From 48a282b913037c2e7c10eef7f25f2f7f692cc933 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sun, 14 Dec 2014 11:26:08 +0100 Subject: [PATCH] http://nixos.org -> https://nixos.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 78bb17dd22e4da4e3810fbc78185d73bb25ea73e) Signed-off-by: Domen Kožar --- README.md | 16 ++++++++-------- maintainers/docker/Dockerfile | 2 +- nixos/doc/manual/development/sources.xml | 6 +++--- nixos/doc/manual/installation/upgrading.xml | 12 ++++++------ nixos/maintainers/scripts/ec2/create-ebs-amis.py | 2 +- .../cd-dvd/system-tarball-pc-readme.txt | 2 +- 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/README.md b/README.md index e59b15425e96..f49dcce2268c 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,10 @@ -Nixpkgs is a collection of packages for [Nix](http://nixos.org/nix/) package -manager. Nixpkgs also includes [NixOS](http://nixos.org/nixos/) linux distribution source code. +Nixpkgs is a collection of packages for [Nix](https://nixos.org/nix/) package +manager. Nixpkgs also includes [NixOS](https://nixos.org/nixos/) linux distribution source code. -* [NixOS installation instructions](http://nixos.org/nixos/manual/#ch-installation) -* [Manual (How to write packages for Nix)](http://nixos.org/nixpkgs/manual/) -* [Manual (NixOS)](http://nixos.org/nixos/manual/) -* [Continuous build](http://hydra.nixos.org/jobset/nixos/trunk-combined) -* [Tests](http://hydra.nixos.org/job/nixos/trunk-combined/tested#tabs-constituents) -* [Mailing list](http://lists.science.uu.nl/mailman/listinfo/nix-dev) +* [NixOS installation instructions](https://nixos.org/nixos/manual/#ch-installation) +* [Manual (How to write packages for Nix)](https://nixos.org/nixpkgs/manual/) +* [Manual (NixOS)](https://nixos.org/nixos/manual/) +* [Continuous build](https://hydra.nixos.org/jobset/nixos/trunk-combined) +* [Tests](https://hydra.nixos.org/job/nixos/trunk-combined/tested#tabs-constituents) +* [Mailing list](https://lists.science.uu.nl/mailman/listinfo/nix-dev) * [IRC - #nixos on freenode.net](irc://irc.freenode.net/#nixos) diff --git a/maintainers/docker/Dockerfile b/maintainers/docker/Dockerfile index 5a98c47de2c1..f02a9d653fd5 100644 --- a/maintainers/docker/Dockerfile +++ b/maintainers/docker/Dockerfile @@ -1,7 +1,7 @@ FROM busybox RUN dir=`mktemp -d` && trap 'rm -rf "$dir"' EXIT && \ - wget -O- http://nixos.org/releases/nix/nix-1.7/nix-1.7-x86_64-linux.tar.bz2 | bzcat | tar x -C $dir && \ + wget -O- https://nixos.org/releases/nix/nix-1.7/nix-1.7-x86_64-linux.tar.bz2 | bzcat | tar x -C $dir && \ mkdir -m 0755 /nix && USER=root sh $dir/*/install && \ echo ". /root/.nix-profile/etc/profile.d/nix.sh" >> /etc/profile diff --git a/nixos/doc/manual/development/sources.xml b/nixos/doc/manual/development/sources.xml index 992a07af9813..f9fadd6bf5ed 100644 --- a/nixos/doc/manual/development/sources.xml +++ b/nixos/doc/manual/development/sources.xml @@ -50,8 +50,8 @@ Or, to base your local branch on the latest version available in the NixOS channel: -$ curl -sI http://nixos.org/channels/nixos-unstable/ | grep Location -Location: http://releases.nixos.org/nixos/unstable/nixos-14.10pre43986.acaf4a6/ +$ curl -sI https://nixos.org/channels/nixos-unstable/ | grep Location +Location: https://releases.nixos.org/nixos/unstable/nixos-14.10pre43986.acaf4a6/ $ git checkout -b local acaf4a6 @@ -92,4 +92,4 @@ to nix-env, as it will break after interpreting expressions in nixos/ as packages. --> - \ No newline at end of file + diff --git a/nixos/doc/manual/installation/upgrading.xml b/nixos/doc/manual/installation/upgrading.xml index e4e21603329d..ef83d4595183 100644 --- a/nixos/doc/manual/installation/upgrading.xml +++ b/nixos/doc/manual/installation/upgrading.xml @@ -15,7 +15,7 @@ been built. These channels are: Stable channels, such as nixos-14.04. + xlink:href="https://nixos.org/channels/nixos-14.04">nixos-14.04. These only get conservative bug fixes and package upgrades. For instance, a channel update may cause the Linux kernel on your system to be upgraded from 3.4.66 to 3.4.67 (a minor bug fix), but @@ -26,7 +26,7 @@ been built. These channels are: The unstable channel, nixos-unstable. + xlink:href="https://nixos.org/channels/nixos-unstable">nixos-unstable. This corresponds to NixOS’s main development branch, and may thus see radical changes between channel updates. It’s not recommended for production systems. @@ -34,7 +34,7 @@ been built. These channels are: To see what channels are available, go to . (Note that the URIs of the +xlink:href="https://nixos.org/channels"/>. (Note that the URIs of the various channels redirect to a directory that contains the channel’s latest version and includes ISO images and VirtualBox appliances.) @@ -53,20 +53,20 @@ nixos https://nixos.org/channels/nixos-unstable To switch to a different NixOS channel, do -$ nix-channel --add http://nixos.org/channels/channel-name nixos +$ nix-channel --add https://nixos.org/channels/channel-name nixos (Be sure to include the nixos parameter at the end.) For instance, to use the NixOS 14.04 stable channel: -$ nix-channel --add http://nixos.org/channels/nixos-14.04 nixos +$ nix-channel --add http:s//nixos.org/channels/nixos-14.04 nixos But if you want to live on the bleeding edge: -$ nix-channel --add http://nixos.org/channels/nixos-unstable nixos +$ nix-channel --add https://nixos.org/channels/nixos-unstable nixos diff --git a/nixos/maintainers/scripts/ec2/create-ebs-amis.py b/nixos/maintainers/scripts/ec2/create-ebs-amis.py index 62525651ae03..6c91aa68694d 100755 --- a/nixos/maintainers/scripts/ec2/create-ebs-amis.py +++ b/nixos/maintainers/scripts/ec2/create-ebs-amis.py @@ -75,7 +75,7 @@ m.run_command("mount {0} /mnt".format(device)) m.run_command("touch /mnt/.ebs") m.run_command("mkdir -p /mnt/etc/nixos") -m.run_command("nix-channel --add http://nixos.org/channels/nixos-{} nixos".format(args.channel)) +m.run_command("nix-channel --add https://nixos.org/channels/nixos-{} nixos".format(args.channel)) m.run_command("nix-channel --update") version = m.run_command("nix-instantiate --eval-only -A lib.nixpkgsVersion ''", capture_stdout=True).split(' ')[0].replace('"','').strip() diff --git a/nixos/modules/installer/cd-dvd/system-tarball-pc-readme.txt b/nixos/modules/installer/cd-dvd/system-tarball-pc-readme.txt index 8f0a8d355c6e..84252f292c54 100644 --- a/nixos/modules/installer/cd-dvd/system-tarball-pc-readme.txt +++ b/nixos/modules/installer/cd-dvd/system-tarball-pc-readme.txt @@ -80,7 +80,7 @@ had booted this nixos. Run: * `grep local-cmds run/current-system/init` Then you can proceed normally subscribing to a nixos channel: - nix-channel --add http://nixos.org/channels/nixos-unstable + nix-channel --add https://nixos.org/channels/nixos-unstable nix-channel --update Testing: