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

gawk: 4.2.1 -> 5.0.1 (#59503)

Browse Source 
* gawk: 4.2.1 -> 5.0.1

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/gawk/versions

* libgpg-error: fix build with gawk 5

Cherry picked commit 6fe2cdd03c98270b0ce0026acf8dab0a6c4d3d63 from
https://github.com/NixOS/nixpkgs/pull/67801.
This commit is contained in:
R. RyanTM 2019-08-31 04:13:30 -07:00 committed by Samuel Leathers
parent 5017f4c608
commit 50d8295cc6
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/development/libraries/libgpg-error/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, lib, buildPackages, fetchurl, gettext { stdenv, lib, buildPackages, fetchurl, gettext, fetchpatch
, genPosixLockObjOnly ? false , genPosixLockObjOnly ? false
}: let }: let
genPosixLockObjOnlyAttrs = lib.optionalAttrs genPosixLockObjOnly { genPosixLockObjOnlyAttrs = lib.optionalAttrs genPosixLockObjOnly {
@ -24,7 +24,18 @@ in stdenv.mkDerivation (rec {
sha256 = "0z696dmhfxm2n6pmr8b857wwljq9h633yi99bhbn7h88f91rigds"; sha256 = "0z696dmhfxm2n6pmr8b857wwljq9h633yi99bhbn7h88f91rigds";
}; };
# Remove gawk buildfix on > 1.36
patches = [
(fetchpatch {
url = "https://dev.gnupg.org/rE7865041c77f4f7005282f10f9b6666b19072fbdf?diff=1";
sha256 = "0hs4rpwqq2afpsbqliq451jjaysq2iyzxvd9sx3992b4vnllgqqq";
})
];
postPatch = '' postPatch = ''
# Remove on > 1.36 release: gawk upgrade fix didn't include Makefile regeneration
sed 's/-v namespace=errnos_/-v pkg_namespace=errnos_/' -i src/Makefile.in
sed '/BUILD_TIMESTAMP=/s/=.*/=1970-01-01T00:01+0000/' -i ./configure sed '/BUILD_TIMESTAMP=/s/=.*/=1970-01-01T00:01+0000/' -i ./configure
'' + lib.optionalString (stdenv.hostPlatform.isAarch32 && stdenv.buildPlatform != stdenv.hostPlatform) '' '' + lib.optionalString (stdenv.hostPlatform.isAarch32 && stdenv.buildPlatform != stdenv.hostPlatform) ''
ln -s lock-obj-pub.arm-unknown-linux-gnueabi.h src/syscfg/lock-obj-pub.linux-gnueabihf.h ln -s lock-obj-pub.arm-unknown-linux-gnueabi.h src/syscfg/lock-obj-pub.linux-gnueabihf.h

4
pkgs/tools/text/gawk/default.nix
View File

@ -19,11 +19,11 @@ let
inherit (stdenv.lib) optional; inherit (stdenv.lib) optional;
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gawk-4.2.1"; name = "gawk-5.0.1";
src = fetchurl { src = fetchurl {
url = "mirror://gnu/gawk/${name}.tar.xz"; url = "mirror://gnu/gawk/${name}.tar.xz";
sha256 = "0lam2zf3n7ak4pig8w46lhx9hzx50kj2v2yj1616mm26wy2rf4fi"; sha256 = "15570p7g2x54asvr2fsc56sxzmm08fbk4mzpcs5n92fp9vq8cklf";
}; };
# When we do build separate interactive version, it makes sense to always include man. # When we do build separate interactive version, it makes sense to always include man.