Resolve conflict

NixOS · Feb 10, 2025 · 0531f12 · 0531f12
1 parent df8d5e6
commit 0531f12
Showing 1 changed file with 1 addition and 33 deletions.
diff --git a/scripts/nix-profile.fish.in b/scripts/nix-profile.fish.in
@@ -29,7 +29,7 @@ if test -n "$HOME" && test -n "$USER"
     end
 
     # Set $NIX_SSL_CERT_FILE so that Nixpkgs applications like curl work.
-    if test -n "$NIX_SSH_CERT_FILE"
+    if test -n "$NIX_SSL_CERT_FILE"
         : # Allow users to override the NIX_SSL_CERT_FILE
     else if test -e /etc/ssl/certs/ca-certificates.crt # NixOS, Ubuntu, Debian, Gentoo, Arch
         set --export NIX_SSL_CERT_FILE /etc/ssl/certs/ca-certificates.crt
@@ -56,36 +56,4 @@ if test -n "$HOME" && test -n "$USER"
     set --erase NIX_LINK
 end
 
-<<<<<<< HEAD
-=======
-# Set $NIX_SSL_CERT_FILE so that Nixpkgs applications like curl work.
-if test -n "$NIX_SSL_CERT_FILE"
-    : # Allow users to override the NIX_SSL_CERT_FILE
-else if test -e /etc/ssl/certs/ca-certificates.crt # NixOS, Ubuntu, Debian, Gentoo, Arch
-    set --export NIX_SSL_CERT_FILE /etc/ssl/certs/ca-certificates.crt
-else if test -e /etc/ssl/ca-bundle.pem # openSUSE Tumbleweed
-    set --export NIX_SSL_CERT_FILE /etc/ssl/ca-bundle.pem
-else if test -e /etc/ssl/certs/ca-bundle.crt # Old NixOS
-    set --export NIX_SSL_CERT_FILE /etc/ssl/certs/ca-bundle.crt
-else if test -e /etc/pki/tls/certs/ca-bundle.crt # Fedora, CentOS
-    set --export NIX_SSL_CERT_FILE /etc/pki/tls/certs/ca-bundle.crt
-else if test -e "$NIX_LINK/etc/ssl/certs/ca-bundle.crt" # fall back to cacert in Nix profile
-    set --export NIX_SSL_CERT_FILE "$NIX_LINK/etc/ssl/certs/ca-bundle.crt"
-else if test -e "$NIX_LINK/etc/ca-bundle.crt" # old cacert in Nix profile
-    set --export NIX_SSL_CERT_FILE "$NIX_LINK/etc/ca-bundle.crt"
-end
-
-# Only use MANPATH if it is already set. In general `man` will just simply
-# pick up `.nix-profile/share/man` because is it close to `.nix-profile/bin`
-# which is in the $PATH. For more info, run `manpath -d`.
-if set --query MANPATH
-    set --export --prepend --path MANPATH "$NIX_LINK/share/man"
-end
-
-add_path "$NIX_LINK/bin"
-set --erase NIX_LINK
-
-# Cleanup
-
->>>>>>> 803fb83f7 (nix-profile.fish: Typo NIX_SS{H => L}_CERT_FILE)
 functions -e add_path