From 0422bcb64305b5b702c5525d5f94e57e8c379749 Mon Sep 17 00:00:00 2001 From: Daniel Laguna Date: Fri, 19 Dec 2025 11:49:26 +0100 Subject: [PATCH] darkman: 2.0.1 -> 2.2.0 https://gitlab.com/WhyNotHugo/darkman/-/blob/main/CHANGELOG.md --- pkgs/by-name/da/darkman/go-mod.patch | 28 -------------------------- pkgs/by-name/da/darkman/makefile.patch | 15 +++++++++++--- pkgs/by-name/da/darkman/package.nix | 9 ++++----- 3 files changed, 16 insertions(+), 36 deletions(-) delete mode 100644 pkgs/by-name/da/darkman/go-mod.patch diff --git a/pkgs/by-name/da/darkman/go-mod.patch b/pkgs/by-name/da/darkman/go-mod.patch deleted file mode 100644 index 8fbb26dfc5a0..000000000000 --- a/pkgs/by-name/da/darkman/go-mod.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/go.mod b/go.mod -index 2d396a4..c4fea4b 100644 ---- a/go.mod -+++ b/go.mod -@@ -1,14 +1,19 @@ - module gitlab.com/WhyNotHugo/darkman - --go 1.16 -+go 1.18 - - require ( - github.com/adrg/xdg v0.3.3 - github.com/godbus/dbus/v5 v5.0.4 -- github.com/kr/pretty v0.2.0 // indirect - github.com/rxwycdh/rxhash v0.0.0-20230131062142-10b7a38b400d - github.com/sj14/astral v0.1.2 -- github.com/spf13/cobra v1.7.0 // indirect -- gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect -+ github.com/spf13/cobra v1.7.0 - gopkg.in/yaml.v3 v3.0.1 - ) -+ -+require ( -+ github.com/inconshreveable/mousetrap v1.1.0 // indirect -+ github.com/kr/pretty v0.2.0 // indirect -+ github.com/spf13/pflag v1.0.5 // indirect -+ gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect -+) diff --git a/pkgs/by-name/da/darkman/makefile.patch b/pkgs/by-name/da/darkman/makefile.patch index 1374c37cf061..627162eaa477 100644 --- a/pkgs/by-name/da/darkman/makefile.patch +++ b/pkgs/by-name/da/darkman/makefile.patch @@ -1,12 +1,21 @@ diff --git a/Makefile b/Makefile -index 9048e45..0fb1f5a 100644 +index ab6997b..c3687ef 100644 --- a/Makefile +++ b/Makefile -@@ -26,7 +26,6 @@ site/index.html: darkman.1 +@@ -30,7 +30,6 @@ site/index.html: darkman.1 mandoc -T html -O style=man-style.css < darkman.1 > site/index.html install: build - @install -Dm755 darkman ${DESTDIR}${PREFIX}/bin/darkman - @install -Dm644 darkman.service ${DESTDIR}${PREFIX}/lib/systemd/user/darkman.service @install -Dm644 darkman.1 ${DESTDIR}${PREFIX}/share/man/man1/darkman.1 @install -Dm644 LICENCE ${DESTDIR}${PREFIX}/share/licenses/darkman/LICENCE + @install -Dm644 _darkman.zsh ${DESTDIR}${PREFIX}/share/zsh/site-functions/_darkman +@@ -38,8 +37,6 @@ install: build + @install -Dm644 darkman.fish ${DESTDIR}${PREFIX}/share/fish/vendor_completions.d/darkman.fish + @install -Dm644 contrib/darkman.service \ + ${DESTDIR}${PREFIX}/lib/systemd/user/darkman.service +- @install -Dm755 contrib/darkman.openrc \ +- ${DESTDIR}/etc/user/init.d/darkman + @install -Dm644 contrib/dbus/nl.whynothugo.darkman.service \ + ${DESTDIR}${PREFIX}/share/dbus-1/services/nl.whynothugo.darkman.service + @install -Dm644 contrib/dbus/org.freedesktop.impl.portal.desktop.darkman.service \ diff --git a/pkgs/by-name/da/darkman/package.nix b/pkgs/by-name/da/darkman/package.nix index 624ca2bcc7f8..780698e44a3c 100644 --- a/pkgs/by-name/da/darkman/package.nix +++ b/pkgs/by-name/da/darkman/package.nix @@ -8,22 +8,21 @@ buildGoModule rec { pname = "darkman"; - version = "2.0.1"; + version = "2.2.0"; src = fetchFromGitLab { owner = "WhyNotHugo"; repo = "darkman"; rev = "v${version}"; - hash = "sha256-FaEpVy/0PqY5Bmw00hMyFZb9wcwYwEuCKMatYN8Xk3o="; + hash = "sha256-Kpuuxxwn/huA5WwmnVGG0HowNBGyexDRpdUc3bNmB18="; }; patches = [ - ./go-mod.patch ./makefile.patch ]; postPatch = '' - substituteInPlace darkman.service \ + substituteInPlace contrib/darkman.service \ --replace-fail /usr/bin/darkman $out/bin/darkman substituteInPlace contrib/dbus/nl.whynothugo.darkman.service \ --replace-fail /usr/bin/darkman $out/bin/darkman @@ -31,7 +30,7 @@ buildGoModule rec { --replace-fail /usr/bin/darkman $out/bin/darkman ''; - vendorHash = "sha256-3lILSVm7mtquCdR7+cDMuDpHihG+gDJTcQa1cM2o7ZU="; + vendorHash = "sha256-QO+fz8m2rILKTokimf+v4x0lon5lZy7zC+5qjTMdcs0="; nativeBuildInputs = [ scdoc ]; buildPhase = ''