diff options
Diffstat (limited to 'pkgs')
156 files changed, 5717 insertions, 3376 deletions
diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix index 09413f741158f..797ecd493d219 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix @@ -41,10 +41,10 @@ elpaBuild { pname = "activities"; ename = "activities"; - version = "0.6pre0.20240218.181422"; + version = "0.8pre0.20240313.183743"; src = fetchurl { - url = "https://elpa.gnu.org/devel/activities-0.6pre0.20240218.181422.tar"; - sha256 = "172rbxnhbdppkr4kc2a11i9588dfcz629d2flg2sfmx5j23995zn"; + url = "https://elpa.gnu.org/devel/activities-0.8pre0.20240313.183743.tar"; + sha256 = "1ba85ik0knxrlhw2prwsawin5r86n75qm240qkgkd05xhm7znqnw"; }; packageRequires = [ emacs persist ]; meta = { @@ -220,10 +220,10 @@ elpaBuild { pname = "aircon-theme"; ename = "aircon-theme"; - version = "0.0.6.0.20220827.93355"; + version = "0.0.6.0.20240307.233340"; src = fetchurl { - url = "https://elpa.gnu.org/devel/aircon-theme-0.0.6.0.20220827.93355.tar"; - sha256 = "0p2svw1db5km3ks2ywb38lsqh0y54ng8wgmh1s80mzvcflc8gia6"; + url = "https://elpa.gnu.org/devel/aircon-theme-0.0.6.0.20240307.233340.tar"; + sha256 = "1jw2w80sjglh1fq4psr5nflm20h37ldd5xjlqbmfd46ghmlanb1d"; }; packageRequires = [ emacs ]; meta = { @@ -311,14 +311,29 @@ license = lib.licenses.free; }; }) {}; + assess = callPackage ({ elpaBuild, emacs, fetchurl, lib, m-buffer }: + elpaBuild { + pname = "assess"; + ename = "assess"; + version = "0.7.0.20240303.95456"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/assess-0.7.0.20240303.95456.tar"; + sha256 = "0k9n0j5q5l2bwbb7yql8jg9fnqvmk7mgx6dv612hpv9hdsls65h1"; + }; + packageRequires = [ emacs m-buffer ]; + meta = { + homepage = "https://elpa.gnu.org/packages/assess.html"; + license = lib.licenses.free; + }; + }) {}; async = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "async"; ename = "async"; - version = "1.9.8.0.20240108.152601"; + version = "1.9.8.0.20240323.191212"; src = fetchurl { - url = "https://elpa.gnu.org/devel/async-1.9.8.0.20240108.152601.tar"; - sha256 = "01sh3szrpjc2hpmrdrkiv34whw37c9xdybvipjn9xzi5b66m613a"; + url = "https://elpa.gnu.org/devel/async-1.9.8.0.20240323.191212.tar"; + sha256 = "0w0nqdam98ahvbbbzr3i4z7zx2xfl6h1b3aq53qn8cxwnl1mfnqx"; }; packageRequires = [ emacs ]; meta = { @@ -333,10 +348,10 @@ elpaBuild { pname = "auctex"; ename = "auctex"; - version = "14.0.3.0.20240220.160410"; + version = "14.0.4.0.20240317.113904"; src = fetchurl { - url = "https://elpa.gnu.org/devel/auctex-14.0.3.0.20240220.160410.tar"; - sha256 = "1j4i9m9018s606wbrx4r439i479jqf9f5040m9b3qbqhgqwklw8z"; + url = "https://elpa.gnu.org/devel/auctex-14.0.4.0.20240317.113904.tar"; + sha256 = "1iwzym6ygq0wzb96qgbv7530fv3cxykjilbxzxb3la3xhqb93qhs"; }; packageRequires = [ emacs ]; meta = { @@ -478,10 +493,10 @@ elpaBuild { pname = "beframe"; ename = "beframe"; - version = "1.0.1.0.20240210.51926"; + version = "1.0.1.0.20240224.51508"; src = fetchurl { - url = "https://elpa.gnu.org/devel/beframe-1.0.1.0.20240210.51926.tar"; - sha256 = "13j35grsh452wwv69qkxckwa8ip27x10bnk5vs60higair15624k"; + url = "https://elpa.gnu.org/devel/beframe-1.0.1.0.20240224.51508.tar"; + sha256 = "1i22lbwck2q80byxd6bd6cba9jj3iqzsj129rb81a221wp91sarj"; }; packageRequires = [ emacs ]; meta = { @@ -513,10 +528,10 @@ elpaBuild { pname = "bind-key"; ename = "bind-key"; - version = "2.4.1.0.20240210.91008"; + version = "2.4.1.0.20240321.194020"; src = fetchurl { - url = "https://elpa.gnu.org/devel/bind-key-2.4.1.0.20240210.91008.tar"; - sha256 = "034r93cf4dkrzggfacmwg6ny05wxdzva6ia6ry7x2saf7fhlb6qh"; + url = "https://elpa.gnu.org/devel/bind-key-2.4.1.0.20240321.194020.tar"; + sha256 = "0fjx32brckrmbvcyps45akzhimw93rzi7hy7f8nx0j72nkncavpp"; }; packageRequires = [ emacs ]; meta = { @@ -631,18 +646,14 @@ license = lib.licenses.free; }; }) {}; - brief = callPackage ({ cl-lib ? null - , elpaBuild - , fetchurl - , lib - , nadvice }: + brief = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib, nadvice }: elpaBuild { pname = "brief"; ename = "brief"; - version = "5.88.22.2.0.20230818.125719"; + version = "5.90.0.20240321.65101"; src = fetchurl { - url = "https://elpa.gnu.org/devel/brief-5.88.22.2.0.20230818.125719.tar"; - sha256 = "1h9kqphbzmg0jwms8zd0ch0sgg8z1g847wcggr3842xhdayxds1k"; + url = "https://elpa.gnu.org/devel/brief-5.90.0.20240321.65101.tar"; + sha256 = "1z4nww74gaxjjjfg4i9qdk6lwfjnbsc41jq95k0pcj12ilwilg54"; }; packageRequires = [ cl-lib nadvice ]; meta = { @@ -658,10 +669,10 @@ elpaBuild { pname = "buffer-env"; ename = "buffer-env"; - version = "0.5.0.20231028.161716"; + version = "0.6.0.20240323.72724"; src = fetchurl { - url = "https://elpa.gnu.org/devel/buffer-env-0.5.0.20231028.161716.tar"; - sha256 = "1gi7092mfzsqfj8l000arxdwmg73xzbgzfliazzk0s617480ccbw"; + url = "https://elpa.gnu.org/devel/buffer-env-0.6.0.20240323.72724.tar"; + sha256 = "1bdch2ah5c0ikzl2zyfv7hkpbhvkvcdd4ljkzd5zmnwj11fk7ml2"; }; packageRequires = [ compat emacs ]; meta = { @@ -759,10 +770,10 @@ elpaBuild { pname = "cape"; ename = "cape"; - version = "1.3.0.20240214.113952"; + version = "1.4.0.20240315.54216"; src = fetchurl { - url = "https://elpa.gnu.org/devel/cape-1.3.0.20240214.113952.tar"; - sha256 = "01q9hrzar17zrcm1ayakg6xamz5a434294d3xij9yalwrnnpvrd3"; + url = "https://elpa.gnu.org/devel/cape-1.4.0.20240315.54216.tar"; + sha256 = "0pqr36i8ijq32kf0qxb0hdm0gffakya12jjj4dy0hwan13scq77d"; }; packageRequires = [ compat emacs ]; meta = { @@ -926,10 +937,10 @@ elpaBuild { pname = "comint-mime"; ename = "comint-mime"; - version = "0.3.0.20231008.111300"; + version = "0.4.0.20240302.74422"; src = fetchurl { - url = "https://elpa.gnu.org/devel/comint-mime-0.3.0.20231008.111300.tar"; - sha256 = "184811v36aa080fx2xkpx1p7fmd1s739apxryywpmisjq9alkkl9"; + url = "https://elpa.gnu.org/devel/comint-mime-0.4.0.20240302.74422.tar"; + sha256 = "0zgna6h5v2mgmlkxyxla0faf3xrs13mv62xayyf3ddrhjgk82ggb"; }; packageRequires = [ emacs ]; meta = { @@ -961,10 +972,10 @@ elpaBuild { pname = "company"; ename = "company"; - version = "0.10.2.0.20240218.181202"; + version = "0.10.2.0.20240311.194338"; src = fetchurl { - url = "https://elpa.gnu.org/devel/company-0.10.2.0.20240218.181202.tar"; - sha256 = "0w170l9br7cxq8ili7jba89qx45wfkhqbz0yrvmmwa27qh2nz4ki"; + url = "https://elpa.gnu.org/devel/company-0.10.2.0.20240311.194338.tar"; + sha256 = "159g5aii6bw006hkb49f653zc3lnnxnimg2xmyvwl0rgyk7imfl1"; }; packageRequires = [ emacs ]; meta = { @@ -1037,10 +1048,10 @@ elpaBuild { pname = "compat"; ename = "compat"; - version = "29.1.4.4.0.20240213.64417"; + version = "29.1.4.5.0.20240316.105418"; src = fetchurl { - url = "https://elpa.gnu.org/devel/compat-29.1.4.4.0.20240213.64417.tar"; - sha256 = "1ihkqsa6akwk3p4z83iwbizcp0bg0gla5klavzrfppnnpyh83nrf"; + url = "https://elpa.gnu.org/devel/compat-29.1.4.5.0.20240316.105418.tar"; + sha256 = "1f0rhf0p2szvqq1ixv7fxn726h3mnc0iqlyal1qzrf46vdsjkf87"; }; packageRequires = [ emacs seq ]; meta = { @@ -1052,10 +1063,10 @@ elpaBuild { pname = "consult"; ename = "consult"; - version = "1.3.0.20240223.131438"; + version = "1.4.0.20240324.100717"; src = fetchurl { - url = "https://elpa.gnu.org/devel/consult-1.3.0.20240223.131438.tar"; - sha256 = "0pibhg8i7rcxbkzlkz37v5w9x566ffabx7jmhjzgjgq7v6cgqzv6"; + url = "https://elpa.gnu.org/devel/consult-1.4.0.20240324.100717.tar"; + sha256 = "1dngyxxviml9a4gqr85ah38pb4028wx2cvm8g9h4jp02g4cr7rkc"; }; packageRequires = [ compat emacs ]; meta = { @@ -1063,8 +1074,7 @@ license = lib.licenses.free; }; }) {}; - consult-hoogle = callPackage ({ consult - , elpaBuild + consult-hoogle = callPackage ({ elpaBuild , emacs , fetchurl , haskell-mode @@ -1072,12 +1082,12 @@ elpaBuild { pname = "consult-hoogle"; ename = "consult-hoogle"; - version = "0.1.1.0.20240211.83945"; + version = "0.2.0.0.20240309.142502"; src = fetchurl { - url = "https://elpa.gnu.org/devel/consult-hoogle-0.1.1.0.20240211.83945.tar"; - sha256 = "1ka6k26k3zr86p4z7lxb7jsh9wrhkiz8mp552jbz3v6kyifcmaq1"; + url = "https://elpa.gnu.org/devel/consult-hoogle-0.2.0.0.20240309.142502.tar"; + sha256 = "0igkhv7hg4bd6h27j16w2in6d542818ich94fhif4g36xh0jhdw7"; }; - packageRequires = [ consult emacs haskell-mode ]; + packageRequires = [ emacs haskell-mode ]; meta = { homepage = "https://elpa.gnu.org/packages/consult-hoogle.html"; license = lib.licenses.free; @@ -1124,10 +1134,10 @@ elpaBuild { pname = "corfu"; ename = "corfu"; - version = "1.2.0.20240212.223716"; + version = "1.2.0.20240320.91948"; src = fetchurl { - url = "https://elpa.gnu.org/devel/corfu-1.2.0.20240212.223716.tar"; - sha256 = "179sprpnfwda9ibgcn3q2g6czbxl40p0l1sfa0pbs5kzwjslg0i9"; + url = "https://elpa.gnu.org/devel/corfu-1.2.0.20240320.91948.tar"; + sha256 = "1gpqqh7f0ywn3mg31psdl7nanl3zqf3bddxz0hs018yp9dhr4d9v"; }; packageRequires = [ compat emacs ]; meta = { @@ -1159,10 +1169,10 @@ elpaBuild { pname = "counsel"; ename = "counsel"; - version = "0.14.2.0.20240214.214516"; + version = "0.14.2.0.20240229.151718"; src = fetchurl { - url = "https://elpa.gnu.org/devel/counsel-0.14.2.0.20240214.214516.tar"; - sha256 = "0fnx7m76zrspnrmcbj359724w6ih77pyl17w1968r621law6i37i"; + url = "https://elpa.gnu.org/devel/counsel-0.14.2.0.20240229.151718.tar"; + sha256 = "0wq8by3bc15cry533ybawzpb6qypnzvq79kpd9h0wrkd1yfbdazz"; }; packageRequires = [ emacs ivy swiper ]; meta = { @@ -1308,10 +1318,10 @@ elpaBuild { pname = "dape"; ename = "dape"; - version = "0.7.0.0.20240223.130714"; + version = "0.9.0.0.20240318.94928"; src = fetchurl { - url = "https://elpa.gnu.org/devel/dape-0.7.0.0.20240223.130714.tar"; - sha256 = "1jm7r04bi22flwh83cfv6grla76s3c6qayw4iz6mbiwpqc4yx3qa"; + url = "https://elpa.gnu.org/devel/dape-0.9.0.0.20240318.94928.tar"; + sha256 = "0f190gkicqqj02irhgcwcjjalh4srbcd9y80src888wp775vwy1x"; }; packageRequires = [ emacs jsonrpc ]; meta = { @@ -1371,10 +1381,10 @@ elpaBuild { pname = "debbugs"; ename = "debbugs"; - version = "0.40.0.20240215.214858"; + version = "0.40.0.20240318.175047"; src = fetchurl { - url = "https://elpa.gnu.org/devel/debbugs-0.40.0.20240215.214858.tar"; - sha256 = "0kf6f8qpshdx07zbpgglpz01daq2ix3sw006yn1qx07bxj1kihsd"; + url = "https://elpa.gnu.org/devel/debbugs-0.40.0.20240318.175047.tar"; + sha256 = "1vkap2h2041hib1rw3n91z9hs6vfphkgi84257x7b8yj1f0dr2xn"; }; packageRequires = [ emacs soap-client ]; meta = { @@ -1401,10 +1411,10 @@ elpaBuild { pname = "denote"; ename = "denote"; - version = "2.2.4.0.20240223.62237"; + version = "2.3.0.0.20240324.175148"; src = fetchurl { - url = "https://elpa.gnu.org/devel/denote-2.2.4.0.20240223.62237.tar"; - sha256 = "0h4cs61mipfxb8hzs6d7mafw7y97r0k0l68mcglr0c2lxcxv6sd3"; + url = "https://elpa.gnu.org/devel/denote-2.3.0.0.20240324.175148.tar"; + sha256 = "00bd7470a01dd92nzcw9g7zpff3sy3vzxy13ig6a7gk9i5a8c7zg"; }; packageRequires = [ emacs ]; meta = { @@ -1453,10 +1463,10 @@ elpaBuild { pname = "devdocs"; ename = "devdocs"; - version = "0.5.0.20231127.190545"; + version = "0.6.0.20240323.82337"; src = fetchurl { - url = "https://elpa.gnu.org/devel/devdocs-0.5.0.20231127.190545.tar"; - sha256 = "19w6fdw6j3qpmm88nymym3h012yi6mc22bdzm6pr4m39d8m4qbqx"; + url = "https://elpa.gnu.org/devel/devdocs-0.6.0.20240323.82337.tar"; + sha256 = "1pdjf4j6wcpz98i50fx11sndqycpalwxips45lgsnjglyc8sa1lr"; }; packageRequires = [ emacs ]; meta = { @@ -1507,10 +1517,10 @@ elpaBuild { pname = "diff-hl"; ename = "diff-hl"; - version = "1.9.2.0.20240127.3432"; + version = "1.9.2.0.20240225.11635"; src = fetchurl { - url = "https://elpa.gnu.org/devel/diff-hl-1.9.2.0.20240127.3432.tar"; - sha256 = "0i7dyl8x1mv0jk8pr5w133m0rvxqqk0dm8sfszg8azg9y0ihsigf"; + url = "https://elpa.gnu.org/devel/diff-hl-1.9.2.0.20240225.11635.tar"; + sha256 = "0g32092z52xmmch8aya1wz9xds93agv4509nvf4zzygg9pr40x0w"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -1610,10 +1620,10 @@ elpaBuild { pname = "dired-preview"; ename = "dired-preview"; - version = "0.1.1.0.20240117.24241"; + version = "0.1.1.0.20240312.193205"; src = fetchurl { - url = "https://elpa.gnu.org/devel/dired-preview-0.1.1.0.20240117.24241.tar"; - sha256 = "1npf39wmkfknij89qphx9qmpycr59x4sm57575ys2b50ca2bk49w"; + url = "https://elpa.gnu.org/devel/dired-preview-0.1.1.0.20240312.193205.tar"; + sha256 = "02yi5rxcv8v10zsypsn19i16rakik2ii650drk337h0iqkdwx8ax"; }; packageRequires = [ emacs ]; meta = { @@ -1787,10 +1797,10 @@ elpaBuild { pname = "ebdb"; ename = "ebdb"; - version = "0.8.22.0.20240117.72338"; + version = "0.8.22.0.20240305.123820"; src = fetchurl { - url = "https://elpa.gnu.org/devel/ebdb-0.8.22.0.20240117.72338.tar"; - sha256 = "0x7kccnwka9ajbc21mwli2x00ysh3gzadwrjf89aq7xy8ixkx56f"; + url = "https://elpa.gnu.org/devel/ebdb-0.8.22.0.20240305.123820.tar"; + sha256 = "1y680dfqvmbpq75ylgw16jx0p7hyggi12bb1f0c7z0w0y473gdj0"; }; packageRequires = [ emacs seq ]; meta = { @@ -1855,10 +1865,10 @@ elpaBuild { pname = "eev"; ename = "eev"; - version = "20240205.0.20240220.34251"; + version = "20240309.0.20240309.40750"; src = fetchurl { - url = "https://elpa.gnu.org/devel/eev-20240205.0.20240220.34251.tar"; - sha256 = "01m609prd554rgwjs9igxwxair1pl6g1vgm2p890mddd0741ci7k"; + url = "https://elpa.gnu.org/devel/eev-20240309.0.20240309.40750.tar"; + sha256 = "03vmfj9ialviza0j1xdrfxrm948qfqsvj95k6xsgx6kr4fh0gy8i"; }; packageRequires = [ emacs ]; meta = { @@ -1873,10 +1883,10 @@ elpaBuild { pname = "ef-themes"; ename = "ef-themes"; - version = "1.5.1.0.20240223.55243"; + version = "1.6.1.0.20240322.140619"; src = fetchurl { - url = "https://elpa.gnu.org/devel/ef-themes-1.5.1.0.20240223.55243.tar"; - sha256 = "1i9rjlfnmq2in93q4j08w5hkhjf0mhd4sam329x2bzibq5rv4m24"; + url = "https://elpa.gnu.org/devel/ef-themes-1.6.1.0.20240322.140619.tar"; + sha256 = "0zmwx7l3dgjrqwg4nlsjkaiqx95pswpznzzrbzzlkc4aajk9l047"; }; packageRequires = [ emacs ]; meta = { @@ -1898,10 +1908,10 @@ elpaBuild { pname = "eglot"; ename = "eglot"; - version = "1.17.0.20240204.100650"; + version = "1.17.0.20240323.73745"; src = fetchurl { - url = "https://elpa.gnu.org/devel/eglot-1.17.0.20240204.100650.tar"; - sha256 = "0jcqjpw15gjgi2kbr9xjdjjy5g8gjry7q04a3cnr1ih43qa0hkhb"; + url = "https://elpa.gnu.org/devel/eglot-1.17.0.20240323.73745.tar"; + sha256 = "0g2a6hj6k1z74ymsl568117bql1xalf0pqlckscj8dj1glcn6jq5"; }; packageRequires = [ eldoc @@ -1987,8 +1997,7 @@ license = lib.licenses.free; }; }) {}; - ellama = callPackage ({ dash - , elpaBuild + ellama = callPackage ({ elpaBuild , emacs , fetchurl , lib @@ -1997,12 +2006,12 @@ elpaBuild { pname = "ellama"; ename = "ellama"; - version = "0.8.7.0.20240223.201209"; + version = "0.8.13.0.20240316.161027"; src = fetchurl { - url = "https://elpa.gnu.org/devel/ellama-0.8.7.0.20240223.201209.tar"; - sha256 = "0b8b6qq9d14krxzrhwwh0g6xgpgxags8cr09b6bkpkrly4j3q08f"; + url = "https://elpa.gnu.org/devel/ellama-0.8.13.0.20240316.161027.tar"; + sha256 = "00pf48z90sirwyrk40p8fy9vi2cckrxismcp1yr8sirifs0wi574"; }; - packageRequires = [ dash emacs llm spinner ]; + packageRequires = [ emacs llm spinner ]; meta = { homepage = "https://elpa.gnu.org/packages/ellama.html"; license = lib.licenses.free; @@ -2030,10 +2039,10 @@ elpaBuild { pname = "embark"; ename = "embark"; - version = "1.0.0.20240221.104918"; + version = "1.0.0.20240323.170519"; src = fetchurl { - url = "https://elpa.gnu.org/devel/embark-1.0.0.20240221.104918.tar"; - sha256 = "121vvf8j9hs1z6lxz1v5r7r663k6kvzxnfd3xfgmipjfvax3ql85"; + url = "https://elpa.gnu.org/devel/embark-1.0.0.20240323.170519.tar"; + sha256 = "0mj762p6pbqciw1jjbn03qmcw7z4nc823ssd42jbx3a5mzvyi3qr"; }; packageRequires = [ compat emacs ]; meta = { @@ -2051,10 +2060,10 @@ elpaBuild { pname = "embark-consult"; ename = "embark-consult"; - version = "1.0.0.20240221.104918"; + version = "1.0.0.20240323.170519"; src = fetchurl { - url = "https://elpa.gnu.org/devel/embark-consult-1.0.0.20240221.104918.tar"; - sha256 = "1ky6nsgzp73s94w7x1p00cly54gnmb763hrj7lx8k5ljc953zsd1"; + url = "https://elpa.gnu.org/devel/embark-consult-1.0.0.20240323.170519.tar"; + sha256 = "0ys3v2519vw02c04vyl5jggk9n6nf2hzhb3xr8y635lg2f8chbh9"; }; packageRequires = [ compat consult emacs embark ]; meta = { @@ -2076,10 +2085,10 @@ elpaBuild { pname = "ement"; ename = "ement"; - version = "0.15pre0.20240216.193240"; + version = "0.15pre0.20240319.190705"; src = fetchurl { - url = "https://elpa.gnu.org/devel/ement-0.15pre0.20240216.193240.tar"; - sha256 = "0bqvdz8rq63ac1szlvnk4aq1kafshc4kgyb91q941ndmpkd18gnj"; + url = "https://elpa.gnu.org/devel/ement-0.15pre0.20240319.190705.tar"; + sha256 = "1g5bjg9z4k33pfvskv1nkxpzrp197rfwq4mpki74kmr9z7cmspaa"; }; packageRequires = [ emacs @@ -2105,10 +2114,10 @@ elpaBuild { pname = "emms"; ename = "emms"; - version = "18.0.20240211.172953"; + version = "19.0.20240318.161230"; src = fetchurl { - url = "https://elpa.gnu.org/devel/emms-18.0.20240211.172953.tar"; - sha256 = "1y70n5f0xw05z5ri4gj13z5fyibygcff019zazmy3wq4idn2ff2z"; + url = "https://elpa.gnu.org/devel/emms-19.0.20240318.161230.tar"; + sha256 = "0yk3v3vglv8hl4x9piyis7q783gmbb49sw15zdgjys56plcg2k17"; }; packageRequires = [ cl-lib nadvice seq ]; meta = { @@ -2174,10 +2183,10 @@ elpaBuild { pname = "erc"; ename = "erc"; - version = "5.6snapshot0.20240216.195938"; + version = "5.6snapshot0.20240323.151032"; src = fetchurl { - url = "https://elpa.gnu.org/devel/erc-5.6snapshot0.20240216.195938.tar"; - sha256 = "0ap7kibpas9fwfsyail09v2zx9jkfa7hlj7fi0dr67a6jkqmgvya"; + url = "https://elpa.gnu.org/devel/erc-5.6snapshot0.20240323.151032.tar"; + sha256 = "1vydh0v3rw44r6y1lfbr4nlxhmbx224idj5s5g4kas6r2pgi0b74"; }; packageRequires = [ compat emacs ]; meta = { @@ -2209,10 +2218,10 @@ elpaBuild { pname = "ess"; ename = "ess"; - version = "24.1.1.0.20240131.104105"; + version = "24.1.1.0.20240311.150545"; src = fetchurl { - url = "https://elpa.gnu.org/devel/ess-24.1.1.0.20240131.104105.tar"; - sha256 = "0ky9n9kdqs4gsmwl3ah2lnw2qrmimrzfip1axrlbbk92n5dg6cvi"; + url = "https://elpa.gnu.org/devel/ess-24.1.1.0.20240311.150545.tar"; + sha256 = "0dyyyl7akn50j15asr6msrx704vr4wjfz3a1h7nsxjjaczz0n8kz"; }; packageRequires = [ emacs ]; meta = { @@ -2306,10 +2315,10 @@ elpaBuild { pname = "exwm"; ename = "exwm"; - version = "0.28.0.20240212.225519"; + version = "0.28.0.20240316.164011"; src = fetchurl { - url = "https://elpa.gnu.org/devel/exwm-0.28.0.20240212.225519.tar"; - sha256 = "1ikp7q4cdss5isqrnl1iwlqwqgswh7sraz983ixdq706k1zsbcgr"; + url = "https://elpa.gnu.org/devel/exwm-0.28.0.20240316.164011.tar"; + sha256 = "0kqg4rfwrrd9z714a6k4ldmpq4iqihkx1c2q4fnf82p9616pd88w"; }; packageRequires = [ emacs xelb ]; meta = { @@ -2361,10 +2370,10 @@ elpaBuild { pname = "filechooser"; ename = "filechooser"; - version = "0.1.2.0.20240219.174103"; + version = "0.2.0.0.20240310.203607"; src = fetchurl { - url = "https://elpa.gnu.org/devel/filechooser-0.1.2.0.20240219.174103.tar"; - sha256 = "13rfqb0s3kw3llvgaxq27cdj8fihimihpaicsn5mq36yxbdcd0an"; + url = "https://elpa.gnu.org/devel/filechooser-0.2.0.0.20240310.203607.tar"; + sha256 = "0ra072qdg38y92f73cimwlgcclvfpz4wvrr8wr7i808jv1rdagv7"; }; packageRequires = [ compat emacs ]; meta = { @@ -2822,10 +2831,10 @@ elpaBuild { pname = "greader"; ename = "greader"; - version = "0.9.7.0.20240223.114345"; + version = "0.9.19.0.20240315.175225"; src = fetchurl { - url = "https://elpa.gnu.org/devel/greader-0.9.7.0.20240223.114345.tar"; - sha256 = "11kkp3x93yka54a68jjg0wpk51d3snf21wvamylk016w9sh3lls0"; + url = "https://elpa.gnu.org/devel/greader-0.9.19.0.20240315.175225.tar"; + sha256 = "1z58dr4zpb2pk10ppjrqr7bxzbji6bgajhv71s6i6802k8il7r32"; }; packageRequires = [ emacs ]; meta = { @@ -2848,17 +2857,14 @@ license = lib.licenses.free; }; }) {}; - gtags-mode = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib }: + gtags-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "gtags-mode"; ename = "gtags-mode"; - version = "1.0.0.20240124.174821"; + version = "1.1.0.20240313.5421"; src = fetchurl { - url = "https://elpa.gnu.org/devel/gtags-mode-1.0.0.20240124.174821.tar"; - sha256 = "0j8i71z95y1crnfbcdpnrcwnfvpgcarvq1dqnmj7ic3fz40hd711"; + url = "https://elpa.gnu.org/devel/gtags-mode-1.1.0.20240313.5421.tar"; + sha256 = "134h3w1gcvncm12yq6ls8xp8587r06vl7qr359rnkvc78sh07c9q"; }; packageRequires = [ emacs ]; meta = { @@ -3008,10 +3014,10 @@ elpaBuild { pname = "hyperbole"; ename = "hyperbole"; - version = "8.0.2pre0.20240222.73640"; + version = "9.0.2pre0.20240322.162839"; src = fetchurl { - url = "https://elpa.gnu.org/devel/hyperbole-8.0.2pre0.20240222.73640.tar"; - sha256 = "0j94qx0gmfh3n43jmca7zvr3j0sjc4nd2bxz5impgajq19l94wmj"; + url = "https://elpa.gnu.org/devel/hyperbole-9.0.2pre0.20240322.162839.tar"; + sha256 = "14m1gnkbr9sg8i5bxwar71qs23i3wnqlfwf8cac76ihpminfzz1f"; }; packageRequires = [ emacs ]; meta = { @@ -3074,10 +3080,10 @@ elpaBuild { pname = "isearch-mb"; ename = "isearch-mb"; - version = "0.7.0.20231020.185704"; + version = "0.8.0.20240310.84654"; src = fetchurl { - url = "https://elpa.gnu.org/devel/isearch-mb-0.7.0.20231020.185704.tar"; - sha256 = "080qsg5ykjkzmir2pi4dij0ayjjiwlq8129rmv6777dld2a1pdrm"; + url = "https://elpa.gnu.org/devel/isearch-mb-0.8.0.20240310.84654.tar"; + sha256 = "1n1lb1gcifd1m2pk4zgij3gd8500m4jhd6kgzrjy15cci34xlhsf"; }; packageRequires = [ emacs ]; meta = { @@ -3270,10 +3276,10 @@ elpaBuild { pname = "jinx"; ename = "jinx"; - version = "1.3.0.20240223.131200"; + version = "1.4.0.20240311.82108"; src = fetchurl { - url = "https://elpa.gnu.org/devel/jinx-1.3.0.20240223.131200.tar"; - sha256 = "1iyi3ayrjwp0xvsz4r03hwdlph0jw454xrlpy7j4spbwcq3s50yn"; + url = "https://elpa.gnu.org/devel/jinx-1.4.0.20240311.82108.tar"; + sha256 = "086231zh82hb2lz66m16hcvc7ncirn4zjx5hc5kmgzdp9aci8k8w"; }; packageRequires = [ compat emacs ]; meta = { @@ -3281,18 +3287,14 @@ license = lib.licenses.free; }; }) {}; - jit-spell = callPackage ({ compat - , elpaBuild - , emacs - , fetchurl - , lib }: + jit-spell = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "jit-spell"; ename = "jit-spell"; - version = "0.3.0.20230826.155115"; + version = "0.4.0.20240323.72834"; src = fetchurl { - url = "https://elpa.gnu.org/devel/jit-spell-0.3.0.20230826.155115.tar"; - sha256 = "08aamxml469jkyxsrg7nalc3ajfps4i2a639hix45w4wv48s20zi"; + url = "https://elpa.gnu.org/devel/jit-spell-0.4.0.20240323.72834.tar"; + sha256 = "14lqji9qyki7yq1kr1hc1ikcphvk18js3mp1rwx239mh3v079f0n"; }; packageRequires = [ compat emacs ]; meta = { @@ -3308,10 +3310,10 @@ elpaBuild { pname = "js2-mode"; ename = "js2-mode"; - version = "20231224.0.20240221.35415"; + version = "20231224.0.20240310.175505"; src = fetchurl { - url = "https://elpa.gnu.org/devel/js2-mode-20231224.0.20240221.35415.tar"; - sha256 = "076jh8ldqmanb140cf4s381dwmlm0mr030ddqz7aaj790853vff2"; + url = "https://elpa.gnu.org/devel/js2-mode-20231224.0.20240310.175505.tar"; + sha256 = "1q99zwhk0cdlr161zi38sz412y69k7nh8wa6scz5mi4v07vjrr9g"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -3341,10 +3343,10 @@ elpaBuild { pname = "jsonrpc"; ename = "jsonrpc"; - version = "1.0.24.0.20240121.142806"; + version = "1.0.25.0.20240312.132224"; src = fetchurl { - url = "https://elpa.gnu.org/devel/jsonrpc-1.0.24.0.20240121.142806.tar"; - sha256 = "0fx1g76igs1bwcj6v3yxalwf57ggzvv1ms4gqid6ari6r3jp6c25"; + url = "https://elpa.gnu.org/devel/jsonrpc-1.0.25.0.20240312.132224.tar"; + sha256 = "12x9i0m655nck41cv6kap814bzdw867wirnqbqyx8q80vmhxar9p"; }; packageRequires = [ emacs ]; meta = { @@ -3375,10 +3377,10 @@ elpaBuild { pname = "kind-icon"; ename = "kind-icon"; - version = "0.2.2.0.20240106.145829"; + version = "0.2.2.0.20240321.120430"; src = fetchurl { - url = "https://elpa.gnu.org/devel/kind-icon-0.2.2.0.20240106.145829.tar"; - sha256 = "16b0ilf3hqqlr9blc6vl1yc1y83hmfnxm0isl2f8rff29hw0k6y5"; + url = "https://elpa.gnu.org/devel/kind-icon-0.2.2.0.20240321.120430.tar"; + sha256 = "11f82zrdf5fmpbfv076pg55d0pybjv13wyl62pymcgw1i1jjsach"; }; packageRequires = [ emacs svg-lib ]; meta = { @@ -3466,6 +3468,40 @@ license = lib.licenses.free; }; }) {}; + lentic = callPackage ({ dash, elpaBuild, emacs, fetchurl, lib, m-buffer }: + elpaBuild { + pname = "lentic"; + ename = "lentic"; + version = "0.12.0.20240303.95600"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/lentic-0.12.0.20240303.95600.tar"; + sha256 = "08q7rkf2dxmwllpvm01v9bk7n0zynrqjmrsy3mrg4fnmdm9sw257"; + }; + packageRequires = [ dash emacs m-buffer ]; + meta = { + homepage = "https://elpa.gnu.org/packages/lentic.html"; + license = lib.licenses.free; + }; + }) {}; + lentic-server = callPackage ({ elpaBuild + , fetchurl + , lentic + , lib + , web-server }: + elpaBuild { + pname = "lentic-server"; + ename = "lentic-server"; + version = "0.2.0.20240314.214448"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/lentic-server-0.2.0.20240314.214448.tar"; + sha256 = "0nv50f4qa98cmj7r8azxbms6wbm1ij3bfld0fk1cqhn5b054ly0b"; + }; + packageRequires = [ lentic web-server ]; + meta = { + homepage = "https://elpa.gnu.org/packages/lentic-server.html"; + license = lib.licenses.free; + }; + }) {}; let-alist = callPackage ({ elpaBuild , emacs , fetchurl @@ -3514,14 +3550,36 @@ license = lib.licenses.free; }; }) {}; + listen = callPackage ({ elpaBuild + , emacs + , fetchurl + , lib + , persist + , taxy + , taxy-magit-section + , transient }: + elpaBuild { + pname = "listen"; + ename = "listen"; + version = "0.9pre0.20240322.72611"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/listen-0.9pre0.20240322.72611.tar"; + sha256 = "0k50isjazhx0hbmxw3s2p2ny56il5ywbsq1bda6av86ifzr1620c"; + }; + packageRequires = [ emacs persist taxy taxy-magit-section transient ]; + meta = { + homepage = "https://elpa.gnu.org/packages/listen.html"; + license = lib.licenses.free; + }; + }) {}; llm = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "llm"; ename = "llm"; - version = "0.9.1.0.20240218.124933"; + version = "0.12.1.0.20240323.232518"; src = fetchurl { - url = "https://elpa.gnu.org/devel/llm-0.9.1.0.20240218.124933.tar"; - sha256 = "1xdq5riyhxp5kff4v87mz5rr0df77ysmrc3vlarfhh12hg9bf3i4"; + url = "https://elpa.gnu.org/devel/llm-0.12.1.0.20240323.232518.tar"; + sha256 = "16y64vc84f14rcsbgg6cl0c9dc0xi0m2jks30m4l5khya7bkkj0x"; }; packageRequires = [ emacs ]; meta = { @@ -3615,10 +3673,10 @@ elpaBuild { pname = "logos"; ename = "logos"; - version = "1.1.1.0.20240117.25050"; + version = "1.1.1.0.20240224.55443"; src = fetchurl { - url = "https://elpa.gnu.org/devel/logos-1.1.1.0.20240117.25050.tar"; - sha256 = "10l1v429am4x65hk4f5sghql9vd5w1z163ld7za2sd9qv18dxf4z"; + url = "https://elpa.gnu.org/devel/logos-1.1.1.0.20240224.55443.tar"; + sha256 = "10z609m2ak37yfbmlgv258j2rsvkq40h5rzmdwk8ibldz3n6ywgd"; }; packageRequires = [ emacs ]; meta = { @@ -3656,6 +3714,24 @@ license = lib.licenses.free; }; }) {}; + m-buffer = callPackage ({ elpaBuild + , fetchurl + , lib + , seq }: + elpaBuild { + pname = "m-buffer"; + ename = "m-buffer"; + version = "0.16.0.20240302.175529"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/m-buffer-0.16.0.20240302.175529.tar"; + sha256 = "1scjp8f89a7mn7wlw0sgix8hk4dw6lpz0gakvfr7c5mcmm0bzhlr"; + }; + packageRequires = [ seq ]; + meta = { + homepage = "https://elpa.gnu.org/packages/m-buffer.html"; + license = lib.licenses.free; + }; + }) {}; map = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "map"; @@ -3679,10 +3755,10 @@ elpaBuild { pname = "marginalia"; ename = "marginalia"; - version = "1.5.0.20240105.70159"; + version = "1.5.0.20240323.201536"; src = fetchurl { - url = "https://elpa.gnu.org/devel/marginalia-1.5.0.20240105.70159.tar"; - sha256 = "1x1n95scr1f6b3c6ymgi7hh7dl9z6ifiwgxyh29d657mn1sifxl9"; + url = "https://elpa.gnu.org/devel/marginalia-1.5.0.20240323.201536.tar"; + sha256 = "11sjdmif14bcl3cn2sn9a20lvyw8qrjqjscwcq0aid0lqwswmvi4"; }; packageRequires = [ compat emacs ]; meta = { @@ -3728,10 +3804,10 @@ elpaBuild { pname = "mct"; ename = "mct"; - version = "1.0.0.0.20240214.72309"; + version = "1.0.0.0.20240320.41315"; src = fetchurl { - url = "https://elpa.gnu.org/devel/mct-1.0.0.0.20240214.72309.tar"; - sha256 = "0iqv403ikrj4fpbbs01wcmm94klifr71mlx6kb5n1cxf4i12f8s9"; + url = "https://elpa.gnu.org/devel/mct-1.0.0.0.20240320.41315.tar"; + sha256 = "062mk5kqivhgvfk81rsa21bqkzk2h3wgfq1prjppndfw8y4cajpb"; }; packageRequires = [ emacs ]; meta = { @@ -3877,10 +3953,10 @@ elpaBuild { pname = "modus-themes"; ename = "modus-themes"; - version = "4.3.0.0.20240223.71209"; + version = "4.4.0.0.20240322.51913"; src = fetchurl { - url = "https://elpa.gnu.org/devel/modus-themes-4.3.0.0.20240223.71209.tar"; - sha256 = "0gvzgq2h7nkh77kg82jflpnrn5ilp6gmsl1jsg4gkcrhs0v36i1s"; + url = "https://elpa.gnu.org/devel/modus-themes-4.4.0.0.20240322.51913.tar"; + sha256 = "1ilblm5hgynihfm60q44fw9njhir1nndz7mhxbbsyhlm42bg30vc"; }; packageRequires = [ emacs ]; meta = { @@ -3888,6 +3964,21 @@ license = lib.licenses.free; }; }) {}; + mpdired = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "mpdired"; + ename = "mpdired"; + version = "2pre0.20240319.164728"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/mpdired-2pre0.20240319.164728.tar"; + sha256 = "18xhxlxzl5kapjzhaqw0zsi5avp2wb0vrxj9rsigsjcr0p09asrd"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/mpdired.html"; + license = lib.licenses.free; + }; + }) {}; multi-mode = callPackage ({ elpaBuild , fetchurl , lib }: @@ -4031,10 +4122,10 @@ elpaBuild { pname = "nano-modeline"; ename = "nano-modeline"; - version = "1.0.1.0.20240120.114819"; + version = "1.0.1.0.20240318.92455"; src = fetchurl { - url = "https://elpa.gnu.org/devel/nano-modeline-1.0.1.0.20240120.114819.tar"; - sha256 = "0m4zs3l3q077v0g1vp1z0kbddgb3cwvnd7i50f4ih9pjiymgjvkc"; + url = "https://elpa.gnu.org/devel/nano-modeline-1.0.1.0.20240318.92455.tar"; + sha256 = "1ncbyq2753s46aca2kklf5rrgccc1wddbp0qbhcn6v2j1y37c8k5"; }; packageRequires = [ emacs ]; meta = { @@ -4049,10 +4140,10 @@ elpaBuild { pname = "nano-theme"; ename = "nano-theme"; - version = "0.3.4.0.20230421.53238"; + version = "0.3.4.0.20240319.93238"; src = fetchurl { - url = "https://elpa.gnu.org/devel/nano-theme-0.3.4.0.20230421.53238.tar"; - sha256 = "04fmfzy965d6wbaxgpkgyxaw9qv6103gc9g8kw1gcvbxdgq0rf56"; + url = "https://elpa.gnu.org/devel/nano-theme-0.3.4.0.20240319.93238.tar"; + sha256 = "0i7zxx2y052bn4ry3pr24zmm846zilcvv2pvkzcd450zp84p39hn"; }; packageRequires = [ emacs ]; meta = { @@ -4296,10 +4387,10 @@ elpaBuild { pname = "orderless"; ename = "orderless"; - version = "1.0.0.20240221.100116"; + version = "1.1.0.20240320.163827"; src = fetchurl { - url = "https://elpa.gnu.org/devel/orderless-1.0.0.20240221.100116.tar"; - sha256 = "1qg94gy3f7f49xfnqxl5315gr55rm8crpp7l5jkw3ha6d4n7cjvl"; + url = "https://elpa.gnu.org/devel/orderless-1.1.0.20240320.163827.tar"; + sha256 = "1iffr6y533z310c47jig8fbg6vyv9a6vlrwn5v4rg0vb3m0i1ah7"; }; packageRequires = [ emacs ]; meta = { @@ -4311,10 +4402,10 @@ elpaBuild { pname = "org"; ename = "org"; - version = "9.7pre0.20240223.132445"; + version = "9.7pre0.20240324.161811"; src = fetchurl { - url = "https://elpa.gnu.org/devel/org-9.7pre0.20240223.132445.tar"; - sha256 = "1va7l4h4lbajwzvmvj5w9fx148ixbzbagbhjjlqmg0kccsamx8qj"; + url = "https://elpa.gnu.org/devel/org-9.7pre0.20240324.161811.tar"; + sha256 = "02c2zy96ipzyl6abn375zkvsybfbs3067mnv70xrgjhfrd02yfbr"; }; packageRequires = [ emacs ]; meta = { @@ -4388,10 +4479,10 @@ elpaBuild { pname = "org-modern"; ename = "org-modern"; - version = "1.1.0.20240102.32915"; + version = "1.2.0.20240316.110902"; src = fetchurl { - url = "https://elpa.gnu.org/devel/org-modern-1.1.0.20240102.32915.tar"; - sha256 = "0vp610bjjz885bb16kc7lv7k4h2fir8mvcs3jhvwrddbhyi4hycq"; + url = "https://elpa.gnu.org/devel/org-modern-1.2.0.20240316.110902.tar"; + sha256 = "1jxq281qpr8if9np3qsg8gccg08yzi7szq0vz5v8yy7q4lc27wz2"; }; packageRequires = [ compat emacs ]; meta = { @@ -4445,10 +4536,10 @@ elpaBuild { pname = "org-remark"; ename = "org-remark"; - version = "1.2.1.0.20240201.154838"; + version = "1.2.1.0.20240323.220226"; src = fetchurl { - url = "https://elpa.gnu.org/devel/org-remark-1.2.1.0.20240201.154838.tar"; - sha256 = "150zkg15y8zafjhwrwf2p5fng5287mh8n452a5gk47ikf0jsx7b0"; + url = "https://elpa.gnu.org/devel/org-remark-1.2.1.0.20240323.220226.tar"; + sha256 = "0vw0arm7jhzrxwfjyqj65xicbr6020k106vb7zaw1iyvwq64fid7"; }; packageRequires = [ emacs org ]; meta = { @@ -4693,10 +4784,10 @@ elpaBuild { pname = "phpinspect"; ename = "phpinspect"; - version = "0.0.20230831.151323"; + version = "0.0.20240322.152749"; src = fetchurl { - url = "https://elpa.gnu.org/devel/phpinspect-0.0.20230831.151323.tar"; - sha256 = "01qhyjs9ziz6qk652ibvwjzpbzd1a9038jrmxx79mj39yai4lwca"; + url = "https://elpa.gnu.org/devel/phpinspect-0.0.20240322.152749.tar"; + sha256 = "1cm8m3zvqd000zv88md4qnrjlq29x8kl1zsivb1k4q6b0rxpva4g"; }; packageRequires = [ compat ]; meta = { @@ -4836,10 +4927,10 @@ elpaBuild { pname = "popper"; ename = "popper"; - version = "0.4.6.0.20230908.183054"; + version = "0.4.6.0.20240323.172152"; src = fetchurl { - url = "https://elpa.gnu.org/devel/popper-0.4.6.0.20230908.183054.tar"; - sha256 = "062ykss5kv0w1i254n9lzwkfwf5zliicianh1nvypmlqdp16hphx"; + url = "https://elpa.gnu.org/devel/popper-0.4.6.0.20240323.172152.tar"; + sha256 = "14k8shc3w1kc8yz3i1rm02qdyjkxbyyypl2phm9650dvwhwxibxg"; }; packageRequires = [ emacs ]; meta = { @@ -4869,10 +4960,10 @@ elpaBuild { pname = "pq"; ename = "pq"; - version = "0.1.0.20220719.42000"; + version = "0.2.0.20240317.135839"; src = fetchurl { - url = "https://elpa.gnu.org/devel/pq-0.1.0.20220719.42000.tar"; - sha256 = "11anvvmsjrfcfcz5sxfd40gsm6mlmc9llrvdnwhp4dsvi2llqv65"; + url = "https://elpa.gnu.org/devel/pq-0.2.0.20240317.135839.tar"; + sha256 = "0hfngsg0hqqrkm55q0ds09bprbpf7km7ry0s4y2lmvyybfaszkla"; }; packageRequires = [ emacs ]; meta = { @@ -4905,10 +4996,10 @@ elpaBuild { pname = "project"; ename = "project"; - version = "0.10.0.0.20240215.181437"; + version = "0.10.0.0.20240315.22845"; src = fetchurl { - url = "https://elpa.gnu.org/devel/project-0.10.0.0.20240215.181437.tar"; - sha256 = "1pp3al6yydv4wpqc2bz2ccak8na38x35i0z1vi999ir232mpdaa5"; + url = "https://elpa.gnu.org/devel/project-0.10.0.0.20240315.22845.tar"; + sha256 = "0l0aqa5xyj1wj3wxvbvyjx32cjq405dkp10fmy9ydb80a44l8jyw"; }; packageRequires = [ emacs xref ]; meta = { @@ -4997,10 +5088,10 @@ elpaBuild { pname = "python"; ename = "python"; - version = "0.28.0.20240223.100931"; + version = "0.28.0.20240314.140956"; src = fetchurl { - url = "https://elpa.gnu.org/devel/python-0.28.0.20240223.100931.tar"; - sha256 = "1x97iqsg2jnhr23l81dlipz5xwf0g8mlw9yqqz02rjc8s112awsv"; + url = "https://elpa.gnu.org/devel/python-0.28.0.20240314.140956.tar"; + sha256 = "1ikh9qj1dd7002wxfgppngja32yw81i799ymsxwgrypy3xidxxpa"; }; packageRequires = [ compat emacs seq ]; meta = { @@ -5114,10 +5205,10 @@ elpaBuild { pname = "rcirc-sqlite"; ename = "rcirc-sqlite"; - version = "0.1.3.0.20240215.94754"; + version = "0.1.4.0.20240226.165830"; src = fetchurl { - url = "https://elpa.gnu.org/devel/rcirc-sqlite-0.1.3.0.20240215.94754.tar"; - sha256 = "169d4pb204jns39p2xbh37psy9pyi6yhiywlm7ywn2c4fagwj2q2"; + url = "https://elpa.gnu.org/devel/rcirc-sqlite-0.1.4.0.20240226.165830.tar"; + sha256 = "1j16p0i9yyv229f4jcq10vwld01yda6gdv7n5a0ap0xk5qhaj67k"; }; packageRequires = [ emacs ]; meta = { @@ -5395,10 +5486,10 @@ elpaBuild { pname = "rt-liberation"; ename = "rt-liberation"; - version = "6.0.20231204.173138"; + version = "7.0.20240306.83828"; src = fetchurl { - url = "https://elpa.gnu.org/devel/rt-liberation-6.0.20231204.173138.tar"; - sha256 = "0z6988s3hnbh4l5crn3m1ilz94dvsi8d11khjb45qdkmdpzvdmh3"; + url = "https://elpa.gnu.org/devel/rt-liberation-7.0.20240306.83828.tar"; + sha256 = "1bykgygci149vn2s722xg5bn0kp6srjb8mf5rygvy5h32lfdc4r9"; }; packageRequires = []; meta = { @@ -5560,10 +5651,10 @@ elpaBuild { pname = "shell-command-plus"; ename = "shell-command+"; - version = "2.4.2.0.20230311.131100"; + version = "2.4.2.0.20240313.182825"; src = fetchurl { - url = "https://elpa.gnu.org/devel/shell-command+-2.4.2.0.20230311.131100.tar"; - sha256 = "03nlyl4r5dm2hr3j0z1qw3s2v4zf0qvij350caalm08qmc9apama"; + url = "https://elpa.gnu.org/devel/shell-command+-2.4.2.0.20240313.182825.tar"; + sha256 = "06yffzhfjgbqr4nsk1f098qmr72818n8466i2g75j03vmzacbzgd"; }; packageRequires = [ emacs ]; meta = { @@ -5627,10 +5718,10 @@ elpaBuild { pname = "site-lisp"; ename = "site-lisp"; - version = "0.1.2.0.20240221.82209"; + version = "0.1.2.0.20240308.82403"; src = fetchurl { - url = "https://elpa.gnu.org/devel/site-lisp-0.1.2.0.20240221.82209.tar"; - sha256 = "0jx7lqwrbvwk2cyznd2rfapnvs6k3kaz6kwyd9508kxv2y521gz2"; + url = "https://elpa.gnu.org/devel/site-lisp-0.1.2.0.20240308.82403.tar"; + sha256 = "0hc811pinqr9swg9764aibyfar33n8nk733pzfgn70rdyxszl9h5"; }; packageRequires = [ emacs ]; meta = { @@ -5815,10 +5906,10 @@ elpaBuild { pname = "spacious-padding"; ename = "spacious-padding"; - version = "0.3.0.0.20240222.124225"; + version = "0.4.1.0.20240311.74539"; src = fetchurl { - url = "https://elpa.gnu.org/devel/spacious-padding-0.3.0.0.20240222.124225.tar"; - sha256 = "072biw4a146d7064j1zqi03nh7aiy465bna11sk102x90mhs9z25"; + url = "https://elpa.gnu.org/devel/spacious-padding-0.4.1.0.20240311.74539.tar"; + sha256 = "1alvy1am8fjlj0wlmzbpvjjgjcln25v0dc19rbwfgwm8pzbq2apn"; }; packageRequires = [ emacs ]; meta = { @@ -5883,10 +5974,10 @@ elpaBuild { pname = "sql-indent"; ename = "sql-indent"; - version = "1.7.0.20230922.224618"; + version = "1.7.0.20240323.40057"; src = fetchurl { - url = "https://elpa.gnu.org/devel/sql-indent-1.7.0.20230922.224618.tar"; - sha256 = "1clffdk29mq5cbgjw5if2sfmx1dvvhn10lapnrpfz560r2lfykvg"; + url = "https://elpa.gnu.org/devel/sql-indent-1.7.0.20240323.40057.tar"; + sha256 = "1gvb4inym802zjx721l7qwwmvahaqaw0v1qkm3kl36nqcx7ykp52"; }; packageRequires = [ cl-lib ]; meta = { @@ -5949,10 +6040,10 @@ elpaBuild { pname = "standard-themes"; ename = "standard-themes"; - version = "2.0.1.0.20240212.80249"; + version = "2.0.1.0.20240226.81513"; src = fetchurl { - url = "https://elpa.gnu.org/devel/standard-themes-2.0.1.0.20240212.80249.tar"; - sha256 = "1k4285xpdlhhbmn4516jv2kwn5x82mah23jwlr9qhb4hxvzjmkms"; + url = "https://elpa.gnu.org/devel/standard-themes-2.0.1.0.20240226.81513.tar"; + sha256 = "1c4rqg59823syxd9izz8spi54yf0p2984vnpkk7r1kklzfszglmf"; }; packageRequires = [ emacs ]; meta = { @@ -6369,10 +6460,10 @@ elpaBuild { pname = "tramp"; ename = "tramp"; - version = "2.6.2.1.0.20240130.101154"; + version = "2.6.2.2.0.20240228.151226"; src = fetchurl { - url = "https://elpa.gnu.org/devel/tramp-2.6.2.1.0.20240130.101154.tar"; - sha256 = "0rlzqwcmcifcg64sbabs8fnrbx4s5vvkqwdwf963pji5fi2n60di"; + url = "https://elpa.gnu.org/devel/tramp-2.6.2.2.0.20240228.151226.tar"; + sha256 = "0cv1mwksfcggsyv38kmldcxb702mv7kl4f5l20ilkypsl8ryjfyy"; }; packageRequires = [ emacs ]; meta = { @@ -6442,10 +6533,10 @@ elpaBuild { pname = "transient"; ename = "transient"; - version = "0.5.3.0.20240201.110006"; + version = "0.6.0.0.20240321.220938"; src = fetchurl { - url = "https://elpa.gnu.org/devel/transient-0.5.3.0.20240201.110006.tar"; - sha256 = "07hg1bas7zvs6hxq189wp5ngi71skydal2h6q4xsv28ac7mi268g"; + url = "https://elpa.gnu.org/devel/transient-0.6.0.0.20240321.220938.tar"; + sha256 = "0ircfdybzzjxalcfcmd889b41c647fqdwybylri52hz3wh13iix4"; }; packageRequires = [ compat emacs seq ]; meta = { @@ -6479,10 +6570,10 @@ elpaBuild { pname = "tree-inspector"; ename = "tree-inspector"; - version = "0.4.0.20230925.193758"; + version = "0.4.0.20240322.113138"; src = fetchurl { - url = "https://elpa.gnu.org/devel/tree-inspector-0.4.0.20230925.193758.tar"; - sha256 = "0ncg9yhngzn7cspqna62i21v8rra4hczpz74xckgzs34s98mv4y7"; + url = "https://elpa.gnu.org/devel/tree-inspector-0.4.0.20240322.113138.tar"; + sha256 = "0ic17jzzj5mqzdpg6hvwyas9s70jpqgfc96azmmb3mhpvs6xwak2"; }; packageRequires = [ emacs treeview ]; meta = { @@ -6620,10 +6711,10 @@ elpaBuild { pname = "urgrep"; ename = "urgrep"; - version = "0.4.0snapshot0.20240124.145836"; + version = "0.4.2snapshot0.20240310.204507"; src = fetchurl { - url = "https://elpa.gnu.org/devel/urgrep-0.4.0snapshot0.20240124.145836.tar"; - sha256 = "1bi6hvkpcdk3kjdzj14lndsyxhl2bcscx57ggl6wmix7ga0bc8za"; + url = "https://elpa.gnu.org/devel/urgrep-0.4.2snapshot0.20240310.204507.tar"; + sha256 = "0pzicsyp8p2cbyy77l0fj7kzi7amc5xqyj6a6in1jvgc52wzg532"; }; packageRequires = [ compat emacs project ]; meta = { @@ -6840,10 +6931,10 @@ elpaBuild { pname = "verilog-mode"; ename = "verilog-mode"; - version = "2023.6.6.141322628.0.20240102.22814"; + version = "2024.3.1.121933719.0.20240314.104026"; src = fetchurl { - url = "https://elpa.gnu.org/devel/verilog-mode-2023.6.6.141322628.0.20240102.22814.tar"; - sha256 = "0zp9nasy8vd3b047bjpiyvl2c0l4k03nbba4yga5a77jkg7mzsh1"; + url = "https://elpa.gnu.org/devel/verilog-mode-2024.3.1.121933719.0.20240314.104026.tar"; + sha256 = "14v14yn6lcpjxldmzl9wymikxzli4mpvy9xsa0pvq0dlj0d30xgw"; }; packageRequires = []; meta = { @@ -6855,10 +6946,10 @@ elpaBuild { pname = "vertico"; ename = "vertico"; - version = "1.7.0.20240212.231900"; + version = "1.7.0.20240322.111445"; src = fetchurl { - url = "https://elpa.gnu.org/devel/vertico-1.7.0.20240212.231900.tar"; - sha256 = "0rhl6brd5h0l0bq3izy4114gaj8qm88ldx6x9a9ixa0kjjx2pc6a"; + url = "https://elpa.gnu.org/devel/vertico-1.7.0.20240322.111445.tar"; + sha256 = "1v4c3h9qv1mr4dwirzh5r6vvkbxhxqw4cq245vla0ljgl9bhsm86"; }; packageRequires = [ compat emacs ]; meta = { @@ -7060,10 +7151,10 @@ elpaBuild { pname = "which-key"; ename = "which-key"; - version = "3.6.0.0.20240220.203830"; + version = "3.6.0.0.20240312.163350"; src = fetchurl { - url = "https://elpa.gnu.org/devel/which-key-3.6.0.0.20240220.203830.tar"; - sha256 = "1pp40cm6a46pdpljzfrx70vszmynr1flzlwzv2ky1zf5yv6wacq4"; + url = "https://elpa.gnu.org/devel/which-key-3.6.0.0.20240312.163350.tar"; + sha256 = "09mjn8ms7yhy93b3klqhvwvk2ipk4fx6l9s7446m7fxjdylgbj6a"; }; packageRequires = [ emacs ]; meta = { @@ -7078,10 +7169,10 @@ elpaBuild { pname = "window-commander"; ename = "window-commander"; - version = "3.0.2.0.20240212.12958"; + version = "3.0.2.0.20240314.125442"; src = fetchurl { - url = "https://elpa.gnu.org/devel/window-commander-3.0.2.0.20240212.12958.tar"; - sha256 = "02v3m4qrwzxdlsfdjh35bazcdfn92s6qjh8q7jqfnhv3i2b80jx6"; + url = "https://elpa.gnu.org/devel/window-commander-3.0.2.0.20240314.125442.tar"; + sha256 = "1bjamqhn8nkqxmak1xfxriwqjhb0bdj7ldcg6r24rral0f0crwhm"; }; packageRequires = [ emacs ]; meta = { @@ -7128,10 +7219,10 @@ elpaBuild { pname = "wisi"; ename = "wisi"; - version = "4.3.2.0.20231026.105332"; + version = "4.3.2.0.20240313.173240"; src = fetchurl { - url = "https://elpa.gnu.org/devel/wisi-4.3.2.0.20231026.105332.tar"; - sha256 = "1jlqvimnjsdvaylfj2hq9k9bllvl74j1g4pd8w4kf3c30n7jyiql"; + url = "https://elpa.gnu.org/devel/wisi-4.3.2.0.20240313.173240.tar"; + sha256 = "0cd7y0wg52yz8bp74m9p9wnw4zhsgks61znxxm8y0mjxxac4g188"; }; packageRequires = [ emacs seq ]; meta = { @@ -7307,10 +7398,10 @@ elpaBuild { pname = "yasnippet"; ename = "yasnippet"; - version = "0.14.1.0.20240215.153445"; + version = "0.14.1.0.20240308.31533"; src = fetchurl { - url = "https://elpa.gnu.org/devel/yasnippet-0.14.1.0.20240215.153445.tar"; - sha256 = "121b54xh9jsqcb2x1a5r9nd1c3i5ayka932xd47z09ps46zlvpsr"; + url = "https://elpa.gnu.org/devel/yasnippet-0.14.1.0.20240308.31533.tar"; + sha256 = "0n67qgrnjxv5vb1brc545b4jyan7adx4r8478mw3686ia014l1kh"; }; packageRequires = [ cl-lib emacs ]; meta = { diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix index 25831b16cc4a5..ec8e192397a2a 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix @@ -34,10 +34,10 @@ elpaBuild { pname = "activities"; ename = "activities"; - version = "0.5.1"; + version = "0.7"; src = fetchurl { - url = "https://elpa.gnu.org/packages/activities-0.5.1.tar"; - sha256 = "0ng9sgajcpal881s3kavkmz0fc38f2h207hpqj62cf14z7bsk0zk"; + url = "https://elpa.gnu.org/packages/activities-0.7.tar"; + sha256 = "17vwbblcwayf1lqfvc64s606cyv1pyh094i3d8fz0k5ivgfp6ybi"; }; packageRequires = [ emacs persist ]; meta = { @@ -261,6 +261,21 @@ license = lib.licenses.free; }; }) {}; + assess = callPackage ({ elpaBuild, emacs, fetchurl, lib, m-buffer }: + elpaBuild { + pname = "assess"; + ename = "assess"; + version = "0.7"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/assess-0.7.tar"; + sha256 = "0ixs6ab5j12q69bn9h423a6c7mpc7r5spf6m039x3rl14yc04cy4"; + }; + packageRequires = [ emacs m-buffer ]; + meta = { + homepage = "https://elpa.gnu.org/packages/assess.html"; + license = lib.licenses.free; + }; + }) {}; async = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "async"; @@ -280,10 +295,10 @@ elpaBuild { pname = "auctex"; ename = "auctex"; - version = "14.0.3"; + version = "14.0.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/auctex-14.0.3.tar"; - sha256 = "1xk29nk3r7ilxk2vag3diacamqvlws7mbjk5a0iivz5y6fy7hmjc"; + url = "https://elpa.gnu.org/packages/auctex-14.0.4.tar"; + sha256 = "03w6qs4f0ksb8f54zsx189775w3wdyfaqg3dwn20a77y5cvisk52"; }; packageRequires = [ emacs ]; meta = { @@ -550,10 +565,10 @@ elpaBuild { pname = "brief"; ename = "brief"; - version = "5.88.22.2"; + version = "5.90"; src = fetchurl { - url = "https://elpa.gnu.org/packages/brief-5.88.22.2.tar"; - sha256 = "1i4sdm8kcrazzp22gb4hi1gd4lfq6hdh6pnldmi1zjjyhl1gbzn3"; + url = "https://elpa.gnu.org/packages/brief-5.90.tar"; + sha256 = "18v0qf3aj14sh6njrrjdahzaghsqy50hdjrwl3k1m7x2jqvzxd1z"; }; packageRequires = [ cl-lib nadvice ]; meta = { @@ -565,10 +580,10 @@ elpaBuild { pname = "buffer-env"; ename = "buffer-env"; - version = "0.5"; + version = "0.6"; src = fetchurl { - url = "https://elpa.gnu.org/packages/buffer-env-0.5.tar"; - sha256 = "17q0flxp0rp52ksyh5ijcamvvm003icbyzv28r6vknrw3qsphb3p"; + url = "https://elpa.gnu.org/packages/buffer-env-0.6.tar"; + sha256 = "08li070s2s64lifgzns0z6xjk1qyaik56d6sbdp3gsyghc1sx7rn"; }; packageRequires = [ compat emacs ]; meta = { @@ -659,10 +674,10 @@ elpaBuild { pname = "cape"; ename = "cape"; - version = "1.3"; + version = "1.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/cape-1.3.tar"; - sha256 = "1178f6js821zcmsc3zrlclnaf4sswgvzs2qazzi975dkcfqcn3vq"; + url = "https://elpa.gnu.org/packages/cape-1.4.tar"; + sha256 = "1y0b0lx6qb27x3d0yn3gxykfir07cw4w5jkkw3ff8x1ak6wrf4zv"; }; packageRequires = [ compat emacs ]; meta = { @@ -809,10 +824,10 @@ elpaBuild { pname = "comint-mime"; ename = "comint-mime"; - version = "0.3"; + version = "0.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/comint-mime-0.3.tar"; - sha256 = "0dlzwzmiwq9z8riq6h1gpq1g713x09kxgaz2m4anxkbmgb95r7hf"; + url = "https://elpa.gnu.org/packages/comint-mime-0.4.tar"; + sha256 = "1wgr1dq3qdnsvziylcqaiwhjafdqph4jrnq4cp0lcr1j796vp1dz"; }; packageRequires = [ emacs ]; meta = { @@ -907,10 +922,10 @@ elpaBuild { pname = "compat"; ename = "compat"; - version = "29.1.4.4"; + version = "29.1.4.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/compat-29.1.4.4.tar"; - sha256 = "0710g552b1nznnfx2774gmg6yizs27s0bakqm95nsjrp6kgznbfr"; + url = "https://elpa.gnu.org/packages/compat-29.1.4.5.tar"; + sha256 = "191cjzrw9xm5bvcf8s1yr9hdcn9i02789xfd8pz33lk65s0rq413"; }; packageRequires = [ emacs seq ]; meta = { @@ -922,10 +937,10 @@ elpaBuild { pname = "consult"; ename = "consult"; - version = "1.3"; + version = "1.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/consult-1.3.tar"; - sha256 = "1qyqvc4rp0287lidpzhvi669ygjnqmlw8wq0hc0nks2703p283c8"; + url = "https://elpa.gnu.org/packages/consult-1.4.tar"; + sha256 = "1vxc9i4jwnq4q8svgqjzn6nqqjzh3b6gp81iyfcr5n2122y0aq1y"; }; packageRequires = [ compat emacs ]; meta = { @@ -933,8 +948,7 @@ license = lib.licenses.free; }; }) {}; - consult-hoogle = callPackage ({ consult - , elpaBuild + consult-hoogle = callPackage ({ elpaBuild , emacs , fetchurl , haskell-mode @@ -942,12 +956,12 @@ elpaBuild { pname = "consult-hoogle"; ename = "consult-hoogle"; - version = "0.1.1"; + version = "0.2.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/consult-hoogle-0.1.1.tar"; - sha256 = "1bcl7h5ykcgrsfj27wkv9l9jvbj2bbkh0w9d60663m1bkp0p3y2r"; + url = "https://elpa.gnu.org/packages/consult-hoogle-0.2.0.tar"; + sha256 = "1wzd7i7sfd1l8fkfgfaj5vyc9nx9aycfr4yp5yxg1mr6fz8m2rmz"; }; - packageRequires = [ consult emacs haskell-mode ]; + packageRequires = [ emacs haskell-mode ]; meta = { homepage = "https://elpa.gnu.org/packages/consult-hoogle.html"; license = lib.licenses.free; @@ -1152,10 +1166,10 @@ elpaBuild { pname = "dape"; ename = "dape"; - version = "0.7.0"; + version = "0.9.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/dape-0.7.0.tar"; - sha256 = "0fbafwmrs9dlv875vcg1c9gh0hqs1zpnyqxgkdvbrazww7ffn60g"; + url = "https://elpa.gnu.org/packages/dape-0.9.0.tar"; + sha256 = "13xvl24l8lr64ndc8rk1dxdgsbvwxhn90844xkdzl7qs8i3hyw1l"; }; packageRequires = [ emacs jsonrpc ]; meta = { @@ -1242,10 +1256,10 @@ elpaBuild { pname = "denote"; ename = "denote"; - version = "2.2.4"; + version = "2.3.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/denote-2.2.4.tar"; - sha256 = "0a0f4s715nfb7kly82m1gb2ady69z089wlay5i53n9bxzi61x3j7"; + url = "https://elpa.gnu.org/packages/denote-2.3.0.tar"; + sha256 = "0h6pdn9w1ggyrmfniqvy307wnlf49n05asa2z5wqxvj6mnvjza1y"; }; packageRequires = [ emacs ]; meta = { @@ -1287,10 +1301,10 @@ elpaBuild { pname = "devdocs"; ename = "devdocs"; - version = "0.5"; + version = "0.6"; src = fetchurl { - url = "https://elpa.gnu.org/packages/devdocs-0.5.tar"; - sha256 = "0qyp8lhf76yv2ym7cryvygvf2m9jah5nsl1g79gqjrsin6vlhqka"; + url = "https://elpa.gnu.org/packages/devdocs-0.6.tar"; + sha256 = "17av2l61mr4y8la4cqiq1dnaznni4xirr5k3wdix1jzl3q1apypy"; }; packageRequires = [ emacs ]; meta = { @@ -1653,10 +1667,10 @@ elpaBuild { pname = "eev"; ename = "eev"; - version = "20240205"; + version = "20240309"; src = fetchurl { - url = "https://elpa.gnu.org/packages/eev-20240205.tar"; - sha256 = "06psmcf3yi7pincsbhjrcrml0wzwgmlv6xy2fbpg1sg8vlibbgi3"; + url = "https://elpa.gnu.org/packages/eev-20240309.tar"; + sha256 = "0j9hz5raxrk3d2ashbsp9yvi04d5ap0chb4lpljr4pbh2lnyjr4h"; }; packageRequires = [ emacs ]; meta = { @@ -1668,10 +1682,10 @@ elpaBuild { pname = "ef-themes"; ename = "ef-themes"; - version = "1.5.1"; + version = "1.6.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ef-themes-1.5.1.tar"; - sha256 = "00qh5b7kx0dlms7drnzj95mvgwfzg5h5m9prkbr8qi4ssx939gdw"; + url = "https://elpa.gnu.org/packages/ef-themes-1.6.1.tar"; + sha256 = "1ms0rqivxdsbx7jv6d5h1khvm4ghml152ab831chg4z77apmq1ga"; }; packageRequires = [ emacs ]; meta = { @@ -1778,22 +1792,16 @@ license = lib.licenses.free; }; }) {}; - ellama = callPackage ({ dash - , elpaBuild - , emacs - , fetchurl - , lib - , llm - , spinner }: + ellama = callPackage ({ elpaBuild, emacs, fetchurl, lib, llm, spinner }: elpaBuild { pname = "ellama"; ename = "ellama"; - version = "0.8.7"; + version = "0.8.13"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ellama-0.8.7.tar"; - sha256 = "0qmd7zrh026rjic26bdp9zinb7vkppdm14inwpwaashqxa5brwi5"; + url = "https://elpa.gnu.org/packages/ellama-0.8.13.tar"; + sha256 = "012j3rnvwj8ajyjdlgdx6nrs773i71dyl5brs0jgx010jibzmafi"; }; - packageRequires = [ dash emacs llm spinner ]; + packageRequires = [ emacs llm spinner ]; meta = { homepage = "https://elpa.gnu.org/packages/ellama.html"; license = lib.licenses.free; @@ -1893,10 +1901,10 @@ elpaBuild { pname = "emms"; ename = "emms"; - version = "18"; + version = "19"; src = fetchurl { - url = "https://elpa.gnu.org/packages/emms-18.tar"; - sha256 = "1jslk37kx7yzvwy4hq1a6b71kp4a3bgfzzp8bpplv7z6vcmwrmgq"; + url = "https://elpa.gnu.org/packages/emms-19.tar"; + sha256 = "13c884s92ddn52psgkaz3zvb94g23gq41dbidpx7x4gzdhd9qqxm"; }; packageRequires = [ cl-lib nadvice seq ]; meta = { @@ -2125,10 +2133,10 @@ elpaBuild { pname = "filechooser"; ename = "filechooser"; - version = "0.1.2"; + version = "0.2.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/filechooser-0.1.2.tar"; - sha256 = "0s0mdc851zd2hy8hfpbamiimbh7c788cyz8mxnwzkpmf6jlj6xdw"; + url = "https://elpa.gnu.org/packages/filechooser-0.2.0.tar"; + sha256 = "1pl6n6d6gymdm0gx0nz96hwps8v1s2zpqph41d0h5hdvsvxacx6w"; }; packageRequires = [ compat emacs ]; meta = { @@ -2554,10 +2562,10 @@ elpaBuild { pname = "greader"; ename = "greader"; - version = "0.9.7"; + version = "0.9.19"; src = fetchurl { - url = "https://elpa.gnu.org/packages/greader-0.9.7.tar"; - sha256 = "08q2qfcwyxrnmjbzblgk16xhshhn2314swjs0kr5jrdijdgpfghh"; + url = "https://elpa.gnu.org/packages/greader-0.9.19.tar"; + sha256 = "1d04d1shzb505qs2mf7387dvl56pwlwh4b349s5fq2prwqrq71l7"; }; packageRequires = [ emacs ]; meta = { @@ -2584,10 +2592,10 @@ elpaBuild { pname = "gtags-mode"; ename = "gtags-mode"; - version = "1.0"; + version = "1.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/gtags-mode-1.0.tar"; - sha256 = "0nyzsr3fnds931ihw2dp5xlgv151kzph7qv1n751r1cajimzlp7n"; + url = "https://elpa.gnu.org/packages/gtags-mode-1.1.tar"; + sha256 = "0fgs6iqrivmyxfkjl6hxxs3zfjkkdas61z34q08qfjgw0ixz188h"; }; packageRequires = [ emacs ]; meta = { @@ -2726,10 +2734,10 @@ elpaBuild { pname = "hyperbole"; ename = "hyperbole"; - version = "9.0.0"; + version = "9.0.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/hyperbole-9.0.0.tar"; - sha256 = "07kpyp3ggf4knakn18niy819l184apx4d9vbcwv57j8zyqgn4c3l"; + url = "https://elpa.gnu.org/packages/hyperbole-9.0.1.tar"; + sha256 = "0a7py2dvszh0rf2smbmm8msjrc8vbbvlqnsqw0m2l12v8vllmxnb"; }; packageRequires = [ emacs ]; meta = { @@ -2786,10 +2794,10 @@ elpaBuild { pname = "isearch-mb"; ename = "isearch-mb"; - version = "0.7"; + version = "0.8"; src = fetchurl { - url = "https://elpa.gnu.org/packages/isearch-mb-0.7.tar"; - sha256 = "1dfjh4ya9515vx0q2dv1brddw350gxd40h1g1vsa783ivvm0hm75"; + url = "https://elpa.gnu.org/packages/isearch-mb-0.8.tar"; + sha256 = "06241rwz01z4ysgmizczq12zl0cc6xvfyds48glzk1jp82zp4adp"; }; packageRequires = [ emacs ]; meta = { @@ -2956,10 +2964,10 @@ elpaBuild { pname = "jinx"; ename = "jinx"; - version = "1.3"; + version = "1.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/jinx-1.3.tar"; - sha256 = "0xlfw1sw92qf8bwpw9qnjhkz4ax6n7kcl72ypqm3swmj92jbgsg7"; + url = "https://elpa.gnu.org/packages/jinx-1.4.tar"; + sha256 = "1vv85pbhcpwjvd3iwnr8ksjpbydrsk7m3zm34hcbybg703yk2nl7"; }; packageRequires = [ compat emacs ]; meta = { @@ -2971,10 +2979,10 @@ elpaBuild { pname = "jit-spell"; ename = "jit-spell"; - version = "0.3"; + version = "0.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/jit-spell-0.3.tar"; - sha256 = "0q8wd9phd0zcjhc92j633vz82fr0ji8zc9vir7kcn1msrf6jspwz"; + url = "https://elpa.gnu.org/packages/jit-spell-0.4.tar"; + sha256 = "1p83spcq52l7k63p56y3w5r3kl49wbrs4abynwn25ikhkd4wl8x3"; }; packageRequires = [ compat emacs ]; meta = { @@ -3016,10 +3024,10 @@ elpaBuild { pname = "jsonrpc"; ename = "jsonrpc"; - version = "1.0.24"; + version = "1.0.25"; src = fetchurl { - url = "https://elpa.gnu.org/packages/jsonrpc-1.0.24.tar"; - sha256 = "05nwxfybczxx7pmflq762dq3wypm3pmcfljqs5kh81icxvdqvk8s"; + url = "https://elpa.gnu.org/packages/jsonrpc-1.0.25.tar"; + sha256 = "0hlc70xlm3a53il7k24s6s25dhnd09l2454r5qkpfnjdz9p5ih6f"; }; packageRequires = [ emacs ]; meta = { @@ -3137,6 +3145,40 @@ license = lib.licenses.free; }; }) {}; + lentic = callPackage ({ dash, elpaBuild, emacs, fetchurl, lib, m-buffer }: + elpaBuild { + pname = "lentic"; + ename = "lentic"; + version = "0.12"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/lentic-0.12.tar"; + sha256 = "15sb126sq5aw3n09vqydmsl1l5svfar70iz42hnqi783cpw1lh0m"; + }; + packageRequires = [ dash emacs m-buffer ]; + meta = { + homepage = "https://elpa.gnu.org/packages/lentic.html"; + license = lib.licenses.free; + }; + }) {}; + lentic-server = callPackage ({ elpaBuild + , fetchurl + , lentic + , lib + , web-server }: + elpaBuild { + pname = "lentic-server"; + ename = "lentic-server"; + version = "0.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/lentic-server-0.2.tar"; + sha256 = "1vifs91r4rm57rka8by50f8zg5pr2hjqwbdz28mbbxhkj3war6s5"; + }; + packageRequires = [ lentic web-server ]; + meta = { + homepage = "https://elpa.gnu.org/packages/lentic-server.html"; + license = lib.licenses.free; + }; + }) {}; let-alist = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "let-alist"; @@ -3182,14 +3224,36 @@ license = lib.licenses.free; }; }) {}; + listen = callPackage ({ elpaBuild + , emacs + , fetchurl + , lib + , persist + , taxy + , taxy-magit-section + , transient }: + elpaBuild { + pname = "listen"; + ename = "listen"; + version = "0.8"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/listen-0.8.tar"; + sha256 = "1vj9fsyp5v1qh87asj23k625080x6c8mgkas4933lrz7l2g7h1y2"; + }; + packageRequires = [ emacs persist taxy taxy-magit-section transient ]; + meta = { + homepage = "https://elpa.gnu.org/packages/listen.html"; + license = lib.licenses.free; + }; + }) {}; llm = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "llm"; ename = "llm"; - version = "0.9.1"; + version = "0.12.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/llm-0.9.1.tar"; - sha256 = "0vib0zl41fsacc5d79f1l52j2vxnbqc37471b86cxw9rha0clr8m"; + url = "https://elpa.gnu.org/packages/llm-0.12.1.tar"; + sha256 = "11z56fqp0y13jmvm2611xyqsz41k01rsqdjvrzvbf33n56vsw713"; }; packageRequires = [ emacs ]; meta = { @@ -3317,6 +3381,21 @@ license = lib.licenses.free; }; }) {}; + m-buffer = callPackage ({ elpaBuild, fetchurl, lib, seq }: + elpaBuild { + pname = "m-buffer"; + ename = "m-buffer"; + version = "0.16"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/m-buffer-0.16.tar"; + sha256 = "1mb03hrszxxsk61yvh70rnkn7iiwx1vx6n1br02clkpn2q2c0mq5"; + }; + packageRequires = [ seq ]; + meta = { + homepage = "https://elpa.gnu.org/packages/m-buffer.html"; + license = lib.licenses.free; + }; + }) {}; map = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "map"; @@ -3516,10 +3595,10 @@ elpaBuild { pname = "modus-themes"; ename = "modus-themes"; - version = "4.3.0"; + version = "4.4.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/modus-themes-4.3.0.tar"; - sha256 = "0zsglzqc36bw9r7fgvxjdcrdjar6xwad29kwyqd2k36bq3pivzq3"; + url = "https://elpa.gnu.org/packages/modus-themes-4.4.0.tar"; + sha256 = "1n6fmgj2kpdy2mmwg5hh6dic30zy0gd3ap6hlipl9qn08lawbbgq"; }; packageRequires = [ emacs ]; meta = { @@ -3527,6 +3606,21 @@ license = lib.licenses.free; }; }) {}; + mpdired = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "mpdired"; + ename = "mpdired"; + version = "1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/mpdired-1.tar"; + sha256 = "1b7xsdgsrwy7qkshkk83bizz9r78g4pdfnavwl6riyb947gk6zkx"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/mpdired.html"; + license = lib.licenses.free; + }; + }) {}; multi-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "multi-mode"; @@ -3900,10 +3994,10 @@ elpaBuild { pname = "orderless"; ename = "orderless"; - version = "1.0"; + version = "1.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/orderless-1.0.tar"; - sha256 = "0kslgrs857h3mm837hcb8v52ankbv0hm2pz0q136imckzj32m43s"; + url = "https://elpa.gnu.org/packages/orderless-1.1.tar"; + sha256 = "19iy0ps8h1qjh16mdybayd9i25bn27sa2slqsa6nslh251pxc0rk"; }; packageRequires = [ emacs ]; meta = { @@ -3915,10 +4009,10 @@ elpaBuild { pname = "org"; ename = "org"; - version = "9.6.19"; + version = "9.6.23"; src = fetchurl { - url = "https://elpa.gnu.org/packages/org-9.6.19.tar"; - sha256 = "0ibgw0i7nsn589k0ynifwdp1f3ia6p8369myhjqgmwy392cwrcxg"; + url = "https://elpa.gnu.org/packages/org-9.6.23.tar"; + sha256 = "0yqn3kag4anzm8ahfgjxrxjndzq6rbs6kayfq93gx4rn0qxa334q"; }; packageRequires = [ emacs ]; meta = { @@ -3975,10 +4069,10 @@ elpaBuild { pname = "org-modern"; ename = "org-modern"; - version = "1.1"; + version = "1.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/org-modern-1.1.tar"; - sha256 = "1aclips7y3dasjh6rjdcx1b6fkaripjam6120b7wm487qpjcrzc8"; + url = "https://elpa.gnu.org/packages/org-modern-1.2.tar"; + sha256 = "1kgvrsmbgadbr7wk48sgx1prlgpbp31nih9bl9div35d496njcnw"; }; packageRequires = [ compat emacs ]; meta = { @@ -4376,6 +4470,21 @@ license = lib.licenses.free; }; }) {}; + pq = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "pq"; + ename = "pq"; + version = "0.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/pq-0.2.tar"; + sha256 = "0gy3i2l1fxwpav6l57yf3mml15lhwh9xp8sm40hlpgyn15nyz4c6"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/pq.html"; + license = lib.licenses.free; + }; + }) {}; project = callPackage ({ elpaBuild, emacs, fetchurl, lib, xref }: elpaBuild { pname = "project"; @@ -4575,10 +4684,10 @@ elpaBuild { pname = "rcirc-sqlite"; ename = "rcirc-sqlite"; - version = "0.1.3"; + version = "0.1.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/rcirc-sqlite-0.1.3.tar"; - sha256 = "1pwxkw6dzwbg5g3rxilpp6iy3mzxgpn0mw59i3dcx25hdyizqhip"; + url = "https://elpa.gnu.org/packages/rcirc-sqlite-0.1.4.tar"; + sha256 = "0hz0nm35jq6fg9pr4j725r2awxbf1q23bzn85nhcbpafzb8mmajl"; }; packageRequires = [ emacs ]; meta = { @@ -4845,10 +4954,10 @@ elpaBuild { pname = "rt-liberation"; ename = "rt-liberation"; - version = "6"; + version = "7"; src = fetchurl { - url = "https://elpa.gnu.org/packages/rt-liberation-6.tar"; - sha256 = "1l87q2h1hqm5zpg1fz835gmbf5fgl9fvcqg42c17v6kim4has8zd"; + url = "https://elpa.gnu.org/packages/rt-liberation-7.tar"; + sha256 = "0gb1an3a68ib27jrc8x8grq5z3xya4b1gl8ii82a1clzf87n7k63"; }; packageRequires = []; meta = { @@ -5215,10 +5324,10 @@ elpaBuild { pname = "spacious-padding"; ename = "spacious-padding"; - version = "0.3.0"; + version = "0.4.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/spacious-padding-0.3.0.tar"; - sha256 = "1iiaxgl18k8hkwwyz3qnargv6q8kwzyh39ai46k5xbpmyrsj4b16"; + url = "https://elpa.gnu.org/packages/spacious-padding-0.4.1.tar"; + sha256 = "02bc0r20b4mgnlzryq26q0jq45wfgpvv7y3zhvnaaqj11rw7779f"; }; packageRequires = [ emacs ]; meta = { @@ -5689,10 +5798,10 @@ elpaBuild { pname = "tramp"; ename = "tramp"; - version = "2.6.2.1"; + version = "2.6.2.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/tramp-2.6.2.1.tar"; - sha256 = "145riknpdvw7rvpz20m766yci3w012f241mw38pbbb9cb8pn2rbf"; + url = "https://elpa.gnu.org/packages/tramp-2.6.2.2.tar"; + sha256 = "0bbsff2qr71f70nxhdi19b3jzpv6bgfb7x7qkrccsygvsvgyrb2h"; }; packageRequires = [ emacs ]; meta = { @@ -5749,10 +5858,10 @@ elpaBuild { pname = "transient"; ename = "transient"; - version = "0.5.3"; + version = "0.6.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/transient-0.5.3.tar"; - sha256 = "12ak6rykg627rkwwiga5d9g9pzcrq2sliynqbr3lm8rvlwbdhkhx"; + url = "https://elpa.gnu.org/packages/transient-0.6.0.tar"; + sha256 = "1lsh8cvg1kspa8gl9fml0x7r61fbhjajmjqjf4r2s7qz102z66xb"; }; packageRequires = [ compat emacs seq ]; meta = { @@ -5899,10 +6008,10 @@ elpaBuild { pname = "urgrep"; ename = "urgrep"; - version = "0.4.0"; + version = "0.4.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/urgrep-0.4.0.tar"; - sha256 = "0l0gswml6hkna48gfljj3hajhcx3bbc1rqwb2v01hvqab05an7zs"; + url = "https://elpa.gnu.org/packages/urgrep-0.4.1.tar"; + sha256 = "1kwcb7xxk9lcby5s8gpd5dchya7qq063j217rxsjyn8vv9z91lfc"; }; packageRequires = [ compat emacs project ]; meta = { @@ -6106,10 +6215,10 @@ elpaBuild { pname = "verilog-mode"; ename = "verilog-mode"; - version = "2023.6.6.141322628"; + version = "2024.3.1.121933719"; src = fetchurl { - url = "https://elpa.gnu.org/packages/verilog-mode-2023.6.6.141322628.tar"; - sha256 = "14qls4v5yxrgyiimvvggimw5ddlx0ll387a1r6awm274rj4p3d19"; + url = "https://elpa.gnu.org/packages/verilog-mode-2024.3.1.121933719.tar"; + sha256 = "047kna2j1mbsibw1psxdp8qmg91dnjrdrskdzhys9pmaqggfl5ry"; }; packageRequires = []; meta = { diff --git a/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix index 8f2e093ddf8d1..c9a699f5a06b0 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix @@ -64,10 +64,10 @@ elpaBuild { pname = "annotate"; ename = "annotate"; - version = "2.1.0"; + version = "2.2.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/annotate-2.1.0.tar"; - sha256 = "07q8s3qi3lm8g01ypvqqq0cn5jx5jrgyv74fbfam3mmz5l3mqp6q"; + url = "https://elpa.nongnu.org/nongnu/annotate-2.2.0.tar"; + sha256 = "1h1whavdrwfsc79kcvh2vbvjzqd7n01xzjb1acgyiy9wkyl79p7b"; }; packageRequires = []; meta = { @@ -306,10 +306,10 @@ elpaBuild { pname = "buttercup"; ename = "buttercup"; - version = "1.33"; + version = "1.34"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/buttercup-1.33.tar"; - sha256 = "0245fq4iny1jnm440dzkq0fadw10ncnhkj28mayqs9iyyzj9g5h4"; + url = "https://elpa.nongnu.org/nongnu/buttercup-1.34.tar"; + sha256 = "0bdlky9d5fzc9x9wpjxyvrclz1rmzsnvc89lf0m5fhyp4r8jvxy4"; }; packageRequires = [ emacs ]; meta = { @@ -459,6 +459,26 @@ license = lib.licenses.free; }; }) {}; + consult-flycheck = callPackage ({ consult + , elpaBuild + , emacs + , fetchurl + , flycheck + , lib }: + elpaBuild { + pname = "consult-flycheck"; + ename = "consult-flycheck"; + version = "1.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/consult-flycheck-1.0.tar"; + sha256 = "0901wliqdzj5dmam1kkbq0nxhywqf11182q7yxjxh98czy5w3xh8"; + }; + packageRequires = [ consult emacs flycheck ]; + meta = { + homepage = "https://elpa.gnu.org/packages/consult-flycheck.html"; + license = lib.licenses.free; + }; + }) {}; corfu-terminal = callPackage ({ corfu , elpaBuild , emacs @@ -479,16 +499,16 @@ license = lib.licenses.free; }; }) {}; - crux = callPackage ({ elpaBuild, fetchurl, lib, seq }: + crux = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "crux"; ename = "crux"; - version = "0.4.0"; + version = "0.5.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/crux-0.4.0.tar"; - sha256 = "01yg54s2l3zr4h7h3nw408bqzrr4yds9rfgc575b76006v5d3ciy"; + url = "https://elpa.nongnu.org/nongnu/crux-0.5.0.tar"; + sha256 = "0zdzfglzvhkzyvnkk2d217c6f8gnbcxlp8adimwrxgqh7c6gwihp"; }; - packageRequires = [ seq ]; + packageRequires = [ emacs ]; meta = { homepage = "https://elpa.gnu.org/packages/crux.html"; license = lib.licenses.free; @@ -742,10 +762,10 @@ elpaBuild { pname = "elpher"; ename = "elpher"; - version = "3.5.1"; + version = "3.6.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/elpher-3.5.1.tar"; - sha256 = "0687npypihavghz9bjs8f6h10awjgjv5fdd11dmh43p1krhrga2w"; + url = "https://elpa.nongnu.org/nongnu/elpher-3.6.0.tar"; + sha256 = "0pa8y3zc768wdgp43546qvwr6ly2q9gznfrl6qmm90gkv5wrc5ln"; }; packageRequires = [ emacs ]; meta = { @@ -2682,10 +2702,10 @@ elpaBuild { pname = "racket-mode"; ename = "racket-mode"; - version = "1.0.20240219.135847"; + version = "1.0.20240319.160226"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/racket-mode-1.0.20240219.135847.tar"; - sha256 = "06g1ci7kq8fxjh65qwwnh530xvvh6pr9ha52f7xmbjf56iifn1da"; + url = "https://elpa.nongnu.org/nongnu/racket-mode-1.0.20240319.160226.tar"; + sha256 = "1alqiagpkbxqi8nyrn1qzfx23fagpn1ml9hqpyj897jwf5f03zsh"; }; packageRequires = [ emacs ]; meta = { @@ -3382,10 +3402,10 @@ elpaBuild { pname = "visual-fill-column"; ename = "visual-fill-column"; - version = "2.6.0"; + version = "2.6.2"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/visual-fill-column-2.6.0.tar"; - sha256 = "1gpjby6g9wq8p25q1a35hr56nfb4sbcdrf0bjxidh1diw5g5saw4"; + url = "https://elpa.nongnu.org/nongnu/visual-fill-column-2.6.2.tar"; + sha256 = "13z87xyzldllvga8iygb33qaqvrrc2qnc315zalvbmydw174cq1i"; }; packageRequires = [ emacs ]; meta = { @@ -3397,10 +3417,10 @@ elpaBuild { pname = "web-mode"; ename = "web-mode"; - version = "17.3.18"; + version = "17.3.19"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/web-mode-17.3.18.tar"; - sha256 = "18ylzq12gsayp3cmd8qjdqsnyiymjd95ffqs3xcyva6sl8d41hmy"; + url = "https://elpa.nongnu.org/nongnu/web-mode-17.3.19.tar"; + sha256 = "1z33y7p1dilwpwydb9q14n55q48n80mynm7fjr7ih91wvk8zz5di"; }; packageRequires = [ emacs ]; meta = { @@ -3560,10 +3580,10 @@ elpaBuild { pname = "xah-fly-keys"; ename = "xah-fly-keys"; - version = "24.21.20240220095736"; + version = "24.24.20240324101507"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-24.21.20240220095736.tar"; - sha256 = "04ra1m9mwhz3zh0776gbzfn4kn0yxgbfbh1hq78r2zxggvpjfikv"; + url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-24.24.20240324101507.tar"; + sha256 = "1lqrrs5j523q33vvs85j3dlnd56bmnzglfkc8jilv6yq44dmv7v7"; }; packageRequires = [ emacs ]; meta = { diff --git a/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json b/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json index 016ccf1dfc43c..659d82c088dfe 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json +++ b/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json @@ -95,24 +95,6 @@ } }, { - "ename": "4clojure", - "commit": "3fea8d290fe4d71b954ad6b68a8d182e40ee1e13", - "sha256": "1cqab8kh4varf5hasvhkia39fa8qmmqycica7mbcvp33n8w3941j", - "fetcher": "github", - "repo": "emacsorphanage/4clojure", - "unstable": { - "version": [ - 20210102, - 459 - ], - "deps": [ - "request" - ], - "commit": "6f494d3905284ccdd57aae3d8ac16fc7ab431596", - "sha256": "19mbfh504mli8mnf95xaych45nqnayrspymf5r80dky4jv43zzv8" - } - }, - { "ename": "750words", "commit": "bee7108d3b0f4861ec23ab7a87ddd5fbf17952c7", "sha256": "0j63ry8x617xdrffiwkwdngp6y3rik0nq2w61yf6sa097fmzpl2p", @@ -1048,21 +1030,21 @@ "repo": "xcwen/ac-php", "unstable": { "version": [ - 20230529, - 1404 + 20240222, + 320 ], "deps": [ "ac-php-core", "auto-complete", "yasnippet" ], - "commit": "7b89fbf25360cc146aee9b2b2ca60f3462b21078", - "sha256": "0fmp1595v06dgmx9skxphknaagf9ds9l7ygi7lzxas1s8d05dj10" + "commit": "d4378a857aa1c60b34d86557aa10238785d1ac66", + "sha256": "1xz86cjsjm72b0rm50fr2z82rcllhczsd4jr5rnp2clbind5w697" }, "stable": { "version": [ 2, - 5, + 6, 0 ], "deps": [ @@ -1070,8 +1052,8 @@ "auto-complete", "yasnippet" ], - "commit": "7b89fbf25360cc146aee9b2b2ca60f3462b21078", - "sha256": "0fmp1595v06dgmx9skxphknaagf9ds9l7ygi7lzxas1s8d05dj10" + "commit": "d4378a857aa1c60b34d86557aa10238785d1ac66", + "sha256": "1xz86cjsjm72b0rm50fr2z82rcllhczsd4jr5rnp2clbind5w697" } }, { @@ -1082,8 +1064,8 @@ "repo": "xcwen/ac-php", "unstable": { "version": [ - 20240222, - 320 + 20240325, + 700 ], "deps": [ "dash", @@ -1093,13 +1075,13 @@ "s", "xcscope" ], - "commit": "d4378a857aa1c60b34d86557aa10238785d1ac66", - "sha256": "1xz86cjsjm72b0rm50fr2z82rcllhczsd4jr5rnp2clbind5w697" + "commit": "f9a6ad0f3715d7f491bbe2ae7e762a02ed12a2e0", + "sha256": "0qhzh2giaqdz6rqvhzgdv85x6ivcxwzhkx0lw5rfx0glvp48svcx" }, "stable": { "version": [ 2, - 5, + 6, 0 ], "deps": [ @@ -1110,8 +1092,8 @@ "s", "xcscope" ], - "commit": "7b89fbf25360cc146aee9b2b2ca60f3462b21078", - "sha256": "0fmp1595v06dgmx9skxphknaagf9ds9l7ygi7lzxas1s8d05dj10" + "commit": "d4378a857aa1c60b34d86557aa10238785d1ac66", + "sha256": "1xz86cjsjm72b0rm50fr2z82rcllhczsd4jr5rnp2clbind5w697" } }, { @@ -1696,16 +1678,16 @@ "repo": "pauldub/activity-watch-mode", "unstable": { "version": [ - 20240223, - 803 + 20240313, + 754 ], "deps": [ "cl-lib", "json", "request" ], - "commit": "0189963cb60a0efdbb1cfd17641c06d16a74a974", - "sha256": "0k7ksh1d7cx5x64fbjakhxz3ab35m33sxf1dzmgymvw0xzdp9hs8" + "commit": "19aed6ca81a3b1e549f47867c924d180d8536791", + "sha256": "0nbpi5wxpzajdn85gl5zrv9blxd37jszrnn2r8j4y3xqxsx9d68m" }, "stable": { "version": [ @@ -1730,11 +1712,11 @@ "repo": "brownts/ada-ts-mode", "unstable": { "version": [ - 20240205, - 38 + 20240324, + 2139 ], - "commit": "f8df38fce4dba715f5e2252b047f9174e82f9cac", - "sha256": "0wyczjsszsn9yvchp5lihh1a7z3ax59syq1ckqg806nj1hvkfz31" + "commit": "fe84f62ea68c919bf321ba7b57b059d8d4b2bcd3", + "sha256": "12ckhv25an2f5k8w1fsfad7vqlwfi9mzdg30s48dwz4bdll5d065" } }, { @@ -1829,11 +1811,11 @@ "repo": "thierryvolpiatto/addressbook-bookmark", "unstable": { "version": [ - 20230602, - 1034 + 20240304, + 602 ], - "commit": "f4b839b20c16c53e609705506cad1ef68bff4378", - "sha256": "0n3yzxa8yxsz0q17kdcybkw9kdjnzl394gk9bq1vf0gq0hc8my7m" + "commit": "2e76708a3dc73953c1e0f66e26918690b79424d0", + "sha256": "14lvbhaqzg7jhranrpin3xzsxs1w4i6bv2bmkf9pmwyfsw5187lw" }, "stable": { "version": [ @@ -1969,6 +1951,30 @@ } }, { + "ename": "afterglow", + "commit": "aa1b650ac44ed4714959c063825617265e2a5167", + "sha256": "14148pykdw24ldpjwhb7rbc34nkvssaxqhjhs8jl4hwi1jzxm173", + "fetcher": "github", + "repo": "ernstvanderlinden/emacs-afterglow", + "unstable": { + "version": [ + 20240312, + 953 + ], + "commit": "d90fcf4e5c8ac6f5bae2eb01dea32558b2b18fba", + "sha256": "1s41v21jf2hw4n8d9frs0i5h5q0c3v1wfpwd53ghcw8inrkjcyww" + }, + "stable": { + "version": [ + 0, + 2, + 1 + ], + "commit": "8254dc5d4fdfec63e1b5b2d59af0771d2c5a5474", + "sha256": "1l6s7bw9cxngxh2z754yy4fnj1v7s4i95g3cyprrk9w45l20ff0f" + } + }, + { "ename": "afternoon-theme", "commit": "a5676fa2b3228cb56e38449c4573afdc37f3994b", "sha256": "0lb7qia4fqdz9jbklx4jiy4820dmblmbg7qpnww0pkqrc0nychh3", @@ -2322,15 +2328,15 @@ "repo": "alan-platform/AlanForEmacs", "unstable": { "version": [ - 20230216, - 857 + 20240309, + 650 ], "deps": [ "flycheck", "s" ], - "commit": "723cf8e8d7e00c1498935553c46f459aa1d26135", - "sha256": "0634gsbbf6fwsh44lk6nblksl402yvy2cf9pcjvlbhrz7mkp2m8j" + "commit": "df6c82f1a37a4bd6f18cb463c3f7ab7d087b91ab", + "sha256": "13fy6x7cs74zpqzix719jly01v5mzdwqhcq3m3kqrsxy1m9a0g49" }, "stable": { "version": [ @@ -3399,11 +3405,11 @@ "repo": "bastibe/annotate.el", "unstable": { "version": [ - 20231102, - 1334 + 20240320, + 1350 ], - "commit": "dfe0d7c9905ac31716a35b37766ed6166c1f18d9", - "sha256": "0b7r62hd2lb640xvmcj6yg4kmaa0ndknbj61pjr4jkarb8v0p8k6" + "commit": "9d88cc7ffed6f79f81a83a914554e264e35a575c", + "sha256": "116gcg09nrxpbvgv3h1hmgy2y12xl57rgy6ki0ayw6li7zn7df4j" }, "stable": { "version": [ @@ -3449,10 +3455,10 @@ 2, 6, 4, - 1 + 3 ], - "commit": "4293e0a94d15acac915ab9088b2ec028f78d14a9", - "sha256": "00yfwwqv4dyka5yg4m9w5dfd9ajn5z51lg7dakj6d03lay76dhh7" + "commit": "714c7d2c76c5ffda3180e95c28669259f0dc5b5c", + "sha256": "1vyah8rxizx8gi5j17k1llii7i7nlqf2yw8nsqj4ky7q3dvy3zyy" } }, { @@ -3803,11 +3809,11 @@ "repo": "wanderlust/apel", "unstable": { "version": [ - 20220720, - 1308 + 20221214, + 1337 ], - "commit": "82eb2325bd149dc57b43a9ce9402c6c6183e4052", - "sha256": "0qiw19pn1cs8y571irw7bjdygkvwan9ch2i1dg139dri4b6q1il6" + "commit": "1a6fd3bab2cc6b0a450c2d801f77a1c9da0f72fb", + "sha256": "03yjg14rvcxn59wga4jvx28ii16bx5ym93fzfyssm67gqwgyb2gf" } }, { @@ -3818,19 +3824,19 @@ "repo": "radian-software/apheleia", "unstable": { "version": [ - 20240209, - 156 + 20240323, + 216 ], - "commit": "c07e90793c839d1973a0820d24e03a0a6b30b77e", - "sha256": "16jqm67yi776akshbyvflfdsis4c6zl18rmcza1s11wvfnd7z609" + "commit": "3e89e62922d610a3429707710d6636244a3c3f76", + "sha256": "1g711i4xims1mdh59cr0plfif17c9j9crgd7vv777xh19qff5imd" }, "stable": { "version": [ 4, - 0 + 1 ], - "commit": "731edd2954ae213548ec4459c7db6d5db9e251b8", - "sha256": "0afv75w028v59qf777nrf57xj9yaz3jj2bixfmkgiqrn1wii9pm6" + "commit": "7ba74c7cc28e4f0da4006968ecb8587133daa142", + "sha256": "10adk4l5090dy0as6xqv5qpgdc0vf7jy8s1nrsn3zgf6n3s3ffqb" } }, { @@ -3886,6 +3892,21 @@ } }, { + "ename": "app-monochrome-themes", + "commit": "54c81724187491b6f285448720f61eea7eb4ed93", + "sha256": "04bzzni91gyrdp47w2rhr9h4mdr05fihx6x12nvygjzy7dz9ls9d", + "fetcher": "github", + "repo": "Greybeard-Entertainment/app-monochrome", + "unstable": { + "version": [ + 20240303, + 1628 + ], + "commit": "84de8c0424cd51feaf758cc636d9864e7311864c", + "sha256": "0m7ka3zwfka5d484j5v6f96jr5n8rs4qbb8vvw5r2nhky9ji4cna" + } + }, + { "ename": "apparmor-mode", "commit": "6dece118970184e7fc2cfd3e26f97f2028d7f5f2", "sha256": "1ilp4srliacwgvzkbkky6ka0p60ni6v4na270iniklmjglbbs5f0", @@ -4383,14 +4404,14 @@ "repo": "phillord/assess", "unstable": { "version": [ - 20231120, - 1701 + 20240303, + 1454 ], "deps": [ "m-buffer" ], - "commit": "2399936d5b75094ed0e131b3f9d48041005383e2", - "sha256": "1a1c6f4d8mbygrl20kxlvrjcgvvbzv4zr7hhqkzywvnazf2kvj16" + "commit": "cadeb24a5d8261fad4bdfdc09e7d571cc395a6ca", + "sha256": "1vnqi3czhi0dp60rrdskyzakj3kvb7bacv9l5w8488l45wszr17d" }, "stable": { "version": [ @@ -4469,11 +4490,11 @@ "repo": "jwiegley/emacs-async", "unstable": { "version": [ - 20240108, - 1526 + 20240323, + 1912 ], - "commit": "d040f72cb0be5265d50ac541ddb09ebbc68b7908", - "sha256": "10lvsnvvs56l8n5f40hmqk7nwpf7d39az82mf2q7phpph7icgry2" + "commit": "72b70b004505db2f06318fefd6b358704b9167d7", + "sha256": "00dpd202b9g2qpzb1ijbw8j69j2fxf0q3hdqrxpbhcagh22yn0qr" }, "stable": { "version": [ @@ -4577,11 +4598,11 @@ "repo": "meedstrom/asyncloop", "unstable": { "version": [ - 20240219, - 1742 + 20240324, + 2057 ], - "commit": "8bc72f51c52c108ece0655625dedc10b9fe1cb8d", - "sha256": "05cyjjkwl9s3sqg9a3h9xcxhp4r30d5srz93knkwi48namb1nncg" + "commit": "22d299cd0ba0c8d407acba6cb22ed8f7be4161a6", + "sha256": "15nil21m02h864vqpmnwpdd2p5zsihx86lrkvqil1zvziwykxx2x" }, "stable": { "version": [ @@ -5105,20 +5126,20 @@ "repo": "emacscollective/auto-compile", "unstable": { "version": [ - 20240101, - 2210 + 20240321, + 2014 ], - "commit": "c4a267daf97dfc42472ea7e99fae3d7dbb6ac812", - "sha256": "0hvhvx48vhdpkzlj79l02ingshha4h1dkfxx5a2sl9gndybyfgxq" + "commit": "4ba644f3e3e33afb2b263e9d184b6e2b70d5fadd", + "sha256": "1h0rq69flrjj65wa1x7x0ispm041qr2xrzs5qxciabhav2hs3hqh" }, "stable": { "version": [ - 1, - 8, - 2 + 2, + 0, + 0 ], - "commit": "113db4d7f546b2829fed23e2c9bcb4fdac63ff57", - "sha256": "1wq8kl6659yyx8gb6m95mrrqh9bjpx4y7c6injvsqil3jkaff9xv" + "commit": "4ba644f3e3e33afb2b263e9d184b6e2b70d5fadd", + "sha256": "1h0rq69flrjj65wa1x7x0ispm041qr2xrzs5qxciabhav2hs3hqh" } }, { @@ -5129,15 +5150,15 @@ "repo": "auto-complete/auto-complete", "unstable": { "version": [ - 20240101, - 831 + 20240320, + 1734 ], "deps": [ "cl-lib", "popup" ], - "commit": "2afcea4bb7ba4e9573a7ad888dc6ab7bca5f7b03", - "sha256": "1i4nh340xx5waspgp5k5rcmjfcm55n2fjj6i6bxfidz7yj9sxmda" + "commit": "0c2f5a7d28b70bfe30b87378d58d74798a62741d", + "sha256": "0i70m57isahd9f1pigrx1qdl56cakjnkzyb28449pz9i31gs9sg5" }, "stable": { "version": [ @@ -5420,11 +5441,11 @@ "repo": "LionyxML/auto-dark-emacs", "unstable": { "version": [ - 20240212, - 1446 + 20240322, + 44 ], - "commit": "39f104ee67d6561bd8a9649f0f09dcc60db25627", - "sha256": "02ppd0zmw2lsjixq158kq55a1d3jvaya6amf1m7yglbsn48bxd9r" + "commit": "066f9723001647bec88b051e543b82366c9b7a42", + "sha256": "1r9pr8ars3341mh9mvybaigdq83i225rj3xr4c8c8lw93wl0pk0n" } }, { @@ -6455,15 +6476,15 @@ "repo": "tarsius/backline", "unstable": { "version": [ - 20240101, - 2210 + 20240306, + 1822 ], "deps": [ "compat", "outline-minor-faces" ], - "commit": "f9e55c75bee689722d63875610511e8b39151fb1", - "sha256": "1mw2mfr95aaz1mnq1zym9mr9n96350l4kpywg1yv2m0rvkblqqkf" + "commit": "1bbfc53a92fbae5a2b4afa34584a008dc9337c3e", + "sha256": "0hlkj2478s2j49bkmr4fg8za6frchqw8f3f5496gsy4kzdv3n9qk" }, "stable": { "version": [ @@ -6712,19 +6733,19 @@ "repo": "fledermaus/totp.el", "unstable": { "version": [ - 20240203, - 1945 + 20240227, + 1821 ], - "commit": "da1498e54df8802efe2174c0e988c23fea49fc79", - "sha256": "05z6w1s4mxv8knnknq5lj6frp7j4wy6zrafg1hq1kv7q28nqv4qr" + "commit": "927257e97a602b6979a75028e8417bf1499582d4", + "sha256": "1vw1vpnxa4qxbdsmis8d0df3qhwr1c5h0q04rvwmyviixd729mlr" }, "stable": { "version": [ 1, - 0 + 1 ], - "commit": "da1498e54df8802efe2174c0e988c23fea49fc79", - "sha256": "05z6w1s4mxv8knnknq5lj6frp7j4wy6zrafg1hq1kv7q28nqv4qr" + "commit": "927257e97a602b6979a75028e8417bf1499582d4", + "sha256": "1vw1vpnxa4qxbdsmis8d0df3qhwr1c5h0q04rvwmyviixd729mlr" } }, { @@ -7309,19 +7330,19 @@ "repo": "dholm/benchmark-init-el", "unstable": { "version": [ - 20240221, - 701 + 20240320, + 1342 ], - "commit": "80ba80eb62c9449b3920164d999d41b1dd7230eb", - "sha256": "0m43wsxldsv0xgliq8vgfc83yvrf19m9azw5f9s3b0mscb6ip79i" + "commit": "2b34432d79fa0aae8abc3db72db1cb79a28c00b2", + "sha256": "1slw10mp9lkfy04qgv7ly76rww2rs3yijq6sjx4jwswd4b46bmsg" }, "stable": { "version": [ 1, - 1 + 2 ], - "commit": "02435560415bbadbcf5051fb7042880549170e7e", - "sha256": "19375vamhld4xm2qrdmhlp2nczfvalmz9x6ahl23zwkilr8n1nbw" + "commit": "2b34432d79fa0aae8abc3db72db1cb79a28c00b2", + "sha256": "1slw10mp9lkfy04qgv7ly76rww2rs3yijq6sjx4jwswd4b46bmsg" } }, { @@ -7950,11 +7971,11 @@ "repo": "justbur/emacs-bind-map", "unstable": { "version": [ - 20220108, - 228 + 20240308, + 2050 ], - "commit": "510a24138d8de3b8df0783f1ac493a551fc9bd74", - "sha256": "0crxjy1ykgb429z8ikjv5iy8vg5i0qn8n86p2lgri4glx45sxxx0" + "commit": "d7b0e42b78f708669ec368ebbd1f503094ceee22", + "sha256": "0g449iyndsdmhpk4j8zrl9smkjww3vhrvv2v4d6108q1wcg1p7v7" }, "stable": { "version": [ @@ -8052,8 +8073,8 @@ "repo": "SqrtMinusOne/biome", "unstable": { "version": [ - 20240128, - 1235 + 20240311, + 2154 ], "deps": [ "compat", @@ -8061,8 +8082,8 @@ "request", "transient" ], - "commit": "bc4f229c74c725a4981b4a5eab21674ac5097116", - "sha256": "0gd6wm97qhlrm8xxa1phc4484j7lwk1biry2h7hnkn4i0yyb04mz" + "commit": "d393ddbb70f1f27632c7ec63fe96e0179b708714", + "sha256": "10r85yjiqd656alhi41n7ykyswj51g2sanacnkfsmdaj97rv9zy4" } }, { @@ -8291,15 +8312,15 @@ "repo": "Artawower/blamer.el", "unstable": { "version": [ - 20240130, - 1629 + 20240320, + 2028 ], "deps": [ "async", "posframe" ], - "commit": "f79a7422e5976eb3bee1c73bfcb33d701cc932a6", - "sha256": "14dvg15p18mpkp667jy0515py9alxfpjxv03y1d4p87firm9fffx" + "commit": "ab7d19c2ee54424d3ffc853982fe875ad47b6e7f", + "sha256": "127rnzwf64br0p2i3mjkzfdcjhpwn873ln1gcbhanls6sgka2ahl" }, "stable": { "version": [ @@ -8854,16 +8875,16 @@ "repo": "jyp/boon", "unstable": { "version": [ - 20240109, - 1943 + 20240314, + 920 ], "deps": [ "dash", "expand-region", "multiple-cursors" ], - "commit": "ef9650bb73ce901ad0fa3aef4685393a31aaa3d9", - "sha256": "12397nvbmzfnzw11dnv8xf1mapi1z9a6j9iapbx363cprsbina2b" + "commit": "9e006726be9ac508e0bb0393393abce06f7493f4", + "sha256": "0n11869w4806lak36x54rfwsnckrv7ydp3lzmdbjcq48mcsh1jjg" }, "stable": { "version": [ @@ -8887,15 +8908,15 @@ "repo": "emacscollective/borg", "unstable": { "version": [ - 20240205, - 1834 + 20240320, + 2244 ], "deps": [ "epkg", "magit" ], - "commit": "94b9be770dd325ca5e6502822fd2f6efab220f63", - "sha256": "1m1n07m301imancmc3xcxcr6w10ixvg5m3smaa8ryw702nsnqssj" + "commit": "96ea859c8da74f415b76ccc8dd63b27ce0b6b267", + "sha256": "0gpjc7cz6hrpnq4va3klgy313s26hhibl7rfpwy4iscmslzhgdw1" }, "stable": { "version": [ @@ -9119,11 +9140,11 @@ "repo": "Michael-Allan/Breccia.Emacs", "unstable": { "version": [ - 20240213, - 1406 + 20240324, + 900 ], - "commit": "5d857b56733ede08b06448f2392045bb1d89cbc6", - "sha256": "0fi3v35k56qyb8xakdnpfiphgll0f9xgzpyvxg121493rki6n5x4" + "commit": "1cc2ed75572d0dad693914e33ec5c440f7bff536", + "sha256": "0jfhnib7yziy1qqiyyjd17vcp8rbf5ha21wvcqayknhkrhxc4b97" } }, { @@ -9180,6 +9201,21 @@ } }, { + "ename": "bril-mode", + "commit": "51af2cb24ff7464024b3a5ea0192c26b4bdd09af", + "sha256": "0qgbpcvqaxr1b1lkl0xy31pdpsz60gpvvhyfrw2jcwlgk7zp1kna", + "fetcher": "github", + "repo": "nverno/bril-mode", + "unstable": { + "version": [ + 20240315, + 1157 + ], + "commit": "da61316385e31973c462a1e8a3213327b34df3ff", + "sha256": "0799x37yksd0a2zdi7x5x3i8gy02fbabyjmajbnxi32zdav76w6d" + } + }, + { "ename": "broadcast", "commit": "6ed51896112e702a8b853059884aad50d37738c2", "sha256": "1h2c3mb49q3vlpalrsrx8q3rmy1zg0y45ayvzbvzdkfgs8idgbib", @@ -9440,14 +9476,14 @@ "repo": "astoff/buffer-env", "unstable": { "version": [ - 20231028, - 1617 + 20240323, + 727 ], "deps": [ "compat" ], - "commit": "8ba30f5b7df3a219e792377b1d7163a536896a4b", - "sha256": "0ai2n443l3rp3pc40ppxsaldbsbqqx6822h4kk7zj6f84f9nf7cp" + "commit": "3814bdf3585ffffea3014b1d01549894ec1aa897", + "sha256": "1rqr8y3kclds087y09r2l4mrk6x8mm7p84fg2wf2kdvbqmdv7sf0" } }, { @@ -9711,8 +9747,8 @@ "repo": "alphapapa/bufler.el", "unstable": { "version": [ - 20240216, - 805 + 20240312, + 552 ], "deps": [ "burly", @@ -9722,8 +9758,8 @@ "map", "pretty-hydra" ], - "commit": "d686f6a303ed250da2ee01d82afea26058a0a533", - "sha256": "0842w4h4v0gkmn6mlgrp9qywqyks4k5ibz0frwqiq6dxsy0wz7x9" + "commit": "ef3b28bbdcb1e813a1d5b06a91d09774998967c5", + "sha256": "0dl1ji045g8nd8739q28csvjrxwmaq9l7vxlsw1nk1hc7apbv1bx" }, "stable": { "version": [ @@ -10090,19 +10126,19 @@ "repo": "jorgenschaefer/emacs-buttercup", "unstable": { "version": [ - 20231208, - 2346 + 20240320, + 2109 ], - "commit": "f2f7f81a83a1092f05c515f8f5212a5a82f180ff", - "sha256": "0467dmh8idcwm5qs70igls9wy6kx2kzcqig6yavcm47wjr3a373q" + "commit": "be25a149fcec1a33d1dfbdf42b265a9f0a958ef5", + "sha256": "160ijybvs2msilbh2yfm13hm3gxzkr9if9h7qqw62jsnk2nfb7h2" }, "stable": { "version": [ 1, - 33 + 34 ], - "commit": "e4fb7cd560d27d8879a2c7739ee96946adec2df8", - "sha256": "10q6zr837yaal1g3l7vmj08b3c301j99b290pylshb0si360a27h" + "commit": "c0764a764cf088dcb5132c44d5864b22d7723765", + "sha256": "07bsbzqxsb6sbayriymy54bqcy7is7c61fpnm83mg9527w0w4g19" } }, { @@ -10799,25 +10835,25 @@ "repo": "minad/cape", "unstable": { "version": [ - 20240214, - 1139 + 20240315, + 542 ], "deps": [ "compat" ], - "commit": "c56cd95f6df003f8928f11e8776d3a9a3eca6890", - "sha256": "1zz5sah8zdkvmbh2kdn4v5vf3sb09krdrxhzyzcg63zjya2z8prz" + "commit": "a397a0c92de38277b7f835fa999fac400a764908", + "sha256": "1mixvpmb2njxziv8mbg6hrczzlvdzrn9zz01cswjywb8bl35l87h" }, "stable": { "version": [ 1, - 3 + 4 ], "deps": [ "compat" ], - "commit": "c56cd95f6df003f8928f11e8776d3a9a3eca6890", - "sha256": "1zz5sah8zdkvmbh2kdn4v5vf3sb09krdrxhzyzcg63zjya2z8prz" + "commit": "af61a4e670818f100beb6ef582449931b3965b10", + "sha256": "1ml3w9xvcxbcbsi01rdsclsxra5h7jrm9lsrkbj1hin2wl5gr9np" } }, { @@ -11160,6 +11196,30 @@ } }, { + "ename": "casual", + "commit": "dcc5db335679fde21244f2c4f102acdc425e6258", + "sha256": "0q7s11ynk6bxzj5lljrc5z3v4jf7n10fi5b1jx7bc3qdg7173z3p", + "fetcher": "github", + "repo": "kickingvegas/casual", + "unstable": { + "version": [ + 20240317, + 2027 + ], + "commit": "643af803258fd9524582fc1d56472ea44c70100f", + "sha256": "1jw82q82qzr41v7clwjcfvlhvyd02pacikga1sjfiq9bw9dj3alg" + }, + "stable": { + "version": [ + 1, + 2, + 1 + ], + "commit": "643af803258fd9524582fc1d56472ea44c70100f", + "sha256": "1jw82q82qzr41v7clwjcfvlhvyd02pacikga1sjfiq9bw9dj3alg" + } + }, + { "ename": "catmacs", "commit": "e62e45ea234a574ed602f27c3c6bc240bcd4fa43", "sha256": "0ym1szmq9ib75yiyy5jw647fcs7gg0d5dkskqc293pg81qf3im50", @@ -11289,20 +11349,20 @@ "repo": "kickingvegas/cc-isearch-menu", "unstable": { "version": [ - 20240221, - 742 + 20240320, + 532 ], - "commit": "9cf6d98b228df378e4fd428a6978c154011d130f", - "sha256": "0ca89b8z0y40b888f07rm6zmj6229mvbvwx31ffs6grpsdqn428s" + "commit": "4ffb8c42b84a2b3c1773d285980b46110920928e", + "sha256": "0v1pxs3cfb9n5gmcrhni425wxwian4vwzhzpnq6bvks8h03ch18r" }, "stable": { "version": [ 1, - 0, - 3 + 3, + 1 ], - "commit": "9cf6d98b228df378e4fd428a6978c154011d130f", - "sha256": "0ca89b8z0y40b888f07rm6zmj6229mvbvwx31ffs6grpsdqn428s" + "commit": "4ffb8c42b84a2b3c1773d285980b46110920928e", + "sha256": "0v1pxs3cfb9n5gmcrhni425wxwian4vwzhzpnq6bvks8h03ch18r" } }, { @@ -11619,10 +11679,10 @@ "version": [ 0, 0, - 4 + 5 ], - "commit": "ebb546221eed36616669ea4e42d35aa8b167202c", - "sha256": "1mkms3ykkp2lzmm2j8ain6db93yha62vk6vs2ngl1a6xdcr9xvdl" + "commit": "70b5275f0e7b8e15a3def48281f364a32c55afce", + "sha256": "0f8yl9az24bhw3w5maq68qn9gz4y4vpvf3xsngsai358vs69ibr1" } }, { @@ -11728,7 +11788,7 @@ "repo": "worr/cfn-mode", "unstable": { "version": [ - 20240218, + 20240324, 904 ], "deps": [ @@ -11736,8 +11796,8 @@ "s", "yaml-mode" ], - "commit": "cd987267b379782fd623d23fca0fdae748166b35", - "sha256": "13g6b21mnpz2g4n6v9yv8asw1yhdxynqsyqhmmzfcvj9dbx6gn7n" + "commit": "9431e2261b74a5e5a4bc3d243b0e3433aec45e74", + "sha256": "0ziwx73zwshazkp63lzyhfsdfdsavmzas4ngsrd4rv4mpj41w68c" }, "stable": { "version": [ @@ -11998,14 +12058,33 @@ "repo": "xenodium/chatgpt-shell", "unstable": { "version": [ - 20240220, - 1129 + 20240306, + 857 ], "deps": [ "shell-maker" ], - "commit": "ca5a91fe803663a4849b1ccfe1a2be91409cb43d", - "sha256": "1frav21936dd8fc3k0pcwzq0njarpr8g0p5cag8cy0k87kipxd9q" + "commit": "bf2d12ed2ed60c498d95215fa1cf81c2b23191a7", + "sha256": "0jv0zxmfv59h2cljk55syvl7rgpfy6zfydzm9bms2wyj68rv24pr" + } + }, + { + "ename": "chatu", + "commit": "b2e384b97c95f44dc8ec506ebb5955b549905c49", + "sha256": "15hckifkxm479rxcvwrrr8rky4ija6xsg9k8xkqvp3sbyg468v5y", + "fetcher": "github", + "repo": "kimim/chatu", + "unstable": { + "version": [ + 20240308, + 1129 + ], + "deps": [ + "org", + "plantuml-mode" + ], + "commit": "63a42219b28b2011e86ae5e8abb1366b65a25347", + "sha256": "0r0r3899yqy946sa2d3xfi565jh85yh9wcz9wylvrkar4rb70b6b" } }, { @@ -12637,8 +12716,8 @@ "repo": "clojure-emacs/cider", "unstable": { "version": [ - 20240220, - 720 + 20240310, + 1926 ], "deps": [ "clojure-mode", @@ -12649,8 +12728,8 @@ "spinner", "transient" ], - "commit": "1aad1ce6f0645c2efb35b5d0115b804415b2a2cf", - "sha256": "0f8zzvx5k09vjapkz48b93v6fg8bz66kybxk3jnvplpy3mmzlbxw" + "commit": "c4fa1a84a3b3d03ef5f61cc5d33ff4e91b9a1dce", + "sha256": "1mm4i7fjpdhqpjknziccpwm0kndb9c4dkmj52ff69dffm4zqps17" }, "stable": { "version": [ @@ -12871,25 +12950,25 @@ "repo": "emacs-circe/circe", "unstable": { "version": [ - 20231119, - 1420 + 20240227, + 2116 ], "deps": [ "cl-lib" ], - "commit": "d374042741cfd0691135f215d311dca8b7a47d19", - "sha256": "0509nskxf2a4msidqq18pymn0szpxmn05dfmrp7x4lwarjgr4f37" + "commit": "7044e07ab235ae09498c430558449750ec1e6a9f", + "sha256": "103ljkymlkr50w937mc2yjj0xdq8i2p7xl25xv4r74fignd29m55" }, "stable": { "version": [ 2, - 12 + 13 ], "deps": [ "cl-lib" ], - "commit": "710f057fedae6e9b820cce9336fef24b7d057e4c", - "sha256": "0lrxd4hanaxj85nafsc0wss677slmyaks3qb7a95mj7vic3ib937" + "commit": "6f33a481af6bce68f55b9e25d5c14c1ed46fa9d9", + "sha256": "026dvi4v1dghfv3f2g15h8xz69an3l352kn5krcr6cb4s510b5qm" } }, { @@ -12983,16 +13062,16 @@ "repo": "pprevos/citar-denote", "unstable": { "version": [ - 20240208, - 1246 + 20240228, + 807 ], "deps": [ "citar", "dash", "denote" ], - "commit": "5291f504902d403ef3f39dbc5b3e1cd1c9fe4d34", - "sha256": "1hn7jhvdfac8hxmvr97lilql6lpd3akx2hklwxarp7m4awm9b9fr" + "commit": "43ecacd818f0b569b949d160bd86bff5bbe4b0f7", + "sha256": "143inb9i1xccnzj83qg2rczfizhqwshkhsa0rh3wi99hvxjigkif" }, "stable": { "version": [ @@ -13080,8 +13159,8 @@ "repo": "andras-simonyi/citeproc-el", "unstable": { "version": [ - 20231230, - 1309 + 20240307, + 1412 ], "deps": [ "compat", @@ -13093,8 +13172,8 @@ "s", "string-inflection" ], - "commit": "c61c98b9d230ea28b2ca49498134803e1f8ea526", - "sha256": "04h6mgfyhx8zkjbcfhaac88754w61592pjdj27ayxh0xj0gybxzz" + "commit": "cb2d3e72116e626133703aa9875d680442249abe", + "sha256": "1jlyxq0hk6wrprpjlq8cgs14hzl8lxgdkyfl1c9lnwcr3c7iijrd" }, "stable": { "version": [ @@ -13610,8 +13689,8 @@ "repo": "clojure-emacs/clj-refactor.el", "unstable": { "version": [ - 20240116, - 1119 + 20240310, + 2054 ], "deps": [ "cider", @@ -13624,14 +13703,14 @@ "seq", "yasnippet" ], - "commit": "fa3efe18e7150df5153a7d05c54e96d59398a0a8", - "sha256": "17c9lrykbfp0ab7lmi4jh34q6ir7i46acn313xw5342d2q5ql6sk" + "commit": "dc1bbc8cdaa723bdbb6669ea7d280625c370755d", + "sha256": "0mha1wqn5hd9g8y0fp35qkhlnxlrwli62x7mbifman279h16gaml" }, "stable": { "version": [ 3, - 11, - 3 + 12, + 0 ], "deps": [ "cider", @@ -13644,8 +13723,8 @@ "seq", "yasnippet" ], - "commit": "fa3efe18e7150df5153a7d05c54e96d59398a0a8", - "sha256": "17c9lrykbfp0ab7lmi4jh34q6ir7i46acn313xw5342d2q5ql6sk" + "commit": "dc1bbc8cdaa723bdbb6669ea7d280625c370755d", + "sha256": "0mha1wqn5hd9g8y0fp35qkhlnxlrwli62x7mbifman279h16gaml" } }, { @@ -13939,11 +14018,11 @@ "repo": "clojure-emacs/clojure-mode", "unstable": { "version": [ - 20240218, - 756 + 20240304, + 559 ], - "commit": "4836394af1459dc8d312b25b077218a900ebfe60", - "sha256": "0dy86n73qa5mzfm4mj0in2vbnyayddwa5r9r41mh9fyq2pz1wl38" + "commit": "3792e08b76aa7fdae18938e1966ea140b9817a9a", + "sha256": "12zq6026s4yq6dbx1jy9g2fxy8ia2lm8ifx4qmnrfhcbscaj841l" }, "stable": { "version": [ @@ -14055,11 +14134,11 @@ "repo": "clojure-emacs/clojure-ts-mode", "unstable": { "version": [ - 20240219, - 2005 + 20240314, + 552 ], - "commit": "f3d9e98dd018a3140efc9b8fb8a96ba829a7e644", - "sha256": "1hwjv62h3bjs0lk7pp22mc6qf186jamacvkb9f9jm906r43dbpq8" + "commit": "8afa5656955814193b3b27020faf4edf00abda88", + "sha256": "0jxfzcmqlmc88ib483n6y445xs7bpaqw3b1w0z3nmcdfk512d0fr" }, "stable": { "version": [ @@ -14307,20 +14386,20 @@ "url": "https://gitlab.kitware.com/cmake/cmake.git", "unstable": { "version": [ - 20240126, - 1513 + 20240321, + 1332 ], - "commit": "409ab01039dd3c8f5ae0df48a1ee1c356132a9bf", - "sha256": "015246558f89vsv8ai5a53nbr1cv3ia37dndqb67r3v1fbysymbi" + "commit": "25d2850c190ba915a7527a29dda6efe61be901f0", + "sha256": "0q49x6z053gw257lamimm9nr1xpajwwqdfjxzrs596kmysrkjrcz" }, "stable": { "version": [ 3, - 28, - 3 + 29, + 0 ], - "commit": "5e984bb35232116a54de7db39788cb162ca7c263", - "sha256": "1bkbszmlmzzj6xnq8xa4fqjd45zkbw4vhhmv99whzq3kmjsmnmca" + "commit": "25d2850c190ba915a7527a29dda6efe61be901f0", + "sha256": "0q49x6z053gw257lamimm9nr1xpajwwqdfjxzrs596kmysrkjrcz" } }, { @@ -14388,11 +14467,11 @@ "repo": "tumashu/cnfonts", "unstable": { "version": [ - 20230412, - 132 + 20240320, + 254 ], - "commit": "5115f53366bd6118dce3673ddec5ff428534ce67", - "sha256": "0k0mh653sjwhli6hxdyzvcqdmpxdsx1s0fwzsw69dfr6nxr7f1dv" + "commit": "323bfd2f66ac0d9cc831cc1ff785c1ed603f5ef2", + "sha256": "0g73an139fvv4nqgky56d211781dj5hfilgmd3zvm97gnw7xv0nd" }, "stable": { "version": [ @@ -14932,11 +15011,11 @@ "repo": "purcell/color-theme-sanityinc-tomorrow", "unstable": { "version": [ - 20240220, - 1651 + 20240226, + 1133 ], - "commit": "1e6539f3a9b17e916b10b9423e5d617e3b756698", - "sha256": "13afznznzjfirldy1qhh42p0r91vaqj7gahcqfdflb8pvzjijdbv" + "commit": "e74bb5bbf714c8ec9649d161a90708f0b9b093d6", + "sha256": "04k6sm533db7av83j08a6kz1q1i8shhxza29fz7aql4rkazyd2kb" }, "stable": { "version": [ @@ -15376,20 +15455,20 @@ "repo": "company-mode/company-mode", "unstable": { "version": [ - 20240218, - 1812 + 20240311, + 1943 ], - "commit": "0c0186cca8e7e9a12a44ffe42ad7037ffa6bfac7", - "sha256": "0gdn5wbnn8sibyiakn55hz8krncdxlpgy409vvfa5w7jlijbv9cc" + "commit": "b0a522ac5bf8ba3d2f4f22e3aa846a4f82978a16", + "sha256": "11ghdfbyg8fvi79l0xvaqhpnzlnjfl3ng517pb2h37hp2cyy8b5i" }, "stable": { "version": [ 0, 10, - 1 + 2 ], - "commit": "d832d886d0dce655b44de8c5e1eec749b2bea3a3", - "sha256": "09v0q7kxyar5r06l4lv3v78vnd39v3b0pnxg0r3h3my4ki72by8i" + "commit": "34e92d9b7084b03d087866abcd1e6a22a244c9bb", + "sha256": "1s2d0x7s8vgnc7idzcbpa3y1nrmgmpahzzzi9xh8dcsn5ss42sl1" } }, { @@ -15550,16 +15629,16 @@ "repo": "sebastiencs/company-box", "unstable": { "version": [ - 20230312, - 1028 + 20240320, + 921 ], "deps": [ "company", "dash", "frame-local" ], - "commit": "b6f53e26adf948aca55c3ff6c22c21a6a6614253", - "sha256": "0shzdvzrihw8rqgliq6aj1d856m30nj4skzldmw1caqmghfqwv7m" + "commit": "c4f2e243fba03c11e46b1600b124e036f2be7691", + "sha256": "08bqg65zjpfk5raa0yd2p3v5h35yq1ksr62dx4wdznjc2zb3drk4" } }, { @@ -16493,21 +16572,21 @@ "repo": "xcwen/ac-php", "unstable": { "version": [ - 20240201, - 843 + 20240222, + 320 ], "deps": [ "ac-php-core", "cl-lib", "company" ], - "commit": "38b991e1f2dcd05e7e00ed6c33b28fc877271eb3", - "sha256": "0rwz5w0djngacbxzidam7vpfgxk82c4l6lp9psw2siv5yr2yqxkx" + "commit": "d4378a857aa1c60b34d86557aa10238785d1ac66", + "sha256": "1xz86cjsjm72b0rm50fr2z82rcllhczsd4jr5rnp2clbind5w697" }, "stable": { "version": [ 2, - 5, + 6, 0 ], "deps": [ @@ -16515,8 +16594,8 @@ "cl-lib", "company" ], - "commit": "7b89fbf25360cc146aee9b2b2ca60f3462b21078", - "sha256": "0fmp1595v06dgmx9skxphknaagf9ds9l7ygi7lzxas1s8d05dj10" + "commit": "d4378a857aa1c60b34d86557aa10238785d1ac66", + "sha256": "1xz86cjsjm72b0rm50fr2z82rcllhczsd4jr5rnp2clbind5w697" } }, { @@ -16667,27 +16746,27 @@ "repo": "radian-software/prescient.el", "unstable": { "version": [ - 20231123, - 2208 + 20240226, + 204 ], "deps": [ "company", "prescient" ], - "commit": "c0eca3328313f1e93d24e686307516f43a484ba2", - "sha256": "1vj21kcqlsa02nvslmxgxsbv4pc93gakj4x2a6rbk87zl6ccw7pk" + "commit": "c39bf07c56b427bf41aafd7d20eaef5cf3c312b5", + "sha256": "0pfc0ycp4cr9zwkjv3rqfkwkx8p52ad7aq2c60j0qwp3yd0cghc4" }, "stable": { "version": [ 6, - 2 + 3 ], "deps": [ "company", "prescient" ], - "commit": "c0eca3328313f1e93d24e686307516f43a484ba2", - "sha256": "1vj21kcqlsa02nvslmxgxsbv4pc93gakj4x2a6rbk87zl6ccw7pk" + "commit": "c39bf07c56b427bf41aafd7d20eaef5cf3c312b5", + "sha256": "0pfc0ycp4cr9zwkjv3rqfkwkx8p52ad7aq2c60j0qwp3yd0cghc4" } }, { @@ -17328,11 +17407,11 @@ "repo": "mohkale/compile-multi", "unstable": { "version": [ - 20231226, - 2123 + 20240315, + 2126 ], - "commit": "5ca966d73fbc6ec3835ed2db5be8c9ca05fc4586", - "sha256": "0p8zxb1wjd67k47g25k4hva2q6wf13214437anqhnw53kps4yfqk" + "commit": "7124939e77da2bf3847aeeba2ba0387e47e11ce7", + "sha256": "1b1dygxgd1snm6faf61vpa6kdq67ag5xc805bn8ksbvljn0d4x0i" }, "stable": { "version": [ @@ -17730,25 +17809,25 @@ "repo": "minad/consult", "unstable": { "version": [ - 20240223, - 1314 + 20240323, + 2016 ], "deps": [ "compat" ], - "commit": "66f7c20899976f23494c7016ce0cd25f1b4ff2e0", - "sha256": "1kby7wwl697xwgnzqfzclc1jxdp9wjvcjv86j6wdc2x2kxkpg4rj" + "commit": "ec232fa60497e7a3abcf6e385181afcc0cf6017f", + "sha256": "0z33j3jg4kspyqcm95yrvdw9y90a8ikjz8n5ycfyrjydpa838c3r" }, "stable": { "version": [ 1, - 3 + 4 ], "deps": [ "compat" ], - "commit": "66f7c20899976f23494c7016ce0cd25f1b4ff2e0", - "sha256": "1kby7wwl697xwgnzqfzclc1jxdp9wjvcjv86j6wdc2x2kxkpg4rj" + "commit": "0eab65fe3273c97a422c99ee426eef7f2d2dffa4", + "sha256": "0kp1xrivs111d8ksjyf3m1ldzb8qknwrh2k2lzbrq6yiwc4bigy7" } }, { @@ -17917,7 +17996,7 @@ "repo": "mohkale/consult-eglot", "unstable": { "version": [ - 20231209, + 20240324, 1137 ], "deps": [ @@ -17925,8 +18004,8 @@ "eglot", "project" ], - "commit": "049c6319b8a48ff66189d49592c7759f0b356596", - "sha256": "0q2c7nw88cp63wp5vn8b4n6799ibd76hb472g0mjnrk374h03pai" + "commit": "4fa151f83f15de22eb2a241ddce95bed80b8ba79", + "sha256": "1bri48z9yarys95w77mxmbn6nj7wypb23bjmz410p885ma98wn1x" }, "stable": { "version": [ @@ -17944,6 +18023,25 @@ } }, { + "ename": "consult-eglot-embark", + "commit": "5ffb32a540ebf6ebffd1913de1d82019674177fe", + "sha256": "1avmvd2rz6py9m089id9adi5ympic1cz0pp0xwh2kbbhyij30ns4", + "fetcher": "github", + "repo": "mohkale/consult-eglot", + "unstable": { + "version": [ + 20240324, + 1211 + ], + "deps": [ + "consult-eglot", + "embark-consult" + ], + "commit": "64262e72452f8fe6dd49d31bcdd4bd577b7d682d", + "sha256": "0mn9d87m05bhqrw7sscx4a2a5h7gkqyhv06a80ky9vbzlfjfk6hh" + } + }, + { "ename": "consult-flycheck", "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", "sha256": "12zwy7jwbg7njm009c1rns0q382rv5lmbzjb4giy4wwwpjg3nfgf", @@ -17951,15 +18049,15 @@ "repo": "minad/consult-flycheck", "unstable": { "version": [ - 20240102, - 330 + 20240310, + 1442 ], "deps": [ "consult", "flycheck" ], - "commit": "d83f87581af74f7a2739d8b1b90c37da5ae3d310", - "sha256": "1j1kh6imhryr973i42q41h5jwxclzx5mxvy21ac84pihvvspf71z" + "commit": "754f5497d827f7d58009256a21af614cc44378a3", + "sha256": "19smn8wyindw92nvfskg5s889pdc5hn0w9q5z13hmjb8iv2gx9yp" }, "stable": { "version": [ @@ -18131,16 +18229,16 @@ "repo": "mclear-tools/consult-notes", "unstable": { "version": [ - 20240216, - 311 + 20240306, + 1529 ], "deps": [ "consult", "dash", "s" ], - "commit": "d6e340044cd1d263f51b7c1877e04566db485f34", - "sha256": "1j8rckv9ksizvzznbi2v6hg1jcy9dp02jjzz3pbrpy5mx7n830d9" + "commit": "652d0281b81becac643efe96386facf23e1dee01", + "sha256": "0ka4mr4gg2nmkg0fr7i9dq3f3jmq9m16wbzjk5w9x5yxhh9rymx2" } }, { @@ -18300,26 +18398,26 @@ "repo": "titus.pinta/consult-tex", "unstable": { "version": [ - 20240130, - 1536 + 20240307, + 1019 ], "deps": [ "consult" ], - "commit": "46a36ce0046137ba6a0f99112db4651284e87f53", - "sha256": "0y1fc768jnv1d1ij0mz0siagsz3yphb9acj0nwprsh5kgbl9zz0q" + "commit": "29ab438792cb0a258dc7158526919ffcf0b5f134", + "sha256": "0pi200gphywgqyn9acn5a4hda9dq4gkdqhzb6m9z0xwxwj7jsd3p" }, "stable": { "version": [ 0, - 1, - 3 + 2, + 0 ], "deps": [ "consult" ], - "commit": "46a36ce0046137ba6a0f99112db4651284e87f53", - "sha256": "0y1fc768jnv1d1ij0mz0siagsz3yphb9acj0nwprsh5kgbl9zz0q" + "commit": "29ab438792cb0a258dc7158526919ffcf0b5f134", + "sha256": "0pi200gphywgqyn9acn5a4hda9dq4gkdqhzb6m9z0xwxwj7jsd3p" } }, { @@ -18362,15 +18460,15 @@ "repo": "mohkale/consult-yasnippet", "unstable": { "version": [ - 20220724, - 1338 + 20240314, + 1838 ], "deps": [ "consult", "yasnippet" ], - "commit": "ae0450889484f23dc4ec37518852a2c61b89f184", - "sha256": "13hmmsnmh32vafws61sckzzy354rq0nslqpyzhw97iwvn0fpsa35" + "commit": "834d39acfe8a7d2c304afbe4d649b9372118c756", + "sha256": "0vjsqjhgzxvdhhcis5gx8xc56mjl3drpy1qn1265f6474j7y4frv" } }, { @@ -18686,14 +18784,14 @@ "url": "https://code.bsdgeek.org/adam/corfu-candidate-overlay", "unstable": { "version": [ - 20230814, - 1537 + 20240322, + 1814 ], "deps": [ "corfu" ], - "commit": "265438b16155e899d82a869aebca16105665c998", - "sha256": "0i36g2i7435pby32vcapv4ydmp6rqn0r51qm91wqyzan1f3n3qck" + "commit": "f730de2c150720ee70d4d7be4b8bb533c7dfc97e", + "sha256": "17qrk02las8laxkf864zn8fkamihysi9bfjzil998kdmxhvrfxsx" }, "stable": { "version": [ @@ -18715,27 +18813,27 @@ "repo": "radian-software/prescient.el", "unstable": { "version": [ - 20240106, - 2017 + 20240226, + 204 ], "deps": [ "corfu", "prescient" ], - "commit": "4b875be52e75f7b81e68a16b62cfbb2f2584042c", - "sha256": "1ks7adpyzils4n4clyds7cncbcd0g41ymisyi1jqb0wn9r82i93h" + "commit": "c39bf07c56b427bf41aafd7d20eaef5cf3c312b5", + "sha256": "0pfc0ycp4cr9zwkjv3rqfkwkx8p52ad7aq2c60j0qwp3yd0cghc4" }, "stable": { "version": [ 6, - 2 + 3 ], "deps": [ "corfu", "prescient" ], - "commit": "c0eca3328313f1e93d24e686307516f43a484ba2", - "sha256": "1vj21kcqlsa02nvslmxgxsbv4pc93gakj4x2a6rbk87zl6ccw7pk" + "commit": "c39bf07c56b427bf41aafd7d20eaef5cf3c312b5", + "sha256": "0pfc0ycp4cr9zwkjv3rqfkwkx8p52ad7aq2c60j0qwp3yd0cghc4" } }, { @@ -18815,15 +18913,15 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20240214, - 2118 + 20240229, + 1509 ], "deps": [ "ivy", "swiper" ], - "commit": "749ac1235a7948011cb0caddd4c31037e3314614", - "sha256": "0d598jxdrxjlszaikh27v7j2zdndisfqzb384d94siw4rwzfj4zr" + "commit": "14c696aa2d6cd905795ba543374457a04a13ccae", + "sha256": "1j2x1jqyhkldkm1fcm6ycad92dc3jkxbr44hqw3kiq6ghbz746da" }, "stable": { "version": [ @@ -19936,23 +20034,20 @@ "repo": "bbatsov/crux", "unstable": { "version": [ - 20240223, - 1420 + 20240229, + 957 ], - "commit": "a8dbf91e88638aa76f6dcbbdd8621f2ff5673765", - "sha256": "1hmny162l2yakhlc76lvk71lqz7invkxfw8v69x31zng16pwdx67" + "commit": "7980df10e47eef41d4d1c57cfb690ec406381ed3", + "sha256": "00n4k09x3slchs81xw1q0rcb78ncb5k2lvsigb9j7s3kxbj6bvvy" }, "stable": { "version": [ 0, - 4, + 5, 0 ], - "deps": [ - "seq" - ], - "commit": "3445e7e027592c50505c5237ed1484715d2a3892", - "sha256": "1h28chpyq61k72qh749r5kqq1y70wx3xw9c3zyfzmy750wlw6nyj" + "commit": "7980df10e47eef41d4d1c57cfb690ec406381ed3", + "sha256": "00n4k09x3slchs81xw1q0rcb78ncb5k2lvsigb9j7s3kxbj6bvvy" } }, { @@ -21501,11 +21596,11 @@ "repo": "emacs-dashboard/emacs-dashboard", "unstable": { "version": [ - 20240222, - 59 + 20240322, + 340 ], - "commit": "ed1a6a452e26e2042faec2e073f1441d73a69447", - "sha256": "15hnp1xwwq8mssdz5vi64v80cgv1zziinm11y3pmrhrxmlzm4321" + "commit": "05b4b1a7bc5ec5d0fca5ee6cd6a2099107c47b15", + "sha256": "0hscfmm0rz6rz3npb0kgdwv836s9xlp0j61nahjqgwq9lqkmjl0a" }, "stable": { "version": [ @@ -22321,11 +22416,11 @@ "repo": "jrblevin/deft", "unstable": { "version": [ - 20210707, - 1633 + 20240309, + 2117 ], - "commit": "28be94d89bff2e1c7edef7244d7c5ba0636b1296", - "sha256": "074d8apvfp9na14q080w14i9ixbswvp7akjyv8gmxmy5im4gm0y3" + "commit": "bb1a16b87c3e0fe70fade6227e47dd7712b89bf6", + "sha256": "0mmhqk7bh34l1zb4hskd914qs28vi688jvhlcdrgdl62s3184m8l" }, "stable": { "version": [ @@ -22445,9 +22540,9 @@ }, { "ename": "deno-ts-mode", - "commit": "0a5c849697a2a277f8c07f8cf0a6a3a92dd18586", - "sha256": "0dkcnz0r8mgbyd4pfa3knq1qzzlgmz3iacmdj1s0m7p24ki6yvh6", - "fetcher": "sourcehut", + "commit": "0a17820e6383af31230cd2853b58ce38e44208e0", + "sha256": "0jrjdryfk2smylm4z8v8zxgrzdqq6m7ybg4bcskjwr7vk3smndmw", + "fetcher": "github", "repo": "mgmarlow/deno-ts-mode", "unstable": { "version": [ @@ -22475,15 +22570,15 @@ "repo": "pprevos/denote-explore", "unstable": { "version": [ - 20240212, - 716 + 20240317, + 919 ], "deps": [ "dash", "denote" ], - "commit": "f1dbb2d93919f7efc0e6067f794b229ef7659d1d", - "sha256": "0c891zivwfpfazy9zmvj42gcr9bignbky636xmngf4l7i1p9qcig" + "commit": "53dcead5eea35ec0545aa85e8f0c8384b6f4eb57", + "sha256": "1wdsfyc2qzvhaj3dyfxg045sr9naqrg3yip4fwj71rfzzkpva3j0" } }, { @@ -22704,11 +22799,11 @@ "repo": "astoff/devdocs.el", "unstable": { "version": [ - 20231127, - 1905 + 20240323, + 823 ], - "commit": "f0436bc0e2077683438e838acdfc425337898175", - "sha256": "04f7idkpbjkyrcaklh5fmchi9s4inixibrikkrrfjyrc85l2j31d" + "commit": "01ce2c06e997cb821be6123395fb6d224bf958ab", + "sha256": "14rp8f182bfip3p00khinp9rnr7nr2l86r6ppqyd37idk1mf158w" } }, { @@ -22920,11 +23015,11 @@ "repo": "kisaragi-hiu/didyoumean.el", "unstable": { "version": [ - 20200905, - 1843 + 20240229, + 1807 ], - "commit": "ce5edcce160b86e7f6480f0381be785d43f97e19", - "sha256": "0a89bp9vz8lzg5klhmzpfmc0mhqmx667ivr86ckkjhiwr2mmzq0s" + "commit": "fc12bd33c7b4f6dc74e49735c269ff75c72227a1", + "sha256": "1fc0bmhvhmhnvqsp5j3dwhsi355aarrxcs5jgnjp7y26wi6ijn4h" }, "stable": { "version": [ @@ -22974,14 +23069,14 @@ "repo": "dgutov/diff-hl", "unstable": { "version": [ - 20240127, - 34 + 20240225, + 116 ], "deps": [ "cl-lib" ], - "commit": "b8b2727a72fdf64ac98e6cfa136a43cb0cacf72f", - "sha256": "0g0gq8n5968qxbqb965kq4crm18n3k6miiiv90pdygykq1b2gww5" + "commit": "96620839430c1205cbb8c92dd54973397f70f9d2", + "sha256": "09i735cd8pyfdk5llk47liywc0l3irh4ipwqky9vpp3mh3xg1f4x" }, "stable": { "version": [ @@ -23097,15 +23192,15 @@ "repo": "pkryger/difftastic.el", "unstable": { "version": [ - 20240223, - 1630 + 20240308, + 1548 ], "deps": [ "compat", "magit" ], - "commit": "029baa91145f72ffa95b23fab86c6598de654cfc", - "sha256": "0lsf0bi7k1pf9kx9lrb1r1vdplr3a4ij2is46y08zm04dzqpqa1v" + "commit": "763e5f25925a8a625a943953a5f13d21b9a3bc51", + "sha256": "0v9w6iswshr8mj1g5bp9i13ck0wd1jcy4czancgwhc8hn2k5dnnl" } }, { @@ -23526,6 +23621,24 @@ } }, { + "ename": "dired-auto-readme", + "commit": "d5942df9855b69f93ca64f82c653552a7b76a521", + "sha256": "1gxngps4xa90hkxilzz694w4qdhiii170lrhi6z57iy18fviws75", + "fetcher": "github", + "repo": "amno1/dired-auto-readme", + "unstable": { + "version": [ + 20240318, + 953 + ], + "deps": [ + "markdown-mode" + ], + "commit": "8c31904ec8200e04e3d4efa2be2d1c935675423e", + "sha256": "0dp1b52748fdhsjma9s4np3zq83mqc6rcamxhdlawccaq0dn9ipg" + } + }, + { "ename": "dired-avfs", "commit": "568e524b7bdf91b31655bdbb30fe9481d7a0ffbf", "sha256": "1q42pvrpmd525887iicd3m5gw4w2a78xb72v7fjfl30ay1kir4bm", @@ -23552,16 +23665,16 @@ "repo": "Fuco1/dired-hacks", "unstable": { "version": [ - 20230621, - 1019 + 20240322, + 2135 ], "deps": [ "dash", "dired-hacks-utils", "f" ], - "commit": "874449d6fc98aee565e1715ec18acec3c1c2cafb", - "sha256": "119m942a9p13l62w5wq2iprkvakv0c4xwfhq2yivhwb21rqmxq0g" + "commit": "c3bf65aeacfc5ae04508ebcff7b0c9fb37ca4beb", + "sha256": "0slv5v4d5iqx02ilcrp30i6jhismvw5n123m7p0fbmqpb7pv2070" } }, { @@ -23794,6 +23907,29 @@ } }, { + "ename": "dired-hist", + "commit": "54185115f7b74608ccd5cdf026817f4c9c17850e", + "sha256": "1hjfymdffqh0vi748c5bl5sbp0jkdwwidn6i0r0p41d2v7nhxxv0", + "fetcher": "github", + "repo": "Anoncheg1/dired-hist", + "unstable": { + "version": [ + 20240324, + 509 + ], + "commit": "1755b7bbb81e83563feac8e395e0d9fd85217ad6", + "sha256": "1h60m4w0dyhacymx2m9yrci742wk28wkb36pmq5sxvpck8jbd110" + }, + "stable": { + "version": [ + 0, + 13 + ], + "commit": "1178b678c249cafd9b320d8305798c30ff367939", + "sha256": "1xpw3h6iwy3wd34hafpzhq37bmphi0qrmcwsa9p6y7s64q3fpb1i" + } + }, + { "ename": "dired-icon", "commit": "8a96249947cba52cd75515b3dc83b0842fedf624", "sha256": "0nyiqcywc1p8kw3psisl4zxwmf2g0x82kanka85zxxdz15s509j1", @@ -23871,11 +24007,11 @@ "repo": "thomp/dired-launch", "unstable": { "version": [ - 20240123, - 611 + 20240317, + 2344 ], - "commit": "5bd3e4b8068bc5c345965f09d46709e08e15d666", - "sha256": "140z5qxvgm7dd4vl7mcmc641ma806nw6sjc0q1cmlaswyrl6793m" + "commit": "0a7dbe002306cbeeedcf5b9fbbc72adc83f0d331", + "sha256": "06p19kwh6xr5krs4j54qx342ncnlhiszkml13b51k0h2kqvchlkm" } }, { @@ -23886,15 +24022,15 @@ "repo": "Fuco1/dired-hacks", "unstable": { "version": [ - 20230512, - 1107 + 20240318, + 845 ], "deps": [ "dash", "dired-hacks-utils" ], - "commit": "523f51b4152a3bf4e60fe57f512732c698b5c96f", - "sha256": "09z238y41rgy0jrn2hq5k6kj1k2skkgpf4kbfzyjzi6kcw8586bf" + "commit": "475be5486bc2d593283ba6e8c8c43053d4cbdd7f", + "sha256": "1gz3wk3s42fj8qvbiyh4147ryqqapy2jp37dbs0z03acwqn9d23p" } }, { @@ -24178,14 +24314,14 @@ "repo": "jojojames/dired-sidebar", "unstable": { "version": [ - 20230623, - 1655 + 20240320, + 1952 ], "deps": [ "dired-subtree" ], - "commit": "85ec4fffc2607d38ec2e3b8577320aceb8e652dd", - "sha256": "09708kcbzx9v904rg49yg3xjix8kbkx89xsysx66imxh3s8f8xjb" + "commit": "573658021fd6e6cf032d789de29aca4e5dd258fd", + "sha256": "0icy2mzkbcrf7dq0zlakq56h89jw0rdlgfn0z6zz0hlyq2d2zhz6" }, "stable": { "version": [ @@ -24329,14 +24465,14 @@ "repo": "Boruch-Baum/emacs-diredc", "unstable": { "version": [ - 20240219, - 2237 + 20240314, + 753 ], "deps": [ "key-assist" ], - "commit": "91cdc351e1cf6680b838980121802b682ee2210d", - "sha256": "0bqirfvjvi37ysjyvpgnpwjw6pfpxbz9h0jxrhc1dd6cqdh40dr6" + "commit": "b638face71558cc1444c352fe6bab2d9b28bf281", + "sha256": "0askrlywbkj1x92l8hqdwb6xbcyj16gymmcima8spvjxjdbhm3y2" }, "stable": { "version": [ @@ -24404,14 +24540,14 @@ "repo": "wbolster/emacs-direnv", "unstable": { "version": [ - 20230721, - 714 + 20240314, + 715 ], "deps": [ "dash" ], - "commit": "14f74269af34f8c30ab4a521eff290b74460daed", - "sha256": "0q5n499vc7d57fyr98alyrfycdvwgykf2fia3jq090h6xn5jbjl3" + "commit": "c0bf3b81c7a97e2a0d06d05495e86848254fcc1f", + "sha256": "1b68rz3y64afwbh5brxa9yzwmsjg1g8irgvbvdblazhciap397c3" }, "stable": { "version": [ @@ -25413,11 +25549,11 @@ "repo": "spotify/dockerfile-mode", "unstable": { "version": [ - 20240223, - 1357 + 20240324, + 1010 ], - "commit": "35178a080fb3b61051437570f51fa0cdf2b7772b", - "sha256": "0lz6lfyab2f9nw0fwkvvn7zx361c3wm0aar9v2vhb437c0mxzndh" + "commit": "39a012a27fcf6fb629c447d13b6974baf906714c", + "sha256": "04r8y5zhgv0nv85bw0li47r577rw7wczikx65aazvxk0skgda5sw" }, "stable": { "version": [ @@ -25537,11 +25673,11 @@ "repo": "ag91/doctest", "unstable": { "version": [ - 20240212, - 1801 + 20240321, + 2345 ], - "commit": "0a621020e671ccf75de1582b78da5a6ff31e0d69", - "sha256": "1yg2hs08kgrz4kyp5z04ldlzhpy0lqsqmx2r4if6qcxyqvm89wva" + "commit": "a1fc9f2fcb45ea980ca25c524d54a7b0bd40e3c9", + "sha256": "0im29nv6gz3gpkh9c3m03pkmj034rxsarw0qw0b1gfpl5c91nsxx" } }, { @@ -25670,16 +25806,16 @@ "repo": "seagle0128/doom-modeline", "unstable": { "version": [ - 20240221, - 817 + 20240324, + 1457 ], "deps": [ "compat", "nerd-icons", "shrink-path" ], - "commit": "f67f627574e02b4a474b2dc5e8a68dbdf6cfd913", - "sha256": "13rdgb4j62d4aszwdklym17dxghvqabbdg2dv5vzf957nn0kwhkx" + "commit": "2e420e64ffadc7489e281ea69e572cd0e415fbcb", + "sha256": "00jgs4d2si2c6m7bghzlczl8vj48snyr7z68igh0lgq5afg0s81y" }, "stable": { "version": [ @@ -25723,14 +25859,14 @@ "repo": "doomemacs/themes", "unstable": { "version": [ - 20231208, - 2011 + 20240320, + 121 ], "deps": [ "cl-lib" ], - "commit": "ff26f26ea3d761375f5fc4070438fbd0f3473d33", - "sha256": "0ag8va9xwr61ra3nn53alggmdnw42x2z7820jyjqff39f5ziqszs" + "commit": "37d2182f5078d29fb22bbace346e523bb84b2c4e", + "sha256": "0zhncai46b3rv205v8cmdvlg746gy2q4c6mq3vn3p5a3mqv7jn1r" }, "stable": { "version": [ @@ -25950,11 +26086,11 @@ "url": "https://salsa.debian.org/emacsen-team/dpkg-dev-el.git", "unstable": { "version": [ - 20231220, - 35 + 20240303, + 1522 ], - "commit": "767ae6e9c2222e689272089a96f9545f1eb5552c", - "sha256": "1dhq1vdwggl8wz812v2r9ipmz35yry3ylkm851p11wizv0z91whm" + "commit": "69b294694c57d8e7571fada6a6651c40d266285e", + "sha256": "05zyjc0wcx70b1fzxhh8pwnhvmza03afqxvvbmip7hcxnyf2wajy" }, "stable": { "version": [ @@ -26257,8 +26393,8 @@ "repo": "thomp/dtk", "unstable": { "version": [ - 20230924, - 2038 + 20240317, + 2328 ], "deps": [ "cl-lib", @@ -26266,8 +26402,8 @@ "s", "seq" ], - "commit": "5d7fc18eee0d219f52585e05b303f494dc5831cd", - "sha256": "1hbzxir6b0r6cr0sl8yjabk9c7khrqwyjzd5pq90wsslgik3zg4x" + "commit": "461f30f2e2038c3c469e710309046c0af4d6b41a", + "sha256": "12v1lac0sq72aip6k29l3agxbqagcf300wdbpbx3rq65kimdnvid" } }, { @@ -26434,10 +26570,10 @@ "version": [ 3, 14, - 0 + 2 ], - "commit": "73250f00372d3f28a25963ded6138728f4202663", - "sha256": "1c97838q4lfp26z12qwhp2js036cb5l5q8yr76a8msisx22cnncz" + "commit": "b19f6df8954995899e30275055d9582b6c83687c", + "sha256": "17h91vvqdmwkl7l4b7z6mzxsq9g2czzi9h3d68csz3h0jhwwn130" } }, { @@ -26570,11 +26706,11 @@ "repo": "xenodium/dwim-shell-command", "unstable": { "version": [ - 20240108, - 1754 + 20240324, + 1906 ], - "commit": "7a2c298424466d2bff7c050e01fb85b5f882dbc3", - "sha256": "0ac32n212g9jk76zns6z92syx2himhxll6qr8drvvz98ybjh46pm" + "commit": "5049375dcba5b58c35b558c9a5975c3424855ee6", + "sha256": "01m3w9cv4ckj78x111rfxcj44by3kngvlisz9gzsabi3hz2rn42d" } }, { @@ -27038,11 +27174,11 @@ "repo": "emacs-eask/eask", "unstable": { "version": [ - 20240223, - 921 + 20240323, + 2214 ], - "commit": "6c672569c6d6e9ad6387b3cef14beca6ba45ae85", - "sha256": "0h11iw1b16vd87hg2a6jlrqg3gmxad14mi5vkwc3vc9n4wzrivpv" + "commit": "9a98b6c21c289dec110b434899fd050778eedab9", + "sha256": "070fc2p3wcb63x3364k815yxm1f7ks5vdjdaw5p7grzn9664crn5" }, "stable": { "version": [ @@ -27089,8 +27225,8 @@ "repo": "emacs-eask/easky", "unstable": { "version": [ - 20240223, - 743 + 20240316, + 327 ], "deps": [ "ansi", @@ -27099,8 +27235,8 @@ "lv", "marquee-header" ], - "commit": "f6ee724eef0a289e84a6b00a1b973e92acef4a4b", - "sha256": "0vbi892qp82s02cqb2bjfcrr5i4570mxwi2gikg5csg2pnq7gfsg" + "commit": "85fcdf4db86f8d6773ce7d309cf752c9f972e564", + "sha256": "0pczdrjlf0w7f3zdcd45cgirk6hbzm14hx0gjip7l0ypwgfmhixv" }, "stable": { "version": [ @@ -27369,28 +27505,28 @@ "repo": "joostkremers/ebib", "unstable": { "version": [ - 20240205, - 1511 + 20240305, + 752 ], "deps": [ "compat", "parsebib" ], - "commit": "2c5a2c42708302c40d19c36b35422df9e8fc6c73", - "sha256": "0b60k4yqmnim9hx25dhyvn6g646mq10pym8k6h176jr06br8kc2y" + "commit": "3d7b09606a04cd4c8236e290e709b56872148bc8", + "sha256": "1ga8zzzqs6vrjzm6jily37jyzpq4vsgh49vxy8a68399bdl90s77" }, "stable": { "version": [ 2, 40, - 4 + 5 ], "deps": [ "compat", "parsebib" ], - "commit": "2c5a2c42708302c40d19c36b35422df9e8fc6c73", - "sha256": "0b60k4yqmnim9hx25dhyvn6g646mq10pym8k6h176jr06br8kc2y" + "commit": "3d7b09606a04cd4c8236e290e709b56872148bc8", + "sha256": "1ga8zzzqs6vrjzm6jily37jyzpq4vsgh49vxy8a68399bdl90s77" } }, { @@ -27401,8 +27537,8 @@ "repo": "swflint/emacs-universal-sidecar", "unstable": { "version": [ - 20240203, - 1945 + 20240320, + 1935 ], "deps": [ "citeproc", @@ -27410,8 +27546,8 @@ "universal-sidecar", "universal-sidecar-citeproc" ], - "commit": "fbeaba52260f5ee7323839cbe15c4125532a9240", - "sha256": "13gc1m5ayzb1z1npfc3nvmw9md2nspzrrskqif71633rbgik7h5h" + "commit": "e38aa3fbf570ab1eef3bf0441e5be59586672377", + "sha256": "11kbbv6s4qinx0l95f7j6ic40ykfcjpmz6wsl8jx9fdqrlh9b91w" }, "stable": { "version": [ @@ -27481,11 +27617,11 @@ "repo": "benzanol/echo-bar.el", "unstable": { "version": [ - 20231121, - 1720 + 20240307, + 741 ], - "commit": "1138151e55fdfd43126c79caf13169a644b47c00", - "sha256": "01ydg9a2b4617cqz2w3jb6dk9wkrl559qssa2z1y6gz3awy6fwd6" + "commit": "71ef563df7f1b85cfe64854b6e40bb353a281cc5", + "sha256": "1hgnmyphzww9gq6ww3x0xckn25rb26dlkbh22vf23566yhq1s993" } }, { @@ -27550,8 +27686,8 @@ "repo": "ecukes/ecukes", "unstable": { "version": [ - 20230220, - 456 + 20240315, + 2350 ], "deps": [ "ansi", @@ -27561,8 +27697,8 @@ "f", "s" ], - "commit": "6bc1feb33d44bda7a7ccf06f8748050ffa1dc23c", - "sha256": "0wcc2rygz6l496fbh6azlbphdk3qn9hfdmcnq7wrcjy35b5f0cbw" + "commit": "11225972934b3cfe09ada87dd785f8dd0082b6e3", + "sha256": "0m3p25kxqzj4mndb7bpi6ymb309zsq46102g38yq244dsd3xwqdy" }, "stable": { "version": [ @@ -27943,14 +28079,14 @@ "repo": "editorconfig/editorconfig-emacs", "unstable": { "version": [ - 20240129, - 257 + 20240318, + 2049 ], "deps": [ "nadvice" ], - "commit": "4b81a5992858cbf03bcd7ed6ef31e4be0b55a7c1", - "sha256": "1chhc0jffk7zrll737h2wpr0ccakvgskblfvw5jsprscp00asm11" + "commit": "6b85f0475f01ff97f3233acb68e2646d2ca32a91", + "sha256": "1c78vv29sq8hk59mw7ir3wqrwz5gl9nd7gf3dgla6kdfw6ba3783" }, "stable": { "version": [ @@ -28394,15 +28530,27 @@ "repo": "yveszoundi/eglot-java", "unstable": { "version": [ - 20240223, - 1709 + 20240322, + 239 ], "deps": [ "eglot", "jsonrpc" ], - "commit": "f7b1ff5132308a110aeb8fa2364868f8e9fea557", - "sha256": "0573l48lchrrzcgy8mj7i5rj3a7jx6sjj8ixd4jd2fjmfssq86x8" + "commit": "d09a4204ece16a5be4ddea71476ef87e565733bd", + "sha256": "1dl751frdhvk9474m885m1k5fka0rbpsnawgjb3qfmg4zi2v053v" + }, + "stable": { + "version": [ + 1, + 34 + ], + "deps": [ + "eglot", + "jsonrpc" + ], + "commit": "d09a4204ece16a5be4ddea71476ef87e565733bd", + "sha256": "1dl751frdhvk9474m885m1k5fka0rbpsnawgjb3qfmg4zi2v053v" } }, { @@ -28413,30 +28561,30 @@ "repo": "non-Jedi/eglot-jl", "unstable": { "version": [ - 20230601, - 1335 + 20240318, + 1159 ], "deps": [ "cl-generic", "eglot", "project" ], - "commit": "7dc604fe42a459a987853d065cd6d0f3c4cbc02a", - "sha256": "0ska1i7n2ykyxm3w64661x24ycfdn2vl7px0hv33llg2sbd9famf" + "commit": "1d9cab682380f37ca1e9e9933cda13164600706d", + "sha256": "0ynrqvshr8jzndqq17m5r8jn4lk3k5bfi8nqb6aa7hyfk7bcriy3" }, "stable": { "version": [ 2, - 2, - 1 + 3, + 0 ], "deps": [ "cl-generic", "eglot", "project" ], - "commit": "3e66d604b66a35290c686194de7cb39b113ab20a", - "sha256": "0n9cf3cpf55f4n4nmfl4m2pai1b8hznyivr0vzvf9p56iyfnx98g" + "commit": "ab5e6835ea9a16e90ad1b5f369a96a60455e855c", + "sha256": "144q4fj3am165vf1vx2ljlsmpn8vvvs1b95qi3rxlwqskkx0lig3" } }, { @@ -28659,28 +28807,28 @@ "repo": "ahyatt/ekg", "unstable": { "version": [ - 20240204, - 2244 + 20240320, + 242 ], "deps": [ "llm", "triples" ], - "commit": "7d1e426daacd5d5f1e1e8c0e9f2c71e6a557219c", - "sha256": "04iz6dy7mnl3mdnach43j5qpfzlyd1lp9np1zjw7y878qdjypalv" + "commit": "8f050a65837d6d3ec4ea3ba7539541518d061539", + "sha256": "0hd5d7kiw8qbdpgxkv6zpknp799g61cqdjsi7jlgmj1dznryrxz6" }, "stable": { "version": [ 0, 5, - 0 + 1 ], "deps": [ "llm", "triples" ], - "commit": "7d1e426daacd5d5f1e1e8c0e9f2c71e6a557219c", - "sha256": "04iz6dy7mnl3mdnach43j5qpfzlyd1lp9np1zjw7y878qdjypalv" + "commit": "8f050a65837d6d3ec4ea3ba7539541518d061539", + "sha256": "0hd5d7kiw8qbdpgxkv6zpknp799g61cqdjsi7jlgmj1dznryrxz6" } }, { @@ -29152,11 +29300,11 @@ "repo": "Mstrodl/elcord", "unstable": { "version": [ - 20230627, - 1213 + 20240305, + 2138 ], - "commit": "bb12802f1f1e34345c600f69111c1a53bf98185e", - "sha256": "1pgnnm12pd5y67lcnzwd2f4b0cc2kaxxvzxb7a4ipb2gb0vwy3if" + "commit": "e2775f40ec55dfdceea83d535dff77d60534b6bc", + "sha256": "0dw5vf6iqncs12x494z5cj7ym9daxaa9ldzbja7vgzkdyy82yvp4" } }, { @@ -29201,20 +29349,20 @@ "repo": "emacs-eldev/eldev", "unstable": { "version": [ - 20240219, - 1855 + 20240317, + 1521 ], - "commit": "be713ddddcaa7a569494ea5d7e43c9681a2a8aea", - "sha256": "1r1g8j3ph537wir3q3syl9bh96dnb7nnfikg5hvahsv6qcjkx17f" + "commit": "76b08f798c94e2c6f107cd1fec9fb8aa02b5aa5b", + "sha256": "0gdgf2pkys4jxy7zknpixvygyhjv1xk9949frks3xlpiknvmkxdq" }, "stable": { "version": [ 1, - 8, - 2 + 9, + 1 ], - "commit": "220f54cbd2398843c91065bc3a2375fe8934dcdf", - "sha256": "108px7lnf39ngvb8rcqb9qh2amcbs1h22dbwd1q7js2np2nd132y" + "commit": "4da05948a10f1d7297ee80907e1412de76170b51", + "sha256": "1v0jwzwq0xpih8m4aymz90fdfvypkiqczh0ip5jg4kcvzikliw3f" } }, { @@ -29450,20 +29598,20 @@ "repo": "swflint/electric-ospl-mode", "unstable": { "version": [ - 20240221, - 2202 + 20240319, + 1842 ], - "commit": "af8a681966dcf6a51a33188f1483c2a68af94ff7", - "sha256": "0pp6j2anzbm3ziv6rb16h9gqiqqcym52b5lfigjr5i33v9a5xdza" + "commit": "e5283062fdf66aa2d664059b307839bf94413055", + "sha256": "0l60xc2l1ms8hzf5v5vk9spvdicqkvpkskwg07i3p00p2ldns0v8" }, "stable": { "version": [ 3, 1, - 0 + 2 ], - "commit": "af8a681966dcf6a51a33188f1483c2a68af94ff7", - "sha256": "0pp6j2anzbm3ziv6rb16h9gqiqqcym52b5lfigjr5i33v9a5xdza" + "commit": "e5283062fdf66aa2d664059b307839bf94413055", + "sha256": "0l60xc2l1ms8hzf5v5vk9spvdicqkvpkskwg07i3p00p2ldns0v8" } }, { @@ -29987,6 +30135,40 @@ } }, { + "ename": "elisa", + "commit": "08093b0f7196322df0a66b0ff47fb110aafcbdbb", + "sha256": "0pwfxk4knqjfqja7hwddk2b8084mn8mrjiffzsn8qwam61hwhbcb", + "fetcher": "github", + "repo": "s-kostyaev/elisa", + "unstable": { + "version": [ + 20240322, + 1808 + ], + "deps": [ + "async", + "ellama", + "llm" + ], + "commit": "8794e14d75998fd20ab6d9c52ff4c44251428559", + "sha256": "14syfx8pibvw37zbi3gip5anhwby5l2sn5fjc9fhwp668g6b56yj" + }, + "stable": { + "version": [ + 0, + 1, + 3 + ], + "deps": [ + "async", + "ellama", + "llm" + ], + "commit": "8794e14d75998fd20ab6d9c52ff4c44251428559", + "sha256": "14syfx8pibvw37zbi3gip5anhwby5l2sn5fjc9fhwp668g6b56yj" + } + }, + { "ename": "elisp-autofmt", "commit": "6d5d559e92ade81b24d313da12520896de964a46", "sha256": "1cij8nh8lldpm46v7m3pc2x2z9gkh1g26qk7in9hn3lx0nwdxavc", @@ -30308,30 +30490,28 @@ "repo": "s-kostyaev/ellama", "unstable": { "version": [ - 20240223, - 2012 + 20240316, + 1610 ], "deps": [ - "dash", "llm", "spinner" ], - "commit": "5acc209c299b9540265141b466900b0c36dc0ff4", - "sha256": "15xaqjcqks6w63107r8w6329876jvj5h1zbwgx9rc40z5qq9vamg" + "commit": "b94d5952d4e36e1caeef5ac0b3ecd6d89009082b", + "sha256": "0pwhr9xqakhhlvv7aab33lba3dpx4byh1clg6wfiyyl6xr2a48js" }, "stable": { "version": [ 0, 8, - 7 + 13 ], "deps": [ - "dash", "llm", "spinner" ], - "commit": "5acc209c299b9540265141b466900b0c36dc0ff4", - "sha256": "15xaqjcqks6w63107r8w6329876jvj5h1zbwgx9rc40z5qq9vamg" + "commit": "b94d5952d4e36e1caeef5ac0b3ecd6d89009082b", + "sha256": "0pwhr9xqakhhlvv7aab33lba3dpx4byh1clg6wfiyyl6xr2a48js" } }, { @@ -30625,11 +30805,11 @@ "repo": "dochang/elpa-clone", "unstable": { "version": [ - 20230808, - 1523 + 20240229, + 1034 ], - "commit": "dfbb68ac183b8c3e6e370c45032790ed7cf52165", - "sha256": "0lvwa14i1s9dhrpv35gqw3ra5bl006km0k2ygs8issy6vy9y3jll" + "commit": "3c77587a6ab6cdf041f969d8606407e575374022", + "sha256": "1wrv17hcyqw00n3lhsw4kncqg116hr2mq7hhx60fig1sdv09gs6q" }, "stable": { "version": [ @@ -30691,20 +30871,20 @@ "url": "https://thelambdalab.xyz/git/elpher.git", "unstable": { "version": [ - 20240214, - 952 + 20240324, + 1315 ], - "commit": "3f53ed5b6550d25a66bc83f6f26d8cfb06b1dcce", - "sha256": "1qiqjkbqjv6gw4lyf697jsb081sy2r46i3q6gdssfrhsjjmb8jag" + "commit": "56bc74e224d9835c41b6e6b68c9705b60e6dbbe2", + "sha256": "00z41vw63vm71i5szmvrxspvnzkpzflpip56jnmkjc94qfla2l8s" }, "stable": { "version": [ 3, - 5, - 1 + 6, + 0 ], - "commit": "3f53ed5b6550d25a66bc83f6f26d8cfb06b1dcce", - "sha256": "1qiqjkbqjv6gw4lyf697jsb081sy2r46i3q6gdssfrhsjjmb8jag" + "commit": "56bc74e224d9835c41b6e6b68c9705b60e6dbbe2", + "sha256": "00z41vw63vm71i5szmvrxspvnzkpzflpip56jnmkjc94qfla2l8s" } }, { @@ -31438,14 +31618,14 @@ "repo": "oantolin/embark", "unstable": { "version": [ - 20240221, - 1649 + 20240323, + 2205 ], "deps": [ "compat" ], - "commit": "c93abadc8220c0caa6fea805f7a736c346d47e7e", - "sha256": "0pmg58anfgsp1v9dg56kbihv86k88pjicid41mzqq9jpwx4wh8x0" + "commit": "15c95aee0ec6f42ee3b7a0bc6cf1e2c1ad91dfcd", + "sha256": "1lv8r1xpilcpx061s16m9s44i79lqcw6cxggx39phj8855zp3cag" }, "stable": { "version": [ @@ -31493,6 +31673,37 @@ } }, { + "ename": "embark-org-roam", + "commit": "2e5ff49735c703637570ef0479b3b613de8cc3f1", + "sha256": "1nndgzpp4jgraf0lc9zqw7z0zqplmfq6r6r40xzz7lcq99xxs6i6", + "fetcher": "github", + "repo": "bramadams/embark-org-roam", + "unstable": { + "version": [ + 20240303, + 335 + ], + "deps": [ + "embark", + "org-roam" + ], + "commit": "5bc9efc33e74eb47becbc2f6467141864cb6ecea", + "sha256": "07k9c5bxdi3v4mb2kfkxx71dh0g44iw18m1dpydnziwhayw7sky4" + }, + "stable": { + "version": [ + 0, + 2 + ], + "deps": [ + "embark", + "org-roam" + ], + "commit": "5bc9efc33e74eb47becbc2f6467141864cb6ecea", + "sha256": "07k9c5bxdi3v4mb2kfkxx71dh0g44iw18m1dpydnziwhayw7sky4" + } + }, + { "ename": "embark-vc", "commit": "69145c00a0903f876cdc2a76c2aa57defb300678", "sha256": "05pcr1znlfrls9cr76sif6wiinkd0bz2h06csv508w880h8lb1r5", @@ -31520,14 +31731,14 @@ "repo": "madnificent/ember-mode", "unstable": { "version": [ - 20200208, - 1423 + 20240301, + 1056 ], "deps": [ "cl-lib" ], - "commit": "a587c423041b2fcb065fd5b6a03b2899b764e462", - "sha256": "0x5fnrflbgafwcqr6v0jj6522j2j086s7msh2mr6yysmrfjhx2zk" + "commit": "2fd5da9e360db134232d373edf09373fa762e092", + "sha256": "0x6k1r8r1vdgf88dz8saz9d71d16cl1rqx5ij0gfi252bfwqnq8y" } }, { @@ -31645,28 +31856,28 @@ "url": "https://git.savannah.gnu.org/git/emms.git", "unstable": { "version": [ - 20240211, - 2229 + 20240318, + 2011 ], "deps": [ "cl-lib", "nadvice", "seq" ], - "commit": "9fec86dbb768b3b5714036d08129a20664f57657", - "sha256": "1ig6jaw1cg9pchgi864vp812pj66pp2q9crk74b3pfgi2viqg3bz" + "commit": "38417250833e14914d3cff65ebf8b51a1b9c1da5", + "sha256": "1qwpjrn8jm35ylbh7n2f3xk7z30czzx5w2nzi3qwmwrlb4wvp0df" }, "stable": { "version": [ - 18 + 19 ], "deps": [ "cl-lib", "nadvice", "seq" ], - "commit": "174a9f1e6a67830cf24c05eb6b99ab3fb11a579e", - "sha256": "0awdjsk5ihd52qp3878w732z2infwh5h32n54gz6g23bzm0pdjn6" + "commit": "384ca4544ec359bba08d2f9d2a78acb8f9917e25", + "sha256": "06yk5fpmgqkxrpcyd8gqq9g11x0clv8zgbwvxr95nwz720j70i72" } }, { @@ -31788,6 +31999,39 @@ } }, { + "ename": "emms-player-spotify", + "commit": "e83ca8e7027f3886a6322664f2c8bcca12f1c83a", + "sha256": "1v1wpdhjsjdj19swhh2xc7l1b7ls1q197pb63xmw4633vvlij8g4", + "fetcher": "github", + "repo": "sarg/emms-spotify", + "unstable": { + "version": [ + 20240302, + 2106 + ], + "deps": [ + "compat", + "emms", + "s" + ], + "commit": "3b1e8e5b5306173940d311191b13e2ace4d048b9", + "sha256": "1z96pwax3igw5sprk48v4wgxp2pb9qjfbp0dm5jqxqrmhza0qici" + }, + "stable": { + "version": [ + 0, + 1 + ], + "deps": [ + "compat", + "emms", + "s" + ], + "commit": "3b1e8e5b5306173940d311191b13e2ace4d048b9", + "sha256": "1z96pwax3igw5sprk48v4wgxp2pb9qjfbp0dm5jqxqrmhza0qici" + } + }, + { "ename": "emms-soundcloud", "commit": "952c7a383d39825805127bd709fa60ac77ef724d", "sha256": "13vpcgqhhxhvgf22jpqidb9a1q4l1x9m8kfdv9ba9h009xf2a1pi", @@ -32023,15 +32267,15 @@ "repo": "isamert/empv.el", "unstable": { "version": [ - 20240210, - 2233 + 20240310, + 28 ], "deps": [ "compat", "s" ], - "commit": "6cca36835f150754a5590227d956fc245f10eb5d", - "sha256": "1wypvqs135dfb12mc954k53rvq48ljcc1l01fzkq7rwk543i182p" + "commit": "cb284929a6a1364d1200677de38a75d90edc6fb2", + "sha256": "0yc147iln4hpfv74jzaq6z53m52cannllwn5ffafya6qih5rl4hm" }, "stable": { "version": [ @@ -32326,15 +32570,15 @@ "repo": "purcell/envrc", "unstable": { "version": [ - 20231023, - 1521 + 20240324, + 2246 ], "deps": [ "inheritenv", "seq" ], - "commit": "4f9ae5d4d1fcb32c844b50ccda34305884d68be3", - "sha256": "1jsxdyl5sjwc2rwwg2j6ggxs7bvgsifsclqylv1lj3hjl8nhrjzj" + "commit": "94785b4bd385432ccd1bbabc73842cadb3357ca6", + "sha256": "02pfqsl9m1spwqzrb5x5f4rpys4laa0mjny5252qm2vc0rlp26xk" }, "stable": { "version": [ @@ -33139,10 +33383,10 @@ 2, 6, 4, - 1 + 3 ], - "commit": "4293e0a94d15acac915ab9088b2ec028f78d14a9", - "sha256": "00yfwwqv4dyka5yg4m9w5dfd9ajn5z51lg7dakj6d03lay76dhh7" + "commit": "714c7d2c76c5ffda3180e95c28669259f0dc5b5c", + "sha256": "1vyah8rxizx8gi5j17k1llii7i7nlqf2yw8nsqj4ky7q3dvy3zyy" } }, { @@ -33187,21 +33431,21 @@ "repo": "erlang/otp", "unstable": { "version": [ - 20240214, - 900 + 20240321, + 722 ], - "commit": "b74bd21d5cb52e0fdc5ea321439c428783feea23", - "sha256": "1vjgmda8m2c2shdyk7dy4bspykrbsgvcs5s98fzxsqwf99l2xh20" + "commit": "e651174c569694c92b1794ddd0a1a4a199610091", + "sha256": "1g9icvg07x78kkp1w9ljgbm6zyyzwz4p17mq844vr1vbr50amsx3" }, "stable": { "version": [ 27, 0, -1, - 1 + 2 ], - "commit": "b74bd21d5cb52e0fdc5ea321439c428783feea23", - "sha256": "1vjgmda8m2c2shdyk7dy4bspykrbsgvcs5s98fzxsqwf99l2xh20" + "commit": "e651174c569694c92b1794ddd0a1a4a199610091", + "sha256": "1g9icvg07x78kkp1w9ljgbm6zyyzwz4p17mq844vr1vbr50amsx3" } }, { @@ -33774,10 +34018,10 @@ }, { "ename": "eshell-outline", - "commit": "950b9323c19b145bbf07a9a8f780880a2593831c", - "sha256": "1k510vsfsnhp86y2587zbc0cmaf735sp802d6qk7bgdllljl18hd", - "fetcher": "git", - "url": "https://git.jamzattack.xyz/eshell-outline", + "commit": "517b88019524e52bd41f65153151101a2e77c159", + "sha256": "1kn0s42z5wl21xzld80phvnvfqihkzwvz8v5xml9jvvrbvq92ps3", + "fetcher": "github", + "repo": "emacsattic/eshell-outline", "unstable": { "version": [ 20201121, @@ -33827,19 +34071,19 @@ "repo": "akreisher/eshell-syntax-highlighting", "unstable": { "version": [ - 20231108, - 2313 + 20240325, + 146 ], - "commit": "4ac27eec6595ba116a6151dfaf0b0e0440101e10", - "sha256": "123a2szd95nd43v2397087ayahp7azqm5arzh4fmqi1kdch4w3sp" + "commit": "1d25386bf7d1a97e083d33750a98fbd1c6598138", + "sha256": "1mvhp5arzhmkgpyq6kg0vlvaan8h67z3jjszazmjvgi5gma6jz1n" }, "stable": { "version": [ 0, - 5 + 6 ], - "commit": "c134271b57f21910a6bdc5e395c7862791ed0a16", - "sha256": "1la604vdj56s934j16yz8rlvzhd69433rrbgfyw9c7njxqldwcs7" + "commit": "c43f83983dad5f89d842450b97239bb22b5236a7", + "sha256": "0maza5vh22psfxg5qavdayqr40aw8jc95bjiz5dwm0xga55clbfg" } }, { @@ -33868,20 +34112,20 @@ "repo": "peterwvj/eshell-up", "unstable": { "version": [ - 20240217, - 2020 + 20240226, + 1747 ], - "commit": "160e48a7e0047a2947923d1fc43a9727e51fb25f", - "sha256": "0xbcskq2ykwz0hpfjbgzh3gpjldx9y2jxwwdaibhv4j0cf9fyiyq" + "commit": "1999afaa509204b780db44e99ac9648fe7d92d32", + "sha256": "0kdqbnapgdk6p4sid9yjlk16sps2qq3xyh7j0jljn0c25qhqbw21" }, "stable": { "version": [ 0, 0, - 3 + 4 ], - "commit": "653121392acd607d5dfbca0832927e06806a2d39", - "sha256": "05mfwp8zira7p2ip1rmqa08arlbkv7w1mbx7s5saj655scg7jaq3" + "commit": "1999afaa509204b780db44e99ac9648fe7d92d32", + "sha256": "0kdqbnapgdk6p4sid9yjlk16sps2qq3xyh7j0jljn0c25qhqbw21" } }, { @@ -33892,14 +34136,14 @@ "repo": "iostapyshyn/eshell-vterm", "unstable": { "version": [ - 20221229, - 1328 + 20240305, + 1149 ], "deps": [ "vterm" ], - "commit": "e96c30ad5e7d63b778fc3232e81b090b63b13277", - "sha256": "0zgf2yv85awlxc44cqbnyrzbkygxqp6hdqfskyg8qqjbm56cycvy" + "commit": "20f4b246fa605a1533cdfbe3cb7faf31a24e3d2e", + "sha256": "1akqxmgq8838v5nmxdldcgpvr3qf3qz64qsfnf90ic4mivdjgffy" } }, { @@ -34005,14 +34249,14 @@ "repo": "aaronjensen/eslintd-fix", "unstable": { "version": [ - 20210731, - 1649 + 20240224, + 1517 ], "deps": [ "dash" ], - "commit": "3897d8a679a6e98e3f5054aaefe07f6b55f8f128", - "sha256": "0wx0mca7xykjkbyhix2mhqf2l9zc46l14hdy4krnr3xdyb5ibmkr" + "commit": "99665b66686cc5974499cec4aff1e29faef1c028", + "sha256": "1zx45ykwcg7in20725vafxk7wxa375vpgy0c56wm20g4vsyil4dd" }, "stable": { "version": [ @@ -34185,11 +34429,11 @@ "repo": "emacs-ess/ESS", "unstable": { "version": [ - 20240131, - 1041 + 20240229, + 2054 ], - "commit": "ab2faeca1ba6c456333312c58f58ef9e5ef4aa8b", - "sha256": "0jfdfqpa3x1zm65cllkzhqir057xd3hxi4z2ddii1i26zy56iikf" + "commit": "cf237253049583a547bafc16edb9eb9a52e1ebf6", + "sha256": "02zps4a404ijmngy2yx6sxj0c9hgs9383cm4byds2nw1jzhjc7wf" }, "stable": { "version": [ @@ -34824,15 +35068,15 @@ "repo": "emacs-evil/evil", "unstable": { "version": [ - 20240222, - 652 + 20240324, + 1731 ], "deps": [ "cl-lib", "goto-chg" ], - "commit": "a7ffa73bbdc523c0e473d79c0ded7c6457bcb65c", - "sha256": "16npmdas70myr0nhy9fn7rl7nz2gcyqwnhbcky27a75j22vvfj9h" + "commit": "64a07c7aca2933ed1feec80704db49dc2c3476b3", + "sha256": "0m77bqnaqmqbd2w6710hplisbc9wwqhiymx63m7g2ddldzcmxyd0" }, "stable": { "version": [ @@ -34954,8 +35198,8 @@ "repo": "emacs-evil/evil-cleverparens", "unstable": { "version": [ - 20240103, - 926 + 20240308, + 751 ], "deps": [ "dash", @@ -34963,8 +35207,8 @@ "paredit", "smartparens" ], - "commit": "e8ccec32867e12d70a7cff5c70e4ac91f58dbd20", - "sha256": "1pyzn3knh9rbyzmk7jsb9z1vjsgvc020k2mjnsdl5szib5bvjm6m" + "commit": "aa19ed6fec73c883442fb4ffd8d300355d5a8580", + "sha256": "1lidyj1xk1xaszsi832f8bhpxgmfpjykd1gxn1y9zqi9rg9b8hpw" } }, { @@ -35025,28 +35269,28 @@ "repo": "emacs-evil/evil-collection", "unstable": { "version": [ - 20240223, - 1627 + 20240321, + 13 ], "deps": [ "annalist", "evil" ], - "commit": "54e1eb02d918fb38b4e71c87ea9a8fe8f499dc5f", - "sha256": "18v3bnz7k5b2gnyp36dmmdxpmr7d1pnim31wpz91rmj5hs58qn8x" + "commit": "89aea406334bc251adb70b1d6070b24fa94552ba", + "sha256": "1w47hr75a1r0zdzp6f14ac33sk2kqvmrlh52nd1pxll0wkaxd2xf" }, "stable": { "version": [ 0, 0, - 9 + 10 ], "deps": [ "annalist", "evil" ], - "commit": "88e5ce8bdb0762119b4153ed3346b486029f26d3", - "sha256": "1y1ig4shqaaiiwqm5pv8hvh8ynr6irhffkgmpyzmhdaaicxnfazc" + "commit": "d0518fc1626f09a341d4b5a98c857087abfb1b0c", + "sha256": "09hnxb8nh3g0hi93fz9f1y164gv9iyh5994wfn6fsq2v1xdz8phm" } }, { @@ -35517,10 +35761,10 @@ }, { "ename": "evil-lispy", - "commit": "377d43f3717b8e17c3adce886aaf3e579383ec64", - "sha256": "17z830b0x6lhmqkk07hfbrg63c7q7mpn4zz1ppjd1smv4mcqzyld", + "commit": "f752bec984b45890e4d74ddd76cbadb0b3bf2942", + "sha256": "07xkijnsww6060b6x88x5jwaw49ndz2dmaa6cbw78l28s4xgpnhc", "fetcher": "github", - "repo": "sp3ctum/evil-lispy", + "repo": "mikavilpas/evil-lispy", "unstable": { "version": [ 20190502, @@ -35543,26 +35787,26 @@ "repo": "redguardtoo/evil-mark-replace", "unstable": { "version": [ - 20200630, - 940 + 20240303, + 1416 ], "deps": [ "evil" ], - "commit": "d4fec7b10e93cca149163324cd2b2b2dcc211047", - "sha256": "0v08jwb92igd8cxbb1nxjdzwymppcaar9mf89dmbk7jkqif2q72z" + "commit": "217d5b507aa11dd0b334d5c3e1f74ac1fc2f66a4", + "sha256": "17mn7jybnlzhb82h6jkxdhcr76p1p5dk1v7dpb74r3ccd75sqn2b" }, "stable": { "version": [ 0, 0, - 5 + 6 ], "deps": [ "evil" ], - "commit": "d4fec7b10e93cca149163324cd2b2b2dcc211047", - "sha256": "0v08jwb92igd8cxbb1nxjdzwymppcaar9mf89dmbk7jkqif2q72z" + "commit": "217d5b507aa11dd0b334d5c3e1f74ac1fc2f66a4", + "sha256": "17mn7jybnlzhb82h6jkxdhcr76p1p5dk1v7dpb74r3ccd75sqn2b" } }, { @@ -36629,15 +36873,15 @@ "repo": "clsty/evil-tutor-sc", "unstable": { "version": [ - 20240215, - 5 + 20240319, + 233 ], "deps": [ "evil", "evil-tutor" ], - "commit": "9ae3cff4b1d44d74989e832cfa566c20bbe6bb1a", - "sha256": "1dqb1g6q8szknajr4rb9l2nra507k1qfmiwwx1mdhbvvfp3c6qjz" + "commit": "fcf8a588068c8fe591320d9e7161bf2d09b2e337", + "sha256": "1wf7bhhayj6x5657zy9ap014jlkkkvbkrg2v27h4y12cz5mc9i1z" }, "stable": { "version": [ @@ -37342,16 +37586,16 @@ "repo": "ananthakumaran/exunit.el", "unstable": { "version": [ - 20230730, - 445 + 20240303, + 1106 ], "deps": [ "f", "s", "transient" ], - "commit": "e008c89e01e5680473278c7e7bab42842e294e4d", - "sha256": "17r5r01br7k3nxy7vchhk94dz0zyrdlg66ip5wlj1kh89xwprvsq" + "commit": "5e8f6b681d4745ef23bd8f7ddafba80d6285f26e", + "sha256": "0jdkf8jfrw10rbd08k9lmknxpypkywnlm2mn2maz0bfb0cpi6lm3" } }, { @@ -37559,16 +37803,16 @@ "repo": "FrostyX/eyebrowse-restore", "unstable": { "version": [ - 20230312, - 1821 + 20240304, + 2338 ], "deps": [ "dash", "eyebrowse", "s" ], - "commit": "50e8a2cb3c4a64f7fadd0303d178de8a57bb37db", - "sha256": "0spcsg1kzz5h3y3m6jd3fz2mhfbmgfy4m35650axgx53309ivkfz" + "commit": "abb3877e12b41740305741deec37ca681b896e82", + "sha256": "125jnx9gvfcd0hg2aqsa4krj4ajiygricp4ill9s5200c24xwjp5" } }, { @@ -37652,15 +37896,15 @@ "repo": "rejeep/f.el", "unstable": { "version": [ - 20231219, - 750 + 20240308, + 906 ], "deps": [ "dash", "s" ], - "commit": "634b0ecdeaa192ef0dd10db312a67ebe5c2d5852", - "sha256": "1ziaagd1j076c89w8kw09slmixhxhczi51a5m8wwmhhn4jks3f6r" + "commit": "1e7020dc0d4c52d3da9bd610d431cab13aa02d8c", + "sha256": "07pbjgwnvjvbl1hsar6kjcy7f4390gl1jy712ln09vkiqn8ln5dq" }, "stable": { "version": [ @@ -38259,14 +38503,14 @@ "repo": "martianh/fedi.el", "unstable": { "version": [ - 20240220, - 1434 + 20240311, + 1417 ], "deps": [ "markdown-mode" ], - "commit": "ffcb84bb132a72c9d787b4f6d8481d27da623d41", - "sha256": "0a5zq7axxh3khx6465s7ym9s7v2iw7ky9z486d0zg41k7926bm9d" + "commit": "b4996a467868b11e7f4ee9c53354131a99bc6bad", + "sha256": "0shh0k73h39yq44yrcqsvci88byrvc52x2r2vgld9fh1kfw9iq66" }, "stable": { "version": [ @@ -38356,11 +38600,11 @@ "repo": "technomancy/fennel-mode", "unstable": { "version": [ - 20240217, - 1848 + 20240313, + 32 ], - "commit": "0997a3853e56bfcd29167687f8ababcf8fd89c36", - "sha256": "0l5a7xgrdcrflv33f4l8sszjn0qnhmnljad5r7iwgsymz7jvav8d" + "commit": "4cdf20b673ed1eb14342d7a470ef75cbe165b0c4", + "sha256": "1hvmcnagrz4zwzadsx406hw0gsn66h5rd5y4891pkc260bi8mcyc" } }, { @@ -38960,11 +39204,11 @@ "repo": "jming422/fira-code-mode", "unstable": { "version": [ - 20220531, - 1555 + 20240228, + 1728 ], - "commit": "7b469ca0c22b7e6a907cd65eebdfa9723998a131", - "sha256": "1jgkgnpi5zmmqmm622p3cl0hj72cbag68c8mbi9bakw2fkq64xm2" + "commit": "c48f3f16a4b497b9e455966561bbb6638efe4900", + "sha256": "0pbbqwms0w7n2blqan7jbk38klc85gwqw3j4w5c90shg9a8xsr01" } }, { @@ -39037,6 +39281,30 @@ } }, { + "ename": "firstly-search", + "commit": "32c60a04989a3d985b963eb3e42fa3a78ea1bd8d", + "sha256": "14pg33kp4kr778py00719c9s7jfpcznmr28mcqdpsf714v5d0xq5", + "fetcher": "github", + "repo": "Anoncheg1/firstly-search", + "unstable": { + "version": [ + 20240324, + 1536 + ], + "commit": "5a5a60ba276c4362c371e44ff1cfa242b94eef62", + "sha256": "1bb4p9jaj7mn451zsx5wzsc9wrkzskg16g4cmxbvsfrlfxzfvicz" + }, + "stable": { + "version": [ + 0, + 1, + 1 + ], + "commit": "93d8b048187ae1e1bac4949c070ed4a8125e74bd", + "sha256": "1qp48fnf4ji8w4xn8sngknk79hwfwlk4cyz0717f0fmvk0wp7ias" + } + }, + { "ename": "fish-completion", "commit": "cbf0664a035ab6419cd78634ca583339c3bd1599", "sha256": "0hnji71fpp91ppy2pvm78r8q1zx5php1gjclhvglcc1hyz47kawq", @@ -39044,11 +39312,11 @@ "repo": "LemonBreezes/emacs-fish-completion", "unstable": { "version": [ - 20231028, - 2123 + 20240310, + 1442 ], - "commit": "99f0672c20ea61d21f106183e80f32c0c6525faa", - "sha256": "037cp4scia8pimn32j70vkf8c6rzipv1nm5r18z5v4lfdbiyyw0v" + "commit": "5e081b3c061cfd91a98aceb035bdc80240e6ff92", + "sha256": "16a9fdjwsh89ar3paprmks89z0ydijn3lqv0r8khmhpa9ljrkrg5" }, "stable": { "version": [ @@ -39505,15 +39773,15 @@ "repo": "wanderlust/flim", "unstable": { "version": [ - 20231214, - 2336 + 20240221, + 1353 ], "deps": [ "apel", "oauth2" ], - "commit": "e9f4c56537704bceb2696c35b98466bc413d8d34", - "sha256": "0xpj3wmsi2jhq442r8s3c0laiyknsnbpysp0amjrk7h6lp87s4rj" + "commit": "23bb29d70a13cada2eaab425ef80071564586a6d", + "sha256": "14ihl59sj829hycbw182byk4npmrsmhcgl98j5v7i81vmxdfrcm9" } }, { @@ -39806,11 +40074,11 @@ "repo": "flycheck/flycheck", "unstable": { "version": [ - 20240224, - 703 + 20240317, + 606 ], - "commit": "ed010752df6ca0092107aeb22ff110306462102b", - "sha256": "09bncjxppn1snciznxm1g11anv40a031rg20ppqms0cxkwjn5acd" + "commit": "0c8de6de03bb1639552007f70a9c66ebdd382496", + "sha256": "0nc5fpggqckpnlxaaf0w517zr6xzamg25yj2hgrp19naqicl7133" }, "stable": { "version": [ @@ -42654,9 +42922,9 @@ }, { "ename": "flymake-clippy", - "commit": "86d2018564549dfa7d67c9bc9fd9a790ec9173c2", - "sha256": "1ccv32dlzrvihq69bi3c2anryj7zafvlpbga11f4zy31qfi6ad2y", - "fetcher": "sourcehut", + "commit": "0a17820e6383af31230cd2853b58ce38e44208e0", + "sha256": "09zkmrn580cdbywz0qrhpylw15m9l1rgfq6kngj6wcsznrl501a7", + "fetcher": "github", "repo": "mgmarlow/flymake-clippy", "unstable": { "version": [ @@ -42704,15 +42972,15 @@ "repo": "mohkale/flymake-collection", "unstable": { "version": [ - 20231231, - 1509 + 20240316, + 2135 ], "deps": [ "flymake", "let-alist" ], - "commit": "852d47f7b4cac7345d40bd16067842e095aee13b", - "sha256": "1r9cif3hpmf8lx4w9ac3lccgq1swwfgzh7slaa7ld0h5mmq9w23c" + "commit": "f1d889f166934a4d8ec0f0e159e179314c2e8791", + "sha256": "0ry8lmbsllsbk5gaywwym5fi1f001g3qzjzwzcz5xq1vim9jzlvj" }, "stable": { "version": [ @@ -42736,11 +43004,11 @@ "repo": "fritzgrabo/flymake-cspell", "unstable": { "version": [ - 20230208, - 2155 + 20240304, + 1349 ], - "commit": "c68bf7eef99ddb2fbd780f175e869df2db5d768f", - "sha256": "05k8aiiik2ws3hdppg6kv8avq2dc7mvn08hs28brrzm3d8h6ma65" + "commit": "a573c07142cd0142c4cc1affd57f96b4d5c229b3", + "sha256": "0qbf3wrx3p1c78jx7lmsz6ayp05hig6p0772mi27drz1yk2x5d8d" } }, { @@ -42961,11 +43229,11 @@ "repo": "orzechowskid/flymake-eslint", "unstable": { "version": [ - 20240202, - 1548 + 20240322, + 2315 ], - "commit": "c783788fc1b6fa9703c623f651f4a72c11923d30", - "sha256": "09isnk70lxbgcfmq8v07fz7ml4pmqdj7g1i3a7k8mpnr1zixrbbh" + "commit": "6ab909b85a8e97815db9831cdd5f283a7830177f", + "sha256": "19jyim5rrmv8bdskaw8gxb6fch3jj3irqhddi2aaxvgdxn321yxm" }, "stable": { "version": [ @@ -42979,9 +43247,9 @@ }, { "ename": "flymake-fennel", - "commit": "9e090e0bf0894ff5b32b020c2b570646cd28a0e3", - "sha256": "1ajzb4wacg2qgqd6jchnxjlpqmp07cams1j5s1my6qyl5m3sgrvc", - "fetcher": "sourcehut", + "commit": "0a17820e6383af31230cd2853b58ce38e44208e0", + "sha256": "0kd9kd00xg89s5gxx24n4agcl0r910kkddmv8f4j8pflp2yh1lkp", + "fetcher": "github", "repo": "mgmarlow/flymake-fennel", "unstable": { "version": [ @@ -43077,10 +43345,10 @@ }, { "ename": "flymake-golangci", - "commit": "76c98b2e204eb2a733295037cbf13b60d1cad97b", - "sha256": "13p29d7b3pchyiw1rbdaif7h6jhzfg635ix8z2kzkqg9bvkxxr7y", - "fetcher": "gitlab", - "repo": "shackra/flymake-golangci", + "commit": "b282ee5729bdcd1d70f798e2d52b68905fdc026b", + "sha256": "1p8w5lhq1h2p2l7ws8hrsf9dgq5dqv1fhc42qf2230xm5scbq2x8", + "fetcher": "github", + "repo": "emacsattic/flymake-golangci", "unstable": { "version": [ 20191028, @@ -43403,11 +43671,14 @@ "repo": "emacs-languagetool/flymake-languagetool", "unstable": { "version": [ - 20240101, - 851 + 20240307, + 419 + ], + "deps": [ + "compat" ], - "commit": "bd2d2c05949e9d892ca1313d1012aff39528218e", - "sha256": "0yz6c028dykvcp8ajnjds63fnlf58c5m5p3w1y9hx3l1hy9qmgx4" + "commit": "73a1814db4cc387854d72828c0e188c9f5b4c661", + "sha256": "03sgfygr0jp3h7lnjl6v7j8rrcj5ib8qrvvijlqpk62vjh2pn4gc" }, "stable": { "version": [ @@ -43517,14 +43788,14 @@ "repo": "flymake/emacs-flymake-perlcritic", "unstable": { "version": [ - 20120328, - 814 + 20240229, + 953 ], "deps": [ "flymake" ], - "commit": "0692d6ad5495f6e5438bde0a10345829b8e1def8", - "sha256": "11r982h5fhjkmm9ld8wfdip0ghinw523nm1w4fmy830g0bbkgkrq" + "commit": "f65ac37608b78ce785808c27fba86a8102a4ff95", + "sha256": "1hyjn4kqf3wcnw4gp859x1kdaf9fin482cws1ln41vld0cv4bqbc" }, "stable": { "version": [ @@ -44302,6 +44573,25 @@ } }, { + "ename": "fmo-mode", + "commit": "2dd41f2de377b64c3ae78ab2f93bf6b9d8dc6f7d", + "sha256": "0hhdxl951vsfz33kfyx2xwjyjd3295jz1nabix3r92shcqxmq9n3", + "fetcher": "github", + "repo": "xeechou/fmo-mode.el", + "unstable": { + "version": [ + 20240306, + 1442 + ], + "deps": [ + "difflib", + "format-all" + ], + "commit": "eb63a36ee8ca0ec985e6fd043db974e6f9b38c83", + "sha256": "1s36a9kv30xs7ac3niq9dz0bany69w8bhl3yqddsryjsyrbdc9i5" + } + }, + { "ename": "fn", "commit": "6d2929604b6dd21d6cf425643927a9c216801dc1", "sha256": "0cb98rxdb6sd0kws6bc4pa536kiyw3yk0hlfqcm3ps81hcgqjhhn", @@ -44478,11 +44768,11 @@ "repo": "jaalto/project-emacs--folding-mode", "unstable": { "version": [ - 20231003, - 959 + 20240308, + 334 ], - "commit": "f6fc3af1de39ac94b1642595232457b9060c3f45", - "sha256": "1s2adff853w1ix0s1zapqcql4vhmyy56rixkcb06niv5pr2pwpg7" + "commit": "b27c4a1d19e8b91777be0e346cc0ed7c73e2c446", + "sha256": "06g07ndxkz1nrbar95aa1vwp0jdz22x4l1j6mx0pllfwffaxn5xb" } }, { @@ -44744,8 +45034,8 @@ "repo": "magit/forge", "unstable": { "version": [ - 20240219, - 1113 + 20240324, + 2106 ], "deps": [ "closql", @@ -44760,8 +45050,8 @@ "transient", "yaml" ], - "commit": "4ec54211b2cb695ad8eb5b395bbc9b522f600797", - "sha256": "1yjbz8d2jq90yn2scgiwad3ycz3jcyprnxgz59rp0j11a26d08rv" + "commit": "2a3b41eb6235b3f39c017c1f86b3928a45c5a64d", + "sha256": "09nxkknp4f66v4s2hyfxyhg2qgzzcpzw7xsb8v16p9k5khnkrh8m" }, "stable": { "version": [ @@ -44979,26 +45269,26 @@ "repo": "rnkn/fountain-mode", "unstable": { "version": [ - 20240210, - 1105 + 20240226, + 245 ], "deps": [ "seq" ], - "commit": "68fa4e62d86e0d636f0aaccd101ba1b887597424", - "sha256": "0skqm9gjf0sjqx8pl2s789rpyady17zwvnda10lxzqv1cg4vn74n" + "commit": "20e2fc4aa62d27a48c092761e77d65b64d55a3c5", + "sha256": "11c09a470v61cwi0662615q8l58sxd2mk6zqbvrp5g14w8470hgs" }, "stable": { "version": [ 3, 7, - 1 + 2 ], "deps": [ "seq" ], - "commit": "e2c0b952b297d99dd16f2d55f883eec8bfdfa896", - "sha256": "1m6xvda2bx5pxzklc0nlzfc9a9fbnvysld2zha59qdjlr9zzi298" + "commit": "561982bde5fc4f53f72cebe53e0eea53051ef0e7", + "sha256": "0xy45inihqwaix49vxr5yiqyps4r2djkzdd4g7kkc0fv7kzrm1m4" } }, { @@ -45631,8 +45921,8 @@ "repo": "FStarLang/fstar-mode.el", "unstable": { "version": [ - 20230506, - 1606 + 20240312, + 1632 ], "deps": [ "company", @@ -45642,8 +45932,8 @@ "quick-peek", "yasnippet" ], - "commit": "56039769454d3b71cad7248d144d04bb6f97a522", - "sha256": "15wfp8yckh5k9sg72ky5fd0mma7ancj26d73anlg2h00njshqpsv" + "commit": "6e5d3ea858f3c8a9d01161d9089909c2b22fdfca", + "sha256": "1z1mcmmrfx1nx3d3374wb7qykzdc3qh9ssgs2wz7b5vnv9cbdfn6" }, "stable": { "version": [ @@ -45827,14 +46117,14 @@ "repo": "jojojames/fussy", "unstable": { "version": [ - 20240103, - 159 + 20240224, + 1641 ], "deps": [ "flx" ], - "commit": "4080b373f3361126d4de1f063bb08718b0c08eed", - "sha256": "1x0vmbxd0ggslkxcam5da586plsjar9v5nka0dbxdkwx6k6n23r1" + "commit": "0f58683355986e3f8d49734cb1f2ecdd71729439", + "sha256": "1hqh656h7gy233d1557qrp4vq9vsalgdn9wa2bsd1c11z46f3r8f" }, "stable": { "version": [ @@ -46480,15 +46770,15 @@ "repo": "emacs-geiser/guile", "unstable": { "version": [ - 20231227, - 1512 + 20240314, + 1950 ], "deps": [ "geiser", "transient" ], - "commit": "6e0811c75d13c3c8488e7a11a018e1ea2ae3288a", - "sha256": "162hfssivp36m58siqszli8sjkfxg9b0dsdpn54alj80sjalkx46" + "commit": "71a6be00433a157de3936f208c7a1bd0192b12cd", + "sha256": "0chwpwl55qbgfig7z4zdd4ly9vj2367b1ll1wg0q41sn34fqgpq5" }, "stable": { "version": [ @@ -46817,16 +47107,16 @@ "repo": "thisch/gerrit.el", "unstable": { "version": [ - 20240221, - 2200 + 20240306, + 1947 ], "deps": [ "dash", "magit", "s" ], - "commit": "f327a5c4ec9f508e7caac622438168ff3bc29fd7", - "sha256": "0pj8g15firy6pqm7plry63i79xp0l9n3c6bx17sln0dv4dyj8z8x" + "commit": "8a98747155712d751239e5699e3a6fd090848b33", + "sha256": "1l02fm864j7ml8anm9ykf9yd5x8r12zrn2p4psadxpzkqa5r5zg0" } }, { @@ -47125,16 +47415,16 @@ "repo": "magit/ghub", "unstable": { "version": [ - 20240218, - 2101 + 20240311, + 1716 ], "deps": [ "compat", "let-alist", "treepy" ], - "commit": "c59de91717c2343ccba3adb9047d846edc35bc36", - "sha256": "02cs2min8kg1rnmjm2kvn2xvbmr7dsl0jgsxknqikc44d73a0ipy" + "commit": "132631529c2e3e75e15608658aed5adfbb6b7409", + "sha256": "11cih7igq5amv7w5k5fql0c0plfmgqnkv5p36a2dl3mzk96d8mkn" }, "stable": { "version": [ @@ -47460,14 +47750,14 @@ "repo": "liuyinz/git-cliff.el", "unstable": { "version": [ - 20240220, - 1913 + 20240304, + 2323 ], "deps": [ "transient" ], - "commit": "0bc7b66d78058f5d41e9adb891d6fb29085153ee", - "sha256": "1szbfxy3lc1y8ax3gbxs5spkdjshrpq537yaxd85n9mrv19s3xv0" + "commit": "be4b22a2c0d638cf1e5d52acc96933a443d0ca23", + "sha256": "0v8jibs3drq2rlmnpjw7ar4zc8fglka53rcqdcmshbq2jh96z0fi" }, "stable": { "version": [ @@ -47523,16 +47813,16 @@ "repo": "magit/magit", "unstable": { "version": [ - 20240221, - 1445 + 20240320, + 2311 ], "deps": [ "compat", "transient", "with-editor" ], - "commit": "09961f67a403c53b62669f40a088d5720dc77270", - "sha256": "0sw5lwk04yi0840yqyga7v82mjkqvflwi3pgsq02mrdbc5w4wx1m" + "commit": "4d378d91d245f68a972626c4076a6558d1c19dce", + "sha256": "0vix49448b79sxvwzxnij2q7nsv525y5qx814k3q0s80zwd4ny2v" }, "stable": { "version": [ @@ -47816,20 +48106,20 @@ "repo": "sshaw/git-link", "unstable": { "version": [ - 20230518, - 204 + 20240303, + 1546 ], - "commit": "aded95807f277f30e1607313bdf9ac9a016a2305", - "sha256": "0mxhmza01837hqq1pfi6jf8y2bw48k74bccddlzngaa22xiz1d21" + "commit": "14156291e0eb7156bd779a80c17e1935a7f8f5e5", + "sha256": "1dxmzk4qrz69h097lwshfg4qavdp92an5212ndhjkpmkgvk1v0xl" }, "stable": { "version": [ 0, - 8, - 6 + 9, + 1 ], - "commit": "f5691f8c66eb0f6050d9ab3834ab32661244b378", - "sha256": "1ifq9z4p0rbz2bpm6qz89xg5ycn5fflsyradzzxzsgyys0zc6szx" + "commit": "14156291e0eb7156bd779a80c17e1935a7f8f5e5", + "sha256": "1dxmzk4qrz69h097lwshfg4qavdp92an5212ndhjkpmkgvk1v0xl" } }, { @@ -47957,14 +48247,14 @@ "repo": "pidu/git-timemachine", "unstable": { "version": [ - 20240219, - 2108 + 20240309, + 1109 ], "deps": [ "transient" ], - "commit": "69474bfc653bb076f94d97d22903e2299a3d8a8b", - "sha256": "02grsmgslvbm67g85iv2xq9jq3wj9xi16gn0dqrgrc96hh63mpjh" + "commit": "5ed73c3831cf6da10ba941e6abba708a86853e8f", + "sha256": "1cx2rqv1c162bpf6dn01arjbyqlaxjgr1a674bsvwjin3rwcx22j" }, "stable": { "version": [ @@ -48984,28 +49274,27 @@ "url": "https://git.thanosapollo.org/gnosis", "unstable": { "version": [ - 20240222, - 1347 + 20240314, + 612 ], "deps": [ "compat", "emacsql" ], - "commit": "6ee271486b9a2c1467434bf6c23cb804f905a0f2", - "sha256": "1d9limkb3ydfbhxdcycqv7nh1qk3kwp35c85c1xlhqh761rcl516" + "commit": "78e066b94809fb7746086a1ca6b7d7c39d353343", + "sha256": "11kj6w1daqhblrmvc2zhzd17j5kq1nzrmn3379f80y9gjp4y1blk" }, "stable": { "version": [ 0, - 1, - 9 + 2, + 0 ], "deps": [ - "compat", "emacsql" ], - "commit": "6ee271486b9a2c1467434bf6c23cb804f905a0f2", - "sha256": "1d9limkb3ydfbhxdcycqv7nh1qk3kwp35c85c1xlhqh761rcl516" + "commit": "3433d348e214cff704c2bef1a855c0ea655ad32b", + "sha256": "0y59cc330348yjfw346smc3fha7r0l7zxppydllax31hmx3g4k7d" } }, { @@ -49709,28 +49998,28 @@ "repo": "grafov/go-playground", "unstable": { "version": [ - 20221127, - 1342 + 20240322, + 17 ], "deps": [ "go-mode", "gotest" ], - "commit": "e70aeb111fbb4487b464a813feb8ecad1542dc1c", - "sha256": "0r7rds41m899ikc6lnjhlkkrhljmazsddk8f050nzngdfb60p3sa" + "commit": "52227ad154249fc0df2e8a53fa9e2c76c5a6fc76", + "sha256": "0c45dmg6xb37baly5s903zbdiv0hw0kb2y2226g1yyfh8hsgw7dk" }, "stable": { "version": [ 1, - 8, - 2 + 9, + 0 ], "deps": [ "go-mode", "gotest" ], - "commit": "e70aeb111fbb4487b464a813feb8ecad1542dc1c", - "sha256": "0r7rds41m899ikc6lnjhlkkrhljmazsddk8f050nzngdfb60p3sa" + "commit": "52227ad154249fc0df2e8a53fa9e2c76c5a6fc76", + "sha256": "0c45dmg6xb37baly5s903zbdiv0hw0kb2y2226g1yyfh8hsgw7dk" } }, { @@ -49911,11 +50200,11 @@ "repo": "lorniu/go-translate", "unstable": { "version": [ - 20230503, - 303 + 20240313, + 356 ], - "commit": "59506f69503cca65291fa5ccd0a326e716338c23", - "sha256": "082xczdxqjbrk0nsl6l0223jh3vhmjni438wa4grv17md1pvxy02" + "commit": "377375c87f64e7d069c8fc310ccfefd8771226f3", + "sha256": "1p5acy25ap0lpnv178xrkz2lyjppsfss8vcqarjpvd1hv40wfv5m" }, "stable": { "version": [ @@ -50539,8 +50828,8 @@ "stable": { "version": [ 0, - 35, - 0 + 36, + 1 ], "deps": [ "dash", @@ -50548,8 +50837,8 @@ "magit-popup", "s" ], - "commit": "d7c0094aa2d4dd3cb0da572106793d11078c5c47", - "sha256": "03ffg4ypfrnj8qmip0cdkgifrxasb1wi05zpvg1mmdyx64sr1f90" + "commit": "cc533e4b14c522d0cc44ee646b0a36c408c10425", + "sha256": "12vd1xzmj9140a4hfkjmxg5mdj9m03nk31yx9yq1mrgjd89xxp6k" } }, { @@ -50703,28 +50992,28 @@ "repo": "karthink/gptel", "unstable": { "version": [ - 20240221, - 811 + 20240321, + 1740 ], "deps": [ "compat", "transient" ], - "commit": "8ba07d042c11cb65ebce69fc1dc069905ec00e5e", - "sha256": "0wfqwp5rz77xzsxb56g4w9h047zb0y06ajcr724b5sjykbbznhzw" + "commit": "12e00cbd092de95ae7f11aa207cd41dd9fabf883", + "sha256": "0ri0saa5750nay1ck46lxa6h21nxh9sgs0n1khr92wda1rinh85g" }, "stable": { "version": [ 0, - 7, + 8, 0 ], "deps": [ "compat", "transient" ], - "commit": "8ba07d042c11cb65ebce69fc1dc069905ec00e5e", - "sha256": "0wfqwp5rz77xzsxb56g4w9h047zb0y06ajcr724b5sjykbbznhzw" + "commit": "5dcbf40066f5b6fba27af7bf610348dbd781751e", + "sha256": "1n3kdylv50filla692j2vcjalw6yza80xlg90cw54m9jp9br8sch" } }, { @@ -51813,11 +52102,11 @@ "repo": "Overdr0ne/gumshoe", "unstable": { "version": [ - 20231224, - 1844 + 20240304, + 525 ], - "commit": "2d91bf3810ee93fad57772983720f77e9f534b61", - "sha256": "0l6hk7q1in9zcclpxd1nsjj7sggg3gzqhj2piffg31xfl7f62r5r" + "commit": "223d19ffbd6296864a775d18025150ccbcbc7800", + "sha256": "1lad09axg7iyk3iclk35fxpdb42s8sxxncfqgpqcc56grin7jq85" } }, { @@ -52044,11 +52333,11 @@ "repo": "idlip/haki", "unstable": { "version": [ - 20240125, - 557 + 20240227, + 1029 ], - "commit": "73fd0027b3ef4ab1b9f368ae5f60676177471900", - "sha256": "0yh8ph27c5rmgxrr91kl02w397h7hf7ldjkjr3p21r75w03hymmq" + "commit": "0854346035d9070d347e4de710af41b293b85fb2", + "sha256": "0xb4bgb6cd92h7s0w440b25jli5ss7j910njrfmp5ifwraxjl0jm" } }, { @@ -52225,15 +52514,15 @@ "repo": "alphapapa/hammy.el", "unstable": { "version": [ - 20231123, - 552 + 20240306, + 3 ], "deps": [ "svg-lib", "ts" ], - "commit": "61188c66897fcab359ee555cd30c384a968af64c", - "sha256": "08b1minjvdd3h2smav5lcpvz8b6qdi73bd8a7n5i8wnzxcqhx2s8" + "commit": "d06064633cb142cd52bfa65400fd243eb656ada8", + "sha256": "1gk7plcykxzi148cm2z0j731ag01fn54sj1k58nqy541n21qgk9f" }, "stable": { "version": [ @@ -52861,16 +53150,16 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20240221, - 1816 + 20240320, + 1528 ], "deps": [ "helm-core", "popup", "wfnames" ], - "commit": "0b355b3cd447df2cf96ad32577b0910770d20c25", - "sha256": "14jyzgz300mx0724agb1jnaixykqrvyblqkik17why0v28jqj2sx" + "commit": "eae4f5a24a2a5d9fac0ec1a9200362bf9efa911b", + "sha256": "1szf9whxq9xd3nn45wg0y6z2xc3g8rcahh3v28aw1v7p7pj5f1y4" }, "stable": { "version": [ @@ -53754,14 +54043,14 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20240224, - 604 + 20240324, + 1909 ], "deps": [ "async" ], - "commit": "56ff07ea90284f5303be5fcaddaaa144e0c3396c", - "sha256": "1dkbrlrnn2lij1fbxbsxaaj29zyf504pv7bjdy1v0pmf1yhxdglp" + "commit": "8068f5301cd1a8495dee6882de99ffec6f89f55f", + "sha256": "0h8g1hjkslhbm371kpsh1gqipl4zlva2fnvgqyspqmgmdpb8g49i" }, "stable": { "version": [ @@ -55370,14 +55659,14 @@ "repo": "emacs-helm/helm-ls-git", "unstable": { "version": [ - 20230924, - 1610 + 20240315, + 1721 ], "deps": [ "helm" ], - "commit": "35b3a548694039463749cc18bd628e8f4e3c8019", - "sha256": "0j762wgwmyls60q8w3g960c0b6ba2l0p91iqylz03ww1ipgixrwj" + "commit": "8b0b9484d43153e0c1a1fb664a14b1a53874e60b", + "sha256": "1ggsx4hvkq7q13pxa4lqxj4s78fm5acl55z7b5c1qrvykkwjdfc4" }, "stable": { "version": [ @@ -59143,14 +59432,14 @@ "repo": "kaorahi/howm", "unstable": { "version": [ - 20231231, - 854 + 20240229, + 1231 ], "deps": [ "cl-lib" ], - "commit": "fc61c312be7cd23c654a02f1f81355d562cd627e", - "sha256": "111l502krbrpzm63kbiblchiav8wv38z11snvcx428xjzpl28q1l" + "commit": "11d05032af3ffb895c7b1a1845fea7ffe3be4fbf", + "sha256": "155zp3hhb8i7dp2f5vz3yca8gzrzg0psxak17rfa9j1lk0zgqyr0" }, "stable": { "version": [ @@ -59763,6 +60052,21 @@ } }, { + "ename": "hyperbole", + "commit": "eeb6ed97ff5b0e63f5f10a4339d8f790806a6efa", + "sha256": "0v48smnd7bm65mjz2waahyi2favbsmynigya5s6xyhx0h6y3apxv", + "fetcher": "git", + "url": "https://git.savannah.gnu.org/git/hyperbole.git", + "unstable": { + "version": [ + 20240322, + 1628 + ], + "commit": "2a10d5edf945a2faa89e59744a3b37ede7496010", + "sha256": "0nqih5cqbcs5l2s2kz57682gmkcajd3h7vlvs7nhkril99s85c9g" + } + }, + { "ename": "hyperdrive", "commit": "e6a45576a099fd1a5c6f9e5761f90153bfc1b33c", "sha256": "1jcjmbm36j5s8w6wi6rxhr2khgwks07q1vfhdr1h20gz9ijikvna", @@ -59770,8 +60074,8 @@ "repo": "ushin/hyperdrive.el", "unstable": { "version": [ - 20240207, - 1949 + 20240226, + 743 ], "deps": [ "compat", @@ -59781,8 +60085,8 @@ "taxy-magit-section", "transient" ], - "commit": "8c41b805a522deb86e8b496090769c7251345115", - "sha256": "1p3pf0fybxv5v5sqhrr1yypjba4sl284px575s87ihcrkfjc9bwj" + "commit": "9895acdd1bc14e9a63e3b6ef050510a67ae59e7d", + "sha256": "04x951f267gca33vjlzq4fh1xk1py9m9v8qkbsygv19rhqicad4z" }, "stable": { "version": [ @@ -60886,28 +61190,28 @@ "repo": "KarimAziev/igist", "unstable": { "version": [ - 20240204, - 1321 + 20240322, + 953 ], "deps": [ "ghub", "transient" ], - "commit": "f83141db9a962cfe039431fa440f9c09ec8034ef", - "sha256": "0kj8kjz9324x4hw52rfn71h6pmb2svvbyzi1mkxzyrhhgwjmzbp4" + "commit": "051a58085cd9593665c59c75208cc10189b53504", + "sha256": "1pcm39n1kgl7h7bqkp7grwgd8fa720ss1px1by07al08g39xq72y" }, "stable": { "version": [ 1, - 5, + 6, 1 ], "deps": [ "ghub", "transient" ], - "commit": "e588d2f625ad5f780572e144145e789a764af1b0", - "sha256": "0vz8xzdl87wvkvlawr0ph9s20r263qks9kp5b7g2hv2zng6wr3x5" + "commit": "051a58085cd9593665c59c75208cc10189b53504", + "sha256": "1pcm39n1kgl7h7bqkp7grwgd8fa720ss1px1by07al08g39xq72y" } }, { @@ -61258,11 +61562,11 @@ "repo": "petergardfjall/emacs-immaterial-theme", "unstable": { "version": [ - 20230219, - 1703 + 20240310, + 931 ], - "commit": "20417eaf6f349b3707e515d5d7817896243a8ad1", - "sha256": "1xymssi0kyipgy9dyda931795xpvr1afnisaccl9yq53rzibwxfx" + "commit": "a0a53a1fd9ca8dfd1d56fb45ab548ad900235a7a", + "sha256": "06ggjnb4dir8zrasskl44hq9r2fcw5gb26gyfh1580zyzjvfp855" }, "stable": { "version": [ @@ -61512,11 +61816,11 @@ "repo": "jcs-elpa/indent-control", "unstable": { "version": [ - 20240101, - 940 + 20240303, + 2359 ], - "commit": "27a545181d629e286009d313c60ce10abc407610", - "sha256": "0i9ny5pfxcjf1bp9jxgsy2k88xgvllc46pbg3niyw4hrvzk9nwbx" + "commit": "4ede831b8680946f8e4a6cafd4f522c464160c00", + "sha256": "0pjd6mdhf5x9nkm2g5bqgav6ii15gs8d74kj3bigqkfv0m3q5s53" }, "stable": { "version": [ @@ -61650,15 +61954,15 @@ "repo": "Fuco1/indicators.el", "unstable": { "version": [ - 20161211, - 1126 + 20240321, + 2029 ], "deps": [ "cl-lib", "dash" ], - "commit": "f62a1201f21453e3aca93f48483e65ae8251432e", - "sha256": "0n933jigp0awba2hxg3kwscmfmmqn3jwbrxcw3vw9aj0a5rg5bq6" + "commit": "9b80c4545fc5c50332b2748c30d492517ae583b5", + "sha256": "1dx93qlzsl5zsinslgybd1lca6962dinzy91ndqijj7sicv9nd0r" } }, { @@ -61821,11 +62125,11 @@ "repo": "nonsequitur/inf-ruby", "unstable": { "version": [ - 20240127, - 1832 + 20240310, + 1803 ], - "commit": "dac615c7fdbb57587465b1c497f8be4c979439e1", - "sha256": "0hw8n62cnxms88nrcyj6rfp3nil7r3l3kjykw7nv366y77mczvir" + "commit": "b88ff8bd5fe2e468de611b0211842634beaeb5da", + "sha256": "1qq5dnaj7nyhllg6kx7h2fgk8bisvn35kc4i2d4xsgpsf11293wp" }, "stable": { "version": [ @@ -62130,14 +62434,14 @@ "repo": "chaosemer/init-dir", "unstable": { "version": [ - 20240216, - 1758 + 20240320, + 2117 ], "deps": [ "benchmark-init" ], - "commit": "3b2320a62e0b2c39ae001381ef3e9ee0d538f146", - "sha256": "1irki93sz709rkp8ma3s6b9hmz99l67mcimqw316vqc583kkj2l9" + "commit": "90abd62ab6d2db311c92671c73228d6d80849930", + "sha256": "1jd0wm6lf6jrrm5c3yd96rwmmxnnzqk89n8c1l6gsnyxb01cnnc0" }, "stable": { "version": [ @@ -62710,11 +63014,11 @@ "repo": "csrhodes/iplayer-el", "unstable": { "version": [ - 20161120, - 2120 + 20240305, + 1633 ], - "commit": "b788fffa4b36bbd558047ffa6be51b1f0f462f23", - "sha256": "0x82mxbc6f5azzg7c4zrxz1q763k8i3y1kfb79xfspb2i64dgg5g" + "commit": "62d3ca74e4f4d4f72f17e9075b06d0ba561ae5df", + "sha256": "0gspa6bmahaqk2vkjx5m6hzr5vcm6r2ks9aybgjw59fkdkp08fg4" }, "stable": { "version": [ @@ -63845,27 +64149,27 @@ "repo": "radian-software/prescient.el", "unstable": { "version": [ - 20231123, - 2208 + 20240226, + 204 ], "deps": [ "ivy", "prescient" ], - "commit": "c0eca3328313f1e93d24e686307516f43a484ba2", - "sha256": "1vj21kcqlsa02nvslmxgxsbv4pc93gakj4x2a6rbk87zl6ccw7pk" + "commit": "c39bf07c56b427bf41aafd7d20eaef5cf3c312b5", + "sha256": "0pfc0ycp4cr9zwkjv3rqfkwkx8p52ad7aq2c60j0qwp3yd0cghc4" }, "stable": { "version": [ 6, - 2 + 3 ], "deps": [ "ivy", "prescient" ], - "commit": "c0eca3328313f1e93d24e686307516f43a484ba2", - "sha256": "1vj21kcqlsa02nvslmxgxsbv4pc93gakj4x2a6rbk87zl6ccw7pk" + "commit": "c39bf07c56b427bf41aafd7d20eaef5cf3c312b5", + "sha256": "0pfc0ycp4cr9zwkjv3rqfkwkx8p52ad7aq2c60j0qwp3yd0cghc4" } }, { @@ -64205,15 +64509,15 @@ "repo": "emacs-jabber/emacs-jabber", "unstable": { "version": [ - 20230715, - 456 + 20240306, + 524 ], "deps": [ "fsm", "srv" ], - "commit": "c52d60d0a1fd209301c8434634259946c61a5f53", - "sha256": "0hncr3jjipg0hvbspzslyswrr7qyxlln3s15z4f7snsaflmrzsdg" + "commit": "633cb73633143ec093c291af94b008f456037e8b", + "sha256": "1agbcbqvfdh0933b1rzsnmv27kfr8ns3202bgpqhnnvpn2dmp448" } }, { @@ -65002,25 +65306,25 @@ "repo": "minad/jinx", "unstable": { "version": [ - 20240223, - 1312 + 20240311, + 821 ], "deps": [ "compat" ], - "commit": "cd63c27767d655319f89432ed1feae1cae12cdab", - "sha256": "02nc3aha4alhw3qm119hciy3xmrk829vgq4a1dxn04m8qf01fpy8" + "commit": "b09efcb85b1a8db8054a3d5a298e8d9516836f16", + "sha256": "0dyfj85h54v3q8fb5sni3xvan78np1xrx4w2mnbsf95z4kac91mh" }, "stable": { "version": [ 1, - 3 + 4 ], "deps": [ "compat" ], - "commit": "cd63c27767d655319f89432ed1feae1cae12cdab", - "sha256": "02nc3aha4alhw3qm119hciy3xmrk829vgq4a1dxn04m8qf01fpy8" + "commit": "b2ef3af2857896e20cff0488c46a4bfcfee39ecc", + "sha256": "14zamk2s20f6dnv23v9snya0mi1bs2nq6xpp5bj06kiymzwhcqjw" } }, { @@ -65274,11 +65578,11 @@ "repo": "ljos/jq-mode", "unstable": { "version": [ - 20240115, - 1512 + 20240304, + 911 ], - "commit": "37028e120041a489eff352b79202361cb232377e", - "sha256": "1dhrcdjc8g830zdx35xv55j1jnrxb9kb6ai76xfg32icr1fyaf4p" + "commit": "d533567a680bc87060c56a50f83d80e58646d2f2", + "sha256": "02bl5v7y64xl14g396yl9z8bb87aldhg8yb4c72jycqf9xkmanai" }, "stable": { "version": [ @@ -65298,11 +65602,11 @@ "repo": "nverno/jq-ts-mode", "unstable": { "version": [ - 20231111, - 208 + 20240305, + 1511 ], - "commit": "0201e351ed0074a72c0987282079c775f3c8fe52", - "sha256": "157f300w61dq9s11f71p4z0nykg8h1f64rnpy3199y6sfjhhglyl" + "commit": "9e6a2aab79a973e1200b8e4b5e6f1762b29b0dec", + "sha256": "082sfn63as6sfsf13ziplyag7nglyc3baf2fk0hwz37y54ada35y" } }, { @@ -65541,14 +65845,14 @@ "repo": "mooz/js2-mode", "unstable": { "version": [ - 20240221, - 351 + 20240310, + 1755 ], "deps": [ "cl-lib" ], - "commit": "e7373b0e0891b2521d8f9b9862b77607317b2f39", - "sha256": "012yc87dv73w9fsccyfdm7ihrc1n39axs4kgw2zj31w48sv1vh1w" + "commit": "e92829da3d6387252a0a5737c0c5344cb3de1578", + "sha256": "163s57j12fcigr096m3rgw07nnhs099dij6x4k9vs3005jy43a8p" }, "stable": { "version": [ @@ -65722,26 +66026,26 @@ "repo": "json-emacs/json-mode", "unstable": { "version": [ - 20240203, - 751 + 20240228, + 1443 ], "deps": [ "json-snatcher" ], - "commit": "bfd1557aaa20b7518b808fdc869f094b52205234", - "sha256": "008dlgqm9l9lk12njig2hbsfqafw42169qdh0z8qq0flqmnm1vqj" + "commit": "72f340d3fb4b796589e75cb5985797a7f177f34a", + "sha256": "1yy440aaf17y6nrlcq0phz0x5j3wcymcrdm8pm0rmwdxfmar0csx" }, "stable": { "version": [ 1, 9, - 0 + 1 ], "deps": [ "json-snatcher" ], - "commit": "a93a0c76784376fbb9105719f25c7489991056a1", - "sha256": "0irz9gpw43wkhiq8828wm9nsc3baqg299dgly9iv7jiygk2lp14s" + "commit": "72f340d3fb4b796589e75cb5985797a7f177f34a", + "sha256": "1yy440aaf17y6nrlcq0phz0x5j3wcymcrdm8pm0rmwdxfmar0csx" } }, { @@ -66062,20 +66366,20 @@ "repo": "llemaitre19/jtsx", "unstable": { "version": [ - 20240214, - 1136 + 20240315, + 1515 ], - "commit": "f2bca05283222e4622b54d1a42b704966b363331", - "sha256": "0hz4h7b1wnq1l7yrcy078yd2qjnsnras1lr2llrangf9gfzrif4p" + "commit": "e2fb775b30c2eadd33413d6b1dbdc41ba155c1fe", + "sha256": "1215g39mryl36ag5l1pbza7ll1wxd5q37kf8m90dddv9kkzag1a2" }, "stable": { "version": [ 0, - 3, - 5 + 4, + 1 ], - "commit": "781d140a8d3115a9567d797ed73ec32e21db4679", - "sha256": "1yci9jhrdlmfi51qvwv2v6p1vl1zaz3xa5h4rx94gv2vi3fvg4v2" + "commit": "cd84f2d021d8fd1b06dc594bea2f7d8ce753ad2d", + "sha256": "1k3rqi3kg84b420m91ycw7r2j42r17jks9a6v0b57lcdcvjbyccz" } }, { @@ -66104,11 +66408,11 @@ "repo": "JuliaEditorSupport/julia-emacs", "unstable": { "version": [ - 20230712, - 1524 + 20240315, + 1726 ], - "commit": "7a8c868e0d3e51ba4a2c621ee22ca9599e0e4bbb", - "sha256": "0xwd4kq69ray6bk8hwjxnqf7myc3mn36chc2l9jn7a0x1f8x6k10" + "commit": "2dfc869ff6b3878407fe7226669dfaae8d38d541", + "sha256": "0hqriyh857rvsdhp3pvv3diikaccf7lrjszpmkaaxjyr0d93p2z7" }, "stable": { "version": [ @@ -66175,8 +66479,8 @@ "repo": "gcv/julia-snail", "unstable": { "version": [ - 20240205, - 2228 + 20240310, + 1510 ], "deps": [ "dash", @@ -66185,8 +66489,8 @@ "s", "spinner" ], - "commit": "ce6994a548c3da051eb9104cad2c1056aa3cf4c1", - "sha256": "0p3wffd2013nd9322k543ql2z9w8826c4basm3w7wq2c1ckf8q2f" + "commit": "a25ce847480a0c2bed24fad3f1ee62904c9c93a5", + "sha256": "07pcdfccsjf51389nivrxiqldvrb2gywqin7s7qy8ci684c6cpzi" }, "stable": { "version": [ @@ -66433,11 +66737,11 @@ "repo": "leon-barrett/just-mode.el", "unstable": { "version": [ - 20230303, - 2255 + 20240312, + 1626 ], - "commit": "d7f52eab8fa3828106f80acb1e2176e5877b7191", - "sha256": "103jwkmg3dphmr885rpbxjp3x8xw45c0zbcvwarkv4bjhph8y4vh" + "commit": "57d854c26033c2f629b63fa4be90236fd3015278", + "sha256": "0lxx22hp1j7q6cjr5ryiymkf7d70pcn5blihrd45h0h5swjx85fl" }, "stable": { "version": [ @@ -66666,26 +66970,25 @@ "repo": "bram85/kagi.el", "unstable": { "version": [ - 20240214, - 749 + 20240323, + 905 ], "deps": [ "shell-maker" ], - "commit": "c32eb03aaf033a23214507d7f4edd31cf0a3f182", - "sha256": "1y6mb8mr5rv8hf11jwdbh89nwpi2y2ibvd7jfrpfbb4dbngyblq9" + "commit": "407781fe4e24e7c57a4751c43b16ae6a69d297f8", + "sha256": "0nfsnx4ll3m8h4pj69kgcc8jn3sbldq3xgj0wkrr4x672fg6nyil" }, "stable": { "version": [ 0, - 3, - 1 + 4 ], "deps": [ "shell-maker" ], - "commit": "6627fc20d297afd80392488651fd46e4df051a3e", - "sha256": "0w1nkk3j3hl2177f4gw4z62wkmq17gdrybsh30i5q6rmq97ilhr6" + "commit": "0570505cff30bf03afc44c4095791c99add9d11c", + "sha256": "013w68r9205m8q5vhzihawqvaliilspkzcs1n7ky9kpfvysqfnbw" } }, { @@ -66801,11 +67104,11 @@ "repo": "meritamen/emacs-kanagawa-theme", "unstable": { "version": [ - 20240120, - 647 + 20240325, + 305 ], - "commit": "7277c9230c27f927fcde3dc5303a8b6704062ecf", - "sha256": "0w3vi358gda0p0ir7yxwxn7j397nqq3rc4v9qwcr3xs1ddj9f678" + "commit": "fcc2960a911c74e041bc04a4c4b7fecf97f3d176", + "sha256": "0npqpbpqy5x4f6zj4gjlg6pv8ip935hv2wffid13rgb6pnd5w27s" } }, { @@ -67280,14 +67583,14 @@ "repo": "tarsius/keycast", "unstable": { "version": [ - 20240117, - 1559 + 20240304, + 1916 ], "deps": [ "compat" ], - "commit": "5ed2e122ee6fb324336ce12f7f260c404db1290e", - "sha256": "0jzxm6h47wn405ra7kk2rjhadngj3jb27xb5j8xri4xxdmdn0mhh" + "commit": "ec90b16baa0e9e7eb43d8c38e6cf6dccf75a95de", + "sha256": "19sjfydyagcr3vh989c8v0payd36qj3al4j00jwaj49qb3ck8g25" }, "stable": { "version": [ @@ -67629,28 +67932,28 @@ "repo": "khoj-ai/khoj", "unstable": { "version": [ - 20240220, - 2212 + 20240314, + 1838 ], "deps": [ "dash", "transient" ], - "commit": "b1c86fee3b5d14f099d2d4b47f411aaa8318d650", - "sha256": "1pyz4k9zky1j3l6bvf0cjw8am093ss5vwpmynvcdgpbgzj49d0s2" + "commit": "fba0338787b3197e22d6b4ea7dc94be153be7396", + "sha256": "1h686dk9ghkx99bcbs1zf4z0pw69h85lr9a85pdm3am8k3rbxg4i" }, "stable": { "version": [ 1, - 6, + 7, 0 ], "deps": [ "dash", "transient" ], - "commit": "b1c86fee3b5d14f099d2d4b47f411aaa8318d650", - "sha256": "1pyz4k9zky1j3l6bvf0cjw8am093ss5vwpmynvcdgpbgzj49d0s2" + "commit": "fba0338787b3197e22d6b4ea7dc94be153be7396", + "sha256": "1h686dk9ghkx99bcbs1zf4z0pw69h85lr9a85pdm3am8k3rbxg4i" } }, { @@ -67875,14 +68178,14 @@ "repo": "benjaminor/kkp", "unstable": { "version": [ - 20231227, - 2145 + 20240227, + 1145 ], "deps": [ "compat" ], - "commit": "cd4b9eb31fcd0393ea5614608e18e20dc3dc95e8", - "sha256": "10q7420n7gs9vl6i55ss1mdl76brl7fj0rrfrcfdc79xfai1qk17" + "commit": "ed9214329f11b095fc7bad06feb329b9f232258d", + "sha256": "1l9fcz0hj0z88rzamwwrslzkm8gpbpqvvghr3bpxjln8i0qgkasc" } }, { @@ -68086,11 +68389,11 @@ "repo": "bricka/emacs-kotlin-ts-mode", "unstable": { "version": [ - 20231222, - 1345 + 20240318, + 1601 ], - "commit": "c884b3442806a21cbcf28ac24853f05da8ac6658", - "sha256": "139a201kd8hg21jrkww86xdjwx4r586cwv9i1ypclb4mswjahgay" + "commit": "5cf2ab3a50ccae4eb23482f5d0a615fa2d22504b", + "sha256": "17qdsfb5vbfk1dfj5314xq3i0k5gk1l9893pqbp8ijad0hs5lvl5" } }, { @@ -68184,11 +68487,11 @@ "repo": "terjesannum/emacs-kubectx-mode", "unstable": { "version": [ - 20230914, - 553 + 20240312, + 2024 ], - "commit": "3153c19a28402a515c53ce22ccc08e750597182e", - "sha256": "1cbh5sipwdvr2a8fq4dxglp1vhsxzqyakvg61hv08nbskqadvh89" + "commit": "b177c0fa9f8471d6199df4598afde1e39e83c504", + "sha256": "0yclqnjlvdhql736yiwwri4gy40b75ll3v6scp6mms4fa5969xd6" }, "stable": { "version": [ @@ -68514,18 +68817,38 @@ "repo": "isamert/lab.el", "unstable": { "version": [ - 20240126, - 841 + 20240317, + 1949 ], "deps": [ + "async-await", "compat", "f", "memoize", + "promise", "request", "s" ], - "commit": "db4c0ec1fb11670ff8218ed088d191e3121a7696", - "sha256": "09n3hsn6w68k7krh7b01rhx084qg998fsxh6n8vsqmpi4mmn4si5" + "commit": "bd88c08c02203a66048412672b894c0d7dab3da3", + "sha256": "0zxxa99n3wh77fm03mpnz2kxhgs6x2gqhznxh2gy5lx1yd8kg7jp" + }, + "stable": { + "version": [ + 2, + 0, + 0 + ], + "deps": [ + "async-await", + "compat", + "f", + "memoize", + "promise", + "request", + "s" + ], + "commit": "bd88c08c02203a66048412672b894c0d7dab3da3", + "sha256": "0zxxa99n3wh77fm03mpnz2kxhgs6x2gqhznxh2gy5lx1yd8kg7jp" } }, { @@ -68628,16 +68951,16 @@ "stable": { "version": [ 2, - 4, - 1 + 5, + 0 ], "deps": [ "eglot", "highlight", "math-symbol-lists" ], - "commit": "5898e7c56ec58a24586d1f48bce02516cd44b0bc", - "sha256": "1b79vc1bk64cda4x6i7f5qih0xajf78wqmvyanjf1v2jqpwbj8aq" + "commit": "3730715c845c0732b912e10e14391350c327b6d3", + "sha256": "0cbs4nhj4lk6sj454vf6kfsljidchhh9h2ayn611kn9xd95hr082" } }, { @@ -68905,14 +69228,14 @@ "repo": "slotThe/change-env", "unstable": { "version": [ - 20230810, - 542 + 20240318, + 855 ], "deps": [ "auctex" ], - "commit": "968f38f0699c72ed5e8be2d0531424d16280f0f4", - "sha256": "04ivfpp1rm4zf47s11qkc9g1dnvymy5xm62q842g77icf12vgv0m" + "commit": "8b6bcd562c8ba5753551f7a6837b01b562b6439a", + "sha256": "0qqhxbxynii3sqywqvni9i0r32jrnljriky0fsfs8bf1sndzpdc7" } }, { @@ -69550,11 +69873,11 @@ "repo": "ledger/ledger-mode", "unstable": { "version": [ - 20240117, - 1230 + 20240324, + 1619 ], - "commit": "11e748d4838d51772f531a75849349ed8cd939ed", - "sha256": "1k64n4iickm40v6h89kqqz579b8idsgqzhmmg8da6ahxk1kgghf1" + "commit": "34a74306ec9e0f542fd421fd4b7edd2e99d8e94d", + "sha256": "1fpgzkjszyd4nrxp0qxn8r7475rzplvz7clm4j4agv7nzjkp8m0m" }, "stable": { "version": [ @@ -69642,27 +69965,27 @@ "repo": "martianh/lem.el", "unstable": { "version": [ - 20240223, - 949 + 20240313, + 1154 ], "deps": [ "fedi", "markdown-mode" ], - "commit": "97db37fcb62d44a6bcab4fa8411a32cd902c2076", - "sha256": "1fm6bk69b9nhyvxdsm9d7zcbnwg5n659bl35ywvz8xlh87ymjz23" + "commit": "48caf7b856efc0c98f5d735dc605fbe0db793ec5", + "sha256": "181n1ng8nlx3dkj9lhjjva80a9i4xz6lj3yajzmf36y2b35va6s9" }, "stable": { "version": [ 0, - 17 + 22 ], "deps": [ "fedi", "markdown-mode" ], - "commit": "97db37fcb62d44a6bcab4fa8411a32cd902c2076", - "sha256": "1fm6bk69b9nhyvxdsm9d7zcbnwg5n659bl35ywvz8xlh87ymjz23" + "commit": "0e7372d4ce133aff7d0a2b79d1f66e5e1e9efc07", + "sha256": "12g16gq9qawhlj92jgxr2l7xcc0ikvmwsygjcr3qyxy0bawynzr8" } }, { @@ -69688,15 +70011,15 @@ "repo": "phillord/lentic", "unstable": { "version": [ - 20221201, - 47 + 20240303, + 1456 ], "deps": [ "dash", "m-buffer" ], - "commit": "6af878392e127e75409ae0f4bc08837a8f591d88", - "sha256": "134rk1kcfkqnzhn51c0vvkj4839d5lbn0g61bqfpkgsvfpn05wh4" + "commit": "180c1082c016de790f9e6596b63329657c83ce20", + "sha256": "0kq7j6cx4jgaj8ll3vyfwsbcwmfrq4rvqq1ipsskzwlgigwynxzn" }, "stable": { "version": [ @@ -69721,15 +70044,15 @@ "repo": "phillord/lentic-server", "unstable": { "version": [ - 20160717, - 2052 + 20240315, + 144 ], "deps": [ "lentic", "web-server" ], - "commit": "8e809fafbb27a98f815b544d9d9ee15843eb6a36", - "sha256": "1wc1c6hqhbb5x4fi7lp30bsrfww9g12c41lphswy92qzlij4zbww" + "commit": "732b88e7a183707ba65c38e8b3517cac42572644", + "sha256": "0r5n1xm21y1xi3pm6x107l9njcgh5207vc4imwgk4xh5axblmcfl" } }, { @@ -69831,20 +70154,20 @@ "repo": "fniessen/emacs-leuven-theme", "unstable": { "version": [ - 20231108, - 1108 + 20240304, + 1034 ], - "commit": "ab33c7a526573e1392f7faa22e87735d3706866c", - "sha256": "123jqcgg7wam7ym51sd1wc4qvz16qbq7k30pvy3138z9h5kmizac" + "commit": "04ac63e73f060edcb1bf5fadad3466c3ab557d47", + "sha256": "0g95z1khr1g4sr5ppzqxnakm2hkfxhavw1rl03r99csqj9qppv4c" }, "stable": { "version": [ 1, - 1, - 8 + 2, + 0 ], - "commit": "ab33c7a526573e1392f7faa22e87735d3706866c", - "sha256": "123jqcgg7wam7ym51sd1wc4qvz16qbq7k30pvy3138z9h5kmizac" + "commit": "04ac63e73f060edcb1bf5fadad3466c3ab557d47", + "sha256": "0g95z1khr1g4sr5ppzqxnakm2hkfxhavw1rl03r99csqj9qppv4c" } }, { @@ -70851,14 +71174,14 @@ "repo": "Fuco1/litable", "unstable": { "version": [ - 20221028, - 1640 + 20240321, + 2059 ], "deps": [ "dash" ], - "commit": "0a75befedbf826c9779f83500792b044658f2374", - "sha256": "14612mv4m8zrh0skshnbcl47dvd9ih2jn80svyyq3hg7dxvmh5wg" + "commit": "b83b1283ea6642ab82f536f1f3b280160404ff6b", + "sha256": "09jk7316vi5v6bsp0dc515x2j1kpvww4j6v5ry3dwqaifr7gi78b" } }, { @@ -71107,11 +71430,11 @@ "repo": "donkirkby/live-py-plugin", "unstable": { "version": [ - 20231219, - 314 + 20240304, + 1642 ], - "commit": "a7529311e9a60b26b562a98f00feeb09ef640afe", - "sha256": "0qvzky3bihgimym84k14gd8fa57cgvqq8y7wsic6kjdhqq3qchhf" + "commit": "eafd9848fe6eeea14373c6969c3bd9e5e0838fe2", + "sha256": "0qzrv3m7drigvfzg7f5w26aksqy5nk47s8mzhrs3dlg9597xdkn0" }, "stable": { "version": [ @@ -71221,14 +71544,11 @@ "repo": "tarsius/llama", "unstable": { "version": [ - 20240101, - 2218 - ], - "deps": [ - "seq" + 20240312, + 1636 ], - "commit": "05c14ca9bcc63f4afa27fc18df1c32ab63b8ed7b", - "sha256": "1a4b2whjv1lnnz1wmqj9g0l2hk41rgi9njqmjssgwlf3484bcq79" + "commit": "e73736d3bd3a8284a2d48266a0cfdb0c9b9217e4", + "sha256": "0f3ysf9rpy1pkg9czl8lblp97l1prv7qb6jsgs206mwbyg1lar15" }, "stable": { "version": [ @@ -71801,29 +72121,30 @@ "repo": "okamsn/loopy", "unstable": { "version": [ - 20240220, - 114 + 20240310, + 50 ], "deps": [ "compat", "map", "seq" ], - "commit": "fc0296ca155c32ad3455f36602b7b34f2163bfd7", - "sha256": "0pk9vp28mdcwbycj2bdqagzjadl3xavsvl86xmil8g15hkym4m1r" + "commit": "de9a2933f4794d13236236db6165403d722e5105", + "sha256": "0ngmp81jd9fnvninw0v52535570np5jy194jwfqz6sp7b7394ijv" }, "stable": { "version": [ 0, - 11, - 0 + 12, + 1 ], "deps": [ + "compat", "map", "seq" ], - "commit": "771c1d1edd4dfec96b576b1d2b551e4aae066dc9", - "sha256": "1z1bi1ms5508iv5w1jmmlml2fay21dhgl2lzbv2is5mnkkv0s6di" + "commit": "c7a9660df036ca3ba947fb877c0a05589d95f658", + "sha256": "02g4ic394jwbaskyy2knahf2x2jig1y98cpgfasf3gvl6gkhsk2p" } }, { @@ -71834,28 +72155,28 @@ "repo": "okamsn/loopy", "unstable": { "version": [ - 20240220, - 114 + 20240225, + 1740 ], "deps": [ "dash", "loopy" ], - "commit": "fc0296ca155c32ad3455f36602b7b34f2163bfd7", - "sha256": "0pk9vp28mdcwbycj2bdqagzjadl3xavsvl86xmil8g15hkym4m1r" + "commit": "eeebd2713d636b3cf08c6af22f46d23b9aa06592", + "sha256": "104vwcxcypib6w8706x27szdc2a40mcbz7kakkpk8qhvg5an6gq3" }, "stable": { "version": [ 0, - 11, - 0 + 12, + 1 ], "deps": [ "dash", "loopy" ], - "commit": "771c1d1edd4dfec96b576b1d2b551e4aae066dc9", - "sha256": "1z1bi1ms5508iv5w1jmmlml2fay21dhgl2lzbv2is5mnkkv0s6di" + "commit": "c7a9660df036ca3ba947fb877c0a05589d95f658", + "sha256": "02g4ic394jwbaskyy2knahf2x2jig1y98cpgfasf3gvl6gkhsk2p" } }, { @@ -71985,8 +72306,8 @@ "repo": "emacs-lsp/lsp-docker", "unstable": { "version": [ - 20231121, - 1644 + 20240318, + 2039 ], "deps": [ "dash", @@ -71996,8 +72317,8 @@ "s", "yaml" ], - "commit": "60e1103ac7c8e30d036ea65fad489210682d6259", - "sha256": "1y3x2p0f7c2igg9cckk2g5x5cpypa9f2iyfi9ai0hdx60n7gkmrm" + "commit": "5554349883af05fd25d6bbd56d7116d7f965d493", + "sha256": "1ybcnha6kbqcx7jrm666jbrnw5hkbws7n541zl2d4jl1gpv09g5y" } }, { @@ -72040,8 +72361,8 @@ "repo": "emacs-grammarly/lsp-grammarly", "unstable": { "version": [ - 20240101, - 847 + 20240229, + 115 ], "deps": [ "grammarly", @@ -72050,8 +72371,8 @@ "request", "s" ], - "commit": "7b3597e19c50452124f532c3c47f40c0e33f6e91", - "sha256": "1xxyyfpn8dnqciypl826k6nimsjng1cyy68i8fypcvay88001qdp" + "commit": "39deb23b282785eaffc6ae17838c92c613a49315", + "sha256": "0f2kj2d64b9rqz9jf38629b5hwvp7wscbc646ydfmwib5f2m723x" }, "stable": { "version": [ @@ -72273,28 +72594,28 @@ "repo": "ROCKTAKEY/lsp-latex", "unstable": { "version": [ - 20240215, - 1159 + 20240324, + 1218 ], "deps": [ "consult", "lsp-mode" ], - "commit": "11935eb414b1ef81af2dd34d11e79c5490cd67f3", - "sha256": "0gr5v9cbhiqwp8hs8di5dlc6gq2ka26bi9fljldl1421yxsxyl0m" + "commit": "30e5ee2a387bee7b320564d402b3e587cdae536c", + "sha256": "0zfg35mq3a1550l2ds6wg5flxc04fq600apz3z5zfq58qqdiah8k" }, "stable": { "version": [ 3, - 6, + 7, 1 ], "deps": [ "consult", "lsp-mode" ], - "commit": "11935eb414b1ef81af2dd34d11e79c5490cd67f3", - "sha256": "0gr5v9cbhiqwp8hs8di5dlc6gq2ka26bi9fljldl1421yxsxyl0m" + "commit": "30e5ee2a387bee7b320564d402b3e587cdae536c", + "sha256": "0zfg35mq3a1550l2ds6wg5flxc04fq600apz3z5zfq58qqdiah8k" } }, { @@ -72305,14 +72626,14 @@ "repo": "emacs-languagetool/lsp-ltex", "unstable": { "version": [ - 20240101, - 851 + 20240318, + 224 ], "deps": [ "lsp-mode" ], - "commit": "ef649bfaeea2931ef41d7c27b819ea9c41b6fba6", - "sha256": "0841jbz2aiwzi5agwrj819wx2v5ml1fgbwgsdnn8z9c9l5gcrvk2" + "commit": "c4bc1515be815b58d76bed2dbc5e7c400c37d6be", + "sha256": "0n2vgwag68wsszmjid0zz0jip7nb03chs3v1vh0zm15y0ri0rjl3" }, "stable": { "version": [ @@ -72382,8 +72703,8 @@ "repo": "emacs-lsp/lsp-mode", "unstable": { "version": [ - 20240222, - 1726 + 20240324, + 1820 ], "deps": [ "dash", @@ -72394,8 +72715,8 @@ "markdown-mode", "spinner" ], - "commit": "9d3ff6faaf4c0273640df1e989abd6613736870d", - "sha256": "1p1vvpp9zqxqhrw2iidxw1r5pzjbm8c550yjnb0syyppkvx4rj7s" + "commit": "17e583c253e0cba71ee8a0c25743933c478d5c62", + "sha256": "168dpcmjvv590awqzlv5hfc2lpwx1nwn830cqy55nnds4gvmp23s" }, "stable": { "version": [ @@ -72657,14 +72978,14 @@ "repo": "shader-ls/lsp-shader", "unstable": { "version": [ - 20240101, - 952 + 20240229, + 111 ], "deps": [ "lsp-mode" ], - "commit": "65b90c66222043dfed07e193670eb8e9e9a396b5", - "sha256": "1kvp5bbq8xs4mqs991zqrrbn7hilnmy6fbykzh6ck9smrw80r77r" + "commit": "02fdc6d74e931db52ba1aa8dcce17d0a26049242", + "sha256": "1ky5rds4mvfnpibp4n9zmlczlccncwjhz4ylrzs39d2rlfw953qn" }, "stable": { "version": [ @@ -73088,14 +73409,14 @@ "repo": "phillord/m-buffer-el", "unstable": { "version": [ - 20220719, - 1850 + 20240302, + 2255 ], "deps": [ "seq" ], - "commit": "d2e35bf9293367f1a2d19f259f32a35bd9f4788b", - "sha256": "0b961hwyrbabrf732859aqbi3n9s237cx7j96baq9yf2azi6a9fb" + "commit": "8a51de3366599e7fa52e37b596c9ce226b6f04c5", + "sha256": "1v632j4c2k8ram18ayaq64rf01y102a40rh9mvrzzvmf2jkmcw6p" }, "stable": { "version": [ @@ -73165,14 +73486,14 @@ "repo": "amake/macports.el", "unstable": { "version": [ - 20240113, - 1224 + 20240321, + 2352 ], "deps": [ "transient" ], - "commit": "75604bb57040be06eabf41669e6e2553afa8f7ba", - "sha256": "1vkis7ahl08n9xfdisf2w2p0aih3jmb1apcccsaqy5b7bn9dc381" + "commit": "a5ef9d69ff04f5dc62c5a48c5119d96ab3e4d62a", + "sha256": "1qwpj4qmq31270r0n17dfkwskxcyd5ysg78f2yggb9zfk5vvdn1d" } }, { @@ -73206,14 +73527,14 @@ "repo": "emacsorphanage/macrostep", "unstable": { "version": [ - 20230813, - 2123 + 20240320, + 2226 ], "deps": [ "cl-lib" ], - "commit": "0b04a89f698c335c9ea492553470a8d45c113edd", - "sha256": "1735wqjb1n5q0pckh2sch2vqr7z2ycl6ns4rr5q3wvf5njpb22sv" + "commit": "b56965e66c82b529ac752fa2abe6ffa3a1dbef58", + "sha256": "1d3xnbmg6vz42y9327kapd14f4khnm1ii4bbskcwpimirnr9bnk0" }, "stable": { "version": [ @@ -73349,13 +73670,13 @@ "version": [ 0, 3, - 0 + 1 ], "deps": [ "compat" ], - "commit": "688451a7616032a6c1a98ec627860e1d4257814b", - "sha256": "0bcp4vlhw2nvqfb4rl4iq05hghqwandkbvyp36992jnm9r7l149a" + "commit": "6ac83927a6c294619bb99cb1ceb2ecf352498599", + "sha256": "0x70dd12w0p44c7b5273fwi51sr2giqcl230170v8vk9rn73p12i" } }, { @@ -73366,8 +73687,8 @@ "repo": "magit/magit", "unstable": { "version": [ - 20240218, - 530 + 20240320, + 2336 ], "deps": [ "compat", @@ -73378,8 +73699,8 @@ "transient", "with-editor" ], - "commit": "f5ddce8c8459ffcbb2bd3ae759259d6b627c69cd", - "sha256": "0r3x70rhnacs4yd8kh58bqgs6mha294j22vmwk9jzwhfxqwy63v8" + "commit": "0e8f25a8d8011328f2bf082232c720b24c2a12c2", + "sha256": "0x8qqfpxl1mr8s3q8z38bfng4raxkhnr7djymyagisbblnbxr9zj" }, "stable": { "version": [ @@ -73648,6 +73969,26 @@ } }, { + "ename": "magit-gptcommit", + "commit": "674e68c28ee0e12e6f2b217b7d140eae22473d16", + "sha256": "1mrygbjhha0kyl7jydhc3ycmmq6wpp6kb4sw7gjzbikw3vhqhgba", + "fetcher": "github", + "repo": "douo/magit-gptcommit", + "unstable": { + "version": [ + 20240303, + 1649 + ], + "deps": [ + "dash", + "gptel", + "magit" + ], + "commit": "28485542a14966141208daf6baedb3833ad2357d", + "sha256": "0wl1hccwalrm585kv5jin8975jmymff9xl8jw6rnw1bdrn59a4wl" + } + }, + { "ename": "magit-imerge", "commit": "e78a5c27eedfc9b1d79e37e8d333c5d253f31a3c", "sha256": "0rycmbsi2s7rjqfpcv794vhkybav7d8ikzdaxai36szxpg9pzhj4", @@ -73869,15 +74210,15 @@ "repo": "magit/magit", "unstable": { "version": [ - 20240221, - 1835 + 20240311, + 1407 ], "deps": [ "compat", "dash" ], - "commit": "039a1801efd2c75412de65d7b6a36e39361938af", - "sha256": "1cmb6glxzvvngycvxlp0vxbdxprxa5kh3f0yk4ydx9pzbbwdkspa" + "commit": "8a3c1ccdda8185255ce76adc2ba41b9a43f18b8c", + "sha256": "11srw91xq20cv0zd41cvb4pi5x4hdxphsq5y7p8cpxfkvxzvh0nq" }, "stable": { "version": [ @@ -74009,8 +74350,8 @@ "repo": "alphapapa/magit-todos", "unstable": { "version": [ - 20240213, - 1759 + 20240321, + 759 ], "deps": [ "async", @@ -74022,14 +74363,14 @@ "s", "transient" ], - "commit": "1e9acc0ba63fbc297001bf334d63cb4326be80df", - "sha256": "0jh4ii4hbyq5rhkrq17y2wddl20d8xzixwix1p3pigvby4qv30ij" + "commit": "332ce763f7336ea356964b92723678aa1ed4640f", + "sha256": "0npqns8fy0brxp8mcxbzf7n0ssrz0gb0h8ggqdfc0csal1bjs283" }, "stable": { "version": [ 1, 7, - 1 + 2 ], "deps": [ "async", @@ -74041,8 +74382,8 @@ "s", "transient" ], - "commit": "a2396aaead5bc7712278260f245c740195c4afd2", - "sha256": "1y5l36ig0q5dqgijw916zgaz68kphg7k6kxs560vrfwkfn0cy59d" + "commit": "a9f47dd8ad81b96be866bccd6c99358525408b4e", + "sha256": "1ygn1498ji785bkbi7ziazk1bkzinq5srpjh2yhw70v3cr5sfk8g" } }, { @@ -74697,14 +75038,14 @@ "repo": "minad/marginalia", "unstable": { "version": [ - 20240105, - 701 + 20240323, + 2015 ], "deps": [ "compat" ], - "commit": "ea356ebb1ddb8d6da78574b517155475cf52d46f", - "sha256": "15zq9071f1dd6a26x4y51yk9l5rkwb3vnm6qa7z8gvhhj15n8glb" + "commit": "3275d1f85cb020280979a050054b843f7563aea2", + "sha256": "0lljik22flx6khc26xyk8qr91p883mgh29fl8rnyyvdlljlsj33a" }, "stable": { "version": [ @@ -74839,11 +75180,11 @@ "repo": "jrblevin/markdown-mode", "unstable": { "version": [ - 20240107, - 831 + 20240318, + 1307 ], - "commit": "e096bb97a91fcd4dc2b46d8b6e093194b03b7364", - "sha256": "1bzinzr94637kl8aqk2jxmhj57jabq5xjs8fqnmi39an2nv98bh0" + "commit": "fd6c5508f979ab526e024a591eaec963712cb211", + "sha256": "15vip2y7lgypnipyabrq1qlqwg6s3365gsfij3bipxbnx2p9n1p1" }, "stable": { "version": [ @@ -75169,28 +75510,28 @@ "repo": "martianh/mastodon.el", "unstable": { "version": [ - 20240223, - 1703 + 20240309, + 1753 ], "deps": [ "persist", "request" ], - "commit": "25bae1042ff59efa516d6443a729453dc023dd11", - "sha256": "03x7r2hcd4m6xq21yignm04c9g4l732bs9cbig46k5rhvqsk7nnj" + "commit": "90aeac60805ed49da29781b979b6ab3edab671aa", + "sha256": "1l4arid01m5475wq4sy8j598ww13847sbpg9grl71r72rs83071w" }, "stable": { "version": [ 1, 0, - 16 + 18 ], "deps": [ "persist", "request" ], - "commit": "25bae1042ff59efa516d6443a729453dc023dd11", - "sha256": "03x7r2hcd4m6xq21yignm04c9g4l732bs9cbig46k5rhvqsk7nnj" + "commit": "90aeac60805ed49da29781b979b6ab3edab671aa", + "sha256": "1l4arid01m5475wq4sy8j598ww13847sbpg9grl71r72rs83071w" } }, { @@ -75443,11 +75784,11 @@ "repo": "dochang/mb-url", "unstable": { "version": [ - 20230811, - 442 + 20240229, + 730 ], - "commit": "a9f1e8ab46858c35a600ce304748a7db65400bef", - "sha256": "1bihsi0qlvkz817jbbw3352rvmb9iy73l4m9gqr33ca3sxs6qavq" + "commit": "13517d8bee3001d6208ad5255237880f19d4f1e5", + "sha256": "1rnrx8l91f96k719zkjxnz3hr6wasl6x5m4kkkhzk3iqgvvpsnys" }, "stable": { "version": [ @@ -75905,11 +76246,11 @@ "repo": "meow-edit/meow", "unstable": { "version": [ - 20240210, - 1644 + 20240321, + 931 ], - "commit": "54d4e933039827c158a4f593a94681a64e0d8042", - "sha256": "0xv6wg4lyi5bv68h5hk5hfxdwxa2g3ybxd8z0l420az4rnhr6zhq" + "commit": "59c058c3ccf55badda65d55a56aa30cd025441c7", + "sha256": "1wx6p4a7p8rl8hp3ylcw7z9cjrvyxi66lkn4wb4khvlz45c75f0n" }, "stable": { "version": [ @@ -76387,11 +76728,11 @@ "repo": "kazu-yamamoto/Mew", "unstable": { "version": [ - 20230415, - 633 + 20240305, + 27 ], - "commit": "47886a3b6bc64e5822546318e5a3dd0ff5eeb967", - "sha256": "0avzxdlj027pyfs3is8kj4kwgyrl2b6r2n7a0pcbag09f71f8nhi" + "commit": "d41dc93785d231f1e391ba61893aacd1331d5726", + "sha256": "1amz0d27xik7zx3mkfr08v5izjvqiabw08x6yzlw60hjx9pafzzl" }, "stable": { "version": [ @@ -76457,11 +76798,11 @@ "repo": "purpleidea/mgmt", "unstable": { "version": [ - 20240122, - 2052 + 20240305, + 605 ], - "commit": "a8f194259bd36e63410f972b210542fa0cfb67ce", - "sha256": "1g9mm5i0z8q0abpw1ji9bsjydylxrws39qy5ncbqhqjdvbards7j" + "commit": "90f6d4e5630ab69d737fdf7f17c81843a9c6a081", + "sha256": "0a9w5mg5jfbjvkljmqrn1jicfffc888g1ngdipqqvq85hfpcdz44" }, "stable": { "version": [ @@ -76481,26 +76822,26 @@ "repo": "yoshinari-nomura/mhc", "unstable": { "version": [ - 20240206, - 1129 + 20240311, + 1117 ], "deps": [ "calfw" ], - "commit": "244cc9089a95b83200c4121b235448dc6d3730cd", - "sha256": "0rd5dxqhzyki60vlnf10mhf3nqhq9inh56m4k92lp4865xsds7pp" + "commit": "79ab5687cd4e979d2613f5515c8016058ca9b3c2", + "sha256": "16b4a82j8qbcmqx4a21fhj47q7p2cq1vjqmbsw6wxg1bxlcc6z2g" }, "stable": { "version": [ 1, 2, - 4 + 6 ], "deps": [ "calfw" ], - "commit": "33d8ca1a1beb2b63e720e17525bdda3cc878e5ed", - "sha256": "1786r9jfxdsnbb7icy0ndg28p8srkr6mn3zs2r7iibr2ysk3rjvp" + "commit": "79ab5687cd4e979d2613f5515c8016058ca9b3c2", + "sha256": "16b4a82j8qbcmqx4a21fhj47q7p2cq1vjqmbsw6wxg1bxlcc6z2g" } }, { @@ -76702,20 +77043,26 @@ "repo": "liuyinz/mini-echo.el", "unstable": { "version": [ - 20240220, - 1934 + 20240311, + 2001 ], - "commit": "f25a2f543b3e9fa5043ef37c81c17fc15aceb534", - "sha256": "1nbwwf087v1mp5vbmasxqnmbrsgzgm87yd5ajq1hnfxd412w3vhx" + "deps": [ + "hide-mode-line" + ], + "commit": "9b3fd955e04ec168fa769a79cb9f480e84f90ffd", + "sha256": "1dw1l3w9y9p0128ywazlglbbxmsmzhngj1q1x640k174vlwx48hg" }, "stable": { "version": [ 0, - 7, - 2 + 8, + 0 + ], + "deps": [ + "hide-mode-line" ], - "commit": "f25a2f543b3e9fa5043ef37c81c17fc15aceb534", - "sha256": "1nbwwf087v1mp5vbmasxqnmbrsgzgm87yd5ajq1hnfxd412w3vhx" + "commit": "9e01966d56514aa1fe9b7cc281da390ab33532d1", + "sha256": "0q4hvbypnjg5q1szwki2md45r5kkdxrr4zxqh57y7d53idjzhpnf" } }, { @@ -77415,20 +77762,20 @@ "repo": "DCsunset/modaled", "unstable": { "version": [ - 20231028, - 1648 + 20240302, + 12 ], - "commit": "22e10677eb359a2dfb1a989a1beb62ef809d51c5", - "sha256": "086p9706gb0wfai8nsi49rsgkjjrfbi4hl1qf0v9r8w3xfqpb201" + "commit": "0d8f8941f3e31a19641db4b21dd7d963c514ec92", + "sha256": "0vylps3x6jqfy8la1hq3969qms2pcmrcg8dnsbbydinngvh46szn" }, "stable": { "version": [ 0, 8, - 1 + 2 ], - "commit": "22e10677eb359a2dfb1a989a1beb62ef809d51c5", - "sha256": "086p9706gb0wfai8nsi49rsgkjjrfbi4hl1qf0v9r8w3xfqpb201" + "commit": "f372a5759e40b79bb4868d12209a5eb7dc661a54", + "sha256": "0kiksf8kax0l33aqag9igmwkm0yccmijzji4ff2bcil2dmxcj47r" } }, { @@ -77690,20 +78037,20 @@ "repo": "protesilaos/modus-themes", "unstable": { "version": [ - 20240223, - 712 + 20240322, + 519 ], - "commit": "5d57c7354bec2d62e4c962ab47101bd604aea438", - "sha256": "00km2b9zab5l109w0qf3qak4r5a8fr3wych7wkfk2d2ljs8brz4c" + "commit": "bea2f68833e1f46ef60eba25f67a8ab162e7bccb", + "sha256": "1h4wzarzgk06v14xxsya0fym4bd17vgmkw3skd8sc81bak2fb74d" }, "stable": { "version": [ 4, - 3, + 4, 0 ], - "commit": "fe08a02c4c0501a984b15af3f8c3c5e4769b93ad", - "sha256": "12i32y7y6hcv7mqc6g7pcmxr2f54xf3vl2yavdv76643vlhay32v" + "commit": "a082d7739f627523c6d9098c869cf143fa60b014", + "sha256": "1vy6wyq8hv8fih4m8m1k9n7fdp913nmv0k5g8vppnjivmnrwfswy" } }, { @@ -77714,11 +78061,11 @@ "repo": "kuanyui/moe-theme.el", "unstable": { "version": [ - 20231006, - 639 + 20240308, + 921 ], - "commit": "1872aebc016e1c1a8d4e2a4037cd54b618de5453", - "sha256": "04hipaz7wc46axnjqgbwzcjghiyw9fc6kslifs3263h96cfxib0m" + "commit": "56286c6b869520807596e3e8af1b37c50e5a1349", + "sha256": "122zn5hvpc56cg6c8h6j9v2cqimzrqlrr49glqfw9wix648xapzm" }, "stable": { "version": [ @@ -77941,11 +78288,11 @@ "repo": "oneKelvinSmith/monokai-emacs", "unstable": { "version": [ - 20220117, - 1244 + 20240324, + 1830 ], - "commit": "4a09c59f948ba5b602b6f395e667f53224fd75a2", - "sha256": "16ykswl0nxhva6njidz6scgnp5g7rr40zvscy060f09jqasbwxwq" + "commit": "df6c23d14e52f9d7f5bc2265facfbedfb07a444e", + "sha256": "0l0cc5qxr9fg7qs2fs2yk0nbgm6xnp2i0wvyxdnjzz6mz6c84ngk" }, "stable": { "version": [ @@ -78052,14 +78399,14 @@ "repo": "tarsius/moody", "unstable": { "version": [ - 20240102, - 1542 + 20240311, + 1617 ], "deps": [ "compat" ], - "commit": "622a5316cdced84dbd0559443bb86bb635692a0a", - "sha256": "11hxzz1yc63yx7pfcn18b7fffajfc494ci2x4dcxnzw84qzssds2" + "commit": "65116ee9a8d8ca5a9e1e579b5957e0e7673c1dfe", + "sha256": "196r6nwfjj0gj1b356gb0snqq4iqkv0k35nd17mmg48qdl517n4v" }, "stable": { "version": [ @@ -78352,19 +78699,20 @@ "repo": "amnn/move-mode", "unstable": { "version": [ - 20221205, - 1433 + 20240309, + 2223 ], - "commit": "fa34fbe977d62c8297abc3547b9cfb25802e033c", - "sha256": "1qxnkdvn0d2ybrkwm57wn0k5y1nr6sc82i9n3s2306anyflvn868" + "commit": "b07983c8df12fa428117cea8e09067ae952871d9", + "sha256": "09dnxmx0rc3v26fhi5s9f7ri05fx9p02m284qhkgr82ipdn0whnb" }, "stable": { "version": [ 1, - 0 + 0, + 1 ], - "commit": "87aabaac939b69bfd4cd23704e3b67f59c461358", - "sha256": "0sdb783i0rg1fgcs38xxn59z7mzkc43m9cgdx9vzb2ymzzfgg0z9" + "commit": "b07983c8df12fa428117cea8e09067ae952871d9", + "sha256": "09dnxmx0rc3v26fhi5s9f7ri05fx9p02m284qhkgr82ipdn0whnb" } }, { @@ -78423,21 +78771,21 @@ "repo": "google/mozc", "unstable": { "version": [ - 20231026, - 1200 + 20240209, + 1327 ], - "commit": "242f240b883b2515ccf2b4f82085f8484cd00a38", - "sha256": "1hmp74lfqljdvw4nd3pnncysc5c6761arpfc8wjvmbwwp98h2akz" + "commit": "c2fcbf6515c5884437977de46187c16a8cb7bb50", + "sha256": "0jggi6bnvl0xl82nvspszmagprcc6k2wqczmp5v1fax0kd7qxdnj" }, "stable": { "version": [ 2, 29, - 5268, + 5374, 102 ], - "commit": "242f240b883b2515ccf2b4f82085f8484cd00a38", - "sha256": "1hmp74lfqljdvw4nd3pnncysc5c6761arpfc8wjvmbwwp98h2akz" + "commit": "c2fcbf6515c5884437977de46187c16a8cb7bb50", + "sha256": "0jggi6bnvl0xl82nvspszmagprcc6k2wqczmp5v1fax0kd7qxdnj" } }, { @@ -78707,14 +79055,14 @@ "repo": "lorniu/mpvi", "unstable": { "version": [ - 20230608, - 154 + 20240315, + 214 ], "deps": [ "emms" ], - "commit": "f633510686d7b974147592336fa21ce6df80a5da", - "sha256": "03rjdarf7c6yl9pcgn1b27kc6699k1xhysf6hw6npgjn33iafllw" + "commit": "2412e4cd2879e1ebeaf29b92104abc94226b50bc", + "sha256": "19h35qzr7n4rza1phmk67p5ri747sl1smnp7pzayidibcvhcynvc" } }, { @@ -78908,11 +79256,11 @@ "repo": "Alexander-Miller/mu4e-column-faces", "unstable": { "version": [ - 20221213, - 2206 + 20240318, + 2050 ], - "commit": "1bbb646ea07deb1bd2daa4c6eb36e0f65aac40b0", - "sha256": "12cb37lj8j1fd5kp3gbnzgknb57j5l8xgrnhb60ysff66m1mbrr7" + "commit": "d0387f277c1572160b3e80471252ff0305409988", + "sha256": "0xcbbinhh6r7larg3r3mgid1f2lf49z0hq1hy2ri3wj8zld6iyl3" }, "stable": { "version": [ @@ -79899,11 +80247,11 @@ "repo": "kenranunderscore/emacs-naga-theme", "unstable": { "version": [ - 20240218, - 715 + 20240324, + 1932 ], - "commit": "a4c1d5bef93d9382ecf967a9897796e7a8937484", - "sha256": "1xkhqmfpb4sc1glx5ly9hwjpicdiq94cfbi9qsb43fx5xqc38d3a" + "commit": "7cef2b6097bb73a6a293a81a0f1fca1e9893321c", + "sha256": "13xrpd13rxv5zp4w1hgyayyjxa0ap7g505yrhdq8sfirlsfic57g" } }, { @@ -80601,11 +80949,11 @@ "repo": "rainstormstudio/nerd-icons.el", "unstable": { "version": [ - 20240122, - 644 + 20240319, + 833 ], - "commit": "c6a4acf19454b415cba1c43daf4bfca8fccdd9ba", - "sha256": "1pnlp54f0c2wgc65p932xyk71lyw361x17w71fnxgp72j1a3y6dz" + "commit": "8095215a503d8048739de8b4ea4066598edb8cbb", + "sha256": "1zwhslj2r63dmwgbv031b63rhhghf2nv8wb9zx31rdqh96g53s28" }, "stable": { "version": [ @@ -81627,9 +81975,9 @@ }, { "ename": "no-clown-fiesta-theme", - "commit": "3004633d97d78a997b4e904b36dc13f87df1503f", - "sha256": "0cvg8ldnn90sqdkrk64im42kbr6f3z3zk9skbda9v530l456m38l", - "fetcher": "github", + "commit": "7e4b0a546f6e2038369a816936e3a80436e3bc86", + "sha256": "0rf411gx8ci4kyhp86njjh41pvhr0pjzxwpg6nhhkq9aq3smyyan", + "fetcher": "codeberg", "repo": "ranmaru22/no-clown-fiesta-theme.el", "unstable": { "version": [ @@ -81666,14 +82014,14 @@ "repo": "emacscollective/no-littering", "unstable": { "version": [ - 20240217, - 1926 + 20240321, + 710 ], "deps": [ "compat" ], - "commit": "6de0be803206334bfff5b74cdccab5ed51b37280", - "sha256": "0frxyyq7rr13m3jdzczr185wphrfxylgfriqagchpqnby386bzpr" + "commit": "dcc7af41cc6b48d446c0a76bae029898f82cc2e3", + "sha256": "103cmw2cxbq9n4csh0n3rrq57caa1fdby7ry0izcdnaaph7rwhqc" }, "stable": { "version": [ @@ -81711,16 +82059,16 @@ "repo": "thomp/noaa", "unstable": { "version": [ - 20230904, - 1815 + 20240317, + 2321 ], "deps": [ "kv", "request", "s" ], - "commit": "04da1d3467d08cd1d28539c2b132035a9fb1c793", - "sha256": "19rqq2j367yvxdfrrkflicp1p7swf23kxya82kpb84zd7z1vn85z" + "commit": "7d68b5a580c64123f3bbd75f795a891dfdeb1746", + "sha256": "124ak5qvjlg3kb49wmx8pbvdpqz6g79ji811kjvxf9d5gbv85714" } }, { @@ -81985,17 +82333,17 @@ }, { "ename": "nordic-night-theme", - "commit": "11254a9e0d387eb6a50a0a9cc09dccc7f667115d", - "sha256": "0wbpw6344ncpv2d578g7wqr1fvn057ryl3sp3mg9wpah36fi5g0v", - "fetcher": "git", - "url": "https://git.sr.ht/~ashton314/nordic-night", + "commit": "f1985ff02a9d7ec22fc9398fac5d91a3f32eb368", + "sha256": "1gihwfp9shpdvf340f0h69qnaswfhd0jpm1x3acn5v0b8jqns5ay", + "fetcher": "codeberg", + "repo": "ashton314/nordic-night", "unstable": { "version": [ - 20231205, - 1744 + 20240311, + 2147 ], - "commit": "d5d481a6b514001b22d1a184c1214d220fe3869d", - "sha256": "1qvka1ybwc3jyxjk0ljzmbf6l56lmfqi4l7dasmmc31w7all3l53" + "commit": "a9e5918c7755ccb1fa20d3d8e3a3ea069455f87b", + "sha256": "079685xsh9jpariiagns06z8zqbna7s3pr054s1lx4y701bmxmss" }, "stable": { "version": [ @@ -82122,10 +82470,10 @@ "version": [ 0, 38, - 2 + 3 ], - "commit": "c769658360e10a6d01a4134e680e2f498741bc5c", - "sha256": "07n4cp8zql9vkc5s18d687mwhb96cad629d3mgvxbf36v3v1s1xx" + "commit": "d0469c5b4c6ed9188b96b12363fced45291813fd", + "sha256": "0y9fmd8qaybs3i6xndsmq9f5iskdc852i2bq442k7iyjgj3gw8rd" } }, { @@ -82260,16 +82608,16 @@ "repo": "tarsius/notmuch-transient", "unstable": { "version": [ - 20240106, - 1322 + 20240302, + 2332 ], "deps": [ "compat", "notmuch", "transient" ], - "commit": "0dc26288276e43a2e362acae850444a47b7db652", - "sha256": "05kwrnmj3d4rhx463iilfs6qwqy7f1rg752ghcmjlx2l1vjqwsc1" + "commit": "f08ef922b88d90a7cad348743c8470f443b1fa8e", + "sha256": "1v20cz1kkd0p82hrdkq7wy30wgi37idrzcxk3n23ypmhmylig82a" }, "stable": { "version": [ @@ -83121,19 +83469,19 @@ "repo": "TxGVNN/ob-compile", "unstable": { "version": [ - 20220830, + 20240324, 315 ], - "commit": "9a16b3dd0f467c091e91944b90a2ca3d646d6617", - "sha256": "0ajs108ib4g57sik31m81hw6ln11gcyrx96x4f1d6hx73c8i8nk7" + "commit": "2b614d108445b8462b491af09092b0f65c237e42", + "sha256": "1246ji8kx5hznwbb55fvi446gsjbd0znwd2zjv6ygxsp4lcbrsib" }, "stable": { "version": [ 0, - 2 + 3 ], - "commit": "9a16b3dd0f467c091e91944b90a2ca3d646d6617", - "sha256": "0ajs108ib4g57sik31m81hw6ln11gcyrx96x4f1d6hx73c8i8nk7" + "commit": "ee94c0d432b98d4b003b179e2109c3114ea54d9b", + "sha256": "06zkjnv324bwj1bd2kdvxar0is992qngl5n94d4z2cpx3zcn2c5q" } }, { @@ -83983,14 +84331,14 @@ "repo": "jackkamm/ob-reticulate", "unstable": { "version": [ - 20210214, - 2229 + 20240224, + 1615 ], "deps": [ "org" ], - "commit": "56f4d74f5a2218927aeacce61442b373a0a189e3", - "sha256": "1r93i00g79jclfcpd6rla7c80rm30avmi66fc1z0qqyfpf29kvy0" + "commit": "dc08d43df967b15446f3d229fdc6bd600b7ea0df", + "sha256": "0sa1y4n51kvq6i3y79dbsx703gmir7k7idj84pbr9fp9qfjal45i" } }, { @@ -84412,11 +84760,11 @@ "repo": "ideasman42/emacs-theme-oblivion", "unstable": { "version": [ - 20231111, - 1100 + 20240320, + 1152 ], - "commit": "f8e3e1cb02f83624624a4e42070059d91f2e8d5c", - "sha256": "0mb5mmw1110a4czg459c4dl6xj99vzp5vgkhp7kkdgakck0pz17z" + "commit": "8b7ed6627ee3c838acd2ec9bfd5a6fb02228edfb", + "sha256": "1qp8216c6spjyjbnj0x3w150fisnxzy5yzhgkihip352kf5ah54j" } }, { @@ -84712,26 +85060,26 @@ "repo": "oer/oer-reveal", "unstable": { "version": [ - 20240104, - 1513 + 20240319, + 1005 ], "deps": [ "org-re-reveal" ], - "commit": "3552f038f4c39e70aa1cc9bf59ad448a76bf5524", - "sha256": "1vn8iz7891ml9z989d8k68i01rldnyrgg5vzbf6k7kyf3vnslf8c" + "commit": "0a44a385a565b8e39908c36dd32d5b231ffee9bd", + "sha256": "1gjmnxplpm7p4ylsypds809jqxw942anddq09v8frnrrbhi5q0sh" }, "stable": { "version": [ 4, - 19, - 1 + 22, + 0 ], "deps": [ "org-re-reveal" ], - "commit": "3552f038f4c39e70aa1cc9bf59ad448a76bf5524", - "sha256": "1vn8iz7891ml9z989d8k68i01rldnyrgg5vzbf6k7kyf3vnslf8c" + "commit": "0a44a385a565b8e39908c36dd32d5b231ffee9bd", + "sha256": "1gjmnxplpm7p4ylsypds809jqxw942anddq09v8frnrrbhi5q0sh" } }, { @@ -85611,19 +85959,19 @@ "repo": "oantolin/orderless", "unstable": { "version": [ - 20240221, - 1601 + 20240320, + 1638 ], - "commit": "91df48c8e1331e434ce6ce3bab709de2035e3ec4", - "sha256": "1frpidiv3pl5l5nh0n1k7yhkbhk2hqsbnpdv63jdn767w8s3pwa2" + "commit": "3847f311077efa17951a786d2759f2639c5f43c8", + "sha256": "1gc3ysa1yhi6pz8bafbdpj0avdhms0rfd1r3k5mrhnm8mgh6zq8q" }, "stable": { "version": [ 1, - 0 + 1 ], - "commit": "847694e78c12d903d5e3f6cb365a5d3b984db537", - "sha256": "1jmwyici90v82gqjq44n0scrwhmg05pi9yplkn4bpss80c83dxp4" + "commit": "3847f311077efa17951a786d2759f2639c5f43c8", + "sha256": "1gc3ysa1yhi6pz8bafbdpj0avdhms0rfd1r3k5mrhnm8mgh6zq8q" } }, { @@ -85853,30 +86201,30 @@ "repo": "eyeinsky/org-anki", "unstable": { "version": [ - 20240105, - 1423 + 20240311, + 2016 ], "deps": [ "dash", "promise", "request" ], - "commit": "e842ab4ed817b95e98a3cb6fa39b5ffd3488c342", - "sha256": "1y1ik3c2cs8zgvrdd5655lyxm3ld17r5nh152dv1ah5agy54k6rf" + "commit": "f4737a04a82f8592ef623da40e65881ee5aed718", + "sha256": "1rqzjppaf2h7y5lvqzjll9dg71gwkm81wgczqswxgd880r3v29a4" }, "stable": { "version": [ 3, 2, - 4 + 5 ], "deps": [ "dash", "promise", "request" ], - "commit": "e842ab4ed817b95e98a3cb6fa39b5ffd3488c342", - "sha256": "1y1ik3c2cs8zgvrdd5655lyxm3ld17r5nh152dv1ah5agy54k6rf" + "commit": "f4737a04a82f8592ef623da40e65881ee5aed718", + "sha256": "1rqzjppaf2h7y5lvqzjll9dg71gwkm81wgczqswxgd880r3v29a4" } }, { @@ -86280,20 +86628,31 @@ }, { "ename": "org-caldav", - "commit": "855ea20024b606314f8590129259747cac0bcc97", - "sha256": "1wzb5garpxg8p7zaqp6z5q0l2x8n9m7fjg5xy3vg9878njnqr9kc", + "commit": "9b189a0fc43987c9975d27da5049001feccf68a7", + "sha256": "01ravi768xn62r4l0xcsr3k049m93zhdw7fn0gsiwjmqyvzz5l7m", "fetcher": "github", "repo": "dengste/org-caldav", "unstable": { "version": [ - 20240221, - 704 + 20240302, + 2226 + ], + "deps": [ + "org" + ], + "commit": "21da50c95b279b5fa528b353181275f935de1e1d", + "sha256": "1rmd2d0w6f28cgdp4vibs4h2nz69i25s0s4x7vwhfjx8393bmyc0" + }, + "stable": { + "version": [ + 3, + 1 ], "deps": [ "org" ], - "commit": "9a3062cea3d1081450abbbef6a0d2b83014f31fb", - "sha256": "09vhpbbyxnip0rb3467an227w9xacg6amcfv75bqlyyj7c8lh675" + "commit": "7c0ae0dd84d47f7f28a5e74e68ecbbd53df401d8", + "sha256": "0im6swyhdy8g56lh2nnbz7hb4hjqspi7aag7qc4616m5fs7ijlig" } }, { @@ -86364,14 +86723,14 @@ "repo": "drghirlanda/org-change", "unstable": { "version": [ - 20231026, - 2216 + 20240318, + 2003 ], "deps": [ "org" ], - "commit": "c74662112e8a857bd87c54128baba9307a393974", - "sha256": "0mpsghnzgyhxzjdsnj57sizv0dny75hm0kj61q13ckrc26bjlhg7" + "commit": "e944bb4a0943cdd06abd9032e6e6cbd34424ea42", + "sha256": "0gpdrli91rmjvngvddmivq41by60jiha7xmxidsr0lq961q1nrvi" } }, { @@ -86432,39 +86791,6 @@ } }, { - "ename": "org-cite-sidecar", - "commit": "78a825b6589e3d1264a2134c11fdf836ea75e348", - "sha256": "0ifdlfk6zqv6ajl0hsc0vhll5pf496n7za65vnvpfrmbkz1g9j6y", - "fetcher": "sourcehut", - "repo": "swflint/emacs-universal-sidecar", - "unstable": { - "version": [ - 20240218, - 1917 - ], - "deps": [ - "citeproc", - "universal-sidecar", - "universal-sidecar-citeproc" - ], - "commit": "94e349534e049c9bcf08eb70ef4ebfc9b9f80d0d", - "sha256": "0yh682yv8236458070v56g7p1c7ana87whyp9kz1k7nwjr6z9vil" - }, - "stable": { - "version": [ - 1, - 5, - 2 - ], - "deps": [ - "citeproc", - "universal-sidecar" - ], - "commit": "9050eaea7946e613a4b9ecd9dd1462614699edb1", - "sha256": "169n0d4hsx9azch1w14wlmilm411hb7v0564xrcwww5w145jrs9m" - } - }, - { "ename": "org-cliplink", "commit": "7ddb13c59441fdf4eb1ba3816e147279dea7d429", "sha256": "19l3k9w9csgvdr7n824bzg7jja0f28dmz6caldxh43vankpmlg3p", @@ -86480,6 +86806,24 @@ } }, { + "ename": "org-clock-agenda-daytime-mode", + "commit": "d86e8d1a1afba41d3ac684d998e1bdf206fa5459", + "sha256": "0xmaimwfyih2yfh6qimhhjwrpkqmvlc0694qpkb2vg6338sm41si", + "fetcher": "github", + "repo": "ArneBab/emacs-org-clock-daytime", + "unstable": { + "version": [ + 20240303, + 846 + ], + "deps": [ + "org" + ], + "commit": "82e2cd5a523f5fda75176a08eb120a0872700add", + "sha256": "1xbhigbb7r1cfp0f63bg3k6x9kqbxffjvykfvj84llgjzqjns6rg" + } + }, + { "ename": "org-clock-convenience", "commit": "a80ed929181cdd28886ca598a0c387a31d239b2e", "sha256": "1zis0fp7q253qfxypm7a69zb3w8jb4cbrbj2rk34d1jisvnn4irw", @@ -86613,14 +86957,14 @@ "url": "https://repo.or.cz/org-contacts.git", "unstable": { "version": [ - 20240220, - 536 + 20240311, + 850 ], "deps": [ "org" ], - "commit": "fe2ca7d35c439f64742234beba35ed4a3e196f70", - "sha256": "0jd12dcj3rirkgnmfz69pdijwwihdlv9441zb0yvrz4vi4z2n9ac" + "commit": "6660db078f7687af3bc31f702e3e957d4d7654bd", + "sha256": "0i0jkdn2wd7q9nzacaldhwx0i027951j0dp24pgkq34radqldjmb" } }, { @@ -87835,15 +88179,30 @@ "url": "https://repo.or.cz/org-link-beautify.git", "unstable": { "version": [ - 20240223, - 1448 + 20240312, + 529 ], "deps": [ "fb2-reader", - "nerd-icons" + "nerd-icons", + "qrencode" + ], + "commit": "c77338cfac89a41f90eafea80d11d8134e8096f4", + "sha256": "1pvq83lca6sj19vra0r2cvzngqkkcwswqq1ma96dkl5xyn01ggw9" + }, + "stable": { + "version": [ + 1, + 2, + 3 + ], + "deps": [ + "fb2-reader", + "nerd-icons", + "qrencode" ], - "commit": "988f4b19f85340c6a7ba2a8c2c928833843957bc", - "sha256": "1b5dgjlg4w4x2b9j6zr1m0swxvngw0bn7n9wfwxq76vd6s52lr1m" + "commit": "c77338cfac89a41f90eafea80d11d8134e8096f4", + "sha256": "1pvq83lca6sj19vra0r2cvzngqkkcwswqq1ma96dkl5xyn01ggw9" } }, { @@ -87955,8 +88314,8 @@ "repo": "alphapapa/org-make-toc", "unstable": { "version": [ - 20231206, - 101 + 20240229, + 724 ], "deps": [ "compat", @@ -87964,8 +88323,8 @@ "org", "s" ], - "commit": "412f211e8477c37f2e775e02341c43d42fe92bb9", - "sha256": "1f6l4g6dl4r9ylmrsnr2wja8bdr3635j8mlpih0lx5d8h5l11s8k" + "commit": "3ac2024694a9f974a7d263748642182fc7e829d1", + "sha256": "1ikvvrki9aw9pmai1qi92wipbjk1vka4qpac470714l8aq41zfbc" }, "stable": { "version": [ @@ -88084,25 +88443,25 @@ "repo": "minad/org-modern", "unstable": { "version": [ - 20240102, - 329 + 20240316, + 1109 ], "deps": [ "compat" ], - "commit": "5f056aad428a0e4207012a0efa447aacb74c75b9", - "sha256": "1h3j58csbrzvz6fkabp97yrv0gpjrv7c6idlxplfb7qibjhg2lvp" + "commit": "a2ff4c8e9cac412e8cb9c7faf618ac18146107ea", + "sha256": "19mn29f294wng6pgm1vwncx50963wnh7zj33ipynx8qxndbi6hsm" }, "stable": { "version": [ 1, - 1 + 2 ], "deps": [ "compat" ], - "commit": "d812a192f040a9e7785a53f144de1800d52b9f0d", - "sha256": "1nanv3rnrjldr2gd55hn2w8j4zcm6b9jq1qica3m7iyq187ygbdg" + "commit": "a2ff4c8e9cac412e8cb9c7faf618ac18146107ea", + "sha256": "19mn29f294wng6pgm1vwncx50963wnh7zj33ipynx8qxndbi6hsm" } }, { @@ -88183,14 +88542,14 @@ "repo": "jeremy-compostella/org-msg", "unstable": { "version": [ - 20240116, - 2218 + 20240319, + 1947 ], "deps": [ "htmlize" ], - "commit": "0b65f0f77a7a71881ddfce19a8cdc60465bda057", - "sha256": "0gv864k31fg2cf0ldl9js9f82h21pa6kjzvxn4kgnnbgpnwzin82" + "commit": "8ce92fecae371b7cfd5ef3c0a3ac280e5664487d", + "sha256": "1jcxj3cvi2lv46sgl8mwkzfc8kvlyvcvaxyq5i9mhbv8xfgvi6gx" } }, { @@ -88256,28 +88615,28 @@ "repo": "Zweihander-Main/org-newtab", "unstable": { "version": [ - 20240222, - 413 + 20240227, + 155 ], "deps": [ "async", "websocket" ], - "commit": "892a35cd853e8a83fc9b7645e7bb7c25838d220a", - "sha256": "07vf1lsh75jh9x483agrk69mbja7v0qyi1wi2q5xj3p3hi89j0iq" + "commit": "eca494a43e242558bd8db24d321ad62a8ec86c02", + "sha256": "0xl16f45kgmggknb7fphda67vzz67z72kqcqk22bxq7mjbav96kg" }, "stable": { "version": [ 0, 1, - 0 + 1 ], "deps": [ "async", "websocket" ], - "commit": "892a35cd853e8a83fc9b7645e7bb7c25838d220a", - "sha256": "07vf1lsh75jh9x483agrk69mbja7v0qyi1wi2q5xj3p3hi89j0iq" + "commit": "eca494a43e242558bd8db24d321ad62a8ec86c02", + "sha256": "0xl16f45kgmggknb7fphda67vzz67z72kqcqk22bxq7mjbav96kg" } }, { @@ -88969,28 +89328,28 @@ "repo": "oer/org-re-reveal", "unstable": { "version": [ - 20240103, - 847 + 20240318, + 645 ], "deps": [ "htmlize", "org" ], - "commit": "7c39d15b841c7a8d197a24c89e5fef5d54e271aa", - "sha256": "0ayiaqci969d8q3nc0aq0a9djl84lckj2sc5nndbb1bvvhz49xq1" + "commit": "827961d69d56a2c9a777dc6280d8cd832ede125b", + "sha256": "11if1c1a0i6i2wagjwqmvp2hfkv3slpq7r6dfbpkhlmils2hxr9p" }, "stable": { "version": [ 3, - 25, - 1 + 26, + 0 ], "deps": [ "htmlize", "org" ], - "commit": "7c39d15b841c7a8d197a24c89e5fef5d54e271aa", - "sha256": "0ayiaqci969d8q3nc0aq0a9djl84lckj2sc5nndbb1bvvhz49xq1" + "commit": "827961d69d56a2c9a777dc6280d8cd832ede125b", + "sha256": "11if1c1a0i6i2wagjwqmvp2hfkv3slpq7r6dfbpkhlmils2hxr9p" } }, { @@ -89148,8 +89507,8 @@ "repo": "jkitchin/org-ref", "unstable": { "version": [ - 20240220, - 1951 + 20240307, + 1757 ], "deps": [ "avy", @@ -89165,8 +89524,8 @@ "request", "s" ], - "commit": "fc6a933b64e127596d0dd61227f287ba545f6317", - "sha256": "0xiaa89y88dy3mw16zbnwgilx173nh3zpkrjrxinvl001qdvcbda" + "commit": "190248311f90cfc4f0cceef20c7bd52a5d5aa66f", + "sha256": "079lmfl2zm8pb0xlkansw9rbxrpn3dnmzwjajp2gma03b4gnw4v8" }, "stable": { "version": [ @@ -89289,11 +89648,11 @@ "repo": "unhammer/org-rich-yank", "unstable": { "version": [ - 20240201, - 921 + 20240302, + 659 ], - "commit": "b623daf5c5a600d00057ac6351bad6ec8a1efc09", - "sha256": "10iwzl85yvkxfhf0l7shpb91rlkf41ha20sa99n2bsjxwyf9f8kn" + "commit": "50925a1183a51a6b3a9cf9ce23c425735e622e42", + "sha256": "1g6afgq5yb75j7v8sl5a5y2xnfhvkgk55lkykxix8ly11554x6dy" }, "stable": { "version": [ @@ -89350,15 +89709,15 @@ "repo": "org-roam/org-roam-bibtex", "unstable": { "version": [ - 20230628, - 2036 + 20240229, + 1913 ], "deps": [ "bibtex-completion", "org-roam" ], - "commit": "f90ac12b7ae5ba7bcdebfe53796fd0417946e5e1", - "sha256": "0magzl7bffwvjmri7r4smp6wdjcn8wgfgrd9sk5z0kcydd0r4aab" + "commit": "d9b8a57cfca832e3e7c7f414bf93060acbf63573", + "sha256": "1ww421apmn887602b9pddh76sd25x6jq3z1x0vah5zpglh2sqd6z" }, "stable": { "version": [ @@ -89382,8 +89741,8 @@ "repo": "ahmed-shariff/org-roam-ql", "unstable": { "version": [ - 20240212, - 202 + 20240226, + 1311 ], "deps": [ "magit-section", @@ -89392,8 +89751,8 @@ "s", "transient" ], - "commit": "9f5f1234a69b1df9d65ab947a003060fb5a28b60", - "sha256": "0jmdjf1mhbgnfncsgh3qiwss3hyn3yydc7gd0g0d42a8ac24svbh" + "commit": "2bd7c59ce1216b5d76e2a067be2f25807cd4d831", + "sha256": "05cjwqqsflw42mgz4ca1l73z35jwv3y1nlba4spwbsmp3p2nigls" }, "stable": { "version": [ @@ -89658,6 +90017,24 @@ } }, { + "ename": "org-sliced-images", + "commit": "52b6325143bebd4672e63cbeeb8b93ec63cc0df8", + "sha256": "0w7lm07cfbhrasxsn76l4g8fj4dnk7ryywwb194mnfkpmgfvjaq6", + "fetcher": "github", + "repo": "jcfk/org-sliced-images", + "unstable": { + "version": [ + 20240324, + 2009 + ], + "deps": [ + "org" + ], + "commit": "3a3d1704f82e909056294b3ac1da350dfea1ce30", + "sha256": "084anl78vq77i3j5jw0rq0cj383si0yp87d8z2amck6dg11gmn33" + } + }, + { "ename": "org-snooze", "commit": "fd04816fb53fe01fa9924ec928c1dd41f2219d6a", "sha256": "00iwjj249vzqnfvbmlzrjig1sfhzbpv9kcpz95i3ir1w1qhw5119", @@ -89877,8 +90254,8 @@ "repo": "alphapapa/org-super-agenda", "unstable": { "version": [ - 20231121, - 344 + 20240301, + 1602 ], "deps": [ "compat", @@ -89888,8 +90265,8 @@ "s", "ts" ], - "commit": "ee3379ae92b90c084717fb2a7614060ce12283cb", - "sha256": "1z8pwi03shgjcy7a31h758a25ikar0b3f8lscil4w9kii2v9222d" + "commit": "51c9da5ce7b791150758984bab469d2222516844", + "sha256": "1mddkfd6xiy2q0907dzyy3vf77yamm6pa608dhdy2chgc26l0ji4" }, "stable": { "version": [ @@ -90599,17 +90976,17 @@ }, { "ename": "org-vcard", - "commit": "df860814a09c376c9a6a2c5e7f528bbae29810b2", - "sha256": "0l6azshvzl1wws582njqr3qx4h73gwrdqwa3jcic1qbs9hg2l4yl", + "commit": "cb46cf94b832a64776df16fc51c9bd5a848f1740", + "sha256": "07wbd1a75xr5cpw0v1pbvpd32lz3w2myl2dxjsn32a2zg349zgbz", "fetcher": "github", - "repo": "flexibeast/org-vcard", + "repo": "pinoaffe/org-vcard", "unstable": { "version": [ - 20221111, - 328 + 20240309, + 839 ], - "commit": "92345fa9f1e1f928278a654ac5ad57d22d74dbef", - "sha256": "1yd5ff89lss0dcnqkgmcb30bb719lixcad4pfkggpssnnix998rv" + "commit": "fab5ea81d8a4bb1123cdc0287b9b58c062d5b372", + "sha256": "1p0zx59m2839gpnizn7df1zw57s8i9c35xbw9fbqshbs8lv0ag4j" }, "stable": { "version": [ @@ -91323,11 +91700,11 @@ "repo": "tbanel/orgaggregate", "unstable": { "version": [ - 20230806, - 1657 + 20240228, + 720 ], - "commit": "7e158316ab43c92f6f41597e8646715870049abc", - "sha256": "07bs01ifdqixp725rwrkwb78777979dv4mcf4jh6qidhdaqf8zq3" + "commit": "cc129b543c472c704c8dc074500a8192ac3d9f88", + "sha256": "1kcw09k5ga1sc8p4zzlcp3mnmqs6kx626vkk29awm0b1qyg8pk92" } }, { @@ -91353,11 +91730,11 @@ "repo": "tbanel/orgtblfit", "unstable": { "version": [ - 20230110, - 1544 + 20240228, + 716 ], - "commit": "5bde4902187b2578dc39ee3a02cd7c84c4470b8a", - "sha256": "0hy6i6m38k3ad2yr22jrr5i3af9v3k0106bilqxklv8jv6i4x284" + "commit": "a22f3a137f3590d7f13c3be38bbd1e55d39cb2ad", + "sha256": "1mpfxvgjd7cgjdpndibbw2zcsnca8hckd0s25sfy0dbcvdsn6hb7" } }, { @@ -91368,11 +91745,11 @@ "repo": "tbanel/orgtbljoin", "unstable": { "version": [ - 20230127, - 2133 + 20240228, + 719 ], - "commit": "257bd101a142aaad2fc3993f7752fe839d1663e0", - "sha256": "15f8zrzrpl967x7pq5833vclvrpj07n936gyhpslxlpd1shjnwg7" + "commit": "f243511ec4b3a712d0b868ecbc4c7b1310a3382d", + "sha256": "1lpgprrcwhzglddkr9q4v4qlr503wvvg1ri31445vp8fd4ldz0aa" } }, { @@ -91615,14 +91992,14 @@ "repo": "xuchunyang/osx-dictionary.el", "unstable": { "version": [ - 20240111, - 148 + 20240226, + 511 ], "deps": [ "cl-lib" ], - "commit": "1f5a74f3e5d7f3c443f07433951512cd99e820a6", - "sha256": "1nldsxm9m5m8kji9x8c0kjxknbw5y8y865cxbz9vpnxhlx7dj0l5" + "commit": "8f16ffb465b64c9dd566c8b7316b34896ce4c52b", + "sha256": "047y7zrih5d5x7m9i116yq951iyscb7ika1z4y864mqhd0ljhwvb" }, "stable": { "version": [ @@ -92138,14 +92515,14 @@ "repo": "yashi/org-asciidoc", "unstable": { "version": [ - 20220625, - 2321 + 20240316, + 1959 ], "deps": [ "org" ], - "commit": "a55ac6adef39124c9434be47fe9cc0c75c4bfea2", - "sha256": "1yz2nyq651wv82hccp04cqkikzj0jv5hvam48v0s9plynwlrc359" + "commit": "d6736852a5479c73c253d2ea8b352dcb232d02f8", + "sha256": "0sfc38p4jc6dxppmx1mxk7sni45jy6qq6220md4pnigsn8q6pr7k" } }, { @@ -92201,15 +92578,15 @@ "repo": "jkitchin/ox-clip", "unstable": { "version": [ - 20220117, - 1909 + 20240310, + 1513 ], "deps": [ "htmlize", "org" ], - "commit": "ff117cf3c619eef12eccc0ccbfa3f11adb73ea68", - "sha256": "0lwfpm5i5k1gaf0gmqjaxccisha4d7p6v8y9z9a510rc28a86vyb" + "commit": "a549cc8e1747beb6b7e567ffac27e31ba45cb8e8", + "sha256": "1i94p0nzhx1h181z6whkc3gbja85qk97xvmhx3p03a7b1pjswrhn" } }, { @@ -92350,14 +92727,14 @@ "repo": "kaushalmodi/ox-hugo", "unstable": { "version": [ - 20221028, - 1631 + 20240305, + 1923 ], "deps": [ "tomelr" ], - "commit": "a66063a9915c859c57944564f0b8dbc7949d4449", - "sha256": "0yd7i1ryzc6lwmkfhkdh1kqqjyvzc1m0yyprm2m8xakkc12wljmd" + "commit": "c4156d9d383bf97853ba9e16271b7c4d5e697f49", + "sha256": "13bjhjgvpp1lr4m1wmcbka4wfi4ikvnix4rq9ryhdj679q176x7h" }, "stable": { "version": [ @@ -92374,10 +92751,10 @@ }, { "ename": "ox-impress-js", - "commit": "ec8cb06e00e79a36f614fb7d041ce1f8af3530ff", - "sha256": "116m86af5730k7c2lzxw3cz585n4zj09hcgr0g9r9shbhqd64xl7", + "commit": "b2fdd72363223f1433852e4cc982907a6d7dc32f", + "sha256": "0k8lhkq141rlrk6fjvy4yqvpzyjly49zdga3vyci44h0pfkpbmya", "fetcher": "github", - "repo": "takumikinjo/org-impress-js.el", + "repo": "emacsattic/org-impress-js", "unstable": { "version": [ 20150412, @@ -92544,11 +92921,11 @@ "repo": "DamienCassou/ox-linuxmag-fr", "unstable": { "version": [ - 20230611, - 1229 + 20240319, + 2034 ], - "commit": "535f7228a845b69a9f70d81b30d304a2bf01cd3d", - "sha256": "15r140ivf5y593xv16yvf9hqp005fvka7wyfikk7s5baalali39i" + "commit": "eab473296b8319a052ca30d27e07508e876ca8d9", + "sha256": "007f3r38xnsg1b0srzx2qvcjbkdnkfh0mkhpa8fcph9wdnc4aj6z" }, "stable": { "version": [ @@ -92970,26 +93347,26 @@ "repo": "ox-tufte/ox-tufte", "unstable": { "version": [ - 20240201, - 2132 + 20240317, + 2053 ], "deps": [ "org" ], - "commit": "7bd86582afb7d8d504322dcba9848c478579990b", - "sha256": "0pyhbwsqsby52h740jvkrip1d78dkssymiyr31dnqzv3yg7qzj0k" + "commit": "ebdde02e4d33c3321543d67db8f1aef80adc03bd", + "sha256": "0rdainmx0xg6rfql7rai75x0v2r2s1snjy6b61jd53caif7aigbk" }, "stable": { "version": [ 4, - 0, - 4 + 2, + 0 ], "deps": [ "org" ], - "commit": "a94de43da30e2a893b5d033747d79ff63bab743f", - "sha256": "15jfwrdawj8flgyfqhsfhdlnam6n5gzw5minnixwxyp69q5vxnpw" + "commit": "ebdde02e4d33c3321543d67db8f1aef80adc03bd", + "sha256": "0rdainmx0xg6rfql7rai75x0v2r2s1snjy6b61jd53caif7aigbk" } }, { @@ -93154,6 +93531,21 @@ } }, { + "ename": "pacdiff", + "commit": "17da39dbf1df9e57d2e4a9d7a3c97e91f098a434", + "sha256": "06c9x70jbh662x1rjqami27l9rxlj9j5f0ny3zffyvjl428c6p6v", + "fetcher": "github", + "repo": "fbrosda/pacdiff.el", + "unstable": { + "version": [ + 20240219, + 1606 + ], + "commit": "74996064f7270a3b8fc57bbc8b166f3966c0a4c1", + "sha256": "1m58v63gi42j75l2zi2pjvipmbs1k040fmpy3msih7kwqhhvs54a" + } + }, + { "ename": "pacfiles-mode", "commit": "bec20443188d9218235c4b31840544a7b1e0690d", "sha256": "08yc3w7zvckg8s1g707hvbbkvi2k52jrk2iwlj0sk22ih3q3yaa9", @@ -93238,14 +93630,14 @@ "repo": "melpa/package-build", "unstable": { "version": [ - 20240204, - 2043 + 20240306, + 2234 ], "deps": [ "compat" ], - "commit": "6ae02eddae6846d17ad6b13f036de35ee7d7f60b", - "sha256": "0k2z197f5q9iracmax4mrzw5x06clc8x615l0l9204xmd6bsms2k" + "commit": "236ef4e4d615699d4ba8b7ad28bd40b87d269411", + "sha256": "1s5ik92l3nz4k19l4a73p8y2pp4zx22w4iinj892kx5xakdh1s10" }, "stable": { "version": [ @@ -93280,27 +93672,25 @@ "repo": "purcell/package-lint", "unstable": { "version": [ - 20240220, - 2303 + 20240311, + 1058 ], "deps": [ "let-alist" ], - "commit": "eeb585eaceeba483d9bc7ab543e7422c82920e35", - "sha256": "0m257k7zl1fq56xpwq9pwl3ihahyd4235hmjq4p5k0b0f3bfbgdx" + "commit": "fce93b7edf4e971b2cbe3425c1d773ffe0aa8a62", + "sha256": "1myhdhb3kwq03f3p7qgb9bk8srs1wlag4ch4kl26yb9213mzx8gv" }, "stable": { "version": [ 0, - 21 + 22 ], "deps": [ - "cl-lib", - "compat", "let-alist" ], - "commit": "dd81a5b9224cc6e6dc4bbb6b4a2928df89c01317", - "sha256": "1y0h8rrmvi3j5maig6i69kxxr1igb96075vpzbycaqln3xn11g36" + "commit": "fce93b7edf4e971b2cbe3425c1d773ffe0aa8a62", + "sha256": "1myhdhb3kwq03f3p7qgb9bk8srs1wlag4ch4kl26yb9213mzx8gv" } }, { @@ -93311,25 +93701,25 @@ "repo": "purcell/package-lint", "unstable": { "version": [ - 20231113, - 1518 + 20240311, + 1058 ], "deps": [ "package-lint" ], - "commit": "dd81a5b9224cc6e6dc4bbb6b4a2928df89c01317", - "sha256": "1y0h8rrmvi3j5maig6i69kxxr1igb96075vpzbycaqln3xn11g36" + "commit": "fce93b7edf4e971b2cbe3425c1d773ffe0aa8a62", + "sha256": "1myhdhb3kwq03f3p7qgb9bk8srs1wlag4ch4kl26yb9213mzx8gv" }, "stable": { "version": [ 0, - 21 + 22 ], "deps": [ "package-lint" ], - "commit": "dd81a5b9224cc6e6dc4bbb6b4a2928df89c01317", - "sha256": "1y0h8rrmvi3j5maig6i69kxxr1igb96075vpzbycaqln3xn11g36" + "commit": "fce93b7edf4e971b2cbe3425c1d773ffe0aa8a62", + "sha256": "1myhdhb3kwq03f3p7qgb9bk8srs1wlag4ch4kl26yb9213mzx8gv" } }, { @@ -93474,11 +93864,11 @@ "repo": "purcell/page-break-lines", "unstable": { "version": [ - 20240206, - 1156 + 20240311, + 1026 ], - "commit": "1b85352b0b16328d5c9e6a25baf93da3edaa6512", - "sha256": "1899dc4x9n07j98ciqf8rq0sh9791bnsf719b5fc3vqql93x57i5" + "commit": "e33426ae7f10c60253afe4850450902919fc87fd", + "sha256": "1mczwbr7yyk79xc68kamx9wrzbk6hhq6c7m793cx3qlxy80chn90" }, "stable": { "version": [ @@ -93687,15 +94077,15 @@ "repo": "joostkremers/pandoc-mode", "unstable": { "version": [ - 20231103, - 5 + 20240311, + 2218 ], "deps": [ "dash", "hydra" ], - "commit": "340da8787d6305640d042af46d2bd609bd5a7518", - "sha256": "1m3p6c1vjkdfpr1rjpb6rxxjrf9maa204fxpmjqnmn8mw7bfw944" + "commit": "c7fa568ab9cfbb2abfb9b22f419d28ce570d7b22", + "sha256": "00l4vh8mx899k330fvkplz77rg502j406gjc3v2nyakfmf67h85h" }, "stable": { "version": [ @@ -93994,20 +94384,20 @@ "repo": "justinbarclay/parinfer-rust-mode", "unstable": { "version": [ - 20230831, - 618 + 20240319, + 1546 ], - "commit": "6e6bdeeba32534acca5928fe4201ce013094988d", - "sha256": "1dkvsk3damvimnzs56f1vq4fqfkfkhwag9fzanz7s97bywpanhc2" + "commit": "3e95b19cd1e0ec5a8f92ea0a4a1f74ce6a8997ba", + "sha256": "0rkrn8imvi9vk6vi3wgv0a6zgxvw5jjvj58h5n79maw13rzdnwzf" }, "stable": { "version": [ 0, 8, - 3 + 5 ], - "commit": "c825606e6aca4a2ed18c0af321df5f36a3c8c774", - "sha256": "1fix225ikfabsy9r4kc3znx6k4k5wbw5n45mkir3fdyis0pcwg6x" + "commit": "3e95b19cd1e0ec5a8f92ea0a4a1f74ce6a8997ba", + "sha256": "0rkrn8imvi9vk6vi3wgv0a6zgxvw5jjvj58h5n79maw13rzdnwzf" } }, { @@ -94870,15 +95260,15 @@ "repo": "vedang/pdf-tools", "unstable": { "version": [ - 20230611, - 239 + 20240317, + 848 ], "deps": [ "let-alist", "tablist" ], - "commit": "c69e7656a4678fe25afbd29f3503dd19ee7f9896", - "sha256": "02l1mwil0r8zgg3377i6zy8cz6kl48hncgyl8x6aigxrrqzsxvza" + "commit": "93e74924517d39483b432d6c3c9b8f8b8f0eb50c", + "sha256": "1js123pg2qbq5ql1hc7lwzrs4wqcdghsypvvwsm1qm9mi017g1h6" }, "stable": { "version": [ @@ -95558,19 +95948,19 @@ "repo": "emarsden/pg-el", "unstable": { "version": [ - 20240221, - 1722 + 20240314, + 1247 ], - "commit": "3b4cef1a1fe57bd8ee32a0c58667d1fc8f802180", - "sha256": "00sdvlb9ybyzncjijibw81mf3lhw5p40v7086cg18xvpa2qvzdfz" + "commit": "686dbe8cc7a94c65faf933695093645e53aa3318", + "sha256": "18v03ix5vg8a8w2ic5gik052p15d2mgnb112dvnxba69dyz6vsm3" }, "stable": { "version": [ 0, - 28 + 30 ], - "commit": "3b4cef1a1fe57bd8ee32a0c58667d1fc8f802180", - "sha256": "00sdvlb9ybyzncjijibw81mf3lhw5p40v7086cg18xvpa2qvzdfz" + "commit": "bca35bd60fde1f561e21080768017f6727469d88", + "sha256": "1g04izsnvxinbwvzx0sj643ix5jlwdd7dkl61nvaqkkkm3g35jp6" } }, { @@ -98040,11 +98430,11 @@ "repo": "karthink/popper", "unstable": { "version": [ - 20230909, - 56 + 20240325, + 10 ], - "commit": "3804068a5bece44184e044ca0cf1bcaec90f5690", - "sha256": "1v66vypgnb7h9c6ljz86md7p898qc2dfsb4nzka53an57sy5lvsp" + "commit": "c6b78fdd546e19582fa2195cf51f6753c45e7c03", + "sha256": "121qil7y3n4p601y2j2sk077d8vzyb5ghdpj0f618pbw6pp8gyk4" }, "stable": { "version": [ @@ -98663,19 +99053,19 @@ "repo": "radian-software/prescient.el", "unstable": { "version": [ - 20231205, - 137 + 20240226, + 204 ], - "commit": "b701032968d6ab6f4d37b45fec282cf9c6e479c6", - "sha256": "18k8mki0b904qi4xl50w7bb65xhzl4d6d23qyngw33sbd83m8vq0" + "commit": "c39bf07c56b427bf41aafd7d20eaef5cf3c312b5", + "sha256": "0pfc0ycp4cr9zwkjv3rqfkwkx8p52ad7aq2c60j0qwp3yd0cghc4" }, "stable": { "version": [ 6, - 2 + 3 ], - "commit": "c0eca3328313f1e93d24e686307516f43a484ba2", - "sha256": "1vj21kcqlsa02nvslmxgxsbv4pc93gakj4x2a6rbk87zl6ccw7pk" + "commit": "c39bf07c56b427bf41aafd7d20eaef5cf3c312b5", + "sha256": "0pfc0ycp4cr9zwkjv3rqfkwkx8p52ad7aq2c60j0qwp3yd0cghc4" } }, { @@ -99457,20 +99847,26 @@ "repo": "TxGVNN/project-tasks", "unstable": { "version": [ - 20230808, - 314 + 20240321, + 340 ], - "commit": "36b7b9e3acb3399aec6c8ef89bf389a12fc87600", - "sha256": "1fwwh709ff660ii43nd0prq2jcc8gmn1v8sg9jki00xn9yas8hsi" + "deps": [ + "project" + ], + "commit": "2db15b1dd88a92d51890ed1b6ab1007ec09c30a4", + "sha256": "1zapqprbfw99jv0kii1ajwlz9ix9d7w66lf8l67h7nzqls5pqi3j" }, "stable": { "version": [ 0, - 4, + 5, 1 ], - "commit": "36b7b9e3acb3399aec6c8ef89bf389a12fc87600", - "sha256": "1fwwh709ff660ii43nd0prq2jcc8gmn1v8sg9jki00xn9yas8hsi" + "deps": [ + "project" + ], + "commit": "eab59faafc47763a7b9c4116bf8c438406f62705", + "sha256": "1k52zb6zmml5l50xkkhilml9ki06184mz2g865s4dp3vijpypqgh" } }, { @@ -99764,8 +100160,8 @@ "repo": "mohkale/projection", "unstable": { "version": [ - 20240211, - 1526 + 20240317, + 1257 ], "deps": [ "compat", @@ -99773,8 +100169,8 @@ "project", "s" ], - "commit": "596b20a5f8690867336f4cb29368d0ac3af1a0fe", - "sha256": "1i4zjkhjsws8ppbknw4fc1m2355bda6h59lhjrwvccl2fakrbv3i" + "commit": "20548689eead0a86fcc921491047f392fd6b120f", + "sha256": "02ncfcbkwj933crrhca5wmfv55qpsc7szjvbdapkazzg5j4gqmlr" } }, { @@ -99785,15 +100181,15 @@ "repo": "mohkale/projection", "unstable": { "version": [ - 20240211, - 1526 + 20240316, + 2222 ], "deps": [ "compile-multi", "projection" ], - "commit": "596b20a5f8690867336f4cb29368d0ac3af1a0fe", - "sha256": "1i4zjkhjsws8ppbknw4fc1m2355bda6h59lhjrwvccl2fakrbv3i" + "commit": "dc489480a6e4be82e570266202144730b3ddde5f", + "sha256": "198jlknm3za6n1wp1ns5vbw5554xfrdqdaayhrgqr3f8cil2y0vh" } }, { @@ -99979,11 +100375,11 @@ "repo": "ProofGeneral/PG", "unstable": { "version": [ - 20240223, - 1405 + 20240306, + 2002 ], - "commit": "1f0724813a4eacb59b7a8d8905619c893d12f03b", - "sha256": "1yb7ddzz3gsh4d7dgk3x6xgx3pgdqyrmqr6f4lxs9vhp102n7b1x" + "commit": "a6f8243ed2860cc7c9cb051496f1543d981e9f7e", + "sha256": "0fdzak693zb5lndxkdgb8af5hpichgkhhpxnl6pcnd1r6v01ahnr" }, "stable": { "version": [ @@ -100091,19 +100487,19 @@ }, "stable": { "version": [ - 25, - 3 + 26, + 0 ], - "commit": "4a2aef570deb2bfb8927426558701e8bfc26f2a4", - "sha256": "1fgvviv2zfnq4ap4qkndgryf8mkcbznzwdqnqc32vj4dmvsqxy9p" + "commit": "d6511091a0cab1ad13f676a02676ad2a0e5eb9ae", + "sha256": "0qi72mfwck0a3iwzvacl497bmz872pyzrdgya0w47r29y65z0m3g" } }, { "ename": "protobuf-ts-mode", - "commit": "ef4f38a4e91870ebfd8fcd4cfaf3463f77ac31e1", - "sha256": "0kpp1sqwbvipwac95gj873w1zvmsrwdcz3qangqz8bck2f48pvv6", - "fetcher": "git", - "url": "https://git.ookami.one/cgit/protobuf-ts-mode", + "commit": "feb6e7b10f4adb9c6ba3981b60f72db6f4cedb95", + "sha256": "1wx3yy624d4dx2gjfs8y8yfdmnl32xgy5wzbcnxvbhigjn4x6cbr", + "fetcher": "github", + "repo": "emacsattic/protobuf-ts-mode", "unstable": { "version": [ 20230728, @@ -101154,10 +101550,10 @@ }, { "ename": "pyim-cangjiedict", - "commit": "0086ad25357f8d1340e23c92ce066112c46a19b6", - "sha256": "16ljs7ldddnawxv66xsvh8cnxkfr9d07mchkvcajs9975g0axvah", + "commit": "9e0d6c5698267d6f355c319071c4a6b39640e3fd", + "sha256": "1y7np5g7c921vczj8h0jjzr68j08qx48dw2h8lgj80idk8mc8zhg", "fetcher": "github", - "repo": "ba11aStone/pyim-cangjiedict", + "repo": "con5tella/pyim-cangjiedict", "unstable": { "version": [ 20210617, @@ -101172,10 +101568,10 @@ }, { "ename": "pyim-smzmdict", - "commit": "e5f1fe26dad66865cfc8e7de87a7368fcba45c50", - "sha256": "18djbr5zybmr8gkn63kgxy18gsc8vf58xcs0v5q2i0dnd6ijaqms", + "commit": "49fec74868b77d36882176ab41473c3c8a0fd5c2", + "sha256": "0rymxr89vsr7j0pb49s8lrrnh79q395270b29z0w6s6hwyygqv3k", "fetcher": "github", - "repo": "ba11aStone/pyim-smzmdict", + "repo": "con5tella/pyim-smzmdict", "unstable": { "version": [ 20210505, @@ -101653,8 +102049,8 @@ "repo": "wbolster/emacs-python-pytest", "unstable": { "version": [ - 20231106, - 1557 + 20240314, + 1038 ], "deps": [ "dash", @@ -101662,13 +102058,13 @@ "s", "transient" ], - "commit": "7e8acc0232355db35dc66a15bf50c14a80ba3e72", - "sha256": "0gl210nm1n5ynpirzn1h81zb4x0q6nl8biq2132chm3l5m58fapk" + "commit": "46fd006462258a3366723fafacdf2db6a6ae689d", + "sha256": "1ahpzay6gbxrcin4ldcp1sm17fcvg94n729haj3zgcalsmhjlx90" }, "stable": { "version": [ 3, - 3, + 4, 0 ], "deps": [ @@ -101677,8 +102073,8 @@ "s", "transient" ], - "commit": "aef8b42f7ca69d84289209c7bf0974c8ef4c95ab", - "sha256": "1a8086j4iq8qg230dx9nxcaivffyb7y5fga8fc1m5x4v9dh171x7" + "commit": "46fd006462258a3366723fafacdf2db6a6ae689d", + "sha256": "1ahpzay6gbxrcin4ldcp1sm17fcvg94n729haj3zgcalsmhjlx90" } }, { @@ -102191,14 +102587,14 @@ "repo": "emacsorphanage/quickrun", "unstable": { "version": [ - 20240201, - 2014 + 20240316, + 807 ], "deps": [ "ht" ], - "commit": "248149b0261051bd9eec8bdbc21c22d18d7b1b11", - "sha256": "02qayvia6mx3lwps5x573srag4zf2wbxm0xk0mzfpdki3ffjwhhi" + "commit": "4604cbd7dff6996a0d35d4eb042a5623530763bb", + "sha256": "066lvxkw0xls8a0f243ic57nr6rlpwy71pgvi3wcm8zg8ky2r599" }, "stable": { "version": [ @@ -102356,11 +102752,11 @@ "repo": "greghendershott/racket-mode", "unstable": { "version": [ - 20240219, - 1858 + 20240319, + 2002 ], - "commit": "9e8e60531ca90c5fd0f42c0e931f0c7f12103567", - "sha256": "1yxdgx6cdj7xq7zw85f6fp4h56qsavv57a7p88bnfp8lm1cz5r13" + "commit": "fd3e3ddf12aef6d7661b5a2c0f70afc7107b7fd9", + "sha256": "15ciqhns9q6gqv8wxjd71mijacpsi3lg4f1hqy8z58r7gzjr8av7" } }, { @@ -104453,10 +104849,10 @@ }, { "ename": "req-package", - "commit": "9bb31fb6eeb41a19b33a9edb86d8a0bd6c962042", - "sha256": "1dg670cp7gfb5w0lvyfk3f8b1ch104wd5ld12y568q4i5wkzhfcp", + "commit": "1202a12d3991df7de1bb57c59467f1532be52b37", + "sha256": "1w2z3mamx3adm05bqqxrph0q9cin12ia0n45jha3gbic5b7b4562", "fetcher": "github", - "repo": "edvorg/req-package", + "repo": "emacsorphanage/req-package", "unstable": { "version": [ 20180605, @@ -104601,11 +104997,11 @@ "repo": "jjlee/rescript-mode", "unstable": { "version": [ - 20230321, - 1917 + 20240312, + 1235 ], - "commit": "a0a21d1c037c78ba4c05108a5e7afd5f75fe7bd7", - "sha256": "11ik71xspqcgyn11f9mkda01vyn9q7bwpbzqjf6yd7yn5b83xrhf" + "commit": "e97487a8786dd329593c3a786443a6d987d719e9", + "sha256": "0cp8pv9isny0y9s0310y05afci3ars7ibf21y4sqmgadgfnp0qf2" } }, { @@ -104789,15 +105185,15 @@ "repo": "jcs-elpa/reveal-in-folder", "unstable": { "version": [ - 20240118, - 611 + 20240226, + 37 ], "deps": [ "f", "s" ], - "commit": "c774564e3a35d8112ec3f399f76941cb63317a4e", - "sha256": "074r3v33k82s4xksihq52kl3hpxk98np7x7mqjiqvldmaqc3y6ym" + "commit": "ef1b86f745ff2e1d13dc57f6f9fe7e0c53fe26bd", + "sha256": "18gqrfxar906h4i4gn9wwwrpzi5cmnpzgfh1qkqhyjbh7wl3d37i" }, "stable": { "version": [ @@ -104845,14 +105241,14 @@ "repo": "a13/reverse-im.el", "unstable": { "version": [ - 20230125, - 1846 + 20240315, + 1320 ], "deps": [ "seq" ], - "commit": "83c639756357c6b154842997b86e63c583ff8ff4", - "sha256": "08nnm6kvndsvnk7l1zr0zmbc0f6wsrfq284n80m2sxhx428k5jwh" + "commit": "bcd70b49b16abab53165cb464d0a9a5f95bf946b", + "sha256": "17br84xaxy1am01fdqi6742wwfp9aig1a71fmhvncpdi1plsxkca" }, "stable": { "version": [ @@ -104891,6 +105287,25 @@ } }, { + "ename": "reverso", + "commit": "ce59525a7710dde686c2dd023a593a89a51ff987", + "sha256": "0anw1l44qgxh7rhadcccw7fcfc8b0nwxd28vpzjkx8c2cr63p1pn", + "fetcher": "github", + "repo": "SqrtMinusOne/reverso.el", + "unstable": { + "version": [ + 20240113, + 2128 + ], + "deps": [ + "request", + "transient" + ], + "commit": "7ae99550cd6076009560c4c7a3e4cdf101826041", + "sha256": "025nd01w5sagiz56bpn7mihc5n9zr0s6bn6g3fimb7b1697h9rlq" + } + }, + { "ename": "revert-buffer-all", "commit": "962f7c87d0630399ea388f25ec5792fa2f2b4489", "sha256": "1diaxzznh60nhhj9jks8nriyzkw34h0qyjhbnlyscbsagg6gy9wx", @@ -105425,11 +105840,11 @@ "repo": "jgkamat/rmsbolt", "unstable": { "version": [ - 20240105, - 614 + 20240301, + 1749 ], - "commit": "2643d71b34f53eccb6188f548f5d1349adef07fb", - "sha256": "0xnbp55nrs5wxhrfvym3sfqamf499mlzj6zsw9bhp6r1sjidl21i" + "commit": "1aeeadf7114316b9949e3c212a883ca95c3ddab0", + "sha256": "01nhxmildizza26vkf20qvmhh7n5g1sl7vyn7i1dwpi74334in64" } }, { @@ -105440,26 +105855,26 @@ "repo": "dgutov/robe", "unstable": { "version": [ - 20240118, - 348 + 20240319, + 254 ], "deps": [ "inf-ruby" ], - "commit": "0438ae818e2551637ee3ec8baf5bbf471eef9359", - "sha256": "0knawwja1dba172kjw8hypzvnngcsd9xspy2j42n66npi12yyky8" + "commit": "863dcfc41e15200e476995586c2aa7bc9cabc5c8", + "sha256": "02s2kp7nh924i2iwys1q3yx4zgwj9hxnfl0x3ny5lzz8j2ijb3vn" }, "stable": { "version": [ 0, 8, - 3 + 4 ], "deps": [ "inf-ruby" ], - "commit": "082da38797d247f9c64568ad712a345e041d5c84", - "sha256": "1xbj7wi389n6pxfvxrakvhylkdlqg8ll9ad2zmxggcchygwah6nl" + "commit": "34ce25eb9b1956389276adeca93b679bf0a84451", + "sha256": "0kvyfyr4b0z0l964a8z9shy8nlnxzxc2ljcc02gj2pn1rn1wz0gq" } }, { @@ -105566,14 +105981,14 @@ }, { "ename": "rom-party", - "commit": "d512cbf4962988eb163416f2a05432ba07cb0cac", - "sha256": "1z3k8nsrzzzxl1m17aj59y4zrki5czlcdsrxyfa66m6m7d133d79", + "commit": "aeb77fec281518c481fee27a734af4170e6f9605", + "sha256": "0zxix0mnq89ij5n4mqpsqqrr977c5xbv4f02hrl55n444gz59x93", "fetcher": "github", "repo": "LaurenceWarne/rom-party.el", "unstable": { "version": [ - 20240218, - 2044 + 20240324, + 909 ], "deps": [ "async", @@ -105584,8 +105999,8 @@ "ht", "s" ], - "commit": "0af8c03de584c91ea1a43c4c94fa4e7bb8c98fa4", - "sha256": "0y0rayvibf77508nv3p8k240m0agzfar5hr216fqask2rg0l9cfd" + "commit": "e4e8f113b370ceaed0ea28940117bd69f3d3f935", + "sha256": "0s14ki44iwaskfa2ky61by088f7h5s9frz621fpainfhx0i7m59r" }, "stable": { "version": [ @@ -106428,11 +106843,11 @@ "repo": "rust-lang/rust-mode", "unstable": { "version": [ - 20240217, - 338 + 20240313, + 157 ], - "commit": "8bbe70b72fde8046e12e6a41ffbee6c9f6b4ddd7", - "sha256": "0zza5d7ys062qss0lj7w28l496k2j0cykzlp7qmpchd4v5vzq9ky" + "commit": "87bf4ea711456c858445ec4c22b3552fd796708d", + "sha256": "16sc646nc54fnr52y5zrgpcr4rb7isbmc9gf8fd164k2x64h8gv0" }, "stable": { "version": [ @@ -106875,6 +107290,21 @@ } }, { + "ename": "satysfi-ts-mode", + "commit": "4bca9e68860dcf23f37ddd70ba3e47412061800a", + "sha256": "1p86scrvk97iw5vwm0phn0wk3zjc4hr94dk7nzckjlm9nlzb8m5q", + "fetcher": "github", + "repo": "Kyure-A/satysfi-ts-mode", + "unstable": { + "version": [ + 20240319, + 321 + ], + "commit": "b40d55ebd6ffeadadb85aabaf2e636110c85370c", + "sha256": "0l6n116nrvka2vpwkhd7pzrzjxmcjl4m8fscbk3rjl26xq139mpc" + } + }, + { "ename": "sauron", "commit": "9d30dcc4715422133e1bb00ad7a8e25b060387e4", "sha256": "01fk1xfh7r16fb1xg5ibbs7gci9dja49msdlf7964hiq7pnnhxgb", @@ -107042,14 +107472,14 @@ "repo": "openscad/emacs-scad-mode", "unstable": { "version": [ - 20240216, - 1536 + 20240224, + 1251 ], "deps": [ "compat" ], - "commit": "8d5650c5cfee96c42d64427bfcadb89f6bda66be", - "sha256": "08yia0q18b0w3lkr4wh1bd1v606cksi6hpz72nqjvv59qyjfmg01" + "commit": "1bae3dab16adf1f0d47befcc6d2b63a50af87231", + "sha256": "137kn3ilbl6gnq6jc21mzhlc7vyy9nvr3qf0p6f1hmdixm2cbyr7" }, "stable": { "version": [ @@ -107113,11 +107543,11 @@ "repo": "KaranAhlawat/scala-ts-mode", "unstable": { "version": [ - 20240213, - 1734 + 20240309, + 1136 ], - "commit": "88f9ad9d8800515f47609829df9b2a15dc475eff", - "sha256": "04cm7my5kp8fv5d8an3h4a2z037y2kqvrarr20jj5a7b3fdxq0my" + "commit": "0a34b23b3b71be1e0ce307df873434c08408fc57", + "sha256": "0dzzygq4cfckmwr7a5lhr140kyy45z15q02r4c9kaxz9cjg4zdvf" } }, { @@ -107965,27 +108395,27 @@ "repo": "radian-software/prescient.el", "unstable": { "version": [ - 20231205, - 137 + 20240226, + 204 ], "deps": [ "prescient", "selectrum" ], - "commit": "b701032968d6ab6f4d37b45fec282cf9c6e479c6", - "sha256": "18k8mki0b904qi4xl50w7bb65xhzl4d6d23qyngw33sbd83m8vq0" + "commit": "c39bf07c56b427bf41aafd7d20eaef5cf3c312b5", + "sha256": "0pfc0ycp4cr9zwkjv3rqfkwkx8p52ad7aq2c60j0qwp3yd0cghc4" }, "stable": { "version": [ 6, - 2 + 3 ], "deps": [ "prescient", "selectrum" ], - "commit": "c0eca3328313f1e93d24e686307516f43a484ba2", - "sha256": "1vj21kcqlsa02nvslmxgxsbv4pc93gakj4x2a6rbk87zl6ccw7pk" + "commit": "c39bf07c56b427bf41aafd7d20eaef5cf3c312b5", + "sha256": "0pfc0ycp4cr9zwkjv3rqfkwkx8p52ad7aq2c60j0qwp3yd0cghc4" } }, { @@ -108825,11 +109255,11 @@ "repo": "xenodium/chatgpt-shell", "unstable": { "version": [ - 20240112, - 1749 + 20240227, + 2310 ], - "commit": "39dd8e7415ebe6d836a1d721337019cfea89f5ad", - "sha256": "0xylvqjhdwmgbcm412jgyir8kwb16j1jzwp708z1p0yaw4j7c54c" + "commit": "03afa7339930e5715c217455f3070c88a7fac55c", + "sha256": "1n6gpfyq13180k41jn3xnar0gz3a9qz08nz8v5xjj0qxdgml02g6" } }, { @@ -109551,26 +109981,26 @@ "repo": "rnkn/side-hustle", "unstable": { "version": [ - 20230814, - 1047 + 20240325, + 205 ], "deps": [ "seq" ], - "commit": "602557d74229b377ee0e7d43ec70a6f9f84c81e0", - "sha256": "0ilgyg8dzvk2xqvm22jkydhw2a463g85mhhfx5sin42jvl8pi122" + "commit": "903380cf9e08d98689c2c116965f8e47d002fad6", + "sha256": "0728k6dbx4435vnm0rfj2pw2kdp4f7j1pwqdmlwp8zf81i5bghzn" }, "stable": { "version": [ 0, - 2, + 3, 0 ], "deps": [ "seq" ], - "commit": "786932352ce2f10214b801e872690e05b6102851", - "sha256": "09i5ds9ayid570x97glcy6cb8qdr5jc8riqfs7wl3hi4dif0z61a" + "commit": "903380cf9e08d98689c2c116965f8e47d002fad6", + "sha256": "0728k6dbx4435vnm0rfj2pw2kdp4f7j1pwqdmlwp8zf81i5bghzn" } }, { @@ -109605,11 +110035,11 @@ "repo": "ideasman42/emacs-sidecar-locals", "unstable": { "version": [ - 20230518, - 1422 + 20240227, + 151 ], - "commit": "b6b66b6d5a8963256d87d87d02f94ae36b39e6f6", - "sha256": "1whzimns7hk69hh02djvghl91ciraj31yv4p1sa9p5vx2m4pg2hv" + "commit": "2b2b765387f2cbae9935c3ee6e2a32aa8d68f1b8", + "sha256": "1nbdip04zdk583s0glbfa5g657vvhsia3h19nr6gwakvlkgv33wb" } }, { @@ -109620,11 +110050,14 @@ "repo": "emacs-sideline/sideline", "unstable": { "version": [ - 20240222, - 151 + 20240319, + 315 + ], + "deps": [ + "ht" ], - "commit": "3bd6315e8c3437b262d6f9975f37d94ac84d0720", - "sha256": "144f42jb5v8dz9ayj5q9v1zcy08xbivx6zf53yrpv6dyban1i37k" + "commit": "04a525f624e1a42c47a2755fbc63be32104f44cb", + "sha256": "1imbb2026vrlrqwjay05442q42w8a1vhb5chl6rdhs504vxaxdp3" }, "stable": { "version": [ @@ -109676,16 +110109,16 @@ "repo": "emacs-sideline/sideline-flycheck", "unstable": { "version": [ - 20240101, - 918 + 20240313, + 2304 ], "deps": [ "flycheck", "ht", "sideline" ], - "commit": "36262547f57699b02e456661156600b044ef26da", - "sha256": "1y24k66cjdq21pals5n01y2mj5nazn2nfiijww4znwzpaabsqi9p" + "commit": "1b3fc4d41b93ab3fa3754d188545d9e8cc0150f1", + "sha256": "0qh2v4jx0bvpcgac3h7kbd87bvgqdrvr7fw2m2syjspfbk7jqb65" }, "stable": { "version": [ @@ -109709,14 +110142,14 @@ "repo": "emacs-sideline/sideline-flymake", "unstable": { "version": [ - 20240101, - 917 + 20240309, + 1112 ], "deps": [ "sideline" ], - "commit": "e6b0e7dd7eea511aad1d9af1d944f1379bd7ad7d", - "sha256": "0viw2hhcy8af4knmcilzc9sp2dh4d0yakamyrqhgn2wn5a9q149z" + "commit": "e6a9ae69fc048f8eaacbf653e7136678dbef4597", + "sha256": "08mng3wqlrflnywiy8m29psk9sks32niy3xgzxrawkkidfv79m9p" }, "stable": { "version": [ @@ -110532,14 +110965,14 @@ "repo": "slime/slime", "unstable": { "version": [ - 20240214, - 2218 + 20240324, + 2347 ], "deps": [ "macrostep" ], - "commit": "1b634dd03503a782882a4d078847920fe9544393", - "sha256": "1bj2bdqvxksrs3hr7p41ar0rrbffq0znzlyghr55kh22v2wns4bk" + "commit": "7e8e754f0eec45beeb7294b1c2d28257fa24ad29", + "sha256": "0q51rghv7baz2ni983cvzhmnxhskshwzcc6ab6x75rmayfwpipir" }, "stable": { "version": [ @@ -111331,15 +111764,15 @@ "repo": "Fuco1/smartparens", "unstable": { "version": [ - 20231024, - 1804 + 20240324, + 946 ], "deps": [ "cl-lib", "dash" ], - "commit": "0778a8a84064cf2bc3a9857bd0e7a4619cc1e5c3", - "sha256": "1svi5zfrg2ygsjb247y02c9i0cqmc5lqa7sq999niriblj5plr60" + "commit": "ddc6233ea6fc2da7a3a8e44face465c15631b02b", + "sha256": "1hv4v9451qjbakpw1ivz4yas8f9xbmxj48f1jn37y31x6j2d1bnn" }, "stable": { "version": [ @@ -111919,15 +112352,15 @@ "repo": "SpringHan/sniem", "unstable": { "version": [ - 20240120, - 654 + 20240228, + 1320 ], "deps": [ "dash", "s" ], - "commit": "8582dafd99131b755e32ecb231ae08025adfde98", - "sha256": "14v7nirbqyynadhzgms5ybiwn83i4dhh606gc5m04sf7ll7x10p5" + "commit": "50ead3321c448261d974ca05cd811fcd2232aeda", + "sha256": "1lx3mqmr8b3hccn6m6gzl12y3z8h6va7479daib1qy489inlk6wz" } }, { @@ -112356,6 +112789,33 @@ } }, { + "ename": "sops", + "commit": "ae47495104fdb4603da59f5ac5390aca935154de", + "sha256": "1gz0mnlmq7i8cmcj1r8yv1xzfgq076qqk743xpy0j9agffds4631", + "fetcher": "github", + "repo": "djgoku/sops", + "unstable": { + "version": [ + 20240315, + 2226 + ], + "deps": [ + "s" + ], + "commit": "9ed9f02ff83ab6e0cb0173f0578be1a5b71e3b66", + "sha256": "1120zfpnask7p3jspyk7yk1qq1g1m7vwp6kfxk7vd3yz9v732cds" + }, + "stable": { + "version": [ + 0, + 1, + 0 + ], + "commit": "b7b6784fb53659c3e8d103dbb027b12cf4846d8c", + "sha256": "1bls67w733cgpnm3b3rrw93jpkckrc4g7a4pprgnm96b3w4qrrkp" + } + }, + { "ename": "sorcery-theme", "commit": "04f78275b18383eb9594eb57e48b5b5c4639cbd8", "sha256": "18g4lkn98cjz5y4c2csziykq9ixafgixsxki04hfk9k1d9idixz3", @@ -112823,11 +113283,11 @@ "repo": "gnuhack/spanish-holidays", "unstable": { "version": [ - 20231212, - 2107 + 20240302, + 1542 ], - "commit": "cf892251468e6ba38c259f759bf31e7f9ad1c036", - "sha256": "0sjrzifbw0p13bl9lvwim5phhbwa7a868pzs6nxqhvxz88lx72bw" + "commit": "81ef3733da0ab807570c7fad1bab613bf7f30acb", + "sha256": "1d2hg6r4zc77xrmid7kz4w91g5ib13hl5kl8ak1w5glb51mfhfbw" } }, { @@ -112928,11 +113388,11 @@ "repo": "condy0919/spdx.el", "unstable": { "version": [ - 20240224, - 56 + 20240316, + 58 ], - "commit": "4554b88e4ba0636a622ac63aa084cd253feff7c0", - "sha256": "00zykhxmcrdl0s9yad0f2xsrgpid7wgwdaf88wjji2y3w92170m7" + "commit": "d1b325c8e7e2ac079de1314f91b980b354117248", + "sha256": "0870vlygdkyd8b6z9kykiqw48b64s0rrr68ir3ig30wmzs2r2441" } }, { @@ -113549,6 +114009,21 @@ } }, { + "ename": "sqlite-mode-extras", + "commit": "5c109bdc19547ac1483b07c54a81934458b525f5", + "sha256": "0v58wm0prl8hz1fzvg9vd7zxqmrd1zbbcnr4kjpqmy575mi9yxzf", + "fetcher": "github", + "repo": "xenodium/sqlite-mode-extras", + "unstable": { + "version": [ + 20240319, + 1312 + ], + "commit": "376aabe26607d40fbd572290296edaaafdf61bd3", + "sha256": "0xsk9b211nk2s6jxijvry5r75j64g3mazcd74iwkd21hq9hal5y8" + } + }, + { "ename": "sqlite3", "commit": "75bbc8a92954bd12b4c9d206a804c34c97b19e3d", "sha256": "1c7j8hzz8xs1nrn931apyj7nhwr3dnfbsrimb6fpdfmms8095y7w", @@ -114562,11 +115037,11 @@ "repo": "PythonNut/su.el", "unstable": { "version": [ - 20210721, - 1816 + 20240320, + 1707 ], - "commit": "1ecf7a7bbf9d88708eb2215e940753f8d6bccc92", - "sha256": "1994ypxz5zgrpdd5v61znf41c0dn4favab560wkgfnhhzrc1jgkf" + "commit": "e097f31b3bbb8581d045d0e684d3f129f90e8085", + "sha256": "091xwf9wivfzi3b8qmw6y2xl280nkvxmfmyr7nfvz0zxbdyim24s" } }, { @@ -115140,8 +115615,8 @@ "repo": "isamert/swagg.el", "unstable": { "version": [ - 20231128, - 2038 + 20240324, + 2014 ], "deps": [ "compat", @@ -115150,8 +115625,24 @@ "s", "yaml" ], - "commit": "097d1441a18eac7169b8a3fba9e253d7f489c6fb", - "sha256": "0rzrvx7cmmxf5fgrfa68z1idhd34q74wq3x93xi9h6xlghbzc2ii" + "commit": "747102ae3448e8dcd5209308447375fd0fee4f89", + "sha256": "1azagz784g73zrcd092qmc5abk2rc9zq225chp2db2mm0v1bf1c0" + }, + "stable": { + "version": [ + 0, + 3, + 2 + ], + "deps": [ + "compat", + "dash", + "request", + "s", + "yaml" + ], + "commit": "747102ae3448e8dcd5209308447375fd0fee4f89", + "sha256": "1azagz784g73zrcd092qmc5abk2rc9zq225chp2db2mm0v1bf1c0" } }, { @@ -115683,14 +116174,14 @@ "repo": "wolray/symbol-overlay", "unstable": { "version": [ - 20230729, - 807 + 20240311, + 1207 ], "deps": [ "seq" ], - "commit": "a783d7b5d8dee5ba9f5e7c00a834fbd6d645081b", - "sha256": "1ah4y3j0kdzf3ygrba5bjs04fpbpc9hwrzb8bb8ql0r42vdhbng5" + "commit": "de215fff392c916ffab01950fcb6daf6fd18be4f", + "sha256": "0n4102h319fpa2gqz6kdz9qx2r63lq9530xmg5mckkjsv8zd706d" }, "stable": { "version": [ @@ -115960,14 +116451,14 @@ "repo": "emacs-berlin/syntactic-close", "unstable": { "version": [ - 20231218, - 1001 + 20240322, + 857 ], "deps": [ "cl-lib" ], - "commit": "022018c4de0d799c92301b76ea4f1775cfc9f510", - "sha256": "1xgghmdj1irbfxcz7fhxs7i0mrp6myska77m0piicryhqpa8ch9d" + "commit": "6cf74c73c9ef946819e3cb6faa8e482fb11ccd53", + "sha256": "0q959gaighs7qcyjyf0a1jqhc39b5zbivk5gvx4n54x65vy0lc2r" } }, { @@ -116216,11 +116707,11 @@ "repo": "ajrosen/tab-bar-buffers", "unstable": { "version": [ - 20220722, - 1937 + 20240227, + 2037 ], - "commit": "6d196d4b853c5355403da86607dfb31a038cc024", - "sha256": "1b2ihlymhzdz13140ywz95j5pz2vflnszvavd0ibxfw05y55ng2m" + "commit": "08a3f39c0b1673e3cad34e1f0e83fb56c903586c", + "sha256": "0rgxwyjkhlhzr4nbbjy08l4z26cic9dw4rhlkpkv9s51wxxnhaw8" } }, { @@ -116441,8 +116932,8 @@ "repo": "shuxiao9058/tabnine", "unstable": { "version": [ - 20231123, - 1236 + 20240227, + 1429 ], "deps": [ "dash", @@ -116452,8 +116943,8 @@ "transient", "vterm" ], - "commit": "f6383e6b8af25ed6edd1ccd67a8791a7a0d06248", - "sha256": "1xq6r90apw7n4hfhrwh65mw4bq02rnv08j4jf8mwnw4ga204fnwi" + "commit": "a46629994b485472a442517e4c287e7a493deb9e", + "sha256": "162bid314jsgjf98i2xpxklwdhmnq0115ha6xr5qd8j6sch0f7xv" } }, { @@ -116464,14 +116955,14 @@ "repo": "mclear-tools/tabspaces", "unstable": { "version": [ - 20240209, - 2300 + 20240306, + 1454 ], "deps": [ "project" ], - "commit": "b8799f477c2b467caf4cc5b740d3945d96b84eca", - "sha256": "0f1nqydm6ji2yq5kf1n8y3cijs0zqvyd2rm1yvr77crsyqy52m9i" + "commit": "73d9cecaeb671e14409c80b10a17be64acebc43c", + "sha256": "09h5lndv8sxv9v3s5jlg3yj949vfq3jf78h1zj59vpzgvgi5cf62" } }, { @@ -116757,10 +117248,10 @@ }, { "ename": "tbx2org", - "commit": "d616cbf4ad7e49807afd2f7acf0a0fd2f2a0bac4", - "sha256": "1yvkw65la4w12c4w6l9ai73lzng170wv4b8gry99m2bakw3wr8m8", + "commit": "78d82b77af53c95242ddc4879d6b923eb2463077", + "sha256": "1z8izwqbs3775car9fbwa52vn4y6mbnlr4q0lnzhfxf8fylkwlri", "fetcher": "github", - "repo": "istib/tbx2org", + "repo": "emacsattic/tbx2org", "unstable": { "version": [ 20140224, @@ -116861,15 +117352,16 @@ "repo": "zevlg/telega.el", "unstable": { "version": [ - 20240214, - 1600 + 20240322, + 901 ], "deps": [ "rainbow-identifiers", + "transient", "visual-fill-column" ], - "commit": "ab03a5ead11e9a0abc96cae6025cd87135a71a57", - "sha256": "0mb911k3qnyr92x7f1ycj24qs41r01imy7yk6f32bdx0ri6921v3" + "commit": "7df0fead1683154dee24b3b61b4b575a89fab039", + "sha256": "09ppf5pgnan285hyfipa930wyi5qc8wf7b70wb9yh8xam7j1insf" }, "stable": { "version": [ @@ -117436,11 +117928,11 @@ "repo": "davidshepherd7/terminal-here", "unstable": { "version": [ - 20240213, - 2304 + 20240227, + 2236 ], - "commit": "0415b2d5ac16325039d0c6e4fdbc8a9e4694820f", - "sha256": "0432vlnr6cdwk5ndldd0vyv7r2wgin56mr40q5gdnxv4ppl6rnlg" + "commit": "c996304c1e873e561108a509129b9e4358d354d5", + "sha256": "0dk9wvsbx0szhn8r7ls4729fi2840ywwfir905b6dmvdxxy85q7k" }, "stable": { "version": [ @@ -117599,15 +118091,15 @@ "repo": "hcl-emacs/terraform-mode", "unstable": { "version": [ - 20231116, - 1525 + 20240321, + 2136 ], "deps": [ "dash", "hcl-mode" ], - "commit": "e8b57df8c2a3d3171f3768f60eb84067f553289c", - "sha256": "03gdyal1r0b64ljmnpz0wcq9rylfh06cv3vggcz81zvjnyssh9qi" + "commit": "a645c32a8f0f0d04034262ae5fea330d5c7a33c6", + "sha256": "17zb4adh8j333nc4w4ywnw4kvljbanrnkmf0k7m6nv71rp1v56fr" }, "stable": { "version": [ @@ -118186,21 +118678,21 @@ "repo": "facebook/fbthrift", "unstable": { "version": [ - 20240216, - 1732 + 20240318, + 1244 ], - "commit": "eca43d4980a147304be41de85ae1e4f24e128fc3", - "sha256": "0cqkkzqwfm8lgypd0bkwhr5mkhq0fgmfifhdzibwj8mbqzbzkqp6" + "commit": "9a64b4682510c27eab73440c56fca1eda9e05abd", + "sha256": "0m5nb9mq434wcfggdrpxyznbbp9psdkqqqdkps9jfs305qcld5zd" }, "stable": { "version": [ 2024, - 2, - 19, + 3, + 18, 0 ], - "commit": "eca43d4980a147304be41de85ae1e4f24e128fc3", - "sha256": "0cqkkzqwfm8lgypd0bkwhr5mkhq0fgmfifhdzibwj8mbqzbzkqp6" + "commit": "9a64b4682510c27eab73440c56fca1eda9e05abd", + "sha256": "0m5nb9mq434wcfggdrpxyznbbp9psdkqqqdkps9jfs305qcld5zd" } }, { @@ -118575,11 +119067,11 @@ "repo": "aimebertrand/timu-caribbean-theme", "unstable": { "version": [ - 20231022, - 1816 + 20240224, + 2028 ], - "commit": "5fc2cad6c91748afa98d1df2b65b3b5329d21b03", - "sha256": "0hsn3q36pdgg4w2nxmszsr7d3n0wkc291i1v04nakknhw8fx6b0m" + "commit": "ec83fc030ad7c098637df6f3a56d844f8526c571", + "sha256": "0pf7sdcc6gpb5k8qmig7bgxhdqxl3jgah4wcvxcv8s8cfmmhrlfx" }, "stable": { "version": [ @@ -118627,19 +119119,19 @@ "repo": "aimebertrand/timu-macos-theme", "unstable": { "version": [ - 20240215, - 1822 + 20240317, + 2007 ], - "commit": "b99b7d77530748009366910b69c238b4c21f5bc0", - "sha256": "0yj9sy6iyya3p29kfhb4dlaz2sbq39alvkciv173w992g92cd5s8" + "commit": "6079fa1bf9859955d30d6c51e7d8105588a9b588", + "sha256": "0f8jawiszqw2xwac2c3ipr8jdx7vfi5wr6xyd491m3faif4rmzz6" }, "stable": { "version": [ 1, - 2 + 3 ], - "commit": "665c6e409c7d6a37575b3e64961b17ae3db18cb8", - "sha256": "06jz2gz6qs0iyd466qxra17x80jigkmvpf4ynh5q9z2pq113mrn7" + "commit": "43c2ebc4364c227e9e8943478c21250c594b3c50", + "sha256": "0lb7nlvmjmhq5dpqd2mdhn1h4hyy09bkpqmvz9dh8jwmgp8gfr04" } }, { @@ -118650,11 +119142,11 @@ "repo": "aimebertrand/timu-rouge-theme", "unstable": { "version": [ - 20230911, - 2116 + 20240224, + 2040 ], - "commit": "49df5e054c87044fdd941796f423a621b9495f70", - "sha256": "1v5srm1gbsy31384lys21hc4mj4xd7q3bkwhgjp8i9k0rrl0hrb8" + "commit": "2095a2bedb2682145407e149d1c2b1c0aa02a6f8", + "sha256": "0zzk4ydf245x8wz6sbmpnch614k7h0k8zyllw9x4l2paw4las5fv" }, "stable": { "version": [ @@ -118673,11 +119165,11 @@ "repo": "aimebertrand/timu-spacegrey-theme", "unstable": { "version": [ - 20231010, - 2137 + 20240224, + 2010 ], - "commit": "fbe0aacc0d1010631ba8b2848b78e26514ce60c6", - "sha256": "0h8kkzgfz5hkynlynml0pgkq9j6fzzq33hl9ww8mq1gzzq6n62db" + "commit": "1cca501c9640a9f1d6bf717dc36df96d35deeeba", + "sha256": "13ymng05yvdx1pddnb8hwqs8drvgmkyhndqqahdcg3bd41qkijb6" }, "stable": { "version": [ @@ -119322,25 +119814,25 @@ "repo": "fledermaus/totp.el", "unstable": { "version": [ - 20240203, - 2152 + 20240227, + 1841 ], "deps": [ "base32" ], - "commit": "5fa6529ace892972d2d7ce08af88c7912a1c25a6", - "sha256": "05z6w1s4mxv8knnknq5lj6frp7j4wy6zrafg1hq1kv7q28nqv4qr" + "commit": "af2ca2f0623d5268e31f1fe19bc1370c14b601b1", + "sha256": "1vw1vpnxa4qxbdsmis8d0df3qhwr1c5h0q04rvwmyviixd729mlr" }, "stable": { "version": [ 1, - 0 + 1 ], "deps": [ "base32" ], - "commit": "da1498e54df8802efe2174c0e988c23fea49fc79", - "sha256": "05z6w1s4mxv8knnknq5lj6frp7j4wy6zrafg1hq1kv7q28nqv4qr" + "commit": "927257e97a602b6979a75028e8417bf1499582d4", + "sha256": "1vw1vpnxa4qxbdsmis8d0df3qhwr1c5h0q04rvwmyviixd729mlr" } }, { @@ -119486,19 +119978,19 @@ "repo": "emacs-circe/circe", "unstable": { "version": [ - 20231119, - 1417 + 20240225, + 1112 ], - "commit": "1a66ac496465d5970d982b088809940286b77800", - "sha256": "06digshq994ggsiw9cfs4kfsj4xmp1byi5d5fs3wkqljdw08078n" + "commit": "6f33a481af6bce68f55b9e25d5c14c1ed46fa9d9", + "sha256": "026dvi4v1dghfv3f2g15h8xz69an3l352kn5krcr6cb4s510b5qm" }, "stable": { "version": [ 2, - 12 + 13 ], - "commit": "710f057fedae6e9b820cce9336fef24b7d057e4c", - "sha256": "0lrxd4hanaxj85nafsc0wss677slmyaks3qb7a95mj7vic3ib937" + "commit": "6f33a481af6bce68f55b9e25d5c14c1ed46fa9d9", + "sha256": "026dvi4v1dghfv3f2g15h8xz69an3l352kn5krcr6cb4s510b5qm" } }, { @@ -119575,11 +120067,11 @@ "repo": "fosskers/transducers.el", "unstable": { "version": [ - 20240206, - 646 + 20240308, + 843 ], - "commit": "acf4588bc3113e8412451650b0c38243ed43db89", - "sha256": "0n7w3vpdvhci5j6i5v73cp3awcp3airm4rb6f2jhz3ni8ih9z1by" + "commit": "2d452e4cdc3b5cfa29ee3d7a645ff53d4e993384", + "sha256": "1k17mxkk7mdv07ji30njxdpkzgyjpn4v45p0am72wn1k1kyq4vim" }, "stable": { "version": [ @@ -119617,28 +120109,28 @@ "repo": "magit/transient", "unstable": { "version": [ - 20240221, - 1504 + 20240321, + 2209 ], "deps": [ "compat", "seq" ], - "commit": "ba37702ab3cf90191865172bd5581fd353ccba63", - "sha256": "0wl5x3dfkw41d8pvmyqn4g2jd2dyanncaxms6g2wqhfkp41rkg97" + "commit": "55d5d41b48d7f7bc1ecf1f90c012d7821dff5724", + "sha256": "1mdcph2g0nbava3npa7bz463jqrz8rp9zmjgx8rqk7bdz2gd2yai" }, "stable": { "version": [ 0, - 5, - 3 + 6, + 0 ], "deps": [ "compat", "seq" ], - "commit": "72cf67d7e047a4f82e0e18bd016c7826bf2efde0", - "sha256": "0fr0pan4dffckfywnx7a0dkb2l71fnc47cqqqb1lckqwr1gr9z6l" + "commit": "55d5d41b48d7f7bc1ecf1f90c012d7821dff5724", + "sha256": "1mdcph2g0nbava3npa7bz463jqrz8rp9zmjgx8rqk7bdz2gd2yai" } }, { @@ -120093,26 +120585,26 @@ "repo": "emacs-tree-sitter/tree-sitter-langs", "unstable": { "version": [ - 20240223, - 1000 + 20240324, + 1936 ], "deps": [ "tree-sitter" ], - "commit": "8b65f758e95705708e416f3fd535c664838a3083", - "sha256": "1kd2sjz73a0vqfl1g1fdfhg8y3r826gm6xhqlhxz31g1j69b8z5q" + "commit": "c56cb511045d50e30f78508c54494e025d6af2cb", + "sha256": "0xxksxa8i37d33izkkfjmq0igyir98szxywkjg9rs28hj55m7zfj" }, "stable": { "version": [ 0, 12, - 139 + 163 ], "deps": [ "tree-sitter" ], - "commit": "8b65f758e95705708e416f3fd535c664838a3083", - "sha256": "1kd2sjz73a0vqfl1g1fdfhg8y3r826gm6xhqlhxz31g1j69b8z5q" + "commit": "c56cb511045d50e30f78508c54494e025d6af2cb", + "sha256": "0xxksxa8i37d33izkkfjmq0igyir98szxywkjg9rs28hj55m7zfj" } }, { @@ -120189,8 +120681,8 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20240214, - 2107 + 20240229, + 2108 ], "deps": [ "ace-window", @@ -120202,8 +120694,8 @@ "pfuture", "s" ], - "commit": "025b7ce326bec062a33d772cc6548e55f940c622", - "sha256": "00y15mn949vnm8yg1gqi66lp70kv5vnyknwnh4v3amamqbh5na15" + "commit": "8c6df39f01a4d47fda2cc943645fa067f771b748", + "sha256": "12jfivx5gqayv8n2q08f7inwqmxck51q0r9nxgb1m1kzi5vdisqp" }, "stable": { "version": [ @@ -120725,15 +121217,14 @@ "stable": { "version": [ 0, - 2, - 2 + 3 ], "deps": [ "dash", "s" ], - "commit": "0bf2ac9680ae077d6f110ea0629728fbc654e945", - "sha256": "0l35gz1hpada2kzascbyqgawa5d3sdyg67gzvak84p9zx62jppn8" + "commit": "552936017cfdec89f7fc20c254ae6b37c3f22c5b", + "sha256": "18lif159zndl19ddz9rfq12l90770858yasfns21ryl1yrq3aifr" } }, { @@ -120777,10 +121268,10 @@ }, { "ename": "tsort", - "commit": "ccd853a83f5acaeb74859fc2b5899693985c6ef7", - "sha256": "1xcc8k1bi3vbz87g969chqkdz5nqajcf2qj6sfcm4s01705p7r23", + "commit": "cf4164640ae2baf7610b4d10c8edd070969db0b0", + "sha256": "0x8idv1jjwfmda834dqhiff05f7q6i258iaiwyl1vbmck818kzhv", "fetcher": "github", - "repo": "ehawkvu/tsort.el", + "repo": "echawk/tsort.el", "unstable": { "version": [ 20231027, @@ -120897,14 +121388,14 @@ "repo": "smallwat3r/tubestatus.el", "unstable": { "version": [ - 20220620, - 2028 + 20240322, + 2129 ], "deps": [ "request" ], - "commit": "bf722d441ff96ff8fac6c8d2a798e283fef5613b", - "sha256": "08cwyabcb0qzydsw14n9vk93y471yp8cyif9pcbmx2qrr9kd07xa" + "commit": "26c2627f70badfd4cf6069c31ebc20fa8b03136d", + "sha256": "0xqk230ah7dr2casm4hmxhp85dks030v310ah3n7az5csdzs6xpr" } }, { @@ -121172,20 +121663,20 @@ "repo": "KeyWeeUsr/typewriter-roll-mode", "unstable": { "version": [ - 20231130, - 1 + 20240225, + 1412 ], - "commit": "100da2ba50195dcde926aecdf8b72ce4c1ccaeff", - "sha256": "165mrqy13bkrabc5hsd780ll362j7b518c5ys6qlcdvijv4dgm40" + "commit": "99afeb13bd0340a23176c4ebfdabc93117c04069", + "sha256": "0xz7b1bgrlqp4bprr3gsgq3vxvh17lk0jgwdxkfsxv6vffqrzc0a" }, "stable": { "version": [ 1, - 0, - 1 + 1, + 0 ], - "commit": "100da2ba50195dcde926aecdf8b72ce4c1ccaeff", - "sha256": "165mrqy13bkrabc5hsd780ll362j7b518c5ys6qlcdvijv4dgm40" + "commit": "99afeb13bd0340a23176c4ebfdabc93117c04069", + "sha256": "0xz7b1bgrlqp4bprr3gsgq3vxvh17lk0jgwdxkfsxv6vffqrzc0a" } }, { @@ -122427,15 +122918,15 @@ "repo": "smallwat3r/untappd.el", "unstable": { "version": [ - 20210815, - 1544 + 20240316, + 1755 ], "deps": [ "emojify", "request" ], - "commit": "8a31e5888ddd73ed5d2b6ac8ce27acc30f2b59fc", - "sha256": "0iawj6xhchfvbhnajyw7gjd0c8dwjyzqkg219ay22p8ffgpzqrw3" + "commit": "0b46faab755c8f6c4b70a45c24af1673465d9958", + "sha256": "042kw4sxazjvl7x90n4b7ilasc1z5lniw691wiz9jmzj8h1j3niw" } }, { @@ -122848,26 +123339,26 @@ "repo": "diml/utop", "unstable": { "version": [ - 20230707, - 1535 + 20240226, + 1308 ], "deps": [ "tuareg" ], - "commit": "5b98d2845bf8e46a253593578cf0371d773f6da0", - "sha256": "14z9asqx7z3i2j6vy0la699nxj2cxhggjc77jnsg9761kv159wym" + "commit": "d4f6f5f7337eeeac9507801c8f147fff518f9d69", + "sha256": "03lagf6s7rsxcgrqk1nklnrbsjrng5gpw0h0rza510y08k77gw52" }, "stable": { "version": [ 2, - 13, - 1 + 14, + 0 ], "deps": [ "tuareg" ], - "commit": "5b98d2845bf8e46a253593578cf0371d773f6da0", - "sha256": "14z9asqx7z3i2j6vy0la699nxj2cxhggjc77jnsg9761kv159wym" + "commit": "d4f6f5f7337eeeac9507801c8f147fff518f9d69", + "sha256": "03lagf6s7rsxcgrqk1nklnrbsjrng5gpw0h0rza510y08k77gw52" } }, { @@ -123304,20 +123795,20 @@ "repo": "tarsius/vcomp", "unstable": { "version": [ - 20230407, - 1426 + 20240302, + 2255 ], - "commit": "fdd010e9081d62aa6aaa1b25a2df925efd662d0c", - "sha256": "1kpafj5sxcd0qkxfnqqh9pl2wpjdy4vs04jjy1w33cdrz411k60v" + "commit": "99831d234481a61488aca4b96b842b63a79c732a", + "sha256": "06qcmlr16dnvwln4136vz6m0zs5mp81awy40jv8pmvhwms9fprr7" }, "stable": { "version": [ 1, - 0, + 1, 0 ], - "commit": "f839b3b3257a564b19d7f9557dc8bcbbe0b95842", - "sha256": "1xd42bdi6x89gc9xjrwvzzdaanv9vwlbbjwp25bs1nsd53k5nvak" + "commit": "99831d234481a61488aca4b96b842b63a79c732a", + "sha256": "06qcmlr16dnvwln4136vz6m0zs5mp81awy40jv8pmvhwms9fprr7" } }, { @@ -123620,20 +124111,20 @@ "repo": "federicotdn/verb", "unstable": { "version": [ - 20240210, - 1127 + 20240317, + 1608 ], - "commit": "b3e3c3eeea21ffa24f5dc8bef6dd401cc25c199a", - "sha256": "06sk6gllhni4ai3nh304zjsv17fzpsficbp2zi2mbn6q8vd5siax" + "commit": "a430847beb925ae82007d70f32f3bab38f0054e9", + "sha256": "0amcnyslr4inpms48ricln6nm1yp1rkbrpv1qgabml3f70x1faz9" }, "stable": { "version": [ 2, - 15, + 16, 0 ], - "commit": "f9ea5780ec65e6f30451514b72ce99619dd8457f", - "sha256": "1l38ax1ms7s2qwjnqd0djf2gcy5jpqha55d17vyvkx1kgwjapja7" + "commit": "442e9ddaa658bc9e8d3e50f930e2024fd88a3aa9", + "sha256": "1jyav9y2awzaaiz8drlwgb3170pv6ra95zaichfyywdhxxny0fw5" } }, { @@ -123862,28 +124353,29 @@ "repo": "radian-software/prescient.el", "unstable": { "version": [ - 20240104, - 1357 + 20240226, + 204 ], "deps": [ "compat", "prescient", "vertico" ], - "commit": "864b352e7ecc649cd13ff23172c9cc8039129cc9", - "sha256": "0vfmzi5kj67il1ab3r91fkv72v0xk7d9bmc6y6abgqw8mqf5sjhq" + "commit": "c39bf07c56b427bf41aafd7d20eaef5cf3c312b5", + "sha256": "0pfc0ycp4cr9zwkjv3rqfkwkx8p52ad7aq2c60j0qwp3yd0cghc4" }, "stable": { "version": [ 6, - 2 + 3 ], "deps": [ + "compat", "prescient", "vertico" ], - "commit": "c0eca3328313f1e93d24e686307516f43a484ba2", - "sha256": "1vj21kcqlsa02nvslmxgxsbv4pc93gakj4x2a6rbk87zl6ccw7pk" + "commit": "c39bf07c56b427bf41aafd7d20eaef5cf3c312b5", + "sha256": "0pfc0ycp4cr9zwkjv3rqfkwkx8p52ad7aq2c60j0qwp3yd0cghc4" } }, { @@ -124655,11 +125147,11 @@ "repo": "akermu/emacs-libvterm", "unstable": { "version": [ - 20240102, - 1640 + 20240318, + 1617 ], - "commit": "e96c53f5035c841b20937b65142498bd8e161a40", - "sha256": "0k1pb505ld7nzkh60danrx3qsrb3ifcqcm0359qbhg1ls12mrsnm" + "commit": "303decd923ef83a184b861d34081fd8635484a03", + "sha256": "15srbva8s19valai3ji794k0fha2xz3jhw81rg75mpnwcd5cxynb" } }, { @@ -125179,16 +125671,16 @@ "repo": "wanderlust/wanderlust", "unstable": { "version": [ - 20240207, - 949 + 20240229, + 1209 ], "deps": [ "apel", "flim", "semi" ], - "commit": "c15e8ece4f34f10479e17cda19d10b98f6be3ec1", - "sha256": "1lsld77wql0n9vsdnpj2zb50r8ngcfjsi9fzl7mpv3929n99w3r2" + "commit": "e525f27d29e122bb8baefa1837816f9001fa5085", + "sha256": "0gphh1qh55jkg2a8gvwjf5f60jhjk3c3y40iikgvgw6hnx3aw8ga" } }, { @@ -125479,11 +125971,11 @@ "repo": "fxbois/web-mode", "unstable": { "version": [ - 20240210, - 1511 + 20240315, + 1838 ], - "commit": "f19788e76c2359075975c20b8fda1f0b5080f042", - "sha256": "0bilcgsinqdqgspkbx31gq44d7cz8xpj9xdnjflg70c7ppr505dy" + "commit": "a9d21841224da3295f2dd0a90022f5e435e48046", + "sha256": "19v4mwa1arnxrznqq8x7zsqlgvgznmw4yn8yd77jyr5lcvw43nax" }, "stable": { "version": [ @@ -126117,11 +126609,11 @@ "repo": "justbur/emacs-which-key", "unstable": { "version": [ - 20240221, - 138 + 20240312, + 2033 ], - "commit": "5fbdf05351e77ee62e3933c7b5f46459693bd04c", - "sha256": "0bvw7qd0avik114dvlrfarzhx0rvwpa2jz0qx2n5wq8is08py6q3" + "commit": "96911a1d3faf8426a33241f4821319e98421f380", + "sha256": "0icplq3rnvaixx83phmwzspcw4wy1wzfcxhkf16fna2ik2i35829" }, "stable": { "version": [ @@ -126300,19 +126792,20 @@ "repo": "lassik/emacs-whois", "unstable": { "version": [ - 20240205, - 2147 + 20240315, + 1929 ], - "commit": "5cd0e1724ed8159927df06ded55162d0c122c0fd", - "sha256": "1i3zwp4q3804q71q08vnc9am8lagvz2lx9h27pwry10dihcv4gz6" + "commit": "d4466b296721fa94b2ceab1c51bc9bfd8bbf4e0a", + "sha256": "0b9a45m0z8apbas9hbfry68cyy801cmvrzfxr54wni8bppbz7gcl" }, "stable": { "version": [ 0, - 3 + 4, + 1 ], - "commit": "6ce65ec5c992b1e1cb538610f1c3708e9d467c39", - "sha256": "0cz5c0zy4lz0534nfr2xf7p0d09ppcfdmry4335gx19vz47fj60n" + "commit": "d4466b296721fa94b2ceab1c51bc9bfd8bbf4e0a", + "sha256": "0b9a45m0z8apbas9hbfry68cyy801cmvrzfxr54wni8bppbz7gcl" } }, { @@ -126899,10 +127392,10 @@ "version": [ 1, 0, - 11 + 12 ], - "commit": "13e6fbf177e04153159a137168c880d3bc0d56e6", - "sha256": "1w2wx5001aiwky25kvk190d1bgz6g856nm5hhaggsyb1h9f5ws17" + "commit": "7c6239a779656cd55225ad24e15cc29bc896f834", + "sha256": "0m5ssl4ngk2jl1zk0fnsss0asyvwanjaa5rrcksldqnh2ikcr4bm" } }, { @@ -127260,11 +127753,11 @@ "repo": "martianh/wordreference.el", "unstable": { "version": [ - 20231008, - 1456 + 20240318, + 2135 ], - "commit": "da8bfc29c1500bef27423c2be03e46aff1b9bdd4", - "sha256": "1d267ddzxns95zn4xgwyp55jz6ca3df1lq8npjskswnyvcczrxrb" + "commit": "6cd9e43c809267fc37e21e99d49ded4e4731b48a", + "sha256": "06m17drciv9nxb7344ir0gm7a3krz24krh78v167vnyvzv72abfr" } }, { @@ -128559,11 +129052,11 @@ "repo": "yoshiki/yaml-mode", "unstable": { "version": [ - 20231120, - 546 + 20240317, + 1602 ], - "commit": "aa7f04d8aaeb1b580904a84cadf561721d9acdbb", - "sha256": "1kgig5b975gcxfyq4z69nmf70fr6cznl2p7hvga5dy680xxls5yd" + "commit": "7b5ce294fb15c2c8926fa476d7218aa415550a2a", + "sha256": "0hraswfb669iq510zdxvf642mkaylardxrj9a9lipsii26ibqrzn" }, "stable": { "version": [ @@ -128583,26 +129076,26 @@ "repo": "zkry/yaml-pro", "unstable": { "version": [ - 20240223, - 1406 + 20240313, + 307 ], "deps": [ "yaml" ], - "commit": "504943460174febf36427c94483a3c63c7b28e26", - "sha256": "1qh33gffz7avi5gjw754rl2cif32hqv532za7wqsbzga5aags2vy" + "commit": "775c0a4b82c79da0eb91620fb0cbbf6c8642815b", + "sha256": "16l1nmi9rizrcmx53xc8yr4y6lw5cg26hnwbw6l38i9nzhklx23n" }, "stable": { "version": [ + 1, 0, - 3, - 5 + 0 ], "deps": [ "yaml" ], - "commit": "4599bcb552555a39b5fab99b425180cdc131213c", - "sha256": "1ihi9ydzws97r0n5y71xyiljg0099c8w5vym8riv8skzf15bf5yp" + "commit": "c5d4d7eb3d2221dea7ee8c04286f1272806929c1", + "sha256": "0b0s3c7h3l94743qqpx16djn4d6xsrb59yhmz3fr7afrysp7d77q" } }, { @@ -128802,14 +129295,14 @@ "repo": "joaotavora/yasnippet", "unstable": { "version": [ - 20240215, - 1909 + 20240308, + 815 ], "deps": [ "cl-lib" ], - "commit": "1ec7e3b6f79de076133f16da61e3d99f16668048", - "sha256": "0hk5k2sghl4j478pyp7n7dqq3iqz0rcf607cs51f2sy1y362f0gy" + "commit": "33587a8551b8f6991b607d3532062a384c010ce1", + "sha256": "1412iz2k8fvkgb0kdnmv7g3mw8fqa8smbxzs2w8c2ahbm4bprrfq" }, "stable": { "version": [ @@ -128832,14 +129325,14 @@ "repo": "elken/yasnippet-capf", "unstable": { "version": [ - 20240116, - 1646 + 20240309, + 1316 ], "deps": [ "yasnippet" ], - "commit": "db12b55cd08b614cbba134008566e48d7faf660e", - "sha256": "0a5iqh3jcnkf5l9df2pp73aqcpzafjyj4a556q4v2w17v0wwn7f4" + "commit": "9043f8275176a8f198ce8e81fadab1870fa165bb", + "sha256": "19czzfjcd9m34ga51m5s10rlxp3v4q7fbq0cb5mc99ahbl763z9n" } }, { @@ -129061,26 +129554,26 @@ "url": "https://git.thanosapollo.org/yeetube", "unstable": { "version": [ - 20240210, - 1008 + 20240320, + 1033 ], "deps": [ "compat" ], - "commit": "bdb3d532308071cd912bfbf92963c9cabe79de7c", - "sha256": "0c2iq6rb179zh9qbw7prxsjbiz77j060pj75s82wbbz5xjavzgp5" + "commit": "f9c28a527a60811c4b60bdd3730ca25c9522739a", + "sha256": "0idnvy7jgry8q3vf3532xdfxz62hc9qdn5ssb6mp32kmya9c3v3j" }, "stable": { "version": [ 2, 1, - 2 + 4 ], "deps": [ "compat" ], - "commit": "bdb3d532308071cd912bfbf92963c9cabe79de7c", - "sha256": "0c2iq6rb179zh9qbw7prxsjbiz77j060pj75s82wbbz5xjavzgp5" + "commit": "f9feada5c09fa8245f0230696557f7e7ffa266f1", + "sha256": "1gpfm41d4wzk1i0hnmfn81xv05ida9ljibar7ji4d7nisjbd4vp9" } }, { @@ -129893,14 +130386,14 @@ "repo": "ziglang/zig-mode", "unstable": { "version": [ - 20240221, - 1019 + 20240301, + 1618 ], "deps": [ "reformatter" ], - "commit": "9ce200971008fa29641ab7bec80802b450b65646", - "sha256": "1s44mq24s5a6kbq09mwswwxn91p4mlgpm0k0ff13i68cxd7641li" + "commit": "b6f5375efeb97026410190f352f1044214fa0289", + "sha256": "0nll0ib9yvmjvysvvvmfdq5gl2zrwymzrifmmvifns8ddc2iv9ql" } }, { @@ -130548,11 +131041,11 @@ "repo": "pesterhazy/zprint-mode.el", "unstable": { "version": [ - 20200731, - 1238 + 20240311, + 941 ], - "commit": "b9b72b4918156f2f44aa544be9e19ea391937c2a", - "sha256": "1jvk8g8qc83y6pmklk403mikl6q3s6gls60fyw07p8f3kvhgfxzi" + "commit": "cd7ae7400177b3c233a77c2a46de818c72375362", + "sha256": "0dygbbasz8mxbz6n6zcsd1xj1n3ab35yxiabjwgi7zlikxigjipw" } }, { diff --git a/pkgs/applications/editors/emacs/sources.nix b/pkgs/applications/editors/emacs/sources.nix index a5797ae6f3056..c8f80ef9fe6c9 100644 --- a/pkgs/applications/editors/emacs/sources.nix +++ b/pkgs/applications/editors/emacs/sources.nix @@ -98,10 +98,10 @@ in emacs29 = import ./make-emacs.nix (mkArgs { pname = "emacs"; - version = "29.2"; + version = "29.3"; variant = "mainline"; - rev = "29.2"; - hash = "sha256-qSQmQzVyEGSr4GAI6rqnEwBvhl09D2D8MNasHqZQPL8="; + rev = "29.3"; + hash = "sha256-4yN81djeKb9Hlr6MvaDdXqf4XOl0oolXEYGqkA+KUO0="; }); emacs28-macport = import ./make-emacs.nix (mkArgs { diff --git a/pkgs/applications/editors/vim/plugins/neovim-require-check-hook.sh b/pkgs/applications/editors/vim/plugins/neovim-require-check-hook.sh index 5b454e0ff01b9..0c6a0010845d7 100644 --- a/pkgs/applications/editors/vim/plugins/neovim-require-check-hook.sh +++ b/pkgs/applications/editors/vim/plugins/neovim-require-check-hook.sh @@ -10,7 +10,7 @@ neovimRequireCheckHook () { # editorconfig-checker-disable export HOME="$TMPDIR" @nvimBinary@ -es --headless -n -u NONE -i NONE --clean -V1 \ - --cmd "set rtp+=$out" \ + --cmd "set rtp+=$out,${dependencies/ /,}" \ --cmd "lua require('$nvimRequireCheck')" fi } diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 21967ce5d2f6c..c832ed9c777e6 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -670,6 +670,9 @@ hardhat-nvim = super.hardhat-nvim.overrideAttrs { dependencies = with self; [ overseer-nvim plenary-nvim ]; + + doInstallCheck = true; + nvimRequireCheck = "hardhat"; }; harpoon = super.harpoon.overrideAttrs { diff --git a/pkgs/applications/emulators/dolphin-emu/default.nix b/pkgs/applications/emulators/dolphin-emu/default.nix index f81fce6a5aa8b..b2a9bbb7bbc40 100644 --- a/pkgs/applications/emulators/dolphin-emu/default.nix +++ b/pkgs/applications/emulators/dolphin-emu/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , cmake , pkg-config , wrapQtAppsHook @@ -71,6 +72,12 @@ stdenv.mkDerivation rec { patches = [ # Remove when merged https://github.com/dolphin-emu/dolphin/pull/12070 ./find-minizip-ng.patch + + # fix buidl w/ glibc-2.39 + (fetchpatch { + url = "https://github.com/dolphin-emu/dolphin/commit/3da2e15e6b95f02f66df461e87c8b896e450fdab.patch"; + hash = "sha256-+8yGF412wQUYbyEuYWd41pgOgEbhCaezexxcI5CNehc="; + }) ]; strictDeps = true; diff --git a/pkgs/build-support/agda/default.nix b/pkgs/build-support/agda/default.nix index 681d1ea681bb4..44c9ade02ffb8 100644 --- a/pkgs/build-support/agda/default.nix +++ b/pkgs/build-support/agda/default.nix @@ -2,14 +2,28 @@ { stdenv, lib, self, Agda, runCommand, makeWrapper, writeText, ghcWithPackages, nixosTests }: -with lib.strings; - let + inherit (lib) + attrValues + elem + filter + filterAttrs + isAttrs + isList + platforms + ; + + inherit (lib.strings) + concatMapStrings + concatMapStringsSep + optionalString + ; + withPackages' = { pkgs, ghc ? ghcWithPackages (p: with p; [ ieee754 ]) }: let - pkgs' = if builtins.isList pkgs then pkgs else pkgs self; + pkgs' = if isList pkgs then pkgs else pkgs self; library-file = writeText "libraries" '' ${(concatMapStringsSep "\n" (p: "${p}/${p.libraryFile}") pkgs')} ''; @@ -23,7 +37,7 @@ let inherit withPackages; tests = { inherit (nixosTests) agda; - allPackages = withPackages (lib.filter self.lib.isUnbrokenAgdaPackage (lib.attrValues self)); + allPackages = withPackages (filter self.lib.isUnbrokenAgdaPackage (attrValues self)); }; }; inherit (Agda) meta; @@ -35,7 +49,7 @@ let ln -s ${Agda}/bin/agda-mode $out/bin/agda-mode ''; - withPackages = arg: if builtins.isAttrs arg then withPackages' arg else withPackages' { pkgs = arg; }; + withPackages = arg: if isAttrs arg then withPackages' arg else withPackages' { pkgs = arg; }; extensions = [ "agda" @@ -62,7 +76,7 @@ let , extraExtensions ? [] , ... }: let - agdaWithArgs = withPackages (builtins.filter (p: p ? isAgdaDerivation) buildInputs); + agdaWithArgs = withPackages (filter (p: p ? isAgdaDerivation) buildInputs); includePathArgs = concatMapStrings (path: "-i" + path + " ") (includePaths ++ [(dirOf everythingFile)]); in { @@ -91,13 +105,13 @@ let # darwin, it seems that there is no standard such locale; luckily, # the referenced issue doesn't seem to surface on darwin. Hence let's # set this only on non-darwin. - LC_ALL = lib.optionalString (!stdenv.isDarwin) "C.UTF-8"; + LC_ALL = optionalString (!stdenv.isDarwin) "C.UTF-8"; - meta = if meta.broken or false then meta // { hydraPlatforms = lib.platforms.none; } else meta; + meta = if meta.broken or false then meta // { hydraPlatforms = platforms.none; } else meta; # Retrieve all packages from the finished package set that have the current package as a dependency and build them - passthru.tests = with builtins; - lib.filterAttrs (name: pkg: self.lib.isUnbrokenAgdaPackage pkg && elem pname (map (pkg: pkg.pname) pkg.buildInputs)) self; + passthru.tests = + filterAttrs (name: pkg: self.lib.isUnbrokenAgdaPackage pkg && elem pname (map (pkg: pkg.pname) pkg.buildInputs)) self; }; in { diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index 1a32f365bab2a..b2545d0ad0e57 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -35,7 +35,7 @@ # Note: the hardening flags are part of the bintools-wrapper, rather than # the cc-wrapper, because a few of them are handled by the linker. -, defaultHardeningFlags ? with stdenvNoCC; [ +, defaultHardeningFlags ? [ "bindnow" "format" "fortify" @@ -44,7 +44,7 @@ "relro" "stackprotector" "strictoverflow" - ] ++ lib.optional ( + ] ++ lib.optional (with stdenvNoCC; # Musl-based platforms will keep "pie", other platforms will not. # If you change this, make sure to update section `{#sec-hardening-in-nixpkgs}` # in the nixpkgs manual to inform users about the defaults. @@ -59,15 +59,30 @@ , postLinkSignHook ? null, signingUtils ? null }: -with lib; - assert nativeTools -> !propagateDoc && nativePrefix != ""; -assert !nativeTools -> - bintools != null && coreutils != null && gnugrep != null; +assert !nativeTools -> bintools != null && coreutils != null && gnugrep != null; assert !(nativeLibc && noLibc); assert (noLibc || nativeLibc) == (libc == null); let + inherit (lib) + attrByPath + concatStringsSep + getBin + getDev + getLib + getName + getVersion + hasSuffix + optional + optionalAttrs + optionals + optionalString + platforms + removePrefix + replaceStrings + ; + stdenv = stdenvNoCC; inherit (stdenv) hostPlatform targetPlatform; @@ -75,18 +90,18 @@ let # # TODO(@Ericson2314) Make unconditional, or optional but always true by # default. - targetPrefix = lib.optionalString (targetPlatform != hostPlatform) + targetPrefix = optionalString (targetPlatform != hostPlatform) (targetPlatform.config + "-"); - bintoolsVersion = lib.getVersion bintools; - bintoolsName = lib.removePrefix targetPrefix (lib.getName bintools); + bintoolsVersion = getVersion bintools; + bintoolsName = removePrefix targetPrefix (getName bintools); - libc_bin = lib.optionalString (libc != null) (getBin libc); - libc_dev = lib.optionalString (libc != null) (getDev libc); - libc_lib = lib.optionalString (libc != null) (getLib libc); - bintools_bin = lib.optionalString (!nativeTools) (getBin bintools); + libc_bin = optionalString (libc != null) (getBin libc); + libc_dev = optionalString (libc != null) (getDev libc); + libc_lib = optionalString (libc != null) (getLib libc); + bintools_bin = optionalString (!nativeTools) (getBin bintools); # The wrapper scripts use 'cat' and 'grep', so we may need coreutils. - coreutils_bin = lib.optionalString (!nativeTools) (getBin coreutils); + coreutils_bin = optionalString (!nativeTools) (getBin coreutils); # See description in cc-wrapper. suffixSalt = replaceStrings ["-" "."] ["_" "_"] targetPlatform.config; @@ -114,11 +129,11 @@ let else if targetPlatform.isLoongArch64 then "${sharedLibraryLoader}/lib/ld-linux-loongarch*.so.1" else if targetPlatform.isDarwin then "/usr/lib/dyld" else if targetPlatform.isFreeBSD then "/libexec/ld-elf.so.1" - else if lib.hasSuffix "pc-gnu" targetPlatform.config then "ld.so.1" + else if hasSuffix "pc-gnu" targetPlatform.config then "ld.so.1" else ""; expand-response-params = - lib.optionalString (buildPackages ? stdenv && buildPackages.stdenv.hasCC && buildPackages.stdenv.cc != "/dev/null") + optionalString (buildPackages ? stdenv && buildPackages.stdenv.hasCC && buildPackages.stdenv.cc != "/dev/null") (import ../expand-response-params { inherit (buildPackages) stdenv; }); in @@ -126,7 +141,7 @@ in stdenv.mkDerivation { pname = targetPrefix + (if name != "" then name else "${bintoolsName}-wrapper"); - version = lib.optionalString (bintools != null) bintoolsVersion; + version = optionalString (bintools != null) bintoolsVersion; preferLocalBuild = true; @@ -196,7 +211,7 @@ stdenv.mkDerivation { # as it must have both the GNU assembler from cctools (installed as `gas`) # and the Clang integrated assembler (installed as `as`). # See pkgs/os-specific/darwin/binutils/default.nix for details. - + lib.optionalString wrapGas '' + + optionalString wrapGas '' if [ -e $ldPath/${targetPrefix}gas ]; then ln -s $ldPath/${targetPrefix}gas $out/bin/${targetPrefix}gas fi @@ -273,7 +288,7 @@ stdenv.mkDerivation { ${if targetPlatform.isDarwin then '' printf "export LD_DYLD_PATH=%q\n" "$dynamicLinker" >> $out/nix-support/setup-hook - '' else lib.optionalString (sharedLibraryLoader != null) '' + '' else optionalString (sharedLibraryLoader != null) '' if [ -e ${sharedLibraryLoader}/lib/32/ld-linux.so.2 ]; then echo ${sharedLibraryLoader}/lib/32/ld-linux.so.2 > $out/nix-support/dynamic-linker-m32 fi @@ -290,7 +305,7 @@ stdenv.mkDerivation { # install the wrapper, you get tools like objdump (same for any # binaries of libc). + optionalString (!nativeTools) '' - printWords ${bintools_bin} ${lib.optionalString (libc != null) libc_bin} > $out/nix-support/propagated-user-env-packages + printWords ${bintools_bin} ${optionalString (libc != null) libc_bin} > $out/nix-support/propagated-user-env-packages '' ## @@ -406,7 +421,7 @@ stdenv.mkDerivation { # for substitution in utils.bash expandResponseParams = "${expand-response-params}/bin/expand-response-params"; shell = getBin shell + shell.shellPath or ""; - gnugrep_bin = lib.optionalString (!nativeTools) gnugrep; + gnugrep_bin = optionalString (!nativeTools) gnugrep; wrapperName = "BINTOOLS_WRAPPER"; inherit dynamicLinker targetPrefix suffixSalt coreutils_bin; inherit bintools_bin libc_bin libc_dev libc_lib; @@ -414,13 +429,13 @@ stdenv.mkDerivation { }; meta = - let bintools_ = lib.optionalAttrs (bintools != null) bintools; in - (lib.optionalAttrs (bintools_ ? meta) (removeAttrs bintools.meta ["priority"])) // + let bintools_ = optionalAttrs (bintools != null) bintools; in + (optionalAttrs (bintools_ ? meta) (removeAttrs bintools.meta ["priority"])) // { description = - lib.attrByPath ["meta" "description"] "System binary utilities" bintools_ + attrByPath ["meta" "description"] "System binary utilities" bintools_ + " (wrapper script)"; priority = 10; } // optionalAttrs useMacosReexportHack { - platforms = lib.platforms.darwin; + platforms = platforms.darwin; }; } diff --git a/pkgs/build-support/build-fhsenv-bubblewrap/default.nix b/pkgs/build-support/build-fhsenv-bubblewrap/default.nix index 5b4de2dd04cab..e06fb51dd4b67 100644 --- a/pkgs/build-support/build-fhsenv-bubblewrap/default.nix +++ b/pkgs/build-support/build-fhsenv-bubblewrap/default.nix @@ -31,10 +31,20 @@ assert (pname != null || version != null) -> (name == null && pname != null); # You must declare either a name or pname + version (preferred). -with builtins; let + inherit (lib) + concatLines + concatStringsSep + escapeShellArgs + filter + optionalString + splitString + ; + + inherit (lib.attrsets) removeAttrs; + pname = if args ? name && args.name != null then args.name else args.pname; - versionStr = lib.optionalString (version != null) ("-" + version); + versionStr = optionalString (version != null) ("-" + version); name = pname + versionStr; buildFHSEnv = callPackage ./buildFHSEnv.nix { }; @@ -116,10 +126,10 @@ let exec ${run} "$@" ''; - indentLines = str: lib.concatLines (map (s: " " + s) (filter (s: s != "") (lib.splitString "\n" str))); + indentLines = str: concatLines (map (s: " " + s) (filter (s: s != "") (splitString "\n" str))); bwrapCmd = { initArgs ? "" }: '' ${extraPreBwrapCmds} - ignored=(/nix /dev /proc /etc ${lib.optionalString privateTmp "/tmp"}) + ignored=(/nix /dev /proc /etc ${optionalString privateTmp "/tmp"}) ro_mounts=() symlinks=() etc_ignored=() @@ -164,7 +174,7 @@ let fi # link selected etc entries from the actual root - for i in ${lib.escapeShellArgs etcBindEntries}; do + for i in ${escapeShellArgs etcBindEntries}; do if [[ "''${etc_ignored[@]}" =~ "$i" ]]; then continue fi @@ -195,7 +205,7 @@ let x11_args+=(--ro-bind-try "$local_socket" "$local_socket") fi - ${lib.optionalString privateTmp '' + ${optionalString privateTmp '' # sddm places XAUTHORITY in /tmp if [[ "$XAUTHORITY" == /tmp/* ]]; then x11_args+=(--ro-bind-try "$XAUTHORITY" "$XAUTHORITY") @@ -220,15 +230,15 @@ let --dev-bind /dev /dev --proc /proc --chdir "$(pwd)" - ${lib.optionalString unshareUser "--unshare-user"} - ${lib.optionalString unshareIpc "--unshare-ipc"} - ${lib.optionalString unsharePid "--unshare-pid"} - ${lib.optionalString unshareNet "--unshare-net"} - ${lib.optionalString unshareUts "--unshare-uts"} - ${lib.optionalString unshareCgroup "--unshare-cgroup"} - ${lib.optionalString dieWithParent "--die-with-parent"} + ${optionalString unshareUser "--unshare-user"} + ${optionalString unshareIpc "--unshare-ipc"} + ${optionalString unsharePid "--unshare-pid"} + ${optionalString unshareNet "--unshare-net"} + ${optionalString unshareUts "--unshare-uts"} + ${optionalString unshareCgroup "--unshare-cgroup"} + ${optionalString dieWithParent "--die-with-parent"} --ro-bind /nix /nix - ${lib.optionalString privateTmp "--tmpfs /tmp"} + ${optionalString privateTmp "--tmpfs /tmp"} # Our glibc will look for the cache in its own path in `/nix/store`. # As such, we need a cache to exist there, because pressure-vessel # depends on the existence of an ld cache. However, adding one @@ -242,7 +252,7 @@ let --symlink /etc/ld.so.cache ${glibc}/etc/ld.so.cache \ --ro-bind ${glibc}/etc/rpc ${glibc}/etc/rpc \ --remount-ro ${glibc}/etc \ - '' + lib.optionalString (stdenv.isx86_64 && stdenv.isLinux) (indentLines '' + '' + optionalString (stdenv.isx86_64 && stdenv.isLinux) (indentLines '' --tmpfs ${pkgsi686Linux.glibc}/etc \ --symlink /etc/ld.so.conf ${pkgsi686Linux.glibc}/etc/ld.so.conf \ --symlink /etc/ld.so.cache ${pkgsi686Linux.glibc}/etc/ld.so.cache \ diff --git a/pkgs/build-support/coq/default.nix b/pkgs/build-support/coq/default.nix index eb045ddf6865a..6036d0f05dd53 100644 --- a/pkgs/build-support/coq/default.nix +++ b/pkgs/build-support/coq/default.nix @@ -1,10 +1,33 @@ { lib, stdenv, coqPackages, coq, which, fetchzip }@args: -let lib = import ./extra-lib.nix {inherit (args) lib;}; in -with builtins; with lib; + let + lib = import ./extra-lib.nix { + inherit (args) lib; + }; + + inherit (lib) + concatStringsSep + flip + foldl + isFunction + isString + optional + optionalAttrs + optionals + optionalString + pred + remove + switch + versions + ; + + inherit (lib.attrsets) removeAttrs; + inherit (lib.strings) match; + isGitHubDomain = d: match "^github.*" d != null; isGitLabDomain = d: match "^gitlab.*" d != null; in + { pname, version ? null, fetcher ? null, diff --git a/pkgs/build-support/coq/extra-lib.nix b/pkgs/build-support/coq/extra-lib.nix index 3c226b4920b62..94de7c0113d84 100644 --- a/pkgs/build-support/coq/extra-lib.nix +++ b/pkgs/build-support/coq/extra-lib.nix @@ -1,5 +1,25 @@ { lib }: -with builtins; with lib; recursiveUpdate lib (rec { + +let + inherit (lib) + all + concatStringsSep + findFirst + flip + getAttr + head + isFunction + length + recursiveUpdate + splitVersion + tail + take + versionAtLeast + versionOlder + zipListsWith + ; +in +recursiveUpdate lib (rec { versions = let diff --git a/pkgs/build-support/coq/meta-fetch/default.nix b/pkgs/build-support/coq/meta-fetch/default.nix index 82c29fb760b78..daed9faa3efed 100644 --- a/pkgs/build-support/coq/meta-fetch/default.nix +++ b/pkgs/build-support/coq/meta-fetch/default.nix @@ -1,8 +1,33 @@ { lib, stdenv, fetchzip }@args: -let lib' = lib; in -let lib = import ../extra-lib.nix {lib = lib';}; in -with builtins; with lib; + let + lib = import ../extra-lib.nix { + inherit (args) lib; + }; + + inherit (lib) + attrNames + fakeSha256 + filter + findFirst + head + isAttrs + isPath + isString + last + length + optionalAttrs + pathExists + pred + sort + switch + switch-if + versionAtLeast + versions + ; + + inherit (lib.strings) match split; + default-fetcher = {domain ? "github.com", owner ? "", repo, rev, name ? "source", sha256 ? null, ...}@args: let ext = if args?sha256 then "zip" else "tar.gz"; fmt = if args?sha256 then "zip" else "tarball"; @@ -17,7 +42,7 @@ let { cond = (match "(www.)?mpi-sws.org" domain) != null; out = "https://www.mpi-sws.org/~${owner}/${repo}/download/${repo}-${rev}.${ext}";} ] (throw "meta-fetch: no fetcher found for domain ${domain} on ${rev}"); - fetch = x: if args?sha256 then fetchzip (x // { inherit sha256; }) else fetchTarball x; + fetch = x: if args?sha256 then fetchzip (x // { inherit sha256; }) else builtins.fetchTarball x; in fetch { inherit url ; }; in { @@ -38,11 +63,12 @@ switch arg [ { case = isNull; out = { version = "broken"; src = ""; broken = true; }; } { case = isPathString; out = { version = "dev"; src = arg; }; } { case = pred.union isVersion isShortVersion; - out = let v = if isVersion arg then arg else shortVersion arg; in - let - given-sha256 = release.${v}.sha256 or ""; - sha256 = if given-sha256 == "" then lib.fakeSha256 else given-sha256; - rv = release.${v} // { inherit sha256; }; in + out = let + v = if isVersion arg then arg else shortVersion arg; + given-sha256 = release.${v}.sha256 or ""; + sha256 = if given-sha256 == "" then fakeSha256 else given-sha256; + rv = release.${v} // { inherit sha256; }; + in { version = rv.version or v; src = rv.src or fetcher (location // { rev = releaseRev v; } // rv); diff --git a/pkgs/build-support/fetchrepoproject/default.nix b/pkgs/build-support/fetchrepoproject/default.nix index 78b8caeb8091e..a5e79c8d4ef97 100644 --- a/pkgs/build-support/fetchrepoproject/default.nix +++ b/pkgs/build-support/fetchrepoproject/default.nix @@ -9,9 +9,14 @@ assert repoRepoRev != "" -> repoRepoURL != ""; assert createMirror -> !useArchive; -with lib; - let + inherit (lib) + concatMapStringsSep + concatStringsSep + fetchers + optionalString + ; + extraRepoInitFlags = [ (optionalString (repoRepoURL != "") "--repo-url=${repoRepoURL}") (optionalString (repoRepoRev != "") "--repo-branch=${repoRepoRev}") diff --git a/pkgs/build-support/fetchsourcehut/default.nix b/pkgs/build-support/fetchsourcehut/default.nix index ed6e85bd639b2..42d437b3555e6 100644 --- a/pkgs/build-support/fetchsourcehut/default.nix +++ b/pkgs/build-support/fetchsourcehut/default.nix @@ -1,6 +1,14 @@ { fetchgit, fetchhg, fetchzip, lib }: -lib.makeOverridable ( +let + inherit (lib) + assertOneOf + makeOverridable + optionalString + ; +in + +makeOverridable ( { owner , repo, rev , domain ? "sr.ht" @@ -10,9 +18,7 @@ lib.makeOverridable ( , ... # For hash agility } @ args: -with lib; - -assert (lib.assertOneOf "vc" vc [ "hg" "git" ]); +assert (assertOneOf "vc" vc [ "hg" "git" ]); let urlFor = resource: "https://${resource}.${domain}/${owner}/${repo}"; diff --git a/pkgs/build-support/nix-gitignore/default.nix b/pkgs/build-support/nix-gitignore/default.nix index c047bfc7d9a28..849720675c892 100644 --- a/pkgs/build-support/nix-gitignore/default.nix +++ b/pkgs/build-support/nix-gitignore/default.nix @@ -7,9 +7,32 @@ # - zero or more directories. For example, "a/**/b" matches "a/b", # - "a/x/b", "a/x/y/b" and so on. -with builtins; - let + inherit (builtins) filterSource; + + inherit (lib) + concatStringsSep + elemAt + filter + head + isList + length + optionals + optionalString + pathExists + readFile + removePrefix + replaceStrings + stringLength + sub + substring + toList + trace + ; + + + inherit (lib.strings) match split typeOf; + debug = a: trace a a; last = l: elemAt l ((length l) - 1); in rec { @@ -17,7 +40,7 @@ in rec { filterPattern = patterns: root: (name: _type: let - relPath = lib.removePrefix ((toString root) + "/") name; + relPath = removePrefix ((toString root) + "/") name; matches = pair: (match (head pair) relPath) != null; matched = map (pair: [(matches pair) (last pair)]) patterns; in @@ -45,7 +68,7 @@ in rec { escs = "\\*?"; splitString = let recurse = str : [(substring 0 1 str)] ++ - (lib.optionals (str != "") (recurse (substring 1 (stringLength(str)) str) )); + (optionals (str != "") (recurse (substring 1 (stringLength(str)) str) )); in str : recurse str; chars = s: filter (c: c != "" && !isList c) (splitString s); escape = s: map (c: "\\" + c) (chars s); @@ -66,7 +89,7 @@ in rec { handleSlashPrefix = l: let split = (match "^(/?)(.*)" l); - findSlash = l: lib.optionalString ((match ".+/.+" l) == null) l; + findSlash = l: optionalString ((match ".+/.+" l) == null) l; hasSlash = mapAroundCharclass findSlash l != l; in (if (elemAt split 0) == "/" || hasSlash @@ -94,12 +117,12 @@ in rec { gitignoreCompileIgnore = file_str_patterns: root: let onPath = f: a: if typeOf a == "path" then f a else a; - str_patterns = map (onPath readFile) (lib.toList file_str_patterns); + str_patterns = map (onPath readFile) (toList file_str_patterns); in concatStringsSep "\n" str_patterns; - gitignoreFilterPure = filter: patterns: root: name: type: + gitignoreFilterPure = predicate: patterns: root: name: type: gitignoreFilter (gitignoreCompileIgnore patterns root) root name type - && filter name type; + && predicate name type; # This is a very hacky way of programming this! # A better way would be to reuse existing filtering by making multiple gitignore functions per each root. @@ -145,23 +168,23 @@ in rec { ''); withGitignoreFile = patterns: root: - lib.toList patterns ++ [ ".git" ] ++ [(root + "/.gitignore")]; + toList patterns ++ [ ".git" ] ++ [(root + "/.gitignore")]; withRecursiveGitignoreFile = patterns: root: - lib.toList patterns ++ [ ".git" ] ++ [(compileRecursiveGitignore root)]; + toList patterns ++ [ ".git" ] ++ [(compileRecursiveGitignore root)]; # filterSource derivatives - gitignoreFilterSourcePure = filter: patterns: root: - filterSource (gitignoreFilterPure filter patterns root) root; + gitignoreFilterSourcePure = predicate: patterns: root: + filterSource (gitignoreFilterPure predicate patterns root) root; - gitignoreFilterSource = filter: patterns: root: - gitignoreFilterSourcePure filter (withGitignoreFile patterns root) root; + gitignoreFilterSource = predicate: patterns: root: + gitignoreFilterSourcePure predicate (withGitignoreFile patterns root) root; - gitignoreFilterRecursiveSource = filter: patterns: root: - gitignoreFilterSourcePure filter (withRecursiveGitignoreFile patterns root) root; + gitignoreFilterRecursiveSource = predicate: patterns: root: + gitignoreFilterSourcePure predicate (withRecursiveGitignoreFile patterns root) root; - # "Filter"-less alternatives + # "Predicate"-less alternatives gitignoreSourcePure = gitignoreFilterSourcePure (_: _: true); gitignoreSource = patterns: let type = typeOf patterns; in diff --git a/pkgs/build-support/pkg-config-wrapper/default.nix b/pkgs/build-support/pkg-config-wrapper/default.nix index f409ca3a7d4b6..c7856bd1f8765 100644 --- a/pkgs/build-support/pkg-config-wrapper/default.nix +++ b/pkgs/build-support/pkg-config-wrapper/default.nix @@ -10,9 +10,17 @@ , extraPackages ? [], extraBuildCommands ? "" }: -with lib; - let + inherit (lib) + attrByPath + getBin + optional + optionalAttrs + optionals + optionalString + replaceStrings + ; + stdenv = stdenvNoCC; inherit (stdenv) hostPlatform targetPlatform; @@ -20,7 +28,7 @@ let # # TODO(@Ericson2314) Make unconditional, or optional but always true by # default. - targetPrefix = lib.optionalString (targetPlatform != hostPlatform) + targetPrefix = optionalString (targetPlatform != hostPlatform) (targetPlatform.config + "-"); # See description in cc-wrapper. @@ -49,7 +57,7 @@ stdenv.mkDerivation { dontUnpack = true; # Additional flags passed to pkg-config. - addFlags = lib.optional stdenv.targetPlatform.isStatic "--static"; + addFlags = optional stdenv.targetPlatform.isStatic "--static"; installPhase = '' @@ -119,10 +127,10 @@ stdenv.mkDerivation { }; meta = - let pkg-config_ = lib.optionalAttrs (pkg-config != null) pkg-config; in - (lib.optionalAttrs (pkg-config_ ? meta) (removeAttrs pkg-config.meta ["priority"])) // + let pkg-config_ = optionalAttrs (pkg-config != null) pkg-config; in + (optionalAttrs (pkg-config_ ? meta) (removeAttrs pkg-config.meta ["priority"])) // { description = - lib.attrByPath ["meta" "description"] "pkg-config" pkg-config_ + attrByPath ["meta" "description"] "pkg-config" pkg-config_ + " (wrapper script)"; priority = 10; }; diff --git a/pkgs/build-support/release/default.nix b/pkgs/build-support/release/default.nix index 1cc6a5812f1f5..f5ab2db1a7541 100644 --- a/pkgs/build-support/release/default.nix +++ b/pkgs/build-support/release/default.nix @@ -1,6 +1,24 @@ { lib, pkgs }: -with pkgs; +let + inherit (lib) optionalString; + + inherit (pkgs) + autoconf + automake + checkinstall + clang-analyzer + cov-build + enableGCOVInstrumentation + lcov + libtool + makeGCOVReport + runCommand + stdenv + vmTools + xz + ; +in rec { @@ -91,7 +109,7 @@ rec { dontConfigure = true; dontBuild = true; - patchPhase = lib.optionalString isNixOS '' + patchPhase = optionalString isNixOS '' touch .update-on-nixos-rebuild ''; diff --git a/pkgs/build-support/replace-dependency.nix b/pkgs/build-support/replace-dependency.nix index 5b4c127cdd8e7..7912d21bfd692 100644 --- a/pkgs/build-support/replace-dependency.nix +++ b/pkgs/build-support/replace-dependency.nix @@ -19,9 +19,20 @@ # (and all of its dependencies) without rebuilding further. { drv, oldDependency, newDependency, verbose ? true }: -with lib; - let + inherit (lib) + any + attrNames + concatStringsSep + elem + filter + filterAttrs + listToAttrs + mapAttrsToList + stringLength + substring + ; + warn = if verbose then builtins.trace else (x: y: y); references = import (runCommandLocal "references.nix" { exportReferencesGraph = [ "graph" drv ]; } '' (echo { @@ -54,7 +65,7 @@ let (drv: { name = discard (toString drv); value = elem oldStorepath (referencesOf drv) || any dependsOnOld (referencesOf drv); - }) (builtins.attrNames references)); + }) (attrNames references)); dependsOnOld = drv: dependsOnOldMemo.${discard (toString drv)}; @@ -74,9 +85,9 @@ let rewriteMemo = listToAttrs (map (drv: { name = discard (toString drv); value = rewriteHashes (builtins.storePath drv) - (filterAttrs (n: v: builtins.elem (builtins.storePath (discard (toString n))) (referencesOf drv)) rewriteMemo); + (filterAttrs (n: v: elem (builtins.storePath (discard (toString n))) (referencesOf drv)) rewriteMemo); }) - (filter dependsOnOld (builtins.attrNames references))) // rewrittenDeps; + (filter dependsOnOld (attrNames references))) // rewrittenDeps; drvHash = discard (toString drv); in assert (stringLength (drvName (toString oldDependency)) == stringLength (drvName (toString newDependency))); diff --git a/pkgs/build-support/setup-hooks/auto-patchelf.sh b/pkgs/build-support/setup-hooks/auto-patchelf.sh index 9f6366b3feaed..783ea45f8eeb1 100644 --- a/pkgs/build-support/setup-hooks/auto-patchelf.sh +++ b/pkgs/build-support/setup-hooks/auto-patchelf.sh @@ -88,22 +88,21 @@ autoPatchelf() { --extra-args "${patchelfFlagsArray[@]}" } -# XXX: This should ultimately use fixupOutputHooks but we currently don't have -# a way to enforce the order. If we have $runtimeDependencies set, the setup -# hook of patchelf is going to ruin everything and strip out those additional -# RPATHs. -# -# So what we do here is basically run in postFixup and emulate the same -# behaviour as fixupOutputHooks because the setup hook for patchelf is run in -# fixupOutput and the postFixup hook runs later. -# -# shellcheck disable=SC2016 -# (Expressions don't expand in single quotes, use double quotes for that.) -postFixupHooks+=(' - if [ -z "${dontAutoPatchelf-}" ]; then +autoPatchelfPostFixup() { + # XXX: This should ultimately use fixupOutputHooks but we currently don't have + # a way to enforce the order. If we have $runtimeDependencies set, the setup + # hook of patchelf is going to ruin everything and strip out those additional + # RPATHs. + # + # So what we do here is basically run in postFixup and emulate the same + # behaviour as fixupOutputHooks because the setup hook for patchelf is run in + # fixupOutput and the postFixup hook runs later. + if [[ -z "${dontAutoPatchelf-}" ]]; then autoPatchelf -- $(for output in $(getAllOutputNames); do [ -e "${!output}" ] || continue echo "${!output}" done) fi -') +} + +postFixupHooks+=(autoPatchelfPostFixup) diff --git a/pkgs/build-support/setup-hooks/make-binary-wrapper/make-binary-wrapper.sh b/pkgs/build-support/setup-hooks/make-binary-wrapper/make-binary-wrapper.sh index 6cd01f6bf6307..3948342a36fc9 100644 --- a/pkgs/build-support/setup-hooks/make-binary-wrapper/make-binary-wrapper.sh +++ b/pkgs/build-support/setup-hooks/make-binary-wrapper/make-binary-wrapper.sh @@ -19,6 +19,7 @@ assertExecutable() { # (if unset or empty, defaults to EXECUTABLE) # --inherit-argv0 : the executable inherits argv0 from the wrapper. # (use instead of --argv0 '$0') +# --resolve-argv0 : if argv0 doesn't include a / character, resolve it against PATH # --set VAR VAL : add VAR with value VAL to the executable's environment # --set-default VAR VAL : like --set, but only adds VAR if not already set in # the environment @@ -87,6 +88,7 @@ makeDocumentedCWrapper() { makeCWrapper() { local argv0 inherit_argv0 n params cmd main flagsBefore flagsAfter flags executable length local uses_prefix uses_suffix uses_assert uses_assert_success uses_stdio uses_asprintf + local resolve_path executable=$(escapeStringLiteral "$1") params=("$@") length=${#params[*]} @@ -169,6 +171,12 @@ makeCWrapper() { # Whichever comes last of --argv0 and --inherit-argv0 wins inherit_argv0=1 ;; + --resolve-argv0) + # this gets processed after other argv0 flags + uses_stdio=1 + uses_string=1 + resolve_argv0=1 + ;; *) # Using an error macro, we will make sure the compiler gives an understandable error message main="$main#error makeCWrapper: Unknown argument ${p}"$'\n' ;; @@ -176,6 +184,7 @@ makeCWrapper() { done [[ -z "$flagsBefore" && -z "$flagsAfter" ]] || main="$main"${main:+$'\n'}$(addFlags "$flagsBefore" "$flagsAfter")$'\n'$'\n' [ -z "$inherit_argv0" ] && main="${main}argv[0] = \"${argv0:-${executable}}\";"$'\n' + [ -z "$resolve_argv0" ] || main="${main}argv[0] = resolve_argv0(argv[0]);"$'\n' main="${main}return execv(\"${executable}\", argv);"$'\n' [ -z "$uses_asprintf" ] || printf '%s\n' "#define _GNU_SOURCE /* See feature_test_macros(7) */" @@ -183,9 +192,11 @@ makeCWrapper() { printf '%s\n' "#include <stdlib.h>" [ -z "$uses_assert" ] || printf '%s\n' "#include <assert.h>" [ -z "$uses_stdio" ] || printf '%s\n' "#include <stdio.h>" + [ -z "$uses_string" ] || printf '%s\n' "#include <string.h>" [ -z "$uses_assert_success" ] || printf '\n%s\n' "#define assert_success(e) do { if ((e) < 0) { perror(#e); abort(); } } while (0)" [ -z "$uses_prefix" ] || printf '\n%s\n' "$(setEnvPrefixFn)" [ -z "$uses_suffix" ] || printf '\n%s\n' "$(setEnvSuffixFn)" + [ -z "$resolve_argv0" ] || printf '\n%s\n' "$(resolveArgv0Fn)" printf '\n%s' "int main(int argc, char **argv) {" printf '\n%s' "$(indent4 "$main")" printf '\n%s\n' "}" @@ -338,6 +349,41 @@ void set_env_suffix(char *env, char *sep, char *suffix) { " } +resolveArgv0Fn() { + printf '%s' "\ +char *resolve_argv0(char *argv0) { + if (strchr(argv0, '/') != NULL) { + return argv0; + } + char *path = getenv(\"PATH\"); + if (path == NULL) { + return argv0; + } + char *path_copy = strdup(path); + if (path_copy == NULL) { + return argv0; + } + char *dir = strtok(path_copy, \":\"); + while (dir != NULL) { + char *candidate = malloc(strlen(dir) + strlen(argv0) + 2); + if (candidate == NULL) { + free(path_copy); + return argv0; + } + sprintf(candidate, \"%s/%s\", dir, argv0); + if (access(candidate, X_OK) == 0) { + free(path_copy); + return candidate; + } + free(candidate); + dir = strtok(NULL, \":\"); + } + free(path_copy); + return argv0; +} +" +} + # Embed a C string which shows up as readable text in the compiled binary wrapper, # giving instructions for recreating the wrapper. # Keep in sync with makeBinaryWrapper.extractCmd diff --git a/pkgs/build-support/setup-hooks/make-wrapper.sh b/pkgs/build-support/setup-hooks/make-wrapper.sh index 11b332bfc3eb2..cba158bd31ea9 100644 --- a/pkgs/build-support/setup-hooks/make-wrapper.sh +++ b/pkgs/build-support/setup-hooks/make-wrapper.sh @@ -15,6 +15,7 @@ assertExecutable() { # (if unset or empty, defaults to EXECUTABLE) # --inherit-argv0 : the executable inherits argv0 from the wrapper. # (use instead of --argv0 '$0') +# --resolve-argv0 : if argv0 doesn't include a / character, resolve it against PATH # --set VAR VAL : add VAR with value VAL to the executable's environment # --set-default VAR VAL : like --set, but only adds VAR if not already set in # the environment @@ -177,6 +178,9 @@ makeShellWrapper() { elif [[ "$p" == "--inherit-argv0" ]]; then # Whichever comes last of --argv0 and --inherit-argv0 wins argv0='$0' + elif [[ "$p" == "--resolve-argv0" ]]; then + # this is noop in shell wrappers, since bash will always resolve $0 + resolve_argv0=1 else die "makeWrapper doesn't understand the arg $p" fi diff --git a/pkgs/build-support/vm/test.nix b/pkgs/build-support/vm/test.nix index ae6a10dea3b9c..50dbfeb750be5 100644 --- a/pkgs/build-support/vm/test.nix +++ b/pkgs/build-support/vm/test.nix @@ -1,5 +1,21 @@ -with import ../../.. { }; -with vmTools; +let + pkgs = import ../../.. { }; + + inherit (pkgs) + hello + patchelf + pcmanfm + stdenv + ; + + inherit (pkgs.vmTools) + buildRPM + diskImages + makeImageTestScript + runInLinuxImage + runInLinuxVM + ; +in { diff --git a/pkgs/build-support/writers/scripts.nix b/pkgs/build-support/writers/scripts.nix index 1dd25c500719b..06d763ca9d6af 100644 --- a/pkgs/build-support/writers/scripts.nix +++ b/pkgs/build-support/writers/scripts.nix @@ -1,4 +1,14 @@ -{ pkgs, buildPackages, lib, stdenv, libiconv, mkNugetDeps, mkNugetSource, gixy }: +{ + buildPackages, + gixy, + lib, + libiconv, + makeBinaryWrapper, + mkNugetDeps, + mkNugetSource, + pkgs, + stdenv, +}: let inherit (lib) concatMapStringsSep @@ -6,7 +16,6 @@ let escapeShellArg last optionalString - stringLength strings types ; @@ -18,137 +27,285 @@ rec { # Examples: # writeBash = makeScriptWriter { interpreter = "${pkgs.bash}/bin/bash"; } # makeScriptWriter { interpreter = "${pkgs.dash}/bin/dash"; } "hello" "echo hello world" - makeScriptWriter = { interpreter, check ? "" }: nameOrPath: content: + makeScriptWriter = { interpreter, check ? "", makeWrapperArgs ? [], }: nameOrPath: content: assert (types.path.check nameOrPath) || (builtins.match "([0-9A-Za-z._])[0-9A-Za-z._-]*" nameOrPath != null); assert (types.path.check content) || (types.str.check content); let + nameIsPath = types.path.check nameOrPath; name = last (builtins.split "/" nameOrPath); - in + path = if nameIsPath then nameOrPath else "/bin/${name}"; + # The inner derivation which creates the executable under $out/bin (never at $out directly) + # This is required in order to support wrapping, as wrapped programs consist of at least two files: the executable and the wrapper. + inner = + pkgs.runCommandLocal name ( + { + inherit makeWrapperArgs; + nativeBuildInputs = [ + makeBinaryWrapper + ]; + meta.mainProgram = name; + } + // ( + if (types.str.check content) then { + inherit content interpreter; + passAsFile = [ "content" ]; + } else { + inherit interpreter; + contentPath = content; + } + ) + ) + '' + # On darwin a script cannot be used as an interpreter in a shebang but + # there doesn't seem to be a limit to the size of shebang and multiple + # arguments to the interpreter are allowed. + if [[ -n "${toString pkgs.stdenvNoCC.isDarwin}" ]] && isScript $interpreter + then + wrapperInterpreterLine=$(head -1 "$interpreter" | tail -c+3) + # Get first word from the line (note: xargs echo remove leading spaces) + wrapperInterpreter=$(echo "$wrapperInterpreterLine" | xargs echo | cut -d " " -f1) + + if isScript $wrapperInterpreter + then + echo "error: passed interpreter ($interpreter) is a script which has another script ($wrapperInterpreter) as an interpreter, which is not supported." + exit 1 + fi + + # This should work as long as wrapperInterpreter is a shell, which is + # the case for programs wrapped with makeWrapper, like + # python3.withPackages etc. + interpreterLine="$wrapperInterpreterLine $interpreter" + else + interpreterLine=$interpreter + fi + + echo "#! $interpreterLine" > $out + cat "$contentPath" >> $out + ${optionalString (check != "") '' + ${check} $out + ''} + chmod +x $out + + # Relocate executable + # Wrap it if makeWrapperArgs are specified + mv $out tmp + mkdir -p $out/$(dirname "${path}") + mv tmp $out/${path} + if [ -n "''${makeWrapperArgs+''${makeWrapperArgs[@]}}" ]; then + wrapProgram $out/${path} ''${makeWrapperArgs[@]} + fi + ''; + in + if nameIsPath + then inner + # In case nameOrPath is a name, the user intends the executable to be located at $out. + # This is achieved by creating a separate derivation containing a symlink at $out linking to ${inner}/bin/${name}. + # This breaks the override pattern. + # In case this turns out to be a problem, we can still add more magic + else pkgs.runCommandLocal name {} '' + ln -s ${inner}/bin/${name} $out + ''; - pkgs.runCommandLocal name ( - lib.optionalAttrs (nameOrPath == "/bin/${name}") { - meta.mainProgram = name; - } - // ( - if (types.str.check content) then { - inherit content interpreter; - passAsFile = [ "content" ]; - } else { - inherit interpreter; - contentPath = content; - } - ) - ) - '' - # On darwin a script cannot be used as an interpreter in a shebang but - # there doesn't seem to be a limit to the size of shebang and multiple - # arguments to the interpreter are allowed. - if [[ -n "${toString pkgs.stdenvNoCC.isDarwin}" ]] && isScript $interpreter - then - wrapperInterpreterLine=$(head -1 "$interpreter" | tail -c+3) - # Get first word from the line (note: xargs echo remove leading spaces) - wrapperInterpreter=$(echo "$wrapperInterpreterLine" | xargs echo | cut -d " " -f1) - - if isScript $wrapperInterpreter - then - echo "error: passed interpreter ($interpreter) is a script which has another script ($wrapperInterpreter) as an interpreter, which is not supported." - exit 1 - fi - - # This should work as long as wrapperInterpreter is a shell, which is - # the case for programs wrapped with makeWrapper, like - # python3.withPackages etc. - interpreterLine="$wrapperInterpreterLine $interpreter" - else - interpreterLine=$interpreter - fi - - echo "#! $interpreterLine" > $out - cat "$contentPath" >> $out - ${optionalString (check != "") '' - ${check} $out - ''} - chmod +x $out - ${optionalString (types.path.check nameOrPath) '' - mv $out tmp - mkdir -p $out/$(dirname "${nameOrPath}") - mv tmp $out/${nameOrPath} - ''} - ''; # Base implementation for compiled executables. # Takes a compile script, which in turn takes the name as an argument. # # Examples: # writeSimpleC = makeBinWriter { compileScript = name: "gcc -o $out $contentPath"; } - makeBinWriter = { compileScript, strip ? true }: nameOrPath: content: + makeBinWriter = { compileScript, strip ? true, makeWrapperArgs ? [] }: nameOrPath: content: assert (types.path.check nameOrPath) || (builtins.match "([0-9A-Za-z._])[0-9A-Za-z._-]*" nameOrPath != null); assert (types.path.check content) || (types.str.check content); let + nameIsPath = types.path.check nameOrPath; name = last (builtins.split "/" nameOrPath); + path = if nameIsPath then nameOrPath else "/bin/${name}"; + # The inner derivation which creates the executable under $out/bin (never at $out directly) + # This is required in order to support wrapping, as wrapped programs consist of at least two files: the executable and the wrapper. + inner = + pkgs.runCommandLocal name ( + { + inherit makeWrapperArgs; + nativeBuildInputs = [ + makeBinaryWrapper + ]; + meta.mainProgram = name; + } + // ( + if (types.str.check content) then { + inherit content; + passAsFile = [ "content" ]; + } else { + contentPath = content; + } + ) + ) + '' + ${compileScript} + ${lib.optionalString strip + "${lib.getBin buildPackages.bintools-unwrapped}/bin/${buildPackages.bintools-unwrapped.targetPrefix}strip -S $out"} + # Sometimes binaries produced for darwin (e. g. by GHC) won't be valid + # mach-o executables from the get-go, but need to be corrected somehow + # which is done by fixupPhase. + ${lib.optionalString pkgs.stdenvNoCC.hostPlatform.isDarwin "fixupPhase"} + mv $out tmp + mkdir -p $out/$(dirname "${path}") + mv tmp $out/${path} + if [ -n "''${makeWrapperArgs+''${makeWrapperArgs[@]}}" ]; then + wrapProgram $out/${path} ''${makeWrapperArgs[@]} + fi + ''; in - pkgs.runCommand name ((if (types.str.check content) then { - inherit content; - passAsFile = [ "content" ]; - } else { - contentPath = content; - }) // lib.optionalAttrs (nameOrPath == "/bin/${name}") { - meta.mainProgram = name; - }) '' - ${compileScript} - ${lib.optionalString strip - "${lib.getBin buildPackages.bintools-unwrapped}/bin/${buildPackages.bintools-unwrapped.targetPrefix}strip -S $out"} - # Sometimes binaries produced for darwin (e. g. by GHC) won't be valid - # mach-o executables from the get-go, but need to be corrected somehow - # which is done by fixupPhase. - ${lib.optionalString pkgs.stdenvNoCC.hostPlatform.isDarwin "fixupPhase"} - ${optionalString (types.path.check nameOrPath) '' - mv $out tmp - mkdir -p $out/$(dirname "${nameOrPath}") - mv tmp $out/${nameOrPath} - ''} - ''; + if nameIsPath + then inner + # In case nameOrPath is a name, the user intends the executable to be located at $out. + # This is achieved by creating a separate derivation containing a symlink at $out linking to ${inner}/bin/${name}. + # This breaks the override pattern. + # In case this turns out to be a problem, we can still add more magic + else pkgs.runCommandLocal name {} '' + ln -s ${inner}/bin/${name} $out + ''; # Like writeScript but the first line is a shebang to bash # - # Example: + # Can be called with or without extra arguments. + # + # Example without arguments: # writeBash "example" '' # echo hello world # '' - writeBash = makeScriptWriter { - interpreter = "${lib.getExe pkgs.bash}"; - }; + # + # Example with arguments: + # writeBash "example" + # { + # makeWrapperArgs = [ + # "--prefix" "PATH" ":" "${pkgs.hello}/bin" + # ]; + # } + # '' + # hello + # '' + writeBash = name: argsOrScript: + if lib.isAttrs argsOrScript && ! lib.isDerivation argsOrScript + then makeScriptWriter (argsOrScript // { interpreter = "${lib.getExe pkgs.bash}"; }) name + else makeScriptWriter { interpreter = "${lib.getExe pkgs.bash}"; } name argsOrScript; # Like writeScriptBin but the first line is a shebang to bash + # + # Can be called with or without extra arguments. + # + # Example without arguments: + # writeBashBin "example" '' + # echo hello world + # '' + # + # Example with arguments: + # writeBashBin "example" + # { + # makeWrapperArgs = [ + # "--prefix", "PATH", ":", "${pkgs.hello}/bin", + # ]; + # } + # '' + # hello + # '' writeBashBin = name: writeBash "/bin/${name}"; # Like writeScript but the first line is a shebang to dash # - # Example: + # Can be called with or without extra arguments. + # + # Example without arguments: # writeDash "example" '' # echo hello world # '' - writeDash = makeScriptWriter { - interpreter = "${lib.getExe pkgs.dash}"; - }; + # + # Example with arguments: + # writeDash "example" + # { + # makeWrapperArgs = [ + # "--prefix", "PATH", ":", "${pkgs.hello}/bin", + # ]; + # } + # '' + # hello + # '' + writeDash = name: argsOrScript: + if lib.isAttrs argsOrScript && ! lib.isDerivation argsOrScript + then makeScriptWriter (argsOrScript // { interpreter = "${lib.getExe pkgs.dash}"; }) name + else makeScriptWriter { interpreter = "${lib.getExe pkgs.dash}"; } name argsOrScript; # Like writeScriptBin but the first line is a shebang to dash + # + # Can be called with or without extra arguments. + # + # Example without arguments: + # writeDashBin "example" '' + # echo hello world + # '' + # + # Example with arguments: + # writeDashBin "example" + # { + # makeWrapperArgs = [ + # "--prefix", "PATH", ":", "${pkgs.hello}/bin", + # ]; + # } + # '' + # hello + # '' writeDashBin = name: writeDash "/bin/${name}"; # Like writeScript but the first line is a shebang to fish # - # Example: + # Can be called with or without extra arguments. + # + # Example without arguments: # writeFish "example" '' # echo hello world # '' - writeFish = makeScriptWriter { - interpreter = "${lib.getExe pkgs.fish} --no-config"; - check = "${lib.getExe pkgs.fish} --no-config --no-execute"; # syntax check only - }; + # + # Example with arguments: + # writeFish "example" + # { + # makeWrapperArgs = [ + # "--prefix", "PATH", ":", "${pkgs.hello}/bin", + # ]; + # } + # '' + # hello + # '' + writeFish = name: argsOrScript: + if lib.isAttrs argsOrScript && ! lib.isDerivation argsOrScript + then makeScriptWriter (argsOrScript // { + interpreter = "${lib.getExe pkgs.fish} --no-config"; + check = "${lib.getExe pkgs.fish} --no-config --no-execute"; # syntax check only + }) name + else makeScriptWriter { + interpreter = "${lib.getExe pkgs.fish} --no-config"; + check = "${lib.getExe pkgs.fish} --no-config --no-execute"; # syntax check only + } name argsOrScript; # Like writeScriptBin but the first line is a shebang to fish + # + # Can be called with or without extra arguments. + # + # Example without arguments: + # writeFishBin "example" '' + # echo hello world + # '' + # + # Example with arguments: + # writeFishBin "example" + # { + # makeWrapperArgs = [ + # "--prefix", "PATH", ":", "${pkgs.hello}/bin", + # ]; + # } + # '' + # hello + # '' writeFishBin = name: writeFish "/bin/${name}"; @@ -162,11 +319,12 @@ rec { # main = launchMissiles # ''; writeHaskell = name: { - libraries ? [], ghc ? pkgs.ghc, ghcArgs ? [], + libraries ? [], + makeWrapperArgs ? [], + strip ? true, threadedRuntime ? true, - strip ? true }: let appendIfNotSet = el: list: if elem el list then list else list ++ [ el ]; @@ -178,7 +336,7 @@ rec { ${(ghc.withPackages (_: libraries ))}/bin/ghc ${lib.escapeShellArgs ghcArgs'} tmp.hs mv tmp $out ''; - inherit strip; + inherit makeWrapperArgs strip; } name; # writeHaskellBin takes the same arguments as writeHaskell but outputs a directory (like writeScriptBin) @@ -187,36 +345,72 @@ rec { # Like writeScript but the first line is a shebang to nu # - # Example: + # Can be called with or without extra arguments. + # + # Example without arguments: # writeNu "example" '' # echo hello world # '' - writeNu = makeScriptWriter { - interpreter = "${lib.getExe pkgs.nushell} --no-config-file"; - }; + # + # Example with arguments: + # writeNu "example" + # { + # makeWrapperArgs = [ + # "--prefix", "PATH", ":", "${pkgs.hello}/bin", + # ]; + # } + # '' + # hello + # '' + writeNu = name: argsOrScript: + if lib.isAttrs argsOrScript && ! lib.isDerivation argsOrScript + then makeScriptWriter (argsOrScript // { interpreter = "${lib.getExe pkgs.nushell} --no-config-file"; }) name + else makeScriptWriter { interpreter = "${lib.getExe pkgs.nushell} --no-config-file"; } name argsOrScript; + # Like writeScriptBin but the first line is a shebang to nu + # + # Can be called with or without extra arguments. + # + # Example without arguments: + # writeNuBin "example" '' + # echo hello world + # '' + # + # Example with arguments: + # writeNuBin "example" + # { + # makeWrapperArgs = [ + # "--prefix", "PATH", ":", "${pkgs.hello}/bin", + # ]; + # } + # '' + # hello + # '' writeNuBin = name: writeNu "/bin/${name}"; # makeRubyWriter takes ruby and compatible rubyPackages and produces ruby script writer, # If any libraries are specified, ruby.withPackages is used as interpreter, otherwise the "bare" ruby is used. - makeRubyWriter = ruby: rubyPackages: buildRubyPackages: name: { libraries ? [], }: - makeScriptWriter { - interpreter = - if libraries == [] - then "${ruby}/bin/ruby" - else "${(ruby.withPackages (ps: libraries))}/bin/ruby"; - # Rubocop doesnt seem to like running in this fashion. - #check = (writeDash "rubocop.sh" '' - # exec ${lib.getExe buildRubyPackages.rubocop} "$1" - #''); - } name; + makeRubyWriter = ruby: rubyPackages: buildRubyPackages: name: { libraries ? [], ... } @ args: + makeScriptWriter ( + (builtins.removeAttrs args ["libraries"]) + // { + interpreter = + if libraries == [] + then "${ruby}/bin/ruby" + else "${(ruby.withPackages (ps: libraries))}/bin/ruby"; + # Rubocop doesn't seem to like running in this fashion. + #check = (writeDash "rubocop.sh" '' + # exec ${lib.getExe buildRubyPackages.rubocop} "$1" + #''); + } + ) name; # Like writeScript but the first line is a shebang to ruby # # Example: - # writeRuby "example" '' + # writeRuby "example" { libraries = [ pkgs.rubyPackages.git ]; } '' # puts "hello world" # '' writeRuby = makeRubyWriter pkgs.ruby pkgs.rubyPackages buildPackages.rubyPackages; @@ -227,17 +421,20 @@ rec { # makeLuaWriter takes lua and compatible luaPackages and produces lua script writer, # which validates the script with luacheck at build time. If any libraries are specified, # lua.withPackages is used as interpreter, otherwise the "bare" lua is used. - makeLuaWriter = lua: luaPackages: buildLuaPackages: name: { libraries ? [], }: - makeScriptWriter { - interpreter = lua.interpreter; - # if libraries == [] - # then lua.interpreter - # else (lua.withPackages (ps: libraries)).interpreter - # This should support packages! I just cant figure out why some dependency collision happens whenever I try to run this. - check = (writeDash "luacheck.sh" '' - exec ${buildLuaPackages.luacheck}/bin/luacheck "$1" - ''); - } name; + makeLuaWriter = lua: luaPackages: buildLuaPackages: name: { libraries ? [], ... } @ args: + makeScriptWriter ( + (builtins.removeAttrs args ["libraries"]) + // { + interpreter = lua.interpreter; + # if libraries == [] + # then lua.interpreter + # else (lua.withPackages (ps: libraries)).interpreter + # This should support packages! I just cant figure out why some dependency collision happens whenever I try to run this. + check = (writeDash "luacheck.sh" '' + exec ${buildLuaPackages.luacheck}/bin/luacheck "$1" + ''); + } + ) name; # writeLua takes a name an attributeset with libraries and some lua source code and # returns an executable (should also work with luajit) @@ -265,9 +462,10 @@ rec { writeLua "/bin/${name}"; writeRust = name: { - rustc ? pkgs.rustc, - rustcArgs ? [], - strip ? true + makeWrapperArgs ? [], + rustc ? pkgs.rustc, + rustcArgs ? [], + strip ? true, }: let darwinArgs = lib.optionals stdenv.isDarwin [ "-L${lib.getLib libiconv}/lib" ]; @@ -277,7 +475,7 @@ rec { cp "$contentPath" tmp.rs PATH=${lib.makeBinPath [pkgs.gcc]} ${rustc}/bin/rustc ${lib.escapeShellArgs rustcArgs} ${lib.escapeShellArgs darwinArgs} -o "$out" tmp.rs ''; - inherit strip; + inherit makeWrapperArgs strip; } name; writeRustBin = name: @@ -337,10 +535,13 @@ rec { # use boolean; # print "Howdy!\n" if true; # '' - writePerl = name: { libraries ? [] }: - makeScriptWriter { - interpreter = "${lib.getExe (pkgs.perl.withPackages (p: libraries))}"; - } name; + writePerl = name: { libraries ? [], ... } @ args: + makeScriptWriter ( + (builtins.removeAttrs args ["libraries"]) + // { + interpreter = "${lib.getExe (pkgs.perl.withPackages (p: libraries))}"; + } + ) name; # writePerlBin takes the same arguments as writePerl but outputs a directory (like writeScriptBin) writePerlBin = name: @@ -349,22 +550,27 @@ rec { # makePythonWriter takes python and compatible pythonPackages and produces python script writer, # which validates the script with flake8 at build time. If any libraries are specified, # python.withPackages is used as interpreter, otherwise the "bare" python is used. - makePythonWriter = python: pythonPackages: buildPythonPackages: name: { libraries ? [], flakeIgnore ? [] }: + makePythonWriter = python: pythonPackages: buildPythonPackages: name: { libraries ? [], flakeIgnore ? [], ... } @ args: let ignoreAttribute = optionalString (flakeIgnore != []) "--ignore ${concatMapStringsSep "," escapeShellArg flakeIgnore}"; in - makeScriptWriter { - interpreter = - if pythonPackages != pkgs.pypy2Packages || pythonPackages != pkgs.pypy3Packages then - if libraries == [] - then python.interpreter - else (python.withPackages (ps: libraries)).interpreter - else python.interpreter - ; - check = optionalString python.isPy3k (writeDash "pythoncheck.sh" '' - exec ${buildPythonPackages.flake8}/bin/flake8 --show-source ${ignoreAttribute} "$1" - ''); - } name; + makeScriptWriter + ( + (builtins.removeAttrs args ["libraries" "flakeIgnore"]) + // { + interpreter = + if pythonPackages != pkgs.pypy2Packages || pythonPackages != pkgs.pypy3Packages then + if libraries == [] + then python.interpreter + else (python.withPackages (ps: libraries)).interpreter + else python.interpreter + ; + check = optionalString python.isPy3k (writeDash "pythoncheck.sh" '' + exec ${buildPythonPackages.flake8}/bin/flake8 --show-source ${ignoreAttribute} "$1" + ''); + } + ) + name; # writePyPy2 takes a name an attributeset with libraries and some pypy2 sourcecode and # returns an executable @@ -421,7 +627,7 @@ rec { writePyPy3 "/bin/${name}"; - makeFSharpWriter = { dotnet-sdk ? pkgs.dotnet-sdk, fsi-flags ? "", libraries ? _: [] }: nameOrPath: + makeFSharpWriter = { dotnet-sdk ? pkgs.dotnet-sdk, fsi-flags ? "", libraries ? _: [], ... } @ args: nameOrPath: let fname = last (builtins.split "/" nameOrPath); path = if strings.hasSuffix ".fsx" nameOrPath then nameOrPath else "${nameOrPath}.fsx"; @@ -442,9 +648,12 @@ rec { ${lib.getExe dotnet-sdk} fsi --quiet --nologo --readline- ${fsi-flags} "$@" < "$script" ''; - in content: makeScriptWriter { - interpreter = fsi; - } path + in content: makeScriptWriter ( + (builtins.removeAttrs args ["dotnet-sdk" "fsi-flags" "libraries"]) + // { + interpreter = fsi; + } + ) path '' #i "nuget: ${nuget-source}/lib" ${ content } @@ -456,5 +665,4 @@ rec { writeFSharpBin = name: writeFSharp "/bin/${name}"; - } diff --git a/pkgs/build-support/writers/test.nix b/pkgs/build-support/writers/test.nix index 982c550d28e08..656d127930fad 100644 --- a/pkgs/build-support/writers/test.nix +++ b/pkgs/build-support/writers/test.nix @@ -1,13 +1,8 @@ -{ glib -, haskellPackages +{ haskellPackages , lib , nodePackages , perlPackages -, pypy2Packages , python3Packages -, pypy3Packages -, luaPackages -, rubyPackages , runCommand , testers , writers @@ -16,8 +11,38 @@ # If you are reading this, you can test these writers by running: nix-build . -A tests.writers -with writers; let + inherit (lib) getExe recurseIntoAttrs; + + inherit (writers) + makeFSharpWriter + writeBash + writeBashBin + writeDash + writeDashBin + writeFish + writeFishBin + writeFSharp + writeHaskell + writeHaskellBin + writeJS + writeJSBin + writeJSON + writeLua + writeNu + writePerl + writePerlBin + writePyPy3 + writePython3 + writePython3Bin + writeRuby + writeRust + writeRustBin + writeText + writeTOML + writeYAML + ; + expectSuccess = test: runCommand "run-${test.name}" {} '' if [[ "$(${test})" != success ]]; then @@ -30,7 +55,7 @@ let expectSuccessBin = test: runCommand "run-${test.name}" {} '' - if [[ "$(${lib.getExe test})" != success ]]; then + if [[ "$(${getExe test})" != success ]]; then echo 'test ${test.name} failed' exit 1 fi @@ -44,8 +69,8 @@ let in testers.testEqualContents { expected = expectedFile; actual = file; assertion = "${file.name} matches"; }; in -lib.recurseIntoAttrs { - bin = lib.recurseIntoAttrs { +recurseIntoAttrs { + bin = recurseIntoAttrs { bash = expectSuccessBin (writeBashBin "test-writers-bash-bin" '' if [[ "test" == "test" ]]; then echo "success"; fi ''); @@ -145,7 +170,7 @@ lib.recurseIntoAttrs { #''); }; - simple = lib.recurseIntoAttrs { + simple = recurseIntoAttrs { bash = expectSuccess (writeBash "test-writers-bash" '' if [[ "test" == "test" ]]; then echo "success"; fi ''); @@ -270,7 +295,7 @@ lib.recurseIntoAttrs { ''); }; - path = lib.recurseIntoAttrs { + path = recurseIntoAttrs { bash = expectSuccess (writeBash "test-writers-bash-path" (writeText "test" '' if [[ "test" == "test" ]]; then echo "success"; fi '')); @@ -310,4 +335,85 @@ lib.recurseIntoAttrs { expected = "hello: world\n"; }; }; + + wrapping = recurseIntoAttrs { + bash-bin = expectSuccessBin ( + writeBashBin "test-writers-wrapping-bash-bin" + { + makeWrapperArgs = [ + "--set" + "ThaigerSprint" + "Thailand" + ]; + } + '' + if [[ "$ThaigerSprint" == "Thailand" ]]; then + echo "success" + fi + '' + ); + + bash = expectSuccess ( + writeBash "test-writers-wrapping-bash" + { + makeWrapperArgs = [ + "--set" + "ThaigerSprint" + "Thailand" + ]; + } + '' + if [[ "$ThaigerSprint" == "Thailand" ]]; then + echo "success" + fi + '' + ); + + python = expectSuccess ( + writePython3 "test-writers-wrapping-python" + { + makeWrapperArgs = [ + "--set" + "ThaigerSprint" + "Thailand" + ]; + } + '' + import os + + if os.environ.get("ThaigerSprint") == "Thailand": + print("success") + '' + ); + + rust = expectSuccess ( + writeRust "test-writers-wrapping-rust" + { + makeWrapperArgs = [ + "--set" + "ThaigerSprint" + "Thailand" + ]; + } + '' + fn main(){ + if std::env::var("ThaigerSprint").unwrap() == "Thailand" { + println!("success") + } + } + '' + ); + + no-empty-wrapper = let + bin = writeBashBin "bin" { makeWrapperArgs = []; } ''true''; + in runCommand "run-test-writers-wrapping-no-empty-wrapper" {} '' + ls -A ${bin}/bin + if [ $(ls -A ${bin}/bin | wc -l) -eq 1 ]; then + touch $out + else + echo "Error: Empty wrapper was created" >&2 + exit 1 + fi + ''; + }; } diff --git a/pkgs/by-name/on/onevpl-intel-gpu/package.nix b/pkgs/by-name/on/onevpl-intel-gpu/package.nix new file mode 100644 index 0000000000000..64e6f9d262f2d --- /dev/null +++ b/pkgs/by-name/on/onevpl-intel-gpu/package.nix @@ -0,0 +1,38 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, pkg-config +, libdrm +, libva +}: + +stdenv.mkDerivation rec { + pname = "onevpl-intel-gpu"; + version = "23.4.3"; + + outputs = [ "out" "dev" ]; + + src = fetchFromGitHub { + owner = "oneapi-src"; + repo = "oneVPL-intel-gpu"; + rev = "intel-onevpl-${version}"; + sha256 = "sha256-oDwDMUq6JpRJH5nbANb7TJLW7HRYA9y0xZxEsoepx/U="; + }; + + nativeBuildInputs = [ cmake pkg-config ]; + + buildInputs = [ libdrm libva ]; + + meta = { + description = "oneAPI Video Processing Library Intel GPU implementation"; + homepage = "https://github.com/oneapi-src/oneVPL-intel-gpu"; + changelog = "https://github.com/oneapi-src/oneVPL-intel-gpu/releases/tag/${src.rev}"; + license = [ lib.licenses.mit ]; + platforms = lib.platforms.linux; + # CMake adds x86 specific compiler flags in <source>/builder/FindGlobals.cmake + # NOTE: https://github.com/oneapi-src/oneVPL-intel-gpu/issues/303 + broken = !stdenv.hostPlatform.isx86; + maintainers = [ lib.maintainers.evanrichter ]; + }; +} diff --git a/pkgs/by-name/vu/vulkan-volk/package.nix b/pkgs/by-name/vu/vulkan-volk/package.nix index 1164fd2921e2a..a659f9a1c6da7 100644 --- a/pkgs/by-name/vu/vulkan-volk/package.nix +++ b/pkgs/by-name/vu/vulkan-volk/package.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "volk"; - version = "1.3.275.0"; + version = "1.3.280.0"; src = fetchFromGitHub { owner = "zeux"; repo = "volk"; rev = "vulkan-sdk-${finalAttrs.version}"; - hash = "sha256-uTjLgJMGN8nOVhVIl/GNhO2jXe9ebhc9vzAwCDwfuf4="; + hash = "sha256-e4TLGRqn0taYeiRVxc9WevURjO5dsVq3RpOwZBGDknQ="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/wa/waf/package.nix b/pkgs/by-name/wa/waf/package.nix index 515f3ae034218..9dd0e9339d873 100644 --- a/pkgs/by-name/wa/waf/package.nix +++ b/pkgs/by-name/wa/waf/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "waf"; - version = "2.0.26"; + version = "2.0.27"; src = fetchFromGitLab { owner = "ita1024"; repo = "waf"; rev = "waf-${finalAttrs.version}"; - hash = "sha256-AXDMWlwivJ0Xot6iwuIIlbV2Anz6ieghyOI9jA4yrko="; + hash = "sha256-GeEoD5CHubwR4ndGk7J7czEf0hWtPQr88TqJDPqeK0s="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome/misc/gnome-extensions-cli/default.nix b/pkgs/desktops/gnome/misc/gnome-extensions-cli/default.nix index 03f5075a791f8..e7d18a0d3c0d5 100644 --- a/pkgs/desktops/gnome/misc/gnome-extensions-cli/default.nix +++ b/pkgs/desktops/gnome/misc/gnome-extensions-cli/default.nix @@ -33,6 +33,7 @@ buildPythonApplication rec { pythonRelaxDeps = [ "more-itertools" + "packaging" ]; propagatedBuildInputs = [ diff --git a/pkgs/development/compilers/gcc/common/builder.nix b/pkgs/development/compilers/gcc/common/builder.nix index 98525b5e237ef..25c5646338653 100644 --- a/pkgs/development/compilers/gcc/common/builder.nix +++ b/pkgs/development/compilers/gcc/common/builder.nix @@ -1,6 +1,7 @@ { lib , stdenv , enableMultilib +, targetConfig }: let @@ -196,6 +197,13 @@ originalAttrs: (stdenv.mkDerivation (finalAttrs: originalAttrs // { mkdir -p "$out/''${targetConfig}/lib" mkdir -p "''${!outputLib}/''${targetConfig}/lib" '' + + # if cross-compiling, link from $lib/lib to $lib/${targetConfig}. + # since native-compiles have $lib/lib as a directory (not a + # symlink), this ensures that in every case we can assume that + # $lib/lib contains the .so files + lib.optionalString (with stdenv; targetPlatform.config != hostPlatform.config) '' + ln -Ts "''${!outputLib}/''${targetConfig}/lib" $lib/lib + '' + # Make `lib64` symlinks to `lib`. lib.optionalString (!enableMultilib && stdenv.hostPlatform.is64bit && !stdenv.hostPlatform.isMips64n32) '' ln -s lib "$out/''${targetConfig}/lib64" diff --git a/pkgs/development/compilers/gcc/common/libgcc.nix b/pkgs/development/compilers/gcc/common/libgcc.nix index c8342ae90054a..a7de840adc8d0 100644 --- a/pkgs/development/compilers/gcc/common/libgcc.nix +++ b/pkgs/development/compilers/gcc/common/libgcc.nix @@ -83,10 +83,6 @@ in lib.optionalString (!langC) '' rm -f $out/lib/libgcc_s.so* '' - + lib.optionalString (hostPlatform != targetPlatform) '' - mkdir -p $lib/lib/ - ln -s ${targetPlatformSlash}lib $lib/lib - '' # TODO(amjoseph): remove the `libgcc_s.so` symlinks below and replace them # with a `-L${gccForLibs.libgcc}/lib` in cc-wrapper's diff --git a/pkgs/development/compilers/gcc/default.nix b/pkgs/development/compilers/gcc/default.nix index cc3546bed22cf..0144ab4cfff9b 100644 --- a/pkgs/development/compilers/gcc/default.nix +++ b/pkgs/development/compilers/gcc/default.nix @@ -103,6 +103,7 @@ let inherit version; disableBootstrap = atLeast11 && !stdenv.hostPlatform.isDarwin && (atLeast12 -> !profiledCompiler); inherit (stdenv) buildPlatform hostPlatform targetPlatform; + targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null; patches = callFile ./patches {}; @@ -124,6 +125,7 @@ let inherit version; buildPlatform hostPlatform targetPlatform + targetConfig patches crossMingw stageNameAddon @@ -329,7 +331,7 @@ lib.pipe ((callFile ./common/builder.nix {}) ({ ++ optional (is7 && targetPlatform.isAarch64) "--enable-fix-cortex-a53-843419" ++ optional (is7 && targetPlatform.isNetBSD) "--disable-libcilkrts"; - targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null; + inherit targetConfig; buildFlags = # we do not yet have Nix-driven profiling diff --git a/pkgs/development/compilers/swift/sourcekit-lsp/default.nix b/pkgs/development/compilers/swift/sourcekit-lsp/default.nix index a2dd73fefa13f..ec05eea01bf4d 100644 --- a/pkgs/development/compilers/swift/sourcekit-lsp/default.nix +++ b/pkgs/development/compilers/swift/sourcekit-lsp/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , callPackage +, fetchpatch , pkg-config , swift , swiftpm @@ -41,7 +42,11 @@ stdenv.mkDerivation { patch -p1 -d .build/checkouts/indexstore-db -i ${./patches/indexstore-db-macos-target.patch} swiftpmMakeMutable swift-tools-support-core - patch -p1 -d .build/checkouts/swift-tools-support-core -i ${./patches/force-unwrap-file-handles.patch} + patch -p1 -d .build/checkouts/swift-tools-support-core -i ${fetchpatch { + url = "https://github.com/apple/swift-tools-support-core/commit/990afca47e75cce136d2f59e464577e68a164035.patch"; + hash = "sha256-PLzWsp+syiUBHhEFS8+WyUcSae5p0Lhk7SSRdNvfouE="; + includes = [ "Sources/TSCBasic/FileSystem.swift" ]; + }} # This toggles a section specific to Xcode XCTest, which doesn't work on # Darwin, where we also use swift-corelibs-xctest. diff --git a/pkgs/development/compilers/swift/swift-driver/default.nix b/pkgs/development/compilers/swift/swift-driver/default.nix index d69a4da0eb3e1..3245fa1d8787f 100644 --- a/pkgs/development/compilers/swift/swift-driver/default.nix +++ b/pkgs/development/compilers/swift/swift-driver/default.nix @@ -54,7 +54,11 @@ stdenv.mkDerivation { configurePhase = generated.configure + '' swiftpmMakeMutable swift-tools-support-core - patch -p1 -d .build/checkouts/swift-tools-support-core -i ${./patches/force-unwrap-file-handles.patch} + patch -p1 -d .build/checkouts/swift-tools-support-core -i ${fetchpatch { + url = "https://github.com/apple/swift-tools-support-core/commit/990afca47e75cce136d2f59e464577e68a164035.patch"; + hash = "sha256-PLzWsp+syiUBHhEFS8+WyUcSae5p0Lhk7SSRdNvfouE="; + includes = [ "Sources/TSCBasic/FileSystem.swift" ]; + }} ''; # TODO: Tests depend on indexstore-db being provided by an existing Swift diff --git a/pkgs/development/compilers/swift/swift-driver/patches/force-unwrap-file-handles.patch b/pkgs/development/compilers/swift/swift-driver/patches/force-unwrap-file-handles.patch deleted file mode 100644 index a2f2d38c37c81..0000000000000 --- a/pkgs/development/compilers/swift/swift-driver/patches/force-unwrap-file-handles.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 8d9ab4b6ed24a97e8af0cc338a52aacdcf438b8c Mon Sep 17 00:00:00 2001 -From: Pavel Sobolev <paveloom@riseup.net> -Date: Tue, 21 Nov 2023 20:53:33 +0300 -Subject: [PATCH] Force-unwrap file handles. - ---- - Sources/TSCBasic/FileSystem.swift | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Sources/TSCBasic/FileSystem.swift b/Sources/TSCBasic/FileSystem.swift -index 3a63bdf..a1f3d9d 100644 ---- a/Sources/TSCBasic/FileSystem.swift -+++ b/Sources/TSCBasic/FileSystem.swift -@@ -425,7 +425,7 @@ private class LocalFileSystem: FileSystem { - if fp == nil { - throw FileSystemError(errno: errno, path) - } -- defer { fclose(fp) } -+ defer { fclose(fp!) } - - // Read the data one block at a time. - let data = BufferedOutputByteStream() -@@ -455,7 +455,7 @@ private class LocalFileSystem: FileSystem { - if fp == nil { - throw FileSystemError(errno: errno, path) - } -- defer { fclose(fp) } -+ defer { fclose(fp!) } - - // Write the data in one chunk. - var contents = bytes.contents --- -2.42.0 diff --git a/pkgs/development/compilers/swift/swift-format/default.nix b/pkgs/development/compilers/swift/swift-format/default.nix index 2f7e630e68045..a3d939b85cbd8 100644 --- a/pkgs/development/compilers/swift/swift-format/default.nix +++ b/pkgs/development/compilers/swift/swift-format/default.nix @@ -1,5 +1,6 @@ { lib , stdenv +, fetchpatch , callPackage , swift , swiftpm @@ -21,7 +22,11 @@ stdenv.mkDerivation { configurePhase = generated.configure + '' swiftpmMakeMutable swift-tools-support-core - patch -p1 -d .build/checkouts/swift-tools-support-core -i ${./patches/force-unwrap-file-handles.patch} + patch -p1 -d .build/checkouts/swift-tools-support-core -i ${fetchpatch { + url = "https://github.com/apple/swift-tools-support-core/commit/990afca47e75cce136d2f59e464577e68a164035.patch"; + hash = "sha256-PLzWsp+syiUBHhEFS8+WyUcSae5p0Lhk7SSRdNvfouE="; + includes = [ "Sources/TSCBasic/FileSystem.swift" ]; + }} ''; # We only install the swift-format binary, so don't need the other products. diff --git a/pkgs/development/compilers/swift/swift-format/patches/force-unwrap-file-handles.patch b/pkgs/development/compilers/swift/swift-format/patches/force-unwrap-file-handles.patch deleted file mode 100644 index a2f2d38c37c81..0000000000000 --- a/pkgs/development/compilers/swift/swift-format/patches/force-unwrap-file-handles.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 8d9ab4b6ed24a97e8af0cc338a52aacdcf438b8c Mon Sep 17 00:00:00 2001 -From: Pavel Sobolev <paveloom@riseup.net> -Date: Tue, 21 Nov 2023 20:53:33 +0300 -Subject: [PATCH] Force-unwrap file handles. - ---- - Sources/TSCBasic/FileSystem.swift | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Sources/TSCBasic/FileSystem.swift b/Sources/TSCBasic/FileSystem.swift -index 3a63bdf..a1f3d9d 100644 ---- a/Sources/TSCBasic/FileSystem.swift -+++ b/Sources/TSCBasic/FileSystem.swift -@@ -425,7 +425,7 @@ private class LocalFileSystem: FileSystem { - if fp == nil { - throw FileSystemError(errno: errno, path) - } -- defer { fclose(fp) } -+ defer { fclose(fp!) } - - // Read the data one block at a time. - let data = BufferedOutputByteStream() -@@ -455,7 +455,7 @@ private class LocalFileSystem: FileSystem { - if fp == nil { - throw FileSystemError(errno: errno, path) - } -- defer { fclose(fp) } -+ defer { fclose(fp!) } - - // Write the data in one chunk. - var contents = bytes.contents --- -2.42.0 diff --git a/pkgs/development/compilers/swift/swiftpm/default.nix b/pkgs/development/compilers/swift/swiftpm/default.nix index 4a7a4ab63cced..2f3cb9530cfe5 100644 --- a/pkgs/development/compilers/swift/swiftpm/default.nix +++ b/pkgs/development/compilers/swift/swiftpm/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , callPackage +, fetchpatch , cmake , ninja , git @@ -195,12 +196,22 @@ let ''; }; + # Part of this patch fixes for glibc 2.39: glibc patch 64b1a44183a3094672ed304532bedb9acc707554 + # marks the `FILE*` argument to a few functions including `ferror` & `fread` as non-null. However + # the code passes an `Optional<T>` to these functions. + # This patch uses a `guard` which effectively unwraps the type (or throws an exception). + swift-tools-support-core-glibc-fix = fetchpatch { + url = "https://github.com/apple/swift-tools-support-core/commit/990afca47e75cce136d2f59e464577e68a164035.patch"; + hash = "sha256-PLzWsp+syiUBHhEFS8+WyUcSae5p0Lhk7SSRdNvfouE="; + includes = [ "Sources/TSCBasic/FileSystem.swift" ]; + }; + swift-tools-support-core = mkBootstrapDerivation { name = "swift-tools-support-core"; src = generated.sources.swift-tools-support-core; patches = [ - ./patches/force-unwrap-file-handles.patch + swift-tools-support-core-glibc-fix ]; buildInputs = [ @@ -389,7 +400,7 @@ in stdenv.mkDerivation (commonAttrs // { swiftpmMakeMutable swift-tools-support-core substituteInPlace .build/checkouts/swift-tools-support-core/Sources/TSCTestSupport/XCTestCasePerf.swift \ --replace 'canImport(Darwin)' 'false' - patch -p1 -d .build/checkouts/swift-tools-support-core -i ${./patches/force-unwrap-file-handles.patch} + patch -p1 -d .build/checkouts/swift-tools-support-core -i ${swift-tools-support-core-glibc-fix} # Prevent a warning about SDK directories we don't have. swiftpmMakeMutable swift-driver diff --git a/pkgs/development/compilers/swift/swiftpm/patches/force-unwrap-file-handles.patch b/pkgs/development/compilers/swift/swiftpm/patches/force-unwrap-file-handles.patch deleted file mode 100644 index a2f2d38c37c81..0000000000000 --- a/pkgs/development/compilers/swift/swiftpm/patches/force-unwrap-file-handles.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 8d9ab4b6ed24a97e8af0cc338a52aacdcf438b8c Mon Sep 17 00:00:00 2001 -From: Pavel Sobolev <paveloom@riseup.net> -Date: Tue, 21 Nov 2023 20:53:33 +0300 -Subject: [PATCH] Force-unwrap file handles. - ---- - Sources/TSCBasic/FileSystem.swift | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Sources/TSCBasic/FileSystem.swift b/Sources/TSCBasic/FileSystem.swift -index 3a63bdf..a1f3d9d 100644 ---- a/Sources/TSCBasic/FileSystem.swift -+++ b/Sources/TSCBasic/FileSystem.swift -@@ -425,7 +425,7 @@ private class LocalFileSystem: FileSystem { - if fp == nil { - throw FileSystemError(errno: errno, path) - } -- defer { fclose(fp) } -+ defer { fclose(fp!) } - - // Read the data one block at a time. - let data = BufferedOutputByteStream() -@@ -455,7 +455,7 @@ private class LocalFileSystem: FileSystem { - if fp == nil { - throw FileSystemError(errno: errno, path) - } -- defer { fclose(fp) } -+ defer { fclose(fp!) } - - // Write the data in one chunk. - var contents = bytes.contents --- -2.42.0 diff --git a/pkgs/development/compilers/vyper/default.nix b/pkgs/development/compilers/vyper/default.nix index fb83f299bd8c9..078cb7dac9252 100644 --- a/pkgs/development/compilers/vyper/default.nix +++ b/pkgs/development/compilers/vyper/default.nix @@ -57,6 +57,7 @@ buildPythonPackage rec { pythonRelaxDeps = [ "asttokens" + "packaging" ]; propagatedBuildInputs = [ diff --git a/pkgs/development/interpreters/lua-5/hooks/default.nix b/pkgs/development/interpreters/lua-5/hooks/default.nix index 6c303f770decc..ca9c15e8a3b1e 100644 --- a/pkgs/development/interpreters/lua-5/hooks/default.nix +++ b/pkgs/development/interpreters/lua-5/hooks/default.nix @@ -8,7 +8,6 @@ let callPackage = lua.pkgs.callPackage; - luaInterpreter = lua.interpreter; in { lua-setup-hook = LuaPathSearchPaths: LuaCPathSearchPaths: diff --git a/pkgs/development/interpreters/lua-5/hooks/setup-hook.sh b/pkgs/development/interpreters/lua-5/hooks/setup-hook.sh index 7b2d2a4d83d86..3041b7f1c3f71 100644 --- a/pkgs/development/interpreters/lua-5/hooks/setup-hook.sh +++ b/pkgs/development/interpreters/lua-5/hooks/setup-hook.sh @@ -13,11 +13,6 @@ nix_debug() { addToLuaSearchPathWithCustomDelimiter() { local varName="$1" local absPattern="$2" - # delete longest match starting from the lua placeholder '?' - local topDir="${absPattern%%\?*}" - - # export only if the folder exists else LUA_PATH/LUA_CPATH grow too large - if [[ ! -d "$topDir" ]]; then return; fi # export only if we haven't already got this dir in the search path if [[ ${!varName-} == *"$absPattern"* ]]; then return; fi @@ -27,7 +22,15 @@ addToLuaSearchPathWithCustomDelimiter() { # allowing relative modules to be used even when there are system modules. if [[ ! -v "${varName}" ]]; then export "${varName}=;;"; fi - export "${varName}=${!varName:+${!varName};}${absPattern}" + # export only if the folder contains lua files + shopt -s globstar + + for _file in ${absPattern/\?/\*\*}; do + export "${varName}=${!varName:+${!varName};}${absPattern}" + shopt -u globstar + return; + done + shopt -u globstar } addToLuaPath() { diff --git a/pkgs/development/interpreters/lua-5/interpreter.nix b/pkgs/development/interpreters/lua-5/interpreter.nix index 4091fdd49e0e4..2856951d9fbdf 100644 --- a/pkgs/development/interpreters/lua-5/interpreter.nix +++ b/pkgs/development/interpreters/lua-5/interpreter.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: let luaPackages = self.pkgs; - luaversion = lib.versions.majorMinor version; + luaversion = lib.versions.majorMinor finalAttrs.version; plat = if (stdenv.isLinux && lib.versionOlder self.luaversion "5.4") then "linux" else if (stdenv.isLinux && lib.versionAtLeast self.luaversion "5.4") then "linux-readline" @@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: outputs = [ "out" "doc" ]; src = fetchurl { - url = "https://www.lua.org/ftp/${finalAttrs.pname}-${finalAttrs.version}.tar.gz"; + url = "https://www.lua.org/ftp/lua-${finalAttrs.version}.tar.gz"; sha256 = hash; }; @@ -60,16 +60,11 @@ stdenv.mkDerivation (finalAttrs: inherit patches; - # we can't pass flags to the lua makefile because for portability, everything is hardcoded postPatch = '' - { - echo -e ' - #undef LUA_PATH_DEFAULT - #define LUA_PATH_DEFAULT "./share/lua/${luaversion}/?.lua;./?.lua;./?/init.lua" - #undef LUA_CPATH_DEFAULT - #define LUA_CPATH_DEFAULT "./lib/lua/${luaversion}/?.so;./?.so;./lib/lua/${luaversion}/loadall.so" - ' - } >> src/luaconf.h + sed -i "s@#define LUA_ROOT[[:space:]]*\"/usr/local/\"@#define LUA_ROOT \"$out/\"@g" src/luaconf.h + + # abort if patching didn't work + grep $out src/luaconf.h '' + lib.optionalString (!stdenv.isDarwin && !staticOnly) '' # Add a target for a shared library to the Makefile. sed -e '1s/^/LUA_SO = liblua.so/' \ @@ -102,8 +97,8 @@ stdenv.mkDerivation (finalAttrs: makeFlagsArray+=(${lib.optionalString stdenv.isDarwin "CC=\"$CC\""}${lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) " 'AR=${stdenv.cc.targetPrefix}ar rcu'"}) installFlagsArray=( TO_BIN="lua luac" INSTALL_DATA='cp -d' \ - TO_LIB="${if stdenv.isDarwin then "liblua.${version}.dylib" - else ("liblua.a" + lib.optionalString (!staticOnly) " liblua.so liblua.so.${luaversion} liblua.so.${version}" )}" ) + TO_LIB="${if stdenv.isDarwin then "liblua.${finalAttrs.version}.dylib" + else ("liblua.a" + lib.optionalString (!staticOnly) " liblua.so liblua.so.${luaversion} liblua.so.${finalAttrs.version}" )}" ) runHook postConfigure ''; @@ -128,7 +123,7 @@ stdenv.mkDerivation (finalAttrs: Name: Lua Description: An Extensible Extension Language - Version: ${version} + Version: ${finalAttrs.version} Requires: Libs: -L$out/lib -llua Cflags: -I$out/include @@ -138,7 +133,7 @@ stdenv.mkDerivation (finalAttrs: ln -s "$out/lib/pkgconfig/lua.pc" "$out/lib/pkgconfig/lua${lib.replaceStrings [ "." ] [ "" ] luaversion}.pc" # Make documentation outputs of different versions co-installable. - mv $out/share/doc/lua $out/share/doc/lua-${version} + mv $out/share/doc/lua $out/share/doc/lua-${finalAttrs.version} ''; # copied from python diff --git a/pkgs/development/interpreters/lua-5/tests/assert.sh b/pkgs/development/interpreters/lua-5/tests/assert.sh index c5783a24b2d7b..b0aa3825ef93a 100644 --- a/pkgs/development/interpreters/lua-5/tests/assert.sh +++ b/pkgs/development/interpreters/lua-5/tests/assert.sh @@ -3,14 +3,14 @@ # Example: # fail "It should have been but it wasn't to be" function fail() { - echo "$1" + echo -e "$1" exit 1 } function assertStringEqual() { if ! diff <(echo "$1") <(echo "$2") ; then - fail "expected \"$1\" to be equal to \"$2\"" + fail "Actual value: \"$1\"\nExpected value: \"$2\"" fi } diff --git a/pkgs/development/interpreters/lua-5/tests/default.nix b/pkgs/development/interpreters/lua-5/tests/default.nix index 7351fb7cd6f4d..6ca6b153c0b62 100644 --- a/pkgs/development/interpreters/lua-5/tests/default.nix +++ b/pkgs/development/interpreters/lua-5/tests/default.nix @@ -1,12 +1,10 @@ { lua , hello , wrapLua -, lib, fetchFromGitHub -, fetchFromGitLab +, lib , pkgs }: let - runTest = lua: { name, command }: pkgs.runCommandLocal "test-${lua.name}-${name}" ({ nativeBuildInputs = [lua]; @@ -18,29 +16,47 @@ let + "touch $out" ); - wrappedHello = hello.overrideAttrs(oa: { - propagatedBuildInputs = [ - wrapLua - lua.pkgs.cjson - ]; - postFixup = '' - wrapLuaPrograms - ''; - }); + wrappedHello = hello.overrideAttrs(oa: { + propagatedBuildInputs = [ + wrapLua + lua.pkgs.cjson + ]; + postFixup = '' + wrapLuaPrograms + ''; + }); + + luaWithModule = lua.withPackages(ps: [ + ps.lua-cjson + ]); + + golden_LUA_PATHS = { - luaWithModule = lua.withPackages(ps: [ - ps.lua-cjson - ]); + # Looking at lua interpreter 'setpath' code + # for instance https://github.com/lua/lua/blob/69ea087dff1daba25a2000dfb8f1883c17545b7a/loadlib.c#L599 + # replace ";;" by ";LUA_PATH_DEFAULT;" + "5.1" = ";./?.lua;${lua}/share/lua/5.1/?.lua;${lua}/share/lua/5.1/?/init.lua;${lua}/lib/lua/5.1/?.lua;${lua}/lib/lua/5.1/?/init.lua;"; + "5.2" = ";${lua}/share/lua/5.2/?.lua;${lua}/share/lua/5.2/?/init.lua;${lua}/lib/lua/5.2/?.lua;${lua}/lib/lua/5.2/?/init.lua;./?.lua;"; + "5.3" = ";${lua}/share/lua/5.3/?.lua;${lua}/share/lua/5.3/?/init.lua;${lua}/lib/lua/5.3/?.lua;${lua}/lib/lua/5.3/?/init.lua;./?.lua;./?/init.lua;"; + # lua5.4 seems to be smarter about it and dont add the lua separators when nothing left or right + "5.4" = "${lua}/share/lua/5.4/?.lua;${lua}/share/lua/5.4/?/init.lua;${lua}/lib/lua/5.4/?.lua;${lua}/lib/lua/5.4/?/init.lua;./?.lua;./?/init.lua"; + + # luajit versions + "2.0" = ";./?.lua;${lua}/share/luajit-2.0/?.lua;/usr/local/share/lua/5.1/?.lua;/usr/local/share/lua/5.1/?/init.lua;${lua}/share/lua/5.1/?.lua;${lua}/share/lua/5.1/?/init.lua;"; + "2.1" = ";./?.lua;${lua}/share/luajit-2.1/?.lua;/usr/local/share/lua/5.1/?.lua;/usr/local/share/lua/5.1/?/init.lua;${lua}/share/lua/5.1/?.lua;${lua}/share/lua/5.1/?/init.lua;"; + }; in pkgs.recurseIntoAttrs ({ - checkAliases = runTest lua { - name = "check-aliases"; + checkInterpreterPatch = let + golden_LUA_PATH = golden_LUA_PATHS.${lib.versions.majorMinor lua.version}; + in + runTest lua { + name = "check-default-lua-path"; command = '' + export LUA_PATH=";;" generated=$(lua -e 'print(package.path)') - golden_LUA_PATH='./share/lua/${lua.luaversion}/?.lua;./?.lua;./?/init.lua' - - assertStringContains "$generated" "$golden_LUA_PATH" + assertStringEqual "$generated" "${golden_LUA_PATH}" ''; }; diff --git a/pkgs/development/interpreters/luajit/default.nix b/pkgs/development/interpreters/luajit/default.nix index 211fa56e91197..15bcfee3a44cc 100644 --- a/pkgs/development/interpreters/luajit/default.nix +++ b/pkgs/development/interpreters/luajit/default.nix @@ -62,7 +62,7 @@ let else buildPackages.stdenv; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "luajit"; inherit version src; @@ -75,15 +75,6 @@ stdenv.mkDerivation rec { # passed by nixpkgs CC wrapper is insufficient on its own substituteInPlace src/Makefile --replace "#CCDEBUG= -g" "CCDEBUG= -g" fi - - { - echo -e ' - #undef LUA_PATH_DEFAULT - #define LUA_PATH_DEFAULT "./share/lua/${luaversion}/?.lua;./?.lua;./?/init.lua" - #undef LUA_CPATH_DEFAULT - #define LUA_CPATH_DEFAULT "./lib/lua/${luaversion}/?.so;./?.so;./lib/lua/${luaversion}/loadall.so" - ' - } >> src/luaconf.h ''; dontConfigure = true; @@ -122,7 +113,8 @@ stdenv.mkDerivation rec { inputs' = lib.filterAttrs (n: v: ! lib.isDerivation v && n != "passthruFun") inputs; override = attr: let lua = attr.override (inputs' // { self = lua; }); in lua; in passthruFun rec { - inherit self luaversion packageOverrides luaAttr; + inherit self packageOverrides luaAttr; + inherit (finalAttrs) luaversion; executable = "lua"; luaOnBuildForBuild = override pkgsBuildBuild.${luaAttr}; luaOnBuildForHost = override pkgsBuildHost.${luaAttr}; @@ -142,4 +134,4 @@ stdenv.mkDerivation rec { ]; maintainers = with maintainers; [ thoughtpolice smironov vcunat lblasc ]; } // extraMeta; -} +}) diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix index a77206ae3852c..86b09fa877685 100644 --- a/pkgs/development/interpreters/python/cpython/2.7/default.nix +++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix @@ -131,6 +131,12 @@ let # * https://github.com/python/cpython/commit/e6b247c8e524 ../3.7/no-win64-workaround.patch + # fix openssl detection by reverting irrelevant change for us, to enable hashlib which is required by pip + (fetchpatch { + url = "https://github.com/ActiveState/cpython/pull/35/commits/20ea5b46aaf1e7bdf9d6905ba8bece2cc73b05b0.patch"; + revert = true; + hash = "sha256-Lp5fGlcfJJ6p6vKmcLckJiAA2AZz4prjFE0aMEJxotw="; + }) ] ++ lib.optionals (x11Support && stdenv.isDarwin) [ ./use-correct-tcl-tk-on-darwin.patch @@ -312,8 +318,6 @@ in with passthru; stdenv.mkDerivation ({ inherit passthru; postFixup = '' - # Include a sitecustomize.py file. Note it causes an error when it's in postInstall with 2.7. - cp ${../../sitecustomize.py} $out/${sitePackages}/sitecustomize.py '' + lib.optionalString strip2to3 '' rm -R $out/bin/2to3 $out/lib/python*/lib2to3 '' + lib.optionalString stripConfig '' diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index 301af7a29c9ea..96dcb6c25a131 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -537,8 +537,7 @@ in with passthru; stdenv.mkDerivation (finalAttrs: { # Strip tests rm -R $out/lib/python*/test $out/lib/python*/**/test{,s} '' + optionalString includeSiteCustomize '' - # Include a sitecustomize.py file - cp ${../sitecustomize.py} $out/${sitePackages}/sitecustomize.py + '' + optionalString stripBytecode '' # Determinism: deterministic bytecode # First we delete all old bytecode. diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index a88f5ff0a4e71..03147bc4c5f3b 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -35,9 +35,9 @@ in { major = "2"; minor = "7"; patch = "18"; - suffix = ".7"; # ActiveState's Python 2 extended support + suffix = ".8"; # ActiveState's Python 2 extended support }; - hash = "sha256-zcjAoSq6491ePiDySBCKrLIyYoO/5fdH6aBTNg/NH8s="; + hash = "sha256-HUOzu3uJbtd+3GbmGD35KOk/CDlwL4S7hi9jJGRFiqI="; inherit (darwin) configd; inherit passthruFun; }; diff --git a/pkgs/development/interpreters/python/hooks/python-relax-deps-hook.sh b/pkgs/development/interpreters/python/hooks/python-relax-deps-hook.sh index 293bd5cebd500..16df000139255 100644 --- a/pkgs/development/interpreters/python/hooks/python-relax-deps-hook.sh +++ b/pkgs/development/interpreters/python/hooks/python-relax-deps-hook.sh @@ -77,13 +77,12 @@ _pythonRemoveDeps() { pythonRelaxDepsHook() { pushd dist - # See https://peps.python.org/pep-0491/#escaping-and-unicode - local -r pkg_name="${pname//[^[:alnum:].]/_}" local -r unpack_dir="unpacked" - local -r metadata_file="$unpack_dir/$pkg_name*/$pkg_name*.dist-info/METADATA" + local -r metadata_file="$unpack_dir/*/*.dist-info/METADATA" # We generally shouldn't have multiple wheel files, but let's be safer here - for wheel in "$pkg_name"*".whl"; do + for wheel in *".whl"; do + PYTHONPATH="@wheel@/@pythonSitePackages@:$PYTHONPATH" \ @pythonInterpreter@ -m wheel unpack --dest "$unpack_dir" "$wheel" rm -rf "$wheel" @@ -98,7 +97,7 @@ pythonRelaxDepsHook() { fi PYTHONPATH="@wheel@/@pythonSitePackages@:$PYTHONPATH" \ - @pythonInterpreter@ -m wheel pack "$unpack_dir/$pkg_name"* + @pythonInterpreter@ -m wheel pack "$unpack_dir/"* done # Remove the folder since it will otherwise be in the dist output. diff --git a/pkgs/development/interpreters/python/hooks/python-runtime-deps-check-hook.py b/pkgs/development/interpreters/python/hooks/python-runtime-deps-check-hook.py index 5a3a919391753..36ce389de50f8 100644 --- a/pkgs/development/interpreters/python/hooks/python-runtime-deps-check-hook.py +++ b/pkgs/development/interpreters/python/hooks/python-runtime-deps-check-hook.py @@ -78,7 +78,7 @@ def test_requirement(requirement: Requirement) -> bool: error(f"{package_name} not installed") return False - if package.version not in requirement.specifier: + if requirement.specifier and package.version not in requirement.specifier: error( f"{package_name}{requirement.specifier} not satisfied by version {package.version}" ) @@ -91,7 +91,12 @@ if __name__ == "__main__": args = argparser.parse_args() metadata = get_metadata(args.wheel) - tests = [test_requirement(requirement) for requirement in metadata.requires_dist] + requirements = metadata.requires_dist + + if not requirements: + sys.exit(0) + + tests = [test_requirement(requirement) for requirement in requirements] if not all(tests): sys.exit(1) diff --git a/pkgs/development/interpreters/python/pypy/default.nix b/pkgs/development/interpreters/python/pypy/default.nix index 9b414944bba5b..5724f4944d9c2 100644 --- a/pkgs/development/interpreters/python/pypy/default.nix +++ b/pkgs/development/interpreters/python/pypy/default.nix @@ -126,9 +126,6 @@ in with passthru; stdenv.mkDerivation rec { ln -s $out/${executable}-c/include $out/include/${libPrefix} ln -s $out/${executable}-c/lib-python/${if isPy3k then "3" else pythonVersion} $out/lib/${libPrefix} - # Include a sitecustomize.py file - cp ${../sitecustomize.py} $out/${if isPy38OrNewer then sitePackages else "lib/${libPrefix}/${sitePackages}"}/sitecustomize.py - runHook postInstall ''; diff --git a/pkgs/development/interpreters/python/pypy/prebuilt.nix b/pkgs/development/interpreters/python/pypy/prebuilt.nix index 4b47c642eca4c..70f8711ef0866 100644 --- a/pkgs/development/interpreters/python/pypy/prebuilt.nix +++ b/pkgs/development/interpreters/python/pypy/prebuilt.nix @@ -95,9 +95,6 @@ in with passthru; stdenv.mkDerivation { echo "Removing bytecode" find . -name "__pycache__" -type d -depth -delete - # Include a sitecustomize.py file - cp ${../sitecustomize.py} $out/${sitePackages}/sitecustomize.py - runHook postInstall ''; diff --git a/pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix b/pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix index 37a06f9f61ed5..f0b60c2333f56 100644 --- a/pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix +++ b/pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix @@ -96,9 +96,6 @@ in with passthru; stdenv.mkDerivation { echo "Removing bytecode" find . -name "__pycache__" -type d -depth -delete - # Include a sitecustomize.py file - cp ${../sitecustomize.py} $out/${sitePackages}/sitecustomize.py - runHook postInstall ''; diff --git a/pkgs/development/interpreters/python/sitecustomize.py b/pkgs/development/interpreters/python/sitecustomize.py deleted file mode 100644 index d79a4696d8eaa..0000000000000 --- a/pkgs/development/interpreters/python/sitecustomize.py +++ /dev/null @@ -1,39 +0,0 @@ -""" -This is a Nix-specific module for discovering modules built with Nix. - -The module recursively adds paths that are on `NIX_PYTHONPATH` to `sys.path`. In -order to process possible `.pth` files `site.addsitedir` is used. - -The paths listed in `PYTHONPATH` are added to `sys.path` afterwards, but they -will be added before the entries we add here and thus take precedence. - -Note the `NIX_PYTHONPATH` environment variable is unset in order to prevent leakage. - -Similarly, this module listens to the environment variable `NIX_PYTHONEXECUTABLE` -and sets `sys.executable` to its value. -""" -import site -import sys -import os -import functools - -paths = os.environ.pop('NIX_PYTHONPATH', None) -if paths: - functools.reduce(lambda k, p: site.addsitedir(p, k), paths.split(':'), site._init_pathinfo()) - -# Check whether we are in a venv or virtualenv. -# For Python 3 we check whether our `base_prefix` is different from our current `prefix`. -# For Python 2 we check whether the non-standard `real_prefix` is set. -# https://stackoverflow.com/questions/1871549/determine-if-python-is-running-inside-virtualenv -in_venv = (sys.version_info.major == 3 and sys.prefix != sys.base_prefix) or (sys.version_info.major == 2 and hasattr(sys, "real_prefix")) - -if not in_venv: - executable = os.environ.pop('NIX_PYTHONEXECUTABLE', None) - prefix = os.environ.pop('NIX_PYTHONPREFIX', None) - - if 'PYTHONEXECUTABLE' not in os.environ and executable is not None: - sys.executable = executable - if prefix is not None: - # Sysconfig does not like it when sys.prefix is set to None - sys.prefix = sys.exec_prefix = prefix - site.PREFIXES.insert(0, prefix) diff --git a/pkgs/development/interpreters/python/tests.nix b/pkgs/development/interpreters/python/tests.nix index df4484f9ec68e..0251a903a7ae8 100644 --- a/pkgs/development/interpreters/python/tests.nix +++ b/pkgs/development/interpreters/python/tests.nix @@ -39,11 +39,21 @@ let is_virtualenv = "False"; }; } // lib.optionalAttrs (!python.isPyPy) { - # Use virtualenv from a Nix env. - nixenv-virtualenv = rec { - env = runCommand "${python.name}-virtualenv" {} '' - ${pythonVirtualEnv.interpreter} -m virtualenv venv - mv venv $out + # Use virtualenv with symlinks from a Nix env. + nixenv-virtualenv-links = rec { + env = runCommand "${python.name}-virtualenv-links" {} '' + ${pythonVirtualEnv.interpreter} -m virtualenv --system-site-packages --symlinks --no-seed $out + ''; + interpreter = "${env}/bin/${python.executable}"; + is_venv = "False"; + is_nixenv = "True"; + is_virtualenv = "True"; + }; + } // lib.optionalAttrs (!python.isPyPy) { + # Use virtualenv with copies from a Nix env. + nixenv-virtualenv-copies = rec { + env = runCommand "${python.name}-virtualenv-copies" {} '' + ${pythonVirtualEnv.interpreter} -m virtualenv --system-site-packages --copies --no-seed $out ''; interpreter = "${env}/bin/${python.executable}"; is_venv = "False"; @@ -59,27 +69,48 @@ let is_nixenv = "True"; is_virtualenv = "False"; }; - } // lib.optionalAttrs (python.isPy3k && (!python.isPyPy)) { - # Venv built using plain Python + } // lib.optionalAttrs (python.pythonAtLeast "3.8" && (!python.isPyPy)) { + # Venv built using links to plain Python # Python 2 does not support venv # TODO: PyPy executable name is incorrect, it should be pypy-c or pypy-3c instead of pypy and pypy3. - plain-venv = rec { - env = runCommand "${python.name}-venv" {} '' - ${python.interpreter} -m venv $out + plain-venv-links = rec { + env = runCommand "${python.name}-venv-links" {} '' + ${python.interpreter} -m venv --system-site-packages --symlinks --without-pip $out + ''; + interpreter = "${env}/bin/${python.executable}"; + is_venv = "True"; + is_nixenv = "False"; + is_virtualenv = "False"; + }; + } // lib.optionalAttrs (python.pythonAtLeast "3.8" && (!python.isPyPy)) { + # Venv built using copies from plain Python + # Python 2 does not support venv + # TODO: PyPy executable name is incorrect, it should be pypy-c or pypy-3c instead of pypy and pypy3. + plain-venv-copies = rec { + env = runCommand "${python.name}-venv-copies" {} '' + ${python.interpreter} -m venv --system-site-packages --copies --without-pip $out ''; interpreter = "${env}/bin/${python.executable}"; is_venv = "True"; is_nixenv = "False"; is_virtualenv = "False"; }; - } // lib.optionalAttrs (python.pythonAtLeast "3.8") { # Venv built using Python Nix environment (python.buildEnv) - # TODO: Cannot create venv from a nix env - # Error: Command '['/nix/store/ddc8nqx73pda86ibvhzdmvdsqmwnbjf7-python3-3.7.6-venv/bin/python3.7', '-Im', 'ensurepip', '--upgrade', '--default-pip']' returned non-zero exit status 1. - nixenv-venv = rec { - env = runCommand "${python.name}-venv" {} '' - ${pythonEnv.interpreter} -m venv $out + nixenv-venv-links = rec { + env = runCommand "${python.name}-venv-links" {} '' + ${pythonEnv.interpreter} -m venv --system-site-packages --symlinks --without-pip $out + ''; + interpreter = "${env}/bin/${pythonEnv.executable}"; + is_venv = "True"; + is_nixenv = "True"; + is_virtualenv = "False"; + }; + } // lib.optionalAttrs (python.pythonAtLeast "3.8") { + # Venv built using Python Nix environment (python.buildEnv) + nixenv-venv-copies = rec { + env = runCommand "${python.name}-venv-copies" {} '' + ${pythonEnv.interpreter} -m venv --system-site-packages --copies --without-pip $out ''; interpreter = "${env}/bin/${pythonEnv.executable}"; is_venv = "True"; @@ -91,11 +122,33 @@ let testfun = name: attrs: runCommand "${python.name}-tests-${name}" ({ inherit (python) pythonVersion; } // attrs) '' + mkdir $out + + # set up the test files cp -r ${./tests/test_environments} tests chmod -R +w tests substituteAllInPlace tests/test_python.py - ${attrs.interpreter} -m unittest discover --verbose tests #/test_python.py - mkdir $out + + # run the tests by invoking the interpreter via full path + echo "absolute path: ${attrs.interpreter}" + ${attrs.interpreter} -m unittest discover --verbose tests 2>&1 | tee "$out/full.txt" + + # run the tests by invoking the interpreter via $PATH + export PATH="$(dirname ${attrs.interpreter}):$PATH" + echo "PATH: $(basename ${attrs.interpreter})" + "$(basename ${attrs.interpreter})" -m unittest discover --verbose tests 2>&1 | tee "$out/path.txt" + + # make sure we get the right path when invoking through a result link + ln -s "${attrs.env}" result + relative="result/bin/$(basename ${attrs.interpreter})" + expected="$PWD/$relative" + actual="$(./$relative -c "import sys; print(sys.executable)" | tee "$out/result.txt")" + if [ "$actual" != "$expected" ]; then + echo "expected $expected, got $actual" + exit 1 + fi + + # if we got this far, the tests passed touch $out/success ''; diff --git a/pkgs/development/interpreters/python/tests/test_environments/test_python.py b/pkgs/development/interpreters/python/tests/test_environments/test_python.py index 0fc4b8a9e91c1..538273f65dbc7 100644 --- a/pkgs/development/interpreters/python/tests/test_environments/test_python.py +++ b/pkgs/development/interpreters/python/tests/test_environments/test_python.py @@ -38,7 +38,7 @@ class TestCasePython(unittest.TestCase): @unittest.skipIf(IS_PYPY or sys.version_info.major==2, "Python 2 does not have base_prefix") def test_base_prefix(self): - if IS_VENV or IS_NIXENV or IS_VIRTUALENV: + if IS_VENV or IS_VIRTUALENV: self.assertNotEqual(sys.prefix, sys.base_prefix) else: self.assertEqual(sys.prefix, sys.base_prefix) diff --git a/pkgs/development/interpreters/python/wrapper.nix b/pkgs/development/interpreters/python/wrapper.nix index f5f9b03e0fd3c..aa568a01b1b0c 100644 --- a/pkgs/development/interpreters/python/wrapper.nix +++ b/pkgs/development/interpreters/python/wrapper.nix @@ -35,6 +35,8 @@ let fi mkdir -p "$out/bin" + rm -f $out/bin/.*-wrapped + for path in ${lib.concatStringsSep " " paths}; do if [ -d "$path/bin" ]; then cd "$path/bin" @@ -42,7 +44,13 @@ let if [ -f "$prg" ]; then rm -f "$out/bin/$prg" if [ -x "$prg" ]; then - makeWrapper "$path/bin/$prg" "$out/bin/$prg" --set NIX_PYTHONPREFIX "$out" --set NIX_PYTHONEXECUTABLE ${pythonExecutable} --set NIX_PYTHONPATH ${pythonPath} ${lib.optionalString (!permitUserSite) ''--set PYTHONNOUSERSITE "true"''} ${lib.concatStringsSep " " makeWrapperArgs} + if [ -f ".$prg-wrapped" ]; then + echo "#!${pythonExecutable}" > "$out/bin/$prg" + sed -e '1d' -e '3d' ".$prg-wrapped" >> "$out/bin/$prg" + chmod +x "$out/bin/$prg" + else + makeWrapper "$path/bin/$prg" "$out/bin/$prg" --inherit-argv0 --resolve-argv0 ${lib.optionalString (!permitUserSite) ''--set PYTHONNOUSERSITE "true"''} ${lib.concatStringsSep " " makeWrapperArgs} + fi fi fi done diff --git a/pkgs/development/libraries/SDL/setup-hook.sh b/pkgs/development/libraries/SDL/setup-hook.sh index 553e8553a77f4..54a9b3e8bfab4 100644 --- a/pkgs/development/libraries/SDL/setup-hook.sh +++ b/pkgs/development/libraries/SDL/setup-hook.sh @@ -1,9 +1,15 @@ addSDLPath () { if [ -e "$1/include/SDL" ]; then export SDL_PATH="${SDL_PATH-}${SDL_PATH:+ }$1/include/SDL" - fi - if [ -e "$1/lib" ]; then - export SDL_LIB_PATH="${SDL_LIB_PATH-}${SDL_LIB_PATH:+ }-L$1/lib" + # NB this doesn’t work with split dev packages because different packages + # will contain "include/SDL/" and "lib/" directories. + # + # However the SDL_LIB_PATH is consumed by SDL itself and serves to locate + # libraries like SDL_mixer, SDL_image, etc which are not split-package + # so the check above will only trigger on them. + if [ -e "$1/lib" ]; then + export SDL_LIB_PATH="${SDL_LIB_PATH-}${SDL_LIB_PATH:+ }-L$1/lib" + fi fi } diff --git a/pkgs/development/libraries/Xaw3d/default.nix b/pkgs/development/libraries/Xaw3d/default.nix index f90be3a751e34..83237060312f1 100644 --- a/pkgs/development/libraries/Xaw3d/default.nix +++ b/pkgs/development/libraries/Xaw3d/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "Xaw3d"; - version = "1.6.5"; + version = "1.6.6"; src = fetchurl { url = "https://www.x.org/releases/individual/lib/libXaw3d-${version}.tar.xz"; - sha256 = "sha256-NIHuS2dTuI4YhW6iZcuE8rAznujDu+yWaxVrOLWEGDM="; + sha256 = "sha256-pBw+NxNa1hax8ou95wACr788tZow3zQUH4KdMurchkY="; }; dontUseImakeConfigure = true; nativeBuildInputs = [ pkg-config bison flex imake gccmakedep ]; diff --git a/pkgs/development/libraries/at-spi2-core/default.nix b/pkgs/development/libraries/at-spi2-core/default.nix index 6ebab7eb47607..270f624965f60 100644 --- a/pkgs/development/libraries/at-spi2-core/default.nix +++ b/pkgs/development/libraries/at-spi2-core/default.nix @@ -23,14 +23,14 @@ stdenv.mkDerivation rec { pname = "at-spi2-core"; - version = "2.50.1"; + version = "2.50.2"; outputs = [ "out" "dev" ]; separateDebugInfo = true; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "Vye1wGh6xXuoBA55vWcxtxSja4/PMhkPI2uPs2mHiec="; + hash = "sha256-W4GxRhpi3Y++0aJ2+p71txEvmuX/huHjKtlkS2VP94w="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/dav1d/default.nix b/pkgs/development/libraries/dav1d/default.nix index 09b15ad4da789..da1eecdabab3f 100644 --- a/pkgs/development/libraries/dav1d/default.nix +++ b/pkgs/development/libraries/dav1d/default.nix @@ -26,13 +26,13 @@ assert useVulkan -> withExamples; stdenv.mkDerivation rec { pname = "dav1d"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "videolan"; repo = pname; rev = version; - hash = "sha256-NDv4ZlmrbRoecd0qj/sy+camn4uRTrvte4/84L6oUUg="; + hash = "sha256-PBFQrGGP7hKNMuwkl7q/7/C7v41xqdOYW+pJ70fI4Uo="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/edencommon/default.nix b/pkgs/development/libraries/edencommon/default.nix index 68d6e55291570..0690f0f12ebdf 100644 --- a/pkgs/development/libraries/edencommon/default.nix +++ b/pkgs/development/libraries/edencommon/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "edencommon"; - version = "2024.01.22.00"; + version = "2024.03.11.00"; src = fetchFromGitHub { owner = "facebookexperimental"; repo = "edencommon"; rev = "v${version}"; - sha256 = "sha256-KY0vXptzOEJLDjHvGd3T5oiCCvggND2bPBzvll+YBo4="; + sha256 = "sha256-1z4QicS98juv4bUEbHBkCjVJHEhnoJyLYp4zMHmDbMg="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/expat/2.6.0-fix-tests-flakiness.patch b/pkgs/development/libraries/expat/2.6.0-fix-tests-flakiness.patch deleted file mode 100644 index 9817b1833627f..0000000000000 --- a/pkgs/development/libraries/expat/2.6.0-fix-tests-flakiness.patch +++ /dev/null @@ -1,252 +0,0 @@ -diff --git a/lib/internal.h b/lib/internal.h -index cce71e4c..a217b3f9 100644 ---- a/lib/internal.h -+++ b/lib/internal.h -@@ -31,7 +31,7 @@ - Copyright (c) 2016-2023 Sebastian Pipping <sebastian@pipping.org> - Copyright (c) 2018 Yury Gribov <tetra2005@gmail.com> - Copyright (c) 2019 David Loffredo <loffredo@steptools.com> -- Copyright (c) 2023 Sony Corporation / Snild Dolkow <snild@sony.com> -+ Copyright (c) 2023-2024 Sony Corporation / Snild Dolkow <snild@sony.com> - Licensed under the MIT license: - - Permission is hereby granted, free of charge, to any person obtaining -@@ -162,7 +162,7 @@ const char *unsignedCharToPrintable(unsigned char c); - #endif - - extern XML_Bool g_reparseDeferralEnabledDefault; // written ONLY in runtests.c --extern unsigned int g_parseAttempts; // used for testing only -+extern unsigned int g_bytesScanned; // used for testing only - - #ifdef __cplusplus - } -diff --git a/lib/xmlparse.c b/lib/xmlparse.c -index aaf0fa9c..6de99d99 100644 ---- a/lib/xmlparse.c -+++ b/lib/xmlparse.c -@@ -38,7 +38,7 @@ - Copyright (c) 2022 Jann Horn <jannh@google.com> - Copyright (c) 2022 Sean McBride <sean@rogue-research.com> - Copyright (c) 2023 Owain Davies <owaind@bath.edu> -- Copyright (c) 2023 Sony Corporation / Snild Dolkow <snild@sony.com> -+ Copyright (c) 2023-2024 Sony Corporation / Snild Dolkow <snild@sony.com> - Licensed under the MIT license: - - Permission is hereby granted, free of charge, to any person obtaining -@@ -630,7 +630,7 @@ static unsigned long getDebugLevel(const char *variableName, - : ((*((pool)->ptr)++ = c), 1)) - - XML_Bool g_reparseDeferralEnabledDefault = XML_TRUE; // write ONLY in runtests.c --unsigned int g_parseAttempts = 0; // used for testing only -+unsigned int g_bytesScanned = 0; // used for testing only - - struct XML_ParserStruct { - /* The first member must be m_userData so that the XML_GetUserData -@@ -1017,7 +1017,7 @@ callProcessor(XML_Parser parser, const char *start, const char *end, - return XML_ERROR_NONE; - } - } -- g_parseAttempts += 1; -+ g_bytesScanned += (unsigned)have_now; - const enum XML_Error ret = parser->m_processor(parser, start, end, endPtr); - if (ret == XML_ERROR_NONE) { - // if we consumed nothing, remember what we had on this parse attempt. -diff --git a/tests/basic_tests.c b/tests/basic_tests.c -index 7112a440..a9cc3861 100644 ---- a/tests/basic_tests.c -+++ b/tests/basic_tests.c -@@ -5202,13 +5202,7 @@ START_TEST(test_nested_entity_suspend) { - END_TEST - - /* Regression test for quadratic parsing on large tokens */ --START_TEST(test_big_tokens_take_linear_time) { -- const char *const too_slow_failure_message -- = "Compared to the baseline runtime of the first test, this test has a " -- "slowdown of more than <max_slowdown>. " -- "Please keep increasing the value by 1 until it reliably passes the " -- "test on your hardware and open a bug sharing that number with us. " -- "Thanks in advance!"; -+START_TEST(test_big_tokens_scale_linearly) { - const struct { - const char *pre; - const char *post; -@@ -5220,65 +5214,57 @@ START_TEST(test_big_tokens_take_linear_time) { - {"<e><", "/></e>"}, // big elem name, used to be O(N²) - }; - const int num_cases = sizeof(text) / sizeof(text[0]); -- // For the test we need a <max_slowdown> value that is: -- // (1) big enough that the test passes reliably (avoiding flaky tests), and -- // (2) small enough that the test actually catches regressions. -- const int max_slowdown = 15; - char aaaaaa[4096]; - const int fillsize = (int)sizeof(aaaaaa); - const int fillcount = 100; -+ const unsigned approx_bytes = fillsize * fillcount; // ignore pre/post. -+ const unsigned max_factor = 4; -+ const unsigned max_scanned = max_factor * approx_bytes; - - memset(aaaaaa, 'a', fillsize); - - if (! g_reparseDeferralEnabledDefault) { - return; // heuristic is disabled; we would get O(n^2) and fail. - } --#if ! defined(__linux__) -- if (CLOCKS_PER_SEC < 100000) { -- // Skip this test if clock() doesn't have reasonably good resolution. -- // This workaround is primarily targeting Windows and FreeBSD, since -- // XSI requires the value to be 1.000.000 (10x the condition here), and -- // we want to be very sure that at least one platform in CI can catch -- // regressions (through a failing test). -- return; -- } --#endif - -- clock_t baseline = 0; - for (int i = 0; i < num_cases; ++i) { - XML_Parser parser = XML_ParserCreate(NULL); - assert_true(parser != NULL); - enum XML_Status status; -- set_subtest("max_slowdown=%d text=\"%saaaaaa%s\"", max_slowdown, -- text[i].pre, text[i].post); -- const clock_t start = clock(); -+ set_subtest("text=\"%saaaaaa%s\"", text[i].pre, text[i].post); - - // parse the start text -+ g_bytesScanned = 0; - status = _XML_Parse_SINGLE_BYTES(parser, text[i].pre, - (int)strlen(text[i].pre), XML_FALSE); - if (status != XML_STATUS_OK) { - xml_failure(parser); - } -+ - // parse lots of 'a', failing the test early if it takes too long -+ unsigned past_max_count = 0; - for (int f = 0; f < fillcount; ++f) { - status = _XML_Parse_SINGLE_BYTES(parser, aaaaaa, fillsize, XML_FALSE); - if (status != XML_STATUS_OK) { - xml_failure(parser); - } -- // i == 0 means we're still calculating the baseline value -- if (i > 0) { -- const clock_t now = clock(); -- const clock_t clocks_so_far = now - start; -- const int slowdown = clocks_so_far / baseline; -- if (slowdown >= max_slowdown) { -- fprintf( -- stderr, -- "fill#%d: clocks_so_far=%d baseline=%d slowdown=%d max_slowdown=%d\n", -- f, (int)clocks_so_far, (int)baseline, slowdown, max_slowdown); -- fail(too_slow_failure_message); -- } -+ if (g_bytesScanned > max_scanned) { -+ // We're not done, and have already passed the limit -- the test will -+ // definitely fail. This block allows us to save time by failing early. -+ const unsigned pushed -+ = (unsigned)strlen(text[i].pre) + (f + 1) * fillsize; -+ fprintf( -+ stderr, -+ "after %d/%d loops: pushed=%u scanned=%u (factor ~%.2f) max_scanned: %u (factor ~%u)\n", -+ f + 1, fillcount, pushed, g_bytesScanned, -+ g_bytesScanned / (double)pushed, max_scanned, max_factor); -+ past_max_count++; -+ // We are failing, but allow a few log prints first. If we don't reach -+ // a count of five, the test will fail after the loop instead. -+ assert_true(past_max_count < 5); - } - } -+ - // parse the end text - status = _XML_Parse_SINGLE_BYTES(parser, text[i].post, - (int)strlen(text[i].post), XML_TRUE); -@@ -5286,18 +5272,14 @@ START_TEST(test_big_tokens_take_linear_time) { - xml_failure(parser); - } - -- // how long did it take in total? -- const clock_t end = clock(); -- const clock_t taken = end - start; -- if (i == 0) { -- assert_true(taken > 0); // just to make sure we don't div-by-0 later -- baseline = taken; -- } -- const int slowdown = taken / baseline; -- if (slowdown >= max_slowdown) { -- fprintf(stderr, "taken=%d baseline=%d slowdown=%d max_slowdown=%d\n", -- (int)taken, (int)baseline, slowdown, max_slowdown); -- fail(too_slow_failure_message); -+ assert_true(g_bytesScanned > approx_bytes); // or the counter isn't working -+ if (g_bytesScanned > max_scanned) { -+ fprintf( -+ stderr, -+ "after all input: scanned=%u (factor ~%.2f) max_scanned: %u (factor ~%u)\n", -+ g_bytesScanned, g_bytesScanned / (double)approx_bytes, max_scanned, -+ max_factor); -+ fail("scanned too many bytes"); - } - - XML_ParserFree(parser); -@@ -5774,19 +5756,17 @@ START_TEST(test_varying_buffer_fills) { - fillsize[2], fillsize[3]); - XML_Parser parser = XML_ParserCreate(NULL); - assert_true(parser != NULL); -- g_parseAttempts = 0; - - CharData storage; - CharData_Init(&storage); - XML_SetUserData(parser, &storage); - XML_SetStartElementHandler(parser, start_element_event_handler); - -+ g_bytesScanned = 0; - int worstcase_bytes = 0; // sum of (buffered bytes at each XML_Parse call) -- int scanned_bytes = 0; // sum of (buffered bytes at each actual parse) - int offset = 0; - while (*fillsize >= 0) { - assert_true(offset + *fillsize <= document_length); // or test is invalid -- const unsigned attempts_before = g_parseAttempts; - const enum XML_Status status - = XML_Parse(parser, &document[offset], *fillsize, XML_FALSE); - if (status != XML_STATUS_OK) { -@@ -5796,28 +5776,20 @@ START_TEST(test_varying_buffer_fills) { - fillsize++; - assert_true(offset <= INT_MAX - worstcase_bytes); // avoid overflow - worstcase_bytes += offset; // we might've tried to parse all pending bytes -- if (g_parseAttempts != attempts_before) { -- assert_true(g_parseAttempts == attempts_before + 1); // max 1/XML_Parse -- assert_true(offset <= INT_MAX - scanned_bytes); // avoid overflow -- scanned_bytes += offset; // we *did* try to parse all pending bytes -- } - } - assert_true(storage.count == 1); // the big token should've been parsed -- assert_true(scanned_bytes > 0); // test-the-test: does our counter work? -+ assert_true(g_bytesScanned > 0); // test-the-test: does our counter work? - if (g_reparseDeferralEnabledDefault) { - // heuristic is enabled; some XML_Parse calls may have deferred reparsing -- const int max_bytes_scanned = -*fillsize; -- if (scanned_bytes > max_bytes_scanned) { -+ const unsigned max_bytes_scanned = -*fillsize; -+ if (g_bytesScanned > max_bytes_scanned) { - fprintf(stderr, -- "bytes scanned in parse attempts: actual=%d limit=%d \n", -- scanned_bytes, max_bytes_scanned); -+ "bytes scanned in parse attempts: actual=%u limit=%u \n", -+ g_bytesScanned, max_bytes_scanned); - fail("too many bytes scanned in parse attempts"); - } -- assert_true(scanned_bytes <= worstcase_bytes); -- } else { -- // heuristic is disabled; every XML_Parse() will have reparsed -- assert_true(scanned_bytes == worstcase_bytes); - } -+ assert_true(g_bytesScanned <= (unsigned)worstcase_bytes); - - XML_ParserFree(parser); - } -@@ -6065,7 +6037,7 @@ make_basic_test_case(Suite *s) { - tcase_add_test__ifdef_xml_dtd(tc_basic, - test_pool_integrity_with_unfinished_attr); - tcase_add_test__if_xml_ge(tc_basic, test_nested_entity_suspend); -- tcase_add_test(tc_basic, test_big_tokens_take_linear_time); -+ tcase_add_test(tc_basic, test_big_tokens_scale_linearly); - tcase_add_test(tc_basic, test_set_reparse_deferral); - tcase_add_test(tc_basic, test_reparse_deferral_is_inherited); - tcase_add_test(tc_basic, test_set_reparse_deferral_on_null_parser); diff --git a/pkgs/development/libraries/expat/default.nix b/pkgs/development/libraries/expat/default.nix index d2f4aa392cb16..9944277e946b6 100644 --- a/pkgs/development/libraries/expat/default.nix +++ b/pkgs/development/libraries/expat/default.nix @@ -16,7 +16,7 @@ # files. let - version = "2.6.0"; + version = "2.6.2"; tag = "R_${lib.replaceStrings ["."] ["_"] version}"; in stdenv.mkDerivation (finalAttrs: { @@ -25,14 +25,9 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = with finalAttrs; "https://github.com/libexpat/libexpat/releases/download/${tag}/${pname}-${version}.tar.xz"; - hash = "sha256-y19ajqIR4cq9Wb4KkzpS48Aswyboak04fY0hjn7kej4="; + hash = "sha256-7hS0xdiQixvsN62TdgfqsYPU2YBqCK3uRyw8MSHSc2Q="; }; - patches = [ - # Fix tests flakiness on some platforms (like aarch64-darwin), should be released in 2.6.1 - ./2.6.0-fix-tests-flakiness.patch - ]; - strictDeps = true; outputs = [ "out" "dev" ]; # TODO: fix referrers diff --git a/pkgs/development/libraries/fb303/default.nix b/pkgs/development/libraries/fb303/default.nix index d1de187ec2c4f..6c50819ef1468 100644 --- a/pkgs/development/libraries/fb303/default.nix +++ b/pkgs/development/libraries/fb303/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "fb303"; - version = "2024.01.22.00"; + version = "2024.03.11.00"; src = fetchFromGitHub { owner = "facebook"; repo = "fb303"; rev = "v${version}"; - sha256 = "sha256-EQpe0REGWUpYg+llsCo4x6vJ7UPdWXk3uPM3b8b9Uf0="; + sha256 = "sha256-Jtztb8CTqvRdRjUa3jaouP5PFAwoM4rKLIfgvOyXUIg="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/fbthrift/default.nix b/pkgs/development/libraries/fbthrift/default.nix index 373d018922030..5ac08f2c6cc3a 100644 --- a/pkgs/development/libraries/fbthrift/default.nix +++ b/pkgs/development/libraries/fbthrift/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "fbthrift"; - version = "2024.01.22.00"; + version = "2024.03.11.00"; src = fetchFromGitHub { owner = "facebook"; repo = "fbthrift"; rev = "v${version}"; - sha256 = "sha256-vIYXX4NOs2JdhrAJKmIhf4+hQEXHue2Ok7e4cw6yups="; + sha256 = "sha256-iCiiKNDlfKm1Y4SGzcSP6o/OdiRRrj9UEawW6qpBpSY="; }; nativeBuildInputs = [ @@ -38,7 +38,9 @@ stdenv.mkDerivation rec { flex ]; - cmakeFlags = lib.optionals stdenv.isDarwin [ + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=${if stdenv.isDarwin then "OFF" else "ON"}" + ] ++ lib.optionals stdenv.isDarwin [ "-DCMAKE_OSX_DEPLOYMENT_TARGET=10.14" # For aligned allocation ]; diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 6dba78cad2194..6ed7dfc7b757a 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -30,7 +30,7 @@ , withFullDeps ? ffmpegVariant == "full" , fetchgit -, fetchpatch +, fetchpatch2 # Feature flags , withAlsa ? withHeadlessDeps && stdenv.isLinux # Alsa in/output supporT @@ -101,6 +101,7 @@ , withVmaf ? withFullDeps && !stdenv.isAarch64 && lib.versionAtLeast version "5" # Netflix's VMAF (Video Multi-Method Assessment Fusion) , withVoAmrwbenc ? withFullDeps && withVersion3 # AMR-WB encoder , withVorbis ? withHeadlessDeps # Vorbis de/encoding, native encoder exists +, withVpl ? false # Hardware acceleration via intel libvpl , withVpx ? withHeadlessDeps && stdenv.buildPlatform == stdenv.hostPlatform # VP8 & VP9 de/encoding , withVulkan ? withSmallDeps && !stdenv.isDarwin , withWebp ? withFullDeps # WebP encoder @@ -147,7 +148,7 @@ * Program options */ , buildFfmpeg ? withHeadlessDeps # Build ffmpeg executable -, buildFfplay ? withFullDeps # Build ffplay executable +, buildFfplay ? withSmallDeps # Build ffplay executable , buildFfprobe ? withHeadlessDeps # Build ffprobe executable , buildQtFaststart ? withFullDeps # Build qt-faststart executable , withBin ? buildFfmpeg || buildFfplay || buildFfprobe || buildQtFaststart @@ -246,6 +247,7 @@ , libvdpau , libvmaf , libvorbis +, libvpl , libvpx , libwebp , libX11 @@ -328,6 +330,7 @@ assert withGPLv3 -> withGPL && withVersion3; * Build dependencies */ assert withPixelutils -> buildAvutil; +assert !(withMfx && withVpl); # incompatible features /* * Program dependencies */ @@ -365,25 +368,25 @@ stdenv.mkDerivation (finalAttrs: { --replace /usr/local/lib/frei0r-1 ${frei0r}/lib/frei0r-1 ''; - patches = map (patch: fetchpatch patch) ([ ] + patches = map (patch: fetchpatch2 patch) ([ ] ++ optionals (versionOlder version "5") [ { name = "libsvtav1-1.5.0-compat-compressed_ten_bit_format.patch"; url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/031f1561cd286596cdb374da32f8aa816ce3b135"; - hash = "sha256-mSnmAkoNikDpxcN+A/hpB7mUbbtcMvm4tG6gZFuroe8="; + hash = "sha256-agJgzIzrBTQBAypuCmGXXFo7vw6Iodw5Ny5O5QCKCn8="; } { # Backport fix for binutils-2.41. name = "binutils-2.41.patch"; url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/effadce6c756247ea8bae32dc13bb3e6f464f0eb"; - hash = "sha256-vlBUMJ1bORQHRNpuzc5iXsTWwS/CN5BmGIA8g7H7mJE="; + hash = "sha256-vLSltvZVMcQ0CnkU0A29x6fJSywE8/aU+Mp9os8DZYY="; } # The upstream patch isn’t for ffmpeg 4, but it will apply with a few tweaks. # Fixes a crash when built with clang 16 due to UB in ff_seek_frame_binary. { name = "utils-fix_crash_in_ff_seek_frame_binary.patch"; url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/ab792634197e364ca1bb194f9abe36836e42f12d"; - hash = "sha256-UxZ4VneZpw+Q/UwkEUDNdb2nOx1QnMrZ40UagspNTxI="; + hash = "sha256-vqqVACjbCcGL9Qvmg1QArSKqVmOqr8BEr+OxTBDt6mA="; postFetch = '' substituteInPlace "$out" \ --replace libavformat/seek.c libavformat/utils.c \ @@ -391,20 +394,18 @@ stdenv.mkDerivation (finalAttrs: { ''; } ] - ++ (lib.optional (lib.versionAtLeast version "6" && lib.versionOlder version "6.1") - { # this can be removed post 6.1 - name = "fix_aacps_tablegen"; - url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/814178f92647be2411516bbb82f48532373d2554"; - hash = "sha256-FQV9/PiarPXCm45ldtCsxGHjlrriL8DKpn1LaKJ8owI="; - } - ) - ++ (lib.optional (lib.versionAtLeast version "6.1" && lib.versionOlder version "6.2") + ++ (lib.optionals (lib.versionAtLeast version "6.1" && lib.versionOlder version "6.2") [ { # this can be removed post 6.1 name = "fix_build_failure_due_to_PropertyKey_EncoderID"; url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/cb049d377f54f6b747667a93e4b719380c3e9475"; - hash = "sha256-Ittka0mId1N/BwJ0FQ0ygpTSS6Y11u2SjWDpbGN+KXo="; + hash = "sha256-sxRXKKgUak5vsQTiV7ge8vp+N22CdTIvuczNgVRP72c="; } - )); + { + name = "fix_vulkan_av1"; + url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/e06ce6d2b45edac4a2df04f304e18d4727417d24"; + hash = "sha256-73mlX1rdJrguw7OXaSItfHtI7gflDrFj+7SepVvvUIg="; + } + ])); configurePlatforms = []; setOutputFlags = false; # Only accepts some of them @@ -561,6 +562,9 @@ stdenv.mkDerivation (finalAttrs: { (enableFeature withV4l2M2m "v4l2-m2m") (enableFeature withVaapi "vaapi") (enableFeature withVdpau "vdpau") + ] ++ optionals (versionAtLeast version "6.0") [ + (enableFeature withVpl "libvpl") + ] ++ [ (enableFeature withVidStab "libvidstab") # Actual min. version 2.0 (enableFeature withVmaf "libvmaf") (enableFeature withVoAmrwbenc "libvo-amrwbenc") @@ -676,6 +680,7 @@ stdenv.mkDerivation (finalAttrs: { ++ optionals withVmaf [ libvmaf ] ++ optionals withVoAmrwbenc [ vo-amrwbenc ] ++ optionals withVorbis [ libvorbis ] + ++ optionals withVpl [ libvpl ] ++ optionals withVpx [ libvpx ] ++ optionals withVulkan [ vulkan-headers vulkan-loader ] ++ optionals withWebp [ libwebp ] diff --git a/pkgs/development/libraries/fizz/default.nix b/pkgs/development/libraries/fizz/default.nix index 282400948769a..5415dde6ca856 100644 --- a/pkgs/development/libraries/fizz/default.nix +++ b/pkgs/development/libraries/fizz/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "fizz"; - version = "2024.01.22.00"; + version = "2024.03.11.00"; src = fetchFromGitHub { owner = "facebookincubator"; repo = "fizz"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-17EELvRrWhUprxvm1Ur0FYNimvY1qgK0YH8ehxtLpxM="; + hash = "sha256-IHWotiVUjGOvebXy4rwsh8U8UMxTrF1VaqXzZMjojiM="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix index eb0372a40aff2..9dd6bbeaa55e4 100644 --- a/pkgs/development/libraries/folly/default.nix +++ b/pkgs/development/libraries/folly/default.nix @@ -1,5 +1,6 @@ { lib , stdenv +, overrideSDK , fetchFromGitHub , boost , cmake @@ -26,13 +27,13 @@ stdenv.mkDerivation rec { pname = "folly"; - version = "2024.01.22.00"; + version = "2024.03.11.00"; src = fetchFromGitHub { owner = "facebook"; repo = "folly"; rev = "v${version}"; - sha256 = "sha256-+z1wuEOgr7CMHFnOn5gLm9mtVH7mVURLstOoDqzxKbk="; + sha256 = "sha256-INvWTw27fmVbKQIT9ebdRGMCOIzpc/NepRN2EnKLJx0="; }; nativeBuildInputs = [ @@ -72,6 +73,8 @@ stdenv.mkDerivation rec { # see https://github.com/NixOS/nixpkgs/issues/144170 "-DCMAKE_INSTALL_INCLUDEDIR=include" "-DCMAKE_INSTALL_LIBDIR=lib" + ] ++ lib.optional (stdenv.isDarwin && stdenv.isx86_64) [ + "-DCMAKE_OSX_DEPLOYMENT_TARGET=10.13" ]; # split outputs to reduce downstream closure sizes diff --git a/pkgs/development/libraries/glib-networking/default.nix b/pkgs/development/libraries/glib-networking/default.nix index d646830c771fb..39e17a894cb7d 100644 --- a/pkgs/development/libraries/glib-networking/default.nix +++ b/pkgs/development/libraries/glib-networking/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "glib-networking"; - version = "2.78.0"; + version = "2.78.1"; outputs = [ "out" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "Uv5M6T99xRM0sQKJRZmFjSPIplrEoRELMJIFZdaNOro="; + sha256 = "5I8t27BJgyy7CSMFKcXkXayp8N8O2jJfgy9zeYWb8J8="; }; patches = [ @@ -35,6 +35,12 @@ stdenv.mkDerivation rec { }) ./installed-tests-path.patch + + # pkcs11 tests provide a relative path that gnutls of course isn't able to + # load, resulting in test failures + # https://gitlab.gnome.org/GNOME/glib-networking/-/blob/2.78.1/tls/tests/certificate.c#L926 + # https://gitlab.gnome.org/GNOME/glib-networking/-/blob/2.78.1/tls/tests/connection.c#L3380 + ./disable-pkcs11-tests.patch ]; strictDeps = true; diff --git a/pkgs/development/libraries/glib-networking/disable-pkcs11-tests.patch b/pkgs/development/libraries/glib-networking/disable-pkcs11-tests.patch new file mode 100644 index 0000000000000..43a37878b56c9 --- /dev/null +++ b/pkgs/development/libraries/glib-networking/disable-pkcs11-tests.patch @@ -0,0 +1,13 @@ +diff --git a/meson.build b/meson.build +index 0b3b8c0..7f6ce09 100644 +--- a/meson.build ++++ b/meson.build +@@ -86,7 +86,7 @@ if gnutls_dep.found() + backends += ['gnutls'] + # test-specific, maybe move to tls/tests + if cc.has_function('gnutls_pkcs11_init', prefix: '#include <gnutls/pkcs11.h>', dependencies: gnutls_dep) +- config_h.set10('HAVE_GNUTLS_PKCS11', true) ++ config_h.set10('HAVE_GNUTLS_PKCS11', false) + endif + endif + diff --git a/pkgs/development/libraries/glibc/0001-Revert-Remove-all-usage-of-BASH-or-BASH-in-installed.patch b/pkgs/development/libraries/glibc/0001-Revert-Remove-all-usage-of-BASH-or-BASH-in-installed.patch index b7658b59fb1e5..100bf31c3b008 100644 --- a/pkgs/development/libraries/glibc/0001-Revert-Remove-all-usage-of-BASH-or-BASH-in-installed.patch +++ b/pkgs/development/libraries/glibc/0001-Revert-Remove-all-usage-of-BASH-or-BASH-in-installed.patch @@ -1,4 +1,4 @@ -From cdd0c4b168fe228de97778556cea5c0f936e0e79 Mon Sep 17 00:00:00 2001 +From e207c3dbcff1d3d09c60eec99b6fec2a698b01bd Mon Sep 17 00:00:00 2001 From: Bernardo Meurer <bernardo@meurer.org> Date: Fri, 22 Jul 2022 22:11:07 -0700 Subject: [PATCH] Revert "Remove all usage of @BASH@ or ${BASH} in installed @@ -22,10 +22,10 @@ Co-authored-by: Maximilian Bosch <maximilian@mbosch.me> 8 files changed, 15 insertions(+), 10 deletions(-) diff --git a/debug/Makefile b/debug/Makefile -index 52f9a7852c..22e4ae5461 100644 +index 3903cc97a3..b041acca71 100644 --- a/debug/Makefile +++ b/debug/Makefile -@@ -265,8 +265,9 @@ $(objpfx)pcprofiledump: $(objpfx)pcprofiledump.o +@@ -343,8 +343,9 @@ $(objpfx)pcprofiledump: $(objpfx)pcprofiledump.o $(objpfx)xtrace: xtrace.sh rm -f $@.new @@ -38,20 +38,20 @@ index 52f9a7852c..22e4ae5461 100644 && rm -f $@ && mv $@.new $@ && chmod +x $@ diff --git a/debug/xtrace.sh b/debug/xtrace.sh -index 3d1f2af43a..eb2ba7ad4a 100755 +index 77ec1d84df..5614404a71 100755 --- a/debug/xtrace.sh +++ b/debug/xtrace.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#! @BASH@ - # Copyright (C) 1999-2023 Free Software Foundation, Inc. + # Copyright (C) 1999-2024 Free Software Foundation, Inc. # This file is part of the GNU C Library. diff --git a/elf/Makefile b/elf/Makefile -index 0d19964d42..ee8ee1cd41 100644 +index 5d78b659ce..a2145d7b64 100644 --- a/elf/Makefile +++ b/elf/Makefile -@@ -250,7 +250,8 @@ $(objpfx)sotruss-lib.so: $(common-objpfx)libc.so $(objpfx)ld.so \ +@@ -249,7 +249,8 @@ $(objpfx)sotruss-lib.so: $(common-objpfx)libc.so $(objpfx)ld.so \ $(common-objpfx)libc_nonshared.a $(objpfx)sotruss: sotruss.sh $(common-objpfx)config.make @@ -61,7 +61,7 @@ index 0d19964d42..ee8ee1cd41 100644 -e 's%@TEXTDOMAINDIR@%$(localedir)%g' \ -e 's%@PREFIX@%$(prefix)%g' \ -e 's|@PKGVERSION@|$(PKGVERSION)|g' \ -@@ -1396,6 +1397,7 @@ ldd-rewrite = -e 's%@RTLD@%$(rtlddir)/$(rtld-installed-name)%g' \ +@@ -1392,6 +1393,7 @@ ldd-rewrite = -e 's%@RTLD@%$(rtlddir)/$(rtld-installed-name)%g' \ -e 's%@VERSION@%$(version)%g' \ -e 's|@PKGVERSION@|$(PKGVERSION)|g' \ -e 's|@REPORT_BUGS_TO@|$(REPORT_BUGS_TO)|g' \ @@ -70,30 +70,30 @@ index 0d19964d42..ee8ee1cd41 100644 ifeq ($(ldd-rewrite-script),no) diff --git a/elf/ldd.bash.in b/elf/ldd.bash.in -index e45dec5894..e09428506e 100644 +index d6b640df66..46111670cd 100644 --- a/elf/ldd.bash.in +++ b/elf/ldd.bash.in @@ -1,4 +1,4 @@ -#!/bin/bash +#! @BASH@ - # Copyright (C) 1996-2023 Free Software Foundation, Inc. + # Copyright (C) 1996-2024 Free Software Foundation, Inc. # This file is part of the GNU C Library. diff --git a/elf/sotruss.sh b/elf/sotruss.sh -index 874a6bed3f..7cc154561e 100755 +index ac1a83984e..2bf17c518e 100755 --- a/elf/sotruss.sh +++ b/elf/sotruss.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#! @BASH@ - # Copyright (C) 2011-2023 Free Software Foundation, Inc. + # Copyright (C) 2011-2024 Free Software Foundation, Inc. # This file is part of the GNU C Library. diff --git a/malloc/Makefile b/malloc/Makefile -index dfb51d344c..574b5e9579 100644 +index c83ade5f10..8dd9174b79 100644 --- a/malloc/Makefile +++ b/malloc/Makefile -@@ -306,8 +306,9 @@ $(objpfx)mtrace: mtrace.pl +@@ -312,8 +312,9 @@ $(objpfx)mtrace: mtrace.pl $(objpfx)memusage: memusage.sh rm -f $@.new @@ -106,17 +106,17 @@ index dfb51d344c..574b5e9579 100644 && rm -f $@ && mv $@.new $@ && chmod +x $@ diff --git a/malloc/memusage.sh b/malloc/memusage.sh -index b1f5848b74..329e36ef8a 100755 +index d2d9d17ea8..2e7efc9049 100755 --- a/malloc/memusage.sh +++ b/malloc/memusage.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#! @BASH@ - # Copyright (C) 1999-2023 Free Software Foundation, Inc. + # Copyright (C) 1999-2024 Free Software Foundation, Inc. # This file is part of the GNU C Library. diff --git a/timezone/Makefile b/timezone/Makefile -index 0306c0bca9..de9bbcc815 100644 +index d7acb387ba..c8e203ea3a 100644 --- a/timezone/Makefile +++ b/timezone/Makefile @@ -132,7 +132,8 @@ $(testdata)/XT5: testdata/gen-XT5.sh @@ -130,5 +130,5 @@ index 0306c0bca9..de9bbcc815 100644 -e '/PKGVERSION=/s|=.*|="$(PKGVERSION)"|' \ -e '/REPORT_BUGS_TO=/s|=.*|="$(REPORT_BUGS_TO)"|' \ -- -2.38.4 +2.42.0 diff --git a/pkgs/development/libraries/glibc/2.38-master.patch.gz b/pkgs/development/libraries/glibc/2.38-master.patch.gz deleted file mode 100644 index a07e4f8e1d507..0000000000000 --- a/pkgs/development/libraries/glibc/2.38-master.patch.gz +++ /dev/null Binary files differdiff --git a/pkgs/development/libraries/glibc/2.39-master.patch b/pkgs/development/libraries/glibc/2.39-master.patch new file mode 100644 index 0000000000000..3e0815573f5eb --- /dev/null +++ b/pkgs/development/libraries/glibc/2.39-master.patch @@ -0,0 +1,566 @@ +commit 6d1e3fb07b45e2e31e469b16cf21b24bccf8914c +Author: Andreas K. Hüttel <dilfridge@gentoo.org> +Date: Wed Jan 31 02:12:43 2024 +0100 + + Replace advisories directory + + Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org> + +diff --git a/ADVISORIES b/ADVISORIES +new file mode 100644 +index 0000000000..d4e33f2df3 +--- /dev/null ++++ b/ADVISORIES +@@ -0,0 +1,2 @@ ++For the GNU C Library Security Advisories, see the git master branch: ++https://sourceware.org/git/?p=glibc.git;a=tree;f=advisories;hb=HEAD +diff --git a/advisories/GLIBC-SA-2023-0001 b/advisories/GLIBC-SA-2023-0001 +deleted file mode 100644 +index 3d19c91b6a..0000000000 +--- a/advisories/GLIBC-SA-2023-0001 ++++ /dev/null +@@ -1,14 +0,0 @@ +-printf: incorrect output for integers with thousands separator and width field +- +-When the printf family of functions is called with a format specifier +-that uses an <apostrophe> (enable grouping) and a minimum width +-specifier, the resulting output could be larger than reasonably expected +-by a caller that computed a tight bound on the buffer size. The +-resulting larger than expected output could result in a buffer overflow +-in the printf family of functions. +- +-CVE-Id: CVE-2023-25139 +-Public-Date: 2023-02-02 +-Vulnerable-Commit: e88b9f0e5cc50cab57a299dc7efe1a4eb385161d (2.37) +-Fix-Commit: c980549cc6a1c03c23cc2fe3e7b0fe626a0364b0 (2.38) +-Fix-Commit: 07b9521fc6369d000216b96562ff7c0ed32a16c4 (2.37-4) +diff --git a/advisories/GLIBC-SA-2023-0002 b/advisories/GLIBC-SA-2023-0002 +deleted file mode 100644 +index 5122669a64..0000000000 +--- a/advisories/GLIBC-SA-2023-0002 ++++ /dev/null +@@ -1,15 +0,0 @@ +-getaddrinfo: Stack read overflow in no-aaaa mode +- +-If the system is configured in no-aaaa mode via /etc/resolv.conf, +-getaddrinfo is called for the AF_UNSPEC address family, and a DNS +-response is received over TCP that is larger than 2048 bytes, +-getaddrinfo may potentially disclose stack contents via the returned +-address data, or crash. +- +-CVE-Id: CVE-2023-4527 +-Public-Date: 2023-09-12 +-Vulnerable-Commit: f282cdbe7f436c75864e5640a409a10485e9abb2 (2.36) +-Fix-Commit: bd77dd7e73e3530203be1c52c8a29d08270cb25d (2.39) +-Fix-Commit: 4ea972b7edd7e36610e8cde18bf7a8149d7bac4f (2.36-113) +-Fix-Commit: b7529346025a130fee483d42178b5c118da971bb (2.37-38) +-Fix-Commit: b25508dd774b617f99419bdc3cf2ace4560cd2d6 (2.38-19) +diff --git a/advisories/GLIBC-SA-2023-0003 b/advisories/GLIBC-SA-2023-0003 +deleted file mode 100644 +index d3aef80348..0000000000 +--- a/advisories/GLIBC-SA-2023-0003 ++++ /dev/null +@@ -1,15 +0,0 @@ +-getaddrinfo: Potential use-after-free +- +-When an NSS plugin only implements the _gethostbyname2_r and +-_getcanonname_r callbacks, getaddrinfo could use memory that was freed +-during buffer resizing, potentially causing a crash or read or write to +-arbitrary memory. +- +-CVE-Id: CVE-2023-4806 +-Public-Date: 2023-09-12 +-Fix-Commit: 973fe93a5675c42798b2161c6f29c01b0e243994 (2.39) +-Fix-Commit: e09ee267c03e3150c2c9ba28625ab130705a485e (2.34-420) +-Fix-Commit: e3ccb230a961b4797510e6a1f5f21fd9021853e7 (2.35-270) +-Fix-Commit: a9728f798ec7f05454c95637ee6581afaa9b487d (2.36-115) +-Fix-Commit: 6529a7466c935f36e9006b854d6f4e1d4876f942 (2.37-39) +-Fix-Commit: 00ae4f10b504bc4564e9f22f00907093f1ab9338 (2.38-20) +diff --git a/advisories/GLIBC-SA-2023-0004 b/advisories/GLIBC-SA-2023-0004 +deleted file mode 100644 +index 5286a7aa54..0000000000 +--- a/advisories/GLIBC-SA-2023-0004 ++++ /dev/null +@@ -1,16 +0,0 @@ +-tunables: local privilege escalation through buffer overflow +- +-If a tunable of the form NAME=NAME=VAL is passed in the environment of a +-setuid program and NAME is valid, it may result in a buffer overflow, +-which could be exploited to achieve escalated privileges. This flaw was +-introduced in glibc 2.34. +- +-CVE-Id: CVE-2023-4911 +-Public-Date: 2023-10-03 +-Vulnerable-Commit: 2ed18c5b534d9e92fc006202a5af0df6b72e7aca (2.34) +-Fix-Commit: 1056e5b4c3f2d90ed2b4a55f96add28da2f4c8fa (2.39) +-Fix-Commit: dcc367f148bc92e7f3778a125f7a416b093964d9 (2.34-423) +-Fix-Commit: c84018a05aec80f5ee6f682db0da1130b0196aef (2.35-274) +-Fix-Commit: 22955ad85186ee05834e47e665056148ca07699c (2.36-118) +-Fix-Commit: b4e23c75aea756b4bddc4abcf27a1c6dca8b6bd3 (2.37-45) +-Fix-Commit: 750a45a783906a19591fb8ff6b7841470f1f5701 (2.38-27) +diff --git a/advisories/GLIBC-SA-2023-0005 b/advisories/GLIBC-SA-2023-0005 +deleted file mode 100644 +index cc4eb90b82..0000000000 +--- a/advisories/GLIBC-SA-2023-0005 ++++ /dev/null +@@ -1,18 +0,0 @@ +-getaddrinfo: DoS due to memory leak +- +-The fix for CVE-2023-4806 introduced a memory leak when an application +-calls getaddrinfo for AF_INET6 with AI_CANONNAME, AI_ALL and AI_V4MAPPED +-flags set. +- +-CVE-Id: CVE-2023-5156 +-Public-Date: 2023-09-25 +-Vulnerable-Commit: e09ee267c03e3150c2c9ba28625ab130705a485e (2.34-420) +-Vulnerable-Commit: e3ccb230a961b4797510e6a1f5f21fd9021853e7 (2.35-270) +-Vulnerable-Commit: a9728f798ec7f05454c95637ee6581afaa9b487d (2.36-115) +-Vulnerable-Commit: 6529a7466c935f36e9006b854d6f4e1d4876f942 (2.37-39) +-Vulnerable-Commit: 00ae4f10b504bc4564e9f22f00907093f1ab9338 (2.38-20) +-Fix-Commit: 8006457ab7e1cd556b919f477348a96fe88f2e49 (2.34-421) +-Fix-Commit: 17092c0311f954e6f3c010f73ce3a78c24ac279a (2.35-272) +-Fix-Commit: 856bac55f98dc840e7c27cfa82262b933385de90 (2.36-116) +-Fix-Commit: 4473d1b87d04b25cdd0e0354814eeaa421328268 (2.37-42) +-Fix-Commit: 5ee59ca371b99984232d7584fe2b1a758b4421d3 (2.38-24) +diff --git a/advisories/GLIBC-SA-2024-0001 b/advisories/GLIBC-SA-2024-0001 +deleted file mode 100644 +index 28931c75ae..0000000000 +--- a/advisories/GLIBC-SA-2024-0001 ++++ /dev/null +@@ -1,15 +0,0 @@ +-syslog: Heap buffer overflow in __vsyslog_internal +- +-__vsyslog_internal did not handle a case where printing a SYSLOG_HEADER +-containing a long program name failed to update the required buffer +-size, leading to the allocation and overflow of a too-small buffer on +-the heap. +- +-CVE-Id: CVE-2023-6246 +-Public-Date: 2024-01-30 +-Vulnerable-Commit: 52a5be0df411ef3ff45c10c7c308cb92993d15b1 (2.37) +-Fix-Commit: 6bd0e4efcc78f3c0115e5ea9739a1642807450da (2.39) +-Fix-Commit: 23514c72b780f3da097ecf33a793b7ba9c2070d2 (2.38-42) +-Fix-Commit: 97a4292aa4a2642e251472b878d0ec4c46a0e59a (2.37-57) +-Vulnerable-Commit: b0e7888d1fa2dbd2d9e1645ec8c796abf78880b9 (2.36-16) +-Fix-Commit: d1a83b6767f68b3cb5b4b4ea2617254acd040c82 (2.36-126) +diff --git a/advisories/GLIBC-SA-2024-0002 b/advisories/GLIBC-SA-2024-0002 +deleted file mode 100644 +index 940bfcf2fc..0000000000 +--- a/advisories/GLIBC-SA-2024-0002 ++++ /dev/null +@@ -1,15 +0,0 @@ +-syslog: Heap buffer overflow in __vsyslog_internal +- +-__vsyslog_internal used the return value of snprintf/vsnprintf to +-calculate buffer sizes for memory allocation. If these functions (for +-any reason) failed and returned -1, the resulting buffer would be too +-small to hold output. +- +-CVE-Id: CVE-2023-6779 +-Public-Date: 2024-01-30 +-Vulnerable-Commit: 52a5be0df411ef3ff45c10c7c308cb92993d15b1 (2.37) +-Fix-Commit: 7e5a0c286da33159d47d0122007aac016f3e02cd (2.39) +-Fix-Commit: d0338312aace5bbfef85e03055e1212dd0e49578 (2.38-43) +-Fix-Commit: 67062eccd9a65d7fda9976a56aeaaf6c25a80214 (2.37-58) +-Vulnerable-Commit: b0e7888d1fa2dbd2d9e1645ec8c796abf78880b9 (2.36-16) +-Fix-Commit: 2bc9d7c002bdac38b5c2a3f11b78e309d7765b83 (2.36-127) +diff --git a/advisories/GLIBC-SA-2024-0003 b/advisories/GLIBC-SA-2024-0003 +deleted file mode 100644 +index b43a5150ab..0000000000 +--- a/advisories/GLIBC-SA-2024-0003 ++++ /dev/null +@@ -1,13 +0,0 @@ +-syslog: Integer overflow in __vsyslog_internal +- +-__vsyslog_internal calculated a buffer size by adding two integers, but +-did not first check if the addition would overflow. +- +-CVE-Id: CVE-2023-6780 +-Public-Date: 2024-01-30 +-Vulnerable-Commit: 52a5be0df411ef3ff45c10c7c308cb92993d15b1 (2.37) +-Fix-Commit: ddf542da94caf97ff43cc2875c88749880b7259b (2.39) +-Fix-Commit: d37c2b20a4787463d192b32041c3406c2bd91de0 (2.38-44) +-Fix-Commit: 2b58cba076e912961ceaa5fa58588e4b10f791c0 (2.37-59) +-Vulnerable-Commit: b0e7888d1fa2dbd2d9e1645ec8c796abf78880b9 (2.36-16) +-Fix-Commit: b9b7d6a27aa0632f334352fa400771115b3c69b7 (2.36-128) +diff --git a/advisories/README b/advisories/README +deleted file mode 100644 +index 94e68b1350..0000000000 +--- a/advisories/README ++++ /dev/null +@@ -1,73 +0,0 @@ +-GNU C Library Security Advisory Format +-====================================== +- +-Security advisories in this directory follow a simple git commit log +-format, with a heading and free-format description augmented with tags +-to allow parsing key information. References to code changes are +-specific to the glibc repository and follow a specific format: +- +- Tag-name: <commit-ref> (release-version) +- +-The <commit-ref> indicates a specific commit in the repository. The +-release-version indicates the publicly consumable release in which this +-commit is known to exist. The release-version is derived from the +-git-describe format, (i.e. stripped out from glibc-2.34.NNN-gxxxx) and +-is of the form 2.34-NNN. If the -NNN suffix is absent, it means that +-the change is in that release tarball, otherwise the change is on the +-release/2.YY/master branch and not in any released tarball. +- +-The following tags are currently being used: +- +-CVE-Id: +-This is the CVE-Id assigned under the CVE Program +-(https://www.cve.org/). +- +-Public-Date: +-The date this issue became publicly known. +- +-Vulnerable-Commit: +-The commit that introduced this vulnerability. There could be multiple +-entries, one for each release branch in the glibc repository; the +-release-version portion of this tag should tell you which branch this is +-on. +- +-Fix-Commit: +-The commit that fixed this vulnerability. There could be multiple +-entries for each release branch in the glibc repository, indicating that +-all of those commits contributed to fixing that issue in each of those +-branches. +- +-Adding an Advisory +------------------- +- +-An advisory for a CVE needs to be added on the master branch in two steps: +- +-1. Add the text of the advisory without any Fix-Commit tags along with +- the fix for the CVE. Add the Vulnerable-Commit tag, if applicable. +- The advisories directory does not exist in release branches, so keep +- the advisory text commit distinct from the code changes, to ease +- backports. Ask for the GLIBC-SA advisory number from the security +- team. +- +-2. Finish all backports on release branches and then back on the msater +- branch, add all commit refs to the advisory using the Fix-Commit +- tags. Don't bother adding the release-version subscript since the +- next step will overwrite it. +- +-3. Run the process-advisories.sh script in the scripts directory on the +- advisory: +- +- scripts/process-advisories.sh update GLIBC-SA-YYYY-NNNN +- +- (replace YYYY-NNNN with the actual advisory number). +- +-4. Verify the updated advisory and push the result. +- +-Getting a NEWS snippet from advisories +--------------------------------------- +- +-Run: +- +- scripts/process-advisories.sh news +- +-and copy the content into the NEWS file. + +commit 63295e4fda1f6dab4bf7442706fe303bf283036c +Author: Adhemerval Zanella <adhemerval.zanella@linaro.org> +Date: Mon Feb 5 16:10:24 2024 +0000 + + arm: Remove wrong ldr from _dl_start_user (BZ 31339) + + The commit 49d877a80b29d3002887b084eec6676d9f5fec18 (arm: Remove + _dl_skip_args usage) removed the _SKIP_ARGS literal, which was + previously loader to r4 on loader _start. However, the cleanup did not + remove the following 'ldr r4, [sl, r4]' on _dl_start_user, used to check + to skip the arguments after ld self-relocations. + + In my testing, the kernel initially set r4 to 0, which makes the + ldr instruction just read the _GLOBAL_OFFSET_TABLE_. However, since r4 + is a callee-saved register; a different runtime might not zero + initialize it and thus trigger an invalid memory access. + + Checked on arm-linux-gnu. + + Reported-by: Adrian Ratiu <adrian.ratiu@collabora.com> + Reviewed-by: Szabolcs Nagy <szabolcs.nagy@arm.com> + (cherry picked from commit 1e25112dc0cb2515d27d8d178b1ecce778a9d37a) + +diff --git a/sysdeps/arm/dl-machine.h b/sysdeps/arm/dl-machine.h +index b857bbc868..dd1a0f6b6e 100644 +--- a/sysdeps/arm/dl-machine.h ++++ b/sysdeps/arm/dl-machine.h +@@ -139,7 +139,6 @@ _start:\n\ + _dl_start_user:\n\ + adr r6, .L_GET_GOT\n\ + add sl, sl, r6\n\ +- ldr r4, [sl, r4]\n\ + @ save the entry point in another register\n\ + mov r6, r0\n\ + @ get the original arg count\n\ + +commit 312e159626b67fe11f39e83e222cf4348a3962f3 +Author: Adhemerval Zanella <adhemerval.zanella@linaro.org> +Date: Thu Feb 1 14:29:53 2024 -0300 + + mips: FIx clone3 implementation (BZ 31325) + + For o32 we need to setup a minimal stack frame to allow cprestore + on __thread_start_clone3 (which instruct the linker to save the + gp for PIC). Also, there is no guarantee by kABI that $8 will be + preserved after syscall execution, so we need to save it on the + provided stack. + + Checked on mipsel-linux-gnu. + + Reported-by: Khem Raj <raj.khem@gmail.com> + Tested-by: Khem Raj <raj.khem@gmail.com> + (cherry picked from commit bbd248ac0d75efdef8fe61ea69b1fb25fb95b6e7) + +diff --git a/sysdeps/unix/sysv/linux/mips/clone3.S b/sysdeps/unix/sysv/linux/mips/clone3.S +index e9fec2fa47..481b8ae963 100644 +--- a/sysdeps/unix/sysv/linux/mips/clone3.S ++++ b/sysdeps/unix/sysv/linux/mips/clone3.S +@@ -37,11 +37,6 @@ + + .text + .set nomips16 +-#if _MIPS_SIM == _ABIO32 +-# define EXTRA_LOCALS 1 +-#else +-# define EXTRA_LOCALS 0 +-#endif + #define FRAMESZ ((NARGSAVE*SZREG)+ALSZ)&ALMASK + GPOFF= FRAMESZ-(1*SZREG) + NESTED(__clone3, SZREG, sp) +@@ -68,8 +63,31 @@ NESTED(__clone3, SZREG, sp) + beqz a0, L(error) /* No NULL cl_args pointer. */ + beqz a2, L(error) /* No NULL function pointer. */ + ++#if _MIPS_SIM == _ABIO32 ++ /* Both stack and stack_size on clone_args are defined as uint64_t, and ++ there is no need to handle values larger than to 32 bits for o32. */ ++# if __BYTE_ORDER == __BIG_ENDIAN ++# define CL_STACKPOINTER_OFFSET 44 ++# define CL_STACKSIZE_OFFSET 52 ++# else ++# define CL_STACKPOINTER_OFFSET 40 ++# define CL_STACKSIZE_OFFSET 48 ++# endif ++ ++ /* For o32 we need to setup a minimal stack frame to allow cprestore ++ on __thread_start_clone3. Also there is no guarantee by kABI that ++ $8 will be preserved after syscall execution (so we need to save it ++ on the provided stack). */ ++ lw t0, CL_STACKPOINTER_OFFSET(a0) /* Load the stack pointer. */ ++ lw t1, CL_STACKSIZE_OFFSET(a0) /* Load the stack_size. */ ++ addiu t1, -32 /* Update the stack size. */ ++ addu t2, t1, t0 /* Calculate the thread stack. */ ++ sw a3, 0(t2) /* Save argument pointer. */ ++ sw t1, CL_STACKSIZE_OFFSET(a0) /* Save the new stack size. */ ++#else + move $8, a3 /* a3 is set to 0/1 for syscall success/error + while a4/$8 is returned unmodified. */ ++#endif + + /* Do the system call, the kernel expects: + v0: system call number +@@ -125,7 +143,11 @@ L(thread_start_clone3): + + /* Restore the arg for user's function. */ + move t9, a2 /* Function pointer. */ ++#if _MIPS_SIM == _ABIO32 ++ PTR_L a0, 0(sp) ++#else + move a0, $8 /* Argument pointer. */ ++#endif + + /* Call the user's function. */ + jal t9 + +commit d0724994de40934c552f1f68de89053848a44927 +Author: Xi Ruoyao <xry111@xry111.site> +Date: Thu Feb 22 21:26:55 2024 +0100 + + math: Update mips64 ulps + + Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org> + (cherry picked from commit e2a65ecc4b30a797df7dc6529f09b712aa256029) + +diff --git a/sysdeps/mips/mips64/libm-test-ulps b/sysdeps/mips/mips64/libm-test-ulps +index 78969745b2..933aba4735 100644 +--- a/sysdeps/mips/mips64/libm-test-ulps ++++ b/sysdeps/mips/mips64/libm-test-ulps +@@ -1066,17 +1066,17 @@ double: 1 + ldouble: 1 + + Function: "j0": +-double: 2 ++double: 3 + float: 9 + ldouble: 2 + + Function: "j0_downward": +-double: 5 ++double: 6 + float: 9 + ldouble: 9 + + Function: "j0_towardzero": +-double: 6 ++double: 7 + float: 9 + ldouble: 9 + +@@ -1146,6 +1146,7 @@ float: 6 + ldouble: 8 + + Function: "log": ++double: 1 + float: 1 + ldouble: 1 + + +commit e0910f1d3278f05439fb434ee528fc9be1b6bd5e +Author: Stefan Liebler <stli@linux.ibm.com> +Date: Thu Feb 22 15:03:27 2024 +0100 + + S390: Do not clobber r7 in clone [BZ #31402] + + Starting with commit e57d8fc97b90127de4ed3e3a9cdf663667580935 + "S390: Always use svc 0" + clone clobbers the call-saved register r7 in error case: + function or stack is NULL. + + This patch restores the saved registers also in the error case. + Furthermore the existing test misc/tst-clone is extended to check + all error cases and that clone does not clobber registers in this + error case. + + (cherry picked from commit 02782fd12849b6673cb5c2728cb750e8ec295aa3) + +diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/clone.S b/sysdeps/unix/sysv/linux/s390/s390-32/clone.S +index 4c882ef2ee..a7a863242c 100644 +--- a/sysdeps/unix/sysv/linux/s390/s390-32/clone.S ++++ b/sysdeps/unix/sysv/linux/s390/s390-32/clone.S +@@ -53,6 +53,7 @@ ENTRY(__clone) + br %r14 + error: + lhi %r2,-EINVAL ++ lm %r6,%r7,24(%r15) /* Load registers. */ + j SYSCALL_ERROR_LABEL + PSEUDO_END (__clone) + +diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/clone.S b/sysdeps/unix/sysv/linux/s390/s390-64/clone.S +index 4eb104be71..c552a6b8de 100644 +--- a/sysdeps/unix/sysv/linux/s390/s390-64/clone.S ++++ b/sysdeps/unix/sysv/linux/s390/s390-64/clone.S +@@ -54,6 +54,7 @@ ENTRY(__clone) + br %r14 + error: + lghi %r2,-EINVAL ++ lmg %r6,%r7,48(%r15) /* Restore registers. */ + jg SYSCALL_ERROR_LABEL + PSEUDO_END (__clone) + +diff --git a/sysdeps/unix/sysv/linux/tst-clone.c b/sysdeps/unix/sysv/linux/tst-clone.c +index 470676ab2b..2bc7124983 100644 +--- a/sysdeps/unix/sysv/linux/tst-clone.c ++++ b/sysdeps/unix/sysv/linux/tst-clone.c +@@ -16,12 +16,16 @@ + License along with the GNU C Library; if not, see + <https://www.gnu.org/licenses/>. */ + +-/* BZ #2386 */ ++/* BZ #2386, BZ #31402 */ + #include <errno.h> + #include <stdio.h> + #include <stdlib.h> + #include <unistd.h> + #include <sched.h> ++#include <stackinfo.h> /* For _STACK_GROWS_{UP,DOWN}. */ ++#include <support/check.h> ++ ++volatile unsigned v = 0xdeadbeef; + + int child_fn(void *arg) + { +@@ -30,22 +34,67 @@ int child_fn(void *arg) + } + + static int +-do_test (void) ++__attribute__((noinline)) ++do_clone (int (*fn)(void *), void *stack) + { + int result; ++ unsigned int a = v; ++ unsigned int b = v; ++ unsigned int c = v; ++ unsigned int d = v; ++ unsigned int e = v; ++ unsigned int f = v; ++ unsigned int g = v; ++ unsigned int h = v; ++ unsigned int i = v; ++ unsigned int j = v; ++ unsigned int k = v; ++ unsigned int l = v; ++ unsigned int m = v; ++ unsigned int n = v; ++ unsigned int o = v; ++ ++ result = clone (fn, stack, 0, NULL); ++ ++ /* Check that clone does not clobber call-saved registers. */ ++ TEST_VERIFY (a == v && b == v && c == v && d == v && e == v && f == v ++ && g == v && h == v && i == v && j == v && k == v && l == v ++ && m == v && n == v && o == v); ++ ++ return result; ++} ++ ++static void ++__attribute__((noinline)) ++do_test_single (int (*fn)(void *), void *stack) ++{ ++ printf ("%s (fn=%p, stack=%p)\n", __FUNCTION__, fn, stack); ++ errno = 0; ++ ++ int result = do_clone (fn, stack); ++ ++ TEST_COMPARE (errno, EINVAL); ++ TEST_COMPARE (result, -1); ++} + +- result = clone (child_fn, NULL, 0, NULL); ++static int ++do_test (void) ++{ ++ char st[128 * 1024] __attribute__ ((aligned)); ++ void *stack = NULL; ++#if _STACK_GROWS_DOWN ++ stack = st + sizeof (st); ++#elif _STACK_GROWS_UP ++ stack = st; ++#else ++# error "Define either _STACK_GROWS_DOWN or _STACK_GROWS_UP" ++#endif + +- if (errno != EINVAL || result != -1) +- { +- printf ("FAIL: clone()=%d (wanted -1) errno=%d (wanted %d)\n", +- result, errno, EINVAL); +- return 1; +- } ++ do_test_single (child_fn, NULL); ++ do_test_single (NULL, stack); ++ do_test_single (NULL, NULL); + +- puts ("All OK"); + return 0; + } + +-#define TEST_FUNCTION do_test () +-#include "../test-skeleton.c" ++#include <support/test-driver.c> diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index 826d1e9c83899..4d6fb5a54b398 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -36,16 +36,15 @@ , withLinuxHeaders ? false , profilingLibraries ? false , withGd ? false -, withLibcrypt ? false , extraBuildInputs ? [] , extraNativeBuildInputs ? [] , ... } @ args: let - version = "2.38"; - patchSuffix = "-44"; - sha256 = "sha256-+4KZiZiyspllRnvBtp0VLpwwfSzzAcnq+0VVt3DvP9I="; + version = "2.39"; + patchSuffix = "-5"; + sha256 = "sha256-93vUfPgXDFc2Wue/hmlsEYrbOxINMlnGTFAtPcHi2SY="; in assert withLinuxHeaders -> linuxHeaders != null; @@ -59,14 +58,14 @@ stdenv.mkDerivation ({ patches = [ /* No tarballs for stable upstream branch, only https://sourceware.org/git/glibc.git and using git would complicate bootstrapping. - $ git fetch --all -p && git checkout origin/release/2.38/master && git describe - glibc-2.38-44-gd37c2b20a4 - $ git show --minimal --reverse glibc-2.38.. | gzip -9n --rsyncable - > 2.38-master.patch.gz + $ git fetch --all -p && git checkout origin/release/2.39/master && git describe + glibc-2.39-5-ge0910f1d32 + $ git show --minimal --reverse glibc-2.39.. > 2.39-master.patch To compare the archive contents zdiff can be used. - $ zdiff -u 2.38-master.patch.gz ../nixpkgs/pkgs/development/libraries/glibc/2.38-master.patch.gz + $ diff -u 2.39-master.patch ../nixpkgs/pkgs/development/libraries/glibc/2.39-master.patch */ - ./2.38-master.patch.gz + ./2.39-master.patch /* Allow NixOS and Nix to handle the locale-archive. */ ./nix-locale-archive.patch @@ -96,11 +95,6 @@ stdenv.mkDerivation ({ & https://github.com/NixOS/nixpkgs/pull/188492#issuecomment-1233802991 */ ./reenable_DT_HASH.patch - - /* Retrieved from https://salsa.debian.org/glibc-team/glibc/-/commit/662dbc4f9287139a0d9c91df328a5ba6cc6abee1#0f3c6d67cb8cf5bb35c421c20f828fea97b68edf - Qualys advisory: https://www.qualys.com/2024/01/30/qsort.txt - */ - ./local-qsort-memory-corruption.patch ] /* NVCC does not support ARM intrinsics. Since <math.h> is pulled in by almost every HPC piece of software, without this patch CUDA compilation on ARM @@ -177,8 +171,7 @@ stdenv.mkDerivation ({ # so the glibc does not depend on its compiler store path "libc_cv_as_needed=no" ] - ++ lib.optional withGd "--with-gd" - ++ lib.optional withLibcrypt "--enable-crypt"; + ++ lib.optional withGd "--with-gd"; makeFlags = (args.makeFlags or []) ++ [ "OBJCOPY=${stdenv.cc.targetPrefix}objcopy" diff --git a/pkgs/development/libraries/glibc/default.nix b/pkgs/development/libraries/glibc/default.nix index be3bee081e73e..3f7331461fea5 100644 --- a/pkgs/development/libraries/glibc/default.nix +++ b/pkgs/development/libraries/glibc/default.nix @@ -2,7 +2,6 @@ , withLinuxHeaders ? true , profilingLibraries ? false , withGd ? false -, withLibcrypt? false , pkgsBuildBuild , libgcc }: @@ -16,7 +15,7 @@ let in (callPackage ./common.nix { inherit stdenv; } { - inherit withLinuxHeaders withGd profilingLibraries withLibcrypt; + inherit withLinuxHeaders withGd profilingLibraries; pname = "glibc" + lib.optionalString withGd "-gd" + lib.optionalString (stdenv.cc.isGNU && libgcc==null) "-nolibgcc"; }).overrideAttrs(previousAttrs: { diff --git a/pkgs/development/libraries/glibc/local-qsort-memory-corruption.patch b/pkgs/development/libraries/glibc/local-qsort-memory-corruption.patch deleted file mode 100644 index f7e25c72a61c9..0000000000000 --- a/pkgs/development/libraries/glibc/local-qsort-memory-corruption.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -rup a/stdlib/qsort.c b/stdlib/qsort.c ---- a/stdlib/qsort.c 2023-07-31 10:54:16.000000000 -0700 -+++ b/stdlib/qsort.c 2024-01-15 09:08:25.596167959 -0800 -@@ -224,7 +224,8 @@ _quicksort (void *const pbase, size_t to - while ((run_ptr += size) <= end_ptr) - { - tmp_ptr = run_ptr - size; -- while ((*cmp) ((void *) run_ptr, (void *) tmp_ptr, arg) < 0) -+ while (tmp_ptr != base_ptr -+ && (*cmp) ((void *) run_ptr, (void *) tmp_ptr, arg) < 0) - tmp_ptr -= size; - - tmp_ptr += size; - diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix index 3bef1d935564a..1c30c76ca7ab6 100644 --- a/pkgs/development/libraries/gnutls/default.nix +++ b/pkgs/development/libraries/gnutls/default.nix @@ -1,7 +1,7 @@ -{ config -, lib +{ lib , stdenv , fetchurl +, fetchpatch2 , zlib , lzo , libtasn1 @@ -57,11 +57,11 @@ in stdenv.mkDerivation rec { pname = "gnutls"; - version = "3.8.3"; + version = "3.8.4"; src = fetchurl { url = "mirror://gnupg/gnutls/v${lib.versions.majorMinor version}/gnutls-${version}.tar.xz"; - hash = "sha256-90/FlUsn1Oxt+7Ed6ph4iLWxJCiaNwOvytoO5SD0Fz4="; + hash = "sha256-K+pOFUeU8/ABgPoqXFH+iwBax6Mc1YvUTN+n8268Ops="; }; outputs = [ "bin" "dev" "out" ] @@ -73,6 +73,15 @@ stdenv.mkDerivation rec { patches = [ ./nix-ssl-cert-file.patch + # Revert https://gitlab.com/gnutls/gnutls/-/merge_requests/1800 + # dlopen isn't as easy in NixPkgs, as noticed in tests broken by this. + # Without getting the libs into RPATH they won't be found. + (fetchpatch2 { + name = "revert-dlopen-compression.patch"; + url = "https://gitlab.com/gnutls/gnutls/-/commit/8584908d6b679cd4e7676de437117a793e18347c.diff"; + revert = true; + hash = "sha256-r/+Gmwqy0Yc1LHL/PdPLXlErUBC5JxquLzCBAN3LuRM="; + }) ]; # Skip some tests: @@ -87,6 +96,12 @@ stdenv.mkDerivation rec { sed 's:/usr/lib64/pkcs11/ /usr/lib/pkcs11/ /usr/lib/x86_64-linux-gnu/pkcs11/:`pkg-config --variable=p11_module_path p11-kit-1`:' -i tests/p11-kit-trust.sh '' + lib.optionalString stdenv.hostPlatform.isMusl '' # See https://gitlab.com/gnutls/gnutls/-/issues/945 sed '2iecho "certtool tests skipped in musl build"\nexit 0' -i tests/cert-tests/certtool.sh + '' + lib.optionalString stdenv.hostPlatform.isStatic '' + # Adapted from https://gitlab.com/gnutls/gnutls/-/commit/d214cd4570fb1559a20e941bb7ceac7df52e96d3 + # Can be removed with 3.8.5+. + sed -i lib/nettle/backport/rsa-sign-tr.c -e \ + '/^#include <nettle\/rsa\.h>/i\ + #define nettle_rsa_compute_root_tr _gnutls_nettle_backport_rsa_compute_root_tr' ''; preConfigure = "patchShebangs ."; @@ -112,7 +127,7 @@ stdenv.mkDerivation rec { ++ lib.optional (withP11-kit) p11-kit ++ lib.optional (tpmSupport && stdenv.isLinux) trousers; - nativeBuildInputs = [ perl pkg-config texinfo ] + nativeBuildInputs = [ perl pkg-config texinfo ] ++ [ autoconf automake ] ++ lib.optionals doCheck [ which nettools util-linux ]; propagatedBuildInputs = [ nettle ] diff --git a/pkgs/development/libraries/libblockdev/default.nix b/pkgs/development/libraries/libblockdev/default.nix index 7b317ecec5a57..8ec4b709b162f 100644 --- a/pkgs/development/libraries/libblockdev/default.nix +++ b/pkgs/development/libraries/libblockdev/default.nix @@ -31,13 +31,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "libblockdev"; - version = "3.0.4"; + version = "3.1.1"; src = fetchFromGitHub { owner = "storaged-project"; repo = "libblockdev"; rev = "${finalAttrs.version}-1"; - hash = "sha256-9tPI8FyHQ9i7p4HLrxiseIH8Y5uqnlsNjcZ1qIHCcRY="; + hash = "sha256-WCMedMkaMMhZbB3iJu3c+CTT3AvOjzOSYP45J+NQEDQ="; }; outputs = [ "out" "dev" "devdoc" ]; diff --git a/pkgs/development/libraries/libhandy/default.nix b/pkgs/development/libraries/libhandy/default.nix index 28e698e2a83f8..19dcb4248f9b5 100644 --- a/pkgs/development/libraries/libhandy/default.nix +++ b/pkgs/development/libraries/libhandy/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { pname = "libhandy"; - version = "1.8.2"; + version = "1.8.3"; outputs = [ "out" @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-0RqizT5XCsbQ79ukbRcxR8EfRYJkV+kkwFmQuy4N+a0="; + sha256 = "sha256-BbSXIpBz/1V/ELMm4HTFBm+HQ6MC1IIKuXvLXNLasIc="; }; depsBuildBuild = [ diff --git a/pkgs/development/libraries/libnice/default.nix b/pkgs/development/libraries/libnice/default.nix index ade70284ba688..72419deaccb5a 100644 --- a/pkgs/development/libraries/libnice/default.nix +++ b/pkgs/development/libraries/libnice/default.nix @@ -18,14 +18,14 @@ stdenv.mkDerivation rec { pname = "libnice"; - version = "0.1.21"; + version = "0.1.22"; outputs = [ "bin" "out" "dev" ] ++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [ "devdoc" ]; src = fetchurl { url = "https://libnice.freedesktop.org/releases/${pname}-${version}.tar.gz"; - hash = "sha256-cuc6Ks8g9ZCT4h1WAWBuQFhzUD6zXzRvpiHeI+mbOzk="; + hash = "sha256-pfckzwnq5QxBp1FxQdidpKYeyerKMtpKAHP67VQXrX4="; }; patches = [ diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index 415f097f3318d..f82cc8b4c1081 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "librsvg"; - version = "2.57.1"; + version = "2.57.92"; outputs = [ "out" "dev" ] ++ lib.optionals withIntrospection [ "devdoc" @@ -50,13 +50,13 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/librsvg/${lib.versions.majorMinor finalAttrs.version}/librsvg-${finalAttrs.version}.tar.xz"; - hash = "sha256-B0Zxo+1vvNZ8ripA5TkQf08JfKikqxqJTAXiUk/zQO8="; + hash = "sha256-Kiwwvqvzz91ApKbb7T+zPmd8ruXY8wR4gkm3Mee+OFI="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit (finalAttrs) src; name = "librsvg-deps-${finalAttrs.version}"; - hash = "sha256-zICI7sps5KYe8/yWXbCJv529KxGLjoyDOmpCgVAIsTs="; + hash = "sha256-yJf3V2dPwI+RcDH6Lh/AhUgaisdbTnzdAFt+SeNw9NY="; # TODO: move this to fetchCargoTarball dontConfigure = true; }; diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix index 80b5f411e6639..a7360741fe842 100644 --- a/pkgs/development/libraries/libtiff/default.nix +++ b/pkgs/development/libraries/libtiff/default.nix @@ -7,6 +7,7 @@ , pkg-config , sphinx +, lerc , libdeflate , libjpeg , xz @@ -62,6 +63,10 @@ stdenv.mkDerivation (finalAttrs: { # sure cross-compilation works first! nativeBuildInputs = [ autoreconfHook pkg-config sphinx ]; + buildInputs = [ + lerc + ]; + # TODO: opengl support (bogus configure detection) propagatedBuildInputs = [ libdeflate diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix index f3d58613b25dc..e9faec42cd318 100644 --- a/pkgs/development/libraries/libva/default.nix +++ b/pkgs/development/libraries/libva/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libva" + lib.optionalString minimal "-minimal"; - version = "2.20.0"; + version = "2.21.0"; src = fetchFromGitHub { owner = "intel"; repo = "libva"; rev = finalAttrs.version; - sha256 = "sha256-ENAsytjqvS8xHZyZLPih3bzBgQ1f/j+s3dWZs1GTWHs="; + sha256 = "sha256-X9H5nxbYFSMfxZMxs3iWwCgdrJ2FTVWW7tlgQek3WIg="; }; outputs = [ "dev" "out" ]; diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index 78c5d09889aa7..1cca2d9222dbb 100644 --- a/pkgs/development/libraries/libxml2/default.nix +++ b/pkgs/development/libraries/libxml2/default.nix @@ -23,19 +23,9 @@ , testers }: -let - # Newer versions fail with minimal python, probably because - # https://gitlab.gnome.org/GNOME/libxml2/-/commit/b706824b612adb2c8255819c9a55e78b52774a3c - # This case is encountered "temporarily" during stdenv bootstrapping on darwin. - # Beware that the old version has known security issues, so the final set shouldn't use it. - oldVer = python.pname == "python3-minimal"; -in - assert oldVer -> stdenv.isDarwin; # reduce likelihood of using old libxml2 unintentionally - -let -libxml = stdenv.mkDerivation (finalAttrs: rec { +stdenv.mkDerivation (finalAttrs: rec { pname = "libxml2"; - version = "2.12.5"; + version = "2.12.6"; outputs = [ "bin" "dev" "out" "doc" ] ++ lib.optional pythonSupport "py" @@ -44,7 +34,7 @@ libxml = stdenv.mkDerivation (finalAttrs: rec { src = fetchurl { url = "mirror://gnome/sources/libxml2/${lib.versions.majorMinor version}/libxml2-${version}.tar.xz"; - hash = "sha256-qXJ5Zpav04Bz4PWcKDw6L1pWC1JotLq8ORsoYWZSayE="; + hash = "sha256-iJxZOogaPbX92WzJMYyH3zTrZI7fxFgnKtRv1gc1P7s="; }; strictDeps = true; @@ -139,15 +129,4 @@ libxml = stdenv.mkDerivation (finalAttrs: rec { maintainers = with maintainers; [ eelco jtojnar ]; pkgConfigModules = [ "libxml-2.0" ]; }; -}); -in -if oldVer then - libxml.overrideAttrs (attrs: rec { - version = "2.10.1"; - src = fetchurl { - url = "mirror://gnome/sources/libxml2/${lib.versions.majorMinor version}/libxml2-${version}.tar.xz"; - sha256 = "21a9e13cc7c4717a6c36268d0924f92c3f67a1ece6b7ff9d588958a6db9fb9d8"; - }; - }) -else - libxml +}) diff --git a/pkgs/development/libraries/mvfst/default.nix b/pkgs/development/libraries/mvfst/default.nix index 6b6e2d9c9e579..45b432a2dc9e6 100644 --- a/pkgs/development/libraries/mvfst/default.nix +++ b/pkgs/development/libraries/mvfst/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "mvfst"; - version = "2024.01.22.00"; + version = "2024.03.11.00"; src = fetchFromGitHub { owner = "facebook"; repo = "mvfst"; rev = "v${version}"; - sha256 = "sha256-vhLwxA91v+vt5PQejhPOaj9YSkulg86hTD9GkpQKB24="; + sha256 = "sha256-KjNTDgpiR9EG42Agl2JFJoPo5+8GlS27oPMWpdLq2v8="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/npth/default.nix b/pkgs/development/libraries/npth/default.nix index 023d9cebb973d..f7a31ad8086fd 100644 --- a/pkgs/development/libraries/npth/default.nix +++ b/pkgs/development/libraries/npth/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl }: +{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook }: stdenv.mkDerivation rec { pname = "npth"; @@ -9,6 +9,16 @@ stdenv.mkDerivation rec { sha256 = "sha256-hYn1aTe3XOM7KNMS/MvzArO3HsPzlF/eaqp0AnkUrQU="; }; + patches = [ + (fetchpatch { + name = "musl.patch"; + url = "https://git.gnupg.org/cgi-bin/gitweb.cgi?p=npth.git;a=patch;h=417abd56fd7bf45cd4948414050615cb1ad59134"; + hash = "sha256-0g2tLFjW1bybNi6oxlW7vPimsQLjmTih4JZSoATjESI="; + }) + ]; + + nativeBuildInputs = [ autoreconfHook ]; + doCheck = true; meta = with lib; { diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix index fc722257a9c17..34288773705a6 100644 --- a/pkgs/development/libraries/pango/default.nix +++ b/pkgs/development/libraries/pango/default.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "pango"; - version = "1.51.0"; + version = "1.51.2"; outputs = [ "bin" "out" "dev" ] ++ lib.optional withIntrospection "devdoc"; src = fetchurl { url = with finalAttrs; "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "dO/BCa5vkDu+avd+qirGCUuO4kWi4j8TKnqPCGLRqfU="; + sha256 = "sha256-PbpAfytfwRfhkvMCXwocyO3B/ZuTSxxXiyuXNCE5QVo="; }; depsBuildBuild = [ diff --git a/pkgs/development/libraries/s2n-tls/default.nix b/pkgs/development/libraries/s2n-tls/default.nix index a8c8a22ff1bbe..1d50f1d89fa42 100644 --- a/pkgs/development/libraries/s2n-tls/default.nix +++ b/pkgs/development/libraries/s2n-tls/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "s2n-tls"; - version = "1.4.6"; + version = "1.4.8"; src = fetchFromGitHub { owner = "aws"; repo = pname; rev = "v${version}"; - hash = "sha256-x4/AkmkmuTKxzlk8AxbydA4GctpShsKiFTTJ8m7B4TY="; + hash = "sha256-fDofKp/WUPY4+1HUeBdRklInTS7Qndycnci4h3F/mLY="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/spirv-headers/default.nix b/pkgs/development/libraries/spirv-headers/default.nix index 64362243229b2..655233362e150 100644 --- a/pkgs/development/libraries/spirv-headers/default.nix +++ b/pkgs/development/libraries/spirv-headers/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "spirv-headers"; - version = "1.3.275.0"; + version = "1.3.280.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Headers"; rev = "vulkan-sdk-${version}"; - hash = "sha256-/I9dJlBE0kvFvqooKuqMETtOE72Jmva3zIGnq0o4+aE="; + hash = "sha256-kyOAwe4R0FmeA9IIJF2eoZR+7g9LiGKaZ7FuIfkrXJ4="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index 5152f5d0e33c8..d172d75e011bb 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -15,13 +15,13 @@ in stdenv.mkDerivation rec { pname = "sqlite${lib.optionalString interactive "-interactive"}"; - version = "3.45.1"; + version = "3.45.2"; # nixpkgs-update: no auto update # NB! Make sure to update ./tools.nix src (in the same directory). src = fetchurl { url = "https://sqlite.org/2024/sqlite-autoconf-${archiveVersion version}.tar.gz"; - hash = "sha256-zZwnhBt6WTLJiXZR4guGxwHddAVWmJsByllvz6PUmgo="; + hash = "sha256-vJBnRC7t8905mJtcXPv/83rmbMnJknTgwwUtxNSo9q4="; }; outputs = [ "bin" "dev" "out" ]; diff --git a/pkgs/development/libraries/sqlite/tools.nix b/pkgs/development/libraries/sqlite/tools.nix index 695d2207da7d9..94ac07df9d402 100644 --- a/pkgs/development/libraries/sqlite/tools.nix +++ b/pkgs/development/libraries/sqlite/tools.nix @@ -4,12 +4,12 @@ let archiveVersion = import ./archive-version.nix lib; mkTool = { pname, makeTarget, description, homepage, mainProgram }: stdenv.mkDerivation rec { inherit pname; - version = "3.45.1"; + version = "3.45.2"; # nixpkgs-update: no auto update src = assert version == sqlite.version; fetchurl { url = "https://sqlite.org/2024/sqlite-src-${archiveVersion version}.zip"; - hash = "sha256-f3sUpo7bzUpX3zqMTb1W0tNUam583VDeQM6wOvM9NLo="; + hash = "sha256-SkWjV3zIr2g8S9TG6Bp8eCxbfV2qBhdeosuXHKcWkbE="; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/development/libraries/umockdev/default.nix b/pkgs/development/libraries/umockdev/default.nix index 9c3026b0c9fbe..1fe1c0b01d928 100644 --- a/pkgs/development/libraries/umockdev/default.nix +++ b/pkgs/development/libraries/umockdev/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "umockdev"; - version = "0.17.18"; + version = "0.18.0"; outputs = [ "bin" "out" "dev" "devdoc" ]; src = fetchurl { url = "https://github.com/martinpitt/umockdev/releases/download/${finalAttrs.version}/umockdev-${finalAttrs.version}.tar.xz"; - sha256 = "sha256-RmrT4McV5W9Q6mqWUWWCPQc6hBN6y4oeObZlc2SKmF8="; + hash = "sha256-uJkeaKK89C6mCYjfqLzvAFUNmo6IvvZvn2mxp7H44ng="; }; patches = [ @@ -43,12 +43,6 @@ stdenv.mkDerivation (finalAttrs: { src = ./substitute-udevadm.patch; udevadm = "${systemdMinimal}/bin/udevadm"; }) - - (fetchpatch { - name = "musl.patch"; - url = "https://github.com/martinpitt/umockdev/commit/d4efe24be59bd859b87473ea3d7efe8100bedc74.patch"; - hash = "sha256-whf3p2e7FWN1xk5+HF9KsbMW74DPOQ0R0+FxBfCZTX0="; - }) ]; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/vulkan-headers/default.nix b/pkgs/development/libraries/vulkan-headers/default.nix index dc17404c84802..5793905a75a14 100644 --- a/pkgs/development/libraries/vulkan-headers/default.nix +++ b/pkgs/development/libraries/vulkan-headers/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "vulkan-headers"; - version = "1.3.275.0"; + version = "1.3.280.0"; nativeBuildInputs = [ cmake ]; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { owner = "KhronosGroup"; repo = "Vulkan-Headers"; rev = "vulkan-sdk-${version}"; - hash = "sha256-kBOkj7mr4stPXUCBhNJpNL3A+9BebEwrIBEIroxdH8Y="; + hash = "sha256-EnKiCtH6rh3ACQgokSSfp4FPFluMZW0dheP8IEzZtY4="; }; passthru.updateScript = ./update.sh; diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix index 8b0f236acf4e4..f36a01e1a67ff 100644 --- a/pkgs/development/libraries/vulkan-loader/default.nix +++ b/pkgs/development/libraries/vulkan-loader/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "vulkan-loader"; - version = "1.3.275.0"; + version = "1.3.280.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-Loader"; rev = "vulkan-sdk-${finalAttrs.version}"; - hash = "sha256-53PUXAWiK38ciV6oMvD7ZHdXi4RU4r0RmDWUUHU3mE0="; + hash = "sha256-zkJSPshRaZRDiBvLJbJo8l1MX10KXYZniqtNTNnokT4="; }; patches = [ ./fix-pkgconfig.patch ]; diff --git a/pkgs/development/libraries/vulkan-utility-libraries/default.nix b/pkgs/development/libraries/vulkan-utility-libraries/default.nix index 301311e124128..c2c49671b0781 100644 --- a/pkgs/development/libraries/vulkan-utility-libraries/default.nix +++ b/pkgs/development/libraries/vulkan-utility-libraries/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "vulkan-utility-libraries"; - version = "1.3.275.0"; + version = "1.3.280.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-Utility-Libraries"; rev = "vulkan-sdk-${finalAttrs.version}"; - hash = "sha256-gvia+Xb9BpOjPARKo3Sgp85Bfh1roFZ2PzCtXVFYeIU="; + hash = "sha256-mCD9/bpWUXRVJ+OyOqG0tXTgFuptIlcG6UR/RiNV1Z0="; }; nativeBuildInputs = [ cmake python3 ]; diff --git a/pkgs/development/libraries/wangle/default.nix b/pkgs/development/libraries/wangle/default.nix index d30389d972593..080bfb4d018c6 100644 --- a/pkgs/development/libraries/wangle/default.nix +++ b/pkgs/development/libraries/wangle/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "wangle"; - version = "2024.01.22.00"; + version = "2024.03.11.00"; src = fetchFromGitHub { owner = "facebook"; repo = "wangle"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-pXcJszncYWvtwT4guEl69rOAIXZzgF7I6qh8PqLbxdA="; + sha256 = "sha256-fDtJ+9bZj+siKlMglYMkLO/+jldUmsS5V3Umk1gNdlo="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/wayland/protocols.nix b/pkgs/development/libraries/wayland/protocols.nix index 9625f3a5ee1b4..e150c87c15d1a 100644 --- a/pkgs/development/libraries/wayland/protocols.nix +++ b/pkgs/development/libraries/wayland/protocols.nix @@ -6,14 +6,14 @@ stdenv.mkDerivation rec { pname = "wayland-protocols"; - version = "1.33"; + version = "1.34"; # https://gitlab.freedesktop.org/wayland/wayland-protocols/-/issues/48 doCheck = stdenv.hostPlatform == stdenv.buildPlatform && stdenv.hostPlatform.linker == "bfd" && wayland.withLibraries; src = fetchurl { url = "https://gitlab.freedesktop.org/wayland/${pname}/-/releases/${version}/downloads/${pname}-${version}.tar.xz"; - hash = "sha256-lPDFCwkNbmGgP2IEhGexmrvoUb5OEa57NvZfi5jDljo="; + hash = "sha256-xZsnys2F9guvTuX4DfXA0Vdg6taiQysAq34uBXTcr+s="; }; postPatch = lib.optionalString doCheck '' diff --git a/pkgs/development/python-modules/apsw/default.nix b/pkgs/development/python-modules/apsw/default.nix index 153b8b3b05dd7..bdd640a4ce507 100644 --- a/pkgs/development/python-modules/apsw/default.nix +++ b/pkgs/development/python-modules/apsw/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "apsw"; - version = "3.45.1.0"; + version = "3.45.2.0"; format = "setuptools"; disabled = isPyPy; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "rogerbinns"; repo = "apsw"; rev = "refs/tags/${version}"; - hash = "sha256-NkpkciLR2TgfK/7UQHEzvQu8qRj4UJyOlGQbiV23qrc="; + hash = "sha256-tTi3/10W4OoGH6PQVhvPWc5o09on5BZrWoAvrfh4C/E="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/chex/default.nix b/pkgs/development/python-modules/chex/default.nix index 559d047032c6a..08ce0916c25ea 100644 --- a/pkgs/development/python-modules/chex/default.nix +++ b/pkgs/development/python-modules/chex/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub +, setuptools , absl-py , cloudpickle , dm-tree @@ -15,8 +16,8 @@ buildPythonPackage rec { pname = "chex"; - version = "0.1.85"; - format = "setuptools"; + version = "0.1.86"; + pyproject = true; disabled = pythonOlder "3.9"; @@ -24,10 +25,14 @@ buildPythonPackage rec { owner = "deepmind"; repo = "chex"; rev = "refs/tags/v${version}"; - hash = "sha256-7k/+2dNNbPBXtbabuOEVpAI7T1SuM4JDf074dmTg/vs="; + hash = "sha256-Z5Ns4fG5pC99I4xdGjDMKX6YZpTtd1y0TWcIOtr7dug="; }; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ absl-py jaxlib jax diff --git a/pkgs/development/python-modules/diffsync/default.nix b/pkgs/development/python-modules/diffsync/default.nix index 877322259c42e..ff96650b920f2 100644 --- a/pkgs/development/python-modules/diffsync/default.nix +++ b/pkgs/development/python-modules/diffsync/default.nix @@ -27,6 +27,11 @@ buildPythonPackage rec { pythonRelaxDepsHook ]; + pythonRelaxDeps = [ + "packaging" + "structlog" + ]; + propagatedBuildInputs = [ colorama packaging @@ -35,10 +40,6 @@ buildPythonPackage rec { structlog ]; - pythonRelaxDeps = [ - "structlog" - ]; - pythonImportsCheck = [ "diffsync" ]; diff --git a/pkgs/development/python-modules/django/4.nix b/pkgs/development/python-modules/django/4.nix index 4340c5ab2c97c..029db650ab869 100644 --- a/pkgs/development/python-modules/django/4.nix +++ b/pkgs/development/python-modules/django/4.nix @@ -41,14 +41,15 @@ }: buildPythonPackage rec { - pname = "Django"; + pname = "django"; version = "4.2.11"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { - inherit pname version; + pname = "Django"; + inherit version; hash = "sha256-bm/z2y2N0MmGtO7IVUyOT5GbXB/2KltDkMF6/y7W5cQ="; }; diff --git a/pkgs/development/python-modules/ed25519/default.nix b/pkgs/development/python-modules/ed25519/default.nix index 7b2c20c39a042..745c2c38cd0da 100644 --- a/pkgs/development/python-modules/ed25519/default.nix +++ b/pkgs/development/python-modules/ed25519/default.nix @@ -1,10 +1,13 @@ -{ lib, fetchPypi, buildPythonPackage }: +{ lib, fetchPypi, buildPythonPackage, pythonAtLeast }: buildPythonPackage rec { pname = "ed25519"; version = "1.5"; format = "setuptools"; + # last commit in 2019, various compat issues with 3.12 + disabled = pythonAtLeast "3.12"; + src = fetchPypi { inherit pname version; sha256 = "0n1k83ww0pr4q6z0h7p8hvy21hcgb96jvgllfbwhvvyf37h3w182"; diff --git a/pkgs/development/python-modules/flet/default.nix b/pkgs/development/python-modules/flet/default.nix index 0dbed81022a6e..3e9a7d1f7bf0e 100644 --- a/pkgs/development/python-modules/flet/default.nix +++ b/pkgs/development/python-modules/flet/default.nix @@ -36,9 +36,10 @@ buildPythonPackage rec { ]; pythonRelaxDeps = [ - "websockets" "cookiecutter" + "packaging" "watchdog" + "websockets" ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/logical-unification/default.nix b/pkgs/development/python-modules/logical-unification/default.nix index c129202dbf168..adc6141f11db3 100644 --- a/pkgs/development/python-modules/logical-unification/default.nix +++ b/pkgs/development/python-modules/logical-unification/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, pythonAtLeast , toolz , multipledispatch , py @@ -33,6 +34,11 @@ buildPythonPackage rec { pytest-benchmark # Needed for the `--benchmark-skip` flag ]; + disabledTests = lib.optionals (pythonAtLeast "3.12") [ + # Failed: DID NOT RAISE <class 'RecursionError'> + "test_reify_recursion_limit" + ]; + pytestFlagsArray = [ "--benchmark-skip" "--html=testing-report.html" diff --git a/pkgs/development/python-modules/mlflow/default.nix b/pkgs/development/python-modules/mlflow/default.nix index 0a0efaab43728..5d8c91d8bc08a 100644 --- a/pkgs/development/python-modules/mlflow/default.nix +++ b/pkgs/development/python-modules/mlflow/default.nix @@ -38,14 +38,14 @@ buildPythonPackage rec { pname = "mlflow"; - version = "2.11.1"; + version = "2.11.3"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-ouwp7oYvGZVSCPuOBeUeXp0u3HF143zxNtlDuYGoJOk="; + hash = "sha256-Yht+MR6JC3lxnC53dyhtjgjTjdBNWrCAlmmQvUpV/rs="; }; # Remove currently broken dependency `shap`, a model explainability package. @@ -56,7 +56,11 @@ buildPythonPackage rec { setuptools ]; pythonRemoveDeps = [ "shap" ]; - pythonRelaxDeps = [ "pytz" "pyarrow" ]; + pythonRelaxDeps = [ + "packaging" + "pytz" + "pyarrow" + ]; propagatedBuildInputs = [ alembic diff --git a/pkgs/development/python-modules/notus-scanner/default.nix b/pkgs/development/python-modules/notus-scanner/default.nix index 263aebada6a55..51a41bedc9208 100644 --- a/pkgs/development/python-modules/notus-scanner/default.nix +++ b/pkgs/development/python-modules/notus-scanner/default.nix @@ -27,6 +27,7 @@ buildPythonPackage rec { }; pythonRelaxDeps = [ + "packaging" "python-gnupg" ]; diff --git a/pkgs/development/python-modules/packaging/default.nix b/pkgs/development/python-modules/packaging/default.nix index 123c1230fc87a..32ce7fd8accb6 100644 --- a/pkgs/development/python-modules/packaging/default.nix +++ b/pkgs/development/python-modules/packaging/default.nix @@ -14,14 +14,14 @@ let packaging = buildPythonPackage rec { pname = "packaging"; - version = "23.2"; + version = "24.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-BI+w6UBQNlGOqvSKVZU8dQwR4aG2jg3RqdYu0MCSz8U="; + hash = "sha256-64LF4+ViCQdHZuaIW7BLjDigwBXQowA26+fs40yZiek="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pymysql/default.nix b/pkgs/development/python-modules/pymysql/default.nix index 888b5b9d309c3..e7711f5902b94 100644 --- a/pkgs/development/python-modules/pymysql/default.nix +++ b/pkgs/development/python-modules/pymysql/default.nix @@ -5,11 +5,12 @@ }: buildPythonPackage rec { - pname = "PyMySQL"; + pname = "pymysql"; version = "1.0.2"; src = fetchPypi { - inherit pname version; + pname = "PyMySQL"; + inherit version; sha256 = "816927a350f38d56072aeca5dfb10221fe1dc653745853d30a216637f5d7ad36"; }; diff --git a/pkgs/development/python-modules/pyqrcode/default.nix b/pkgs/development/python-modules/pyqrcode/default.nix index 7cb0a94eb74a1..2b0ce5193555f 100644 --- a/pkgs/development/python-modules/pyqrcode/default.nix +++ b/pkgs/development/python-modules/pyqrcode/default.nix @@ -1,11 +1,12 @@ { lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { - pname = "PyQRCode"; + pname = "pyqrcode"; version = "1.2.1"; src = fetchPypi { - inherit pname version; + pname = "PyQRCode"; + inherit version; sha256 = "fdbf7634733e56b72e27f9bce46e4550b75a3a2c420414035cae9d9d26b234d5"; }; diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix index 0b2b1c8ad6b18..0af19e2c174ef 100644 --- a/pkgs/development/python-modules/pyqt/5.x.nix +++ b/pkgs/development/python-modules/pyqt/5.x.nix @@ -26,14 +26,15 @@ }: buildPythonPackage rec { - pname = "PyQt5"; + pname = "pyqt5"; version = "5.15.9"; format = "pyproject"; disabled = isPy27; src = fetchPypi { - inherit pname version; + pname = "PyQt5"; + inherit version; hash = "sha256-3EHoQBqQ3D4raStBG9VJKrVZrieidCTu1L05FVZOxMA="; }; diff --git a/pkgs/development/python-modules/rmscene/default.nix b/pkgs/development/python-modules/rmscene/default.nix index 9e6bba74d05b4..a7eb4d2c632ce 100644 --- a/pkgs/development/python-modules/rmscene/default.nix +++ b/pkgs/development/python-modules/rmscene/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , pythonOlder +, pythonRelaxDepsHook , fetchFromGitHub , poetry-core , packaging @@ -24,6 +25,11 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry-core + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + "packaging" ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/send2trash/default.nix b/pkgs/development/python-modules/send2trash/default.nix index 62bbea264e723..bd08e6c2dcdec 100644 --- a/pkgs/development/python-modules/send2trash/default.nix +++ b/pkgs/development/python-modules/send2trash/default.nix @@ -6,7 +6,7 @@ }: buildPythonPackage rec { - pname = "Send2Trash"; + pname = "send2trash"; version = "1.8.2"; format = "pyproject"; diff --git a/pkgs/development/python-modules/sqlalchemy-i18n/default.nix b/pkgs/development/python-modules/sqlalchemy-i18n/default.nix index a17e7ada45226..a33a9783319ff 100644 --- a/pkgs/development/python-modules/sqlalchemy-i18n/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-i18n/default.nix @@ -7,11 +7,12 @@ }: buildPythonPackage rec { - pname = "SQLAlchemy-i18n"; + pname = "sqlalchemy-i18n"; version = "1.1.0"; src = fetchPypi { - inherit pname version; + pname = "SQLAlchemy-i18n"; + inherit version; sha256 = "de33376483a581ca14218d8f57a114466c5f72b674a95839b6c4564a6e67796f"; }; diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix index 0d3ac845f6086..ae1f22b4c2f68 100644 --- a/pkgs/development/python-modules/sqlalchemy/default.nix +++ b/pkgs/development/python-modules/sqlalchemy/default.nix @@ -39,8 +39,8 @@ }: buildPythonPackage rec { - pname = "SQLAlchemy"; - version = "2.0.28"; + pname = "sqlalchemy"; + version = "2.0.29"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -49,7 +49,7 @@ buildPythonPackage rec { owner = "sqlalchemy"; repo = "sqlalchemy"; rev = "refs/tags/rel_${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-Xl3w9v97tyOpL4vUYzlovGrUGIZtIZsAhbE5/FhqFiM="; + hash = "sha256-jEkuvwq/KKjcsREWDvvTFT87kgu3TSBR3JaseOs54qc="; }; postPatch = '' diff --git a/pkgs/development/python-modules/streamlit/default.nix b/pkgs/development/python-modules/streamlit/default.nix index 94144c92ab086..4ce529ef5c06c 100644 --- a/pkgs/development/python-modules/streamlit/default.nix +++ b/pkgs/development/python-modules/streamlit/default.nix @@ -18,6 +18,7 @@ , pympler , python-dateutil , pythonOlder +, pythonRelaxDepsHook , setuptools , requests , rich @@ -44,6 +45,11 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + "packaging" ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ukpostcodeparser/default.nix b/pkgs/development/python-modules/ukpostcodeparser/default.nix index a2c452046ab94..486cee90435a8 100644 --- a/pkgs/development/python-modules/ukpostcodeparser/default.nix +++ b/pkgs/development/python-modules/ukpostcodeparser/default.nix @@ -1,11 +1,12 @@ { lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { - pname = "UkPostcodeParser"; + pname = "ukpostcodeparser"; version = "1.1.2"; src = fetchPypi { - inherit pname version; + pname = "UkPostcodeParser"; + inherit version; sha256 = "930264efa293db80af0103a4fe9c161b06365598d24bb6fe5403f3f57c70530e"; }; diff --git a/pkgs/development/python-modules/woob/default.nix b/pkgs/development/python-modules/woob/default.nix index 0887533adb9a1..abc876b388a8b 100644 --- a/pkgs/development/python-modules/woob/default.nix +++ b/pkgs/development/python-modules/woob/default.nix @@ -2,7 +2,7 @@ , babel , buildPythonPackage , fetchFromGitLab -, fetchpatch +, pythonRelaxDepsHook , html2text , lxml , packaging @@ -37,6 +37,11 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + "packaging" ]; propagatedBuildInputs = [ diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 266b28f6e4ca7..6d99089ce2793 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -30,6 +30,7 @@ python3.pkgs.buildPythonApplication rec { "networkx" "openai" "packageurl-python" + "packaging" "pycep-parser" "termcolor" ]; diff --git a/pkgs/development/tools/misc/elfutils/default.nix b/pkgs/development/tools/misc/elfutils/default.nix index 0533af6789190..838dfff80fe34 100644 --- a/pkgs/development/tools/misc/elfutils/default.nix +++ b/pkgs/development/tools/misc/elfutils/default.nix @@ -8,11 +8,11 @@ # TODO: Look at the hardcoded paths to kernel, modules etc. stdenv.mkDerivation rec { pname = "elfutils"; - version = "0.190"; + version = "0.191"; src = fetchurl { url = "https://sourceware.org/elfutils/ftp/${version}/${pname}-${version}.tar.bz2"; - hash = "sha256-jgCjqbXwS8HcJzroYoHS0m7UEgILOR/8wjGY8QIx1pI="; + hash = "sha256-33bbcTZtHXCDZfx6bGDKSDmPFDZ+sriVTvyIlxR62HE="; }; patches = [ diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix index 849f44ea9bc0d..e607967a1205f 100644 --- a/pkgs/development/tools/misc/gdb/default.nix +++ b/pkgs/development/tools/misc/gdb/default.nix @@ -30,11 +30,11 @@ assert pythonSupport -> python3 != null; stdenv.mkDerivation rec { pname = targetPrefix + basename + lib.optionalString hostCpuOnly "-host-cpu-only"; - version = "14.1"; + version = "14.2"; src = fetchurl { url = "mirror://gnu/gdb/${basename}-${version}.tar.xz"; - hash = "sha256-1m31EnYUNFH8v/RkzIcj1o8enfRaai1WNaVOcWQ+24A="; + hash = "sha256-LU3YBh2N7RK2xj9V5FNEiB6CJhBfTSqbI0BA76XOd3I="; }; postPatch = lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/development/tools/misc/luarocks/default.nix b/pkgs/development/tools/misc/luarocks/default.nix index 8622ca5acd38b..49d3eb280a071 100644 --- a/pkgs/development/tools/misc/luarocks/default.nix +++ b/pkgs/development/tools/misc/luarocks/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "luarocks"; - version = "3.10.0"; + version = "3.11.0"; src = fetchFromGitHub { owner = "luarocks"; repo = "luarocks"; rev = "v${finalAttrs.version}"; - hash = "sha256-lM0jbKbV1fNz6AgJX6Pu6rlAzos/wEzn8wTvCBrOOe4="; + hash = "sha256-mSwwBuLWoMT38iYaV/BTdDmmBz4heTRJzxBHC0Vrvc4="; }; patches = [ diff --git a/pkgs/development/tools/spirv-tools/default.nix b/pkgs/development/tools/spirv-tools/default.nix index 648b2615166c1..dcf124e151afa 100644 --- a/pkgs/development/tools/spirv-tools/default.nix +++ b/pkgs/development/tools/spirv-tools/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "spirv-tools"; - version = "1.3.275.0"; + version = "1.3.280.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Tools"; rev = "vulkan-sdk-${version}"; - hash = "sha256-RzGvoDt1Qc+f6mZsfs99MxX4YB3yFc5FP92Yx/WGrsI="; + hash = "sha256-WnlFr9M7OI4unCIxfmSkvcLqZFKhW4Qkbb4+xp8lSOo="; }; # The cmake options are sufficient for turning on static building, but not diff --git a/pkgs/development/tools/vulkan-validation-layers/default.nix b/pkgs/development/tools/vulkan-validation-layers/default.nix index 1d0a39fb2b8bd..c40a6bbb6e78f 100644 --- a/pkgs/development/tools/vulkan-validation-layers/default.nix +++ b/pkgs/development/tools/vulkan-validation-layers/default.nix @@ -23,13 +23,13 @@ let in stdenv.mkDerivation rec { pname = "vulkan-validation-layers"; - version = "1.3.275.0"; + version = "1.3.280.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-ValidationLayers"; rev = "vulkan-sdk-${version}"; - hash = "sha256-hJx8gn0zCN3+DhO6niylZJXPHgQ+VhQV5tL8qAeRaUg="; + hash = "sha256-jBiVbLRbAZEEU8ZYg9Ehx4b5hDJoi7+LnN++zKLSzvA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/watchman/default.nix b/pkgs/development/tools/watchman/default.nix index dc5d1f87fdb36..213aa3f8798e0 100644 --- a/pkgs/development/tools/watchman/default.nix +++ b/pkgs/development/tools/watchman/default.nix @@ -34,13 +34,13 @@ stdenv.mkDerivation rec { pname = "watchman"; - version = "2024.01.22.00"; + version = "2024.03.11.00"; src = fetchFromGitHub { owner = "facebook"; repo = "watchman"; rev = "v${version}"; - hash = "sha256-+qlcdekBcRwmgrtQ8HcLHphURf0c4oRCs6nbjAzT26c="; + hash = "sha256-cD8mIYCc+8Z2p3rwKVRFcW9sOBbpb5KHU5VpbXHMpeg="; }; cmakeFlags = [ diff --git a/pkgs/games/cataclysm-dda/glibc-2.39.diff b/pkgs/games/cataclysm-dda/glibc-2.39.diff new file mode 100644 index 0000000000000..edc79ce76d79c --- /dev/null +++ b/pkgs/games/cataclysm-dda/glibc-2.39.diff @@ -0,0 +1,28 @@ +diff --git a/src/debug.cpp b/src/debug.cpp +index fa63a3b..1e8f554 100644 +--- a/src/debug.cpp ++++ b/src/debug.cpp +@@ -1494,6 +1494,14 @@ std::string game_info::operating_system() + } + + #if !defined(__CYGWIN__) && !defined (__ANDROID__) && ( defined (__linux__) || defined(unix) || defined(__unix__) || defined(__unix) || ( defined(__APPLE__) && defined(__MACH__) ) || defined(BSD) ) // linux; unix; MacOs; BSD ++ // ++class FILEDeleter ++{ ++ public: ++ void operator()( FILE *f ) const noexcept { ++ pclose( f ); ++ } ++}; + /** Execute a command with the shell by using `popen()`. + * @param command The full command to execute. + * @note The output buffer is limited to 512 characters. +@@ -1504,7 +1512,7 @@ static std::string shell_exec( const std::string &command ) + std::vector<char> buffer( 512 ); + std::string output; + try { +- std::unique_ptr<FILE, decltype( &pclose )> pipe( popen( command.c_str(), "r" ), pclose ); ++ std::unique_ptr<FILE, FILEDeleter> pipe( popen( command.c_str(), "r" ) ); + if( pipe ) { + while( fgets( buffer.data(), buffer.size(), pipe.get() ) != nullptr ) { + output += buffer.data(); diff --git a/pkgs/games/cataclysm-dda/stable.nix b/pkgs/games/cataclysm-dda/stable.nix index 90eab89a83496..5c3ccb4bf2876 100644 --- a/pkgs/games/cataclysm-dda/stable.nix +++ b/pkgs/games/cataclysm-dda/stable.nix @@ -43,6 +43,9 @@ let url = "https://sources.debian.org/data/main/c/cataclysm-dda/0.G-4/debian/patches/gcc13-keyword-requires.patch"; hash = "sha256-8yvHh0YKC7AC/qzia7AZAfMewMC0RiSepMXpOkMXRd8="; }) + # Fix build w/ glibc-2.39 + # From https://github.com/BrettDong/Cataclysm-DDA/commit/9b206e2dc969ad79345596e03c3980bd155d2f48 + ./glibc-2.39.diff ]; makeFlags = common.makeFlags ++ [ diff --git a/pkgs/os-specific/darwin/CoreSymbolication/default.nix b/pkgs/os-specific/darwin/CoreSymbolication/default.nix index d9a2b378134a2..f6b0e2b79c3d3 100644 --- a/pkgs/os-specific/darwin/CoreSymbolication/default.nix +++ b/pkgs/os-specific/darwin/CoreSymbolication/default.nix @@ -1,8 +1,14 @@ -{ lib, fetchFromGitHub, fetchpatch, stdenv }: +{ + lib, + fetchFromGitHub, + fetchpatch, + stdenvNoCC, + darwin-stubs, +}: -stdenv.mkDerivation { - pname = "core-symbolication"; - version = "unstable-2018-06-17"; +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "CoreSymbolication"; + inherit (darwin-stubs) version; src = fetchFromGitHub { repo = "CoreSymbolication"; @@ -12,15 +18,35 @@ stdenv.mkDerivation { }; patches = [ - # C99 compilation fix - # https://github.com/matthewbauer/CoreSymbolication/pull/1 + # Add missing symbol definitions needed to build `zlog` in system_cmds. + # https://github.com/matthewbauer/CoreSymbolication/pull/2 (fetchpatch { - url = "https://github.com/boltzmannrain/CoreSymbolication/commit/1c26cc93f260bda9230a93e91585284e80aa231f.patch"; - hash = "sha256-d/ieDEnvZ9kVOjBVUdJzGmdvC1AF3Jk4fbwp04Q6l/I="; + url = "https://github.com/matthewbauer/CoreSymbolication/commit/ae7ac6a7043dbae8e63d6ce5e63dfaf02b5977fe.patch"; + hash = "sha256-IuXGMsaR1LIGs+BpDU1b4YlznKm9VhK5DQ+Dthtb1mI="; + }) + (fetchpatch { + url = "https://github.com/matthewbauer/CoreSymbolication/commit/6531da946949a94643e6d8424236174ae64fe0ca.patch"; + hash = "sha256-+nDX04yY92yVT9KxiAFY2LxKcS7P8JpU539K+YVRqV4="; }) ]; - makeFlags = [ "PREFIX=$(out)" "CC=${stdenv.cc.targetPrefix}cc" ]; + dontBuild = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/Library/Frameworks/CoreSymbolication.framework/Versions/A/Headers + + ln -s A $out/Library/Frameworks/CoreSymbolication.framework/Versions/Current + ln -s Versions/Current/Headers $out/Library/Frameworks/CoreSymbolication.framework/Headers + ln -s Versions/Current/CoreSymbolication.tbd $out/Library/Frameworks/CoreSymbolication.framework/CoreSymbolication.tbd + + cp *.h $out/Library/Frameworks/CoreSymbolication.framework/Versions/A/Headers + cp ${darwin-stubs}/System/Library/PrivateFrameworks/CoreSymbolication.framework/Versions/A/CoreSymbolication.tbd \ + $out/Library/Frameworks/CoreSymbolication.framework/Versions/A/CoreSymbolication.tbd + + runHook postInstall + ''; meta = with lib; { description = "Reverse engineered headers for Apple's CoreSymbolication framework"; @@ -29,4 +55,4 @@ stdenv.mkDerivation { platforms = platforms.darwin; maintainers = with maintainers; [ matthewbauer ]; }; -} +}) diff --git a/pkgs/os-specific/darwin/apple-sdk-11.0/default.nix b/pkgs/os-specific/darwin/apple-sdk-11.0/default.nix index 0e908d0179db1..518ab4230156f 100644 --- a/pkgs/os-specific/darwin/apple-sdk-11.0/default.nix +++ b/pkgs/os-specific/darwin/apple-sdk-11.0/default.nix @@ -143,5 +143,16 @@ let }); xcbuild = xcodebuild; })); + + darwin-stubs = stdenvNoCC.mkDerivation { + pname = "darwin-stubs"; + inherit (MacOSX-SDK) version; + + buildCommand = '' + mkdir -p "$out" + ln -s ${MacOSX-SDK}/System "$out/System" + ln -s ${MacOSX-SDK}/usr "$out/usr" + ''; + }; }; in packages diff --git a/pkgs/os-specific/darwin/apple-sdk/default.nix b/pkgs/os-specific/darwin/apple-sdk/default.nix index 5484ba5acb189..962f7f681c49d 100644 --- a/pkgs/os-specific/darwin/apple-sdk/default.nix +++ b/pkgs/os-specific/darwin/apple-sdk/default.nix @@ -350,5 +350,7 @@ in rec { frameworks = bareFrameworks // overrides bareFrameworks; + inherit darwin-stubs; + inherit sdk; } diff --git a/pkgs/os-specific/darwin/apple-source-releases/default.nix b/pkgs/os-specific/darwin/apple-source-releases/default.nix index ab13e91e37354..8a562cc825581 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/default.nix @@ -6,6 +6,9 @@ let # a stdenv out of something like this. With some care we can probably get rid of this, but for # now it's staying here. versions = { + "macos-14.3" = { + system_cmds = "970.0.4"; + }; "osx-10.12.6" = { xnu = "3789.70.16"; libiconv = "50"; @@ -155,7 +158,7 @@ let version = versions.${sdkName}.${pname}; in fetchApple' pname version sha256; - appleDerivation'' = stdenv: pname: version: sdkName: sha256: attrs: stdenv.mkDerivation ({ + appleDerivation'' = stdenv: pname: version: sdkName: sha256: attrs: stdenv.mkDerivation (finalAttrs: { inherit pname version; src = if attrs ? srcs then null else (fetchApple' pname version sha256); @@ -181,7 +184,7 @@ let fi ''; - } // attrs // { + } // (if builtins.isFunction attrs then attrs finalAttrs else attrs) // { meta = (with lib; { platforms = platforms.darwin; license = licenses.apsl20; @@ -276,7 +279,9 @@ developerToolsPackages_11_3_1 // macosPackages_11_0_1 // { libmalloc = if stdenv.isx86_64 then applePackage "libmalloc" "osx-10.12.6" "sha256-brfG4GEF2yZipKdhlPq6DhT2z5hKYSb2MAmffaikdO4=" {} else macosPackages_11_0_1.libmalloc; - libplatform = applePackage "libplatform" "osx-10.12.6" "sha256-6McMTjw55xtnCsFI3AB1osRagnuB5pSTqeMKD3gpGtM=" {}; + libplatform = if stdenv.isx86_64 then + applePackage "libplatform" "osx-10.12.6" "sha256-6McMTjw55xtnCsFI3AB1osRagnuB5pSTqeMKD3gpGtM=" {} + else macosPackages_11_0_1.libplatform; libpthread = applePackage "libpthread" "osx-10.12.6" "sha256-QvJ9PERmrCWBiDmOWrLvQUKZ4JxHuh8gS5nlZKDLqE8=" {}; libresolv = applePackage "libresolv" "osx-10.12.6" "sha256-FtvwjJKSFX6j9APYPC8WLXVOjbHLZa1Gcoc8yxLy8qE=" {}; Libsystem = applePackage "Libsystem" "osx-10.12.6" "sha256-zvRdCP//TjKCGAqm/5nJXPppshU1cv2fg/L/yK/olGQ=" {}; @@ -304,7 +309,7 @@ developerToolsPackages_11_3_1 // macosPackages_11_0_1 // { else macosPackages_11_0_1.network_cmds; file_cmds = applePackage "file_cmds" "osx-10.11.6" "sha256-JYy6HwmultKeZtLfaysbsyLoWg+OaTh7eJu54JkJC0Q=" {}; shell_cmds = applePackage "shell_cmds" "osx-10.11.6" "sha256-kmEOprkiJGMVcl7yHkGX8ymk/5KjE99gWuF8j2hK5hY=" {}; - system_cmds = applePackage "system_cmds" "osx-10.11.6" "sha256-KBdGlHeXo2PwgRQOOeElJ1RBqCY1Tdhn5KD42CMhdzI=" {}; + system_cmds = applePackage "system_cmds" "macos-14.3" "sha256-qFp9nkzsq9uQ7zoyfvO+3gvDlc7kaPvn6luvmO/Io30=" {}; text_cmds = applePackage "text_cmds" "osx-10.11.6" "sha256-KSebU7ZyUsPeqn51nzuGNaNxs9pvmlIQQdkWXIVzDxw=" {}; top = applePackage "top" "osx-10.11.6" "sha256-jbz64ODogtpNyLpXGSZj1jCBdFPVXcVcBkL1vc7g5qQ=" {}; PowerManagement = applePackage "PowerManagement" "osx-10.11.6" "sha256-bYGtYnBOcE5W03AZzfVTJXPZ6GgryGAMt/LgLPxFkVk=" {}; diff --git a/pkgs/os-specific/darwin/apple-source-releases/libplatform/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libplatform/default.nix index 39c801962692f..e0b25d27778a9 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libplatform/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libplatform/default.nix @@ -1,9 +1,10 @@ -{ appleDerivation', stdenvNoCC }: +{ lib, appleDerivation', stdenvNoCC }: -appleDerivation' stdenvNoCC { +appleDerivation' stdenvNoCC (finalAttrs: { installPhase = '' mkdir $out cp -r include $out/include + test -d private && cp -r private/* $out/include ''; appleHeaders = '' @@ -27,6 +28,12 @@ appleDerivation' stdenvNoCC { platform/introspection_private.h platform/string.h setjmp.h - ucontext.h - ''; -} + '' + ( + if lib.versionAtLeast finalAttrs.version "254.40.4" then '' + string_x86.h + ucontext.h + '' else '' + ucontext.h + '' + ); +}) diff --git a/pkgs/os-specific/darwin/apple-source-releases/macos-11.0.1.nix b/pkgs/os-specific/darwin/apple-source-releases/macos-11.0.1.nix index 0a70e648695d5..b4a7bbc4df243 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/macos-11.0.1.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/macos-11.0.1.nix @@ -40,7 +40,6 @@ objc4 = applePackage' "objc4" "818.2" "macos-11.0.1" "0m8mk1qd18wqjfn2jsq2lx6fxv ppp = applePackage' "ppp" "877.40.2" "macos-11.0.1" "06xznc77j45zzi12m4cmr3jj853qlc8dbmynbg1z6m9qf5phdbgk" {}; removefile = applePackage' "removefile" "49.40.3" "macos-11.0.1" "0870ihxpmvj8ggaycwlismbgbw9768lz7w6mc9vxf8l6nlc43z4f" {}; shell_cmds = applePackage' "shell_cmds" "216.40.4" "macos-11.0.1" "0wbysc9lwf1xgl686r3yn95rndcmqlp17zc1ig9gsl5fxyy5bghh" {}; -system_cmds = applePackage' "system_cmds" "880.40.5" "macos-11.0.1" "064yqf84ny0cjpqmzmnhz05faay6axb2r4i6knnyc8n21yiip5dc" {}; text_cmds = applePackage' "text_cmds" "106" "macos-11.0.1" "17fn35m6i866zjrf8da6cq6crydp6vp4zq0aaab243rv1fx303yy" {}; top = applePackage' "top" "129" "macos-11.0.1" "0d9pqmv3mwkfcv7c05hfvnvnn4rbsl92plr5hsazp854pshzqw2k" {}; xnu = applePackage' "xnu" "7195.50.7.100.1" "macos-11.0.1" "11zjmpw11rcc6a0xlbwramra1rsr65s4ypnxwpajgbr2c657lipl" {}; diff --git a/pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix index f708d77409007..7bd3cae118eb2 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix @@ -1,114 +1,161 @@ -{ stdenv, appleDerivation, lib -, libutil, Librpcsvc, apple_sdk, pam, CF, openbsm }: - -appleDerivation { - # xcbuild fails with: - # /nix/store/fc0rz62dh8vr648qi7hnqyik6zi5sqx8-xcbuild-wrapper/nix-support/setup-hook: line 1: 9083 Segmentation fault: 11 xcodebuild OTHER_CFLAGS="$NIX_CFLAGS_COMPILE" OTHER_CPLUSPLUSFLAGS="$NIX_CFLAGS_COMPILE" OTHER_LDFLAGS="$NIX_LDFLAGS" build - # see issue facebook/xcbuild#188 - # buildInputs = [ xcbuild ]; - - buildInputs = [ libutil Librpcsvc apple_sdk.frameworks.OpenDirectory pam CF - apple_sdk.frameworks.IOKit openbsm ]; - # env.NIX_CFLAGS_COMPILE = lib.optionalString hostPlatform.isi686 "-D__i386__" - # + lib.optionalString hostPlatform.isx86_64 "-D__x86_64__" - # + lib.optionalString hostPlatform.isAarch32 "-D__arm__"; - env.NIX_CFLAGS_COMPILE = toString ([ "-DDAEMON_UID=1" - "-DDAEMON_GID=1" - "-DDEFAULT_AT_QUEUE='a'" - "-DDEFAULT_BATCH_QUEUE='b'" - "-DPERM_PATH=\"/usr/lib/cron/\"" - "-DOPEN_DIRECTORY" - "-DNO_DIRECT_RPC" - "-DAPPLE_GETCONF_UNDERSCORE" - "-DAPPLE_GETCONF_SPEC" - "-DUSE_PAM" - "-DUSE_BSM_AUDIT" - "-D_PW_NAME_LEN=MAXLOGNAME" - "-D_PW_YPTOKEN=\"__YP!\"" - "-DAHZV1=64 " - "-DAU_SESSION_FLAG_HAS_TTY=0x4000" - "-DAU_SESSION_FLAG_HAS_AUTHENTICATED=0x4000" - ] ++ lib.optional (!stdenv.isLinux) " -D__FreeBSD__ "); - - patches = [ - # Fix implicit declarations that cause builds to fail when built with clang 16. - ./fix-implicit-declarations.patch +{ + lib, + stdenv, + stdenvNoCC, + appleDerivation, + fetchFromGitHub, + runCommand, + gawk, + meson, + ninja, + pkg-config, + libdispatch, + libmalloc, + libplatform, + Librpcsvc, + libutil, + ncurses, + openbsm, + pam, + xnu, + CoreFoundation, + CoreSymbolication, + DirectoryService, + IOKit, + Kernel, + Libc, + OpenDirectory, + WebKit, +}: + +let + OpenDirectoryPrivate = stdenvNoCC.mkDerivation (finalAttrs: { + name = "apple-private-framework-OpenDirectory"; + version = "146"; + + src = fetchFromGitHub { + owner = "apple-oss-distributions"; + repo = "OpenDirectory"; + rev = "OpenDirectory-${finalAttrs.version}"; + hash = "sha256-6fSl8PasCZSBfe0ftaePcBuSEO3syb6kK+mfDI6iR7A="; + }; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + + mkdir -p "$out/include/CFOpenDirectory" "$out/include/OpenDirectory" + install -t "$out/include/CFOpenDirectory" \ + Core/CFOpenDirectoryPriv.h \ + Core/CFODTrigger.h + touch "$out/include/CFOpenDirectory/CFOpenDirectoryConstantsPriv.h" + install -t "$out/include/OpenDirectory" \ + Framework/OpenDirectoryPriv.h \ + Framework/NSOpenDirectoryPriv.h + + runHook postInstall + ''; + }); + + libmallocPrivate = stdenvNoCC.mkDerivation { + pname = "libmalloc-private"; + version = lib.getVersion libmalloc; + + inherit (libmalloc) src; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + + mkdir -p "$out/include" + cp -r private/*.h "$out/include" + + runHook postInstall + ''; + }; + + # Private xnu headers that are part of the source tree but not in the xnu derivation. + xnuPrivate = stdenvNoCC.mkDerivation { + pname = "xnu-private"; + version = lib.getVersion xnu; + + inherit (xnu) src; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + + mkdir -p "$out/include" + cp libsyscall/wrappers/spawn/spawn_private.h "$out/include" + + runHook postInstall + ''; + }; +in +appleDerivation (finalAttrs: { + nativeBuildInputs = [ + gawk + meson + ninja + pkg-config + ]; + + buildInputs = [ + libdispatch + libplatform + Librpcsvc + libutil + ncurses + openbsm + pam + xnu + CoreFoundation + CoreSymbolication + DirectoryService + IOKit + Kernel + OpenDirectory ]; postPatch = '' - substituteInPlace login.tproj/login.c \ - --replace bsm/audit_session.h bsm/audit.h - substituteInPlace login.tproj/login_audit.c \ - --replace bsm/audit_session.h bsm/audit.h - '' + lib.optionalString stdenv.isAarch64 '' - substituteInPlace sysctl.tproj/sysctl.c \ - --replace "GPROF_STATE" "0" - substituteInPlace login.tproj/login.c \ - --replace "defined(__arm__)" "defined(__arm__) || defined(__arm64__)" + # Replace hard-coded, impure system paths with the output path in the store. + sed -e "s|PATH=[^;]*|PATH='$out/bin'|" -i "pagesize/pagesize.sh" ''; - buildPhase = '' - for dir in *.tproj; do - name=$(basename $dir) - name=''${name%.tproj} - - CFLAGS="" - case $name in - arch) CFLAGS="-framework CoreFoundation";; - atrun) CFLAGS="-Iat.tproj";; - chkpasswd) - CFLAGS="-framework OpenDirectory -framework CoreFoundation -lpam";; - getconf) - for f in getconf.tproj/*.gperf; do - cfile=''${f%.gperf}.c - LC_ALL=C awk -f getconf.tproj/fake-gperf.awk $f > $cfile - done - ;; - iostat) CFLAGS="-framework IOKit -framework CoreFoundation";; - login) CFLAGS="-lbsm -lpam";; - nvram) CFLAGS="-framework CoreFoundation -framework IOKit";; - sadc) CFLAGS="-framework IOKit -framework CoreFoundation";; - sar) CFLAGS="-Isadc.tproj";; - esac - - echo "Building $name" - - case $name in - - # These are all broken currently. - arch) continue;; - chpass) continue;; - dirhelper) continue;; - dynamic_pager) continue;; - fs_usage) continue;; - latency) continue;; - pagesize) continue;; - passwd) continue;; - reboot) continue;; - sc_usage) continue;; - shutdown) continue;; - trace) continue;; - - *) cc $dir/*.c -I''${dir} $CFLAGS -o $name ;; - esac - done + # A vendored meson.build is used instead of the upstream Xcode project. + # This is done for a few reasons: + # - The upstream project causes `xcbuild` to crash. + # See: https://github.com/facebookarchive/xcbuild/issues/188; + # - Achieving the same flexibility regarding SDK version would require modifying the + # Xcode project, but modifying Xcode projects without using Xcode is painful; and + # - Using Meson allows the derivation to leverage the robust Meson support in nixpkgs, + # and it allows it to use Meson features to simplify the build (e.g., generators). + preConfigure = '' + substitute '${./meson.build}' meson.build \ + --subst-var-by kernel '${Kernel}' \ + --subst-var-by libc_private '${Libc}' \ + --subst-var-by libmalloc_private '${libmallocPrivate}' \ + --subst-var-by opendirectory '${OpenDirectory}' \ + --subst-var-by opendirectory_private '${OpenDirectoryPrivate}' \ + --subst-var-by xnu '${xnu}' \ + --subst-var-by xnu_private '${xnuPrivate}' \ + --subst-var-by version '${finalAttrs.version}' + cp '${./meson.options}' meson.options ''; - installPhase = '' - for dir in *.tproj; do - name=$(basename $dir) - name=''${name%.tproj} - [ -x $name ] && install -D $name $out/bin/$name - for n in 1 2 3 4 5 6 7 8 9; do - for f in $dir/*.$n; do - install -D $f $out/share/man/man$n/$(basename $f) - done - done - done - ''; + mesonFlags = [ (lib.mesonOption "sdk_version" stdenv.hostPlatform.darwinSdkVersion) ]; meta = { platforms = lib.platforms.darwin; - maintainers = with lib.maintainers; [ shlevy matthewbauer ]; + maintainers = with lib.maintainers; [ + shlevy + matthewbauer + ]; }; -} +}) diff --git a/pkgs/os-specific/darwin/apple-source-releases/system_cmds/fix-implicit-declarations.patch b/pkgs/os-specific/darwin/apple-source-releases/system_cmds/fix-implicit-declarations.patch deleted file mode 100644 index b08f54045724f..0000000000000 --- a/pkgs/os-specific/darwin/apple-source-releases/system_cmds/fix-implicit-declarations.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff -ur a/getty.tproj/main.c b/getty.tproj/main.c ---- a/getty.tproj/main.c 2008-06-10 14:50:19.000000000 -0400 -+++ b/getty.tproj/main.c 2023-05-31 18:06:40.121028558 -0400 -@@ -67,6 +67,7 @@ - #include <syslog.h> - #include <termios.h> - #include <time.h> -+#include <util.h> - #include <unistd.h> - - #ifdef __APPLE__ -@@ -152,7 +153,7 @@ - static void putpad(const char *); - static void puts(const char *); - static void timeoverrun(int); --static char *getline(int); -+static char *get_line(int); - static void setttymode(int); - static int opentty(const char *, int); - -@@ -352,7 +353,7 @@ - if ((fd = open(IF, O_RDONLY)) != -1) { - char * cp; - -- while ((cp = getline(fd)) != NULL) { -+ while ((cp = get_line(fd)) != NULL) { - putf(cp); - } - close(fd); -@@ -744,7 +745,7 @@ - - - static char * --getline(int fd) -+get_line(int fd) - { - int i = 0; - static char linebuf[512]; ---- a/newgrp.tproj/newgrp.c 2021-10-06 01:38:52.000000000 -0400 -+++ b/newgrp.tproj/newgrp.c 2023-05-31 22:26:50.656157841 -0400 -@@ -47,6 +47,7 @@ - #include <string.h> - #include <unistd.h> - #ifdef __APPLE__ -+#include <membership.h> - #include <paths.h> - #endif /* __APPLE__ */ - static void addgroup(const char *grpname); diff --git a/pkgs/os-specific/darwin/apple-source-releases/system_cmds/meson.build b/pkgs/os-specific/darwin/apple-source-releases/system_cmds/meson.build new file mode 100644 index 0000000000000..de73e88f5d4d3 --- /dev/null +++ b/pkgs/os-specific/darwin/apple-source-releases/system_cmds/meson.build @@ -0,0 +1,544 @@ +# Build settings based on the upstream Xcode project. +# See: https://github.com/apple-oss-distributions/system_cmds/blob/main/system_cmds.xcodeproj/project.pbxproj + + +# Project settings +project('system_cmds', 'c', version : '@version@') + +if host_machine.system() != 'linux' + add_project_arguments('-D__FreeBSD__', language : 'c') +endif + +sdk_version = get_option('sdk_version') + + +# Dependencies +cc = meson.get_compiler('c') +# Upstream uses awk to process `.gperf` files instead of gperf, which can’t process them. +fake_gperf = find_program('awk', required : true) + +## Frameworks +core_foundation = dependency('appleframeworks', modules : 'CoreFoundation') +core_symbolication = dependency('appleframeworks', modules : 'CoreSymbolication') +directory_service = dependency('appleframeworks', modules : 'DirectoryService') +iokit = dependency('appleframeworks', modules : 'IOKit') +kernel = declare_dependency(include_directories : '@kernel@/Library/Frameworks/Kernel.framework/Headers') +open_directory = dependency('appleframeworks', modules : 'OpenDirectory') + +## Private Headers +cfopen_directory = declare_dependency( + dependencies : declare_dependency( + compile_args :[ '-iframework', '@opendirectory@/Library/Frameworks/OpenDirectory.framework/Frameworks' ], + ), + include_directories : '@opendirectory_private@/include', +) +libc_private = declare_dependency(include_directories : '@libc_private@/include') +libmalloc_private = declare_dependency(include_directories : '@libmalloc_private@/include') + +xnu_include_dirs = [ + '@xnu@/include/bsd', + '@xnu@/include/libkern', + '@xnu@/include/iokit', + '@xnu@/include/osfmk', + '@xnu_private@/include' +] +if sdk_version.version_compare('>=10.13') + xnu_include_dirs += '@xnu@/include/san' +endif +xnu_private = declare_dependency( + compile_args : [ + # Suppresses suffixing symbols with '$UNIX2003', which causes link failures. + '-D__DARWIN_ONLY_UNIX_CONFORMANCE=1', + # Make sure Darwin is correctly detected as macOS + '-DPLATFORM_MacOSX=1', + # Access private definitions + '-DPRIVATE=1' + ], + include_directories : xnu_include_dirs +) + +## Libraries +ncurses = dependency('ncurses') +openbsm = cc.find_library('bsm') +pam = cc.find_library('pam') + +# Feature Tests +if sdk_version.version_compare('<12') + add_project_arguments('-DkIOMainPortDefault=kIOMasterPortDefault', language : 'c') + add_project_arguments('-DIOMainPort=IOMasterPort', language : 'c') +endif + + +# Generators +pgperf = generator( + fake_gperf, + arguments : [ '-f', meson.source_root() + '/getconf/fake-gperf.awk', '@INPUT@' ], + capture : true, + output : '@BASENAME@.gperf.c' +) + + +# Binaries +executable('ac', install : true, sources : 'ac/ac.c') +install_man('ac/ac.8') + +executable('accton', install : true, sources : 'accton/accton.c') +install_man('accton/accton.8') + +executable( + 'arch', + build_by_default : sdk_version.version_compare('>=11'), + install : sdk_version.version_compare('>=11'), + sources : 'arch/arch.c' +) +install_man( + 'arch/arch.1', + 'arch/machine.1' +) + +executable( + 'at', + c_args : [ + '-DDAEMON_UID=1', + '-DDAEMON_GID=1', + '-DDEFAULT_AT_QUEUE=\'a\'', + '-DDEFAULT_BATCH_QUEUE=\'b\'', + '-DPERM_PATH="/usr/lib/cron"', + ], + install : true, + sources : [ + 'at/at.c', + 'at/panic.c', + 'at/parsetime.c', + 'at/perm.c' + ] +) +install_man('at/at.1') + +executable( + 'atrun', + c_args : [ '-DDAEMON_UID=1', '-DDAEMON_GID=1' ], + include_directories : 'at', + install : true, + sources : [ + 'atrun/atrun.c', + 'atrun/gloadavg.c' + ] +) +install_man('atrun/atrun.8') + +executable( + 'chkpasswd', + c_args : '-DUSE_PAM', + dependencies : [ core_foundation, open_directory, pam ], + install : true, + sources : [ + 'chkpasswd/file_passwd.c', + 'chkpasswd/nis_passwd.c', + 'chkpasswd/od_passwd.c', + 'chkpasswd/pam_passwd.c', + 'chkpasswd/passwd.c', + 'chkpasswd/stringops.c' + ] +) +install_man('chkpasswd/chkpasswd.8') + +executable( + 'chpass', + dependencies : [ cfopen_directory, directory_service, open_directory ], + install : true, + sources : [ + 'chpass/chpass.c', + 'chpass/edit.c', + 'chpass/field.c', + 'chpass/open_directory.c', + 'chpass/table.c', + 'chpass/util.c' + ] +) +install_man('chpass/chpass.1') + +executable('cpuctl', install : true, sources : 'cpuctl/cpuctl.c') +install_man('cpuctl/cpuctl.8') + +executable('dmesg', install : true, sources : 'dmesg/dmesg.c') +install_man('dmesg/dmesg.8') + +executable( + 'dynamic_pager', + c_args : '-DNO_DIRECT_RPC', + install : true, + sources : 'dynamic_pager/dynamic_pager.c' +) +install_man('dynamic_pager/dynamic_pager.8') + +executable( + 'fs_usage', + # Requires 'ktrace/session.h' + build_by_default : false, + install : false, + sources : 'fs_usage/fs_usage.c' +) +# install_man('fs_usage/fs_usage.1') + +executable( + 'gcore', + # Requires XPC private APIs + build_by_default : false and sdk_version.version_compare('>=11'), + install : false and sdk_version.version_compare('>=11'), + sources : [ + 'gcore/convert.c', + 'gcore/corefile.c', + 'gcore/dyld.c', + 'gcore/dyld_shared_cache.c', + 'gcore/main.c', + 'gcore/sparse.c', + 'gcore/threads.c', + 'gcore/utils.c', + 'gcore/vanilla.c', + 'gcore/vm.c' + ] +) +# install_man('gcore/gcore-internal.1', 'gcore/gcore.1') + +executable( + 'getconf', + c_args : '-DAPPLE_GETCONF_UNDERSCORE', + include_directories : 'getconf', + install : true, + sources : [ + 'getconf/getconf.c', + ] + pgperf.process( + [ + 'getconf/confstr.gperf', + 'getconf/limits.gperf', + 'getconf/unsigned_limits.gperf', + 'getconf/progenv.gperf', + 'getconf/sysconf.gperf', + 'getconf/pathconf.gperf' + ] + ) +) +install_man('getconf/getconf.1') + +executable( + 'getty', + install : true, + sources : [ + 'getty/chat.c', + 'getty/init.c', + 'getty/main.c', + 'getty/subr.c' + ] +) +install_man( + 'getty/getty.8', + 'getty/gettytab.5', + 'getty/ttys.5' +) + +executable('hostinfo', install : true, sources : 'hostinfo/hostinfo.c') +install_man('hostinfo/hostinfo.8') + +executable( + 'iosim', + dependencies : [ core_foundation, iokit ], + include_directories : 'at', + install : true, + sources : 'iosim/iosim.c' +) +install_man('iosim/iosim.1') + +executable( + 'iostat', + dependencies : [ core_foundation, iokit ], + install : true, + sources : 'iostat/iostat.c' +) +install_man('iostat/iostat.8') + +executable( + 'kpgo', + dependencies : [ xnu_private ], + install : true, + sources : 'kpgo/kpgo.c' +) +# No man pages for `kpgo` + +executable( + 'latency', + build_by_default : sdk_version.version_compare('>=12'), + dependencies : ncurses, + install : sdk_version.version_compare('>=12'), + sources : 'latency/latency.c' +) +if sdk_version.version_compare('>=12') + install_man('latency/latency.1') +endif + +executable( + 'login', + # Requires SoftLinking/WeakLinking.h and end-point security entitlements + build_by_default : false, + c_args : '-DUSE_BSM_AUDIT=1', + dependencies : [ openbsm, xnu_private ], + install : false, + sources : [ + 'login/login.c', + 'login/login_audit.c' + ] +) +# install_man('login/login.1') + +executable( + 'lskq', + build_by_default : sdk_version.version_compare('>=12'), + install : sdk_version.version_compare('>=12'), + sources : 'lskq/lskq.c' +) +if sdk_version.version_compare('>=12') + install_man('lskq/lskq.1') +endif + +executable( + 'lsmp', + build_by_default : sdk_version.version_compare('>=12'), + install : sdk_version.version_compare('>=12'), + sources : [ + 'lsmp/lsmp.c', + 'lsmp/port_details.c', + 'lsmp/task_details.c' + ] +) +if sdk_version.version_compare('>=12') + install_man('lsmp/lsmp.1') +endif + +executable( + 'ltop', + install : true, + sources : 'ltop/ltop.c' +) +install_man('ltop/ltop.1') + +executable('mean', install : true, sources : 'mean/mean.c') +# No man pages for `mean`. + +executable( + 'memory_pressure', + dependencies : [ xnu_private ], + install : true, + sources : 'memory_pressure/memory_pressure.c' +) +install_man('memory_pressure/memory_pressure.1') + +executable('mkfile', install : true, sources : 'mkfile/mkfile.c') +install_man('mkfile/mkfile.8') + +executable( + 'mslutil', + build_by_default : sdk_version.version_compare('>=10.13'), + dependencies : [ libmalloc_private ], + install : sdk_version.version_compare('>=10.13'), + sources : 'mslutil/mslutil.c' +) +if sdk_version.version_compare('>=10.13') + install_man('mslutil/mslutil.1') +endif + +executable('newgrp', install : true, sources : 'newgrp/newgrp.c') +install_man('newgrp/newgrp.1') + +executable('nologin', install : true, sources : 'nologin/nologin.c') +install_man( + 'nologin/nologin.5', + 'nologin/nologin.8' +) + +executable( + 'nvram', + c_args : '-DTARGET_OS_BRIDGE=0', + dependencies : [ iokit, libc_private, xnu_private ], + install : true, + sources : 'nvram/nvram.c' +) +install_man('nvram/nvram.8') + +custom_target( + 'pagesize', + command : [ 'cp', '@INPUT@', '@OUTPUT@' ], + install : true, + install_dir : get_option('bindir'), + install_mode : 'r-xr-xr-x', + input : 'pagesize/pagesize.sh', + output : 'pagesize' +) +install_man('pagesize/pagesize.1') + +executable( + 'passwd', + dependencies : [ cfopen_directory, directory_service, open_directory, pam ], + install : true, + sources : [ + 'passwd/file_passwd.c', + 'passwd/nis_passwd.c', + 'passwd/od_passwd.c', + 'passwd/pam_passwd.c', + 'passwd/passwd.c' + ] +) +install_man('passwd/passwd.1') + +executable( + 'proc_uuid_policy', + install : true, + sources : 'proc_uuid_policy/proc_uuid_policy.c' +) +install_man('proc_uuid_policy/proc_uuid_policy.1') + +executable('purge', install : true, sources : 'purge/purge.c') +install_man('purge/purge.8') + +executable( + 'pwd_mkdb', + c_args : [ '-D_PW_NAME_LEN=MAXLOGNAME', '-D_PW_YPTOKEN="__YP!"' ], + install : true, + sources : [ + 'pwd_mkdb/pw_scan.c', + 'pwd_mkdb/pwd_mkdb.c' + ] +) +install_man('pwd_mkdb/pwd_mkdb.8') + +executable( + 'reboot', + # Requires IOKitUser kext APIs + build_by_default : false, + install : false, + sources : 'reboot/reboot.c' +) +# install_man('reboot/reboot.8') + +executable( + 'sa', + c_args : '-DAHZV1', + install : true, + sources : [ + 'sa/db.c', + 'sa/main.c', + 'sa/pdb.c', + 'sa/usrdb.c' + ] +) +install_man('sa/sa.8') + +executable( + 'sc_usage', + build_by_default : sdk_version.version_compare('>=12'), + dependencies : ncurses, + install : sdk_version.version_compare('>=12'), + sources : 'sc_usage/sc_usage.c' +) +if sdk_version.version_compare('>=12') + install_man('sc_usage/sc_usage.1') +endif + +executable('shutdown', + # Requires IOKitUser kext APIs + build_by_default : false, + install : false, + sources : 'shutdown/shutdown.c' +) +# install_man('shutdown/shutdown.8') + +executable( + 'stackshot', + build_by_default : sdk_version.version_compare('>=10.13'), + dependencies : [ xnu_private ], + install : sdk_version.version_compare('>=10.13'), + sources : 'stackshot/stackshot.c' +) +# No man pages for `stackshot`. + +executable('sync', install : true, sources : 'sync/sync.c') +# No man pages for `sync`. + +executable('sysctl', install : true, sources : 'sysctl/sysctl.c') +install_man( + 'sysctl/sysctl.8', + 'sysctl/sysctl.conf.5' +) + +executable( + 'taskpolicy', + build_by_default : sdk_version.version_compare('>=11'), + dependencies : [ xnu_private ], + install : sdk_version.version_compare('>=11'), + sources : 'taskpolicy/taskpolicy.c' +) +if sdk_version.version_compare('>=11') + install_man('taskpolicy/taskpolicy.8') +endif + +executable('vifs', install : true, sources : 'vifs/vifs.c') +install_man('vifs/vifs.8') + +executable( + 'vipw', + install : true, + sources : [ + 'vipw/pw_util.c', + 'vipw/vipw.c' + ] +) +install_man('vipw/vipw.8') + +executable('vm_purgeable_stat', + build_by_default : sdk_version.version_compare('>=11'), + install : sdk_version.version_compare('>=11'), + sources : 'vm_purgeable_stat/vm_purgeable_stat.c' +) +if sdk_version.version_compare('>=11') + install_man('vm_purgeable_stat/vm_purgeable_stat.1') +endif + +executable('vm_stat', install : true, sources : 'vm_stat/vm_stat.c') +install_man('vm_stat/vm_stat.1') + +executable('wait4path', install : true, sources : 'wait4path/wait4path.c') +install_man('wait4path/wait4path.1') + +executable('wordexp-helper', install : true, sources : 'wordexp-helper/wordexp-helper.c') +# No man pages for `wordexp-helper`. + +executable('zdump', include_directories : 'zic', install : true, sources : 'zdump/zdump.c') +install_man('zdump/zdump.8') + +executable('zic', install : true, sources : 'zic/zic.c') +install_man('zic/zic.8') + +executable( + 'zlog', + build_by_default : sdk_version.version_compare('>=11'), + c_args : '-DKERN_NOT_FOUND=56', + dependencies : core_symbolication, + install : sdk_version.version_compare('>=11'), + sources : [ + 'zlog/SymbolicationHelper.c', + 'zlog/zlog.c', + ] +) +if sdk_version.version_compare('>=11') + install_man('zlog/zlog.1') +endif + +executable( + 'zprint', + # Requires IOKitUser kext APIs + build_by_default : false, + dependencies: [ kernel ], + install : false, + sources : 'zprint/zprint.c' +) +# install_man('zprint/zprint.1') + diff --git a/pkgs/os-specific/darwin/apple-source-releases/system_cmds/meson.options b/pkgs/os-specific/darwin/apple-source-releases/system_cmds/meson.options new file mode 100644 index 0000000000000..8c4ce874c64c5 --- /dev/null +++ b/pkgs/os-specific/darwin/apple-source-releases/system_cmds/meson.options @@ -0,0 +1 @@ +option('sdk_version', type : 'string') diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix index 03eb1959c9b27..e2e4384908a8c 100644 --- a/pkgs/os-specific/linux/iproute/default.nix +++ b/pkgs/os-specific/linux/iproute/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "iproute2"; - version = "6.7.0"; + version = "6.8.0"; src = fetchurl { url = "mirror://kernel/linux/utils/net/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-/5Qt2YKNfR+Gf2H+cs5DMHjDHl2OSnjiDwLLWJLohB0="; + hash = "sha256-A6bMo9cakI0fFfe0lb4rj+hR+UFFjcRmSQDX9F/PaM4="; }; postPatch = '' diff --git a/pkgs/os-specific/linux/mdadm/default.nix b/pkgs/os-specific/linux/mdadm/default.nix index e7aa16d3dd39a..7f2195529c6c0 100644 --- a/pkgs/os-specific/linux/mdadm/default.nix +++ b/pkgs/os-specific/linux/mdadm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mdadm"; - version = "4.2"; + version = "4.3"; src = fetchurl { url = "mirror://kernel/linux/utils/raid/mdadm/mdadm-${version}.tar.xz"; - sha256 = "sha256-RhwhVnCGS7dKTRo2IGhKorL4KW3/oGdD8m3aVVes8B0="; + sha256 = "sha256-QWcnrh8QgOpuMJDOo23QdoJvw2kVHjarc2VXupIZb58="; }; patches = [ ./no-self-references.patch ]; diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 05e66dd704afd..d07150493fc37 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -176,7 +176,7 @@ assert withBootloader -> withEfi; let wantCurl = withRemote || withImportd; wantGcrypt = withResolved || withImportd; - version = "255.2"; + version = "255.4"; # Use the command below to update `releaseTimestamp` on every (major) version # change. More details in the commentary at mesonFlags. @@ -194,7 +194,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "systemd"; repo = "systemd-stable"; rev = "v${version}"; - hash = "sha256-8SfJY/pcH4yrDeJi0GfIUpetTbpMwyswvSu+RSfgqfY="; + hash = "sha256-P1mKq+ythrv8MU7y2CuNtEx6qCDacugzfsPRZL+NPys="; }; # On major changes, or when otherwise required, you *must* : diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index c1507d4ea5cd1..4981f5938de21 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -77,11 +77,15 @@ stdenv.mkDerivation rec { ''; enableParallelBuilding = true; - # TODO: investigate the aarch64-linux failures; see this and linked discussions: + + doCheck = false; + # TODO: investigate failures; see this and linked discussions: # https://github.com/NixOS/nixpkgs/pull/192962 + /* doCheck = with stdenv.hostPlatform; !isStatic && !(isAarch64 && isLinux) # https://gitlab.isc.org/isc-projects/bind9/-/issues/4269 && !is32bit; + */ checkTarget = "unit"; checkInputs = [ cmocka diff --git a/pkgs/servers/ldap/389/default.nix b/pkgs/servers/ldap/389/default.nix index 18aeea04cb623..ce61f9676e188 100644 --- a/pkgs/servers/ldap/389/default.nix +++ b/pkgs/servers/ldap/389/default.nix @@ -141,5 +141,9 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = [ maintainers.ners ]; + # https://hydra.nixos.org/build/249763145, doesn't build since glibc 2.39. + # Potential fix is documented in https://github.com/389ds/389-ds-base/issues/5332, + # but it doesn't apply here. + broken = true; }; } diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index 5f078d2f6fcfe..e32ef9bc1df64 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -6,6 +6,7 @@ , soxr, speexdsp, systemd, webrtc-audio-processing_1 , gst_all_1 , check, libintl, meson, ninja, m4, wrapGAppsHook +, fetchpatch2 , x11Support ? false @@ -48,6 +49,19 @@ stdenv.mkDerivation rec { # Install sysconfdir files inside of the nix store, # but use a conventional runtime sysconfdir outside the store ./add-option-for-installation-sysconfdir.patch + + # Fix crashes with some UCM devices + # See https://gitlab.archlinux.org/archlinux/packaging/packages/pulseaudio/-/issues/4 + (fetchpatch2 { + name = "alsa-ucm-Check-UCM-verb-before-working-with-device-status.patch"; + url = "https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/commit/f5cacd94abcc47003bd88ad7ca1450de649ffb15.patch"; + hash = "sha256-WyEqCitrqic2n5nNHeVS10vvGy5IzwObPPXftZKy/A8="; + }) + (fetchpatch2 { + name = "alsa-ucm-Replace-port-device-UCM-context-assertion-with-an-error.patch"; + url = "https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/commit/ed3d4f0837f670e5e5afb1afa5bcfc8ff05d3407.patch"; + hash = "sha256-fMJ3EYq56sHx+zTrG6osvI/QgnhqLvWiifZxrRLMvns="; + }) ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index e2ebe4d6bbb5d..b1094630dd465 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -158,8 +158,16 @@ let __stdenvImpureHostDeps = commonImpureHostDeps; __extraImpureHostDeps = commonImpureHostDeps; + # Using the bootstrap tools curl for fetchers allows the stdenv bootstrap to avoid + # having a dependency on curl, allowing curl to be updated without triggering a + # new stdenv bootstrap on Darwin. overrides = self: super: (overrides self super) // { fetchurl = thisStdenv.fetchurlBoot; + fetchpatch = super.fetchpatch.override { inherit (self) fetchurl; }; + fetchgit = super.fetchgit.override { + git = super.git.override { curl = bootstrapTools; }; + }; + fetchzip = super.fetchzip.override { inherit (self) fetchurl; }; }; }; @@ -415,8 +423,6 @@ in buildInputs = old.buildInputs ++ [ self.darwin.CF ]; }); - curl = super.curlMinimal; - # Disable tests because they use dejagnu, which fails to run. libffi = super.libffi.override { doCheck = false; }; @@ -489,8 +495,9 @@ in ''; }) - # Build sysctl and Python for use by LLVM’s check phase. These must be built in their - # own stage, or an infinite recursion results on x86_64-darwin when using the source-based SDK. + # Build cctools, Python, and sysctl for use by LLVM’s check phase. They must be built in + # their stage to prevent infinite recursions and to make sure the stdenv used to build + # LLVM has the newly built cctools instead of the one from the bootstrap tools. (prevStage: # previous stage1 stdenv: assert lib.all isFromBootstrapFiles (with prevStage; [ coreutils gnugrep ]); @@ -1027,40 +1034,11 @@ in # LLVM dependencies - don’t rebuild them. libffi libiconv libxml2 ncurses zlib; - # These overrides are required to break an infinite recursion. curl depends on Darwin - # frameworks, but those frameworks require these dependencies to build, which - # depend on curl indirectly. - cpio = super.cpio.override { - inherit (prevStage) fetchurl; - }; - - libyaml = super.libyaml.override { - inherit (prevStage) fetchFromGitHub; - }; - - pbzx = super.pbzx.override { - inherit (prevStage) fetchFromGitHub; - }; - - python3Minimal = super.python3Minimal.override { - inherit (prevStage) fetchurl; - }; - - xar = super.xar.override { - inherit (prevStage) fetchurl; - }; - darwin = super.darwin.overrideScope (selfDarwin: superDarwin: { inherit (prevStage.darwin) dyld CF Libsystem darwin-stubs # CF dependencies - don’t rebuild them. libobjc objc4; - # rewrite-tbd is also needed to build Darwin frameworks, so it’s built using the - # previous stage’s fetchFromGitHub to avoid an infinite recursion (same as above). - rewrite-tbd = superDarwin.rewrite-tbd.override { - inherit (prevStage) fetchFromGitHub; - }; - signingUtils = superDarwin.signingUtils.override { inherit (selfDarwin) sigtool; }; @@ -1075,6 +1053,28 @@ in bintools = selfDarwin.binutils-unwrapped; libc = selfDarwin.Libsystem; }; + + # cctools needs to build the LLVM man pages, which requires sphinx. Sphinx + # has hatch-vcs as a transitive dependency, which pulls in git (and curl). + # Disabling the tests for hatch-vcs allows the stdenv bootstrap to avoid having + # any dependency on curl other than the one provided in the bootstrap tools. + cctools-llvm = superDarwin.cctools-llvm.override (old: { + llvmPackages = + let + tools = old.llvmPackages.tools.extend (_: superTools: { + llvm-manpages = superTools.llvm-manpages.override { + python3Packages = prevStage.python3Packages.overrideScope (_: superPython: { + hatch-vcs = (superPython.hatch-vcs.override { + git = null; + pytestCheckHook = null; + }); + }); + }; + }); + inherit (old.llvmPackages) libraries release_version; + in + { inherit tools libraries release_version; } // tools // libraries; + }); }); llvmPackages = super.llvmPackages // ( diff --git a/pkgs/tools/X11/xdg-utils/default.nix b/pkgs/tools/X11/xdg-utils/default.nix index b9c286328a49b..3a45cdffe4210 100644 --- a/pkgs/tools/X11/xdg-utils/default.nix +++ b/pkgs/tools/X11/xdg-utils/default.nix @@ -1,8 +1,8 @@ -{ lib, stdenv, fetchFromGitLab, fetchFromGitHub, fetchpatch, writeText +{ lib, stdenv, fetchFromGitLab, fetchFromGitHub, writeText # docs deps , libxslt, docbook_xml_dtd_412, docbook_xml_dtd_43, docbook_xsl, xmlto # runtime deps -, resholve, bash, coreutils, dbus, file, gawk, glib, gnugrep, gnused, jq, nettools, procmail, procps, xdg-user-dirs +, resholve, bash, coreutils, dbus, file, gawk, glib, gnugrep, gnused, jq, nettools, procmail, procps, which, xdg-user-dirs , perl, perlPackages , mimiSupport ? false , withXdgOpenUsePortalPatch ? true }: @@ -212,6 +212,25 @@ let "$handler" = true; }; } + + { + scripts = [ "bin/xdg-terminal" ]; + interpreter = "${bash}/bin/bash"; + inputs = commonDeps ++ [ bash glib.bin which ]; + fake.external = commonFakes ++ [ + "gconftool-2" # GNOME + "exo-open" # XFCE + "lxterminal" # LXQT + "qterminal" # LXQT + "terminology" # Englightenment + ]; + keep = { + "$command" = true; + "$kreadconfig" = true; + "$terminal_exec" = true; + }; + prologue = commonPrologue; + } ]; in @@ -231,6 +250,8 @@ stdenv.mkDerivation rec { # Allow forcing the use of XDG portals using NIXOS_XDG_OPEN_USE_PORTAL environment variable. # Upstream PR: https://github.com/freedesktop/xdg-utils/pull/12 ./allow-forcing-portal-use.patch + # Enable build of xdg-terminal + ./enable-xdg-terminal.patch ]; # just needed when built from git diff --git a/pkgs/tools/X11/xdg-utils/enable-xdg-terminal.patch b/pkgs/tools/X11/xdg-utils/enable-xdg-terminal.patch new file mode 100644 index 0000000000000..c98e3b10c6f05 --- /dev/null +++ b/pkgs/tools/X11/xdg-utils/enable-xdg-terminal.patch @@ -0,0 +1,12 @@ +--- a/scripts/Makefile.in ++++ b/scripts/Makefile.in +@@ -21,7 +21,8 @@ + xdg-open \ + xdg-email \ + xdg-screensaver \ +- xdg-settings ++ xdg-settings \ ++ xdg-terminal + # xdg-su + # xdg-copy \ + # xdg-file-dialog diff --git a/pkgs/tools/compression/xz/default.nix b/pkgs/tools/compression/xz/default.nix index 480eff1970882..4431a178ac02f 100644 --- a/pkgs/tools/compression/xz/default.nix +++ b/pkgs/tools/compression/xz/default.nix @@ -11,11 +11,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "xz"; - version = "5.6.1"; + version = "5.4.6"; # Beware of CVE-2024-3094 and related risks!!! src = fetchurl { - url = with finalAttrs; "https://github.com/tukaani-project/xz/releases/download/v${version}/xz-${version}.tar.bz2"; - hash = "sha256-0wBCJkmgEksRIWML5VnIkM7t8yZn1wZLgSiTMWbCF8g="; + url = with finalAttrs; + # The original URL has been taken down. + # "https://github.com/tukaani-project/xz/releases/download/v${version}/xz-${version}.tar.bz2"; + "mirror://sourceforge/lzmautils/xz-${version}.tar.bz2"; + sha256 = "sha256-kThRsnTo4dMXgeyUnxwj6NvPDs9uc6JDbcIXad0+b0k="; }; strictDeps = true; diff --git a/pkgs/tools/graphics/spirv-cross/default.nix b/pkgs/tools/graphics/spirv-cross/default.nix index 73413c1aee4c1..c6aaf73c1eb9d 100644 --- a/pkgs/tools/graphics/spirv-cross/default.nix +++ b/pkgs/tools/graphics/spirv-cross/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "spirv-cross"; - version = "1.3.275.0"; + version = "1.3.280.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Cross"; rev = "vulkan-sdk-${finalAttrs.version}"; - hash = "sha256-Mhr3Yxm5MeLLQFmxWmtXLsq+ZcOE+KMs+3iiTYF8t30="; + hash = "sha256-jWTTUHUvUyF5Vern3QXZo96Yvp7/T1WQjt3OpvJczsw="; }; nativeBuildInputs = [ cmake python3 ]; diff --git a/pkgs/tools/graphics/vulkan-extension-layer/default.nix b/pkgs/tools/graphics/vulkan-extension-layer/default.nix index 336c31811aa21..7d5273b4c30c0 100644 --- a/pkgs/tools/graphics/vulkan-extension-layer/default.nix +++ b/pkgs/tools/graphics/vulkan-extension-layer/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "vulkan-extension-layer"; - version = "1.3.275.0"; + version = "1.3.280.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-ExtensionLayer"; rev = "vulkan-sdk-${version}"; - hash = "sha256-zQycF3yKoa54KBUIuG1BqFGB00yc6oZQzdcDel2rXN0="; + hash = "sha256-THy2/hZacOI6IUPFk8cckpBKM4W3pFFeeEwSTVoMDQo="; }; nativeBuildInputs = [ cmake pkg-config jq ]; diff --git a/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix b/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix index 778b136558869..6ac7ac411185d 100644 --- a/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix +++ b/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { pname = "vulkan-tools-lunarg"; - version = "1.3.275.0"; + version = "1.3.280.0"; src = fetchFromGitHub { owner = "LunarG"; repo = "VulkanTools"; rev = "vulkan-sdk-${version}"; - hash = "sha256-MEQX90HL90jyVBWWcvOF7QLzm1+fNE5TW3MWdK4w53M="; + hash = "sha256-tp5b7/1lDF9oe/AsiqhVCvYY8p9UguGAgIkLS/hIhfQ="; }; nativeBuildInputs = [ cmake python3 jq which pkg-config libsForQt5.qt5.wrapQtAppsHook ]; diff --git a/pkgs/tools/graphics/vulkan-tools/default.nix b/pkgs/tools/graphics/vulkan-tools/default.nix index e084f7e2285b7..95423b68d6b90 100644 --- a/pkgs/tools/graphics/vulkan-tools/default.nix +++ b/pkgs/tools/graphics/vulkan-tools/default.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation rec { pname = "vulkan-tools"; - version = "1.3.275.0"; + version = "1.3.280.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-Tools"; rev = "vulkan-sdk-${version}"; - hash = "sha256-0sAwO8gXzpMst+7l7LS1oiDLo9E6otDktCti+v8jwDw="; + hash = "sha256-v6Piz1nvNffopz5FVRkgJ1pXj63jCWTyNopkpjcBFXA="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/security/gnupg/24.nix b/pkgs/tools/security/gnupg/24.nix index 95a6d9c0fa5ff..cc3ae15e9a1c7 100644 --- a/pkgs/tools/security/gnupg/24.nix +++ b/pkgs/tools/security/gnupg/24.nix @@ -13,11 +13,11 @@ assert guiSupport -> enableMinimal == false; stdenv.mkDerivation rec { pname = "gnupg"; - version = "2.4.4"; + version = "2.4.5"; src = fetchurl { url = "mirror://gnupg/gnupg/${pname}-${version}.tar.bz2"; - hash = "sha256-Z+vgFsqQ+naIzmejh+vYLGJh6ViX23sj3yT/M1voW8Y="; + hash = "sha256-9o99ddBssWNcM2002ESvl0NsP2TqFLy3yGl4L5b0Qnc="; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; diff --git a/pkgs/tools/video/svt-av1/default.nix b/pkgs/tools/video/svt-av1/default.nix index d40047510f405..d84200c3847ce 100644 --- a/pkgs/tools/video/svt-av1/default.nix +++ b/pkgs/tools/video/svt-av1/default.nix @@ -4,17 +4,20 @@ , gitUpdater , cmake , nasm + +# for passthru.tests +, ffmpeg }: stdenv.mkDerivation (finalAttrs: { pname = "svt-av1"; - version = "1.8.0"; + version = "2.0.0"; src = fetchFromGitLab { owner = "AOMediaCodec"; repo = "SVT-AV1"; rev = "v${finalAttrs.version}"; - hash = "sha256-JV65VuEPJBrADsGviBnE6EgZmbqJ4Z4qli6cAfUMmkw="; + hash = "sha256-yfKnkO8GPmMpTWTVYDliERouSFgQPe3CfJmVussxfHY="; }; nativeBuildInputs = [ @@ -26,8 +29,13 @@ stdenv.mkDerivation (finalAttrs: { "-DSVT_AV1_LTO=ON" ]; - passthru.updateScript = gitUpdater { - rev-prefix = "v"; + passthru = { + updateScript = gitUpdater { + rev-prefix = "v"; + }; + tests = { + ffmpeg = ffmpeg.override { withSvtav1 = true; }; + }; }; meta = with lib; { diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix index 1302541234f53..ca2fcf1407136 100644 --- a/pkgs/top-level/darwin-packages.nix +++ b/pkgs/top-level/darwin-packages.nix @@ -195,7 +195,9 @@ impure-cmds // appleSourcePackages // chooseLibs // { xcode_15 xcode_15_1 xcode; - CoreSymbolication = callPackage ../os-specific/darwin/CoreSymbolication { }; + CoreSymbolication = callPackage ../os-specific/darwin/CoreSymbolication { + inherit (apple_sdk) darwin-stubs; + }; # TODO: Remove the CF hook if a solution to the crashes is not found. CF = |