Merge pull request #48306 from NixOS/staging-next
Merge staging-next into master
This commit is contained in:
Frederik Rietdijk
GitHub
commit
821a3beb10
@ -4,7 +4,7 @@
|
||||
|
||||
let
|
||||
# if you bump version, update pkgs.tortoisehg too or ping maintainer
|
||||
version = "4.7.1";
|
||||
version = "4.7.2";
|
||||
name = "mercurial-${version}";
|
||||
inherit (python2Packages) docutils hg-git dulwich python;
|
||||
in python2Packages.buildPythonApplication {
|
||||
@ -13,7 +13,7 @@ in python2Packages.buildPythonApplication {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://mercurial-scm.org/release/${name}.tar.gz";
|
||||
sha256 = "03217dk8jh2ckrqqhqyahw44f5j2aq3kv03ba5v2b11i3hy3h0w5";
|
||||
sha256 = "1yq9r8s9jzj8hk2yizjk25s4w16yx9b8mbdj6wp8ld7j2r15kw4p";
|
||||
};
|
||||
|
||||
inherit python; # pass it so that the same version can be used in hg2git
|
||||
|
||||
@ -91,8 +91,10 @@ in stdenv.mkDerivation (args // {
|
||||
|
||||
installPhase = args.installPhase or ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/bin
|
||||
find target/release -maxdepth 1 -executable -type f -exec cp "{}" $out/bin \;
|
||||
mkdir -p $out/bin $out/lib
|
||||
find target/release -maxdepth 1 -type f -executable ! \( -regex ".*\.\(so.[0-9.]+\|so\|a\|dylib\)" \) -print0 | xargs -r -0 cp -t $out/bin
|
||||
find target/release -maxdepth 1 -regex ".*\.\(so.[0-9.]+\|so\|a\|dylib\)" -print0 | xargs -r -0 cp -t $out/lib
|
||||
rmdir --ignore-fail-on-non-empty $out/lib $out/bin
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
|
||||
@ -6,11 +6,11 @@
|
||||
|
||||
let
|
||||
rustPlatform = recurseIntoAttrs (makeRustPlatform (callPackage ./bootstrap.nix {}));
|
||||
version = "1.29.0";
|
||||
cargoVersion = "1.29.0";
|
||||
version = "1.29.1";
|
||||
cargoVersion = "1.29.1";
|
||||
src = fetchurl {
|
||||
url = "https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz";
|
||||
sha256 = "1sb15znckj8pc8q3g7cq03pijnida6cg64yqmgiayxkzskzk9sx4";
|
||||
sha256 = "0jd3c57x3yndizns4pb68nh25si47agfmrdvf9nwwsyfcs5p5c7i";
|
||||
};
|
||||
in rec {
|
||||
rustc = callPackage ./rustc.nix {
|
||||
|
||||
@ -40,19 +40,17 @@ let
|
||||
disallowedReferences = [ stdenv.cc ];
|
||||
|
||||
patches =
|
||||
[ ]
|
||||
# Do not look in /usr etc. for dependencies.
|
||||
++ optional (versionOlder version "5.26") ./no-sys-dirs.patch
|
||||
++ optional (versionAtLeast version "5.26") ./no-sys-dirs-5.26.patch
|
||||
++ optional (versionAtLeast version "5.24") (
|
||||
[
|
||||
# Do not look in /usr etc. for dependencies.
|
||||
./no-sys-dirs-5.26.patch
|
||||
# Fix parallel building: https://rt.perl.org/Public/Bug/Display.html?id=132360
|
||||
fetchurlBoot {
|
||||
(fetchurlBoot {
|
||||
url = "https://rt.perl.org/Public/Ticket/Attachment/1502646/807252/0001-Fix-missing-build-dependency-for-pods.patch";
|
||||
sha256 = "1bb4mldfp8kq1scv480wm64n2jdsqa3ar46cjp1mjpby8h5dr2r0";
|
||||
})
|
||||
]
|
||||
++ optional stdenv.isSunOS ./ld-shared.patch
|
||||
++ optional stdenv.isDarwin ./cpp-precomp.patch
|
||||
++ optional (stdenv.isDarwin && versionAtLeast version "5.24") ./sw_vers.patch
|
||||
++ optionals stdenv.isDarwin [ ./cpp-precomp.patch ./sw_vers.patch ]
|
||||
++ optional crossCompiling ./MakeMaker-cross.patch;
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -1,250 +0,0 @@
|
||||
diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/Configure perl-5.20.0/Configure
|
||||
--- perl-5.20.0-orig/Configure 2014-05-26 15:34:18.000000000 +0200
|
||||
+++ perl-5.20.0/Configure 2014-06-25 10:43:35.368285986 +0200
|
||||
@@ -106,15 +106,7 @@
|
||||
fi
|
||||
|
||||
: Proper PATH setting
|
||||
-paths='/bin /usr/bin /usr/local/bin /usr/ucb /usr/local /usr/lbin'
|
||||
-paths="$paths /opt/bin /opt/local/bin /opt/local /opt/lbin"
|
||||
-paths="$paths /usr/5bin /etc /usr/gnu/bin /usr/new /usr/new/bin /usr/nbin"
|
||||
-paths="$paths /opt/gnu/bin /opt/new /opt/new/bin /opt/nbin"
|
||||
-paths="$paths /sys5.3/bin /sys5.3/usr/bin /bsd4.3/bin /bsd4.3/usr/ucb"
|
||||
-paths="$paths /bsd4.3/usr/bin /usr/bsd /bsd43/bin /opt/ansic/bin /usr/ccs/bin"
|
||||
-paths="$paths /etc /usr/lib /usr/ucblib /lib /usr/ccs/lib"
|
||||
-paths="$paths /sbin /usr/sbin /usr/libexec"
|
||||
-paths="$paths /system/gnu_library/bin"
|
||||
+paths=''
|
||||
|
||||
for p in $paths
|
||||
do
|
||||
@@ -1337,8 +1329,7 @@
|
||||
archname=''
|
||||
: Possible local include directories to search.
|
||||
: Set locincpth to "" in a hint file to defeat local include searches.
|
||||
-locincpth="/usr/local/include /opt/local/include /usr/gnu/include"
|
||||
-locincpth="$locincpth /opt/gnu/include /usr/GNU/include /opt/GNU/include"
|
||||
+locincpth=""
|
||||
:
|
||||
: no include file wanted by default
|
||||
inclwanted=''
|
||||
@@ -1349,17 +1340,12 @@
|
||||
|
||||
libnames=''
|
||||
: change the next line if compiling for Xenix/286 on Xenix/386
|
||||
-xlibpth='/usr/lib/386 /lib/386'
|
||||
+xlibpth=''
|
||||
: Possible local library directories to search.
|
||||
-loclibpth="/usr/local/lib /opt/local/lib /usr/gnu/lib"
|
||||
-loclibpth="$loclibpth /opt/gnu/lib /usr/GNU/lib /opt/GNU/lib"
|
||||
+loclibpth=""
|
||||
|
||||
: general looking path for locating libraries
|
||||
-glibpth="/lib /usr/lib $xlibpth"
|
||||
-glibpth="$glibpth /usr/ccs/lib /usr/ucblib /usr/local/lib"
|
||||
-test -f /usr/shlib/libc.so && glibpth="/usr/shlib $glibpth"
|
||||
-test -f /shlib/libc.so && glibpth="/shlib $glibpth"
|
||||
-test -d /usr/lib64 && glibpth="$glibpth /lib64 /usr/lib64 /usr/local/lib64"
|
||||
+glibpth=""
|
||||
|
||||
: Private path used by Configure to find libraries. Its value
|
||||
: is prepended to libpth. This variable takes care of special
|
||||
@@ -1391,8 +1377,6 @@
|
||||
libswanted="$libswanted m crypt sec util c cposix posix ucb bsd BSD"
|
||||
: We probably want to search /usr/shlib before most other libraries.
|
||||
: This is only used by the lib/ExtUtils/MakeMaker.pm routine extliblist.
|
||||
-glibpth=`echo " $glibpth " | sed -e 's! /usr/shlib ! !'`
|
||||
-glibpth="/usr/shlib $glibpth"
|
||||
: Do not use vfork unless overridden by a hint file.
|
||||
usevfork=false
|
||||
|
||||
@@ -2446,7 +2430,6 @@
|
||||
zip
|
||||
"
|
||||
pth=`echo $PATH | sed -e "s/$p_/ /g"`
|
||||
-pth="$pth $sysroot/lib $sysroot/usr/lib"
|
||||
for file in $loclist; do
|
||||
eval xxx=\$$file
|
||||
case "$xxx" in
|
||||
@@ -4936,7 +4919,7 @@
|
||||
: Set private lib path
|
||||
case "$plibpth" in
|
||||
'') if ./mips; then
|
||||
- plibpth="$incpath/usr/lib $sysroot/usr/local/lib $sysroot/usr/ccs/lib"
|
||||
+ plibpth="$incpath/usr/lib"
|
||||
fi;;
|
||||
esac
|
||||
case "$libpth" in
|
||||
@@ -8600,13 +8583,8 @@
|
||||
echo " "
|
||||
case "$sysman" in
|
||||
'')
|
||||
- syspath='/usr/share/man/man1 /usr/man/man1'
|
||||
- syspath="$syspath /usr/man/mann /usr/man/manl /usr/man/local/man1"
|
||||
- syspath="$syspath /usr/man/u_man/man1"
|
||||
- syspath="$syspath /usr/catman/u_man/man1 /usr/man/l_man/man1"
|
||||
- syspath="$syspath /usr/local/man/u_man/man1 /usr/local/man/l_man/man1"
|
||||
- syspath="$syspath /usr/man/man.L /local/man/man1 /usr/local/man/man1"
|
||||
- sysman=`./loc . /usr/man/man1 $syspath`
|
||||
+ syspath=''
|
||||
+ sysman=''
|
||||
;;
|
||||
esac
|
||||
if $test -d "$sysman"; then
|
||||
@@ -19900,9 +19878,10 @@
|
||||
case "$full_ar" in
|
||||
'') full_ar=$ar ;;
|
||||
esac
|
||||
+full_ar=ar
|
||||
|
||||
: Store the full pathname to the sed program for use in the C program
|
||||
-full_sed=$sed
|
||||
+full_sed=sed
|
||||
|
||||
: see what type gids are declared as in the kernel
|
||||
echo " "
|
||||
Only in perl-5.20.0/: Configure.orig
|
||||
diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/ext/Errno/Errno_pm.PL perl-5.20.0/ext/Errno/Errno_pm.PL
|
||||
--- perl-5.20.0-orig/ext/Errno/Errno_pm.PL 2014-05-26 15:34:20.000000000 +0200
|
||||
+++ perl-5.20.0/ext/Errno/Errno_pm.PL 2014-06-25 10:31:24.317970047 +0200
|
||||
@@ -126,11 +126,7 @@
|
||||
if ($dep =~ /(\S+errno\.h)/) {
|
||||
$file{$1} = 1;
|
||||
}
|
||||
- } elsif ($^O eq 'linux' &&
|
||||
- $Config{gccversion} ne '' &&
|
||||
- $Config{gccversion} !~ /intel/i
|
||||
- # might be using, say, Intel's icc
|
||||
- ) {
|
||||
+ } elsif (0) {
|
||||
# When cross-compiling we may store a path for gcc's "sysroot" option:
|
||||
my $sysroot = $Config{sysroot} || '';
|
||||
# Some Linuxes have weird errno.hs which generate
|
||||
Only in perl-5.20.0/ext/Errno: Errno_pm.PL.orig
|
||||
diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/hints/freebsd.sh perl-5.20.0/hints/freebsd.sh
|
||||
--- perl-5.20.0-orig/hints/freebsd.sh 2014-01-31 22:55:51.000000000 +0100
|
||||
+++ perl-5.20.0/hints/freebsd.sh 2014-06-25 10:25:53.263964680 +0200
|
||||
@@ -119,21 +119,21 @@
|
||||
objformat=`/usr/bin/objformat`
|
||||
if [ x$objformat = xaout ]; then
|
||||
if [ -e /usr/lib/aout ]; then
|
||||
- libpth="/usr/lib/aout /usr/local/lib /usr/lib"
|
||||
- glibpth="/usr/lib/aout /usr/local/lib /usr/lib"
|
||||
+ libpth=""
|
||||
+ glibpth=""
|
||||
fi
|
||||
lddlflags='-Bshareable'
|
||||
else
|
||||
- libpth="/usr/lib /usr/local/lib"
|
||||
- glibpth="/usr/lib /usr/local/lib"
|
||||
+ libpth=""
|
||||
+ glibpth=""
|
||||
ldflags="-Wl,-E "
|
||||
lddlflags="-shared "
|
||||
fi
|
||||
cccdlflags='-DPIC -fPIC'
|
||||
;;
|
||||
*)
|
||||
- libpth="/usr/lib /usr/local/lib"
|
||||
- glibpth="/usr/lib /usr/local/lib"
|
||||
+ libpth=""
|
||||
+ glibpth=""
|
||||
ldflags="-Wl,-E "
|
||||
lddlflags="-shared "
|
||||
cccdlflags='-DPIC -fPIC'
|
||||
diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/hints/linux.sh perl-5.20.0/hints/linux.sh
|
||||
--- perl-5.20.0-orig/hints/linux.sh 2014-05-26 15:34:20.000000000 +0200
|
||||
+++ perl-5.20.0/hints/linux.sh 2014-06-25 10:33:47.354883843 +0200
|
||||
@@ -150,25 +150,6 @@
|
||||
;;
|
||||
esac
|
||||
|
||||
-# Ubuntu 11.04 (and later, presumably) doesn't keep most libraries
|
||||
-# (such as -lm) in /lib or /usr/lib. So we have to ask gcc to tell us
|
||||
-# where to look. We don't want gcc's own libraries, however, so we
|
||||
-# filter those out.
|
||||
-# This could be conditional on Unbuntu, but other distributions may
|
||||
-# follow suit, and this scheme seems to work even on rather old gcc's.
|
||||
-# This unconditionally uses gcc because even if the user is using another
|
||||
-# compiler, we still need to find the math library and friends, and I don't
|
||||
-# know how other compilers will cope with that situation.
|
||||
-# Morever, if the user has their own gcc earlier in $PATH than the system gcc,
|
||||
-# we don't want its libraries. So we try to prefer the system gcc
|
||||
-# Still, as an escape hatch, allow Configure command line overrides to
|
||||
-# plibpth to bypass this check.
|
||||
-if [ -x /usr/bin/gcc ] ; then
|
||||
- gcc=/usr/bin/gcc
|
||||
-else
|
||||
- gcc=gcc
|
||||
-fi
|
||||
-
|
||||
case "$plibpth" in
|
||||
'') plibpth=`LANG=C LC_ALL=C $gcc $ccflags $ldflags -print-search-dirs | grep libraries |
|
||||
cut -f2- -d= | tr ':' $trnl | grep -v 'gcc' | sed -e 's:/$::'`
|
||||
@@ -178,32 +159,6 @@
|
||||
;;
|
||||
esac
|
||||
|
||||
-case "$libc" in
|
||||
-'')
|
||||
-# If you have glibc, then report the version for ./myconfig bug reporting.
|
||||
-# (Configure doesn't need to know the specific version since it just uses
|
||||
-# gcc to load the library for all tests.)
|
||||
-# We don't use __GLIBC__ and __GLIBC_MINOR__ because they
|
||||
-# are insufficiently precise to distinguish things like
|
||||
-# libc-2.0.6 and libc-2.0.7.
|
||||
- for p in $plibpth
|
||||
- do
|
||||
- for trylib in libc.so.6 libc.so
|
||||
- do
|
||||
- if $test -e $p/$trylib; then
|
||||
- libc=`ls -l $p/$trylib | awk '{print $NF}'`
|
||||
- if $test "X$libc" != X; then
|
||||
- break
|
||||
- fi
|
||||
- fi
|
||||
- done
|
||||
- if $test "X$libc" != X; then
|
||||
- break
|
||||
- fi
|
||||
- done
|
||||
- ;;
|
||||
-esac
|
||||
-
|
||||
# Are we using ELF? Thanks to Kenneth Albanowski <kjahds@kjahds.com>
|
||||
# for this test.
|
||||
cat >try.c <<'EOM'
|
||||
@@ -367,33 +322,6 @@
|
||||
;;
|
||||
esac
|
||||
|
||||
-# SuSE8.2 has /usr/lib/libndbm* which are ld scripts rather than
|
||||
-# true libraries. The scripts cause binding against static
|
||||
-# version of -lgdbm which is a bad idea. So if we have 'nm'
|
||||
-# make sure it can read the file
|
||||
-# NI-S 2003/08/07
|
||||
-case "$nm" in
|
||||
- '') ;;
|
||||
- *)
|
||||
- for p in $plibpth
|
||||
- do
|
||||
- if $test -r $p/libndbm.so; then
|
||||
- if $nm $p/libndbm.so >/dev/null 2>&1 ; then
|
||||
- echo 'Your shared -lndbm seems to be a real library.'
|
||||
- _libndbm_real=1
|
||||
- break
|
||||
- fi
|
||||
- fi
|
||||
- done
|
||||
- if $test "X$_libndbm_real" = X; then
|
||||
- echo 'Your shared -lndbm is not a real library.'
|
||||
- set `echo X "$libswanted "| sed -e 's/ ndbm / /'`
|
||||
- shift
|
||||
- libswanted="$*"
|
||||
- fi
|
||||
- ;;
|
||||
-esac
|
||||
-
|
||||
# Linux on Synology.
|
||||
if [ -f /etc/synoinfo.conf -a -d /usr/syno ]; then
|
||||
# Tested on Synology DS213 and DS413
|
||||
@ -8,7 +8,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "1.8.8";
|
||||
version = "1.9.0";
|
||||
inherit (stdenv.lib) optional optionals optionalString;
|
||||
in
|
||||
|
||||
@ -17,7 +17,7 @@ stdenv.mkDerivation {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-${version}.tar.bz2";
|
||||
sha256 = "1ag3scnm1fcviqgx2p4858y433mr0ndqw6zccnccrqcr9mpcird8";
|
||||
sha256 = "004b4j812wgfv8pmcypyrlwrjfa6149lwpz5df6rnm5cy0msdv0i";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
|
||||
version = "1.1";
|
||||
};
|
||||
|
||||
PERL_USE_UNSAFE_INC = stdenv.lib.optionalString (stdenv.lib.versionAtLeast (stdenv.lib.getVersion perl) "5.26") "1";
|
||||
PERL_USE_UNSAFE_INC = "1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "${meta.homepage}${name}.tar.gz";
|
||||
|
||||
@ -1,14 +1,14 @@
|
||||
{ stdenv, lib, fetchpatch, fetchFromGitHub, autoconf, automake, libtool, pkgconfig }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.23.0";
|
||||
version = "1.23.1";
|
||||
name = "libuv-${version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libuv";
|
||||
repo = "libuv";
|
||||
rev = "v${version}";
|
||||
sha256 = "1yfx99f7qnq3qvcgbnih27dgwfg6c51xw6n6n2c3c1wb3mh95im0";
|
||||
sha256 = "14h8dcyx81sbckbgmqhagncyz8s6z6qzpx0fy8p79whq5hb3f4jg";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -67,7 +67,7 @@ let
|
||||
in
|
||||
|
||||
let
|
||||
version = "18.2.1";
|
||||
version = "18.2.2";
|
||||
branch = head (splitString "." version);
|
||||
in
|
||||
|
||||
@ -81,7 +81,7 @@ let self = stdenv.mkDerivation {
|
||||
"ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz"
|
||||
"https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
|
||||
];
|
||||
sha256 = "0mhhr1id11s1fbdxbvr4a81xjh1nsznpra9dl36bv2hq7mpxqdln";
|
||||
sha256 = "1i3ky3d210vi3f5hlr9la1kspdyv093npndxsbzdklw95aqq5fn3";
|
||||
};
|
||||
|
||||
prePatch = "patchShebangs .";
|
||||
|
||||
@ -25,7 +25,7 @@ stdenv.mkDerivation (
|
||||
|
||||
# current directory (".") is removed from @INC in Perl 5.26 but many old libs rely on it
|
||||
# https://metacpan.org/pod/release/XSAWYERX/perl-5.26.0/pod/perldelta.pod#Removal-of-the-current-directory-%28%22.%22%29-from-@INC
|
||||
PERL_USE_UNSAFE_INC = lib.optionalString (lib.versionAtLeast (lib.getVersion perl) "5.26") "1";
|
||||
PERL_USE_UNSAFE_INC = "1";
|
||||
|
||||
meta.homepage = "https://metacpan.org/release/${(builtins.parseDrvName name).name}";
|
||||
}
|
||||
@ -33,7 +33,7 @@ stdenv.mkDerivation (
|
||||
)
|
||||
//
|
||||
{
|
||||
name = "perl${lib.getVersion perl}-${name}";
|
||||
name = "perl${perl.version}-${name}";
|
||||
builder = ./builder.sh;
|
||||
nativeBuildInputs = nativeBuildInputs ++ [ (perl.dev or perl) ];
|
||||
inherit perl;
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{ stdenv, fetchurl, perl, gettext, LocaleGettext }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "help2man-1.47.6";
|
||||
name = "help2man-1.47.7";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/help2man/${name}.tar.xz";
|
||||
sha256 = "0vz4dlrvy4vc6l7w0a7n668pfa0rdm73wr2gar58wqranyah46yr";
|
||||
sha256 = "03gckfr2980qn319c02vflq7d75vq2qdkxrw80kb9g84xn48wnsq";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ gettext LocaleGettext ];
|
||||
|
||||
@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
|
||||
./remove-rust-buildstep.patch
|
||||
];
|
||||
preConfigure = ''
|
||||
sed -i -e 's|rust-stracciatella|${libstracciatella}/bin/libstracciatella.so|g' CMakeLists.txt
|
||||
sed -i -e 's|rust-stracciatella|${libstracciatella}/lib/libstracciatella.so|g' CMakeLists.txt
|
||||
cmakeFlagsArray+=("-DEXTRA_DATA_DIR=$out/share/ja2")
|
||||
'';
|
||||
|
||||
|
||||
@ -25,6 +25,19 @@ stdenv.mkDerivation rec {
|
||||
# Add Neo keymap subdirectory
|
||||
sed -i -e 's,^KEYMAPSUBDIRS *= *,&i386/neo ,' data/Makefile.am
|
||||
|
||||
# Renaming keymaps with name clashes, because loadkeys just picks
|
||||
# the first keymap it sees. The clashing names lead to e.g.
|
||||
# "loadkeys no" defaulting to a norwegian dvorak map instead of
|
||||
# the much more common qwerty one.
|
||||
pushd data/keymaps/i386
|
||||
mv qwertz/cz{,-qwertz}.map
|
||||
mv olpc/es{,-olpc}.map
|
||||
mv olpc/pt{,-olpc}.map
|
||||
mv dvorak/{no.map,dvorak-no.map}
|
||||
mv fgGIod/trf{,-fgGIod}.map
|
||||
mv colemak/{en-latin9,colemak}.map
|
||||
popd
|
||||
|
||||
# Fix the path to gzip/bzip2.
|
||||
substituteInPlace src/libkeymap/findfile.c \
|
||||
--replace gzip ${gzip}/bin/gzip \
|
||||
|
||||
@ -13,11 +13,6 @@ stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
||||
patches = stdenv.lib.optional stdenv.hostPlatform.isMusl (fetchpatch {
|
||||
url = https://git.alpinelinux.org/cgit/aports/plain/testing/numactl/musl.patch?id=0592b128c71c3e70d493bc7a13caed0d7fae91dd;
|
||||
sha256 = "080b0sygmg7104qbbh1amh3b322yyiajwi2d3d0vayffgva0720v";
|
||||
});
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs test
|
||||
'';
|
||||
|
||||
@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
# needs to find a local perl module during build
|
||||
PERL_USE_UNSAFE_INC = stdenv.lib.optionalString (stdenv.lib.versionAtLeast (stdenv.lib.getVersion perl) "5.26") "1";
|
||||
PERL_USE_UNSAFE_INC = "1";
|
||||
|
||||
# TODO: tests are failing http://munin-monitoring.org/ticket/1390#comment:1
|
||||
# NOTE: important, test command always exits with 0, think of a way to abort the build once tests pass
|
||||
|
||||
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
|
||||
patches = optional stdenv.hostPlatform.isCygwin ./coreutils-8.23-4.cygwin.patch;
|
||||
|
||||
# The test tends to fail on btrfs and maybe other unusual filesystems.
|
||||
postPatch = optionalString (!stdenv.hostPlatform.isDarwin) ''
|
||||
postPatch = ''
|
||||
sed '2i echo Skipping dd sparse test && exit 0' -i ./tests/dd/sparse.sh
|
||||
sed '2i echo Skipping cp sparse test && exit 0' -i ./tests/cp/sparse.sh
|
||||
sed '2i echo Skipping rm deep-2 test && exit 0' -i ./tests/rm/deep-2.sh
|
||||
|
||||
@ -41,7 +41,7 @@ in pythonPackages.buildPythonApplication rec {
|
||||
|
||||
preBuild = ''
|
||||
mkdir -p rust/target/release
|
||||
ln -s ${native}/bin/libvdirsyncer_rustext* rust/target/release/
|
||||
ln -s ${native}/lib/libvdirsyncer_rustext* rust/target/release/
|
||||
'';
|
||||
|
||||
LC_ALL = "en_US.utf8";
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ stdenv, fetchurl, substituteAll, intltool, pkgconfig, dbus-glib, gnome3
|
||||
, systemd, libuuid, polkit, gnutls, ppp, dhcp, iptables
|
||||
{ stdenv, fetchurl, fetchpatch, substituteAll, intltool, pkgconfig, dbus-glib
|
||||
, gnome3, systemd, libuuid, polkit, gnutls, ppp, dhcp, iptables
|
||||
, libgcrypt, dnsmasq, bluez5, readline
|
||||
, gobjectIntrospection, modemmanager, openresolv, libndp, newt, libsoup
|
||||
, ethtool, gnused, coreutils, file, inetutils, kmod, jansson, libxslt
|
||||
@ -67,13 +67,13 @@ in stdenv.mkDerivation rec {
|
||||
|
||||
patches = [
|
||||
# https://bugzilla.gnome.org/show_bug.cgi?id=796751
|
||||
(fetchurl {
|
||||
(fetchpatch {
|
||||
url = https://bugzilla.gnome.org/attachment.cgi?id=372953;
|
||||
sha256 = "1crjplyiiipkhjjlifrv6hhvxinlcxd6irp9ijbc7jij31g44i0a";
|
||||
sha256 = "0xg7bzs6dvkbv2qp67i7mi1c5yrmfd471xgmlkn15b33pqkzy3mc";
|
||||
})
|
||||
(fetchurl {
|
||||
(fetchpatch {
|
||||
url = https://gitlab.freedesktop.org/NetworkManager/NetworkManager/commit/0a3755c1799d3a4dc1875d4c59c7c568a64c8456.patch;
|
||||
sha256 = "af1717f7c6fdd6dadb4082dd847f4bbc42cf1574833299f3e47024e785533f2e";
|
||||
sha256 = "0r7338q3za7mf419a244vi65b1q497rg84avijybmv6w4x6p1ksd";
|
||||
})
|
||||
(substituteAll {
|
||||
src = ./fix-paths.patch;
|
||||
|
||||
@ -37,6 +37,13 @@ stdenv.mkDerivation rec {
|
||||
|
||||
patches =
|
||||
[
|
||||
# Remove on update!
|
||||
(fetchpatch {
|
||||
name = "fix-tunnel-forwarding.diff";
|
||||
url = "https://github.com/openssh/openssh-portable/commit/cfb1d9bc767.diff";
|
||||
sha256 = "1mszj7f1kj6bazr7asbi1bi4238lfpilpp98f6c1dn3py4fbsdg8";
|
||||
})
|
||||
|
||||
./locale_archive.patch
|
||||
./fix-host-key-algorithms-plus.patch
|
||||
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "unbound-${version}";
|
||||
version = "1.7.3";
|
||||
version = "1.8.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://unbound.net/downloads/${name}.tar.gz";
|
||||
sha256 = "c11de115d928a6b48b2165e0214402a7a7da313cd479203a7ce7a8b62cba602d";
|
||||
sha256 = "0gxqc4ynd2g1a5dwaazqh9n8injh49a7dz0l9bbxqgv47dnrvxvq";
|
||||
};
|
||||
|
||||
outputs = [ "out" "lib" "man" ]; # "dev" would only split ~20 kB
|
||||
|
||||
@ -23,7 +23,6 @@ stdenv.mkDerivation rec {
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = stdenv.lib.optional doCheck ed;
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
||||
configureFlags = stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
|
||||
@ -31,6 +30,7 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
doCheck = stdenv.hostPlatform.libc != "musl"; # not cross;
|
||||
checkInputs = [ed];
|
||||
|
||||
meta = {
|
||||
description = "GNU Patch, a program to apply differences to files";
|
||||
|
||||
@ -7,6 +7,8 @@
|
||||
|
||||
{config, pkgs, fetchurl, fetchFromGitHub, stdenv, gnused, perl, overrides}:
|
||||
|
||||
# cpan2nix assumes that perl-packages.nix will be used only with perl 5.26 or above
|
||||
assert stdenv.lib.versionAtLeast perl.version "5.26";
|
||||
let
|
||||
inherit (stdenv.lib) maintainers;
|
||||
self = _self // overrides;
|
||||
@ -1857,7 +1859,7 @@ let
|
||||
url = "mirror://cpan/authors/id/J/JS/JSWARTZ/${name}.tar.gz";
|
||||
sha256 = "c7f1a2b3570a8fede484e933f89ba1729e0abd05935791d146c522dd120ee851";
|
||||
};
|
||||
preConfigure = stdenv.lib.optionalString (stdenv.lib.versionAtLeast perl.version "5.26") ''
|
||||
preConfigure = ''
|
||||
# fix error 'Unescaped left brace in regex is illegal here in regex'
|
||||
substituteInPlace lib/CHI/t/Driver/Subcache/l1_cache.pm --replace 'qr/CHI stats: {' 'qr/CHI stats: \{'
|
||||
'';
|
||||
@ -2095,7 +2097,7 @@ let
|
||||
url = "mirror://cpan/authors/id/E/EV/EVO/${name}.tar.gz";
|
||||
sha256 = "0ricb0mn0i06ngfhq5y035yx8i7ahlx83yyqwixqmv6hg4p79b5c";
|
||||
};
|
||||
preConfigure = stdenv.lib.optionalString (stdenv.lib.versionAtLeast perl.version "5.26") ''
|
||||
preConfigure = ''
|
||||
# fix error 'Unescaped left brace in regex is illegal here in regex'
|
||||
substituteInPlace tests/xemulator/class_methodmaker/Test.pm --replace 's/(TEST\s{)/$1/g' 's/(TEST\s\{)/$1/g'
|
||||
'';
|
||||
@ -14841,7 +14843,7 @@ let
|
||||
meta = {
|
||||
description = "Aggregate C<*.t> tests to make them run faster";
|
||||
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
|
||||
broken = stdenv.lib.versionAtLeast perl.version "5.26"; # This module only works with Test::More version < 1.3, but you have 1.302133
|
||||
broken = true; # This module only works with Test::More version < 1.3, but you have 1.302133
|
||||
};
|
||||
};
|
||||
|
||||
@ -16967,7 +16969,7 @@ let
|
||||
meta = {
|
||||
description = "Turns ref() into a multimethod";
|
||||
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
|
||||
broken = stdenv.lib.versionAtLeast perl.version "5.26"; # 'OP {aka struct op}' has no member named 'op_sibling'
|
||||
broken = true; # 'OP {aka struct op}' has no member named 'op_sibling'
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user