guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

332/376: Always use https to fetch the Nixpkgs channel


From: Ludovic Courtès
Subject: 332/376: Always use https to fetch the Nixpkgs channel
Date: Wed, 28 Jan 2015 22:05:59 +0000

civodul pushed a commit to tag 1.8
in repository guix.

commit 2f16946064b03b92ed5e3a7aea8e222813ea89c2
Author: Eelco Dolstra <address@hidden>
Date:   Wed Dec 10 11:35:56 2014 +0100

    Always use https to fetch the Nixpkgs channel
---
 scripts/install-nix-from-closure.sh |    6 +-----
 scripts/nix-profile.sh.in           |    2 +-
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/scripts/install-nix-from-closure.sh 
b/scripts/install-nix-from-closure.sh
index 60ec1ea..467fc50 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 8093bcd..a91b54b 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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]