Merge branch 'master' into staging-next

3 files changed, 95 insertions, 95 deletions

diff --git a/pkgs/data/fonts/iosevka/bin.nix b/pkgs/data/fonts/iosevka/bin.nix
index 62259c16efb44..37fe1795bfa1b 100644
--- a/pkgs/data/fonts/iosevka/bin.nix
+++ b/pkgs/data/fonts/iosevka/bin.nix
@@ -17,7 +17,7 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "${name}-bin";
-  version = "30.2.0";
+  version = "30.3.0";
 
   src = fetchurl {
     url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/PkgTTC-${name}-${version}.zip";
diff --git a/pkgs/data/fonts/iosevka/variants.nix b/pkgs/data/fonts/iosevka/variants.nix
index 19ef53dff48b6..26a4439c4dc57 100644
--- a/pkgs/data/fonts/iosevka/variants.nix
+++ b/pkgs/data/fonts/iosevka/variants.nix
@@ -1,93 +1,93 @@
 # This file was autogenerated. DO NOT EDIT!
 {
-  Iosevka = "16pmskxrr94cgjlqs4rsqqb9mqfaz5m79m6pch3lmivnjrvivg7g";
-  IosevkaAile = "1sxm7lbcxvfadasqq17n379gnbivsmgxkkh8fhdymajzk71y6vhn";
-  IosevkaCurly = "1na30nz2drdig4gvj8l76j2yhz3xggz8vhhmgjxbhq21qwv3lp6m";
-  IosevkaCurlySlab = "0h58sj249nlwsi97mxs27mqn3brqcfg4ph7z8xlyxnxvgc76yz88";
-  IosevkaEtoile = "1nvk1gk0jawnf1v0smrffy1f9v1jwkvg5ah86szwakjmlb4mqr81";
-  IosevkaSlab = "0farri44jsrb0jjj2vlgc5p17nsz9agfa89xpnjw0njccipd95nj";
-  IosevkaSS01 = "0ar951n923nfgyh4d040m0jkyks0csrvcgkbr2ki32qgijz1kf26";
-  IosevkaSS02 = "13f20484xjc28ihx8705ms904n78qp5qq41jmlllbmgdycipba2z";
-  IosevkaSS03 = "1kb7z5bcisx3k02wa682ikynh4s2vv5w7y1zs6qk7gy4gmhaxrhn";
-  IosevkaSS04 = "0ga88f71y517qjb6dskhr8zdhflkl5bvafhv79wgbfffmqk4vpi5";
-  IosevkaSS05 = "0fly6i9irqk092q89irg4yld3s5dx6k03yvibkkrybf369mjzx2h";
-  IosevkaSS06 = "1j8j75468bncksfyf724yc00q5kcddp6q7kmjhnalxg69qjrpkzr";
-  IosevkaSS07 = "03nm4rci5iscrlhncqdhcfcqkvgglg4hxh49yz5n5jcihci10q51";
-  IosevkaSS08 = "0wd8bfra1da2g0c46qxjrjgx25c6mln4a0dxmal8bn1jk3glq1cb";
-  IosevkaSS09 = "0sdw5s1ajbm6fd59xy5ap04s1g89sci2kvq5xfv695744g47lf4m";
-  IosevkaSS10 = "1a9mfrszmv0vlwmjaznwdjgj8c3nippbj6n8py8ld72krs19l8hd";
-  IosevkaSS11 = "0nnvaijqxh8qw88xw1i6migx8skqmq4rs5kls9kwjzy44wvgyly1";
-  IosevkaSS12 = "06jrc9x3z43bdl3wmlfn4ai085p1ymv4wcb85qljzqq12c6adgy5";
-  IosevkaSS13 = "1b18liyi90jy8ca5b9f6p2j8vvl1d8dvvhcxdi30km27s84i8psc";
-  IosevkaSS14 = "15vnsnw21a09y4pzc37x5xizcyc68wj7vr4x6k33iv341m357149";
-  IosevkaSS15 = "1vi4fkzk412g3qn1ba5g9r69k36i66n8xgymf14lf8y1wah46020";
-  IosevkaSS16 = "0cj0j4kjz0fs629pimmhg1jqsxmmsr2m143j0m7nyjf4y4pdkpnm";
-  IosevkaSS17 = "15v6m9wnkr366v1d9cbf9w7zz56x7qrz3265minaslx97lkplv1c";
-  IosevkaSS18 = "0syh5lb9mymvmzn2sv0msncqblg8xx3akarbn2gdv5nb41p3d0hq";
-  SGr-Iosevka = "1k76yvjr7ydzhl4vv4vp5qbchz0dj88s3d87rz6axsrc188xrbak";
-  SGr-IosevkaCurly = "0wajxb8n3i0xr2figxx9p5anc6azqww6n374m301n6b6ln51bvcd";
-  SGr-IosevkaCurlySlab = "05p38bzsqi5ip0y4rzg9fn79dximw0b1657ji956hw0kc37qqbr3";
-  SGr-IosevkaFixed = "1g7asaiwzd26rpfnbg1ndbfljigbpw38fc4fyjdww3388fq82x3m";
-  SGr-IosevkaFixedCurly = "0zwbpk1gm5s4shw8drx45hy31vzkgkcdqky4pw9n6vm61nc9sn1l";
-  SGr-IosevkaFixedCurlySlab = "0rrl3pw8kcipbxib6z45scwnhxjg6b6yqmdrdsah8bl90xlrc1lz";
-  SGr-IosevkaFixedSlab = "0rb009pd2q0azyla974s3a8knlvqq6v8kipsms6s99f7d9x9r9rq";
-  SGr-IosevkaFixedSS01 = "1i9ph67brswkszr0fd7h5najrcy5nf1qap926z8gkcj45c4gqb84";
-  SGr-IosevkaFixedSS02 = "0qfxad184zisq31y60h6y2wdxvnlb3ln0s4290bb1j3hwzvdb595";
-  SGr-IosevkaFixedSS03 = "1d47z3ibpb3qdp5hxvbh8dw9h1mz5b2a6xk2m6rgansml2wzg193";
-  SGr-IosevkaFixedSS04 = "15m34521y7w33qn7mxw6kvng6i0pbz5sldh0m2hj114ikdzsh5av";
-  SGr-IosevkaFixedSS05 = "0pkq6w7riy7hgq2h0m12vnbn8qawsjn6bb613wdl3cnnqfnsh9lw";
-  SGr-IosevkaFixedSS06 = "0bkdc3kc92s2nqqpd56j1llb9wlv11kj4dvw86n0646y18cg4g1r";
-  SGr-IosevkaFixedSS07 = "1vg393dzmhypl4qwx519y9ybwy8m8222chdw4cjhhv9kay6n6mak";
-  SGr-IosevkaFixedSS08 = "0f7l5qpwqwvy2lryv0vhq2zi06f5z9cbgq55ax40vqgaic2jygpr";
-  SGr-IosevkaFixedSS09 = "08a7b72lkpzyvzn2wari2hsp3r69hhb48dpq83c1vyi9sh3vw4wz";
-  SGr-IosevkaFixedSS10 = "1z72krj7cpyqnvbls3k30x68qff5rh5qm5fghw19kcsi6czvfqfd";
-  SGr-IosevkaFixedSS11 = "0nr95yz5rkqw6a5bal83qkc5hdfs7x3vbz382hwci3wlid9iwrn4";
-  SGr-IosevkaFixedSS12 = "1nhjwlxdxjafcsnqgrl8nrbccfmvhmc6is79zhh9lwqi0kjnim58";
-  SGr-IosevkaFixedSS13 = "0mwmf6q3krwzff1wqwky8csylslh109axl2k1rdra2skvpyaiv0h";
-  SGr-IosevkaFixedSS14 = "1nd5b829qg90wg393m6b1681lbn7fmcszssm2zv1bwwyz07j9s6r";
-  SGr-IosevkaFixedSS15 = "02bfbj52bx2jy15n0dzqifcfg44qb9gx41qpz07rd52j7dscdxzh";
-  SGr-IosevkaFixedSS16 = "1w9p08dcxj6mhym1hg0mphm3qiw72a25a6czzys9wdgzkhd0iy0r";
-  SGr-IosevkaFixedSS17 = "0j10k0j3chnv0gmwx82nl13rdixfrbqdkjdhlx6lkfn8ifxwgd6p";
-  SGr-IosevkaFixedSS18 = "0w3c35jjyyaf6983d3rsgawbymk7qy721r7g8diwgasxh73cbr3q";
-  SGr-IosevkaSlab = "0jd5zhmrw6mpa198zrn4hlisi88caz36g2vs0b8dy5ivnmda852v";
-  SGr-IosevkaSS01 = "1228z9vnqsmzjdbp4ym8hqqx2iis7cf2jw2nir04sd8vzjyxj8jy";
-  SGr-IosevkaSS02 = "170xvgis66ikrf5ss2q32k22xfsfqh20fkg80g68dqfigy61mzp6";
-  SGr-IosevkaSS03 = "0ld2k9krg5xr4zn7fnbvf08md4kbm0b2lv5vzvjn68n10jmhhyf5";
-  SGr-IosevkaSS04 = "1a9d5nihfx2jydi986g8l0nlds3i0vk3c4av2jjyz5d1igfbibiw";
-  SGr-IosevkaSS05 = "15m90fc038k74qrqa5cwxj8mkny056ry16az9m1ysqp20mficf94";
-  SGr-IosevkaSS06 = "0qf7k6r5g1hqljkz3wswh7fqamxz67fn9afiaaaxq811lpp4430w";
-  SGr-IosevkaSS07 = "118gnf2ybx7zy87am00z2lpgis2zy1bq95c7a6whcf8xmfcf8a8a";
-  SGr-IosevkaSS08 = "15ab04a6k2g1lzn0lgar4pl8jalirhvq31w8sn66h8xjlwbazij4";
-  SGr-IosevkaSS09 = "0fa6krkj6fz132b80yshxa28yprbkm0mdj5wzlbm043qldnv4rl4";
-  SGr-IosevkaSS10 = "1ks28j176r59vj8ic30hzb8kqyr50sphlmmj52qn4xa7kyljbzav";
-  SGr-IosevkaSS11 = "1lc4rc067r4ayacxrg9hx4xxaxg1yfmvl0cy0z9h5b8d2p8ybr29";
-  SGr-IosevkaSS12 = "1sm75ssbximnk5yjczyvvmv664lf2qw9nqskw91mhp1bmr6jysms";
-  SGr-IosevkaSS13 = "0s3f8rzmzaf1qrb3ydr6f6mm0avmagksrlqna83vrr8lmj3010v3";
-  SGr-IosevkaSS14 = "13wc6nrndwzg31djsc2zhh98m16l6fw65h8i8kksqq2f5yn2dcps";
-  SGr-IosevkaSS15 = "13sfr8lg6xwjb3vrd89lgc267ymjg785y0m6kayrjwzy03cr60hl";
-  SGr-IosevkaSS16 = "040gn02mk4nbrna4p7ygkcjass61v9k3yvhskgyxyi8jj7zv9lps";
-  SGr-IosevkaSS17 = "1sa5gki3qgj9x2xqyixj7kwy1sr04x3q0d3bk6dlxkx5vm4q1ikr";
-  SGr-IosevkaSS18 = "00j5wag0db13s257iny7wf107409agr7w2wkqgnzdp17b0d0y93y";
-  SGr-IosevkaTerm = "02dig9zq2xlpjwn4qkxs13i3pbz9wxf0jcp5cl5lx3dyl6s0yz5w";
-  SGr-IosevkaTermCurly = "1r2zl2yxw2kdz015350p920i794r6d7jikg2x7vmxam6qdr235b7";
-  SGr-IosevkaTermCurlySlab = "10smqh4wpqrayyy231fqqa69ycwvd1zkx69gpyxmksxp6vz1a92k";
-  SGr-IosevkaTermSlab = "11qcg9k1lh6v9gbyb20qxqmp945r884zqhfvn5i56lfbhk8s5kv8";
-  SGr-IosevkaTermSS01 = "1i0qdhk120dxp7wrp49vpill9dp8gw5jj9k3bfwvxs9169dac9a2";
-  SGr-IosevkaTermSS02 = "0rlmn86kf2rjk3fg6znw92chfvkyw2cxiixwkyv04ghwad2wfj5w";
-  SGr-IosevkaTermSS03 = "1njmx0vz7d9k911fmbl2bpdx8z1nxl724lfq4vi485yqpin0r2m6";
-  SGr-IosevkaTermSS04 = "1s5j2hnl9ni5vc79rbaif5vad8mdqym7cws46jkk13a7r7fm4v2i";
-  SGr-IosevkaTermSS05 = "1sr4x3jq2j2z5g1jh8qbxdlx5m35h23akyrh8prisqv4v5l0q4xr";
-  SGr-IosevkaTermSS06 = "1wx2dqd8y4823jb9hq7gigam15jxidclsy5syqpr1a7h9ylx54jh";
-  SGr-IosevkaTermSS07 = "021nmgixl6cbl4mh5r0w5zahn2nh6jpk06x57yqapzdvgx4fww8w";
-  SGr-IosevkaTermSS08 = "1vc9632dqsvy8ffpi1a3bgc40ng4sczwvjax0gdkvfshwc2bxf9x";
-  SGr-IosevkaTermSS09 = "0k55yj8vq0q9v5rl62brj3zwfrmz16yxdy3k2wg1vsh3ysa8ih6p";
-  SGr-IosevkaTermSS10 = "0v628akln3ij6wcwkhfdsrhxgn05ilkprwif88bxyxrrlxwj1d0n";
-  SGr-IosevkaTermSS11 = "10h9cyk532xjmnlaaaj7l82gvvmdh6p9gvmjz0cr15s6mmzp5l9z";
-  SGr-IosevkaTermSS12 = "1ha0hi9zkl6khyjka99ix1c7wsfdc3ar33312x9pk89zha7sc5gh";
-  SGr-IosevkaTermSS13 = "0157y4wdnb7vrqk4qgbchvxrh8986xqpf2af9h4dh6nbvyai6dpf";
-  SGr-IosevkaTermSS14 = "10dsldq9gh8h2402xy4hx86715r6l7y8jfww65721jlwf081fqkn";
-  SGr-IosevkaTermSS15 = "1h68804jn7wyggqz8bn7cfjjkp16ay0ywhffnprgnj4z33dv1431";
-  SGr-IosevkaTermSS16 = "1lrclnhwzq1nlfrfhrsh1zkika7170y7c5miywra7wzzvjhsciwh";
-  SGr-IosevkaTermSS17 = "109gnqymr98bb8bpckk0j205wp8b36zv4956z2x4lwqn1qxxq80r";
-  SGr-IosevkaTermSS18 = "19al3fw5iayssikilk9x5apya74b63q84yyfz03ikss01z6170gm";
+  Iosevka = "10vg87ifnx48vxmrcn0nz43lri10dzpgl24qfaj6vg1nwbywag3c";
+  IosevkaAile = "1gym03y63x92vzisdy2x9sx3qbxvvpd70q6krlfp5zf7d3cph7fg";
+  IosevkaCurly = "0bvdp99ybv0agx4n2qn78jsv8x8m86i44zvgp2h93lnji6dv67s7";
+  IosevkaCurlySlab = "1mskl851z5wp3wwsxapbnq3gaarnmh4if0q6m7y3wb0c18s18f92";
+  IosevkaEtoile = "10ccailwfmfjxzvk9lbns989dixqjbfdkw5j3fdkxvny07qviq54";
+  IosevkaSlab = "0wnmm8hm4mis0pbqfma3qcd3rx08wgqi4f6ixg58vd9ds7a7rg8f";
+  IosevkaSS01 = "19fhvx7r48mkzgadzpf1dh9w331cnjig70kyw8jzib9rlhca7y38";
+  IosevkaSS02 = "0idwdmnfgq88l2rhlmlqkfbkrqhz35jqp902qc18sdwprwmj7kpz";
+  IosevkaSS03 = "17scd42b67fylh5ws463793p3lakxhip8vfdk0z85z27x0yg97cc";
+  IosevkaSS04 = "0p2bqkxnghkmvk84nb30vn3wl1ivfzb9s508hm0m3nzgj67mljf0";
+  IosevkaSS05 = "0d6jfp83wcwx6v3rizss6z43kainv5zlrnsaya1m1n7qmpxgrj3p";
+  IosevkaSS06 = "1b7s6ki4k0qqszznmsgf28vhqmx8vr3d1glbb87vqzgm59hfpcyk";
+  IosevkaSS07 = "0hzf4byciw745gwzgr88pb5plaxrml5av4af84dw7qp1j4wzbamd";
+  IosevkaSS08 = "0yismsjpgmb9s5rfvp4bz4dym48885pl7gf2mcv9dxwcly4wax5j";
+  IosevkaSS09 = "1zcylrrs2q5w6160hd160ismmhjm835ki2j5r3axxzas9va6la4z";
+  IosevkaSS10 = "0vh5nax33i0drw86vp2l13p5g13dfcc2py794spjda72pkdzvfiy";
+  IosevkaSS11 = "12iw2vl0pz1bj2wnqjf9471rbg8bqrym56ziimdzknv5id033fbs";
+  IosevkaSS12 = "017ipava1n37lyxd3a11rnabjjv28l975h1c2l2nramaqqa5pszx";
+  IosevkaSS13 = "16mk6dc6rn362m1432fklllaqjadnlbdhl3faddlrf3mklwm1wlc";
+  IosevkaSS14 = "0gzl2r4g3xn6y349wvr572s8cvc0cn7zyfp0s88pmnj632i5y0d9";
+  IosevkaSS15 = "0rr15v2gyn01k4l4wq7w7fd3vqssnk03nf7zj4nf8f1az7dxskmh";
+  IosevkaSS16 = "17l32p6yx888g4dgkbw8nj54d4a3b8rnqb5w2vaiickns851yh9c";
+  IosevkaSS17 = "1rsrqbw1azwl0j0h88zlvsc0q0rlamw8j3kz910nsk3l4b8nicy4";
+  IosevkaSS18 = "0l42b9zwm6xddf69lp1z273md3008a9gz8dnvf09ig6bmw1vp1rk";
+  SGr-Iosevka = "0yda9880sg7jk5j1n36ji4w68l24s9prpaniya0jjyprylwfs7sh";
+  SGr-IosevkaCurly = "1q2kmzjgxkhqwrai1zn3nhv0rf4xfi2f93j3w9zwlqc15v7ngn38";
+  SGr-IosevkaCurlySlab = "1j170hxlk168hspnip9qvwjp44jb7i15swia8xy7ccb7jh6x28c8";
+  SGr-IosevkaFixed = "1gmgwwa5rfqclncal5mir2iksirxzfjmfbcpn7qn4qhq9wms1j7x";
+  SGr-IosevkaFixedCurly = "1ici7jgfzm4ivxvz6890r2ij3r686m9ikd0wy60bh13gp09h16dw";
+  SGr-IosevkaFixedCurlySlab = "1cfkxcbdfaq0pk7ikdzqmkq1zwc542kzsc4rrns8sd9j2qzdi1bk";
+  SGr-IosevkaFixedSlab = "0fvkcdfkzzc8dsx0cwcdk1l8qdaadnxdghkv6s8xdsj2q47dk20b";
+  SGr-IosevkaFixedSS01 = "1j3v88j7a3r01a2q0g41k5w1dfy58igx2bvs0rlngvrhcyphdp4b";
+  SGr-IosevkaFixedSS02 = "02sj966nsr9ck4kl77319lxikly96k83r27hxdyfhxmig7q4965l";
+  SGr-IosevkaFixedSS03 = "1c50zshmg09g7z3zzdkdmj7slpvj59nl40k2dxwrldnyfvjpzxvb";
+  SGr-IosevkaFixedSS04 = "03jb49rgx06wm13mb2b8gg6xpfj9nh8yh49ki8ybb4ivwmym3pfg";
+  SGr-IosevkaFixedSS05 = "0ng7kmq8x4dllgbv7xnw0s5cnigm71q65vbszfdda6dzkgf0vhxz";
+  SGr-IosevkaFixedSS06 = "021330rsnbnizxp36aaq4478vdi378vfypsan58k8cnl4nfsqygf";
+  SGr-IosevkaFixedSS07 = "1b07d7srv6is7rx9f2hxd45jjg3yi07hr3xxqk0sssa0i8x79r85";
+  SGr-IosevkaFixedSS08 = "00jihg0hks0aqqa4m6cgq7p5anpvhn1jr16rh4iycxc8m22wh90i";
+  SGr-IosevkaFixedSS09 = "0m1j23wrgh56avcgl22lff4jqzhajcwwx7f56wh4kc173d1r8k9m";
+  SGr-IosevkaFixedSS10 = "0g9g2bxl51y9rd3ag3vy0aslz3pw6f21mhpxyshcjl3558yqqly8";
+  SGr-IosevkaFixedSS11 = "0h0wayawf7hf4vda5widcm92lfwrhb26kb258xs6w5vqc8vp3g96";
+  SGr-IosevkaFixedSS12 = "0g6b0f6wsv0sgpdip2la44wxm3xxyxaq95vj9jiw43pdhrm2q5nz";
+  SGr-IosevkaFixedSS13 = "0hzs4svcb8scnag1822vgx4fsrg684nl56wxgmlp6db5121p6xlx";
+  SGr-IosevkaFixedSS14 = "09xlcsajfrwz2ji0klzp534vwp94wfawl2ixcc9x0whira867zbc";
+  SGr-IosevkaFixedSS15 = "0pzjw32ffqsbw51msnr62b87hlqlpwz6nk98wy69dixx5jjqiv9c";
+  SGr-IosevkaFixedSS16 = "04hcm1xb58qbsxf93qp18j4xk0x0ir1gmc1mz80xy38kvdn2l33h";
+  SGr-IosevkaFixedSS17 = "0n8l3a5hmy907c1ysn8a6ada2v3wgb1pcv2bbdrzklcic0ww1zj8";
+  SGr-IosevkaFixedSS18 = "0gjw1qk2ygxnd91vd107biarzrpfxpc3hflwa3aqpaga1qxc3f4p";
+  SGr-IosevkaSlab = "18v5yayks1mnag9avgdslih8j9j8z9f4ygwjjs2mwwws547m9438";
+  SGr-IosevkaSS01 = "188j0i31bzzyqzqly4hxbil5q9ccnv444285bv84vn9wivqgc44p";
+  SGr-IosevkaSS02 = "052h4w9n8anfsjmh3q8i4aycg0qfx1l59wy7ag0fncl8r2ynw95m";
+  SGr-IosevkaSS03 = "0d2xg6l63sp6yrb2vjh4wbb5jfw2ad8dm9f8hbigs5yqvb3762if";
+  SGr-IosevkaSS04 = "0r08iay0i8z2hsp154j9grvyd3k2njjmad35q1h6yxmhawz63hzg";
+  SGr-IosevkaSS05 = "0ds2cf96d9nbjhj5qj319a8pg162ia48rx2dk6kd019ijgciwcqf";
+  SGr-IosevkaSS06 = "0a7vvplb39szmfj46fx1g5rql60my02akn37hrb228bcnrrhcskx";
+  SGr-IosevkaSS07 = "1mar641pj2g9f9ap88j28zbmw7p015dahh35395720x7f7jk9y2b";
+  SGr-IosevkaSS08 = "05y7ixzgngszkdrh1bv7idp0hwlrb4gn0sjl9m3hddd9rxs5bjqn";
+  SGr-IosevkaSS09 = "1c83aiqqdcscgdih4m119jk6805j06jk6sn87dd81aybm0rdir13";
+  SGr-IosevkaSS10 = "145d699f4s8z01fwdssmhcc60n6s84sd156yy17jgspazgp227mv";
+  SGr-IosevkaSS11 = "0sqj7dbdk74ahxi17bdydqkyrdm3si2zr0q7fl8lj5v61x8kxg5g";
+  SGr-IosevkaSS12 = "0l4ym9gr2d53hifhvf76r0w1s1rwxkniv9fgdb65saj6a2vd49f4";
+  SGr-IosevkaSS13 = "03ygs3bj65mzyn9hyd663wc19a9jr6g11l9gdr8qn54v38g0brdb";
+  SGr-IosevkaSS14 = "1pwwhnhjbswgyjmn54jnnz4vb4zvzc891vpd8lc029g0h80zm0j8";
+  SGr-IosevkaSS15 = "0qa7m038d5vjrfxwmm9pvcs0r63ahqz1hxgv13bik4p2bifbq361";
+  SGr-IosevkaSS16 = "12wpv1cjks0zxrv4a3fvsqzmwqk8rwrjxwc00dhl5rhgkk1mn51f";
+  SGr-IosevkaSS17 = "04n13qlxiavzax85lrl5dr2a7wlqk1yjyl274hsjrw7cxghjjd30";
+  SGr-IosevkaSS18 = "0ymh6vgs9gcsv2l7hx66gplq1x60hy582iwy33w3kp9nvinxm21k";
+  SGr-IosevkaTerm = "17a1rv7awksy3fjs3m6qj365js4572wm1f0yy8qbkk0lv7bn1dd7";
+  SGr-IosevkaTermCurly = "1cdm79fbb21jl4bdw2im961cfskf104gzkv9riliw1b7vkrfxl1n";
+  SGr-IosevkaTermCurlySlab = "0ykn3d72az3sgn35vr2vf5d70l10spmhli05s7sk68y669g0z5jb";
+  SGr-IosevkaTermSlab = "0sxzcpnh8xykk09kk3sdm0pxqmr48cc0k8cyx0s94adwr9hg4dl7";
+  SGr-IosevkaTermSS01 = "1rr9i5hq2zz66abdavpwg4mpbhf5wl463bdy7xnjnqpbpj766f90";
+  SGr-IosevkaTermSS02 = "1nzadff8ml61z3fa2b0hrla0dz02hjk68p0byzahn5hr9cgc1v4j";
+  SGr-IosevkaTermSS03 = "0f8axrzy8skxzsnfkb16vbbjww152npqhd7y73vzcqn8r90ngs53";
+  SGr-IosevkaTermSS04 = "1i37y1nsfhm27vga6d7av5986qyvwscnmlbrskdrbrhl7sg12yb2";
+  SGr-IosevkaTermSS05 = "0i3aidf3p5dqlpkrz595nxr6ljj94nzwg7cmdmy3c6685050bk35";
+  SGr-IosevkaTermSS06 = "08jdfpa9sm0vwrz7vgz5rib2wj26jdp9lry9gj4g3iins6f41vwq";
+  SGr-IosevkaTermSS07 = "1gjp6yfq6licmhkqf5ag8ldynjxfa7lbaad10cv56frqkkg85v4c";
+  SGr-IosevkaTermSS08 = "1w8vxwxvpadf82sv7p56hc75lllp09ygm2k5rw6s5iyx580w4m6h";
+  SGr-IosevkaTermSS09 = "1d1jvgd5wy1bwlmd0gqdjpqz4611dr27gf6kh8i65q24sbjk4mw8";
+  SGr-IosevkaTermSS10 = "07r63vr3yqfssqkc8icj7qyrk80i9jnx295i254ianknbmjd8991";
+  SGr-IosevkaTermSS11 = "1vqpsl0yk3cgrc40rf0mm4v9q30c6y5c858g7piibcj3bp2adi8z";
+  SGr-IosevkaTermSS12 = "1i4ngsxwj82hz4vqla1pr3i7xkhnq872k0f91pvbz63fyi8ij7sy";
+  SGr-IosevkaTermSS13 = "1pf36mlndldl01jgbza5jjlf12mqxqwzr7j3zx4vp587yjf6iqap";
+  SGr-IosevkaTermSS14 = "1nv3gdpfdwc2pci130kj1n2890b1lnbczgw826cdpp3w7spxs04f";
+  SGr-IosevkaTermSS15 = "1xj9q80v0n65nn7zxnckdmc23bb3458v6pv8f36ynj3icbb645zj";
+  SGr-IosevkaTermSS16 = "0gxk5bfaq1g7is8n7l60iv6hhygx4i3b9j8zxq5svybhmg4malnk";
+  SGr-IosevkaTermSS17 = "00kvld6l6mzp5bbygwq4sy3f262jb295kyk8nq9gwvamg92md7hc";
+  SGr-IosevkaTermSS18 = "0dzzfc8y7wgz727z3p5zdd5g25y6h1d5y1aflnz4r2grg5rv6kvp";
 }
diff --git a/pkgs/data/themes/marwaita/default.nix b/pkgs/data/themes/marwaita/default.nix
index a16cf43cfe29b..9b279bba3aff7 100644
--- a/pkgs/data/themes/marwaita/default.nix
+++ b/pkgs/data/themes/marwaita/default.nix
@@ -1,5 +1,5 @@
 { lib
-, stdenv
+, stdenvNoCC
 , fetchFromGitHub
 , gdk-pixbuf
 , gtk-engine-murrine
@@ -8,15 +8,15 @@
 , gitUpdater
 }:
 
-stdenv.mkDerivation rec {
+stdenvNoCC.mkDerivation rec {
   pname = "marwaita";
-  version = "17";
+  version = "20.1";
 
   src = fetchFromGitHub {
     owner = "darkomarko42";
     repo = pname;
     rev = version;
-    sha256 = "sha256-9yPgcWtk8w2AyOav1sfQFuH8wnX37ho836NgUnQbFRE=";
+    hash = "sha256-3kVfZnqRJs0CPl+EICDjg2+NSwuz18QccHx63cVLpFY=";
   };
 
   buildInputs = [