diff options
| author | Shea Levy <shea@shealevy.com> | 2018-03-22 09:28:58 -0400 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2018-03-22 09:28:58 -0400 |
| commit | 380171c9f6247480a31d87f04a20e96b0a1154c9 (patch) | |
| tree | 7a2b71dc09e350894c27a9412992776405f5ec4d /pkgs/development/libraries/libgpg-error | |
| parent | d0a8866622066a0abe9a95e444676d283580dc37 (diff) | |
| download | nixlib-380171c9f6247480a31d87f04a20e96b0a1154c9.tar nixlib-380171c9f6247480a31d87f04a20e96b0a1154c9.tar.gz nixlib-380171c9f6247480a31d87f04a20e96b0a1154c9.tar.bz2 nixlib-380171c9f6247480a31d87f04a20e96b0a1154c9.tar.lz nixlib-380171c9f6247480a31d87f04a20e96b0a1154c9.tar.xz nixlib-380171c9f6247480a31d87f04a20e96b0a1154c9.tar.zst nixlib-380171c9f6247480a31d87f04a20e96b0a1154c9.zip | |
libgpg-error: 1.27 -> 1.28
Diffstat (limited to 'pkgs/development/libraries/libgpg-error')
| -rw-r--r-- | pkgs/development/libraries/libgpg-error/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/libraries/libgpg-error/riscv.patch | 54 |
2 files changed, 2 insertions, 58 deletions
diff --git a/pkgs/development/libraries/libgpg-error/default.nix b/pkgs/development/libraries/libgpg-error/default.nix index 5c5824a9930c..c138364ff289 100644 --- a/pkgs/development/libraries/libgpg-error/default.nix +++ b/pkgs/development/libraries/libgpg-error/default.nix @@ -17,15 +17,13 @@ }; in stdenv.mkDerivation (rec { name = "libgpg-error-${version}"; - version = "1.27"; + version = "1.28"; src = fetchurl { url = "mirror://gnupg/libgpg-error/${name}.tar.bz2"; - sha256 = "1li95ni122fzinzlmxbln63nmgij63irxfvi52ws4zfbzv3am4sg"; + sha256 = "0jfsfnh9bxlxiwxws60yah4ybjw2hshmvqp31pri4m4h8ivrbnry"; }; - patches = if hostPlatform.isRiscV then ./riscv.patch else null; - postPatch = '' sed '/BUILD_TIMESTAMP=/s/=.*/=1970-01-01T00:01+0000/' -i ./configure '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' diff --git a/pkgs/development/libraries/libgpg-error/riscv.patch b/pkgs/development/libraries/libgpg-error/riscv.patch deleted file mode 100644 index afc3b9993a43..000000000000 --- a/pkgs/development/libraries/libgpg-error/riscv.patch +++ /dev/null @@ -1,54 +0,0 @@ -commit b3e9ec5626d474c58e683a41d09576297d4acd3d -Author: Shea Levy <shea@shealevy.com> -Date: Sat Feb 24 21:12:44 2018 -0500 - - syscfg: Add lock-obj-pub file for riscv64-unknown-linux-gnu. - - * src/syscfg/lock-obj-pub.riscv64-unknown-linux-gnu.h: new. - * src/Makefile.am (lock_obj_pub): Add it. - - Signed-off-by: Shea Levy <shea@shealevy.com> - -diff --git a/src/Makefile.am b/src/Makefile.am -index 4446612..5a8cc43 100644 ---- a/src/Makefile.in -+++ b/src/Makefile.in -@@ -65,6 +65,7 @@ lock_obj_pub = \ - syscfg/lock-obj-pub.powerpc64-unknown-linux-gnu.h \ - syscfg/lock-obj-pub.powerpc64le-unknown-linux-gnu.h \ - syscfg/lock-obj-pub.powerpc-unknown-linux-gnuspe.h \ -+ syscfg/lock-obj-pub.riscv64-unknown-linux-gnu.h \ - syscfg/lock-obj-pub.s390x-ibm-linux-gnu.h \ - syscfg/lock-obj-pub.sh3-unknown-linux-gnu.h \ - syscfg/lock-obj-pub.sh4-unknown-linux-gnu.h \ -diff --git a/src/syscfg/lock-obj-pub.riscv64-unknown-linux-gnu.h b/src/syscfg/lock-obj-pub.riscv64-unknown-linux-gnu.h -new file mode 100644 -index 0000000..8aab9d6 ---- /dev/null -+++ b/src/syscfg/lock-obj-pub.riscv64-unknown-linux-gnu.h -@@ -0,0 +1,25 @@ -+## lock-obj-pub.riscv64-unknown-linux-gnu.h -+## File created by gen-posix-lock-obj - DO NOT EDIT -+## To be included by mkheader into gpg-error.h -+ -+typedef struct -+{ -+ long _vers; -+ union { -+ volatile char _priv[40]; -+ long _x_align; -+ long *_xp_align; -+ } u; -+} gpgrt_lock_t; -+ -+#define GPGRT_LOCK_INITIALIZER {1,{{0,0,0,0,0,0,0,0, \ -+ 0,0,0,0,0,0,0,0, \ -+ 0,0,0,0,0,0,0,0, \ -+ 0,0,0,0,0,0,0,0, \ -+ 0,0,0,0,0,0,0,0}}} -+## -+## Local Variables: -+## mode: c -+## buffer-read-only: t -+## End: -+## |