about summary refs log tree commit diff
path: root/pkgs/tools
diff options
context:
space:
mode:
authorJörg Thalheim <Mic92@users.noreply.github.com>2024-06-24 18:41:53 +0200
committerGitHub <noreply@github.com>2024-06-24 18:41:53 +0200
commit34aa149015589667f31251f587c78b8b965174f6 (patch)
treef36e88655e35647648c86f047de471ad5f2074e0 /pkgs/tools
parent0645ee4c273ddb5640cc0561c3be2e3cc74ba2f3 (diff)
parent0394bcf6cb5d1a799ec5dde5bc7cf9d7b5243dc1 (diff)
Merge pull request #322154 from Mic92/nix-eval-jobs
nix-eval-jobs: 2.22.0 -> 2.22.1
Diffstat (limited to 'pkgs/tools')
-rw-r--r--pkgs/tools/package-management/nix-eval-jobs/2.19.nix47
-rw-r--r--pkgs/tools/package-management/nix-eval-jobs/default.nix6
2 files changed, 4 insertions, 49 deletions
diff --git a/pkgs/tools/package-management/nix-eval-jobs/2.19.nix b/pkgs/tools/package-management/nix-eval-jobs/2.19.nix
deleted file mode 100644
index bf2d48e4adfb1..0000000000000
--- a/pkgs/tools/package-management/nix-eval-jobs/2.19.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-{ lib
-, boost
-, cmake
-, fetchFromGitHub
-, meson
-, ninja
-, nix
-, nlohmann_json
-, pkg-config
-, stdenv
-}:
-stdenv.mkDerivation rec {
-  pname = "nix-eval-jobs";
-  version = "2.19.4";
-  src = fetchFromGitHub {
-    owner = "nix-community";
-    repo = pname;
-    rev = "v${version}";
-    hash = "sha256-97ZqhTMqnAr1rzEy96faceWzFyWexnYbH1aTfc1y0JE=";
-  };
-  buildInputs = [
-    boost
-    nix
-    nlohmann_json
-  ];
-  nativeBuildInputs = [
-    meson
-    ninja
-    pkg-config
-    # nlohmann_json can be only discovered via cmake files
-    cmake
-  ];
-
-  # Since this package is intimately tied to a specific Nix release, we
-  # propagate the Nix used for building it to make it easier for users
-  # downstream to reference it.
-  passthru = { inherit nix; };
-
-  meta = {
-    description = "Hydra's builtin hydra-eval-jobs as a standalone";
-    homepage = "https://github.com/nix-community/nix-eval-jobs";
-    license = lib.licenses.gpl3;
-    maintainers = with lib.maintainers; [ adisbladis mic92 ];
-    platforms = lib.platforms.unix;
-    mainProgram = "nix-eval-jobs";
-  };
-}
diff --git a/pkgs/tools/package-management/nix-eval-jobs/default.nix b/pkgs/tools/package-management/nix-eval-jobs/default.nix
index 15a095f6c3b13..0417b5c294dec 100644
--- a/pkgs/tools/package-management/nix-eval-jobs/default.nix
+++ b/pkgs/tools/package-management/nix-eval-jobs/default.nix
@@ -4,6 +4,7 @@
 , fetchFromGitHub
 , meson
 , ninja
+, curl
 , nix
 , nlohmann_json
 , pkg-config
@@ -11,16 +12,17 @@
 }:
 stdenv.mkDerivation rec {
   pname = "nix-eval-jobs";
-  version = "2.22.0";
+  version = "2.22.1";
   src = fetchFromGitHub {
     owner = "nix-community";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-Foi9FUuwKBUVExR3uEJEGsNRCGkkoNDj0yEhASanGCM=";
+    hash = "sha256-zvi2YfvlOLtui2JFhPs2qybpnJR3/2luMfp8t/eMh54=";
   };
   buildInputs = [
     boost
     nix
+    curl
     nlohmann_json
   ];
   nativeBuildInputs = [