treewide: refactor git python package definitions

+31 -40
+7 -10
pkgs/by-name/gi/git-archive-all/package.nix
··· 1 1 { 2 2 lib, 3 - buildPythonApplication, 3 + python3Packages, 4 4 fetchFromGitHub, 5 5 git, 6 - pytestCheckHook, 7 - pytest-cov-stub, 8 - pytest-mock, 9 6 }: 10 7 11 - buildPythonApplication rec { 8 + python3Packages.buildPythonApplication rec { 12 9 pname = "git-archive-all"; 13 10 version = "1.23.1"; 14 11 format = "setuptools"; ··· 16 13 src = fetchFromGitHub { 17 14 owner = "Kentzo"; 18 15 repo = "git-archive-all"; 19 - rev = version; 16 + tag = version; 20 17 hash = "sha256-fIPjggOx+CEorj1bazz8s81ZdppkTL0OlA5tRqCYZyc="; 21 18 }; 22 19 ··· 40 37 git 41 38 ]; 42 39 43 - checkInputs = [ 40 + checkInputs = with python3Packages; [ 44 41 pytestCheckHook 45 42 pytest-cov-stub 46 43 pytest-mock ··· 52 49 export HOME="$(mktemp -d)" 53 50 ''; 54 51 55 - meta = with lib; { 52 + meta = { 56 53 description = "Archive a repository with all its submodules"; 57 54 longDescription = '' 58 55 A python script wrapper for git-archive that archives a git superproject 59 56 and its submodules, if it has any. Takes into account .gitattributes 60 57 ''; 61 58 homepage = "https://github.com/Kentzo/git-archive-all"; 62 - license = licenses.mit; 63 - maintainers = with maintainers; [ fgaz ]; 59 + license = lib.licenses.mit; 60 + maintainers = with lib.maintainers; [ fgaz ]; 64 61 mainProgram = "git-archive-all"; 65 62 }; 66 63 }
+5 -5
pkgs/by-name/gi/git-imerge/package.nix
··· 1 1 { 2 2 lib, 3 - buildPythonApplication, 3 + python3Packages, 4 4 fetchPypi, 5 5 installShellFiles, 6 6 }: 7 7 8 - buildPythonApplication rec { 8 + python3Packages.buildPythonApplication rec { 9 9 pname = "git-imerge"; 10 10 version = "1.2.0"; 11 11 format = "setuptools"; ··· 21 21 installShellCompletion --bash completions/git-imerge 22 22 ''; 23 23 24 - meta = with lib; { 24 + meta = { 25 25 homepage = "https://github.com/mhagger/git-imerge"; 26 26 description = "Perform a merge between two branches incrementally"; 27 - license = licenses.gpl2Plus; 28 - maintainers = [ ]; 27 + license = lib.licenses.gpl2Plus; 28 + maintainers = with lib.maintainers; [ ]; 29 29 mainProgram = "git-imerge"; 30 30 }; 31 31 }
+3 -3
pkgs/by-name/gi/git-publish/package.nix
··· 6 6 fetchFromGitHub, 7 7 installShellFiles, 8 8 }: 9 - stdenv.mkDerivation rec { 9 + stdenv.mkDerivation (finalAttrs: { 10 10 pname = "git-publish"; 11 11 version = "1.8.2"; 12 12 13 13 src = fetchFromGitHub { 14 14 owner = "stefanha"; 15 15 repo = "git-publish"; 16 - rev = "v${version}"; 16 + tag = "v${finalAttrs.version}"; 17 17 hash = "sha256-jjpbr+ZqG4U8/z0PurnXR+IUKQkG3QB8YqhDkH8uu2Y="; 18 18 }; 19 19 ··· 40 40 homepage = "https://github.com/stefanha/git-publish"; 41 41 mainProgram = "git-publish"; 42 42 }; 43 - } 43 + })
+8 -11
pkgs/by-name/gi/git-repo-updater/package.nix
··· 1 1 { 2 2 lib, 3 - buildPythonApplication, 4 - hatchling, 5 - colorama, 3 + python3Packages, 6 4 fetchPypi, 7 - gitpython, 8 5 }: 9 6 10 - buildPythonApplication rec { 7 + python3Packages.buildPythonApplication rec { 11 8 pname = "gitup"; 12 9 version = "0.5.2"; 13 10 pyproject = true; 14 11 15 12 src = fetchPypi { 16 13 inherit pname version; 17 - sha256 = "sha256-51DWPJ9JOMrRdWGaiiL4qzo4VFFeT1rG5yyI6Ej+ZRw="; 14 + hash = "sha256-51DWPJ9JOMrRdWGaiiL4qzo4VFFeT1rG5yyI6Ej+ZRw="; 18 15 }; 19 16 20 - build-system = [ hatchling ]; 21 - propagatedBuildInputs = [ 17 + build-system = with python3Packages; [ hatchling ]; 18 + dependencies = with python3Packages; [ 22 19 colorama 23 20 gitpython 24 21 ]; ··· 26 23 # no tests 27 24 doCheck = false; 28 25 29 - meta = with lib; { 26 + meta = { 30 27 description = "Easily update multiple Git repositories at once"; 31 28 homepage = "https://github.com/earwig/git-repo-updater"; 32 - license = licenses.mit; 33 - maintainers = with maintainers; [ 29 + license = lib.licenses.mit; 30 + maintainers = with lib.maintainers; [ 34 31 bdesham 35 32 artturin 36 33 ];
+8 -11
pkgs/by-name/gi/git-review/package.nix
··· 1 1 { 2 2 lib, 3 - buildPythonApplication, 3 + python3Packages, 4 4 fetchgit, 5 - pbr, 6 - requests, 7 - setuptools, 8 5 gitUpdater, 9 6 }: 10 7 11 - buildPythonApplication rec { 8 + python3Packages.buildPythonApplication rec { 12 9 pname = "git-review"; 13 10 version = "2.5.0"; 14 11 format = "setuptools"; 15 12 16 - # Manually set version because prb wants to get it from the git 13 + # Manually set version because pbr wants to get it from the git 17 14 # upstream repository (and we are installing from tarball instead) 18 15 PBR_VERSION = version; 19 16 ··· 29 26 "man" 30 27 ]; 31 28 32 - nativeBuildInputs = [ 29 + nativeBuildInputs = with python3Packages; [ 33 30 pbr 34 31 ]; 35 32 36 - propagatedBuildInputs = [ 33 + dependencies = with python3Packages; [ 37 34 requests 38 35 setuptools # implicit dependency, used to get package version through pkg_resources 39 36 ]; ··· 47 44 48 45 passthru.updateScript = gitUpdater { }; 49 46 50 - meta = with lib; { 47 + meta = { 51 48 description = "Tool to submit code to Gerrit"; 52 49 homepage = "https://opendev.org/opendev/git-review"; 53 50 changelog = "https://docs.opendev.org/opendev/git-review/latest/releasenotes.html#relnotes-${version}"; 54 - license = licenses.asl20; 55 - maintainers = with maintainers; [ kira-bruneau ]; 51 + license = lib.licenses.asl20; 52 + maintainers = with lib.maintainers; [ kira-bruneau ]; 56 53 mainProgram = "git-review"; 57 54 }; 58 55 }