From 3f492973aef18d8fabd90a10e0c5e38d7c711c3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Wed, 9 Apr 2025 16:10:10 -0700
Subject: [PATCH 01/19] python313Packages.pyiskra: 0.1.17 -> 0.1.18

Diff: https://github.com/Iskramis/pyiskra/compare/refs/tags/v0.1.17...v0.1.18

Changelog: https://github.com/Iskramis/pyiskra/releases/tag/v0.1.18
---
 pkgs/development/python-modules/pyiskra/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pyiskra/default.nix b/pkgs/development/python-modules/pyiskra/default.nix
index 81839a2b7bde..07ef1bc66b05 100644
--- a/pkgs/development/python-modules/pyiskra/default.nix
+++ b/pkgs/development/python-modules/pyiskra/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "pyiskra";
-  version = "0.1.17";
+  version = "0.1.18";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Iskramis";
     repo = "pyiskra";
     tag = "v${version}";
-    hash = "sha256-LpiylQe/8bBIlFLmrbIEOyeqHgHzW9SaG71O7y28Rkg=";
+    hash = "sha256-O6OCO8vH+1XyhkUZgRd+s0fpvHa+t7Tuzx9N7Jl7iYI=";
   };
 
   build-system = [ setuptools ];

From baffc5931c9718743ab657e1274e62628f3765eb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 10 Apr 2025 02:48:13 +0000
Subject: [PATCH 02/19] makemkv: 1.17.9 -> 1.18.1

---
 pkgs/by-name/ma/makemkv/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ma/makemkv/package.nix b/pkgs/by-name/ma/makemkv/package.nix
index 5832860a7303..a664daaeb4d5 100644
--- a/pkgs/by-name/ma/makemkv/package.nix
+++ b/pkgs/by-name/ma/makemkv/package.nix
@@ -17,21 +17,21 @@
 }:
 
 let
