Merge commit 'db88608d8c811a93b74c99cfa1224952afc78200'

Conflicts:
	nixpkgs/nixos/modules/config/update-users-groups.pl

1 files changed, 11 insertions, 9 deletions

diff --git a/nixpkgs/pkgs/development/libraries/howard-hinnant-date/default.nix b/nixpkgs/pkgs/development/libraries/howard-hinnant-date/default.nix
index fe807d3dfb44..13c3a4752e67 100644
--- a/nixpkgs/pkgs/development/libraries/howard-hinnant-date/default.nix
+++ b/nixpkgs/pkgs/development/libraries/howard-hinnant-date/default.nix
@@ -1,20 +1,23 @@
-{ lib, stdenv, fetchFromGitHub, cmake, curl, tzdata, fetchpatch, substituteAll }:
+{ lib, stdenv, fetchFromGitHub, cmake, tzdata, fetchpatch, substituteAll }:
 
 stdenv.mkDerivation rec {
-  pname = "howard-hinnant-date-unstable";
-  version = "2020-03-09";
+  pname = "howard-hinnant-date";
+  version = "3.0.1";
 
   src = fetchFromGitHub {
     owner = "HowardHinnant";
     repo = "date";
-    rev = "4c1968b8f038483037cadfdbad3215ce21d934bb";
-    sha256 = "0dywrf18v1znfnz0gdxgi2ydax466zq34gc1vvg2k7vq17a30wq3";
+    rev = "v${version}";
+    sha256 = "1qk7pgnk0bpinja28104qha6f7r1xwh5dy3gra7vjkqwl0jdwa35";
   };
 
   patches = [
+    # Add pkg-config file
+    # https://github.com/HowardHinnant/date/pull/538
     (fetchpatch {
-      url = "https://github.com/HowardHinnant/date/commit/e56b2dce7e89a92e1b9b35caa13b3e938c4cedea.patch";
-      sha256 = "0m3qbhq7kmm9qa3jm6d2px7c1dxdj5k9lffgdvqnrwmhxwj1p9n2";
+      name = "output-date-pc-for-pkg-config.patch";
+      url = "https://git.alpinelinux.org/aports/plain/community/date/538-output-date-pc-for-pkg-config.patch?id=11f6b4d4206b0648182e7b41cd57dcc9ccea0728";
+      sha256 = "1ma0586jsd89jgwbmd2qlvlc8pshs1pc4zk5drgxi3qvp8ai1154";
     })
     # Without this patch, this library will drop a `tzdata` directory into
     # `~/Downloads` if it cannot find `/usr/share/zoneinfo`. Make the path it
@@ -26,7 +29,6 @@ stdenv.mkDerivation rec {
   ];
 
   nativeBuildInputs = [ cmake ];
-  buildInputs = [ curl ];
 
   cmakeFlags = [
     "-DBUILD_TZ_LIB=true"
@@ -41,6 +43,6 @@ stdenv.mkDerivation rec {
     description = "A date and time library based on the C++11/14/17 <chrono> header";
     homepage = "https://github.com/HowardHinnant/date";
     platforms = platforms.linux;
-    maintainers = with maintainers; [ ];
+    maintainers = with maintainers; [ r-burns ];
   };
 }