Merge pull request #284621 from D3vil0p3r/patch-6

tokyo-night-gtk: change package name
NixOS · Feb 17, 2024 · 5b83373 · 5b83373
2 parents 8f13ee7 + 1234093
commit 5b83373
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 4 deletions.
diff --git a/pkgs/data/themes/tokyo-night-gtk/default.nix → ...a/themes/tokyonight-gtk-theme/default.nix b/pkgs/data/themes/tokyo-night-gtk/default.nix → ...a/themes/tokyonight-gtk-theme/default.nix
@@ -6,7 +6,7 @@
 }:
 
 let
-  prefix = "tokyo-night-gtk";
+  prefix = "tokyonight-gtk-theme";
 
   packages = lib.mapAttrs' (type: content: {
     name = type;

diff --git a/pkgs/data/themes/tokyo-night-gtk/generic.nix → ...a/themes/tokyonight-gtk-theme/generic.nix b/pkgs/data/themes/tokyo-night-gtk/generic.nix → ...a/themes/tokyonight-gtk-theme/generic.nix
@@ -12,7 +12,7 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "${prefix}_${type}-${variantName}";
-  version = "unstable-2023-05-30";
+  version = "unstable-2023-05-31";
 
   src = fetchFromGitHub {
     owner = "Fausto-Korpsvart";

diff --git a/...data/themes/tokyo-night-gtk/variants.json → ...themes/tokyonight-gtk-theme/variants.json b/...data/themes/tokyo-night-gtk/variants.json → ...themes/tokyonight-gtk-theme/variants.json
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
@@ -1074,6 +1074,7 @@ mapAliases ({
   tixati = throw "'tixati' has been removed from nixpkgs as it is unfree and unmaintained"; # Added 2023-03-17
   tkcvs = tkrev; # Added 2022-03-07
   tokodon = plasma5Packages.tokodon;
+  tokyo-night-gtk = tokyonight-gtk-theme; # Added 2024-01-28
   tootle = throw "'tootle' has been removed as it is not maintained upstream. Consider using 'tuba' instead"; # Added 2024-02-11
   tor-browser-bundle-bin = tor-browser; # Added 2023-09-23
   transfig = fig2dev; # Added 2022-02-15

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
@@ -35669,9 +35669,9 @@ with pkgs;
 
   tofi = callPackage ../applications/misc/tofi { };
 
-  tokyo-night-gtk = tokyo-night-gtk-variants.full;
+  tokyonight-gtk-theme = tokyonight-gtk-theme-variants.full;
 
-  tokyo-night-gtk-variants = recurseIntoAttrs (callPackage ../data/themes/tokyo-night-gtk { });
+  tokyonight-gtk-theme-variants = recurseIntoAttrs (callPackage ../data/themes/tokyonight-gtk-theme { });
 
   topydo = callPackage ../applications/misc/topydo { };