howard-hinnant-date: 3.0.1 -> 3.0.3 (#354877)
This commit is contained in:
@@ -1,11 +1,9 @@
|
||||
diff --git a/src/tz.cpp b/src/tz.cpp
|
||||
index 68436c3..2bfe19e 100644
|
||||
--- a/src/tz.cpp
|
||||
+++ b/src/tz.cpp
|
||||
@@ -349,7 +349,7 @@ discover_tz_dir()
|
||||
struct stat sb;
|
||||
using namespace std;
|
||||
# ifndef __APPLE__
|
||||
@@ -498,7 +498,7 @@ discover_tz_dir()
|
||||
else
|
||||
throw runtime_error("discover_tz_dir failed to find zoneinfo\n");
|
||||
# elif !defined(__APPLE__)
|
||||
- CONSTDATA auto tz_dir_default = "/usr/share/zoneinfo";
|
||||
+ CONSTDATA auto tz_dir_default = "@tzdata@/share/zoneinfo";
|
||||
CONSTDATA auto tz_dir_buildroot = "/usr/share/zoneinfo/uclibc";
|
||||
|
||||
@@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "howard-hinnant-date";
|
||||
version = "3.0.1";
|
||||
version = "3.0.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "HowardHinnant";
|
||||
repo = "date";
|
||||
rev = "v${version}";
|
||||
sha256 = "1qk7pgnk0bpinja28104qha6f7r1xwh5dy3gra7vjkqwl0jdwa35";
|
||||
hash = "sha256-qfrmH3NRyrDVmHRmmWzM5Zz37E7RFXJqaV1Rq2E59qs=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -19,13 +19,6 @@ stdenv.mkDerivation rec {
|
||||
url = "https://git.alpinelinux.org/aports/plain/community/date/538-output-date-pc-for-pkg-config.patch?id=11f6b4d4206b0648182e7b41cd57dcc9ccea0728";
|
||||
sha256 = "1ma0586jsd89jgwbmd2qlvlc8pshs1pc4zk5drgxi3qvp8ai1154";
|
||||
})
|
||||
# Fix CMake include directory path.
|
||||
# https://github.com/HowardHinnant/date/pull/753
|
||||
(fetchpatch {
|
||||
name = "fix-cmake-include-dir.patch";
|
||||
url = "https://github.com/HowardHinnant/date/commit/8061b53c489b0c8676feedcb65049b27664327b5.patch";
|
||||
hash = "sha256-weZUgu0SDad7EK7msUbVzk1zY4euI0Biafj/5jD4JV4=";
|
||||
})
|
||||
# Without this patch, this library will drop a `tzdata` directory into
|
||||
# `~/Downloads` if it cannot find `/usr/share/zoneinfo`. Make the path it
|
||||
# searches for `zoneinfo` be the one from the `tzdata` package.
|
||||
@@ -33,13 +26,6 @@ stdenv.mkDerivation rec {
|
||||
src = ./make-zoneinfo-available.diff;
|
||||
inherit tzdata;
|
||||
})
|
||||
# The reported version to cmake's find_package() is 3.0.0, but the actual
|
||||
# version is 3.0.1. This patch fixes that.
|
||||
(fetchpatch {
|
||||
name = "fix-cmake-version.patch";
|
||||
url = "https://github.com/HowardHinnant/date/commit/2e19c006e2218447ee31f864191859517603f59f.patch";
|
||||
hash = "sha256-SRAWrwv64ap3Qh3RlhwqgS0L2YsrjqVSgw6iH3KlWvk=";
|
||||
})
|
||||
];
|
||||
|
||||
# Tweaks to fix undefined variable substitutions
|
||||
|
||||
Reference in New Issue
Block a user