public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

treewide: stdenv.lib -> lib

Browse Source
This commit is contained in:
Ben Siraphob
2021-01-16 17:58:11 +07:00
parent a9bb54359e
commit badf51221d
977 changed files with 2613 additions and 2613 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/version-management/git-and-tools/cgit/default.nix
+5 -5
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, openssl, zlib, asciidoc, libxml2, libxslt
{ lib, stdenv, fetchurl, openssl, zlib, asciidoc, libxml2, libxslt
, docbook_xsl, pkgconfig, luajit
, coreutils, gnused, groff, docutils
, gzip, bzip2, lzip, xz, zstd
@@ -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 ];
};
}
pkgs/applications/version-management/git-and-tools/darcs-to-git/default.nix
+3 -3
View File
@@ -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;
};
}
pkgs/applications/version-management/git-and-tools/ghq/default.nix
+3 -3
View File
@@ -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;
};
}
pkgs/applications/version-management/git-and-tools/git-absorb/default.nix
+1 -1
View File
@@ -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";
pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix
+2 -2
View File
@@ -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";
pkgs/applications/version-management/git-and-tools/git-annex-remote-rclone/default.nix
+1 -1
View File
@@ -20,7 +20,7 @@ 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 lib; {
pkgs/applications/version-management/git-and-tools/git-annex-utils/default.nix
+4 -4
View File
@@ -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;
};
}
pkgs/applications/version-management/git-and-tools/git-appraise/default.nix
+3 -3
View File
@@ -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 ];
};
}
pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix
+5 -5
View File
@@ -1,4 +1,4 @@
{ fetchFromGitHub, python2Packages, stdenv, git, graphviz }:
{ fetchFromGitHub, python2Packages, lib, stdenv, git, graphviz }:
python2Packages.buildPythonApplication rec {
pname = "git-big-picture";
@@ -17,14 +17,14 @@ python2Packages.buildPythonApplication rec {
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 ];
license = lib.licenses.gpl3;
platforms = lib.platforms.linux;
maintainers = [ lib.maintainers.nthorne ];
};
}
pkgs/applications/version-management/git-and-tools/git-dit/default.nix
+1 -1
View File
@@ -38,7 +38,7 @@ buildRustPackage rec {
openssl_1_0_2
libssh
zlib
] ++ stdenv.lib.optionals (stdenv.isDarwin) [
] ++ lib.optionals (stdenv.isDarwin) [
curl
libiconv
CoreFoundation
pkgs/applications/version-management/git-and-tools/git-gone/default.nix
+2 -2
View File
@@ -16,14 +16,14 @@ rustPlatform.buildRustPackage rec {
nativeBuildInputs = [ pkgconfig 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 lib; {
pkgs/applications/version-management/git-and-tools/git-ignore/default.nix
+1 -1
View File
@@ -17,7 +17,7 @@ buildRustPackage rec {
nativeBuildInputs = [ pkgconfig installShellFiles ];
buildInputs = [ openssl ]
++ stdenv.lib.optionals stdenv.isDarwin [
++ lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.Security
];
pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix
+1 -1
View File
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "0jc6mhszxmwsdjk73wkfi0jjp9vkzzl9kk0dbnry6w7dyr5if8cc";
buildInputs = [ ncurses5 ] ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ];
buildInputs = [ ncurses5 ] ++ lib.optionals stdenv.isDarwin [ libiconv Security ];
cargoParallelTestThreads = false;
pkgs/applications/version-management/git-and-tools/git-octopus/default.nix
+2 -2
View File
@@ -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";
pkgs/applications/version-management/git-and-tools/git-open/default.nix
+1 -1
View File
@@ -19,7 +19,7 @@ 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 lib; {
pkgs/applications/version-management/git-and-tools/git-recent/default.nix
+1 -1
View File
@@ -22,7 +22,7 @@ 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 lib; {
pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix
+1 -1
View File
@@ -22,7 +22,7 @@ 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 ]}"
'';
pkgs/applications/version-management/git-and-tools/git-reparent/default.nix
+1 -1
View File
@@ -20,7 +20,7 @@ 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 lib; {
pkgs/applications/version-management/git-and-tools/git-secret/default.nix
+3 -3
View File
@@ -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;
};
}
pkgs/applications/version-management/git-and-tools/git-secrets/default.nix
+1 -1
View File
@@ -20,7 +20,7 @@ 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 lib; {
pkgs/applications/version-management/git-and-tools/git-standup/default.nix
+1 -1
View File
@@ -19,7 +19,7 @@ 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 lib; {
pkgs/applications/version-management/git-and-tools/git-subset/default.nix
+1 -1
View File
@@ -15,7 +15,7 @@ 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 lib; {
description = "Super fast Git tree filtering";
pkgs/applications/version-management/git-and-tools/git-sync/default.nix
+5 -5
View File
@@ -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;
};
}
pkgs/applications/version-management/git-and-tools/git-test/default.nix
+1 -1
View File
@@ -20,7 +20,7 @@ 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 lib; {
pkgs/applications/version-management/git-and-tools/git-trim/default.nix
+1 -1
View File
@@ -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
pkgs/applications/version-management/git-and-tools/git-workspace/default.nix
+1 -1
View File
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "0zkns037vgy96ybmn80px515ivz6yhj5br5mwbvxgl73va92wd9v";
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ openssl ] ++ stdenv.lib.optional stdenv.isDarwin Security;
buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security;
meta = with lib; {
description = "Sync personal and work git repositories from multiple providers";
pkgs/applications/version-management/git-and-tools/git/default.nix
+35 -35
View File
@@ -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
@@ -38,7 +38,7 @@ stdenv.mkDerivation {
sha256 = "06ad6dylgla34k9am7d5z8y3rryc8ln3ibq5z0d74rcm20hm0wsm";
};
outputs = [ "out" ] ++ stdenv.lib.optional withManual "doc";
outputs = [ "out" ] ++ lib.optional withManual "doc";
hardeningDisable = [ "format" ];
@@ -66,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 [ pkgconfig 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"
@@ -96,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
@@ -108,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
'');
@@ -129,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
@@ -146,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.
@@ -170,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) {
@@ -186,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}"
@@ -206,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
@@ -230,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 ''
@@ -248,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
@@ -275,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 {
@@ -297,7 +297,7 @@ stdenv.mkDerivation {
# 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
''}
@@ -310,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
@@ -334,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 = ''
@@ -342,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 ];
};
}
pkgs/applications/version-management/git-and-tools/git2cl/default.nix
+2 -2
View File
@@ -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;
};
}
pkgs/applications/version-management/git-and-tools/gitui/default.nix
+2 -2
View File
@@ -14,8 +14,8 @@ 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 lib; {
description = "Blazing fast terminal-ui for git written in rust";
pkgs/applications/version-management/git-and-tools/gitweb/default.nix
+4 -4
View File
@@ -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 ];
};
}
pkgs/applications/version-management/git-and-tools/subgit/default.nix
+3 -3
View File
@@ -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 ];
pkgs/applications/version-management/git-and-tools/svn2git/default.nix
+3 -3
View File
@@ -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;
};
}
pkgs/applications/version-management/git-and-tools/tig/default.nix
+1 -1
View File
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
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 = ''
pkgs/applications/version-management/git-and-tools/transcrypt/default.nix
+2 -2
View File
@@ -22,11 +22,11 @@ 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
'';