delroth/nix-eval-jobs
0
0
Fork 0
forked from lix-project/nix-eval-jobs
Code Pull requests Activity

Fix build with stable Nix

Browse source
This commit is contained in:
adisbladis 2022-04-24 14:07:25 +12:00
parent 813c5d7aae
commit 1ea8948eb7
4 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
flake.lock
View file

@ -2,11 +2,11 @@
"nodes": { "nodes": {
"flake-utils": { "flake-utils": {
"locked": { "locked": {
"lastModified": 1644229661, "lastModified": 1649676176,
"narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", "narHash": "sha256-OWKJratjt2RW151VUlJPRALb7OU2S5s+f0vLj4o1bHM=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", "rev": "a4b154ebbdc88c8498a5c7b01589addc9e9cb678",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -17,11 +17,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1650161686, "lastModified": 1650701402,
"narHash": "sha256-70ZWAlOQ9nAZ08OU6WY7n4Ij2kOO199dLfNlvO/+pf8=", "narHash": "sha256-XKfstdtqDg+O+gNBx1yGVKWIhLgfEDg/e2lvJSsp9vU=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1ffba9f2f683063c2b14c9f4d12c55ad5f4ed887", "rev": "bc41b01dd7a9fdffd32d9b03806798797532a5fe",
"type": "github" "type": "github"
}, },
"original": { "original": {

6
flake.nix
View file

@ -17,7 +17,7 @@
let let
mkVariant = nix: (packages.nix-eval-jobs.override { mkVariant = nix: (packages.nix-eval-jobs.override {
# TODO: fix to stable after next nix release # TODO: fix to stable after next nix release
nix = pkgs.nixUnstable; nix = pkgs.nix;
#inherit nix; #inherit nix;
}).overrideAttrs (_: { }).overrideAttrs (_: {
name = "nix-eval-jobs-${nix.version}"; name = "nix-eval-jobs-${nix.version}";
@ -46,9 +46,7 @@
touch $out touch $out
''; '';
# TODO fix to unstable in next release build = mkVariant pkgs.nix;
build = mkVariant pkgs.nixUnstable;
#build = mkVariant pkgs.nix;
build-unstable = mkVariant pkgs.nixUnstable; build-unstable = mkVariant pkgs.nixUnstable;
}; };

1
meson.build
View file

@ -6,6 +6,7 @@ project('nix-eval-jobs', 'cpp',
nix_main_dep = dependency('nix-main', required: true) nix_main_dep = dependency('nix-main', required: true)
nix_store_dep = dependency('nix-store', required: true) nix_store_dep = dependency('nix-store', required: true)
nix_expr_dep = dependency('nix-expr', required: true) nix_expr_dep = dependency('nix-expr', required: true)
nix_cmd_dep = dependency('nix-cmd', required: true)
threads_dep = dependency('threads', required: true) threads_dep = dependency('threads', required: true)
nlohmann_json_dep = dependency('nlohmann_json', required: true) nlohmann_json_dep = dependency('nlohmann_json', required: true)
boost_dep = dependency('boost', required: true) boost_dep = dependency('boost', required: true)

1
src/meson.build
View file

@ -7,6 +7,7 @@ executable('nix-eval-jobs', src,
nix_main_dep, nix_main_dep,
nix_store_dep, nix_store_dep,
nix_expr_dep, nix_expr_dep,
nix_cmd_dep,
boost_dep, boost_dep,
nlohmann_json_dep, nlohmann_json_dep,
threads_dep threads_dep