From 9ddf60a4b0a3ca04ac933cffa022b93cf63a2469 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Mon, 1 Jul 2024 10:05:52 -0300 Subject: [PATCH 1/2] marwaita: move to pkgs/by-name/ma/ --- .../marwaita/default.nix => by-name/ma/marwaita/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{data/themes/marwaita/default.nix => by-name/ma/marwaita/package.nix} (100%) diff --git a/pkgs/data/themes/marwaita/default.nix b/pkgs/by-name/ma/marwaita/package.nix similarity index 100% rename from pkgs/data/themes/marwaita/default.nix rename to pkgs/by-name/ma/marwaita/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 703bdaf0af14..ffb7bda1ed5f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28582,8 +28582,6 @@ with pkgs; martian-mono = callPackage ../data/fonts/martian-mono { }; - marwaita = callPackage ../data/themes/marwaita { }; - marwaita-icons = callPackage ../by-name/ma/marwaita-icons/package.nix { inherit (kdePackages) breeze-icons; }; From 3fccc915ef1ce860589643cb216955e8f59524c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Mon, 1 Jul 2024 10:07:09 -0300 Subject: [PATCH 2/2] marwaita: 20.1 -> 20.2-unstable-2024-07-01 Diff: https://github.com/darkomarko42/marwaita/compare/20.1...20.2 --- pkgs/by-name/ma/marwaita/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ma/marwaita/package.nix b/pkgs/by-name/ma/marwaita/package.nix index 9b279bba3aff..ba390421ac29 100644 --- a/pkgs/by-name/ma/marwaita/package.nix +++ b/pkgs/by-name/ma/marwaita/package.nix @@ -10,13 +10,13 @@ stdenvNoCC.mkDerivation rec { pname = "marwaita"; - version = "20.1"; + version = "20.2-unstable-2024-07-01"; src = fetchFromGitHub { owner = "darkomarko42"; repo = pname; - rev = version; - hash = "sha256-3kVfZnqRJs0CPl+EICDjg2+NSwuz18QccHx63cVLpFY="; + rev = "da6614b0fcb14d83de94f9b23b75baec03b3bc68"; + hash = "sha256-XP3mDa8KOyqd4ECnjvmfk84lU56qBYPGZAT9/fEp6N8="; }; buildInputs = [