From aa3476462ad0296315013a67b84739c2096e050e Mon Sep 17 00:00:00 2001 From: name_snrl Date: Tue, 16 Apr 2024 21:31:44 +0500 Subject: [PATCH 1/2] wl-clip-persist: 0.3.1 -> 0.4.0 --- .../wl/wl-clip-persist/package.nix} | 32 ++++++++----------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 14 insertions(+), 20 deletions(-) rename pkgs/{tools/wayland/wl-clip-persist/default.nix => by-name/wl/wl-clip-persist/package.nix} (51%) diff --git a/pkgs/tools/wayland/wl-clip-persist/default.nix b/pkgs/by-name/wl/wl-clip-persist/package.nix similarity index 51% rename from pkgs/tools/wayland/wl-clip-persist/default.nix rename to pkgs/by-name/wl/wl-clip-persist/package.nix index 2cfe8cc01743..649b74b65aa7 100644 --- a/pkgs/tools/wayland/wl-clip-persist/default.nix +++ b/pkgs/by-name/wl/wl-clip-persist/package.nix @@ -1,32 +1,28 @@ -{ lib -, stdenv -, rustPlatform -, fetchFromGitHub -, pkg-config -, wayland +{ + lib, + stdenv, + rustPlatform, + fetchFromGitHub, + pkg-config, + wayland, }: -rustPlatform.buildRustPackage { +rustPlatform.buildRustPackage rec { pname = "wl-clip-persist"; - version = "0.3.1"; + version = "0.4.0"; src = fetchFromGitHub { owner = "Linus789"; repo = "wl-clip-persist"; - # upstream doesn't tag releases - rev = "6ba11a2aa295d780f0b2e8f005cf176601d153b0"; - hash = "sha256-wg4xEXLAZpWflFejP7ob4cnmRvo9d/0dL9hceG+RUr0="; + rev = "v${version}"; + hash = "sha256-uu9R+/8483YyuvMeot2sRs8ihSN1AEPeDjzRxB1P8kc="; }; - cargoHash = "sha256-vNxNvJ5tA323EVArJ6glNslkq/Q6u7NsIpTYO1Q3GEw="; + cargoHash = "sha256-XpNpHi9vl89sbec6DXh50t8s328Uw4PpzFVvGp1TP6o="; - nativeBuildInputs = [ - pkg-config - ]; + nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - wayland - ]; + buildInputs = [ wayland ]; meta = with lib; { broken = stdenv.isDarwin; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8f814aee1f07..b37b2b7fedc1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4785,8 +4785,6 @@ with pkgs; wlay = callPackage ../tools/wayland/wlay { }; - wl-clip-persist = callPackage ../tools/wayland/wl-clip-persist { }; - wl-clipboard = callPackage ../tools/wayland/wl-clipboard { }; wl-clipboard-x11 = callPackage ../tools/wayland/wl-clipboard-x11 { }; From cb01675dd19753f6aaa4d9c7b66e2dc81d2a14b9 Mon Sep 17 00:00:00 2001 From: name_snrl Date: Tue, 16 Apr 2024 21:32:21 +0500 Subject: [PATCH 2/2] wl-clip-persist: add `name-snrl` to maintainers --- pkgs/by-name/wl/wl-clip-persist/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/wl/wl-clip-persist/package.nix b/pkgs/by-name/wl/wl-clip-persist/package.nix index 649b74b65aa7..3612999599df 100644 --- a/pkgs/by-name/wl/wl-clip-persist/package.nix +++ b/pkgs/by-name/wl/wl-clip-persist/package.nix @@ -31,6 +31,6 @@ rustPlatform.buildRustPackage rec { inherit (wayland.meta) platforms; license = licenses.mit; mainProgram = "wl-clip-persist"; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ name-snrl ]; }; }