diff options
Diffstat (limited to 'pkgs/applications/version-management')
17 files changed, 34 insertions, 34 deletions
diff --git a/pkgs/applications/version-management/bitkeeper/default.nix b/pkgs/applications/version-management/bitkeeper/default.nix index 875f9dfa4855f..c185a4fb759b5 100644 --- a/pkgs/applications/version-management/bitkeeper/default.nix +++ b/pkgs/applications/version-management/bitkeeper/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, perl, gperf, bison, groff -, pkgconfig, libXft, pcre +, pkg-config, libXft, pcre , libtomcrypt, libtommath, lz4 }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ perl gperf bison groff libXft pcre libtomcrypt libtommath lz4 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 831db07ffea79..f48fe4b1ec4ce 100644 --- a/pkgs/applications/version-management/git-and-tools/cgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/cgit/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, openssl, zlib, asciidoc, libxml2, libxslt -, docbook_xsl, pkgconfig, luajit +, docbook_xsl, pkg-config, luajit , coreutils, gnused, groff, docutils , gzip, bzip2, lzip, xz, zstd , python, wrapPython, pygments, markdown @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { sha256 = "09lzwa183nblr6l8ib35g2xrjf9wm9yhk3szfvyzkwivdv69c9r2"; }; - nativeBuildInputs = [ pkgconfig ] ++ [ python wrapPython ]; + nativeBuildInputs = [ pkg-config ] ++ [ python wrapPython ]; buildInputs = [ openssl zlib asciidoc libxml2 libxslt docbook_xsl luajit ]; 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 0117b6cb3b666..fb3f555cb1399 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 @@ -5,7 +5,7 @@ , libssh , cmake , perl -, pkgconfig +, pkg-config , rustPlatform , curl , libiconv @@ -30,7 +30,7 @@ buildRustPackage rec { nativeBuildInputs = [ cmake - pkgconfig + pkg-config perl ]; 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 d55ad89ca56d5..c7453aff85bce 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 @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, pkgconfig, makeWrapper, openssl, git, libiconv, Security, installShellFiles }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config, makeWrapper, openssl, git, libiconv, Security, installShellFiles }: rustPlatform.buildRustPackage rec { pname = "git-gone"; @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1g2jijx8y34lid9qwa26v4svab5v9ki6gn9vcfiy61dqa964c3l9"; - nativeBuildInputs = [ pkgconfig makeWrapper installShellFiles ]; + nativeBuildInputs = [ pkg-config makeWrapper installShellFiles ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ libiconv Security ]; 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 d594b99614198..b01976f7632ea 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 @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, installShellFiles, rustPlatform, pkgconfig, openssl, darwin }: +{ lib, stdenv, fetchFromGitHub, installShellFiles, rustPlatform, pkg-config, openssl, darwin }: with rustPlatform; @@ -15,7 +15,7 @@ buildRustPackage rec { cargoSha256 = "sha256-D1CIITuZSAsKYsK8U0q8HwPsYCyrfkTXZThxufEEkWU="; - nativeBuildInputs = [ pkgconfig installShellFiles ]; + nativeBuildInputs = [ pkg-config installShellFiles ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security 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 480725797a20a..9b2853551c2bd 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 @@ -2,7 +2,7 @@ , fetchFromGitHub , rustPlatform , Security -, pkgconfig, openssl +, pkg-config, openssl }: rustPlatform.buildRustPackage rec { @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-lvxEYjVMJoAFFRG5iVfGwxUeJObIxfEaWokk69l++nI="; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; meta = with lib; { 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 d7258dd3660c1..90f6ba5ac5ac8 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -15,7 +15,7 @@ , sendEmailSupport , darwin , withLibsecret ? false -, pkgconfig, glib, libsecret +, pkg-config, glib, libsecret , gzip # needed at runtime by gitweb.cgi }: @@ -73,7 +73,7 @@ stdenv.mkDerivation { ++ lib.optionals guiSupport [tcl tk] ++ lib.optionals withpcre2 [ pcre2 ] ++ lib.optionals stdenv.isDarwin [ darwin.Security ] - ++ lib.optionals withLibsecret [ pkgconfig glib libsecret ]; + ++ lib.optionals withLibsecret [ pkg-config glib libsecret ]; # required to support pthread_cancel() NIX_LDFLAGS = lib.optionalString (!stdenv.cc.isClang) "-lgcc_s" diff --git a/pkgs/applications/version-management/git-and-tools/gitin/default.nix b/pkgs/applications/version-management/git-and-tools/gitin/default.nix index c9111ea2c3227..e2aaafea20243 100644 --- a/pkgs/applications/version-management/git-and-tools/gitin/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gitin/default.nix @@ -1,7 +1,7 @@ { lib, stdenv , buildGoPackage , fetchFromGitHub -, pkgconfig +, pkg-config , libgit2_0_27 }: @@ -20,7 +20,7 @@ buildGoPackage rec { goDeps = ./deps.nix; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libgit2_0_27 ]; meta = with lib; { diff --git a/pkgs/applications/version-management/git-and-tools/grv/default.nix b/pkgs/applications/version-management/git-and-tools/grv/default.nix index f7aae5ba8d27e..041034651894b 100644 --- a/pkgs/applications/version-management/git-and-tools/grv/default.nix +++ b/pkgs/applications/version-management/git-and-tools/grv/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub, curl, ncurses, pkgconfig, readline +{ lib, stdenv, buildGoPackage, fetchFromGitHub, curl, ncurses, pkg-config, readline , cmake }: let version = "0.3.2"; @@ -8,7 +8,7 @@ buildGoPackage { inherit version; buildInputs = [ ncurses readline curl ]; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ pkg-config cmake ]; goPackagePath = "github.com/rgburke/grv"; 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 f907cdac036eb..6ac6cde44a87a 100644 --- a/pkgs/applications/version-management/git-and-tools/tig/default.nix +++ b/pkgs/applications/version-management/git-and-tools/tig/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, ncurses, asciidoc, xmlto, docbook_xsl, docbook_xml_dtd_45 -, readline, makeWrapper, git, libiconv, autoreconfHook, findXMLCatalogs, pkgconfig +, readline, makeWrapper, git, libiconv, autoreconfHook, findXMLCatalogs, pkg-config }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0wxcbfqsk8p84zizy6lf3gp5j122wrf8c7xlipki6nhcfhksn33b"; }; - nativeBuildInputs = [ makeWrapper autoreconfHook asciidoc xmlto docbook_xsl docbook_xml_dtd_45 findXMLCatalogs pkgconfig ]; + nativeBuildInputs = [ makeWrapper autoreconfHook asciidoc xmlto docbook_xsl docbook_xml_dtd_45 findXMLCatalogs pkg-config ]; autoreconfFlags = "-I tools -v"; diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index c16e66c9e8182..acfd91be331bd 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitLab, fetchFromGitHub, buildGoModule, ruby -, bundlerEnv, pkgconfig +, bundlerEnv, pkg-config # libgit2 + dependencies , libgit2, openssl, zlib, pcre, http-parser }: @@ -50,7 +50,7 @@ in buildGoModule rec { }; buildFlags = [ "-tags=static,system_libgit2" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ rubyEnv.wrappedRuby libgit openssl zlib pcre http-parser ]; doCheck = false; diff --git a/pkgs/applications/version-management/gitoxide/default.nix b/pkgs/applications/version-management/gitoxide/default.nix index ba359bc9779c5..51fc538261d14 100644 --- a/pkgs/applications/version-management/gitoxide/default.nix +++ b/pkgs/applications/version-management/gitoxide/default.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; - # Needed to get openssl-sys to use pkgconfig. + # Needed to get openssl-sys to use pkg-config. OPENSSL_NO_VENDOR = 1; meta = with lib; { diff --git a/pkgs/applications/version-management/gource/default.nix b/pkgs/applications/version-management/gource/default.nix index 048ad4036652b..c4a86b8d4be98 100644 --- a/pkgs/applications/version-management/gource/default.nix +++ b/pkgs/applications/version-management/gource/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, SDL2, ftgl, pkgconfig, libpng, libjpeg, pcre +{ lib, stdenv, fetchurl, SDL2, ftgl, pkg-config, libpng, libjpeg, pcre , SDL2_image, freetype, glew, libGLU, libGL, boost, glm }: @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "16p7b1x4r0915w883lp374jcdqqja37fnb7m8vnsfnl2n64gi8qr"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glew SDL2 ftgl libpng libjpeg pcre SDL2_image libGLU libGL boost glm freetype diff --git a/pkgs/applications/version-management/guitone/default.nix b/pkgs/applications/version-management/guitone/default.nix index 82513bab9527a..d78023d8468f1 100644 --- a/pkgs/applications/version-management/guitone/default.nix +++ b/pkgs/applications/version-management/guitone/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchmtn, qt4, qmake4Hook, pkgconfig, graphviz }: +{ lib, stdenv, fetchmtn, qt4, qmake4Hook, pkg-config, graphviz }: let version = "1.0-mtn-head"; in stdenv.mkDerivation { @@ -19,7 +19,7 @@ stdenv.mkDerivation { patches = [ ./parallel-building.patch ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ qt4 qmake4Hook graphviz ]; qmakeFlags = [ "guitone.pro" ]; diff --git a/pkgs/applications/version-management/monotone-viz/default.nix b/pkgs/applications/version-management/monotone-viz/default.nix index f4e21dd4149d2..5c260cc8e6cf1 100644 --- a/pkgs/applications/version-management/monotone-viz/default.nix +++ b/pkgs/applications/version-management/monotone-viz/default.nix @@ -1,10 +1,10 @@ -{ lib, stdenv, fetchurl, ocamlPackages, gnome2, pkgconfig, makeWrapper, glib +{ lib, stdenv, fetchurl, ocamlPackages, gnome2, pkg-config, 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 lib stdenv fetchurl pkgconfig xlibsWrapper libpng libjpeg expat libXaw + inherit lib stdenv fetchurl pkg-config xlibsWrapper libpng libjpeg expat libXaw yacc libtool fontconfig pango gd libwebp; }; in let inherit (gnome2) libgnomecanvas; in @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { version = "1.0.2"; pname = "monotone-viz"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ocaml lablgtk libgnomecanvas glib graphviz_2_0 makeWrapper camlp4]; src = fetchurl { url = "http://oandrieu.nerim.net/monotone-viz/${pname}-${version}-nolablgtk.tar.gz"; 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 c72256807dd88..8ecc5bf9ac8f0 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 @@ -{ lib, stdenv, fetchurl, pkgconfig, xlibsWrapper, libpng, libjpeg, expat, libXaw +{ lib, stdenv, fetchurl, pkg-config, xlibsWrapper, libpng, libjpeg, expat, libXaw , yacc, libtool, fontconfig, pango, gd, libwebp }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "39b8e1f2ba4cc1f5bdc8e39c7be35e5f831253008e4ee2c176984f080416676c"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xlibsWrapper libpng libjpeg expat libXaw yacc libtool fontconfig pango gd libwebp diff --git a/pkgs/applications/version-management/monotone/default.nix b/pkgs/applications/version-management/monotone/default.nix index c8c2d5b048b91..f20d827dc5ff0 100644 --- a/pkgs/applications/version-management/monotone/default.nix +++ b/pkgs/applications/version-management/monotone/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, boost, zlib, botan, libidn -, lua, pcre, sqlite, perl, pkgconfig, expect +, lua, pcre, sqlite, perl, pkg-config, expect , bzip2, gmp, openssl }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { patches = [ ./monotone-1.1-Adapt-to-changes-in-pcre-8.42.patch ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ boost zlib botan libidn lua pcre sqlite expect openssl gmp bzip2 ]; |