lix-project/nix-eval-jobs
2
0
Fork 1
Code Issues 1 Pull requests Packages Projects Releases Wiki Activity

Merge #174

Browse source 
174: Bump nix version r=Mic92 a=Mic92



Co-authored-by: Jörg Thalheim <joerg@thalheim.io>
This commit is contained in:
bors[bot] 2023-01-22 10:20:36 +00:00 committed by GitHub
parent a0b4134df2 cdd53c2782
commit 14e28ffd7e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.nix-version
View file

@ -1 +1 @@
unstable 2_13

2
default.nix
View file

@ -17,7 +17,7 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "nix-eval-jobs"; pname = "nix-eval-jobs";
version = "2.11.0"; version = "2.13.0";
src = if srcDir == null then filterMesonBuild ./. else srcDir; src = if srcDir == null then filterMesonBuild ./. else srcDir;
buildInputs = [ buildInputs = [
nlohmann_json nlohmann_json

8
flake.lock
View file

@ -22,16 +22,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1674211260, "lastModified": 1674380517,
"narHash": "sha256-xU6Rv9sgnwaWK7tgCPadV6HhI2Y/fl4lKxJoG2+m9qs=", "narHash": "sha256-+wjehzo+LlHb34fTlSK0OW8N9Us9+6mzydCVQyIhE9k=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5ed481943351e9fd354aeb557679624224de38d5", "rev": "4a91562abad9ef3dd581da561e80408ea54e8ab6",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-unstable", "ref": "master",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }

2
flake.nix
View file

@ -1,7 +1,7 @@
{ {
description = "Hydra's builtin hydra-eval-jobs as a standalone"; 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.url = "github:hercules-ci/flake-parts";
inputs.flake-parts.inputs.nixpkgs-lib.follows = "nixpkgs"; inputs.flake-parts.inputs.nixpkgs-lib.follows = "nixpkgs";

5
src/nix-eval-jobs.cc
View file

@ -20,6 +20,7 @@
#include <nix/logging.hh> #include <nix/logging.hh>
#include <nix/error.hh> #include <nix/error.hh>
#include <nix/installables.hh> #include <nix/installables.hh>
#include <nix/path-with-outputs.hh>
#include <nix/value-to-json.hh> #include <nix/value-to-json.hh>
@ -255,7 +256,7 @@ static void worker(ref<EvalState> state, Bindings &autoArgs, AutoCloseFD &to,
std::optional<InstallableFlake> flake; std::optional<InstallableFlake> flake;
if (myArgs.flake) { if (myArgs.flake) {
auto [flakeRef, fragment, outputSpec] = auto [flakeRef, fragment, outputSpec] =
parseFlakeRefWithFragmentAndOutputsSpec(myArgs.releaseExpr, parseFlakeRefWithFragmentAndExtendedOutputsSpec(myArgs.releaseExpr,
absPath(".")); absPath("."));
flake.emplace(InstallableFlake({}, state, std::move(flakeRef), fragment, flake.emplace(InstallableFlake({}, state, std::move(flakeRef), fragment,
@ -263,7 +264,7 @@ static void worker(ref<EvalState> state, Bindings &autoArgs, AutoCloseFD &to,
flake::LockFlags{ flake::LockFlags{
.updateLockFile = false, .updateLockFile = false,
.useRegistries = false, .useRegistries = false,
.allowMutable = false, .allowUnlocked = false,
})); }));
}; };