update the Nix requirements

Nix 2.0 is now available everywhere
This commit is contained in:
zimbatm 2018-11-02 16:16:50 +01:00
parent 6bbd843da0
commit a4885d4596
No known key found for this signature in database
GPG Key ID: 71BAF6D40C1D63D7
3 changed files with 6 additions and 13 deletions

View File

@ -6,6 +6,10 @@ Nix. It's installing a VM using the native virtualization
VirtualBox. The project also comes with an installation script that configures
Nix to use the VM as a remote builder automatically.
## Requirements
This project depends on Nix and a nixpkgs channel >= 18.03.
## Installation
Fetch it from the NixOS binary cache:

View File

@ -19,7 +19,7 @@ self: super: {
nix-script-store-plugin = self.stdenv.mkDerivation {
name = "nix-script-store-plugin";
nativeBuildInputs = [ self.pkgconfig self.cmake ];
buildInputs = [ self.nixUnstable ];
buildInputs = [ self.nix ];
src = self.fetchFromGitHub {
owner = "puffnfresh";
repo = "nix-script-store-plugin";
@ -27,15 +27,4 @@ self: super: {
sha256 = "0b1jbnw9hl99cqcqyv0szxs1mhvxzp91gy65194yyfhrdj5rx19m";
};
};
nixUnstable = self.nix.overrideDerivation (drv: {
name = "nix-2.0pre6018_g088ef817";
src = self.fetchFromGitHub {
owner = "NixOS";
repo = "nix";
rev = "088ef81759f22bf0115a52f183ba66b0be3b9ef2";
sha256 = "1rj20lllf9awx0150frxckgwv1h6a1rv90dyz206lp3b4jvsf7pf";
};
nativeBuildInputs = drv.nativeBuildInputs ++ (with self; [ autoreconfHook autoconf-archive bison flex libxml2 libxslt docbook5 docbook5_xsl ]);
});
}

View File

@ -1,4 +1,4 @@
{ inherit (import ./default.nix {}) hyperkit virtsock vpnkit go-vpnkit
linuxkit linuxkit-builder nix-linuxkit-runner nix-script-store-plugin
nixUnstable;
nix;
}