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

Merge staging-next into master

Browse Source
This commit is contained in:
Frederik Rietdijk
2018-07-17 10:04:59 +02:00
parent bac995cd9f 9d0336a2bb
commit 1ae2f10642
77 changed files with 496 additions and 453 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/tools/build-managers/cmake/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig
{ stdenv, fetchurl, fetchpatch, pkgconfig
, bzip2, curl, expat, libarchive, xz, zlib, libuv, rhash
, majorVersion ? "3.11"
# darwin attributes
@@ -57,6 +57,11 @@ stdenv.mkDerivation rec {
# Don't search in non-Nix locations such as /usr, but do search in our libc.
patches = [ ./search-path-3.9.patch ]
++ optional (versionOlder version "3.12") (fetchpatch {
name = "cmake-3.11-libuv-1.21.patch";
url = https://gitlab.kitware.com/cmake/cmake/commit/889033b5c6847cf1f7bd789384405d59dc333bf6.patch;
sha256 = "0683zbyb3bicaxqzrj4wgdan6x08k30m20kkmpjvw30nr6a8r6xq";
})
# Don't depend on frameworks.
++ optional (useSharedLibraries && majorVersion == "3.11") ./application-services.patch # TODO: remove conditional
++ optional stdenv.isCygwin ./3.2.2-cygwin.patch;

2
pkgs/development/tools/hexio/default.nix
View File

@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
patchPhase = ''
substituteInPlace Makefile \
--replace '-I/usr/local/include/PCSC/' '-I${pcsclite}/include/PCSC/' \
--replace '-I/usr/local/include/PCSC/' '-I${stdenv.lib.getDev pcsclite}/include/PCSC/' \
--replace '-L/usr/local/lib/pth' '-I${pth}/lib/'
'';

2
pkgs/development/tools/misc/automake/automake-1.11.x.nix
View File

@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
sha256 = "1ffbc6cc41f0ea6c864fbe9485b981679dc5e350f6c4bc6c3512f5a4226936b5";
};
patches = [ ./fix-test-autoconf-2.69.patch ];
patches = [ ./fix-test-autoconf-2.69.patch ./fix-perl-5.26.patch ];
buildInputs = [perl autoconf makeWrapper];

10
pkgs/development/tools/misc/automake/fix-perl-5.26.patch Normal file
View File

@@ -0,0 +1,10 @@
--- automake-1.11.2/automake.in
+++ automake-1.11.2/automake.in
@@ -4156,7 +4156,7 @@ sub substitute_ac_subst_variables_worker($)
sub substitute_ac_subst_variables ($)
{
my ($text) = @_;
- $text =~ s/\${([^ \t=:+{}]+)}/&substitute_ac_subst_variables_worker ($1)/ge;
+ $text =~ s/\$\{([^ \t=:+{}]+)}/&substitute_ac_subst_variables_worker ($1)/ge;
return $text;
}

8
pkgs/development/tools/parsing/bison/2.x.nix
View File

@@ -1,16 +1,18 @@
{ stdenv, fetchurl, m4, perl }:
{ stdenv, lib, fetchurl, m4, perl }:
stdenv.mkDerivation rec {
name = "bison-2.7";
name = "bison-2.7.1";
src = fetchurl {
url = "mirror://gnu/bison/${name}.tar.gz";
sha256 = "0cd8s2g7zjshya7kwjc9rh3drsssl4hiq4sccnkgf0nn9wvygfqr";
sha256 = "0c9li3iaslzzr3zig6m3zlmb4r8i0wfvkcrvdyiqxasb09mjkqh8";
};
nativeBuildInputs = [ m4 ] ++ stdenv.lib.optional doCheck perl;
propagatedBuildInputs = [ m4 ];
patches = lib.optional stdenv.isDarwin ./darwin-vasnprintf.patch;
doCheck = true;
# M4 = "${m4}/bin/m4";

12
pkgs/development/tools/parsing/bison/darwin-vasnprintf.patch Normal file
View File

@@ -0,0 +1,12 @@
diff -ur bison-2.7-pristine/lib/vasnprintf.c bison-2.7/lib/vasnprintf.c
--- bison-2.7-pristine/lib/vasnprintf.c 2012-11-30 20:48:23.000000000 +0900
+++ bison-2.7/lib/vasnprintf.c 2018-06-28 16:55:31.000000000 +0900
@@ -4870,7 +4870,7 @@
#endif
*fbp = dp->conversion;
#if USE_SNPRINTF
-# if !(((__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) && !defined __UCLIBC__) || ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__))
+# if !(((__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) && !defined __UCLIBC__) || ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__) || (defined __APPLE__ && defined __MACH__))
fbp[1] = '%';
fbp[2] = 'n';
fbp[3] = '\0';