Rebase onto c1a53897ad4290a1cbfa02fbe6f3869577b93744

Signed-off-by: Alyssa Ross <hi@alyssa.is>

13 files changed, 174 insertions, 140 deletions

diff --git a/pkgs/data/documentation/zeal/default.nix b/pkgs/data/documentation/zeal/default.nix
index 525d3d027d8..7d8adf6cc01 100644
--- a/pkgs/data/documentation/zeal/default.nix
+++ b/pkgs/data/documentation/zeal/default.nix
@@ -17,28 +17,22 @@
 
 let
   isQt5 = lib.versions.major qtbase.version == "5";
+
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "zeal";
-  version = "0.6.1.20230907"; # unstable-date format not suitable for cmake
+  version = "0.7.0";
 
   src = fetchFromGitHub {
     owner = "zealdocs";
     repo = "zeal";
-    rev = "20249153077964d01c7c36b9f4042a40e8c8fbf1";
-    hash = "sha256-AyfpMq0R0ummTGvyUHOh/XBUeVfkFwo1VyyLSGoTN8w=";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-s1FaazHVtWE697BO0hIOgZVowdkq68R9x327ZnJRnlo=";
   };
 
-  # we only need this if we are using a version that hasn't been released. We
-  # could also match on the "VERSION x.y.z" bit but then it would have to be
-  # updated based on whatever is the latest release, so instead just rewrite the
-  # line.
   postPatch = ''
