b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #175541 from Artturin/updatenixstable

Browse source 
nixVersions.stable: 2.8.0 -> 2.9.0
This commit is contained in:
Sandro 2022-06-06 14:33:05 +02:00 committed by GitHub
parent 6d2efbade8 aef9be48aa
commit d10d2e4fb8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 53 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/development/libraries/nix-plugins/default.nix
View file

@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
hash = "sha256-AkHsZpYM4EY8SNuF6LhxF2peOjp69ICGc3kOLkDms64=";
};
patches = [ ./nix-2.9.patch ];
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ nix boost ];

35
pkgs/development/libraries/nix-plugins/nix-2.9.patch Normal file
View file

@ -0,0 +1,35 @@
diff --git a/extra-builtins.cc b/extra-builtins.cc
index 617807a..c417cb3 100644
--- a/extra-builtins.cc
+++ b/extra-builtins.cc
@@ -27,7 +27,7 @@ static ExtraBuiltinsSettings extraBuiltinsSettings;
static GlobalConfig::Register rp(&extraBuiltinsSettings);
-static void extraBuiltins(EvalState & state, const Pos & pos,
+static void extraBuiltins(EvalState & state, const PosIdx pos,
Value ** _args, Value & v)
{
static auto extraBuiltinsFile = absPath(extraBuiltinsSettings.extraBuiltinsFile);
@@ -44,10 +44,10 @@ static void extraBuiltins(EvalState & state, const Pos & pos,
auto attrs = state.buildBindings(2);
auto sExec = state.symbols.create("exec");
- attrs.alloc(sExec).mkPrimOp(new PrimOp { .fun = prim_exec, .arity = 1, .name = sExec });
+ attrs.alloc(sExec).mkPrimOp(new PrimOp { .fun = prim_exec, .arity = 1, .name = "exec" });
auto sImportNative = state.symbols.create("importNative");
- attrs.alloc(sImportNative).mkPrimOp(new PrimOp { .fun = prim_importNative, .arity = 2, .name = sImportNative });
+ attrs.alloc(sImportNative).mkPrimOp(new PrimOp { .fun = prim_importNative, .arity = 2, .name = "importNative" });
arg = state.allocValue();
arg->mkAttrs(attrs);
@@ -64,7 +64,7 @@ static void extraBuiltins(EvalState & state, const Pos & pos,
static RegisterPrimOp rp1("__extraBuiltins", 0,
extraBuiltins);
-static void cflags(EvalState & state, const Pos & _pos,
+static void cflags(EvalState & state, const PosIdx _pos,
Value ** _args, Value & v)
{
auto attrs = state.buildBindings(3);

4
pkgs/tools/package-management/nix-eval-jobs/default.nix
View file

@ -11,12 +11,12 @@
}:
stdenv.mkDerivation rec {
pname = "nix-eval-jobs";
version = "0.0.6";
version = "2.9.0";
src = fetchFromGitHub {
owner = "nix-community";
repo = pname;
rev = "v${version}";
hash = "sha256-NCUVRiZqg9JgS+hlAczvPDb0M5uIwyyqhdKe5K1P360=";
hash = "sha256-fN9D1rqJ4UFmCykTK8cU0oPWqN3wR8m9/zQ6fwVdBcY=";
};
buildInputs = [
boost

15
pkgs/tools/package-management/nix/default.nix
View file

@ -85,7 +85,20 @@ in lib.makeExtensible (self: {
sha256 = "sha256-zldZ4SiwkISFXxrbY/UdwooIZ3Z/I6qKxtpc3zD0T/o=";
};
stable = self.nix_2_8;
nix_2_9 = common {
version = "2.9.0";
sha256 = "sha256-W6aTsTpCTb+vXQEXDjnKqetOuJmEfSuK2CXvAMqwo74=";
patches = [
# can be removed when updated to 2.9.1
(fetchpatch {
name = "fix-segfault-in-git-fetcher";
url = "https://github.com/NixOS/nix/commit/bc4759345538c89e1f045aaabcc0cafe4ecca12a.patch";
sha256 = "sha256-UrfH4M7a02yfE9X3tA1Pwhw4RacBW+rShYkl7ybG64I=";
})
];
};
stable = self.nix_2_9;
# remember to backport updates to the stable branch!
unstable = lib.lowPrio (common rec {