From 4629a9f8223b0d093b1895002b30d57d4d491e82 Mon Sep 17 00:00:00 2001 From: luftmensch-luftmensch Date: Thu, 13 Jun 2024 09:59:08 +0200 Subject: fluent-gtk-theme 2024-04-28 -> 2024-06-12 --- pkgs/data/themes/fluent-gtk-theme/default.nix | 157 ++++++++++++++++---------- 1 file changed, 97 insertions(+), 60 deletions(-) (limited to 'pkgs') diff --git a/pkgs/data/themes/fluent-gtk-theme/default.nix b/pkgs/data/themes/fluent-gtk-theme/default.nix index 9efa36aa88b71..137f8a92dd1bc 100644 --- a/pkgs/data/themes/fluent-gtk-theme/default.nix +++ b/pkgs/data/themes/fluent-gtk-theme/default.nix @@ -1,77 +1,114 @@ -{ lib -, stdenvNoCC -, fetchFromGitHub -, gitUpdater -, gnome-themes-extra -, gtk-engine-murrine -, jdupes -, sassc -, themeVariants ? [] # default: blue -, colorVariants ? [] # default: all -, sizeVariants ? [] # default: standard -, tweaks ? [] +{ + lib, + stdenvNoCC, + fetchFromGitHub, + gitUpdater, + gnome-themes-extra, + gtk-engine-murrine, + jdupes, + sassc, + themeVariants ? [ ], # default: blue + colorVariants ? [ ], # default: all + sizeVariants ? [ ], # default: standard + tweaks ? [ ], }: let pname = "fluent-gtk-theme"; - in -lib.checkListOfEnum "${pname}: theme variants" [ "default" "purple" "pink" "red" "orange" "yellow" "green" "teal" "grey" "all" ] themeVariants -lib.checkListOfEnum "${pname}: color variants" [ "standard" "light" "dark" ] colorVariants -lib.checkListOfEnum "${pname}: size variants" [ "standard" "compact" ] sizeVariants -lib.checkListOfEnum "${pname}: tweaks" [ "solid" "float" "round" "blur" "noborder" "square" ] tweaks +lib.checkListOfEnum "${pname}: theme variants" + [ + "default" + "purple" + "pink" + "red" + "orange" + "yellow" + "green" + "teal" + "grey" + "all" + ] + themeVariants + lib.checkListOfEnum + "${pname}: color variants" + [ + "standard" + "light" + "dark" + ] + colorVariants + lib.checkListOfEnum + "${pname}: size variants" + [ + "standard" + "compact" + ] + sizeVariants + lib.checkListOfEnum + "${pname}: tweaks" + [ + "solid" + "float" + "round" + "blur" + "noborder" + "square" + ] + tweaks -stdenvNoCC.mkDerivation (finalAttrs: { - inherit pname; - version = "2024-04-28"; + stdenvNoCC.mkDerivation + (finalAttrs: { + inherit pname; + version = "2024-06-12"; - src = fetchFromGitHub { - owner = "vinceliuice"; - repo = "fluent-gtk-theme"; - rev = finalAttrs.version; - hash = "sha256-0zf3fHtWcrbT26jgwgsPEDDhBWErOkgXyvGwSWV8rGs="; - }; + src = fetchFromGitHub { + owner = "vinceliuice"; + repo = "fluent-gtk-theme"; + rev = finalAttrs.version; + hash = "sha256-ONhW68UUrFiv5hxkR7XI8U/5+qM+tYLIS2OM05pqJi0="; + }; - nativeBuildInputs = [ - jdupes - sassc - ]; + nativeBuildInputs = [ + jdupes + sassc + ]; - buildInputs = [ - gnome-themes-extra - ]; + buildInputs = [ gnome-themes-extra ]; - propagatedUserEnvPkgs = [ - gtk-engine-murrine - ]; + propagatedUserEnvPkgs = [ gtk-engine-murrine ]; - postPatch = '' - patchShebangs install.sh - ''; + postPatch = '' + patchShebangs install.sh + ''; - installPhase = '' - runHook preInstall + installPhase = '' + runHook preInstall - name= HOME="$TMPDIR" ./install.sh \ - ${lib.optionalString (themeVariants != []) "--theme " + builtins.toString themeVariants} \ - ${lib.optionalString (colorVariants != []) "--color " + builtins.toString colorVariants} \ - ${lib.optionalString (sizeVariants != []) "--size " + builtins.toString sizeVariants} \ - ${lib.optionalString (tweaks != []) "--tweaks " + builtins.toString tweaks} \ - --icon nixos \ - --dest $out/share/themes + name= HOME="$TMPDIR" ./install.sh \ + ${lib.optionalString (themeVariants != [ ]) "--theme " + builtins.toString themeVariants} \ + ${lib.optionalString (colorVariants != [ ]) "--color " + builtins.toString colorVariants} \ + ${lib.optionalString (sizeVariants != [ ]) "--size " + builtins.toString sizeVariants} \ + ${lib.optionalString (tweaks != [ ]) "--tweaks " + builtins.toString tweaks} \ + --icon nixos \ + --dest $out/share/themes - jdupes --quiet --link-soft --recurse $out/share + jdupes --quiet --link-soft --recurse $out/share - runHook postInstall - ''; + runHook postInstall + ''; - passthru.updateScript = gitUpdater { }; + passthru.updateScript = gitUpdater { }; - meta = { - description = "Fluent design gtk theme"; - homepage = "https://github.com/vinceliuice/Fluent-gtk-theme"; - license = lib.licenses.gpl3Only; - platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ romildo ]; - }; -}) + meta = { + description = "Fluent design gtk theme"; + changelog = "https://github.com/vinceliuice/Fluent-gtk-theme/releases/tag/${finalAttrs.version}"; + homepage = "https://github.com/vinceliuice/Fluent-gtk-theme"; + license = lib.licenses.gpl3Only; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ + luftmensch-luftmensch + romildo + ]; + }; + }) -- cgit 1.4.1 From 6959071f7c372e7e8fb2ce1cb9da139b45f24750 Mon Sep 17 00:00:00 2001 From: luftmensch-luftmensch Date: Thu, 13 Jun 2024 10:04:58 +0200 Subject: fluent-gtk-theme: move to pkgs/by-name --- pkgs/by-name/fl/fluent-gtk-theme/package.nix | 114 ++++++++++++++++++++++++++ pkgs/data/themes/fluent-gtk-theme/default.nix | 114 -------------------------- pkgs/top-level/all-packages.nix | 2 - 3 files changed, 114 insertions(+), 116 deletions(-) create mode 100644 pkgs/by-name/fl/fluent-gtk-theme/package.nix delete mode 100644 pkgs/data/themes/fluent-gtk-theme/default.nix (limited to 'pkgs') diff --git a/pkgs/by-name/fl/fluent-gtk-theme/package.nix b/pkgs/by-name/fl/fluent-gtk-theme/package.nix new file mode 100644 index 0000000000000..137f8a92dd1bc --- /dev/null +++ b/pkgs/by-name/fl/fluent-gtk-theme/package.nix @@ -0,0 +1,114 @@ +{ + lib, + stdenvNoCC, + fetchFromGitHub, + gitUpdater, + gnome-themes-extra, + gtk-engine-murrine, + jdupes, + sassc, + themeVariants ? [ ], # default: blue + colorVariants ? [ ], # default: all + sizeVariants ? [ ], # default: standard + tweaks ? [ ], +}: + +let + pname = "fluent-gtk-theme"; +in +lib.checkListOfEnum "${pname}: theme variants" + [ + "default" + "purple" + "pink" + "red" + "orange" + "yellow" + "green" + "teal" + "grey" + "all" + ] + themeVariants + lib.checkListOfEnum + "${pname}: color variants" + [ + "standard" + "light" + "dark" + ] + colorVariants + lib.checkListOfEnum + "${pname}: size variants" + [ + "standard" + "compact" + ] + sizeVariants + lib.checkListOfEnum + "${pname}: tweaks" + [ + "solid" + "float" + "round" + "blur" + "noborder" + "square" + ] + tweaks + + stdenvNoCC.mkDerivation + (finalAttrs: { + inherit pname; + version = "2024-06-12"; + + src = fetchFromGitHub { + owner = "vinceliuice"; + repo = "fluent-gtk-theme"; + rev = finalAttrs.version; + hash = "sha256-ONhW68UUrFiv5hxkR7XI8U/5+qM+tYLIS2OM05pqJi0="; + }; + + nativeBuildInputs = [ + jdupes + sassc + ]; + + buildInputs = [ gnome-themes-extra ]; + + propagatedUserEnvPkgs = [ gtk-engine-murrine ]; + + postPatch = '' + patchShebangs install.sh + ''; + + installPhase = '' + runHook preInstall + + name= HOME="$TMPDIR" ./install.sh \ + ${lib.optionalString (themeVariants != [ ]) "--theme " + builtins.toString themeVariants} \ + ${lib.optionalString (colorVariants != [ ]) "--color " + builtins.toString colorVariants} \ + ${lib.optionalString (sizeVariants != [ ]) "--size " + builtins.toString sizeVariants} \ + ${lib.optionalString (tweaks != [ ]) "--tweaks " + builtins.toString tweaks} \ + --icon nixos \ + --dest $out/share/themes + + jdupes --quiet --link-soft --recurse $out/share + + runHook postInstall + ''; + + passthru.updateScript = gitUpdater { }; + + meta = { + description = "Fluent design gtk theme"; + changelog = "https://github.com/vinceliuice/Fluent-gtk-theme/releases/tag/${finalAttrs.version}"; + homepage = "https://github.com/vinceliuice/Fluent-gtk-theme"; + license = lib.licenses.gpl3Only; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ + luftmensch-luftmensch + romildo + ]; + }; + }) diff --git a/pkgs/data/themes/fluent-gtk-theme/default.nix b/pkgs/data/themes/fluent-gtk-theme/default.nix deleted file mode 100644 index 137f8a92dd1bc..0000000000000 --- a/pkgs/data/themes/fluent-gtk-theme/default.nix +++ /dev/null @@ -1,114 +0,0 @@ -{ - lib, - stdenvNoCC, - fetchFromGitHub, - gitUpdater, - gnome-themes-extra, - gtk-engine-murrine, - jdupes, - sassc, - themeVariants ? [ ], # default: blue - colorVariants ? [ ], # default: all - sizeVariants ? [ ], # default: standard - tweaks ? [ ], -}: - -let - pname = "fluent-gtk-theme"; -in -lib.checkListOfEnum "${pname}: theme variants" - [ - "default" - "purple" - "pink" - "red" - "orange" - "yellow" - "green" - "teal" - "grey" - "all" - ] - themeVariants - lib.checkListOfEnum - "${pname}: color variants" - [ - "standard" - "light" - "dark" - ] - colorVariants - lib.checkListOfEnum - "${pname}: size variants" - [ - "standard" - "compact" - ] - sizeVariants - lib.checkListOfEnum - "${pname}: tweaks" - [ - "solid" - "float" - "round" - "blur" - "noborder" - "square" - ] - tweaks - - stdenvNoCC.mkDerivation - (finalAttrs: { - inherit pname; - version = "2024-06-12"; - - src = fetchFromGitHub { - owner = "vinceliuice"; - repo = "fluent-gtk-theme"; - rev = finalAttrs.version; - hash = "sha256-ONhW68UUrFiv5hxkR7XI8U/5+qM+tYLIS2OM05pqJi0="; - }; - - nativeBuildInputs = [ - jdupes - sassc - ]; - - buildInputs = [ gnome-themes-extra ]; - - propagatedUserEnvPkgs = [ gtk-engine-murrine ]; - - postPatch = '' - patchShebangs install.sh - ''; - - installPhase = '' - runHook preInstall - - name= HOME="$TMPDIR" ./install.sh \ - ${lib.optionalString (themeVariants != [ ]) "--theme " + builtins.toString themeVariants} \ - ${lib.optionalString (colorVariants != [ ]) "--color " + builtins.toString colorVariants} \ - ${lib.optionalString (sizeVariants != [ ]) "--size " + builtins.toString sizeVariants} \ - ${lib.optionalString (tweaks != [ ]) "--tweaks " + builtins.toString tweaks} \ - --icon nixos \ - --dest $out/share/themes - - jdupes --quiet --link-soft --recurse $out/share - - runHook postInstall - ''; - - passthru.updateScript = gitUpdater { }; - - meta = { - description = "Fluent design gtk theme"; - changelog = "https://github.com/vinceliuice/Fluent-gtk-theme/releases/tag/${finalAttrs.version}"; - homepage = "https://github.com/vinceliuice/Fluent-gtk-theme"; - license = lib.licenses.gpl3Only; - platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ - luftmensch-luftmensch - romildo - ]; - }; - }) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9135e7f94e33b..1f2c023113ff0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28448,8 +28448,6 @@ with pkgs; flat-remix-gtk = callPackage ../data/themes/flat-remix-gtk { }; flat-remix-gnome = callPackage ../data/themes/flat-remix-gnome { }; - fluent-gtk-theme = callPackage ../data/themes/fluent-gtk-theme { }; - fluent-icon-theme = callPackage ../data/icons/fluent-icon-theme { }; font-awesome_4 = (callPackage ../data/fonts/font-awesome { }).v4; -- cgit 1.4.1