From 396a0d3045bbf0a5252cce5771be6607be05c4f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 18 Jan 2023 16:38:32 +0100 Subject: [PATCH 1/3] bump nixpkgs and set version to 2_13 --- .nix-version | 2 +- flake.lock | 8 ++++---- flake.nix | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.nix-version b/.nix-version index 6842dbd..8b980bc 100644 --- a/.nix-version +++ b/.nix-version @@ -1 +1 @@ -unstable +2_13 diff --git a/flake.lock b/flake.lock index 975744e..4803c32 100644 --- a/flake.lock +++ b/flake.lock @@ -22,16 +22,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1674211260, - "narHash": "sha256-xU6Rv9sgnwaWK7tgCPadV6HhI2Y/fl4lKxJoG2+m9qs=", + "lastModified": 1674380517, + "narHash": "sha256-+wjehzo+LlHb34fTlSK0OW8N9Us9+6mzydCVQyIhE9k=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5ed481943351e9fd354aeb557679624224de38d5", + "rev": "4a91562abad9ef3dd581da561e80408ea54e8ab6", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "master", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 9259fab..24efad7 100644 --- a/flake.nix +++ b/flake.nix @@ -1,7 +1,7 @@ { description = "Hydra's builtin hydra-eval-jobs as a standalone"; - inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + inputs.nixpkgs.url = "github:NixOS/nixpkgs/master"; inputs.flake-parts.url = "github:hercules-ci/flake-parts"; inputs.flake-parts.inputs.nixpkgs-lib.follows = "nixpkgs"; From 205f05ac02e322b1f5f8be38d188fed578e8bc43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 18 Jan 2023 16:38:38 +0100 Subject: [PATCH 2/3] fix build with 2.13 --- src/nix-eval-jobs.cc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/nix-eval-jobs.cc b/src/nix-eval-jobs.cc index 4d6c2cd..7b22fc4 100644 --- a/src/nix-eval-jobs.cc +++ b/src/nix-eval-jobs.cc @@ -20,6 +20,7 @@ #include #include #include +#include #include @@ -255,15 +256,15 @@ static void worker(ref state, Bindings &autoArgs, AutoCloseFD &to, std::optional flake; if (myArgs.flake) { auto [flakeRef, fragment, outputSpec] = - parseFlakeRefWithFragmentAndOutputsSpec(myArgs.releaseExpr, - absPath(".")); + parseFlakeRefWithFragmentAndExtendedOutputsSpec(myArgs.releaseExpr, + absPath(".")); flake.emplace(InstallableFlake({}, state, std::move(flakeRef), fragment, outputSpec, {}, {}, flake::LockFlags{ .updateLockFile = false, .useRegistries = false, - .allowMutable = false, + .allowUnlocked = false, })); }; From cdd53c2782546f171fa9310ab305bfb421c74754 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 18 Jan 2023 16:44:36 +0100 Subject: [PATCH 3/3] bump nix-eval-jobs version --- default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/default.nix b/default.nix index a60ed77..982c5e0 100644 --- a/default.nix +++ b/default.nix @@ -17,7 +17,7 @@ let in stdenv.mkDerivation rec { pname = "nix-eval-jobs"; - version = "2.11.0"; + version = "2.13.0"; src = if srcDir == null then filterMesonBuild ./. else srcDir; buildInputs = [ nlohmann_json