diff --git a/pkgs/data/themes/marwaita-manjaro/default.nix b/pkgs/by-name/ma/marwaita-darkcyan/package.nix similarity index 68% rename from pkgs/data/themes/marwaita-manjaro/default.nix rename to pkgs/by-name/ma/marwaita-darkcyan/package.nix index 19ff7c18b8a6..d031ad0b10b4 100644 --- a/pkgs/data/themes/marwaita-manjaro/default.nix +++ b/pkgs/by-name/ma/marwaita-darkcyan/package.nix @@ -5,17 +5,18 @@ , gtk-engine-murrine , gtk_engines , librsvg +, gitUpdater }: stdenv.mkDerivation rec { - pname = "marwaita-manjaro"; - version = "20.1"; + pname = "marwaita-darkcyan"; + version = "20.2-unstable-2024-07-01"; src = fetchFromGitHub { owner = "darkomarko42"; repo = pname; - rev = version; - sha256 = "sha256-rEwSlLnDzW6iaPCf91mhL0PqycJAqm/ZmoRf35fl1RY="; + rev = "ad837492a377909e0e84f090c740f0296d311797"; + hash = "sha256-1aCJEVh97Ze600zg8twwRQmoU7Z9tbvPG0Zl0HTyvA0="; }; buildInputs = [ @@ -37,8 +38,10 @@ stdenv.mkDerivation rec { runHook postInstall ''; + passthru.updateScript = gitUpdater { }; + meta = with lib; { - description = "Manjaro Style (green version) of Marwaita GTK theme"; + description = "Manjaro Style of Marwaita GTK theme"; homepage = "https://www.pling.com/p/1351213/"; license = licenses.gpl3Only; platforms = platforms.unix; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index c2744dc68618..c60379b7e457 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -862,6 +862,7 @@ mapAliases ({ mariadb-client = hiPrio mariadb.client; #added 2019.07.28 markdown-pp = throw "markdown-pp was removed from nixpkgs, because the upstream archived it on 2021-09-02"; # Added 2023-07-22 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 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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 83e9aceb273c..02cfd2c7d9aa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28588,8 +28588,6 @@ with pkgs; inherit (kdePackages) breeze-icons; }; - marwaita-manjaro = callPackage ../data/themes/marwaita-manjaro { }; - marwaita-peppermint = callPackage ../data/themes/marwaita-peppermint { }; marwaita-pop_os = callPackage ../data/themes/marwaita-pop_os { };