about summary refs log tree commit diff
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2014-12-10T10·35+0100
committerEelco Dolstra <eelco.dolstra@logicblox.com>2014-12-10T10·35+0100
commit2f16946064b03b92ed5e3a7aea8e222813ea89c2 (patch)
tree9254378ebe625f8c596dfcf31c1b211f3297d25d
parent39fe52f7acd1ef0e5cfddc70c13d0b3b9d578500 (diff)
Always use https to fetch the Nixpkgs channel
-rw-r--r--scripts/install-nix-from-closure.sh6
-rw-r--r--scripts/nix-profile.sh.in2
2 files changed, 2 insertions, 6 deletions
diff --git a/scripts/install-nix-from-closure.sh b/scripts/install-nix-from-closure.sh
index 60ec1ea93219..467fc50d62a8 100644
--- a/scripts/install-nix-from-closure.sh
+++ b/scripts/install-nix-from-closure.sh
@@ -73,11 +73,7 @@ fi
 
 # Subscribe the user to the Nixpkgs channel and fetch it.
 if ! $nix/bin/nix-channel --list | grep -q "^nixpkgs "; then
-    if [ -n "$SSL_CERT_FILE" ]; then
-        $nix/bin/nix-channel --add https://nixos.org/channels/nixpkgs-unstable
-    else
-        $nix/bin/nix-channel --add http://nixos.org/channels/nixpkgs-unstable
-    fi
+    $nix/bin/nix-channel --add https://nixos.org/channels/nixpkgs-unstable
 fi
 if [ -z "$_NIX_INSTALLER_TEST" ]; then
     $nix/bin/nix-channel --update nixpkgs
diff --git a/scripts/nix-profile.sh.in b/scripts/nix-profile.sh.in
index 8093bcd3761e..a91b54bd589f 100644
--- a/scripts/nix-profile.sh.in
+++ b/scripts/nix-profile.sh.in
@@ -12,7 +12,7 @@ if [ -n "$HOME" ]; then
 
     # Subscribe the user to the Nixpkgs channel by default.
     if [ ! -e $HOME/.nix-channels ]; then
-        echo "http://nixos.org/channels/nixpkgs-unstable nixpkgs" > $HOME/.nix-channels
+        echo "https://nixos.org/channels/nixpkgs-unstable nixpkgs" > $HOME/.nix-channels
     fi
 
     # Append ~/.nix-defexpr/channels/nixpkgs to $NIX_PATH so that