From a428849ce7b43f2c72c40e0bc58ed548bcd2a4a5 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Mon, 5 Aug 2019 21:55:29 -0400 Subject: [PATCH 1/4] xmloscopy: 0.1.2 -> 0.1.3 --- pkgs/tools/text/xml/xmloscopy/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/xml/xmloscopy/default.nix b/pkgs/tools/text/xml/xmloscopy/default.nix index 9703bd1ecea..778dc845bc5 100644 --- a/pkgs/tools/text/xml/xmloscopy/default.nix +++ b/pkgs/tools/text/xml/xmloscopy/default.nix @@ -6,7 +6,7 @@ docbook5 }: stdenv.mkDerivation rec { name = "xmloscopy-${version}"; - version = "0.1.2"; + version = "0.1.3"; buildInputs = [ makeWrapper @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { owner = "grahamc"; repo = "xmloscopy"; rev = "v${version}"; - sha256 = "07fcnf1vv0x72lksl1v0frmlh73gca199ldqqbgdjpybjdffz456"; + sha256 = "06y5bckrmnq7b5ny2hfvlmdws910jw3xbw5nzy3bcpqsccqnjxrc"; }; installPhase = '' @@ -48,5 +48,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/grahamc/xmloscopy; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.all; + maintainers = [ stdenv.lib.maintainers.grahamc ]; }; } From 16584b52f39f5bac2170e7df068d0069dfb29401 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Mon, 5 Aug 2019 22:02:13 -0400 Subject: [PATCH 2/4] xmloscopy: with --- pkgs/tools/text/xml/xmloscopy/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/text/xml/xmloscopy/default.nix b/pkgs/tools/text/xml/xmloscopy/default.nix index 778dc845bc5..e9141bb07db 100644 --- a/pkgs/tools/text/xml/xmloscopy/default.nix +++ b/pkgs/tools/text/xml/xmloscopy/default.nix @@ -43,11 +43,11 @@ stdenv.mkDerivation rec { --set PATH "${spath}" ''; - meta = { + meta = with stdenv.lib; { description = "wtf is my docbook broken?"; homepage = https://github.com/grahamc/xmloscopy; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.grahamc ]; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ grahamc ]; }; } From b8c0210fccbaf840fd5152aa3c8639dafdd5e7c6 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Mon, 5 Aug 2019 22:02:47 -0400 Subject: [PATCH 3/4] xmloscopy: name -> pname --- pkgs/tools/text/xml/xmloscopy/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/text/xml/xmloscopy/default.nix b/pkgs/tools/text/xml/xmloscopy/default.nix index e9141bb07db..6088df90bd9 100644 --- a/pkgs/tools/text/xml/xmloscopy/default.nix +++ b/pkgs/tools/text/xml/xmloscopy/default.nix @@ -5,7 +5,7 @@ fzf, coreutils, libxml2, libxslt, jing, findutils, gnugrep, gnused, docbook5 }: stdenv.mkDerivation rec { - name = "xmloscopy-${version}"; + pname = "xmloscopy"; version = "0.1.3"; buildInputs = [ From 4ec201e7b73d2ccc30a65e0c1f9183e76c229510 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Mon, 5 Aug 2019 22:59:57 -0400 Subject: [PATCH 4/4] xmloscopy: buildInputs -> nativeBuildInputs --- pkgs/tools/text/xml/xmloscopy/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/text/xml/xmloscopy/default.nix b/pkgs/tools/text/xml/xmloscopy/default.nix index 6088df90bd9..5d085e41196 100644 --- a/pkgs/tools/text/xml/xmloscopy/default.nix +++ b/pkgs/tools/text/xml/xmloscopy/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { pname = "xmloscopy"; version = "0.1.3"; - buildInputs = [ + nativeBuildInputs = [ makeWrapper dev_only_shellcheck ];