[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
118/376: install-nix-from-closure.sh: Use https channel if possible
From: |
Ludovic Courtès |
Subject: |
118/376: install-nix-from-closure.sh: Use https channel if possible |
Date: |
Wed, 28 Jan 2015 22:04:26 +0000 |
civodul pushed a commit to tag 1.8
in repository guix.
commit 4a198dae746379effe04c19341f1d370461c71c7
Author: Eelco Dolstra <address@hidden>
Date: Thu Aug 7 15:36:54 2014 +0200
install-nix-from-closure.sh: Use https channel if possible
---
scripts/install-nix-from-closure.sh | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/scripts/install-nix-from-closure.sh
b/scripts/install-nix-from-closure.sh
index 0a2890e..8aa227a 100644
--- a/scripts/install-nix-from-closure.sh
+++ b/scripts/install-nix-from-closure.sh
@@ -73,7 +73,11 @@ fi
# Subscribe the user to the Nixpkgs channel and fetch it.
if ! $nix/bin/nix-channel --list | grep -q "^nixpkgs "; then
- $nix/bin/nix-channel --add http://nixos.org/channels/nixpkgs-unstable
+ 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
fi
$nix/bin/nix-channel --update nixpkgs
- 101/376: make clean: Remove Makefile.config, (continued)
- 101/376: make clean: Remove Makefile.config, Ludovic Courtès, 2015/01/28
- 105/376: findRoots(): Prevent a call to lstat(), Ludovic Courtès, 2015/01/28
- 108/376: Remove ugly hack for detecting build environment setup errors, Ludovic Courtès, 2015/01/28
- 107/376: Call commonChildInit() before doing chroot init, Ludovic Courtès, 2015/01/28
- 104/376: Make readDirectory() return inode / file type, Ludovic Courtès, 2015/01/28
- 106/376: Eliminate redundant copy, Ludovic Courtès, 2015/01/28
- 110/376: Make chroot builds easier to set up, Ludovic Courtès, 2015/01/28
- 109/376: Speed up nix-shell, Ludovic Courtès, 2015/01/28
- 121/376: nix-install-package: Use extra-binary-caches, Ludovic Courtès, 2015/01/28
- 119/376: Add support for order-only dependencies, Ludovic Courtès, 2015/01/28
- 118/376: install-nix-from-closure.sh: Use https channel if possible,
Ludovic Courtès <=
- 114/376: Refactor, Ludovic Courtès, 2015/01/28
- 117/376: Remove unnecessary call to addTempRoot(), Ludovic Courtès, 2015/01/28
- 115/376: Move some options out of globals, Ludovic Courtès, 2015/01/28
- 116/376: Doh, Ludovic Courtès, 2015/01/28
- 112/376: Add option ‘build-extra-chroot-dirs’, Ludovic Courtès, 2015/01/28
- 111/376: Get rid of "killing <pid>" message for unused build hooks, Ludovic Courtès, 2015/01/28
- 129/376: Remove log2html.xsl and friends, Ludovic Courtès, 2015/01/28
- 122/376: Warn about untrusted binary caches in extra-binary-caches, Ludovic Courtès, 2015/01/28
- 113/376: Update manual, Ludovic Courtès, 2015/01/28
- 126/376: Handle compound single dash options properly, Ludovic Courtès, 2015/01/28