diff options
Diffstat (limited to 'pkgs/data')
86 files changed, 1039 insertions, 325 deletions
diff --git a/pkgs/data/documentation/gnome-user-docs/default.nix b/pkgs/data/documentation/gnome-user-docs/default.nix index e8f671566d8dd..23dfd975bf745 100644 --- a/pkgs/data/documentation/gnome-user-docs/default.nix +++ b/pkgs/data/documentation/gnome-user-docs/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "gnome-user-docs"; - version = "41.1"; + version = "41.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-user-docs/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "Ve499XfRcX/BUvwq64nQr3qeyoZsiXTGdfYL1jCIjEg="; + sha256 = "0xcIld06i7EXyfFIoLs/tJDRr3ExxEFod7G7/sWROVo="; }; nativeBuildInputs = [ diff --git a/pkgs/data/fonts/andika/default.nix b/pkgs/data/fonts/andika/default.nix index aaa380098a271..02ee29a382ed3 100644 --- a/pkgs/data/fonts/andika/default.nix +++ b/pkgs/data/fonts/andika/default.nix @@ -1,7 +1,7 @@ { lib, fetchzip }: let - version = "6.001"; + version = "6.101"; in fetchzip rec { name = "andika-${version}"; @@ -14,7 +14,7 @@ in unzip -j $downloadedFile \*OFL.txt \*OFL-FAQ.txt \*README.txt \*FONTLOG.txt -d "$out/share/doc/${name}" ''; - sha256 = "sha256-ukPFBLjHQbOosQ1h0ImVlz8HhNNMp0e41SjzUhQaZtc="; + sha256 = "sha256-J/Ad+fmCMOxLoo+691LE6Bgi/l3ovIfWScwwVWtqACI="; meta = with lib; { homepage = "https://software.sil.org/andika"; diff --git a/pkgs/data/fonts/behdad-fonts/default.nix b/pkgs/data/fonts/behdad-fonts/default.nix index d5d0b2a3c1dd8..be6ed005b166e 100644 --- a/pkgs/data/fonts/behdad-fonts/default.nix +++ b/pkgs/data/fonts/behdad-fonts/default.nix @@ -20,6 +20,6 @@ in fetchFromGitHub { description = "A Persian/Arabic Open Source Font"; license = licenses.ofl; platforms = platforms.all; - maintainers = [ maintainers.linarcx ]; + maintainers = [ ]; }; } diff --git a/pkgs/data/fonts/cantarell-fonts/default.nix b/pkgs/data/fonts/cantarell-fonts/default.nix index 011e88dc1d2ec..49b4e6354ca47 100644 --- a/pkgs/data/fonts/cantarell-fonts/default.nix +++ b/pkgs/data/fonts/cantarell-fonts/default.nix @@ -1,15 +1,36 @@ -{ lib, stdenv, fetchurl, meson, ninja, gettext, appstream-glib, gnome }: +{ stdenv +, lib +, fetchurl +, meson +, ninja +, python3 +, gettext +, appstream-glib +, gnome +}: stdenv.mkDerivation rec { pname = "cantarell-fonts"; - version = "0.301"; + version = "0.303.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "3d35db0ac03f9e6b0d5a53577591b714238985f4cfc31a0aa17f26cd74675e83"; + sha256 = "+UY6BlnGPlfjgf3XU88ZKSJTlcW0kTWYlCR2GDBTBBE="; }; - nativeBuildInputs = [ meson ninja gettext appstream-glib ]; + nativeBuildInputs = [ + meson + ninja + python3 + python3.pkgs.psautohint + python3.pkgs.cffsubr + python3.pkgs.statmake + python3.pkgs.ufo2ft + python3.pkgs.setuptools + python3.pkgs.ufoLib2 + gettext + appstream-glib + ]; # ad-hoc fix for https://github.com/NixOS/nixpkgs/issues/50855 # until we fix gettext's envHook @@ -19,7 +40,7 @@ stdenv.mkDerivation rec { outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "1sczskw2kv3qy39i9mzw2lkl94a90bjgv5ln9acy5kh4gb2zmy7z"; + outputHash = "XeqHVdTQ7PTzxkjwfzS/BTR7+k/M69sfUKdRXGOTmZE="; passthru = { updateScript = gnome.updateScript { diff --git a/pkgs/data/fonts/charis-sil/default.nix b/pkgs/data/fonts/charis-sil/default.nix index 75f1d89be7703..3294cb711052c 100644 --- a/pkgs/data/fonts/charis-sil/default.nix +++ b/pkgs/data/fonts/charis-sil/default.nix @@ -1,7 +1,7 @@ { lib, fetchzip }: let - version = "6.001"; + version = "6.101"; in fetchzip rec { name = "charis-sil-${version}"; @@ -14,7 +14,7 @@ in unzip -j $downloadedFile \*OFL.txt \*OFL-FAQ.txt \*README.txt \*FONTLOG.txt -d "$out/share/doc/${name}" ''; - sha256 = "sha256-eKSOvYuTMpAnTk4sRiWFUDJrTsF+K5716ALCepaUU08="; + sha256 = "sha256-b1ms9hJ6IPe7W6O9KgzHZvwT4/nAoLOhdydcUrwNfnU="; meta = with lib; { homepage = "https://software.sil.org/charis"; diff --git a/pkgs/data/fonts/cm-unicode/default.nix b/pkgs/data/fonts/cm-unicode/default.nix index d7437c3231d63..3248813c3cb0a 100644 --- a/pkgs/data/fonts/cm-unicode/default.nix +++ b/pkgs/data/fonts/cm-unicode/default.nix @@ -16,7 +16,7 @@ in fetchzip rec { sha256 = "1rzz7yhqq3lljyqxbg46jfzfd09qgpgx865lijr4sgc94riy1ypn"; meta = with lib; { - homepage = "http://canopus.iacp.dvo.ru/~panov/cm-unicode/"; + homepage = "https://cm-unicode.sourceforge.io/"; description = "Computer Modern Unicode fonts"; maintainers = with maintainers; [ raskin rycee ]; license = licenses.ofl; diff --git a/pkgs/data/fonts/comic-relief/default.nix b/pkgs/data/fonts/comic-relief/default.nix index 1f5ce7f642faf..b5a7e88788768 100644 --- a/pkgs/data/fonts/comic-relief/default.nix +++ b/pkgs/data/fonts/comic-relief/default.nix @@ -19,7 +19,7 @@ in fetchzip rec { sha256 = "0dz0y7w6mq4hcmmxv6fn4mp6jkln9mzr4s96vsg68wrl5b7k9yff"; meta = with lib; { - homepage = "http://loudifier.com/comic-relief/"; + homepage = "https://fontlibrary.org/en/font/comic-relief"; description = "A font metric-compatible with Microsoft Comic Sans"; longDescription = '' Comic Relief is a typeface designed to be metrically equivalent diff --git a/pkgs/data/fonts/cozette/default.nix b/pkgs/data/fonts/cozette/default.nix index 3550facfc1142..1b0b033836645 100644 --- a/pkgs/data/fonts/cozette/default.nix +++ b/pkgs/data/fonts/cozette/default.nix @@ -1,14 +1,14 @@ { lib, fetchzip }: let - version = "1.8.3"; + version = "1.13.0"; in fetchzip rec { name = "Cozette-${version}"; url = "https://github.com/slavfox/Cozette/releases/download/v.${version}/CozetteFonts.zip"; - sha256 = "1nc4zk6n7cbv9vwlhpm3ady5lc4d4ic1klyywwfg27w8j0jv57hx"; + sha256 = "sha256-xp3BCYfNUxCNewg4FfzmJnKp0PARvvnViMVwT25nWdM="; postFetch = '' mkdir -p $out/share/fonts diff --git a/pkgs/data/fonts/crimson/default.nix b/pkgs/data/fonts/crimson/default.nix index b8ff43a11288c..9400ef06cf9a2 100644 --- a/pkgs/data/fonts/crimson/default.nix +++ b/pkgs/data/fonts/crimson/default.nix @@ -16,7 +16,7 @@ in fetchzip rec { sha256 = "0mg65f0ydyfmb43jqr1f34njpd10w8npw15cbb7z0nxmy4nkl842"; meta = with lib; { - homepage = "https://aldusleaf.org/crimson.html"; + homepage = "https://github.com/skosch/Crimson"; description = "A font family inspired by beautiful oldstyle typefaces"; license = licenses.ofl; platforms = platforms.all; diff --git a/pkgs/data/fonts/dejavu-fonts/default.nix b/pkgs/data/fonts/dejavu-fonts/default.nix index aed90b103b4e1..ba9fed1be282e 100644 --- a/pkgs/data/fonts/dejavu-fonts/default.nix +++ b/pkgs/data/fonts/dejavu-fonts/default.nix @@ -12,7 +12,7 @@ let This package includes DejaVu Sans, DejaVu Serif, DejaVu Sans Mono, and the TeX Gyre DejaVu Math font. ''; - homepage = "http://dejavu-fonts.org/wiki/Main_Page"; + homepage = "https://dejavu-fonts.github.io/"; # Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. # Copyright (c) 2006 by Tavmjong Bah. All Rights Reserved. diff --git a/pkgs/data/fonts/doulos-sil/default.nix b/pkgs/data/fonts/doulos-sil/default.nix index a1e686a320ed7..f720c2cac7dc8 100644 --- a/pkgs/data/fonts/doulos-sil/default.nix +++ b/pkgs/data/fonts/doulos-sil/default.nix @@ -1,7 +1,7 @@ { lib, fetchzip }: let - version = "6.001"; + version = "6.101"; in fetchzip rec { name = "doulos-sil-${version}"; @@ -14,7 +14,7 @@ in unzip -j $downloadedFile \*OFL.txt \*OFL-FAQ.txt \*README.txt \*FONTLOG.txt -d "$out/share/doc/${name}" ''; - sha256 = "sha256-MkeLLT7EAeSuCMxVVxVfajHufxr+xMLIz2hf3wF3U4o="; + sha256 = "sha256-vYdnudMkkWz6r8pwq98fyO0zcfFBRPmrqlmWxHCOIcc="; meta = with lib; { homepage = "https://software.sil.org/doulos"; diff --git a/pkgs/data/fonts/encode-sans/default.nix b/pkgs/data/fonts/encode-sans/default.nix index c6bb23b43266a..3fd0115ddb487 100644 --- a/pkgs/data/fonts/encode-sans/default.nix +++ b/pkgs/data/fonts/encode-sans/default.nix @@ -23,7 +23,7 @@ fetchzip rec { Designed by Pablo Impallari and Andres Torresi. ''; - homepage = "http://www.impallari.com/projects/overview/encode"; + homepage = "https://github.com/impallari/Encode-Sans"; license = licenses.ofl; maintainers = with maintainers; [ cmfwyp ]; platforms = platforms.all; diff --git a/pkgs/data/fonts/gandom-fonts/default.nix b/pkgs/data/fonts/gandom-fonts/default.nix index 54e0020ae6878..1b8b3307eb352 100644 --- a/pkgs/data/fonts/gandom-fonts/default.nix +++ b/pkgs/data/fonts/gandom-fonts/default.nix @@ -2,7 +2,7 @@ let pname = "gandom-fonts"; - version = "0.6"; + version = "0.8"; in fetchFromGitHub { name = "${pname}-${version}"; owner = "rastikerdar"; @@ -13,13 +13,13 @@ in fetchFromGitHub { tar xf $downloadedFile --strip=1 find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/gandom-fonts {} \; ''; - sha256 = "0zsq6s9ziyb5jz0v8aj00dlxd1aly0ibxgszd05dfvykmgz051lc"; + sha256 = "sha256-EDS3wwKwe2BIcOCxu7DxkVLCoEoTPP31k5ID51lqn3M="; meta = with lib; { homepage = "https://github.com/rastikerdar/gandom-font"; description = "A Persian (Farsi) Font - فونت (قلم) فارسی گندم"; license = licenses.ofl; platforms = platforms.all; - maintainers = [ maintainers.linarcx ]; + maintainers = [ ]; }; } diff --git a/pkgs/data/fonts/gentium/default.nix b/pkgs/data/fonts/gentium/default.nix index ac8839f075b29..f64f7b341440d 100644 --- a/pkgs/data/fonts/gentium/default.nix +++ b/pkgs/data/fonts/gentium/default.nix @@ -1,7 +1,7 @@ { lib, fetchzip }: let - version = "6.001"; + version = "6.101"; in fetchzip rec { name = "gentium-${version}"; @@ -23,7 +23,7 @@ in fetchzip rec { -d $out/share/doc/${name}/documentation ''; - sha256 = "sha256-DeoMTJ2nhTBtNQYG55lIMvnulqpk/KTeIqgpb5eiTIA="; + sha256 = "sha256-+T5aUlqQYDWRp4/4AZzsREHgjAnOeUB6qn1GAI0A5hE="; meta = with lib; { homepage = "https://software.sil.org/gentium/"; diff --git a/pkgs/data/fonts/hannom/default.nix b/pkgs/data/fonts/hannom/default.nix new file mode 100644 index 0000000000000..0ca15b1b0d2ed --- /dev/null +++ b/pkgs/data/fonts/hannom/default.nix @@ -0,0 +1,33 @@ +{ lib, fetchzip }: + +let + version = "2005"; +in fetchzip { + name = "hannom-${version}"; + + url = "mirror://sourceforge/vietunicode/hannom/hannom%20v${version}/hannomH.zip"; + + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype + ''; + + sha256 = "sha256-zOYJxEHl4KM0ncVQDBs9+e3z8DxzF2ef3pRj0OVSuUo="; + + meta = with lib; { + description = "UNICODE Han Nom Font Set"; + homepage = "http://vietunicode.sourceforge.net/fonts/fonts_hannom.html"; + longDescription = '' + The true type fonts HAN NOM A and HAN NOM B have been developed by Chan + Nguyen Do Quoc Bao (Germany), To Minh Tam (USA) and Ni sinh Thien Vien Vien + Chieu (Vietnam). Their work got started in 2001, completed in 2003, and + publicized in 2005. These two true type fonts can be used with WIN-2000 or + WIN-XP and Office XP or Office 2003 to display Han and Nom characters with + code points by the Unicode Standard. Two sets of true type fonts are + available with high and low resolutions. + ''; + license = licenses.unfree; + maintainers = with maintainers; [ wegank ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/data/fonts/iosevka/update-default.sh b/pkgs/data/fonts/iosevka/update-default.sh index 208ea6101ac28..8d918058988a0 100755 --- a/pkgs/data/fonts/iosevka/update-default.sh +++ b/pkgs/data/fonts/iosevka/update-default.sh @@ -8,7 +8,7 @@ repo=https://github.com/be5invis/Iosevka # Discover the latest version. current_version=$(nix-instantiate "$nixpkgs" --eval --strict -A iosevka.version | tr -d '"') -new_version=$(list-git-tags "$repo" | sort --reverse --version-sort | awk 'match($0, /^v([0-9.]+)$/, m) { print m[1]; exit; }') +new_version=$(list-git-tags --url="$repo" | sort --reverse --version-sort | awk 'match($0, /^v([0-9.]+)$/, m) { print m[1]; exit; }') if [[ "$new_version" == "$current_version" ]]; then echo "iosevka: no update found" exit diff --git a/pkgs/data/fonts/ipaexfont/default.nix b/pkgs/data/fonts/ipaexfont/default.nix index ef914d144843c..5223bc499d5c3 100644 --- a/pkgs/data/fonts/ipaexfont/default.nix +++ b/pkgs/data/fonts/ipaexfont/default.nix @@ -1,16 +1,16 @@ { lib, fetchzip }: fetchzip { - name = "ipaexfont-003.01"; + name = "ipaexfont-004.01"; - url = "http://web.archive.org/web/20160616003021/http://dl.ipafont.ipa.go.jp/IPAexfont/IPAexfont00301.zip"; + url = "https://moji.or.jp/wp-content/ipafont/IPAexfont/IPAexfont00401.zip"; postFetch = '' mkdir -p $out/share/fonts unzip -j $downloadedFile \*.ttf -d $out/share/fonts/opentype ''; - sha256 = "02a6sj990cnig5lq0m54nmbmfkr3s57jpxl9fiyzrjmigvd1qmhj"; + sha256 = "0wp369kri33kb1mmiq4lpl9i4xnacw9fj63ycmkmlkq64s8qnjnx"; meta = with lib; { description = "Japanese font package with Mincho and Gothic fonts"; @@ -21,7 +21,7 @@ fetchzip { This is the successor to the IPA fonts. ''; - homepage = "http://ipafont.ipa.go.jp/"; + homepage = "https://moji.or.jp/ipafont/"; license = licenses.ipa; maintainers = with maintainers; [ gebner ]; }; diff --git a/pkgs/data/fonts/ipafont/default.nix b/pkgs/data/fonts/ipafont/default.nix index eec28db883a85..9bc9b82db0e6a 100644 --- a/pkgs/data/fonts/ipafont/default.nix +++ b/pkgs/data/fonts/ipafont/default.nix @@ -3,7 +3,7 @@ fetchzip { name = "ipafont-003.03"; - url = "http://ipafont.ipa.go.jp/old/ipafont/IPAfont00303.php"; + url = "https://moji.or.jp/wp-content/ipafont/IPAfont/IPAfont00303.zip"; postFetch = '' mkdir -p $out/share/fonts @@ -19,7 +19,7 @@ fetchzip { Promotion Agency of Japan. It provides both Mincho and Gothic fonts, suitable for both display and printing. ''; - homepage = "http://ipafont.ipa.go.jp/ipafont/"; + homepage = "https://moji.or.jp/ipafont/"; license = lib.licenses.ipa; maintainers = [ lib.maintainers.auntie ]; }; diff --git a/pkgs/data/fonts/ir-standard-fonts/default.nix b/pkgs/data/fonts/ir-standard-fonts/default.nix index 25ec1e5d11da7..2e535255cc6bb 100644 --- a/pkgs/data/fonts/ir-standard-fonts/default.nix +++ b/pkgs/data/fonts/ir-standard-fonts/default.nix @@ -21,6 +21,6 @@ in fetchFromGitHub { # License information is unavailable. license = licenses.unfree; platforms = platforms.all; - maintainers = [ maintainers.linarcx ]; + maintainers = [ ]; }; } diff --git a/pkgs/data/fonts/iwona/default.nix b/pkgs/data/fonts/iwona/default.nix index 7333c5abe3583..85cf06df11fb9 100644 --- a/pkgs/data/fonts/iwona/default.nix +++ b/pkgs/data/fonts/iwona/default.nix @@ -14,7 +14,7 @@ in fetchzip { meta = with lib; { description = "A two-element sans-serif typeface, created by Małgorzata Budyta"; - homepage = "http://jmn.pl/en/kurier-i-iwona/"; + homepage = "https://jmn.pl/en/kurier-i-iwona/"; # "[...] GUST Font License (GFL), which is a free license, legally # equivalent to the LaTeX Project Public # License (LPPL), version 1.3c or # later." - GUST website diff --git a/pkgs/data/fonts/julia-mono/default.nix b/pkgs/data/fonts/julia-mono/default.nix index a1f8f316773ec..136a3218761cc 100644 --- a/pkgs/data/fonts/julia-mono/default.nix +++ b/pkgs/data/fonts/julia-mono/default.nix @@ -1,13 +1,13 @@ { lib, fetchzip }: let - version = "0.043"; + version = "0.044"; in fetchzip { name = "JuliaMono-ttf-${version}"; url = "https://github.com/cormullion/juliamono/releases/download/v${version}/JuliaMono-ttf.tar.gz"; - sha256 = "sha256-oxQRrFhTf37OrJSbDlmzh/7xOuKrtxO7v2+j7QcsAmE="; + sha256 = "sha256-KCU1eOSEWjYh6kPda/iCtZUIWIq5lK79uUCLl2w7SEg="; postFetch = '' mkdir -p $out/share/fonts/truetype diff --git a/pkgs/data/fonts/lalezar-fonts/default.nix b/pkgs/data/fonts/lalezar-fonts/default.nix index 01e9d209a3177..31a857bfda057 100644 --- a/pkgs/data/fonts/lalezar-fonts/default.nix +++ b/pkgs/data/fonts/lalezar-fonts/default.nix @@ -21,6 +21,6 @@ in fetchFromGitHub { description = "A multi-script display typeface for popular culture"; license = licenses.ofl; platforms = platforms.all; - maintainers = [ maintainers.linarcx ]; + maintainers = [ ]; }; } diff --git a/pkgs/data/fonts/montserrat/default.nix b/pkgs/data/fonts/montserrat/default.nix index 41135122f0540..7d91f49eb3e41 100644 --- a/pkgs/data/fonts/montserrat/default.nix +++ b/pkgs/data/fonts/montserrat/default.nix @@ -2,13 +2,13 @@ let pname = "montserrat"; - version = "7.210"; + version = "7.222"; in fetchFromGitHub { name = "${pname}-${version}"; owner = "JulietaUla"; repo = pname; rev = "v${version}"; - sha256 = "sha256-C6T0Iz1rFC+EsKFJRil2jGTMQ4X7wR80E3eORL5qi0U="; + sha256 = "sha256-MeNnc1e5X5f0JyaLY6fX22rytHkvL++eM2ygsdlGMv0="; postFetch = '' tar xf $downloadedFile --strip 1 diff --git a/pkgs/data/fonts/nahid-fonts/default.nix b/pkgs/data/fonts/nahid-fonts/default.nix index 0e08bebea0920..fbceb3c927dcb 100644 --- a/pkgs/data/fonts/nahid-fonts/default.nix +++ b/pkgs/data/fonts/nahid-fonts/default.nix @@ -20,6 +20,6 @@ in fetchFromGitHub { description = "A Persian (Farsi) Font - قلم (فونت) فارسی ناهید"; license = licenses.free; platforms = platforms.all; - maintainers = [ maintainers.linarcx ]; + maintainers = [ ]; }; } diff --git a/pkgs/data/fonts/nanum-gothic-coding/default.nix b/pkgs/data/fonts/nanum-gothic-coding/default.nix index 4785c1386a623..5066a2aef4dcb 100644 --- a/pkgs/data/fonts/nanum-gothic-coding/default.nix +++ b/pkgs/data/fonts/nanum-gothic-coding/default.nix @@ -20,6 +20,6 @@ in fetchzip { homepage = "https://github.com/naver/nanumfont"; license = licenses.ofl; platforms = platforms.all; - maintainers = with maintainers; [ linarcx ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/data/fonts/nika-fonts/default.nix b/pkgs/data/fonts/nika-fonts/default.nix index 5db9bb2a95183..f497a184be01c 100644 --- a/pkgs/data/fonts/nika-fonts/default.nix +++ b/pkgs/data/fonts/nika-fonts/default.nix @@ -20,6 +20,6 @@ in fetchFromGitHub { description = "Persian/Arabic Open Source Font"; license = licenses.ofl; platforms = platforms.all; - maintainers = [ maintainers.linarcx ]; + maintainers = [ ]; }; } diff --git a/pkgs/data/fonts/noto-fonts/default.nix b/pkgs/data/fonts/noto-fonts/default.nix index d6b4488daf05e..9c9996db39e04 100644 --- a/pkgs/data/fonts/noto-fonts/default.nix +++ b/pkgs/data/fonts/noto-fonts/default.nix @@ -3,8 +3,8 @@ , lib , fetchFromGitHub , fetchurl -, fetchzip , cairo +, nixosTests , python3 , pkg-config , pngquant @@ -61,6 +61,45 @@ let maintainers = with maintainers; [ mathnerd314 emily ]; }; }; + + mkNotoCJK = { typeface, version, rev, sha256 }: + stdenvNoCC.mkDerivation { + pname = "noto-fonts-cjk-${lib.toLower typeface}"; + inherit version; + + src = fetchFromGitHub { + owner = "googlefonts"; + repo = "noto-cjk"; + inherit rev sha256; + sparseCheckout = "${typeface}/OTC"; + }; + + installPhase = '' + install -m444 -Dt $out/share/fonts/opentype/noto-cjk ${typeface}/OTC/*.ttc + ''; + + passthru.tests.noto-fonts = nixosTests.noto-fonts; + + meta = with lib; { + description = "Beautiful and free fonts for CJK languages"; + homepage = "https://www.google.com/get/noto/help/cjk/"; + longDescription = '' + Noto ${typeface} CJK is a ${lib.toLower typeface} typeface designed as + an intermediate style between the modern and traditional. It is + intended to be a multi-purpose digital font for user interface + designs, digital content, reading on laptops, mobile devices, and + electronic books. Noto ${typeface} CJK comprehensively covers + Simplified Chinese, Traditional Chinese, Japanese, and Korean in a + unified font family. It supports regional variants of ideographic + characters for each of the four languages. In addition, it supports + Japanese kana, vertical forms, and variant characters (itaiji); it + supports Korean hangeul — both contemporary and archaic. + ''; + license = licenses.ofl; + platforms = platforms.all; + maintainers = with maintainers; [ mathnerd314 emily ]; + }; + }; in { @@ -74,39 +113,18 @@ in weights = "{Black,Condensed,Extra,Medium,Semi,Thin}*"; }; - noto-fonts-cjk = let zip = fetchzip { - url = let rev = "be6c059ac1587e556e2412b27f5155c8eb3ddbe6"; in - "https://raw.githubusercontent.com/googlefonts/noto-cjk/${rev}/NotoSansCJK.ttc.zip"; - # __MACOSX... - stripRoot = false; - sha256 = "0ik4z2b15i0pghskgfm3adzb0h35fr4gyzvz3bq49hhkhn9h85vi"; - }; in stdenvNoCC.mkDerivation { - pname = "noto-fonts-cjk"; - version = "2.001"; - - buildCommand = '' - install -m444 -Dt $out/share/fonts/opentype/noto-cjk ${zip}/*.ttc - ''; + noto-fonts-cjk-sans = mkNotoCJK { + typeface = "Sans"; + version = "2.004"; + rev = "9f7f3c38eab63e1d1fddd8d50937fe4f1eacdb1d"; + sha256 = "sha256-pNC/WJCYHSlU28E/CSFsrEMbyCe/6tjevDlOvDK9RwU="; + }; - meta = with lib; { - description = "Beautiful and free fonts for CJK languages"; - homepage = "https://www.google.com/get/noto/help/cjk/"; - longDescription = - '' - Noto Sans CJK is a sans serif typeface designed as an intermediate style - between the modern and traditional. It is intended to be a multi-purpose - digital font for user interface designs, digital content, reading on laptops, - mobile devices, and electronic books. Noto Sans CJK comprehensively covers - Simplified Chinese, Traditional Chinese, Japanese, and Korean in a unified font - family. It supports regional variants of ideographic characters for each of the - four languages. In addition, it supports Japanese kana, vertical forms, and - variant characters (itaiji); it supports Korean hangeul — both contemporary and - archaic. - ''; - license = licenses.ofl; - platforms = platforms.all; - maintainers = with maintainers; [ mathnerd314 emily ]; - }; + noto-fonts-cjk-serif = mkNotoCJK { + typeface = "Serif"; + version = "2.000"; + rev = "9f7f3c38eab63e1d1fddd8d50937fe4f1eacdb1d"; + sha256 = "sha256-Iy4lmWj5l+/Us/dJJ/Jl4MEojE9mrFnhNQxX2zhVngY="; }; noto-fonts-emoji = let diff --git a/pkgs/data/fonts/parastoo-fonts/default.nix b/pkgs/data/fonts/parastoo-fonts/default.nix index 7c713576a21c4..a3d273bb8ae1a 100644 --- a/pkgs/data/fonts/parastoo-fonts/default.nix +++ b/pkgs/data/fonts/parastoo-fonts/default.nix @@ -2,7 +2,7 @@ let pname = "parastoo-fonts"; - version = "1.0.0-alpha5"; + version = "2.0.1"; in fetchFromGitHub { name = "${pname}-${version}"; @@ -14,13 +14,13 @@ in fetchFromGitHub { tar xf $downloadedFile --strip=1 find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/parastoo-fonts {} \; ''; - sha256 = "10jbii6rskcy4akjl5yfcqv4mfwk3nqnx36l6sbxks43va9l04f4"; + sha256 = "sha256-4smobLS43DB7ISmbWDWX0IrtaeiyXpi1QpAiL8NyXoQ="; meta = with lib; { homepage = "https://github.com/rastikerdar/parastoo-font"; description = "A Persian (Farsi) Font - فونت ( قلم ) فارسی پرستو"; license = licenses.ofl; platforms = platforms.all; - maintainers = [ maintainers.linarcx ]; + maintainers = [ ]; }; } diff --git a/pkgs/data/fonts/quattrocento-sans/default.nix b/pkgs/data/fonts/quattrocento-sans/default.nix index ed0411ceb9f6c..0d62a866e0f00 100644 --- a/pkgs/data/fonts/quattrocento-sans/default.nix +++ b/pkgs/data/fonts/quattrocento-sans/default.nix @@ -5,7 +5,7 @@ let in fetchzip rec { name = "quattrocento-sans-${version}"; - url = "http://web.archive.org/web/20170709124317/http://www.impallari.com/media/releases/quattrocento-sans-v${version}.zip"; + url = "https://web.archive.org/web/20170709124317/http://www.impallari.com/media/releases/quattrocento-sans-v${version}.zip"; postFetch = '' mkdir -p $out/share/{fonts,doc} diff --git a/pkgs/data/fonts/quattrocento/default.nix b/pkgs/data/fonts/quattrocento/default.nix index 3d11321cd4b26..aa23175a04d48 100644 --- a/pkgs/data/fonts/quattrocento/default.nix +++ b/pkgs/data/fonts/quattrocento/default.nix @@ -5,7 +5,7 @@ let in fetchzip rec { name = "quattrocento-${version}"; - url = "http://web.archive.org/web/20170707001804/http://www.impallari.com/media/releases/quattrocento-v${version}.zip"; + url = "https://web.archive.org/web/20170707001804/http://www.impallari.com/media/releases/quattrocento-v${version}.zip"; postFetch = '' mkdir -p $out/share/{fonts,doc} diff --git a/pkgs/data/fonts/sahel-fonts/default.nix b/pkgs/data/fonts/sahel-fonts/default.nix index ff86338c26d4a..9079ba7fada0b 100644 --- a/pkgs/data/fonts/sahel-fonts/default.nix +++ b/pkgs/data/fonts/sahel-fonts/default.nix @@ -2,7 +2,7 @@ let pname = "sahel-fonts"; - version = "1.0.0-alpha22"; + version = "3.4.0"; in fetchFromGitHub { name = "${pname}-${version}"; @@ -14,13 +14,13 @@ in fetchFromGitHub { tar xf $downloadedFile --strip=1 find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/sahel-fonts {} \; ''; - sha256 = "0vj8ydv50rjanb0favd7rh4r9rv5fl39vqwvzkpgfdcdawn0xjm7"; + sha256 = "sha256-MrKSgz9WpVgLS37uH/7S0LPBD/n3GLXeUCMBD7x5CG8="; meta = with lib; { homepage = "https://github.com/rastikerdar/sahel-font"; description = "A Persian (farsi) Font - فونت (قلم) فارسی ساحل"; license = licenses.ofl; platforms = platforms.all; - maintainers = [ maintainers.linarcx ]; + maintainers = [ ]; }; } diff --git a/pkgs/data/fonts/samim-fonts/default.nix b/pkgs/data/fonts/samim-fonts/default.nix index e10249a1afd97..b29114e6b1c4a 100644 --- a/pkgs/data/fonts/samim-fonts/default.nix +++ b/pkgs/data/fonts/samim-fonts/default.nix @@ -2,7 +2,7 @@ let pname = "samim-fonts"; - version = "3.1.0"; + version = "4.0.4"; in fetchFromGitHub { name = "${pname}-${version}"; @@ -14,13 +14,13 @@ in fetchFromGitHub { tar xf $downloadedFile --strip=1 find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/samim-fonts {} \; ''; - sha256 = "0mmhncqg48dp0d7l725dv909zswbkk22dlqzcdfh6k6cgk2gn08q"; + sha256 = "sha256-WYSJ2mAzAe5H0EaMYU3qNVcQ0lRuHsjZ11YmLnZ2FCo="; meta = with lib; { homepage = "https://github.com/rastikerdar/samim-font"; description = "A Persian (Farsi) Font - فونت (قلم) فارسی صمیم"; license = licenses.ofl; platforms = platforms.all; - maintainers = [ maintainers.linarcx ]; + maintainers = [ ]; }; } diff --git a/pkgs/data/fonts/sarasa-gothic/default.nix b/pkgs/data/fonts/sarasa-gothic/default.nix index c28b3745f9429..3d601bdc68653 100644 --- a/pkgs/data/fonts/sarasa-gothic/default.nix +++ b/pkgs/data/fonts/sarasa-gothic/default.nix @@ -1,14 +1,14 @@ { lib, fetchurl, libarchive }: let - version = "0.35.5"; + version = "0.35.8"; in fetchurl { name = "sarasa-gothic-${version}"; # Use the 'ttc' files here for a smaller closure size. # (Using 'ttf' files gives a closure size about 15x larger, as of November 2021.) url = "https://github.com/be5invis/Sarasa-Gothic/releases/download/v${version}/sarasa-gothic-ttc-${version}.7z"; - sha256 = "sha256-t9BYV9a/rmEr8nLqcdxg4Z5pWsCefvwI47eSwub41u0="; + sha256 = "sha256-22q+FdTh9Dex+tEo/HCBK14ZlJFtFM7SrE6K1/iVBY0="; recursiveHash = true; downloadToTemp = true; diff --git a/pkgs/data/fonts/shabnam-fonts/default.nix b/pkgs/data/fonts/shabnam-fonts/default.nix index 5cf54697fdf60..d5e7e2b243c3f 100644 --- a/pkgs/data/fonts/shabnam-fonts/default.nix +++ b/pkgs/data/fonts/shabnam-fonts/default.nix @@ -2,7 +2,7 @@ let pname = "shabnam-fonts"; - version = "4.0.0"; + version = "5.0.1"; in fetchFromGitHub { name = "${pname}-${version}"; @@ -14,13 +14,13 @@ in fetchFromGitHub { tar xf $downloadedFile --strip=1 find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/shabnam-fonts {} \; ''; - sha256 = "0wfyaaj2pq2knz12l7rsc4wc703cbz0r8gkcya5x69p0aixch8ba"; + sha256 = "sha256-m4G4UtW/0S9CsvaSF7QfthfIxGQ02E7SucdDm5s3G7A="; meta = with lib; { homepage = "https://github.com/rastikerdar/shabnam-font"; description = "A Persian (Farsi) Font - فونت (قلم) فارسی شبنم"; license = licenses.ofl; platforms = platforms.all; - maintainers = [ maintainers.linarcx ]; + maintainers = [ ]; }; } diff --git a/pkgs/data/fonts/sudo/default.nix b/pkgs/data/fonts/sudo/default.nix index e0bc42f8d129d..45450a7c20f71 100644 --- a/pkgs/data/fonts/sudo/default.nix +++ b/pkgs/data/fonts/sudo/default.nix @@ -1,11 +1,11 @@ { lib, fetchzip }: let - version = "0.61"; + version = "0.62"; in fetchzip { name = "sudo-font-${version}"; url = "https://github.com/jenskutilek/sudo-font/releases/download/v${version}/sudo.zip"; - sha256 = "sha256-4GDlx2zhwkcsxJPq0IrS1owmw+RKy09X3Q0zzA9l79w="; + sha256 = "sha256-I0E2zYbfEFBEIBNC7nnJb+hOaBgGZkAIg08YpA8awso="; postFetch = '' mkdir -p $out/share/fonts/ diff --git a/pkgs/data/fonts/vazir-fonts/default.nix b/pkgs/data/fonts/vazir-fonts/default.nix index a41013fd490cb..b2c4f1faa3c55 100755 --- a/pkgs/data/fonts/vazir-fonts/default.nix +++ b/pkgs/data/fonts/vazir-fonts/default.nix @@ -2,7 +2,7 @@ let pname = "vazir-fonts"; - version = "22.1.0"; + version = "30.1.0"; in fetchFromGitHub { name = "${pname}-${version}"; @@ -14,13 +14,13 @@ in fetchFromGitHub { tar xf $downloadedFile --strip=1 find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/truetype {} \; ''; - sha256 = "1nh3pyyw3082aizdwgyihh4z122z7kzp45ry7lzdhq9lshkpzglc"; + sha256 = "sha256-J1l6rBFgaXFtGnK0pH7GbaYTt5TI/OevjZrXmaEgkB4="; meta = with lib; { homepage = "https://github.com/rastikerdar/vazir-font"; description = "A Persian (Farsi) Font - قلم (فونت) فارسی وزیر"; license = licenses.ofl; platforms = platforms.all; - maintainers = [ maintainers.linarcx ]; + maintainers = [ ]; }; } diff --git a/pkgs/data/fonts/victor-mono/default.nix b/pkgs/data/fonts/victor-mono/default.nix index 68f437a8fc8d0..45873e1b7f96c 100644 --- a/pkgs/data/fonts/victor-mono/default.nix +++ b/pkgs/data/fonts/victor-mono/default.nix @@ -1,7 +1,7 @@ { lib, fetchzip }: let - version = "1.5.1"; + version = "1.5.2"; in fetchzip { name = "victor-mono-${version}"; @@ -21,7 +21,7 @@ fetchzip { unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype ''; - sha256 = "sha256-FHahUp/Ghjv6fwsjj1giVPlAIXRMSZCSLcVMiMHvV3A="; + sha256 = "sha256-cNDZh0P/enmoKL/6eHzkgl5ghtai2K9cTgWMVmm8GIA="; meta = with lib; { description = "Free programming font with cursive italics and ligatures"; diff --git a/pkgs/data/fonts/vista-fonts-chs/default.nix b/pkgs/data/fonts/vista-fonts-chs/default.nix index 7c5d9dbba6ea7..66274c667a04b 100644 --- a/pkgs/data/fonts/vista-fonts-chs/default.nix +++ b/pkgs/data/fonts/vista-fonts-chs/default.nix @@ -5,7 +5,7 @@ stdenvNoCC.mkDerivation { version = "1"; src = fetchurl { - url = "http://web.archive.org/web/20161221192937if_/http://download.microsoft.com/download/d/6/e/d6e2ff26-5821-4f35-a18b-78c963b1535d/VistaFont_CHS.EXE"; + url = "https://web.archive.org/web/20161221192937if_/http://download.microsoft.com/download/d/6/e/d6e2ff26-5821-4f35-a18b-78c963b1535d/VistaFont_CHS.EXE"; # Alternative mirror: # http://www.eeo.cn/download/font/VistaFont_CHS.EXE sha256 = "1qwm30b8aq9piyqv07hv8b5bac9ms40rsdf8pwix5dyk8020i8xi"; diff --git a/pkgs/data/icons/comixcursors/default.nix b/pkgs/data/icons/comixcursors/default.nix new file mode 100644 index 0000000000000..aa744878bcb3b --- /dev/null +++ b/pkgs/data/icons/comixcursors/default.nix @@ -0,0 +1,125 @@ +{ lib, stdenv, fetchFromGitLab, bc, librsvg, xcursorgen }: + +let + dimensions = { + color = [ "Black" "Blue" "Green" "Orange" "Red" "White" ]; + opacity = [ "" "Opaque_" ]; # Translucent or opaque. + thickness = [ "" "Slim_" ]; # Thick or slim edges. + handedness = [ "" "LH_" ]; # Right- or left-handed. + }; + product = lib.cartesianProductOfSets dimensions; + variantName = + { color, opacity, thickness, handedness }: + "${handedness}${opacity}${thickness}${color}"; + variants = + # (The order of this list is already good looking enough to show in the + # meta.longDescription.) + map variantName product; +in +stdenv.mkDerivation rec { + pname = "comixcursors"; + version = "0.9.2"; + + src = fetchFromGitLab { + owner = "limitland"; + repo = "comixcursors"; + # https://gitlab.com/limitland/comixcursors/-/issues/3 + rev = "8c327c8514ab3a352583605c1ddcb7eb3d1d302b"; + sha256 = "0bpxqw4izj7m0zb9lnxnmsjicfw60ppkdyv5nwrrz4x865wb296a"; + }; + + nativeBuildInputs = [ bc librsvg xcursorgen ]; + + patches = [ ./makefile-shell-var.patch ]; + + postPatch = '' + patchShebangs ./install-all ./bin/ + ''; + + # install-all is used instead of the directions in upstream's INSTALL file, + # because using its Makefile directly is broken. Upstream itself seems to use + # its build-distribution script instead, which also uses install-all, but we + # do not use it because it does extra things for other distros. + # + # When not all of the variants, i.e. only a smaller subset of them, are + # desired (i.e. when a subset of outputs are chosen), install-all will still + # build all of them. While upstream appears to provide old functionality for + # building only a subset, it is broken and we do not use it. With prebuilt + # substitutions, installers of this package will get only the outputs they + # chose. + buildPhase = '' + ICONSDIR=$TMP/staged ./install-all + ''; + + installPhase = '' + for outputName in $outputs ; do + if [ $outputName != out ]; then + local outputDir=''${!outputName}; + local iconsDir=$outputDir/share/icons + local cursorName=$(tr _ - <<<"$outputName") + + mkdir -p $iconsDir + cp -r -d $TMP/staged/ComixCursors-$cursorName $iconsDir + + unset outputDir iconsDir cursorName + fi + done + + # Need this directory (empty) to prevent the builder scripts from breaking. + mkdir -p $out + ''; + + outputs = let + default = "Opaque_Black"; + in + # Have the most-traditional variant be the default output (as the first). + # Even with outputsToInstall=[], the default/first still has an effect on + # some Nix tools (e.g. nix-build). + [ default ] ++ (lib.remove default variants) + # Need a dummy "out" output to prevent the builder scripts from breaking. + ++ [ "out" ]; + + # No default output (to the extent possible). Instead, the outputs' + # attributes are used to choose which variant(s) to have. + outputsToInstall = []; + + meta = with lib; { + description = "The Comix Cursors mouse themes"; + longDescription = '' + There are many (${toString ((length outputs) - 1)}) variants of color, + opacity, edge thickness, and right- or left-handedness, for this cursor + theme. This package's derivation has an output for each of these + variants, named following the upstream convention, and the attribute for + an output must be used to install a variant. E.g.: + <programlisting language="nix"> + environment.systemPackages = [ + comixcursors.Blue + comixcursors.Opaque_Orange + comixcursors.Slim_Red + comixcursors.Opaque_Slim_White + comixcursors.LH_Green + comixcursors.LH_Opaque_Black + comixcursors.LH_Slim_Orange + comixcursors.LH_Opaque_Slim_Blue + ]; + </programlisting> + + Attempting to use just <literal>comixcursors</literal>, i.e. without an + output attribute, will not install any variants. To install all the + variants, use <literal>comixcursors.all</literal> (which is a list), e.g.: + <programlisting language="nix"> + environment.systemPackages = comixcursors.all ++ [...]; + </programlisting> + + The complete list of output attributes is: + <programlisting> + ${concatStringsSep "\n" variants} + </programlisting> + ''; + homepage = "https://gitlab.com/limitland/comixcursors"; + changelog = "https://gitlab.com/limitland/comixcursors/-/blob/HEAD/NEWS"; + license = licenses.gpl3Plus; + maintainers = [ maintainers.DerickEddington ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/data/icons/comixcursors/makefile-shell-var.patch b/pkgs/data/icons/comixcursors/makefile-shell-var.patch new file mode 100644 index 0000000000000..4032244c9ef02 --- /dev/null +++ b/pkgs/data/icons/comixcursors/makefile-shell-var.patch @@ -0,0 +1,11 @@ +--- a/Makefile ++++ b/Makefile +@@ -22,8 +22,6 @@ + + # Makefile for ComixCursors project. + +-SHELL = /bin/bash +- + CURSORSNAME = ComixCursors + PACKAGENAME ?= ${CURSORSNAME} + SUMMARY ?= The original Comix Cursors diff --git a/pkgs/data/icons/gnome-icon-theme/default.nix b/pkgs/data/icons/gnome-icon-theme/default.nix index 0e6a2fc67c439..239cf052ca9e2 100644 --- a/pkgs/data/icons/gnome-icon-theme/default.nix +++ b/pkgs/data/icons/gnome-icon-theme/default.nix @@ -29,5 +29,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; + broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/gnome-icon-theme.x86_64-darwin }; } diff --git a/pkgs/data/icons/kora-icon-theme/default.nix b/pkgs/data/icons/kora-icon-theme/default.nix index 9ecc7f76c073a..8df63a75ad8dc 100644 --- a/pkgs/data/icons/kora-icon-theme/default.nix +++ b/pkgs/data/icons/kora-icon-theme/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "kora-icon-theme"; - version = "1.4.9"; + version = "1.5.0"; src = fetchFromGitHub { owner = "bikass"; repo = "kora"; rev = "v${version}"; - sha256 = "sha256-bhzkR8V/kdETC12mqMtTw+80o8AAD8sYeMhpktd0WMo="; + sha256 = "sha256-kUgNj7KuxsQ/BvQ0ORl3xzEm9gv69+2PS0Bgv8i/S9U="; }; nativeBuildInputs = [ diff --git a/pkgs/data/icons/luna-icons/default.nix b/pkgs/data/icons/luna-icons/default.nix index 3d87e9577d5c7..f6ac136d4af62 100644 --- a/pkgs/data/icons/luna-icons/default.nix +++ b/pkgs/data/icons/luna-icons/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "luna-icons"; - version = "1.8"; + version = "1.9"; src = fetchFromGitHub { owner = "darkomarko42"; repo = pname; rev = version; - sha256 = "1c317ac43ff70sxn1syx20qhs4nkccv6hbf69fmi3acswqsll1z4"; + sha256 = "1l6jxbgq2qnw4qx0khkdxcq75v17cv2ccfnm28sslpzcc1r8amqd"; }; nativeBuildInputs = [ diff --git a/pkgs/data/icons/nordzy-icon-theme/default.nix b/pkgs/data/icons/nordzy-icon-theme/default.nix new file mode 100644 index 0000000000000..11113bb6a5039 --- /dev/null +++ b/pkgs/data/icons/nordzy-icon-theme/default.nix @@ -0,0 +1,54 @@ +{ stdenvNoCC +, fetchFromGitHub +, lib +, gtk3 +, jdupes +, nordzy-themes ? [ "all" ] # Override this to only install selected themes +}: + +stdenvNoCC.mkDerivation { + pname = "nordzy-icon-theme"; + version = "unstable-2022-01-23"; + + src = fetchFromGitHub { + owner = "alvatip"; + repo = "Nordzy-icon"; + rev = "10b9ee80ef5c4cac1d1770d89a6d55046521ea36"; + sha256 = "1b8abhs5gzr2qy407jq818pr67vjky8zn3pa3c8n552ayybblibk"; + }; + + # In the post patch phase we should first make sure to patch shebangs. + postPatch = '' + patchShebangs install.sh + ''; + + nativeBuildInputs = [ + gtk3 + jdupes + ]; + + dontDropIconThemeCache = true; + + installPhase = '' + runHook preInstall + + name= ./install.sh --dest $out/share/icons \ + ${lib.optionalString (nordzy-themes != []) (lib.strings.concatMapStrings (theme: "-t ${theme} ") nordzy-themes)} + + # Replace duplicate files with hardlinks to the first file in each + # set of duplicates, reducing the installed size in about 87% + jdupes -L -r $out/share + + runHook postInstall + ''; + + dontFixup = true; + + meta = with lib; { + description = "Icon theme using the Nord color palette, based on WhiteSur and Numix icon themes"; + homepage = "https://github.com/alvatip/Nordzy-icon"; + license = licenses.gpl3Only; + platforms = platforms.linux; + maintainers = with maintainers; [ alexnortung ]; + }; +} diff --git a/pkgs/data/icons/numix-icon-theme-circle/default.nix b/pkgs/data/icons/numix-icon-theme-circle/default.nix index 089e098e97e22..79ca07dd5b5ac 100644 --- a/pkgs/data/icons/numix-icon-theme-circle/default.nix +++ b/pkgs/data/icons/numix-icon-theme-circle/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "numix-icon-theme-circle"; - version = "21.12.05"; + version = "22.02.06"; src = fetchFromGitHub { owner = "numixproject"; repo = pname; rev = version; - sha256 = "sha256-tmrysmg4jVPurNJy3AqzAIjd1QCXoH2nGuJhRinvqVQ="; + sha256 = "sha256-a+h5DMxVM1TPVx8yuKwRzjjnBLnIWMCCKG+BPg1Hq5Y="; }; nativeBuildInputs = [ gtk3 ]; diff --git a/pkgs/data/icons/numix-icon-theme-square/default.nix b/pkgs/data/icons/numix-icon-theme-square/default.nix index 8aeb6d44669ae..550b11c7ac897 100644 --- a/pkgs/data/icons/numix-icon-theme-square/default.nix +++ b/pkgs/data/icons/numix-icon-theme-square/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "numix-icon-theme-square"; - version = "21.12.05"; + version = "22.02.06"; src = fetchFromGitHub { owner = "numixproject"; repo = pname; rev = version; - sha256 = "sha256-SVWIY7RGwk2AKruDkAYoZ5nDSAU8LPb9dtqxDFumZ5o="; + sha256 = "sha256-dKBNB1udRysDe3HbUh2qudQDeLgS/wmSnY3nAWnmjQo="; }; nativeBuildInputs = [ gtk3 ]; diff --git a/pkgs/data/icons/papirus-icon-theme/default.nix b/pkgs/data/icons/papirus-icon-theme/default.nix index 503e4e1d296a6..9da7178e80ad1 100644 --- a/pkgs/data/icons/papirus-icon-theme/default.nix +++ b/pkgs/data/icons/papirus-icon-theme/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "papirus-icon-theme"; - version = "20211201"; + version = "20220204"; src = fetchFromGitHub { owner = "PapirusDevelopmentTeam"; repo = pname; rev = version; - sha256 = "sha256-lcwQALFQ4zkgDLCX1uthAP3QZwP7UcWcPSOU+UTDykE="; + sha256 = "sha256-DYz2fnn1ZfX09NQcRXmGTYY95K5wOWhlmJeDjEvN1vY="; }; nativeBuildInputs = [ gtk3 ]; diff --git a/pkgs/data/icons/phinger-cursors/default.nix b/pkgs/data/icons/phinger-cursors/default.nix new file mode 100644 index 0000000000000..5afd2fe228f6a --- /dev/null +++ b/pkgs/data/icons/phinger-cursors/default.nix @@ -0,0 +1,28 @@ +{ lib, stdenvNoCC, fetchurl }: + +stdenvNoCC.mkDerivation rec { + pname = "phinger-cursors"; + version = "1.1"; + + src = fetchurl { + url = "https://github.com/phisch/phinger-cursors/releases/download/v${version}/phinger-cursors-variants.tar.bz2"; + sha256 = "sha256-II+1x+rcjGRRVB8GYkVwkKVHNHcNaBKRb6C613901oc="; + }; + + sourceRoot = "."; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/icons + cp -r ./phinger-cursors* $out/share/icons + runHook postInstall + ''; + + meta = with lib; { + description = "The most over-engineered cursor theme"; + homepage = "https://github.com/phisch/phinger-cursors"; + platforms = platforms.unix; + license = licenses.cc-by-sa-40; + maintainers = with maintainers; [ fortuneteller2k ]; + }; +} diff --git a/pkgs/data/icons/qogir-icon-theme/default.nix b/pkgs/data/icons/qogir-icon-theme/default.nix index c0f65ab7eadc6..24ad687834e36 100644 --- a/pkgs/data/icons/qogir-icon-theme/default.nix +++ b/pkgs/data/icons/qogir-icon-theme/default.nix @@ -1,14 +1,20 @@ -{ lib, stdenv, fetchFromGitHub, gtk3, hicolor-icon-theme, jdupes }: - -stdenv.mkDerivation rec { +{ lib +, stdenvNoCC +, fetchFromGitHub +, gtk3 +, hicolor-icon-theme +, jdupes +}: + +stdenvNoCC.mkDerivation rec { pname = "qogir-icon-theme"; - version = "2021-10-14"; + version = "2022-01-12"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "0qbbg0hcdda7apk892b8nhbrsvji12nv97ss7lv412xwcmxsj9fp"; + sha256 = "1daayxsqh7di3bvfnl39h1arsj1fypd3ba30mas6dl1d0qy17z1p"; }; nativeBuildInputs = [ gtk3 jdupes ]; @@ -26,7 +32,7 @@ stdenv.mkDerivation rec { patchShebangs install.sh mkdir -p $out/share/icons name= ./install.sh -d $out/share/icons - jdupes -l -r $out/share/icons + jdupes -L -r $out/share/icons runHook postInstall ''; diff --git a/pkgs/data/icons/tela-circle-icon-theme/default.nix b/pkgs/data/icons/tela-circle-icon-theme/default.nix new file mode 100644 index 0000000000000..d19dcba69fd8f --- /dev/null +++ b/pkgs/data/icons/tela-circle-icon-theme/default.nix @@ -0,0 +1,65 @@ +{ lib +, stdenvNoCC +, fetchFromGitHub +, gtk3 +, hicolor-icon-theme +, jdupes +, allColorVariants ? false +, circularFolder ? false +, colorVariants ? [] # default is standard +}: + +let + pname = "tela-circle-icon-theme"; +in +lib.checkListOfEnum "${pname}: color variants" [ "standard" "black" "blue" "brown" "green" "grey" "orange" "pink" "purple" "red" "yellow" "manjaro" "ubuntu" ] colorVariants + +stdenvNoCC.mkDerivation rec { + inherit pname; + version = "2022-02-08"; + + src = fetchFromGitHub { + owner = "vinceliuice"; + repo = pname; + rev = version; + sha256 = "08a1jhirvn2x9hhjr0lqqqayhsf446cddapprxpsnsn9q6x2j2gp"; + }; + + nativeBuildInputs = [ + gtk3 + jdupes + ]; + + propagatedBuildInputs = [ + hicolor-icon-theme + ]; + + dontDropIconThemeCache = true; + + # These fixup steps are slow and unnecessary for this package. + # Package may install almost 400 000 small files. + dontPatchELF = true; + dontRewriteSymlinks = true; + + installPhase = '' + runHook preInstall + + patchShebangs install.sh + + ./install.sh -d $out/share/icons \ + ${lib.optionalString circularFolder "-c"} \ + ${if allColorVariants then "-a" else builtins.toString colorVariants} + + jdupes -L -r $out/share/icons + + runHook postInstall + ''; + + meta = with lib; { + description = "Flat and colorful personality icon theme"; + homepage = "https://github.com/vinceliuice/Tela-circle-icon-theme"; + license = licenses.gpl3Only; + platforms = platforms.unix; + maintainers = with maintainers; [ romildo ]; + }; +} diff --git a/pkgs/data/icons/tela-icon-theme/default.nix b/pkgs/data/icons/tela-icon-theme/default.nix index 4e2b824be4bce..ab7742bb36f0e 100644 --- a/pkgs/data/icons/tela-icon-theme/default.nix +++ b/pkgs/data/icons/tela-icon-theme/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "tela-icon-theme"; - version = "2021-12-25"; + version = "2022-01-25"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "sha256-qlt9jv3lCPVFBeN4aQd4r9NE0YAxWQavMoo13cvhv6E="; + sha256 = "sha256-XKNSCWwanm2dP002TY/mE4SDX13TllHrbrb55V4wLSQ="; }; nativeBuildInputs = [ gtk3 jdupes ]; diff --git a/pkgs/data/icons/vimix-icon-theme/default.nix b/pkgs/data/icons/vimix-icon-theme/default.nix index 502a8023c9bd2..853b1d209abbf 100644 --- a/pkgs/data/icons/vimix-icon-theme/default.nix +++ b/pkgs/data/icons/vimix-icon-theme/default.nix @@ -1,7 +1,20 @@ -{ lib, stdenv, fetchFromGitHub, gtk3, hicolor-icon-theme, jdupes }: +{ lib +, stdenv +, fetchFromGitHub +, gtk3 +, hicolor-icon-theme +, jdupes +, colorVariants ? [] # default: all +}: + +let + pname = "vimix-icon-theme"; + +in +lib.checkListOfEnum "${pname}: color variants" [ "standard" "Amethyst" "Beryl" "Doder" "Ruby" "Black" "White" ] colorVariants stdenv.mkDerivation rec { - pname = "vimix-icon-theme"; + inherit pname; version = "2021-11-09"; src = fetchFromGitHub { @@ -23,10 +36,16 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall + patchShebangs install.sh - ./install.sh -a -d $out/share/icons + + ./install.sh \ + ${if colorVariants != [] then builtins.toString colorVariants else "-a"} \ + -d $out/share/icons + # replace duplicate files with symlinks - jdupes -l -r $out/share/icons + jdupes -L -r $out/share/icons + runHook postInstall ''; diff --git a/pkgs/data/misc/adapta-backgrounds/default.nix b/pkgs/data/misc/adapta-backgrounds/default.nix index 6debaa9ebe220..417bd7392b524 100644 --- a/pkgs/data/misc/adapta-backgrounds/default.nix +++ b/pkgs/data/misc/adapta-backgrounds/default.nix @@ -11,7 +11,9 @@ stdenv.mkDerivation rec { sha256 = "04hmbmzf97rsii8gpwy3wkljy5xhxmlsl34d63s6hfy05knclydj"; }; - nativeBuildInputs = [ meson ninja pkg-config glib ]; + strictDeps = true; + nativeBuildInputs = [ meson ninja pkg-config ]; + buildInputs = [ glib ]; meta = with lib; { description = "Wallpaper collection for adapta-project"; diff --git a/pkgs/data/misc/cacert/default.nix b/pkgs/data/misc/cacert/default.nix index 49645ee800838..4d79521c255c2 100644 --- a/pkgs/data/misc/cacert/default.nix +++ b/pkgs/data/misc/cacert/default.nix @@ -20,13 +20,13 @@ let blocklist = writeText "cacert-blocklist.txt" (lib.concatStringsSep "\n" blacklist); extraCertificatesBundle = writeText "cacert-extra-certificates-bundle.crt" (lib.concatStringsSep "\n\n" extraCertificateStrings); - srcVersion = "3.71"; + srcVersion = "3.74"; version = if nssOverride != null then nssOverride.version else srcVersion; meta = with lib; { homepage = "https://curl.haxx.se/docs/caextract.html"; description = "A bundle of X.509 certificates of public Certificate Authorities (CA)"; platforms = platforms.all; - maintainers = with maintainers; [ andir fpletz lukegb ]; + maintainers = with maintainers; [ fpletz lukegb ]; license = licenses.mpl20; }; certdata = stdenv.mkDerivation { @@ -35,7 +35,7 @@ let src = if nssOverride != null then nssOverride.src else fetchurl { url = "mirror://mozilla/security/nss/releases/NSS_${lib.replaceStrings ["."] ["_"] version}_RTM/src/nss-${version}.tar.gz"; - sha256 = "0ly2l3dv6z5hlxs72h5x6796ni3x1bq60saavaf42ddgv4ax7b4r"; + sha256 = "0mnhdkm4galhpvfz4rv0918jwmjlwkvcvb1f5va8f3zlz48qi4l8"; }; dontBuild = true; diff --git a/pkgs/data/misc/ddccontrol-db/default.nix b/pkgs/data/misc/ddccontrol-db/default.nix index c8a76b98367da..9ac49167f66b4 100644 --- a/pkgs/data/misc/ddccontrol-db/default.nix +++ b/pkgs/data/misc/ddccontrol-db/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "ddccontrol-db"; - version = "20210812"; + version = "20220216"; src = fetchFromGitHub { owner = "ddccontrol"; repo = "ddccontrol-db"; rev = version; - sha256 = "sha256-dRqyjDC9yNkNOnYQ9fkWPlnyzSqIZ4zxZ2T7t8Bu9FE="; + sha256 = "sha256-Nr8OvxbJRf9t2BUtEX3qBAH2BSs6KWLMzSpykiwYsHQ="; }; preConfigure = '' diff --git a/pkgs/data/misc/freepats/default.nix b/pkgs/data/misc/freepats/default.nix index 3ba5e1b61de15..4fe6a5c20fdef 100644 --- a/pkgs/data/misc/freepats/default.nix +++ b/pkgs/data/misc/freepats/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { Freepats is a project to create a free and open set of instrument patches, in any format, that can be used with softsynths. ''; - homepage = "http://freepats.zenvoid.org/"; + homepage = "https://freepats.zenvoid.org/"; license = licenses.gpl2; platforms = platforms.all; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/data/misc/geolite-legacy/builder.sh b/pkgs/data/misc/geolite-legacy/builder.sh deleted file mode 100644 index 0bb61d863ecea..0000000000000 --- a/pkgs/data/misc/geolite-legacy/builder.sh +++ /dev/null @@ -1,20 +0,0 @@ -source "$stdenv/setup" - -mkdir -p $out/share/GeoIP -cd $out/share/GeoIP - -# Iterate over all environment variable names beginning with "src": -for var in "${!src@}"; do - # Store the value of the variable with name $var in $src: - eval src="\$$var" - - # Copy $src to current directory, removing Nix hash from the filename: - dest="${src##*/}" - dest="${dest#*-}" - cp "$src" "$dest" -done - -gzip -dv *.gz - -ln -s GeoLiteCity.dat GeoIPCity.dat -ln -s GeoLiteCityv6.dat GeoIPCityv6.dat diff --git a/pkgs/data/misc/geolite-legacy/default.nix b/pkgs/data/misc/geolite-legacy/default.nix index 735a660894926..ad9560da9a481 100644 --- a/pkgs/data/misc/geolite-legacy/default.nix +++ b/pkgs/data/misc/geolite-legacy/default.nix @@ -1,41 +1,34 @@ -{ lib, stdenv, fetchurl }: +{ lib, stdenv, fetchurl, zstd }: -let - fetchDB = src: sha256: fetchurl { - inherit sha256; - url = "https://geolite.maxmind.com/download/geoip/database/${src}"; - }; -in stdenv.mkDerivation { pname = "geolite-legacy"; - version = "2017-12-02"; + version = "2022-01-25"; + + # We use Arch Linux package as a snapshot, because upstream database is updated in-place. + geoip = fetchurl { + url = "https://archive.archlinux.org/packages/g/geoip-database/geoip-database-20220125-1-any.pkg.tar.zst"; + sha256 = "sha256-ieuLpllJTHYu28UXBGfDWbnr9Ei8pGnos+RPWDsAGcM="; + }; - srcGeoIP = fetchDB - "GeoLiteCountry/GeoIP.dat.gz" - "1nggml11wzlanmzk6wbw2kla91fj8ggd9kh9yz42lnyckdlf5ac4"; - srcGeoIPv6 = fetchDB - "GeoIPv6.dat.gz" - "0w809xgmr5zi4fgm9q3lhrnh1vl62s49n737bhq4jplm5918ki50"; - srcGeoLiteCity = fetchDB - "GeoLiteCity.dat.gz" - "0cibajsv5xdjpw1qfx22izm5azqcj0d7nvk39irgwflkim9jfjbs"; - srcGeoLiteCityv6 = fetchDB - "GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz" - "1ldwbzgs64irfgb3kq3jp8fmhwmwqk713dr4kkdqlglrblr9hfkc"; - srcGeoIPASNum = fetchDB - "asnum/GeoIPASNum.dat.gz" - "06qqs8qr8vxqwd80npz7n66k3bpc1vs7w43i2bb4k0di5yxnjwr9"; - srcGeoIPASNumv6 = fetchDB - "asnum/GeoIPASNumv6.dat.gz" - "1qyq4h8cja62giv6q1qqc502vsq53wzz1kx80mgvwngmycrxa21k"; + extra = fetchurl { + url = "https://archive.archlinux.org/packages/g/geoip-database-extra/geoip-database-extra-20220125-1-any.pkg.tar.zst"; + sha256 = "sha256-xrTnuJvuvtvn+uIARtbuJUlHco3Q+9BXLljt35V3ip0="; + }; + + nativeBuildInputs = [ zstd ]; + + buildCommand = '' + tar -xaf "$geoip" + tar -xaf "$extra" + mkdir -p $out/share + mv usr/share/GeoIP $out/share + ''; meta = with lib; { description = "GeoLite Legacy IP geolocation databases"; - homepage = "https://geolite.maxmind.com/download/geoip"; - license = licenses.cc-by-sa-30; + homepage = "https://mailfud.org/geoip-legacy/"; + license = licenses.cc-by-sa-40; platforms = platforms.all; maintainers = with maintainers; [ fpletz ]; }; - - builder = ./builder.sh; } diff --git a/pkgs/data/misc/hackage/pin.json b/pkgs/data/misc/hackage/pin.json index c6226691d75f6..d22dccf38cf06 100644 --- a/pkgs/data/misc/hackage/pin.json +++ b/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "01a23b49c333c95167338433cd375e24fc60d66d", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/01a23b49c333c95167338433cd375e24fc60d66d.tar.gz", - "sha256": "0mf1pqlg5cj0p0si1vgf5mp5an89yhq0il6v7n58smcqbfdynds5", - "msg": "Update from Hackage at 2021-12-21T13:58:08Z" + "commit": "aa8f2230d08c540df249147ea681a5c22314d083", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/aa8f2230d08c540df249147ea681a5c22314d083.tar.gz", + "sha256": "1h92r4si1vmf3v2m843xaqwr99hpnn1s0x08qcvd2gwjkc2qq10a", + "msg": "Update from Hackage at 2022-02-14T17:17:31Z" } diff --git a/pkgs/data/misc/mime-types/default.nix b/pkgs/data/misc/mime-types/default.nix deleted file mode 100644 index 77b67e48f923f..0000000000000 --- a/pkgs/data/misc/mime-types/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ lib, fetchzip }: - -let - version = "9"; -in fetchzip rec { - name = "mime-types-${version}"; - url = "https://mirrors.kernel.org/gentoo/distfiles/${name}.tar.bz2"; - postFetch = '' - mkdir -p $out/etc - tar xjvf $downloadedFile --directory=$out/etc --strip-components=1 - ''; - sha256 = "0gyla4wfiaccs0qh0hw7n08kdpnkkssglcg0z2jblb2lsdr4qna0"; - - meta = with lib; { - description = "A database of common mappings of file extensions to MIME types"; - homepage = "https://packages.gentoo.org/packages/app-misc/mime-types"; - license = licenses.gpl2; - maintainers = with maintainers; [ peterhoeg ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/data/misc/osinfo-db/default.nix b/pkgs/data/misc/osinfo-db/default.nix index 17a63debdc646..4af6f3b4db402 100644 --- a/pkgs/data/misc/osinfo-db/default.nix +++ b/pkgs/data/misc/osinfo-db/default.nix @@ -1,15 +1,25 @@ -{ lib, stdenv, fetchurl, osinfo-db-tools, gettext, libxml2 }: +{ lib +, stdenv +, fetchurl +, osinfo-db-tools +, gettext +, libxml2 +}: stdenv.mkDerivation rec { pname = "osinfo-db"; - version = "20210312"; + version = "20220214"; src = fetchurl { url = "https://releases.pagure.org/libosinfo/${pname}-${version}.tar.xz"; - sha256 = "sha256-dUjsCeRFynN4xc65njntyohX+Ck4MeCzy1WPQjCHDhA="; + sha256 = "sha256-E+bJAOuCAPFmD4oe13Xs7NWgH9skv7bu4c5l3XvP06k="; }; - nativeBuildInputs = [ osinfo-db-tools gettext libxml2 ]; + nativeBuildInputs = [ + osinfo-db-tools + gettext + libxml2 + ]; installPhase = '' osinfo-db-import --dir "$out/share/osinfo" "${src}" @@ -18,6 +28,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Osinfo database of information about operating systems for virtualization provisioning tools"; homepage = "https://gitlab.com/libosinfo/osinfo-db/"; + changelog = "https://gitlab.com/libosinfo/osinfo-db/-/commits/v${version}"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/data/misc/poppler-data/default.nix b/pkgs/data/misc/poppler-data/default.nix index 5d6e7b8e80dc2..6d35279b6de20 100644 --- a/pkgs/data/misc/poppler-data/default.nix +++ b/pkgs/data/misc/poppler-data/default.nix @@ -1,20 +1,30 @@ -{ fetchurl, lib, stdenv, cmake, ninja }: +{ fetchurl +, lib +, stdenv +, cmake +, ninja +, poppler +}: stdenv.mkDerivation rec { - name = "poppler-data-0.4.10"; + pname = "poppler-data"; + version = "0.4.11"; src = fetchurl { - url = "https://poppler.freedesktop.org/${name}.tar.gz"; - sha256 = "0c3vjs3p7rjc4yfacnhd865r27czmzwcr4j2z4jldi68dvvcwbvf"; + url = "https://poppler.freedesktop.org/${pname}-${version}.tar.gz"; + sha256 = "LOwFzRuwOvmKiwah4i9ubhplseLzgWyzBpuwh0gl8Iw="; }; - nativeBuildInputs = [ cmake ninja ]; + nativeBuildInputs = [ + cmake + ninja + ]; meta = with lib; { homepage = "https://poppler.freedesktop.org/"; description = "Encoding files for Poppler, a PDF rendering library"; platforms = platforms.all; license = licenses.free; # more free licenses combined - maintainers = with maintainers; [ ]; + maintainers = poppler.meta.maintainers; }; } diff --git a/pkgs/data/misc/rime-data/default.nix b/pkgs/data/misc/rime-data/default.nix index fbf65bc12a9f6..97404764e2005 100644 --- a/pkgs/data/misc/rime-data/default.nix +++ b/pkgs/data/misc/rime-data/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "rime-data"; - version = "0.38.20210628"; + version = "0.38.20211002"; src = fetchFromGitHub { owner = "rime"; repo = "plum"; - rev = "0b835e347cad9c2d7038cfe82df5b5d1fe1c0327"; - sha256 = "0mja4wyazxdc6fr7pzij5ah4rzwxv4s12s64vfn5ikx1ias1f8ib"; + rev = "1730556e1da5a08bb8e0a656c4780a46851a2913"; + sha256 = "sha256-D7rPUxcB3QkCtisfBLHPiqfgL5lqmxjSiuEcpE63elw="; }; buildInputs = [ librime ]; diff --git a/pkgs/data/misc/shared-mime-info/default.nix b/pkgs/data/misc/shared-mime-info/default.nix index 4c60895897fe3..2feb5e2f5a471 100644 --- a/pkgs/data/misc/shared-mime-info/default.nix +++ b/pkgs/data/misc/shared-mime-info/default.nix @@ -13,34 +13,24 @@ }: stdenv.mkDerivation rec { - pname = "shared-mime-info"; - version = "2.1"; + pname = "shared-mime-info-unstable"; + version = "2021-12-03"; outputs = [ "out" "dev" ]; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "xdg"; - repo = pname; - rev = version; - sha256 = "07bxv44p43pqq4ymfnyy50yli7lwdqymhvclna42rkn1cazq3vb5"; + repo = "shared-mime-info"; + rev = "5a406b06792e26a83c7346b3c2443c0bd8d4cdb2"; + sha256 = "1v7dx7mr0m4lcff1aasg9gxn280zn0ffn6fjg9xc44pnllg01n6s"; }; - patches = [ - # xmlto is only used for building the docs, which are not installed anyways. - (fetchpatch { - name = "xmlto-optional.patch"; - url = "https://gitlab.freedesktop.org/xdg/shared-mime-info/-/merge_requests/110.patch"; - sha256 = "0p5gxlcmn8ji5bc7pd105s1halqwa1d28lfx9yj43rn6mav7allx"; - }) - ]; - nativeBuildInputs = [ meson ninja pkg-config gettext - itstool libxml2 ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) shared-mime-info; diff --git a/pkgs/data/misc/tzdata/default.nix b/pkgs/data/misc/tzdata/default.nix index fddd1aec61ac5..52662b190a747 100644 --- a/pkgs/data/misc/tzdata/default.nix +++ b/pkgs/data/misc/tzdata/default.nix @@ -2,16 +2,16 @@ stdenv.mkDerivation rec { pname = "tzdata"; - version = "2021c"; + version = "2021e"; srcs = [ (fetchurl { url = "https://data.iana.org/time-zones/releases/tzdata${version}.tar.gz"; - sha256 = "0himprzx3ahxkmg4rvp8n5lqry76qzc65j6sfq151hqirg4d3wdl"; + sha256 = "1cdjdcxl0s9xf0dg1z64kh7llm80byxqlzrkkjzcdlyh6yvl5v07"; }) (fetchurl { url = "https://data.iana.org/time-zones/releases/tzcode${version}.tar.gz"; - sha256 = "01fsa661vzdij46z286pa8q07cppqz29sr2pf0qqldqpldbb6km3"; + sha256 = "0x8pcfmjvxk29yfh8bklchv2f0vpl4yih0gc4wyx292l78wncijq"; }) ]; diff --git a/pkgs/data/misc/v2ray-domain-list-community/default.nix b/pkgs/data/misc/v2ray-domain-list-community/default.nix index 270a110b62f37..1115edabcec7a 100644 --- a/pkgs/data/misc/v2ray-domain-list-community/default.nix +++ b/pkgs/data/misc/v2ray-domain-list-community/default.nix @@ -3,14 +3,14 @@ let generator = pkgsBuildBuild.buildGoModule rec { pname = "v2ray-domain-list-community"; - version = "20211228022859"; + version = "20220201175515"; src = fetchFromGitHub { owner = "v2fly"; repo = "domain-list-community"; rev = version; - sha256 = "sha256-wDz4msCaX6BPzxrg5GeZSrMuxsCx8uimhaHghWdDp8s="; + sha256 = "sha256-vgw6i8djBQDV+fmkVe5CuKMwES/PXGoVe8cTgB5tflo="; }; - vendorSha256 = "sha256-p0EPYOw3vuqHiVSrZR7SA7vE0DWA7xyupWM+JznjF+o="; + vendorSha256 = "sha256-QUbnUnxG1tsNbR49HTl55aiLkBM/ae9mCtzWeN4Ju78="; meta = with lib; { description = "community managed domain list"; homepage = "https://github.com/v2fly/domain-list-community"; diff --git a/pkgs/data/misc/v2ray-geoip/default.nix b/pkgs/data/misc/v2ray-geoip/default.nix index 64cecbc60a3eb..df190fd9ef80a 100644 --- a/pkgs/data/misc/v2ray-geoip/default.nix +++ b/pkgs/data/misc/v2ray-geoip/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "v2ray-geoip"; - version = "202112300030"; + version = "202202170030"; src = fetchFromGitHub { owner = "v2fly"; repo = "geoip"; - rev = "570a09062b1b6dbd3b8cb1785c0ce4a0ed3c50f4"; - sha256 = "sha256-YGKHruyVShFrMbE0eXzb2Qp3BMfM+4SLaK8pqR2sloM="; + rev = "ebc49c1ccbe7f267778ab42dbfa01d7ff8a5241c"; + sha256 = "sha256-CxV7jKNeaSW7lVBKKr7Ih2XAehnFcapkyDogd5V32Zk="; }; installPhase = '' diff --git a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix index 28737253af5e7..735dfdb4f81b3 100644 --- a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix +++ b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix @@ -63,8 +63,9 @@ let ''; meta = { - homepage = "http://wiki.docbook.org/topic/DocBookXslStylesheets"; + homepage = "https://github.com/docbook/wiki/wiki/DocBookXslStylesheets"; description = "XSL stylesheets for transforming DocBook documents into HTML and various other formats"; + license = lib.licenses.mit; maintainers = [ lib.maintainers.eelco ]; platforms = lib.platforms.all; }; diff --git a/pkgs/data/soundfonts/ydp-grand/default.nix b/pkgs/data/soundfonts/ydp-grand/default.nix new file mode 100644 index 0000000000000..3b44b712139e4 --- /dev/null +++ b/pkgs/data/soundfonts/ydp-grand/default.nix @@ -0,0 +1,23 @@ +{ lib, stdenv, fetchurl }: + +stdenv.mkDerivation { + name = "ydp-grand"; + version = "unstable-2016-08-04"; + + src = fetchurl { + url = "https://freepats.zenvoid.org/Piano/YDP-GrandPiano/YDP-GrandPiano-SF2-20160804.tar.bz2"; + sha256 = "sha256-0kPcPhgqYN8qFukoKMGCHPPrV0i0Xi4r3Pqc968FYCY="; + }; + + installPhase = '' + install -Dm644 YDP-GrandPiano-*.sf2 $out/share/soundfonts/YDP-GrandPiano.sf2 + ''; + + meta = with lib; { + description = "Acoustic grand piano soundfont"; + homepage = "https://freepats.zenvoid.org/Piano/acoustic-grand-piano.html"; + license = licenses.cc-by-30; + platforms = platforms.all; + maintainers = with maintainers; [ ckie ]; + }; +} diff --git a/pkgs/data/themes/artim-dark/default.nix b/pkgs/data/themes/artim-dark/default.nix new file mode 100644 index 0000000000000..9485f46b19a98 --- /dev/null +++ b/pkgs/data/themes/artim-dark/default.nix @@ -0,0 +1,35 @@ +{ lib, stdenvNoCC, fetchFromGitHub }: + +stdenvNoCC.mkDerivation rec{ + pname = "artim-dark"; + version = "unstable-2021-12-29"; + + src = fetchFromGitHub { + owner="Mrcuve0"; + repo="Aritim-Dark"; + rev = "99cd330a1ab4814260e28f15431e3338a1103668"; + hash = "sha256-xGnw5KpXbVyDdTuAkav1Hec6bitpZdPzZk0xv7WHTdY="; + }; + + dontBuild = true; + installPhase = '' + mkdir -p $out/share/plasma/desktoptheme + cp -R KDE/plasmaTheme/Aritim-Dark* $out/share/plasma/desktoptheme + mkdir -p $out/share/aurorae/themes + cp -R KDE/auroraeTheme $out/share/aurorae/themes/Aritim-Dark + mkdir -p $out/share/color-schemes + cp -R KDE/colorScheme/*.colors $out/share/color-schemes + mkdir -p $out/share/plasma/look-and-feel + cp -R KDE/globalTheme $out/share/plasma/look-and-feel/Aritim-Dark + mkdir -p $out/share/themes + cp -R GTK $out/share/themes/Aritim-Dark + ''; + + meta = { + description = "Dark theme deeply inspired by the Ayu Dark color palette"; + homepage = "https://github.com/Mrcuve0/Aritim-Dark"; + license = with lib.licenses; [ gpl3Only ]; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.pasqui23 ]; + }; +} diff --git a/pkgs/data/themes/cdetheme/default.nix b/pkgs/data/themes/cdetheme/default.nix deleted file mode 100644 index a2d6568b9a870..0000000000000 --- a/pkgs/data/themes/cdetheme/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, python2Packages }: - -stdenv.mkDerivation rec { - pname = "cdetheme"; - version = "1.3"; - - src = fetchFromGitHub { - owner = "josvanr"; - repo = "cde-motif-theme"; - rev = version; - sha256 = "1v5c4db69cmzdci8xxlkx3s3cifg1h5160qq5siwfps0sj7pvggj"; - }; - - dontBuild = true; - - pythonPath = with python2Packages; [ pyqt4 pillow pyxdg pyyaml ]; - nativeBuildInputs = with python2Packages; [ python wrapPython ]; - - installPhase = '' - mkdir -p $out/share/themes - cp -r cdetheme $out/share/themes - patchShebangs $out/share/themes/cdetheme/scripts/switchtheme - wrapPythonProgramsIn "$out/share/themes/cdetheme/scripts" "$out $pythonPath" - ''; - - meta = with lib; { - description = "Gtk2 / Gtk3 theme mimicking CDE / Motif"; - homepage = "https://www.gnome-look.org/p/1231025"; - license = licenses.gpl3; - platforms = platforms.all; - maintainers = with maintainers; [ ]; - hydraPlatforms = []; - }; -} diff --git a/pkgs/data/themes/flat-remix-gtk/default.nix b/pkgs/data/themes/flat-remix-gtk/default.nix index 68a98337abc67..59b2714285ed7 100644 --- a/pkgs/data/themes/flat-remix-gtk/default.nix +++ b/pkgs/data/themes/flat-remix-gtk/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "flat-remix-gtk"; - version = "20211223"; + version = "20220215"; src = fetchFromGitHub { owner = "daniruiz"; repo = pname; rev = version; - sha256 = "sha256-jGE5ud7wEEa4JI1QTaCrOnbDwjQtDOFJX2uMo7t7+Js="; + sha256 = "sha256-J9PAHQ/MbdDuX16ioQQnzZpIZs/NJVkJjLL4nfaeNkU="; }; dontBuild = true; diff --git a/pkgs/data/themes/graphite-gtk-theme/default.nix b/pkgs/data/themes/graphite-gtk-theme/default.nix new file mode 100644 index 0000000000000..0c9bae8ac31ea --- /dev/null +++ b/pkgs/data/themes/graphite-gtk-theme/default.nix @@ -0,0 +1,95 @@ +{ lib +, stdenvNoCC +, fetchFromGitHub +, gnome-themes-extra +, gtk-engine-murrine +, jdupes +, sassc +, themeVariants ? [] # default: blue +, colorVariants ? [] # default: all +, sizeVariants ? [] # default: standard +, tweaks ? [] +, wallpapers ? false +, withGrub ? false +, grubScreens ? [] # default: 1080p +}: + +let + pname = "graphite-gtk-theme"; + +in +lib.checkListOfEnum "${pname}: theme variants" [ "default" "purple" "pink" "red" "orange" "yellow" "green" "teal" "blue" "all" ] themeVariants +lib.checkListOfEnum "${pname}: color variants" [ "standard" "light" "dark" ] colorVariants +lib.checkListOfEnum "${pname}: size variants" [ "standard" "compact" ] sizeVariants +lib.checkListOfEnum "${pname}: tweaks" [ "nord" "black" "midblack" "rimless" "normal" ] tweaks +lib.checkListOfEnum "${pname}: grub screens" [ "1080p" "2k" "4k" ] grubScreens + +stdenvNoCC.mkDerivation { + inherit pname; + version = "unstable-2022-02-04"; + + src = fetchFromGitHub { + owner = "vinceliuice"; + repo = pname; + rev = "7ab6a1b7eda81e914405a9931408b1d5c73e6891"; + sha256 = "09xixd6cz2iyyyg6vskyk0wj2mahfsg21dlfcvi862h8w01hg9lr"; + }; + + nativeBuildInputs = [ + jdupes + sassc + ]; + + buildInputs = [ + gnome-themes-extra + ]; + + propagatedUserEnvPkgs = [ + gtk-engine-murrine + ]; + + installPhase = '' + runHook preInstall + + patchShebangs install.sh + + name= ./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} \ + --dest $out/share/themes + + ${lib.optionalString wallpapers '' + mkdir -p $out/share/backgrounds + cp -a wallpaper/Graphite-normal/*.png $out/share/backgrounds/ + ${lib.optionalString (builtins.elem "nord" tweaks) '' + cp -a wallpaper/Graphite-nord/*.png $out/share/backgrounds/ + ''} + ''} + + ${lib.optionalString withGrub '' + ( + cd other/grub2 + + patchShebangs install.sh + + ./install.sh --justcopy --dest $out/share/grub/themes \ + ${lib.optionalString (builtins.elem "nord" tweaks) "--theme nord"} \ + ${lib.optionalString (grubScreens != []) "--screen " + builtins.toString grubScreens} + ) + ''} + + jdupes -L -r $out/share + + runHook postInstall + ''; + + meta = with lib; { + description = "Flat Gtk+ theme based on Elegant Design"; + homepage = "https://github.com/vinceliuice/Graphite-gtk-theme"; + license = licenses.gpl3Only; + platforms = platforms.unix; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/data/themes/graphite-kde-theme/default.nix b/pkgs/data/themes/graphite-kde-theme/default.nix new file mode 100644 index 0000000000000..dd3a215a03851 --- /dev/null +++ b/pkgs/data/themes/graphite-kde-theme/default.nix @@ -0,0 +1,41 @@ +{ stdenv +, lib +, fetchFromGitHub +}: + +stdenv.mkDerivation rec { + pname = "graphite-kde-theme"; + version = "2022-02-08"; + + src = fetchFromGitHub { + owner = "vinceliuice"; + repo = pname; + rev = version; + sha256 = "0pnn5s1vfdgkpsy5sc838731ly1imi8pbyd4asibw4zi238l0nvf"; + }; + + installPhase = '' + runHook preInstall + + patchShebangs install.sh + + substituteInPlace install.sh \ + --replace '$HOME/.local' $out \ + --replace '$HOME/.config' $out/share + + name= ./install.sh --dest $out/share/themes + + mkdir -p $out/share/sddm/themes + cp -a sddm/Graphite $out/share/sddm/themes/ + + runHook postInstall + ''; + + meta = with lib; { + description = "A flat Design theme for KDE Plasma desktop"; + homepage = "https://github.com/vinceliuice/Graphite-kde-theme"; + license = licenses.gpl3Only; + platforms = platforms.all; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/data/themes/kwin-decorations/kde-rounded-corners/default.nix b/pkgs/data/themes/kwin-decorations/kde-rounded-corners/default.nix new file mode 100644 index 0000000000000..06b0e32d1b7a8 --- /dev/null +++ b/pkgs/data/themes/kwin-decorations/kde-rounded-corners/default.nix @@ -0,0 +1,38 @@ +{ stdenv +, fetchFromGitHub +, cmake +, extra-cmake-modules +, wrapQtAppsHook +, kwin +, kdelibs4support +, libepoxy +, libXdmcp +, lib +}: + +stdenv.mkDerivation rec { + pname = "kde-rounded-corners"; + version = "unstable-2021-11-06"; + + src = fetchFromGitHub { + owner = "matinlotfali"; + repo = "KDE-Rounded-Corners"; + rev = "8ad8f5f5eff9d1625abc57cb24dc484d51f0e1bd"; + sha256 = "0xbskf7jd03d2invfz1nnfc82klzvc784snw539n4kn6c6rc381p"; + }; + + postConfigure = '' + substituteInPlace cmake_install.cmake \ + --replace "${kdelibs4support}" "$out" + ''; + + nativeBuildInputs = [ cmake extra-cmake-modules wrapQtAppsHook ]; + buildInputs = [ kwin kdelibs4support libepoxy libXdmcp ]; + + meta = with lib; { + description = "Rounds the corners of your windows"; + homepage = "https://github.com/matinlotfali/KDE-Rounded-Corners"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ flexagoon ]; + }; +} diff --git a/pkgs/data/themes/lightly-qt/default.nix b/pkgs/data/themes/lightly-qt/default.nix new file mode 100644 index 0000000000000..7b653d9524240 --- /dev/null +++ b/pkgs/data/themes/lightly-qt/default.nix @@ -0,0 +1,42 @@ +{ mkDerivation +, lib +, fetchFromGitHub +, cmake +, extra-cmake-modules +, kdecoration +, plasma-workspace +, qtbase +, qt5 +}: + +mkDerivation rec { + pname = "lightly-qt"; + version = "0.4.1"; + + src = fetchFromGitHub { + owner = "Luwx"; + repo = "Lightly"; + rev = "v${version}"; + sha256 = "0qkjzgjplgwczhk6959iah4ilvazpprv7yb809jy75kkp1jw8mwk"; + }; + + buildInputs = [ + kdecoration + plasma-workspace + qtbase + qt5.qtx11extras + ]; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; + + meta = with lib; { + description = "A fork of breeze theme style that aims to be visually modern and minimalistic"; + homepage = "https://github.com/Luwx/Lightly"; + license = licenses.gpl2Plus; + maintainers = [ maintainers.pwoelfel ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/data/themes/marwaita/default.nix b/pkgs/data/themes/marwaita/default.nix index 7a1b79d6d97c1..1e9f9041ca12b 100644 --- a/pkgs/data/themes/marwaita/default.nix +++ b/pkgs/data/themes/marwaita/default.nix @@ -5,17 +5,18 @@ , gtk-engine-murrine , gtk_engines , librsvg +, gitUpdater }: stdenv.mkDerivation rec { pname = "marwaita"; - version = "12.0"; + version = "13.0"; src = fetchFromGitHub { owner = "darkomarko42"; repo = pname; rev = version; - sha256 = "10mf1cbm6a9k0b1vcafy3jb7kicpvnf6xqmn1dfxwsq3k81mmy7d"; + sha256 = "sha256-aP/zPM7M8Oru/2AA8w6rKU/AVJJ0bAEC01C60yi2SbM="; }; buildInputs = [ @@ -37,6 +38,8 @@ stdenv.mkDerivation rec { runHook postInstall ''; + passthru.updateScript = gitUpdater {inherit pname version; }; + meta = with lib; { description = "GTK theme supporting Budgie, Pantheon, Mate, Xfce4 and GNOME desktops"; homepage = "https://www.pling.com/p/1239855/"; diff --git a/pkgs/data/themes/material-kwin-decoration/default.nix b/pkgs/data/themes/material-kwin-decoration/default.nix index f5dccefbc139e..3716fb79368fe 100644 --- a/pkgs/data/themes/material-kwin-decoration/default.nix +++ b/pkgs/data/themes/material-kwin-decoration/default.nix @@ -16,7 +16,7 @@ mkDerivation rec { pname = "material-kwin-decoration"; - version = "unstable-20211028"; + version = "unstable-2021-10-28"; src = fetchFromGitHub { owner = "Zren"; @@ -25,6 +25,11 @@ mkDerivation rec { sha256 = "sha256-aYlnPFhf+ISVe5Ycryu5BSXY8Lb5OoueMqnWQZiv6Lc="; }; + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace "-Werror" "" + ''; + nativeBuildInputs = [ cmake extra-cmake-modules ]; buildInputs = [ diff --git a/pkgs/data/themes/mojave/default.nix b/pkgs/data/themes/mojave/default.nix index bf2014344a6ee..56d7dfcf3752b 100644 --- a/pkgs/data/themes/mojave/default.nix +++ b/pkgs/data/themes/mojave/default.nix @@ -10,24 +10,42 @@ , optipng , sassc , which +, buttonSizeVariants ? [] # default to standard +, buttonVariants ? [] # default to all +, colorVariants ? [] # default to all +, opacityVariants ? [] # default to all +, themeVariants ? [] # default to MacOS blue +, wallpapers ? false }: -stdenv.mkDerivation rec { +let pname = "mojave-gtk-theme"; - version = "2021-07-20"; +in +lib.checkListOfEnum "${pname}: button size variants" [ "standard" "small" ] buttonSizeVariants +lib.checkListOfEnum "${pname}: button variants" [ "standard" "alt" ] buttonVariants +lib.checkListOfEnum "${pname}: color variants" [ "light" "dark" ] colorVariants +lib.checkListOfEnum "${pname}: opacity variants" [ "standard" "solid" ] opacityVariants +lib.checkListOfEnum "${pname}: theme variants" [ "default" "blue" "purple" "pink" "red" "orange" "yellow" "green" "grey" "all" ] themeVariants + +stdenv.mkDerivation rec { + inherit pname; + version = "unstable-2021-12-20"; srcs = [ (fetchFromGitHub { owner = "vinceliuice"; repo = pname; - rev = version; - sha256 = "08j70kmjhvh06c3ahcracarrfq4vpy0zsp6zkcivbw4nf3bzp2zc"; + rev = "c148646ccab382f7a2d5fdc421fc32d843cb4172"; + sha256 = "sha256-h4MSSh8cu9M81bM+WJSyl1SQ7CVth1DvjIVOUJXqpxs"; }) + ] + ++ + lib.optional wallpapers (fetchurl { url = "https://github.com/vinceliuice/Mojave-gtk-theme/raw/11741a99d96953daf9c27e44c94ae50a7247c0ed/macOS_Mojave_Wallpapers.tar.xz"; sha256 = "18zzkwm1kqzsdaj8swf0xby1n65gxnyslpw4lnxcx1rphip0rwf7"; }) - ]; + ; sourceRoot = "source"; @@ -76,9 +94,23 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - name= ./install.sh --theme all --dest $out/share/themes - install -D -t $out/share/wallpapers ../"macOS Mojave Wallpapers"/* - jdupes -l -r $out/share + + name= ./install.sh \ + ${lib.optionalString (buttonSizeVariants != []) "--small " + builtins.toString buttonSizeVariants} \ + ${lib.optionalString (buttonVariants != []) "--alt " + builtins.toString buttonVariants} \ + ${lib.optionalString (colorVariants != []) "--color " + builtins.toString colorVariants} \ + ${lib.optionalString (opacityVariants != []) "--opacity " + builtins.toString opacityVariants} \ + ${lib.optionalString (themeVariants != []) "--theme " + builtins.toString themeVariants} \ + --dest $out/share/themes + + ${lib.optionalString wallpapers '' + install -D -t $out/share/wallpapers ../"macOS Mojave Wallpapers"/* + ''} + + # Replace duplicate files with hardlinks to the first file in each + # set of duplicates, reducing the installed size in about 53% + jdupes -L -r $out/share + runHook postInstall ''; diff --git a/pkgs/data/themes/nordic/default.nix b/pkgs/data/themes/nordic/default.nix index 8d41ce5e38df6..a2a518d3f0a0d 100644 --- a/pkgs/data/themes/nordic/default.nix +++ b/pkgs/data/themes/nordic/default.nix @@ -1,77 +1,84 @@ -{ lib, stdenv, fetchFromGitHub, gtk-engine-murrine }: +{ lib +, stdenv +, fetchFromGitHub +, gtk-engine-murrine +, jdupes +}: stdenv.mkDerivation rec { pname = "nordic"; - version = "2.1.0"; + version = "unstable-2022-01-08"; srcs = [ (fetchFromGitHub { owner = "EliverLara"; repo = pname; - rev = "0112af91943b8819f7a1af9a508cda7fe3d74051"; - sha256 = "sha256-ccOA5/jXTx20495NpTgVu7DvsjfTEULqL3IyJ+Pd/ug"; + rev = "85086324c2a8fa7ca538b85ad0681e03733b2c86"; + sha256 = "sha256-p1nr71iJZm+2123WF67NkunBX2dR4ruK2Afqd7XdeGc="; name = "Nordic"; }) (fetchFromGitHub { owner = "EliverLara"; repo = pname; - rev = "b30d2c844cc6ef5d020308f1c02791de45b607a7"; - sha256 = "sha256-g5yCCFXzipZLmUat+1r6QWHB7DWQvMKhMexHPV/DJHM"; + rev = "46c9e6665963ccb54938d7730e520bd8c52f4307"; + sha256 = "sha256-uFnNLshyKOvzaij7tEKb0fw0j3/GGfzznAf/aaKx7XI="; name = "Nordic-standard-buttons"; }) (fetchFromGitHub { owner = "EliverLara"; repo = pname; - rev = "6d38d6af363528f42619f663e3ecd4c08dfd2411"; - sha256 = "sha256-jaRiSE6yfTltzZ2vr8w4d+YtSz7REOcL7vOOhQvIMlQ"; + rev = "da5c930386427fce65ea185f164709c8a20e362f"; + sha256 = "sha256-Ee9ymuMWs2ZgU+8FVLaviGtHMT4Sz5NWLaEGln2Z4V0="; name = "Nordic-darker"; }) (fetchFromGitHub { owner = "EliverLara"; repo = pname; - rev = "4142817c14c27b371d42796445bedc84dc94672c"; - sha256 = "sha256-FAb1+EREcwYrfSxAl6LrPaJtkHMt67NV3bG87g1cFT4"; + rev = "fd85fb2712ac1192e35c92149b75bfc3c440b1c7"; + sha256 = "sha256-6WUQBeNq7EKNkYcCt/fUYloue90gxfp8bDYawkQQ6ss="; name = "Nordic-darker-standard-buttons"; }) (fetchFromGitHub { owner = "EliverLara"; repo = pname; - rev = "2a91d6f3db70412b0a80ed33546fbe93075627d8"; - sha256 = "sha256-Su+amS7moc2IDONNvqw3bjL6Q0WLJWzHu6WvfcVDcDY"; + rev = "259e30ce13566214c7594b038dd2c240648a07a0"; + sha256 = "sha256-F6hC6XbT9yJl6SW9qJNlwmmBcvOrOS5yPCQALZFhgbM="; name = "Nordic-bluish-accent"; }) (fetchFromGitHub { owner = "EliverLara"; repo = pname; - rev = "3ebd334f97d638fdc888b16d69851e3ee31131f2"; - sha256 = "sha256-h0IXtWcdDvAEVi/1cLZF4Vacdl6VAY+5uo0LGPNe0bg"; + rev = "2a27051d87558dfa595fb94eff34241d3a1b8c30"; + sha256 = "sha256-JIld6GVtr1tz02Do2Ft92qtza6iGrPapasd6jmMFG6k="; name = "Nordic-bluish-accent-standard-buttons"; }) (fetchFromGitHub { owner = "EliverLara"; repo = "${pname}-polar"; - rev = "803926882f8178c72b433466a377aaa33c5b372a"; - sha256 = "sha256-G7Vu03PoFOEU9uxb5JiHR4Tr8qk47fPo7Gg7Vt9Zzns"; + rev = "0bea76aed39bb2a2669278b8403c4129aa47be0f"; + sha256 = "sha256-OXmz6uHXh1zl93sgv5WEwARkEUCr4PRh0/mJyMLXpnk="; name = "Nordic-Polar"; }) (fetchFromGitHub { owner = "EliverLara"; repo = "${pname}-polar"; - rev = "988cb8a16ece3901b8b0e7a5b86503400491cb1e"; - sha256 = "sha256-Zx1mrzJm5o4wQwOR8ZU2OEcjD3/6UXwLrBYpMtCkQbg"; + rev = "8fe52b6c276a7e548e87a558db6734cf9f003b06"; + sha256 = "sha256-/IxlBvMLAK+mGRyaa7bTv/oZS24nSNeE5GsyJIeN6UU="; name = "Nordic-Polar-standard-buttons"; }) ]; sourceRoot = "."; + nativeBuildInputs = [ jdupes ]; + propagatedUserEnvPkgs = [ gtk-engine-murrine ]; installPhase = '' @@ -101,6 +108,10 @@ stdenv.mkDerivation rec { mv -v $out/share/themes/Nordic/kde/sddm/* $out/share/sddm/themes/Nordic/ rm -rf $out/share/themes/Nordic/kde + # Replace duplicate files with hardlinks to the first file in each + # set of duplicates, reducing the installed size in about 65% + jdupes -L -r $out/share + runHook postInstall ''; diff --git a/pkgs/data/themes/orchis-theme/default.nix b/pkgs/data/themes/orchis-theme/default.nix index ef7f88e3e955d..ccaee7f65522c 100644 --- a/pkgs/data/themes/orchis-theme/default.nix +++ b/pkgs/data/themes/orchis-theme/default.nix @@ -6,6 +6,7 @@ , gtk-engine-murrine , sassc , tweaks ? [ ] # can be "solid" "compact" "black" "primary" +, withWallpapers ? false }: let @@ -20,13 +21,13 @@ assert lib.assertMsg (unknownTweaks == [ ]) '' stdenvNoCC.mkDerivation rec { pname = "orchis-theme"; - version = "2021-12-13"; + version = "2022-02-18"; src = fetchFromGitHub { repo = "Orchis-theme"; owner = "vinceliuice"; rev = version; - sha256 = "sha256-PN2ucGMDzRv4v86X1zVIs9+GkbMWuja2WaSQLFvJYd0="; + sha256 = "sha256-SqptW8DEDCB6LMHalRlf71TWK93gW+blbu6Q1Oommes="; }; nativeBuildInputs = [ gtk3 sassc ]; @@ -42,6 +43,10 @@ rec { installPhase = '' runHook preInstall bash install.sh -d $out/share/themes -t all ${lib.optionalString (tweaks != []) "--tweaks " + builtins.toString tweaks} + ${lib.optionalString withWallpapers '' + mkdir -p $out/share/backgrounds + cp src/wallpaper/{1080p,2k,4k}.jpg $out/share/backgrounds + ''} runHook postInstall ''; diff --git a/pkgs/data/themes/pitch-black/default.nix b/pkgs/data/themes/pitch-black/default.nix new file mode 100644 index 0000000000000..95037f90239e0 --- /dev/null +++ b/pkgs/data/themes/pitch-black/default.nix @@ -0,0 +1,30 @@ +{ lib, stdenvNoCC, fetchFromGitHub }: + +stdenvNoCC.mkDerivation rec{ + pname = "pitch-black"; + version = "unstable-2019-07-23"; + + src = fetchFromGitHub { + repo = pname; + owner = "freefreeno"; + rev = "d8039341419aef1157c030bf3d9237bd926e0b95"; + hash = "sha256-Rn3ZMBD6srIkYFNN3HT5JFP46Akodmeqz5tbV2/2ZDA="; + }; + + dontBuild = true; + + installPhase = '' + rm LICENSE README.md + mkdir -p $out/share + mv GTK $out/share/themes + mv * $out/share + ''; + + meta = with lib; { + description = "A dark plasma theme built with usability in mind"; + homepage = "https://github.com/freefreeno/Pitch-Black"; + license = licenses.gpl3Only; + platforms = platforms.unix; + maintainers = [ maintainers.pasqui23 ]; + }; +} diff --git a/pkgs/data/themes/plano/default.nix b/pkgs/data/themes/plano/default.nix index 9f05a19919354..c321dc235c49a 100644 --- a/pkgs/data/themes/plano/default.nix +++ b/pkgs/data/themes/plano/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "plano-theme"; - version = "3.38-1"; + version = "4.0"; src = fetchFromGitHub { owner = "lassekongo83"; repo = pname; rev = "v${version}"; - sha256 = "0g2mwvzc04z3dsdfhwqgw9s7987406pv22s9rbazfvprk4ddc5b6"; + sha256 = "sha256-slGr2nsdKng6zaVDeXWFAWKIxZbcnOLU6RH6wM0293E="; }; nativeBuildInputs = [ diff --git a/pkgs/data/themes/sierra/default.nix b/pkgs/data/themes/sierra/default.nix index d3fbb5fe78851..e87f64661419c 100644 --- a/pkgs/data/themes/sierra/default.nix +++ b/pkgs/data/themes/sierra/default.nix @@ -1,26 +1,67 @@ -{ lib, stdenv, fetchFromGitHub, libxml2, gdk-pixbuf, librsvg, gtk-engine-murrine }: +{ lib +, stdenv +, fetchFromGitHub +, gdk-pixbuf +, gtk-engine-murrine +, jdupes +, librsvg +, libxml2 +, buttonVariants ? [] # default to all +, colorVariants ? [] # default to all +, opacityVariants ? [] # default to all +, sizeVariants ? [] # default to all +}: -stdenv.mkDerivation rec { +let pname = "sierra-gtk-theme"; - version = "2019-12-16"; +in +lib.checkListOfEnum "${pname}: button variants" [ "standard" "alt" ] buttonVariants +lib.checkListOfEnum "${pname}: color variants" [ "light" "dark" ] colorVariants +lib.checkListOfEnum "${pname}: opacity variants" [ "standard" "solid" ] opacityVariants +lib.checkListOfEnum "${pname}: size variants" [ "standard" "compact" ] sizeVariants + +stdenv.mkDerivation { + inherit pname; + version = "unstable-2021-05-24"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; - rev = version; - sha256 = "14hlz8kbrjypyd6wyrwmnj2wm9w3kc8y00ms35ard7x8lmhs56hr"; + rev = "05899001c4fc2fec87c4d222cb3997c414e0affd"; + sha256 = "174l5mryc34ma1r42pk6572c6i9hmzr9vj1a6w06nqz5qcfm1hds"; }; - nativeBuildInputs = [ libxml2 ]; + nativeBuildInputs = [ + jdupes + libxml2 + ]; - buildInputs = [ gdk-pixbuf librsvg ]; + buildInputs = [ + gdk-pixbuf + librsvg + ]; - propagatedUserEnvPkgs = [ gtk-engine-murrine ]; + propagatedUserEnvPkgs = [ + gtk-engine-murrine + ]; installPhase = '' - patchShebangs . + runHook preInstall + + patchShebangs install.sh + mkdir -p $out/share/themes - name= ./install.sh --dest $out/share/themes + name= ./install.sh --dest $out/share/themes \ + ${lib.optionalString (buttonVariants != []) "--alt " + builtins.toString buttonVariants} \ + ${lib.optionalString (colorVariants != []) "--color " + builtins.toString colorVariants} \ + ${lib.optionalString (opacityVariants != []) "--opacity " + builtins.toString opacityVariants} \ + ${lib.optionalString (sizeVariants != []) "--flat " + builtins.toString sizeVariants} + + # Replace duplicate files with hardlinks to the first file in each + # set of duplicates, reducing the installed size in about 79% + jdupes -L -r $out/share + + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/data/themes/stilo/default.nix b/pkgs/data/themes/stilo/default.nix index bfcda04932944..6401c0e28694b 100644 --- a/pkgs/data/themes/stilo/default.nix +++ b/pkgs/data/themes/stilo/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "stilo-themes"; - version = "3.38-1"; + version = "4.0"; src = fetchFromGitHub { owner = "lassekongo83"; repo = pname; rev = "v${version}"; - sha256 = "09xarzp0j0a8cqzcg0447jl5cgvl6ccj5f00dik1hy2nlrz7d8ad"; + sha256 = "sha256-YKEDXrOAn7pGWb0VcOx7cKHnuX120yPzqtUVnzyLrDQ="; }; nativeBuildInputs = [ meson ninja sassc ]; diff --git a/pkgs/data/themes/zuki/default.nix b/pkgs/data/themes/zuki/default.nix index 098edf6cc2e18..d557e151d2640 100644 --- a/pkgs/data/themes/zuki/default.nix +++ b/pkgs/data/themes/zuki/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zuki-themes"; - version = "3.38-1"; + version = "4.0"; src = fetchFromGitHub { owner = "lassekongo83"; repo = pname; rev = "v${version}"; - sha256 = "0890i8kavgnrhm8ic4zpl16wc4ngpnf1zi8js9gvki2cl7dlj1xm"; + sha256 = "1q026wa8xgyb6f5k7pqpm5zav30dbnm3b8w59as3sh8rhfgpbf80"; }; nativeBuildInputs = [ meson ninja sassc ]; |