diff options
Diffstat (limited to 'nixpkgs/pkgs/data')
22 files changed, 366 insertions, 75 deletions
diff --git a/nixpkgs/pkgs/data/documentation/zeal/default.nix b/nixpkgs/pkgs/data/documentation/zeal/default.nix index 462b06054f3f..18f4d1319739 100644 --- a/nixpkgs/pkgs/data/documentation/zeal/default.nix +++ b/nixpkgs/pkgs/data/documentation/zeal/default.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://zealdocs.org/"; changelog = "https://github.com/zealdocs/zeal/releases"; license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ skeidel peterhoeg AndersonTorres ]; + maintainers = with lib.maintainers; [ peterhoeg AndersonTorres ]; inherit (qtbase.meta) platforms; }; }) diff --git a/nixpkgs/pkgs/data/fonts/commit-mono/default.nix b/nixpkgs/pkgs/data/fonts/commit-mono/default.nix index 29569d1137aa..895e70a544b9 100644 --- a/nixpkgs/pkgs/data/fonts/commit-mono/default.nix +++ b/nixpkgs/pkgs/data/fonts/commit-mono/default.nix @@ -4,11 +4,11 @@ }: stdenvNoCC.mkDerivation rec { pname = "commit-mono"; - version = "1.139"; + version = "1.141"; src = fetchzip { url = "https://github.com/eigilnikolajsen/commit-mono/releases/download/v${version}/CommitMono-${version}.zip"; - hash = "sha256-TrXuWQzNlJsFwwOsnLuCCEj/9B9XrTNHSDVES68gIYs="; + hash = "sha256-ErC4ZM17rYq+5FRW9m9nIbQOjQGTCCoNhXHxb7Swd84="; stripRoot = false; }; diff --git a/nixpkgs/pkgs/data/fonts/corefonts/default.nix b/nixpkgs/pkgs/data/fonts/corefonts/default.nix index f8ffc6a2b8e6..059350da7d4f 100644 --- a/nixpkgs/pkgs/data/fonts/corefonts/default.nix +++ b/nixpkgs/pkgs/data/fonts/corefonts/default.nix @@ -39,9 +39,11 @@ stdenv.mkDerivation { cabextract --lowercase viewer1.cab # rename to more standard names + # handle broken macOS file-system mv andalemo.ttf Andale_Mono.ttf mv ariblk.ttf Arial_Black.ttf - mv arial.ttf Arial.ttf + mv arial.ttf Arial.ttf.tmp + mv Arial.ttf.tmp Arial.ttf mv arialbd.ttf Arial_Bold.ttf mv arialbi.ttf Arial_Bold_Italic.ttf mv ariali.ttf Arial_Italic.ttf @@ -51,12 +53,15 @@ stdenv.mkDerivation { mv courbd.ttf Courier_New_Bold.ttf mv couri.ttf Courier_New_Italic.ttf mv courbi.ttf Courier_New_Bold_Italic.ttf - mv georgia.ttf Georgia.ttf + mv georgia.ttf Georgia.ttf.tmp + mv Georgia.ttf.tmp Georgia.ttf mv georgiab.ttf Georgia_Bold.ttf mv georgiai.ttf Georgia_Italic.ttf mv georgiaz.ttf Georgia_Bold_Italic.ttf - mv impact.ttf Impact.ttf - mv tahoma.ttf Tahoma.ttf + mv impact.ttf Impact.ttf.tmp + mv Impact.ttf.tmp Impact.ttf + mv tahoma.ttf Tahoma.ttf.tmp + mv Tahoma.ttf.tmp Tahoma.ttf mv times.ttf Times_New_Roman.ttf mv timesbd.ttf Times_New_Roman_Bold.ttf mv timesbi.ttf Times_New_Roman_Bold_Italic.ttf @@ -65,11 +70,13 @@ stdenv.mkDerivation { mv trebucbd.ttf Trebuchet_MS_Bold.ttf mv trebucit.ttf Trebuchet_MS_Italic.ttf mv trebucbi.ttf Trebuchet_MS_Italic.ttf - mv verdana.ttf Verdana.ttf + mv verdana.ttf Verdana.ttf.tmp + mv Verdana.ttf.tmp Verdana.ttf mv verdanab.ttf Verdana_Bold.ttf mv verdanai.ttf Verdana_Italic.ttf mv verdanaz.ttf Verdana_Bold_Italic.ttf - mv webdings.ttf Webdings.ttf + mv webdings.ttf Webdings.ttf.tmp + mv Webdings.ttf.tmp Webdings.ttf install -m444 -Dt $out/share/fonts/truetype *.ttf diff --git a/nixpkgs/pkgs/data/fonts/fixedsys-excelsior/default.nix b/nixpkgs/pkgs/data/fonts/fixedsys-excelsior/default.nix index 53592152a333..dec1ea062bbc 100644 --- a/nixpkgs/pkgs/data/fonts/fixedsys-excelsior/default.nix +++ b/nixpkgs/pkgs/data/fonts/fixedsys-excelsior/default.nix @@ -24,6 +24,6 @@ stdenvNoCC.mkDerivation rec { description = "Pan-unicode version of Fixedsys, a classic DOS font"; platforms = lib.platforms.all; license = lib.licenses.publicDomain; - maintainers = [ lib.maintainers.ninjatrappeur ]; + maintainers = [ lib.maintainers.picnoir ]; }; } diff --git a/nixpkgs/pkgs/data/fonts/iosevka/default.nix b/nixpkgs/pkgs/data/fonts/iosevka/default.nix index fdd9ff2de15b..04f89b6d2a1f 100644 --- a/nixpkgs/pkgs/data/fonts/iosevka/default.nix +++ b/nixpkgs/pkgs/data/fonts/iosevka/default.nix @@ -55,16 +55,16 @@ assert (extraParameters != null) -> set != null; buildNpmPackage rec { pname = if set != null then "iosevka-${set}" else "iosevka"; - version = "27.3.2"; + version = "27.3.5"; src = fetchFromGitHub { owner = "be5invis"; repo = "iosevka"; rev = "v${version}"; - hash = "sha256-an2/Aqb+5t61CkiBhwL9lA0WPxhIC+tDDjhn8alcqJQ="; + hash = "sha256-dqXr/MVOuEmAMueaRWsnzY9MabhnyBRtLR9IDVLN79I="; }; - npmDepsHash = "sha256-BQTM/ea/X2iqRkX510fAzouPNcV7cUmtY7J/CSUMH7o="; + npmDepsHash = "sha256-bux8aFBP1Pi5pAQY1jkNTqD2Ny2j+QQs+QRaXWJj6xg="; nativeBuildInputs = [ remarshal diff --git a/nixpkgs/pkgs/data/fonts/material-design-icons/default.nix b/nixpkgs/pkgs/data/fonts/material-design-icons/default.nix index 25923f3cfc77..1a6537a0096f 100644 --- a/nixpkgs/pkgs/data/fonts/material-design-icons/default.nix +++ b/nixpkgs/pkgs/data/fonts/material-design-icons/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "material-design-icons"; - version = "7.2.96"; + version = "7.3.67"; src = fetchFromGitHub { owner = "Templarian"; repo = "MaterialDesign-Webfont"; rev = "v${version}"; - sha256 = "sha256-4r/l7QkD04OR74FZBH0l81hDY5TexEIIJnECYFKsGxM="; + sha256 = "sha256-gQT+5MqYo1qUiLJTzlhF5dB5BZMtr34JWn9rMa9MJvQ="; sparseCheckout = [ "fonts" ]; }; diff --git a/nixpkgs/pkgs/data/fonts/noto-fonts/default.nix b/nixpkgs/pkgs/data/fonts/noto-fonts/default.nix index 86565615534c..fee51ebacf4a 100644 --- a/nixpkgs/pkgs/data/fonts/noto-fonts/default.nix +++ b/nixpkgs/pkgs/data/fonts/noto-fonts/default.nix @@ -160,8 +160,8 @@ rec { noto-fonts-cjk-serif = mkNotoCJK { typeface = "Serif"; - version = "2.001"; - sha256 = "sha256-y1103SS0qkZMhEL5+7kQZ+OBs5tRaqkqOcs4796Fzhg="; + version = "2.002"; + sha256 = "sha256-GLjpTAiHfygj1J4AdUVDJh8kykkFOglq+h4kyat5W9s="; }; noto-fonts-color-emoji = diff --git a/nixpkgs/pkgs/data/fonts/pretendard/default.nix b/nixpkgs/pkgs/data/fonts/pretendard/default.nix index 8c4cbd103735..9f62ad8dd4e5 100644 --- a/nixpkgs/pkgs/data/fonts/pretendard/default.nix +++ b/nixpkgs/pkgs/data/fonts/pretendard/default.nix @@ -1,7 +1,7 @@ { lib, stdenvNoCC, fetchzip }: let - version = "1.3.8"; + version = "1.3.9"; mkPretendard = { pname, typeface, hash }: stdenvNoCC.mkDerivation { @@ -35,24 +35,24 @@ in pretendard = mkPretendard { pname = "pretendard"; typeface = "Pretendard"; - hash = "sha256-Re4Td9uA8Qn/xv39Bo9i3gShYWQ1mRX44Vyx7/i4xwI="; + hash = "sha256-n7RQApffpL/8ojHcZbdxyanl9Tlc8HP8kxLFBdArUfY="; }; pretendard-gov = mkPretendard { pname = "pretendard-gov"; typeface = "PretendardGOV"; - hash = "sha256-GQv/Ia91QgXZwFX+WdE7aRFUJFWhCMLFY86gu4Ii2w8="; + hash = "sha256-qoDUBOmrk6WPKQgnapThfKC01xWup+HN82hcoIjEe0M="; }; pretendard-jp = mkPretendard { pname = "pretendard-jp"; typeface = "PretendardJP"; - hash = "sha256-7OLInF1XUQxyHyb9a0zyfCLZrdcxMTM2QeBe3lwLJ0A="; + hash = "sha256-1nTk1LPoRSfSDgDuGWkcs6RRIY4ZOqDBPMsxezMos6Q="; }; pretendard-std = mkPretendard { pname = "pretendard-std"; typeface = "PretendardStd"; - hash = "sha256-DCR6KUAblVjhapqMn2p0nzndEJm4OCawGV3nAWZvSBs="; + hash = "sha256-gkYqqxSICmSIrBuPRzBaOlGGM/rJU1z7FiFvu9RhK5s="; }; } diff --git a/nixpkgs/pkgs/data/fonts/sketchybar-app-font/default.nix b/nixpkgs/pkgs/data/fonts/sketchybar-app-font/default.nix index df68dbb844c5..8364c84f1ffc 100644 --- a/nixpkgs/pkgs/data/fonts/sketchybar-app-font/default.nix +++ b/nixpkgs/pkgs/data/fonts/sketchybar-app-font/default.nix @@ -5,11 +5,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "sketchybar-app-font"; - version = "1.0.17"; + version = "1.0.20"; src = fetchurl { url = "https://github.com/kvndrsslr/sketchybar-app-font/releases/download/v${finalAttrs.version}/sketchybar-app-font.ttf"; - hash = "sha256-sDMasHVcITTSUP9B87w4I7IZ44tYmabNNWl+kE3dUoE="; + hash = "sha256-pf3SSxzlNIdbXXHfRauFCnrVUMOd5J9sSUE9MsfWrwo="; }; dontUnpack = true; diff --git a/nixpkgs/pkgs/data/icons/hackneyed/default.nix b/nixpkgs/pkgs/data/icons/hackneyed/default.nix index 74aedaa3786e..e26a32b159ec 100644 --- a/nixpkgs/pkgs/data/icons/hackneyed/default.nix +++ b/nixpkgs/pkgs/data/icons/hackneyed/default.nix @@ -1,29 +1,41 @@ -{ lib, fetchzip, stdenvNoCC, fetchFromGitLab, xcursorgen, imagemagick6, inkscape }: +{ lib, stdenvNoCC, fetchFromGitLab, imagemagick, inkscape, xcursorgen }: stdenvNoCC.mkDerivation rec { pname = "hackneyed"; - version = "0.8.2"; + version = "0.9.1"; src = fetchFromGitLab { owner = "Enthymeme"; repo = "hackneyed-x11-cursors"; rev = version; - sha256 = "sha256-Wtrw/EzxCj4cAyfdBp0OJE4+c6FouW7+b6nFTLxdXNY="; + hash = "sha256-+7QtHgBuhJtQejiHeZ+QoedJo24LqSY51XRVLv9Ho2g="; }; - buildInputs = [ imagemagick6 inkscape xcursorgen ]; + nativeBuildInputs = [ imagemagick inkscape xcursorgen ]; postPatch = '' patchShebangs *.sh - substituteInPlace make-png.sh \ - --replace /usr/bin/inkscape ${inkscape}/bin/inkscape ''; enableParallelBuilding = true; - makeFlags = [ "PREFIX=$(out)" ]; + makeFlags = [ + "INKSCAPE=inkscape" + "INSTALL=install" + "PREFIX=$(out)" + "VERBOSE=1" + "XCURSORGEN=xcursorgen" + ]; + buildFlags = [ "theme" "theme.left" ]; + # The Makefile declares a dependency on the value of $(INKSCAPE) for some reason; + # it's unnecessary for building though. + prePatch = '' + substituteInPlace GNUmakefile \ + --replace 'inkscape-version: $(INKSCAPE)' 'inkscape-version:' + ''; + meta = with lib; { homepage = "https://gitlab.com/Enthymeme/hackneyed-x11-cursors"; description = "A scalable cursor theme that resembles Windows 3.x/NT 3.x cursors"; diff --git a/nixpkgs/pkgs/data/icons/reversal-icon-theme/default.nix b/nixpkgs/pkgs/data/icons/reversal-icon-theme/default.nix new file mode 100644 index 000000000000..b636bba4a301 --- /dev/null +++ b/nixpkgs/pkgs/data/icons/reversal-icon-theme/default.nix @@ -0,0 +1,77 @@ +{ lib +, stdenvNoCC +, fetchFromGitHub +, gtk3 +, jdupes +, adwaita-icon-theme +, hicolor-icon-theme +, numix-icon-theme-circle +, gitUpdater +, allColorVariants ? false +, colorVariants ? [] +}: + +let + pname = "reversal-icon-theme"; +in +lib.checkListOfEnum "${pname}: color variants" [ "-blue" "-red" "-pink" "-purple" "-green" "-orange" "-brown" "-grey" "-black" "-cyan" ] colorVariants + +stdenvNoCC.mkDerivation rec { + inherit pname; + version = "unstable-2023-05-13"; + + src = fetchFromGitHub { + owner = "yeyushengfan258"; + repo = pname; + rev = "bdae2ea365731b25a869fc2c8c6a1fb849eaf5b2"; + hash = "sha256-Cd+1ggyS+Y2Sk8w5zifc4IFOwbFrbjL6S6awES/W0EE="; + }; + + nativeBuildInputs = [ + gtk3 + jdupes + ]; + + propagatedBuildInputs = [ + adwaita-icon-theme + hicolor-icon-theme + numix-icon-theme-circle + ]; + + dontDropIconThemeCache = true; + + # These fixup steps are slow and unnecessary for this package. + # Package may install many small files. + dontPatchELF = true; + dontRewriteSymlinks = true; + + postPatch = '' + patchShebangs install.sh + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/icons + + name= ./install.sh \ + ${if allColorVariants then "-a" else builtins.toString colorVariants} \ + -d $out/share/icons + + rm $out/share/icons/*/{AUTHORS,COPYING} + + jdupes --quiet --link-soft --recurse $out/share + + runHook postInstall + ''; + + passthru.updateScript = gitUpdater { }; + + meta = with lib; { + description = "A colorful Design Rectangle icon theme"; + homepage = "https://github.com/yeyushengfan258/Reversal-icon-theme"; + license = licenses.gpl3Plus; + platforms = platforms.all; + maintainers = with maintainers; [ romildo ]; + }; +} diff --git a/nixpkgs/pkgs/data/icons/tau-hydrogen/default.nix b/nixpkgs/pkgs/data/icons/tau-hydrogen/default.nix index bff4bb703a4e..17a6d31b8a56 100644 --- a/nixpkgs/pkgs/data/icons/tau-hydrogen/default.nix +++ b/nixpkgs/pkgs/data/icons/tau-hydrogen/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "tau-hydrogen"; - version = "1.0.13"; + version = "1.0.14"; src = fetchFromGitHub { owner = "tau-OS"; repo = "tau-hydrogen"; rev = finalAttrs.version; - hash = "sha256-rfgSNytPCVCkAJ9N3kRw9mfcXr+JEqy1jyyDgXqxtsM="; + hash = "sha256-8awcowBm0hwoYYm/wtKeqCWRhgXh2rI3UvAlL1tbj6c="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/data/misc/hackage/pin.json b/nixpkgs/pkgs/data/misc/hackage/pin.json index fd0f1b564733..cbfd42dfc874 100644 --- a/nixpkgs/pkgs/data/misc/hackage/pin.json +++ b/nixpkgs/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "d37311b9195c41b254b2d71c74c93e51f6ccebab", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/d37311b9195c41b254b2d71c74c93e51f6ccebab.tar.gz", - "sha256": "1m2xcnyz6y03m5l5qdxc0avi4gi53g82hq4ab9qcjbxi82g3qn4v", - "msg": "Update from Hackage at 2023-10-04T18:27:12Z" + "commit": "49d09494dd24eae895fe1260e2c26157f740e451", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/49d09494dd24eae895fe1260e2c26157f740e451.tar.gz", + "sha256": "1f0m4wni61v6679ya0mb9mw3vxhak9yvjxjm6wfs7wryayb4i5ba", + "msg": "Update from Hackage at 2023-10-21T19:49:07Z" } diff --git a/nixpkgs/pkgs/data/misc/papirus-folders/default.nix b/nixpkgs/pkgs/data/misc/papirus-folders/default.nix index 24fbeb0b0e23..a44a382c4b40 100644 --- a/nixpkgs/pkgs/data/misc/papirus-folders/default.nix +++ b/nixpkgs/pkgs/data/misc/papirus-folders/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "papirus-folders"; - version = "1.12.1"; + version = "1.13.1"; src = fetchFromGitHub { owner = "PapirusDevelopmentTeam"; repo = "papirus-folders"; rev = "v${version}"; - sha256 = "sha256-Dus9f2m5Wj46Url7N3UYEvBAankppzGzdJHGPH3CT3g="; + sha256 = "sha256-BY1hnAGz31Deffy/EGKy/nuPKmpAA0u8FzPYgr1Plfs="; }; buildInputs = [ diff --git a/nixpkgs/pkgs/data/soundfonts/generaluser/default.nix b/nixpkgs/pkgs/data/soundfonts/generaluser/default.nix index 5191199e6471..abe1ea4ceac6 100644 --- a/nixpkgs/pkgs/data/soundfonts/generaluser/default.nix +++ b/nixpkgs/pkgs/data/soundfonts/generaluser/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { # we can't use fetchurl since stdenv does not handle unpacking *.zip's by default. src = fetchzip { - # Linked on http://www.schristiancollins.com/generaluser.php: + # Linked on https://www.schristiancollins.com/generaluser.php: url = "https://www.dropbox.com/s/4x27l49kxcwamp5/GeneralUser_GS_${version}.zip"; sha256 = "sha256-lwUlWubXiVZ8fijKuNF54YQjT0uigjNAbjKaNjmC51s="; }; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "a SoundFont bank featuring 259 instrument presets and 11 drum kits"; - homepage = "http://www.schristiancollins.com/generaluser.php"; + homepage = "https://www.schristiancollins.com/generaluser.php"; license = licenses.generaluser; platforms = platforms.all; maintainers = with maintainers; [ ckie ]; diff --git a/nixpkgs/pkgs/data/themes/colloid-gtk-theme/default.nix b/nixpkgs/pkgs/data/themes/colloid-gtk-theme/default.nix index 6b56064b8734..71e7fb9a2863 100644 --- a/nixpkgs/pkgs/data/themes/colloid-gtk-theme/default.nix +++ b/nixpkgs/pkgs/data/themes/colloid-gtk-theme/default.nix @@ -1,7 +1,6 @@ { lib , stdenvNoCC , fetchFromGitHub -, gitUpdater , gnome-themes-extra , gtk-engine-murrine , jdupes @@ -23,13 +22,13 @@ lib.checkListOfEnum "${pname}: tweaks" [ "nord" "dracula" "gruvbox" "all" "black stdenvNoCC.mkDerivation rec { inherit pname; - version = "2023-08-12"; + version = "2023-10-28"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - hash = "sha256-Ss6IXd4vYUvIF5/Hn4IVLNvDSaewTY0GNZp7X5Lmz/c="; + hash = "sha256-NxIWH3qLW8sEguovAv9wfgnlnmPlTipRJTmMo3rSHNY="; }; nativeBuildInputs = [ @@ -64,8 +63,6 @@ stdenvNoCC.mkDerivation rec { runHook postInstall ''; - passthru.updateScript = gitUpdater { }; - meta = with lib; { description = "A modern and clean Gtk theme"; homepage = "https://github.com/vinceliuice/Colloid-gtk-theme"; diff --git a/nixpkgs/pkgs/data/themes/graphite-gtk-theme/default.nix b/nixpkgs/pkgs/data/themes/graphite-gtk-theme/default.nix index 31422625a48d..b59b1393c6d8 100644 --- a/nixpkgs/pkgs/data/themes/graphite-gtk-theme/default.nix +++ b/nixpkgs/pkgs/data/themes/graphite-gtk-theme/default.nix @@ -63,7 +63,7 @@ stdenvNoCC.mkDerivation rec { ${lib.optionalString wallpapers '' mkdir -p $out/share/backgrounds - cp -a wallpaper/Graphite-normal/*.png $out/share/backgrounds/ + cp -a wallpaper/Graphite/*.png $out/share/backgrounds/ ${lib.optionalString (builtins.elem "nord" tweaks) '' cp -a wallpaper/Graphite-nord/*.png $out/share/backgrounds/ ''} diff --git a/nixpkgs/pkgs/data/themes/tokyo-night-gtk/default.nix b/nixpkgs/pkgs/data/themes/tokyo-night-gtk/default.nix index a117562174e5..dc3273e695b1 100644 --- a/nixpkgs/pkgs/data/themes/tokyo-night-gtk/default.nix +++ b/nixpkgs/pkgs/data/themes/tokyo-night-gtk/default.nix @@ -1,38 +1,38 @@ { lib -, stdenvNoCC -, fetchFromGitHub +, callPackage +, runCommand , gtk-engine-murrine +, gnome-themes-extra }: -stdenvNoCC.mkDerivation { - pname = "tokyo-night-gtk"; - version = "2023.01.17"; +let + prefix = "tokyo-night-gtk"; - src = fetchFromGitHub { - owner = "Fausto-Korpsvart"; - repo = "Tokyo-Night-GTK-Theme"; - rev = "f7ae3421ac0d415ca57fb6224e093e12b8a980bb"; - sha256 = "sha256-90V55pRfgiaP1huhD+3456ziJ2EU24iNQHt5Ro+g+M0="; - }; + packages = lib.mapAttrs' (type: content: { + name = type; - propagatedUserEnvPkgs = [ - gtk-engine-murrine - ]; + value = lib.mapAttrs' (variantName: variant: { + name = variantName; + value = callPackage ./generic.nix { inherit prefix type variantName variant; }; + }) content; + }) (lib.importJSON ./variants.json); +in packages // { + # Not using `symlinkJoin` because it's massively inefficient in this case + full = runCommand "${prefix}_full" { + preferLocalBuild = true; - dontBuild = true; + propagatedUserEnvPkgs = [ + gtk-engine-murrine + gnome-themes-extra + ]; + } '' + mkdir -p $out/share/{icons,themes,${prefix}} - installPhase = '' - runHook preInstall - mkdir -p $out/share/themes - cp -a themes/* $out/share/themes - runHook postInstall + ${lib.concatStrings (lib.forEach (lib.attrValues (lib.attrsets.mergeAttrsList (lib.attrValues packages))) (variant: + '' + ln -s ${variant}/share/${variant.ptype}/Tokyonight-${variant.pvariant} $out/share/${variant.ptype}/Tokyonight-${variant.pvariant} + ln -s ${variant}/share/${prefix}/LICENSE $out/share/${prefix}/LICENSE 2>/dev/null || true + '' + ))} ''; - - meta = with lib; { - description = "A GTK theme based on the Tokyo Night colour palette."; - homepage = "www.pling.com/p/1681315/"; - license = licenses.gpl3Only; - platforms = platforms.unix; - maintainers = with lib.maintainers; [ garaiza-93 ]; - }; } diff --git a/nixpkgs/pkgs/data/themes/tokyo-night-gtk/generic.nix b/nixpkgs/pkgs/data/themes/tokyo-night-gtk/generic.nix new file mode 100644 index 000000000000..35bf498666da --- /dev/null +++ b/nixpkgs/pkgs/data/themes/tokyo-night-gtk/generic.nix @@ -0,0 +1,77 @@ +{ lib +, stdenvNoCC +, fetchFromGitHub +, writeScript +, gtk-engine-murrine +, gnome-themes-extra +, prefix ? "" +, type ? "" +, variantName ? "" +, variant ? "" +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "${prefix}_${type}-${variantName}"; + version = "unstable-2023-05-30"; + + src = fetchFromGitHub { + owner = "Fausto-Korpsvart"; + repo = "Tokyo-Night-GTK-Theme"; + rev = "e9790345a6231cd6001f1356d578883fac52233a"; + hash = "sha256-Q9UnvmX+GpvqSmTwdjU4hsEsYhA887wPqs5pyqbIhmc="; + }; + + propagatedUserEnvPkgs = [ + gtk-engine-murrine + gnome-themes-extra + ]; + + dontPatch = true; + dontConfigure = true; + dontBuild = true; + dontFixup = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/{${type},${prefix}} + cp -a ${type}/Tokyonight-${variant} $out/share/${type} + cp -a LICENSE $out/share/${prefix} + + runHook postInstall + ''; + + passthru = { + updateScript = writeScript "update.sh" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl common-updater-scripts tree jq + res="$(curl ''${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} \ + -sL "https://api.github.com/repos/${finalAttrs.src.owner}/${finalAttrs.src.repo}/commits/HEAD")" + + rev="$(echo $res | jq '.sha' --raw-output)" + version="unstable-$(echo $res | jq '.commit | .author | .date' --raw-output | sed 's/T.*$//')" + update-source-version ${prefix}-variants.${type}.${variantName} "$version" "$rev" --ignore-same-hash + + commonjq1='.[] .contents .[] | {(.name): .name} | walk(if type=="object" then with_entries(.key|=ascii_downcase) else . end)' + commonjq2='reduce inputs as $in (.; . + $in)' + commontree="-dJ -L 1 --noreport ${finalAttrs.src}" + + echo $(tree $commontree/icons | jq "$commonjq1" | jq "$commonjq2" | jq '{icons: .}') \ + $(tree $commontree/themes | jq "$commonjq1" | jq "$commonjq2" | jq '{themes: .}') | \ + jq 'reduce inputs as $in (.; . + $in)' | sed "s/[tT]okyonight-//g" > \ + "$(git rev-parse --show-toplevel)/pkgs/data/themes/${prefix}/variants.json" + ''; + + # For "full" in default.nix + ptype = type; + pvariant = variant; + }; + + meta = with lib; { + description = "A GTK theme based on the Tokyo Night colour palette"; + homepage = "https://www.pling.com/p/1681315"; + license = licenses.gpl3Only; + platforms = platforms.unix; + maintainers = with maintainers; [ garaiza-93 Madouura ]; + }; +}) diff --git a/nixpkgs/pkgs/data/themes/tokyo-night-gtk/variants.json b/nixpkgs/pkgs/data/themes/tokyo-night-gtk/variants.json new file mode 100644 index 000000000000..6489d9c649de --- /dev/null +++ b/nixpkgs/pkgs/data/themes/tokyo-night-gtk/variants.json @@ -0,0 +1,18 @@ +{ + "icons": { + "dark": "Dark", + "dark-cyan": "Dark-Cyan", + "light": "Light", + "moon": "Moon" + }, + "themes": { + "dark-b": "Dark-B", + "dark-bl": "Dark-BL", + "dark-b-lb": "Dark-B-LB", + "dark-bl-lb": "Dark-BL-LB", + "storm-b": "Storm-B", + "storm-bl": "Storm-BL", + "storm-b-lb": "Storm-B-LB", + "storm-bl-lb": "Storm-BL-LB" + } +} diff --git a/nixpkgs/pkgs/data/themes/utterly-nord-plasma/default.nix b/nixpkgs/pkgs/data/themes/utterly-nord-plasma/default.nix new file mode 100644 index 000000000000..4fbb0f5b8a83 --- /dev/null +++ b/nixpkgs/pkgs/data/themes/utterly-nord-plasma/default.nix @@ -0,0 +1,63 @@ +{ lib +, stdenv +, fetchFromGitHub +, breeze-icons +, kdeclarative +, kirigami2 +, plasma-framework +, plasma-workspace +}: + +stdenv.mkDerivation rec { + pname = "utterly-nord-plasma"; + version = "2.1"; + + src = fetchFromGitHub { + owner = "HimDek"; + repo = pname; + rev = "6d9ffe008f0bee47c8346c9a7ec71f206d999fd0"; + hash = "sha256-B5pIwV0BHxDluKWKTy+xuBPaE3N6UOHXip1SIAm2kM8="; + }; + + propagatedUserEnvPkgs = [ + breeze-icons + kdeclarative.bin + kirigami2 + plasma-framework.bin + plasma-workspace + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/{color-schemes,Kvantum,plasma/look-and-feel,sddm/themes,wallpapers,konsole} + + cp -a look-and-feel $out/share/plasma/look-and-feel/Utterly-Nord + cp -a look-and-feel-solid $out/share/plasma/look-and-feel/Utterly-Nord-solid + cp -a look-and-feel-light $out/share/plasma/look-and-feel/Utterly-Nord-light + cp -a look-and-feel-light-solid $out/share/plasma/look-and-feel/Utterly-Nord-light-solid + + cp -a *.colors $out/share/color-schemes/ + + cp -a wallpaper $out/share/wallpapers/Utterly-Nord + + cp -a kvantum $out/share/Kvantum/Utterly-Nord + cp -a kvantum-solid $out/share/Kvantum/Utterly-Nord-Solid + cp -a kvantum-light $out/share/Kvantum/Utterly-Nord-Light + cp -a kvantum-light-solid $out/share/Kvantum/Utterly-Nord-Light-Solid + + cp -a *.colorscheme $out/share/konsole/ + + cp -a sddm $out/share/sddm/themes/Utterly-Nord + + runHook postInstall + ''; + + meta = with lib; { + description = "A Plasma theme with Nordic Colors, transparency, blur and round edges for UI elements"; + homepage = "https://himdek.com/Utterly-Nord-Plasma/"; + license = licenses.gpl2Plus; + platforms = platforms.all; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/nixpkgs/pkgs/data/themes/utterly-round-plasma-style/default.nix b/nixpkgs/pkgs/data/themes/utterly-round-plasma-style/default.nix new file mode 100644 index 000000000000..40bdb2f71d88 --- /dev/null +++ b/nixpkgs/pkgs/data/themes/utterly-round-plasma-style/default.nix @@ -0,0 +1,40 @@ +{ lib +, stdenv +, fetchFromGitHub +}: + +stdenv.mkDerivation rec { + pname = "utterly-round-plasma-style"; + version = "2.1"; + + src = fetchFromGitHub { + owner = "HimDek"; + repo = pname; + rev = "c3677d5223286f69871f6745cdb3b71367229d40"; + hash = "sha256-mlqRMz0cAZnnM4xE6p7fMzhGlqCQcM4FxmDlVnbGUgQ="; + }; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/{aurorae/themes,plasma/desktoptheme} + + cp -a aurorae/dark/translucent $out/share/aurorae/themes/Utterly-Round-Dark + cp -a aurorae/dark/solid $out/share/aurorae/themes/Utterly-Round-Dark-Solid + cp -a aurorae/light/translucent $out/share/aurorae/themes/Utterly-Round-Light + cp -a aurorae/light/solid $out/share/aurorae/themes/Utterly-Round-Light-Solid + + cp -a desktoptheme/translucent $out/share/plasma/desktoptheme/Utterly-Round + cp -a desktoptheme/solid $out/share/plasma/desktoptheme/Utterly-Round-Solid + + runHook postInstall + ''; + + meta = with lib; { + description = "A rounded desktop theme and window borders for Plasma 5 that follows any color scheme"; + homepage = "https://himdek.com/Utterly-Round-Plasma-Style/"; + license = licenses.gpl2Plus; + platforms = platforms.all; + maintainers = [ maintainers.romildo ]; + }; +} |