diff options
| author | zowoq <59103226+zowoq@users.noreply.github.com> | 2020-05-31 00:29:33 +1000 |
|---|---|---|
| committer | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2020-06-04 18:18:11 +0200 |
| commit | 683004d092e6c4b5dc68d40684e8ecf65c87c1fc (patch) | |
| tree | 891e21a7814409865f95b29c10a6df32104659b9 /pkgs | |
| parent | 62ee86086c611e2209e11615cfc5fa96384ef468 (diff) | |
| download | nixlib-683004d092e6c4b5dc68d40684e8ecf65c87c1fc.tar nixlib-683004d092e6c4b5dc68d40684e8ecf65c87c1fc.tar.gz nixlib-683004d092e6c4b5dc68d40684e8ecf65c87c1fc.tar.bz2 nixlib-683004d092e6c4b5dc68d40684e8ecf65c87c1fc.tar.lz nixlib-683004d092e6c4b5dc68d40684e8ecf65c87c1fc.tar.xz nixlib-683004d092e6c4b5dc68d40684e8ecf65c87c1fc.tar.zst nixlib-683004d092e6c4b5dc68d40684e8ecf65c87c1fc.zip | |
libgpgerror: 1.36 -> 1.38
https://github.com/gpg/libgpg-error/blob/libgpg-error-1.38/NEWS
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/libgpg-error/default.nix | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/pkgs/development/libraries/libgpg-error/default.nix b/pkgs/development/libraries/libgpg-error/default.nix index e170e4931b83..1e49a72096a3 100644 --- a/pkgs/development/libraries/libgpg-error/default.nix +++ b/pkgs/development/libraries/libgpg-error/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPackages, fetchurl, gettext, fetchpatch +{ stdenv, lib, buildPackages, fetchurl, gettext , genPosixLockObjOnly ? false }: let genPosixLockObjOnlyAttrs = lib.optionalAttrs genPosixLockObjOnly { @@ -17,25 +17,14 @@ }; in stdenv.mkDerivation (rec { pname = "libgpg-error"; - version = "1.36"; + version = "1.38"; src = fetchurl { url = "mirror://gnupg/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "0z696dmhfxm2n6pmr8b857wwljq9h633yi99bhbn7h88f91rigds"; + sha256 = "00px79xzyc5lj8aig7i4fhk29h1lkqp4840wjfgi9mv9m9sq566q"; }; - # Remove gawk buildfix on > 1.36 - patches = [ - (fetchpatch { - url = "https://dev.gnupg.org/rE7865041c77f4f7005282f10f9b6666b19072fbdf?diff=1"; - sha256 = "0hs4rpwqq2afpsbqliq451jjaysq2iyzxvd9sx3992b4vnllgqqq"; - }) - ]; - 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 '' + 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 |