diff options
Diffstat (limited to 'nixpkgs/pkgs/applications/version-management/git-and-tools')
75 files changed, 321 insertions, 543 deletions
diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix index 99c6323217ab..1ffc06536750 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jre, makeWrapper }: +{ lib, stdenv, fetchurl, jre, makeWrapper }: let version = "1.13.0"; @@ -26,7 +26,7 @@ in makeWrapper "${jre}/bin/java" $out/bin/bfg --add-flags "-cp $out/share/java/$jarName com.madgag.git.bfg.cli.Main" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://rtyley.github.io/bfg-repo-cleaner/"; # Descriptions taken with minor modification from the homepage of bfg-repo-cleaner description = "Removes large or troublesome blobs in a git repository like git-filter-branch does, but faster"; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/default.nix index 68edb8503bfc..695250a5cc47 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/default.nix @@ -9,7 +9,7 @@ bundlerEnv rec { pname = "atlassian-stash"; - passthru.updateScript = bundlerUpdateScript "gitAndTools.bitbucket-server-cli"; + passthru.updateScript = bundlerUpdateScript "bitbucket-server-cli"; meta = with lib; { description = "A command line interface to interact with BitBucket Server (formerly Atlassian Stash)"; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/gemset.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/gemset.nix index a7c1406665e7..844291b09054 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/gemset.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/gemset.nix @@ -63,4 +63,4 @@ }; version = "2.0.5"; }; -} \ No newline at end of file +} diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/bump2version/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/bump2version/default.nix index eb44f6d412b5..393edc57dcc8 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/bump2version/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/bump2version/default.nix @@ -18,7 +18,7 @@ buildPythonApplication rec { pytest tests/ -k 'not usage_string_fork' ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Version-bump your software with a single command"; longDescription = '' A small command line tool to simplify releasing software by updating diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/cgit/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/cgit/default.nix index 79c118a200c1..f48fe4b1ec4c 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/cgit/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/cgit/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, openssl, zlib, asciidoc, libxml2, libxslt -, docbook_xsl, pkgconfig, luajit +{ lib, stdenv, fetchurl, openssl, zlib, asciidoc, libxml2, libxslt +, docbook_xsl, pkg-config, luajit , coreutils, gnused, groff, docutils , gzip, bzip2, lzip, xz, zstd , python, wrapPython, pygments, markdown @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { sha256 = "09lzwa183nblr6l8ib35g2xrjf9wm9yhk3szfvyzkwivdv69c9r2"; }; - nativeBuildInputs = [ pkgconfig ] ++ [ python wrapPython ]; + nativeBuildInputs = [ pkg-config ] ++ [ python wrapPython ]; buildInputs = [ openssl zlib asciidoc libxml2 libxslt docbook_xsl luajit ]; @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { wrapPythonProgramsIn "$out/lib/cgit/filters" "$out $pythonPath" for script in $out/lib/cgit/filters/*.sh $out/lib/cgit/filters/html-converters/txt2html; do - wrapProgram $script --prefix PATH : '${stdenv.lib.makeBinPath [ coreutils gnused ]}' + wrapProgram $script --prefix PATH : '${lib.makeBinPath [ coreutils gnused ]}' done ''; @@ -75,8 +75,8 @@ stdenv.mkDerivation rec { homepage = "https://git.zx2c4.com/cgit/about/"; repositories.git = "git://git.zx2c4.com/cgit"; description = "Web frontend for git repositories"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ bjornfor ]; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ bjornfor ]; }; } diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/darcs-to-git/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/darcs-to-git/default.nix index 22d289d549af..f4b7d38bebcf 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/darcs-to-git/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/darcs-to-git/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, ruby, gnugrep, diffutils, git, darcs }: +{ lib, stdenv, fetchgit, ruby, gnugrep, diffutils, git, darcs }: stdenv.mkDerivation { pname = "darcs-to-git"; @@ -74,7 +74,7 @@ stdenv.mkDerivation { meta = { description = "Converts a Darcs repository into a Git repository"; homepage = "http://www.sanityinc.com/articles/converting-darcs-repositories-to-git"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.mit; + platforms = lib.platforms.unix; }; } diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/default.nix deleted file mode 100644 index 46b27e95c798..000000000000 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/default.nix +++ /dev/null @@ -1,268 +0,0 @@ -/* All git-relates tools live here, in a separate attribute set so that users - * can get a fast overview over what's available. - */ -args @ {config, lib, pkgs}: with args; with pkgs; -let - gitBase = callPackage ./git { - svnSupport = false; # for git-svn support - guiSupport = false; # requires tcl/tk - sendEmailSupport = false; # requires plenty of perl libraries - perlLibs = [perlPackages.LWP perlPackages.URI perlPackages.TermReadKey]; - smtpPerlLibs = [ - perlPackages.libnet perlPackages.NetSMTPSSL - perlPackages.IOSocketSSL perlPackages.NetSSLeay - perlPackages.AuthenSASL perlPackages.DigestHMAC - ]; - }; - - self = rec { - # Try to keep this generally alphabetized - - bfg-repo-cleaner = callPackage ./bfg-repo-cleaner { }; - - bitbucket-server-cli = callPackage ./bitbucket-server-cli { }; - - bump2version = pkgs.python37Packages.callPackage ./bump2version { }; - - darcs-to-git = callPackage ./darcs-to-git { }; - - delta = callPackage ./delta { - inherit (darwin.apple_sdk.frameworks) Security; - }; - - diff-so-fancy = callPackage ./diff-so-fancy { }; - - gh = callPackage ./gh { }; - - ghorg = callPackage ./ghorg { }; - - ghq = callPackage ./ghq { }; - - ghr = callPackage ./ghr { }; - - git = appendToName "minimal" gitBase; - - git-absorb = callPackage ./git-absorb { - inherit (darwin.apple_sdk.frameworks) Security; - }; - - git-annex = pkgs.haskellPackages.git-annex; - - git-annex-metadata-gui = libsForQt5.callPackage ./git-annex-metadata-gui { - inherit (python3Packages) buildPythonApplication pyqt5 git-annex-adapter; - }; - - git-annex-remote-b2 = callPackage ./git-annex-remote-b2 { }; - - git-annex-remote-dbx = callPackage ./git-annex-remote-dbx { - inherit (python3Packages) - buildPythonApplication - fetchPypi - dropbox - annexremote - humanfriendly; - }; - - git-annex-remote-rclone = callPackage ./git-annex-remote-rclone { }; - - git-annex-utils = callPackage ./git-annex-utils { }; - - git-brunch = pkgs.haskellPackages.git-brunch; - - git-appraise = callPackage ./git-appraise {}; - - git-bug = callPackage ./git-bug { }; - - # support for bugzilla - git-bz = callPackage ./git-bz { }; - - git-chglog = callPackage ./git-chglog { }; - - git-cinnabar = callPackage ./git-cinnabar { }; - - git-codeowners = callPackage ./git-codeowners { }; - - git-codereview = callPackage ./git-codereview { }; - - git-cola = callPackage ./git-cola { }; - - git-crypt = callPackage ./git-crypt { }; - - git-delete-merged-branches = callPackage ./git-delete-merged-branches { }; - - git-dit = callPackage ./git-dit { - inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; - }; - - git-doc = lib.addMetaAttrs { - description = "Additional documentation for Git"; - longDescription = '' - This package contains additional documentation (HTML and text files) that - is referenced in the man pages of Git. - ''; - } gitFull.doc; - - git-extras = callPackage ./git-extras { }; - - git-fame = callPackage ./git-fame {}; - - git-fast-export = callPackage ./fast-export { mercurial = mercurial_4; }; - - git-filter-repo = callPackage ./git-filter-repo { - pythonPackages = python3Packages; - }; - - git-gone = callPackage ./git-gone { - inherit (darwin.apple_sdk.frameworks) Security; - }; - - git-hub = callPackage ./git-hub { }; - - git-ignore = callPackage ./git-ignore { }; - - git-imerge = python3Packages.callPackage ./git-imerge { }; - - git-interactive-rebase-tool = callPackage ./git-interactive-rebase-tool { - inherit (darwin.apple_sdk.frameworks) Security; - }; - - git-machete = python3Packages.callPackage ./git-machete { }; - - git-my = callPackage ./git-my { }; - - git-octopus = callPackage ./git-octopus { }; - - git-open = callPackage ./git-open { }; - - git-radar = callPackage ./git-radar { }; - - git-recent = callPackage ./git-recent { - util-linux = if stdenv.isLinux then util-linuxMinimal else util-linux; - }; - - git-remote-codecommit = python3Packages.callPackage ./git-remote-codecommit { }; - - git-remote-gcrypt = callPackage ./git-remote-gcrypt { }; - - git-remote-hg = callPackage ./git-remote-hg { }; - - git-reparent = callPackage ./git-reparent { }; - - git-secret = callPackage ./git-secret { }; - - git-secrets = callPackage ./git-secrets { }; - - git-standup = callPackage ./git-standup { }; - - git-stree = callPackage ./git-stree { }; - - git-subrepo = callPackage ./git-subrepo { }; - - git-subset = callPackage ./git-subset { - inherit (darwin.apple_sdk.frameworks) Security; - }; - - git-subtrac = callPackage ./git-subtrac { }; - - git-sync = callPackage ./git-sync { }; - - git-test = callPackage ./git-test { }; - - git-trim = callPackage ./git-trim { - inherit (darwin.apple_sdk.frameworks) Security; - }; - - git-workspace = callPackage ./git-workspace { - inherit (darwin.apple_sdk.frameworks) Security; - }; - - git2cl = callPackage ./git2cl { }; - - # 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; - })); - - gita = python3Packages.callPackage ./gita {}; - - gitbatch = callPackage ./gitbatch { }; - - gitflow = callPackage ./gitflow { }; - - gitin = callPackage ./gitin { }; - - gitstatus = callPackage ./gitstatus { }; - - gitui = callPackage ./gitui { - inherit (darwin.apple_sdk.frameworks) Security AppKit; - inherit (pkgs) openssl perl; - }; - - glab = callPackage ./glab { }; - - grv = callPackage ./grv { }; - - hub = callPackage ./hub { }; - - lab = callPackage ./lab { }; - - lefthook = callPackage ./lefthook { - # Please use empty attrset once upstream bugs have been fixed - # https://github.com/Arkweid/lefthook/issues/151 - buildGoModule = buildGo114Module; - }; - - legit = callPackage ./legit { }; - - pass-git-helper = python3Packages.callPackage ./pass-git-helper { }; - - pre-commit = pkgs.python3Packages.toPythonApplication pkgs.python3Packages.pre-commit; - - qgit = qt5.callPackage ./qgit { }; - - rs-git-fsmonitor = callPackage ./rs-git-fsmonitor { }; - - scmpuff = callPackage ./scmpuff { }; - - stgit = callPackage ./stgit { }; - - subgit = callPackage ./subgit { }; - - svn-all-fast-export = libsForQt5.callPackage ./svn-all-fast-export { }; - - svn2git = callPackage ./svn2git { - git = gitSVN; - }; - - thicket = callPackage ./thicket { }; - - tig = callPackage ./tig { }; - - top-git = callPackage ./topgit { }; - - transcrypt = callPackage ./transcrypt { }; - - git-vanity-hash = callPackage ./git-vanity-hash { }; - - ydiff = pkgs.python3.pkgs.toPythonApplication pkgs.python3.pkgs.ydiff; - -} // lib.optionalAttrs (config.allowAliases or true) (with self; { - # aliases - darcsToGit = darcs-to-git; - gitAnnex = git-annex; - gitBrunch = git-brunch; - gitFastExport = git-fast-export; - gitRemoteGcrypt = git-remote-gcrypt; - svn_all_fast_export = svn-all-fast-export; - topGit = top-git; -}); -in - self diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/delta/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/delta/default.nix index e3862a81b427..465de2d1d2be 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/delta/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/delta/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "delta"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "dandavison"; repo = pname; rev = version; - sha256 = "134dhkk6ckhk6pb2hmfy1q2hkb8d1fkhbshw9qzbnp0qwbv3wgqj"; + sha256 = "17cmwkha25hwsvnjcp388zd9kwacfq7adjp0sjw59y0vyr1maf22"; }; - cargoSha256 = "0633g8jyhmhs33cdspa46gvmnzl2jfwxylmjfhsvbxznzygb4dw3"; + cargoSha256 = "1bji818cmkl0286a4qcnfiwibnqd5q5fvzmzgk5cabrdwaag2ia5"; nativeBuildInputs = [ installShellFiles ]; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix index ffdb788745a7..42ebe89cd4aa 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix @@ -1,4 +1,4 @@ -{stdenv, git, perl, ncurses, coreutils, fetchFromGitHub, makeWrapper, ...}: +{lib, stdenv, git, perl, ncurses, coreutils, fetchFromGitHub, makeWrapper, ...}: stdenv.mkDerivation rec { pname = "diff-so-fancy"; @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/so-fancy/diff-so-fancy"; description = "Good-looking diffs filter for git"; license = licenses.mit; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/fast-export/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/fast-export/default.nix index 80f048d05752..5aea15769c0b 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/fast-export/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/fast-export/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, git, mercurial, makeWrapper}: +{lib, stdenv, fetchFromGitHub, git, mercurial, makeWrapper}: stdenv.mkDerivation rec { pname = "fast-export"; @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { popd ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Import mercurial into git"; homepage = "https://repo.or.cz/w/fast-export.git"; license = licenses.gpl2; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/gh/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/gh/default.nix index 7ba8a652d806..7c61c3329b20 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/gh/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/gh/default.nix @@ -1,17 +1,22 @@ -{ lib, fetchFromGitHub, buildGoModule, installShellFiles }: +{ lib +, fetchFromGitHub +, buildGoModule +, installShellFiles +, git +}: buildGoModule rec { pname = "gh"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - sha256 = "08gxx9dwk24r1c5jkc9mqzcicxqmrdw0bi94nr517hk5cqsav2sl"; + sha256 = "1f23b8bn867b4zihz8m91xmkclcw1jnqkwi06klhm5576akahigq"; }; - vendorSha256 = "1ih7z883pffb6hnx51h8823d95b52d6dy1gk6ln7j25fqhcfvsy8"; + vendorSha256 = "00adc0xjrkjrjh0gxk55vhpgxb5x0j5ialzrdvhlrvhpnb44qrcq"; nativeBuildInputs = [ installShellFiles ]; @@ -30,8 +35,10 @@ buildGoModule rec { done ''; - # fails with `unable to find git executable in PATH` - doCheck = false; + checkInputs = [ git ]; + checkPhase = '' + make test + ''; meta = with lib; { description = "GitHub CLI tool"; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/ghorg/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/ghorg/default.nix index 30049e845877..b038e98e2dba 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/ghorg/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/ghorg/default.nix @@ -1,14 +1,14 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "ghorg"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "gabrie30"; repo = "ghorg"; rev = version; - sha256 = "0diwndkckv6fga45j9zngizycn5m71r67cziv0zrx6c66ssbj49w"; + sha256 = "sha256-OoNHKDxYKTmfm1rrQxG7PnH7DINa2M/NKc/5iKaUybg="; }; doCheck = false; @@ -18,7 +18,7 @@ buildGoModule rec { buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Quickly clone an entire org/users repositories into one directory"; longDescription = '' ghorg allows you to quickly clone all of an orgs, or users repos into a diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/ghq/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/ghq/default.nix index 96f72f2d69c4..c6fbf3b9569c 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/ghq/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/ghq/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "ghq"; @@ -28,7 +28,7 @@ buildGoModule rec { meta = { description = "Remote repository management made easy"; homepage = "https://github.com/x-motemen/ghq"; - maintainers = with stdenv.lib.maintainers; [ sigma ]; - license = stdenv.lib.licenses.mit; + maintainers = with lib.maintainers; [ sigma ]; + license = lib.licenses.mit; }; } diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix index d8e34f570058..2d6d7401e28f 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform, installShellFiles, libiconv, Security }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, installShellFiles, libiconv, Security }: rustPlatform.buildRustPackage rec { pname = "git-absorb"; @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ]; + buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; cargoSha256 = "0h0vlz4qd8i9bf1mgjr618zbdwfp6bmy7ql9a1xzjmfdpkl3cgk9"; @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/tummychow/git-absorb"; description = "git commit --fixup, but automatic"; license = [ licenses.bsd3 ]; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-annex-metadata-gui/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-annex-metadata-gui/default.nix index cb0103df227a..1908b7539243 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-annex-metadata-gui/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-annex-metadata-gui/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonApplication, fetchFromGitHub, pyqt5, qt5, git-annex-adapter }: +{ lib, stdenv, buildPythonApplication, fetchFromGitHub, pyqt5, qt5, git-annex-adapter }: buildPythonApplication rec { pname = "git-annex-metadata-gui"; @@ -23,7 +23,7 @@ buildPythonApplication rec { propagatedBuildInputs = [ pyqt5 git-annex-adapter ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/alpernebbi/git-annex-metadata-gui"; description = "Graphical interface for git-annex metadata commands"; maintainers = with maintainers; [ dotlambda ]; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix index 55a9dd18f720..95e583585f19 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix @@ -1,8 +1,8 @@ -{ stdenv, buildGoPackage, fetchgit }: +{ lib, stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { pname = "git-annex-remote-b2"; - version = "20151212-${stdenv.lib.strings.substring 0 7 rev}"; + version = "20151212-${lib.strings.substring 0 7 rev}"; rev = "4db46b9fc9ef7b3f4851c2a6b061cb8f90f553ba"; goPackagePath = "github.com/encryptio/git-annex-remote-b2"; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-annex-remote-rclone/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-annex-remote-rclone/default.nix index 260e8024a8cc..843a8d34881a 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-annex-remote-rclone/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-annex-remote-rclone/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rclone, makeWrapper }: +{ lib, stdenv, fetchFromGitHub, rclone, makeWrapper }: stdenv.mkDerivation rec { pname = "git-annex-remote-rclone"; @@ -20,10 +20,10 @@ stdenv.mkDerivation rec { mkdir -p $out/bin cp git-annex-remote-rclone $out/bin wrapProgram "$out/bin/git-annex-remote-rclone" \ - --prefix PATH ":" "${stdenv.lib.makeBinPath [ rclone ]}" + --prefix PATH ":" "${lib.makeBinPath [ rclone ]}" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/DanielDent/git-annex-remote-rclone"; description = "Use rclone supported cloud storage providers with git-annex"; license = licenses.gpl3; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-annex-utils/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-annex-utils/default.nix index bcfc33e55e4c..7ad040a7c17e 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-annex-utils/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-annex-utils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, autoconf, automake, libtool, gmp }: +{ lib, stdenv, fetchgit, autoconf, automake, libtool, gmp }: stdenv.mkDerivation rec { pname = "git-annex-utils"; @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { Currently there is only one utility gadu, a du like utility for annexed files. ''; homepage = "http://git-annex.mysteryvortex.com/git-annex-utils.html"; - license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ woffs ]; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ woffs ]; + platforms = lib.platforms.all; }; } diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-appraise/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-appraise/default.nix index 4895a2e399bf..ba4cd42d29dd 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-appraise/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-appraise/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "git-appraise-unstable"; @@ -17,7 +17,7 @@ buildGoPackage rec { meta = { description = "Distributed code review system for Git repos"; homepage = "https://github.com/google/git-appraise"; - license = stdenv.lib.licenses.asl20; - maintainers = [ stdenv.lib.maintainers.vdemeester ]; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.vdemeester ]; }; } diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix index cd35c98a9696..ec832866c717 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix @@ -1,30 +1,34 @@ -{ fetchFromGitHub, python2Packages, stdenv, git, graphviz }: +{ fetchFromGitHub, python3Packages, lib, stdenv, git, graphviz }: -python2Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "git-big-picture"; - version = "0.10.1"; + version = "1.0.0"; src = fetchFromGitHub { - owner = "esc"; + owner = "git-big-picture"; repo = pname; rev = "v${version}"; - sha256 = "0b0zdq7d7k7f6p3wwc799347fraphbr20rxd1ysnc4xi1cj4wpmi"; + sha256 = "14yf71iwgk78nw8w0bpijsnnl4vg3bvxsw3vvypxmbrc1nh0bdha"; }; buildInputs = [ git graphviz ]; - checkInputs = [ git ]; + # NOTE: Tests are disabled due to unpackaged test dependency "Scruf". + # When bumping to 1.1.0, please re-enable and use: + #checkInputs = [ cram git pytest ]; + #checkPhase = "pytest test.py"; + doCheck = false; postFixup = '' wrapProgram $out/bin/git-big-picture \ - --prefix PATH ":" ${ stdenv.lib.makeBinPath buildInputs } + --prefix PATH ":" ${ lib.makeBinPath buildInputs } ''; meta = { description = "Tool for visualization of Git repositories"; - homepage = "https://github.com/esc/git-big-picture"; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.nthorne ]; + homepage = "https://github.com/git-big-picture/git-big-picture"; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.nthorne ]; }; } diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-bug/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-bug/default.nix index 7c345639e9f8..9ca5c707b5ce 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-bug/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-bug/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "git-bug"; @@ -29,7 +29,7 @@ buildGoModule rec { install -D -m 0644 -t "$out/share/man/man1" doc/man/* ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Distributed bug tracker embedded in Git"; homepage = "https://github.com/MichaelMure/git-bug"; license = licenses.gpl3; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-bz/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-bz/default.nix index 7f199894924e..20e6a993cab2 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-bz/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-bz/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit +{ lib, stdenv, fetchgit , asciidoc, docbook_xml_dtd_45, docbook_xsl, libxslt, makeWrapper, xmlto , pythonPackages }: @@ -31,7 +31,7 @@ stdenv.mkDerivation { --prefix PYTHONPATH : "$(toPythonPath "${pythonPackages.pysqlite}")" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Bugzilla integration for git"; longDescription = '' git-bz is a tool for integrating the Git command line with the diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-cola/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-cola/default.nix index fa77b5307a37..e7e0e009d112 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-cola/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-cola/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python3Packages, gettext, git, qt5 }: +{ lib, stdenv, fetchFromGitHub, python3Packages, gettext, git, qt5 }: let inherit (python3Packages) buildPythonApplication pyqt5 sip pyinotify; @@ -26,7 +26,7 @@ in buildPythonApplication rec { ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/git-cola/git-cola"; description = "A sleek and powerful Git GUI"; license = licenses.gpl2; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix index 487f9b9625f4..08875dabd0fe 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, git, gnupg, makeWrapper, openssl, stdenv +{ fetchFromGitHub, git, gnupg, makeWrapper, openssl, lib, stdenv , libxslt, docbook_xsl }: @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/git-crypt --prefix PATH : $out/bin:${git}/bin:${gnupg}/bin ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.agwa.name/projects/git-crypt"; description = "Transparent file encryption in git"; longDescription = '' diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-dit/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-dit/default.nix index 9ec4e2530424..fb3f555cb139 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-dit/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-dit/default.nix @@ -1,11 +1,11 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , openssl_1_0_2 , zlib , libssh , cmake , perl -, pkgconfig +, pkg-config , rustPlatform , curl , libiconv @@ -30,7 +30,7 @@ buildRustPackage rec { nativeBuildInputs = [ cmake - pkgconfig + pkg-config perl ]; @@ -38,14 +38,14 @@ buildRustPackage rec { openssl_1_0_2 libssh zlib - ] ++ stdenv.lib.optionals (stdenv.isDarwin) [ + ] ++ lib.optionals (stdenv.isDarwin) [ curl libiconv CoreFoundation Security ]; - meta = with stdenv.lib; { + meta = with lib; { inherit (src.meta) homepage; description = "Decentralized Issue Tracking for git"; # This has not had a release in years and its cargo vendored dependencies diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-extras/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-extras/default.nix index d322a141cd94..3f6ea7972bac 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-extras/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-extras/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, unixtools, which }: +{ lib, stdenv, fetchzip, unixtools, which }: stdenv.mkDerivation rec { pname = "git-extras"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { install -D etc/git-extras-completion.zsh $out/share/zsh/site-functions/_git_extras ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/tj/git-extras"; description = "GIT utilities -- repo summary, repl, changelog population, author commit percentages and more"; license = licenses.mit; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-fame/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-fame/default.nix index 782579c70446..216a1035c72b 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-fame/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-fame/default.nix @@ -1,4 +1,4 @@ -{ stdenv, bundlerEnv, ruby, bundlerUpdateScript }: +{ lib, stdenv, bundlerEnv, ruby, bundlerUpdateScript }: bundlerEnv { inherit ruby; @@ -7,9 +7,9 @@ bundlerEnv { gemdir = ./.; - passthru.updateScript = bundlerUpdateScript "gitAndTools.git-fame"; + passthru.updateScript = bundlerUpdateScript "git-fame"; - meta = with stdenv.lib; { + meta = with lib; { description = '' A command-line tool that helps you summarize and pretty-print collaborators based on contributions ''; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-fame/gemset.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-fame/gemset.nix index 49b4af4ef6d3..07dd36ac68a0 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-fame/gemset.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-fame/gemset.nix @@ -57,4 +57,4 @@ }; version = "2.1.2"; }; -} \ No newline at end of file +} diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-filter-repo/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-filter-repo/default.nix index c642f062c7b6..864ef51a5881 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-filter-repo/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-filter-repo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pythonPackages }: +{ lib, stdenv, fetchurl, pythonPackages }: stdenv.mkDerivation rec { pname = "git-filter-repo"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { install -Dm644 -t $out/share/man/man1 Documentation/man1/git-filter-repo.1 ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/newren/git-filter-repo"; description = "Quickly rewrite git repository history (filter-branch replacement)"; license = licenses.mit; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-gone/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-gone/default.nix index 13411ed4c41b..c7453aff85bc 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-gone/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-gone/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig, makeWrapper, openssl, git, libiconv, Security, installShellFiles }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config, makeWrapper, openssl, git, libiconv, Security, installShellFiles }: rustPlatform.buildRustPackage rec { pname = "git-gone"; @@ -13,20 +13,20 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1g2jijx8y34lid9qwa26v4svab5v9ki6gn9vcfiy61dqa964c3l9"; - nativeBuildInputs = [ pkgconfig makeWrapper installShellFiles ]; + nativeBuildInputs = [ pkg-config makeWrapper installShellFiles ]; buildInputs = [ openssl ] - ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ]; + ++ lib.optionals stdenv.isDarwin [ libiconv Security ]; postInstall = '' installManPage git-gone.1 ''; postFixup = '' - wrapProgram $out/bin/git-gone --prefix PATH : "${stdenv.lib.makeBinPath [ git ]}" + wrapProgram $out/bin/git-gone --prefix PATH : "${lib.makeBinPath [ git ]}" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Cleanup stale Git branches of pull requests"; homepage = "https://github.com/lunaryorn/git-gone"; license = licenses.asl20; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-hub/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-hub/default.nix index 33b3d0bc167c..ac3de7cbc9ec 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-hub/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-hub/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gitMinimal, python2Packages }: +{ lib, stdenv, fetchFromGitHub, gitMinimal, python2Packages }: stdenv.mkDerivation rec { pname = "git-hub"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { rm -r $out/share/{doc,vim} ''; - meta = with stdenv.lib; { + meta = with lib; { inherit (src.meta) homepage; description = "Git command line interface to GitHub"; longDescription = '' diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix index a2f319d82b0d..b01976f7632e 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix @@ -1,23 +1,23 @@ -{ stdenv, fetchFromGitHub, installShellFiles, rustPlatform, pkgconfig, openssl, darwin }: +{ lib, stdenv, fetchFromGitHub, installShellFiles, rustPlatform, pkg-config, openssl, darwin }: with rustPlatform; buildRustPackage rec { pname = "git-ignore"; - version = "1.0.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "sondr3"; repo = pname; rev = "v${version}"; - sha256 = "0krz50pw9bkyzl78bvppk6skbpjp8ga7bd34jya4ha1xfmd8p89c"; + sha256 = "sha256-bKIBPqGKiS3ey8vH2F4EoleV1H2PTOp+71d/YW3jkT0="; }; - cargoSha256 = "0vcg2pl0s329fr8p23pwdx2jy7qahbr7n337ib61f69aaxi1xmq0"; + cargoSha256 = "sha256-D1CIITuZSAsKYsK8U0q8HwPsYCyrfkTXZThxufEEkWU="; - nativeBuildInputs = [ pkgconfig installShellFiles ]; + nativeBuildInputs = [ pkg-config installShellFiles ]; buildInputs = [ openssl ] - ++ stdenv.lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; @@ -26,7 +26,7 @@ buildRustPackage rec { installManPage $releaseDir/build/git-ignore-*/out/git-ignore.1 ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Quickly and easily fetch .gitignore templates from gitignore.io"; homepage = "https://github.com/sondr3/git-ignore"; license = licenses.gpl3Plus; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix index 1edd48f92f15..1d669bfe49c6 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix @@ -1,4 +1,4 @@ -{ stdenv, ncurses5, fetchFromGitHub, rustPlatform, libiconv, Security }: +{ lib, stdenv, ncurses5, fetchFromGitHub, rustPlatform, libiconv, Security }: rustPlatform.buildRustPackage rec { pname = "git-interactive-rebase-tool"; @@ -13,11 +13,11 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0jc6mhszxmwsdjk73wkfi0jjp9vkzzl9kk0dbnry6w7dyr5if8cc"; - buildInputs = [ ncurses5 ] ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ]; + buildInputs = [ ncurses5 ] ++ lib.optionals stdenv.isDarwin [ libiconv Security ]; cargoParallelTestThreads = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/MitMaro/git-interactive-rebase-tool"; description = "Native cross platform full feature terminal based sequence editor for git interactive rebase"; changelog = "https://github.com/MitMaro/git-interactive-rebase-tool/releases/tag/${version}"; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-my/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-my/default.nix index 2a8a262bf304..d8ce7a42bb59 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-my/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-my/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "git-my"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { install -Dm755 -t "$out"/bin ./git-my ''; - meta = with stdenv.lib; { + meta = with lib; { description = "List remote branches if they're merged and/or available locally"; homepage = "https://github.com/davidosomething/git-my"; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-octopus/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-octopus/default.nix index d5278d9d2417..942a12e239b9 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-octopus/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-octopus/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, git, perl, makeWrapper }: +{ lib, stdenv, fetchFromGitHub, git, perl, makeWrapper }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { pname = "git-octopus"; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-open/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-open/default.nix index f7b2120cca02..3ba53e837fa8 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-open/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-open/default.nix @@ -1,4 +1,4 @@ -{stdenv, git, xdg_utils, gnugrep, fetchFromGitHub, makeWrapper}: +{lib, stdenv, git, xdg_utils, gnugrep, fetchFromGitHub, makeWrapper}: stdenv.mkDerivation rec { pname = "git-open"; @@ -19,10 +19,10 @@ stdenv.mkDerivation rec { mkdir -p $out/bin cp git-open $out/bin wrapProgram $out/bin/git-open \ - --prefix PATH : "${stdenv.lib.makeBinPath [ git xdg_utils gnugrep ]}" + --prefix PATH : "${lib.makeBinPath [ git xdg_utils gnugrep ]}" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/paulirish/git-open"; description = "Open the GitHub page or website for a repository in your browser"; license = licenses.mit; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-radar/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-radar/default.nix index fc4b5850f5c7..1cd14aa96927 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-radar/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-radar/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub}: +{lib, stdenv, fetchFromGitHub}: stdenv.mkDerivation rec { pname = "git-radar"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ln -s $out/git-radar $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/michaeldfallen/git-radar"; license = licenses.mit; description = "A tool you can add to your prompt to provide at-a-glance information on your git repo"; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-recent/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-recent/default.nix index a01b84a948ad..2ecc5d872b88 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-recent/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-recent/default.nix @@ -1,4 +1,4 @@ -{stdenv, git, less, fetchFromGitHub, makeWrapper +{lib, stdenv, git, less, fetchFromGitHub, makeWrapper # util-linuxMinimal is included because we need the column command , util-linux }: @@ -22,10 +22,10 @@ stdenv.mkDerivation rec { mkdir -p $out/bin cp git-recent $out/bin wrapProgram $out/bin/git-recent \ - --prefix PATH : "${stdenv.lib.makeBinPath [ git less util-linux ]}" + --prefix PATH : "${lib.makeBinPath [ git less util-linux ]}" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/paulirish/git-recent"; description = "See your latest local git branches, formatted real fancy"; license = licenses.mit; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix index 04787b0ce25b..d6a35a28d66e 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, docutils, makeWrapper +{ lib, stdenv, fetchFromGitHub, docutils, makeWrapper , gnupg, curl, rsync, coreutils , gawk, gnused, gnugrep }: @@ -22,11 +22,11 @@ stdenv.mkDerivation rec { installPhase = '' prefix="$out" ./install.sh wrapProgram "$out/bin/git-remote-gcrypt" \ - --prefix PATH ":" "${stdenv.lib.makeBinPath [ gnupg curl rsync coreutils + --prefix PATH ":" "${lib.makeBinPath [ gnupg curl rsync coreutils gawk gnused gnugrep ]}" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://spwhitton.name/tech/code/git-remote-gcrypt"; description = "A git remote helper for GPG-encrypted remotes"; license = licenses.gpl3; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-reparent/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-reparent/default.nix index c0de46264d05..037de14658d6 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-reparent/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-reparent/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeWrapper, git, gnused }: +{ lib, stdenv, fetchFromGitHub, makeWrapper, git, gnused }: stdenv.mkDerivation rec { pname = "git-reparent"; @@ -20,10 +20,10 @@ stdenv.mkDerivation rec { ''; postFixup = '' - wrapProgram $out/bin/git-reparent --prefix PATH : "${stdenv.lib.makeBinPath [ git gnused ]}" + wrapProgram $out/bin/git-reparent --prefix PATH : "${lib.makeBinPath [ git gnused ]}" ''; - meta = with stdenv.lib; { + meta = with lib; { inherit (src.meta) homepage; description = "Git command to recommit HEAD with a new set of parents"; maintainers = [ maintainers.marsam ]; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-secret/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-secret/default.nix index fe67aca55d14..eea7bed011b0 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-secret/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-secret/default.nix @@ -29,8 +29,8 @@ in stdenv.mkDerivation { meta = { description = "A bash-tool to store your private data inside a git repository"; homepage = "https://git-secret.io"; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.lo1tuma ]; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.lo1tuma ]; + platforms = lib.platforms.all; }; } diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-secrets/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-secrets/default.nix index 1beff2a118df..154a4048e0a7 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-secrets/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-secrets/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeWrapper, git, coreutils }: +{ lib, stdenv, fetchFromGitHub, makeWrapper, git, coreutils }: stdenv.mkDerivation rec { pname = "git-secrets"; @@ -20,10 +20,10 @@ stdenv.mkDerivation rec { install -m444 -Dt $out/share/man/man1 git-secrets.1 wrapProgram $out/bin/git-secrets \ - --prefix PATH : "${stdenv.lib.makeBinPath [ git coreutils ]}" + --prefix PATH : "${lib.makeBinPath [ git coreutils ]}" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Prevents you from committing secrets and credentials into git repositories"; homepage = "https://github.com/awslabs/git-secrets"; license = licenses.asl20; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-standup/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-standup/default.nix index ceb734f0f67f..2bbf7840138d 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-standup/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-standup/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeWrapper, git }: +{ lib, stdenv, fetchFromGitHub, makeWrapper, git }: stdenv.mkDerivation rec { pname = "git-standup"; @@ -19,10 +19,10 @@ stdenv.mkDerivation rec { install -Dm755 -t $out/bin git-standup wrapProgram $out/bin/git-standup \ - --prefix PATH : "${stdenv.lib.makeBinPath [ git ]}" + --prefix PATH : "${lib.makeBinPath [ git ]}" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Recall what you did on the last working day"; homepage = "https://github.com/kamranahmedse/git-standup"; license = licenses.mit; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-subrepo/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-subrepo/default.nix index 708014e4af8d..7fe9883c556d 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-subrepo/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-subrepo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, git, makeWrapper, which }: +{ lib, stdenv, fetchFromGitHub, git, makeWrapper, which }: stdenv.mkDerivation rec { pname = "git-subrepo"; @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { --prefix PATH : "${git}/bin" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/ingydotnet/git-subrepo"; description = "Git submodule alternative"; license = licenses.mit; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-subset/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-subset/default.nix index 9893e6dd7844..204ded65fd3e 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-subset/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-subset/default.nix @@ -1,4 +1,4 @@ -{ stdenv, rustPlatform, fetchFromGitHub, pkg-config, openssl, curl, libiconv, Security }: +{ lib, stdenv, rustPlatform, fetchFromGitHub, pkg-config, openssl, curl, libiconv, Security }: rustPlatform.buildRustPackage rec { pname = "git-subset"; @@ -15,9 +15,9 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ curl libiconv Security ]; + buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ curl libiconv Security ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Super fast Git tree filtering"; homepage = "https://github.com/jasonwhite/git-subset"; license = licenses.mit; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-sync/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-sync/default.nix index bba355095558..87cb7452c75b 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-sync/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-sync/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, coreutils, gnugrep, gnused, makeWrapper, git +{ lib, stdenv, fetchFromGitHub, coreutils, gnugrep, gnused, makeWrapper, git }: stdenv.mkDerivation rec { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { cp -a git-sync $out/bin/git-sync ''; - wrapperPath = with stdenv.lib; makeBinPath [ + wrapperPath = with lib; makeBinPath [ coreutils git gnugrep @@ -38,8 +38,8 @@ stdenv.mkDerivation rec { meta = { description = "A script to automatically synchronize a git repository"; homepage = "https://github.com/simonthum/git-sync"; - maintainers = with stdenv.lib.maintainers; [ imalison ]; - license = stdenv.lib.licenses.cc0; - platforms = with stdenv.lib.platforms; unix; + maintainers = with lib.maintainers; [ imalison ]; + license = lib.licenses.cc0; + platforms = with lib.platforms; unix; }; } diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-test/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-test/default.nix index 27f9bcffa34e..624ce5616909 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-test/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-test/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeWrapper, git }: +{ lib, stdenv, fetchFromGitHub, makeWrapper, git }: stdenv.mkDerivation rec { pname = "git-test"; @@ -20,10 +20,10 @@ stdenv.mkDerivation rec { install -m444 -Dt $out/share/man/man1 git-test.1 wrapProgram $out/bin/git-test \ - --prefix PATH : "${stdenv.lib.makeBinPath [ git ]}" + --prefix PATH : "${lib.makeBinPath [ git ]}" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Test your commits"; homepage = "https://github.com/spotify/git-test"; license = licenses.asl20; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-trim/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-trim/default.nix index 33534334bea7..d470b63a0b7e 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-trim/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-trim/default.nix @@ -1,4 +1,4 @@ -{ stdenv, rustPlatform, fetchFromGitHub, pkg-config, openssl, libiconv, Security }: +{ lib, stdenv, rustPlatform, fetchFromGitHub, pkg-config, openssl, libiconv, Security }: rustPlatform.buildRustPackage rec { pname = "git-trim"; @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ]; + buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ libiconv Security ]; postInstall = '' install -Dm644 -t $out/share/man/man1/ docs/git-trim.1 @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { # fails with sandbox doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Automatically trims your branches whose tracking remote refs are merged or gone"; homepage = "https://github.com/foriequal0/git-trim"; license = licenses.mit; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-vanity-hash/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-vanity-hash/default.nix index 839acc5cca59..77e077436169 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-vanity-hash/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-vanity-hash/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform }: +{ lib, stdenv, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "git-vanity-hash"; @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { cp README.md $out/share/doc/git-vanity-hash ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/prasmussen/git-vanity-hash"; description = "Tool for creating commit hashes with a specific prefix"; license = [ licenses.mit ]; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-when-merged/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-when-merged/default.nix new file mode 100644 index 000000000000..d020f351fedf --- /dev/null +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-when-merged/default.nix @@ -0,0 +1,40 @@ +{ lib, stdenv, fetchFromGitHub, python3 }: + +stdenv.mkDerivation rec { + pname = "git-when-merged"; + version = "1.2.0"; + + src = fetchFromGitHub { + owner = "mhagger"; + repo = pname; + rev = "v${version}"; + sha256 = "0sw98gmsnd4iki9fx455jga9m80bxvvfgys8i1r2fc7d5whc2qa6"; + }; + + buildInputs = [ python3 ]; + + installPhase = '' + install -D --target-directory $out/bin/ bin/git-when-merged + ''; + + meta = with lib; { + description = + "Helps you figure out when and why a commit was merged into a branch"; + longDescription = '' + If you use standard Git workflows, then you create a feature + branch for each feature that you are working on. When the feature + is complete, you merge it into your master branch. You might even + have sub-feature branches that are merged into a feature branch + before the latter is merged. + + In such a workflow, the first-parent history of master consists + mainly of merges of feature branches into the mainline. git + when-merged can be used to ask, "When (and why) was commit C + merged into the current branch?" + ''; + homepage = "https://github.com/mhagger/git-when-merged"; + license = licenses.gpl2Only; + platforms = python3.meta.platforms; + maintainers = with maintainers; [ DamienCassou ]; + }; +} diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-workspace/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-workspace/default.nix index 674bdd14247a..9b2853551c2b 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-workspace/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-workspace/default.nix @@ -1,27 +1,27 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , rustPlatform , Security -, pkgconfig, openssl +, pkg-config, openssl }: rustPlatform.buildRustPackage rec { pname = "git-workspace"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "orf"; repo = pname; rev = "v${version}"; - sha256 = "1ckfk221ag6yhbqxfz432wpgbhddgzgdsaxhl1ymw90pwpnz717y"; + sha256 = "sha256-//EyGhuE8rMRL03TtECIi0X51/p/GvTqvr2FRQEIqFA="; }; - cargoSha256 = "0zkns037vgy96ybmn80px515ivz6yhj5br5mwbvxgl73va92wd9v"; + cargoSha256 = "sha256-lvxEYjVMJoAFFRG5iVfGwxUeJObIxfEaWokk69l++nI="; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ openssl ] ++ stdenv.lib.optional stdenv.isDarwin Security; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; - meta = with stdenv.lib; { + meta = with lib; { description = "Sync personal and work git repositories from multiple providers"; homepage = "https://github.com/orf/git-workspace"; license = with licenses; [ mit ]; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git/default.nix index 57f6703762d1..90f6ba5ac5ac 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, buildPackages +{ fetchurl, lib, stdenv, buildPackages , fetchpatch , curl, openssl, zlib, expat, perlPackages, python3, gettext, cpio , gnugrep, gnused, gawk, coreutils # needed at runtime by git-filter-branch etc @@ -15,7 +15,7 @@ , sendEmailSupport , darwin , withLibsecret ? false -, pkgconfig, glib, libsecret +, pkg-config, glib, libsecret , gzip # needed at runtime by gitweb.cgi }: @@ -23,7 +23,7 @@ assert sendEmailSupport -> perlSupport; assert svnSupport -> perlSupport; let - version = "2.29.2"; + version = "2.30.0"; svn = subversionClient.override { perlBindings = perlSupport; }; gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ]; @@ -35,10 +35,10 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "1h87yv117ypnc0yi86941089c14n91gixk8b6shj2y35prp47z7j"; + sha256 = "06ad6dylgla34k9am7d5z8y3rryc8ln3ibq5z0d74rcm20hm0wsm"; }; - outputs = [ "out" ] ++ stdenv.lib.optional withManual "doc"; + outputs = [ "out" ] ++ lib.optional withManual "doc"; hardeningDisable = [ "format" ]; @@ -52,12 +52,6 @@ stdenv.mkDerivation { ./ssh-path.patch ./git-send-email-honor-PATH.patch ./installCheck-path.patch - (fetchpatch { - # https://github.com/git/git/pull/925 - name = "make-manual-reproducible.patch"; - url = "https://github.com/git/git/commit/7a68e9e0b8eda91eb576bbbc5ed66298f3ab761c.patch"; - sha256 = "02naws82pd3vvwrrgqn91kid8qkjihyjaz1ahgjz8qlmnn2avf5n"; - }) ]; postPatch = '' @@ -72,20 +66,20 @@ stdenv.mkDerivation { ''; nativeBuildInputs = [ gettext perlPackages.perl ] - ++ stdenv.lib.optionals withManual [ asciidoctor texinfo xmlto docbook2x + ++ lib.optionals withManual [ asciidoctor texinfo xmlto docbook2x docbook_xsl docbook_xsl_ns docbook_xml_dtd_45 libxslt ]; buildInputs = [curl openssl zlib expat cpio makeWrapper libiconv] - ++ stdenv.lib.optionals perlSupport [ perlPackages.perl ] - ++ stdenv.lib.optionals guiSupport [tcl tk] - ++ stdenv.lib.optionals withpcre2 [ pcre2 ] - ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.Security ] - ++ stdenv.lib.optionals withLibsecret [ pkgconfig glib libsecret ]; + ++ lib.optionals perlSupport [ perlPackages.perl ] + ++ lib.optionals guiSupport [tcl tk] + ++ lib.optionals withpcre2 [ pcre2 ] + ++ lib.optionals stdenv.isDarwin [ darwin.Security ] + ++ lib.optionals withLibsecret [ pkg-config glib libsecret ]; # required to support pthread_cancel() - NIX_LDFLAGS = stdenv.lib.optionalString (!stdenv.cc.isClang) "-lgcc_s" - + stdenv.lib.optionalString (stdenv.isFreeBSD) "-lthr"; + NIX_LDFLAGS = lib.optionalString (!stdenv.cc.isClang) "-lgcc_s" + + lib.optionalString (stdenv.isFreeBSD) "-lthr"; - configureFlags = stdenv.lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ + configureFlags = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "ac_cv_fread_reads_directories=yes" "ac_cv_snprintf_returns_bogus=no" "ac_cv_iconv_omits_bom=no" @@ -102,11 +96,11 @@ stdenv.mkDerivation { ] ++ (if perlSupport then ["PERL_PATH=${perlPackages.perl}/bin/perl"] else ["NO_PERL=1"]) ++ (if pythonSupport then ["PYTHON_PATH=${python3}/bin/python"] else ["NO_PYTHON=1"]) - ++ stdenv.lib.optionals stdenv.isSunOS ["INSTALL=install" "NO_INET_NTOP=" "NO_INET_PTON="] + ++ lib.optionals stdenv.isSunOS ["INSTALL=install" "NO_INET_NTOP=" "NO_INET_PTON="] ++ (if stdenv.isDarwin then ["NO_APPLE_COMMON_CRYPTO=1"] else ["sysconfdir=/etc"]) - ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl ["NO_SYS_POLL_H=1" "NO_GETTEXT=YesPlease"] - ++ stdenv.lib.optional withpcre2 "USE_LIBPCRE2=1" - ++ stdenv.lib.optional (!nlsSupport) "NO_GETTEXT=1" + ++ lib.optionals stdenv.hostPlatform.isMusl ["NO_SYS_POLL_H=1" "NO_GETTEXT=YesPlease"] + ++ lib.optional withpcre2 "USE_LIBPCRE2=1" + ++ lib.optional (!nlsSupport) "NO_GETTEXT=1" # git-gui refuses to start with the version of tk distributed with # macOS Catalina. We can prevent git from building the .app bundle # by specifying an invalid tk framework. The postInstall step will @@ -114,16 +108,16 @@ stdenv.mkDerivation { # acceptable version. # # See https://github.com/Homebrew/homebrew-core/commit/dfa3ccf1e7d3901e371b5140b935839ba9d8b706 - ++ stdenv.lib.optional stdenv.isDarwin "TKFRAMEWORK=/nonexistent"; + ++ lib.optional stdenv.isDarwin "TKFRAMEWORK=/nonexistent"; postBuild = '' make -C contrib/subtree - '' + (stdenv.lib.optionalString perlSupport '' + '' + (lib.optionalString perlSupport '' make -C contrib/diff-highlight - '') + (stdenv.lib.optionalString stdenv.isDarwin '' + '') + (lib.optionalString stdenv.isDarwin '' make -C contrib/credential/osxkeychain - '') + (stdenv.lib.optionalString withLibsecret '' + '') + (lib.optionalString withLibsecret '' make -C contrib/credential/libsecret ''); @@ -135,11 +129,11 @@ stdenv.mkDerivation { installFlags = [ "NO_INSTALL_HARDLINKS=1" ]; - preInstall = (stdenv.lib.optionalString stdenv.isDarwin '' + preInstall = (lib.optionalString stdenv.isDarwin '' mkdir -p $out/bin ln -s $out/share/git/contrib/credential/osxkeychain/git-credential-osxkeychain $out/bin/ rm -f $PWD/contrib/credential/osxkeychain/git-credential-osxkeychain.o - '') + (stdenv.lib.optionalString withLibsecret '' + '') + (lib.optionalString withLibsecret '' mkdir -p $out/bin ln -s $out/share/git/contrib/credential/libsecret/git-credential-libsecret $out/bin/ rm -f $PWD/contrib/credential/libsecret/git-credential-libsecret.o @@ -152,7 +146,7 @@ stdenv.mkDerivation { } # Install git-subtree. - make -C contrib/subtree install ${stdenv.lib.optionalString withManual "USE_ASCIIDOCTOR=1 install-doc"} + make -C contrib/subtree install ${lib.optionalString withManual "USE_ASCIIDOCTOR=1 install-doc"} rm -rf contrib/subtree # Install contrib stuff. @@ -176,7 +170,7 @@ stdenv.mkDerivation { '${gnugrep}/bin/grep', '${gnused}/bin/sed', '${gawk}/bin/awk', '${coreutils}/bin/cut', '${coreutils}/bin/basename', '${coreutils}/bin/dirname', '${coreutils}/bin/wc', '${coreutils}/bin/tr' - ${stdenv.lib.optionalString perlSupport ", '${perlPackages.perl}/bin/perl'"} + ${lib.optionalString perlSupport ", '${perlPackages.perl}/bin/perl'"} ); } foreach $c (@a) { @@ -192,7 +186,7 @@ stdenv.mkDerivation { # Also put git-http-backend into $PATH, so that we can use smart # HTTP(s) transports for pushing ln -s $out/libexec/git-core/git-http-backend $out/bin/git-http-backend - '' + stdenv.lib.optionalString perlSupport '' + '' + lib.optionalString perlSupport '' # wrap perl commands makeWrapper "$out/share/git/contrib/credential/netrc/git-credential-netrc.perl" $out/bin/git-credential-netrc \ --set PERL5LIB "$out/${perlPackages.perl.libPrefix}:${perlPackages.makePerlPath perlLibs}" @@ -212,7 +206,7 @@ stdenv.mkDerivation { sed -i -e "s|'compressor' => \['gzip'|'compressor' => ['${gzip}/bin/gzip'|" \ $out/share/gitweb/gitweb.cgi # Give access to CGI.pm and friends (was removed from perl core in 5.22) - for p in ${stdenv.lib.concatStringsSep " " gitwebPerlLibs}; do + for p in ${lib.concatStringsSep " " gitwebPerlLibs}; do sed -i -e "/use CGI /i use lib \"$p/${perlPackages.perl.libPrefix}\";" \ "$out/share/gitweb/gitweb.cgi" done @@ -236,7 +230,7 @@ stdenv.mkDerivation { notSupported $out/libexec/git-core/git-send-email '') - + stdenv.lib.optionalString withManual ''# Install man pages + + lib.optionalString withManual ''# Install man pages make -j $NIX_BUILD_CORES -l $NIX_BUILD_CORES USE_ASCIIDOCTOR=1 PERL_PATH="${buildPackages.perl}/bin/perl" cmd-list.made install install-html \ -C Documentation '' @@ -254,7 +248,7 @@ stdenv.mkDerivation { notSupported "$out/$prog" done '') - + stdenv.lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.isDarwin '' # enable git-credential-osxkeychain by default if darwin mkdir -p $out/etc cat > $out/etc/gitconfig << EOF @@ -281,7 +275,7 @@ stdenv.mkDerivation { installCheckFlagsArray+=( GIT_PROVE_OPTS="--jobs $NIX_BUILD_CORES --failures --state=failed,save" GIT_TEST_INSTALLED=$out/bin - ${stdenv.lib.optionalString (!svnSupport) "NO_SVN_TESTS=y"} + ${lib.optionalString (!svnSupport) "NO_SVN_TESTS=y"} ) function disable_test { @@ -298,11 +292,12 @@ stdenv.mkDerivation { disable_test t0001-init shared disable_test t1301-shared-repo disable_test t5324-split-commit-graph 'split commit-graph respects core.sharedrepository' + disable_test t4129-apply-samemode 'do not use core.sharedRepository for working tree files' # Our patched gettext never fallbacks disable_test t0201-gettext-fallbacks - ${stdenv.lib.optionalString (!sendEmailSupport) '' + ${lib.optionalString (!sendEmailSupport) '' # Disable sendmail tests disable_test t9001-send-email ''} @@ -315,17 +310,17 @@ stdenv.mkDerivation { # Tested to fail: 2.18.0 disable_test t9902-completion "sourcing the completion script clears cached --options" - ${stdenv.lib.optionalString (!perlSupport) '' + ${lib.optionalString (!perlSupport) '' # request-pull is a Bash script that invokes Perl, so it is not available # when NO_PERL=1, and the test should be skipped, but the test suite does # not check for the Perl prerequisite. disable_test t5150-request-pull ''} - '' + stdenv.lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' # XXX: Some tests added in 2.24.0 fail. # Please try to re-enable on the next release. disable_test t7816-grep-binary-pattern - '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' + '' + lib.optionalString stdenv.hostPlatform.isMusl '' # Test fails (as of 2.17.0, musl 1.1.19) disable_test t3900-i18n-commit # Fails largely due to assumptions about BOM @@ -339,7 +334,7 @@ stdenv.mkDerivation { meta = { homepage = "https://git-scm.com/"; description = "Distributed version control system"; - license = stdenv.lib.licenses.gpl2; + license = lib.licenses.gpl2; changelog = "https://raw.githubusercontent.com/git/git/${version}/Documentation/RelNotes/${version}.txt"; longDescription = '' @@ -347,7 +342,7 @@ stdenv.mkDerivation { handle very large projects with speed and efficiency. ''; - platforms = stdenv.lib.platforms.all; - maintainers = with stdenv.lib.maintainers; [ primeos peti wmertens globin ]; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ primeos peti wmertens globin ]; }; } diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git2cl/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git2cl/default.nix index 34417cfaa8c8..a1c63538220b 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/git2cl/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git2cl/default.nix @@ -1,4 +1,4 @@ -{ fetchgit, stdenv, perl }: +{ fetchgit, lib, stdenv, perl }: stdenv.mkDerivation { name = "git2cl-20080827"; @@ -18,6 +18,6 @@ stdenv.mkDerivation { meta = { homepage = "https://savannah.nongnu.org/projects/git2cl"; description = "Convert git logs to GNU style ChangeLog files"; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/gita/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/gita/default.nix index 3e07a93458b7..6f20e4a44c6f 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/gita/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/gita/default.nix @@ -9,12 +9,12 @@ }: buildPythonApplication rec { - version = "0.10.10"; + version = "0.11.9"; pname = "gita"; src = fetchFromGitHub { - sha256 = "0k7hicncbrqvhmpq1w3v1309bqij6izw31xs8xcb8is85dvi754h"; - rev = "v${version}"; + sha256 = "9+zuLAx9lMfltsBqjvsivJ5wPnStPfq11XgGMv/JDpY="; + rev = version; repo = "gita"; owner = "nosarthur"; }; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/gitbatch/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/gitbatch/default.nix index 99a127f3d8f8..dc853be6772e 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/gitbatch/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/gitbatch/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "gitbatch-unstable"; @@ -15,7 +15,7 @@ buildGoPackage rec { sha256 = "0613vfqdn3k0w7fm25rqnqdr67w9vii3i56dfslqcn1vqjfrff3q"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Running git UI commands"; homepage = "https://github.com/isacikgoz/gitbatch"; license = licenses.mit; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/gitflow/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/gitflow/default.nix index 1307573990a9..08bf5eb6ba07 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/gitflow/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/gitflow/default.nix @@ -1,16 +1,16 @@ -{ pkgs, stdenv, fetchFromGitHub }: +{ pkgs, lib, stdenv, fetchFromGitHub }: with pkgs.lib; stdenv.mkDerivation rec { pname = "gitflow"; - version = "1.12.2"; + version = "1.12.3"; src = fetchFromGitHub { owner = "petervanderdoes"; repo = pname; rev = version; - sha256 = "0smwlc1wa4ndvspc9x6f4jwnzr58achysrhhip402j98d7di8hw5"; + sha256 = "sha256-kHirHG/bfsU6tKyQ0khNSTyChhzHfzib+HyA3LOtBI8="; }; buildInputs = [ pkgs.makeWrapper ]; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { --suffix PATH : ${pkgs.git}/bin ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/petervanderdoes/gitflow"; description = "Extend git with the Gitflow branching model"; longDescription = '' diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/gitin/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/gitin/default.nix index af9aef6d39c6..e2aaafea2024 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/gitin/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/gitin/default.nix @@ -1,7 +1,7 @@ -{ stdenv +{ lib, stdenv , buildGoPackage , fetchFromGitHub -, pkgconfig +, pkg-config , libgit2_0_27 }: @@ -20,10 +20,10 @@ buildGoPackage rec { goDeps = ./deps.nix; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libgit2_0_27 ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/isacikgoz/gitin"; description = "Text-based user interface for git"; license = licenses.bsd3; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix index a6ca3126d5ce..f4b74405eba2 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix @@ -1,4 +1,4 @@ -{ callPackage, stdenv, fetchFromGitHub, git, zsh, ...}: +{ callPackage, lib, stdenv, fetchFromGitHub, git, zsh, ...}: stdenv.mkDerivation rec { pname = "gitstatus"; @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { wait $! ''; - meta = with stdenv.lib; { + meta = with lib; { description = "10x faster implementation of `git status` command"; homepage = "https://github.com/romkatv/gitstatus"; license = licenses.gpl3Only; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/gitui/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/gitui/default.nix index f89349aaeaa5..81b2984087bd 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/gitui/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/gitui/default.nix @@ -1,4 +1,4 @@ -{ stdenv, rustPlatform, fetchFromGitHub, libiconv, perl, python3, Security, AppKit, openssl, xclip }: +{ lib, stdenv, rustPlatform, fetchFromGitHub, libiconv, perl, python3, Security, AppKit, openssl, xclip }: rustPlatform.buildRustPackage rec { pname = "gitui"; version = "0.11.0"; @@ -14,10 +14,10 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ python3 perl ]; buildInputs = [ openssl ] - ++ stdenv.lib.optional stdenv.isLinux xclip - ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv Security AppKit ]; + ++ lib.optional stdenv.isLinux xclip + ++ lib.optionals stdenv.isDarwin [ libiconv Security AppKit ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Blazing fast terminal-ui for git written in rust"; homepage = "https://github.com/extrawurst/gitui"; license = licenses.mit; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/gitweb/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/gitweb/default.nix index b6659b5f539f..6f5ce3358a3a 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/gitweb/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/gitweb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildEnv, git, fetchFromGitHub +{ lib, stdenv, buildEnv, git, fetchFromGitHub , gitwebTheme ? false }: let @@ -15,13 +15,13 @@ let sha256 = "17hypq6jvhy6zhh26lp3nyi52npfd5wy5752k6sq0shk4na2acqi"; }; in buildEnv { - name = "gitweb-${stdenv.lib.getVersion git}"; + name = "gitweb-${lib.getVersion git}"; ignoreCollisions = true; - paths = stdenv.lib.optional gitwebTheme gitwebThemeSrc + paths = lib.optional gitwebTheme gitwebThemeSrc ++ [ "${git}/share/gitweb" ]; meta = git.meta // { - maintainers = with stdenv.lib.maintainers; [ gnidorah ]; + maintainers = with lib.maintainers; [ gnidorah ]; }; } diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/glab/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/glab/default.nix index 9c2e4f00ca7a..ac2cd5d3b417 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/glab/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/glab/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "glab"; - version = "1.11.1"; + version = "1.13.1"; src = fetchFromGitHub { owner = "profclems"; repo = pname; rev = "v${version}"; - sha256 = "mmrTuldU2WDe9t2nC3DYfqwb28uh6qjAaaveR221mjw="; + sha256 = "sha256-NSc/h6cENuXIBwC4ixvZDlERV7b/X0GB4OGzxGEk4YY="; }; - vendorSha256 = "B4RKcKUTdGkonsKhL7NIKzVpZq6XD6cMMWed4wr/Moc="; + vendorSha256 = "sha256-N9swoVltKzdYez1WSoXMLZCvfYSFhVXgPjUfR0+5aAo="; runVend = true; # Tests are trying to access /homeless-shelter diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/grv/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/grv/default.nix index 64a4f8a823ce..041034651894 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/grv/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/grv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, curl, ncurses, pkgconfig, readline +{ lib, stdenv, buildGoPackage, fetchFromGitHub, curl, ncurses, pkg-config, readline , cmake }: let version = "0.3.2"; @@ -8,7 +8,7 @@ buildGoPackage { inherit version; buildInputs = [ ncurses readline curl ]; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ pkg-config cmake ]; goPackagePath = "github.com/rgburke/grv"; @@ -40,7 +40,7 @@ buildGoPackage { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "GRV is a terminal interface for viewing Git repositories"; homepage = "https://github.com/rgburke/grv"; license = licenses.gpl3; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/hub/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/hub/default.nix index 788512df85cd..4b189c55c8a8 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/hub/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/hub/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, git, groff, installShellFiles, util-linux, nixosTests }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub, git, groff, installShellFiles, util-linux, nixosTests }: buildGoPackage rec { pname = "hub"; @@ -37,7 +37,7 @@ buildGoPackage rec { passthru.tests = { inherit (nixosTests) hub; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Command-line wrapper for git that makes you better at GitHub"; license = licenses.mit; homepage = "https://hub.github.com/"; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/lab/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/lab/default.nix index 3459f5099c97..284cbe758398 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/lab/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/lab/default.nix @@ -1,32 +1,32 @@ -{ lib, buildGoModule, fetchFromGitHub, makeWrapper, xdg_utils }: +{ lib, buildGoModule, fetchFromGitHub, makeWrapper, xdg_utils, installShellFiles, git }: buildGoModule rec { pname = "lab"; - version = "0.17.2"; + version = "0.19.0"; src = fetchFromGitHub { owner = "zaquestion"; repo = "lab"; rev = "v${version}"; - sha256 = "0zkwvmzgj7h8lc8jkg2a81392b28c8hkwqzj6dds6q4asbmymx5c"; + sha256 = "1l6xsikd1113qd4y0mvjsl64gbi4327m9v4d593f27fxink39j8s"; }; subPackages = [ "." ]; - vendorSha256 = "1lrmafvv5zfn9kc0p8g5vdz351n1zbaqwhwk861fxys0rdpqskyc"; + vendorSha256 = "07zl5xhzgrgr5skba6cds5nal58pllf10gak0ap62j1k9gk2ych2"; doCheck = false; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper installShellFiles ]; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; postInstall = '' - mkdir -p "$out/share/bash-completion/completions" "$out/share/zsh/site-functions" - export LAB_CORE_HOST=a LAB_CORE_USER=b LAB_CORE_TOKEN=c - $out/bin/lab completion bash > $out/share/bash-completion/completions/lab - $out/bin/lab completion zsh > $out/share/zsh/site-functions/_lab - wrapProgram $out/bin/lab --prefix PATH ":" "${lib.makeBinPath [ xdg_utils ]}"; + wrapProgram $out/bin/lab --prefix PATH ":" "${lib.makeBinPath [ git xdg_utils ]}"; + for shell in bash fish zsh; do + $out/bin/lab completion $shell > lab.$shell + installShellCompletion lab.$shell + done ''; meta = with lib; { diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/lefthook/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/lefthook/default.nix index a13e4b33d38e..ce7493088430 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/lefthook/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/lefthook/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub }: # Currently `buildGo114Module` is passed as `buildGoModule` from # `../default.nix`. Please remove the fixed 1.14 once a new release has been @@ -21,7 +21,7 @@ buildGoModule rec { doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Fast and powerful Git hooks manager for any type of projects"; homepage = "https://github.com/Arkweid/lefthook"; license = licenses.mit; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/pass-git-helper/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/pass-git-helper/default.nix index 5914378f5b35..5feb71c79317 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/pass-git-helper/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/pass-git-helper/default.nix @@ -1,23 +1,23 @@ -{ stdenv, buildPythonApplication, fetchFromGitHub, pyxdg, pytest }: +{ lib, stdenv, buildPythonApplication, fetchFromGitHub, pyxdg, pytest, pytest-mock }: buildPythonApplication rec { pname = "pass-git-helper"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "languitar"; repo = "pass-git-helper"; rev = "v${version}"; - sha256 = "18nvwlp0w4aqj268wly60rnjzqw2d8jl0hbs6bkwp3hpzzz5g6yd"; + sha256 = "sha256-GdsFPpBdoEaOCmdKxw5xTuFOcGFH94w5q/lV891lCUs="; }; propagatedBuildInputs = [ pyxdg ]; - checkInputs = [ pytest ]; + checkInputs = [ pytest pytest-mock ]; preCheck = '' export HOME=$(mktemp -d) ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/languitar/pass-git-helper"; description = "A git credential helper interfacing with pass, the standard unix password manager"; license = licenses.gpl3Plus; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/radicle-upstream/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/radicle-upstream/default.nix index f7b6aa153140..26f46066531e 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/radicle-upstream/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/radicle-upstream/default.nix @@ -1,13 +1,13 @@ -{ stdenv, appimageTools, gsettings-desktop-schemas, gtk3, autoPatchelfHook, zlib, fetchurl }: +{ lib, stdenv, appimageTools, gsettings-desktop-schemas, gtk3, autoPatchelfHook, zlib, fetchurl }: let pname = "radicle-upstream"; - version = "0.1.5"; + version = "0.1.6"; name = "${pname}-${version}"; src = fetchurl { url = "https://releases.radicle.xyz/radicle-upstream-${version}.AppImage"; - sha256 = "1q5p6bvzi5awxd9a3xvvdhy26bz0dx8drb1z0zzqdvqqcxxyydq7"; + sha256 = "1s299rxala6gqj69j5q4d4n5wfdk2zsb4r9qrhml0m79b4f79yar"; }; contents = appimageTools.extractType2 { inherit name src; }; @@ -54,7 +54,7 @@ appimageTools.wrapType2 { $out/share/icons/hicolor/512x512/apps/${pname}.png ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A decentralized app for code collaboration"; homepage = "https://radicle.xyz/"; license = licenses.gpl3Plus; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/scmpuff/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/scmpuff/default.nix index de8cb396b7fc..69062d305b7a 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/scmpuff/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/scmpuff/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "scmpuff"; @@ -14,7 +14,7 @@ buildGoPackage rec { sha256 = "0zrzzcs0i13pfwcqh8qb0sji54vh37rdr7qasg57y56cqpx16vl3"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Add numbered shortcuts to common git commands"; homepage = "https://github.com/mroth/scmpuff"; license = licenses.mit; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/stgit/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/stgit/default.nix index 1bad72296b4f..3a37c798a085 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/stgit/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/stgit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, python3Packages, fetchFromGitHub, git, installShellFiles }: +{ lib, stdenv, python3Packages, fetchFromGitHub, git, installShellFiles }: python3Packages.buildPythonApplication rec { pname = "stgit"; @@ -21,7 +21,7 @@ python3Packages.buildPythonApplication rec { installShellCompletion --name _stg $out/share/stgit/completion/stgit.zsh ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A patch manager implemented on top of Git"; homepage = "http://procode.org/stgit/"; license = licenses.gpl2; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/subgit/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/subgit/default.nix index 11189e02c8ff..2f275827a2ef 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/subgit/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/subgit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, makeWrapper, jre }: +{ lib, stdenv, fetchurl, unzip, makeWrapper, jre }: stdenv.mkDerivation rec { name = "subgit-3.3.10"; @@ -7,8 +7,8 @@ stdenv.mkDerivation rec { description = "A tool for a smooth, stress-free SVN to Git migration"; longDescription = "Create writable Git mirror of a local or remote Subversion repository and use both Subversion and Git as long as you like. You may also do a fast one-time import from Subversion to Git."; homepage = "http://subgit.com"; - license = stdenv.lib.licenses.unfree; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.unfree; + platforms = lib.platforms.all; }; nativeBuildInputs = [ unzip makeWrapper ]; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix index 75f6a9608412..8c73c00f00c2 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, qmake, qtbase, qttools, subversion, apr }: +{ lib, stdenv, fetchFromGitHub, qmake, qtbase, qttools, subversion, apr }: let version = "1.0.18"; @@ -25,7 +25,7 @@ stdenv.mkDerivation { NIX_LDFLAGS = "-lsvn_fs-1"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/svn-all-fast-export/svn2git"; description = "A fast-import based converter for an svn repo to git repos"; license = licenses.gpl3; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/svn2git/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/svn2git/default.nix index b61ae80bbee1..69742b6d7603 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/svn2git/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/svn2git/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ruby, makeWrapper, git }: +{ lib, stdenv, fetchurl, ruby, makeWrapper, git }: let version = "2.4.0"; @@ -33,7 +33,7 @@ stdenv.mkDerivation { meta = { homepage = "https://github.com/nirvdrum/svn2git"; description = "Tool for importing Subversion repositories into git"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.mit; + platforms = lib.platforms.unix; }; } diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/tig/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/tig/default.nix index 9415c0eecf16..6ac6cde44a87 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/tig/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/tig/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, ncurses, asciidoc, xmlto, docbook_xsl, docbook_xml_dtd_45 -, readline, makeWrapper, git, libiconv, autoreconfHook, findXMLCatalogs, pkgconfig +{ lib, stdenv, fetchFromGitHub, ncurses, asciidoc, xmlto, docbook_xsl, docbook_xml_dtd_45 +, readline, makeWrapper, git, libiconv, autoreconfHook, findXMLCatalogs, pkg-config }: stdenv.mkDerivation rec { @@ -13,12 +13,12 @@ stdenv.mkDerivation rec { sha256 = "0wxcbfqsk8p84zizy6lf3gp5j122wrf8c7xlipki6nhcfhksn33b"; }; - nativeBuildInputs = [ makeWrapper autoreconfHook asciidoc xmlto docbook_xsl docbook_xml_dtd_45 findXMLCatalogs pkgconfig ]; + nativeBuildInputs = [ makeWrapper autoreconfHook asciidoc xmlto docbook_xsl docbook_xml_dtd_45 findXMLCatalogs pkg-config ]; autoreconfFlags = "-I tools -v"; buildInputs = [ ncurses readline git ] - ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv ]; + ++ lib.optionals stdenv.isDarwin [ libiconv ]; # those files are inherently impure, we'll handle the corresponding dependencies. postPatch = '' @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { --prefix PATH ':' "${git}/bin" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://jonas.github.io/tig/"; description = "Text-mode interface for git"; maintainers = with maintainers; [ bjornfor domenkozar qknight globin ]; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/topgit/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/topgit/default.nix index 9577b56b6c73..cbb341ae3eb3 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/topgit/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/topgit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, git, perl }: +{ lib, stdenv, fetchFromGitHub, git, perl }: stdenv.mkDerivation rec { pname = "topgit"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { install -Dm755 contrib/tg-completion.bash -t "$out/share/bash-completion/completions/" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "TopGit manages large amount of interdependent topic branches"; homepage = "https://github.com/mackyle/topgit"; license = licenses.gpl2; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix index c99c70379df4..aebd488fe305 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, git, makeWrapper, openssl, coreutils, util-linux, gnugrep, gnused, gawk }: +{ lib, stdenv, fetchFromGitHub, git, makeWrapper, openssl, coreutils, util-linux, gnugrep, gnused, gawk }: stdenv.mkDerivation rec { pname = "transcrypt"; @@ -22,16 +22,16 @@ stdenv.mkDerivation rec { install -m 644 -D contrib/zsh/_transcrypt $out/share/zsh/site-functions/_transcrypt wrapProgram $out/bin/transcrypt \ - --prefix PATH : "${stdenv.lib.makeBinPath [ git openssl coreutils util-linux gnugrep gnused gawk ]}" + --prefix PATH : "${lib.makeBinPath [ git openssl coreutils util-linux gnugrep gnused gawk ]}" cat > $out/bin/transcrypt-depspathprefix << EOF #!${stdenv.shell} - echo "${stdenv.lib.makeBinPath [ git openssl coreutils gawk ]}:" + echo "${lib.makeBinPath [ git openssl coreutils gawk ]}:" EOF chmod +x $out/bin/transcrypt-depspathprefix ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Transparently encrypt files within a Git repository"; longDescription = '' A script to configure transparent encryption of sensitive files stored in |