diff options
Diffstat (limited to 'pkgs/applications/version-management')
68 files changed, 235 insertions, 235 deletions
diff --git a/pkgs/applications/version-management/bitkeeper/default.nix b/pkgs/applications/version-management/bitkeeper/default.nix index 78f62ebcf25..875f9dfa485 100644 --- a/pkgs/applications/version-management/bitkeeper/default.nix +++ b/pkgs/applications/version-management/bitkeeper/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, gperf, bison, groff +{ lib, stdenv, fetchurl, perl, gperf, bison, groff , pkgconfig, libXft, pcre , libtomcrypt, libtommath, lz4 }: @@ -48,9 +48,9 @@ stdenv.mkDerivation rec { scales up to very large projects and down to tiny ones. ''; homepage = "https://www.bitkeeper.org/"; - license = stdenv.lib.licenses.asl20; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ wscott thoughtpolice ]; + license = lib.licenses.asl20; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ wscott thoughtpolice ]; broken = true; # seems to fail on recent glibc versions }; } diff --git a/pkgs/applications/version-management/commitizen/node-composition.nix b/pkgs/applications/version-management/commitizen/node-composition.nix index 17879f381d5..0769168a78f 100644 --- a/pkgs/applications/version-management/commitizen/node-composition.nix +++ b/pkgs/applications/version-management/commitizen/node-composition.nix @@ -6,7 +6,7 @@ let nodeEnv = import ./node-env.nix { - inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile; + inherit (pkgs) lib stdenv python2 util-linux runCommand writeTextFile; inherit nodejs; libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; }; @@ -14,4 +14,4 @@ in import ./node-packages.nix { inherit (pkgs) fetchurl fetchgit; inherit nodeEnv; -} \ No newline at end of file +} diff --git a/pkgs/applications/version-management/commitizen/node-env.nix b/pkgs/applications/version-management/commitizen/node-env.nix index 04e3ee097fa..262df27e464 100644 --- a/pkgs/applications/version-management/commitizen/node-env.nix +++ b/pkgs/applications/version-management/commitizen/node-env.nix @@ -1,6 +1,6 @@ # This file originates from node2nix -{stdenv, nodejs, python2, util-linux, libtool, runCommand, writeTextFile}: +{lib, stdenv, nodejs, python2, util-linux, libtool, runCommand, writeTextFile}: let python = if nodejs ? python then nodejs.python else python2; @@ -38,8 +38,8 @@ let }; includeDependencies = {dependencies}: - stdenv.lib.optionalString (dependencies != []) - (stdenv.lib.concatMapStrings (dependency: + lib.optionalString (dependencies != []) + (lib.concatMapStrings (dependency: '' # Bundle the dependencies of the package mkdir -p node_modules @@ -100,7 +100,7 @@ let cd "$DIR/${packageName}" ${includeDependencies { inherit dependencies; }} cd .. - ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} ''; pinpointDependencies = {dependencies, production}: @@ -161,12 +161,12 @@ let '' node ${pinpointDependenciesFromPackageJSON} ${if production then "production" else "development"} - ${stdenv.lib.optionalString (dependencies != []) + ${lib.optionalString (dependencies != []) '' if [ -d node_modules ] then cd node_modules - ${stdenv.lib.concatMapStrings (dependency: pinpointDependenciesOfPackage dependency) dependencies} + ${lib.concatMapStrings (dependency: pinpointDependenciesOfPackage dependency) dependencies} cd .. fi ''} @@ -183,7 +183,7 @@ let cd "${packageName}" ${pinpointDependencies { inherit dependencies production; }} cd .. - ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} fi ''; @@ -344,8 +344,8 @@ let cd "${packageName}" runHook preRebuild - ${stdenv.lib.optionalString bypassCache '' - ${stdenv.lib.optionalString reconstructLock '' + ${lib.optionalString bypassCache '' + ${lib.optionalString reconstructLock '' if [ -f package-lock.json ] then echo "WARNING: Reconstruct lock option enabled, but a lock file already exists!" @@ -361,14 +361,14 @@ let node ${addIntegrityFieldsScript} ''} - npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} rebuild + npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} rebuild if [ "''${dontNpmInstall-}" != "1" ] then # NPM tries to download packages even when they already exist if npm-shrinkwrap is used. rm -f npm-shrinkwrap.json - npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} install + npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} install fi ''; @@ -396,8 +396,8 @@ let stdenv.mkDerivation ({ name = "node_${name}-${version}"; buildInputs = [ tarWrapper python nodejs ] - ++ stdenv.lib.optional (stdenv.isLinux) util-linux - ++ stdenv.lib.optional (stdenv.isDarwin) libtool + ++ lib.optional (stdenv.isLinux) util-linux + ++ lib.optional (stdenv.isDarwin) libtool ++ buildInputs; inherit nodejs; @@ -470,8 +470,8 @@ let name = "node-dependencies-${name}-${version}"; buildInputs = [ tarWrapper python nodejs ] - ++ stdenv.lib.optional (stdenv.isLinux) util-linux - ++ stdenv.lib.optional (stdenv.isDarwin) libtool + ++ lib.optional (stdenv.isLinux) util-linux + ++ lib.optional (stdenv.isDarwin) libtool ++ buildInputs; inherit dontStrip; # Stripping may fail a build for some package deployments @@ -491,7 +491,7 @@ let # Create fake package.json to make the npm commands work properly cp ${src}/package.json . chmod 644 package.json - ${stdenv.lib.optionalString bypassCache '' + ${lib.optionalString bypassCache '' if [ -f ${src}/package-lock.json ] then cp ${src}/package-lock.json . @@ -500,13 +500,13 @@ let # Go to the parent folder to make sure that all packages are pinpointed cd .. - ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }} # Expose the executables that were installed cd .. - ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} mv ${packageName} lib ln -s $out/lib/node_modules/.bin $out/bin @@ -516,7 +516,7 @@ let stdenv.mkDerivation { name = "node-shell-${name}-${version}"; - buildInputs = [ python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) util-linux ++ buildInputs; + buildInputs = [ python nodejs ] ++ lib.optional (stdenv.isLinux) util-linux ++ buildInputs; buildCommand = '' mkdir -p $out/bin cat > $out/bin/shell <<EOF @@ -529,14 +529,14 @@ let # Provide the dependencies in a development shell through the NODE_PATH environment variable inherit nodeDependencies; - shellHook = stdenv.lib.optionalString (dependencies != []) '' + shellHook = lib.optionalString (dependencies != []) '' export NODE_PATH=${nodeDependencies}/lib/node_modules export PATH="${nodeDependencies}/bin:$PATH" ''; }; in { - buildNodeSourceDist = stdenv.lib.makeOverridable buildNodeSourceDist; - buildNodePackage = stdenv.lib.makeOverridable buildNodePackage; - buildNodeShell = stdenv.lib.makeOverridable buildNodeShell; + buildNodeSourceDist = lib.makeOverridable buildNodeSourceDist; + buildNodePackage = lib.makeOverridable buildNodePackage; + buildNodeShell = lib.makeOverridable buildNodeShell; } diff --git a/pkgs/applications/version-management/cvsps/default.nix b/pkgs/applications/version-management/cvsps/default.nix index 133d8d7cbb4..f87e3f7cdaf 100644 --- a/pkgs/applications/version-management/cvsps/default.nix +++ b/pkgs/applications/version-management/cvsps/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, cvs, zlib }: +{ lib, stdenv, fetchurl, fetchpatch, cvs, zlib }: stdenv.mkDerivation rec { pname = "cvsps"; @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { same time (using a single "cvs commit" command). ''; homepage = "http://www.cobite.com/cvsps/"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl2; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/version-management/cvsq/default.nix b/pkgs/applications/version-management/cvsq/default.nix index a39c9ede524..dfffdb08238 100644 --- a/pkgs/applications/version-management/cvsq/default.nix +++ b/pkgs/applications/version-management/cvsq/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , makeWrapper , cvs @@ -28,15 +28,15 @@ stdenv.mkDerivation rec { postInstall = '' substituteInPlace $out/bin/cvsq --replace "/bin/sh" "${stdenv.shell}" substituteInPlace $out/bin/lcvs --replace "/bin/sh" "${stdenv.shell}" - wrapProgram $out/bin/cvsq --prefix PATH : ${stdenv.lib.makeBinPath + wrapProgram $out/bin/cvsq --prefix PATH : ${lib.makeBinPath [ cvs nettools findutils rsync coreutils diffutils ]} - wrapProgram $out/bin/cvsq-branch --prefix PATH : ${stdenv.lib.makeBinPath + wrapProgram $out/bin/cvsq-branch --prefix PATH : ${lib.makeBinPath [ cvs nettools findutils rsync coreutils diffutils ]} - wrapProgram $out/bin/cvsq-merge --prefix PATH : ${stdenv.lib.makeBinPath + wrapProgram $out/bin/cvsq-merge --prefix PATH : ${lib.makeBinPath [ cvs nettools findutils rsync coreutils diffutils ]} - wrapProgram $out/bin/cvsq-switch --prefix PATH : ${stdenv.lib.makeBinPath + wrapProgram $out/bin/cvsq-switch --prefix PATH : ${lib.makeBinPath [ cvs nettools findutils rsync coreutils diffutils ]} - wrapProgram $out/bin/lcvs --prefix PATH : ${stdenv.lib.makeBinPath + wrapProgram $out/bin/lcvs --prefix PATH : ${lib.makeBinPath [ cvs nettools findutils rsync coreutils diffutils ]} ''; @@ -60,8 +60,8 @@ stdenv.mkDerivation rec { be used for commits (that's what cvsq is for). ''; homepage = "https://www.linta.de/~aehlig/cvsq/"; - license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ clkamp ]; - platforms = stdenv.lib.platforms.all; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ clkamp ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix index d68535e0a4c..987e7dcdaad 100644 --- a/pkgs/applications/version-management/fossil/default.nix +++ b/pkgs/applications/version-management/fossil/default.nix @@ -29,12 +29,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ installShellFiles tcl ]; buildInputs = [ zlib openssl readline sqlite which ed ] - ++ stdenv.lib.optional stdenv.isDarwin libiconv; + ++ lib.optional stdenv.isDarwin libiconv; doCheck = stdenv.hostPlatform == stdenv.buildPlatform; configureFlags = [ "--disable-internal-sqlite" ] - ++ stdenv.lib.optional withJson "--json"; + ++ lib.optional withJson "--json"; preCheck = '' export TCLLIBPATH="${tcllib}/lib/tcllib${tcllib.version}" diff --git a/pkgs/applications/version-management/git-and-tools/cgit/default.nix b/pkgs/applications/version-management/git-and-tools/cgit/default.nix index 79c118a200c..831db07ffea 100644 --- a/pkgs/applications/version-management/git-and-tools/cgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/cgit/default.nix @@ -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 ]; }; } diff --git a/pkgs/applications/version-management/git-and-tools/darcs-to-git/default.nix b/pkgs/applications/version-management/git-and-tools/darcs-to-git/default.nix index 22d289d549a..f4b7d38bebc 100644 --- a/pkgs/applications/version-management/git-and-tools/darcs-to-git/default.nix +++ b/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/pkgs/applications/version-management/git-and-tools/ghq/default.nix b/pkgs/applications/version-management/git-and-tools/ghq/default.nix index 96f72f2d69c..c6fbf3b9569 100644 --- a/pkgs/applications/version-management/git-and-tools/ghq/default.nix +++ b/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/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix b/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix index c4824b6c66f..2d6d7401e28 100644 --- a/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix @@ -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"; diff --git a/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix index 55a9dd18f72..95e583585f1 100644 --- a/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix +++ b/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/pkgs/applications/version-management/git-and-tools/git-annex-remote-rclone/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex-remote-rclone/default.nix index ea44d7278f3..843a8d34881 100644 --- a/pkgs/applications/version-management/git-and-tools/git-annex-remote-rclone/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-annex-remote-rclone/default.nix @@ -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; { diff --git a/pkgs/applications/version-management/git-and-tools/git-annex-utils/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex-utils/default.nix index bcfc33e55e4..7ad040a7c17 100644 --- a/pkgs/applications/version-management/git-and-tools/git-annex-utils/default.nix +++ b/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/pkgs/applications/version-management/git-and-tools/git-appraise/default.nix b/pkgs/applications/version-management/git-and-tools/git-appraise/default.nix index 4895a2e399b..ba4cd42d29d 100644 --- a/pkgs/applications/version-management/git-and-tools/git-appraise/default.nix +++ b/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/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix b/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix index cd35c98a969..6cadd92eb3d 100644 --- a/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix @@ -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 ]; }; } diff --git a/pkgs/applications/version-management/git-and-tools/git-dit/default.nix b/pkgs/applications/version-management/git-and-tools/git-dit/default.nix index e41a8b3a525..0117b6cb3b6 100644 --- a/pkgs/applications/version-management/git-and-tools/git-dit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-dit/default.nix @@ -38,7 +38,7 @@ buildRustPackage rec { openssl_1_0_2 libssh zlib - ] ++ stdenv.lib.optionals (stdenv.isDarwin) [ + ] ++ lib.optionals (stdenv.isDarwin) [ curl libiconv CoreFoundation diff --git a/pkgs/applications/version-management/git-and-tools/git-gone/default.nix b/pkgs/applications/version-management/git-and-tools/git-gone/default.nix index f08f57ee8be..d55ad89ca56 100644 --- a/pkgs/applications/version-management/git-and-tools/git-gone/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-gone/default.nix @@ -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; { diff --git a/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix b/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix index 4ef97a30a1f..884eed2e2ef 100644 --- a/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix @@ -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 ]; diff --git a/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix b/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix index 2b76fb3dea5..1d669bfe49c 100644 --- a/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix @@ -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; diff --git a/pkgs/applications/version-management/git-and-tools/git-octopus/default.nix b/pkgs/applications/version-management/git-and-tools/git-octopus/default.nix index d5278d9d241..942a12e239b 100644 --- a/pkgs/applications/version-management/git-and-tools/git-octopus/default.nix +++ b/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/pkgs/applications/version-management/git-and-tools/git-open/default.nix b/pkgs/applications/version-management/git-and-tools/git-open/default.nix index ac28e555950..3ba53e837fa 100644 --- a/pkgs/applications/version-management/git-and-tools/git-open/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-open/default.nix @@ -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; { diff --git a/pkgs/applications/version-management/git-and-tools/git-recent/default.nix b/pkgs/applications/version-management/git-and-tools/git-recent/default.nix index b3a371063f3..2ecc5d872b8 100644 --- a/pkgs/applications/version-management/git-and-tools/git-recent/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-recent/default.nix @@ -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; { diff --git a/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix b/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix index 16efc8cbca1..d6a35a28d66 100644 --- a/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix @@ -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 ]}" ''; diff --git a/pkgs/applications/version-management/git-and-tools/git-reparent/default.nix b/pkgs/applications/version-management/git-and-tools/git-reparent/default.nix index 7bc4a05e53c..037de14658d 100644 --- a/pkgs/applications/version-management/git-and-tools/git-reparent/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-reparent/default.nix @@ -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; { diff --git a/pkgs/applications/version-management/git-and-tools/git-secret/default.nix b/pkgs/applications/version-management/git-and-tools/git-secret/default.nix index fe67aca55d1..eea7bed011b 100644 --- a/pkgs/applications/version-management/git-and-tools/git-secret/default.nix +++ b/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/pkgs/applications/version-management/git-and-tools/git-secrets/default.nix b/pkgs/applications/version-management/git-and-tools/git-secrets/default.nix index 90c2b884226..154a4048e0a 100644 --- a/pkgs/applications/version-management/git-and-tools/git-secrets/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-secrets/default.nix @@ -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; { diff --git a/pkgs/applications/version-management/git-and-tools/git-standup/default.nix b/pkgs/applications/version-management/git-and-tools/git-standup/default.nix index 541baee50a7..2bbf7840138 100644 --- a/pkgs/applications/version-management/git-and-tools/git-standup/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-standup/default.nix @@ -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; { diff --git a/pkgs/applications/version-management/git-and-tools/git-subset/default.nix b/pkgs/applications/version-management/git-and-tools/git-subset/default.nix index dd6902af243..204ded65fd3 100644 --- a/pkgs/applications/version-management/git-and-tools/git-subset/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-subset/default.nix @@ -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"; diff --git a/pkgs/applications/version-management/git-and-tools/git-sync/default.nix b/pkgs/applications/version-management/git-and-tools/git-sync/default.nix index bba35509555..87cb7452c75 100644 --- a/pkgs/applications/version-management/git-and-tools/git-sync/default.nix +++ b/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/pkgs/applications/version-management/git-and-tools/git-test/default.nix b/pkgs/applications/version-management/git-and-tools/git-test/default.nix index de345f17cf0..624ce561690 100644 --- a/pkgs/applications/version-management/git-and-tools/git-test/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-test/default.nix @@ -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; { diff --git a/pkgs/applications/version-management/git-and-tools/git-trim/default.nix b/pkgs/applications/version-management/git-and-tools/git-trim/default.nix index d827797b33a..d470b63a0b7 100644 --- a/pkgs/applications/version-management/git-and-tools/git-trim/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-trim/default.nix @@ -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 diff --git a/pkgs/applications/version-management/git-and-tools/git-workspace/default.nix b/pkgs/applications/version-management/git-and-tools/git-workspace/default.nix index aa869c754dc..9bb680a489d 100644 --- a/pkgs/applications/version-management/git-and-tools/git-workspace/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-workspace/default.nix @@ -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"; diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 8c7f323cbb6..d7258dd3660 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/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 @@ -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 ]; }; } diff --git a/pkgs/applications/version-management/git-and-tools/git2cl/default.nix b/pkgs/applications/version-management/git-and-tools/git2cl/default.nix index 34417cfaa8c..a1c63538220 100644 --- a/pkgs/applications/version-management/git-and-tools/git2cl/default.nix +++ b/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/pkgs/applications/version-management/git-and-tools/gitui/default.nix b/pkgs/applications/version-management/git-and-tools/gitui/default.nix index 20a446965f9..81b2984087b 100644 --- a/pkgs/applications/version-management/git-and-tools/gitui/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gitui/default.nix @@ -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"; diff --git a/pkgs/applications/version-management/git-and-tools/gitweb/default.nix b/pkgs/applications/version-management/git-and-tools/gitweb/default.nix index b6659b5f539..6f5ce3358a3 100644 --- a/pkgs/applications/version-management/git-and-tools/gitweb/default.nix +++ b/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/pkgs/applications/version-management/git-and-tools/subgit/default.nix b/pkgs/applications/version-management/git-and-tools/subgit/default.nix index 11189e02c8f..2f275827a2e 100644 --- a/pkgs/applications/version-management/git-and-tools/subgit/default.nix +++ b/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/pkgs/applications/version-management/git-and-tools/svn2git/default.nix b/pkgs/applications/version-management/git-and-tools/svn2git/default.nix index b61ae80bbee..69742b6d760 100644 --- a/pkgs/applications/version-management/git-and-tools/svn2git/default.nix +++ b/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/pkgs/applications/version-management/git-and-tools/tig/default.nix b/pkgs/applications/version-management/git-and-tools/tig/default.nix index 1a469970caf..f907cdac036 100644 --- a/pkgs/applications/version-management/git-and-tools/tig/default.nix +++ b/pkgs/applications/version-management/git-and-tools/tig/default.nix @@ -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 = '' diff --git a/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix b/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix index faa4d66d7ca..aebd488fe30 100644 --- a/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix +++ b/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix @@ -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 ''; diff --git a/pkgs/applications/version-management/git-backup/default.nix b/pkgs/applications/version-management/git-backup/default.nix index bb621647125..d73e77d6d94 100644 --- a/pkgs/applications/version-management/git-backup/default.nix +++ b/pkgs/applications/version-management/git-backup/default.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; meta = with lib; { homepage = "https://github.com/jsdw/git-backup"; diff --git a/pkgs/applications/version-management/git-crecord/default.nix b/pkgs/applications/version-management/git-crecord/default.nix index 9481f3ebd92..3b906e4dc2e 100644 --- a/pkgs/applications/version-management/git-crecord/default.nix +++ b/pkgs/applications/version-management/git-crecord/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pythonPackages }: +{ lib, stdenv, fetchFromGitHub, pythonPackages }: pythonPackages.buildPythonApplication rec { pname = "git-crecord"; @@ -16,6 +16,6 @@ pythonPackages.buildPythonApplication rec { meta = { homepage = "https://github.com/andrewshadura/git-crecord"; description = "Git subcommand to interactively select changes to commit or stage"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; }; } diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix index fb0b153bc3a..9c168d71dba 100644 --- a/pkgs/applications/version-management/git-repo/default.nix +++ b/pkgs/applications/version-management/git-repo/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { # Important runtime dependencies postFixup = '' wrapProgram $out/bin/repo --prefix PATH ":" \ - "${stdenv.lib.makeBinPath [ git gnupg less ]}" + "${lib.makeBinPath [ git gnupg less ]}" ''; meta = with lib; { diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index 528e7c3dd99..20c2e5c9ce8 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -1,10 +1,10 @@ -{ stdenv, buildGoPackage, fetchurl, makeWrapper +{ lib, stdenv, buildGoPackage, fetchurl, makeWrapper , git, bash, gzip, openssh, pam , sqliteSupport ? true , pamSupport ? true }: -with stdenv.lib; +with lib; buildGoPackage rec { pname = "gitea"; diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index 4fc84767cd4..7618b3f3ff1 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -1,4 +1,4 @@ -{ stdenv, libXcomposite, libgnome-keyring, makeWrapper, udev, curl, alsaLib +{ lib, stdenv, libXcomposite, libgnome-keyring, makeWrapper, udev, curl, alsaLib , libXfixes, atk, gtk3, libXrender, pango, gnome3, cairo, freetype, fontconfig , libX11, libXi, libxcb, libXext, libXcursor, glib, libXScrnSaver, libxkbfile, libXtst , nss, nspr, cups, fetchzip, expat, gdk-pixbuf, libXdamage, libXrandr, dbus @@ -6,7 +6,7 @@ , e2fsprogs, krb5, libdrm, mesa }: -with stdenv.lib; +with lib; let curlWithGnuTls = curl.override { gnutlsSupport = true; sslSupport = false; }; diff --git a/pkgs/applications/version-management/gitoxide/default.nix b/pkgs/applications/version-management/gitoxide/default.nix index c345b8d7a80..ba359bc9779 100644 --- a/pkgs/applications/version-management/gitoxide/default.nix +++ b/pkgs/applications/version-management/gitoxide/default.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] - ++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; + ++ lib.optionals stdenv.isDarwin [ Security ]; # Needed to get openssl-sys to use pkgconfig. OPENSSL_NO_VENDOR = 1; diff --git a/pkgs/applications/version-management/gogs/default.nix b/pkgs/applications/version-management/gogs/default.nix index b574c03248f..fed2fd9ea33 100644 --- a/pkgs/applications/version-management/gogs/default.nix +++ b/pkgs/applications/version-management/gogs/default.nix @@ -1,10 +1,10 @@ -{ stdenv, buildGoModule, fetchFromGitHub, makeWrapper +{ lib, stdenv, buildGoModule, fetchFromGitHub, makeWrapper , git, bash, gzip, openssh, pam , sqliteSupport ? true , pamSupport ? true }: -with stdenv.lib; +with lib; buildGoModule rec { pname = "gogs"; diff --git a/pkgs/applications/version-management/guitone/default.nix b/pkgs/applications/version-management/guitone/default.nix index 1ff1030150f..82513bab952 100644 --- a/pkgs/applications/version-management/guitone/default.nix +++ b/pkgs/applications/version-management/guitone/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchmtn, qt4, qmake4Hook, pkgconfig, graphviz }: +{ lib, stdenv, fetchmtn, qt4, qmake4Hook, pkgconfig, graphviz }: let version = "1.0-mtn-head"; in stdenv.mkDerivation { @@ -28,7 +28,7 @@ stdenv.mkDerivation { description = "Qt4 based GUI for monotone"; homepage = "https://guitone.thomaskeller.biz"; downloadPage = "https://code.monotone.ca/p/guitone/"; - license = stdenv.lib.licenses.gpl3; + license = lib.licenses.gpl3; inherit (qt4.meta) platforms; }; } diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix index ecad825dc8b..4f94e2926c4 100644 --- a/pkgs/applications/version-management/meld/default.nix +++ b/pkgs/applications/version-management/meld/default.nix @@ -23,7 +23,7 @@ python3.pkgs.buildPythonApplication rec { format = "other"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "toARTVq3kzJFSf1Y9OsgLY4oDAYzoLdl7ebfs0FgqBs="; }; diff --git a/pkgs/applications/version-management/mercurial/4.9.nix b/pkgs/applications/version-management/mercurial/4.9.nix index f0918ab69a6..29440724274 100644 --- a/pkgs/applications/version-management/mercurial/4.9.nix +++ b/pkgs/applications/version-management/mercurial/4.9.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python2Packages, makeWrapper, unzip +{ lib, stdenv, fetchurl, python2Packages, makeWrapper, unzip , guiSupport ? false, tk ? null , ApplicationServices , mercurialSrc ? fetchurl rec { @@ -22,13 +22,13 @@ in python2Packages.buildPythonApplication { inherit python; # pass it so that the same version can be used in hg2git buildInputs = [ makeWrapper docutils unzip ] - ++ stdenv.lib.optionals stdenv.isDarwin [ ApplicationServices ]; + ++ lib.optionals stdenv.isDarwin [ ApplicationServices ]; propagatedBuildInputs = [ hg-git dulwich ]; makeFlags = [ "PREFIX=$(out)" ]; - postInstall = (stdenv.lib.optionalString guiSupport + postInstall = (lib.optionalString guiSupport '' mkdir -p $out/etc/mercurial cp contrib/hgk $out/bin @@ -62,10 +62,10 @@ in python2Packages.buildPythonApplication { description = "A fast, lightweight SCM system for very large distributed projects"; homepage = "https://www.mercurial-scm.org"; downloadPage = "https://www.mercurial-scm.org/release/"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.eraserhd ]; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.eraserhd ]; updateWalker = true; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index e0400fd46c6..c841482126a 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python3Packages, makeWrapper, unzip +{ lib, stdenv, fetchurl, python3Packages, makeWrapper, unzip , guiSupport ? false, tk ? null , ApplicationServices }: @@ -20,11 +20,11 @@ in python3Packages.buildPythonApplication rec { passthru = { inherit python; }; # pass it so that the same version can be used in hg2git buildInputs = [ makeWrapper docutils unzip ] - ++ stdenv.lib.optionals stdenv.isDarwin [ ApplicationServices ]; + ++ lib.optionals stdenv.isDarwin [ ApplicationServices ]; makeFlags = [ "PREFIX=$(out)" ]; - postInstall = (stdenv.lib.optionalString guiSupport '' + postInstall = (lib.optionalString guiSupport '' mkdir -p $out/etc/mercurial cp contrib/hgk $out/bin cat >> $out/etc/mercurial/hgrc << EOF @@ -56,9 +56,9 @@ in python3Packages.buildPythonApplication rec { description = "A fast, lightweight SCM system for very large distributed projects"; homepage = "https://www.mercurial-scm.org"; downloadPage = "https://www.mercurial-scm.org/release/"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.eelco ]; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.eelco ]; updateWalker = true; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/version-management/monotone-viz/default.nix b/pkgs/applications/version-management/monotone-viz/default.nix index 03b98694eaf..f4e21dd4149 100644 --- a/pkgs/applications/version-management/monotone-viz/default.nix +++ b/pkgs/applications/version-management/monotone-viz/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchurl, ocamlPackages, gnome2, pkgconfig, makeWrapper, glib +{ lib, stdenv, fetchurl, ocamlPackages, gnome2, pkgconfig, makeWrapper, glib , libtool, libpng, yacc, expat, fontconfig, gd, pango, libjpeg, libwebp, xlibsWrapper, libXaw }: # We need an old version of Graphviz for format compatibility reasons. # This version is vulnerable, but monotone-viz will never feed it bad input. let graphviz_2_0 = import ./graphviz-2.0.nix { - inherit stdenv fetchurl pkgconfig xlibsWrapper libpng libjpeg expat libXaw + inherit lib stdenv fetchurl pkgconfig xlibsWrapper libpng libjpeg expat libXaw yacc libtool fontconfig pango gd libwebp; }; in let inherit (gnome2) libgnomecanvas; in @@ -48,8 +48,8 @@ stdenv.mkDerivation rec { meta = { inherit version; description = ''Monotone ancestry visualiser''; - license = stdenv.lib.licenses.gpl2Plus ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + license = lib.licenses.gpl2Plus ; + maintainers = [lib.maintainers.raskin]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/version-management/monotone-viz/graphviz-2.0.nix b/pkgs/applications/version-management/monotone-viz/graphviz-2.0.nix index 816bfcde67f..c72256807dd 100644 --- a/pkgs/applications/version-management/monotone-viz/graphviz-2.0.nix +++ b/pkgs/applications/version-management/monotone-viz/graphviz-2.0.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, xlibsWrapper, libpng, libjpeg, expat, libXaw +{ lib, stdenv, fetchurl, pkgconfig, xlibsWrapper, libpng, libjpeg, expat, libXaw , yacc, libtool, fontconfig, pango, gd, libwebp }: @@ -30,12 +30,12 @@ stdenv.mkDerivation rec { "--with-ltdl-include=${libtool}/include" "--with-ltdl-lib=${libtool.lib}/lib" ] - ++ stdenv.lib.optional (xlibsWrapper == null) "--without-x"; + ++ lib.optional (xlibsWrapper == null) "--without-x"; meta = { description = "A program for visualising graphs"; homepage = "http://www.graphviz.org/"; branch = "2.0"; - platforms = stdenv.lib.platforms.unix; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/version-management/monotone/default.nix b/pkgs/applications/version-management/monotone/default.nix index e08ea3c8cd8..c8c2d5b048b 100644 --- a/pkgs/applications/version-management/monotone/default.nix +++ b/pkgs/applications/version-management/monotone/default.nix @@ -5,7 +5,7 @@ let version = "1.1"; - perlVersion = stdenv.lib.getVersion perl; + perlVersion = lib.getVersion perl; in assert perlVersion != ""; diff --git a/pkgs/applications/version-management/mr/default.nix b/pkgs/applications/version-management/mr/default.nix index 05ef7021f16..da882f1e359 100644 --- a/pkgs/applications/version-management/mr/default.nix +++ b/pkgs/applications/version-management/mr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, perl }: +{ lib, stdenv, fetchgit, perl }: stdenv.mkDerivation { pname = "mr"; @@ -31,8 +31,8 @@ stdenv.mkDerivation { other version control systems can easily be added. ''; homepage = "http://myrepos.branchable.com/"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ antono henrytill ]; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ antono henrytill ]; }; } diff --git a/pkgs/applications/version-management/nitpick/default.nix b/pkgs/applications/version-management/nitpick/default.nix index bcb16ea8678..ba1f3bbb93b 100644 --- a/pkgs/applications/version-management/nitpick/default.nix +++ b/pkgs/applications/version-management/nitpick/default.nix @@ -1,6 +1,6 @@ { fetchFromGitHub , buildPythonPackage -, stdenv +, lib, stdenv , isPy27 }: @@ -10,7 +10,7 @@ buildPythonPackage rec { format = "other"; disabled = !isPy27; - + src = fetchFromGitHub { owner = "travisb-ca"; repo = pname; @@ -21,7 +21,7 @@ buildPythonPackage rec { installPhase = '' mkdir -p $out/share/src install -m 755 -t $out/share/src nitpick.py - + mkdir -p $out/bin ln -s $out/share/src/nitpick.py $out/bin/nitpick ''; @@ -34,7 +34,7 @@ buildPythonPackage rec { follow the code via whatever VCS or distribution mechanism. ''; homepage = "http://travisbrown.ca/projects/nitpick/docs/nitpick.html"; - license = with stdenv.lib.licenses; gpl2; + license = with lib.licenses; gpl2; maintainers = []; }; } diff --git a/pkgs/applications/version-management/p4v/default.nix b/pkgs/applications/version-management/p4v/default.nix index 01ea365b76c..476df99d232 100644 --- a/pkgs/applications/version-management/p4v/default.nix +++ b/pkgs/applications/version-management/p4v/default.nix @@ -48,8 +48,8 @@ stdenv.mkDerivation rec { meta = { description = "Perforce Visual Client"; homepage = "https://www.perforce.com"; - license = stdenv.lib.licenses.unfreeRedistributable; + license = lib.licenses.unfreeRedistributable; platforms = [ "x86_64-linux" ]; - maintainers = with stdenv.lib.maintainers; [ nathyong nioncode ]; + maintainers = with lib.maintainers; [ nathyong nioncode ]; }; } diff --git a/pkgs/applications/version-management/pijul/default.nix b/pkgs/applications/version-management/pijul/default.nix index a4b8be65117..a00332a93ce 100644 --- a/pkgs/applications/version-management/pijul/default.nix +++ b/pkgs/applications/version-management/pijul/default.nix @@ -22,13 +22,13 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-Xwk5bX9o41M/1BmkOpAscGQHikhzV+9qAwVz0qI7FRA"; - cargoBuildFlags = stdenv.lib.optional gitImportSupport "--features=git"; + cargoBuildFlags = lib.optional gitImportSupport "--features=git"; doCheck = false; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl libsodium xxHash zstd ] - ++ (stdenv.lib.optionals gitImportSupport [ libgit2 ]) - ++ (stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + ++ (lib.optionals gitImportSupport [ libgit2 ]) + ++ (lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ CoreServices Security SystemConfiguration ])); diff --git a/pkgs/applications/version-management/rapidsvn/default.nix b/pkgs/applications/version-management/rapidsvn/default.nix index fc6a8adc2ad..33eba79732d 100644 --- a/pkgs/applications/version-management/rapidsvn/default.nix +++ b/pkgs/applications/version-management/rapidsvn/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, wxGTK, subversion, apr, aprutil, python }: +{ lib, stdenv, fetchurl, wxGTK, subversion, apr, aprutil, python }: stdenv.mkDerivation rec { pname = "rapidsvn"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { description = "Multi-platform GUI front-end for the Subversion revision system"; homepage = "http://rapidsvn.tigris.org/"; - license = stdenv.lib.licenses.gpl3Plus; - maintainers = [ stdenv.lib.maintainers.viric ]; + license = lib.licenses.gpl3Plus; + maintainers = [ lib.maintainers.viric ]; }; } diff --git a/pkgs/applications/version-management/rcs/default.nix b/pkgs/applications/version-management/rcs/default.nix index 404d6ae09bc..f8143711318 100644 --- a/pkgs/applications/version-management/rcs/default.nix +++ b/pkgs/applications/version-management/rcs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, ed }: +{ lib, stdenv, fetchurl, fetchpatch, ed }: stdenv.mkDerivation rec { name = "rcs-5.9.4"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ ed ]; - patches = stdenv.lib.optionals stdenv.isDarwin [ + patches = lib.optionals stdenv.isDarwin [ # This failure appears unrelated to the subject of the test. This # test seems to rely on a bash bug where `test $x -nt $y` ignores # subsecond values in timetamps. This bug has been fixed in Bash @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-std=c99"; - hardeningDisable = stdenv.lib.optional stdenv.cc.isClang "format"; + hardeningDisable = lib.optional stdenv.cc.isClang "format"; meta = { homepage = "https://www.gnu.org/software/rcs/"; @@ -66,8 +66,8 @@ stdenv.mkDerivation rec { documentation, graphics, papers, and form letters. ''; - license = stdenv.lib.licenses.gpl3Plus; - maintainers = with stdenv.lib.maintainers; [ eelco ]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ eelco ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/version-management/sit/default.nix b/pkgs/applications/version-management/sit/default.nix index bd8d5db36be..83370f5c6f0 100644 --- a/pkgs/applications/version-management/sit/default.nix +++ b/pkgs/applications/version-management/sit/default.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ cmake ]; buildInputs = [ libzip gnupg ] - ++ (stdenv.lib.optionals stdenv.isDarwin [ libiconv CoreFoundation Security ]); + ++ (lib.optionals stdenv.isDarwin [ libiconv CoreFoundation Security ]); preCheck = '' export HOME=$(mktemp -d) diff --git a/pkgs/applications/version-management/smartgithg/default.nix b/pkgs/applications/version-management/smartgithg/default.nix index f2bd4bf576b..324c61ab194 100644 --- a/pkgs/applications/version-management/smartgithg/default.nix +++ b/pkgs/applications/version-management/smartgithg/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { buildInputs = [ jre gnome3.adwaita-icon-theme gtk3 ]; - preFixup = with stdenv.lib; '' + preFixup = with lib; '' gappsWrapperArgs+=( \ --prefix PATH : ${makeBinPath [ jre which ]} \ --prefix LD_LIBRARY_PATH : ${makeLibraryPath [ @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - desktopItem = with stdenv.lib; makeDesktopItem rec { + desktopItem = with lib; makeDesktopItem rec { name = "smartgit"; exec = "smartgit"; comment = meta.description; @@ -89,6 +89,6 @@ stdenv.mkDerivation rec { homepage = "https://www.syntevo.com/smartgit/"; license = licenses.unfree; platforms = platforms.linux; - maintainers = with stdenv.lib.maintainers; [ jraygauthier ]; + maintainers = with lib.maintainers; [ jraygauthier ]; }; } diff --git a/pkgs/applications/version-management/sourcehut/fetchNodeModules.nix b/pkgs/applications/version-management/sourcehut/fetchNodeModules.nix index 047890a932c..bbc18d0442d 100644 --- a/pkgs/applications/version-management/sourcehut/fetchNodeModules.nix +++ b/pkgs/applications/version-management/sourcehut/fetchNodeModules.nix @@ -1,8 +1,8 @@ -{ stdenv, jq }: { src, nodejs, sha256 }: +{ lib, stdenv, jq }: { src, nodejs, sha256 }: # Only npm >= 5.4.2 is deterministic, see: # https://github.com/npm/npm/issues/17979#issuecomment-332701215 -assert stdenv.lib.versionAtLeast nodejs.version "8.9.0"; +assert lib.versionAtLeast nodejs.version "8.9.0"; stdenv.mkDerivation { name = "node_modules"; diff --git a/pkgs/applications/version-management/srcml/default.nix b/pkgs/applications/version-management/srcml/default.nix index 6deca94fc15..c13a08a711c 100644 --- a/pkgs/applications/version-management/srcml/default.nix +++ b/pkgs/applications/version-management/srcml/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, cmake, libxml2, libxslt, boost, libarchive, python, antlr, +{ lib, stdenv, fetchurl, cmake, libxml2, libxslt, boost, libarchive, python, antlr, curl }: -with stdenv.lib; +with lib; stdenv.mkDerivation rec { version = "0.9.5_beta"; diff --git a/pkgs/applications/version-management/sublime-merge/common.nix b/pkgs/applications/version-management/sublime-merge/common.nix index 6ed644d050e..e6c83eb55d8 100644 --- a/pkgs/applications/version-management/sublime-merge/common.nix +++ b/pkgs/applications/version-management/sublime-merge/common.nix @@ -7,7 +7,7 @@ let pname = "sublime-merge"; - packageAttribute = "sublime-merge${stdenv.lib.optionalString dev "-dev"}"; + packageAttribute = "sublime-merge${lib.optionalString dev "-dev"}"; binaries = [ "sublime_merge" "crash_reporter" "git-credential-sublime" "ssh-askpass-sublime" ]; primaryBinary = "sublime_merge"; primaryBinaryAliases = [ "smerge" ]; @@ -17,7 +17,7 @@ let archSha256 = sha256; arch = "x64"; - libPath = stdenv.lib.makeLibraryPath [ xorg.libX11 glib gtk3 cairo pango ]; + libPath = lib.makeLibraryPath [ xorg.libX11 glib gtk3 cairo pango ]; redirects = [ "/usr/bin/pkexec=${pkexecPath}" "/bin/true=${coreutils}/bin/true" ]; in let binaryPackage = stdenv.mkDerivation { @@ -40,7 +40,7 @@ in let for binary in ${ builtins.concatStringsSep " " binaries }; do patchelf \ --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ${libPath}:${libGL}/lib:${stdenv.cc.cc.lib}/lib${stdenv.lib.optionalString stdenv.is64bit "64"} \ + --set-rpath ${libPath}:${libGL}/lib:${stdenv.cc.cc.lib}/lib${lib.optionalString stdenv.is64bit "64"} \ $binary done @@ -105,11 +105,11 @@ in stdenv.mkDerivation (rec { passthru.updateScript = writeScript "${pname}-update-script" '' #!${stdenv.shell} set -o errexit - PATH=${stdenv.lib.makeBinPath [ common-updater-scripts curl gnugrep ]} + PATH=${lib.makeBinPath [ common-updater-scripts curl gnugrep ]} latestVersion=$(curl -s ${versionUrl} | grep -Po '(?<=<p class="latest"><i>Version:</i> Build )([0-9]+)') - for platform in ${stdenv.lib.concatStringsSep " " meta.platforms}; do + for platform in ${lib.concatStringsSep " " meta.platforms}; do # The script will not perform an update when the version attribute is up to date from previous platform run # We need to clear it before each run update-source-version ${packageAttribute}.${primaryBinary} 0 0000000000000000000000000000000000000000000000000000000000000000 --file=${versionFile} --version-key=buildVersion --system=$platform diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index 66d22e9d718..5540e53c84e 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -31,10 +31,10 @@ let buildInputs = [ zlib apr aprutil sqlite openssl ] ++ extraBuildInputs - ++ stdenv.lib.optional httpSupport serf - ++ stdenv.lib.optional pythonBindings python - ++ stdenv.lib.optional perlBindings perl - ++ stdenv.lib.optional saslSupport sasl; + ++ lib.optional httpSupport serf + ++ lib.optional pythonBindings python + ++ lib.optional perlBindings perl + ++ lib.optional saslSupport sasl; patches = [ ./apr-1.patch ]; @@ -44,15 +44,15 @@ let CPPFLAGS = [ "-P" ]; configureFlags = [ - (stdenv.lib.withFeature bdbSupport "berkeley-db") - (stdenv.lib.withFeatureAs httpServer "apxs" "${apacheHttpd.dev}/bin/apxs") - (stdenv.lib.withFeatureAs (pythonBindings || perlBindings) "swig" swig) - (stdenv.lib.withFeatureAs saslSupport "sasl" sasl) - (stdenv.lib.withFeatureAs httpSupport "serf" serf) + (lib.withFeature bdbSupport "berkeley-db") + (lib.withFeatureAs httpServer "apxs" "${apacheHttpd.dev}/bin/apxs") + (lib.withFeatureAs (pythonBindings || perlBindings) "swig" swig) + (lib.withFeatureAs saslSupport "sasl" sasl) + (lib.withFeatureAs httpSupport "serf" serf) "--disable-keychain" "--with-zlib=${zlib.dev}" "--with-sqlite=${sqlite.dev}" - ] ++ stdenv.lib.optionals javahlBindings [ + ] ++ lib.optionals javahlBindings [ "--enable-javahl" "--with-jdk=${jdk}" ]; @@ -103,7 +103,7 @@ let platforms = platforms.linux ++ platforms.darwin; }; - } // stdenv.lib.optionalAttrs stdenv.isDarwin { + } // lib.optionalAttrs stdenv.isDarwin { CXX = "clang++"; CC = "clang"; CPP = "clang -E"; diff --git a/pkgs/applications/version-management/tkcvs/default.nix b/pkgs/applications/version-management/tkcvs/default.nix index d2a7299bcd9..6a9e910f801 100644 --- a/pkgs/applications/version-management/tkcvs/default.nix +++ b/pkgs/applications/version-management/tkcvs/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, tcl, tk}: +{lib, stdenv, fetchurl, tcl, tk}: stdenv.mkDerivation { @@ -22,7 +22,7 @@ stdenv.mkDerivation meta = { homepage = "https://tkcvs.sourceforge.io"; description = "TCL/TK GUI for cvs and subversion"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/version-management/yadm/default.nix b/pkgs/applications/version-management/yadm/default.nix index 3a45d126203..b75af94af56 100644 --- a/pkgs/applications/version-management/yadm/default.nix +++ b/pkgs/applications/version-management/yadm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, git, gnupg }: +{ lib, stdenv, fetchFromGitHub, git, gnupg }: let version = "2.5.0"; in stdenv.mkDerivation { @@ -35,8 +35,8 @@ stdenv.mkDerivation { * Provides a way to use alternate files on a specific OS or host. * Supplies a method of encrypting confidential data so it can safely be stored in your repository. ''; - license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ abathur ]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ abathur ]; + platforms = lib.platforms.unix; }; } |