Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixos-homepage
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 7860524b48bd
Choose a base ref
...
head repository: NixOS/nixos-homepage
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f74049df65db
Choose a head ref
  • 2 commits
  • 7 files changed
  • 1 contributor

Commits on May 31, 2018

  1. Nix 2.0.4 released

    @edolstra
    edolstra committed May 31, 2018
    Copy the full SHA
    498a1f7 View commit details

  2. Moved installation script to the Nix release directory

    @edolstra
    edolstra committed May 31, 2018
    Copy the full SHA
    f74049d View commit details
Showing with 5 additions and 95 deletions.
  1. +1 −3 .gitignore
  2. +1 −9 Makefile
  3. +1 −5 nix-release.tt
  4. +1 −0 nix/install
  5. +0 −67 nix/install.in
  6. +0 −11 nix/install.sig
  7. +1 −0 nix/install.sig
4 changes: 1 addition & 3 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -4,8 +4,6 @@
/hydra/manual/
/hydra/manual-raw

/nix/install

/nixos/amis.nix
/nixos/amis.json
/nixos/azure-blobs.nix
@@ -28,4 +26,4 @@
/news-rss.xml
/nixos-release.tt
/nixpkgs-commits.json
/nixpkgs-commit-stats.json
/nixpkgs-commit-stats.json
10 changes: 1 addition & 9 deletions Makefile
View file
Original file line number Diff line number Diff line change
@@ -101,8 +101,7 @@ $(NIXPKGS_MANUAL_IN):
all: $(HTML) favicon.png $(subst .png,-small.png,$(filter-out %-small.png,$(wildcard nixos/screenshots/*))) \
nixpkgs/packages.json.gz \
nixpkgs/packages-unstable.json.gz \
nixos/options.json.gz \
nix/install nix/install.sig
nixos/options.json.gz


### Prettify the Hydra manual.
@@ -234,10 +233,3 @@ nixpkgs/packages-unstable.json: discover-more-packages-config.nix
nixos/options.json:
cat $$(nix-build --no-out-link '<nixpkgs/nixos/release.nix>' -I nixpkgs=$(NIXPKGS) -A options)/share/doc/nixos/options.json > $@.tmp
mv $@.tmp $@

nix/install.sig: nix/install
if ! gpg2 --verify $@ $<; then \
gpg2 --detach-sign --armor < $< > $@.tmp; \
mv $@.tmp $@; \
fi
touch $@
6 changes: 1 addition & 5 deletions nix-release.tt
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
[%-
latestNixVersion = "2.0.2"
nix_hash_i686_linux = "01d5da9fad80c3282c5c7d9a7913b505c4c789940d021a1b21cb49df8ae081f8"
nix_hash_x86_64_linux = "d0c2492d7d8f824e3b1ace15a1a58f64a0a8faacc59936ebedfe18905d982d7c"
nix_hash_aarch64_linux = "97397dad4c57031f2e5be37f49c8d610aa98620c971cf99eff8e4c8354d38615"
nix_hash_x86_64_darwin = "3c22d1591b4b39c69054839311cb024ea531d8a57019ec18ff60449a596962a0"
latestNixVersion = "2.0.4"
-%]
1 change: 1 addition & 0 deletions nix/install
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/releases/nix/latest/install
67 changes: 0 additions & 67 deletions nix/install.in
View file

This file was deleted.

11 changes: 0 additions & 11 deletions nix/install.sig
View file

This file was deleted.

1 change: 1 addition & 0 deletions nix/install.sig
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/releases/nix/latest/install.asc