diff options
-rw-r--r-- | README.md | 16 | ||||
-rw-r--r-- | maintainers/docker/Dockerfile | 2 | ||||
-rw-r--r-- | nixos/doc/manual/development/sources.xml | 6 | ||||
-rw-r--r-- | nixos/doc/manual/installation/upgrading.xml | 12 | ||||
-rwxr-xr-x | nixos/maintainers/scripts/ec2/create-ebs-amis.py | 2 | ||||
-rw-r--r-- | nixos/modules/installer/cd-dvd/system-tarball-pc-readme.txt | 2 |
6 files changed, 20 insertions, 20 deletions
diff --git a/README.md b/README.md index e59b15425e96f..f49dcce2268c2 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 5a98c47de2c14..f02a9d653fd55 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 992a07af9813b..f9fadd6bf5ed8 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: <screen> -$ 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 </screen> @@ -92,4 +92,4 @@ to <command>nix-env</command>, as it will break after interpreting expressions in <filename>nixos/</filename> as packages.</para> --> -</chapter> \ No newline at end of file +</chapter> diff --git a/nixos/doc/manual/installation/upgrading.xml b/nixos/doc/manual/installation/upgrading.xml index e4e21603329df..ef83d4595183d 100644 --- a/nixos/doc/manual/installation/upgrading.xml +++ b/nixos/doc/manual/installation/upgrading.xml @@ -15,7 +15,7 @@ been built. These channels are: <itemizedlist> <listitem> <para>Stable channels, such as <literal - xlink:href="http://nixos.org/channels/nixos-14.04">nixos-14.04</literal>. + xlink:href="https://nixos.org/channels/nixos-14.04">nixos-14.04</literal>. 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: </listitem> <listitem> <para>The unstable channel, <literal - xlink:href="http://nixos.org/channels/nixos-unstable">nixos-unstable</literal>. + xlink:href="https://nixos.org/channels/nixos-unstable">nixos-unstable</literal>. This corresponds to NixOS’s main development branch, and may thus see radical changes between channel updates. It’s not recommended for production systems.</para> @@ -34,7 +34,7 @@ been built. These channels are: </itemizedlist> To see what channels are available, go to <link -xlink:href="http://nixos.org/channels"/>. (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.)</para> @@ -53,20 +53,20 @@ nixos https://nixos.org/channels/nixos-unstable To switch to a different NixOS channel, do <screen> -$ nix-channel --add http://nixos.org/channels/<replaceable>channel-name</replaceable> nixos +$ nix-channel --add https://nixos.org/channels/<replaceable>channel-name</replaceable> nixos </screen> (Be sure to include the <literal>nixos</literal> parameter at the end.) For instance, to use the NixOS 14.04 stable channel: <screen> -$ nix-channel --add http://nixos.org/channels/nixos-14.04 nixos +$ nix-channel --add http:s//nixos.org/channels/nixos-14.04 nixos </screen> But if you want to live on the bleeding edge: <screen> -$ nix-channel --add http://nixos.org/channels/nixos-unstable nixos +$ nix-channel --add https://nixos.org/channels/nixos-unstable nixos </screen> </para> diff --git a/nixos/maintainers/scripts/ec2/create-ebs-amis.py b/nixos/maintainers/scripts/ec2/create-ebs-amis.py index 62525651ae036..6c91aa68694d2 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 '<nixpkgs>'", 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 8f0a8d355c6e5..84252f292c54a 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: |