From 925404027a5d81b89e624110de7d07cde9173bcb Mon Sep 17 00:00:00 2001 From: bb010g Date: Tue, 25 Feb 2020 22:51:00 -0800 Subject: [PATCH 1/4] hub-unstable: remove This has been here for 2 years; we can remove it. Co-Authored-By: worldofpeace --- pkgs/applications/version-management/git-and-tools/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 0f6dea75c6f..33626a12649 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -167,8 +167,6 @@ let inherit (darwin) Security; }; - hubUnstable = throw "use gitAndTools.hub instead"; - lab = callPackage ./lab { }; lefthook = callPackage ./lefthook { }; From a7cb757af42a53af19c393a603600d77d447d234 Mon Sep 17 00:00:00 2001 From: bb010g Date: Fri, 18 Oct 2019 19:30:06 -0700 Subject: [PATCH 2/4] git-and-tools: canonicalize hyphenated names Old intercaps names are aliased. darcs-to-git: rename from darcsToGit git-fast-export: rename from gitFastExport git-remote-gcrypt: rename from gitRemoteGcrypt hub-unstable: rename from hubUnstable top-git: rename from topGit --- .../version-management/git-and-tools/default.nix | 12 ++++++++---- pkgs/development/tools/misc/hydra/default.nix | 4 ++-- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 33626a12649..7d5e08b9c1c 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -24,7 +24,7 @@ let bump2version = pkgs.python37Packages.callPackage ./bump2version { }; - darcsToGit = callPackage ./darcs-to-git { }; + darcs-to-git = callPackage ./darcs-to-git { }; delta = callPackage ./delta { }; @@ -153,9 +153,9 @@ let git2cl = callPackage ./git2cl { }; - gitFastExport = callPackage ./fast-export { }; + git-fast-export = callPackage ./fast-export { }; - gitRemoteGcrypt = callPackage ./git-remote-gcrypt { }; + git-remote-gcrypt = callPackage ./git-remote-gcrypt { }; gitflow = callPackage ./gitflow { }; @@ -192,7 +192,7 @@ let tig = callPackage ./tig { }; - topGit = callPackage ./topgit { }; + top-git = callPackage ./topgit { }; transcrypt = callPackage ./transcrypt { }; @@ -200,8 +200,12 @@ let } // lib.optionalAttrs (config.allowAliases or true) (with self; { # aliases + darcsToGit = darcs-to-git; gitAnnex = git-annex; + gitFastExport = git-fast-export; + gitRemoteGcrypt = git-remote-gcrypt; svn_all_fast_export = svn-all-fast-export; + topGit = top-git; }); in self diff --git a/pkgs/development/tools/misc/hydra/default.nix b/pkgs/development/tools/misc/hydra/default.nix index e66341b5f8c..72aecf20ca3 100644 --- a/pkgs/development/tools/misc/hydra/default.nix +++ b/pkgs/development/tools/misc/hydra/default.nix @@ -85,7 +85,7 @@ in stdenv.mkDerivation rec { buildInputs = [ makeWrapper autoconf automake libtool unzip nukeReferences sqlite libpqxx - gitAndTools.topGit mercurial darcs subversion bazaar openssl bzip2 libxslt + gitAndTools.top-git mercurial darcs subversion bazaar openssl bzip2 libxslt guile # optional, for Guile + Guix support perlDeps perl nix postgresql # for running the tests @@ -95,7 +95,7 @@ in stdenv.mkDerivation rec { hydraPath = lib.makeBinPath ( [ sqlite subversion openssh nix coreutils findutils pixz - gzip bzip2 lzma gnutar unzip git gitAndTools.topGit mercurial darcs gnused bazaar + gzip bzip2 lzma gnutar unzip git gitAndTools.top-git mercurial darcs gnused bazaar ] ++ lib.optionals stdenv.isLinux [ rpm dpkg cdrkit ] ); nativeBuildInputs = [ autoreconfHook pkgconfig ]; From 846097b7af5ee4262ed3e07872e7787f48a4fd75 Mon Sep 17 00:00:00 2001 From: bb010g Date: Fri, 18 Oct 2019 19:38:41 -0700 Subject: [PATCH 3/4] git-and-tools: strongly alphabetize --- .../git-and-tools/default.nix | 61 +++++++++---------- 1 file changed, 30 insertions(+), 31 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 7d5e08b9c1c..50301342e75 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -40,29 +40,6 @@ let inherit (darwin.apple_sdk.frameworks) Security; }; - git-appraise = callPackage ./git-appraise {}; - - git-fame = callPackage ./git-fame {}; - - git-filter-repo = callPackage ./git-filter-repo { - pythonPackages = python3Packages; - }; - - gita = python3Packages.callPackage ./gita {}; - - # The full-featured Git. - gitFull = gitBase.override { - svnSupport = true; - guiSupport = true; - sendEmailSupport = true; - withLibsecret = !stdenv.isDarwin; - }; - - # Git with SVN support, but without GUI. - gitSVN = lowPrio (appendToName "with-svn" (gitBase.override { - svnSupport = true; - })); - git-annex = pkgs.haskellPackages.git-annex; git-annex-metadata-gui = libsForQt5.callPackage ./git-annex-metadata-gui { @@ -84,6 +61,8 @@ let git-annex-utils = callPackage ./git-annex-utils { }; + git-appraise = callPackage ./git-appraise {}; + git-bug = callPackage ./git-bug { }; # support for bugzilla @@ -101,6 +80,14 @@ let git-extras = callPackage ./git-extras { }; + git-fame = callPackage ./git-fame {}; + + git-fast-export = callPackage ./fast-export { }; + + git-filter-repo = callPackage ./git-filter-repo { + pythonPackages = python3Packages; + }; + git-gone = callPackage ./git-gone { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -127,6 +114,8 @@ let utillinux = if stdenv.isLinux then utillinuxMinimal else utillinux; }; + git-remote-gcrypt = callPackage ./git-remote-gcrypt { }; + git-remote-hg = callPackage ./git-remote-hg { }; git-reparent = callPackage ./git-reparent { }; @@ -153,9 +142,20 @@ let git2cl = callPackage ./git2cl { }; - git-fast-export = callPackage ./fast-export { }; + # The full-featured Git. + gitFull = gitBase.override { + svnSupport = true; + guiSupport = true; + sendEmailSupport = true; + withLibsecret = !stdenv.isDarwin; + }; - git-remote-gcrypt = callPackage ./git-remote-gcrypt { }; + # Git with SVN support, but without GUI. + gitSVN = lowPrio (appendToName "with-svn" (gitBase.override { + svnSupport = true; + })); + + gita = python3Packages.callPackage ./gita {}; gitflow = callPackage ./gitflow { }; @@ -171,23 +171,22 @@ let lefthook = callPackage ./lefthook { }; - pre-commit = pkgs.python3Packages.toPythonApplication pkgs.python3Packages.pre-commit; - pass-git-helper = python3Packages.callPackage ./pass-git-helper { }; + pre-commit = pkgs.python3Packages.toPythonApplication pkgs.python3Packages.pre-commit; + qgit = qt5.callPackage ./qgit { }; - stgit = callPackage ./stgit { - }; + stgit = callPackage ./stgit { }; subgit = callPackage ./subgit { }; + svn-all-fast-export = libsForQt5.callPackage ./svn-all-fast-export { }; + svn2git = callPackage ./svn2git { git = gitSVN; }; - svn-all-fast-export = libsForQt5.callPackage ./svn-all-fast-export { }; - thicket = callPackage ./thicket { }; tig = callPackage ./tig { }; From ddb272bf1d738ec0ae812ecc72e8d65eb06d2173 Mon Sep 17 00:00:00 2001 From: bb010g Date: Fri, 18 Oct 2019 19:39:16 -0700 Subject: [PATCH 4/4] git-my: init at 1.1.2 --- .../git-and-tools/default.nix | 2 ++ .../git-and-tools/git-my/default.nix | 29 +++++++++++++++++++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/applications/version-management/git-and-tools/git-my/default.nix diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 50301342e75..a7008bf44b3 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -104,6 +104,8 @@ let git-machete = python3Packages.callPackage ./git-machete { }; + git-my = callPackage ./git-my { }; + git-octopus = callPackage ./git-octopus { }; git-open = callPackage ./git-open { }; diff --git a/pkgs/applications/version-management/git-and-tools/git-my/default.nix b/pkgs/applications/version-management/git-and-tools/git-my/default.nix new file mode 100644 index 00000000000..8a5ec250932 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git-my/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "git-my"; + version = "1.1.2"; + + src = fetchFromGitHub { + owner = "davidosomething"; + repo = "git-my"; + rev = version; + sha256 = "0jji5zw25jygj7g4f6f3k0p0s9g37r8iad8pa0s67cxbq2v4sc0v"; + }; + + dontBuild = true; + + installPhase = '' + install -Dm755 -t "$out"/bin ./git-my + ''; + + meta = with stdenv.lib; { + description = + "List remote branches if they're merged and/or available locally"; + homepage = https://github.com/davidosomething/git-my; + license = licenses.free; + maintainers = with maintainers; [ bb010g ]; + platforms = platforms.all; + }; +} +