diff options
author | Alyssa Ross <hi@alyssa.is> | 2021-08-04 10:43:07 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2021-08-04 10:43:07 +0000 |
commit | 62614cbef7da005c1eda8c9400160f6bcd6546b8 (patch) | |
tree | c2630f69080637987b68acb1ee8676d2681fe304 /pkgs/applications/blockchains/stellar-core-dirty-version.patch | |
parent | d9c82ed3044c72cecf01c6ea042489d30914577c (diff) | |
parent | e24069138dfec3ef94f211f1da005bb5395adc11 (diff) | |
download | nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.gz nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.bz2 nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.lz nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.xz nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.zst nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.zip |
Merge branch 'nixpkgs-update' into master
Diffstat (limited to 'pkgs/applications/blockchains/stellar-core-dirty-version.patch')
-rw-r--r-- | pkgs/applications/blockchains/stellar-core-dirty-version.patch | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/pkgs/applications/blockchains/stellar-core-dirty-version.patch b/pkgs/applications/blockchains/stellar-core-dirty-version.patch deleted file mode 100644 index 57d66ce5919..00000000000 --- a/pkgs/applications/blockchains/stellar-core-dirty-version.patch +++ /dev/null @@ -1,15 +0,0 @@ -Subject: Prevent "-dirty" from being erroneously added to the version - -diff --git a/src/Makefile.am b/src/Makefile.am -index d36d1a3..00048fc 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -28,7 +28,7 @@ always: - # Always rebuild because .git/HEAD is a symbolic ref one can't depend on - StellarCoreVersion.h: always - @vers=$$(cd "$(srcdir)" \ -- && git describe --always --dirty --tags 2>/dev/null \ -+ && git describe --always --tags 2>/dev/null \ - || echo "$(PACKAGE) $(VERSION)"); \ - echo "#define STELLAR_CORE_VERSION \"$$vers\"" > $@~ - @if cmp -s $@~ $@; then rm -f $@~; else \ |