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

Merge branch 'staging-next'

Browse Source
This commit is contained in:
Vladimír Čunát
2019-01-13 00:39:38 +01:00
parent 6ca8443c3b 3131a8ea84
commit 570d84a01e
226 changed files with 2164 additions and 2740 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/tools/documentation/doxygen/default.nix
View File

@@ -2,14 +2,14 @@
stdenv.mkDerivation rec {
name = "doxygen-1.8.14";
name = "doxygen-1.8.15";
src = fetchurl {
urls = [
"mirror://sourceforge/doxygen/${name}.src.tar.gz" # faster, with https, etc.
"http://doxygen.nl/files/${name}.src.tar.gz"
];
sha256 = "d1757e02755ef6f56fd45f1f4398598b920381948d6fcfa58f5ca6aa56f59d4d";
sha256 = "bd9c0ec462b6a9b5b41ede97bede5458e0d7bb40d4cfa27f6f622eb33c59245d";
};
nativeBuildInputs = [ cmake ];

4
pkgs/development/tools/misc/gdb/default.nix
View File

@@ -13,7 +13,7 @@
let
basename = "gdb-${version}";
version = "8.2";
version = "8.2.1";
in
assert pythonSupport -> python3 != null;
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://gnu/gdb/${basename}.tar.xz";
sha256 = "0fbw6j4z7kmvywwgavn7w3knp860i5i9qnjffc5p52bwkji43963";
sha256 = "00i27xqawjv282a07i73lp1l02n0a3ywzhykma75qg500wll6sha";
};
patches = [

4
pkgs/development/tools/misc/intel-gpu-tools/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, libdrm, libpciaccess, cairo, dri2proto, udev
{ stdenv, fetchurl, pkgconfig, libdrm, libpciaccess, cairo, xorgproto, udev
, libX11, libXext, libXv, libXrandr, glib, bison, libunwind, python3, kmod
, procps, utilmacros, gnome2, openssl, peg }:
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkgconfig utilmacros ];
buildInputs = [ libdrm libpciaccess cairo dri2proto udev libX11 kmod
buildInputs = [ libdrm libpciaccess cairo xorgproto udev libX11 kmod
libXext libXv libXrandr glib bison libunwind python3 procps
gnome2.gtkdoc openssl peg ];

6
pkgs/development/tools/misc/swig/3.x.nix
View File

@@ -11,10 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "1wyffskbkzj5zyhjnnpip80xzsjcr3p0q5486z3wdwabnysnhn8n";
};
# for cross-compiling we need pcre.dev in nativeBuildInputs to get pcre-config
nativeBuildInputs = [ autoconf automake libtool bison pcre.dev ];
disallowedReferences = [ buildPackages.pcre.dev ];
PCRE_CONFIG = "${pcre.dev}/bin/pcre-config";
nativeBuildInputs = [ autoconf automake libtool bison ];
buildInputs = [ pcre ];
configureFlags = [ "--without-tcl" ];

4
pkgs/development/tools/parsing/bison/3.x.nix
View File

@@ -1,11 +1,11 @@
{ stdenv, fetchurl, m4, perl, help2man }:
stdenv.mkDerivation rec {
name = "bison-3.2.2";
name = "bison-3.2.4";
src = fetchurl {
url = "mirror://gnu/bison/${name}.tar.gz";
sha256 = "0v3q6ym34krb4iskg0pspvpm35wmp3gx9njb9c35cv0w0h0j5z9z";
sha256 = "16n7xs3sa1rlhs8y8zg4gi2s2kbkz8d69w3xp935wjykk0i3wryb";
};
patches = []; # remove on another rebuild