From 1ea8948eb718782265054c2cb9a289a1ee03a3fb Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sun, 24 Apr 2022 14:07:25 +1200 Subject: [PATCH] Fix build with stable Nix --- flake.lock | 12 ++++++------ flake.nix | 6 ++---- meson.build | 1 + src/meson.build | 1 + 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/flake.lock b/flake.lock index 0f133c7..b832c0f 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "flake-utils": { "locked": { - "lastModified": 1644229661, - "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", + "lastModified": 1649676176, + "narHash": "sha256-OWKJratjt2RW151VUlJPRALb7OU2S5s+f0vLj4o1bHM=", "owner": "numtide", "repo": "flake-utils", - "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", + "rev": "a4b154ebbdc88c8498a5c7b01589addc9e9cb678", "type": "github" }, "original": { @@ -17,11 +17,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1650161686, - "narHash": "sha256-70ZWAlOQ9nAZ08OU6WY7n4Ij2kOO199dLfNlvO/+pf8=", + "lastModified": 1650701402, + "narHash": "sha256-XKfstdtqDg+O+gNBx1yGVKWIhLgfEDg/e2lvJSsp9vU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1ffba9f2f683063c2b14c9f4d12c55ad5f4ed887", + "rev": "bc41b01dd7a9fdffd32d9b03806798797532a5fe", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 8b5bc6c..ecd3fc8 100644 --- a/flake.nix +++ b/flake.nix @@ -17,7 +17,7 @@ let mkVariant = nix: (packages.nix-eval-jobs.override { # TODO: fix to stable after next nix release - nix = pkgs.nixUnstable; + nix = pkgs.nix; #inherit nix; }).overrideAttrs (_: { name = "nix-eval-jobs-${nix.version}"; @@ -46,9 +46,7 @@ touch $out ''; - # TODO fix to unstable in next release - build = mkVariant pkgs.nixUnstable; - #build = mkVariant pkgs.nix; + build = mkVariant pkgs.nix; build-unstable = mkVariant pkgs.nixUnstable; }; diff --git a/meson.build b/meson.build index 1767e63..00086fd 100644 --- a/meson.build +++ b/meson.build @@ -6,6 +6,7 @@ project('nix-eval-jobs', 'cpp', nix_main_dep = dependency('nix-main', required: true) nix_store_dep = dependency('nix-store', required: true) nix_expr_dep = dependency('nix-expr', required: true) +nix_cmd_dep = dependency('nix-cmd', required: true) threads_dep = dependency('threads', required: true) nlohmann_json_dep = dependency('nlohmann_json', required: true) boost_dep = dependency('boost', required: true) diff --git a/src/meson.build b/src/meson.build index 56c480d..ef01a7d 100644 --- a/src/meson.build +++ b/src/meson.build @@ -7,6 +7,7 @@ executable('nix-eval-jobs', src, nix_main_dep, nix_store_dep, nix_expr_dep, + nix_cmd_dep, boost_dep, nlohmann_json_dep, threads_dep