-  version = "1.17.9";
+  version = "1.18.1";
   # Using two URLs as the first one will break as soon as a new version is released
   src_bin = fetchurl {
     urls = [
       "http://www.makemkv.com/download/makemkv-bin-${version}.tar.gz"
       "http://www.makemkv.com/download/old/makemkv-bin-${version}.tar.gz"
     ];
-    hash = "sha256-q87cvHBzUQRF4wO/ZA07kbGrok0Bkj1BGTi/4i0s1Hs=";
+    hash = "sha256-sWV2ZR6t7DWF6BeEOioaDryqcTuJ3R4CDYsdBW3bL9Y=";
   };
   src_oss = fetchurl {
     urls = [
       "http://www.makemkv.com/download/makemkv-oss-${version}.tar.gz"
       "http://www.makemkv.com/download/old/makemkv-oss-${version}.tar.gz"
     ];
-    hash = "sha256-JrEV5rpJNRgbXqiKLNUZZtWbZyR44EMTd1kSKVGLZ6o=";
+    hash = "sha256-3Efu+x5o99U55LB5u5POZBRBBK0jPeVoGJOYEOzQO3s=";
   };
 in
 libsForQt5.mkDerivation {

From 4cb5d9ad1349944c06089a43ab72561e62c47be7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 10 Apr 2025 12:11:01 +0000
Subject: [PATCH 03/19] iosevka-bin: 33.1.0 -> 33.2.0

---
 pkgs/by-name/io/iosevka-bin/package.nix  |   2 +-
 pkgs/by-name/io/iosevka-bin/variants.nix | 180 +++++++++++------------
 2 files changed, 91 insertions(+), 91 deletions(-)

diff --git a/pkgs/by-name/io/iosevka-bin/package.nix b/pkgs/by-name/io/iosevka-bin/package.nix
index 05e492db26c2..ac3717869433 100644
--- a/pkgs/by-name/io/iosevka-bin/package.nix
+++ b/pkgs/by-name/io/iosevka-bin/package.nix
@@ -17,7 +17,7 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "${name}-bin";
-  version = "33.1.0";
+  version = "33.2.0";
 
   src = fetchurl {
     url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/PkgTTC-${name}-${version}.zip";
diff --git a/pkgs/by-name/io/iosevka-bin/variants.nix b/pkgs/by-name/io/iosevka-bin/variants.nix
index 455e931e1ea8..8532189f3aca 100644
--- a/pkgs/by-name/io/iosevka-bin/variants.nix
+++ b/pkgs/by-name/io/iosevka-bin/variants.nix
@@ -1,93 +1,93 @@
 # This file was autogenerated. DO NOT EDIT!
 {
-  Iosevka = "0fqm3dall5yajqinxpqqnqbngr2qj1g9ch6a24b56y1xjd62cran";
-  IosevkaAile = "1qv1ipnky1jwkrgwb2zzlcsjyfpswy1h7jjdhybkqqxr0kln6669";
-  IosevkaCurly = "0zy9dhwglbbsgwa0s7nhz6lm72v88iv4pqnpdfjq5yn5ngsr9wnx";
-  IosevkaCurlySlab = "16vrc3lk5islp0v53cc1jcipxqqq0mgrpx3vx8qqc0jy34vraa2r";
-  IosevkaEtoile = "0x4bc20iwdm3ympm32zvskqlmjb23j4k9f1bvmmc78v1s9l07n9h";
-  IosevkaSlab = "06njqwhd80ikv7armlyryslkrlwa44nn47m46xw2k6zdws6rilm0";
-  IosevkaSS01 = "1ksrvlv1mysy1ld4yxiq1hh7jhhg61p3yhyb8m7cpwpi340vlf7a";
-  IosevkaSS02 = "0b0l4wbjqvxyp20wfnky3filvwpv59xxav4sa8ad92rgz5q24lxc";
-  IosevkaSS03 = "1prjhxirv2rdaxcwpn8r5c96pjk1rpwf9kz92yidh7szcfn92b9x";
-  IosevkaSS04 = "108agp6nq0rddd7hb4r5nf0c3122nibzspin19yhicaxangba1rb";
-  IosevkaSS05 = "09phnpjxx3xadyar4cng7bl7i96l4z65z8z7xixkgjhrbfb3gmn4";
-  IosevkaSS06 = "137qdcs31qny3fqi4k96pcrhi95r8piv6bmdfv3lcv94v80zz6f0";
-  IosevkaSS07 = "1n34hai1knj66q1ab9n9s839qizprmrzda8ww7hnc7l1dz5yv12d";
-  IosevkaSS08 = "1rzllgh5s3brh6bipszhcs2hr4bmzq325h72s7agj2dq451a3i8a";
-  IosevkaSS09 = "0pkbxraad7m3bcp6db48wwm0k8xb303cqcd4cnczgrnl8qkd2pd7";
-  IosevkaSS10 = "15107qv3rmvwc5mrlp1h1sh6f0m40daspxri27y9bgl2imz074sr";
-  IosevkaSS11 = "0f5ym3324y8jwinkraqsl79342gj8078yrmv5k6a9wzwzb23y82j";
-  IosevkaSS12 = "0yqmm4yl4dcldl49w0i4bm26l2y540531drpbp63q3m84gkxkr56";
-  IosevkaSS13 = "1k1h6zpq95dadybv84q16jwk3gy8151l8z4302rsh2c474w6p8cg";
-  IosevkaSS14 = "06xx3cs3qvb0i3zw0v1rbk573dmpfg2izqjs65bdzn1v8h13glqv";
-  IosevkaSS15 = "13bbpnc9hkndy8rfkfxvyr98pqh822xn6npp6h5gipslczgci0kr";
-  IosevkaSS16 = "1cgfmb38l6hdllijdg1ybxhk2acx8rxa0lxx4z9rpak00bw3zy4m";
-  IosevkaSS17 = "0a3ir1wa93darilalvkyl2gp3rgk3v86qvbvq428pg3z0fkxg4lp";
-  IosevkaSS18 = "0kc144dc9nsq5anp61pfyad5h4qwgkm7xnca10g62cn1a1l2lkks";
-  SGr-Iosevka = "04jwfl8idgqv1y401y6b6pc4hdarkp126n43kdcb8x083qfnfw20";
-  SGr-IosevkaCurly = "085yphzyb044v091sn726iz5kwmk8vsy19v4m936kk9b7s5jcavz";
-  SGr-IosevkaCurlySlab = "1axqcc57sm3bxqsssbanxsfl2x4s417jf6v0gjlkv3dgknmq18zh";
-  SGr-IosevkaFixed = "131ibj57v2sabb8pw8dhk86q0kbh5q22allkdcibgcrj8av9g3ym";
-  SGr-IosevkaFixedCurly = "12fy0i2hd91p9z7n9jqbqyac2s15xz17m7qsmqnh5ijbv0h15xs3";
-  SGr-IosevkaFixedCurlySlab = "0lrcpjiam1hvwhfgpafv6pny4a443x10f64lhs7ig5ga7msn34ww";
-  SGr-IosevkaFixedSlab = "19y749m77i5xw4ny6x6zqbdg2pjpwm8ns51y1k6x6fxmzw1f45iv";
-  SGr-IosevkaFixedSS01 = "1332dsn8n11mwiqv5qhkiqzh0cp1bz8jc576mq735xcsdjb9rmbv";
-  SGr-IosevkaFixedSS02 = "06pg5kpklgapidnmh97r9zr7lk043493pi1154p3rxn71q5q0gja";
-  SGr-IosevkaFixedSS03 = "13bjcbhdcabcdq8xy7rc75vszmdhq1n8ykqyg32g04mcza6qh711";
-  SGr-IosevkaFixedSS04 = "123fqgpy1srsbryp3svamqfgxdk0kh98rdlbmhfaw3fzdrfcpbm1";
-  SGr-IosevkaFixedSS05 = "0zc7v7c4q50hlyrwkw58rm20igbyvkq07fhb369bijr42rlvhhc3";
-  SGr-IosevkaFixedSS06 = "1l0zwmq1l2k5iz88zwv4wksl3h2kvfr0vjdhyf8sc42la99v7xsk";
-  SGr-IosevkaFixedSS07 = "1g7vs4j1b1h0xqs8lzasgjszz1pf80frgj819qnrqwf7as0lhlrn";
-  SGr-IosevkaFixedSS08 = "0dxc5c2hy0vf0jn7njm1xpcblvmnkz2yalqksqf4i2fip1ysd5yc";
-  SGr-IosevkaFixedSS09 = "07s43jhxwh6qha4k5wpxv7sqqhbd475sqwrv14fzw08m12mpdpkc";
-  SGr-IosevkaFixedSS10 = "077dwvnm78fx0fj4bh0clzmvcgk6kci2a9avwqp4zqzz12z81dmj";
-  SGr-IosevkaFixedSS11 = "043wc8075359llr5jy6jzrh9dvdzzgc0iqplvvncmhj69q06cn81";
-  SGr-IosevkaFixedSS12 = "1dbf3lqygz7wckq84gfy92wjpiqy7jwhbbfb9mcbvnnkz9vn33nc";
-  SGr-IosevkaFixedSS13 = "04my4x9k4hcrzl9iab44dd1xpab2i486vxgr3ap4g8yppgc1844d";
-  SGr-IosevkaFixedSS14 = "0r11nq120hccmbg0yzam1zigpcwxymghgqrn5qqilh4mky91sdj6";
-  SGr-IosevkaFixedSS15 = "0kqwrr89gbmpjrpmmsnvi0gzrbfqa7akk6j9821k795a0swym1wa";
-  SGr-IosevkaFixedSS16 = "1bvjxxzm2klay9mxbzrgv8waxgr5nlikp6s05p7ac9gif0q6344c";
-  SGr-IosevkaFixedSS17 = "053pl9y8sm6z5hdawxf60f9zvffzys86a1znf2d0hn3si3shdyy9";
-  SGr-IosevkaFixedSS18 = "0cckxs4p61jsrynvvj7q75dg7fhac4qc94k595nln7g4a8lyxvl1";
-  SGr-IosevkaSlab = "1znjdjmfkpn4z6kykxyg87ahkwqm95l06gbsnc45i0fzwkikapwx";
-  SGr-IosevkaSS01 = "00pzyv2r1gy9pwbg35pg7x4g4jsl7l1xqyn1ywsbcpcdagsda783";
-  SGr-IosevkaSS02 = "05lxrl27maksbxrrfrarlhiacax2ghl7h7vbq2y2aa7mml46j9nn";
-  SGr-IosevkaSS03 = "0yycbwfjqamqvliihdkxpahvr8b3grfrzpbzxsjs54vfi03q8wxs";
-  SGr-IosevkaSS04 = "0a5g7i28l0i3lm31ggwfr8ix0w5z96qxhk7az2nifgfspcygsmvm";
-  SGr-IosevkaSS05 = "1c4y7pplh8h3y0g41arhg7ilnpfr9jvrx4ffv2gfs96z8nd3v1j7";
-  SGr-IosevkaSS06 = "011gwa2nyjijh6w5yxah4ss9i5lgp0fs639mg1d5khyrazzhd8lv";
-  SGr-IosevkaSS07 = "1n11pqlhl3db6n5ia5rkr8b69fplj3xmaqpv237mmpa7msxdj03v";
-  SGr-IosevkaSS08 = "1nxgpl3ncr5ky2llizgnz941zw2i5vmd9ccqrdzknlr90rdi5z12";
-  SGr-IosevkaSS09 = "0x3jz7vg8w86pzyc82axb70xg2j4nfzmy7hnhbrlci35yxvxrwlg";
-  SGr-IosevkaSS10 = "0zq76fqqys2p23panj0jm5575lnrrskxgbgrki1v8ssp0zy8qind";
-  SGr-IosevkaSS11 = "0sd6mlpf2hplkv3njqxxyj9d1ja5ap5cvz87fnqm3k82bvy9j3mv";
-  SGr-IosevkaSS12 = "1aa40j9vagp4q5b3pf4iab16m3frn05w3xm9hmlh5qvkz90kbgzq";
-  SGr-IosevkaSS13 = "0hav346gz42027dkasdfskmmgrcjv874i27ns26n1cpvnk997lyl";
-  SGr-IosevkaSS14 = "1xxhif1yyjb2x52nbka7mw130b47l0hxm4cgimnhb7fs9ha2a51j";
-  SGr-IosevkaSS15 = "0i182a442092c5azyybbrnpvsfg46iajmzj1lp12cpm73sannfb8";
-  SGr-IosevkaSS16 = "01gz4nxi18r0yrr42lr2nrf2lca8a3rliz5k1b594qsnswpqv0fk";
-  SGr-IosevkaSS17 = "1c2krm1xabwqk7g4p0m9xhgmpx9bcn9npbx146cig3zb94djrav7";
-  SGr-IosevkaSS18 = "1v03vchjkzji74iav2l55lmmig232a1rjfz22mwvvw6vvsqp75m6";
-  SGr-IosevkaTerm = "12jbm58migwvbiqxn8ykcnq6lb285h323cbk5baxk0qn8nhsybnr";
-  SGr-IosevkaTermCurly = "0kk0wmkcw17z6j4l142r0q4zf4jsh3rnvsn0n97famw3mrdnjcn9";
-  SGr-IosevkaTermCurlySlab = "0hxr3wp9sr7vr5w9sjyyfbhshlj755d2lyjbnjs0ac5r1vcgfqyf";
-  SGr-IosevkaTermSlab = "1pcqlvb8zbqz2idmf4dhhwq6srby7a6w3254dcw9qj7432rhfhfx";
-  SGr-IosevkaTermSS01 = "1h3kivh7l4abfcx6x1kcmws2lcsjid4159jmsrp2dbgg4sa92nwy";
-  SGr-IosevkaTermSS02 = "08blza1chjks8641wxi2251rxv264j0sxdcacllss4y0a13qv2xn";
-  SGr-IosevkaTermSS03 = "0i5l61qd92ykifwa8a0cll2317gwd611kccqc9bk6grlxpyyajjl";
-  SGr-IosevkaTermSS04 = "0grvfxlxsq75v04jrbx5xhb6lhv564lb23zdlncwp5f7kiwnjwh1";
-  SGr-IosevkaTermSS05 = "0c6pbpi92ga67ypr6xkzzhm47ph54nz0v5hjvnnys8hdazrp7q7l";
-  SGr-IosevkaTermSS06 = "1s9a5yylzka728wkl89fk712g7kmhqv1fhy04c5dg69r85189w8s";
-  SGr-IosevkaTermSS07 = "1prvb7ppgl3n5jzihag1l1yrwgz0rxgf86zqb62nvyrvvvslkly8";
-  SGr-IosevkaTermSS08 = "1dn7rdipfyvcqq4gv07r7zkmg0h1337c2s17ajzv0k0f79a6k9mr";
-  SGr-IosevkaTermSS09 = "1fqjn07mz0xgrhj8lbq6l2nxzykbx2kcrq1hhmd60y79241dsms6";
-  SGr-IosevkaTermSS10 = "1d499grr3khq45fnflwdj7h8qkxgyri7fs77kwivsaqn2p7hd9ff";
-  SGr-IosevkaTermSS11 = "0fhj3xnxvc4b3vri13jg9zqghql6z29d9h7xi6hl75cf8gl0rzlc";
-  SGr-IosevkaTermSS12 = "1xvfk9wvd91wzaa6d9zj6yxzkmgmjd13v2kjrwv9m1f5ykdzpvpa";
-  SGr-IosevkaTermSS13 = "0zd0i0mzqh36d6w72lrrl3i7zvsy9p3yj9z5hb9kcsnlg9cnnlyv";
-  SGr-IosevkaTermSS14 = "01qg7yvn29lqnd5fmnhyrl84lh3vhm1yxinx39nclj3vfp26r6qz";
-  SGr-IosevkaTermSS15 = "0hxvrawp94a2vx23gyf7pnzd3dzrh7ijgg4q6pcj2kfadfxjwqks";
-  SGr-IosevkaTermSS16 = "1ghkg9d8371ls8iipzqn83kp9j9aah76c90zy8wkvpjh6ypp6sgq";
-  SGr-IosevkaTermSS17 = "0pr6n3b3h8jp7h5hy468ia3dwsnqawcm7v2m8waszgywgvpl5rcy";
-  SGr-IosevkaTermSS18 = "0f08vznvd2hdn3bdjx3qzy5hkrjqm69dpyj4rr4lqxwwx1dyy120";
+  Iosevka = "1fp26w8gwvs7rnfkjx36dkf6d87py9y3wd9x21l6v8kia8lfpmbd";
+  IosevkaAile = "1inglmx8xqhyn4zrh8hk11xsnz00rahvg539ca9fbvzn096lbhfz";
+  IosevkaCurly = "1srw7fpssmyksp9ylqif81vppwi0a0rdmwr7d24q7ij6h2kk094d";
+  IosevkaCurlySlab = "047m9lwmrw40mlgb6mislqahvjs7i5laqgya3xsrgsmm9ybkf2gn";
+  IosevkaEtoile = "1cdvsbbpzf0b0daqpyzcdffi0g31b8xfbzara933gs5xmf01ggv5";
+  IosevkaSlab = "1yvxx6kg92jv5j8fjb5z8xw3fqh0hp305i4f523wwhbxvf3jjpmb";
+  IosevkaSS01 = "0ml1ypz2wxsqxwcx8g4kvj4facqlav2lw9ymj94clkgxm07mp6nz";
+  IosevkaSS02 = "1gijwlzbj5wc1qfagnn8zcivzd9m6bw7p6z3cxkivnknsnirnnd2";
+  IosevkaSS03 = "1xbh6igibgv430lnr92xn31srglvajmbpbirfammhr7lp4fxwh64";
+  IosevkaSS04 = "1mm2j2k4l73y2r5x6snswn4cyikxs5dqy70cqj31f5286x8ggf67";
+  IosevkaSS05 = "1gm35zh3lmvni3vspnan5zkqxkc91324n3a5dqic1zdc4ispigv4";
+  IosevkaSS06 = "11j6hy19rpw7mv2km76qcngcxq6vx27qpl7k8nnv7lbs2932kngv";
+  IosevkaSS07 = "1wivn5h4ryn3d47953jy8ylbp4as6p4ml2x9p492lccrhbb3hbmi";
+  IosevkaSS08 = "1xdn8yf3w4641fxzk0s4171f8z0dg7xysh6ambi4mx5yfwr4rhxa";
+  IosevkaSS09 = "0akaaix1a74sjcnrkg1b4df01zvsbspww4814j1sdm149ckp559c";
+  IosevkaSS10 = "0ddz060z14pij8sjy5yf1ip5lzdvv9sl57cn17l8ls16hc3k2b9j";
+  IosevkaSS11 = "0l3yikky9gqmlvqxgk1smzcmyymdxj8ha8kpjmdcpdll8zzhdqf1";
+  IosevkaSS12 = "1qpqllyc1avp9ca6yimdxljr1qq4dgqm5zwprbnf200sayr84vg8";
+  IosevkaSS13 = "1qlad3glcsarmg9nxcx4yx611z8fr5993hwg82s3xpd2zqadkgrn";
+  IosevkaSS14 = "17gb43kdfi63djcww59pmmh9pi274gpxsf5k5p01gfp5792xs4c5";
+  IosevkaSS15 = "0viiikzhgxydmrn9nq090z3rydh4k1rr62ri2593157k3bdqc1xa";
+  IosevkaSS16 = "1pfnb8ih1gi10f61dmxjgqm2z6aik71bqmjc0ax5w16dg9shqdrj";
+  IosevkaSS17 = "068rf59f6zcni6635waabspg8spdj02lqksjxp1lxbl6rf6dsadl";
+  IosevkaSS18 = "1wkymkrzqgsmp9d07wggzvnvsni649kc68gnq98x2j5nrl8jcivp";
+  SGr-Iosevka = "1hxsz9f1pg5wcwzb51asabxqly87cvrmq0rsq9f7kg2w10m9ckzd";
+  SGr-IosevkaCurly = "1gn179s1niisc29i2dms45qmr1cglwix60mwq5pjs5fkzg23nqb4";
+  SGr-IosevkaCurlySlab = "18fd3gmzc2f759aq8gn8p03zvqpydvvp80ly42bpl3s3i8gbxg0q";
+  SGr-IosevkaFixed = "1dnms6sidyrjyi6379x3yv6g1a5njbn1qa3s2k4j0q5mfs41273p";
+  SGr-IosevkaFixedCurly = "0h3lhawlimvy2x0zl6i0imp3l57shdzapzg15y5961dbcdbsyf4f";
+  SGr-IosevkaFixedCurlySlab = "1zx9xpv8dkib1fgqw9m494skhwlji8vg0m1is4syk3c4h5q87d3j";
+  SGr-IosevkaFixedSlab = "03i7d5bqi4ycbvx74srsmvns0g8pmfnyc9ivk3jn91ahnp6fflxa";
+  SGr-IosevkaFixedSS01 = "1jg1qy8crjsr2vpdc7sc82z2nrsblm71gpl5nhzs0v9jkp55iiwk";
+  SGr-IosevkaFixedSS02 = "10lh9996knlsp8rjm4jp98rs5ykyrib9zqm0dpx23dmrxpsq86rn";
+  SGr-IosevkaFixedSS03 = "1kpkzrqmwabrwg29f4rm8i3d199jkq3yc7aq4wq1qj6bgvsw1qsq";
+  SGr-IosevkaFixedSS04 = "1myjn9i5ssjrqa3ljmf8yqq5675c36mxy4xq5cxn730zm436cl3w";
+  SGr-IosevkaFixedSS05 = "114naq0k3yf3qfcp87w6a4527sjs2259rc6gldzw7xxhfq13mdkp";
+  SGr-IosevkaFixedSS06 = "0qvqs24rcj70n3x7qsrbh6gxs5nld5qp5wxqmzhhsypr5z54rb27";
+  SGr-IosevkaFixedSS07 = "1kyz866kv6vfnqdaizn6d71qh5jhx321zh9sjiyifqlgmyjn6ahw";
+  SGr-IosevkaFixedSS08 = "1zyfkadgsjxgzkbw2c5qgh1gkhsmpxxsbqjfxiwqpfjhzb023rxs";
+  SGr-IosevkaFixedSS09 = "0nm562ywsmgqywbsylxh6ynr75ngkw9h9ffz85gs8acf6m8x5v64";
+  SGr-IosevkaFixedSS10 = "0vnq36s96h7srbkzcayclhiy55crnzmgj1ilj7in2mrb7sk7jzlq";
+  SGr-IosevkaFixedSS11 = "0p771fwl54pl9kv6qk3piwxpqcbx0p4vx8dq7pgbpnkbhj0mrb1r";
+  SGr-IosevkaFixedSS12 = "0nxgpsiyprpgzas304j3imk4gff0q1v2k93sgdwxj7cl1cnncl79";
+  SGr-IosevkaFixedSS13 = "14rmi3fgxvbc8db7i767wlki850nbg8sgyafqdpisn0l5n2qxma9";
+  SGr-IosevkaFixedSS14 = "1mssv68ky1pqfldbhy9sx4cy99l5as8v2gkav85m3wj8a26x63fp";
+  SGr-IosevkaFixedSS15 = "03c8ll9yiyh7pwnm73wggv160wbvvik0bp2s36122w5fyws48m8c";
+  SGr-IosevkaFixedSS16 = "0mh3b633yqagfpx31dx91p0y8c8l8ks0bnm1v8snbvp1irkjhkgs";
+  SGr-IosevkaFixedSS17 = "03isvkr0m6pvygiqr497p4drly4vqlbvpmy4rc81c6kj1klwsi7a";
+  SGr-IosevkaFixedSS18 = "0z9idiblf12yfi106mmzw7nmxija7jpnil6809r9ilgp4wdm68hv";
+  SGr-IosevkaSlab = "1bx49i4lbiqvjfj3j3pc9yfg3xn4s2m269vp5zdavhxdakjxlgq1";
+  SGr-IosevkaSS01 = "0ymx90ajjcdgk0d5432srmbm4a0f46l52r3ig6gpq2q144qdnnfd";
+  SGr-IosevkaSS02 = "0d4q81jp4pj99h0bkm9gqwyhhm82h46p2i6p7wcvqnpar8diqpbg";
+  SGr-IosevkaSS03 = "1g5xm3rmpi5r6sk29i5csjjbqlkpza4sdp00w19bvpbj6c5xkmvh";
+  SGr-IosevkaSS04 = "1lv4fh3x1ykgcby0k4hky0rjmxy2c4ndilns14zbj51gb7w99iw8";
+  SGr-IosevkaSS05 = "1npm7dz5p05b5gc683jf0ky2249hdjdv96vgv0vp2xb7v9lm5mmw";
+  SGr-IosevkaSS06 = "0ixg8fsjc56kyizr1z3db3p17rkjm3hblv8vlilansszj9j0nhbj";
+  SGr-IosevkaSS07 = "07brpyb3bra1mhlscn64x5ca4yicqn6saalv8rdpnx9y4rwnc11p";
+  SGr-IosevkaSS08 = "07cl4sg1rhvq28liys8qay6v7xxqs07xpy1lkh7zzkjfmviw0kcm";
+  SGr-IosevkaSS09 = "0j005bk7njxcbiy4d05mvgrb4h2jygjp5sa9d16a5rzkpksia9jn";
+  SGr-IosevkaSS10 = "01hyahgssqw92qr5nlq06b6hd0vj3jcd9f7w82b2cp70z50027y8";
+  SGr-IosevkaSS11 = "0r50w6kqq0s9gv9w28kdc3vvv2scnp15iww04izrgzayd3frl685";
+  SGr-IosevkaSS12 = "1h16fc6az407zjnkfpchgw534m7h00i7shb1bc9690hfibcdiwib";
+  SGr-IosevkaSS13 = "1d8p1mbp57zmwi6xdnmq74m3vildnlsikxj2src0ybzc7vk33cyk";
+  SGr-IosevkaSS14 = "0zv5d9i596c36rzvyjf640zg85nr91vm8xvxbx523rrk1by70hvl";
+  SGr-IosevkaSS15 = "11rn8j21a2811bvh2nn2fxn1sgy084598cqxypi3d9z3bazq34xv";
+  SGr-IosevkaSS16 = "1y40x7vsni6ir9z88xvl9f33j1wynwg43vjy9b6ip96jm1760h34";
+  SGr-IosevkaSS17 = "1cfasza68xmifhkllfax4f0fr76ymmapd39d3da98pw3cp4m984b";
+  SGr-IosevkaSS18 = "0lc3sc7wydxbrfxkngb323fkdsdkvf1d6s2c4k42i1y0jjk2g3zj";
+  SGr-IosevkaTerm = "0ll89axvrvnvzdgsvmy4aqkkgwl42r09a112lk3z909wp4qcg69h";
+  SGr-IosevkaTermCurly = "0frxm0hc1fxdcgy88jh9wgj2r9g93cdmz1b3j71mniqpyf5zg219";
+  SGr-IosevkaTermCurlySlab = "1r8ljbvxnfjd27kccfjz7f7y3lwyvaaa09hhnj5h1cm2n97l1kbd";
+  SGr-IosevkaTermSlab = "1z96xhrbpcmwml46kd5x7ai6pmiagyvg4p4nlz0qn5xcfs3pvwan";
+  SGr-IosevkaTermSS01 = "0b1rd5s2rv6a5bpwhbrs9sdnsp64vzljrd6c0ql5m1svg3flfrjd";
+  SGr-IosevkaTermSS02 = "0mgpgz7bgx29chwbmy6wsq8j57p3nd45frqahsqjlj40k8f8smqp";
+  SGr-IosevkaTermSS03 = "05pg4a2lcil21yv1m5896xa9gazh5jzgihlzlmax6gzc0m6qcjx1";
+  SGr-IosevkaTermSS04 = "18j178n5mpszx5agjgvbgp253mnn6k1sdkwvm2xqvl53gxmxc179";
+  SGr-IosevkaTermSS05 = "0cai601srxcng56fw465ykikhs2gb6d05yd3694561bxp43mhnxb";
+  SGr-IosevkaTermSS06 = "0v4m0x9r94mqjicqnx8w2ia41n8xxqnax747ghdsrympfra7fkar";
+  SGr-IosevkaTermSS07 = "1xyr0qj8xz9pz3v5xj80c80q32j6n066xq5mknvy8d71kka3ikqm";
+  SGr-IosevkaTermSS08 = "1wwghn8j0q2r2n94v8gg9jd426z272ww4j6ln40h3ib6hfal8k53";
+  SGr-IosevkaTermSS09 = "0b17mr4h7m9ms2j84jifjp1f9l5cxwqdfliaqwhpmmnjsj3p95zz";
+  SGr-IosevkaTermSS10 = "0lh471pr3dcj2iwragsbgnvvp4d6l87f7wihkgdr5hzv7bjqgjh9";
+  SGr-IosevkaTermSS11 = "1h8mcywy9vgwna68n0s8a373jq78c39xkny95az8jbcxsbbg3z9w";
+  SGr-IosevkaTermSS12 = "04399p8rv8rhklfhghsnwl7fy473klbng5msqnnm6cgi7fq4myam";
+  SGr-IosevkaTermSS13 = "0m748a43xavjr2qnz32g0jsgjrnbl6ajyknc648i42gipbq0mgfp";
+  SGr-IosevkaTermSS14 = "15l6i5pcya9mdv07sbb1gab637kp0rqg77bl9rwknhlg1y91blw3";
+  SGr-IosevkaTermSS15 = "18lg7h5cg3dd4miy9wmcq692fy98c9j45pn23wdh8awl7bmfjbk9";
+  SGr-IosevkaTermSS16 = "1185c8q068i0zs1qr7nzzcf4k50yil9jxnl9833sr5wxpn7x74mv";
+  SGr-IosevkaTermSS17 = "0j6mwgxla3dw3a6ddk61w8biv7kwkf0bgfda87yvpfim598anif2";
+  SGr-IosevkaTermSS18 = "070lag58blnd0vf3icqfsm7c3ydgpljyr2qh7ak7yz1fg61mzhmx";
 }

From 3b6e8ad1f96682fc52271378c2e3411bea7cc31a Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Thu, 10 Apr 2025 22:02:05 +0800
Subject: [PATCH 04/19] jetbrains-toolbox: support more platforms

---
 pkgs/by-name/je/jetbrains-toolbox/package.nix | 169 ++++++++++--------
 pkgs/by-name/je/jetbrains-toolbox/update.sh   |  41 +++++
 2 files changed, 138 insertions(+), 72 deletions(-)
 create mode 100755 pkgs/by-name/je/jetbrains-toolbox/update.sh

diff --git a/pkgs/by-name/je/jetbrains-toolbox/package.nix b/pkgs/by-name/je/jetbrains-toolbox/package.nix
index f9985c5bf3ad..618b19bf11cc 100644
--- a/pkgs/by-name/je/jetbrains-toolbox/package.nix
+++ b/pkgs/by-name/je/jetbrains-toolbox/package.nix
@@ -1,89 +1,114 @@
 {
-  stdenv,
   lib,
-  fetchzip,
-  copyDesktopItems,
-  makeWrapper,
-  runCommand,
+  stdenv,
   appimageTools,
+  fetchzip,
+  fetchurl,
+  makeWrapper,
   icu,
-  genericUpdater,
-  writeShellScript,
-  jq,
+  undmg,
 }:
+
 let
   pname = "jetbrains-toolbox";
   version = "2.5.4.38621";
 
-  src = fetchzip {
-    url = "https://download.jetbrains.com/toolbox/jetbrains-toolbox-${version}.tar.gz";
-    hash = "sha256-FQTw6LPLJV+lV546rFOi/503PuErJs4T5q9MNWwGYEs=";
-    stripRoot = false;
-  };
-
-  appimageContents =
-    runCommand "${pname}-extracted"
-      {
-        nativeBuildInputs = [ appimageTools.appimage-exec ];
-      }
-      ''
-        appimage-exec.sh -x $out ${src}/jetbrains-toolbox-${version}/jetbrains-toolbox
-
-        # JetBrains ship a broken desktop file. Despite registering a custom
-        # scheme handler for jetbrains:// URLs, they never mark the command as
-        # being suitable for passing URLs to. Ergo, the handler never receives
-        # its payload. This causes various things to break, including login.
-        # Reported upstream at: https://youtrack.jetbrains.com/issue/TBX-11478/
-        sed -Ei '/^Exec=/s/( %U)?$/ %U/' $out/jetbrains-toolbox.desktop
-      '';
-
-  appimage = appimageTools.wrapAppImage {
-    inherit pname version;
-    src = appimageContents;
-  };
-in
-stdenv.mkDerivation {
-  inherit
-    pname
-    version
-    src
-    appimage
-    ;
-
-  nativeBuildInputs = [
-    makeWrapper
-    copyDesktopItems
-  ];
-
-  installPhase = ''
-    runHook preInstall
-
-    install -Dm644 ${appimageContents}/.DirIcon $out/share/icons/hicolor/scalable/apps/jetbrains-toolbox.svg
-    makeWrapper ${appimage}/bin/jetbrains-toolbox $out/bin/jetbrains-toolbox \
-      --append-flags "--update-failed" \
-      --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ icu ]}
-
-    runHook postInstall
-  '';
-
-  desktopItems = [ "${appimageContents}/jetbrains-toolbox.desktop" ];
-
-  # Disabling the tests, this seems to be very difficult to test this app.
-  doCheck = false;
-
-  passthru.updateScript = genericUpdater {
-    versionLister = writeShellScript "jetbrains-toolbox-versionLister" ''
-      curl -Ls 'https://data.services.jetbrains.com/products?code=TBA&release.type=release' \
-        | ${lib.getExe jq} -r '.[] | .releases | flatten[] | .build'
-    '';
-  };
+  passthru.updateScript = ./update.sh;
 
   meta = {
     description = "Jetbrains Toolbox";
     homepage = "https://jetbrains.com/";
     license = lib.licenses.unfree;
     maintainers = with lib.maintainers; [ AnatolyPopov ];
-    platforms = [ "x86_64-linux" ];
+    platforms = [
+      "aarch64-linux"
+      "aarch64-darwin"
+      "x86_64-linux"
+      "x86_64-darwin"
+    ];
     mainProgram = "jetbrains-toolbox";
   };
-}
+
+  selectSystem =
+    attrs:
+    attrs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
+
+  linux = appimageTools.wrapAppImage rec {
+    inherit
+      pname
+      version
+      passthru
+      meta
+      ;
+
+    src = appimageTools.extractType2 {
+      inherit pname version;
+      src =
+        let
+          arch = selectSystem {
+            x86_64-linux = "";
+            aarch64-linux = "-arm64";
+          };
+        in
+        fetchzip {
+          url = "https://download.jetbrains.com/toolbox/jetbrains-toolbox-${version}${arch}.tar.gz";
+          hash = selectSystem {
+            x86_64-linux = "sha256-rq0Hn9g+/u9C8vbEVH2mv62c1dvxr+t9tBhf26swQgI=";
+            aarch64-linux = "sha256-52wFejaKBSg/eeJu3NDGl1AdZLsJdi/838YeROD4Loc=";
+          };
+        }
+        + "/jetbrains-toolbox";
+      postExtract = ''
+        patchelf --add-rpath ${lib.makeLibraryPath [ icu ]} $out/jetbrains-toolbox
+      '';
+    };
+
+    nativeBuildInputs = [ makeWrapper ];
+
+    extraInstallCommands = ''
+      install -Dm644 ${src}/jetbrains-toolbox.desktop $out/share/applications/jetbrains-toolbox.desktop
+      install -Dm644 ${src}/.DirIcon $out/share/icons/hicolor/scalable/apps/jetbrains-toolbox.svg
+      wrapProgram $out/bin/jetbrains-toolbox \
+        --append-flags "--update-failed"
+    '';
+  };
+
+  darwin = stdenv.mkDerivation (finalAttrs: {
+    inherit
+      pname
+      version
+      passthru
+      meta
+      ;
+
+    src =
+      let
+        arch = selectSystem {
+          x86_64-darwin = "";
+          aarch64-darwin = "-arm64";
+        };
+      in
+      fetchurl {
+        url = "https://download.jetbrains.com/toolbox/jetbrains-toolbox-${finalAttrs.version}${arch}.dmg";
+        hash = selectSystem {
+          x86_64-darwin = "sha256-y0zXQEqY5lj/e440dRtyBfaw8CwqqgzO3Ujreb37Z/I=";
+          aarch64-darwin = "sha256-9Bj5puG9NUHO53oXBRlB5DvX9jGTmrkDgjV2QPH9qg0=";
+        };
+      };
+
+    nativeBuildInputs = [ undmg ];
+
+    sourceRoot = "JetBrains Toolbox.app";
+
+    installPhase = ''
+      runHook preInstall
+
+      mkdir -p $out/Applications $out/bin
+      cp -r . $out/Applications/"JetBrains Toolbox.app"
+      ln -s $out/Applications/"JetBrains Toolbox.app"/Contents/MacOS/jetbrains-toolbox $out/bin/jetbrains-toolbox
+
+      runHook postInstall
+    '';
+  });
+in
+if stdenv.hostPlatform.isDarwin then darwin else linux
diff --git a/pkgs/by-name/je/jetbrains-toolbox/update.sh b/pkgs/by-name/je/jetbrains-toolbox/update.sh
new file mode 100755
index 000000000000..a6b1d812c9d9
--- /dev/null
+++ b/pkgs/by-name/je/jetbrains-toolbox/update.sh
@@ -0,0 +1,41 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p bash nix curl coreutils jq common-updater-scripts
+
+set -eou pipefail
+
+latestVersion=$(curl -Ls 'https://data.services.jetbrains.com/products?code=TBA&release.type=release' | jq -r '.[0].releases | flatten | .[0].build')
+currentVersion=$(nix-instantiate --eval -E "with import ./. {}; jetbrains-toolbox.version or (lib.getVersion jetbrains-toolbox)" | tr -d '"')
+
+echo "latest  version: $latestVersion"
+echo "current version: $currentVersion"
+
+if [[ "$latestVersion" == "$currentVersion" ]]; then
+    echo "package is up-to-date"
+    exit 0
+fi
+
+linux_systems=(
+    "x86_64-linux:"
+    "aarch64-linux:-arm64"
+)
+
+for entry in "${linux_systems[@]}"; do
+    arch="${entry%%:*}"
+    suffix="${entry#*:}"
+    prefetch=$(nix-prefetch-url --unpack "https://download.jetbrains.com/toolbox/jetbrains-toolbox-$latestVersion$suffix.tar.gz")
+    hash=$(nix hash convert --hash-algo sha256 --to sri $prefetch)
+    update-source-version jetbrains-toolbox $latestVersion $hash --system=$arch --ignore-same-version
+done
+
+darwin_systems=(
+    "x86_64-darwin:"
+    "aarch64-darwin:-arm64"
+)
+
+for entry in "${darwin_systems[@]}"; do
+    arch="${entry%%:*}"
+    suffix="${entry#*:}"
+    prefetch=$(nix-prefetch-url "https://download.jetbrains.com/toolbox/jetbrains-toolbox-$latestVersion$suffix.dmg")
+    hash=$(nix hash convert --hash-algo sha256 --to sri $prefetch)
+    update-source-version jetbrains-toolbox $latestVersion $hash --system=$arch --ignore-same-version
+done

