diff options
Diffstat (limited to 'pkgs/data')
54 files changed, 565 insertions, 220 deletions
diff --git a/pkgs/data/documentation/gnome-user-docs/default.nix b/pkgs/data/documentation/gnome-user-docs/default.nix index cd506b61c59cf..82aef1735a743 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 = "44.0"; + version = "44.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-user-docs/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "z2zX65xBSd2Tlm9x+huQevyPZR7MOvVOEIW89K0hsb0="; + sha256 = "k/MpTUP9IvmWLM9r0X/2Tq54psoGP+bB6bxY0A8046g="; }; nativeBuildInputs = [ diff --git a/pkgs/data/documentation/scheme-manpages/default.nix b/pkgs/data/documentation/scheme-manpages/default.nix index 59620b16a6ccf..8ff9344b3f522 100644 --- a/pkgs/data/documentation/scheme-manpages/default.nix +++ b/pkgs/data/documentation/scheme-manpages/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "scheme-manpages"; - version = "unstable-2023-02-06"; + version = "unstable-2023-03-26"; src = fetchFromGitHub { owner = "schemedoc"; repo = "manpages"; - rev = "ccaa76761a1b100e99287c120196bd5f32d4a403"; - hash = "sha256-RL/94dQiZJ60cXHQ9r4P3hRBqe55oUissCmSp4XLM+o="; + rev = "eac67db33b2111f19ac267585032df8b4838e6f4"; + hash = "sha256-FBoagGHWsxZo40gOqeBUw0L+LtNAVF/q6IZ3N9QBFQs="; }; dontBuild = true; diff --git a/pkgs/data/fonts/aileron/default.nix b/pkgs/data/fonts/aileron/default.nix index 5ae83519278b7..c52824dbe1208 100644 --- a/pkgs/data/fonts/aileron/default.nix +++ b/pkgs/data/fonts/aileron/default.nix @@ -4,12 +4,12 @@ let majorVersion = "0"; minorVersion = "102"; in -stdenvNoCC.mkDerivation (self: { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "aileron"; version = "${majorVersion}.${minorVersion}"; src = fetchzip { - url = "https://dotcolon.net/download/fonts/${self.pname}_${majorVersion}${minorVersion}.zip"; + url = "https://dotcolon.net/download/fonts/${finalAttrs.pname}_${majorVersion}${minorVersion}.zip"; hash = "sha256-Ht48gwJZrn0djo1yl6jHZ4+0b710FVwStiC1Zk5YXME="; stripRoot = false; }; @@ -23,7 +23,7 @@ stdenvNoCC.mkDerivation (self: { ''; meta = with lib; { - homepage = "http://dotcolon.net/font/${self.pname}/"; + homepage = "http://dotcolon.net/font/${finalAttrs.pname}/"; description = "A helvetica font in nine weights"; platforms = platforms.all; maintainers = with maintainers; [ leenaars minijackson ]; diff --git a/pkgs/data/fonts/blackout/default.nix b/pkgs/data/fonts/blackout/default.nix index b615aa66c59ce..44cb10b408e9c 100644 --- a/pkgs/data/fonts/blackout/default.nix +++ b/pkgs/data/fonts/blackout/default.nix @@ -1,12 +1,12 @@ { lib, fetchFromGitHub, stdenvNoCC }: -stdenvNoCC.mkDerivation (self: { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "blackout"; version = "2014-07-29"; src = fetchFromGitHub { owner = "theleagueof"; - repo = self.pname; + repo = finalAttrs.pname; rev = "4864cfc1749590e9f78549c6e57116fe98480c0f"; hash = "sha256-UmJVmtuPQYW/w+mdnJw9Ql4R1xf/07l+/Ky1wX9WKqw="; }; diff --git a/pkgs/data/fonts/chunk/default.nix b/pkgs/data/fonts/chunk/default.nix index 708393185e940..fec1c043bfa19 100644 --- a/pkgs/data/fonts/chunk/default.nix +++ b/pkgs/data/fonts/chunk/default.nix @@ -1,12 +1,12 @@ { lib, fetchFromGitHub, stdenvNoCC }: -stdenvNoCC.mkDerivation (self: { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "chunk"; version = "2021-03-03"; src = fetchFromGitHub { owner = "theleagueof"; - repo = self.pname; + repo = finalAttrs.pname; rev = "12a243f3fb7c7a68844901023f7d95d6eaf14104"; hash = "sha256-NMkRvrUgy9yzOT3a1rN6Ch/p8Cr902CwL4G0w7jVm1E="; }; diff --git a/pkgs/data/fonts/cozette/default.nix b/pkgs/data/fonts/cozette/default.nix index 7eff1c211b90b..7073c6215602d 100644 --- a/pkgs/data/fonts/cozette/default.nix +++ b/pkgs/data/fonts/cozette/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "cozette"; - version = "1.19.1"; + version = "1.19.2"; src = fetchzip { url = "https://github.com/slavfox/Cozette/releases/download/v.${version}/CozetteFonts.zip"; - hash = "sha256-CpabWJJDCY+mgE+9U8L50MmWVfhkm+LnfMQtOTXyE8s="; + hash = "sha256-+TnKUgrAafR5irS9XeXWfb1a2PfUKOXf8CAmqJbf6y4="; }; installPhase = '' diff --git a/pkgs/data/fonts/eunomia/default.nix b/pkgs/data/fonts/eunomia/default.nix index a09a0ad0d7829..ea3613b5f81f9 100644 --- a/pkgs/data/fonts/eunomia/default.nix +++ b/pkgs/data/fonts/eunomia/default.nix @@ -4,12 +4,12 @@ let majorVersion = "0"; minorVersion = "200"; in -stdenvNoCC.mkDerivation (self: { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "eunomia"; version = "${majorVersion}.${minorVersion}"; src = fetchzip { - url = "https://dotcolon.net/download/fonts/${self.pname}_${majorVersion}${minorVersion}.zip"; + url = "https://dotcolon.net/download/fonts/${finalAttrs.pname}_${majorVersion}${minorVersion}.zip"; hash = "sha256-Rd2EakaTWjzoEV00tHTgg/bXgJUFfPjCyQUWi7QhFG4="; stripRoot = false; }; diff --git a/pkgs/data/fonts/f1_8/default.nix b/pkgs/data/fonts/f1_8/default.nix index 5898fe1eabaf3..93e44be17cdac 100644 --- a/pkgs/data/fonts/f1_8/default.nix +++ b/pkgs/data/fonts/f1_8/default.nix @@ -4,7 +4,7 @@ let majorVersion = "1"; minorVersion = "101"; in -stdenvNoCC.mkDerivation (self: { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "f1_8"; version = "${majorVersion}.${minorVersion}"; @@ -24,7 +24,7 @@ stdenvNoCC.mkDerivation (self: { ''; meta = with lib; { - homepage = "http://dotcolon.net/font/${self.pname}/"; + homepage = "http://dotcolon.net/font/${finalAttrs.pname}/"; description = "A weighted decorative font"; platforms = platforms.all; maintainers = with maintainers; [ minijackson ]; diff --git a/pkgs/data/fonts/f5_6/default.nix b/pkgs/data/fonts/f5_6/default.nix index a37ee591ef486..f1e8e7698f27a 100644 --- a/pkgs/data/fonts/f5_6/default.nix +++ b/pkgs/data/fonts/f5_6/default.nix @@ -4,12 +4,12 @@ let majorVersion = "0"; minorVersion = "110"; in -stdenvNoCC.mkDerivation (self: { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "f5_6"; version = "${majorVersion}.${minorVersion}"; src = fetchzip { - url = "https://dotcolon.net/download/fonts/${self.pname}_${majorVersion}${minorVersion}.zip"; + url = "https://dotcolon.net/download/fonts/${finalAttrs.pname}_${majorVersion}${minorVersion}.zip"; hash = "sha256-FeCU+mzR0iO5tixI72XUnhvpGj+WRfKyT3mhBtud3uE="; stripRoot = false; }; @@ -23,7 +23,7 @@ stdenvNoCC.mkDerivation (self: { ''; meta = with lib; { - homepage = "http://dotcolon.net/font/${self.pname}/"; + homepage = "http://dotcolon.net/font/${finalAttrs.pname}/"; description = "A weighted decorative font"; platforms = platforms.all; maintainers = with maintainers; [ leenaars minijackson ]; diff --git a/pkgs/data/fonts/fa_1/default.nix b/pkgs/data/fonts/fa_1/default.nix index 4e8ab3cbaa83f..1c21bb279be6e 100644 --- a/pkgs/data/fonts/fa_1/default.nix +++ b/pkgs/data/fonts/fa_1/default.nix @@ -4,12 +4,12 @@ let majorVersion = "0"; minorVersion = "100"; in -stdenvNoCC.mkDerivation (self: { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "fa_1"; version = "${majorVersion}.${minorVersion}"; src = fetchzip { - url = "https://dotcolon.net/download/fonts/${self.pname}_${majorVersion}${minorVersion}.zip"; + url = "https://dotcolon.net/download/fonts/${finalAttrs.pname}_${majorVersion}${minorVersion}.zip"; hash = "sha256-BPJ+wZMYXY/yg5oEgBc5YnswA6A7w6V0gdv+cac0qdc="; stripRoot = false; }; @@ -23,7 +23,7 @@ stdenvNoCC.mkDerivation (self: { ''; meta = with lib; { - homepage = "http://dotcolon.net/font/${self.pname}/"; + homepage = "http://dotcolon.net/font/${finalAttrs.pname}/"; description = "A weighted decorative font"; platforms = platforms.all; maintainers = with maintainers; [ minijackson ]; diff --git a/pkgs/data/fonts/fanwood/default.nix b/pkgs/data/fonts/fanwood/default.nix index ef8be0a6522a2..669ee6ac206e2 100644 --- a/pkgs/data/fonts/fanwood/default.nix +++ b/pkgs/data/fonts/fanwood/default.nix @@ -1,12 +1,12 @@ { lib, fetchFromGitHub, stdenvNoCC }: -stdenvNoCC.mkDerivation (self: { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "fanwood"; version = "2011-05-11"; src = fetchFromGitHub { owner = "theleagueof"; - repo = self.pname; + repo = finalAttrs.pname; rev = "cbaaed9704e7d37d3dcdbdf0b472e9efd0e39432"; hash = "sha256-OroFhhb4RxPHkx+/8PtFnxs1GQVXMPiYTd+2vnRbIjg="; }; diff --git a/pkgs/data/fonts/ferrum/default.nix b/pkgs/data/fonts/ferrum/default.nix index 33b3813cca38c..5f6459a1f6bf5 100644 --- a/pkgs/data/fonts/ferrum/default.nix +++ b/pkgs/data/fonts/ferrum/default.nix @@ -4,12 +4,12 @@ let majorVersion = "0"; minorVersion = "200"; in -stdenvNoCC.mkDerivation (self: { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "ferrum"; version = "${majorVersion}.${minorVersion}"; src = fetchzip { - url = "https://dotcolon.net/download/fonts/${self.pname}_${majorVersion}${minorVersion}.zip"; + url = "https://dotcolon.net/download/fonts/${finalAttrs.pname}_${majorVersion}${minorVersion}.zip"; hash = "sha256-NDJwgFWZgyhMkGRWlY55l2omEw6ju3e3dHCEsWNzQIc="; stripRoot = false; }; @@ -23,7 +23,7 @@ stdenvNoCC.mkDerivation (self: { ''; meta = with lib; { - homepage = "http://dotcolon.net/font/${self.pname}/"; + homepage = "http://dotcolon.net/font/${finalAttrs.pname}/"; description = "A decorative font"; platforms = platforms.all; maintainers = with maintainers; [ leenaars minijackson ]; diff --git a/pkgs/data/fonts/goudy-bookletter-1911/default.nix b/pkgs/data/fonts/goudy-bookletter-1911/default.nix index 3fd0352b55576..14997cd62b6e0 100644 --- a/pkgs/data/fonts/goudy-bookletter-1911/default.nix +++ b/pkgs/data/fonts/goudy-bookletter-1911/default.nix @@ -1,12 +1,12 @@ { lib, fetchFromGitHub, stdenvNoCC }: -stdenvNoCC.mkDerivation (self: { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "goudy-bookletter-1911"; version = "2011-05-11"; src = fetchFromGitHub { owner = "theleagueof"; - repo = self.pname; + repo = finalAttrs.pname; rev = "85ff5b834b4f63feb36fd2053949c19660580e48"; hash = "sha256-11axs1+SRQj+1lYTq2LYf1I65WrrvB/UnAgZkHPP1N8="; }; diff --git a/pkgs/data/fonts/iosevka/bin.nix b/pkgs/data/fonts/iosevka/bin.nix index d18a9d24dfae4..33458c428d2ec 100644 --- a/pkgs/data/fonts/iosevka/bin.nix +++ b/pkgs/data/fonts/iosevka/bin.nix @@ -11,7 +11,7 @@ let (builtins.attrNames (builtins.removeAttrs variantHashes [ "iosevka" ])); in stdenv.mkDerivation rec { pname = "${name}-bin"; - version = "22.0.2"; + version = "22.1.0"; src = fetchurl { url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-${name}-${version}.zip"; diff --git a/pkgs/data/fonts/iosevka/default.nix b/pkgs/data/fonts/iosevka/default.nix index c16d69f1affb8..6f974d078b027 100644 --- a/pkgs/data/fonts/iosevka/default.nix +++ b/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 = "22.0.0"; + version = "22.0.2"; src = fetchFromGitHub { owner = "be5invis"; repo = "iosevka"; rev = "v${version}"; - hash = "sha256-TvzUUuwmDP2K1deUsODV/FDjPTgZjVvilUdfrkeaO88="; + hash = "sha256-cBIcf6GEJnkOvKPMWTb9dWqN9uPs4ynr6tLc7+B6f3k="; }; - npmDepsHash = "sha256-G+iAGKweh5MOFTaNHLnSUwVMTSlgL/w0zrS2SrJrsJE="; + npmDepsHash = "sha256-tLdJuDFVPdnEtHdGdU7G6N+LIiINVVB5/NNFaeveK/U="; nativeBuildInputs = [ remarshal diff --git a/pkgs/data/fonts/iosevka/variants.nix b/pkgs/data/fonts/iosevka/variants.nix index c75708299a59a..b8a40ce5e869e 100644 --- a/pkgs/data/fonts/iosevka/variants.nix +++ b/pkgs/data/fonts/iosevka/variants.nix @@ -1,95 +1,95 @@ # This file was autogenerated. DO NOT EDIT! { - iosevka = "0dj0fk40impvlnbgmpnhndhad841sbk7056nyaxagiz12qq6rrii"; - iosevka-aile = "01r6gdl2s93mhsr7ipq8ir6sy7srpyn8w09yd06hqh26ps40ki2b"; - iosevka-curly = "0d0wsb5fpknxix6qng6mzkfdj2abm8hq067bqvbqhrdwhvbl83x9"; - iosevka-curly-slab = "1hh9ck2pbsjaj81hivq9b7wqxb03mr6hsargw6gic4qn6pkk4l3n"; - iosevka-etoile = "0p85jw25pkhndcdi56l9yg1hm4rsdjvy713q89dygrn5678nw74w"; - iosevka-slab = "11vf6w59pcs71liw0k0nrhaw61nbn4n68vrj1b4rymc7mdaxfp1i"; - iosevka-ss01 = "0hiffyfhfwwy55i1rvr78mvlmgx3c4czfx0lf4vmq2c6c4bldbf7"; - iosevka-ss02 = "1z796x3a7hv05wir06rcj8i1l99169a7wab9j3ibb819pdycs5v7"; - iosevka-ss03 = "1jjmg538avphd3djdjy521q0lbn7ip97qpf479kgvcr1hhv606kl"; - iosevka-ss04 = "09xfsnl5dqzind60wip38pr0j9db47prbcgndfh283jcaysh5c0b"; - iosevka-ss05 = "1mj4q45ifxvgwrrrmlv46p9cliznc4z2vipdf6k8b05ad71n7gab"; - iosevka-ss06 = "02hn8dajvn5x303fv5gfl95hhsvql4h8525hd9k3a93g9qj13ib8"; - iosevka-ss07 = "1hki40chpp3bnz6ksbly8lpjiqywdhgkqpc2h25lksdg8hwd8mcb"; - iosevka-ss08 = "16bpzbcq2i0flw48ch2dfxljgscrm2fxfrcb2112wjv8zvi593hd"; - iosevka-ss09 = "0ajm1gn45zklijyijxvib0iy47q7jvgmp2kdgmsa5zwwvnh8fipb"; - iosevka-ss10 = "1g1if97w5mzzvm8y141rsqby90pmvc4whxxrjvdpmv94yb2biryp"; - iosevka-ss11 = "0icx5cflzk05h51i4i7p5wbdkrpnyfn9r89rsvrd22vxc038xhmg"; - iosevka-ss12 = "1var71j3pfa2fakrmm0c5sgiznbnqnxsnnkmpcb2xpjy4q68xfq1"; - iosevka-ss13 = "0mpidl1hickx60zmza94002721jfs169b5a1l6vxwi5x6vk5329v"; - iosevka-ss14 = "15z0ipnx2spgsp68465x7c8fkvb4hjnyl8pmfj2izn6jmgsrlc4x"; - iosevka-ss15 = "0fyw53nvv45z55x2cnm9kcdcbiw1nykycychkih2fwlydm67vj0d"; - iosevka-ss16 = "18lja4xw63i013ndqhm7kr7ggpbwc5zsxam7xib258nfhyx548ff"; - iosevka-ss17 = "1h2q2v93504539imbn0gbkxi9jw71hisl6px87hs3sh6lmm5kjfm"; - iosevka-ss18 = "085j759av6pspqn3sajrc12w74m7h5y64vdi1spmgd97dnj1gz6q"; - sgr-iosevka = "1ykc80hgc9pipqvqw4m3mqj37rhf6hskgds42kxqzxdn194072m1"; - sgr-iosevka-aile = "0c1jhff87hg4hxwrrp1vxx8gq1bkl9q85py1fz7gb3xdbim54s3z"; - sgr-iosevka-curly = "0zb3y46wbsjb847s31s56gjf9sj8ikp8qvsg1fm2m01idv6f21ig"; - sgr-iosevka-curly-slab = "113wmkzaaqp1yw95ld2j4l1f7yw9miq4bv4zjf9jib4ss6yjq97v"; - sgr-iosevka-etoile = "1pgsh5myw2ihnlk6qkxr7p46sg1402mqvqn7bi2ch8gd472gijck"; - sgr-iosevka-fixed = "1jf1icg1mqv1059p9msvk64j09apcqc9alvzrrxdqblw9b2ckrkj"; - sgr-iosevka-fixed-curly = "1p3m6i1cbphxqrwyj2n0d7zwx9f75nvdsdfyyh8wvap88xwm0ggf"; - sgr-iosevka-fixed-curly-slab = "0lgvai6293ddxckr9yvymi704pymcyp3ks4yx3jn207f70mpdg41"; - sgr-iosevka-fixed-slab = "17935bvl9yly24g95wi2g4faahnj98z3dkb1a6dkb4frjq1nif2m"; - sgr-iosevka-fixed-ss01 = "0wqpm57zcis9h8pzwvyjw8gggrwfgzlc3zd9c3shh7mpzx6zcj88"; - sgr-iosevka-fixed-ss02 = "00jlapqakmpjcdycvdlhlm46iyvr05b8qskl6m7fxqg46dvnzz9z"; - sgr-iosevka-fixed-ss03 = "1qd9wybq9miazkqkpis61s07yak7pn2lfawws421ynfgbb5r7987"; - sgr-iosevka-fixed-ss04 = "0dbrimliy072mqg1gys9cmbl0ac56iavjnl73d14mxc77ciavkkl"; - sgr-iosevka-fixed-ss05 = "1xfhvbzi91gddql6q1byyi40s9n6ym517c2pf6zpirnk6a7415k6"; - sgr-iosevka-fixed-ss06 = "0ibji574aifh7pqpdgnmgmp3k784swjdvly9292sd758mlh8j5sa"; - sgr-iosevka-fixed-ss07 = "1ixx123q5w7pbp9sgm84bhmzi7zy0h1ki3plm891mfv64pkbg42w"; - sgr-iosevka-fixed-ss08 = "00jwiwbgrj6yxqjdp4g8cbsq2jk5pz6h401mh7y6wp2j3y2xrrkb"; - sgr-iosevka-fixed-ss09 = "0jikxfir5md9qp5j1lhk1l9vjx2m15ncy9nkvb50mm32b6y5x3ph"; - sgr-iosevka-fixed-ss10 = "0ampkjvr8qyadfc0yvmyvac7gnm1xi441vz1pf8n2qniypy29bgj"; - sgr-iosevka-fixed-ss11 = "1nchlqkilglymydj33jzgp9wfivja2x3p8app3g9rgcsncsgjyc8"; - sgr-iosevka-fixed-ss12 = "1wpza8g4as1p4cd8g0lv20m2k57f22kazp2w7810k2wzv06613jq"; - sgr-iosevka-fixed-ss13 = "0phh86fk0l37998vxakz0vsxwsj1lbbzls23q56x7hgynnh8nr3x"; - sgr-iosevka-fixed-ss14 = "1x1hmfj692ify57lffg08pa2420fgx0amha1kdzyyxf87s3maqx8"; - sgr-iosevka-fixed-ss15 = "0qbf0b92668pxhjx778nnm5mj2w65c02k3cwk4f4x8vwkagwq2jp"; - sgr-iosevka-fixed-ss16 = "0wmlcckbyrr1sspqfp5r6rymy5myy53q02fl7agv1c7bwfx9iycr"; - sgr-iosevka-fixed-ss17 = "1rrkyv919m86biydl8jivfyn7wf8cna5c3b8rwv80ihz131zgj6z"; - sgr-iosevka-fixed-ss18 = "1s5gj3iyyfgkkxy23yzbibwrzw4s2x9xprc5hhzyh2r10zvib5cf"; - sgr-iosevka-slab = "1313y3nma1pqxm73yksw1b4vkvbwnv434hvkpqk1gp232j3i6dw2"; - sgr-iosevka-ss01 = "137lmgn490vyl2y7aa5pqa66rsdwrsd4z8nz22fsks3p1pzm3fc7"; - sgr-iosevka-ss02 = "1rhc76hfm204l5bmp1jdi74f0ay34g9q2rzi7lz5jirjjinnvadj"; - sgr-iosevka-ss03 = "1gpb5vcx624gi0jjrj8p7jpm6r2465gpbn3khq46f9557ril4m5y"; - sgr-iosevka-ss04 = "0kf1pmq2ffiam4zllj6x1dzd738zi9a843fz6jkpjbf9fascad9z"; - sgr-iosevka-ss05 = "1xibjsa438lwk4y4bf0r7gjqy5czp7j7fml08f492jb1dwz7vqhq"; - sgr-iosevka-ss06 = "1mk6haqj77b7r8cazkhf0bzd5w9ln2s6chsr12pd6bzmvphvzrzi"; - sgr-iosevka-ss07 = "087030ckif8w4mv7j9y4pirfia5g8dh385awpqc6fffls9l0l0zh"; - sgr-iosevka-ss08 = "0gzgsl7li9i1hl0ffw81j4w2ps3wy4kq986fwcwhgk7n9cy9rg97"; - sgr-iosevka-ss09 = "1hsdgsg5y40bxwjkhm2q7jmjcjffsyjwa741n7fkfaqrqwl6273g"; - sgr-iosevka-ss10 = "0ayspdypq0n7j8nbx17lxzki84icy5bzk88xq6akp7g6n035vw37"; - sgr-iosevka-ss11 = "0kf2a1765qrmd5ba3s3hw8hxgzbcqi9dwb754yid18kiipl3lp4l"; - sgr-iosevka-ss12 = "02d8i8qizfd1akhp0857y5i60hq3y4dj2dg2aq9pf4ldydcvc16g"; - sgr-iosevka-ss13 = "0aw77vcfmr868vyff01cqln09xb1f30lwcsg4mqg2ym2ibp0xv71"; - sgr-iosevka-ss14 = "1s1y5hww1vlqavgp4rr36bdvdicx7azw0yyrgv401i5w1p5z0088"; - sgr-iosevka-ss15 = "1wb8s43hjw36x99sh610ms5x04nb6pi9z7i0dcpch7x9g2kk9ydh"; - sgr-iosevka-ss16 = "1fwgskyl6ys383sa6fkkmdpw61m0d5nxc2vrhw56wysfvrz2cfa8"; - sgr-iosevka-ss17 = "1zvzwy90gkaiq9ij9030wssnrjrkx9xkddwghaa1s2p9bdyfnf8x"; - sgr-iosevka-ss18 = "12ijnkr69hahk8ghgibz438ar3yfky4kzwb9r08y43zjvycf2qhg"; - sgr-iosevka-term = "13dvkydib9gv7308i093zpxpr40cr3admq0c4gg6ki3ix7cml3ac"; - sgr-iosevka-term-curly = "0991m6p3b4kiyw0rgvxswwn263i7if7nznbivyzdsj1dgp3b2pkr"; - sgr-iosevka-term-curly-slab = "1qbhhd4w2nxga2j7llsn8w3qa66rfw4nqylsw6dknqfhf34ba2mq"; - sgr-iosevka-term-slab = "0g0dy4nrgy1a3xdbc5nxyh7y8j7plkbk09bid8rq51rdsljzp1hg"; - sgr-iosevka-term-ss01 = "1smlqzqvp8by7rz5g5nbywyg740v9fhyiy3khn9rx5szyj92pmrb"; - sgr-iosevka-term-ss02 = "1caxixkzbjapdr3k1ki1wfvcgs74mng0h15y00msfga1pjbj41vw"; - sgr-iosevka-term-ss03 = "1fsbzb57jx2qcdmixxpgpqm8x1rlvc5vzkgx2w9z83nrll3iba5n"; - sgr-iosevka-term-ss04 = "0zmpgsb0x8d8pggliqyl79hnxv5ivir0d8z2bg5zy1cw5ryzz94w"; - sgr-iosevka-term-ss05 = "17d8ak2xnmp0g37b5ly3qik38mmmblrdqgmixp4i91wldf66h58c"; - sgr-iosevka-term-ss06 = "0vv5gga66c5rs2vl4ncid403yqx7nwjfkr4mr5krlpc6lhs7wzhk"; - sgr-iosevka-term-ss07 = "0mjpm4x0gy4749fnha26xssm7aw72sh7rgf3jf46pmqz40ya829b"; - sgr-iosevka-term-ss08 = "1hw3cjfr3wwmjvi84vdn32kpk6x9zyqi43ib9nva7db4if39vf7s"; - sgr-iosevka-term-ss09 = "1049yb11dlxc7d97hw51mzssrc0ips2dll8wglinp0l23y1nhf2s"; - sgr-iosevka-term-ss10 = "0nzgcr2rlcgzfidnpix1dxyqiz273xmhfipfkflz5plpqvscd0c1"; - sgr-iosevka-term-ss11 = "135crs740qprnzk0mycp83vw9x1m8za6w51syvvx8h0vncsc8g6b"; - sgr-iosevka-term-ss12 = "1a2qrp44i4gqqpn2ycmslnm2g92v79v4hsim2ssiia474s5qn41z"; - sgr-iosevka-term-ss13 = "18dbgl28iykw1hqcmanvpkc8zk12547rgw8zisr4vwqck8an50vb"; - sgr-iosevka-term-ss14 = "0474ricwyvcmk9baxmd3gq1p6zrgnj59p0bbrsfc142ixqgkc0pp"; - sgr-iosevka-term-ss15 = "1g8pjbyxnhvx62g96zlfpbq2kdc329j0pcr8iib7isyhijh4ygcx"; - sgr-iosevka-term-ss16 = "199jhbfh2zbmp07jzi2wm8a63zhmasf4a04bp9i13pqwxz9hic7i"; - sgr-iosevka-term-ss17 = "1lyv2hpmyalrwbhcxjqw9lzil9dfhrf971vazg366wngwn027sp2"; - sgr-iosevka-term-ss18 = "1wszzj13gv3kc488yg9bshrf98db86xi0958g9l2y9l137h4frbz"; + iosevka = "1f0l3d6j936799szy243k58rk28qbrgvgi35g0w6bfsra25lycq2"; + iosevka-aile = "0prhfpz0ib7cbpi1kznb6yrp0wqjnsh39hymzha6lm0pa7py1r36"; + iosevka-curly = "0yzdm4ypfk60zvl54fhsmi9xs1bg08pac0srs9nggicp5zswixb3"; + iosevka-curly-slab = "175d96yzrqdjg7ic88dacvs7hz8daskn1a9vrqks132rr6a26xvw"; + iosevka-etoile = "1n5xcnq6vbks53vfaxkm1ykpfcsbw1q3zmkrlrwsdd0zdxjsy1fx"; + iosevka-slab = "07z3r27px5hsnz9rac290f2xraavflxqnd2ppmjiwz1yg9ch80d9"; + iosevka-ss01 = "1fd5pjyxrqna98nghsp6rxbaqhmxch89s3jdvqdmpwj87jb6dkcc"; + iosevka-ss02 = "13i8cqdh8g3wv8686g09aazjly157wvzgf5a6n1az4kcax9cawi3"; + iosevka-ss03 = "1l1dkk6321czqrd7if4wwmps9r6in88952i1hqgjqr3r797x4k8p"; + iosevka-ss04 = "1798nzr27pv9dpmjgp9bbivg9dcnk3cz603k3n3igmp8rb4rhz5f"; + iosevka-ss05 = "0csxpmh6ymkgfhzl5x370y4qdl92cjhas25782n8carg16bc854f"; + iosevka-ss06 = "12kmb4g0f31jr0d2gr66xjcjjqsmbr5hs0ynqbcsdpk4x58lv4y7"; + iosevka-ss07 = "1fwdiyzs5prggzld9zip2bqzhngljwsy33cdbfq9526qakbxi67g"; + iosevka-ss08 = "0yha45vyl0kdl593f04m26sl92vhklr1afd7yhmlkmhhhqp6bs9n"; + iosevka-ss09 = "0av1npxxky47239x64rbrv7q7gb2lrgyzkaw1mqhafg6yzjn9iq5"; + iosevka-ss10 = "0w3j04sjkrsd91vl7gyxbjjm76xx64p7b5c97p04xsa09gaig7i9"; + iosevka-ss11 = "1vv20s4kp3mhngdpxzxwa1hldahxm1cxybnf1hzgd79a1162blhx"; + iosevka-ss12 = "1yh200azn914s8lyzv8ga68ixxrqhcxx1rywxm3cpmm8iisvjf4y"; + iosevka-ss13 = "0yvnzz53x0np7w53r5989chs9fcv81mckbf41z519r8l30m31bbj"; + iosevka-ss14 = "17cv02gbzn0v8c8apdh7dd5s3y2qb9cydr8g5rbczzpvywixxrwr"; + iosevka-ss15 = "04iqvjx0nkzikar4ivi7zswqvpcd954khmjjx8vicq3x56wggj8z"; + iosevka-ss16 = "1q3krbi3vh8ry35s24cja77a8430x4n8i4anf8v7rh45sns37fmj"; + iosevka-ss17 = "0vyzhix547j7yq717ffns6pd5mgis5sbxl85c1qf3nhij8czqg6l"; + iosevka-ss18 = "0qikq8p8kvxw9lmrgzlm1g26bz3lppbc8jcgl8417jz400npfqg9"; + sgr-iosevka = "095nwxsgwj671m962ix8qva5himdva0iqv9b5lapgb7acidrj8m7"; + sgr-iosevka-aile = "1fkl0v7rclia5lwfm7f3vc3gkgnd88gf00icm6qka1xylzk8z83l"; + sgr-iosevka-curly = "0q7dakcldx7j2cvn8hz079j81y5ab6ziqz6jr51w1whzb46al7rq"; + sgr-iosevka-curly-slab = "0pw3fbygsgdw0isnv18axh49yxyfjdav6xizrvg6x4y8hispx0xp"; + sgr-iosevka-etoile = "1fs22ap272hkf1wfymhbvgdpsrnxwadp8z6lv2hv5wy8ibc0ccia"; + sgr-iosevka-fixed = "0bgag04jidcdj0gmsppc2lhvawpvylxs645sgxjj8bljy6480s96"; + sgr-iosevka-fixed-curly = "0hgablbcb0wrpdkxw78pyvyni7dh457nwb10acwjxy6lbsshd88z"; + sgr-iosevka-fixed-curly-slab = "1nb3izaq3slaxypylz3l6r8xjg7yy0yan08nsw8zny5lp0kaiqw9"; + sgr-iosevka-fixed-slab = "16cc32ysmvifx736alp8bmcb9sjs1426sv72qydy99dafw34xhmm"; + sgr-iosevka-fixed-ss01 = "0vvjj3dsfj8a60pg1qf7hcm6livsjc40xr0sfc9z1hx3dwjqpvlh"; + sgr-iosevka-fixed-ss02 = "1yy9hqfdb897wi3nl5ny5j5i56jggbppx4ddckfa62a4jxvfks58"; + sgr-iosevka-fixed-ss03 = "0qhk1w3gsd3qriyk9k33sfq46h9hn5zy9zk9cpd429z0xdps49kc"; + sgr-iosevka-fixed-ss04 = "02psmn72r1mkza8n7p4sgrag7iz5zylnw03hnq6fnc4bqnn29gph"; + sgr-iosevka-fixed-ss05 = "1w3jjjr8vvzjihpai9mivkcm2wngag6iva120zsqgb2n2k1z31bp"; + sgr-iosevka-fixed-ss06 = "1icabqjnnsj59m4lg3qk820kdsq7hhl3gngfm5x4br43h031cdc7"; + sgr-iosevka-fixed-ss07 = "0j9l18w7xxdgnw728zyphb52a76rbhb8cv388yc94wldzcmsk1jb"; + sgr-iosevka-fixed-ss08 = "0js9pf92pgd944dywya1yjdx99sz56ra0nwxs9n9g0zn1rj5czwv"; + sgr-iosevka-fixed-ss09 = "06bnyhx5rhkqjiwkjy1rxx6mby16wkyb1r4l3lkln5v6v0sfixfp"; + sgr-iosevka-fixed-ss10 = "13y3vvcrm2v78bmadk051zr3izl0hpcxmfag34cikapzmf9vzxn3"; + sgr-iosevka-fixed-ss11 = "1rwjzdz2ab90rv5p8hh870x9knhilqh0iiwfkyx8kjp7s9shhncp"; + sgr-iosevka-fixed-ss12 = "0fj2szv0g2dclf7yhi8xc9hkgz1mw7kpc62hcvs3044ciga9cxrv"; + sgr-iosevka-fixed-ss13 = "1z6rpf9l6yadzqgrdcyi75vd8mh75b6dx7d9bh06n8sjr5amhav5"; + sgr-iosevka-fixed-ss14 = "0cp58j9c7fkm0q0ym99rhg7ljvzympwks4wk7l8vhh0wp2hfw78h"; + sgr-iosevka-fixed-ss15 = "1fzs0c12abrf81yy1254nfiaq5q2rgvnv1yhqh985jmwcr010n83"; + sgr-iosevka-fixed-ss16 = "16wffgq3b9d290kkbb6xa6z9aphn2d1wzqsqfr4mrkbhpwchbh0i"; + sgr-iosevka-fixed-ss17 = "030l59270vyjhik8cn2jphdvd6vphr9ac8kqzx3bdbf1wgsr4sir"; + sgr-iosevka-fixed-ss18 = "06qym0ffxy6j9hagpd3vrf6j5bd83ch150wkqg9rkg1i26q71v36"; + sgr-iosevka-slab = "0mbdgpxkb3s4a8x0dvnjwqg3za0hl73n3a5vrmy8p694bnx1mi7r"; + sgr-iosevka-ss01 = "0ilr1jiqmjmjfv4py1q3pdn3j20nh8j99629gq9g1zb82x1c9g9l"; + sgr-iosevka-ss02 = "0l4cbx4v8zffbbq1lklk8knn0w6j9gjdp1f780k6x0z0jz3dxvdw"; + sgr-iosevka-ss03 = "0dpl84ybj2h6nv03yy4vrwwksx4zms1c8fgr238w1nbhd7lnlyrv"; + sgr-iosevka-ss04 = "0xlyjxsz6zc3gljvw0rsfgyv9xg1kvgsy2ibd2950vlxk2c597jb"; + sgr-iosevka-ss05 = "02vfkdjq01jxjcvcnxs8g2snmq2gg56448yk0l0gna9mi1hagsk3"; + sgr-iosevka-ss06 = "0b75h0al34f6w0s94i5c88pzs4zjl2iinkwjx855a036mdcqkz1l"; + sgr-iosevka-ss07 = "1grqjqn9gckpgrrch9xa05ljpwr1rdr4lczsn89irhjz102s0bik"; + sgr-iosevka-ss08 = "1mzbaslpy7pscmyiiz0k7czw3kjjc9an7mdb4yh99bpxwaskiv3k"; + sgr-iosevka-ss09 = "1d7r2cv1w9q5h1frvzylizwimp8r6bdpg3fckcrdrfxsl0xfdffc"; + sgr-iosevka-ss10 = "1jr01z6s476aggnnki0q4x24z35jx03fl4fh1l44pf3rckz7c0m9"; + sgr-iosevka-ss11 = "05kybk7wskrg2i58h9n31sj1g6m93dcbbxr38y9nfcxb02cdbxp3"; + sgr-iosevka-ss12 = "0pzrn3b5qj2q7k7slwvvz31j566l8xbmgk6kv324r3r19xcmsx31"; + sgr-iosevka-ss13 = "1cgn33g39pnjkh452r396cyw00iskrr73k2jghw2ywb8ard024gc"; + sgr-iosevka-ss14 = "0q74z4p3ybhaha4z6myasxyidy464vmccqk0bji6ks6fdklh2l3m"; + sgr-iosevka-ss15 = "13gcgv08pwsbnr51b67w5hb9x5vcz7ridxjzwcnjhavssq3qn02x"; + sgr-iosevka-ss16 = "1lkxrvd328ww8xi2189333p40awk7bb4d5k0mpcibp1r2hqbhx3x"; + sgr-iosevka-ss17 = "0q4j381k2nz88y2nszd90ynmqyzna5il7j5illhdjk9dyp936f1p"; + sgr-iosevka-ss18 = "16hdbvx9pa5z03i3dv8x40x6d8nvgxn4vga8sgdgpd2d5k8ibcq5"; + sgr-iosevka-term = "0a16brmr2xsm48bcd5rrsv1c7b4yhvnkrlqp14p0fawyfs05bk5v"; + sgr-iosevka-term-curly = "0a53j231zd1nkirp3fg6m72455gmkn0ipvdqswkkipxp5llbxkhx"; + sgr-iosevka-term-curly-slab = "1ypbffwg7pihq5ywy59y3f2d8dw8p5lzk2284336z3a7i8kzmhpq"; + sgr-iosevka-term-slab = "0rcf9i8fibrvmhzmm192crl7jlv7bwda7b12865w4g719a8ksdsv"; + sgr-iosevka-term-ss01 = "0h12vz7qkl6xflffiqjqqkd1ziqkg2pi1s8pk28ak706fv4k203n"; + sgr-iosevka-term-ss02 = "19d3hqlwv7pi9xyh9amshirbj6ypg6ka5g6hz9dmmh0pmwhcvpjs"; + sgr-iosevka-term-ss03 = "09b3ghyvrjx8dnh8i9ly3cmkbpl10gn1283q9bjamcc8niva6g36"; + sgr-iosevka-term-ss04 = "0l27i49myv81x09bj8ii732zc6473psa58ls2zgvd7yz2bihi3ar"; + sgr-iosevka-term-ss05 = "0421p4y94zxwvc7qyl4zgxld3jrx12wsjirmvfxvfndn0f4dwqyk"; + sgr-iosevka-term-ss06 = "0dl62wnqfqrryp0hrj073yvvy225swv9kcldhygapi16mw97v30b"; + sgr-iosevka-term-ss07 = "03sipvjji22g0gajj0vxkmsc81fd173bb816vjv56fh489g04hn3"; + sgr-iosevka-term-ss08 = "0j0y2dzn6a8r0yg40kajzrhyvl5yf2b8hm7n9970h0gl3rrk5pxa"; + sgr-iosevka-term-ss09 = "1y37cr436hwb1iqqsybg0w595kbn0373hm0zmwcsmsxb25166lcf"; + sgr-iosevka-term-ss10 = "1ngyppn90nn8f59xkh63ifl077w0zldjxzxjw8skx2jhj2kis537"; + sgr-iosevka-term-ss11 = "193snjki9wd6cjpd754g7pvhlyg3yizlcjhcw9x0zx60830xcbd3"; + sgr-iosevka-term-ss12 = "000maksimlm3gapp8d3cwymkmkg4n0dcwxvlxwgi2a6f5rwgfm8n"; + sgr-iosevka-term-ss13 = "09yfj7kxd0p2w1dd1n8hwr3j2plqiq7l17rhh0lys1clyw1jrph8"; + sgr-iosevka-term-ss14 = "16fipp8pka2187mclsf24sxx7idcqh4nn4z63glrg6695g8r0vd0"; + sgr-iosevka-term-ss15 = "0yaj5all8jljzyhd5qmgvmiwv7whx4f9zvxgv3l53xxww5i5yhiz"; + sgr-iosevka-term-ss16 = "163g9mj2n8z21nr5yslnq8m4m7j4aq7q918zs8nd5hggjzhqpy9y"; + sgr-iosevka-term-ss17 = "07zicd0f8bclwxfkvxy6x6bhccz3334wmgfxqpzx36sshyhvfihg"; + sgr-iosevka-term-ss18 = "1qwxyyqv483p05mvkar9vb2m349is0qgdijri8ipran73w363fhc"; } diff --git a/pkgs/data/fonts/junction/default.nix b/pkgs/data/fonts/junction/default.nix index 7f5ba5c4a2012..b629477f61444 100644 --- a/pkgs/data/fonts/junction/default.nix +++ b/pkgs/data/fonts/junction/default.nix @@ -1,12 +1,12 @@ { lib, fetchFromGitHub, stdenvNoCC }: -stdenvNoCC.mkDerivation (self: { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "junction"; version = "2014-05-29"; src = fetchFromGitHub { owner = "theleagueof"; - repo = self.pname; + repo = finalAttrs.pname; rev = "fb73260e86dd301b383cf6cc9ca8e726ef806535"; hash = "sha256-Zqh23HPWGed+JkADYjYdsVNRxqJDvC9xhnqAqWZ3Eu8="; }; diff --git a/pkgs/data/fonts/knewave/default.nix b/pkgs/data/fonts/knewave/default.nix index eaadb7afc0de2..27def22718029 100644 --- a/pkgs/data/fonts/knewave/default.nix +++ b/pkgs/data/fonts/knewave/default.nix @@ -1,12 +1,12 @@ { lib, fetchFromGitHub, stdenvNoCC }: -stdenvNoCC.mkDerivation (self: { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "knewave"; version = "2012-07-30"; src = fetchFromGitHub { owner = "theleagueof"; - repo = self.pname; + repo = finalAttrs.pname; rev = "f335d5ff1f12e4acf97d4208e1c37b4d386e57fb"; hash = "sha256-SaJU2GlxU7V3iJNQzFKg1YugaPsiJuSZpC8NCqtWyz0="; }; diff --git a/pkgs/data/fonts/league-gothic/default.nix b/pkgs/data/fonts/league-gothic/default.nix index 4186eb70f6dbe..fd12e0a86591e 100644 --- a/pkgs/data/fonts/league-gothic/default.nix +++ b/pkgs/data/fonts/league-gothic/default.nix @@ -1,11 +1,11 @@ { lib, fetchzip, stdenvNoCC }: -stdenvNoCC.mkDerivation (self: { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "league-gothic"; version = "1.601"; src = fetchzip { - url = "https://github.com/theleagueof/league-gothic/releases/download/${self.version}/LeagueGothic-${self.version}.tar.xz"; + url = "https://github.com/theleagueof/league-gothic/releases/download/${finalAttrs.version}/LeagueGothic-${finalAttrs.version}.tar.xz"; hash = "sha256-emkXKyQw4R0Zgg02oJsvBkqV0jmczP0tF0K2IKqJHMA="; }; diff --git a/pkgs/data/fonts/league-script-number-one/default.nix b/pkgs/data/fonts/league-script-number-one/default.nix index 11d7dc6173c5a..bc847f4f81c84 100644 --- a/pkgs/data/fonts/league-script-number-one/default.nix +++ b/pkgs/data/fonts/league-script-number-one/default.nix @@ -1,12 +1,12 @@ { lib, fetchFromGitHub, stdenvNoCC }: -stdenvNoCC.mkDerivation (self: { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "league-script-number-one"; version = "2011-05-25"; src = fetchFromGitHub { owner = "theleagueof"; - repo = self.pname; + repo = finalAttrs.pname; rev = "225add0b37cf8268759ba4572e02630d9fb54ecf"; hash = "sha256-Z3Zrp0Os3On0tESVical1Qh6wY1H2Hc0OPTlkbtsrCI="; }; diff --git a/pkgs/data/fonts/league-spartan/default.nix b/pkgs/data/fonts/league-spartan/default.nix index 599aeca8ca655..d0e36e591491e 100644 --- a/pkgs/data/fonts/league-spartan/default.nix +++ b/pkgs/data/fonts/league-spartan/default.nix @@ -1,11 +1,11 @@ { lib, fetchzip, stdenvNoCC }: -stdenvNoCC.mkDerivation (self: { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "league-spartan"; version = "2.220"; src = fetchzip { - url = "https://github.com/theleagueof/league-spartan/releases/download/${self.version}/LeagueSpartan-${self.version}.tar.xz"; + url = "https://github.com/theleagueof/league-spartan/releases/download/${finalAttrs.version}/LeagueSpartan-${finalAttrs.version}.tar.xz"; hash = "sha256-dkvWRYli8vk+E0DkZ2NWCJKfSfdo4jEcGo0puQpFVVc="; }; diff --git a/pkgs/data/fonts/linden-hill/default.nix b/pkgs/data/fonts/linden-hill/default.nix index f48313fd4ac9b..9e452d34b99ac 100644 --- a/pkgs/data/fonts/linden-hill/default.nix +++ b/pkgs/data/fonts/linden-hill/default.nix @@ -1,12 +1,12 @@ { lib, fetchFromGitHub, stdenvNoCC }: -stdenvNoCC.mkDerivation (self: { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "linden-hill"; version = "2011-05-25"; src = fetchFromGitHub { owner = "theleagueof"; - repo = self.pname; + repo = finalAttrs.pname; rev = "a3f7ae6c4cac1b7e5ce5269e1fcc6a2fbb9e31ee"; hash = "sha256-EjXcLjzVQeOJgLxGua8t0oMc+APOsONGGpG6VJVCgFw="; }; diff --git a/pkgs/data/fonts/lxgw-neoxihei/default.nix b/pkgs/data/fonts/lxgw-neoxihei/default.nix index 6b93826d4d993..234fd2c508f19 100644 --- a/pkgs/data/fonts/lxgw-neoxihei/default.nix +++ b/pkgs/data/fonts/lxgw-neoxihei/default.nix @@ -5,11 +5,11 @@ stdenvNoCC.mkDerivation rec { pname = "lxgw-neoxihei"; - version = "1.009"; + version = "1.010"; src = fetchurl { url = "https://github.com/lxgw/LxgwNeoXiHei/releases/download/v${version}/LXGWNeoXiHei.ttf"; - hash = "sha256-Q7rrgqrjALLY2y40mNfNmzSeGwcVwhZUmDj08nlWsao="; + hash = "sha256-IIiQn2Qlac4ZFy/gVubrpqEpJIt0Dav2TEL29xDC7w4="; }; dontUnpack = true; diff --git a/pkgs/data/fonts/maple-font/default.nix b/pkgs/data/fonts/maple-font/default.nix index 15a77c2481935..3c870abab6ad8 100644 --- a/pkgs/data/fonts/maple-font/default.nix +++ b/pkgs/data/fonts/maple-font/default.nix @@ -9,7 +9,7 @@ let rec{ inherit pname desc; - version = "6.2"; + version = "6.3"; src = fetchurl { url = "https://github.com/subframe7536/Maple-font/releases/download/v${version}/${pname}.zip"; inherit sha256; @@ -21,6 +21,8 @@ let nativeBuildInputs = [ unzip ]; installPhase = '' find . -name '*.ttf' -exec install -Dt $out/share/fonts/truetype {} \; + find . -name '*.otf' -exec install -Dt $out/share/fonts/opentype {} \; + find . -name '*.woff2' -exec install -Dt $out/share/fonts/woff2 {} \; ''; meta = with lib; { @@ -38,22 +40,33 @@ in { Mono = maple-font { pname = "MapleMono"; - sha256 = "sha256-KhG0gQRnHFvpoxdcySSEYWDtOgG4xIm8X0Ua9o1aGTw="; + sha256 = "sha256-Ap4OwP/QGFz9+xn12rekia1/pwRxZvv+H+ZmZiXcxcY="; desc = "monospace"; }; NF = maple-font { pname = "MapleMono-NF"; - sha256 = "sha256-Ov6AEaLy80cwrFtmKWUceI809SwBlHsQf2F86/sc/6A="; + sha256 = "sha256-WZHFQRG+81TF5YgOT249c8VA8vAvYowiQx/pqsDuJ4o="; desc = "Nerd Font"; }; SC-NF = maple-font { pname = "MapleMono-SC-NF"; - sha256 = "sha256-bb62YGzdE9qvlyuZG7YI16gOxWC+AijlRLY8ET+q5Rg="; + sha256 = "sha256-26odkmMljEwstRywDYJ7Dst5pfOXrtQTcrFFxbRwHcA="; desc = "Nerd Font SC"; }; + opentype = maple-font { + pname = "MapleMono-otf"; + sha256 = "sha256-u2IuymjiosoSbdIW7h2QalagTI+eDMRSuhLgXy5RdRA="; + desc = "OpenType"; + }; + + woff2 = maple-font { + pname = "MapleMono-woff2"; + sha256 = "sha256-iv6Q/aYMlAkhaem8tFWAzqc9mVgWQXghBzcHJz1dg/Y="; + desc = "WOFF2.0"; + }; } diff --git a/pkgs/data/fonts/medio/default.nix b/pkgs/data/fonts/medio/default.nix index 240b6fbeead85..5adcad0086626 100644 --- a/pkgs/data/fonts/medio/default.nix +++ b/pkgs/data/fonts/medio/default.nix @@ -4,12 +4,12 @@ let majorVersion = "0"; minorVersion = "200"; in -stdenvNoCC.mkDerivation (self: { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "medio"; version = "${majorVersion}.${minorVersion}"; src = fetchzip { - url = "https://dotcolon.net/download/fonts/${self.pname}_${majorVersion}${minorVersion}.zip"; + url = "https://dotcolon.net/download/fonts/${finalAttrs.pname}_${majorVersion}${minorVersion}.zip"; hash = "sha256-S+CcwD4zGVk7cIFD6K4NnpE/0mrJq4RnDJC576rhcLQ="; stripRoot = false; }; @@ -23,7 +23,7 @@ stdenvNoCC.mkDerivation (self: { ''; meta = with lib; { - homepage = "http://dotcolon.net/font/${self.pname}/"; + homepage = "http://dotcolon.net/font/${finalAttrs.pname}/"; description = "Serif font designed by Sora Sagano"; longDescription = '' Medio is a serif font designed by Sora Sagano, based roughly diff --git a/pkgs/data/fonts/melete/default.nix b/pkgs/data/fonts/melete/default.nix index cae6bcaf4eaf1..3d3e24ac81daa 100644 --- a/pkgs/data/fonts/melete/default.nix +++ b/pkgs/data/fonts/melete/default.nix @@ -4,12 +4,12 @@ let majorVersion = "0"; minorVersion = "200"; in -stdenvNoCC.mkDerivation (self: { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "melete"; version = "${majorVersion}.${minorVersion}"; src = fetchzip { - url = "https://dotcolon.net/download/fonts/${self.pname}_${majorVersion}${minorVersion}.zip"; + url = "https://dotcolon.net/download/fonts/${finalAttrs.pname}_${majorVersion}${minorVersion}.zip"; hash = "sha256-y1xtNM1Oy92gOvbr9J71XNxb1JeTzOgxKms3G2YHK00="; stripRoot = false; }; @@ -23,7 +23,7 @@ stdenvNoCC.mkDerivation (self: { ''; meta = with lib; { - homepage = "http://dotcolon.net/font/${self.pname}/"; + homepage = "http://dotcolon.net/font/${finalAttrs.pname}/"; description = "A headline typeface that could be used as a movie title"; platforms = platforms.all; maintainers = with maintainers; [ minijackson ]; diff --git a/pkgs/data/fonts/nacelle/default.nix b/pkgs/data/fonts/nacelle/default.nix index 007de90b75ac5..2d670cdc229d9 100644 --- a/pkgs/data/fonts/nacelle/default.nix +++ b/pkgs/data/fonts/nacelle/default.nix @@ -4,12 +4,12 @@ let majorVersion = "1"; minorVersion = "00"; in -stdenvNoCC.mkDerivation (self: { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "nacelle"; version = "${majorVersion}.${minorVersion}"; src = fetchzip { - url = "https://dotcolon.net/download/fonts/${self.pname}_${majorVersion}${minorVersion}.zip"; + url = "https://dotcolon.net/download/fonts/${finalAttrs.pname}_${majorVersion}${minorVersion}.zip"; hash = "sha256-e4QsPiyfWEAYHWdwR3CkGc2UzuA3hZPYYlWtIubY0Oo="; stripRoot = false; }; @@ -23,7 +23,7 @@ stdenvNoCC.mkDerivation (self: { ''; meta = with lib; { - homepage = "http://dotcolon.net/font/${self.pname}/"; + homepage = "http://dotcolon.net/font/${finalAttrs.pname}/"; description = "A improved version of the Aileron font"; platforms = platforms.all; maintainers = with maintainers; [ minijackson ]; diff --git a/pkgs/data/fonts/orbitron/default.nix b/pkgs/data/fonts/orbitron/default.nix index dcbf0085141ee..7e68975520600 100644 --- a/pkgs/data/fonts/orbitron/default.nix +++ b/pkgs/data/fonts/orbitron/default.nix @@ -1,12 +1,12 @@ { lib, stdenvNoCC, fetchFromGitHub }: -stdenvNoCC.mkDerivation (self: { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "orbitron"; version = "2011-05-25"; src = fetchFromGitHub { owner = "theleagueof"; - repo = self.pname; + repo = finalAttrs.pname; rev = "13e6a5222aa6818d81c9acd27edd701a2d744152"; hash = "sha256-zjNPVrDUxcQbrsg1/8fFa6Wenu1yuG/XDfKA7NVZ0rA="; }; diff --git a/pkgs/data/fonts/ostrich-sans/default.nix b/pkgs/data/fonts/ostrich-sans/default.nix index b86727312ec10..67ca4b72823c8 100644 --- a/pkgs/data/fonts/ostrich-sans/default.nix +++ b/pkgs/data/fonts/ostrich-sans/default.nix @@ -1,12 +1,12 @@ { lib, fetchFromGitHub, stdenvNoCC }: -stdenvNoCC.mkDerivation (self: { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "ostrich-sans"; version = "2014-04-18"; src = fetchFromGitHub { owner = "theleagueof"; - repo = self.pname; + repo = finalAttrs.pname; rev = "a949d40d0576d12ba26e2a45e19c91fd0228c964"; hash = "sha256-vvTNtl+fO2zWooH1EvCmO/dPYYgCkj8Ckg5xfg1gtnw="; }; diff --git a/pkgs/data/fonts/penna/default.nix b/pkgs/data/fonts/penna/default.nix index 893262f66e56c..e1a7fc181ddcf 100644 --- a/pkgs/data/fonts/penna/default.nix +++ b/pkgs/data/fonts/penna/default.nix @@ -4,12 +4,12 @@ let majorVersion = "0"; minorVersion = "100"; in -stdenvNoCC.mkDerivation (self: { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "penna"; version = "${majorVersion}.${minorVersion}"; src = fetchzip { - url = "https://dotcolon.net/download/fonts/${self.pname}_${majorVersion}${minorVersion}.zip"; + url = "https://dotcolon.net/download/fonts/${finalAttrs.pname}_${majorVersion}${minorVersion}.zip"; hash = "sha256-fmCJnEaoUGdW9JK3J7JSm5D4qOMRW7qVKPgVE7uCH5w="; stripRoot = false; }; @@ -23,7 +23,7 @@ stdenvNoCC.mkDerivation (self: { ''; meta = with lib; { - homepage = "http://dotcolon.net/font/${self.pname}/"; + homepage = "http://dotcolon.net/font/${finalAttrs.pname}/"; description = "Geometric sans serif designed by Sora Sagano"; longDescription = '' Penna is a geometric sans serif designed by Sora Sagano, diff --git a/pkgs/data/fonts/prociono/default.nix b/pkgs/data/fonts/prociono/default.nix index b5bdf4d22926d..8749c9d0736e8 100644 --- a/pkgs/data/fonts/prociono/default.nix +++ b/pkgs/data/fonts/prociono/default.nix @@ -1,12 +1,12 @@ { lib, fetchFromGitHub, stdenvNoCC }: -stdenvNoCC.mkDerivation (self: { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "prociono"; version = "2011-05-25"; src = fetchFromGitHub { owner = "theleagueof"; - repo = self.pname; + repo = finalAttrs.pname; rev = "f9d9680de6d6f0c13939f23c9dd14cd7853cf844"; hash = "sha256-gC5E0Z0O2cnthoBEu+UOQLsr3/a/3/JPIx3WCPsXXtk="; }; diff --git a/pkgs/data/fonts/raleway/default.nix b/pkgs/data/fonts/raleway/default.nix index c1d766f7d36b5..ffaca35c6b9e5 100644 --- a/pkgs/data/fonts/raleway/default.nix +++ b/pkgs/data/fonts/raleway/default.nix @@ -1,11 +1,11 @@ { lib, fetchzip, stdenvNoCC }: -stdenvNoCC.mkDerivation (self: { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "raleway"; version = "4.101"; src = fetchzip { - url = "https://github.com/theleagueof/raleway/releases/download/${self.version}/Raleway-${self.version}.tar.xz"; + url = "https://github.com/theleagueof/raleway/releases/download/${finalAttrs.version}/Raleway-${finalAttrs.version}.tar.xz"; hash = "sha256-itNHIMoRjiaqYAJoDNetkCquv47VAfel8MAzwsd//Ww="; }; diff --git a/pkgs/data/fonts/route159/default.nix b/pkgs/data/fonts/route159/default.nix index 4d0bf9941b44f..e19d25d61d0f2 100644 --- a/pkgs/data/fonts/route159/default.nix +++ b/pkgs/data/fonts/route159/default.nix @@ -4,12 +4,12 @@ let majorVersion = "1"; minorVersion = "10"; in -stdenvNoCC.mkDerivation (self: { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "route159"; version = "${majorVersion}.${minorVersion}"; src = fetchzip { - url = "https://dotcolon.net/download/fonts/${self.pname}_${majorVersion}${minorVersion}.zip"; + url = "https://dotcolon.net/download/fonts/${finalAttrs.pname}_${majorVersion}${minorVersion}.zip"; hash = "sha256-1InyBW1LGbp/IU/ql9mvT14W3MTxJdWThFwRH6VHpTU="; stripRoot = false; }; @@ -23,7 +23,7 @@ stdenvNoCC.mkDerivation (self: { ''; meta = with lib; { - homepage = "http://dotcolon.net/font/${self.pname}/"; + homepage = "http://dotcolon.net/font/${finalAttrs.pname}/"; description = "A weighted sans serif font"; platforms = platforms.all; maintainers = with maintainers; [ leenaars minijackson ]; diff --git a/pkgs/data/fonts/sarasa-gothic/default.nix b/pkgs/data/fonts/sarasa-gothic/default.nix index c8a3a65a00b78..417008490bcb8 100644 --- a/pkgs/data/fonts/sarasa-gothic/default.nix +++ b/pkgs/data/fonts/sarasa-gothic/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "sarasa-gothic"; - version = "0.40.4"; + version = "0.40.6"; src = fetchurl { # 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"; - hash = "sha256-PVlozsWYomsQKp8WxHD8+pxzlTmIKGPK71HDLWMR9S0="; + hash = "sha256-AHslDiYBQXcxo8XVh1GMZDR8LJXvzJHl4hrisfhltEM="; }; sourceRoot = "."; diff --git a/pkgs/data/fonts/seshat/default.nix b/pkgs/data/fonts/seshat/default.nix index 7ed7abd5fb17c..e86b0539c9277 100644 --- a/pkgs/data/fonts/seshat/default.nix +++ b/pkgs/data/fonts/seshat/default.nix @@ -4,12 +4,12 @@ let majorVersion = "0"; minorVersion = "100"; in -stdenvNoCC.mkDerivation (self: { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "seshat"; version = "${majorVersion}.${minorVersion}"; src = fetchzip { - url = "https://dotcolon.net/download/fonts/${self.pname}_${majorVersion}${minorVersion}.zip"; + url = "https://dotcolon.net/download/fonts/${finalAttrs.pname}_${majorVersion}${minorVersion}.zip"; hash = "sha256-XgprDhzAbcTzZw2QOwpCnzusYheYmSlM+ApU+Y0wO2Q="; stripRoot = false; }; @@ -23,7 +23,7 @@ stdenvNoCC.mkDerivation (self: { ''; meta = with lib; { - homepage = "http://dotcolon.net/font/${self.pname}/"; + homepage = "http://dotcolon.net/font/${finalAttrs.pname}/"; description = "Roman body font designed for main text by Sora Sagano"; longDescription = '' Seshat is a Roman body font designed for the main text. By diff --git a/pkgs/data/fonts/sniglet/default.nix b/pkgs/data/fonts/sniglet/default.nix index a109637a9a1bb..ab60e9c56f7cb 100644 --- a/pkgs/data/fonts/sniglet/default.nix +++ b/pkgs/data/fonts/sniglet/default.nix @@ -1,12 +1,12 @@ { lib, fetchFromGitHub, stdenvNoCC }: -stdenvNoCC.mkDerivation (self: { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "sniglet"; version = "2011-05-25"; src = fetchFromGitHub { owner = "theleagueof"; - repo = self.pname; + repo = finalAttrs.pname; rev = "5c6b0860bdd0d8c4f16222e4de3918c384db17c4"; hash = "sha256-fLT2hZT9o1Ka30EB/6oWwmalhVJ+swXLRFG99yRWd2c="; }; diff --git a/pkgs/data/fonts/sorts-mill-goudy/default.nix b/pkgs/data/fonts/sorts-mill-goudy/default.nix index 432740a9267da..1edbbd9787ed3 100644 --- a/pkgs/data/fonts/sorts-mill-goudy/default.nix +++ b/pkgs/data/fonts/sorts-mill-goudy/default.nix @@ -1,12 +1,12 @@ { lib, fetchFromGitHub, stdenvNoCC }: -stdenvNoCC.mkDerivation (self: { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "sorts-mill-goudy"; version = "2011-05-25"; src = fetchFromGitHub { owner = "theleagueof"; - repo = self.pname; + repo = finalAttrs.pname; rev = "06072890c7b05f274215a24f17449655ccb2c8af"; hash = "sha256-NEfLBJatUmdUL5gJEimJHZfOd1OtI7pxTN97eWMODyM="; }; diff --git a/pkgs/data/fonts/spleen/default.nix b/pkgs/data/fonts/spleen/default.nix index 89d189f4f8b13..911fbc69b55d9 100644 --- a/pkgs/data/fonts/spleen/default.nix +++ b/pkgs/data/fonts/spleen/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "spleen"; - version = "1.9.2"; + version = "1.9.3"; src = fetchurl { url = "https://github.com/fcambus/spleen/releases/download/${version}/spleen-${version}.tar.gz"; - hash = "sha256-AOGgGJLye0Yg3QTlNZPgRdtRim8atn+ZIm8aPpUnivY="; + hash = "sha256-t60e2wKl3a0RfKlPAm64RQtRUE0ugbw6A4deEtTnayU="; }; nativeBuildInputs = [ xorg.mkfontscale ]; diff --git a/pkgs/data/fonts/tenderness/default.nix b/pkgs/data/fonts/tenderness/default.nix index 40b284c2549f4..9149c081d4937 100644 --- a/pkgs/data/fonts/tenderness/default.nix +++ b/pkgs/data/fonts/tenderness/default.nix @@ -4,12 +4,12 @@ let majorVersion = "0"; minorVersion = "601"; in -stdenvNoCC.mkDerivation (self: { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "tenderness"; version = "${majorVersion}.${minorVersion}"; src = fetchzip { - url = "https://dotcolon.net/download/fonts/${self.pname}_${majorVersion}${minorVersion}.zip"; + url = "https://dotcolon.net/download/fonts/${finalAttrs.pname}_${majorVersion}${minorVersion}.zip"; hash = "sha256-bwJKW+rY7/r2pBCSA6HYlaRMsI/U8UdW2vV4tmYuJww="; stripRoot = false; }; @@ -23,7 +23,7 @@ stdenvNoCC.mkDerivation (self: { ''; meta = with lib; { - homepage = "http://dotcolon.net/font/${self.pname}/"; + homepage = "http://dotcolon.net/font/${finalAttrs.pname}/"; description = "Serif font designed by Sora Sagano with old-style figures"; platforms = platforms.all; maintainers = with maintainers; [ leenaars minijackson ]; diff --git a/pkgs/data/fonts/the-neue-black/default.nix b/pkgs/data/fonts/the-neue-black/default.nix index af3cd639c6e91..3288925464fe3 100644 --- a/pkgs/data/fonts/the-neue-black/default.nix +++ b/pkgs/data/fonts/the-neue-black/default.nix @@ -1,11 +1,11 @@ { lib, fetchzip, stdenvNoCC }: -stdenvNoCC.mkDerivation (self: { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "the-neue-black"; version = "1.007"; src = fetchzip { - url = "https://github.com/theleagueof/the-neue-black/releases/download/${self.version}/TheNeueBlack-${self.version}.tar.xz"; + url = "https://github.com/theleagueof/the-neue-black/releases/download/${finalAttrs.version}/TheNeueBlack-${finalAttrs.version}.tar.xz"; hash = "sha256-AsB6w1000xdl+pOPDXqqzQhru1T/VD0hIJ4gFec7mU4="; }; diff --git a/pkgs/data/fonts/twitter-color-emoji/default.nix b/pkgs/data/fonts/twitter-color-emoji/default.nix index de14c9213f88c..7d966fa196f57 100644 --- a/pkgs/data/fonts/twitter-color-emoji/default.nix +++ b/pkgs/data/fonts/twitter-color-emoji/default.nix @@ -14,14 +14,14 @@ }: let - version = "14.0.0"; + version = "14.1.2"; twemojiSrc = fetchFromGitHub { name = "twemoji"; - owner = "twitter"; + owner = "jdecked"; repo = "twemoji"; rev = "v${version}"; - sha256 = "sha256-ar6rBYudMIMngMVe/IowDV3X8wA77JBA6g0x/M7YLMg="; + sha256 = "sha256-UQ4PwO4D1kw7JOMf6xSaRBfT822KwrvWBPDmaQjkRVQ="; }; pythonEnv = @@ -99,7 +99,7 @@ stdenv.mkDerivation rec { This font uses Google’s CBDT format making it work on Android and Linux graphical stack. ''; - homepage = "https://twemoji.twitter.com/"; + homepage = "https://github.com/jdecked/twemoji"; # In noto-emoji-fonts source ## noto-emoji code is in ASL 2.0 license ## Emoji fonts are under OFL license diff --git a/pkgs/data/fonts/vegur/default.nix b/pkgs/data/fonts/vegur/default.nix index effaf74be7db7..e03f25951b544 100644 --- a/pkgs/data/fonts/vegur/default.nix +++ b/pkgs/data/fonts/vegur/default.nix @@ -4,12 +4,12 @@ let majorVersion = "0"; minorVersion = "701"; in -stdenvNoCC.mkDerivation (self: { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "vegur"; version = "${majorVersion}.${minorVersion}"; src = fetchzip { - url = "https://dotcolon.net/download/fonts/${self.pname}_${majorVersion}${minorVersion}.zip"; + url = "https://dotcolon.net/download/fonts/${finalAttrs.pname}_${majorVersion}${minorVersion}.zip"; hash = "sha256-sGb3mEb3g15ZiVCxEfAanly8zMUopLOOjw8W4qbXLPA="; stripRoot = false; }; diff --git a/pkgs/data/fonts/whatsapp-emoji/default.nix b/pkgs/data/fonts/whatsapp-emoji/default.nix new file mode 100644 index 0000000000000..b118691fee1d4 --- /dev/null +++ b/pkgs/data/fonts/whatsapp-emoji/default.nix @@ -0,0 +1,46 @@ +{ stdenvNoCC +, lib +, fetchFromGitHub +, imagemagick +, nix-update-script +, pngquant +, python3Packages +, which +, zopfli +}: + +stdenvNoCC.mkDerivation rec { + pname = "whatsapp-emoji-linux"; + version = "2.22.8.79-1"; + + src = fetchFromGitHub { + rev = "refs/tags/${version}"; + owner = "dmlls"; + repo = "whatsapp-emoji-linux"; + hash = "sha256-AYdyNZYskBNT3v2wl+M0BAYi5piwmrVIDfucSZ3nfTE="; + }; + + makeFlags = [ + "PREFIX=$(out)" + ]; + + enableParallelBuilding = true; + + nativeBuildInputs = [ + imagemagick + pngquant + python3Packages.nototools + which + zopfli + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "WhatsApp Emoji for GNU/Linux"; + homepage = "https://github.com/dmlls/whatsapp-emoji-linux"; + maintainers = [ lib.maintainers.lucasew ]; + sourceProvenance = [ lib.sourceTypes.fromSource ]; + license = lib.licenses.unfree; + }; +} diff --git a/pkgs/data/icons/gnome-icon-theme/default.nix b/pkgs/data/icons/gnome-icon-theme/default.nix index 792519efc15bf..44b92c465bbef 100644 --- a/pkgs/data/icons/gnome-icon-theme/default.nix +++ b/pkgs/data/icons/gnome-icon-theme/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { dontDropIconThemeCache = true; - postInstall = '' + postInstall = lib.optionalString (!stdenv.hostPlatform.isMusl) '' # remove a tree of dirs with no files within rm -r "$out/share/locale" ''; diff --git a/pkgs/data/icons/numix-icon-theme-circle/default.nix b/pkgs/data/icons/numix-icon-theme-circle/default.nix index 8d6fbe4ff4b5e..3f48f5b22a820 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 @@ stdenvNoCC.mkDerivation rec { pname = "numix-icon-theme-circle"; - version = "23.04.05"; + version = "23.04.20"; src = fetchFromGitHub { owner = "numixproject"; repo = pname; rev = version; - sha256 = "sha256-eyTiAfwons/VDsNCNfYp4OR+U37LvTIh8Wfktie8PKU="; + sha256 = "sha256-pc5GwxU4KP6PktPvuCYVzJORVmMvC8GdBPr7QSN2cM0="; }; 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 0c64d55f06182..2dce715b68858 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 @@ stdenvNoCC.mkDerivation rec { pname = "numix-icon-theme-square"; - version = "23.04.05"; + version = "23.04.20"; src = fetchFromGitHub { owner = "numixproject"; repo = pname; rev = version; - sha256 = "sha256-fyb0qHmZev7kH8/q6mk2WPT30Szx1/jLIweq12eAIaw="; + sha256 = "sha256-O9itWigot15qljmPx4msBa7ucb4j+Wb08q5UTsF2sB8="; }; nativeBuildInputs = [ gtk3 ]; diff --git a/pkgs/data/icons/tela-circle-icon-theme/default.nix b/pkgs/data/icons/tela-circle-icon-theme/default.nix index eee3a425b709b..d5c29013c51a7 100644 --- a/pkgs/data/icons/tela-circle-icon-theme/default.nix +++ b/pkgs/data/icons/tela-circle-icon-theme/default.nix @@ -19,13 +19,13 @@ lib.checkListOfEnum "${pname}: color variants" [ "standard" "black" "blue" "brow stdenvNoCC.mkDerivation rec { inherit pname; - version = "2023-01-29"; + version = "2023-04-16"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "J3opK+5xGmV81ubA60BZw9+9IifylrRYo+5cRLWd6Xs="; + sha256 = "OHI/kT4HMlWUTxIeGXjtuIYBzQKM3XTGXuE9cviNDTM="; }; nativeBuildInputs = [ diff --git a/pkgs/data/misc/cldr-annotations/default.nix b/pkgs/data/misc/cldr-annotations/default.nix index 729d3cdbb7b89..6d06d49eb7115 100644 --- a/pkgs/data/misc/cldr-annotations/default.nix +++ b/pkgs/data/misc/cldr-annotations/default.nix @@ -2,12 +2,12 @@ stdenvNoCC.mkDerivation rec { pname = "cldr-annotations"; - version = "42.0"; + version = "43.0"; src = fetchzip { url = "https://unicode.org/Public/cldr/${lib.versions.major version}/cldr-common-${version}.zip"; stripRoot = false; - hash = "sha256-paRon3ecGXNp3ZDnN1DU9RVU2NDWTBiKjy0OP3vcPLE="; + hash = "sha256-L8ikzRpSw4mDCV79TiUqhPHWC0PmGi4i4He0OAB54R0="; }; installPhase = '' diff --git a/pkgs/data/misc/hackage/pin.json b/pkgs/data/misc/hackage/pin.json index d63e66d45f30a..91ec5b8a71d87 100644 --- a/pkgs/data/misc/hackage/pin.json +++ b/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "88252bfad2741817b521acc02a424b878264bf9f", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/88252bfad2741817b521acc02a424b878264bf9f.tar.gz", - "sha256": "00nc417r9xrknhmyjh3rfxlsbchizxicnbp98q63yb5czdapg4bm", - "msg": "Update from Hackage at 2023-04-13T09:45:26Z" + "commit": "67ecaa60725908a5bc562294a2c0e03e30858aa7", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/67ecaa60725908a5bc562294a2c0e03e30858aa7.tar.gz", + "sha256": "0yf0dliq65j5achg3iqz0hkf25jjkgxarsdsr5vl2r5h41n39qg3", + "msg": "Update from Hackage at 2023-04-18T09:14:41Z" } diff --git a/pkgs/data/misc/v2ray-geoip/default.nix b/pkgs/data/misc/v2ray-geoip/default.nix index 795da62e0a99b..12d108b271d00 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 = "202304130041"; + version = "202304200041"; src = fetchFromGitHub { owner = "v2fly"; repo = "geoip"; - rev = "0d55816db7bb2489333f38d05e30500a9730bd0b"; - sha256 = "sha256-W/Fcx282YWmxq+kVm5OxgC5a4mJhe0s0/NTROPJGGrw="; + rev = "7869655f0a2c9fd81d04e091b1c2657029b6e1f9"; + sha256 = "sha256-pgQU8gLErC9zo/GtwxHC2+4svFsxkgceV3IZPovVMo4="; }; installPhase = '' diff --git a/pkgs/data/themes/catppuccin-kde/default.nix b/pkgs/data/themes/catppuccin-kde/default.nix index b31b075a8fca0..9ce72c9b2ef81 100644 --- a/pkgs/data/themes/catppuccin-kde/default.nix +++ b/pkgs/data/themes/catppuccin-kde/default.nix @@ -1,24 +1,47 @@ { lib , stdenvNoCC , fetchFromGitHub +, flavour ? [ "frappe" ] +, accents ? [ "blue" ] +, winDecStyles ? [ "modern" ] }: +let + validFlavours = [ "mocha" "macchiato" "frappe" "latte" ]; + validAccents = [ "rosewater" "flamingo" "pink" "mauve" "red" "maroon" "peach" "yellow" "green" "teal" "sky" "sapphire" "blue" "lavender" ]; + validWinDecStyles = [ "modern" "classic" ]; + + installScript = ./install.sh; +in + + lib.checkListOfEnum "Invalid accent, valid accents are ${toString validAccents}" validAccents accents + lib.checkListOfEnum "Invalid flavour, valid flavours are ${toString validFlavours}" validFlavours flavour + lib.checkListOfEnum "Invalid window decoration style, valid styles are ${toString validWinDecStyles}" validWinDecStyles winDecStyles + stdenvNoCC.mkDerivation rec { pname = "kde"; - version = "unstable-2022-11-26"; + version = "0.2.4"; src = fetchFromGitHub { owner = "catppuccin"; repo = pname; - rev = "249df3ec0cdae79af379f4a10b802c50feac89ba"; - hash = "sha256-CH9GJnFqqdyIzW7VfGb3oB1YPULEZsfK3d1eyFALwKc="; + rev = "v${version}"; + hash = "sha256-w77lzeSisx/PPxctMJKIdRJenq0s8HwR8gLmgNh4SH8="; }; installPhase = '' - mkdir -p $out/share/{plasma/look-and-feel,color-schemes} - find . -type f -name "Catppuccin*.colors" -exec cp "{}" $out/share/color-schemes \; - find . -type f -name "*.tar.gz" -exec tar -xzf "{}" \; - cp -R Catppuccin-* $out/share/plasma/look-and-feel + runHook preInstall + + patchShebangs . + for WINDECSTYLE in ${toString winDecStyles}; do + for FLAVOUR in ${toString flavour}; do + for ACCENT in ${toString accents}; do + FLAVOUR=$FLAVOUR ACCENT=$ACCENT WINDECSTYLE=$WINDECSTYLE bash ${installScript} + done; + done; + done; + + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/data/themes/catppuccin-kde/install.sh b/pkgs/data/themes/catppuccin-kde/install.sh new file mode 100755 index 0000000000000..dec90274b450b --- /dev/null +++ b/pkgs/data/themes/catppuccin-kde/install.sh @@ -0,0 +1,263 @@ +COLORDIR=$out/share/color-schemes +AURORAEDIR=$out/share/aurorae/themes +LOOKANDFEELDIR=$out/share/plasma/look-and-feel +DESKTOPTHEMEDIR=$out/share/plasma/desktoptheme + +FLAVOUR=${FLAVOUR^} +ACCENT=${ACCENT^} +WINDECSTYLE=${WINDECSTYLE^} + +echo "Creating theme directories.." +mkdir -p $COLORDIR +mkdir -p $AURORAEDIR +mkdir -p $LOOKANDFEELDIR +mkdir -p $DESKTOPTHEMEDIR +mkdir ./dist + +# Sets accent based on the pallet selected (Best to fold this in your respective editor) +if [[ $ACCENT == "Rosewater" ]]; then + if [[ $FLAVOUR == "Mocha" ]]; then + ACCENTCOLOR=#f5e0dc + elif [[ $FLAVOUR == "Macchiato" ]]; then + ACCENTCOLOR=#f4dbd6 + elif [[ $FLAVOUR == "Frappe" ]]; then + ACCENTCOLOR=#f2d5cf + elif [[ $FLAVOUR == "Latte" ]]; then + ACCENTCOLOR=#dc8a78 + fi + echo "Accent Rosewater(1) was selected!" +elif [[ $ACCENT == "Flamingo" ]]; then + if [[ $FLAVOUR == "Mocha" ]]; then + ACCENTCOLOR=#f2cdcd + elif [[ $FLAVOUR == "Macchiato" ]]; then + ACCENTCOLOR=#f0c6c6 + elif [[ $FLAVOUR == "Frappe" ]]; then + ACCENTCOLOR=#eebebe + elif [[ $FLAVOUR == "Latte" ]]; then + ACCENTCOLOR=#dd7878 + fi + echo "Accent Flamingo(2) was selected!" + ACCENT="2" +elif [[ $ACCENT == "Pink" ]]; then + if [[ $FLAVOUR == "Mocha" ]]; then + ACCENTCOLOR=#f5c2e7 + elif [[ $FLAVOUR == "Macchiato" ]]; then + ACCENTCOLOR=#f5bde6 + elif [[ $FLAVOUR == "Frappe" ]]; then + ACCENTCOLOR=#f4b8e4 + elif [[ $FLAVOUR == "Latte" ]]; then + ACCENTCOLOR=#ea76cb + fi + echo "Accent Pink(3) was selected!" +elif [[ $ACCENT == "Mauve" ]]; then + if [[ $FLAVOUR == "Mocha" ]]; then + ACCENTCOLOR=#cba6f7 + elif [[ $FLAVOUR == "Macchiato" ]]; then + ACCENTCOLOR=#c6a0f6 + elif [[ $FLAVOUR == "Frappe" ]]; then + ACCENTCOLOR=#ca9ee6 + elif [[ $FLAVOUR == "Latte" ]]; then + ACCENTCOLOR=#8839ef + fi + echo "Accent Mauve(4) was selected!" +elif [[ $ACCENT == "Red" ]]; then + if [[ $FLAVOUR == "Mocha" ]]; then + ACCENTCOLOR=#f38ba8 + elif [[ $FLAVOUR == "Macchiato" ]]; then + ACCENTCOLOR=#ed8796 + elif [[ $FLAVOUR == "Frappe" ]]; then + ACCENTCOLOR=#e78284 + elif [[ $FLAVOUR == "Latte" ]]; then + ACCENTCOLOR=#d20f39 + fi + echo "Accent Red(5) was selected!" +elif [[ $ACCENT == "Maroon" ]]; then + if [[ $FLAVOUR == "Mocha" ]]; then + ACCENTCOLOR=#eba0ac + elif [[ $FLAVOUR == "Macchiato" ]]; then + ACCENTCOLOR=#ee99a0 + elif [[ $FLAVOUR == "Frappe" ]]; then + ACCENTCOLOR=#ea999c + elif [[ $FLAVOUR == "Latte" ]]; then + ACCENTCOLOR=#e64553 + fi + echo "Accent Maroon(6) was selected!" +elif [[ $ACCENT == "Peach" ]]; then + if [[ $FLAVOUR == "Mocha" ]]; then + ACCENTCOLOR=#fab387 + elif [[ $FLAVOUR == "Macchiato" ]]; then + ACCENTCOLOR=#f5a97f + elif [[ $FLAVOUR == "Frappe" ]]; then + ACCENTCOLOR=#ef9f76 + elif [[ $FLAVOUR == "Latte" ]]; then + ACCENTCOLOR=#fe640b + fi + echo "Accent Peach(7) was selected!" +elif [[ $ACCENT == "Yellow" ]]; then + if [[ $FLAVOUR == "Mocha" ]]; then + ACCENTCOLOR=#f9e2af + elif [[ $FLAVOUR == "Macchiato" ]]; then + ACCENTCOLOR=#eed49f + elif [[ $FLAVOUR == "Frappe" ]]; then + ACCENTCOLOR=#e5c890 + elif [[ $FLAVOUR == "Latte" ]]; then + ACCENTCOLOR=#df8e1d + fi + echo "Accent Yellow(8) was selected!" +elif [[ $ACCENT == "Green" ]]; then + if [[ $FLAVOUR == "Mocha" ]]; then + ACCENTCOLOR=#a6e3a1 + elif [[ $FLAVOUR == "Macchiato" ]]; then + ACCENTCOLOR=#a6da95 + elif [[ $FLAVOUR == "Frappe" ]]; then + ACCENTCOLOR=#a6d189 + elif [[ $FLAVOUR == "Latte" ]]; then + ACCENTCOLOR=#40a02b + fi + echo "Accent Green(9) was selected!" +elif [[ $ACCENT == "Teal" ]]; then + if [[ $FLAVOUR == "Mocha" ]]; then + ACCENTCOLOR=#94e2d5 + elif [[ $FLAVOUR == "Macchiato" ]]; then + ACCENTCOLOR=#8bd5ca + elif [[ $FLAVOUR == "Frappe" ]]; then + ACCENTCOLOR=#81c8be + elif [[ $FLAVOUR == "Latte" ]]; then + ACCENTCOLOR=#179299 + fi + echo "Accent Teal(10) was selected!" +elif [[ $ACCENT == "Sky" ]]; then + if [[ $FLAVOUR == "Mocha" ]]; then + ACCENTCOLOR=#89dceb + elif [[ $FLAVOUR == "Macchiato" ]]; then + ACCENTCOLOR=#91d7e3 + elif [[ $FLAVOUR == "Frappe" ]]; then + ACCENTCOLOR=#99d1db + elif [[ $FLAVOUR == "Latte" ]]; then + ACCENTCOLOR=#04a5e5 + fi + echo "Accent Sky(11) was selected!" +elif [[ $ACCENT == "Sapphire" ]]; then + if [[ $FLAVOUR == "Mocha" ]]; then + ACCENTCOLOR=#74c7ec + elif [[ $FLAVOUR == "Macchiato" ]]; then + ACCENTCOLOR=#7dc4e4 + elif [[ $FLAVOUR == "Frappe" ]]; then + ACCENTCOLOR=#85c1dc + elif [[ $FLAVOUR == "Latte" ]]; then + ACCENTCOLOR=#209fb5 + fi + echo "Accent Sapphire(12) was selected!" +elif [[ $ACCENT == "Blue" ]]; then + if [[ $FLAVOUR == "Mocha" ]]; then + ACCENTCOLOR=#89b4fa + elif [[ $FLAVOUR == "Macchiato" ]]; then + ACCENTCOLOR=#8aadf4 + elif [[ $FLAVOUR == "Frappe" ]]; then + ACCENTCOLOR=#8caaee + elif [[ $FLAVOUR == "Latte" ]]; then + ACCENTCOLOR=#1e66f5 + fi + echo "Accent Blue(13) was selected!" +elif [[ $ACCENT == "Lavender" ]]; then + if [[ $FLAVOUR == "Mocha" ]]; then + ACCENTCOLOR=#b4befe + elif [[ $FLAVOUR == "Macchiato" ]]; then + ACCENTCOLOR=#b7bdf8 + elif [[ $FLAVOUR == "Frappe" ]]; then + ACCENTCOLOR=#babbf1 + elif [[ $FLAVOUR == "Latte" ]]; then + ACCENTCOLOR=#7287fd + fi + echo "Accent Lavender(14) was selected!" +else echo "Not a valid accent" && exit +fi + +if [[ $WINDECSTYLE == "Modern" ]]; then + WINDECSTYLECODE=__aurorae__svg__Catppuccin$FLAVOUR-Modern +elif [[ $WINDECSTYLE == "Classic" ]]; then + WINDECSTYLECODE=__aurorae__svg__Catppuccin$FLAVOUR-Classic +fi + +function ModifyLightlyPlasma { + + rm -rf $DESKTOPTHEMEDIR/lightly-plasma-git/icons/* + rm -rf $DESKTOPTHEMEDIR/lightly-plasma-git/translucent + rm $DESKTOPTHEMEDIR/lightly-plasma-git/widgets/tabbar.svgz + rm $DESKTOPTHEMEDIR/lightly-plasma-git/dialogs/background.svgz + + # Copy Patches + cp $DESKTOPTHEMEDIR/lightly-plasma-git/solid/* $DESKTOPTHEMEDIR/lightly-plasma-git -Rf + cp ./Patches/glowbar.svg $DESKTOPTHEMEDIR/lightly-plasma-git/widgets -rf + cp ./Patches/background.svg $DESKTOPTHEMEDIR/lightly-plasma-git/widgets -rf + cp ./Patches/panel-background.svgz $DESKTOPTHEMEDIR/lightly-plasma-git/widgets + + # Modify description to state that it has been modified by the KDE Catppuccin Installer + sed -e s/A\ plasma\ style\ with\ close\ to\ the\ look\ of\ the\ newest\ Lightly./*MODIFIED\ BY\ CATPPUCCIN\ KDE\ INSTALLER*\ A\ plasma\ style\ with\ close\ to\ the\ look\ of\ the\ newest\ Lightly./g $DESKTOPTHEMEDIR/lightly-plasma-git/metadata.desktop >> $DESKTOPTHEMEDIR/lightly-plasma-git/newMetadata.desktop + cp -f $DESKTOPTHEMEDIR/metadata.desktop $DESKTOPTHEMEDIR/lightly-plasma-git/metadata.desktop && rm $DESKTOPTHEMEDIR/metadata.desktop +} + +function AuroraeInstall { + if [[ $WINDECSTYLE == "Modern" ]]; then + cp ./Resources/aurorae/Catppuccin$FLAVOUR-Modern $AURORAEDIR -r; + elif [[ $WINDECSTYLE == "Classic" ]]; then + cp ./Resources/aurorae/Catppuccin$FLAVOUR-Classic $AURORAEDIR -r; + fi +} + +function BuildColorscheme { + # Add Metadata & Replace Accent in colors file + sed -e s/--accentColor/$ACCENTCOLOR/g -e s/--flavour/$FLAVOUR/g -e s/--accentName/$ACCENT/g ./Resources/base.colors > ./dist/base.colors + # Hydrate Metadata with Pallet + Accent Info + sed -e s/--accentName/$ACCENT/g -e s/--flavour/$FLAVOUR/g ./Resources/metadata.desktop > ./dist/Catppuccin-$FLAVOUR-$ACCENT/metadata.desktop + # Modify 'defaults' to set the correct Aurorae Theme + sed -e s/--accentName/$ACCENT/g -e s/--flavour/$FLAVOUR/g -e s/--aurorae/$WINDECSTYLECODE/g ./Resources/defaults > ./dist/Catppuccin-$FLAVOUR-$ACCENT/contents/defaults + # Hydrate Dummy colors according to Pallet + FLAVOURNAME=$FLAVOUR ACCENTNAME=$ACCENT ./Installer/color-build.sh -o ./dist/Catppuccin$FLAVOUR$ACCENT.colors -s ./dist/base.colors +} + +function BuildSplashScreen { + # Hydrate Dummy colors according to Pallet + FLAVOURNAME=$FLAVOUR ./Installer/color-build.sh -s ./Resources/splash/images/busywidget.svg -o ./dist/$GLOBALTHEMENAME/contents/splash/images/_busywidget.svg + # Replace Accent in colors file + sed ./dist/$GLOBALTHEMENAME/contents/splash/images/_busywidget.svg -e s/REPLACE--ACCENT/$ACCENTCOLOR/g > ./dist/$GLOBALTHEMENAME/contents/splash/images/busywidget.svg + # Cleanup temporary file + rm ./dist/$GLOBALTHEMENAME/contents/splash/images/_busywidget.svg + # Hydrate Dummy colors according to Pallet (QML file) + FLAVOURNAME=$FLAVOUR ./Installer/color-build.sh -s ./Resources/splash/Splash.qml -o ./dist/$GLOBALTHEMENAME/contents/splash/Splash.qml + # Add CTP Logo + # TODO: Switch between latte & mocha logo based on Pallet + cp ./Resources/splash/images/Logo.png ./dist/$GLOBALTHEMENAME/contents/splash/images +} + +# Prepare Global Theme Folder +GLOBALTHEMENAME="Catppuccin-$FLAVOUR-$ACCENT" +cp -r ./Resources/Catppuccin-$FLAVOUR-Global ./dist/$GLOBALTHEMENAME +mkdir -p ./dist/$GLOBALTHEMENAME/contents/splash/images + +# Build SplashScreen +echo "Building SplashScreen.." +BuildSplashScreen + +# Build Colorscheme +echo "Building Colorscheme.." +# Generate Color scheme +BuildColorscheme + +# Install Colorscheme +echo "Installing Colorscheme.." +mv ./dist/Catppuccin$FLAVOUR$ACCENT.colors $COLORDIR + +# Install Global Theme. +echo "Installing Global Theme.." +cp -r ./dist/$GLOBALTHEMENAME $LOOKANDFEELDIR + +# echo "Modifying lightly plasma theme.." +# ModifyLightlyPlasma + +echo "Installing aurorae theme.." +AuroraeInstall + +# Cleanup +echo "Cleaning up.." +rm -rf ./dist diff --git a/pkgs/data/themes/numix-solarized/default.nix b/pkgs/data/themes/numix-solarized/default.nix index efc8236c45146..af06075de7d33 100644 --- a/pkgs/data/themes/numix-solarized/default.nix +++ b/pkgs/data/themes/numix-solarized/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "numix-solarized-gtk-theme"; - version = "20210831"; + version = "20230408"; src = fetchFromGitHub { owner = "Ferdi265"; repo = pname; rev = version; - sha256 = "1q8qhpw0hfv625sm626zp4vbz2106b0g5m11ygk87s6kbxrfg6lr"; + sha256 = "sha256-r5xCe8Ew+/SuCUaZ0yjlumORTy/y1VwbQQjQ6uEyGsY="; }; nativeBuildInputs = [ python3 sassc glib gdk-pixbuf inkscape ]; diff --git a/pkgs/data/themes/qogir/default.nix b/pkgs/data/themes/qogir/default.nix index 0685c55a5486e..efbe4ac122c08 100644 --- a/pkgs/data/themes/qogir/default.nix +++ b/pkgs/data/themes/qogir/default.nix @@ -24,13 +24,13 @@ lib.checkListOfEnum "${pname}: tweaks" [ "image" "square" "round" ] tweaks stdenv.mkDerivation rec { inherit pname; - version = "2022-11-09"; + version = "2023-02-27"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "VmMlebERe6LDyfD/lo8o4TvNrJ37m2OHC25JkUc6sig="; + sha256 = "oBUBSPlOCBEaRRFK5ZyoGlk+gwcE8LtdwxvL+iTfuMA="; }; nativeBuildInputs = [ @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Flat Design theme for GTK based desktop environments"; - homepage = "https://vinceliuice.github.io/Qogir-theme"; + homepage = "https://github.com/vinceliuice/Qogir-theme"; license = licenses.gpl3Only; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; |