From 99b6e99ac284ec8e5987b113777a44a8fb0e4ada Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 13 Oct 2024 14:26:30 -0300 Subject: [PATCH 1/4] git-branchstack: use standard callPackage --- .../version-management/git-branchstack/default.nix | 14 +++++++------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/version-management/git-branchstack/default.nix b/pkgs/applications/version-management/git-branchstack/default.nix index b536642cbf55..0ff5568034c1 100644 --- a/pkgs/applications/version-management/git-branchstack/default.nix +++ b/pkgs/applications/version-management/git-branchstack/default.nix @@ -1,26 +1,26 @@ { lib , fetchPypi -, buildPythonApplication -, git-revise +, python3Packages }: -buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "git-branchstack"; version = "0.2.0"; src = fetchPypi { - inherit pname version; + pname = "git-branchstack"; + inherit version; hash = "sha256-gja93LOcVCQ6l+Cygvsm+3uomvxtvUl6t23GIb/tKyQ="; }; - buildInputs = [ + buildInputs = with python3Packages; [ git-revise ]; meta = with lib; { homepage = "https://github.com/krobelus/git-branchstack"; description = "Efficiently manage Git branches without leaving your local branch"; - license = licenses.mit; - maintainers = [ maintainers.AndersonTorres ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ AndersonTorres ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d325c2dfeadb..b91c5fcebc3e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2191,7 +2191,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; }; - git-branchstack = python3.pkgs.callPackage ../applications/version-management/git-branchstack { }; + git-branchstack = callPackage ../applications/version-management/git-branchstack { }; git-bug = callPackage ../applications/version-management/git-bug { }; From bbf870ddd68c282884890760f6d655adf2372737 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 13 Oct 2024 14:28:29 -0300 Subject: [PATCH 2/4] git-branchstack: migrate to by-name --- .../default.nix => by-name/gi/git-branchstack/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/version-management/git-branchstack/default.nix => by-name/gi/git-branchstack/package.nix} (100%) diff --git a/pkgs/applications/version-management/git-branchstack/default.nix b/pkgs/by-name/gi/git-branchstack/package.nix similarity index 100% rename from pkgs/applications/version-management/git-branchstack/default.nix rename to pkgs/by-name/gi/git-branchstack/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b91c5fcebc3e..3e2416748fc2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2191,8 +2191,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; }; - git-branchstack = callPackage ../applications/version-management/git-branchstack { }; - git-bug = callPackage ../applications/version-management/git-bug { }; git-bug-migration = callPackage ../applications/version-management/git-bug-migration { }; From 843db916ec7f142ebb742ae45b46f8a78ecce709 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 13 Oct 2024 14:31:35 -0300 Subject: [PATCH 3/4] git-branchstack: get rid of rec --- pkgs/by-name/gi/git-branchstack/package.nix | 44 +++++++++++---------- 1 file changed, 24 insertions(+), 20 deletions(-) diff --git a/pkgs/by-name/gi/git-branchstack/package.nix b/pkgs/by-name/gi/git-branchstack/package.nix index 0ff5568034c1..e70814e9e852 100644 --- a/pkgs/by-name/gi/git-branchstack/package.nix +++ b/pkgs/by-name/gi/git-branchstack/package.nix @@ -1,26 +1,30 @@ -{ lib -, fetchPypi -, python3Packages +{ + lib, + fetchPypi, + python3Packages, }: -python3Packages.buildPythonApplication rec { - pname = "git-branchstack"; - version = "0.2.0"; - - src = fetchPypi { +let + self = python3Packages.buildPythonApplication { pname = "git-branchstack"; - inherit version; - hash = "sha256-gja93LOcVCQ6l+Cygvsm+3uomvxtvUl6t23GIb/tKyQ="; - }; + version = "0.2.0"; - buildInputs = with python3Packages; [ - git-revise - ]; + src = fetchPypi { + pname = "git-branchstack"; + inherit (self) version; + hash = "sha256-gja93LOcVCQ6l+Cygvsm+3uomvxtvUl6t23GIb/tKyQ="; + }; - meta = with lib; { - homepage = "https://github.com/krobelus/git-branchstack"; - description = "Efficiently manage Git branches without leaving your local branch"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ AndersonTorres ]; + buildInputs = with python3Packages; [ + git-revise + ]; + + meta = { + homepage = "https://github.com/krobelus/git-branchstack"; + description = "Efficiently manage Git branches without leaving your local branch"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ AndersonTorres ]; + }; }; -} +in +self From 40e18f211ee665779322215850066f91dbf6308d Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Mon, 14 Oct 2024 20:33:52 -0300 Subject: [PATCH 4/4] git-branchstack: buildInputs -> dependencies According to new Python packaging guidelines. Co-authored-by: js6pak --- pkgs/by-name/gi/git-branchstack/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/gi/git-branchstack/package.nix b/pkgs/by-name/gi/git-branchstack/package.nix index e70814e9e852..e0cdfaa884df 100644 --- a/pkgs/by-name/gi/git-branchstack/package.nix +++ b/pkgs/by-name/gi/git-branchstack/package.nix @@ -15,7 +15,7 @@ let hash = "sha256-gja93LOcVCQ6l+Cygvsm+3uomvxtvUl6t23GIb/tKyQ="; }; - buildInputs = with python3Packages; [ + dependencies = with python3Packages; [ git-revise ];