Skip to content

dracula-theme: 1.3.0 -> 2.0 and rename ant-dracula to dracula-theme #99704

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
romildo merged 2 commits into from
Oct 11, 2020
Merged

dracula-theme: 1.3.0 -> 2.0 and rename ant-dracula to dracula-theme #99704

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8c5b194
maintainer: add vonfry
Oct 6, 2020
0f1be68
dracula-theme: rename ant-dracula-theme to dracula-theme and update
Oct 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions maintainers/maintainer-list.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9088,6 +9088,12 @@
githubId = 508305;
name = "Jaroslavas Pocepko";
};
vonfry = {
Copy link
Contributor

@alexarice alexarice Oct 6, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can the change to maintainer-list.nix be in a separate commit titled "maintainers: add vonfry"

email = "nixos@vonfry.name";
github = "Vonfry";
githubId = 3413119;
name = "Vonfry";
};
vozz = {
email = "oliver.huntuk@gmail.com";
name = "Oliver Hunt";
Expand Down
34 changes: 0 additions & 34 deletions pkgs/data/themes/ant-theme/ant-dracula.nix
View file
Open in desktop

This file was deleted.

36 changes: 36 additions & 0 deletions pkgs/data/themes/dracula-theme/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
{ stdenv, fetchFromGitHub, gtk-engine-murrine }:

let
themeName = "Dracula";
version = "2.0";
in
stdenv.mkDerivation {
pname = "dracula-theme";
inherit version;

src = fetchFromGitHub {
owner = "dracula";
repo = "gtk";
rev = "v${version}";
sha256 = "10j706gnhdplhykdisp64vzzxpzgn48b5f1fkndcp340x7hf2mf3";
};

propagatedUserEnvPkgs = [
gtk-engine-murrine
];

installPhase = ''
runHook preInstall
mkdir -p $out/share/themes/${themeName}
cp -a {assets,cinnamon,gnome-shell,gtk-2.0,gtk-3.0,gtk-3.20,index.theme,kde,metacity-1,unity,xfwm4} $out/share/themes/${themeName}
runHook postInstall
'';

meta = with stdenv.lib; {
description = "Dracula variant of the Ant theme";
homepage = "https://github.com/dracula/gtk";
license = licenses.gpl3;
platforms = platforms.all;
maintainers = with maintainers; [ alexarice vonfry ];
};
}
3 changes: 3 additions & 0 deletions pkgs/top-level/aliases.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -738,4 +738,7 @@ mapAliases ({
/* Cleanup before 21.03 */
riot-desktop = throw "riot-desktop is now element-desktop!";
riot-web = throw "riot-web is now element-web";

ant-dracula-theme = throw "ant-dracula-theme is now dracula-theme, and theme name is Dracula instead of Ant-Dracula.";

})
2 changes: 1 addition & 1 deletion pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18767,7 +18767,7 @@ in

ant-bloody-theme = callPackage ../data/themes/ant-theme/ant-bloody.nix { };

ant-dracula-theme = callPackage ../data/themes/ant-theme/ant-dracula.nix { };
dracula-theme = callPackage ../data/themes/dracula-theme { };
Copy link
Contributor

@alexarice alexarice Oct 6, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will break existing configurations. Maybe there should be an error thrown when using the old package that tells you to use the new one and to change the theme name in your config

Copy link
Contributor

@kevincox kevincox Oct 11, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, typically you will log a warning for at least a couple of months.

Example:

nixpkgs/lib/debug.nix

Line 201 in 8b33d57

traceXMLVal = x:

Copy link
Contributor

@alexarice alexarice Oct 11, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe the alias should add an appropriate warning


ant-nebula-theme = callPackage ../data/themes/ant-theme/ant-nebula.nix { };

Expand Down