From 6f0c0f24e3ac8d1142be684ccd860a89eb6ca7fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Sun, 26 Nov 2023 11:08:36 -0500 Subject: [PATCH 1/5] fnott: set `meta.mainProgram` --- pkgs/applications/misc/fnott/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/misc/fnott/default.nix b/pkgs/applications/misc/fnott/default.nix index c46ce82ea3ff..c54bd435526b 100644 --- a/pkgs/applications/misc/fnott/default.nix +++ b/pkgs/applications/misc/fnott/default.nix @@ -56,6 +56,7 @@ stdenv.mkDerivation rec { description = "Keyboard driven and lightweight Wayland notification daemon for wlroots-based compositors"; license = with licenses; [ mit zlib ]; maintainers = with maintainers; [ polykernel ]; + mainProgram = "fnott"; platforms = platforms.linux; }; } From 9fe386e214b2c030f711f3632316f5a1c51f3073 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Sun, 26 Nov 2023 11:09:17 -0500 Subject: [PATCH 2/5] fnott: remove `with lib;` --- pkgs/applications/misc/fnott/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/fnott/default.nix b/pkgs/applications/misc/fnott/default.nix index c54bd435526b..e170e3c524b1 100644 --- a/pkgs/applications/misc/fnott/default.nix +++ b/pkgs/applications/misc/fnott/default.nix @@ -51,12 +51,12 @@ stdenv.mkDerivation rec { fcft ]; - meta = with lib; { + meta = { homepage = "https://codeberg.org/dnkl/fnott"; description = "Keyboard driven and lightweight Wayland notification daemon for wlroots-based compositors"; - license = with licenses; [ mit zlib ]; - maintainers = with maintainers; [ polykernel ]; + license = with lib.licenses; [ mit zlib ]; + maintainers = with lib.maintainers; [ polykernel ]; mainProgram = "fnott"; - platforms = platforms.linux; + platforms = lib.platforms.linux; }; } From 11d6013a2fcd8b48e0a7104141eb94431459c4ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Sun, 26 Nov 2023 11:09:47 -0500 Subject: [PATCH 3/5] fnott: set `passthru.updateScript` --- pkgs/applications/misc/fnott/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/fnott/default.nix b/pkgs/applications/misc/fnott/default.nix index e170e3c524b1..4f944862e317 100644 --- a/pkgs/applications/misc/fnott/default.nix +++ b/pkgs/applications/misc/fnott/default.nix @@ -1,5 +1,6 @@ { stdenv , lib +, gitUpdater , fetchFromGitea , pkg-config , meson @@ -26,7 +27,7 @@ stdenv.mkDerivation rec { owner = "dnkl"; repo = "fnott"; rev = version; - sha256 = "sha256-8SKInlj54BP3Gn/DNVoLN62+Dfa8G5d/q2xGUXXdsjo="; + hash = "sha256-8SKInlj54BP3Gn/DNVoLN62+Dfa8G5d/q2xGUXXdsjo="; }; depsBuildBuild = [ @@ -51,6 +52,8 @@ stdenv.mkDerivation rec { fcft ]; + passthru.updateScript = gitUpdater { }; + meta = { homepage = "https://codeberg.org/dnkl/fnott"; description = "Keyboard driven and lightweight Wayland notification daemon for wlroots-based compositors"; From 54da1811a0d07928a278c81c194ae00387a0ace2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Sun, 26 Nov 2023 11:10:17 -0500 Subject: [PATCH 4/5] fnott: enable `strictDeps` --- pkgs/applications/misc/fnott/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/misc/fnott/default.nix b/pkgs/applications/misc/fnott/default.nix index 4f944862e317..8e4327bc80c3 100644 --- a/pkgs/applications/misc/fnott/default.nix +++ b/pkgs/applications/misc/fnott/default.nix @@ -30,6 +30,7 @@ stdenv.mkDerivation rec { hash = "sha256-8SKInlj54BP3Gn/DNVoLN62+Dfa8G5d/q2xGUXXdsjo="; }; + strictDeps = true; depsBuildBuild = [ pkg-config ]; From 097d123c29b4d420b31cf84274f576117cff4285 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Sun, 26 Nov 2023 11:12:30 -0500 Subject: [PATCH 5/5] fnott: move to `pkgs/by-name` --- .../misc/fnott/default.nix => by-name/fn/fnott/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/misc/fnott/default.nix => by-name/fn/fnott/package.nix} (100%) diff --git a/pkgs/applications/misc/fnott/default.nix b/pkgs/by-name/fn/fnott/package.nix similarity index 100% rename from pkgs/applications/misc/fnott/default.nix rename to pkgs/by-name/fn/fnott/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index aa9f3fa62b1e..f0535ff9c8fc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31438,8 +31438,6 @@ with pkgs; flowtime = callPackage ../applications/misc/flowtime { }; - fnott = callPackage ../applications/misc/fnott { }; - furnace = callPackage ../applications/audio/furnace { inherit (darwin.apple_sdk.frameworks) Cocoa; };