From 7168368aba1879b76b2c2f2e4ec1bdd0dcced184 Mon Sep 17 00:00:00 2001
From: David Wolff <david@dav.dev>
Date: Wed, 9 Apr 2025 19:31:24 +0200
Subject: [PATCH 05/19] maintainers: update email for dav-wolff

---
 maintainers/maintainer-list.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 6588d522f3b6..afef2da757a7 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -5592,7 +5592,7 @@
     name = "David Sánchez";
   };
   dav-wolff = {
-    email = "dav-wolff@outlook.com";
+    email = "nixpkgs@dav.dev";
     github = "dav-wolff";
     githubId = 130931508;
     name = "David Wolff";

From 60ebb3f852267981c91d665238865a12b3180554 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 10 Apr 2025 14:39:00 +0000
Subject: [PATCH 06/19] docker-compose: 2.34.0 -> 2.35.0

---
 pkgs/applications/virtualization/docker/compose.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/virtualization/docker/compose.nix b/pkgs/applications/virtualization/docker/compose.nix
index 7d133751e713..658fc8c29f05 100644
--- a/pkgs/applications/virtualization/docker/compose.nix
+++ b/pkgs/applications/virtualization/docker/compose.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "docker-compose";
-  version = "2.34.0";
+  version = "2.35.0";
 
   src = fetchFromGitHub {
     owner = "docker";
     repo = "compose";
     rev = "v${version}";
-    hash = "sha256-AoYm2gRqNgXTc7ksQeSPVo+gTkxaFwhfLhue3Z8a4Wo=";
+    hash = "sha256-Jt5kh9QnNbILpn5YyKAWewlrkCUhB4jdTXjQlZUNdUM=";
   };
 
   postPatch = ''
@@ -20,7 +20,7 @@ buildGoModule rec {
     rm -rf pkg/e2e/
   '';
 
-  vendorHash = "sha256-ISX+PpjapST9d/rFP0SPlFYyPb5NcwwQT6mhb1H1qEE=";
+  vendorHash = "sha256-CIoVaB1yMdes7QNNKu2YZWFkrohZDANbGuwqERUcGyk=";
 
   ldflags = [
     "-X github.com/docker/compose/v2/internal.Version=${version}"

From 6f8162e5c170fef6a17a9590cad649a66d4e3b9d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 10 Apr 2025 15:21:04 +0000
Subject: [PATCH 07/19] openlinkhub: 0.5.2 -> 0.5.4

---
 pkgs/by-name/op/openlinkhub/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/op/openlinkhub/package.nix b/pkgs/by-name/op/openlinkhub/package.nix
index b1ac0451ffab..e71c16be9c8c 100644
--- a/pkgs/by-name/op/openlinkhub/package.nix
+++ b/pkgs/by-name/op/openlinkhub/package.nix
@@ -9,13 +9,13 @@
 
 buildGoModule rec {
   pname = "openlinkhub";
-  version = "0.5.2";
+  version = "0.5.4";
 
   src = fetchFromGitHub {
     owner = "jurkovic-nikola";
     repo = "OpenLinkHub";
     tag = version;
-    hash = "sha256-vr3X3nlojHTZBF7fQukIYguXO4RQKGuDyP6D4tSGKw8=";
+    hash = "sha256-cfnijxmn4Oe/t+K/N1JDTSQ3JSYyzB85gXj7OJ5hqr4=";
   };
 
   proxyVendor = true;

From 65ab750809b60f49fad078abfa5438198e88a285 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Thu, 10 Apr 2025 19:03:40 +0200
Subject: [PATCH 08/19] lucene: drop

broken since https://github.com/NixOS/nixpkgs/pull/147113, before then it was only a fetched jar file copied to $out
---
 pkgs/by-name/lu/lucene/package.nix | 25 -------------------------
 pkgs/top-level/aliases.nix         |  1 +
 2 files changed, 1 insertion(+), 25 deletions(-)
 delete mode 100644 pkgs/by-name/lu/lucene/package.nix

diff --git a/pkgs/by-name/lu/lucene/package.nix b/pkgs/by-name/lu/lucene/package.nix
deleted file mode 100644
index f49428ba76f9..000000000000
--- a/pkgs/by-name/lu/lucene/package.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchurl,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "lucene";
-  version = "1.4.3";
-
-  src = fetchurl {
-    url = "mirror://apache/jakarta/lucene/lucene-${version}.tar.gz";
-    sha256 = "1mxaxg65f7v8n60irjwm24v7hcisbl0srmpvcy1l4scs6rjj1awh";
-  };
-
-  buildCommand = ''
-    cp -r . $out/
-  '';
-
-  meta = with lib; {
-    description = "Java full-text search engine";
-    platforms = platforms.unix;
-    license = licenses.asl20;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 316906540e2e..3a7c90d69a3b 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1051,6 +1051,7 @@ mapAliases {
   loco-cli = loco; # Added 2025-02-24
   loop = throw "'loop' has been removed due to lack of upstream maintenance"; # Added 2025-01-25
   luna-icons = throw "luna-icons has been removed as it was removed upstream"; # Added 2024-10-29
+  lucene = throw "lucene has been removed since it was both wildly out of date and was not even built properly for 4 years"; # Added 2025-04-10
   lv_img_conv = throw "'lv_img_conv' has been removed from nixpkgs as it is broken"; # Added 2024-06-18
   lxd = lib.warnOnInstantiate "lxd has been renamed to lxd-lts" lxd-lts; # Added 2024-04-01
   lxd-unwrapped = lib.warnOnInstantiate "lxd-unwrapped has been renamed to lxd-unwrapped-lts" lxd-unwrapped-lts; # Added 2024-04-01

From 25c16b0bbf65d94149aa31776ce67508743288c7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 10 Apr 2025 17:47:48 +0000
Subject: [PATCH 09/19] firefox-devedition-unwrapped: 137.0b10 -> 138.0b5

---
 .../browsers/firefox/packages/firefox-devedition.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix
index 850fa78f80ba..3467f1f9943e 100644
--- a/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix
@@ -10,13 +10,13 @@
 buildMozillaMach rec {
   pname = "firefox-devedition";
   binaryName = pname;
-  version = "137.0b10";
+  version = "138.0b5";
   applicationName = "Firefox Developer Edition";
   requireSigning = false;
   branding = "browser/branding/aurora";
   src = fetchurl {
     url = "mirror://mozilla/devedition/releases/${version}/source/firefox-${version}.source.tar.xz";
-    sha512 = "ece2e76830b7f3fa0ea3b077948a874315c225da03f9043a5e63900f251aa7f568278aeae5c9b5be89bf07c2d783fbdfd1f2acf37e6dd7db3d82cb7e925e33d6";
+    sha512 = "07da38a6aa19de812539ba9b286d5189607ef45e7d8665a0f42facdcf7b3f7854561ad3cb54dce7e049199574b7d6dff01dba03763730e49306efb82833270fb";
   };
 
   meta = {

From 0acb0fa2ebf400d500c6671103ac7f2066480a6d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 10 Apr 2025 18:49:55 +0000
Subject: [PATCH 10/19] vscode-extensions.fstarlang.fstar-vscode-assistant:
 0.17.1 -> 0.17.2

---
 .../extensions/fstarlang.fstar-vscode-assistant/default.nix   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/fstarlang.fstar-vscode-assistant/default.nix b/pkgs/applications/editors/vscode/extensions/fstarlang.fstar-vscode-assistant/default.nix
index 2390eef07340..d3042ed6447b 100644
--- a/pkgs/applications/editors/vscode/extensions/fstarlang.fstar-vscode-assistant/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/fstarlang.fstar-vscode-assistant/default.nix
@@ -4,8 +4,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "fstar-vscode-assistant";
     publisher = "FStarLang";
-    version = "0.17.1";
-    hash = "sha256-8Lbb1XPtcd6JHZnlLRQggbVJfynJaK2DQ/XhHy+3joE=";
+    version = "0.17.2";
+    hash = "sha256-xbzjU99j8W8JgGDTEM8oHCrKdex+5vL+Okw6e0Okt7M=";
   };
   meta = {
     description = "An interactive editing mode VS Code extension for F*";

From 82ef0e4133da5082f3d7bdcb4ed706c11a3779a0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 10 Apr 2025 19:03:55 +0000
Subject: [PATCH 11/19] alist: 3.43.0 -> 3.44.0

---
 pkgs/by-name/al/alist/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/al/alist/package.nix b/pkgs/by-name/al/alist/package.nix
index 2c2f3e3d3610..77805b365d33 100644
--- a/pkgs/by-name/al/alist/package.nix
+++ b/pkgs/by-name/al/alist/package.nix
@@ -11,14 +11,14 @@
 }:
 buildGoModule rec {
   pname = "alist";
-  version = "3.43.0";
-  webVersion = "3.43.0";
+  version = "3.44.0";
+  webVersion = "3.44.0";
 
   src = fetchFromGitHub {
     owner = "AlistGo";
     repo = "alist";
     tag = "v${version}";
-    hash = "sha256-0+gt5S/eklSp8K4z1bXUVHaG7L3zKhi6TdVaxX/Y83w=";
+    hash = "sha256-zaIS2DYB7x76SCHCX9aJ0/8Lejwy3/AlLbnztSNJtSc=";
     # populate values that require us to use git. By doing this in postFetch we
     # can delete .git afterwards and maintain better reproducibility of the src.
     leaveDotGit = true;
@@ -32,11 +32,11 @@ buildGoModule rec {
   };
   web = fetchzip {
     url = "https://github.com/AlistGo/alist-web/releases/download/${webVersion}/dist.tar.gz";
-    hash = "sha256-uFa9V8DSHk0ET0BCdfT37qUNP2kLNjmt2S6fEk1muME=";
+    hash = "sha256-YPqbEPpwRVTWwH/LOq7cGsYju6YqdFCOseD52OsnkSk=";
   };
 
   proxyVendor = true;
-  vendorHash = "sha256-40YuarjrOvwHyXmHZoiqGMueN7dzu8zQ6hgInmsWVJg=";
+  vendorHash = "sha256-eBIlBtO+AlW2TE4xgxktePb2bm1lIYiuZ4+AUd1bdW8=";
 
   buildInputs = [ fuse ];
 

From 6ba00438aa4d44d43b70cf7ca2077a62ba92ce83 Mon Sep 17 00:00:00 2001
From: sund3RRR <evenquantity@gmail.com>
Date: Thu, 10 Apr 2025 22:52:05 +0300
Subject: [PATCH 12/19] rtfm: 0.6.1 -> 0.6.2

---
 pkgs/by-name/rt/rtfm/package.nix | 11 +++++------
 pkgs/by-name/rt/rtfm/shards.nix  |  4 ++--
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/rt/rtfm/package.nix b/pkgs/by-name/rt/rtfm/package.nix
index aa232c8c3ddd..6fd04196ac17 100644
--- a/pkgs/by-name/rt/rtfm/package.nix
+++ b/pkgs/by-name/rt/rtfm/package.nix
@@ -20,13 +20,13 @@
   writeShellScript,
 }:
 let
-  version = "0.6.1";
+  version = "0.6.2";
 
   src = fetchFromGitHub {
     owner = "hugopl";
     repo = "rtfm";
     tag = "v${version}";
-    hash = "sha256-qWQ2V7o7swbnXGgPOcnZ5Mg/SpjHOYpaD1HL6kgutCs=";
+    hash = "sha256-0yKldVTZdFV1Tj1MUI7TCqF3Ho/D7NOGR9UuLaLUFdo=";
   };
 
   gtk-doc =
@@ -60,16 +60,13 @@ crystal.buildCrystalPackage {
       --replace-fail 'doc_source = Path.new(ARGV[0]? || "/usr/share/doc/crystal/api")' 'doc_source = Path.new(ARGV[0]? || "${crystal}/share/doc/crystal/api")'
     substituteInPlace src/doc2dash/docset_builder.cr \
       --replace-fail 'File.copy(original, real_dest)' 'File.copy(original, real_dest); File.chmod(real_dest, 0o600)'
-    substituteInPlace Makefile \
-      --replace-fail 'shards install' 'true'
   '';
 
   preBuild = ''
     cd lib/gi-crystal
     shards build -Dpreview_mt --release --no-debug
     cd ../..
-    mkdir bin/
-    cp lib/gi-crystal/bin/gi-crystal bin/
+    install -Dm755 lib/gi-crystal/bin/gi-crystal bin/gi-crystal
   '';
 
   buildTargets = [ "all" ];
@@ -91,6 +88,8 @@ crystal.buildCrystalPackage {
     glib-compile-schemas $out/share/glib-2.0/schemas
   '';
 
+  doInstallCheck = false;
+
   passthru = {
     updateScript = _experimental-update-script-combinators.sequence [
       (gitUpdater { rev-prefix = "v"; })
diff --git a/pkgs/by-name/rt/rtfm/shards.nix b/pkgs/by-name/rt/rtfm/shards.nix
index 9fbf14f6e297..e49241fe3387 100644
--- a/pkgs/by-name/rt/rtfm/shards.nix
+++ b/pkgs/by-name/rt/rtfm/shards.nix
@@ -11,8 +11,8 @@
   };
   gi-crystal = {
     url = "https://github.com/hugopl/gi-crystal.git";
-    rev = "v0.24.0";
-    sha256 = "0x356xn35008l573qhyl1sdddc9cc5i3bsa4c7865kgq9521ifyh";
+    rev = "69388976418f5cc5ebc0cb7fb6aae5efd345ce8d";
+    sha256 = "15ayic628ma1h7b56bx11y8yl361qrpxlqngy0jkv793v7vpwd9b";
   };
   gtk4 = {
     url = "https://github.com/hugopl/gtk4.cr.git";

From 342c596fd88f940f0e0c94ee5fdef3d85783d7f5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 10 Apr 2025 20:27:21 +0000
Subject: [PATCH 13/19] copilot-cli: 1.34.0 -> 1.34.1

---
 pkgs/by-name/co/copilot-cli/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/co/copilot-cli/package.nix b/pkgs/by-name/co/copilot-cli/package.nix
index a04f46bf5f42..c490225de5a0 100644
--- a/pkgs/by-name/co/copilot-cli/package.nix
+++ b/pkgs/by-name/co/copilot-cli/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule rec {
   pname = "copilot-cli";
-  version = "1.34.0";
+  version = "1.34.1";
 
   src = fetchFromGitHub {
     owner = "aws";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-iipDvjPCNtk6wHjukgtnWzz0qwAJOU9DpolesNM2ELo=";
+    hash = "sha256-Oxt1+0z+woNPsFuCkj4t71/e21mHtoCd281BwbHCGc8=";
   };
 
-  vendorHash = "sha256-VzvbWh3qk9YvUdzlFa0UZMlNpjtLn1WJY4oN6/QPuuo=";
+  vendorHash = "sha256-ZdYuQAdjzvxxqKHoiHfhfJff3OfEE7ciIGcX1W3jVXY=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 8ffabf0f6ed313c4c823d8a01f544d506456bcb0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 11 Apr 2025 02:18:49 +0000
Subject: [PATCH 14/19] yaziPlugins.ouch: 0-unstable-2025-03-29 ->
 0-unstable-2025-04-09

---
 pkgs/by-name/ya/yazi/plugins/ouch/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ya/yazi/plugins/ouch/default.nix b/pkgs/by-name/ya/yazi/plugins/ouch/default.nix
index 2a6fa7c70853..ea9f3bc51893 100644
--- a/pkgs/by-name/ya/yazi/plugins/ouch/default.nix
+++ b/pkgs/by-name/ya/yazi/plugins/ouch/default.nix
@@ -5,13 +5,13 @@
 }:
 mkYaziPlugin {
   pname = "ouch.yazi";
-  version = "0-unstable-2025-03-29";
+  version = "0-unstable-2025-04-09";
 
   src = fetchFromGitHub {
     owner = "ndtoan96";
     repo = "ouch.yazi";
-    rev = "558188d2479d73cafb7ad8fb1bee12b2b59fb607";
-    hash = "sha256-7X8uAiJ8vBXYBXOgyKhVVikOnTBGrdCcXOJemjQNolI=";
+    rev = "73b7842bbccb12f15e1af54b8b06fc88f5efe82d";
+    hash = "sha256-pdnQB9NSqCndqbeJLeSg2og2vBDg5zKx8EKWKVixqTM=";
   };
 
   meta = {

From a4fc4c7a4d54c93bc483e17484480812e7bf11ee Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 11 Apr 2025 03:22:28 +0000
Subject: [PATCH 15/19] boxflat: 1.28.5 -> 1.29.2

---
 pkgs/by-name/bo/boxflat/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/bo/boxflat/package.nix b/pkgs/by-name/bo/boxflat/package.nix
index 78d6f96e7044..0c0c3f573700 100644
--- a/pkgs/by-name/bo/boxflat/package.nix
+++ b/pkgs/by-name/bo/boxflat/package.nix
@@ -13,14 +13,14 @@
 
 python3Packages.buildPythonPackage rec {
   pname = "boxflat";
-  version = "1.28.5";
+  version = "1.29.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Lawstorant";
     repo = "boxflat";
     tag = "v${version}";
-    hash = "sha256-YwszXAm0B1FuLfa9EKNoh0cXXxj82CXY5q8ot1G184M=";
+    hash = "sha256-ouq21n9G+wP4wpfpnX2gVJrCAANIHNjbIUnCmftwajI=";
   };
 
   build-system = [ python3Packages.setuptools ];

From 9476620334fbc11387af27cbb9dd262b96780eea Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 10 Apr 2025 01:12:13 +0000
Subject: [PATCH 16/19] grails: 7.0.0-M1 -> 7.0.0-M3

---
 pkgs/development/web/grails/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/web/grails/default.nix b/pkgs/development/web/grails/default.nix
index 0e2678281b8e..d81ad8c03597 100644
--- a/pkgs/development/web/grails/default.nix
+++ b/pkgs/development/web/grails/default.nix
@@ -25,11 +25,11 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "grails";
-  version = "7.0.0-M1";
+  version = "7.0.0-M3";
 
   src = fetchurl {
     url = "https://github.com/grails/grails-core/releases/download/v${version}/grails-${version}.zip";
-    sha256 = "sha256-5ZcYSKdwFTfqomk3AMNSc9icecJt2abhTGz7fDNkyo0=";
+    sha256 = "sha256-BM3fxmf86o+Ob63bE9aSCBh2MlkIS4AsYj7CZr/PVWU=";
   };
 
   nativeBuildInputs = [ unzip ];

From 42222b8d1391cb7392933655ec3e9d7a4c5ca272 Mon Sep 17 00:00:00 2001
From: FliegendeWurst <arne.keller@posteo.de>
Date: Thu, 10 Apr 2025 11:22:36 +0200
Subject: [PATCH 17/19] liboping: fix cross build

---
 pkgs/by-name/li/liboping/package.nix | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/li/liboping/package.nix b/pkgs/by-name/li/liboping/package.nix
index fefd39aee363..bbedee7b81eb 100644
--- a/pkgs/by-name/li/liboping/package.nix
+++ b/pkgs/by-name/li/liboping/package.nix
@@ -4,6 +4,7 @@
   fetchpatch,
   ncurses ? null,
   perl ? null,
+  pkg-config,
   lib,
 }:
 
@@ -32,12 +33,24 @@ stdenv.mkDerivation rec {
 
   env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-Wno-error=format-truncation";
 
+  nativeBuildInputs = [
+    perl
+    pkg-config
+  ];
+
   buildInputs = [
     ncurses
     perl
   ];
 
-  configureFlags = lib.optional (perl == null) "--with-perl-bindings=no";
+  configureFlags = [
+    "ac_cv_func_malloc_0_nonnull=yes"
+  ] ++ lib.optional (perl == null) "--with-perl-bindings=no";
+
+  buildFlags = [
+    "CC=${stdenv.cc.targetPrefix}cc"
+    "LD=${stdenv.cc.targetPrefix}cc"
+  ];
 
   meta = with lib; {
     description = "C library to generate ICMP echo requests (a.k.a. ping packets)";

From 8da73043f9ab9c5d9a1d30f82ade607fde557251 Mon Sep 17 00:00:00 2001
From: FliegendeWurst <arne.keller@posteo.de>
Date: Thu, 10 Apr 2025 11:22:36 +0200
Subject: [PATCH 18/19] liboping: modernize

---
 pkgs/by-name/li/liboping/package.nix | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/li/liboping/package.nix b/pkgs/by-name/li/liboping/package.nix
index bbedee7b81eb..92e3666dbb4b 100644
--- a/pkgs/by-name/li/liboping/package.nix
+++ b/pkgs/by-name/li/liboping/package.nix
@@ -8,13 +8,13 @@
   lib,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "liboping";
   version = "1.10.0";
 
   src = fetchurl {
-    url = "https://noping.cc/files/${pname}-${version}.tar.bz2";
-    sha256 = "1n2wkmvw6n80ybdwkjq8ka43z2x8mvxq49byv61b52iyz69slf7b";
+    url = "https://noping.cc/files/liboping-${finalAttrs.version}.tar.bz2";
+    hash = "sha256-6ziqk/k+irKC2X4lgvuuqIs/iJoIy8nb8gBZw3edXNg=";
   };
 
   patches = [
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
     "LD=${stdenv.cc.targetPrefix}cc"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "C library to generate ICMP echo requests (a.k.a. ping packets)";
     longDescription = ''
       liboping is a C library to generate ICMP echo requests, better known as
@@ -61,9 +61,9 @@ stdenv.mkDerivation rec {
       Included is a sample application, called oping, which demonstrates the
       library's abilities.
     '';
-    homepage = "http://noping.cc/";
-    license = licenses.lgpl21;
-    platforms = platforms.unix;
-    maintainers = [ maintainers.bjornfor ];
+    homepage = "https://noping.cc/";
+    license = lib.licenses.lgpl21;
+    platforms = lib.platforms.unix;
+    maintainers = [ lib.maintainers.bjornfor ];
   };
-}
+})

From 6b93024f590b15b1f3888fcc6e56a0866e0c26c2 Mon Sep 17 00:00:00 2001
From: FliegendeWurst <arne.keller@posteo.de>
Date: Thu, 10 Apr 2025 18:30:51 +0200
Subject: [PATCH 19/19] sdcc: disable PIE hardening per upstream

---
 pkgs/by-name/sd/sdcc/package.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/by-name/sd/sdcc/package.nix b/pkgs/by-name/sd/sdcc/package.nix
index 0f707b27bad8..cc9e0512dcb4 100644
--- a/pkgs/by-name/sd/sdcc/package.nix
+++ b/pkgs/by-name/sd/sdcc/package.nix
@@ -80,6 +80,10 @@ stdenv.mkDerivation (finalAttrs: {
     fi
   '';
 
+  # ${src}/support/cpp/gcc/Makefile.in states:
+  # We don't want to compile the compilers with -fPIE, it make PCH fail.
+  hardeningDisable = [ "pie" ];
+
   meta = {
     homepage = "https://sdcc.sourceforge.net/";
     description = "Small Device C Compiler";