From 33585e94d322a37c9f1b6097a408b7e874ad75d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Mon, 8 Jul 2024 12:54:29 -0300 Subject: [PATCH 1/2] marwaita-darkcyan: rename to marwaita-teal Upstream renamed the package, again. --- .../by-name/ma/{marwaita-darkcyan => marwaita-teal}/package.nix | 2 +- pkgs/top-level/aliases.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename pkgs/by-name/ma/{marwaita-darkcyan => marwaita-teal}/package.nix (96%) diff --git a/pkgs/by-name/ma/marwaita-darkcyan/package.nix b/pkgs/by-name/ma/marwaita-teal/package.nix similarity index 96% rename from pkgs/by-name/ma/marwaita-darkcyan/package.nix rename to pkgs/by-name/ma/marwaita-teal/package.nix index d031ad0b10b4..c441f14c5a6c 100644 --- a/pkgs/by-name/ma/marwaita-darkcyan/package.nix +++ b/pkgs/by-name/ma/marwaita-teal/package.nix @@ -9,7 +9,7 @@ }: stdenv.mkDerivation rec { - pname = "marwaita-darkcyan"; + pname = "marwaita-teal"; version = "20.2-unstable-2024-07-01"; src = fetchFromGitHub { diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 49b6afafdd39..dc9acdccb17d 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -863,7 +863,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 + 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 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 From 4041f88650150b69b57538230d5315905fb89659 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Mon, 8 Jul 2024 12:57:02 -0300 Subject: [PATCH 2/2] marwaita-teal: 20.2-unstable-2024-07-01 -> 20.3 --- pkgs/by-name/ma/marwaita-teal/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ma/marwaita-teal/package.nix b/pkgs/by-name/ma/marwaita-teal/package.nix index c441f14c5a6c..da4da24fd8bb 100644 --- a/pkgs/by-name/ma/marwaita-teal/package.nix +++ b/pkgs/by-name/ma/marwaita-teal/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "marwaita-teal"; - version = "20.2-unstable-2024-07-01"; + version = "20.3"; src = fetchFromGitHub { owner = "darkomarko42"; repo = pname; - rev = "ad837492a377909e0e84f090c740f0296d311797"; - hash = "sha256-1aCJEVh97Ze600zg8twwRQmoU7Z9tbvPG0Zl0HTyvA0="; + rev = version; + hash = "sha256-3wiT75fnwagxe1dLVXj+V3n6tZ1zKZcVXlMagAAKXoI="; }; buildInputs = [