From 613bce8f55eee6181c336499838cc1a3f427a2fd Mon Sep 17 00:00:00 2001 From: magicquark <198001825+magicquark@users.noreply.github.com> Date: Sat, 6 Jun 2026 01:22:18 +0100 Subject: [PATCH 1/4] clipse: 1.1.0 -> 1.2.1 Version 1.2.0 of `clipse` has build requirements that are specific to the host display server. The `clipse-x11` alias has been added for those using the x11 display server. Release: https://github.com/savedra1/clipse/releases/tag/v1.2.0 Release: https://github.com/savedra1/clipse/releases/tag/v1.2.1 Co-authored-by: savedra1 --- pkgs/by-name/cl/clipse/package.nix | 61 +++++++++++++++++++++++++++--- pkgs/top-level/all-packages.nix | 5 +++ 2 files changed, 61 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/cl/clipse/package.nix b/pkgs/by-name/cl/clipse/package.nix index 1e9d95a2f3eb..d1c48bdd7a5a 100644 --- a/pkgs/by-name/cl/clipse/package.nix +++ b/pkgs/by-name/cl/clipse/package.nix @@ -2,20 +2,71 @@ lib, buildGoModule, fetchFromGitHub, + stdenv, + enableWayland ? stdenv.hostPlatform.isLinux, + enableX11 ? false, + libpng, + libx11, + libxi, + libxkbcommon, + libxtst, + pkg-config, + xclip, + xinput, + xkbcomp, + xkbutils, + xsel, }: +assert lib.assertMsg ( + stdenv.hostPlatform.isLinux -> (lib.xor enableX11 enableWayland) +) "Exactly one of enableWayland, enableX11 must be true"; + buildGoModule (finalAttrs: { - pname = "clipse"; - version = "1.1.0"; + pname = "clipse${lib.optionalString enableX11 "-x11"}"; + version = "1.2.1"; src = fetchFromGitHub { owner = "savedra1"; repo = "clipse"; - rev = "v${finalAttrs.version}"; - hash = "sha256-yUkHT7SZT7Eudvk1n43V+WGWqUKtXaV+p4ySMK/XzQw="; + tag = "v${finalAttrs.version}"; + hash = "sha256-iDMHEhYuxspBYG54WivnVj2GfMxAc5dcrjNxtAMhsck="; }; - vendorHash = "sha256-+9uoB/1g4qucdM8RJRs+fSc5hpcgaCK0GrUOFgHWeKo="; + vendorHash = "sha256-LxwST4Zjxq6Fwc47VeOdv19J3g/DHZ7Fywp2ZvVR06I="; + + tags = + if stdenv.hostPlatform.isDarwin then + [ "darwin" ] + else if enableWayland then + [ "wayland" ] + else if enableX11 then + [ "linux" ] + else + [ ]; + + env = { + CGO_ENABLED = if enableX11 || stdenv.hostPlatform.isDarwin then "1" else "0"; + }; + + nativeBuildInputs = lib.optionals enableX11 [ + pkg-config + ]; + + buildInputs = lib.optionals enableX11 [ + libpng + libx11 + libxi + libxkbcommon + libxtst + xclip + xinput + xkbcomp + xkbutils + xsel + ]; + + proxyVendor = true; meta = { description = "Useful clipboard manager TUI for Unix"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ba28ad70b86f..dd04655a8419 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11629,4 +11629,9 @@ with pkgs; gpac-unstable = callPackage ../by-name/gp/gpac/package.nix { releaseChannel = "unstable"; }; + + clipse-x11 = callPackage ../by-name/cl/clipse/package.nix { + enableWayland = false; + enableX11 = true; + }; } From d3624302abbbd62633e75454599ad40b6a4136f0 Mon Sep 17 00:00:00 2001 From: magicquark <198001825+magicquark@users.noreply.github.com> Date: Sat, 6 Jun 2026 01:38:40 +0100 Subject: [PATCH 2/4] clipse: add maintainer magicquark --- pkgs/by-name/cl/clipse/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/cl/clipse/package.nix b/pkgs/by-name/cl/clipse/package.nix index d1c48bdd7a5a..004bb1840fc4 100644 --- a/pkgs/by-name/cl/clipse/package.nix +++ b/pkgs/by-name/cl/clipse/package.nix @@ -73,6 +73,9 @@ buildGoModule (finalAttrs: { homepage = "https://github.com/savedra1/clipse"; license = lib.licenses.mit; mainProgram = "clipse"; - maintainers = [ lib.maintainers.savedra1 ]; + maintainers = with lib.maintainers; [ + magicquark + savedra1 + ]; }; }) From 67e808253f3ed6a8fd3181e3a44a4ad51188f116 Mon Sep 17 00:00:00 2001 From: magicquark <198001825+magicquark@users.noreply.github.com> Date: Sat, 6 Jun 2026 01:39:46 +0100 Subject: [PATCH 3/4] clipse: add meta.changelog --- pkgs/by-name/cl/clipse/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/cl/clipse/package.nix b/pkgs/by-name/cl/clipse/package.nix index 004bb1840fc4..6268cbb742c5 100644 --- a/pkgs/by-name/cl/clipse/package.nix +++ b/pkgs/by-name/cl/clipse/package.nix @@ -69,6 +69,7 @@ buildGoModule (finalAttrs: { proxyVendor = true; meta = { + changelog = "https://github.com/savedra1/clipse/blob/main/CHANGELOG.md"; description = "Useful clipboard manager TUI for Unix"; homepage = "https://github.com/savedra1/clipse"; license = lib.licenses.mit; From 66e65fc82e5a8f04accdb695bffdff07346cc537 Mon Sep 17 00:00:00 2001 From: magicquark <198001825+magicquark@users.noreply.github.com> Date: Sat, 6 Jun 2026 01:43:08 +0100 Subject: [PATCH 4/4] clipse: use strictDeps and structuredAttrs --- pkgs/by-name/cl/clipse/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/cl/clipse/package.nix b/pkgs/by-name/cl/clipse/package.nix index 6268cbb742c5..07920fd3aa08 100644 --- a/pkgs/by-name/cl/clipse/package.nix +++ b/pkgs/by-name/cl/clipse/package.nix @@ -33,6 +33,9 @@ buildGoModule (finalAttrs: { hash = "sha256-iDMHEhYuxspBYG54WivnVj2GfMxAc5dcrjNxtAMhsck="; }; + strictDeps = true; + __structuredAttrs = true; + vendorHash = "sha256-LxwST4Zjxq6Fwc47VeOdv19J3g/DHZ7Fywp2ZvVR06I="; tags =