From a0a83d4252e5e1d657b9f37c2a364255cf3e2be6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Mon, 1 Jul 2024 18:18:50 -0300 Subject: [PATCH 1/4] marwaita-manjaro: move to pkgs/by-name/ma/ --- .../default.nix => by-name/ma/marwaita-manjaro/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{data/themes/marwaita-manjaro/default.nix => by-name/ma/marwaita-manjaro/package.nix} (100%) diff --git a/pkgs/data/themes/marwaita-manjaro/default.nix b/pkgs/by-name/ma/marwaita-manjaro/package.nix similarity index 100% rename from pkgs/data/themes/marwaita-manjaro/default.nix rename to pkgs/by-name/ma/marwaita-manjaro/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 703bdaf0af14..23440a551fdf 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 { }; From b6dc9fc53bd1f32255ef32580e04ea90b2b0ffd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Mon, 1 Jul 2024 18:23:47 -0300 Subject: [PATCH 2/4] marwaita-manjaro: rename to marwaita-darkcyan --- .../ma/{marwaita-manjaro => marwaita-darkcyan}/package.nix | 4 ++-- pkgs/top-level/aliases.nix | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) rename pkgs/by-name/ma/{marwaita-manjaro => marwaita-darkcyan}/package.nix (88%) diff --git a/pkgs/by-name/ma/marwaita-manjaro/package.nix b/pkgs/by-name/ma/marwaita-darkcyan/package.nix similarity index 88% rename from pkgs/by-name/ma/marwaita-manjaro/package.nix rename to pkgs/by-name/ma/marwaita-darkcyan/package.nix index 19ff7c18b8a6..5a7444cd6770 100644 --- a/pkgs/by-name/ma/marwaita-manjaro/package.nix +++ b/pkgs/by-name/ma/marwaita-darkcyan/package.nix @@ -8,7 +8,7 @@ }: stdenv.mkDerivation rec { - pname = "marwaita-manjaro"; + pname = "marwaita-darkcyan"; version = "20.1"; src = fetchFromGitHub { @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { ''; 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 From ac1067c38f1a4edfd644eba4917ea638519abdbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Mon, 1 Jul 2024 18:25:37 -0300 Subject: [PATCH 3/4] marwaita-darkcyan: add update script --- pkgs/by-name/ma/marwaita-darkcyan/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/ma/marwaita-darkcyan/package.nix b/pkgs/by-name/ma/marwaita-darkcyan/package.nix index 5a7444cd6770..592c18e4e215 100644 --- a/pkgs/by-name/ma/marwaita-darkcyan/package.nix +++ b/pkgs/by-name/ma/marwaita-darkcyan/package.nix @@ -5,6 +5,7 @@ , gtk-engine-murrine , gtk_engines , librsvg +, gitUpdater }: stdenv.mkDerivation rec { @@ -37,6 +38,8 @@ stdenv.mkDerivation rec { runHook postInstall ''; + passthru.updateScript = gitUpdater { }; + meta = with lib; { description = "Manjaro Style of Marwaita GTK theme"; homepage = "https://www.pling.com/p/1351213/"; From c197afdea6b621265769d6ce543a9f3ee09c32b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Mon, 1 Jul 2024 18:30:14 -0300 Subject: [PATCH 4/4] marwaita-darkcyan: 20.1 -> 20.2-unstable-2024-07-01 Diff: https://github.com/darkomarko42/marwaita-darkcyan/compare/20.1...ad837492a377909e0e84f090c740f0296d311797 --- pkgs/by-name/ma/marwaita-darkcyan/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ma/marwaita-darkcyan/package.nix b/pkgs/by-name/ma/marwaita-darkcyan/package.nix index 592c18e4e215..d031ad0b10b4 100644 --- a/pkgs/by-name/ma/marwaita-darkcyan/package.nix +++ b/pkgs/by-name/ma/marwaita-darkcyan/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "marwaita-darkcyan"; - version = "20.1"; + 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 = [