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

Merge branch 'staging-next' into staging

Browse Source
This commit is contained in:
Jan Tojnar
2021-01-19 13:50:04 +01:00
parent 2d91ad963f 1d26caa746
commit fc7bd322df
1696 changed files with 4737 additions and 3956 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/interpreters/angelscript/default.nix
+2 -2
View File
@@ -3,10 +3,10 @@ let
s = # Generated upstream information
rec {
baseName="angelscript";
version = "2.34.0";
version = "2.35.0";
name="${baseName}-${version}";
url="http://www.angelcode.com/angelscript/sdk/files/angelscript_${version}.zip";
sha256 = "1xxxpwln4v2yasa35y7552fsfd8fbg50gnbp4vxy0ajj2wvh9akg";
sha256 = "sha256-AQ3UXiPnNNRvWJHXDiaGB6EsuasSUD3aQvhC2dt+iFc=";
};
buildInputs = [
unzip
pkgs/development/interpreters/evcxr/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ cargo, fetchFromGitHub, makeWrapper, pkgconfig, rustPlatform, stdenv, gcc, Security, cmake }:
{ cargo, fetchFromGitHub, makeWrapper, pkg-config, rustPlatform, stdenv, gcc, Security, cmake }:
rustPlatform.buildRustPackage rec {
pname = "evcxr";
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
RUST_SRC_PATH = "${rustPlatform.rustLibSrc}";
nativeBuildInputs = [ pkgconfig makeWrapper cmake ];
nativeBuildInputs = [ pkg-config makeWrapper cmake ];
buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
postInstall = let
wrap = exe: ''
pkgs/development/interpreters/falcon/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, pcre, zlib, sqlite }:
{ stdenv, fetchFromGitHub, cmake, pkg-config, pcre, zlib, sqlite }:
stdenv.mkDerivation {
pname = "falcon";
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
sha256 = "1x3gdcz1gqhi060ngqi0ghryf69v8bn50yrbzfad8bhblvhzzdlf";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ cmake pcre zlib sqlite ];
meta = with stdenv.lib; {
pkgs/development/interpreters/gtk-server/default.nix
+2 -2
View File
@@ -2,7 +2,7 @@
, glib
, gtk3
, libffcall
, pkgconfig
, pkg-config
, wrapGAppsHook
}:
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
cd src
'';
nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
nativeBuildInputs = [ pkg-config wrapGAppsHook ];
buildInputs = [ libffcall glib gtk3 ];
configureOptions = [ "--with-gtk3" ];
pkgs/development/interpreters/guile/1.8.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ stdenv, pkgsBuildBuild, buildPackages
, fetchurl, makeWrapper, gawk, pkgconfig
, fetchurl, makeWrapper, gawk, pkg-config
, libtool, readline, gmp
}:
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
depsBuildBuild = [ buildPackages.stdenv.cc ]
++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
pkgsBuildBuild.guile_1_8;
nativeBuildInputs = [ makeWrapper gawk pkgconfig ];
nativeBuildInputs = [ makeWrapper gawk pkg-config ];
buildInputs = [ readline libtool ];
propagatedBuildInputs = [
pkgs/development/interpreters/guile/2.0.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ stdenv, pkgsBuildBuild, buildPackages
, fetchpatch, fetchurl, makeWrapper, gawk, pkgconfig
, fetchpatch, fetchurl, makeWrapper, gawk, pkg-config
, libffi, libtool, readline, gmp, boehmgc, libunistring
, coverageAnalysis ? null
}:
@@ -23,7 +23,7 @@
depsBuildBuild = [ buildPackages.stdenv.cc ]
++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
pkgsBuildBuild.guile_2_0;
nativeBuildInputs = [ makeWrapper gawk pkgconfig ];
nativeBuildInputs = [ makeWrapper gawk pkg-config ];
buildInputs = [ readline libtool libunistring libffi ];
propagatedBuildInputs = [
pkgs/development/interpreters/guile/default.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ stdenv, pkgsBuildBuild, buildPackages
, fetchurl, makeWrapper, gawk, pkgconfig
, fetchurl, makeWrapper, gawk, pkg-config
, libffi, libtool, readline, gmp, boehmgc, libunistring
, coverageAnalysis ? null
, fetchpatch
@@ -25,7 +25,7 @@
depsBuildBuild = [ buildPackages.stdenv.cc ]
++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
pkgsBuildBuild.guile;
nativeBuildInputs = [ makeWrapper gawk pkgconfig ];
nativeBuildInputs = [ makeWrapper gawk pkg-config ];
buildInputs = [ readline libtool libunistring libffi ];
propagatedBuildInputs = [
pkgs/development/interpreters/io/default.nix
+2 -2
View File
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, cmake, zlib, sqlite, gmp, libffi, cairo,
ncurses, freetype, libGLU, libGL, libpng, libtiff, libjpeg, readline, libsndfile,
libxml2, freeglut, libsamplerate, pcre, libevent, libedit, yajl,
python3, openssl, glfw, pkgconfig, libpthreadstubs, libXdmcp, libmemcached
python3, openssl, glfw, pkg-config, libpthreadstubs, libXdmcp, libmemcached
}:
stdenv.mkDerivation {
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
zlib sqlite gmp libffi cairo ncurses freetype
libGLU libGL libpng libtiff libjpeg readline libsndfile libxml2
freeglut libsamplerate pcre libevent libedit yajl
pkgconfig glfw openssl libpthreadstubs libXdmcp
pkg-config glfw openssl libpthreadstubs libXdmcp
libmemcached python3
];
pkgs/development/interpreters/lolcode/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, doxygen, cmake, readline }:
{ stdenv, fetchurl, pkg-config, doxygen, cmake, readline }:
with stdenv.lib;
stdenv.mkDerivation rec {
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "1li7ikcrs7wqah7gqkirg0k61n6pm12w7pydin966x1sdn9na46b";
};
nativeBuildInputs = [ pkgconfig cmake doxygen ];
nativeBuildInputs = [ pkg-config cmake doxygen ];
buildInputs = [ readline ];
# Maybe it clashes with lci scientific logic software package...
pkgs/development/interpreters/love/0.10.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchFromBitbucket, pkgconfig, SDL2, libGLU, libGL, openal, luajit,
{ stdenv, fetchFromBitbucket, pkg-config, SDL2, libGLU, libGL, openal, luajit,
libdevil, freetype, physfs, libmodplug, mpg123, libvorbis, libogg,
libtheora, which, autoconf, automake, libtool
}:
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
sha256 = "19yfmlcx6w8yi4ndm5lni8lrsvnn77bxw5py0dc293nzzlaqa9ym";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [
SDL2 libGLU libGL openal luajit libdevil freetype physfs libmodplug mpg123
libvorbis libogg libtheora autoconf which libtool automake
pkgs/development/interpreters/love/0.7.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig
{ stdenv, fetchurl, pkg-config
, SDL, libGLU, libGL, openal, lua
, libdevil, freetype, physfs
, libmodplug, mpg123, libvorbis, libogg
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
# see discussion on arch linux user repository (https://aur.archlinux.org/packages/love07/?setlang=cs#comment-684696)
patches = [ ./0.7-gl-prototypes.patch ];
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [
SDL libGLU libGL openal lua
libdevil freetype physfs libmodplug mpg123 libvorbis libogg libmng
pkgs/development/interpreters/love/0.8.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig
{ stdenv, fetchurl, pkg-config
, SDL, libGLU, libGL, openal, lua
, libdevil, freetype, physfs
, libmodplug, mpg123, libvorbis, libogg
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
sha256 = "1k4fcsa8zzi04ja179bmj24hvqcbm3icfvrvrzyz2gw9qwfclrwi";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [
SDL libGLU libGL openal lua
libdevil freetype physfs libmodplug mpg123 libvorbis libogg
pkgs/development/interpreters/love/0.9.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig
{ stdenv, fetchurl, pkg-config
, SDL2, libGLU, libGL, openal, luajit
, libdevil, freetype, physfs
, libmodplug, mpg123, libvorbis, libogg
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "1pikd0bzb44r4bf0jbgn78whz1yswpq1n5jc8nf87v42pm30kp84";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [
SDL2 libGLU libGL openal luajit
libdevil freetype physfs libmodplug mpg123 libvorbis libogg
pkgs/development/interpreters/love/11.1.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchFromBitbucket, pkgconfig, SDL2, libGLU, libGL, openal, luajit,
{ stdenv, fetchFromBitbucket, pkg-config, SDL2, libGLU, libGL, openal, luajit,
libdevil, freetype, physfs, libmodplug, mpg123, libvorbis, libogg,
libtheora, which, autoconf, automake, libtool
}:
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
sha256 = "18gfp65ngb8k8g7hgbw2bhrwk2i7m56m21d39pk4484q9z8p4vm7";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [
SDL2 libGLU libGL openal luajit libdevil freetype physfs libmodplug mpg123
libvorbis libogg libtheora autoconf which libtool automake
pkgs/development/interpreters/micropython/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, lib, fetchFromGitHub, pkgconfig, libffi, python3, readline }:
{ stdenv, lib, fetchFromGitHub, pkg-config, libffi, python3, readline }:
stdenv.mkDerivation rec {
pname = "micropython";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
fetchSubmodules = true;
};
nativeBuildInputs = [ pkgconfig python3 ];
nativeBuildInputs = [ pkg-config python3 ];
buildInputs = [ libffi readline ];
pkgs/development/interpreters/nix-exec/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, nix, git }: let
{ stdenv, fetchurl, pkg-config, nix, git }: let
version = "4.1.6";
in stdenv.mkDerivation {
pname = "nix-exec";
@@ -9,7 +9,7 @@ in stdenv.mkDerivation {
sha256 = "0slpsnzzzdkf5d9za7j4kr15jr4mn1k9klfsxibzy47b2bx1vkar";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ nix git ];
NIX_CFLAGS_COMPILE = "-std=c++1y";
pkgs/development/interpreters/octave/default.nix
+2 -2
View File
@@ -14,7 +14,7 @@
, libX11
, graphicsmagick
, pcre
, pkgconfig
, pkg-config
, libGL
, libGLU
, fltk
@@ -145,7 +145,7 @@ in mkDerivation rec {
]
;
nativeBuildInputs = [
pkgconfig
pkg-config
gfortran
# Listed here as well because it's outputs are split
fftw
pkgs/development/interpreters/php/generic.nix
+2 -2
View File
@@ -7,7 +7,7 @@ let
generic =
{ callPackage, lib, stdenv, nixosTests, config, fetchurl, makeWrapper
, symlinkJoin, writeText, autoconf, automake, bison, flex, libtool
, pkgconfig, re2c, apacheHttpd, libargon2, libxml2, pcre, pcre2
, pkg-config, re2c, apacheHttpd, libargon2, libxml2, pcre, pcre2
, systemd, system-sendmail, valgrind, xcbuild
, version
@@ -149,7 +149,7 @@ let
enableParallelBuilding = true;
nativeBuildInputs = [ autoconf automake bison flex libtool pkgconfig re2c ]
nativeBuildInputs = [ autoconf automake bison flex libtool pkg-config re2c ]
++ lib.optional stdenv.isDarwin xcbuild;
buildInputs =
pkgs/development/interpreters/pixie/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchgit, fetchurl, python2, makeWrapper, pkgconfig, gcc,
{ stdenv, fetchgit, fetchurl, python2, makeWrapper, pkg-config, gcc,
pypy, libffi, libedit, libuv, boost, zlib,
variant ? "jit", buildWithPypy ? false }:
@@ -32,7 +32,7 @@ let
build = {flags, target}: stdenv.mkDerivation rec {
pname = "pixie";
version = "0-r${commit-count}-${variant}";
nativeBuildInputs = [ makeWrapper pkgconfig ];
nativeBuildInputs = [ makeWrapper pkg-config ];
buildInputs = libs;
PYTHON = if buildWithPypy
then "${pypy}/pypy-c/pypy-c"
pkgs/development/interpreters/python/pypy/default.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ stdenv, substituteAll, fetchurl
, zlib ? null, zlibSupport ? true, bzip2, pkgconfig, libffi, libunwind, Security
, zlib ? null, zlibSupport ? true, bzip2, pkg-config, libffi, libunwind, Security
, sqlite, openssl, ncurses, python, expat, tcl, tk, tix, xlibsWrapper, libX11
, self, gdbm, db, lzma
, python-setup-hook
@@ -49,7 +49,7 @@ in with passthru; stdenv.mkDerivation rec {
inherit sha256;
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [
bzip2 openssl pythonForPypy libffi ncurses expat sqlite tk tcl xlibsWrapper libX11 gdbm db
] ++ optionals isPy3k [
pkgs/development/interpreters/qnial/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, unzip, pkgconfig, makeWrapper, ncurses }:
{ stdenv, fetchFromGitHub, unzip, pkg-config, makeWrapper, ncurses }:
stdenv.mkDerivation {
pname = "qnial";
@@ -26,7 +26,7 @@ stdenv.mkDerivation {
buildInputs = [
unzip
pkgconfig
pkg-config
ncurses
];
pkgs/development/interpreters/renpy/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, python2Packages, pkgconfig, SDL2
{ stdenv, fetchurl, python2Packages, pkg-config, SDL2
, libpng, ffmpeg_3, freetype, glew, libGL, libGLU, fribidi, zlib
, glib
}:
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
substituteInPlace launcher/game/choose_directory.rpy --replace /usr/bin/python ${python.interpreter}
'';
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [
python cython wrapPython tkinter
SDL2 libpng ffmpeg_3 freetype glew libGLU libGL fribidi zlib pygame_sdl2 glib
pkgs/development/interpreters/spidermonkey/1.8.5.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, lib, autoconf213, fetchurl, fetchpatch, pkgconfig, nspr, perl, python2, zip }:
{ stdenv, lib, autoconf213, fetchurl, fetchpatch, pkg-config, nspr, perl, python2, zip }:
stdenv.mkDerivation {
pname = "spidermonkey";
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
propagatedBuildInputs = [ nspr ];
nativeBuildInputs = [ pkgconfig ] ++ lib.optional stdenv.isAarch32 autoconf213;
nativeBuildInputs = [ pkg-config ] ++ lib.optional stdenv.isAarch32 autoconf213;
buildInputs = [ perl python2 zip ];
postUnpack = "sourceRoot=\${sourceRoot}/js/src";
pkgs/development/interpreters/spidermonkey/38.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, gnused_422, perl, python2, zip, libffi, readline, icu, zlib, buildPackages
{ stdenv, fetchurl, pkg-config, gnused_422, perl, python2, zip, libffi, readline, icu, zlib, buildPackages
, libobjc }:
with stdenv.lib;
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
buildInputs = [ libffi readline icu zlib ]
++ stdenv.lib.optional stdenv.isDarwin libobjc;
nativeBuildInputs = [ pkgconfig perl python2 zip gnused_422 ];
nativeBuildInputs = [ pkg-config perl python2 zip gnused_422 ];
postUnpack = "sourceRoot=\${sourceRoot}/js/src";
pkgs/development/interpreters/spidermonkey/60.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, fetchpatch, autoconf213, pkgconfig, perl, python2, zip, buildPackages
{ stdenv, fetchurl, fetchpatch, autoconf213, pkg-config, perl, python2, zip, buildPackages
, which, readline, zlib, icu }:
with stdenv.lib;
@@ -18,7 +18,7 @@ in stdenv.mkDerivation {
setOutputFlags = false; # Configure script only understands --includedir
buildInputs = [ readline zlib icu ];
nativeBuildInputs = [ autoconf213 pkgconfig perl which python2 zip ];
nativeBuildInputs = [ autoconf213 pkg-config perl which python2 zip ];
patches = [
# Fixed in 62.0
pkgs/development/interpreters/spidermonkey/68.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, fetchpatch, autoconf213, pkgconfig, perl, python2, python3, zip, buildPackages
{ stdenv, fetchurl, fetchpatch, autoconf213, pkg-config, perl, python2, python3, zip, buildPackages
, which, readline, zlib, icu, cargo, rustc, llvmPackages }:
with stdenv.lib;
@@ -19,7 +19,7 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [
autoconf213
pkgconfig
pkg-config
perl
which
python2
pkgs/development/interpreters/spidermonkey/78.nix
+2 -2
View File
@@ -2,7 +2,7 @@
, fetchurl
, fetchpatch
, autoconf213
, pkgconfig
, pkg-config
, perl
, python3
, zip
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
cargo
llvmPackages.llvm # for llvm-objdump
perl
pkgconfig
pkg-config
python3
rust-cbindgen
rustc
pkgs/development/interpreters/supercollider/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, cmake, pkgconfig, alsaLib
{ stdenv, fetchurl, cmake, pkg-config, alsaLib
, libjack2, libsndfile, fftw, curl, gcc
, libXt, qtbase, qttools, qtwebengine
, readline, qtwebsockets, useSCEL ? false, emacs
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
"-DSC_EL=${if useSCEL then "ON" else "OFF"}"
];
nativeBuildInputs = [ cmake pkgconfig qttools ];
nativeBuildInputs = [ cmake pkg-config qttools ];
buildInputs = [
gcc libjack2 libsndfile fftw curl libXt qtbase qtwebengine qtwebsockets readline ]