From 785b541ed62dc56a0aef312c6e6b313bb193683a Mon Sep 17 00:00:00 2001 From: Michiel Leenaars Date: Mon, 27 Jul 2020 00:15:38 +0200 Subject: [PATCH 1/2] datefudge: 1.23 -> 1.24 --- pkgs/tools/system/datefudge/default.nix | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/system/datefudge/default.nix b/pkgs/tools/system/datefudge/default.nix index fd0cc5f582a..201a3e3e309 100644 --- a/pkgs/tools/system/datefudge/default.nix +++ b/pkgs/tools/system/datefudge/default.nix @@ -2,21 +2,14 @@ stdenv.mkDerivation { pname = "datefudge"; - version = "1.23"; + version = "1.24"; src = fetchgit { url = "https://salsa.debian.org/debian/datefudge.git"; - rev = "090d3aace17640478f7f5119518b2f4196f62617"; - sha256 = "0r9g8v9xnv60hq3j20wqy34kyig3sc2pisjxl4irn7jjx85f1spv"; + rev = "6a1b132c14cd7eff58b4fdbbc6ca110cba53d7c6"; + sha256 = "1nh433yx4y4djp0bs6aawqbwk7miq7fsbs9wpjlyh2k9dvil2lrm"; }; - patches = [ - (fetchpatch { - url = "https://src.fedoraproject.org/rpms/datefudge/raw/master/f/datefudge_1.23-tz.patch"; - sha256 = "19c2fvhm06wnp3059b0rnd7dqdchkan8iycjh8jk8y25j870zkvn"; - }) - ]; - postPatch = '' substituteInPlace Makefile \ --replace "/usr" "/" \ From aedccac4e86533012fe26c51c51d28a8f135b928 Mon Sep 17 00:00:00 2001 From: Michiel Leenaars Date: Mon, 27 Jul 2020 00:31:07 +0200 Subject: [PATCH 2/2] datefudge: use tag instead of manual rev --- pkgs/tools/system/datefudge/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/datefudge/default.nix b/pkgs/tools/system/datefudge/default.nix index 201a3e3e309..819071f3f06 100644 --- a/pkgs/tools/system/datefudge/default.nix +++ b/pkgs/tools/system/datefudge/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchgit, fetchpatch }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "datefudge"; version = "1.24"; src = fetchgit { - url = "https://salsa.debian.org/debian/datefudge.git"; - rev = "6a1b132c14cd7eff58b4fdbbc6ca110cba53d7c6"; + url = "https://salsa.debian.org/debian/${pname}.git"; + rev = "debian/${version}"; sha256 = "1nh433yx4y4djp0bs6aawqbwk7miq7fsbs9wpjlyh2k9dvil2lrm"; };