From 4f694f3ab8798be2b6a8b4af14ed410b91a41ebb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christina=20S=C3=B8rensen?= Date: Tue, 3 Oct 2023 12:55:12 +0200 Subject: [PATCH 1/3] convco: move to pkgs/by-name MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Christina Sørensen --- .../convco/default.nix => by-name/co/convco/package.nix} | 4 ++-- pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) rename pkgs/{development/tools/convco/default.nix => by-name/co/convco/package.nix} (92%) diff --git a/pkgs/development/tools/convco/default.nix b/pkgs/by-name/co/convco/package.nix similarity index 92% rename from pkgs/development/tools/convco/default.nix rename to pkgs/by-name/co/convco/package.nix index 9b735d2af215..69f32e6ee2d0 100644 --- a/pkgs/development/tools/convco/default.nix +++ b/pkgs/by-name/co/convco/package.nix @@ -6,7 +6,7 @@ , libiconv , openssl , pkg-config -, Security +, darwin }: rustPlatform.buildRustPackage rec { @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ libiconv Security ]; + buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ]; meta = with lib; { description = "A Conventional commit cli"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9718a46468eb..19b00c845d0d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17382,10 +17382,6 @@ with pkgs; critcmp = callPackage ../development/tools/rust/critcmp { }; - convco = callPackage ../development/tools/convco { - inherit (darwin.apple_sdk.frameworks) Security; - }; - devspace = callPackage ../development/tools/misc/devspace { }; djlint = callPackage ../development/tools/djlint { }; From 7fa35ad84d6ee115bcc45ba3ff2636e023efaa44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christina=20S=C3=B8rensen?= Date: Tue, 3 Oct 2023 13:07:40 +0200 Subject: [PATCH 2/3] convco: 0.4.2 -> 0.4.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Christina Sørensen --- pkgs/by-name/co/convco/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/co/convco/package.nix b/pkgs/by-name/co/convco/package.nix index 69f32e6ee2d0..ac0ae8911492 100644 --- a/pkgs/by-name/co/convco/package.nix +++ b/pkgs/by-name/co/convco/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "convco"; - version = "0.4.2"; + version = "0.4.3"; src = fetchFromGitHub { owner = "convco"; repo = pname; rev = "v${version}"; - sha256 = "sha256-RNUMLc4lY18tsOr2vmpkYdQ2poVOQxsSVl5PEuhzQxw="; + hash = "sha256-qf04mtxBqZy9kpFsqz8lVtyUzNtCYE8cNiVJVQ+sCn0="; }; - cargoHash = "sha256-ChB4w9qnSzuOGTPYfpAJS2icy9wi1RjONCsfT+3vlRo="; + cargoHash = "sha256-A1z8ccdsaBC9gY4rD/0NnuQHm7x4eVlMPBvkMKGHK54="; nativeBuildInputs = [ cmake pkg-config ]; From 9dc7d7106af878dfd3fede7e1c6aeb291bb83532 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christina=20S=C3=B8rensen?= Date: Tue, 3 Oct 2023 13:08:42 +0200 Subject: [PATCH 3/3] convco: add cafkafk as maintainer MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Christina Sørensen --- pkgs/by-name/co/convco/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/co/convco/package.nix b/pkgs/by-name/co/convco/package.nix index ac0ae8911492..4112246c743c 100644 --- a/pkgs/by-name/co/convco/package.nix +++ b/pkgs/by-name/co/convco/package.nix @@ -30,6 +30,6 @@ rustPlatform.buildRustPackage rec { description = "A Conventional commit cli"; homepage = "https://github.com/convco/convco"; license = with licenses; [ mit ]; - maintainers = with maintainers; [ hoverbear ]; + maintainers = with maintainers; [ hoverbear cafkafk ]; }; }