From b809ad0cc35aeb2ea5a949322e6659b768540258 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Mon, 20 May 2024 21:44:42 -0400 Subject: [PATCH 1/3] slurp: migrate to by-name --- .../wayland/slurp/default.nix => by-name/sl/slurp/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/wayland/slurp/default.nix => by-name/sl/slurp/package.nix} (100%) diff --git a/pkgs/tools/wayland/slurp/default.nix b/pkgs/by-name/sl/slurp/package.nix similarity index 100% rename from pkgs/tools/wayland/slurp/default.nix rename to pkgs/by-name/sl/slurp/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ce162c99e57e..79af2e3512d1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4683,8 +4683,6 @@ with pkgs; shotman = callPackage ../tools/wayland/shotman { }; - slurp = callPackage ../tools/wayland/slurp { }; - sway-unwrapped = callPackage ../by-name/sw/sway-unwrapped/package.nix { wlroots = wlroots_0_17; }; From 706b421a503c42d475a162893408b16b3693e37c Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Mon, 20 May 2024 21:45:03 -0400 Subject: [PATCH 2/3] slurp: format with nixfmt --- pkgs/by-name/sl/slurp/package.nix | 36 ++++++++++++++++--------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/pkgs/by-name/sl/slurp/package.nix b/pkgs/by-name/sl/slurp/package.nix index e8be0deae6c2..31a9dee2fec6 100644 --- a/pkgs/by-name/sl/slurp/package.nix +++ b/pkgs/by-name/sl/slurp/package.nix @@ -1,16 +1,17 @@ -{ lib -, stdenv -, fetchFromGitHub -, cairo -, libxkbcommon -, meson -, ninja -, pkg-config -, scdoc -, wayland -, wayland-protocols -, wayland-scanner -, buildDocs ? true +{ + lib, + stdenv, + fetchFromGitHub, + cairo, + libxkbcommon, + meson, + ninja, + pkg-config, + scdoc, + wayland, + wayland-protocols, + wayland-scanner, + buildDocs ? true, }: stdenv.mkDerivation (finalAttrs: { @@ -24,9 +25,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-2M8f3kN6tihwKlUCp2Qowv5xD6Ufb71AURXqwQShlXI="; }; - depsBuildBuild = [ - pkg-config - ]; + depsBuildBuild = [ pkg-config ]; nativeBuildInputs = [ meson @@ -53,6 +52,9 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/emersion/slurp"; license = licenses.mit; mainProgram = "slurp"; - maintainers = with maintainers; [ buffet nickcao ]; + maintainers = with maintainers; [ + buffet + nickcao + ]; }; }) From 50cc50fa0d5a7fccf2b352cee0fbaf8e8ebf2609 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Mon, 20 May 2024 21:45:40 -0400 Subject: [PATCH 3/3] slurp: mark platforms as linux only --- pkgs/by-name/sl/slurp/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/sl/slurp/package.nix b/pkgs/by-name/sl/slurp/package.nix index 31a9dee2fec6..996bf4c75d67 100644 --- a/pkgs/by-name/sl/slurp/package.nix +++ b/pkgs/by-name/sl/slurp/package.nix @@ -45,14 +45,14 @@ stdenv.mkDerivation (finalAttrs: { mesonFlags = [ (lib.mesonEnable "man-pages" buildDocs) ]; - meta = with lib; { + meta = { changelog = "https://github.com/emersion/slurp/releases/tag/v${finalAttrs.version}"; description = "Select a region in a Wayland compositor"; - inherit (wayland.meta) platforms; + platforms = lib.platforms.linux; homepage = "https://github.com/emersion/slurp"; - license = licenses.mit; + license = lib.licenses.mit; mainProgram = "slurp"; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ buffet nickcao ];