Merge pull request #308721 from RobWalt/codeberg-cli

codeberg-cli: 0.3.5 -> 0.4.0

pkgs/by-name/co/codeberg-cli/package.nix

@@ -1,30 +1,42 @@
-{ lib
+{
-, CoreServices
+  darwin,
-, Security
+  fetchFromGitea,
-, fetchFromGitea
+  installShellFiles,
-, installShellFiles
+  lib,
-, openssl
+  openssl,
-, pkg-config
+  pkg-config,
-, rustPlatform
+  rustPlatform,
-, stdenv
+  stdenv,
 }:
 rustPlatform.buildRustPackage rec {
   pname = "codeberg-cli";
-  version = "0.3.5";
+  version = "0.4.0";
 
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "RobWalt";
     repo = "codeberg-cli";
     rev = "v${version}";
-    hash = "sha256-KjH78yqfZoN24TBYyFZuxf7z9poRov0uFYQ8+eq9p/o=";
+    hash = "sha256-g5V3Noqh7Y9v/t/dt7n45/NblqNtpZCKELPc9DOkb8A=";
   };
 
-  cargoHash = "sha256-RE4Zwa5vUWPc42w5GaaYkS6fLIbges1fAsOUuwqR2ag=";
+  cargoHash = "sha256-zTg/3PcFWzBmKZA7lRIpM3P03d1qpNVBczqWFbnxpic=";
-  nativeBuildInputs = [ pkg-config installShellFiles ];
+  nativeBuildInputs = [
+    pkg-config
+    installShellFiles
+  ];
 
-  buildInputs = [ openssl ]
+  buildInputs =
-    ++ lib.optionals stdenv.isDarwin [ CoreServices Security ];
+    [ openssl ]
+    ++ lib.optionals stdenv.isDarwin (
+      let
+        d = darwin.apple_sdk.frameworks;
+      in
+      [
+        d.CoreServices
+        d.Security
+      ]
+    );
 
   postInstall = ''
     installShellCompletion --cmd berg \

pkgs/top-level/all-packages.nix

@@ -498,10 +498,6 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  codeberg-cli = callPackage ../applications/version-management/codeberg-cli {
-    inherit (darwin.apple_sdk.frameworks) Security CoreServices;
-  };
-
   conftest = callPackage ../development/tools/conftest { };
 
   coldsnap = callPackage ../tools/admin/coldsnap {