Merge commit '63678e9f3d3afecfeafa0acead6239cdb447574c' into HEAD

Conflicts:
	nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix

8 files changed, 143 insertions, 177 deletions

diff --git a/nixpkgs/pkgs/data/fonts/iosevka/bin.nix b/nixpkgs/pkgs/data/fonts/iosevka/bin.nix
index fa1787d8f7fc..5d2be4826f43 100644
--- a/nixpkgs/pkgs/data/fonts/iosevka/bin.nix
+++ b/nixpkgs/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 = "27.2.0";
+  version = "27.3.1";
 
   src = fetchurl {
     url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-${name}-${version}.zip";
diff --git a/nixpkgs/pkgs/data/fonts/iosevka/default.nix b/nixpkgs/pkgs/data/fonts/iosevka/default.nix
index 28e0f75124e5..5d687585141d 100644
--- a/nixpkgs/pkgs/data/fonts/iosevka/default.nix
+++ b/nixpkgs/pkgs/data/fonts/iosevka/default.nix
@@ -55,16 +55,16 @@ assert (extraParameters != null) -> set != null;
 
 buildNpmPackage rec {
   pname = if set != null then "iosevka-${set}" else "iosevka";
-  version = "27.2.1";
+  version = "27.3.1";
 
   src = fetchFromGitHub {
     owner = "be5invis";
     repo = "iosevka";
     rev = "v${version}";
-    hash = "sha256-+d6pONsAoA0iI7VCuDHBGGjZPaxgLToouQpFTaX6edY=";
+    hash = "sha256-7ndJDdgDn5tnnUeB4etQ8bBZnH7NuiYoNQ9CrF2HtwQ=";
   };
 
-  npmDepsHash = "sha256-c/QvrDjjoq2o1le++e7D0Lb18wyZc/q6ct++rkgYtzg=";
+  npmDepsHash = "sha256-MNlT8VJTIvoZDAAdEs0Fa8gqO7dWhRR9I4Kw4qlW5Ig=";
 
   nativeBuildInputs = [
     remarshal
diff --git a/nixpkgs/pkgs/data/fonts/iosevka/variants.nix b/nixpkgs/pkgs/data/fonts/iosevka/variants.nix
index 0094fc3e6fe1..4035a0961a26 100644
--- a/nixpkgs/pkgs/data/fonts/iosevka/variants.nix
+++ b/nixpkgs/pkgs/data/fonts/iosevka/variants.nix
@@ -1,95 +1,95 @@
 # This file was autogenerated. DO NOT EDIT!
 {
-  iosevka = "1jn883s4vvpfih31yxap2hg6xya9jfjnqa8f7iqkqyxxqrnx7zzm";
-  iosevka-aile = "1p2s5nslifmdbjbqqlk02kl0rvpmr5pkq71hr9xim2dqb11kmcdl";
-  iosevka-curly = "0rs7jmgpl1ki7b9i3l78fn63xbgd02wraixqb1yjc3lmxi9jbhxn";
-  iosevka-curly-slab = "09rf82w41fbw7pm1ak9vv1i9450h2ia7x434gn9czx01wnb3s2zb";
-  iosevka-etoile = "1621a74z378rz4l1gn9dr7fqqvnd1g7ipr5bw13qhwl5ljf170xs";
-  iosevka-slab = "06x3hbi05bzlaci7hr3wk8j92zn97i41bw8xjnj8sh63mla36w9p";
-  iosevka-ss01 = "1plp7lk9yzizfz9c5k4m51ynvp0zkz7r7vgx416rkwb3yh23fjpv";
-  iosevka-ss02 = "0zpl9a8nccnrywaxj61glj4x7ai1fas9x463xqpy38w686n0jjyn";
-  iosevka-ss03 = "1xrxvsj2ja9miwvgq7p6kxysn8858gk8qh2pp1bw1n67vppvhkp9";
-  iosevka-ss04 = "1y0ac2dq8xmrbw84nar2jsxbyf9nck8fxh3dbl8vhvpnbwan150w";
-  iosevka-ss05 = "1z722m5chr8jq24i7czph1qgkasah7y7i4wv2wv0n2j89mc2fbc2";
-  iosevka-ss06 = "1fzsj9389cah6zp23vlr375j107jxfabqxaa7iv1hjbw3fa2vmdk";
-  iosevka-ss07 = "18psmz6kfhdmpac408w1fsqfarahn60bypm8ci8y3gd8bk8js13c";
-  iosevka-ss08 = "0hjlrly98hd4w5l6cm361h4cyvkdrlf3bp1g6f438aip0bj2y94w";
-  iosevka-ss09 = "13jdlmamfbxnkqii6bkh0xm71fgqdvgnqs88dnq8pjyqhbl32sca";
-  iosevka-ss10 = "15ak510q6di9hsy2p8k7gkp5d1kzgrmk2m55zh90w5irbr5fmbjp";
-  iosevka-ss11 = "0x42pjik0iy2v11iq8i83wa88f6b6qymc3v2sih28rjhijxl7lsm";
-  iosevka-ss12 = "15s7imcm4w61555crah1pxzc9yn3zffkj13zk8zidgk6v7jzb6rs";
-  iosevka-ss13 = "1q3d3fyjsk6iwq1w6dv9rc7ivk021i3v2px574dfbqlswvb2sg86";
-  iosevka-ss14 = "0r1fkrcqcccx4zz9qgzgq9si8xcbn7y1f2821cjs6cbfaxmrkwmc";
-  iosevka-ss15 = "0vgwgkfnch5rn7kc9rblg1km4pzqwsglb31zqnx3rxhszm66j9q6";
-  iosevka-ss16 = "009whnydn5rb6dj06scnc3722y8sddsv4jl42r70x2zzra14qdgk";
-  iosevka-ss17 = "01j1gqrmlx3b6rlv6sg3kv9j39s2dwqvj35h4v0v7min2vn1hydj";
-  iosevka-ss18 = "1pbwqgrkv560237marp5msq1y93llxvjrpixka15a79a7lmpd36i";
-  sgr-iosevka = "0p31qdby1znrsz4hplrq81ngv1l2pxbn9x26hcpjxrbgv2mmvhfq";
-  sgr-iosevka-aile = "00zapw8mk0z40jw69ynvdzhpd67rvi9lp509hf3vb7x3cq1ka1wz";
-  sgr-iosevka-curly = "1rgxkc2ps8pmp3mgi2b51lv4j5cc5q7m6iizw8gbfl36qmzlfdlh";
-  sgr-iosevka-curly-slab = "1fdxr0mkb40fa0605i8b8h51pg8p3cskjsggil9gp1376wzhr42q";
-  sgr-iosevka-etoile = "1r91042avgn0f0p2rf09pam4wfjndkj7wml9vs082kc40aqgh9m5";
-  sgr-iosevka-fixed = "13b5nkyxpm9izj0dmwc97lqbfvbxqyjg3677hpi6ywl3c6m1h542";
-  sgr-iosevka-fixed-curly = "06r0lzcrhf9897yi9h6xh5n1mfb8j4v21nz81igs616w7gjlz0dk";
-  sgr-iosevka-fixed-curly-slab = "1l9qaialwq2xygznylbwkizbqwghzl4625d845f8kwyl9krd92na";
-  sgr-iosevka-fixed-slab = "199s1cdn22rjirrh1f9xhqbh77namriw077g11hykr4ibwy6sc6n";
-  sgr-iosevka-fixed-ss01 = "1y51qk0pfq9r8hpcgmcykrvddl8rw5rjfysrbsjvf6zi59z5rk02";
-  sgr-iosevka-fixed-ss02 = "12x3qrw6baxfwbj2wgawf9qpbk8nv7ccd9grqgw7b4qmy5j31n39";
-  sgr-iosevka-fixed-ss03 = "1sf8xybh8l76dbm8vgk0y4lgdm5lb5pb4kgnipygqj9z0kasj07d";
-  sgr-iosevka-fixed-ss04 = "0pbpqnv6kdnnl4yix3ysfrnxg3ainsl9m0pnkb1i21q5sav20ph5";
-  sgr-iosevka-fixed-ss05 = "1vgfiqxwfg3m68dlk4s1x5ms293nbwgdq34y80hysp8pfzl7d07z";
-  sgr-iosevka-fixed-ss06 = "17f3rxsh2nla6a8fhim88vxqj1kzafvcfbara1iwzsw3fw9gz2ai";
-  sgr-iosevka-fixed-ss07 = "1j3r197jx51b7l5cpm2g5b7mzq53wp05f8ra3cz04r69qc0dj8i5";
-  sgr-iosevka-fixed-ss08 = "1gj784bi4wy0282xbq3f24sqlm7b2s1gz2f8sna4bd5bgci8avb7";
-  sgr-iosevka-fixed-ss09 = "0hhqvghq0mxbjzfhfcjgij94b40129vhg6x4slgk579kdfmr21y4";
-  sgr-iosevka-fixed-ss10 = "044dam3cg2s29j0zbq03ypyyskws31dfvyyp01smds7njf8f2w39";
-  sgr-iosevka-fixed-ss11 = "1xxmcai145rfjhlx4n5hcs7kdz298pxn9b3if85cpmdd9qhdmy48";
-  sgr-iosevka-fixed-ss12 = "13rbsql91z2ndbx121j1yb3m10a2fwil0jilhfjj17rn0kh0a5qi";
-  sgr-iosevka-fixed-ss13 = "19y6x2jln772afqy7y2k97kzpin73y5wq72fh7c9n9cmh1n24628";
-  sgr-iosevka-fixed-ss14 = "0ndm0yk95a10qv95c9d5qhjx4vzc28wkahlxjadndxh82hn8zlqm";
-  sgr-iosevka-fixed-ss15 = "107lwn4d01hry6jyk2blxdy7gx80ka6wrgxs80l5czx4jsk6kr66";
-  sgr-iosevka-fixed-ss16 = "0ka5rp7svqp5hs2zdf0bq5lfhgfmqij93f53q1a0snispx1qnsn6";
-  sgr-iosevka-fixed-ss17 = "18kvws3r66b1lqqpyphpf1nk6qdv6pv9c36zf0kpi7hpfcp1dvaa";
-  sgr-iosevka-fixed-ss18 = "1s9gzh2ghs66rjjz7317x163072gy2fxbqmvhghngd7bpvbajdd6";
-  sgr-iosevka-slab = "0b78y7pikcrlilzn2xlvg5f7liqp0zvzcknx9l47nh32sqn11f5j";
-  sgr-iosevka-ss01 = "1nrj6dl3znakj3h0fvd37k71gcp2l0yfgqggdn6ms4cyyrq16z38";
-  sgr-iosevka-ss02 = "0mhn1jx2ibllp8h05lm9ms8wh960yyncblx4pkj95sswm5kdv8vv";
-  sgr-iosevka-ss03 = "0xxanqcpqh5fvhfad6cyk89yr2nza9lpig6dralizi8b1vxl7bnl";
-  sgr-iosevka-ss04 = "1566hvq2lwnh6p7v55j8khi56y61cg88g7vnb306a0rakg5jv17y";
-  sgr-iosevka-ss05 = "111pwbwp8fkiph6mrzblbx1nzdnzv9d6aphmkxlmrf1cs19jv71k";
-  sgr-iosevka-ss06 = "0p57cqqfhyhri2r1ss8pcd2hdn4pvp0dwr8ls1iws5gaj2s5zbjx";
-  sgr-iosevka-ss07 = "0clchkildx4vmk4xpd3xjx0xbihfkn61pcha00md4qf471ysnpmp";
-  sgr-iosevka-ss08 = "17ici8in0sh2zy1ya9319k9qqjzg5nl7ky6mbb2skpgmh85figfp";
-  sgr-iosevka-ss09 = "0fcwxcvzpc9l5dvmkqxf1g32xr4fk5rr389d6s3qbkdxdlc2vx63";
-  sgr-iosevka-ss10 = "1d59vw8caj9nlpmfijwpgkbb6kxphgdrw2hd5ldcvxs0ny0r8fcd";
-  sgr-iosevka-ss11 = "0d60zpdq7n73cn0lgnwhddxzw3x0i2cpqwpc1k78s8r8h36qmd05";
-  sgr-iosevka-ss12 = "15sc20f2kf6i0wlcfy60ss2j6dyg6figd18g22zmm7msz2lda1b0";
-  sgr-iosevka-ss13 = "0qi8ala5dm3r9gljwf5i84624h6arasd9mhww8nk3822cx8c8jd0";
-  sgr-iosevka-ss14 = "0i9p2rz8ppwl6x9d2j4gry7l386nbv4g2jrrna6bwgk4nh12izg0";
-  sgr-iosevka-ss15 = "0d4s197v96ka5c4b63kisiy8j694vskspc5vry4bgj4pbl7vl6lg";
-  sgr-iosevka-ss16 = "1a02r483ihfnlzx0kir6p84q6bscrs798i5qaw7qiz3zi8kxdrgb";
-  sgr-iosevka-ss17 = "1hi7dikls7x5zn79waki77bcp4w5hzx12mqmh0zx77aah3ghcax1";
-  sgr-iosevka-ss18 = "1mkjyn5mjnlwrxfhxr1f3ja2fd6lbv54fxx0xy9zm1banz0pp3y1";
-  sgr-iosevka-term = "0cmycg6vygxi3c1pdqddmh8mqpcrnkmn9y5c8xjzd1lygm41668q";
-  sgr-iosevka-term-curly = "1q7r3qclmkniin8hx8digwk1rfgfcm4jz6mvjay5sfi5wa6g9fd0";
-  sgr-iosevka-term-curly-slab = "07bf92s5zf9vny3560dr8zwxdg1jpdvz5ksmqcm74ib1024yk17r";
-  sgr-iosevka-term-slab = "1am42m5jggfy0fv3580rsksklaiq8827da1s20ngiyxfzcgbgwf3";
-  sgr-iosevka-term-ss01 = "09igqk8b4hmgmh1q1idvcjpz0vj15yzrsmcqhyrs1ygxyl2d6g5v";
-  sgr-iosevka-term-ss02 = "143czw61bilpim4lqqzp9d2gz4igijyl2p87iy3f5pvh75qzk8fx";
-  sgr-iosevka-term-ss03 = "02s7dsjxsm6dgp2rcz6n9dyi6priz9k5q5wd1rajfs6rgb01j1h7";
-  sgr-iosevka-term-ss04 = "10paacm4gb0823pqacj1ps8s79k6zbayrqqqnhvklkqki2iiay4g";
-  sgr-iosevka-term-ss05 = "0nn49fgxciwpfddcksb5krhvyqbr2zfx2zq1m5nswb70nzwwk8sj";
-  sgr-iosevka-term-ss06 = "1r6xlbf9si5ycg96av2pjjak82qgj1sqdq634wkl41x4mj39zkjl";
-  sgr-iosevka-term-ss07 = "1sfjv2ggqrgxjqykgycia62xa2g523yf61gix9dp79gyg6ga25nr";
-  sgr-iosevka-term-ss08 = "0rk66nzjc4d7bjx9sfgnlzsx52mdrdmgl4xri6jd0ad3543j43bh";
-  sgr-iosevka-term-ss09 = "0y12s0ynb5fda8kprwlbw6a9kkb7fwjfna2axgz5rxlz0ja14gs1";
-  sgr-iosevka-term-ss10 = "0hy31v083cd9lcb7xfvh6lj4nvzlqkbm8lni092sp21iv43xpp4f";
-  sgr-iosevka-term-ss11 = "0wb1c4l8327vsnkpj34grplw1v1mlr3wdavi7i0z5383qx4l3cn0";
-  sgr-iosevka-term-ss12 = "0x8zgm1yl37ij1hq6bcdf0whfbyv4gdkqk94yi3xm74a744pzsvx";
-  sgr-iosevka-term-ss13 = "1ia9q4gn9a6mr0n4vb6d8mnnp9s6l5v5y4fgi6ip0g49n0n8fw4r";
-  sgr-iosevka-term-ss14 = "0ipfjn23jaz6xjb0v2pbirrvi18czir6nijh79kxrrs1k83mc4yq";
-  sgr-iosevka-term-ss15 = "0pdlsd8qsp80y5rgp3vrhl1wjbj4b3bgqyavz1ayqccg939dvzqv";
-  sgr-iosevka-term-ss16 = "0bz3i0cnijq84skhsjgy0p6p6ww364gnkrny1hgcw7w21d69n2x5";
-  sgr-iosevka-term-ss17 = "1sfpaqviv1gqz4c29kmrm1v3zbr3615w90w96s5yxh2lr6zqxi7v";
-  sgr-iosevka-term-ss18 = "02f7i400qk9pbyid4dr6p690sqphz52pvgprqp54q1lw07jksqa6";
+  iosevka = "0l14c39r68x14maw9hyiqd0lqz7q2pq4drw68i0j4jwa58l0r2x1";
+  iosevka-aile = "1pl59kga3ab2jm3y4lh0lqp9nqjggykqrpnh27s99abkf5cvgkzr";
+  iosevka-curly = "1nv3r2c2zj9y3zgaa2r8s0w4l28a3pzkyvcm1br650mb4l469j6c";
+  iosevka-curly-slab = "1ik3affc11w0q3xjrm9pdpzp6hdq9623f1nhsbc4ih5980mvki0j";
+  iosevka-etoile = "16fsysywpf7zdkl0sszi5im42idlmxl273ml0zs9dajd5zdwhm08";
+  iosevka-slab = "1xksbmzzfp6mnd90nfnqyg02ps36makrcr311l1xcl9v4drcnsiq";
+  iosevka-ss01 = "1pzl1adnbi4m2bi4p754k82viqksxjd39q5sqljjrs60p5mwxbw6";
+  iosevka-ss02 = "0r1vrg6b6c4ixw0fzi4g3q7c1hah2szw2rv5gkqmdg0kiw6sddl1";
+  iosevka-ss03 = "0rg6hb0xjzmf8s410x7v5m1pv246p1xfxfggw4lhs19h6f7jcy0v";
+  iosevka-ss04 = "1690xgfyk6gqxwx70dsvq5ba7vf5906pf1qrrd916fkg2a28fxxp";
+  iosevka-ss05 = "1zbiq0hczg2dhld82nyw7x6rkh6y812cvawqqpjmhzxjhd2wn6hv";
+  iosevka-ss06 = "0290w7812pqlix1zmpanksbinzkzv6gw0y5k5dvaf4jrg5c3163m";
+  iosevka-ss07 = "0z7irkdcwwxpj52a6j1b4s1xz9nlib6jm66fxva7pqd9dhsjp1ph";
+  iosevka-ss08 = "1jd12mjcnjs6md3lj182ph9zlb66cmmm2cz49fwdxpx54laawn3i";
+  iosevka-ss09 = "0zggxrk2a315rzz684c06pk0vmp9cw5bcn9zkh61hcn0mii10xdv";
+  iosevka-ss10 = "14mshgnpq5sn4z81a8cwsq6hjarlrmwfqyhkyzcmqymi6gyljs6k";
+  iosevka-ss11 = "14p8fbvd4b4vddnmydyn0v5iffkq1s15pdxpmmwl2aplxnrgshiy";
+  iosevka-ss12 = "1r2p1f0mdkx7sqkv29gdpq78c905gcc7kfbr8l907awhv80fzsgg";
+  iosevka-ss13 = "0ara2w4zav48rk019hnhr3fq8kqzzvlgshq18cq5gralbcgjw883";
+  iosevka-ss14 = "1yqmm13bafrz7siq7q95921ipn3p6ms3dmsxn5zbcmm3pdxxyq1c";
+  iosevka-ss15 = "1y84vzqpwa060q3qrxc77kk3hnrgyjqwwxq4s9fq8hww9d01jb5d";
+  iosevka-ss16 = "0cszx4s3bi9j5l46sh33dkn9cqn9s7v6rk23d4srlfg19bfs19ga";
+  iosevka-ss17 = "0ld6pr8rx1ldszgdd2ixmfj341ry9ajfcpk6k1f9jmfilp4cjnzr";
+  iosevka-ss18 = "19787429v0am3qsjyxlgqwbkn50s54w26481h46ybn7nrskgxl7a";
+  sgr-iosevka = "1i5zg7wwyczf2ljxjvwk4n75j1nvn6wavc3w1zycfcgim458x8s6";
+  sgr-iosevka-aile = "0m0imj778l6zb4y5kb882z4f6abw6q1ww0d8fn4vyqk2csm3kx9v";
+  sgr-iosevka-curly = "071jpj9cj56hszqjy5cmj40gq6n47fp117ckypi0npk6cvrvrl7a";
+  sgr-iosevka-curly-slab = "1f33iy0nrkm76alyzs7bjdfvc7c4j7cqrzrk769y40wx68l5sbji";
+  sgr-iosevka-etoile = "19rgrrk4p9k94s887vv2kqb7zj1wjh5kjncalzbisjpv8ns6l3qq";
+  sgr-iosevka-fixed = "03ccy1f8hswslr7n9dhj9l3zvfkahqi742giim34f360f5chpmdi";
+  sgr-iosevka-fixed-curly = "14czka86s0yj1h0mq4ajn5yx1lnb9l3hp9yw8h558dy8hf6xk9pi";
+  sgr-iosevka-fixed-curly-slab = "1i0hjw0121l83znyfq3zl0z1pl4p57yf2qqrp35qqp0vpsxnjlcy";
+  sgr-iosevka-fixed-slab = "1cz1lj2qa8yiwbxpk3c6hdkgg44q9019yai3iz0c17gw8vwj6xxh";
+  sgr-iosevka-fixed-ss01 = "1966jyi9j01s094kz1k67ds4k4z1sfahwfxsasi59bc4r5srq3p7";
+  sgr-iosevka-fixed-ss02 = "1l08id1p2z2m8vrprlrg0rphspbz17lnc1l483wadffbfrlqrhpr";
+  sgr-iosevka-fixed-ss03 = "0g98s0w2lvskq9fyh47b8rx7rha24k4vzza9svl25kx55ixznzjm";
+  sgr-iosevka-fixed-ss04 = "0wjq34b6xv17ma75lysmwfqxyp57zr0h9hrxyl9c6sgdmlvf7jqx";
+  sgr-iosevka-fixed-ss05 = "080i32z64y9dm19fagc5jh3gkynbim0w03i42bc19im07ryyq79h";
+  sgr-iosevka-fixed-ss06 = "17ggkvz3y17zqkn1m864vgqbc5zvn63gsh39n4w1p9wi9v360984";
+  sgr-iosevka-fixed-ss07 = "1nazbkhr46larr0hgxwx2h5zvi9yr3qlg2npnmpprwqrhvlvlpah";
+  sgr-iosevka-fixed-ss08 = "08i420lx329py3slc99r73hysdnjbc12nm15fs17f505c2zj7war";
+  sgr-iosevka-fixed-ss09 = "0zc9wmxjrpzss7cdczg6af6sckdr22k0q9gj90hggyyjlc08cvz0";
+  sgr-iosevka-fixed-ss10 = "15qzf9zir1rqfpfspkgy9azf6m73lgpl79xhidf47hkvcw9zxjr7";
+  sgr-iosevka-fixed-ss11 = "1z6kji0h5vb3my47h2ccdl2vafh58pyqwp83yy3xgsvsj2qd0835";
+  sgr-iosevka-fixed-ss12 = "0wyk8kyllm35wlsqkxgh3sxvn3f52w7kicq64hdax8k8piaj584x";
+  sgr-iosevka-fixed-ss13 = "052jrfqwi4qbs9k9mqmdk2s82qb8q6175ajy3f6186grnzd73nnq";
+  sgr-iosevka-fixed-ss14 = "0wba9g5q8h5n5c50rncbbkbkc06xs9zxydxz1b0a6dl37drgmvkf";
+  sgr-iosevka-fixed-ss15 = "1kds5pl4vxcniksfp4mslpfr0ba30m754w7vxvzvqamgazmyf0pp";
+  sgr-iosevka-fixed-ss16 = "12hb9laxbhkbgf2rnbzq7zwwl7bg3n3n2yyjlr3vlsik5kd7aznz";
+  sgr-iosevka-fixed-ss17 = "18rvf78xif6p06nzha9nvp725f6mr79f1rk0a6n7ifh1ygdy4lvx";
+  sgr-iosevka-fixed-ss18 = "019gzj9s3wh3i9bxalazx9x8nfljf191idh6ygxpqjz4z3yzxh9n";
+  sgr-iosevka-slab = "0l9bcvrfbxp0pi3hj3zlirq800h63dyqf8dy307r7xg8m3l48xgr";
+  sgr-iosevka-ss01 = "1rb49rx12vgdjvkbyyg63pmxbwqd4v5cfvn5q3k2q4w5m3yhsbm9";
+  sgr-iosevka-ss02 = "07xz0iayqk2hqalmrj8c7kp8b80d6qgazrxwvs22y8nymignzq2s";
+  sgr-iosevka-ss03 = "0skq1kqmkwhs9d1p0lpksxqdgvpjz2krlfqa7idq1sdykpwsvmhi";
+  sgr-iosevka-ss04 = "0cgjh4c3vmmcgb43g0l2dmwcwnwwwqkrr80b9rsbrx43v6lkavda";
+  sgr-iosevka-ss05 = "16y8rm0byaf2xqh31h4vfan6il2m98a225nv3vsb7f42ga185vw0";
+  sgr-iosevka-ss06 = "0v9nd1h0gzgwa5sw9lrxvd5g77y9wn3fqsw86ivpsqn1vmgpqrzq";
+  sgr-iosevka-ss07 = "1h49qx02kn683ax3vh090r7fwlq7ya802zywcws2b9h2hs6p799x";
+  sgr-iosevka-ss08 = "1zk08x7chnj1ach4ghh26kr9kndzlgzzsrrw9aa3f0s7qk1lx2yg";
+  sgr-iosevka-ss09 = "12mrzd7viia71r9ixw1bzsqfaycxpl8zf20qv83ndbjsgzxh9ary";
+  sgr-iosevka-ss10 = "1cq8ii94jdskd0p5g2iigprbzzs3qnjxj7m2rkhl8mricwxdxxs4";
+  sgr-iosevka-ss11 = "1wmzaqcy0xy831010fsdhlm3aly2j01j7z10ka83ga3h8ymg1wla";
+  sgr-iosevka-ss12 = "00xfyvf50ykippnr1cfxy17s0k0gqkgx61vf7x9dmsgl2y6qigpl";
+  sgr-iosevka-ss13 = "0ynmx67c96qslzggjign8g3q7k11ny0mdrdwa7zwi2p0mm61n2jd";
+  sgr-iosevka-ss14 = "19s3a6csc4wq4cjjc2qll8fv00hmzsp5z7hwaq09wls8swz5kmmq";
+  sgr-iosevka-ss15 = "0d8ljkjcf0y263lwpnlh07305k6xlznk9gysk63dhcyxv0ajhrq1";
+  sgr-iosevka-ss16 = "12jbanrv31zxkh5a3a4w2wv0gqvj03mcs7v0zpnylp8jgfmpf8qa";
+  sgr-iosevka-ss17 = "1p088x66grn9bs4k1y6mxb0ka4y4vm74v6nbm74qsarjbyc0kx0a";
+  sgr-iosevka-ss18 = "0ff8lnhhgknj2sq40fkx7pqmiklnjl9ryjrnjcjviwzvs2dgzbmh";
+  sgr-iosevka-term = "0ny2p3hmzwbmzwxr8k1hbv0r3fqwngnz6kind1p3yddrqz8l5rrz";
+  sgr-iosevka-term-curly = "0qdys5q9fw273q58yvs71kqhal2mrh1400kf33mjp80pm1dy0j5j";
+  sgr-iosevka-term-curly-slab = "1bfn60arcb78lllf1lpdi2gscazvy3k9irp3ik0x12qdf9jgzgw0";
+  sgr-iosevka-term-slab = "1grdywa132zl3m5vf7w47lq7wgk6p5n8nab6rgg7pim839f1cn9q";
+  sgr-iosevka-term-ss01 = "14an4f8gm741zz22g854zxbfys2z33sf20kjrlzdp239376k72b7";
+  sgr-iosevka-term-ss02 = "0lqzcn4ykvkvylnlp4c1cfcl72hy3i18q15zng79d8v439w7cbds";
+  sgr-iosevka-term-ss03 = "0kmfmdv5rvfgm8p85dcqb28fsmkwsrgpjkjh1n787nvd2vs96l23";
+  sgr-iosevka-term-ss04 = "0p6hspr95p8hxas05rgp2dq00425i7nnz3nbyfrv4mnjzj66ir60";
+  sgr-iosevka-term-ss05 = "0izgz7rgjivzzvqywj3d2gma2sh83nhvc4scb7x3cbwwkzg9m5jx";
+  sgr-iosevka-term-ss06 = "0syp2mqnqq2gs4zsa3vvx0yz7pa23s995jc8sjrh01la6kpdk332";
+  sgr-iosevka-term-ss07 = "0dzfrw30aych0a0ic643w11ww42rncgyzvm5fkgqnkj1zjsdpgsw";
+  sgr-iosevka-term-ss08 = "0d9b2rwcdpwbdlsyjcd3qd0pip9km4hg9ihjymsi3xj7bihd0wp5";
+  sgr-iosevka-term-ss09 = "06bbj7c99wpjfh7ib7990nayxvbwy69ijlrjbi2mj45pm5i5lswq";
+  sgr-iosevka-term-ss10 = "1i6cfzgbnga999851k7gg6b5awq1i9253fz8sngsb6b34c45zw5c";
+  sgr-iosevka-term-ss11 = "1jb4lg0cjwv8xvhc5j9qp921zawgp2say6dnj6zncv0ys0rs6qwm";
+  sgr-iosevka-term-ss12 = "01w3vj7pw0714r6xp4rq5rlirch9h2d22mk76hsnqb0igzhlkvhy";
+  sgr-iosevka-term-ss13 = "0ywjr4j31v31z1cvvz7jvn7mcj2zhdpgljmvsfvix1j26cy5lr95";
+  sgr-iosevka-term-ss14 = "1cxsxriayzvrxzr3i6k6dwq08ywl9dk78iz4jqgy5jvrh942km0w";
+  sgr-iosevka-term-ss15 = "0j6rvsww2783hrdca3hfvv02s2whswwld7icf0bijdb3p799qi6w";
+  sgr-iosevka-term-ss16 = "0hgi40g030s1ylnp1whxz47wg2lzzqwhblx894dzz7rpnwbgff38";
+  sgr-iosevka-term-ss17 = "0hbdhc3z75n814r2xffnw6lnkwc31p0fmrvsan3z0db35c5kz54i";
+  sgr-iosevka-term-ss18 = "18c3i4l4j9wi7rx191hzmhlc8zblyqpx7bhq9g2lxs9asp8svqsa";
 }
diff --git a/nixpkgs/pkgs/data/fonts/unifont_upper/default.nix b/nixpkgs/pkgs/data/fonts/unifont_upper/default.nix
index 33ed947ae690..8147db6e1086 100644
--- a/nixpkgs/pkgs/data/fonts/unifont_upper/default.nix
+++ b/nixpkgs/pkgs/data/fonts/unifont_upper/default.nix
@@ -2,11 +2,11 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "unifont_upper";
-  version = "15.1.02";
+  version = "15.1.03";
 
   src = fetchurl {
     url = "mirror://gnu/unifont/unifont-${version}/${pname}-${version}.otf";
-    hash = "sha256-OTIwWA2p+7ldqEB5O6J18zU5RVoswC0t1G72fFeCKpU=";
+    hash = "sha256-IZM+21ipmDHoiHYfKQdoguLWN9KC9FlHsNbqOcXDBFQ=";
   };
 
   dontUnpack = true;
diff --git a/nixpkgs/pkgs/data/fonts/whatsapp-emoji/default.nix b/nixpkgs/pkgs/data/fonts/whatsapp-emoji/default.nix
deleted file mode 100644
index 5e34282891b9..000000000000
--- a/nixpkgs/pkgs/data/fonts/whatsapp-emoji/default.nix
+++ /dev/null
@@ -1,46 +0,0 @@
-{ stdenvNoCC
-, lib
-, fetchFromGitHub
-, imagemagick
-, nix-update-script
-, pngquant
-, python3Packages
-, which
-, zopfli
-}:
-
-stdenvNoCC.mkDerivation rec {
-  pname = "whatsapp-emoji-linux";
-  version = "2.23.2.72-1";
-
-  src = fetchFromGitHub {
-    rev = "refs/tags/${version}";
-    owner = "dmlls";
-    repo = "whatsapp-emoji-linux";
-    hash = "sha256-dwX+y8jCpR+SyiH13Os9VeXLDwmAYB7ARW2lAMl/7RE=";
-  };
-
-  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/nixpkgs/pkgs/data/themes/adw-gtk3/default.nix b/nixpkgs/pkgs/data/themes/adw-gtk3/default.nix
index 27811203c86e..79dcc88a6f5d 100644
--- a/nixpkgs/pkgs/data/themes/adw-gtk3/default.nix
+++ b/nixpkgs/pkgs/data/themes/adw-gtk3/default.nix
@@ -9,13 +9,13 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "adw-gtk3";
-  version = "4.9";
+  version = "5.1";
 
   src = fetchFromGitHub {
     owner = "lassekongo83";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-ni1u6696jrwjYZ4gppF9yD1RAum0+D7WxQgu09cxVGg=";
+    sha256 = "sha256-vRB6+C27M4u7v10c6dqGsKpxHMGfpCSiScZ+8qlJRr0=";
   };
 
   nativeBuildInputs = [
diff --git a/nixpkgs/pkgs/data/themes/nordic/default.nix b/nixpkgs/pkgs/data/themes/nordic/default.nix
index c8e956c3f83d..a64b870d12b9 100644
--- a/nixpkgs/pkgs/data/themes/nordic/default.nix
+++ b/nixpkgs/pkgs/data/themes/nordic/default.nix
@@ -2,76 +2,78 @@
 , stdenv
 , fetchFromGitHub
 , gtk-engine-murrine
+, breeze-icons
+, plasma-framework
+, plasma-workspace
 , jdupes
-, libsForQt5
 }:
 
 stdenv.mkDerivation rec {
   pname = "nordic";
-  version = "unstable-2023-05-12";
+  version = "unstable-2023-10-17";
 
   srcs = [
     (fetchFromGitHub {
       owner = "EliverLara";
       repo = pname;
-      rev = "399246cdcbdb1a714c5bb294857cd5a6494b6006";
-      sha256 = "sha256-0yZ4QYcdcGHEw6tdcXAKZ4e+mhNNmvihBxp2sLgTuu8=";
+      rev = "e97d2bcf4494f8ab502e33d13c74b396469a42f4";
+      hash = "sha256-7WfCE3eoJ7maAYqgQNb0mlw8u3zc6NAwTJN+PVojDcE=";
       name = "Nordic";
     })
 
     (fetchFromGitHub {
       owner = "EliverLara";
       repo = pname;
-      rev = "3599ddb6f8b7de936cf106bddd4f929ddfe88b1c";
-      sha256 = "sha256-ft5UbBnjP0xNFFVwk5Elvrpcj273OupjM+MGJVlvJZQ=";
+      rev = "73ed3490c13b2df6c3d27d6b3bcba0c087297f4a";
+      hash = "sha256-fRmGiqtjfGFIfr5hRBS3ZPFYEpQx391WoxphB5gRTJo=";
       name = "Nordic-standard-buttons";
     })
 
     (fetchFromGitHub {
       owner = "EliverLara";
       repo = pname;
-      rev = "b03b66d5badadc2e5ff27b8745a2308b8fafaa61";
-      sha256 = "sha256-6dORsGfYi7q8z7JWA3Y9oqVs9bhT/gbdSrcgJcebGP8=";
+      rev = "4b1fc2942bad203a0aa035cbb688b28005bb1011";
+      hash = "sha256-VU5Bo39l8xdR6QmbTR0Qic6XkSfDFrhyjoHaMm9SBYM=";
       name = "Nordic-darker";
     })
 
     (fetchFromGitHub {
       owner = "EliverLara";
       repo = pname;
-      rev = "e19b75f56e5c328352c183fc960a0be54e99836e";
-      sha256 = "sha256-deKHT0dE5tsUo7+vkzxQ/eRon7COrOAWolw17VtKhiE=";
+      rev = "6d57a16eef66c25f0212b7d2f02e208f2afdf4f9";
+      hash = "sha256-Sq5ZXOh+HA+udQHL2wUw5azgKwAVVvHGNb3SiuOn0nQ=";
       name = "Nordic-darker-standard-buttons";
     })
 
     (fetchFromGitHub {
       owner = "EliverLara";
       repo = pname;
-      rev = "b134b4a1299b3c4a2d9543707ec2b5a0fc97987c";
-      sha256 = "sha256-XSDwc0/59sUHkS0holvujmr/p6vX79648l9cxJqunuM=";
+      rev = "566e38c40bca86df93d0e9226c33d5d525d34454";
+      hash = "sha256-Wl/m2O0tVCFgZhPC/gcNgKr0JqQbiyQBpGEcp8g6kvY=";
       name = "Nordic-bluish-accent";
     })
 
     (fetchFromGitHub {
       owner = "EliverLara";
       repo = pname;
-      rev = "a4efbc09470b36f4cf6af60b5fdfeb8e09282fb3";
-      sha256 = "sha256-Qgrl6p0AhbhK0+aM8hu85Kz/Lz/b2Nn8uWS+WpTGjU4=";
+      rev = "b43efee28129634fdefe70f2a03c401efc7dc22f";
+      hash = "sha256-rLOWkfTMFEnVU2tuw5M2fvbNMPfxIu+gzi+3gnBEhx4=";
       name = "Nordic-bluish-accent-standard-buttons";
     })
 
     (fetchFromGitHub {
       owner = "EliverLara";
       repo = "${pname}-polar";
-      rev = "0d44fb16d0f07ef8615fd7740317a518d2b9411f";
-      sha256 = "sha256-388251/Tg4jyn7c8zkrUxVFooN9O67xk2NTSeYa0VvI=";
+      rev = "2192acfce55fbb9a2982886abe25e623d0e7ff66";
+      hash = "sha256-B/sAy4I+9gX9dHXUldcN5t0vlOL2Jnoan/hRV+tNnSo=";
       name = "Nordic-Polar";
     })
 
     (fetchFromGitHub {
       owner = "EliverLara";
       repo = "${pname}-polar";
-      rev = "0eea9185946fee20b6d7472548226a3652dea7ae";
-      sha256 = "sha256-8JFrmGKn8cl1x3TeDPee1zbMmtypJ9kALv/PRqRHGAU=";
+      rev = "a24b42411d8ea0dc63bf0778e443be251858e586";
+      hash = "sha256-02z4eMFtok1+SeW+ai7vZCXZb6ZhU4l4ch1Zc/GyhYM=";
       name = "Nordic-Polar-standard-buttons";
     })
   ];
@@ -80,47 +82,57 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ jdupes ];
 
-  buildInputs = with libsForQt5; [
+  propagatedUserEnvPkgs = [
+    gtk-engine-murrine
+    breeze-icons
     plasma-framework
-    qtgraphicaleffects
     plasma-workspace
-    breeze-icons
   ];
 
   dontWrapQtApps = true;
 
-  propagatedUserEnvPkgs = [ gtk-engine-murrine ];
-
   installPhase = ''
     runHook preInstall
 
+    # install theme files
     mkdir -p $out/share/themes
     cp -a Nordic* $out/share/themes
+
+    # remove uneeded files
     rm -r $out/share/themes/*/.gitignore
     rm -r $out/share/themes/*/Art
+    rm -r $out/share/themes/*/FUNDING.yml
     rm -r $out/share/themes/*/LICENSE
     rm -r $out/share/themes/*/README.md
     rm -r $out/share/themes/*/{package.json,package-lock.json,Gulpfile.js}
     rm -r $out/share/themes/*/src
     rm -r $out/share/themes/*/cinnamon/*.scss
-    rm -r $out/share/themes/*/gnome-shell/{extensions,*.scss}
+    rm -r $out/share/themes/*/gnome-shell/{earlier-versions,extensions,*.scss}
     rm -r $out/share/themes/*/gtk-2.0/{assets.svg,assets.txt,links.fish,render-assets.sh}
     rm -r $out/share/themes/*/gtk-3.0/{apps,widgets,*.scss}
+    rm -r $out/share/themes/*/gtk-4.0/{apps,widgets,*.scss}
     rm -r $out/share/themes/*/xfwm4/{assets,render_assets.fish}
 
+    # move wallpapers to appropriate directory
+    mkdir -p $out/share/wallpapers/Nordic
+    mv -v $out/share/themes/Nordic/extras/wallpapers/* $out/share/wallpapers/Nordic/
+    rmdir $out/share/themes/Nordic/extras{/wallpapers,}
+
     # move kde related contents to appropriate directories
-    mkdir -p $out/share/{aurorae/themes,color-schemes,Kvantum,plasma,sddm/themes/Nordic}
+    mkdir -p $out/share/{aurorae/themes,color-schemes,Kvantum,plasma,sddm/themes,icons}
     mv -v $out/share/themes/Nordic/kde/aurorae/* $out/share/aurorae/themes/
     mv -v $out/share/themes/Nordic/kde/colorschemes/* $out/share/color-schemes/
     mv -v $out/share/themes/Nordic/kde/konsole $out/share/
     mv -v $out/share/themes/Nordic/kde/kvantum/* $out/share/Kvantum/
     mv -v $out/share/themes/Nordic/kde/plasma/look-and-feel $out/share/plasma/
-    mv -v $out/share/themes/Nordic/kde/sddm/* $out/share/sddm/themes/Nordic/
+    mv -v $out/share/themes/Nordic/kde/sddm/* $out/share/sddm/themes/
+    mv -v $out/share/themes/Nordic/kde/folders/* $out/share/icons/
+    mv -v $out/share/themes/Nordic/kde/cursors/*-cursors $out/share/icons/
     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
+    # Replace duplicate files with symbolic links to the first file in
+    # each set of duplicates, reducing the installed size in about 53%
+    jdupes --quiet --link-soft --recurse $out/share
 
     runHook postInstall
   '';
diff --git a/nixpkgs/pkgs/data/themes/whitesur/default.nix b/nixpkgs/pkgs/data/themes/whitesur/default.nix
index 518bf72d5bdd..fb9a63b21f1a 100644
--- a/nixpkgs/pkgs/data/themes/whitesur/default.nix
+++ b/nixpkgs/pkgs/data/themes/whitesur/default.nix
@@ -33,13 +33,13 @@ lib.checkListOfEnum "${pname}: panel size" [ "default" "smaller" "bigger" ] (sin
 
 stdenv.mkDerivation rec {
   pname = "whitesur-gtk-theme";
-  version = "2023-06-30";
+  version = "2023-10-13";
 
   src = fetchFromGitHub {
     owner = "vinceliuice";
     repo = pname;
     rev = version;
-    sha256 = "sha256-ctEaS+zWkmiVoq0WVA3ecHc2rm8LFQC/kqi/KEXAyXw=";
+    sha256 = "sha256-H8QdKCX6C36J7AfFd0VV9Rnm8LGXSfkxj5Yp2p+PduE=";
   };
 
   nativeBuildInputs = [