diff options
author | Shea Levy <shea@shealevy.com> | 2018-02-13 11:19:31 -0500 |
---|---|---|
committer | Shea Levy <shea@shealevy.com> | 2018-02-13 11:19:31 -0500 |
commit | 9ef5d9c143e6f8a0716bfdb1031835bade82c989 (patch) | |
tree | 0852fabe4a467c72031420f064fd3f5129e13568 | |
parent | 358b821bbe30fa96accabeccaaf65914710f51ec (diff) | |
download | nixlib-9ef5d9c143e6f8a0716bfdb1031835bade82c989.tar nixlib-9ef5d9c143e6f8a0716bfdb1031835bade82c989.tar.gz nixlib-9ef5d9c143e6f8a0716bfdb1031835bade82c989.tar.bz2 nixlib-9ef5d9c143e6f8a0716bfdb1031835bade82c989.tar.lz nixlib-9ef5d9c143e6f8a0716bfdb1031835bade82c989.tar.xz nixlib-9ef5d9c143e6f8a0716bfdb1031835bade82c989.tar.zst nixlib-9ef5d9c143e6f8a0716bfdb1031835bade82c989.zip |
nix-plugins: Bump for new nix plugin mechanism
-rw-r--r-- | pkgs/development/libraries/nix-plugins/default.nix | 10 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 3 |
2 files changed, 6 insertions, 7 deletions
diff --git a/pkgs/development/libraries/nix-plugins/default.nix b/pkgs/development/libraries/nix-plugins/default.nix index 2dcc7e9a53dd..53178d66434d 100644 --- a/pkgs/development/libraries/nix-plugins/default.nix +++ b/pkgs/development/libraries/nix-plugins/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, nix, boehmgc }: -let version = "2.0.7"; in +{ stdenv, fetchFromGitHub, nix, boehmgc, cmake, pkgconfig }: +let version = "3.0.1"; in stdenv.mkDerivation { name = "nix-plugins-${version}"; @@ -7,12 +7,10 @@ stdenv.mkDerivation { owner = "shlevy"; repo = "nix-plugins"; rev = version; - sha256 = "1q4ydp2w114wbfm41m4qgrabha7ifa17xyz5dr137vvnj6njp4vs"; + sha256 = "1pmk2m0kc6a3jqygm5cy1fl5gbcy0ghc2xs4ww0gh20walrys82r"; }; - buildFlags = [ "NIX_INCLUDE=${nix.dev}/include" "GC_INCLUDE=${boehmgc.dev}/include" ]; - - installFlags = [ "PREFIX=$(out)" ]; + buildInputs = [ cmake pkgconfig nix ]; meta = { description = "Collection of miscellaneous plugins for the nix expression language"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 559394cac9f0..6e9016dc5ad0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10400,7 +10400,8 @@ with pkgs; }; libnghttp2 = nghttp2.lib; - nix-plugins = callPackage ../development/libraries/nix-plugins {}; + nix-plugins = callPackage ../development/libraries/nix-plugins + { nix = nixUnstable; }; nlohmann_json = callPackage ../development/libraries/nlohmann_json { }; |