git.iko.soy/typeable/nixpkgs
on master help sign in
Merge #117210: bash_5: don't rely on patch timestamps
commitad47284f8b01f587e24a4f14e0f93126d8ebecda authorVladimír Čunát <v@cunat.cz> dateFri 26 Mar 2021, 18:15 (6 years ago) parenta9b3e26078c2a7
2 files changed+1−16
pkgs/shells/bash/5.1.nix+1−1 pkgs/shells/bash/pgrp-pipe-5.1.patch−15
pkgs/shells/bash/5.1.nix+1−1
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
4545 -DSSH_SOURCE_BASHRC
4646 '';
4747
48− patchFlags = [ "-p0" "-T" ];
48+ patchFlags = [ "-p0" ];
4949
5050 patches = upstreamPatches
5151 ++ [ ./pgrp-pipe-5.1.patch ];
pkgs/shells/bash/pgrp-pipe-5.1.patch−15
@@ -14,18 +14,3 @@ diff -u ./configure ../bash-5.0-fixed/configure
1414 netbsd*|openbsd*) LOCAL_CFLAGS="-DDEV_FD_STAT_BROKEN" ;;
1515 *qnx[67]*) LOCAL_LIBS="-lncurses" ;;
1616 *qnx*) LOCAL_CFLAGS="-Dqnx -F -3s" LOCAL_LDFLAGS="-3s" LOCAL_LIBS="-lunix -lncurses" ;;
17−diff -u ./configure.ac ../bash-5.0-fixed/configure.ac
18−--- ./configure.ac 2019-01-02 15:39:11.000000000 +0100
19−+++ ../bash-5.0-fixed/configure.ac 2019-01-02 15:39:11.000000000 +0100
20−@@ -1108,10 +1108,7 @@
21− solaris2*) LOCAL_CFLAGS=-DSOLARIS ;;
22− lynxos*) LOCAL_CFLAGS=-DRECYCLES_PIDS ;;
23− linux*) LOCAL_LDFLAGS=-rdynamic # allow dynamic loading
24−- case "`uname -r`" in
25−- 1.*|2.[[0123]]*) : ;;
26−- *) AC_DEFINE(PGRP_PIPE) ;;
27−- esac ;;
28−+ AC_DEFINE(PGRP_PIPE) ;;
29− netbsd*|openbsd*) LOCAL_CFLAGS="-DDEV_FD_STAT_BROKEN" ;;
30− *qnx[[67]]*) LOCAL_LIBS="-lncurses" ;;
31− *qnx*) LOCAL_CFLAGS="-Dqnx -F -3s" LOCAL_LDFLAGS="-3s" LOCAL_LIBS="-lunix -lncurses" ;;