JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nix-plugins: Bump for new nix plugin mechanism

Browse Source
This commit is contained in:
Shea Levy 2018-02-13 11:19:31 -05:00
parent 358b821bbe
commit 9ef5d9c143
No known key found for this signature in database
GPG Key ID: 5C0BD6957D86FE27
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/libraries/nix-plugins/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, nix, boehmgc }: { stdenv, fetchFromGitHub, nix, boehmgc, cmake, pkgconfig }:
let version = "2.0.7"; in let version = "3.0.1"; in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "nix-plugins-${version}"; name = "nix-plugins-${version}";
@ -7,12 +7,10 @@ stdenv.mkDerivation {
owner = "shlevy"; owner = "shlevy";
repo = "nix-plugins"; repo = "nix-plugins";
rev = version; rev = version;
sha256 = "1q4ydp2w114wbfm41m4qgrabha7ifa17xyz5dr137vvnj6njp4vs"; sha256 = "1pmk2m0kc6a3jqygm5cy1fl5gbcy0ghc2xs4ww0gh20walrys82r";
}; };
buildFlags = [ "NIX_INCLUDE=${nix.dev}/include" "GC_INCLUDE=${boehmgc.dev}/include" ]; buildInputs = [ cmake pkgconfig nix ];
installFlags = [ "PREFIX=$(out)" ];
meta = { meta = {
description = "Collection of miscellaneous plugins for the nix expression language"; description = "Collection of miscellaneous plugins for the nix expression language";

3
pkgs/top-level/all-packages.nix
View File

@ -10400,7 +10400,8 @@ with pkgs;
}; };
libnghttp2 = nghttp2.lib; 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 { }; nlohmann_json = callPackage ../development/libraries/nlohmann_json { };