keyscope: 1.3.0 -> 1.4.0 (#371261)

NixOS · Jan 11, 2025 · ad2781b · ad2781b
2 parents 6df2f2e + af7ff9f
commit ad2781b
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 28 deletions.
diff --git a/pkgs/tools/security/keyscope/default.nix → pkgs/by-name/ke/keyscope/package.nix b/pkgs/tools/security/keyscope/default.nix → pkgs/by-name/ke/keyscope/package.nix
@@ -1,39 +1,28 @@
 {
   lib,
-  rustPlatform,
   fetchFromGitHub,
-  pkg-config,
+  gitUpdater,
   openssl,
-  stdenv,
-  DiskArbitration,
-  Foundation,
-  IOKit,
-  Security,
+  pkg-config,
+  rustPlatform,
 }:
 
 rustPlatform.buildRustPackage rec {
   pname = "keyscope";
-  version = "1.3.0";
+  version = "1.4.0";
 
   src = fetchFromGitHub {
     owner = "spectralops";
-    repo = pname;
-    rev = "v${version}";
-    sha256 = "sha256-SrBtgirg52q7gM3GZsJsV8ASACvb4sYv5HDbyItpjbk=";
+    repo = "keyscope";
+    tag = "v${version}";
+    hash = "sha256-2DhKiQixhTCQD/SYIQa+o1kzEsslu6wAReuWr0rTrH8=";
   };
 
-  cargoHash = "sha256-MFP3AqlfaclmZxRwaWFw6hsZwCQMRKJEyFEyUN+QLqo=";
+  cargoHash = "sha256-01Q5qCH0VIdO9dpcZxp8wbSjeON9N2C+0qa/2CvMHrc=";
 
   nativeBuildInputs = [ pkg-config ];
 
-  buildInputs =
-    [ openssl ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      DiskArbitration
-      Foundation
-      IOKit
-      Security
-    ];
+  buildInputs = [ openssl ];
 
   # build script tries to get information from git
   postPatch = ''
@@ -42,12 +31,17 @@ rustPlatform.buildRustPackage rec {
 
   VERGEN_GIT_SEMVER = "v${version}";
 
-  meta = with lib; {
+  # Test require network access
+  doCheck = false;
+
+  passthru.updateScript = gitUpdater { };
+
+  meta = {
     description = "Key and secret workflow (validation, invalidation, etc.) tool";
-    mainProgram = "keyscope";
     homepage = "https://github.com/spectralops/keyscope";
     changelog = "https://github.com/spectralops/keyscope/blob/v${version}/CHANGELOG.md";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ figsoda ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ figsoda ];
+    mainProgram = "keyscope";
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
@@ -3884,10 +3884,6 @@ with pkgs;
 
   keybase-gui = callPackage ../tools/security/keybase/gui.nix { };
 
-  keyscope = callPackage ../tools/security/keyscope {
-    inherit (darwin.apple_sdk.frameworks) DiskArbitration Foundation IOKit Security;
-  };
-
   keystore-explorer = callPackage ../applications/misc/keystore-explorer {
     jdk = jdk11;
   };