From 7422c41cb3245faf9647d23a63b716c7b633c150 Mon Sep 17 00:00:00 2001 From: Donovan Glover Date: Sat, 16 Mar 2024 09:40:29 -0400 Subject: [PATCH 1/2] swww: migrate to by-name --- .../wayland/swww/default.nix => by-name/sw/swww/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/wayland/swww/default.nix => by-name/sw/swww/package.nix} (100%) diff --git a/pkgs/tools/wayland/swww/default.nix b/pkgs/by-name/sw/swww/package.nix similarity index 100% rename from pkgs/tools/wayland/swww/default.nix rename to pkgs/by-name/sw/swww/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 551c258ef4ae..8d4d2cda9d8e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4776,8 +4776,6 @@ with pkgs; swaytools = python3Packages.callPackage ../tools/wayland/swaytools { }; - swww = callPackage ../tools/wayland/swww { }; - wayland-utils = callPackage ../tools/wayland/wayland-utils { }; wayland-proxy-virtwl = callPackage ../tools/wayland/wayland-proxy-virtwl { From 81c6ae3aceb65efa16ebd1338a4329412b5e1155 Mon Sep 17 00:00:00 2001 From: Donovan Glover Date: Sat, 16 Mar 2024 09:43:47 -0400 Subject: [PATCH 2/2] swww: cleanup --- pkgs/by-name/sw/swww/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/sw/swww/package.nix b/pkgs/by-name/sw/swww/package.nix index 9973e6b2fb69..cf9b878a506d 100644 --- a/pkgs/by-name/sw/swww/package.nix +++ b/pkgs/by-name/sw/swww/package.nix @@ -14,12 +14,12 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "LGFae"; - repo = pname; + repo = "swww"; rev = "refs/tags/v${version}"; hash = "sha256-n7YdUmIZGu7W7cX6OvVW+wbkKjFvont4hEAhZXYDQd8="; }; - cargoSha256 = "sha256-lZC71M3lbsI+itMydAp5VCz0cpSHo/FpkQFC1NlN4DU="; + cargoHash = "sha256-lZC71M3lbsI+itMydAp5VCz0cpSHo/FpkQFC1NlN4DU="; buildInputs = [ lz4 @@ -42,9 +42,9 @@ rustPlatform.buildRustPackage rec { done installShellCompletion --cmd swww \ - --bash <(cat completions/swww.bash) \ - --fish <(cat completions/swww.fish) \ - --zsh <(cat completions/_swww) + --bash completions/swww.bash \ + --fish completions/swww.fish \ + --zsh completions/_swww ''; meta = with lib; {