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

nixStable: remove old patches

Browse Source 
773313591f
ad9e6037a4
This commit is contained in:
Dmitry Kalinkin 2017-05-23 17:23:43 -04:00
parent 0e9e777508
commit 467a91d9ee
No known key found for this signature in database
GPG Key ID: 5157B3EC8B2CA333
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/tools/package-management/nix/default.nix
View File

@ -8,8 +8,8 @@
let let
common = { name, suffix ? "", src, patchPhase ? "", fromGit ? false }: stdenv.mkDerivation rec { common = { name, suffix ? "", src, fromGit ? false }: stdenv.mkDerivation rec {
inherit name src patchPhase; inherit name src;
version = lib.getVersion name; version = lib.getVersion name;
VERSION_SUFFIX = lib.optionalString fromGit suffix; VERSION_SUFFIX = lib.optionalString fromGit suffix;
@ -134,15 +134,6 @@ in rec {
url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz"; url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz";
sha256 = "0e943e277f37843f9196b0293cc31d828613ad7a328ee77cd5be01935dc6e7e1"; 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; }; }) // { perl-bindings = nixStable; };
nixUnstable = (lib.lowPrio (common rec { nixUnstable = (lib.lowPrio (common rec {