From 2f82a95b74845943522cfe12551fe147cad0a6ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Tue, 29 Oct 2024 20:52:07 -0300
Subject: [PATCH 1/3] marwaita-pop_os: renamed to marwaita-yellow

---
 pkgs/data/themes/marwaita-pop_os/default.nix | 4 ++--
 pkgs/top-level/aliases.nix                   | 1 +
 pkgs/top-level/all-packages.nix              | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/data/themes/marwaita-pop_os/default.nix b/pkgs/data/themes/marwaita-pop_os/default.nix
index 33e75cdd08c2..ff0ad55c1f0b 100644
--- a/pkgs/data/themes/marwaita-pop_os/default.nix
+++ b/pkgs/data/themes/marwaita-pop_os/default.nix
@@ -9,12 +9,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  pname = "marwaita-pop_os";
+  pname = "marwaita-yellow";
   version = "17.0";
 
   src = fetchFromGitHub {
     owner = "darkomarko42";
-    repo = pname;
+    repo = "marwaita-yellow";
     rev = "1f3561f1231d0e9e931f93c5d59df19ed2205ce0";
     hash = "sha256-WbCIMEWF5853TQyhq8aRoWzpsmjObm9hEc4I0pxDNOM=";
   };
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index ac1e02b3ce72..de2d45697f46 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -731,6 +731,7 @@ mapAliases {
   marwaita-manjaro = lib.warn "marwaita-manjaro has been renamed to marwaita-teal" marwaita-teal; # Added 2024-07-08
   marwaita-peppermint = lib.warn "marwaita-peppermint has been renamed to marwaita-red" marwaita-red; # Added 2024-07-01
   marwaita-ubuntu = lib.warn "marwaita-ubuntu has been renamed to marwaita-orange" marwaita-orange; # Added 2024-07-08
+  marwaita-pop_os = lib.warn "marwaita-pop_os has been renamed to marwaita-yellow" marwaita-yellow; # Added 2024-10-29
   masari = throw "masari has been removed as it was abandoned upstream"; # Added 2024-07-11
   mathematica9 = throw "mathematica9 has been removed as it was obsolete, broken, and depended on OpenCV 2"; # Added 2024-08-20
   mathematica10 = throw "mathematica10 has been removed as it was obsolete, broken, and depended on OpenCV 2"; # Added 2024-08-20
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4a5d3b090784..388f065812a4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -27170,7 +27170,7 @@ with pkgs;
     inherit (kdePackages) breeze-icons;
   };
 
-  marwaita-pop_os = callPackage ../data/themes/marwaita-pop_os { };
+  marwaita-yellow = callPackage ../data/themes/marwaita-pop_os { };
 
   matcha-gtk-theme = callPackage ../data/themes/matcha { };
 

From c1d73ed99fa52f781b80f3c3959b9541c2e20a59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Tue, 29 Oct 2024 20:57:24 -0300
Subject: [PATCH 2/3] marwaita-yellow: move to pkgs/by-name

---
 .../default.nix => by-name/ma/marwaita-yellow/package.nix}      | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{data/themes/marwaita-pop_os/default.nix => by-name/ma/marwaita-yellow/package.nix} (100%)

diff --git a/pkgs/data/themes/marwaita-pop_os/default.nix b/pkgs/by-name/ma/marwaita-yellow/package.nix
similarity index 100%
rename from pkgs/data/themes/marwaita-pop_os/default.nix
rename to pkgs/by-name/ma/marwaita-yellow/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 388f065812a4..2b9a559bcc9d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -27170,8 +27170,6 @@ with pkgs;
     inherit (kdePackages) breeze-icons;
   };
 
-  marwaita-yellow = callPackage ../data/themes/marwaita-pop_os { };
-
   matcha-gtk-theme = callPackage ../data/themes/matcha { };
 
   materia-theme = callPackage ../data/themes/materia-theme { };

From 2f442b271ffddd257b6376ffdd3880983f432750 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Tue, 29 Oct 2024 20:58:55 -0300
Subject: [PATCH 3/3] marwaita-yellow: 17.0 -> 20.3.1

Diff: https://github.com/darkomarko42/marwaita-yellow/compare/1f3561f1231d0e9e931f93c5d59df19ed2205ce0...20.3.1
---
 pkgs/by-name/ma/marwaita-yellow/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ma/marwaita-yellow/package.nix b/pkgs/by-name/ma/marwaita-yellow/package.nix
index ff0ad55c1f0b..15c51e354eb5 100644
--- a/pkgs/by-name/ma/marwaita-yellow/package.nix
+++ b/pkgs/by-name/ma/marwaita-yellow/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation rec {
   pname = "marwaita-yellow";
-  version = "17.0";
+  version = "20.3.1";
 
   src = fetchFromGitHub {
     owner = "darkomarko42";
     repo = "marwaita-yellow";
-    rev = "1f3561f1231d0e9e931f93c5d59df19ed2205ce0";
-    hash = "sha256-WbCIMEWF5853TQyhq8aRoWzpsmjObm9hEc4I0pxDNOM=";
+    rev = version;
+    hash = "sha256-ClM2lvFFLNz+pF/pY7j/V5L24egB3oxpkH8cpZMSu5g=";
   };
 
   buildInputs = [