-    sed -i CMakeLists.txt \
-      -e 's@^project.*@project(Zeal VERSION ${finalAttrs.version})@'
-  '' + lib.optionalString (!isQt5) ''
-    substituteInPlace src/app/CMakeLists.txt \
-      --replace "COMPONENTS Widgets" "COMPONENTS Widgets QmlIntegration"
+    substituteInPlace CMakeLists.txt \
+      --replace 'ZEAL_VERSION_SUFFIX "-dev"' 'ZEAL_VERSION_SUFFIX ""'
   '';
 
   nativeBuildInputs = [
diff --git a/pkgs/data/fonts/commit-mono/default.nix b/pkgs/data/fonts/commit-mono/default.nix
index f235778a2f8..d735e64296e 100644
--- a/pkgs/data/fonts/commit-mono/default.nix
+++ b/pkgs/data/fonts/commit-mono/default.nix
@@ -4,11 +4,11 @@
 }:
 stdenvNoCC.mkDerivation rec {
   pname = "commit-mono";
-  version = "1.136";
+  version = "1.138";
 
   src = fetchzip {
     url = "https://github.com/eigilnikolajsen/commit-mono/releases/download/${version}/CommitMono-${version}.zip";
-    sha256 = "sha256-s+KWGWOsluhDLG6LmsVIDVobtHzh5J4JLHoHMQ2+zRg=";
+    sha256 = "sha256-ae2eeHh57i6d0kDMZ68aXvLGFj+rXhwg1CC8cV3ndAQ=";
     stripRoot = false;
   };
 
@@ -20,7 +20,8 @@ stdenvNoCC.mkDerivation rec {
 
   installPhase = ''
     runHook preInstall
-    install -Dm644 -t $out/share/fonts/opentype/ *.otf
+    install -Dm644 -t $out/share/fonts/opentype/ CommitMono-${version}/*.otf
+    install -Dm644 -t $out/share/fonts/truetype/ CommitMono-${version}/ttfautohint/*.ttf
     runHook postInstall
   '';
 
diff --git a/pkgs/data/fonts/hubot-sans/default.nix b/pkgs/data/fonts/hubot-sans/default.nix
index 2458911fda3..5db592ae8b4 100644
--- a/pkgs/data/fonts/hubot-sans/default.nix
+++ b/pkgs/data/fonts/hubot-sans/default.nix
@@ -1,26 +1,31 @@
 { lib
+, fetchzip
 , stdenvNoCC
-, fetchFromGitHub
 }:
 
-stdenvNoCC.mkDerivation rec {
+stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "hubot-sans";
-  version = "1.0";
+  version = "1.0.1";
 
-  src = fetchFromGitHub {
-    rev = "v" + version;
-    owner = "github";
-    repo = pname;
-    sha256 = "GOql+V5TH4b3TmhlgnKcx3jzUAO2jm4HRJRNzdIKxgg=";
+  src = fetchzip {
+    url = "https://github.com/github/hubot-sans/releases/download/v${finalAttrs.version}/Hubot-Sans.zip";
+    hash = "sha256-EWTyoGNqyZcqlF1H1Tdcodc8muHIo8C9gbSPAjiogRk=";
+    stripRoot = false;
   };
 
   installPhase = ''
-    install -m644 --target $out/share/fonts/truetype/hubot-sans -D $src/dist/hubot-sans.ttf
+    runHook preInstall
+
+    install -Dm644 Hubot\ Sans/TTF/*.ttf -t $out/share/fonts/truetype/
+    install -Dm644 Hubot\ Sans/OTF/*.otf -t $out/share/fonts/opentype/
+
+    runHook postInstall
   '';
 
   meta = {
     description = "A variable font from GitHub";
     homepage = "https://github.com/github/hubot-sans";
+    changelog = "https://github.com/github/hubot-sans/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.ofl;
     longDescription = ''
       Hubot Sans is Mona Sans’s robotic sidekick. The typeface is designed with
@@ -34,4 +39,4 @@ stdenvNoCC.mkDerivation rec {
     maintainers = with lib.maintainers; [ drupol ];
     platforms = lib.platforms.all;
   };
-}
+})
diff --git a/pkgs/data/fonts/iosevka/bin.nix b/pkgs/data/fonts/iosevka/bin.nix
index b9cc668bf32..dc7d132884c 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 = "26.3.2";
+  version = "27.0.1";
 
   src = fetchurl {
     url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-${name}-${version}.zip";
diff --git a/pkgs/data/fonts/iosevka/variants.nix b/pkgs/data/fonts/iosevka/variants.nix
index f075991a99b..6b3d3d53c82 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 = "1x0jvkr00k7g1cyvdr2c6bq93zzs9jkjfp553sq729gswvf40kzr";
-  iosevka-aile = "033zsjqkzp1sdvl5acx2blypzfnmf4j2nhk6h05hr4w0xwia9srv";
-  iosevka-curly = "15yyagvl6pxqvizjazn9j0m7s7nv4wyid0wqs91wg7w9nakrhnfs";
-  iosevka-curly-slab = "05m1mjd1kgfpmx7yfkiccd5r765w9xc50sqvxrr599mycd8ddh56";
-  iosevka-etoile = "0z2j66fzvxngqjywmvcgz307c77clz8pasm8dclcwl942l87i395";
-  iosevka-slab = "1s7i4x6v1nf8jx4p7s3mpldjrbkzciak8znnpyzhwkq6ncqvdv6y";
-  iosevka-ss01 = "0liwcnjv64p6c20y0lpppsdnpgfrkdrk0njmcvyd6sqil8lxy2rz";
-  iosevka-ss02 = "0n6w0l6b2wqjqpxl7jcnk40fmjwf06zr6ca6cnhvzaklribs1ika";
-  iosevka-ss03 = "04sv1wljvh0prmdm3svldlyqkvd90zwfy1qbw4518119lvg9h86p";
-  iosevka-ss04 = "1ahqhy14igk48q5abslbb1f5g3py69sb6fdzs1gphh0k8vzbawi6";
-  iosevka-ss05 = "0gx907wziwm6h4vkc2f2d3ja9657i4vfpsia3dhl0amvc5pmvpsc";
-  iosevka-ss06 = "0ybl1lgva3warfxqccip9ygfvwa9pw904qvsa4ar160lc767fc19";
-  iosevka-ss07 = "0ldmdshb9d60db52zrknpm0lxmvvik8rxvy9zy2n2lpv7d9dnfgf";
-  iosevka-ss08 = "0kp0zqbjkj9szxn5l7688pnnbwwvjfxy55spwp4ba3rfcsl6mp5y";
-  iosevka-ss09 = "00k73f7xrfhv6mif70dykv12krg1bnnj4brx8bnd4lcxmg6b34ks";
-  iosevka-ss10 = "0r3h2hpkgh3fncrhlm1g23qkbrpqgjxb7sdmi78wznxn4g9hviwv";
-  iosevka-ss11 = "03q7ny5hk6llid2278k139dwaq1afg0r0fa9gjwhdb960r2rya24";
-  iosevka-ss12 = "0jp5jszwhd4idxqw97n7za88bm7ch9nfxvxk7s9kx4mxznj2bacz";
-  iosevka-ss13 = "1rg7kpqcvf22scdmlbi61h0zw58c46m00ihf2rzvzjfllfzmcqhh";
-  iosevka-ss14 = "09zqsycwjz3g0vj9rqripc9kii67zdj7bkb9j0i5zkbqi2xgab0k";
-  iosevka-ss15 = "0rfhvrxyc24skizhy5fplfvgimvjdd95h1bjjbgrz8sqqld92qal";
-  iosevka-ss16 = "091jnvc9jdzf2hnv1ciczmhrngrlhj3gfsjl7ahbimxagxzf31a5";
-  iosevka-ss17 = "0brcyhg806vs38d8vanq19fffk05lcksairykiapkxhblwv0sy67";
-  iosevka-ss18 = "03h37wi1y85jxjjkk3gjlsphyd2wwsba0lwawi4k8hr0d1l9kglx";
-  sgr-iosevka = "0db82n6w5x0ajs9pr4glpd9b8han32addkfbbb84b3nxx6snn1bc";
-  sgr-iosevka-aile = "097gv8i3dpl41wz4ahd4wz5jfiycm44gpxfnicn5d2zw0p84cjzv";
-  sgr-iosevka-curly = "0lly5hs0jpin33i2h796cr37mdhn3v1x9j5dbcrsdi6wm4ql9kk9";
-  sgr-iosevka-curly-slab = "088jxb727gaf6k4b3cvj9sjhnv4d3yhg96l8iibf930q5c0nflm8";
-  sgr-iosevka-etoile = "11vhpd8j351sgpbg0gxjbgl3ycd1x4xvvv3x9zflxb80l6ch7dym";
-  sgr-iosevka-fixed = "1z0gwcdd1i40swmjxlpf1q4y0123layr3b2yz8pbm8bcpwdyds62";
-  sgr-iosevka-fixed-curly = "194r71zczwf4xjy9x6rjarm2vwaxazirvv04yvi08wcny17ln1d5";
-  sgr-iosevka-fixed-curly-slab = "0j0yqr2icbxdgpwpdbsg6rpi54w3vjxz8xi2cgc8warsydp9p167";
-  sgr-iosevka-fixed-slab = "11s9s1bb982p1p7g5hv2gm8rvhnfls49hrz78gx07nm7ybz4g4i9";
-  sgr-iosevka-fixed-ss01 = "0isa4q30nacz5avw9cr67v8h3p3w0nn9nwlfk1pb35lsm2sxjgqr";
-  sgr-iosevka-fixed-ss02 = "104lqk88w3lv1rchgzh1d9pg2hcgfnwiyvn0p5jii1q7c96dl9xw";
-  sgr-iosevka-fixed-ss03 = "07mkd430yhnnmk3kpmrlagz8kfl0wr44y6bg6w07b1cb5x7bs53q";
-  sgr-iosevka-fixed-ss04 = "1g812caqnzs78cmn1f2297bnnsdyhvswmv3bx9kqg2sx76kkrdym";
-  sgr-iosevka-fixed-ss05 = "0yhmg63vck9108ncg2dnm9vbf6zj5vsjjp0gna1mqn0cn2wvah9i";
-  sgr-iosevka-fixed-ss06 = "0pd73ra3dyc3qawkg7w4w602nqckrbx4sjvbirlmf55krqhkaqgr";
-  sgr-iosevka-fixed-ss07 = "12rxwqks5ka7h0sxsbdmncfx5ln11isa5df7i3cnwxvqdxh2smyf";
-  sgr-iosevka-fixed-ss08 = "1v3h11x5bal8m7glfqqzgv3cx2frgsz7gz2lsnqwsbkn5x9cd66f";
-  sgr-iosevka-fixed-ss09 = "0l03bk1h495r4k275is4i98f4rdhicn6ff14prarl3n68fb68gx0";
-  sgr-iosevka-fixed-ss10 = "0r5bixx333fbv1gddm8hzflki80zwk54lv373x0aw6iji33ybb97";
-  sgr-iosevka-fixed-ss11 = "1v01q658fa4dqxh7wrl8s950cmcqprdnghhrqyas17wrpy3b7jin";
-  sgr-iosevka-fixed-ss12 = "11yhc63rn08znfram3ycz5qfwgh4jjpwn0hagjz78d6i6sandzf1";
-  sgr-iosevka-fixed-ss13 = "1hgli7vkkwxgp03c48y76ldajdiaayd0blgdm49gjd2jhl0hkkbz";
-  sgr-iosevka-fixed-ss14 = "1qgv0zd6kxvbdjznmzzs3vgyk1fgg58pvfd04h9zr22n4h08a7lw";
-  sgr-iosevka-fixed-ss15 = "1a4wcwgh8mnrd0p10ybw5g1v0dyc6pi8vlf561miv7xxxhwsnxn6";
-  sgr-iosevka-fixed-ss16 = "112p61cqiwzfilddwqq0i9b896vb25mbkkl51ac9xabp28izl0m3";
-  sgr-iosevka-fixed-ss17 = "16k69hv04mcnsyb6cnrbd9cgfv8ifkazwnfs5scfijcz9rbs4zm6";
-  sgr-iosevka-fixed-ss18 = "1gm3azw6hsz42fmiiangg8rba4dh6r6a3mqh9nphkd6x0ipmvmkn";
-  sgr-iosevka-slab = "0vn49nms0n3vm76g0lblfhnxkhjkx2kf3xwjqds34c24gzbyhhiz";
-  sgr-iosevka-ss01 = "07nki2ip4kjnli32gw47pdznvyj50a4k72b53x3nxgb1ag3z9gmw";
-  sgr-iosevka-ss02 = "0pq0g8xq9yrrwihq07bylrwj0cvj06xwiqi6njc08lci31xnf5gm";
-  sgr-iosevka-ss03 = "1lbapf246fmdlck4fddy53758nci8g3ph7mhrc3hr1ndx99whrnb";
-  sgr-iosevka-ss04 = "1g32mj1k1al50zcxnbfarb6qvvr5rfq9bmzkq9j2nfr4qjcgwr63";
-  sgr-iosevka-ss05 = "0pynimqhc2bz1sd249cjlpbndy0wp17w59r1s87lhdikqqymb2ck";
-  sgr-iosevka-ss06 = "1nsiwjw2f1w2n5n5iqgscgg25zk821b2ps3mb6h6knnsdgw9snpq";
-  sgr-iosevka-ss07 = "1vm5jmiw6x1b8zlv5ipjqzwx9bwaj9mlcpj9xnayafdx5giwsm81";
-  sgr-iosevka-ss08 = "1fhcn9qn6fq1q6f2xnszy5yzpn88rh1hbax8pb1cdrg304ksjqsx";
-  sgr-iosevka-ss09 = "1837k4r634pr3dkz5mk9sbmpafgnpw0dgj9n4k19396n47llbzc1";
-  sgr-iosevka-ss10 = "0agdxcgysrapg038grv3i753k4l1dqqs56g45aj6b0sp3ygjpkpa";
-  sgr-iosevka-ss11 = "00367dmgva7mhwnnxrjmcag39k0sizr443sv06pscglmgrl7f2y6";
-  sgr-iosevka-ss12 = "0h9m42a6jybwjlv2pq1agdprppcvsgyvyif0l8yv9kji2i2gj2ln";
-  sgr-iosevka-ss13 = "1m2xmmfq7qrff3av6wnw1zs2zh6hsic0in8rx2m01q71j8k7galk";
-  sgr-iosevka-ss14 = "19zk3kqm1870hri7q2cpryy274klk8ddf2vrlqipndxai26k6pxh";
-  sgr-iosevka-ss15 = "0ssbdq3cgidyw5dhgdnfh5vz648d10z6fsp46kkir4xir3j5xj3k";
-  sgr-iosevka-ss16 = "1kr7c4aw9nslizfv9nsxd9rj1kqd0klw375n4vy3r434rdrhgdhp";
-  sgr-iosevka-ss17 = "1k5vzkf5nhfspq22cmm4l1547wpkc521p1lsz1xz1pwgxgxfqgb6";
-  sgr-iosevka-ss18 = "1niykrhiwnzzk6sm95fjrh6dlpzswbqvpcgx4accq4zxlm8llpgf";
-  sgr-iosevka-term = "0sfxz35zcn7xnak57l6nmsicl13y9wh20pqh2cq7gv820vqfhsyj";
-  sgr-iosevka-term-curly = "0p42d65yk8ywfsjkw8vd6jy11qpwf9yczvs23265wlql7xdi5vgj";
-  sgr-iosevka-term-curly-slab = "0blh2r7166bbm981g1vhg4ri2injawb3kzf4d2y8jlnhlvi7hvjp";
-  sgr-iosevka-term-slab = "13b470id7xksp60k6agf9vg64shd0p5079059nvd6h87lr7wya80";
-  sgr-iosevka-term-ss01 = "195f5yrfvwvhb1blk2lrkzwc2vpbbg8y4l0hrmackmxy0ana4kfb";
-  sgr-iosevka-term-ss02 = "1r5qxk98x2zb50rggk216ghbwncdqhjax54r0157d68g8xknrrqd";
-  sgr-iosevka-term-ss03 = "01j6dnn995x4knvvifywb9cmqixrn2c9y9lvq31pdv5v241i9w28";
-  sgr-iosevka-term-ss04 = "01y0hacz8n4wfwqhsiswzy1czy3z1ndb881cvry19d2cg7ch328q";
-  sgr-iosevka-term-ss05 = "1hy8caysjd08aqkgjabs6jdp57fcg835brplfbcjqqfr22k5d5z8";
-  sgr-iosevka-term-ss06 = "12qqr9wk7qxpyxz8cj6zplx54g63gdy9jbsiaj29cagnkjwl1rjj";
-  sgr-iosevka-term-ss07 = "06wg3zyddcpac0gw8r37gdij3ls220f9issxn1mrrczl5wdhv8k0";
-  sgr-iosevka-term-ss08 = "0q5sxz53hqv9d8g6qv7sgcz13cxg76pwln3y72frrw1jjwvfgvdk";
-  sgr-iosevka-term-ss09 = "187mip309cfdwpw5gzjb9jwygvnfhc2bvzi0vybhhz5a70hfdbfv";
-  sgr-iosevka-term-ss10 = "1c258790xqp2bkva7md5cpi9wc6581r5j21n17srhk3dgav77q91";
-  sgr-iosevka-term-ss11 = "0qxbhg1acr6wd8ys0a5ga1pcpfqz3wwvpah9qym7pxdgmqbjq8p8";
-  sgr-iosevka-term-ss12 = "01bayvin0z6nbak2i23539aciw3g1rgqr2av38n1l0l8dpibrwbb";
-  sgr-iosevka-term-ss13 = "1qfw019paggnn6iq72zlpn132xg821awrhbyigkywj169v0nappf";
-  sgr-iosevka-term-ss14 = "0xkwj83lb6hyvz95g0rqcb7apg9njxal9sn5cgkc4abgvnvh3id9";
-  sgr-iosevka-term-ss15 = "0wnqf1bhz4jrm2g7gb3av63d3wnnb9341nlvjgb9yis03akawch3";
-  sgr-iosevka-term-ss16 = "17jwakhnl1sp6v6f8d4p47m1xpklv3r5kyvv97zyw4v7calrkabq";
-  sgr-iosevka-term-ss17 = "15kk0zl9ypz2wyyc80qla51m6bcganrima28w2rcgr1h2amwcdhm";
-  sgr-iosevka-term-ss18 = "1dkfxanxmix3afbqrdbagkpwy9ql37s4iami63l5axcq51g3fzkv";
+  iosevka = "131bxglkns15zan0xzk8k781458ig34jijzp0k27wdpw8dgblykh";
+  iosevka-aile = "0xyxjj3kr0sb8s40kl1lyzmkd18w2m4qnarfbrssxcbafgs6hd3f";
+  iosevka-curly = "0vgmynf2d2b0vxvksgsiss02was60zb7bavrffddh3fklrarkil8";
+  iosevka-curly-slab = "1gg95wccw82v7xdgibajmf312lw1c8bdpk3jl1vvp4xmig06gnfs";
+  iosevka-etoile = "1k928f9mj1fyjwxmn5iddb0p067mji408va96hcm7wy396gmh40j";
+  iosevka-slab = "06kl8y0jpbirdpx7ga09icdsjp9x3hm1552h5sq4wgy8m2prlvja";
+  iosevka-ss01 = "18dywa48mhfzaf3y4vq8509fk9sff1w7ddda6ldglvba15qj56q8";
+  iosevka-ss02 = "0f1iqbvdrdvlk6z0mykm1f095jljni9xkbkc5pnxz5ahv6lxmx6g";
+  iosevka-ss03 = "0bd50by3zlbph859g2fw5ly4lv8ywv4x1qmf1ja5ay02g5b41ail";
+  iosevka-ss04 = "0gxfma9fl6q49i6ymk84a7pz4r4wnik0ixccx478i2pdbbmyvads";
+  iosevka-ss05 = "0ms52v7y5sj579hghj8gc9rl736lpymslpbs3lfkx5p26kxwk3ny";
+  iosevka-ss06 = "0qky2yplvfln3nhclbfzdl6hn0pyjra43by8pwqzx43ai87sz4rl";
+  iosevka-ss07 = "17d0m773plnd3v8sj5j9sb5mb9qnqjnii43r0md8f0iwa3icp406";
+  iosevka-ss08 = "1rx7jv8hhy55gajx4y2741zbrl212qgx7lslgd8y924gxspkfaxq";
+  iosevka-ss09 = "1mz4sc7qn3nmq7l7cm3lh0i1pysqzns8pmqa9a7l6c8llzk8n9xa";
+  iosevka-ss10 = "1z5wa5ja205z3zyw1jdw9l59fzvfw1bifvqn9qxlnbjrkrn5kdsf";
+  iosevka-ss11 = "1lhw4ynk3wxp7bl4w2hg4vydj4y64nhi5cxn8mvamv9j7qqjyfdm";
+  iosevka-ss12 = "1gya74qfzql3y2j820yihy5hhm9hqf7ip7qnv9mhdymwzpc5swb2";
+  iosevka-ss13 = "0rr3nwwwvwh9q6fpkzxlxxw21gp8zsd611kx9m5igb6yx6wmm9z7";
+  iosevka-ss14 = "0p7wha20va30834z2y55s89g00z19587bbv7z6id64lvdwyki3fk";
+  iosevka-ss15 = "1bq707bkp5zyhjwdzadv9aaf8xnnxlzrqircgm56xbdc6j1y3zj2";
+  iosevka-ss16 = "03pb7hr5ncvlsmg48xasycsmcqwwy831xq7f747pzn0pvfbpzbcm";
+  iosevka-ss17 = "1scbnvd6wj9cm6ahxw5qa4cnq6ld118kmlzmd73fqram3l9m3w06";
+  iosevka-ss18 = "0xq9cypwdpg13s7swvhhiazkw8fpsf85c8salbg4wp8j1lq6lcrm";
+  sgr-iosevka = "1ha7n2liqkxlwiaz5r1zxv5ivchiyqrlahwd7w90w1z5sqwzmy3p";
+  sgr-iosevka-aile = "0cp9nj3z9kc3fax1z0zrv3x725pl2m5w7sfz0idpfaiwa0593n10";
+  sgr-iosevka-curly = "1lygvbjrg8lzbrqx7yznpc89r37farkk00dxnwjvc2v8r9796lv5";
+  sgr-iosevka-curly-slab = "0cz3wsldvsqyq3lxm579zimch118pr5cbvgyq6x4437nykk0jm9c";
+  sgr-iosevka-etoile = "0zxnpk0i8qkk8cq49sb2c6lr08j1y3pdj2560qcs7l64q4fzzr1v";
+  sgr-iosevka-fixed = "08ha4khxz8pskj051hjv3rvzlg6ry3gxwlc2q1ajf2j4viyw8245";
+  sgr-iosevka-fixed-curly = "1v4isscbgc6qya41znfnglply9rj7q6rmvn260r4rbj2hx99j5wy";
+  sgr-iosevka-fixed-curly-slab = "0smw0anc9rljarr4c4szvyjbd0ajj7pl001pi69cjpx0xb8zrcsz";
+  sgr-iosevka-fixed-slab = "0iffpdk35dkvczarn4y778k23rdicl0yr613w3z3alx1sajg02q4";
+  sgr-iosevka-fixed-ss01 = "056xmr3688lhpvbn2sqii1p8py6smkpar6jl5bls529cmd8zcfwi";
+  sgr-iosevka-fixed-ss02 = "0qrirgskr8xmcrbi3xvskb29xlq4sxhr67grin5m957nckqi257f";
+  sgr-iosevka-fixed-ss03 = "12hxqax5b02iswpwmfv1kp08gdcxjijsl3a6fwl2gm2ciwvhc4mj";
+  sgr-iosevka-fixed-ss04 = "0xlgxsrirkrwy0rrgiib5ahsqv9kcnfckcb02gkdn4w3bhlkydbr";
+  sgr-iosevka-fixed-ss05 = "1v2a97kw5zpw8q46v59jsmm7y4s4b1ksfk3kjnm92c8vbysmkm1z";
+  sgr-iosevka-fixed-ss06 = "1z3xb2jvgjg58kjipsvjkcc5pfsqs4pd86hvkjfbng2jjl0lvcjl";
+  sgr-iosevka-fixed-ss07 = "1g2fzzylj0g4bz9zrf9mj42h0wrwg27zdq0njgj78wp4fspmllrl";
+  sgr-iosevka-fixed-ss08 = "0qb8x8rxyq13yrv62hw7vx8bvl4nwdzdharxf6c34njsg0nafnw0";
+  sgr-iosevka-fixed-ss09 = "07dhlnh3ismw8ixdnw73xam0jji6kha5h10cqjl3jbqxlghdm873";
+  sgr-iosevka-fixed-ss10 = "0gas1ms88cd5fqajqa89vn87pnqlpy2kry418arwy9c3h5fpdw70";
+  sgr-iosevka-fixed-ss11 = "15zpzv45m5fc7vb2apz6jywc0ip0ykxzb16qdj8qf8j4rq0ajyw0";
+  sgr-iosevka-fixed-ss12 = "00pj11pkhkv72223mv0bhdj0qqv13ywc0gmdkfnmd9cbl0ml1yk8";
+  sgr-iosevka-fixed-ss13 = "1c6qffagjn3qy87gszh0cfm2xz3bnyz8gf4aqbpxyjg55abd1jx0";
+  sgr-iosevka-fixed-ss14 = "1pixg3sjaqc7m1nxcs5alczkk3axhscbgl3x599d5by02z7m1pxq";
+  sgr-iosevka-fixed-ss15 = "0x0k5i3pd4dhbkpb427lmayrvj6bbbr3gp262asckhcsq093wh7c";
+  sgr-iosevka-fixed-ss16 = "0rgv1cl5261bfhx50bkhz8276jbshzf8sz421nmz4qpmxzdalk1p";
+  sgr-iosevka-fixed-ss17 = "1g1w7zirrl9gjky8nbgbh9qjdq03r6sdh9hxcli1wz5qv09zwmh0";
+  sgr-iosevka-fixed-ss18 = "1igfnc9gl5wa06qaw3pisq4ppvd5nwzlh2f34r3xrzmiak9ljwlc";
+  sgr-iosevka-slab = "17mpfvcf4wa2kql8024pdmdf23qm17ch9cr6s1a2pgwf0hn2b3nh";
+  sgr-iosevka-ss01 = "14chhyysy66z01jq9j3d40765sz4d0v3ivzf319clv82q80gkm92";
+  sgr-iosevka-ss02 = "1c8wdcz0f8c9jdc0nyia60m785pblvcd62ag4d329dli8fp0c4kg";
+  sgr-iosevka-ss03 = "1jhl0pcwmvwkify2fdv5ml6l26106xnphxrqn11wsvg4dln3afjl";
+  sgr-iosevka-ss04 = "1wj5nbdnb3n5vfc3y41cwbqqxnhd7p2b55qd05ij85b5a9cgsflj";
+  sgr-iosevka-ss05 = "0zw7ryr7mf7c1njfin66yycg4lalrdvhdd4ycf031qj07v5py5cn";
+  sgr-iosevka-ss06 = "1ka2l4mk0ahn4alnlhyspifg2qnm7cb3ydmndy3q249aidp58bzs";
+  sgr-iosevka-ss07 = "085ghsjwysvzqpksj95x91yz0fyzc5pfj9lhpa8li0x2wjba2jsh";
+  sgr-iosevka-ss08 = "0054z74wk3wbaj3nqnkp7h6fj0zqggnhi21wwfpq52knk8ffc00s";
+  sgr-iosevka-ss09 = "0rbmhq7qix0v4ff8x9j6cgxnjfp80ck2gfww8a7k3nld9z4dn6v8";
+  sgr-iosevka-ss10 = "1ckaiqw677fi195ah496zhhs678bc4xzh31hhwsmvp92y7mfy5na";
+  sgr-iosevka-ss11 = "0zqv2qmvp07j430vbym6552zqky04dx2bnn66r40ndjsz96g8081";
+  sgr-iosevka-ss12 = "10srsjb10qwhm9hgzm56aq58wgy3r9nrcyrvj7jq1q32s5r7jv16";
+  sgr-iosevka-ss13 = "1aaikjri6xkhg6585r6079c41iqhdr94nlismk0zcdygy3ln6vbx";
+  sgr-iosevka-ss14 = "01p421bprrsrddc0f8yxgfg0db8gxs7zgass4p8smainq3zym7v7";
+  sgr-iosevka-ss15 = "0fping8ssj32rsacj7b8a13l0jcmmhznx0phv28x76hkcwagh674";
+  sgr-iosevka-ss16 = "1nzk6hf689v7s81qi1nb7vdg2xvd7v2gv2id9xgdjbfmf3bld10j";
+  sgr-iosevka-ss17 = "01cr9bw4cfyw7i4fim1xdcj5qn2l1dzccnakbqndycmnx4k1134v";
+  sgr-iosevka-ss18 = "10i5qv9ans24mjymq9jh7i3ygdkjvr38y0xc44sn7fb5l72miz1l";
+  sgr-iosevka-term = "02qaa9g0q1d66ha5391xm2vh24hr1vjqw6h6j05a9z2a0y712j71";
+  sgr-iosevka-term-curly = "1xjv9n7dimrsn0dcz9jz6p810bdx7bhcrwnh6m5mvxcf7bpj8341";
+  sgr-iosevka-term-curly-slab = "0sbj3s6ig6410092lsls7mq7h98cipmnabd1fcqxn6dszvhqq6q9";
+  sgr-iosevka-term-slab = "101m8cgjr6s8c42xas2dqyzbl44ab0y1s4cx1rqr8bgr5zxp3jsc";
+  sgr-iosevka-term-ss01 = "0b0i2gs1cv45b5ki8lgiclrly1sg2kh3r82gqbsh4scijv3md9m1";
+  sgr-iosevka-term-ss02 = "0vsldgiscl74jmj55mzqg5zz5pbg6f2fqksfyfyjdps5f584dqq7";
+  sgr-iosevka-term-ss03 = "10czljsmga2nvjix9lca84p271hx2i612984b2hbcz8cip4v2my6";
+  sgr-iosevka-term-ss04 = "06fwjgkqmhngnsljklxz2ab9dpr4sqhn8pxrkhhqka4r5srpn454";
+  sgr-iosevka-term-ss05 = "0lk1k89kjr7ld3bh8pcc8gagjgxv90bwgsgjmn7gqq7nj0kknh4j";
+  sgr-iosevka-term-ss06 = "1apfrkfxq8xbc8hry7x5l8bx87zv13asyw03hirrvzvqrl6q76lw";
+  sgr-iosevka-term-ss07 = "05rvnm17f7qgy4zq3chp12dqvdxwvfv7rld7axccyikqh3b63kn8";
+  sgr-iosevka-term-ss08 = "1y0n2dl6vknvpxhn5d2zsnjj2vgpd9saqs0kmvlbd7lpjsz8d7i0";
+  sgr-iosevka-term-ss09 = "0qkn7syk2wrk14nhwnkbbavsi518pi7qzppiq56y5z1l119dwhrg";
+  sgr-iosevka-term-ss10 = "04b78kk5mggb5xdpigkbkgvcl9q5v41mpx466isqwgxa3p6bp2b4";
+  sgr-iosevka-term-ss11 = "01wsf0qbybnw3bg7iy6yigamg31dhvl6k1gb8jsg4ylllpy7aip3";
+  sgr-iosevka-term-ss12 = "079sbibpsa3xvp8v0pdcacfpck4s01xkczbrbzpnrwiha4b5dqj4";
+  sgr-iosevka-term-ss13 = "1py76ly8wppb0q05mhv91q2x7slidwbbycm86q225yx8hgl0wjdi";
+  sgr-iosevka-term-ss14 = "0sq49yvl03w56dzxpzvfr18bah964g93fg42n31q5bbybmgykd8j";
+  sgr-iosevka-term-ss15 = "0x8kksl8k7zj0hh0fjlqmc5g2jwzdl8ylx6ljzdhfs6y9kdgf04r";
+  sgr-iosevka-term-ss16 = "1kh0m87j4nghgpixh213zs8b626yy5vbmjd4ng17jvvdj98faxzn";
+  sgr-iosevka-term-ss17 = "14rwlw0y8fv7ykyvxhpdhzycmi3j0zx3zrsvph61mnsk33p05vb9";
+  sgr-iosevka-term-ss18 = "19m3f6sgn8ivdhy7nagym6c0nwfd9yyqjdn6q6lxd8hp751jzlf9";
 }
diff --git a/pkgs/data/fonts/nerdfonts/default.nix b/pkgs/data/fonts/nerdfonts/default.nix
index 123e5cb18ab..b2576d0fca4 100644
--- a/pkgs/data/fonts/nerdfonts/default.nix
+++ b/pkgs/data/fonts/nerdfonts/default.nix
@@ -37,7 +37,7 @@ let
   ) selectedFontsShas;
 in
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   inherit version;
   inherit srcs;
   pname = "nerdfonts";
@@ -69,4 +69,4 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ doronbehar ];
     hydraPlatforms = []; # 'Output limit exceeded' on Hydra
   };
-}
+})
diff --git a/pkgs/data/fonts/unifont/default.nix b/pkgs/data/fonts/unifont/default.nix
index dda2b3f5bcb..fc39e2c8ec5 100644
--- a/pkgs/data/fonts/unifont/default.nix
+++ b/pkgs/data/fonts/unifont/default.nix
@@ -4,16 +4,16 @@
 
 stdenv.mkDerivation rec {
   pname = "unifont";
-  version = "15.0.04";
+  version = "15.1.01";
 
-  ttf = fetchurl {
-    url = "mirror://gnu/unifont/${pname}-${version}/${pname}-${version}.ttf";
-    hash = "sha256-kkSbEvWBrvcnBgHDdKJjpSYF6BJDEwmYSxVQbPkQ6so=";
+  otf = fetchurl {
+    url = "mirror://gnu/unifont/${pname}-${version}/${pname}-${version}.otf";
+    hash = "sha256-JJi4D5Zk/vkeaYjX4IIUaiCCp+e7Si3rL7+aNlqilww=";
   };
 
   pcf = fetchurl {
     url = "mirror://gnu/unifont/${pname}-${version}/${pname}-${version}.pcf.gz";
-    hash = "sha256-rdzJuOkXYojgm5VfpshtJuCJYM0/iS+HnWMXEDsLQPg=";
+    hash = "sha256-8ggUx6X1kwwd2qGl/XcqxkN35kaJbQYxoCMGIV0N6zU=";
   };
 
   nativeBuildInputs = [ libfaketime xorg.fonttosfnt xorg.mkfontscale ];
@@ -33,9 +33,9 @@ stdenv.mkDerivation rec {
       install -m 644 -D unifont.otb "$out/share/fonts/unifont.otb"
       mkfontdir "$out/share/fonts"
 
-      # install pcf and ttf fonts
+      # install pcf and otf fonts
       install -m 644 -D ${pcf} $out/share/fonts/unifont.pcf.gz
-      install -m 644 -D ${ttf} $out/share/fonts/truetype/unifont.ttf
+      install -m 644 -D ${otf} $out/share/fonts/opentype/unifont.otf
       cd "$out/share/fonts"
       mkfontdir
       mkfontscale
diff --git a/pkgs/data/fonts/unifont_upper/default.nix b/pkgs/data/fonts/unifont_upper/default.nix
index 892ed5be240..267dc7d8977 100644
--- a/pkgs/data/fonts/unifont_upper/default.nix
+++ b/pkgs/data/fonts/unifont_upper/default.nix
@@ -2,11 +2,11 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "unifont_upper";
-  version = "15.0.04";
+  version = "15.1.01";
 
   src = fetchurl {
-    url = "mirror://gnu/unifont/unifont-${version}/${pname}-${version}.ttf";
-    hash = "sha256-7iRcyKfGpv2rjVLPRNchxpXwj0KA5jlgDnCfG7byLLI=";
+    url = "mirror://gnu/unifont/unifont-${version}/${pname}-${version}.otf";
+    hash = "sha256-+aSVF8taBuAmkrQDvCH5bqdnEo21LwidMSYaiWjTrOg=";
   };
 
   dontUnpack = true;
@@ -14,7 +14,7 @@ stdenvNoCC.mkDerivation rec {
   installPhase = ''
     runHook preInstall
 
-    install -Dm644 $src $out/share/fonts/truetype/unifont_upper.ttf
+    install -Dm644 $src $out/share/fonts/opentype/unifont_upper.otf
 
     runHook postInstall
   '';
diff --git a/pkgs/data/icons/whitesur-cursors/default.nix b/pkgs/data/icons/whitesur-cursors/default.nix
new file mode 100644
index 00000000000..c16efa996d3
--- /dev/null
+++ b/pkgs/data/icons/whitesur-cursors/default.nix
@@ -0,0 +1,31 @@
+{ lib
+, stdenvNoCC
+, fetchFromGitHub
+}:
+
+stdenvNoCC.mkDerivation {
+  pname = "whitesur-cursors";
+  version = "unstable-2022-06-17";
+
+  src = fetchFromGitHub {
+    owner = "vinceliuice";
+    repo = "WhiteSur-cursors";
+    rev = "5c94e8c22de067282f4cf6d782afd7b75cdd08c8";
+    sha256 = "sha256-CFse0XZzJu+PWDcqmvIXvue+3cKX47oavZU9HYRDAg0=";
+  };
+
+  installPhase = ''
+    runHook preInstall
+    install -dm 755 $out/share/icons/WhiteSur-cursors
+    cp -r dist/* $out/share/icons/WhiteSur-cursors
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "An x-cursor theme inspired by macOS and based on capitaine-cursors";
+    homepage = "https://github.com/vinceliuice/WhiteSur-cursors";
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ tomasajt ];
+    platforms = lib.platforms.linux;
+  };
+}
diff --git a/pkgs/data/misc/ddccontrol-db/default.nix b/pkgs/data/misc/ddccontrol-db/default.nix
index efb3f021ec5..52e6c59285a 100644
--- a/pkgs/data/misc/ddccontrol-db/default.nix
+++ b/pkgs/data/misc/ddccontrol-db/default.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation rec {
   pname = "ddccontrol-db";
-  version = "20230821";
+  version = "20230911";
 
   src = fetchFromGitHub {
     owner = "ddccontrol";
     repo = pname;
     rev = version;
-    sha256 = "sha256-R+DXpT9Tgt311G/OtmKp3sqN0ex/rlLt3JuSK7kciC0=";
+    sha256 = "sha256-3lGzQ95ZS9yr9dX+wCTmX6Q+IsbMCfBa4zhcyxsG4+w=";
   };
 
   nativeBuildInputs = [ autoreconfHook intltool ];
diff --git a/pkgs/data/misc/v2ray-domain-list-community/default.nix b/pkgs/data/misc/v2ray-domain-list-community/default.nix
index 116436ef0bd..211ee414750 100644
--- a/pkgs/data/misc/v2ray-domain-list-community/default.nix
+++ b/pkgs/data/misc/v2ray-domain-list-community/default.nix
@@ -3,12 +3,12 @@
 let
   generator = pkgsBuildBuild.buildGoModule rec {
     pname = "v2ray-domain-list-community";
-    version = "20230905081311";
+    version = "20230913074035";
     src = fetchFromGitHub {
       owner = "v2fly";
       repo = "domain-list-community";
       rev = version;
-      hash = "sha256-lSiEfLfXnxou0pt9k6SFRnCm/CeUh2TBhLzi6BwJs7w=";
+      hash = "sha256-A1401KSNkGoVEbiX2MyepesnyF0qVWZ7tuKLtoKUA/k=";
     };
     vendorHash = "sha256-dYaGR5ZBORANKAYuPAi9i+KQn2OAGDGTZxdyVjkcVi8=";
     meta = with lib; {
diff --git a/pkgs/data/themes/catppuccin-gtk/default.nix b/pkgs/data/themes/catppuccin-gtk/default.nix
index 4bda3174662..1e62dd73746 100644
--- a/pkgs/data/themes/catppuccin-gtk/default.nix
+++ b/pkgs/data/themes/catppuccin-gtk/default.nix
@@ -28,13 +28,13 @@ lib.checkListOfEnum "${pname}: tweaks" validTweaks tweaks
 
 stdenvNoCC.mkDerivation rec {
   inherit pname;
-  version = "0.6.1";
+  version = "0.6.2";
 
   src = fetchFromGitHub {
     owner = "catppuccin";
     repo = "gtk";
     rev = "v${version}";
-    sha256 = "sha256-b03V/c2do5FSm4Q0yN7V0RuoQX1fYsBd//Hj3R5MESI=";
+    hash = "sha256-BjdPe3wQBSVMYpeCifq93Cqt/G4bzsZYgOPBTilHqD8=";
   };
 
   nativeBuildInputs = [ gtk3 sassc ];
@@ -53,9 +53,12 @@ stdenvNoCC.mkDerivation rec {
   '';
 
   postPatch = ''
-    patchShebangs --build colloid/clean-old-theme.sh colloid/install.sh
+    patchShebangs --build colloid/install.sh
   '';
 
+  dontConfigure = true;
+  dontBuild = true;
+
   installPhase = ''
     runHook preInstall
 
diff --git a/pkgs/data/themes/vimix/default.nix b/pkgs/data/themes/vimix/default.nix
index 5bd01621ed3..1a49b5cff89 100644
--- a/pkgs/data/themes/vimix/default.nix
+++ b/pkgs/data/themes/vimix/default.nix
@@ -24,13 +24,13 @@ lib.checkListOfEnum "${pname}: tweaks" [ "flat" "grey" "mix" "translucent" ] twe
 
 stdenvNoCC.mkDerivation rec {
   inherit pname;
-  version = "2023-06-21";
+  version = "2023-09-09";
 
   src = fetchFromGitHub {
     owner = "vinceliuice";
     repo = pname;
     rev = version;
-    sha256 = "/LZj7iVWJI4U66XC15TuLnqXVEIF/lOlV+Jujf54NV0=";
+    sha256 = "dfdPEJnSmD0eqzx4ysiGPp77Beo32l2Tz1qSrbShLlc=";
   };
 
   nativeBuildInputs = [