diff options
| author | Shea Levy <shea@shealevy.com> | 2017-04-04 11:29:40 -0400 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2017-04-04 11:29:40 -0400 |
| commit | 9904019841b66a11d1dce48a54c15539f0731614 (patch) | |
| tree | 76f6a9699849d32d97b5d02ee2cea3d3a4770305 /pkgs | |
| parent | 9fc14f23b8cc5a4868bb3f78630f0aeb453883ff (diff) | |
| download | nixlib-9904019841b66a11d1dce48a54c15539f0731614.tar nixlib-9904019841b66a11d1dce48a54c15539f0731614.tar.gz nixlib-9904019841b66a11d1dce48a54c15539f0731614.tar.bz2 nixlib-9904019841b66a11d1dce48a54c15539f0731614.tar.lz nixlib-9904019841b66a11d1dce48a54c15539f0731614.tar.xz nixlib-9904019841b66a11d1dce48a54c15539f0731614.tar.zst nixlib-9904019841b66a11d1dce48a54c15539f0731614.zip | |
nix-plugins: Bump, unbreak
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/nix-plugins/default.nix | 18 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 10 insertions, 12 deletions
diff --git a/pkgs/development/libraries/nix-plugins/default.nix b/pkgs/development/libraries/nix-plugins/default.nix index 8a5d54952606..647f30f98280 100644 --- a/pkgs/development/libraries/nix-plugins/default.nix +++ b/pkgs/development/libraries/nix-plugins/default.nix @@ -1,17 +1,18 @@ -{ stdenv, fetchgit, nix }: - +{ stdenv, fetchFromGitHub, nix }: +let version = "2.0.2"; in stdenv.mkDerivation { - name = "nix-plugins-1.0.0"; + name = "nix-plugins-${version}"; - src = fetchgit { - url = git://github.com/shlevy/nix-plugins.git; - rev = "refs/tags/1.0.0"; - sha256 = "1w7l4mdwgf5w1g48mbng4lcg2nihixvp835mg2j7gghnya309fxl"; + src = fetchFromGitHub { + owner = "shlevy"; + repo = "nix-plugins"; + rev = version; + sha256 = "02bi0p9qjpyxzbr0ki9q774lwdjwcpipkzx84xx9q1ywwafjhr7b"; }; buildInputs = [ nix ]; - buildFlags = [ "NIX_INCLUDE=${nix}/include" ]; + buildFlags = [ "NIX_INCLUDE=${nix.dev}/include" ]; installFlags = [ "PREFIX=$(out)" ]; @@ -20,6 +21,5 @@ stdenv.mkDerivation { homepage = https://github.com/shlevy/nix-plugins; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.all; - broken = true; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 182f9b196ff4..e83ef1781b89 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9131,9 +9131,7 @@ with pkgs; }; libnghttp2 = nghttp2.lib; - nix-plugins = callPackage ../development/libraries/nix-plugins { - nix = pkgs.nixUnstable; - }; + nix-plugins = callPackage ../development/libraries/nix-plugins {}; nlohmann_json = callPackage ../development/libraries/nlohmann_json { }; |