From a7ea3911798120047beb25be107138a0c547dce2 Mon Sep 17 00:00:00 2001 From: Mateo Diaz Date: Mon, 21 Nov 2022 18:03:42 -0800 Subject: [PATCH 1/8] swww: init at 0.5.0 --- maintainers/maintainer-list.nix | 6 ++++++ pkgs/tools/wayland/swww/default.nix | 26 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 34 insertions(+) create mode 100644 pkgs/tools/wayland/swww/default.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index ee4cc8dffbc4..aa3e14273ec7 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8580,6 +8580,12 @@ githubId = 854770; name = "Matej Cotman"; }; + mateodd25 = { + email = "mateodd@icloud.com"; + github = "mateodd25"; + githubId = 854770; + name = "Mateo Diaz"; + }; mathnerd314 = { email = "mathnerd314.gph+hs@gmail.com"; github = "Mathnerd314"; diff --git a/pkgs/tools/wayland/swww/default.nix b/pkgs/tools/wayland/swww/default.nix new file mode 100644 index 000000000000..1e934546324a --- /dev/null +++ b/pkgs/tools/wayland/swww/default.nix @@ -0,0 +1,26 @@ +{ config, lib, pkgs, fetchFromGitHub, rustPlatform, pkg-config, lz4 +, libxkbcommon, ... }: + +rustPlatform.buildRustPackage rec { + pname = "swww"; + version = "0.5.0"; + + src = fetchFromGitHub { + owner = "Horus645"; + repo = pname; + rev = "d45ab41a0c83b6f49a0279618e91ddfc0853bb6a"; + sha256 = "K9ZH/774BmzjEFj3gxzTALQex0T12B8ZuGEB878Qbc0="; + }; + cargoSha256 = "sha256-boCXh9QFfxxtqxElrEHtBJMeCQikaUoytIVshwXRA10="; + buildInputs = [ lz4 libxkbcommon ]; + doCheck = false; # Integration tests do not work in sandbox enviroment + nativeBuildInputs = [ pkg-config ]; + meta = with lib; { + description = + "Efficient animated wallpaper daemon for wayland, controlled at runtime"; + homepage = "https://github.com/Horus645/swww"; + maintainers = with maintainers; [ mateodd25 ]; + license = licenses.gpl3; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f1e59a08d200..34d5660b822d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3554,6 +3554,8 @@ 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 9377f94ac5c69eaeca0a2a9d13a41ea7f41c0b7d Mon Sep 17 00:00:00 2001 From: Mateo Diaz Date: Fri, 3 Feb 2023 22:25:04 -0800 Subject: [PATCH 2/8] swww: v0.5.0 -> v0.7.0 --- pkgs/tools/wayland/swww/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/wayland/swww/default.nix b/pkgs/tools/wayland/swww/default.nix index 1e934546324a..eb2840e5a9b4 100644 --- a/pkgs/tools/wayland/swww/default.nix +++ b/pkgs/tools/wayland/swww/default.nix @@ -1,17 +1,16 @@ { config, lib, pkgs, fetchFromGitHub, rustPlatform, pkg-config, lz4 , libxkbcommon, ... }: - rustPlatform.buildRustPackage rec { pname = "swww"; - version = "0.5.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "Horus645"; repo = pname; - rev = "d45ab41a0c83b6f49a0279618e91ddfc0853bb6a"; - sha256 = "K9ZH/774BmzjEFj3gxzTALQex0T12B8ZuGEB878Qbc0="; + rev = "v0.7.0"; + sha256 = "ofJTL+9izMmwENaEVYQ7rjpoEFR1J2szkJxzYb09N7g="; }; - cargoSha256 = "sha256-boCXh9QFfxxtqxElrEHtBJMeCQikaUoytIVshwXRA10="; + cargoSha256 = "sha256-ntulNQUQZ42CGvwnnQSMQsr/MDSNY/5/Aq2Ew9QItn8="; buildInputs = [ lz4 libxkbcommon ]; doCheck = false; # Integration tests do not work in sandbox enviroment nativeBuildInputs = [ pkg-config ]; @@ -19,7 +18,6 @@ rustPlatform.buildRustPackage rec { description = "Efficient animated wallpaper daemon for wayland, controlled at runtime"; homepage = "https://github.com/Horus645/swww"; - maintainers = with maintainers; [ mateodd25 ]; license = licenses.gpl3; platforms = platforms.linux; }; From a124a517b2e66078143beaae058e394aa5c1acc0 Mon Sep 17 00:00:00 2001 From: Mateo Diaz Date: Sat, 4 Feb 2023 08:02:19 -0800 Subject: [PATCH 3/8] Update pkgs/tools/wayland/swww/default.nix Co-authored-by: Adam Stephens <2071575+adamcstephens@users.noreply.github.com> --- pkgs/tools/wayland/swww/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/wayland/swww/default.nix b/pkgs/tools/wayland/swww/default.nix index eb2840e5a9b4..46c71e20fd5f 100644 --- a/pkgs/tools/wayland/swww/default.nix +++ b/pkgs/tools/wayland/swww/default.nix @@ -1,5 +1,5 @@ { config, lib, pkgs, fetchFromGitHub, rustPlatform, pkg-config, lz4 -, libxkbcommon, ... }: +, libxkbcommon }: rustPlatform.buildRustPackage rec { pname = "swww"; version = "0.7.0"; From 2a5bf1fcdfc8658678bc9305677dfa0fda907367 Mon Sep 17 00:00:00 2001 From: Mateo Diaz Date: Sat, 4 Feb 2023 08:02:30 -0800 Subject: [PATCH 4/8] Update pkgs/tools/wayland/swww/default.nix Co-authored-by: Adam Stephens <2071575+adamcstephens@users.noreply.github.com> --- pkgs/tools/wayland/swww/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/wayland/swww/default.nix b/pkgs/tools/wayland/swww/default.nix index 46c71e20fd5f..e33103aeb7f0 100644 --- a/pkgs/tools/wayland/swww/default.nix +++ b/pkgs/tools/wayland/swww/default.nix @@ -7,8 +7,8 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "Horus645"; repo = pname; - rev = "v0.7.0"; - sha256 = "ofJTL+9izMmwENaEVYQ7rjpoEFR1J2szkJxzYb09N7g="; + rev = "refs/tags/v${version}"; + hash = "sha256-ofJTL+9izMmwENaEVYQ7rjpoEFR1J2szkJxzYb09N7g="; }; cargoSha256 = "sha256-ntulNQUQZ42CGvwnnQSMQsr/MDSNY/5/Aq2Ew9QItn8="; buildInputs = [ lz4 libxkbcommon ]; From 2bf1fca5ac68b085bbc42f445731791cf5aa3b1b Mon Sep 17 00:00:00 2001 From: Mateo Diaz Date: Sat, 4 Feb 2023 08:02:49 -0800 Subject: [PATCH 5/8] Update pkgs/tools/wayland/swww/default.nix Co-authored-by: Adam Stephens <2071575+adamcstephens@users.noreply.github.com> --- pkgs/tools/wayland/swww/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/tools/wayland/swww/default.nix b/pkgs/tools/wayland/swww/default.nix index e33103aeb7f0..c5c4c94c2955 100644 --- a/pkgs/tools/wayland/swww/default.nix +++ b/pkgs/tools/wayland/swww/default.nix @@ -15,8 +15,7 @@ rustPlatform.buildRustPackage rec { doCheck = false; # Integration tests do not work in sandbox enviroment nativeBuildInputs = [ pkg-config ]; meta = with lib; { - description = - "Efficient animated wallpaper daemon for wayland, controlled at runtime"; + description = "Efficient animated wallpaper daemon for wayland, controlled at runtime"; homepage = "https://github.com/Horus645/swww"; license = licenses.gpl3; platforms = platforms.linux; From 68f5e9554ffa3cfee31786f9a3013ebd8a7d8308 Mon Sep 17 00:00:00 2001 From: Mateo Diaz Date: Sat, 4 Feb 2023 08:38:30 -0800 Subject: [PATCH 6/8] Add maintainers --- pkgs/tools/wayland/swww/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/wayland/swww/default.nix b/pkgs/tools/wayland/swww/default.nix index c5c4c94c2955..91576ca2a7c0 100644 --- a/pkgs/tools/wayland/swww/default.nix +++ b/pkgs/tools/wayland/swww/default.nix @@ -18,6 +18,7 @@ rustPlatform.buildRustPackage rec { description = "Efficient animated wallpaper daemon for wayland, controlled at runtime"; homepage = "https://github.com/Horus645/swww"; license = licenses.gpl3; + maintainers = with maintainers; [ mateodd25 ]; platforms = platforms.linux; }; } From 7c201f6b53bf4acc77184d110cd2cfd72d065bae Mon Sep 17 00:00:00 2001 From: Mateo Diaz Date: Sat, 4 Feb 2023 08:40:58 -0800 Subject: [PATCH 7/8] Add whitespaces for readability. --- pkgs/tools/wayland/swww/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/wayland/swww/default.nix b/pkgs/tools/wayland/swww/default.nix index 91576ca2a7c0..70a61067a42e 100644 --- a/pkgs/tools/wayland/swww/default.nix +++ b/pkgs/tools/wayland/swww/default.nix @@ -10,10 +10,12 @@ rustPlatform.buildRustPackage rec { rev = "refs/tags/v${version}"; hash = "sha256-ofJTL+9izMmwENaEVYQ7rjpoEFR1J2szkJxzYb09N7g="; }; + cargoSha256 = "sha256-ntulNQUQZ42CGvwnnQSMQsr/MDSNY/5/Aq2Ew9QItn8="; buildInputs = [ lz4 libxkbcommon ]; doCheck = false; # Integration tests do not work in sandbox enviroment nativeBuildInputs = [ pkg-config ]; + meta = with lib; { description = "Efficient animated wallpaper daemon for wayland, controlled at runtime"; homepage = "https://github.com/Horus645/swww"; From 514178918f7f97a066911c0ce3fc2d41f550a934 Mon Sep 17 00:00:00 2001 From: Mateo Diaz Date: Sat, 18 Feb 2023 20:22:24 -0800 Subject: [PATCH 8/8] 0.7.0 -> 0.7.2 --- pkgs/tools/wayland/swww/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/wayland/swww/default.nix b/pkgs/tools/wayland/swww/default.nix index 70a61067a42e..a766a51188d5 100644 --- a/pkgs/tools/wayland/swww/default.nix +++ b/pkgs/tools/wayland/swww/default.nix @@ -1,19 +1,18 @@ -{ config, lib, pkgs, fetchFromGitHub, rustPlatform, pkg-config, lz4 -, libxkbcommon }: +{ config, lib, pkgs, fetchFromGitHub, rustPlatform, pkg-config, lz4, libxkbcommon }: rustPlatform.buildRustPackage rec { pname = "swww"; - version = "0.7.0"; + version = "0.7.2"; src = fetchFromGitHub { owner = "Horus645"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-ofJTL+9izMmwENaEVYQ7rjpoEFR1J2szkJxzYb09N7g="; + hash = "sha256-1SmCeIlcjOX3yCvpfqQ82uq4h2xlGhX9OCwKb6jGK78="; }; - cargoSha256 = "sha256-ntulNQUQZ42CGvwnnQSMQsr/MDSNY/5/Aq2Ew9QItn8="; + cargoSha256 = "sha256-08YM9yTCRJPHdOc1+7F3guYiP3y1WSi3/hzlDRVpitc="; buildInputs = [ lz4 libxkbcommon ]; - doCheck = false; # Integration tests do not work in sandbox enviroment + doCheck = false; # Integration tests do not work in sandbox environment nativeBuildInputs = [ pkg-config ]; meta = with lib; {