From 5d352d2978415c03fcfc892e41bbaff7a5523f05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Mon, 8 Jul 2024 11:45:03 -0300 Subject: [PATCH 1/3] marwaita-ubuntu: move to pkgs/by-name/ma/ --- .../default.nix => by-name/ma/marwaita-ubuntu/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{data/themes/marwaita-ubuntu/default.nix => by-name/ma/marwaita-ubuntu/package.nix} (100%) diff --git a/pkgs/data/themes/marwaita-ubuntu/default.nix b/pkgs/by-name/ma/marwaita-ubuntu/package.nix similarity index 100% rename from pkgs/data/themes/marwaita-ubuntu/default.nix rename to pkgs/by-name/ma/marwaita-ubuntu/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9865ee99324d..2abf204e2bf8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28584,8 +28584,6 @@ with pkgs; marwaita-pop_os = callPackage ../data/themes/marwaita-pop_os { }; - marwaita-ubuntu = callPackage ../data/themes/marwaita-ubuntu { }; - matcha-gtk-theme = callPackage ../data/themes/matcha { }; materia-theme = callPackage ../data/themes/materia-theme { }; From eb31ad978fd1ff0d1c69cb2f353a15d02b095ae8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Mon, 8 Jul 2024 11:52:21 -0300 Subject: [PATCH 2/3] marwaita-ubuntu: rename to marwaita-orange --- .../by-name/ma/{marwaita-ubuntu => marwaita-orange}/package.nix | 2 +- pkgs/top-level/aliases.nix | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) rename pkgs/by-name/ma/{marwaita-ubuntu => marwaita-orange}/package.nix (96%) diff --git a/pkgs/by-name/ma/marwaita-ubuntu/package.nix b/pkgs/by-name/ma/marwaita-orange/package.nix similarity index 96% rename from pkgs/by-name/ma/marwaita-ubuntu/package.nix rename to pkgs/by-name/ma/marwaita-orange/package.nix index 4190b1c0c3d2..5a8dfe28b95d 100644 --- a/pkgs/by-name/ma/marwaita-ubuntu/package.nix +++ b/pkgs/by-name/ma/marwaita-orange/package.nix @@ -9,7 +9,7 @@ }: stdenv.mkDerivation rec { - pname = "marwaita-ubuntu"; + pname = "marwaita-orange"; version = "17.0"; src = fetchFromGitHub { diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 49b6afafdd39..93586f6fecb8 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -865,6 +865,7 @@ mapAliases ({ markmind = throw "markmind has been removed from nixpkgs, because it depended on an old version of electron"; # Added 2023-09-12 marwaita-manjaro = lib.warn "marwaita-manjaro has been renamed to marwaita-darkcyan" marwaita-darkcyan; # Added 2024-07-01 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 matrique = spectral; # Added 2020-01-27 matrixcli = throw "'matrixcli' has been removed due to being unmaintained and broken functionality. Recommend 'matrix-commander' as an alternative"; # Added 2024-03-09 matrix-recorder = throw "matrix-recorder has been removed due to being unmaintained"; # Added 2023-05-21 From ac5f297bfea66ae6788b08c69ac5d8531abbe60c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Mon, 8 Jul 2024 11:54:55 -0300 Subject: [PATCH 3/3] marwaita-orange: 17.0 -> 20.3 --- pkgs/by-name/ma/marwaita-orange/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ma/marwaita-orange/package.nix b/pkgs/by-name/ma/marwaita-orange/package.nix index 5a8dfe28b95d..bcf0baf2c9ae 100644 --- a/pkgs/by-name/ma/marwaita-orange/package.nix +++ b/pkgs/by-name/ma/marwaita-orange/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "marwaita-orange"; - version = "17.0"; + version = "20.3"; src = fetchFromGitHub { owner = "darkomarko42"; repo = pname; - rev = "481aae16034e0321bcabd14270639b8bd8b9aa73"; - hash = "sha256-Ze2nR+77qe0TfwcvXP9eheB7mXSSVdejk11GS0fx7LY="; + rev = version; + hash = "sha256-RT7+LmauSAavl4ZA9vuKNrh/x8cGUb9V4RecxI/fN+E="; }; buildInputs = [