From 7e120b32d932c3dd6702b8e77f9963d752e887ba Mon Sep 17 00:00:00 2001 From: Arjan Schrijver Date: Fri, 11 Jul 2025 09:07:53 +0200 Subject: [PATCH 1/3] ntfy-sh: 2.12.0 -> 2.13.0 --- pkgs/tools/misc/ntfy-sh/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/ntfy-sh/default.nix b/pkgs/tools/misc/ntfy-sh/default.nix index 0fbf1a316354..64bdf4261663 100644 --- a/pkgs/tools/misc/ntfy-sh/default.nix +++ b/pkgs/tools/misc/ntfy-sh/default.nix @@ -12,21 +12,21 @@ buildGoModule rec { pname = "ntfy-sh"; - version = "2.12.0"; + version = "2.13.0"; src = fetchFromGitHub { owner = "binwiederhier"; repo = "ntfy"; tag = "v${version}"; - hash = "sha256-fnnDVx84dc0iHA1Xa7AgdiBzLxCm4UIZjbMkc24GLVI="; + hash = "sha256-D4wLIGVItH5lZlfmgd2+QsqB4PHlyX4ORpwT1NGdV60="; }; - vendorHash = "sha256-DXvQbVKFviGhTosW4F+FB/tbJBzM5FHULWv4cO3RnK4="; + vendorHash = "sha256-7+nvkyLcdQZ/B4Lly4ygcOGxSLkXXqCqu7xvCB4+8Wo="; ui = buildNpmPackage { inherit src version; pname = "ntfy-sh-ui"; - npmDepsHash = "sha256-SmSItsOjpi874c2AK/3Xmtb0/PisXM+07eoQEEYWKt0="; + npmDepsHash = "sha256-oiOv4d+Gxk43gUAZXrTpcsfuEEpGyJMYS19ZRHf9oF8="; prePatch = '' cd web/ From d0d653168f438f609470bf5754b1caf19838a6f3 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 11 Jul 2025 17:09:44 +0200 Subject: [PATCH 2/3] nfy-sh: move to by-name --- .../misc/ntfy-sh/default.nix => by-name/nt/ntfy-sh/package.nix} | 0 pkgs/{tools/misc => by-name/nt}/ntfy-sh/update.sh | 0 pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 2 deletions(-) rename pkgs/{tools/misc/ntfy-sh/default.nix => by-name/nt/ntfy-sh/package.nix} (100%) rename pkgs/{tools/misc => by-name/nt}/ntfy-sh/update.sh (100%) diff --git a/pkgs/tools/misc/ntfy-sh/default.nix b/pkgs/by-name/nt/ntfy-sh/package.nix similarity index 100% rename from pkgs/tools/misc/ntfy-sh/default.nix rename to pkgs/by-name/nt/ntfy-sh/package.nix diff --git a/pkgs/tools/misc/ntfy-sh/update.sh b/pkgs/by-name/nt/ntfy-sh/update.sh similarity index 100% rename from pkgs/tools/misc/ntfy-sh/update.sh rename to pkgs/by-name/nt/ntfy-sh/update.sh diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 367d22a2779a..5d2d424d3199 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3874,8 +3874,6 @@ with pkgs; # ntfsprogs are merged into ntfs-3g ntfsprogs = pkgs.ntfs3g; - ntfy-sh = callPackage ../tools/misc/ntfy-sh { }; - nvfancontrol = callPackage ../tools/misc/nvfancontrol { libXNVCtrl = linuxPackages.nvidia_x11.settings.libXNVCtrl; }; From 9b2ae092be8fc8eebf58ac812bc24bbcd2da1c1e Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 11 Jul 2025 17:08:24 +0200 Subject: [PATCH 3/3] ntfy-sh: modernize --- pkgs/by-name/nt/ntfy-sh/package.nix | 129 +++++++++++++++------------- 1 file changed, 69 insertions(+), 60 deletions(-) diff --git a/pkgs/by-name/nt/ntfy-sh/package.nix b/pkgs/by-name/nt/ntfy-sh/package.nix index 64bdf4261663..17a97a464f87 100644 --- a/pkgs/by-name/nt/ntfy-sh/package.nix +++ b/pkgs/by-name/nt/ntfy-sh/package.nix @@ -10,73 +10,82 @@ python3Packages, }: -buildGoModule rec { - pname = "ntfy-sh"; - version = "2.13.0"; +buildGoModule ( + finalAttrs: - src = fetchFromGitHub { - owner = "binwiederhier"; - repo = "ntfy"; - tag = "v${version}"; - hash = "sha256-D4wLIGVItH5lZlfmgd2+QsqB4PHlyX4ORpwT1NGdV60="; - }; + let + ui = buildNpmPackage { + inherit (finalAttrs) src version; + pname = "ntfy-sh-ui"; + npmDepsHash = "sha256-oiOv4d+Gxk43gUAZXrTpcsfuEEpGyJMYS19ZRHf9oF8="; - vendorHash = "sha256-7+nvkyLcdQZ/B4Lly4ygcOGxSLkXXqCqu7xvCB4+8Wo="; + prePatch = '' + cd web/ + ''; - ui = buildNpmPackage { - inherit src version; - pname = "ntfy-sh-ui"; - npmDepsHash = "sha256-oiOv4d+Gxk43gUAZXrTpcsfuEEpGyJMYS19ZRHf9oF8="; + installPhase = '' + runHook preInstall - prePatch = '' - cd web/ - ''; + mv build/index.html build/app.html + rm build/config.js + mkdir -p $out + mv build/ $out/site - installPhase = '' - mv build/index.html build/app.html - rm build/config.js - mkdir -p $out - mv build/ $out/site - ''; - }; + runHook postInstall + ''; + }; + in + { + pname = "ntfy-sh"; + version = "2.13.0"; - doCheck = false; + src = fetchFromGitHub { + owner = "binwiederhier"; + repo = "ntfy"; + tag = "v${finalAttrs.version}"; + hash = "sha256-D4wLIGVItH5lZlfmgd2+QsqB4PHlyX4ORpwT1NGdV60="; + }; - ldflags = [ - "-s" - "-w" - "-X main.version=${version}" - ]; + vendorHash = "sha256-7+nvkyLcdQZ/B4Lly4ygcOGxSLkXXqCqu7xvCB4+8Wo="; - nativeBuildInputs = [ - debianutils - mkdocs - python3 - python3Packages.mkdocs-material - python3Packages.mkdocs-minify-plugin - ]; + doCheck = false; - postPatch = '' - sed -i 's# /bin/echo# echo#' Makefile - ''; - - preBuild = '' - cp -r ${ui}/site/ server/ - make docs-build - ''; - - passthru = { - updateScript = ./update.sh; - tests.ntfy-sh = nixosTests.ntfy-sh; - }; - - meta = with lib; { - description = "Send push notifications to your phone or desktop via PUT/POST"; - homepage = "https://ntfy.sh"; - license = licenses.asl20; - maintainers = with maintainers; [ - arjan-s - fpletz + ldflags = [ + "-s" + "-w" + "-X main.version=${finalAttrs.version}" ]; - }; -} + + nativeBuildInputs = [ + debianutils + mkdocs + python3 + python3Packages.mkdocs-material + python3Packages.mkdocs-minify-plugin + ]; + + postPatch = '' + sed -i 's# /bin/echo# echo#' Makefile + ''; + + preBuild = '' + cp -r ${ui}/site/ server/ + make docs-build + ''; + + passthru = { + updateScript = ./update.sh; + tests.ntfy-sh = nixosTests.ntfy-sh; + }; + + meta = { + description = "Send push notifications to your phone or desktop via PUT/POST"; + homepage = "https://ntfy.sh"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ + arjan-s + fpletz + ]; + }; + } +)