diff --git a/pkgs/by-name/ms/ms-sys/manpages-without-build-timestamps.patch b/pkgs/by-name/ms/ms-sys/manpages-without-build-timestamps.patch deleted file mode 100644 index 7b031cb34f1a..000000000000 --- a/pkgs/by-name/ms/ms-sys/manpages-without-build-timestamps.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -u ms-sys-2.6.0/Makefile ms-sys-2.6.0-fixed/Makefile ---- ms-sys-2.6.0/Makefile 2015-09-27 20:39:45.000000000 +0200 -+++ ms-sys-2.6.0-fixed/Makefile2020-01-06 16:43:55.181477511 +0100 -@@ -121,7 +121,7 @@ - - $(DESTDIR)$(MANDIR)/%: $(MAN)/$(dir $(*D))/$(*F) - install -D -m 644 $(MAN)/$(dir $(*D))$(*F) $@ -- gzip -f $@ -+ gzip -n -f $@ - - #$(DESTDIR)$(MANDIR)/%: $(MAN)/$(*F) - # echo t: $< diff --git a/pkgs/by-name/ms/ms-sys/package.nix b/pkgs/by-name/ms/ms-sys/package.nix index 482f7602a40d..3efa81608c2d 100644 --- a/pkgs/by-name/ms/ms-sys/package.nix +++ b/pkgs/by-name/ms/ms-sys/package.nix @@ -5,16 +5,14 @@ gettext, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ms-sys"; - version = "2.6.0"; + version = "2.7.0"; src = fetchurl { - url = "mirror://sourceforge/ms-sys/ms-sys-${version}.tar.gz"; - sha256 = "06xqpm2s9cg8fj7a1822wmh3p4arii0sifssazg1gr6i7xg7kbjz"; + url = "mirror://sourceforge/ms-sys/ms-sys-${finalAttrs.version}.tar.gz"; + hash = "sha256-a4Rs9BwX/nhGfLbNzqQapWvzwhHIKLfFaehJYszQ9RQ="; }; - # TODO: Remove with next release, see https://sourceforge.net/p/ms-sys/patches/8/ - patches = [ ./manpages-without-build-timestamps.patch ]; nativeBuildInputs = [ gettext ]; @@ -22,11 +20,11 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; - meta = with lib; { + meta = { description = "Program for writing Microsoft-compatible boot records"; homepage = "https://ms-sys.sourceforge.net/"; - license = licenses.gpl2Plus; - platforms = with platforms; linux; + license = lib.licenses.gpl2Plus; + platforms = with lib.platforms; linux; mainProgram = "ms-sys"; }; -} +})