git.iko.soy/typeable/nixpkgs
on master help sign in
libgpgerror: clean up

The missing gen-lock-obj.sh was resolved a long time ago. Change the Git URL to the official location while I'm doing libgpgerror things.

commit7ff166f50ff6b4a15fe7a4faeba6948c53537628 authorAlyssa Ross <hi@alyssa.is> dateThu 10 Jun 2021, 19:00 (5 years ago) parent9ccd2aa
2 files changed+1−11
compare with master
unifiedsplit
pkgs/development/libraries/libgpg-error/default.nix−10 pkgs/top-level/all-packages.nix+1−1
pkgs/development/libraries/libgpg-error/default.nix−10
@@ -34,16 +34,6 @@ in stdenv.mkDerivation (rec {
3434 '' + lib.optionalString (stdenv.hostPlatform.isAarch32 && stdenv.hostPlatform.isMusl) ''
3535 ln -s src/syscfg/lock-obj-pub.arm-unknown-linux-gnueabi.h src/syscfg/lock-obj-pub.arm-unknown-linux-musleabihf.h
3636 ln -s src/syscfg/lock-obj-pub.arm-unknown-linux-gnueabi.h src/syscfg/lock-obj-pub.linux-musleabihf.h
37− ''
38− # This file was accidentally excluded from the sdist until
39− # 013720333c6ec1d38791689bc49ba039d98e16b3, post release.
40− # TODO make unconditional next mass rebuild
41− + lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''
42− cp ${fetchurl {
43− url = "https://raw.githubusercontent.com/gpg/libgpg-error/50e62b36ea01ed25d12c443088b85d4f41a2b3e1/src/gen-lock-obj.sh";
44− sha256 = "10cslipa6npalj869asaamj0w941dhmx0yjafpyyh69ypsg2m2c3";
45− }} ./src/gen-lock-obj.sh
46− chmod +x ./src/gen-lock-obj.sh
4737 '';
4838
4939 outputs = [ "out" "dev" "info" ];
pkgs/top-level/all-packages.nix+1−1
@@ -16305,7 +16305,7 @@ in
1630516305
1630616306 libgpgerror = callPackage ../development/libraries/libgpg-error { };
1630716307
16308− # https://github.com/gpg/libgpg-error/blob/70058cd9f944d620764e57c838209afae8a58c78/README#L118-L140
16308+ # https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgpg-error.git;a=blob;f=README;h=fd6e1a83f55696c1f7a08f6dfca08b2d6b7617ec;hb=70058cd9f944d620764e57c838209afae8a58c78#l118
1630916309 libgpgerror-gen-posix-lock-obj = libgpgerror.override {
1631016310 genPosixLockObjOnly = true;
1631116311 };