diff options
| author | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2017-05-23 17:23:43 -0400 |
|---|---|---|
| committer | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2017-05-23 17:32:30 -0400 |
| commit | 467a91d9ee6f2a3750bceaf2c86a2c1f093904df (patch) | |
| tree | a2653e8dc16d696699f8d42b323c703b52e20e7c /pkgs/tools | |
| parent | 0e9e77750818f40303c72ad658b3dca299591e4f (diff) | |
| download | nixlib-467a91d9ee6f2a3750bceaf2c86a2c1f093904df.tar nixlib-467a91d9ee6f2a3750bceaf2c86a2c1f093904df.tar.gz nixlib-467a91d9ee6f2a3750bceaf2c86a2c1f093904df.tar.bz2 nixlib-467a91d9ee6f2a3750bceaf2c86a2c1f093904df.tar.lz nixlib-467a91d9ee6f2a3750bceaf2c86a2c1f093904df.tar.xz nixlib-467a91d9ee6f2a3750bceaf2c86a2c1f093904df.tar.zst nixlib-467a91d9ee6f2a3750bceaf2c86a2c1f093904df.zip | |
nixStable: remove old patches
https://github.com/NixOS/nix/commit/773313591f167888718228bf5ada44a81f3fa32e https://github.com/NixOS/nix/commit/ad9e6037a4558c6fd5a2fcaf9d81a4725a1dd82f
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/package-management/nix/default.nix | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 536b9a07a4f8..d623881cfbad 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -8,8 +8,8 @@ let - common = { name, suffix ? "", src, patchPhase ? "", fromGit ? false }: stdenv.mkDerivation rec { - inherit name src patchPhase; + common = { name, suffix ? "", src, fromGit ? false }: stdenv.mkDerivation rec { + inherit name src; version = lib.getVersion name; VERSION_SUFFIX = lib.optionalString fromGit suffix; @@ -134,15 +134,6 @@ in rec { url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz"; sha256 = "0e943e277f37843f9196b0293cc31d828613ad7a328ee77cd5be01935dc6e7e1"; }; - - # Until 1.11.9 is released, we do this :) - patchPhase = '' - substituteInPlace src/libexpr/json-to-value.cc \ - --replace 'std::less<Symbol>, gc_allocator<Value *>' \ - 'std::less<Symbol>, gc_allocator<std::pair<const Symbol, Value *> >' - - sed -i '/if (settings.readOnlyMode) {/a curSchema = getSchema();' src/libstore/local-store.cc - ''; }) // { perl-bindings = nixStable; }; nixUnstable = (lib.lowPrio (common rec { |