diff options
230 files changed, 4868 insertions, 2561 deletions
diff --git a/doc/hooks/waf.section.md b/doc/hooks/waf.section.md index fa027d87a94d7..b58887b6b6471 100644 --- a/doc/hooks/waf.section.md +++ b/doc/hooks/waf.section.md @@ -20,10 +20,6 @@ If `wafPath` doesn't exist, then `wafHook` will copy the `waf` provided from Nix Controls the flags passed to waf tool during build and install phases. For settings specific to build or install phases, use `wafBuildFlags` or `wafInstallFlags` respectively. -#### `dontAddWafCrossFlags` {#dont-add-waf-cross-flags} - -When set to `true`, don't add cross compilation flags during configure phase. - #### `dontUseWafConfigure` {#dont-use-waf-configure} When set to true, don't use the predefined `wafConfigurePhase`. diff --git a/pkgs/applications/blockchains/polkadot/default.nix b/pkgs/applications/blockchains/polkadot/default.nix index 190bfc28d1327..0e71ddb7ba3bd 100644 --- a/pkgs/applications/blockchains/polkadot/default.nix +++ b/pkgs/applications/blockchains/polkadot/default.nix @@ -82,8 +82,6 @@ rustPlatform.buildRustPackage rec { # available for `rustc-wasm32` WASM_BUILD_STD = 0; - # NOTE: we need to force lld otherwise rust-lld is not found for wasm32 target - CARGO_TARGET_WASM32_UNKNOWN_UNKNOWN_LINKER = "lld"; OPENSSL_NO_VENDOR = 1; PROTOC = "${protobuf}/bin/protoc"; ROCKSDB_LIB_DIR = "${rocksdb}/lib"; diff --git a/pkgs/applications/display-managers/lemurs/default.nix b/pkgs/applications/display-managers/lemurs/default.nix index a83b6c271448e..a480b4fbd8a84 100644 --- a/pkgs/applications/display-managers/lemurs/default.nix +++ b/pkgs/applications/display-managers/lemurs/default.nix @@ -19,9 +19,6 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-uuHPJe+1VsnLRGbHtgTMrib6Tk359cwTDVfvtHnDToo="; - # Fixes a lock issue - preConfigure = "cargo update --offline"; - buildInputs = [ linux-pam ]; diff --git a/pkgs/applications/editors/ed/generic.nix b/pkgs/applications/editors/ed/generic.nix index 70ec6badf25ec..70ffdb4c4af93 100644 --- a/pkgs/applications/editors/ed/generic.nix +++ b/pkgs/applications/editors/ed/generic.nix @@ -13,12 +13,14 @@ , stdenv , fetchurl , lzip +, runtimeShellPackage }: stdenv.mkDerivation { inherit pname version src patches; nativeBuildInputs = [ lzip ]; + buildInputs = [ runtimeShellPackage ]; configureFlags = [ "CC=${stdenv.cc.targetPrefix}cc" 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 fd0ec451ec93f..8d25c1ec2c2f1 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix @@ -345,10 +345,10 @@ elpaBuild { pname = "auctex"; ename = "auctex"; - version = "14.0.4.0.20240427.91120"; + version = "14.0.5.0.20240519.95252"; src = fetchurl { - url = "https://elpa.gnu.org/devel/auctex-14.0.4.0.20240427.91120.tar"; - sha256 = "1qp2vgmna7fi66qdi4flgvl0l4cpz516klkx2rcd6wixvhyc53rx"; + url = "https://elpa.gnu.org/devel/auctex-14.0.5.0.20240519.95252.tar"; + sha256 = "0nb8djks4lpbkmsm4v8v6rnhh1wplcnarfc80fi7mglw26cls1lq"; }; packageRequires = [ emacs ]; meta = { @@ -490,10 +490,10 @@ elpaBuild { pname = "beframe"; ename = "beframe"; - version = "1.0.1.0.20240224.51508"; + version = "1.1.1.0.20240522.34215"; src = fetchurl { - url = "https://elpa.gnu.org/devel/beframe-1.0.1.0.20240224.51508.tar"; - sha256 = "105axrl2m6x5gc523ai9lna89jf44n2na337brxqn1jflnnpdh43"; + url = "https://elpa.gnu.org/devel/beframe-1.1.1.0.20240522.34215.tar"; + sha256 = "1ws11ynbcgi37sbh6p3nilq9ca26694qzqvd1h4dk0lb815b66l4"; }; packageRequires = [ emacs ]; meta = { @@ -593,10 +593,10 @@ elpaBuild { pname = "boxy"; ename = "boxy"; - version = "1.1.4.0.20240326.215209"; + version = "1.1.4.0.20240505.204058"; src = fetchurl { - url = "https://elpa.gnu.org/devel/boxy-1.1.4.0.20240326.215209.tar"; - sha256 = "077q9xxrsd98r4h9xj4djgiwfw34bjx3w0mhnbip2p57xknjjr46"; + url = "https://elpa.gnu.org/devel/boxy-1.1.4.0.20240505.204058.tar"; + sha256 = "18sgxarymy65vjzb94jjd0npxfd7920xlw49py5lc2y8d508p3rf"; }; packageRequires = [ emacs ]; meta = { @@ -613,10 +613,10 @@ elpaBuild { pname = "boxy-headings"; ename = "boxy-headings"; - version = "2.1.5.0.20240326.215829"; + version = "2.1.6.0.20240505.204122"; src = fetchurl { - url = "https://elpa.gnu.org/devel/boxy-headings-2.1.5.0.20240326.215829.tar"; - sha256 = "0zh5g1k2nql8jyg9ws0spsbhzwfa28f6qxs9krihp5qgz8kihn2p"; + url = "https://elpa.gnu.org/devel/boxy-headings-2.1.6.0.20240505.204122.tar"; + sha256 = "1m3k25j5z7q1gz2bbmyjkh79rq2b4350zz6csb2l0l8s4g1yddph"; }; packageRequires = [ boxy emacs org ]; meta = { @@ -700,10 +700,10 @@ elpaBuild { pname = "bufferlo"; ename = "bufferlo"; - version = "0.6.0.20240105.200601"; + version = "0.8.0.20240516.162426"; src = fetchurl { - url = "https://elpa.gnu.org/devel/bufferlo-0.6.0.20240105.200601.tar"; - sha256 = "02iqarvq8b2siivbv878f2yzkm5law15idnbi5wv72v5pc2hxrjk"; + url = "https://elpa.gnu.org/devel/bufferlo-0.8.0.20240516.162426.tar"; + sha256 = "1w4vw1f5qmgv9207wpgmw5ahq4kans5dh775l213vzh32s6cdxx1"; }; packageRequires = [ emacs ]; meta = { @@ -767,10 +767,10 @@ elpaBuild { pname = "cape"; ename = "cape"; - version = "1.5.0.20240411.220758"; + version = "1.5.0.20240517.221612"; src = fetchurl { - url = "https://elpa.gnu.org/devel/cape-1.5.0.20240411.220758.tar"; - sha256 = "0mbw0azs2a33ywq1iqqvm2r5pyhpl1qfjkzmqv473n7qm658gkfg"; + url = "https://elpa.gnu.org/devel/cape-1.5.0.20240517.221612.tar"; + sha256 = "1gxk070lf204hp62zlxqkc0h8k7ml6sywms1m8kadbl650dl8fdc"; }; packageRequires = [ compat emacs ]; meta = { @@ -927,6 +927,25 @@ license = lib.licenses.free; }; }) {}; + colorful-mode = callPackage ({ compat + , elpaBuild + , emacs + , fetchurl + , lib }: + elpaBuild { + pname = "colorful-mode"; + ename = "colorful-mode"; + version = "1.0.0.0.20240427.103837"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/colorful-mode-1.0.0.0.20240427.103837.tar"; + sha256 = "1ggasm3b678rnh96l4bynlbqciwsznsrljhxsi9ifak4xb3zlg8s"; + }; + packageRequires = [ compat emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/colorful-mode.html"; + license = lib.licenses.free; + }; + }) {}; comint-mime = callPackage ({ elpaBuild , emacs , fetchurl @@ -969,10 +988,10 @@ elpaBuild { pname = "company"; ename = "company"; - version = "0.10.2.0.20240311.194338"; + version = "0.10.2.0.20240514.232026"; src = fetchurl { - url = "https://elpa.gnu.org/devel/company-0.10.2.0.20240311.194338.tar"; - sha256 = "1bmf7xa7pwfmwqrdz3sjnbbaqr472n6f2n8mz5qrzc4y09xl8i0r"; + url = "https://elpa.gnu.org/devel/company-0.10.2.0.20240514.232026.tar"; + sha256 = "10sh1pi3wb38r5v6vka0g3dxsmp3yr6p2iqrr3icqrx8mbz2mhvz"; }; packageRequires = [ emacs ]; meta = { @@ -1045,10 +1064,10 @@ elpaBuild { pname = "compat"; ename = "compat"; - version = "29.1.4.5.0.20240401.110429"; + version = "29.1.4.5.0.20240520.101243"; src = fetchurl { - url = "https://elpa.gnu.org/devel/compat-29.1.4.5.0.20240401.110429.tar"; - sha256 = "1mbkvl2fcdcnc8jriwn61z0aim0llg7rgb9rh12rq8djrinw1r5d"; + url = "https://elpa.gnu.org/devel/compat-29.1.4.5.0.20240520.101243.tar"; + sha256 = "0ik2qlvkd414fs2zpks7bfdylcwpchx0mw2d5932156k3bchm0ib"; }; packageRequires = [ emacs seq ]; meta = { @@ -1060,10 +1079,10 @@ elpaBuild { pname = "consult"; ename = "consult"; - version = "1.5.0.20240420.92954"; + version = "1.6.0.20240517.91901"; src = fetchurl { - url = "https://elpa.gnu.org/devel/consult-1.5.0.20240420.92954.tar"; - sha256 = "1cg72m5aqvh7apdv3j4fhm232168vi0iddx3n9w42jwmhsxxq7fr"; + url = "https://elpa.gnu.org/devel/consult-1.6.0.20240517.91901.tar"; + sha256 = "0nyx7dncdqv40cfwzy2hfi4f23mph6q41yz5d04r0mzachpbh5zg"; }; packageRequires = [ compat emacs ]; meta = { @@ -1071,6 +1090,26 @@ license = lib.licenses.free; }; }) {}; + consult-denote = callPackage ({ consult + , denote + , elpaBuild + , emacs + , fetchurl + , lib }: + elpaBuild { + pname = "consult-denote"; + ename = "consult-denote"; + version = "0.0.0.0.20240521.82207"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/consult-denote-0.0.0.0.20240521.82207.tar"; + sha256 = "1yj93195gzjgwfms6k2chwbhq3w14vpab7r9dq24gjxcgb3f63w3"; + }; + packageRequires = [ consult denote emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/consult-denote.html"; + license = lib.licenses.free; + }; + }) {}; consult-hoogle = callPackage ({ elpaBuild , emacs , fetchurl @@ -1131,10 +1170,10 @@ elpaBuild { pname = "corfu"; ename = "corfu"; - version = "1.3.0.20240413.92757"; + version = "1.3.0.20240514.120535"; src = fetchurl { - url = "https://elpa.gnu.org/devel/corfu-1.3.0.20240413.92757.tar"; - sha256 = "0qf5nvg70sb313mv1m1mycipf182lz8c0y2rsacniqzykvqhbv74"; + url = "https://elpa.gnu.org/devel/corfu-1.3.0.20240514.120535.tar"; + sha256 = "0nqq690pnjx7dlab6ba1y1n8m6bhbwm1yl7iqzv8php9j4bxyd20"; }; packageRequires = [ compat emacs ]; meta = { @@ -1166,10 +1205,10 @@ elpaBuild { pname = "counsel"; ename = "counsel"; - version = "0.14.2.0.20240413.191055"; + version = "0.14.2.0.20240520.132838"; src = fetchurl { - url = "https://elpa.gnu.org/devel/counsel-0.14.2.0.20240413.191055.tar"; - sha256 = "14iphwfpmbmg44f1gx54y3ks920z3p86mfvg99h86yy817wb73pl"; + url = "https://elpa.gnu.org/devel/counsel-0.14.2.0.20240520.132838.tar"; + sha256 = "1xpvkyljahcjf84f4b40ivax1i06vyyyhlj3v7x0g90qjl6ba2cr"; }; packageRequires = [ emacs ivy swiper ]; meta = { @@ -1315,10 +1354,10 @@ elpaBuild { pname = "dape"; ename = "dape"; - version = "0.10.0.0.20240427.142238"; + version = "0.11.1.0.20240518.161137"; src = fetchurl { - url = "https://elpa.gnu.org/devel/dape-0.10.0.0.20240427.142238.tar"; - sha256 = "0d2mn565l5ag023z1yqg5nj0fj0iraf5yifh54pyl6cnz7ipmcj3"; + url = "https://elpa.gnu.org/devel/dape-0.11.1.0.20240518.161137.tar"; + sha256 = "1v359ilhbpsvyvr7x1c9lj2hadsblp2lxd7vwsqx87bf1ls2cpzi"; }; packageRequires = [ emacs jsonrpc ]; meta = { @@ -1345,10 +1384,10 @@ elpaBuild { pname = "dash"; ename = "dash"; - version = "2.19.1.0.20240405.94636"; + version = "2.19.1.0.20240510.132708"; src = fetchurl { - url = "https://elpa.gnu.org/devel/dash-2.19.1.0.20240405.94636.tar"; - sha256 = "0s1wqxjv1xdhd251zpk52wlglcc5apbhdhld30vmb7c9bq9288xw"; + url = "https://elpa.gnu.org/devel/dash-2.19.1.0.20240510.132708.tar"; + sha256 = "1m16w781gzsjim087jj8n42kn1lrvkplsigbsx0l7fd6hqagyl2k"; }; packageRequires = [ emacs ]; meta = { @@ -1408,10 +1447,10 @@ elpaBuild { pname = "denote"; ename = "denote"; - version = "2.3.5.0.20240427.91057"; + version = "2.3.5.0.20240520.93621"; src = fetchurl { - url = "https://elpa.gnu.org/devel/denote-2.3.5.0.20240427.91057.tar"; - sha256 = "0xa0jxd6fbd2ayhaaxn1rnimi35pipgidx9l6v19swal0yk08kf4"; + url = "https://elpa.gnu.org/devel/denote-2.3.5.0.20240520.93621.tar"; + sha256 = "12mxsadpikjp3315cd20cp59r9f3g9jznkljp2yc3bkkjfrbjz5v"; }; packageRequires = [ emacs ]; meta = { @@ -1460,10 +1499,10 @@ elpaBuild { pname = "devdocs"; ename = "devdocs"; - version = "0.6.1.0.20240329.73808"; + version = "0.6.1.0.20240428.71147"; src = fetchurl { - url = "https://elpa.gnu.org/devel/devdocs-0.6.1.0.20240329.73808.tar"; - sha256 = "1q4n5r5ki8f7qksr18w273l7qw8c38snn6d842kxwp9zg2417i8x"; + url = "https://elpa.gnu.org/devel/devdocs-0.6.1.0.20240428.71147.tar"; + sha256 = "0pvv4rvr14rc51gxb20zbyh42ijpq37dsmlzdsk8ypbfbgz3jw1s"; }; packageRequires = [ emacs ]; meta = { @@ -1518,10 +1557,10 @@ elpaBuild { pname = "diff-hl"; ename = "diff-hl"; - version = "1.9.2.0.20240401.235744"; + version = "1.9.2.0.20240505.211034"; src = fetchurl { - url = "https://elpa.gnu.org/devel/diff-hl-1.9.2.0.20240401.235744.tar"; - sha256 = "1ilmi9a5g2h3xw49kiavr6pwp091i6j3qd7yxyixvw15ygvc6mi8"; + url = "https://elpa.gnu.org/devel/diff-hl-1.9.2.0.20240505.211034.tar"; + sha256 = "0mbxas2mx0pyvs3ccpp6ss2q8j7n5mva1ngg004fdhp8br8qknhn"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -1621,10 +1660,10 @@ elpaBuild { pname = "dired-preview"; ename = "dired-preview"; - version = "0.1.1.0.20240425.180328"; + version = "0.2.0.0.20240507.55800"; src = fetchurl { - url = "https://elpa.gnu.org/devel/dired-preview-0.1.1.0.20240425.180328.tar"; - sha256 = "1wn8k1wr126nw22sczjrhkxwsjnbhr08ym01sy8d4422wif0l4as"; + url = "https://elpa.gnu.org/devel/dired-preview-0.2.0.0.20240507.55800.tar"; + sha256 = "1m7zgmjhw86yrhj5chci73rbgky3ybzni5j6xvwpxqxl6g41ph04"; }; packageRequires = [ emacs ]; meta = { @@ -1732,10 +1771,10 @@ elpaBuild { pname = "drepl"; ename = "drepl"; - version = "0.2.0.20240421.84519"; + version = "0.3.0.20240511.124331"; src = fetchurl { - url = "https://elpa.gnu.org/devel/drepl-0.2.0.20240421.84519.tar"; - sha256 = "1kxxj0dd9yj168gaq89hm1sqajv8p8y7mgpqrxsqbz2hg6p568af"; + url = "https://elpa.gnu.org/devel/drepl-0.3.0.20240511.124331.tar"; + sha256 = "0xfmna8a8nh48ir9nl5gv4y03kqsvrzars74lza5k0cdsslga4gr"; }; packageRequires = [ comint-mime emacs ]; meta = { @@ -1866,10 +1905,10 @@ elpaBuild { pname = "eev"; ename = "eev"; - version = "20240309.0.20240325.4057"; + version = "20240513.0.20240517.104050"; src = fetchurl { - url = "https://elpa.gnu.org/devel/eev-20240309.0.20240325.4057.tar"; - sha256 = "0h6b69ykrdkzhqkv8b0qjanpfkcw4408kcxlv672h3i660w9jj0j"; + url = "https://elpa.gnu.org/devel/eev-20240513.0.20240517.104050.tar"; + sha256 = "03bdj2f3y5xj33vq7mgxb8s0n05b5qnrsbak2xqjv2bgfky08dmq"; }; packageRequires = [ emacs ]; meta = { @@ -1884,10 +1923,10 @@ elpaBuild { pname = "ef-themes"; ename = "ef-themes"; - version = "1.6.1.0.20240427.83621"; + version = "1.7.0.0.20240510.44643"; src = fetchurl { - url = "https://elpa.gnu.org/devel/ef-themes-1.6.1.0.20240427.83621.tar"; - sha256 = "1pjq8yblcmk4mp83bqcnb154rq8dbn8qn6q394wzzwnn6kv08ay2"; + url = "https://elpa.gnu.org/devel/ef-themes-1.7.0.0.20240510.44643.tar"; + sha256 = "0iygfxy4h74nd2glx7kb4faw4b0f2gpfakdwi1icfkkn021kr781"; }; packageRequires = [ emacs ]; meta = { @@ -1895,7 +1934,8 @@ license = lib.licenses.free; }; }) {}; - eglot = callPackage ({ eldoc + eglot = callPackage ({ compat + , eldoc , elpaBuild , emacs , external-completion @@ -1905,16 +1945,18 @@ , lib , project , seq + , track-changes , xref }: elpaBuild { pname = "eglot"; ename = "eglot"; - version = "1.17.0.20240423.182809"; + version = "1.17.0.20240518.213720"; src = fetchurl { - url = "https://elpa.gnu.org/devel/eglot-1.17.0.20240423.182809.tar"; - sha256 = "129ibvdqcv7jablim041x55vm4awyvcjk295nrrffryzbb75fgi9"; + url = "https://elpa.gnu.org/devel/eglot-1.17.0.20240518.213720.tar"; + sha256 = "10hpsip9ai41pxh5a32dwh9z90h2lrjvd3jh666zl3m11g906iwh"; }; packageRequires = [ + compat eldoc emacs external-completion @@ -1922,6 +1964,7 @@ jsonrpc project seq + track-changes xref ]; meta = { @@ -1987,10 +2030,10 @@ elpaBuild { pname = "elisp-benchmarks"; ename = "elisp-benchmarks"; - version = "1.14.0.20240404.94558"; + version = "1.16.0.20240518.180006"; src = fetchurl { - url = "https://elpa.gnu.org/devel/elisp-benchmarks-1.14.0.20240404.94558.tar"; - sha256 = "1lfpwwm9114x7431pc12kppb0mgia1zd4b5pnfpvqyk3159xx40v"; + url = "https://elpa.gnu.org/devel/elisp-benchmarks-1.16.0.20240518.180006.tar"; + sha256 = "1pc3qs0j8hh68lbh4lqyf2xkahiylpqaaac3cpvard0wdp9b4wsr"; }; packageRequires = []; meta = { @@ -2002,10 +2045,10 @@ elpaBuild { pname = "ellama"; ename = "ellama"; - version = "0.9.1.0.20240415.73018"; + version = "0.9.4.0.20240517.145740"; src = fetchurl { - url = "https://elpa.gnu.org/devel/ellama-0.9.1.0.20240415.73018.tar"; - sha256 = "1fcw0ll24bj32mjjb952in5shnyxz63gdkg80njy89s2bknw1ra1"; + url = "https://elpa.gnu.org/devel/ellama-0.9.4.0.20240517.145740.tar"; + sha256 = "0qb849ij6v7d8kk9mkx7nbk24d1dh32kydjddxykyn64xixw79kc"; }; packageRequires = [ emacs llm spinner ]; meta = { @@ -2110,10 +2153,10 @@ elpaBuild { pname = "emms"; ename = "emms"; - version = "19.0.20240414.193332"; + version = "19.0.20240512.173549"; src = fetchurl { - url = "https://elpa.gnu.org/devel/emms-19.0.20240414.193332.tar"; - sha256 = "03jxpxgrlr1amxix4skfyag5pl6xvls011rcjjx1ka5sjdvnygvp"; + url = "https://elpa.gnu.org/devel/emms-19.0.20240512.173549.tar"; + sha256 = "13y0g21giswhhysm5252q1rb066a3sap4z51j4cprmwhj282zglj"; }; packageRequires = [ cl-lib nadvice seq ]; meta = { @@ -2179,10 +2222,10 @@ elpaBuild { pname = "erc"; ename = "erc"; - version = "5.6snapshot0.20240419.135452"; + version = "5.6snapshot0.20240518.154805"; src = fetchurl { - url = "https://elpa.gnu.org/devel/erc-5.6snapshot0.20240419.135452.tar"; - sha256 = "1yx1k6r6fg77r6h7bvi1v205mnxmw8qjqr96k4dh73a7ik972vmh"; + url = "https://elpa.gnu.org/devel/erc-5.6snapshot0.20240518.154805.tar"; + sha256 = "0hscaz2nn08zv54gr2xfcg4pf66hycjsz31v603mbqyzgx6538hl"; }; packageRequires = [ compat emacs ]; meta = { @@ -2214,10 +2257,10 @@ elpaBuild { pname = "ess"; ename = "ess"; - version = "24.1.1.0.20240426.115232"; + version = "24.1.1.0.20240516.81354"; src = fetchurl { - url = "https://elpa.gnu.org/devel/ess-24.1.1.0.20240426.115232.tar"; - sha256 = "1rskraim68fibf568f07r62h14ni45wvzifn21qyfcvv8slb63jd"; + url = "https://elpa.gnu.org/devel/ess-24.1.1.0.20240516.81354.tar"; + sha256 = "0r4kk65sd8kzdm11c7dz1m4qicjv6zg36r7gdg2mzpl0ym33g8aj"; }; packageRequires = [ emacs ]; meta = { @@ -2311,10 +2354,10 @@ elpaBuild { pname = "exwm"; ename = "exwm"; - version = "0.28.0.20240403.140839"; + version = "0.28.0.20240517.92828"; src = fetchurl { - url = "https://elpa.gnu.org/devel/exwm-0.28.0.20240403.140839.tar"; - sha256 = "1hyf2m1inifvxzv6y2wmrfylp9vrb130nj1pvpy169miw2n50vzm"; + url = "https://elpa.gnu.org/devel/exwm-0.28.0.20240517.92828.tar"; + sha256 = "0d65091s706ajfqi9kp3m6k9hvlwhab6f484fs5v14c9rvspy1pa"; }; packageRequires = [ emacs xelb ]; meta = { @@ -2432,10 +2475,10 @@ elpaBuild { pname = "flymake"; ename = "flymake"; - version = "1.3.7.0.20240422.65418"; + version = "1.3.7.0.20240503.61639"; src = fetchurl { - url = "https://elpa.gnu.org/devel/flymake-1.3.7.0.20240422.65418.tar"; - sha256 = "0gq3x3ssvsccwjajd3w835dd1zvlakj7gxdn6b1fqj46rkyi60vw"; + url = "https://elpa.gnu.org/devel/flymake-1.3.7.0.20240503.61639.tar"; + sha256 = "0qrdjynam3nvhm5qwjks308r28f8wlgsfdmdw4d7sb4xqyr2mzrz"; }; packageRequires = [ eldoc emacs project ]; meta = { @@ -2855,10 +2898,10 @@ elpaBuild { pname = "gtags-mode"; ename = "gtags-mode"; - version = "1.5.0.20240425.21931"; + version = "1.6.0.20240511.23214"; src = fetchurl { - url = "https://elpa.gnu.org/devel/gtags-mode-1.5.0.20240425.21931.tar"; - sha256 = "13gdalm2n75yifpfy2wsbf47l6q4rklvd4akszn423nmcl9bnb8x"; + url = "https://elpa.gnu.org/devel/gtags-mode-1.6.0.20240511.23214.tar"; + sha256 = "0wi1pfvx7wrd8jfnhlim2zp4k2n96c6prl42f8asbvq1rgi5qh1p"; }; packageRequires = [ emacs ]; meta = { @@ -3008,10 +3051,10 @@ elpaBuild { pname = "hyperbole"; ename = "hyperbole"; - version = "9.0.2pre0.20240420.120926"; + version = "9.0.2pre0.20240519.180059"; src = fetchurl { - url = "https://elpa.gnu.org/devel/hyperbole-9.0.2pre0.20240420.120926.tar"; - sha256 = "1mr05p3lhz1xnivl8mqhzdw9qrh0klasjisl75gn14n7l233nir7"; + url = "https://elpa.gnu.org/devel/hyperbole-9.0.2pre0.20240519.180059.tar"; + sha256 = "0i5h57a2ng28ijwds7ddy5ay8dkkgg817p35ig51mjrk7ljz6w2n"; }; packageRequires = [ emacs ]; meta = { @@ -3019,6 +3062,23 @@ license = lib.licenses.free; }; }) {}; + idlwave = callPackage ({ elpaBuild + , fetchurl + , lib }: + elpaBuild { + pname = "idlwave"; + ename = "idlwave"; + version = "6.5.0.0.20240430.163614"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/idlwave-6.5.0.0.20240430.163614.tar"; + sha256 = "165lbvhrvrd1szvqns6pd7wmr9zxszzvq3lqz11qg20didi6sngr"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/idlwave.html"; + license = lib.licenses.free; + }; + }) {}; ilist = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "ilist"; @@ -3107,10 +3167,10 @@ elpaBuild { pname = "ivy"; ename = "ivy"; - version = "0.14.2.0.20240405.203954"; + version = "0.14.2.0.20240519.163855"; src = fetchurl { - url = "https://elpa.gnu.org/devel/ivy-0.14.2.0.20240405.203954.tar"; - sha256 = "02mkfciafhdc9b41s0kv07l9z77zyq7a2j1ljdiwbmcbkdis028p"; + url = "https://elpa.gnu.org/devel/ivy-0.14.2.0.20240519.163855.tar"; + sha256 = "1r1b5znx1dzwpz903sm85sm2yp03yp4mvds782j8lngl46r5ibsr"; }; packageRequires = [ emacs ]; meta = { @@ -3270,10 +3330,10 @@ elpaBuild { pname = "jinx"; ename = "jinx"; - version = "1.6.0.20240415.42305"; + version = "1.7.0.20240515.101640"; src = fetchurl { - url = "https://elpa.gnu.org/devel/jinx-1.6.0.20240415.42305.tar"; - sha256 = "12jvkb9nis5kin7ii7aan7b2d8cd5q1f9qpp6g506m18gdi12f48"; + url = "https://elpa.gnu.org/devel/jinx-1.7.0.20240515.101640.tar"; + sha256 = "1ghp16kmplj9kj92867xsv3bnl6f0w95xl8hgjxbck4krj8k6is5"; }; packageRequires = [ compat emacs ]; meta = { @@ -3566,16 +3626,16 @@ license = lib.licenses.free; }; }) {}; - llm = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + llm = callPackage ({ elpaBuild, emacs, fetchurl, lib, plz }: elpaBuild { pname = "llm"; ename = "llm"; - version = "0.12.3.0.20240331.11827"; + version = "0.15.0.0.20240518.145931"; src = fetchurl { - url = "https://elpa.gnu.org/devel/llm-0.12.3.0.20240331.11827.tar"; - sha256 = "0nc9p0cjxzmfrxrir45lj6yyqwpaw30rdgbhw5dl83shnps4fi58"; + url = "https://elpa.gnu.org/devel/llm-0.15.0.0.20240518.145931.tar"; + sha256 = "0dzvgq7lvlg62rzv9p62r5m0gm5glwd37mnw3sf6w5h3jfnkpzv0"; }; - packageRequires = [ emacs ]; + packageRequires = [ emacs plz ]; meta = { homepage = "https://elpa.gnu.org/packages/llm.html"; license = lib.licenses.free; @@ -3798,10 +3858,10 @@ elpaBuild { pname = "mct"; ename = "mct"; - version = "1.0.0.0.20240320.41315"; + version = "1.0.0.0.20240429.72524"; src = fetchurl { - url = "https://elpa.gnu.org/devel/mct-1.0.0.0.20240320.41315.tar"; - sha256 = "02rifid9g3q6a92xp1xpkmmm00awhxfk573lbapcl473sjy5dwfp"; + url = "https://elpa.gnu.org/devel/mct-1.0.0.0.20240429.72524.tar"; + sha256 = "07nb0y0ld6x2j5g1a0sjm5ihck41xkk55p5hm5279ddjklcp8p6a"; }; packageRequires = [ emacs ]; meta = { @@ -3947,10 +4007,10 @@ elpaBuild { pname = "modus-themes"; ename = "modus-themes"; - version = "4.4.0.0.20240427.84336"; + version = "4.4.0.0.20240505.33119"; src = fetchurl { - url = "https://elpa.gnu.org/devel/modus-themes-4.4.0.0.20240427.84336.tar"; - sha256 = "003kzj9s22qyzvavzh9q0x5dh6jg3n8ykvbihkx5hw16ar7cxmgg"; + url = "https://elpa.gnu.org/devel/modus-themes-4.4.0.0.20240505.33119.tar"; + sha256 = "1y637n8cll4932hyi16gnzpjqypwgwxbyq8mfhgjbz26663nksxs"; }; packageRequires = [ emacs ]; meta = { @@ -4116,10 +4176,10 @@ elpaBuild { pname = "nano-modeline"; ename = "nano-modeline"; - version = "1.0.1.0.20240318.92455"; + version = "1.1.0.0.20240429.102433"; src = fetchurl { - url = "https://elpa.gnu.org/devel/nano-modeline-1.0.1.0.20240318.92455.tar"; - sha256 = "14n5gmbpnbcrj2h2c12s35pdb93r1hflklpnv0bh5gpla154f6ln"; + url = "https://elpa.gnu.org/devel/nano-modeline-1.1.0.0.20240429.102433.tar"; + sha256 = "0jlaqkrqn2x4fhlz57c94586xjqi1sb89p6py4j5r00669djwhrf"; }; packageRequires = [ emacs ]; meta = { @@ -4220,10 +4280,10 @@ elpaBuild { pname = "notmuch-indicator"; ename = "notmuch-indicator"; - version = "1.1.0.0.20240117.25556"; + version = "1.2.0.0.20240511.94138"; src = fetchurl { - url = "https://elpa.gnu.org/devel/notmuch-indicator-1.1.0.0.20240117.25556.tar"; - sha256 = "003pq429x6yjqv4hw7ryigqmpzrk5frwmlk1ar35z9n83xsnl128"; + url = "https://elpa.gnu.org/devel/notmuch-indicator-1.2.0.0.20240511.94138.tar"; + sha256 = "0f1bq1mbjiy1akqml3fb85xz5923j3w2dz4p6yij3kfb5cks42d1"; }; packageRequires = [ emacs ]; meta = { @@ -4393,10 +4453,10 @@ elpaBuild { pname = "org"; ename = "org"; - version = "9.7pre0.20240426.150943"; + version = "9.7pre0.20240521.135840"; src = fetchurl { - url = "https://elpa.gnu.org/devel/org-9.7pre0.20240426.150943.tar"; - sha256 = "0n7d6zrwvrism7blfdri19mvrhcc71cga7qwbvpnq0a9mamv1ypy"; + url = "https://elpa.gnu.org/devel/org-9.7pre0.20240521.135840.tar"; + sha256 = "06j7kjbpd390i0kqvvnlkpdzqkwiicbdgjymif338l0qx2kl4sg5"; }; packageRequires = [ emacs ]; meta = { @@ -4412,10 +4472,10 @@ elpaBuild { pname = "org-contacts"; ename = "org-contacts"; - version = "1.1.0.20240410.112834"; + version = "1.1.0.20240521.114436"; src = fetchurl { - url = "https://elpa.gnu.org/devel/org-contacts-1.1.0.20240410.112834.tar"; - sha256 = "0mns2fkzn1yc968k2nc4y5gys1m7dbcj67mdb8vfj54iwdkw316z"; + url = "https://elpa.gnu.org/devel/org-contacts-1.1.0.20240521.114436.tar"; + sha256 = "0srbl81ngk24c9kf991ps2j53kpqriwgs8ld4lfcqmxzclr5y8iv"; }; packageRequires = [ emacs org ]; meta = { @@ -4470,10 +4530,10 @@ elpaBuild { pname = "org-modern"; ename = "org-modern"; - version = "1.2.0.20240327.153104"; + version = "1.2.0.20240515.193202"; src = fetchurl { - url = "https://elpa.gnu.org/devel/org-modern-1.2.0.20240327.153104.tar"; - sha256 = "0gkkcvjbjyr5h8idafc0lppjwdr84y860800ns7z894i89iy01li"; + url = "https://elpa.gnu.org/devel/org-modern-1.2.0.20240515.193202.tar"; + sha256 = "05mbgm95rlcv5liswlckd26izz5p3a6mkcfnz60widnilfmza9k6"; }; packageRequires = [ compat emacs ]; meta = { @@ -4508,10 +4568,10 @@ elpaBuild { pname = "org-real"; ename = "org-real"; - version = "1.0.8.0.20240328.105118"; + version = "1.0.9.0.20240505.204156"; src = fetchurl { - url = "https://elpa.gnu.org/devel/org-real-1.0.8.0.20240328.105118.tar"; - sha256 = "018bhg886mhv5wzvahvi36bpmh6lpgfahs2dxcrhlb5jqaf8kj50"; + url = "https://elpa.gnu.org/devel/org-real-1.0.9.0.20240505.204156.tar"; + sha256 = "05z8kycyqcfj0w18mnqys54wnlwa9yijlb5c0h86fqbhr7shbjmp"; }; packageRequires = [ boxy emacs org ]; meta = { @@ -4546,10 +4606,10 @@ elpaBuild { pname = "org-transclusion"; ename = "org-transclusion"; - version = "1.3.2.0.20240420.151651"; + version = "1.4.0.0.20240520.170949"; src = fetchurl { - url = "https://elpa.gnu.org/devel/org-transclusion-1.3.2.0.20240420.151651.tar"; - sha256 = "0izvaxis7yc2zfxff3dzsc27r8s4kl65x97rjxhz0cp3iqfsb91x"; + url = "https://elpa.gnu.org/devel/org-transclusion-1.4.0.0.20240520.170949.tar"; + sha256 = "15i8my50y1m44rhk06rfs6bwlc3mavb73bjysg3wp1j132m2dcrl"; }; packageRequires = [ emacs org ]; meta = { @@ -4834,6 +4894,44 @@ license = lib.licenses.free; }; }) {}; + plz-event-source = callPackage ({ elpaBuild + , emacs + , fetchurl + , lib + , plz }: + elpaBuild { + pname = "plz-event-source"; + ename = "plz-event-source"; + version = "0.1pre0.20240501.111443"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/plz-event-source-0.1pre0.20240501.111443.tar"; + sha256 = "1bygbgzvyc6k8bqrnl5gwdbjmlrdh25fmf7n0rllfz4b055cdj6a"; + }; + packageRequires = [ emacs plz ]; + meta = { + homepage = "https://elpa.gnu.org/packages/plz-event-source.html"; + license = lib.licenses.free; + }; + }) {}; + plz-media-type = callPackage ({ elpaBuild + , emacs + , fetchurl + , lib + , plz }: + elpaBuild { + pname = "plz-media-type"; + ename = "plz-media-type"; + version = "0.1pre0.20240501.111146"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/plz-media-type-0.1pre0.20240501.111146.tar"; + sha256 = "0l2zgxgi48rvzs79qq2bjmp7bg2qhd3709rpyzfkv77gigcjwqj6"; + }; + packageRequires = [ emacs plz ]; + meta = { + homepage = "https://elpa.gnu.org/packages/plz-media-type.html"; + license = lib.licenses.free; + }; + }) {}; plz-see = callPackage ({ elpaBuild, emacs, fetchurl, lib, plz }: elpaBuild { pname = "plz-see"; @@ -4936,10 +5034,10 @@ elpaBuild { pname = "posframe"; ename = "posframe"; - version = "1.4.3.0.20240426.60433"; + version = "1.4.3.0.20240507.14806"; src = fetchurl { - url = "https://elpa.gnu.org/devel/posframe-1.4.3.0.20240426.60433.tar"; - sha256 = "1j5l16z765wz5qs1x49vpkmj1cbxbsa69wlrf19r4qc7b6gijzm5"; + url = "https://elpa.gnu.org/devel/posframe-1.4.3.0.20240507.14806.tar"; + sha256 = "08jhv15hwrdjgdzl6d8xwdmx46afwlpd6yz3h5k7y7lhbnlc5jkp"; }; packageRequires = [ emacs ]; meta = { @@ -4987,10 +5085,10 @@ elpaBuild { pname = "project"; ename = "project"; - version = "0.10.0.0.20240415.22959"; + version = "0.10.0.0.20240512.175655"; src = fetchurl { - url = "https://elpa.gnu.org/devel/project-0.10.0.0.20240415.22959.tar"; - sha256 = "0clz75455r6pzjcj9jbpqgi201plmm4094nz7s19xmq1ifll9pzy"; + url = "https://elpa.gnu.org/devel/project-0.10.0.0.20240512.175655.tar"; + sha256 = "1228kpfyj3zd1bz8xjv257mhhxgvrj8d67saxgfxix3y62fhb2wc"; }; packageRequires = [ emacs xref ]; meta = { @@ -5032,10 +5130,10 @@ elpaBuild { pname = "pulsar"; ename = "pulsar"; - version = "1.0.1.0.20240117.25720"; + version = "1.0.1.0.20240429.64508"; src = fetchurl { - url = "https://elpa.gnu.org/devel/pulsar-1.0.1.0.20240117.25720.tar"; - sha256 = "09qq4cribybn86s6dz77rbmazzl3c88305brkiza2pn2cg10g8xw"; + url = "https://elpa.gnu.org/devel/pulsar-1.0.1.0.20240429.64508.tar"; + sha256 = "1ak3vphfw0rsm4rrqyg72zjjwm68ypwxbbif8fz31rnsp0n66f8n"; }; packageRequires = [ emacs ]; meta = { @@ -5047,10 +5145,10 @@ elpaBuild { pname = "pyim"; ename = "pyim"; - version = "5.3.3.0.20240407.80210"; + version = "5.3.4.0.20240508.25615"; src = fetchurl { - url = "https://elpa.gnu.org/devel/pyim-5.3.3.0.20240407.80210.tar"; - sha256 = "1vk0q0wczr9yiwm89kljdlsil7plr2z0cr5sw48fxy4dzgjdjkfb"; + url = "https://elpa.gnu.org/devel/pyim-5.3.4.0.20240508.25615.tar"; + sha256 = "0p079girx795fvqswdjh8l5mwdyndanfcsvb1qvj2klq063y1vv5"; }; packageRequires = [ async emacs xr ]; meta = { @@ -5079,10 +5177,10 @@ elpaBuild { pname = "python"; ename = "python"; - version = "0.28.0.20240427.62346"; + version = "0.28.0.20240518.202234"; src = fetchurl { - url = "https://elpa.gnu.org/devel/python-0.28.0.20240427.62346.tar"; - sha256 = "1knzsgi2g40b9ba5s81653h913mlsh71y83b8qc71v9l16lgy1fg"; + url = "https://elpa.gnu.org/devel/python-0.28.0.20240518.202234.tar"; + sha256 = "0nk9rdr62c9j27gbjz3z6ri35aw026pmj6lhqvn6j9ci8ijif3yf"; }; packageRequires = [ compat emacs seq ]; meta = { @@ -5409,10 +5507,10 @@ elpaBuild { pname = "relint"; ename = "relint"; - version = "1.24.0.20240401.74454"; + version = "1.24.0.20240510.91500"; src = fetchurl { - url = "https://elpa.gnu.org/devel/relint-1.24.0.20240401.74454.tar"; - sha256 = "07q0571ks81al09xl1ms52rznp6y7scvlnh2ax1nj67f3jmikzcd"; + url = "https://elpa.gnu.org/devel/relint-1.24.0.20240510.91500.tar"; + sha256 = "171dnhya0ij5lapn9h2d8ssxx163lwgasvfssd07739171h07389"; }; packageRequires = [ emacs xr ]; meta = { @@ -5895,10 +5993,10 @@ elpaBuild { pname = "spacious-padding"; ename = "spacious-padding"; - version = "0.4.1.0.20240311.74539"; + version = "0.5.0.0.20240429.82953"; src = fetchurl { - url = "https://elpa.gnu.org/devel/spacious-padding-0.4.1.0.20240311.74539.tar"; - sha256 = "1xgnplcvp73fpyi9rx5wbn0hjbcv65vlrb7dqkgjc0chaivp4dgm"; + url = "https://elpa.gnu.org/devel/spacious-padding-0.5.0.0.20240429.82953.tar"; + sha256 = "0k5w5d9prlasvv6074nxl8782mbhhvccpkc1zjrp228frkbgfpmi"; }; packageRequires = [ emacs ]; meta = { @@ -5993,10 +6091,10 @@ elpaBuild { pname = "srht"; ename = "srht"; - version = "0.4.0.20231117.115741"; + version = "0.4.0.20240506.104337"; src = fetchurl { - url = "https://elpa.gnu.org/devel/srht-0.4.0.20231117.115741.tar"; - sha256 = "03wyfx0zhgfpbhwyxrbd6mj0465m82910l77r12gsg1vbk78l4l0"; + url = "https://elpa.gnu.org/devel/srht-0.4.0.20240506.104337.tar"; + sha256 = "1fs6av8l3v4vvzxxhd20rzwrwh8dkk1d1x21jkjx8nczj2jydwb0"; }; packageRequires = [ emacs plz transient ]; meta = { @@ -6029,10 +6127,10 @@ elpaBuild { pname = "standard-themes"; ename = "standard-themes"; - version = "2.0.1.0.20240427.84421"; + version = "2.0.1.0.20240520.83250"; src = fetchurl { - url = "https://elpa.gnu.org/devel/standard-themes-2.0.1.0.20240427.84421.tar"; - sha256 = "09vmyjm148r1ajxlsrdqrgi988a2px5dn5z9k0l3lg88a38rxgz6"; + url = "https://elpa.gnu.org/devel/standard-themes-2.0.1.0.20240520.83250.tar"; + sha256 = "08lb47hilg5dniqxlxp773s16m0shqmglcrf1qdm48ddg05911gx"; }; packageRequires = [ emacs ]; meta = { @@ -6062,10 +6160,10 @@ elpaBuild { pname = "substitute"; ename = "substitute"; - version = "0.2.1.0.20240117.30048"; + version = "0.3.1.0.20240522.34122"; src = fetchurl { - url = "https://elpa.gnu.org/devel/substitute-0.2.1.0.20240117.30048.tar"; - sha256 = "1vkjg3w12r7j3dl5jx5wha412lknns37535vjd4x6xgk2rs3yvh0"; + url = "https://elpa.gnu.org/devel/substitute-0.3.1.0.20240522.34122.tar"; + sha256 = "02n78x82sl7i0xzpp1468i1bwm9kic2ycc9vvhymxalpiylc3iqq"; }; packageRequires = [ emacs ]; meta = { @@ -6126,10 +6224,10 @@ elpaBuild { pname = "svg-tag-mode"; ename = "svg-tag-mode"; - version = "0.3.2.0.20240122.120925"; + version = "0.3.2.0.20240429.105240"; src = fetchurl { - url = "https://elpa.gnu.org/devel/svg-tag-mode-0.3.2.0.20240122.120925.tar"; - sha256 = "17qixxhy889l2v17pw3b2qrk2g6x4a7yfh0bzxfhlizq10sy24hz"; + url = "https://elpa.gnu.org/devel/svg-tag-mode-0.3.2.0.20240429.105240.tar"; + sha256 = "0isp9zcyx9dqb0nah1b990nikwiaxm5lvqlbya9v1rcb3fbvf9hc"; }; packageRequires = [ emacs svg-lib ]; meta = { @@ -6145,10 +6243,10 @@ elpaBuild { pname = "swiper"; ename = "swiper"; - version = "0.14.2.0.20240405.204232"; + version = "0.14.2.0.20240520.120545"; src = fetchurl { - url = "https://elpa.gnu.org/devel/swiper-0.14.2.0.20240405.204232.tar"; - sha256 = "1b5dn8v6rm6m7b2agdxf50jkmrfx6ac8fnwyqabr3zzcshpl6ixm"; + url = "https://elpa.gnu.org/devel/swiper-0.14.2.0.20240520.120545.tar"; + sha256 = "1wcxf1d3kn19yq3gk4d4fqs7p61i1rm316glzlcksny6rp2f1sma"; }; packageRequires = [ emacs ivy ]; meta = { @@ -6449,10 +6547,10 @@ elpaBuild { pname = "track-changes"; ename = "track-changes"; - version = "1.1.0.20240419.221900"; + version = "1.2.0.20240505.172329"; src = fetchurl { - url = "https://elpa.gnu.org/devel/track-changes-1.1.0.20240419.221900.tar"; - sha256 = "16xvkp3fq89jbf87phk6yl9cbfmmgb8r376hh08kwrsmbpaz6bd2"; + url = "https://elpa.gnu.org/devel/track-changes-1.2.0.20240505.172329.tar"; + sha256 = "1mvgwrrqfa3yix9lrsx4mb6zqaydjjqc69nh9lyrcgi54819jlvh"; }; packageRequires = [ emacs ]; meta = { @@ -6537,10 +6635,10 @@ elpaBuild { pname = "transient"; ename = "transient"; - version = "0.6.0.0.20240414.135949"; + version = "0.6.0.0.20240509.184906"; src = fetchurl { - url = "https://elpa.gnu.org/devel/transient-0.6.0.0.20240414.135949.tar"; - sha256 = "1rf1zszrfd02n4ky8n72sqzwb3zk16j92plflfc2wdrzaw9k2mmr"; + url = "https://elpa.gnu.org/devel/transient-0.6.0.0.20240509.184906.tar"; + sha256 = "1axy5ccwd4n63saaf10af182r2k3j8x4vbyhxa81rdv73ndr652g"; }; packageRequires = [ compat emacs seq ]; meta = { @@ -6715,10 +6813,10 @@ elpaBuild { pname = "urgrep"; ename = "urgrep"; - version = "0.4.2snapshot0.20240310.204507"; + version = "0.5.1snapshot0.20240511.180511"; src = fetchurl { - url = "https://elpa.gnu.org/devel/urgrep-0.4.2snapshot0.20240310.204507.tar"; - sha256 = "173ql2ng8blfw4y7nbfgjmzpgvw0xabb1sk2c1mis6k36ali851w"; + url = "https://elpa.gnu.org/devel/urgrep-0.5.1snapshot0.20240511.180511.tar"; + sha256 = "03dpbsmx11r14mi6vlh4phknmxlayxng2rfphv8q7wn4cvgv18q2"; }; packageRequires = [ compat emacs project ]; meta = { @@ -6786,10 +6884,10 @@ elpaBuild { pname = "use-package"; ename = "use-package"; - version = "2.4.5.0.20240330.124921"; + version = "2.4.5.0.20240518.103045"; src = fetchurl { - url = "https://elpa.gnu.org/devel/use-package-2.4.5.0.20240330.124921.tar"; - sha256 = "0jc1389g63bsy2w2fkw332vpwqrm5xci8skqf7mkg39y8nj2j0fw"; + url = "https://elpa.gnu.org/devel/use-package-2.4.5.0.20240518.103045.tar"; + sha256 = "0zh4vb5h2733glbj3izflw0laxvf2y34cm924jpgyrjkz66ld6wc"; }; packageRequires = [ bind-key emacs ]; meta = { @@ -6950,10 +7048,10 @@ elpaBuild { pname = "vertico"; ename = "vertico"; - version = "1.8.0.20240424.195903"; + version = "1.8.0.20240511.204721"; src = fetchurl { - url = "https://elpa.gnu.org/devel/vertico-1.8.0.20240424.195903.tar"; - sha256 = "0yhk9cp3qlan2vci31an1d3c4mqz2ckbs7xhs12qk6vich66yshk"; + url = "https://elpa.gnu.org/devel/vertico-1.8.0.20240511.204721.tar"; + sha256 = "0gd68x98dghqa7da0ybah2w27bxipal262n9d6rpdhxb361cmpca"; }; packageRequires = [ compat emacs ]; meta = { @@ -7155,10 +7253,10 @@ elpaBuild { pname = "which-key"; ename = "which-key"; - version = "3.6.0.0.20240423.92028"; + version = "3.6.0.0.20240501.85118"; src = fetchurl { - url = "https://elpa.gnu.org/devel/which-key-3.6.0.0.20240423.92028.tar"; - sha256 = "0bx47186nrsfbjcfci7qfx3s874q4wvys6imkr4k0i9mmfnchvaa"; + url = "https://elpa.gnu.org/devel/which-key-3.6.0.0.20240501.85118.tar"; + sha256 = "080i7b37fzvf020q4dqxy0dr8na0qqaymv8bd048yrw70wcrlz0w"; }; packageRequires = [ emacs ]; meta = { @@ -7184,6 +7282,24 @@ license = lib.licenses.free; }; }) {}; + window-tool-bar = callPackage ({ elpaBuild + , emacs + , fetchurl + , lib }: + elpaBuild { + pname = "window-tool-bar"; + ename = "window-tool-bar"; + version = "0.2.0.20240519.64147"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/window-tool-bar-0.2.0.20240519.64147.tar"; + sha256 = "1z5fdlrrjdx0lhfwzahnlqxg75fy9abrj3izc8mfwy5j1bkrym6m"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/window-tool-bar.html"; + license = lib.licenses.free; + }; + }) {}; windower = callPackage ({ elpaBuild , emacs , fetchurl @@ -7275,10 +7391,10 @@ elpaBuild { pname = "wrap-search"; ename = "wrap-search"; - version = "4.14.11.0.20240427.191832"; + version = "4.16.13.0.20240517.214404"; src = fetchurl { - url = "https://elpa.gnu.org/devel/wrap-search-4.14.11.0.20240427.191832.tar"; - sha256 = "0286jkxhzn6x2jbvwlrknni3fdf9h2a2mi96kkasy91bph3snx2a"; + url = "https://elpa.gnu.org/devel/wrap-search-4.16.13.0.20240517.214404.tar"; + sha256 = "14rk7gyab0m19z0rhrpqcfdqrdrbz9v5zw36rkn5qxzrpv6cw7hq"; }; packageRequires = []; meta = { @@ -7365,10 +7481,10 @@ elpaBuild { pname = "xref"; ename = "xref"; - version = "1.6.3.0.20240328.32323"; + version = "1.6.3.0.20240518.3950"; src = fetchurl { - url = "https://elpa.gnu.org/devel/xref-1.6.3.0.20240328.32323.tar"; - sha256 = "04rxbfzvz4z3q04r3817vrkx7w6kspdmpyl30h9v37vmwyxw722j"; + url = "https://elpa.gnu.org/devel/xref-1.6.3.0.20240518.3950.tar"; + sha256 = "0k60vvhpw5bzbs3qv28sip7dl2p44m8bczx54ff32klgfwpk06zk"; }; packageRequires = [ 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 88d511c6a3841..b1145baf3781e 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix @@ -295,10 +295,10 @@ elpaBuild { pname = "auctex"; ename = "auctex"; - version = "14.0.4"; + version = "14.0.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/auctex-14.0.4.tar"; - sha256 = "14rfv7xlwdqp42dilmpg11d58q8pzw15fv01hq80iv9kyzsfvxd7"; + url = "https://elpa.gnu.org/packages/auctex-14.0.5.tar"; + sha256 = "0sycj6ad5jazmsxq37hsnvbywkpj66lrw3d3mxqr1wqkb67cdd3k"; }; packageRequires = [ emacs ]; meta = { @@ -430,10 +430,10 @@ elpaBuild { pname = "beframe"; ename = "beframe"; - version = "1.0.1"; + version = "1.1.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/beframe-1.0.1.tar"; - sha256 = "1p8zglpdcss0p307i4h2zpqbsiipmgmk0a2fx6j9w3lx0zgaf2xj"; + url = "https://elpa.gnu.org/packages/beframe-1.1.1.tar"; + sha256 = "0xx2zvgjilivi6nnr2x9bwwcifinj66j6r07wxjawqkrsknyypas"; }; packageRequires = [ emacs ]; meta = { @@ -535,10 +535,10 @@ elpaBuild { pname = "boxy-headings"; ename = "boxy-headings"; - version = "2.1.5"; + version = "2.1.6"; src = fetchurl { - url = "https://elpa.gnu.org/packages/boxy-headings-2.1.5.tar"; - sha256 = "0w3cy2r8iqsb79r33lllj08v719hq0xniq5pbr9sl8kn2raxcjhr"; + url = "https://elpa.gnu.org/packages/boxy-headings-2.1.6.tar"; + sha256 = "0wnks9a4agvqjivp9myl8zcdq6rj7hh5ig73f8qv5imar0i76izc"; }; packageRequires = [ boxy emacs org ]; meta = { @@ -614,10 +614,10 @@ elpaBuild { pname = "bufferlo"; ename = "bufferlo"; - version = "0.6"; + version = "0.8"; src = fetchurl { - url = "https://elpa.gnu.org/packages/bufferlo-0.6.tar"; - sha256 = "0gvg1mag8ngjmjl4d6zr99k7mq368l1m6dxy9mk6icgxm3sqr1yk"; + url = "https://elpa.gnu.org/packages/bufferlo-0.8.tar"; + sha256 = "0ypd611xmjsir24nv8gr19pq7f1n0gbgq9yzvfy3m6k97gpw2jzq"; }; packageRequires = [ emacs ]; meta = { @@ -820,6 +820,21 @@ license = lib.licenses.free; }; }) {}; + colorful-mode = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "colorful-mode"; + ename = "colorful-mode"; + version = "1.0.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/colorful-mode-1.0.0.tar"; + sha256 = "1gmbrb5z3rmw0fjrdymfbcx74szcy963dx53ksykvfd9355azj3x"; + }; + packageRequires = [ compat emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/colorful-mode.html"; + license = lib.licenses.free; + }; + }) {}; comint-mime = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "comint-mime"; @@ -937,10 +952,10 @@ elpaBuild { pname = "consult"; ename = "consult"; - version = "1.5"; + version = "1.6"; src = fetchurl { - url = "https://elpa.gnu.org/packages/consult-1.5.tar"; - sha256 = "1gx4cjrcaq5dn3rrd2dm30jz07zrnddf0y33qi0dmiqlsyg7l9qw"; + url = "https://elpa.gnu.org/packages/consult-1.6.tar"; + sha256 = "00wsv6dvlyf7ygi586pdyhgp7f5ic2qqyqjz3g2g8hmgya5javdb"; }; packageRequires = [ compat emacs ]; meta = { @@ -948,6 +963,26 @@ license = lib.licenses.free; }; }) {}; + consult-denote = callPackage ({ consult + , denote + , elpaBuild + , emacs + , fetchurl + , lib }: + elpaBuild { + pname = "consult-denote"; + ename = "consult-denote"; + version = "0.0.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/consult-denote-0.0.0.tar"; + sha256 = "191qf8knrmimam98jv8kgrl6mfrnwpdmw160s5qw6wcik7j4z6kv"; + }; + packageRequires = [ consult denote emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/consult-denote.html"; + license = lib.licenses.free; + }; + }) {}; consult-hoogle = callPackage ({ elpaBuild , emacs , fetchurl @@ -1166,10 +1201,10 @@ elpaBuild { pname = "dape"; ename = "dape"; - version = "0.10.0"; + version = "0.11.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/dape-0.10.0.tar"; - sha256 = "1x6mbis4vmghp3vf4pxyzdp68nnrraw9ayx3gzbp1bvcmr62qdig"; + url = "https://elpa.gnu.org/packages/dape-0.11.1.tar"; + sha256 = "0i04wwklypzxh78gwd9zjxjm3lwi2sn7qpqnlgd6n8hhcigyzhp0"; }; packageRequires = [ emacs jsonrpc ]; meta = { @@ -1442,10 +1477,10 @@ elpaBuild { pname = "dired-preview"; ename = "dired-preview"; - version = "0.1.1"; + version = "0.2.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/dired-preview-0.1.1.tar"; - sha256 = "08c9bvsdb7w9ggav9yrpz12nf9zlq4h1zq8ssdf9pwrx2nzy06p7"; + url = "https://elpa.gnu.org/packages/dired-preview-0.2.0.tar"; + sha256 = "15l01javijjjjc9bycljgshg9jv3clmfnsisy7f3caqxq78sb61l"; }; packageRequires = [ emacs ]; meta = { @@ -1547,10 +1582,10 @@ elpaBuild { pname = "drepl"; ename = "drepl"; - version = "0.2"; + version = "0.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/drepl-0.2.tar"; - sha256 = "1vf61d6iihpnr3h4cyxksd64qj8rw2a9ihjm3krvjmigxr2r6awx"; + url = "https://elpa.gnu.org/packages/drepl-0.3.tar"; + sha256 = "0dy8xvx5nwibiyhddm6nhcw384vhkhsbbxcs4hah0yxwajfm8yds"; }; packageRequires = [ comint-mime emacs ]; meta = { @@ -1667,10 +1702,10 @@ elpaBuild { pname = "eev"; ename = "eev"; - version = "20240309"; + version = "20240513"; src = fetchurl { - url = "https://elpa.gnu.org/packages/eev-20240309.tar"; - sha256 = "0nn6jdc37n2nx3i97ljl5a37dwxv5qx12ar15yr702hbsgaxyfa5"; + url = "https://elpa.gnu.org/packages/eev-20240513.tar"; + sha256 = "133blp5696f2adxqny5kyylr6s3n3vixs0ak1n3i58sqb0krp2pj"; }; packageRequires = [ emacs ]; meta = { @@ -1682,10 +1717,10 @@ elpaBuild { pname = "ef-themes"; ename = "ef-themes"; - version = "1.6.1"; + version = "1.7.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ef-themes-1.6.1.tar"; - sha256 = "0wkiqjnqnxwzskpxam44qxxz13fbpgnf17c1qrin8ad8i9b49bvq"; + url = "https://elpa.gnu.org/packages/ef-themes-1.7.0.tar"; + sha256 = "0d6rpwk1z9sc1yzfc4d4icb43pqwvdfvqap1m4r4aajvc5kasq1v"; }; packageRequires = [ emacs ]; meta = { @@ -1781,10 +1816,10 @@ elpaBuild { pname = "elisp-benchmarks"; ename = "elisp-benchmarks"; - version = "1.14"; + version = "1.16"; src = fetchurl { - url = "https://elpa.gnu.org/packages/elisp-benchmarks-1.14.tar"; - sha256 = "050wja4axngnxggfxhg4b4lcbf1q674zr933r9qkc3ww731f42qa"; + url = "https://elpa.gnu.org/packages/elisp-benchmarks-1.16.tar"; + sha256 = "0v5db89z6hirvixgjwyz3a9dkx6xf486hy51sprvslki706m08p2"; }; packageRequires = []; meta = { @@ -1796,10 +1831,10 @@ elpaBuild { pname = "ellama"; ename = "ellama"; - version = "0.9.1"; + version = "0.9.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ellama-0.9.1.tar"; - sha256 = "1kyylhavqa2wsgjgqybg25aiz0fyw4njpady2k2xhry5jw9i78vs"; + url = "https://elpa.gnu.org/packages/ellama-0.9.4.tar"; + sha256 = "12l8k7dwcdgndy0zbdgkhx94y46fkzwjrbwlgj9922zbk38nnz46"; }; packageRequires = [ emacs llm spinner ]; meta = { @@ -2592,10 +2627,10 @@ elpaBuild { pname = "gtags-mode"; ename = "gtags-mode"; - version = "1.5"; + version = "1.6"; src = fetchurl { - url = "https://elpa.gnu.org/packages/gtags-mode-1.5.tar"; - sha256 = "15jmynzm2xrvb410vka3jzzdcxbsm3vkihz27yzym708jb0bd8ji"; + url = "https://elpa.gnu.org/packages/gtags-mode-1.6.tar"; + sha256 = "1r3ih44kzkrx9bmfl8ri2yv90b7g4nhb0vvdnz1ba3f44x15ppjx"; }; packageRequires = [ emacs ]; meta = { @@ -2964,10 +2999,10 @@ elpaBuild { pname = "jinx"; ename = "jinx"; - version = "1.6"; + version = "1.7"; src = fetchurl { - url = "https://elpa.gnu.org/packages/jinx-1.6.tar"; - sha256 = "0jy2g587930d4jqi4asrci3411bby9j6wrxczyskacvjs41vqyip"; + url = "https://elpa.gnu.org/packages/jinx-1.7.tar"; + sha256 = "13snfsrwdbn23fdwpk42xp24x8bskl8sgsbq51nr896smjp2x3b4"; }; packageRequires = [ compat emacs ]; meta = { @@ -3246,16 +3281,16 @@ license = lib.licenses.free; }; }) {}; - llm = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + llm = callPackage ({ elpaBuild, emacs, fetchurl, lib, plz }: elpaBuild { pname = "llm"; ename = "llm"; - version = "0.12.3"; + version = "0.15.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/llm-0.12.3.tar"; - sha256 = "19c3i8jfhvc0zqha2mlynk16ws4wgc1hdjrp7gp290bacvr560vg"; + url = "https://elpa.gnu.org/packages/llm-0.15.0.tar"; + sha256 = "1y3gs8zsng87wmlkx5az396hci4xyn0ww7cbaavisqbrxam51qvj"; }; - packageRequires = [ emacs ]; + packageRequires = [ emacs plz ]; meta = { homepage = "https://elpa.gnu.org/packages/llm.html"; license = lib.licenses.free; @@ -3745,10 +3780,10 @@ elpaBuild { pname = "nano-modeline"; ename = "nano-modeline"; - version = "1.0.1"; + version = "1.1.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/nano-modeline-1.0.1.tar"; - sha256 = "0frvg9zy9i8qqb6il0csxmgxsd373n696kwz1xqq28jikvhzkwyy"; + url = "https://elpa.gnu.org/packages/nano-modeline-1.1.0.tar"; + sha256 = "1x4b4j82vzbi1mhbs9bwgw41hcagnfk56kswjk928i179pnkr0cx"; }; packageRequires = [ emacs ]; meta = { @@ -3839,10 +3874,10 @@ elpaBuild { pname = "notmuch-indicator"; ename = "notmuch-indicator"; - version = "1.1.0"; + version = "1.2.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/notmuch-indicator-1.1.0.tar"; - sha256 = "1g30hzb238w9cnxqw8w7gw5l8sl4rx122napmm9rx974hdk3zk9k"; + url = "https://elpa.gnu.org/packages/notmuch-indicator-1.2.0.tar"; + sha256 = "1n525slxs0l5nbila1sy62fz384yz7f54nrq1ixdlq0j3czgh9kz"; }; packageRequires = [ emacs ]; meta = { @@ -4004,10 +4039,10 @@ elpaBuild { pname = "org"; ename = "org"; - version = "9.6.28"; + version = "9.6.30"; src = fetchurl { - url = "https://elpa.gnu.org/packages/org-9.6.28.tar"; - sha256 = "1slh28vjwhb65q0630p1syv6ampdsqgrdmisyj4f328g3j2brpkw"; + url = "https://elpa.gnu.org/packages/org-9.6.30.tar"; + sha256 = "0h2p7gjiys5ch68y35l6bpw9pp852vprmfzi0dk86z1wkilhycip"; }; packageRequires = [ emacs ]; meta = { @@ -4094,10 +4129,10 @@ elpaBuild { pname = "org-real"; ename = "org-real"; - version = "1.0.8"; + version = "1.0.9"; src = fetchurl { - url = "https://elpa.gnu.org/packages/org-real-1.0.8.tar"; - sha256 = "03g12czy833yzj7idkharsbl2zd1ajnsf7ay8qxqljwqrz8m91gw"; + url = "https://elpa.gnu.org/packages/org-real-1.0.9.tar"; + sha256 = "0g19pgg7rqijb6q1vpifvpzl2gyc13a42q1n23x3kawl2srhcjp2"; }; packageRequires = [ boxy emacs org ]; meta = { @@ -4124,10 +4159,10 @@ elpaBuild { pname = "org-transclusion"; ename = "org-transclusion"; - version = "1.3.2"; + version = "1.4.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/org-transclusion-1.3.2.tar"; - sha256 = "14w9n10s6nh3nylkx3xzbqjb9pp4dja85agh0h2bzlbkaq4j7vij"; + url = "https://elpa.gnu.org/packages/org-transclusion-1.4.0.tar"; + sha256 = "0ci6xja3jkj1a9f76sf3780gcjrdpbds2y2bwba3b55fjmr1fscl"; }; packageRequires = [ emacs org ]; meta = { @@ -4544,10 +4579,10 @@ elpaBuild { pname = "pyim"; ename = "pyim"; - version = "5.3.3"; + version = "5.3.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/pyim-5.3.3.tar"; - sha256 = "03khpd3skv7ijmnn721dvila8x6pvg9pl4p7djyz8m59xgvv55dp"; + url = "https://elpa.gnu.org/packages/pyim-5.3.4.tar"; + sha256 = "0axi8vizr2pdswdnnkr409k926h9k7w3c18nbmb9j3pfc32inkjs"; }; packageRequires = [ async emacs xr ]; meta = { @@ -5314,10 +5349,10 @@ elpaBuild { pname = "spacious-padding"; ename = "spacious-padding"; - version = "0.4.1"; + version = "0.5.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/spacious-padding-0.4.1.tar"; - sha256 = "0w9f19sxpbaagwxfnsg3qmk95v8vnkfcyd3l6i9ns9ww26sb2fgl"; + url = "https://elpa.gnu.org/packages/spacious-padding-0.5.0.tar"; + sha256 = "0x5bsyd6b1d3bzrsrpf9nvw7xj5ch114m2dilq64bg8y2db3452z"; }; packageRequires = [ emacs ]; meta = { @@ -5449,10 +5484,10 @@ elpaBuild { pname = "substitute"; ename = "substitute"; - version = "0.2.1"; + version = "0.3.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/substitute-0.2.1.tar"; - sha256 = "09cqxfp9az6cckh0bq1155g6xh9rjn0ppjyc6879ihx6ba61li53"; + url = "https://elpa.gnu.org/packages/substitute-0.3.1.tar"; + sha256 = "0038kkn6v2w3asg9abwary2cacr9wbw90wdvq7q9wyk1818cygff"; }; packageRequires = [ emacs ]; meta = { @@ -5788,10 +5823,10 @@ elpaBuild { pname = "track-changes"; ename = "track-changes"; - version = "1.1"; + version = "1.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/track-changes-1.1.tar"; - sha256 = "04srqkpyc6l3s95jyf2p5pqqf1z67i7k89334r6ybqj1l91h2prn"; + url = "https://elpa.gnu.org/packages/track-changes-1.2.tar"; + sha256 = "0al6a1xjs6p2pn6z976pnmfqz2x5xcz99b5gkdzz90ywbn7018m4"; }; packageRequires = [ emacs ]; meta = { @@ -6013,10 +6048,10 @@ elpaBuild { pname = "urgrep"; ename = "urgrep"; - version = "0.4.1"; + version = "0.5.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/urgrep-0.4.1.tar"; - sha256 = "046096vk8d5xy33icv4s0s101lrx3xan9ppvh77rqxd95gglhgap"; + url = "https://elpa.gnu.org/packages/urgrep-0.5.0.tar"; + sha256 = "14vga04hf03hj1ilcpl3qblmb7mhl9j0qwkq2whbc50p98avkhqi"; }; packageRequires = [ compat emacs project ]; meta = { @@ -6449,6 +6484,21 @@ license = lib.licenses.free; }; }) {}; + window-tool-bar = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "window-tool-bar"; + ename = "window-tool-bar"; + version = "0.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/window-tool-bar-0.2.tar"; + sha256 = "191v21rrw1j560512mjn1s1avhirk1awy746xajjra8lb1ywnxw7"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/window-tool-bar.html"; + license = lib.licenses.free; + }; + }) {}; windower = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "windower"; @@ -6533,10 +6583,10 @@ elpaBuild { pname = "wrap-search"; ename = "wrap-search"; - version = "4.14.11"; + version = "4.16.13"; src = fetchurl { - url = "https://elpa.gnu.org/packages/wrap-search-4.14.11.tar"; - sha256 = "07x6fcig69d3hmcmvpj75h605j8sfjwmd4z1yd4rb6np60dh42ff"; + url = "https://elpa.gnu.org/packages/wrap-search-4.16.13.tar"; + sha256 = "0h5wlvmxq1rcmkhmaan3118w5480xx1gblg73lsfhxnj2xkmhrbi"; }; 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 d9cb7b0aa5cec..762359a47e275 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.2.1"; + version = "2.2.2"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/annotate-2.2.1.tar"; - sha256 = "04k42bc3jbna3jipcpsj31lhcj1cqabak4pmllz9c0jf1z74hx94"; + url = "https://elpa.nongnu.org/nongnu/annotate-2.2.2.tar"; + sha256 = "0hrb7kjzhgy46hxaa77rv5ilsdsv6zxpawnkx4viw5jq0v5s4fl6"; }; packageRequires = []; meta = { @@ -736,10 +736,10 @@ elpaBuild { pname = "editorconfig"; ename = "editorconfig"; - version = "0.10.1"; + version = "0.11.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/editorconfig-0.10.1.tar"; - sha256 = "1xv2yfs8v2bcf9nvbchdw8lxryfnhy3zh0n6vnxyxnbx2590qa9s"; + url = "https://elpa.nongnu.org/nongnu/editorconfig-0.11.0.tar"; + sha256 = "0adzm6fhx5vgg20qy9f7cqpnx938mp1ls91y5cw71pjm9ihs2cyv"; }; packageRequires = [ emacs nadvice ]; meta = { @@ -1525,6 +1525,21 @@ license = lib.licenses.free; }; }) {}; + gptel = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib, transient }: + elpaBuild { + pname = "gptel"; + ename = "gptel"; + version = "0.8.6"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/gptel-0.8.6.tar"; + sha256 = "1ds0i32bdmdi5w68cjxm9xlg0m9n29yr4hl6sqi8gn3kgswfx1sb"; + }; + packageRequires = [ compat emacs transient ]; + meta = { + homepage = "https://elpa.gnu.org/packages/gptel.html"; + license = lib.licenses.free; + }; + }) {}; graphql-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "graphql-mode"; @@ -1989,16 +2004,20 @@ license = lib.licenses.free; }; }) {}; - macrostep = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: + macrostep = callPackage ({ cl-lib ? null + , compat + , elpaBuild + , fetchurl + , lib }: elpaBuild { pname = "macrostep"; ename = "macrostep"; - version = "0.9.2"; + version = "0.9.4"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/macrostep-0.9.2.tar"; - sha256 = "0ij216575987fi4l4305h5xnvic21lizybkyq5mx67zvhcq75yfs"; + url = "https://elpa.nongnu.org/nongnu/macrostep-0.9.4.tar"; + sha256 = "01n3qhxfjd9vg93ddrhnm275v24ih5qczkphc232m0csswxghpdk"; }; - packageRequires = [ cl-lib ]; + packageRequires = [ cl-lib compat ]; meta = { homepage = "https://elpa.gnu.org/packages/macrostep.html"; license = lib.licenses.free; @@ -2073,10 +2092,10 @@ elpaBuild { pname = "mastodon"; ename = "mastodon"; - version = "1.0.12"; + version = "1.0.21"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/mastodon-1.0.12.tar"; - sha256 = "1kmzlz9sb7vkyw84kmpg39zj2hhyrvpb0g6h54ikrxccbn8g22s2"; + url = "https://elpa.nongnu.org/nongnu/mastodon-1.0.21.tar"; + sha256 = "1qlpkg28q4iyvjjzv8b40b8q7ni7rc94lj5akgzxbzw4avpp1217"; }; packageRequires = [ emacs persist request ]; meta = { @@ -2696,10 +2715,10 @@ elpaBuild { pname = "racket-mode"; ename = "racket-mode"; - version = "1.0.20240419.71343"; + version = "1.0.20240514.112412"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/racket-mode-1.0.20240419.71343.tar"; - sha256 = "152cm66y4pk5ggr7rbj9pzf2w0c6adkh1dd3cjwmq96mpxydx2na"; + url = "https://elpa.nongnu.org/nongnu/racket-mode-1.0.20240514.112412.tar"; + sha256 = "1ysjq9jvkm8qibj0z6j4q90sx19xyz9z9qzdlci9mw872r21ak9h"; }; packageRequires = [ emacs ]; meta = { @@ -3570,10 +3589,10 @@ elpaBuild { pname = "xah-fly-keys"; ename = "xah-fly-keys"; - version = "25.1.20240423172921"; + version = "25.6.20240521220424"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-25.1.20240423172921.tar"; - sha256 = "00h6bmfl4mpx44j1phvijffzlqm1xs2gfprmpwbghc29p5lbd2pj"; + url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-25.6.20240521220424.tar"; + sha256 = "029hy3qmf6nvibbq9w2b964gzbw99lja595h4g1y5zzyrgzqrhrn"; }; 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 b21538281143a..9dd51bcbc5a47 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json +++ b/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json @@ -451,40 +451,6 @@ } }, { - "ename": "ac-cider", - "commit": "e8adefaf2e284ef91baec3dbd3e10c868de69926", - "sha256": "1dszpb706h34miq2bxqyq1ycbran5ax36vcniwp8vvhgcjsw5sz6", - "fetcher": "github", - "repo": "clojure-emacs/ac-cider", - "unstable": { - "version": [ - 20161006, - 719 - ], - "deps": [ - "auto-complete", - "cider", - "cl-lib" - ], - "commit": "d8670939bbf88079263d5ace2b8bc04cf325be36", - "sha256": "01g1h2j0rfih8v0yvvr5gjh3abcj2mz3jmfbis8a60ivmngab732" - }, - "stable": { - "version": [ - 0, - 2, - 3 - ], - "deps": [ - "auto-complete", - "cider", - "cl-lib" - ], - "commit": "4be034e5f82421b0a836ec7ff45815c67caffcee", - "sha256": "12s7wy7fyk5z9q287j871gcsrvj90f4c81h39p66d99jw0cl93qj" - } - }, - { "ename": "ac-clang", "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", "sha256": "08yaaiva6j98rqn9d4wfc0yrjh1nifbnj2rz342q863n76fybbxv", @@ -1721,11 +1687,11 @@ "repo": "brownts/ada-ts-mode", "unstable": { "version": [ - 20240426, - 256 + 20240506, + 1140 ], - "commit": "a0c001fd768b062089127b09c838ca51b8214360", - "sha256": "1j2hid05fnzd3q5z89xib70n4w530ifpqqlhv0jhg70npwj7pny7" + "commit": "3f83ab4c99cf13cf4693dde29eb1e950bbbb6595", + "sha256": "1jqsv7f24j39kbh4msvsfm0sv90k20fnw9r1wvmbgi8m7xgdhgzv" } }, { @@ -3031,11 +2997,11 @@ "repo": "franburstall/amsreftex", "unstable": { "version": [ - 20240210, - 1109 + 20240512, + 1746 ], - "commit": "d64705a7a252be2554b717a38252d8999b0c1504", - "sha256": "1q9d93v9zxcs8yngl5liqq3gngl04lnjnka34x8iqbknrl55mzd0" + "commit": "c508b05536a04ee153a9947f025d24930c52209a", + "sha256": "1a99xm0rwb6cmx8dl0mrc8h50f7ssf3xz3n6cc4xagj2b6135jia" } }, { @@ -3289,21 +3255,17 @@ }, { "ename": "anki-editor", - "commit": "8155d649e4b129d0c72da6bb2b1aac66c8483491", - "sha256": "18c5p82llq11vg1svqvbjrcnm7695nbbc6pwwl9jdjplasar585l", + "commit": "d5680d254b73eea91a113e152401255b7d3bf7c0", + "sha256": "012q9kw6xwcyyaha1wfnbqiysy3475mfbcd6bkji9fvdzps6np1b", "fetcher": "github", - "repo": "louietan/anki-editor", + "repo": "anki-editor/anki-editor", "unstable": { "version": [ - 20190922, - 1223 - ], - "deps": [ - "dash", - "request" + 20240514, + 1944 ], - "commit": "084ffad14fa700ad1ba95d8cbfe4a8f6052e2408", - "sha256": "0zjd5yid333shvjm4zy3p7zdpa09xcl96gc4wvi2paxjad6iqhwz" + "commit": "32d81be1d8305c5ccde12c7d0b29845d4f831888", + "sha256": "1chlj0igxk2mmmdvmw3qahp3pz9ra6yabm4711xhlnx7zj028lkc" } }, { @@ -3384,14 +3346,14 @@ "repo": "noctuid/annalist.el", "unstable": { "version": [ - 20190929, - 207 + 20240501, + 1201 ], "deps": [ "cl-lib" ], - "commit": "08df07e4530953a2c0b1aa553adcab37b7b614b0", - "sha256": "1jlb5w4972l8m2aa18q2l6arfpm65g4nk21dn1yi8c9dbpk2g67c" + "commit": "e1ef5dad75fa502d761f70d9ddf1aeb1c423f41d", + "sha256": "1di8wknirx3ql9bqp940yy5p07n2x82wgqyvfmdxblagh7pcp8a8" }, "stable": { "version": [ @@ -3414,11 +3376,11 @@ "repo": "bastibe/annotate.el", "unstable": { "version": [ - 20240326, - 1828 + 20240509, + 1144 ], - "commit": "3a27be3aa024d314da84c89cb86af58dbf3a2cb9", - "sha256": "02rv530xhcxlgqlj0cywcg3r2yhgv055fr9d3fa82g6nq364qf03" + "commit": "bc82194ca5b10a05cab4169f6eacc5c18af61ec0", + "sha256": "0vzvy7bxp6pb42x16jms7sw2l1mp7m0xfz3xk55hwyxfz8rh66gp" }, "stable": { "version": [ @@ -3833,11 +3795,11 @@ "repo": "radian-software/apheleia", "unstable": { "version": [ - 20240413, - 2257 + 20240517, + 2228 ], - "commit": "66bf5195b4e922f23a9d573f2823daeb63e7ed5b", - "sha256": "0yqks35q9vv7qymwx96b9smmg7dpb12lacclq63ypfhkwakd2wgg" + "commit": "61766b50b24fa16be519d77795dc63522e04dce8", + "sha256": "1zichs8b1kczzb63r1pwyiqzav7c0x8sxdvg0inv02w5wq96r2wc" }, "stable": { "version": [ @@ -4008,11 +3970,11 @@ "repo": "waymondo/apropospriate-theme", "unstable": { "version": [ - 20230925, - 114 + 20240517, + 1823 ], - "commit": "ac2e16d23528dbc4efe1844f54366b9392d20ae6", - "sha256": "1rv0bj09lyylc3pq7vyg2y0pgpnx0lzmbvfjvpslmprb9vhfqbdg" + "commit": "84ee370da4c19db8051761b1b64bbdc8e1c7dc73", + "sha256": "13zccq7q1rwhb671f3501j75gy676n611khhzdqxizsgy2mb72nz" }, "stable": { "version": [ @@ -4554,11 +4516,11 @@ "repo": "contrapunctus/async-backup", "unstable": { "version": [ - 20220131, - 1438 + 20230412, + 1534 ], - "commit": "6ddb39fe77d66cdef48b87cb0d0554ad7d132308", - "sha256": "14clnfjn4wwi0kza5d98d2iv9sjfnxs28cabm9psjvi239lx0f9d" + "commit": "d07a7bd4a5c3332a8a585680d67925385c595927", + "sha256": "09vhgczs3xx23srdqjnnxw9vqhrnjy5w04dl9hp22jvbd1z1nzbc" } }, { @@ -4815,26 +4777,26 @@ "repo": "tsuu32/auctex-cluttex", "unstable": { "version": [ - 20220730, - 1100 + 20240519, + 1303 ], "deps": [ "auctex" ], - "commit": "f4012ac86e612eac7662c62afd946e59b3b405bd", - "sha256": "163p1x5zrw39cq2l7vf4zf8283a0bsg9wfs25yvs77dlgsvzvb5c" + "commit": "1a940892dcbe3e4874d2d60db92de1cb34a1b773", + "sha256": "02pllfdx68l694ic6w6lgdvjlqfgnk5bv4jlcrcfiw9n65js4ay0" }, "stable": { "version": [ 0, - 2, + 3, 0 ], "deps": [ "auctex" ], - "commit": "4e05ad8976f352e67d56d9a479a4a570dfe7ba73", - "sha256": "0zgd7yascqn2dwjd20f1v962q7b24wibla5fwnbl9df1x36asqhs" + "commit": "1a940892dcbe3e4874d2d60db92de1cb34a1b773", + "sha256": "02pllfdx68l694ic6w6lgdvjlqfgnk5bv4jlcrcfiw9n65js4ay0" } }, { @@ -5870,14 +5832,14 @@ "repo": "erjoalgo/autobuild", "unstable": { "version": [ - 20230906, - 1629 + 20240430, + 1600 ], "deps": [ "selcand" ], - "commit": "593a5138ded2793bdc0ff5681bf7af2e2a50ca67", - "sha256": "0sgcg5a05zcf3s6c9my3jw7z7mqrfdk1fsclkrhdl1qk89h24cvz" + "commit": "4760f6ea843d5d15c3fcf7cbf6b69153b61739fa", + "sha256": "1viywj3r0znxflyg8fgdcz4jiv598b02jl8097sp02s49jv3vqaz" }, "stable": { "version": [ @@ -6083,27 +6045,27 @@ "repo": "oantolin/embark", "unstable": { "version": [ - 20231208, - 459 + 20240419, + 452 ], "deps": [ "avy", "embark" ], - "commit": "47b0c75d4bf4f72a7af839667c877c80bd493cdb", - "sha256": "14alpanynww6z7yxxyiiy24c0p4pq1argsb0pmqavq25mdxgn4v2" + "commit": "195add1f1ccd1059472c9df7334c97c4d155425e", + "sha256": "1361jvwr3wjbpmq6dfkrhhhv9vrmqpkp1j18syp311g6h8hzi3hg" }, "stable": { "version": [ 1, - 0 + 1 ], "deps": [ "avy", "embark" ], - "commit": "47b0c75d4bf4f72a7af839667c877c80bd493cdb", - "sha256": "14alpanynww6z7yxxyiiy24c0p4pq1argsb0pmqavq25mdxgn4v2" + "commit": "195add1f1ccd1059472c9df7334c97c4d155425e", + "sha256": "1361jvwr3wjbpmq6dfkrhhhv9vrmqpkp1j18syp311g6h8hzi3hg" } }, { @@ -6226,11 +6188,11 @@ "repo": "nverno/awk-ts-mode", "unstable": { "version": [ - 20231130, - 12 + 20240517, + 1251 ], - "commit": "9cd2b2ad05d85e05be9da7275077697223d79878", - "sha256": "0skx2sc575g4w2g4xy340j0i7a6rhxl18xxrg1i42mdiy1k5h3bc" + "commit": "343d19c5b3c99f1a665d0c6bddb7b18278306b06", + "sha256": "1vnnn8gg6i5gszqa128j7m22dlcpzh6c66xv6mvqcva2l1vkx8d8" } }, { @@ -8058,20 +8020,26 @@ "repo": "liuyinz/binky.el", "unstable": { "version": [ - 20240428, - 352 + 20240519, + 732 ], - "commit": "d5717053910f1d66f16c22a3d8834b43a507575e", - "sha256": "1z8yv4xvg2rvc9djkcp72r8b8x0bd26sp2zrfd780wcw4rar6ada" + "deps": [ + "dash" + ], + "commit": "f2fe74321f87dfe46421a7a7aaaec30b7f831059", + "sha256": "17h4jypfhlc7wbw3k7mr8l9hz3f5ji77xxi80i6p7mj5613j26fc" }, "stable": { "version": [ + 2, 1, - 4, - 2 + 0 + ], + "deps": [ + "dash" ], - "commit": "d692f3a3551ae412b0b3fc71d14b7d3991255084", - "sha256": "0a5jjzbywgq6yh0489690mv6x5h6dsfc1dv7dqaq92h7mi8w1d3c" + "commit": "f2fe74321f87dfe46421a7a7aaaec30b7f831059", + "sha256": "17h4jypfhlc7wbw3k7mr8l9hz3f5ji77xxi80i6p7mj5613j26fc" } }, { @@ -8082,8 +8050,8 @@ "repo": "SqrtMinusOne/biome", "unstable": { "version": [ - 20240426, - 1407 + 20240519, + 1037 ], "deps": [ "compat", @@ -8091,8 +8059,8 @@ "request", "transient" ], - "commit": "804a0576f5c87c167c61f00d037581688ab806be", - "sha256": "0izip46biwsmyc862jz4k9dlc27ilmcxdw7nb3wjsc98hsd72512" + "commit": "6c5d786219741e10332304566d4a18db3eddae2b", + "sha256": "0jr2zwzddf6hhmarj9z9dhfcpa7dkid36qy5fms0ncin8bdccl28" } }, { @@ -8345,15 +8313,15 @@ "repo": "Artawower/blamer.el", "unstable": { "version": [ - 20240320, - 2028 + 20240512, + 1514 ], "deps": [ "async", "posframe" ], - "commit": "ab7d19c2ee54424d3ffc853982fe875ad47b6e7f", - "sha256": "127rnzwf64br0p2i3mjkzfdcjhpwn873ln1gcbhanls6sgka2ahl" + "commit": "4cc2e6daaecf84c8dd00792f86724413423293a6", + "sha256": "1xyx1gls4d9xzlfwr0xkbblk8mzk3xhwbdqlag1xxdqnd1z96n5n" }, "stable": { "version": [ @@ -9173,11 +9141,11 @@ "repo": "Michael-Allan/Breccia.Emacs", "unstable": { "version": [ - 20240425, - 2224 + 20240507, + 504 ], - "commit": "fd8c536bb24cc58447213f8cada94f96ccf036dc", - "sha256": "0rlgxkv8grsyxl9k8jmlnmaakzzw4jnmm48y29sg50mjaj219gf7" + "commit": "dafb49308796f75db802e2d23596dfd3fb7e37b0", + "sha256": "1fb20vhszf7la1skzy093m6kl3q3akicirbpdp0vhd3xs47jzk1h" } }, { @@ -10704,8 +10672,8 @@ "repo": "chenyanming/calibredb.el", "unstable": { "version": [ - 20240331, - 409 + 20240507, + 456 ], "deps": [ "dash", @@ -10715,8 +10683,8 @@ "s", "transient" ], - "commit": "b526095e4b1c7866958fe53518eb897a8c87a19b", - "sha256": "0092v35yv63ijqaqwjp368kw295f07p1vc2hlqx4fgarsz6kc71n" + "commit": "8ca1b5262f0f0e4a0e295efc2c14db00333e9a85", + "sha256": "0f3fqgl8kqb1r3dcfd9fn0sh68ky2l13mmd6hqib7lmg4lf7aljz" }, "stable": { "version": [ @@ -10738,10 +10706,10 @@ }, { "ename": "call-graph", - "commit": "a6acf099e2510c82b4b03e2f35051afc3d28af45", - "sha256": "0cklr79gqqrb94jq8aq65wqriamay78vv9sd3jrvp86ixl3ig5xc", + "commit": "1206dea4f7040221775b315fd1e858448ca3dde6", + "sha256": "05gzsps5sr8id03imrhvwvns1c97r5kxfjdy3bns6a772n6danxn", "fetcher": "github", - "repo": "beacoder/call-graph", + "repo": "emacsattic/call-graph", "unstable": { "version": [ 20230222, @@ -10883,14 +10851,14 @@ "repo": "minad/cape", "unstable": { "version": [ - 20240411, - 2207 + 20240517, + 2216 ], "deps": [ "compat" ], - "commit": "bf22aa6ce0ffca1a1a77b693dddcd05eddc386f0", - "sha256": "1ah0nwib2k46467j0fhq9kckx7cqnjgwpdb7zk9jw8rbrjlndcpw" + "commit": "a71e5c96564163837810b96bd34322b42f6e4d9c", + "sha256": "0rwkn8p8p7axrh46x9cp3f90n5ic0dpm409pjn627s9sbz0j2vkj" }, "stable": { "version": [ @@ -11268,6 +11236,30 @@ } }, { + "ename": "casual-dired", + "commit": "ee1942517d15e34316ce3d9cc60d22e41556e232", + "sha256": "1g3vrlfl9482rcx1bmqbprf921ywz5dbcm685yxmfbr2fwbbgad5", + "fetcher": "github", + "repo": "kickingvegas/casual-dired", + "unstable": { + "version": [ + 20240517, + 2348 + ], + "commit": "d49c5c84d222ff8db2038d1f25b32c607a46c8b6", + "sha256": "0rn71abqr198ww6v6fi813dnb4lgi1nsmgk7vw482znnd4jyw937" + }, + "stable": { + "version": [ + 1, + 1, + 2 + ], + "commit": "d49c5c84d222ff8db2038d1f25b32c607a46c8b6", + "sha256": "0rn71abqr198ww6v6fi813dnb4lgi1nsmgk7vw482znnd4jyw937" + } + }, + { "ename": "catmacs", "commit": "e62e45ea234a574ed602f27c3c6bc240bcd4fa43", "sha256": "0ym1szmq9ib75yiyy5jw647fcs7gg0d5dkskqc293pg81qf3im50", @@ -11608,15 +11600,15 @@ "repo": "ema2159/centaur-tabs", "unstable": { "version": [ - 20240411, - 2153 + 20240521, + 2204 ], "deps": [ "cl-lib", "powerline" ], - "commit": "24d90efc72754cd1197a0c2f14d18e7c90dd2b4f", - "sha256": "03j73jhda6pbw203w21zk7w97fv5isr6fdbip40h9id7f112vhaw" + "commit": "3346b23545932c73c4c88a4cdb54778ecff95443", + "sha256": "1p2jllqv6d5xh1j06y9844msww56ldinnil8c1zd9jd4q6jsvnrz" }, "stable": { "version": [ @@ -11836,7 +11828,7 @@ "repo": "worr/cfn-mode", "unstable": { "version": [ - 20240421, + 20240519, 805 ], "deps": [ @@ -11844,8 +11836,8 @@ "s", "yaml-mode" ], - "commit": "3aa78685b9158022f49da43821c0888f377fa213", - "sha256": "0jarry76dzhn9zh41bfzyinibifzcxbzs8vmkdlpd0d97npcdxjh" + "commit": "6ef789934d6b9b78cdbe5c90703f4afead736ead", + "sha256": "04hynyv60g9y3z76zlwvgfqmm4i9450skxhx0r8bw9m8yf04841i" }, "stable": { "version": [ @@ -11935,11 +11927,11 @@ "repo": "GrammarSoft/cg3", "unstable": { "version": [ - 20240419, - 1148 + 20240430, + 2040 ], - "commit": "913974345a9fce9e6ac76934ed535df7e44d47d6", - "sha256": "183agf7njdg1zcrclfpa84izwwy230730anz3cz1rr0r77cqvmgv" + "commit": "06fb61345a4f3aae4bda74f3dfe261b1ec9d902d", + "sha256": "1bvbwk79wd13gvfa99ngz2z00b6wc2w8fh1py27zk024hxqbhf3v" }, "stable": { "version": [ @@ -11974,23 +11966,26 @@ "repo": "positron-solutions/champagne", "unstable": { "version": [ - 20231229, - 947 + 20240515, + 310 ], "deps": [ "posframe" ], - "commit": "2106273c47f898006a799f0c5e35922af4b41f54", - "sha256": "1cmbbnqjbg5sw3svvr99dk6lrmiir6yy8cvz69bl3r7ga6cpiacv" + "commit": "42ef0451e4abe800f047583c4c3b04e51b29d5ee", + "sha256": "1ja4n1kgkz6ri4x903rrgvdi9nhgkzvggm8w8i8ib5hcby3ln591" }, "stable": { "version": [ 0, - 2, - 0 + 3, + 2 ], - "commit": "31092b7f487e872d208dcaecdc24b5438b78f6a0", - "sha256": "0nynrg58nl03fxwyalwqw2s694y1jf4as0qcswhi3i2k9c6679d0" + "deps": [ + "posframe" + ], + "commit": "42ef0451e4abe800f047583c4c3b04e51b29d5ee", + "sha256": "1ja4n1kgkz6ri4x903rrgvdi9nhgkzvggm8w8i8ib5hcby3ln591" } }, { @@ -12106,14 +12101,14 @@ "repo": "xenodium/chatgpt-shell", "unstable": { "version": [ - 20240402, - 2216 + 20240517, + 2003 ], "deps": [ "shell-maker" ], - "commit": "42cf53ba7d43e0622e8c4c57ef8f635e1248182b", - "sha256": "1lg3ymw6vsxkk8vpkbyia5l3xl2bgsk2xsw5n5nrhax9qs3axh1b" + "commit": "910b0ad5cdb633f6be64f88596219a7eb58af226", + "sha256": "1mqdgsy1l9lc94cg1q8gzm7phc3f4rafk39cjlf5i9a1wai7f7p6" } }, { @@ -12124,15 +12119,15 @@ "repo": "kimim/chatu", "unstable": { "version": [ - 20240425, - 1349 + 20240518, + 615 ], "deps": [ "org", "plantuml-mode" ], - "commit": "3175ac95de1a1dc75ff5be1bf3a2e80e0abd5229", - "sha256": "0wf63z7ang91gzqqh0d2a5h41zdvm9xkblkkz0ldp4ppk8wpggkg" + "commit": "f813f0bc926346fbd8151d2ae7079119d4657abb", + "sha256": "1xg5mcxsjlkayls1zknqgx3niwwrbrvj5dpmx68sljjwz4j8b8y5" } }, { @@ -12764,8 +12759,8 @@ "repo": "clojure-emacs/cider", "unstable": { "version": [ - 20240424, - 1919 + 20240522, + 1030 ], "deps": [ "clojure-mode", @@ -12776,8 +12771,8 @@ "spinner", "transient" ], - "commit": "1cd6ab7b7cb4a7e079a273600c4d28307c3aba40", - "sha256": "1hcj1fwp2433j3vfmzyv8sh4icg6rsk70av6prrg4adqwzgvhh7m" + "commit": "5a477c58dca86cbee723ddb2d0670689f53c47ed", + "sha256": "075ikfwrn3n0czzlj2233y7d0ljal8hwzab1vqhfl100q61j0hrj" }, "stable": { "version": [ @@ -13110,29 +13105,30 @@ "repo": "pprevos/citar-denote", "unstable": { "version": [ - 20240424, - 2023 + 20240520, + 2325 ], "deps": [ "citar", "dash", "denote" ], - "commit": "6e236e9100d1401cd7c628c5f799badded77967d", - "sha256": "0yqjigf4qj296q15dkq0qpwab9a80fn5rafb192ykh5qg8sbhc2v" + "commit": "1c62db7107b1ff9de5f87a03d9ac1973c4bbb0ec", + "sha256": "0140a7zxs479na6p94g9rsxg7sp08jx7ri4y1h764wxwfvl8qf8c" }, "stable": { "version": [ 2, - 0 + 2, + 1 ], "deps": [ "citar", "dash", "denote" ], - "commit": "0c68a4f74f5dcfc23ef03b211658a2ccc5d9aa3b", - "sha256": "0g476awbrdws7k7smk1qasz15df20zilx3wqbi3wj0i1q2dbsi8z" + "commit": "4586e030445ff40a4939fe0ecc1aae667825052d", + "sha256": "0rsi2j4gfznpyvf3z1p1xxl0zxfbddha4ig4d30svwnq2maxri7r" } }, { @@ -13207,8 +13203,8 @@ "repo": "andras-simonyi/citeproc-el", "unstable": { "version": [ - 20240307, - 1412 + 20240513, + 1309 ], "deps": [ "compat", @@ -13220,8 +13216,8 @@ "s", "string-inflection" ], - "commit": "cb2d3e72116e626133703aa9875d680442249abe", - "sha256": "1jlyxq0hk6wrprpjlq8cgs14hzl8lxgdkyfl1c9lnwcr3c7iijrd" + "commit": "fed285385c1a8c0248890cd591f64a0e2598334d", + "sha256": "19m3q2izbgzvaimk9z38zznj1602vmr8y93c2sfrkyssjb4rmxfy" }, "stable": { "version": [ @@ -13289,11 +13285,11 @@ "repo": "universal-ctags/citre", "unstable": { "version": [ - 20240425, - 1635 + 20240508, + 1154 ], - "commit": "a78cf13d5c3c1c0275b332da5888cd0973de70fe", - "sha256": "0fjv9s8x533dmy4vnz2k56ydwydjiak8hp4mk9yvcnam5j1vi51v" + "commit": "fe670ff2410fe4cd59cdce8ef1b947deefa71879", + "sha256": "1fancp1z955z2clnr9rh6iqpg6cisama9drx51356n4afv60q9pv" }, "stable": { "version": [ @@ -14083,11 +14079,11 @@ "repo": "clojure-emacs/clojure-mode", "unstable": { "version": [ - 20240304, - 559 + 20240516, + 525 ], - "commit": "3792e08b76aa7fdae18938e1966ea140b9817a9a", - "sha256": "12zq6026s4yq6dbx1jy9g2fxy8ia2lm8ifx4qmnrfhcbscaj841l" + "commit": "faee3efbb1e940af0e5777514923c8dea567f87d", + "sha256": "1d3pwwwwzfaqbynpmkpnmfmf2gh7nviy8nc18m0nm9g27i9x3wk4" }, "stable": { "version": [ @@ -14461,10 +14457,10 @@ "version": [ 3, 29, - 2 + 3 ], - "commit": "d3190d6a730207a56ef2144566468975167a811e", - "sha256": "0yjk4kqrln8smz457dxansfl69zyikr5015xm23xa4g7x1rihkgg" + "commit": "b39fb31bf411c3925bd937f8cffbc471c2588c34", + "sha256": "1bwa80zrqyav0bxpq6b9vrjijbfn5g52vqhzvy70g7bp3jbp6vzm" } }, { @@ -14532,11 +14528,11 @@ "repo": "tumashu/cnfonts", "unstable": { "version": [ - 20240426, - 601 + 20240430, + 536 ], - "commit": "d81b1d5932fbbed509f4b011eb14d2e0e1e73971", - "sha256": "0whkwxi6720rgv22w2xnb4ji092x4hrh4fabbnlm6dvf85g16mqn" + "commit": "1f57d4f64f50e4dbc7ab4d963278b746f904c454", + "sha256": "1jrrpmlagncv46pyq10182bi7mcqy85iy46nw33fskaswypxhwji" }, "stable": { "version": [ @@ -14933,14 +14929,14 @@ "repo": "ankurdave/color-identifiers-mode", "unstable": { "version": [ - 20240218, - 1801 + 20240505, + 2245 ], "deps": [ "dash" ], - "commit": "6cb50ae7e61189f55387e5350c20651e081d613c", - "sha256": "10miij6w40jki1ii9y05ks9wgzzmpiz3qd6mpicc5c9i83cm0d1j" + "commit": "8e189b03ad602cc457308934fbb91b2dc8f286df", + "sha256": "1dhikxir170ssrl8l8qwgg5f9kk391y0wmaa9dw2v20y2jvhpvzh" }, "stable": { "version": [ @@ -15076,11 +15072,11 @@ "repo": "purcell/color-theme-sanityinc-tomorrow", "unstable": { "version": [ - 20240406, - 1456 + 20240429, + 949 ], - "commit": "42b24a3fa3fbdcb36cd2936a38abe142cda65294", - "sha256": "103l62ma6vgq5p15jn125fz4f42s3aghg3l48vh5ngcb9y6w5ip0" + "commit": "5f3b2039eda57e9e4501f8decab5808d9edf98eb", + "sha256": "11vpha0nmcxh7b1cp27778sacjzccp87b6db3mnsir5mbnxyhfx4" }, "stable": { "version": [ @@ -15520,11 +15516,11 @@ "repo": "company-mode/company-mode", "unstable": { "version": [ - 20240311, - 1943 + 20240428, + 2258 ], - "commit": "b0a522ac5bf8ba3d2f4f22e3aa846a4f82978a16", - "sha256": "11ghdfbyg8fvi79l0xvaqhpnzlnjfl3ng517pb2h37hp2cyy8b5i" + "commit": "32f030a4c79bbf082cc21ec21b2cf8ba9dfa22cc", + "sha256": "19y5s4jxz62ak9q3cq66d1gijpbv9bkxazm4qyglsk9ayjz03q43" }, "stable": { "version": [ @@ -15802,26 +15798,26 @@ "repo": "redguardtoo/company-ctags", "unstable": { "version": [ - 20211211, - 338 + 20240511, + 856 ], "deps": [ "company" ], - "commit": "313508ba5d4f1e4b5d5d554faaa74076201c3248", - "sha256": "0hf7lq6rcs6xhmgpc8bwk115rykyfvakcjqpanlsh5m3fdswjq03" + "commit": "2e079a634afa5687bdb004e3883ac0671a222401", + "sha256": "1ilinm5kih3kiljvdbh9x84w8vwcplyas3k8j6x1j6v4gj4k16gn" }, "stable": { "version": [ 0, - 0, - 7 + 1, + 1 ], "deps": [ "company" ], - "commit": "313508ba5d4f1e4b5d5d554faaa74076201c3248", - "sha256": "0hf7lq6rcs6xhmgpc8bwk115rykyfvakcjqpanlsh5m3fdswjq03" + "commit": "2e079a634afa5687bdb004e3883ac0671a222401", + "sha256": "1ilinm5kih3kiljvdbh9x84w8vwcplyas3k8j6x1j6v4gj4k16gn" } }, { @@ -16106,16 +16102,16 @@ "repo": "jcs-elpa/company-fuzzy", "unstable": { "version": [ - 20240101, - 943 + 20240519, + 904 ], "deps": [ "company", "ht", "s" ], - "commit": "059e3e0893a2b3c0ad4bf27b6963e7547b97b5d4", - "sha256": "02n4y3zj7hypqhlki1kh2iha794449p9jyhj1rmr3bqidg2f73ig" + "commit": "ae4dbb00d91fae8f13e236093d99c7e4d0d8fa73", + "sha256": "1akl4d83lydq1sjp56kfwwv4zya0awpvm8ifw7sj4f1fmvkz8awr" }, "stable": { "version": [ @@ -17472,11 +17468,11 @@ "repo": "mohkale/compile-multi", "unstable": { "version": [ - 20240421, - 1100 + 20240507, + 1829 ], - "commit": "fab41595a704260a295544aecbecb16896824e88", - "sha256": "14zswpaymzsrc1xcd4xamnydy4hi7fk0inryh6gyqwkgzkzkshf2" + "commit": "1fbd38806c70ebe8ebfec49cc7606284396a31e6", + "sha256": "138wayb49ywjgxdc19xlv7gr5is0yc9jwaxrxhjp1jj9mjidy1x0" }, "stable": { "version": [ @@ -17495,14 +17491,14 @@ "repo": "mohkale/compile-multi", "unstable": { "version": [ - 20240421, - 1100 + 20240506, + 1319 ], "deps": [ "all-the-icons-completion" ], - "commit": "fab41595a704260a295544aecbecb16896824e88", - "sha256": "14zswpaymzsrc1xcd4xamnydy4hi7fk0inryh6gyqwkgzkzkshf2" + "commit": "4f9cc1d3c448ecc496540a65578191733c09b0fd", + "sha256": "0q95fs78wz63s3lldh7h8l4gqmk67dlwg2kkiyl8f4byp77cf0p4" }, "stable": { "version": [ @@ -17555,17 +17551,17 @@ "repo": "mkcms/compiler-explorer.el", "unstable": { "version": [ - 20240425, - 2138 + 20240517, + 1816 ], "deps": [ "eldoc", "map", - "request", + "plz", "seq" ], - "commit": "fcf17db156877e35be589dbc82dd6d5736038961", - "sha256": "1bqcxr33jrd5jk2z77asn64sscb034pki2vs9c57vlqas4dwyb8r" + "commit": "ca01cbfa5941750f3cf2232f00e28032ef7f9bce", + "sha256": "05yzp9gch1hw10xgk742zdgky0vbbqhyn6fzxj2n6ilwaslcnprh" }, "stable": { "version": [ @@ -17856,6 +17852,29 @@ } }, { + "ename": "conner", + "commit": "0fe4a5498ca9860d8b06d48f643e87d32f416f84", + "sha256": "1cxmpdlp3rq1is79hx917nh2kbg200n9w2l1laakas38y3rd43ag", + "fetcher": "github", + "repo": "tralph3/conner", + "unstable": { + "version": [ + 20240512, + 1717 + ], + "commit": "d8dabaab32e39b01500841b7465076c6ad73c3b9", + "sha256": "1iw787gp2r7ab3xc8s6brsdc7a8cg5g2vsjlb1qhir6zmyz5y5dz" + }, + "stable": { + "version": [ + 0, + 4 + ], + "commit": "05de24bdac7c424d88eabd7cd0307f9b8bcc2aa3", + "sha256": "1s2dnbmfic0v2i9inp95a7psrwiajrpjc99b59rxaqqk5qwpf8hm" + } + }, + { "ename": "constant-theme", "commit": "35763febad20f29320d459394f810668db6c3353", "sha256": "13m4r37gscnqg3qmb0rs2r8sslp0irm7n4p6p496mmvljvjmpv6b", @@ -17878,25 +17897,25 @@ "repo": "minad/consult", "unstable": { "version": [ - 20240420, - 929 + 20240516, + 2240 ], "deps": [ "compat" ], - "commit": "8989c7a5c5035f9e3429f85f1006d0c6cb5d5e8d", - "sha256": "0zrxs4134csg7ygrlq800mpa7xs3z6z547l28jv3c5v2s2ls1k97" + "commit": "80407622f323669c735737272ecbc3b602434b77", + "sha256": "0rrxyds14a3c1f96q3hx92hm4axl66cgghrvc3j745s257macx0y" }, "stable": { "version": [ 1, - 5 + 6 ], "deps": [ "compat" ], - "commit": "d8888bb67f881a3c4855c9ce7224de18a7dc3901", - "sha256": "0wgc30vinc62vppakwyxzfqpxqm0nl3srz4d42xs873i5bsczkab" + "commit": "6eba1a3fa8e13681091a30b2490a03bdce5f243a", + "sha256": "1c6skqx5aqkb0mfnm5zw4mvzcrcr34zcd5jz3ypgb5483nv9kp3c" } }, { @@ -18035,14 +18054,14 @@ "repo": "karthink/consult-dir", "unstable": { "version": [ - 20230725, - 2338 + 20240506, + 236 ], "deps": [ "consult" ], - "commit": "3268ec3f7194c086ecfbd2863e029f42d91b77c1", - "sha256": "12mp2c7mx60l758c4gjnx4lv37fp1b8ifagak8l2dcmg2rm7kxd4" + "commit": "15891383f34d43acc5bb82bda92239b1f54cf178", + "sha256": "1jq931w66iawc1rf01n9mfmnxwvrv2zc711nwnmykdv6ynd636dm" }, "stable": { "version": [ @@ -18265,16 +18284,16 @@ "repo": "gagbo/consult-lsp", "unstable": { "version": [ - 20230209, - 714 + 20240507, + 2105 ], "deps": [ "consult", "f", "lsp-mode" ], - "commit": "f8db3252c0daa41225ba4ed1c0d178b281cd3e90", - "sha256": "0hbavrwxa8mhgijh0wn517fns07ng84q6vya9bvblcx8pq9qw6z0" + "commit": "68583913168bf66fd4d542b2517a2dcab19c447c", + "sha256": "1g3z2f5j2qvzlszn9f4qnbiggn9scaydkgifx2a4pc0ak4zs1m2s" }, "stable": { "version": [ @@ -18298,16 +18317,16 @@ "repo": "mclear-tools/consult-notes", "unstable": { "version": [ - 20240306, - 1529 + 20240516, + 1423 ], "deps": [ "consult", "dash", "s" ], - "commit": "652d0281b81becac643efe96386facf23e1dee01", - "sha256": "0ka4mr4gg2nmkg0fr7i9dq3f3jmq9m16wbzjk5w9x5yxhh9rymx2" + "commit": "c97420c8e91aaae214be7de897eb7eb9b7843520", + "sha256": "0nf06al179p3g7n0zvcxkwhq1ygakg4n554a1w8f6k00m1syslsh" } }, { @@ -18541,6 +18560,30 @@ } }, { + "ename": "context-transient", + "commit": "eae3d8f214a0967fd5bc1d48e45e27a639f61e0d", + "sha256": "1kgyd202db6wgkygmpjqa2w7f8qbhd4z5wymr615zvw1qal3407q", + "fetcher": "github", + "repo": "licht1stein/context-transient.el", + "unstable": { + "version": [ + 20240507, + 1534 + ], + "commit": "efd8343f46f9fb2a1ee391c0292fb35d4f91b107", + "sha256": "0fmp011hnarc73b3zicknwfvql5a2q7ijmy63p0qnw735c9xcjvr" + }, + "stable": { + "version": [ + 1, + 0, + 0 + ], + "commit": "efd8343f46f9fb2a1ee391c0292fb35d4f91b107", + "sha256": "0fmp011hnarc73b3zicknwfvql5a2q7ijmy63p0qnw735c9xcjvr" + } + }, + { "ename": "contextual", "commit": "7325c1a705d07d6916d55a1fc2bb7012e22504fd", "sha256": "0zsyshy2n17zmk3l2shpd4ci9l0xwyx3bmv0psqlpcd0zcjdsfdv", @@ -18982,15 +19025,15 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20240413, - 1905 + 20240520, + 1323 ], "deps": [ "ivy", "swiper" ], - "commit": "28ac6c7e32ec0b90803fd35f8d1f04ed0fe2e6a5", - "sha256": "1zyxm69ld137k9qnjmn87a2qh9qls1phycfcr3h5p3a0d0ackgd6" + "commit": "8133016ab1b37da233e6daaab471e40abf0f7ba9", + "sha256": "0yswdy8yxqs2vpmrskrl6lx7y6m891x5y09gk01kr9ww7zy7wklc" }, "stable": { "version": [ @@ -21291,8 +21334,8 @@ "repo": "emacs-lsp/dap-mode", "unstable": { "version": [ - 20240424, - 1359 + 20240514, + 1617 ], "deps": [ "bui", @@ -21305,8 +21348,8 @@ "posframe", "s" ], - "commit": "22af181d627577968f03213ba59d02458d3e734a", - "sha256": "1q360xhnmfnjgrkmzq69p2wc0rphz7fsbjzgn3hjw0a8kv3jsq0y" + "commit": "11431a26bc4c8ca92b097dbdbcbdc9e3d7fb5583", + "sha256": "1m77dwy1p7jy41v7gjqk9w7jy6sh3blg2qrlw22f3y1d6n0h3lvs" }, "stable": { "version": [ @@ -21563,11 +21606,11 @@ "repo": "magnars/dash.el", "unstable": { "version": [ - 20240405, - 946 + 20240510, + 1327 ], - "commit": "885332bbc4582b08d4f24526250876f3a7569067", - "sha256": "1v700mlwwas57kqnp1hqv0ln0cqv44nlcp7lv9c4rha7q5gzmikz" + "commit": "1de9dcb83eacfb162b6d9a118a4770b1281bcd84", + "sha256": "1nkz7m2yllvin3aynnp1wldjzasah9rv4nlydcxxh5qx4ws3dpka" }, "stable": { "version": [ @@ -22094,11 +22137,11 @@ "url": "https://salsa.debian.org/emacsen-team/debian-el.git", "unstable": { "version": [ - 20240404, - 541 + 20240519, + 1104 ], - "commit": "7bbbf575f0ce11cb4b6acd89e56000ae388b1413", - "sha256": "1s2jqqmmnwcf8bx6vn1754ji5kgdwzcm5hi5j0s4rj1yl9s9jnd4" + "commit": "a76a38cf0af5625b38e1d298bbfa3ae5a2a1ebc9", + "sha256": "0k3r9a9qsi380m4j53j4irfv591irg9w2i0pqk1c8fv3rwxrdiq5" }, "stable": { "version": [ @@ -22640,15 +22683,15 @@ "repo": "pprevos/denote-explore", "unstable": { "version": [ - 20240426, - 450 + 20240512, + 113 ], "deps": [ "dash", "denote" ], - "commit": "9e1a5162dbec751fe62ce4b99bcb0e5024f39f94", - "sha256": "06yhh543piflgx8ql70wmsz56g8a7nja66n7s48rwq7d7pxb6znq" + "commit": "7073ef97758fbcf953557efa15da9226283ff6b0", + "sha256": "151ba0mhq61y2iwic5645rh4agklp1rg3618xcc7r76b4078fybs" } }, { @@ -22884,11 +22927,11 @@ "repo": "blahgeek/emacs-devdocs-browser", "unstable": { "version": [ - 20240414, - 1251 + 20240511, + 306 ], - "commit": "d4ebae6b12ba13393270278a75b053d53af3ac54", - "sha256": "08rrhi7d29h8mzvi7wd4ikj5k7g1kscys709l8aaiq1mxf0nhxj8" + "commit": "0655b89651458777354a3b89c1d486e0fda1928d", + "sha256": "1yamaqscprvrwvgxm5q0bgjmdd31jg86z4zd2mp62xq5mqhg9ncj" } }, { @@ -23139,14 +23182,14 @@ "repo": "dgutov/diff-hl", "unstable": { "version": [ - 20240401, - 2357 + 20240505, + 2110 ], "deps": [ "cl-lib" ], - "commit": "09a0f8fcc7e6ce3f49dca64cdfab898d6762f2a4", - "sha256": "1kszgnp6nrsx8sphk5lnnkvymb5p17djvgpc3433dwjic6rz97ml" + "commit": "11f3113e790526d5ee00f61f8e7cd0d01e323b2e", + "sha256": "1a6hqb0258kdskixcwacq41d7x71rlpwwapmbpd9ds8w6dj5vi40" }, "stable": { "version": [ @@ -23262,15 +23305,15 @@ "repo": "pkryger/difftastic.el", "unstable": { "version": [ - 20240423, - 1553 + 20240429, + 2057 ], "deps": [ "compat", "magit" ], - "commit": "56ec9ba861b132a96220837d711f6e79c26c268d", - "sha256": "1qdiph2wkx7anrpfilxpk9cdzjx6ig0pwzswh9prppdk3flyw5qb" + "commit": "90b9b223bfc39786f6fcf266cdc1cb982bdc37aa", + "sha256": "1z7q6rr3cnp6fpx0439hbk22g1kl84xa6k3pbxm4mph2cqw536jm" } }, { @@ -23304,20 +23347,20 @@ "repo": "retroj/digistar-mode", "unstable": { "version": [ - 20240220, - 1600 + 20240515, + 1529 ], - "commit": "178cb58a3a52d22168f641a5436addf0904d5c45", - "sha256": "16mn9g5gxv6g3dcphiyxpwhkn042zkhi6w8941r7f0mc238msnp3" + "commit": "546adaccb1f90d6947c2c80c2fab4933f40bc274", + "sha256": "16a4x0zxrhs2c4k7v3qhinbxayx213mb8b84jrs21sq7whfad63d" }, "stable": { "version": [ 0, 9, - 9 + 13 ], - "commit": "178cb58a3a52d22168f641a5436addf0904d5c45", - "sha256": "16mn9g5gxv6g3dcphiyxpwhkn042zkhi6w8941r7f0mc238msnp3" + "commit": "a0f0756b132202fadf487d689d3c4312f480d2a7", + "sha256": "0i055f0kvm4ymq9a7ad4zg2kzw4gf60db0kcg5q8gmlsri7ppsl2" } }, { @@ -25876,16 +25919,16 @@ "repo": "seagle0128/doom-modeline", "unstable": { "version": [ - 20240425, - 609 + 20240510, + 144 ], "deps": [ "compat", "nerd-icons", "shrink-path" ], - "commit": "150b5bf8da8050e5db1193f827c33b16a5d8dd3f", - "sha256": "13zfwww73x5ax7vql7fhgyzwwx0xhkh1fs9b6x746nbyl3p5vnnl" + "commit": "65d0bd83eb7c393092e032c24b882f3ba19b4899", + "sha256": "1w657ss91f00kb3gghi9rs0a8cw2bszvik4yjzn6cj7m8ji3k3qi" }, "stable": { "version": [ @@ -26581,16 +26624,16 @@ "repo": "jacktasia/dumb-jump", "unstable": { "version": [ - 20240114, - 354 + 20240514, + 702 ], "deps": [ "dash", "popup", "s" ], - "commit": "ede6a04187e79a29ef31d14760ac0d8d4c5f4cc5", - "sha256": "1ly7xsfliyw38hqh862p6m37mxl460k4zq1fy3xs0jz9q3ak84iq" + "commit": "3c2ab8dfff3a10d3c5f2efd69cfbc81fb5dbbd39", + "sha256": "0q37akv7xnwq14a7zn7cjr3njkkkl7vfrkkr0di8bw9p6dyvwqw4" }, "stable": { "version": [ @@ -26776,11 +26819,11 @@ "repo": "xenodium/dwim-shell-command", "unstable": { "version": [ - 20240414, - 1607 + 20240520, + 1732 ], - "commit": "3dc879fa4c473d1f7c0929ebb0cebcbe729553cc", - "sha256": "0axj93kfimhn7kywpnv7394gaw9rz402lixmwqyka85f1rcw3dzc" + "commit": "c20a474ba8fc0ad73a1b30aeb99502cbfc709c0b", + "sha256": "0lj8rkvpns4fpdmwriax0i5yijqraji1vjbdc6scyvpmdmsqd3p1" } }, { @@ -27510,28 +27553,28 @@ "repo": "swflint/emacs-universal-sidecar", "unstable": { "version": [ - 20240115, - 1727 + 20240428, + 1852 ], "deps": [ "ebdb", "universal-sidecar" ], - "commit": "9050eaea7946e613a4b9ecd9dd1462614699edb1", - "sha256": "169n0d4hsx9azch1w14wlmilm411hb7v0564xrcwww5w145jrs9m" + "commit": "4c78015d10caba9c700e6e6b582004ae1c1d5344", + "sha256": "0s48sbvqchaakz3nyn8qjwdy4yjdfq6wbjshwdp6ix1ykm5xd0h4" }, "stable": { "version": [ 1, - 5, - 2 + 6, + 0 ], "deps": [ "ebdb", "universal-sidecar" ], - "commit": "9050eaea7946e613a4b9ecd9dd1462614699edb1", - "sha256": "169n0d4hsx9azch1w14wlmilm411hb7v0564xrcwww5w145jrs9m" + "commit": "4c78015d10caba9c700e6e6b582004ae1c1d5344", + "sha256": "0s48sbvqchaakz3nyn8qjwdy4yjdfq6wbjshwdp6ix1ykm5xd0h4" } }, { @@ -27575,15 +27618,15 @@ "repo": "joostkremers/ebib", "unstable": { "version": [ - 20240426, - 642 + 20240430, + 1436 ], "deps": [ "compat", "parsebib" ], - "commit": "4055e30872e642f746633bab96c3383836d61e68", - "sha256": "072dbc7wm9mwcbfw0a9957izamk2amcqag53p4n32r3cdn9v94zk" + "commit": "2f2d39d1953fa10d7c3dad6a4611d8ec0d489aba", + "sha256": "0x40cwcibl3dsyxmqn3yhsbw5pyisx5yypjy6qm7hzi6r2wxgvzr" }, "stable": { "version": [ @@ -27607,8 +27650,8 @@ "repo": "swflint/emacs-universal-sidecar", "unstable": { "version": [ - 20240320, - 1935 + 20240428, + 1852 ], "deps": [ "citeproc", @@ -27616,22 +27659,23 @@ "universal-sidecar", "universal-sidecar-citeproc" ], - "commit": "e38aa3fbf570ab1eef3bf0441e5be59586672377", - "sha256": "11kbbv6s4qinx0l95f7j6ic40ykfcjpmz6wsl8jx9fdqrlh9b91w" + "commit": "4c78015d10caba9c700e6e6b582004ae1c1d5344", + "sha256": "0s48sbvqchaakz3nyn8qjwdy4yjdfq6wbjshwdp6ix1ykm5xd0h4" }, "stable": { "version": [ 1, - 5, - 2 + 6, + 0 ], "deps": [ "citeproc", + "ebib", "universal-sidecar", "universal-sidecar-citeproc" ], - "commit": "9050eaea7946e613a4b9ecd9dd1462614699edb1", - "sha256": "169n0d4hsx9azch1w14wlmilm411hb7v0564xrcwww5w145jrs9m" + "commit": "4c78015d10caba9c700e6e6b582004ae1c1d5344", + "sha256": "0s48sbvqchaakz3nyn8qjwdy4yjdfq6wbjshwdp6ix1ykm5xd0h4" } }, { @@ -27687,11 +27731,11 @@ "repo": "benzanol/echo-bar.el", "unstable": { "version": [ - 20240307, - 741 + 20240521, + 326 ], - "commit": "71ef563df7f1b85cfe64854b6e40bb353a281cc5", - "sha256": "1hgnmyphzww9gq6ww3x0xckn25rb26dlkbh22vf23566yhq1s993" + "commit": "0e221754cb40406609ae5c79ac294683850638e1", + "sha256": "0cwpphdj78g6w4an58qrf3mbqji0lm6cfzkz099pcppg17ljz4h4" } }, { @@ -28149,26 +28193,26 @@ "repo": "editorconfig/editorconfig-emacs", "unstable": { "version": [ - 20240318, - 2049 + 20240512, + 1958 ], "deps": [ "nadvice" ], - "commit": "6b85f0475f01ff97f3233acb68e2646d2ca32a91", - "sha256": "1c78vv29sq8hk59mw7ir3wqrwz5gl9nd7gf3dgla6kdfw6ba3783" + "commit": "6ac848e380322bb52d6f70a032e12f70d60daab1", + "sha256": "08fl3jg2vklyczqdz3ifaa0j4zkq7siz0m141lzcq5rahi7c65g6" }, "stable": { "version": [ 0, - 10, - 1 + 11, + 0 ], "deps": [ "nadvice" ], - "commit": "ed760770ed5397120b3d68b69afc0778c48d3a47", - "sha256": "1hwqhfm32sg4y0l0yn7378vjb6icgd92lkazy2z6dmnks5sbz0a3" + "commit": "f1531bab5b57e40759167b7e5db49acbbc09972f", + "sha256": "0bqwmh4lcnbn5gcn38qg4jjfs9bfkbr4dj4dafglgds6a5lhznws" } }, { @@ -28567,16 +28611,16 @@ "repo": "fsharp/emacs-fsharp-mode", "unstable": { "version": [ - 20230324, - 1942 + 20240514, + 1923 ], "deps": [ "eglot", "fsharp-mode", "jsonrpc" ], - "commit": "0ce19f272949f9ed335ab7a9fd9454c01f07eb8f", - "sha256": "1qy1g4nka6k083n0zmas6cq9bkcpij10xyzac0lfilggkr4hqz1w" + "commit": "677d78c4d6cb574086408082dedbcaef04a85359", + "sha256": "0by1ln0raa89dj2jng6kak69b7nzr3ic090wrg4gg6mqky5qbm5n" }, "stable": { "version": [ @@ -28600,27 +28644,27 @@ "repo": "yveszoundi/eglot-java", "unstable": { "version": [ - 20240322, - 239 + 20240501, + 922 ], "deps": [ "eglot", "jsonrpc" ], - "commit": "d09a4204ece16a5be4ddea71476ef87e565733bd", - "sha256": "1dl751frdhvk9474m885m1k5fka0rbpsnawgjb3qfmg4zi2v053v" + "commit": "492282d653c91b07ec10b30eb8a05cbfdc4017c7", + "sha256": "1h1psfx2pjx8jhxi86s0qwqk5prvn9s8nz4adxyvb5nx0329d351" }, "stable": { "version": [ 1, - 34 + 35 ], "deps": [ "eglot", "jsonrpc" ], - "commit": "d09a4204ece16a5be4ddea71476ef87e565733bd", - "sha256": "1dl751frdhvk9474m885m1k5fka0rbpsnawgjb3qfmg4zi2v053v" + "commit": "492282d653c91b07ec10b30eb8a05cbfdc4017c7", + "sha256": "1h1psfx2pjx8jhxi86s0qwqk5prvn9s8nz4adxyvb5nx0329d351" } }, { @@ -28901,15 +28945,15 @@ "repo": "ahyatt/ekg", "unstable": { "version": [ - 20240320, - 242 + 20240506, + 419 ], "deps": [ "llm", "triples" ], - "commit": "8f050a65837d6d3ec4ea3ba7539541518d061539", - "sha256": "0hd5d7kiw8qbdpgxkv6zpknp799g61cqdjsi7jlgmj1dznryrxz6" + "commit": "c23f6672fa1075d11e942dffc1c37701731b94f0", + "sha256": "0s0cdvifxiz0r4widbcqlg19mcnxkhpcbgibi0c4p9n1iaqc1bfp" }, "stable": { "version": [ @@ -29443,20 +29487,20 @@ "repo": "emacs-eldev/eldev", "unstable": { "version": [ - 20240427, - 1730 + 20240511, + 2039 ], - "commit": "089fc7f172bea0d1aae63f5595ced02c6486b2dd", - "sha256": "0n9l74vcwydwpc7ignqppskppnnhlgqf2cfcsr3a1bsw6x0rcw26" + "commit": "5153b5a747aaadb51ac14f3963e3ffbf59273e74", + "sha256": "183pa9sxg0qg0kd75vgll7xfaplpkrlj077vdqhh5qcciikhqhla" }, "stable": { "version": [ 1, - 9, + 10, 1 ], - "commit": "4da05948a10f1d7297ee80907e1412de76170b51", - "sha256": "1v0jwzwq0xpih8m4aymz90fdfvypkiqczh0ip5jg4kcvzikliw3f" + "commit": "56335373099a6e2d3756fe5b7cce539d91c43bd3", + "sha256": "1qir0wagqb8yhmkb12zzadl146w952p3q92bpffd0hq0y6gcp2n5" } }, { @@ -29692,20 +29736,20 @@ "repo": "swflint/electric-ospl-mode", "unstable": { "version": [ - 20240319, - 1842 + 20240428, + 1829 ], - "commit": "e5283062fdf66aa2d664059b307839bf94413055", - "sha256": "0l60xc2l1ms8hzf5v5vk9spvdicqkvpkskwg07i3p00p2ldns0v8" + "commit": "deab4493530ab4bb2112c18d8ca6ccc652e24a63", + "sha256": "1l8d2yjg7rq67vwd0mq8lnfbvwvdp707nm856m9ns3j7jbhpzf9a" }, "stable": { "version": [ 3, - 1, - 2 + 2, + 0 ], - "commit": "e5283062fdf66aa2d664059b307839bf94413055", - "sha256": "0l60xc2l1ms8hzf5v5vk9spvdicqkvpkskwg07i3p00p2ldns0v8" + "commit": "deab4493530ab4bb2112c18d8ca6ccc652e24a63", + "sha256": "1l8d2yjg7rq67vwd0mq8lnfbvwvdp707nm856m9ns3j7jbhpzf9a" } }, { @@ -30064,15 +30108,15 @@ "repo": "karthink/elfeed-tube", "unstable": { "version": [ - 20240123, - 1825 + 20240511, + 418 ], "deps": [ "aio", "elfeed" ], - "commit": "92c66d6adcebe0588ccf811616decf7ef8a8ac65", - "sha256": "1mz2mk9vzdpj0x6dv1grkz03algrsf62kfqrlhnww60vnzqi6i3r" + "commit": "1f5ad2cc26d6290eb77dd36716e5887cb2cd617c", + "sha256": "1c0nxzqhldn59hgalvx24r7wn0s641jv6akv8vra6m8qwarw9ksk" }, "stable": { "version": [ @@ -30584,28 +30628,28 @@ "repo": "s-kostyaev/ellama", "unstable": { "version": [ - 20240415, - 730 + 20240517, + 1457 ], "deps": [ "llm", "spinner" ], - "commit": "6e6ec8e28b8ce32ff207b1b026aaaeddc1bd8239", - "sha256": "1nwwqvl91c65r45yxa2dcl4a41r3ahw6294h79riya48nrp8kn54" + "commit": "fddc1022b5e16e356d6f65ddac51bd2ccf25209c", + "sha256": "0pkhm4kz6wrad3vwk9xf8876sz3fc9m7bypffzfa7wg0ivz547jk" }, "stable": { "version": [ 0, 9, - 1 + 4 ], "deps": [ "llm", "spinner" ], - "commit": "6e6ec8e28b8ce32ff207b1b026aaaeddc1bd8239", - "sha256": "1nwwqvl91c65r45yxa2dcl4a41r3ahw6294h79riya48nrp8kn54" + "commit": "fddc1022b5e16e356d6f65ddac51bd2ccf25209c", + "sha256": "0pkhm4kz6wrad3vwk9xf8876sz3fc9m7bypffzfa7wg0ivz547jk" } }, { @@ -31347,15 +31391,15 @@ "repo": "emacscollective/elx", "unstable": { "version": [ - 20240415, - 1535 + 20240506, + 1556 ], "deps": [ "compat", "llama" ], - "commit": "4b3b0af5b8d1e530a1a8fc44af650886b23918b1", - "sha256": "17c4lq6flzx0nsjcmdpaq8isdz73d337d9nv8fqb1719shniq2cm" + "commit": "9db9f8dcc595717d82943fef66f554a4b40aff0b", + "sha256": "1cn4qya2miky1bwiwdkbp6kykcf5syy3hb7vfz5jlld4i9ckc23c" }, "stable": { "version": [ @@ -31379,11 +31423,11 @@ "repo": "tecosaur/emacs-everywhere", "unstable": { "version": [ - 20240416, - 749 + 20240509, + 1715 ], - "commit": "8868b9e371d3d09add67022e46b3e4db0a0c22a0", - "sha256": "0viss80p4sls6qqi9hcdzzx5gibf4s27rqv1nfcdxibw2j1ici95" + "commit": "0b731ca6da351ba40953d090acf69e81757d437b", + "sha256": "0y5p0lvggjhv37fvr2li16x4kxf8y6nab8l38bdrmws34cip54cz" } }, { @@ -31724,13 +31768,13 @@ "stable": { "version": [ 1, - 0 + 1 ], "deps": [ "compat" ], - "commit": "47b0c75d4bf4f72a7af839667c877c80bd493cdb", - "sha256": "14alpanynww6z7yxxyiiy24c0p4pq1argsb0pmqavq25mdxgn4v2" + "commit": "195add1f1ccd1059472c9df7334c97c4d155425e", + "sha256": "1361jvwr3wjbpmq6dfkrhhhv9vrmqpkp1j18syp311g6h8hzi3hg" } }, { @@ -31755,15 +31799,15 @@ "stable": { "version": [ 1, - 0 + 1 ], "deps": [ "compat", "consult", "embark" ], - "commit": "47b0c75d4bf4f72a7af839667c877c80bd493cdb", - "sha256": "14alpanynww6z7yxxyiiy24c0p4pq1argsb0pmqavq25mdxgn4v2" + "commit": "195add1f1ccd1059472c9df7334c97c4d155425e", + "sha256": "1361jvwr3wjbpmq6dfkrhhhv9vrmqpkp1j18syp311g6h8hzi3hg" } }, { @@ -31950,16 +31994,16 @@ "url": "https://git.savannah.gnu.org/git/emms.git", "unstable": { "version": [ - 20240414, - 1933 + 20240512, + 1735 ], "deps": [ "cl-lib", "nadvice", "seq" ], - "commit": "01110352afecd160165041bee55a63e959f66835", - "sha256": "0hz0yf49l6lq897lvfrv8pzkm7k6frnkqxr28800yhb7d6hcd3ix" + "commit": "c86ede13e80ad573f52e46de54fd24a97e2faa88", + "sha256": "04zw0al519n1xiyy15lzf1mv65d2fip5ha46h8lj03psl777bc4x" }, "stable": { "version": [ @@ -32361,15 +32405,15 @@ "repo": "isamert/empv.el", "unstable": { "version": [ - 20240423, - 2355 + 20240517, + 1701 ], "deps": [ "compat", "s" ], - "commit": "d9ab5d355c2e92c2c4e709d6945e6fab25069ccb", - "sha256": "0khj0xz3g5f0xa6qac7xyi2rjbm48l3wlk01q3x6fznccn5ch6wx" + "commit": "c7313288e350de7331779c0b37a8298980f6ff57", + "sha256": "00w59r7ycpv7819kbyjcvpiif9kzqh7k5nk1nfy2wgs1saxkg8ln" }, "stable": { "version": [ @@ -32665,14 +32709,14 @@ "repo": "purcell/envrc", "unstable": { "version": [ - 20240415, - 1016 + 20240517, + 1633 ], "deps": [ "inheritenv" ], - "commit": "8571bf94b6a63ffd9a84100106602f88ba186854", - "sha256": "03mjws4fp00g5smivs1iz0r78mmd5sgj1g4xyi8aq21mpv5rd2m0" + "commit": "4405f6e7b2e300aa91211bd505364d8f01667c97", + "sha256": "0jkydssnmljj8d29h15gar90r5cgin8qnlwampf2af26zfxxgq3v" }, "stable": { "version": [ @@ -33524,21 +33568,19 @@ "repo": "erlang/otp", "unstable": { "version": [ - 20240418, - 631 + 20240517, + 1225 ], - "commit": "5df3992d695da4d7e8777cf7605279ce9d131f1c", - "sha256": "1zn34znba898b4kyrr2v88rbxlh709biff7z99llrvaxl0id6q3k" + "commit": "601a012837ea0a5c8095bf24223132824177124d", + "sha256": "1vaczg52wb4nzkm3py6b2ndxq1fb7nr3n41sn9wc16v4r8nq35b1" }, "stable": { "version": [ 27, - 0, - -1, - 3 + 0 ], - "commit": "5df3992d695da4d7e8777cf7605279ce9d131f1c", - "sha256": "1zn34znba898b4kyrr2v88rbxlh709biff7z99llrvaxl0id6q3k" + "commit": "601a012837ea0a5c8095bf24223132824177124d", + "sha256": "1vaczg52wb4nzkm3py6b2ndxq1fb7nr3n41sn9wc16v4r8nq35b1" } }, { @@ -33946,14 +33988,14 @@ "repo": "SqrtMinusOne/eshell-atuin", "unstable": { "version": [ - 20240409, - 932 + 20240519, + 2200 ], "deps": [ "compat" ], - "commit": "1b71d4c18039bc3b46095adb557f6987caab4a43", - "sha256": "0mkv3460prgjx8pcfvfnavcd6h93f4cd4lqv0k7mynjiq57qy8np" + "commit": "b8bff27bbd7d4e7c28770d6f88d8ebcb1b965a9e", + "sha256": "0rqjljiwb1j345a4y2md44dbk6qpicz02cbzrbpfbi0a937y0222" } }, { @@ -34182,11 +34224,11 @@ "repo": "akreisher/eshell-syntax-highlighting", "unstable": { "version": [ - 20240416, - 102 + 20240509, + 241 ], - "commit": "070b33c20a907d973f41c0be1dcfd1335b8aa1e0", - "sha256": "0r4n6v9rlfmibrld1axbvxdll2j4c8vrp4glfpziglak1j764ifc" + "commit": "1198fd658d317747eb606a50c7767fef579af324", + "sha256": "1j2qfaw2jrd9gpn7a0i0wd5hjqgzj3akgkayrw73bh285iz19fm6" }, "stable": { "version": [ @@ -34540,11 +34582,11 @@ "repo": "emacs-ess/ESS", "unstable": { "version": [ - 20240410, - 1836 + 20240516, + 811 ], - "commit": "8030e29de88c1f234184278e9839d7a78d3ddc6c", - "sha256": "1xx4srd4qmc0plh3lr1ar0qpamwh41wabrxrjg2205d1dxrqv0wp" + "commit": "f307097eac4d182986ed200924f92f14210a7c46", + "sha256": "08cnnmzj0da0vwv8m4cszhk0yy347pmqjmld7cvzn9xvqpghkmxv" }, "stable": { "version": [ @@ -35156,11 +35198,11 @@ "repo": "beacoder/everlasting-scratch", "unstable": { "version": [ - 20230105, - 507 + 20240430, + 1713 ], - "commit": "1b7dac779501dcd988552aa6455a5be89e8b0562", - "sha256": "0hpv7a7jjs0shs7cda8q1bigwjb31miqbf8f4wr2swmjhh15w7h8" + "commit": "1837142ae14fdfd4d634434ceff966b348826259", + "sha256": "15509mjlk382yws41gb90xqn9g06agjpd6c8b8ps4ykmswm6ad5h" }, "stable": { "version": [ @@ -35179,15 +35221,15 @@ "repo": "emacs-evil/evil", "unstable": { "version": [ - 20240421, - 1915 + 20240521, + 954 ], "deps": [ "cl-lib", "goto-chg" ], - "commit": "fe44a565e6806dba4c298a76eb8800063016ec2d", - "sha256": "0xx73x82q26zgj33agmdzf4z4wk2m88f91wry071k8ja0qd9n5hc" + "commit": "0b134d3bbf73c93f5fed2bb89a35f408a9d627ed", + "sha256": "1nrvrb520wpphbhj1ck7jz2ks55yd7bkzycbjzbh534zax1nri93" }, "stable": { "version": [ @@ -35871,6 +35913,36 @@ } }, { + "ename": "evil-lispops", + "commit": "3c3707521cf3967a452161961f1bce8d0dc83b08", + "sha256": "0iq7bacjdsbvzm10mif94amfnb5q00cpxklfz64cnwg3srgiaxfd", + "fetcher": "github", + "repo": "precompute/evil-lispops", + "unstable": { + "version": [ + 20240428, + 1356 + ], + "deps": [ + "evil" + ], + "commit": "372b52df1a45fcea6c9461e7909cfdbb1db822a9", + "sha256": "1rvp5w1n13b9g4r0f6081w15rd52f46291i0ip0zxcz5q31szcg6" + }, + "stable": { + "version": [ + 0, + 10, + 2 + ], + "deps": [ + "evil" + ], + "commit": "372b52df1a45fcea6c9461e7909cfdbb1db822a9", + "sha256": "1rvp5w1n13b9g4r0f6081w15rd52f46291i0ip0zxcz5q31szcg6" + } + }, + { "ename": "evil-lispy", "commit": "f752bec984b45890e4d74ddd76cbadb0b3bf2942", "sha256": "07xkijnsww6060b6x88x5jwaw49ndz2dmaa6cbw78l28s4xgpnhc", @@ -37691,16 +37763,17 @@ "repo": "ananthakumaran/exunit.el", "unstable": { "version": [ - 20240401, - 1344 + 20240502, + 431 ], "deps": [ "f", + "project", "s", "transient" ], - "commit": "3b63d8835398ccadbcec080c8c1e00cd638b62b0", - "sha256": "0ci0x6jzw2ah3hm362r73wj3vipv1f01pybag29znmdvqfg95flb" + "commit": "b6134ce920a4bbc561f65fac1d1bf37206d97505", + "sha256": "1r28j6n373g85rrlwbx0z7mmjz76q9a9fs74grsl5rdjrpab57cn" } }, { @@ -38145,11 +38218,11 @@ "repo": "WJCFerguson/emacs-faff-theme", "unstable": { "version": [ - 20240416, - 2057 + 20240520, + 1303 ], - "commit": "9b8ff139442b29a16a437c367f201f263bbb884c", - "sha256": "103npmlln3c394fkacapx17zjyw4niwqqn8c768gij0ny4k0qfg4" + "commit": "452546431e3bef05fbf8914f6d41b8b7a3557bf3", + "sha256": "1dikgq84xfv2hq340f9m2nvhn4h09sv9py0sm3214nfssn6z4a55" }, "stable": { "version": [ @@ -38705,11 +38778,11 @@ "repo": "technomancy/fennel-mode", "unstable": { "version": [ - 20240425, - 129 + 20240502, + 1555 ], - "commit": "dd7a320b1582b726d011f4fca24d36614b5ffba8", - "sha256": "0f19c55slndp0vdhbwx7s2cz54a26vvyy7knxd2nrhl6wnrazhma" + "commit": "b07a726f4d8b6e7f69fdf7f2105abfa5707680dc", + "sha256": "129s957d4g288x75x1ixb4i8g6nbf2y032jj4minzhn51627cy88" }, "stable": { "version": [ @@ -39185,11 +39258,11 @@ "repo": "thisirs/find-temp-file", "unstable": { "version": [ - 20221119, - 1350 + 20240512, + 1635 ], - "commit": "601e39b052c66df4cd928cf7e308dd6a54769a99", - "sha256": "0mlzrwiv9m8404lx576gkig8icmp7v2fk36x7z1zw2r4vi6r0qc1" + "commit": "76414b6ba8660905675ec8969f5db0adb270bb80", + "sha256": "0shsazfr3r5a3ar6d6bj394vck5k21mda9isp40apba541bbvr5k" } }, { @@ -39426,11 +39499,11 @@ "repo": "LemonBreezes/emacs-fish-completion", "unstable": { "version": [ - 20240405, - 2052 + 20240518, + 1403 ], - "commit": "807628cc4b0f7a07b6e512f7c7825a78ee5c73fc", - "sha256": "12rs6l3w08smp37p18365bj4as1i3jrwl54zbrxw2navjyqmp11m" + "commit": "1256f137a2039805d4e87f8e6c11a162ed019587", + "sha256": "0l2axq9hnz41wz7nj730s7qlgj7zig03xpmzhbyja1av84jndpvi" }, "stable": { "version": [ @@ -40405,14 +40478,14 @@ "repo": "worr/cfn-mode", "unstable": { "version": [ - 20231030, - 1003 + 20240512, + 2341 ], "deps": [ "flycheck" ], - "commit": "0eb3dd630391e4d8a26e09c9032cfb9f4bd71e08", - "sha256": "1nrhybhpkv3rvks1vqzahfjg0vva76kakd99wpdqsa60ylb5i4jw" + "commit": "b26a95a219aa700256b22fd026cace57bce1701b", + "sha256": "1vcapcym8baf9xfk572s8xfds440lp88wg3zlzghxsfbim4w9ddx" }, "stable": { "version": [ @@ -45163,8 +45236,8 @@ "repo": "magit/forge", "unstable": { "version": [ - 20240423, - 2033 + 20240519, + 1510 ], "deps": [ "closql", @@ -45179,8 +45252,8 @@ "transient", "yaml" ], - "commit": "b54c8610a48c092aec8adde289cb9ba52ff7e23c", - "sha256": "1akx3qf3kfyc21bhg1pdlp92ncnx95wdhsqaj45haqjalad9a0zp" + "commit": "d3b14f2cb6740d18827ed713715908b517e4a899", + "sha256": "058g4gi3p3r70h1bdpphbg65xwggq4azyw70wgq30b9q13v90lkh" }, "stable": { "version": [ @@ -45250,15 +45323,15 @@ "repo": "lassik/emacs-format-all-the-code", "unstable": { "version": [ - 20240205, - 2153 + 20240511, + 1811 ], "deps": [ "inheritenv", "language-id" ], - "commit": "1f4a69811b4b6a00c74fa2566ef731b17b9a2ed1", - "sha256": "1p8bh96yksbpajx2pqxjc4vf7nfncwc3mvh1fcj8afw53g72is8m" + "commit": "c5ddfc5f3317eaa2a7541a818a0fce961e5e61dd", + "sha256": "0br35g9pyif8qws2x9nzn9p3l7ajqsni94japmrwsd943fqixzl0" }, "stable": { "version": [ @@ -45398,14 +45471,14 @@ "repo": "rnkn/fountain-mode", "unstable": { "version": [ - 20240329, - 229 + 20240520, + 307 ], "deps": [ "seq" ], - "commit": "b25315fed996cf1d41cc2d612dacc62b3e95f928", - "sha256": "15r0pzdmimm72jx26zgdxf7fwwcppl45vvh33xx5wnhqzd140hwn" + "commit": "7e10f27dd5d9a5d18e08a5454321e961167dfbf7", + "sha256": "0z7lf948l4yn8znir2nca2bd38c6wqcgihf6cx603j1q7ipfxnwb" }, "stable": { "version": [ @@ -46557,11 +46630,11 @@ "repo": "gvol/gap-mode", "unstable": { "version": [ - 20240126, - 359 + 20240430, + 210 ], - "commit": "b816fcf70840887461764ebdbb34c8b37dd42ba2", - "sha256": "0w5g7hfcbi32bs42rqbzskb1a3pwr4qv02c948xdik7bs0nnjgyd" + "commit": "09b4082b6e28141537696bb832c8ecc975ec57d8", + "sha256": "16gl5y1m6b7s5f5ap7sk0xf51vziqkgzajw6817bcg9ih5lbf8z9" } }, { @@ -46626,11 +46699,11 @@ "repo": "godotengine/emacs-gdscript-mode", "unstable": { "version": [ - 20240424, - 2157 + 20240509, + 1523 ], - "commit": "2737f1c68cbeba38d34e5728c9fc2cd69e9a8f88", - "sha256": "0q8diqv5qcn7xxb42wl5mva8a51l0rhxsbm248walqdrrb0l9jk3" + "commit": "32086df83335ce0e5120b21b80cf7996edb2232e", + "sha256": "1w4bkqg17abxzpcb4w5askspps6zcq503544qnj1j97fmc2zmvha" }, "stable": { "version": [ @@ -46785,14 +46858,14 @@ "repo": "emacs-geiser/chibi", "unstable": { "version": [ - 20211204, - 1938 + 20240521, + 2252 ], "deps": [ "geiser" ], - "commit": "5a6a5a580ea45cd4974df21629a8d50cbe3d6e99", - "sha256": "071m2cvwanra9rd8vmybw8xd4k9a23x02cyy12f7qyjy5fp9s968" + "commit": "2502fed1349c2703eea528b74bcc980ad6bceab8", + "sha256": "1j8vld3s653af8jyvdb3sl16ix3al4fxprawgi3r9rrvrai2wz22" }, "stable": { "version": [ @@ -47544,16 +47617,16 @@ "repo": "magit/ghub", "unstable": { "version": [ - 20240415, - 1555 + 20240507, + 1647 ], "deps": [ "compat", "let-alist", "treepy" ], - "commit": "e0a65456098c5e0f2cf2724d071e9033f7b0bf3a", - "sha256": "0kxvd5bfwddcikm4xd82n24pm2mx7i4hqi5ikaypdav2hlp9s0x5" + "commit": "1df5298c3c4d26ec3720dc6c31f8bfd07858f8a9", + "sha256": "1ag8jkc9kkq6rikz19gv2m2hj85f37zwdxxnx16825hf1q9xcjpk" }, "stable": { "version": [ @@ -47658,6 +47731,30 @@ } }, { + "ename": "girly-notebook-theme", + "commit": "984f419a8f77855487ab178fbb94c048d5a8a6b9", + "sha256": "00vwb2fz24h8pzvp062iq32gmv6bswy6320m19c6nl123vkmsck0", + "fetcher": "github", + "repo": "melissaboiko/girly-notebook-theme", + "unstable": { + "version": [ + 20240513, + 1344 + ], + "commit": "e27603d5afb2b60714b8acef61f3477d11c34e00", + "sha256": "11spfigfnc3yp1vzqxaq6i0pc02shigfy8zvw8cyxqs6cpglbywr" + }, + "stable": { + "version": [ + 1, + 2, + 1 + ], + "commit": "e27603d5afb2b60714b8acef61f3477d11c34e00", + "sha256": "11spfigfnc3yp1vzqxaq6i0pc02shigfy8zvw8cyxqs6cpglbywr" + } + }, + { "ename": "gist", "commit": "cae2ac3513e371a256be0f1a7468e38e686c2487", "sha256": "053fl8aw0ram9wsabzvmlm5w2klwd2pgcn2w9r1yqfs4xqja5sd3", @@ -47879,26 +47976,28 @@ "repo": "liuyinz/git-cliff.el", "unstable": { "version": [ - 20240407, - 940 + 20240517, + 1042 ], "deps": [ + "dash", "transient" ], - "commit": "b217b0576798767cc0a96343ba43adca3c04f760", - "sha256": "03bbm924i10h0chly5za991qplkp15dphgksnhni4i30k5s8znkb" + "commit": "90db86c1a600fc319e7c8172839bfe18c3e4221b", + "sha256": "0i0gdcs9lh7jm5sjwss0gadl7k645rns67va5d9xahzvfz1qkzb9" }, "stable": { "version": [ 0, - 6, + 7, 0 ], "deps": [ + "dash", "transient" ], - "commit": "6715b76f0734aa730958e87555b63b59c80585ff", - "sha256": "1795zwcic7imh7ybzjvbybyqrnnfh887y1bvn95wyywqrjrkk22m" + "commit": "14be943b04c1a0e9a0771bc6fc748d0e961af825", + "sha256": "00bis5dk15wrmccd1pla87z2cbr5fgqg6gqjvkn7iry73sax8c61" } }, { @@ -47942,16 +48041,16 @@ "repo": "magit/magit", "unstable": { "version": [ - 20240415, - 1544 + 20240520, + 1135 ], "deps": [ "compat", "transient", "with-editor" ], - "commit": "68075aff58e7ae5c852b9eabb69df454267deeaf", - "sha256": "16l6gm5kh739d3pclyqgfkc0kqf97zl03hzgx5iqadbx8gpcvzxg" + "commit": "22fd8f8594202a0679ccc2f7d02bca44d48b8039", + "sha256": "1ddx82j2j8sf9w7vc9jqa8fm54slprz4jyg3bxmsh6qb0y7n3yni" }, "stable": { "version": [ @@ -49403,27 +49502,28 @@ "url": "https://git.thanosapollo.org/gnosis", "unstable": { "version": [ - 20240417, - 1322 + 20240517, + 334 ], "deps": [ "compat", "emacsql" ], - "commit": "ad7b3563cb0b63afdb3ee14ada8e282c3a65b72e", - "sha256": "1mvf9wq8mwxl5vvnhgsgi6ahw45cg1sihgknb59pp38mg33yarxv" + "commit": "b9c6c04e33ad2f541ab116dda9e460f21034a8eb", + "sha256": "0h9jjag7ip4rgwr3if9rjlglsp7fiklx52685d527gkv6wqqd5a7" }, "stable": { "version": [ 0, 2, - 0 + 5 ], "deps": [ + "compat", "emacsql" ], - "commit": "3433d348e214cff704c2bef1a855c0ea655ad32b", - "sha256": "0y59cc330348yjfw346smc3fha7r0l7zxppydllax31hmx3g4k7d" + "commit": "b9c6c04e33ad2f541ab116dda9e460f21034a8eb", + "sha256": "0h9jjag7ip4rgwr3if9rjlglsp7fiklx52685d527gkv6wqqd5a7" } }, { @@ -50329,11 +50429,11 @@ "repo": "lorniu/go-translate", "unstable": { "version": [ - 20240313, - 356 + 20240522, + 333 ], - "commit": "377375c87f64e7d069c8fc310ccfefd8771226f3", - "sha256": "1p5acy25ap0lpnv178xrkz2lyjppsfss8vcqarjpvd1hv40wfv5m" + "commit": "8cc1f9d013fd99d5bec8b862f8acb249c9104e7e", + "sha256": "15z86y5dvwdcds6w6vl1bv6j4rakc5a4gzawbacpb8wz25nbbigx" }, "stable": { "version": [ @@ -50958,7 +51058,7 @@ "version": [ 0, 37, - 1 + 2 ], "deps": [ "dash", @@ -50966,8 +51066,8 @@ "magit-popup", "s" ], - "commit": "bf28314d9e3287ad1674f80d8a80d2245c0159ae", - "sha256": "1v02h68s1fir6s7y3zjq0s8gmg5qkac637yf3mv68lglb9cwqjll" + "commit": "9a1b3c8fdfd0fcbe460b3546ef1fba26905e6bd0", + "sha256": "1bcakhih2c3ql2npq4v8bsq88dknbk8658b94hbfhy16an81l2zn" } }, { @@ -51121,28 +51221,52 @@ "repo": "karthink/gptel", "unstable": { "version": [ - 20240428, - 314 + 20240520, + 1943 ], "deps": [ "compat", "transient" ], - "commit": "306fe3bd8c2933b48a871976161a7030c7e5b9f8", - "sha256": "0zdjzjv6znfzdrjdpkvnhbrb2dkqf9kgg4z2hgl2wmx4lkwnvcdx" + "commit": "3bce2caa5dc773d1b1fce53e8453d2e1ce534b8b", + "sha256": "1v6pvla6kv9ym3vkd37k2hkn71ycgh4av933ipjqycy1zrwb968i" }, "stable": { "version": [ 0, 8, - 5 + 6 ], "deps": [ "compat", "transient" ], - "commit": "45aae4f721e37139a57420273b6e4252229141d0", - "sha256": "1w9sji73dixch1b5i420j44qb3jd0zknpypz46g33pbyhg9xwqln" + "commit": "cdb07d0d2bb6a4fe6d6a620aa4eec98f70fe6f78", + "sha256": "1k3mq0xjxdbwbhssd16yh6hfg3jpm9qqx4q4jc2igisjja75nmrv" + } + }, + { + "ename": "gpx", + "commit": "4c77f84fd928654cee560b238c35240d1b984366", + "sha256": "196zdi3f1mi8dr2sigv66hlrxz9n2klgipl7izb9fqkvxv9g3xi2", + "fetcher": "github", + "repo": "mkcms/gpx-mode", + "unstable": { + "version": [ + 20240513, + 1737 + ], + "commit": "b79baf93040fb5c89e803848e8aff31331ea03b8", + "sha256": "0ffqzihh1c874bj53hdgjcvwhkmp2pdmcl6rmzjv1m9ijxhxnjmj" + }, + "stable": { + "version": [ + 0, + 1, + 0 + ], + "commit": "b79baf93040fb5c89e803848e8aff31331ea03b8", + "sha256": "0ffqzihh1c874bj53hdgjcvwhkmp2pdmcl6rmzjv1m9ijxhxnjmj" } }, { @@ -51923,14 +52047,14 @@ "repo": "greduan/emacs-theme-gruvbox", "unstable": { "version": [ - 20230921, - 120 + 20240515, + 553 ], "deps": [ "autothemer" ], - "commit": "9ee1159acd15ee014d5643cdaa4e00e06efa6d63", - "sha256": "1nm0rspn7d53ymcmgvnk69rnlzcqn87m332dncwzj9d2f4mz1l6b" + "commit": "3388a96d8e59c120bc243c1f90c614237f6ac3b5", + "sha256": "0r0yqa47zlwr9bv9m84dq3vl43k1gk5hlclcg40v4wqkiiyhwbvw" }, "stable": { "version": [ @@ -52462,11 +52586,11 @@ "repo": "idlip/haki", "unstable": { "version": [ - 20240412, - 1016 + 20240501, + 1610 ], - "commit": "a564a4feab9e1bd7f022128934ed55c83d120b69", - "sha256": "0f3mhvfmvjmkr0lncykkv95n8v5c8nygq209c4b76kwbap06lhcb" + "commit": "e076785ca936b723751b8957c5d5eab8dde12346", + "sha256": "17ypcl68d2f3m0nqma80g1mrbj50wbf4ljl02xl518y0i9cix50a" } }, { @@ -53279,16 +53403,16 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20240425, - 825 + 20240521, + 1457 ], "deps": [ "helm-core", "popup", "wfnames" ], - "commit": "753563ee010e865f3f0fd9d491c2052eb1347fd8", - "sha256": "103pnnki9338ahgz1z2jfl5fyix19mvlsq0cvgn1pnd7h75v14r9" + "commit": "c65a9039b6574183aa3f3e0b647c85470c002339", + "sha256": "0m0b6gb393q60cha19wm0xsry6rihqyp2v6yqcrbmhjr4qbsmni6" }, "stable": { "version": [ @@ -54172,14 +54296,14 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20240411, - 1719 + 20240518, + 1434 ], "deps": [ "async" ], - "commit": "6ae44dba0cb72a3a6950cbe36d104db9c69dfb49", - "sha256": "01lqwqjgg1m7ixm160z88cv6mbacs1vxbkvzcgns0lspxckvl1b1" + "commit": "ba2eb552353635222f14984b8a2f4456b4ac62e2", + "sha256": "15nb9dd59fbzmq2b78pnb9iy1d2q6bdnq6xxsmpycqr10kbmsv1p" }, "stable": { "version": [ @@ -58275,6 +58399,21 @@ } }, { + "ename": "hide-secrets", + "commit": "7a61ad9493fde6c950919111d14798f10bc637d6", + "sha256": "182az3wqbi72sz63vvjyv1niqn1bbgjxjax4hrbfpn4ls9f2sb5b", + "fetcher": "gitlab", + "repo": "ostseepinguin1/hide-secrets-el", + "unstable": { + "version": [ + 20240512, + 1933 + ], + "commit": "e774f3fdacd875707fde25e32f8760e54a440689", + "sha256": "14jlh6x6pp43rw4q88xfz527zaj4r4mbydxyqr9hw6m3ihhq0vq2" + } + }, + { "ename": "hidepw", "commit": "f2ee7663bcedaffa935b8379cc77168035cb1f14", "sha256": "0qnvlcjldg1mcb5ilcy538sbf294glrx5g1a7vbmspdm3wby7lna", @@ -58707,14 +58846,26 @@ "repo": "Lindydancer/highlight2clipboard", "unstable": { "version": [ - 20151020, - 1840 + 20240516, + 1942 + ], + "deps": [ + "htmlize" + ], + "commit": "6564fafd09a9c676b4d393f2260a0c73daac7257", + "sha256": "1xi8cmf33k7vjqk8p3h1b26fsmdwimlb030sw6ifq4r7nd6bamz1" + }, + "stable": { + "version": [ + 0, + 0, + 3 ], "deps": [ "htmlize" ], - "commit": "6ce58a060d9c5843ccb8c79ec2bba7858c68ac15", - "sha256": "06nnqry36ncqacfzd8yvc4q59bwk3vgf9a14rkpph2hk2rfvq2m6" + "commit": "6564fafd09a9c676b4d393f2260a0c73daac7257", + "sha256": "1xi8cmf33k7vjqk8p3h1b26fsmdwimlb030sw6ifq4r7nd6bamz1" } }, { @@ -60096,11 +60247,11 @@ "url": "https://git.savannah.gnu.org/git/hyperbole.git", "unstable": { "version": [ - 20240420, - 1609 + 20240519, + 1800 ], - "commit": "31c60562fc3b2c23719b2c617be8a65bc5d128ff", - "sha256": "18k4n5z33275p4idh3r5i1ym148lvnv4r88pqbwh2zb9wg4z1y1c" + "commit": "61937530ea3713b37ed34b8ad62331a507ccf8c6", + "sha256": "0i6h8m04njp9vwzibm2ja299lrgygw222mgknf773dys3bdnf7pm" } }, { @@ -60111,8 +60262,8 @@ "repo": "ushin/hyperdrive.el", "unstable": { "version": [ - 20240424, - 1953 + 20240522, + 627 ], "deps": [ "compat", @@ -60122,8 +60273,8 @@ "taxy-magit-section", "transient" ], - "commit": "3d509c7a5998511c2951eedcd236e5939c8c0fc5", - "sha256": "0z3ybggny7b7n3fnl4kpg4fgzqh4pdn0v55lsbrbfibvszhbfwxs" + "commit": "f32525eea6032d3422a4419fe65d6c32eb359b8b", + "sha256": "0rs5ij0z82f2aiq5lrr0rkp33cxx2wb149mb2mrjczwrqm9riwbn" }, "stable": { "version": [ @@ -61853,11 +62004,11 @@ "repo": "jcs-elpa/indent-control", "unstable": { "version": [ - 20240303, - 2359 + 20240512, + 503 ], - "commit": "4ede831b8680946f8e4a6cafd4f522c464160c00", - "sha256": "0pjd6mdhf5x9nkm2g5bqgav6ii15gs8d74kj3bigqkfv0m3q5s53" + "commit": "bf4863c9f7d1d5cadf47b78bebbafc5431361597", + "sha256": "0rkbsy5bc2kfvx4wiig5rnjw69lpi57lgcpp04810sngskima4sj" }, "stable": { "version": [ @@ -62162,11 +62313,11 @@ "repo": "nonsequitur/inf-ruby", "unstable": { "version": [ - 20240310, - 1803 + 20240509, + 143 ], - "commit": "b88ff8bd5fe2e468de611b0211842634beaeb5da", - "sha256": "1qq5dnaj7nyhllg6kx7h2fgk8bisvn35kc4i2d4xsgpsf11293wp" + "commit": "1dcaa0aad2eec23582263f934005140ddf70f52c", + "sha256": "1rxxn0329c3xvcn931rwb2chfzxm2m9zi2zq6kvgi5bwq2p5b53q" }, "stable": { "version": [ @@ -62471,25 +62622,26 @@ "repo": "chaosemer/init-dir", "unstable": { "version": [ - 20240326, - 2204 + 20240521, + 349 ], "deps": [ "benchmark-init" ], - "commit": "5f351041b0f81bfbf81437ce1d39bbd37de9319d", - "sha256": "0nb8y9jyrig1217pfddbcfsdfbvqchs8fvyi0hic283c2lygycsy" + "commit": "fd3da1d7a4caf337eebf53de5cd6f5cadad00537", + "sha256": "1jpdjvkhjrnkcb12w6297hpdiw5vbnw67zby0fmsjz86rjwx08dy" }, "stable": { "version": [ 0, - 2 + 2, + 1 ], "deps": [ "benchmark-init" ], - "commit": "5f351041b0f81bfbf81437ce1d39bbd37de9319d", - "sha256": "0nb8y9jyrig1217pfddbcfsdfbvqchs8fvyi0hic283c2lygycsy" + "commit": "fd3da1d7a4caf337eebf53de5cd6f5cadad00537", + "sha256": "1jpdjvkhjrnkcb12w6297hpdiw5vbnw67zby0fmsjz86rjwx08dy" } }, { @@ -63055,10 +63207,10 @@ "unstable": { "version": [ 20240428, - 218 + 852 ], - "commit": "f1a7c5d464a937ec87c23a4a0bb41207eab07adf", - "sha256": "0ia0d3qw34l04phl75injihgi3i6m0299d1kj0wvdvm6b8ah5cnz" + "commit": "98a7dd345c20db85a5477272148d6fb7801ac651", + "sha256": "0wdyv5i5p4banp100x7y6cldbg7dvrzsyj7z8pldyi4d6iardxy2" } }, { @@ -63591,11 +63743,11 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20240405, - 2019 + 20240519, + 1636 ], - "commit": "a38bc60eb78e38304d1183d98d4fc76671263ee1", - "sha256": "0vi26fpm6pyhi7475pgs73prrb0yw4k6nss02b7536p2pjnaxckq" + "commit": "6a98b006f140b588490c24c5f794aac4250bf300", + "sha256": "054wjara59jjqrhr7hq0h4h3f3k6gvbx6m8066s5hryvi1ij2p4y" }, "stable": { "version": [ @@ -64531,15 +64683,15 @@ "repo": "emacs-jabber/emacs-jabber", "unstable": { "version": [ - 20240306, - 524 + 20240522, + 1532 ], "deps": [ "fsm", "srv" ], - "commit": "633cb73633143ec093c291af94b008f456037e8b", - "sha256": "1agbcbqvfdh0933b1rzsnmv27kfr8ns3202bgpqhnnvpn2dmp448" + "commit": "02372a6673372779571b524319e08b84241e87c6", + "sha256": "0ps998w5z0qs676l29ag47mrrsg9k2g7pgl7fbfc0crbi2ivzj2a" } }, { @@ -65328,25 +65480,25 @@ "repo": "minad/jinx", "unstable": { "version": [ - 20240415, - 423 + 20240515, + 1016 ], "deps": [ "compat" ], - "commit": "77cac7f240f45d6c4836e844bd68151c7f863298", - "sha256": "0paid82g8q7spbi4qb10vbg8izjw7347psybfpww4q0fsjjn6hhj" + "commit": "3c36f1eb31713869ffbdbf55971671efa4f01966", + "sha256": "04f9yd710rrn1v5b44jaackrnc7f6ywy4r5j5ig12gkddbx3r29i" }, "stable": { "version": [ 1, - 6 + 7 ], "deps": [ "compat" ], - "commit": "f4abad42cd0bdcff62ac325a644cb8faad186a4b", - "sha256": "0kl9jpd6a68q1s3lc74jkx0nsk66lpwg7zx61a5h0w0m410l1g1q" + "commit": "3c36f1eb31713869ffbdbf55971671efa4f01966", + "sha256": "04f9yd710rrn1v5b44jaackrnc7f6ywy4r5j5ig12gkddbx3r29i" } }, { @@ -65482,11 +65634,11 @@ "repo": "Michael-Allan/Java_Mode_Tamed", "unstable": { "version": [ - 20240425, - 1650 + 20240508, + 951 ], - "commit": "7c88ff37c2a957a5d07be7a1c878b3325b55f719", - "sha256": "1fkf605g0g2vp9ls3g7n4fkwy9p24iyr4k02rfwfqj2m04gzzhws" + "commit": "4a0bcf5a8f86e26ce76df0ea984c316e63df13f3", + "sha256": "11ka3hcfzh7dzk37zb7lblyq6r5k2f4dpn8c1nkiyzamchbfg4df" } }, { @@ -66388,11 +66540,11 @@ "repo": "llemaitre19/jtsx", "unstable": { "version": [ - 20240418, - 2018 + 20240519, + 1546 ], - "commit": "32dec6d5d5725a7fe2d50537e46c224349008896", - "sha256": "1g82cfkkv7vjsk29bfjjwjhwark1h371pzrfqnrm5sfpyn1h3nxv" + "commit": "7bbf02f046e375c23fe5a90eb0a9557e843eba41", + "sha256": "1x7w6g535la7fs05v2xil4bggif7j9f3qphc49fz9ay6q6rfsc84" }, "stable": { "version": [ @@ -66430,11 +66582,11 @@ "repo": "JuliaEditorSupport/julia-emacs", "unstable": { "version": [ - 20240409, - 1316 + 20240506, + 1205 ], - "commit": "60f23fea669add4a1624573eb6383f4180f5a6c9", - "sha256": "0lsypckp0ghdbqbrw4m9dgq3w8bmyn15mv6iiya9f84bm6r60dn2" + "commit": "d360ad5285b8a0be1818fd6c2b4307c34e468c6e", + "sha256": "0gxj3qn4jmggb2bh7bmykb62g29m24g8k11jx481pf56qn2g3rc2" }, "stable": { "version": [ @@ -66501,8 +66653,8 @@ "repo": "gcv/julia-snail", "unstable": { "version": [ - 20240428, - 522 + 20240521, + 22 ], "deps": [ "dash", @@ -66511,8 +66663,8 @@ "s", "spinner" ], - "commit": "a63ee2a61efd6af2d6a597bfa40cc98630406a8e", - "sha256": "15qqhpbak60bskws5hc6k02089vyzrhivj91jykzi38jzz3vy808" + "commit": "f7784c50078332aeeb8e388bf5b8f13042b7406b", + "sha256": "0cds08nyr7px5mbna2gbmv6a82hc1my45illdgswf7k67jby46zr" }, "stable": { "version": [ @@ -66569,25 +66721,25 @@ "repo": "shg/julia-vterm.el", "unstable": { "version": [ - 20230815, - 2318 + 20240514, + 724 ], "deps": [ "vterm" ], - "commit": "6d67b618a6f2714d283095b088b12859fb663df9", - "sha256": "02al9s2fb9a1nf6s31szbh0pxw32rljj8fpmx9bs132c54x79ph8" + "commit": "2298cd42d354f069adbb7bb06b3b15222e5f54a2", + "sha256": "0r0anwzar8rwiwzwg637nshj59mssiipbilcc6kvxr73ffviy127" }, "stable": { "version": [ 0, - 22 + 25 ], "deps": [ "vterm" ], - "commit": "e4d1c28935c47429442ddfcd735cb8d8c2d8db66", - "sha256": "0q11f5f7j7rwzd4n1r84cfzx8cw631h4nfykjqrm5zbgkc9zmfd0" + "commit": "5e94f761be563db1f537ce37508ffa2cc33fc567", + "sha256": "01hvb5b884rv7q3mng8l71iwikzinvbwns41na30l0rqpzljcqs7" } }, { @@ -67126,11 +67278,11 @@ "repo": "meritamen/emacs-kanagawa-theme", "unstable": { "version": [ - 20240424, - 308 + 20240501, + 38 ], - "commit": "dca0ee1e2978eb82b37c777d894dc447faa70619", - "sha256": "0ac5as108lsc89pggda52jskf110jx1mvdir5rmdpzrl9fdkacix" + "commit": "3ac33b6a4c7c7ad751ec8f264aa05f135b5d953d", + "sha256": "0dbdv64yzhrhhzg0asxnabzhv1jhcihmkby3ilw8hgls0w0r24c0" } }, { @@ -67205,15 +67357,15 @@ "repo": "ogdenwebb/emacs-kaolin-themes", "unstable": { "version": [ - 20240217, - 2054 + 20240507, + 1430 ], "deps": [ "autothemer", "cl-lib" ], - "commit": "b03749c914b1319caccce4cf96630e3fba5335f5", - "sha256": "15246nsiwdfy5zl5iml4qxslz8p7k9lrzdr7p6bn71afk721vz5y" + "commit": "ba7a003d7aa5d4681a8464f4dec6ab4e9fb271d2", + "sha256": "1x0hrl0klfgvm7l2lcqr15apjsy9pfqzbk54idmk7yfk6mz9pr2c" }, "stable": { "version": [ @@ -67404,8 +67556,8 @@ "repo": "jinnovation/kele.el", "unstable": { "version": [ - 20240415, - 2325 + 20240428, + 2141 ], "deps": [ "async", @@ -67417,8 +67569,8 @@ "s", "yaml" ], - "commit": "8f3c4515ae55376f49d2be338d876686a34d121d", - "sha256": "16c7787aspgki933h6393142hxlxz97wcnvg8l4w9c763i5fkqxr" + "commit": "ee667b6581113be21e7d24935cf8a431eb382432", + "sha256": "038zqsgbg4j7mrhw7rf61qp0bja2m675rhxk6y8bbnvkva8z24w9" }, "stable": { "version": [ @@ -67955,28 +68107,28 @@ "repo": "khoj-ai/khoj", "unstable": { "version": [ - 20240427, - 1312 + 20240501, + 1100 ], "deps": [ "dash", "transient" ], - "commit": "12258f02d7c526bc1c91afddbce165f78c3e8a7a", - "sha256": "1g863m2h3xss2aq3xqvh271rjrgzdld7p3qhglc6xz1qn6pvv41g" + "commit": "bc8b92a77dc40c93a5fdf6639f367d814339bbad", + "sha256": "195b9xnlmnlnnl84app8kqbacvlxfxr3li393p43wp5inqsajg2h" }, "stable": { "version": [ 1, - 11, - 1 + 12, + 0 ], "deps": [ "dash", "transient" ], - "commit": "12258f02d7c526bc1c91afddbce165f78c3e8a7a", - "sha256": "1g863m2h3xss2aq3xqvh271rjrgzdld7p3qhglc6xz1qn6pvv41g" + "commit": "bc8b92a77dc40c93a5fdf6639f367d814339bbad", + "sha256": "195b9xnlmnlnnl84app8kqbacvlxfxr3li393p43wp5inqsajg2h" } }, { @@ -68412,11 +68564,11 @@ "repo": "bricka/emacs-kotlin-ts-mode", "unstable": { "version": [ - 20240417, - 838 + 20240513, + 1429 ], - "commit": "a8747af6465b384941ce8f199bdfecb3d0c09812", - "sha256": "044i01kvpilvj6f8h4xn9a0kkpbmq724adphj51pvibv736w4k4s" + "commit": "786b7eacb6c10b7a4e0c0537264264f299632679", + "sha256": "02b854m19f86l5g2j3gc7gb2w9834fm7c6rhjkrc5blwj8i3janm" } }, { @@ -68840,8 +68992,8 @@ "repo": "isamert/lab.el", "unstable": { "version": [ - 20240404, - 736 + 20240517, + 1837 ], "deps": [ "async-await", @@ -68852,8 +69004,8 @@ "request", "s" ], - "commit": "ca6a02c567adb562305d0887140d631e2d6f01f6", - "sha256": "02q2w84rpq0cl7crl6k875wj5g1gq5w1kqlr2whq3jwv1ajfcyg1" + "commit": "fec1d5ad4e09c89c7260dc440f2dce6692b1ec0f", + "sha256": "0gfkxxdqli97x81pcxj1p3w1z6q5w7sn7q636hycrj97v3rdv8br" }, "stable": { "version": [ @@ -69133,11 +69285,11 @@ "repo": "lassik/emacs-language-id", "unstable": { "version": [ - 20240325, - 1223 + 20240510, + 1342 ], - "commit": "c05a566ab5c938b31873b24d698c3d9ff0948ea9", - "sha256": "01rhxsbsn4ilkc9z2556lmpzvnx2d2a2xzmxq3932sd55al98whg" + "commit": "435114f208b97e97aa1576ef1966a33d90cad01b", + "sha256": "1gwdiyvzm3dz1dj5l763f1v68bb15g5qfmy5b9p58695l5hi135z" }, "stable": { "version": [ @@ -70403,11 +70555,11 @@ "repo": "merrickluo/liberime", "unstable": { "version": [ - 20230113, - 556 + 20240515, + 255 ], - "commit": "cc9eb9812fd6f68e78ed6a0c0a85da7a18765753", - "sha256": "11c2wj00wwbdxqkzl60sd77cp43rja5v8hrvhrvhg75v62kawva2" + "commit": "c5839f541763f661a4d46784f3f14adad28ee2b0", + "sha256": "1h4q0nmckfwl2cmp1kaj83ac2lzpdwq7m3r8q722zd05lvnm145v" }, "stable": { "version": [ @@ -71347,15 +71499,15 @@ "repo": "sulami/literate-calc-mode.el", "unstable": { "version": [ - 20240402, - 808 + 20240513, + 1200 ], "deps": [ "dash", "s" ], - "commit": "ceddadc4f130626d3430fc8c5cfff71628221a60", - "sha256": "1chs7kpfwjl65p0m4zlgx3lhsixlis9bg3lilmlhw65436y7nl8s" + "commit": "5e8ce01ff3d85ff81f366724330026d68449bc19", + "sha256": "1jfd2d2qzk6cprwynmk6v5409hgrgl310zv5vbgapq06j49gzriq" } }, { @@ -71621,11 +71773,11 @@ "repo": "tarsius/llama", "unstable": { "version": [ - 20240415, - 1539 + 20240520, + 1947 ], - "commit": "40d671b35e51afbc0d690f33c965d322375c4b27", - "sha256": "1khnl8z1hf7qrwmxikkdmxhb9fp1ngbr6x3lh2n4nrr5kinmqf3c" + "commit": "cea812d16129749deb524771e615a4a831604a83", + "sha256": "1wlc1m9w5s03w91i132yzxbd93pdfnxsf0pq56pfsl6xvrqbj82k" }, "stable": { "version": [ @@ -71648,14 +71800,14 @@ "repo": "kurnevsky/llama-cpp.el", "unstable": { "version": [ - 20231228, - 2043 + 20240511, + 1039 ], "deps": [ "dash" ], - "commit": "e876c05eca8ffadc39d3c5013c2581f1e9f8f94f", - "sha256": "0pxhz02k7kswv37j45rrcssc29xnk3x738p9ysvybldbix5pbq9h" + "commit": "5cea3698aa63921b21888f126cae4f3ebc1baa39", + "sha256": "05vma524dyn9q4rcvz0fpdji6p8wxjriaga6ay39qxppxg54c1v3" } }, { @@ -72339,8 +72491,8 @@ "repo": "emacs-lsp/lsp-dart", "unstable": { "version": [ - 20240401, - 1646 + 20240520, + 1834 ], "deps": [ "dap-mode", @@ -72352,8 +72504,8 @@ "lsp-mode", "lsp-treemacs" ], - "commit": "ee476aa9bb891873943bb4f9dc4b729921c2de37", - "sha256": "1k5h8x4fk6n71hhi8sc5wqasfkf0887hh787n8xdfmkhxc9gids3" + "commit": "1f52e81c9371055ff9188117ace81f009d1c79f2", + "sha256": "18wvsbszdxgmjvpj6b32scg0g8lj54cm3fz725zph44brm98v391" }, "stable": { "version": [ @@ -72546,8 +72698,8 @@ "repo": "emacs-lsp/lsp-java", "unstable": { "version": [ - 20230922, - 1154 + 20240501, + 1928 ], "deps": [ "dap-mode", @@ -72559,8 +72711,8 @@ "request", "treemacs" ], - "commit": "449673da7221a30f1b1756cedcc48b9a2b52a51e", - "sha256": "1y1dr9nk50ji48z91gd1drfxqkq2189shria83cclm0lna45zfy1" + "commit": "37c95ef7e992001250d893277acfccf4af0099b4", + "sha256": "172mp8na5w3dc7k6rl543dar85siz15vlhqidinim8hg9c4v6xqz" }, "stable": { "version": [ @@ -72735,8 +72887,8 @@ "repo": "emacs-lsp/lsp-metals", "unstable": { "version": [ - 20240413, - 851 + 20240508, + 627 ], "deps": [ "dap-mode", @@ -72749,8 +72901,8 @@ "scala-mode", "treemacs" ], - "commit": "01060e9df33bb077ba6bb56ccfebc140aef8f8f3", - "sha256": "0whjz5vh9xf35nvr5an52d7qsf2ayr2pfwvr37qhz1rjg0rv2kzd" + "commit": "fa4072cbe7a7061cdb218b9a3619979f7facba0e", + "sha256": "0zwf5x80y54vdpvglnbk2rrwiabl82hiingig70z99a3707lxx3k" }, "stable": { "version": [ @@ -72780,8 +72932,8 @@ "repo": "emacs-lsp/lsp-mode", "unstable": { "version": [ - 20240427, - 2141 + 20240514, + 1430 ], "deps": [ "dash", @@ -72792,8 +72944,8 @@ "markdown-mode", "spinner" ], - "commit": "32bf5aa458f2bafb318a34bed64cb3f681aa0b51", - "sha256": "1a1g0b4yrwqqj8kpvmpqsjdrshk1kyhy54d9yhpfj4f4gghmay2f" + "commit": "62e1f68c1f2363f7ebe8f1c2762e472f3b5de46a", + "sha256": "17r4jg0i9df74bbphi4809l3q3mqy462syw5msf0sjv7k0f5fml0" }, "stable": { "version": [ @@ -73205,16 +73357,16 @@ "repo": "emacs-lsp/lsp-ui", "unstable": { "version": [ - 20240424, - 412 + 20240514, + 1943 ], "deps": [ "dash", "lsp-mode", "markdown-mode" ], - "commit": "a59fb5d02eaa97908a06cfc07156de73458c8ae8", - "sha256": "1fy172s224ddpdilqflbd3dhs3s6xb2gash6a5svw3lp92mwdnl9" + "commit": "00f1fecdfb41c30428734cf27e492f26f46627fb", + "sha256": "1zpmszary67g9wvkjrm1i7ilcmmdbbzp7liq47xii4k78y9dj55l" }, "stable": { "version": [ @@ -73605,14 +73757,15 @@ "repo": "emacsorphanage/macrostep", "unstable": { "version": [ - 20240328, - 2134 + 20240513, + 2203 ], "deps": [ - "cl-lib" + "cl-lib", + "compat" ], - "commit": "e28d0a028f702d2dbf9a33ab691c3459268ed35e", - "sha256": "0gw2429mgivvjjpx149m26i6yiayhs9s9g8lx5r64kccdci1xrl1" + "commit": "4939d88779761e8b5461b4cf73f86600172987db", + "sha256": "03lriwibv3r8prkg8rih8p80ykxqg9hvax88bg64mdx2jv9l4ygb" }, "stable": { "version": [ @@ -73735,14 +73888,14 @@ "repo": "roadrunner1776/magik", "unstable": { "version": [ - 20240409, - 1410 + 20240521, + 1419 ], "deps": [ "compat" ], - "commit": "7540f14d3d62856313b5cbebefcfd813784ee77b", - "sha256": "1rbidw6scix7wcx09wfjhnln1ar5b9f1bdj9k7mfjcvb46mmaczq" + "commit": "51ec2d21e4d68fc549d2022f86a882e090541ec3", + "sha256": "1mxpwx1n537gjhb09h8d8mnf8ra5qlcnn13260447xk7z620sh8l" }, "stable": { "version": [ @@ -73765,8 +73918,8 @@ "repo": "magit/magit", "unstable": { "version": [ - 20240426, - 2118 + 20240522, + 204 ], "deps": [ "compat", @@ -73777,8 +73930,8 @@ "transient", "with-editor" ], - "commit": "49ba535f526266b69fcaf7442acfa59ad8473caf", - "sha256": "0mcy3sndpajhg95ivr8cl5jsk7pnfc4zhjwyjxsj6yqqc77rw92h" + "commit": "f9268a959828d0c6ab26171dd2fb1ffc55e5ae70", + "sha256": "1xghq21qqjb2b31i75rd7j0h4fk7242vhbq976q1hls5j7a7x2mr" }, "stable": { "version": [ @@ -73887,6 +74040,40 @@ } }, { + "ename": "magit-file-icons", + "commit": "d3d921177674e531d53df5b6205ea6a426491186", + "sha256": "0qcw8mr78mc7bpyzxcix23cvk89fkd8f9ykj7qaxixgizfcmgyhj", + "fetcher": "github", + "repo": "gekoke/magit-file-icons", + "unstable": { + "version": [ + 20240520, + 216 + ], + "deps": [ + "el-patch", + "magit", + "nerd-icons" + ], + "commit": "d85fad81e74a9b6ce9fd7ab341f265d5a181d2a8", + "sha256": "1q03a4zzb2nvxgm84jj3wm4067hp2n4894xmxhc98w981vli41qm" + }, + "stable": { + "version": [ + 1, + 0, + 2 + ], + "deps": [ + "el-patch", + "magit", + "nerd-icons" + ], + "commit": "33458112ae3701a82a02a4b88dd52baef48ababe", + "sha256": "1whx00jp2rgad2f3zir7qmhjpspsx6zs2hk8wlkv4hlsv9s1knpa" + } + }, + { "ename": "magit-filenotify", "commit": "ca5541d2ce3553e9ade2c1ec1c0d78103dfd0c4d", "sha256": "1ihk5yi6psqkccpi2bq2h70kn7k874zl7wcinjaq21lirk4z7bvn", @@ -73955,15 +74142,15 @@ "repo": "emacsorphanage/magit-gerrit", "unstable": { "version": [ - 20231002, - 1538 + 20240514, + 1139 ], "deps": [ "magit", "transient" ], - "commit": "9b6c476a4a5e715d68081dda45312f7e2bedd484", - "sha256": "0gs6zhgywjikxr1lkbbih1ayxl4i4w82vsfg0yqsj6cdbi6r109c" + "commit": "46fe81c76fd2d3e5e97207cd1d951f22ecb16573", + "sha256": "16xb13mamx0rnlsxg4xs0nc1xif59rw3xa22y7fz4897cjyrlp84" }, "stable": { "version": [ @@ -74288,15 +74475,15 @@ "repo": "magit/magit", "unstable": { "version": [ - 20240426, - 1325 + 20240508, + 2349 ], "deps": [ "compat", "dash" ], - "commit": "fef45b274ecb4dc0448bd34dac26f7eaff621e59", - "sha256": "1mh6lj5w52id5v7bl0j5789cbg5kirz1r76g5xrby6grk3zln942" + "commit": "855d924969eb6231d62ab446f727c9f7ad5c4913", + "sha256": "0x13wwm6f93qvaqq7qlx97ahvbvgkqf2xdq7vjn6wm9h2mdkw4hh" }, "stable": { "version": [ @@ -74428,8 +74615,8 @@ "repo": "alphapapa/magit-todos", "unstable": { "version": [ - 20240421, - 1131 + 20240519, + 247 ], "deps": [ "async", @@ -74441,8 +74628,8 @@ "s", "transient" ], - "commit": "f73921e484dbae056e84080c743dffd241cb6bf3", - "sha256": "0axy2pnvs7n091cfvsr54a4px5vxj5pbi0lzqak3n4zpzw0vdf0r" + "commit": "501c8db90ab59f8b619618b9d10db2a32a113727", + "sha256": "19p54cnh105k06d63avbqwq8bbnk4hl5ff5vgq3lcx005qvmpc43" }, "stable": { "version": [ @@ -75258,11 +75445,11 @@ "repo": "jrblevin/markdown-mode", "unstable": { "version": [ - 20240318, - 1307 + 20240501, + 1057 ], - "commit": "fd6c5508f979ab526e024a591eaec963712cb211", - "sha256": "15vip2y7lgypnipyabrq1qlqwg6s3365gsfij3bipxbnx2p9n1p1" + "commit": "0cdebc833ed9b98baf9f260ed12b1e36b0ca0e89", + "sha256": "09v1vkj02l58kz74rqh3vdfy75gi48pvcaz99k9i54wncy61bv5j" }, "stable": { "version": [ @@ -75603,28 +75790,28 @@ "repo": "martianh/mastodon.el", "unstable": { "version": [ - 20240327, - 1353 + 20240521, + 1721 ], "deps": [ "persist", "request" ], - "commit": "d54aa9aa3e4276b9519ff9123e9dc0c123d9dd3b", - "sha256": "096zsjlqx2cv4zq607f9n7mr60d5avhfczf3nxsa8wkjsj97qrlh" + "commit": "49def07b3d9b6f0718ef9402a3808ca01557245e", + "sha256": "158a5hqhmz1dvdg7rcrdikbsqli8gc1kwks6gvbji2qb99zcd8x6" }, "stable": { "version": [ 1, 0, - 19 + 21 ], "deps": [ "persist", "request" ], - "commit": "d54aa9aa3e4276b9519ff9123e9dc0c123d9dd3b", - "sha256": "096zsjlqx2cv4zq607f9n7mr60d5avhfczf3nxsa8wkjsj97qrlh" + "commit": "49def07b3d9b6f0718ef9402a3808ca01557245e", + "sha256": "158a5hqhmz1dvdg7rcrdikbsqli8gc1kwks6gvbji2qb99zcd8x6" } }, { @@ -75658,16 +75845,16 @@ "repo": "matsievskiysv/math-preview", "unstable": { "version": [ - 20230425, - 1820 + 20240519, + 740 ], "deps": [ "dash", "json", "s" ], - "commit": "620de35fc8cf940eba5a567767eac2288708d8cb", - "sha256": "0ni08900p0pbajw143iw0b7a62qiqcm9b6jy7pqgpn437vydjx1z" + "commit": "7c12235c7f8bb1af0e712a8bfa77f1f2635d964a", + "sha256": "0ia9ca9nlq7wjzwk7h1q0kw00avifmc86v0yimn04p21zv3bg45n" }, "stable": { "version": [ @@ -75762,11 +75949,11 @@ "url": "https://git.code.sf.net/p/matlab-emacs/src", "unstable": { "version": [ - 20240418, - 1949 + 20240521, + 1748 ], - "commit": "005954382db3df9c41585701467cedffe48b2ff4", - "sha256": "018m24csl0d3p8987m7dhb2d3wjkb4r9agxfww31gaszc4bdaar5" + "commit": "a78b368387c85437f8de187acf0a2b1cbeeacc3f", + "sha256": "1aw1xm0dawppzr8vjnry6rigvxx204h1msrxjxsvnljr4xr9i40h" } }, { @@ -76247,11 +76434,11 @@ "repo": "gvol/emacs-memento-mori", "unstable": { "version": [ - 20240407, - 1417 + 20240429, + 327 ], - "commit": "7cc2e89511c1c131789737b4c9daeee0147916f0", - "sha256": "1chf40k3gf1gzqlcivl8ry6nwaps7b9cbkmy10pviaslwijifyzh" + "commit": "424dc591b3dd8fe7f2f3ddef1baa647aa2b0cc7e", + "sha256": "1drsc9akr48q5bxrw43fs2lqjp5cdf2nxvng0nvr5v4xvckd1a9x" }, "stable": { "version": [ @@ -76830,11 +77017,11 @@ "repo": "kazu-yamamoto/Mew", "unstable": { "version": [ - 20240427, - 946 + 20240515, + 152 ], - "commit": "82c531e328ca1073e4d4115ca844ba9f0859c4a1", - "sha256": "0xbbdz6yac4qkz1w0ljip9g7knlpp8mhsi6y9pczww1hg05kqlcb" + "commit": "6eedf619d726aa11f23962e406331b7aba8ac82c", + "sha256": "0rp1zfrh6mdv107fz2d75cgayi18397k53dy40d6jxszbcq32x7v" }, "stable": { "version": [ @@ -77105,6 +77292,35 @@ } }, { + "ename": "mindstream", + "commit": "0381cf3e8bfc3209686e9fd827adfbf3bcf624a5", + "sha256": "1ayy8bmj9nk98bpgmmskpj76b5dmdifd2qmkn88mjiq2ahkxjj17", + "fetcher": "github", + "repo": "countvajhula/mindstream", + "unstable": { + "version": [ + 20240519, + 1715 + ], + "deps": [ + "magit" + ], + "commit": "ae8b10b077d71de5e8ad966e03527e8d55b3e18d", + "sha256": "17f68h5ibn3klcfj570fprx7n9q59x8wjwdbzzhry2c7g9ay94nl" + }, + "stable": { + "version": [ + 1, + 0 + ], + "deps": [ + "magit" + ], + "commit": "f95e7fc2c6d529533709ae63a55e8ace9287ec0b", + "sha256": "08m5qlfbl0ilf0z0s6n3lgmjzwc5gh650jmxgl7a6rlzgw3rrh6a" + } + }, + { "ename": "minesweeper", "commit": "d3828ad7599d13728b5571b882344c3ada434b85", "sha256": "061l7xh7vjg5krz5lskj2jvrnsv2qq4bwg0qkkysmy4zp9f3m5iq", @@ -77145,26 +77361,28 @@ "repo": "liuyinz/mini-echo.el", "unstable": { "version": [ - 20240418, - 1047 + 20240518, + 849 ], "deps": [ + "dash", "hide-mode-line" ], - "commit": "adeb402f5e508424960b6165d596b25fd6a6d756", - "sha256": "0jcac2p3ml17q6fsf8jaxc0nx17jjj3z1zvcsqv0k2r53ya8k41x" + "commit": "4e2918225bea7fa7d232260bd0b2de48df68c6f8", + "sha256": "1bccmx0sd7qjfgd1p8yskw12phxc89arbiz064xk9jcl1cxaz57x" }, "stable": { "version": [ 0, - 8, - 0 + 9, + 2 ], "deps": [ + "dash", "hide-mode-line" ], - "commit": "9e01966d56514aa1fe9b7cc281da390ab33532d1", - "sha256": "0q4hvbypnjg5q1szwki2md45r5kkdxrr4zxqh57y7d53idjzhpnf" + "commit": "f0feae3bbd0becd79ea086d4a1b811162470b162", + "sha256": "1wz5ssp480zlfxdvgywxx72gkf7mldrd4gxah18ys09yycawa0hi" } }, { @@ -77535,6 +77753,38 @@ } }, { + "ename": "mise", + "commit": "46ca1d980230fdc13454d9011b5e6c55f047027c", + "sha256": "00haka75iildiq554pdq7zsn5pw88xw0glaa05dvahy3n3p5k61b", + "fetcher": "github", + "repo": "liuyinz/mise.el", + "unstable": { + "version": [ + 20240514, + 452 + ], + "deps": [ + "dash", + "inheritenv" + ], + "commit": "cb19405eba3cfd679a5e3ac75c8c4c1146b16015", + "sha256": "0h0xkps9m1g7q21hij23rli7jq1ygzc74h8fn9am9rmj4dgy5dkg" + }, + "stable": { + "version": [ + 0, + 1, + 0 + ], + "deps": [ + "dash", + "inheritenv" + ], + "commit": "e2db0d204890721e372ed89deb554d9a75385486", + "sha256": "02j067pyqf2xx48qg383wvhk267pj9wd6ckv1azsa20cm713bph4" + } + }, + { "ename": "mistty", "commit": "8a66484b8aff8298222e70466f8f9b09b31bc598", "sha256": "1xymccwmffccf5b5a29mmhwymmllmkd4nbmxk52g7c81xrwnrcnb", @@ -77542,11 +77792,11 @@ "repo": "szermatt/mistty", "unstable": { "version": [ - 20231122, - 2029 + 20240429, + 1645 ], - "commit": "d51d6d995db42377d225169ec8ad200cbbfca401", - "sha256": "0534s8d565y9sgqxf531xnj4lc67wsixpgg5x630rxaf5b8dwzcy" + "commit": "bf68d5b52d9dfae68c83340cabea2681057e82ea", + "sha256": "0a95xjlhb1963cqqxcikf4k31mxkbbksnfbnnmrc5zl63b9ykpww" }, "stable": { "version": [ @@ -77864,20 +78114,20 @@ "repo": "DCsunset/modaled", "unstable": { "version": [ - 20240330, - 1956 + 20240511, + 1540 ], - "commit": "01ef8befac15f77f1b9129bade37e78b6bf7d612", - "sha256": "1nza8pff0adj6sp20wr3yb8a7jdlklwk49qwamb09pal3lidq7pf" + "commit": "c7259e3e91fc8de4f17b2de9c83a12e855ae7932", + "sha256": "1vqfz3dcwlcmla8smwwn9r3kp859d10946zgab9y2x8zzidz7702" }, "stable": { "version": [ 0, 8, - 3 + 4 ], - "commit": "01ef8befac15f77f1b9129bade37e78b6bf7d612", - "sha256": "1nza8pff0adj6sp20wr3yb8a7jdlklwk49qwamb09pal3lidq7pf" + "commit": "c7259e3e91fc8de4f17b2de9c83a12e855ae7932", + "sha256": "1vqfz3dcwlcmla8smwwn9r3kp859d10946zgab9y2x8zzidz7702" } }, { @@ -78139,11 +78389,11 @@ "repo": "protesilaos/modus-themes", "unstable": { "version": [ - 20240427, - 843 + 20240505, + 331 ], - "commit": "56bd9c8f32b4179e4207f553f8656934c0076a85", - "sha256": "0id7b9gl1cl2w2q921fx1gvmh9dsvll9r93k0yszn6v3hf98sjpm" + "commit": "d2762db19ed48bd0cbba61c41940be479760a35e", + "sha256": "1y8z4yfnqic9gg2nm0rqldhwkfz134zxv1x57x3jh9k04p1nblc1" }, "stable": { "version": [ @@ -78163,11 +78413,11 @@ "repo": "kuanyui/moe-theme.el", "unstable": { "version": [ - 20240417, - 1111 + 20240430, + 1601 ], - "commit": "0fb1274cb29863597e627757230feedf7d90482c", - "sha256": "015wi8nx18705yqrkgrvk52rsb2nyv91c04wyx6imwfvfp2vh52d" + "commit": "6df0d99a1a2006b218282f15d84609b88478ca7a", + "sha256": "1rshp0n9nhnapp2glds6zrnp2l4nv93s0kxb8iqjr5n6a9x6m68y" }, "stable": { "version": [ @@ -78501,14 +78751,14 @@ "repo": "tarsius/moody", "unstable": { "version": [ - 20240415, - 1545 + 20240520, + 1715 ], "deps": [ "compat" ], - "commit": "28abaf874b87b6d6c09ef1ab63856de4ed743974", - "sha256": "033wg9qfw2rklinvii6dqpqcdg0agxsn2njq3ywq0xwwldhmms6p" + "commit": "1faf8c16073bb62ade53906eef549ed8ac79ae70", + "sha256": "1jbly23pr5lhgd9i6c0619v9pfrppk6614czf0wvz8ibkgdwsk2c" }, "stable": { "version": [ @@ -79433,20 +79683,20 @@ "repo": "mkcms/mu4e-overview", "unstable": { "version": [ - 20240330, - 1441 + 20240521, + 1445 ], - "commit": "758ea4b3945fa377ae33e45f8213280d38e0551d", - "sha256": "0qdxsfsambbrb3dbch4pyjm9k59cbjlzkx9075aipdi8nl0nvygf" + "commit": "51327c894721680633292a43a4e610542b4eceb3", + "sha256": "1pxapgihcf5c8ycmqzd2gysm0v6r0pw41kbym4xdwyqr6alhz94a" }, "stable": { "version": [ 0, 4, - 0 + 1 ], - "commit": "758ea4b3945fa377ae33e45f8213280d38e0551d", - "sha256": "0qdxsfsambbrb3dbch4pyjm9k59cbjlzkx9075aipdi8nl0nvygf" + "commit": "11e16c36aaa14da777a068761055b57c49168f1e", + "sha256": "0hi2waz0bwzsq3sk6x7zdx7qn3dns82rphpnfd9r7cqyqjlmzy74" } }, { @@ -79555,8 +79805,8 @@ "repo": "mihaiolteanu/mugur", "unstable": { "version": [ - 20231024, - 755 + 20240517, + 504 ], "deps": [ "anaphora", @@ -79564,8 +79814,8 @@ "dash", "s" ], - "commit": "9d55e6eac893abfc0a2622d6ac2a791ce5b23fbb", - "sha256": "1571bxz6jjdpxdcmv3aisd87pwrr46z0pljql45n9lsvs01liyr3" + "commit": "7fe7f6a9dd80389fcd9754e9191192e697a88882", + "sha256": "010jns9id9gxggxgd2d3wpjag1nf8ahqmq57a3mdmfrr1lnvvxzi" }, "stable": { "version": [ @@ -81037,11 +81287,11 @@ "repo": "rainstormstudio/nerd-icons.el", "unstable": { "version": [ - 20240412, - 1831 + 20240520, + 1050 ], - "commit": "fb395120e9de33b276d16caaccaefd98d4340b92", - "sha256": "0iyjd18b3v730ixz5ayr72m4z8p6vv5m0nplpndl0s7a7ypdm9l9" + "commit": "5ed32f43f2e92ac2600d0ff823ec75e4476cc53e", + "sha256": "0x0zipfdm6w861kmw3jjjsc1jqxdw0ggpylvwxbgbspfngl83awj" }, "stable": { "version": [ @@ -81512,11 +81762,11 @@ "repo": "nickel-lang/nickel-mode", "unstable": { "version": [ - 20230707, - 1228 + 20240514, + 1236 ], - "commit": "8b7828892341bbca789723d487546905ca443dc3", - "sha256": "06327va6dybljw4qvz7p30qndnwl18nblai04y689p8x4a69kgxq" + "commit": "71441281e66500e978e10eb44d58e33a28f55b4e", + "sha256": "02rnh6fjvhn5jkridax4x4fmvv74hm1d183s5g8avpjzmyisgmyc" } }, { @@ -81682,10 +81932,10 @@ "version": [ 1, 12, - 0 + 1 ], - "commit": "65d0dfcbbea6b8ca7d8a3a0f673ecb522379e43c", - "sha256": "0jlqqbhmzhlwfhf1axdi3qm6gd1l66s66dw9cn83h9akgvpjf0vv" + "commit": "2daa09ba270b0a43e1929d29b073348aa985dfaa", + "sha256": "00033jmh30z2vjxs40hjfnn74inlfwzn412l26wi2nzg63wnwgj5" } }, { @@ -81840,20 +82090,20 @@ "repo": "nix-community/nix-ts-mode", "unstable": { "version": [ - 20231107, - 1639 + 20240514, + 1605 ], - "commit": "2dddc6e9ca33be211675afca3896fd661fc38a0c", - "sha256": "1a7l7r44v1ysz63k6dzn8sqbn90yaqp36crjzl3q56j8lx5f8rih" + "commit": "49d890e86a4597911366208930af6457ce1d46e7", + "sha256": "1s2kcm8rg35cl3vgbqny0ac2l00nqj5xdpll4z0is7zbhib74ll5" }, "stable": { "version": [ 0, 1, - 2 + 4 ], - "commit": "670023ec3d4e2f667a387a27990b4879e06ef60b", - "sha256": "0rwimbq6mp3z2xhhp535ysq44rcljc8swvaxsgfr5zvidpl2xh43" + "commit": "49d890e86a4597911366208930af6457ce1d46e7", + "sha256": "1s2kcm8rg35cl3vgbqny0ac2l00nqj5xdpll4z0is7zbhib74ll5" } }, { @@ -83020,10 +83270,10 @@ }, { "ename": "number", - "commit": "49d56b297ab729695249143dd65d3c67543cfcc6", - "sha256": "1nwcdv5ibirxx3sqadh6mnpj40ni3wna7wnjh343mx38dk2dzncf", + "commit": "a84d58f0dfdf5f58205fb79d6d52d00637f443aa", + "sha256": "1qf0v4s8jgpk2biqhscnxvn24hwh6pd1aw9k90jmgn7rd5nb979v", "fetcher": "github", - "repo": "chrisdone/number", + "repo": "emacsattic/number", "unstable": { "version": [ 20170901, @@ -83315,6 +83565,24 @@ } }, { + "ename": "ob-acl2", + "commit": "7055689bfc0c4cbacbb69d801cb30b12d5fd3f27", + "sha256": "1fwgry16y55xsz99pp5yxv1lbjfcpgp184kwsnm2k7bvvmnh4yqz", + "fetcher": "github", + "repo": "tani/ob-acl2", + "unstable": { + "version": [ + 20240505, + 1844 + ], + "deps": [ + "org" + ], + "commit": "db6b274de3cd16e17b5b525c94bf3ad9cc279970", + "sha256": "1995n8ha605sq60dml8m0lcrgv2gqbdhd8hihgrxs2wp18y7nhqx" + } + }, + { "ename": "ob-ada-spark", "commit": "4f04564c778f9d404f50381c895a75f22361dae3", "sha256": "0iyyhq8xvjs3a263xdmnba7gx8lzwgqbsqk64dcr2bcrpqiia9f8", @@ -84087,26 +84355,27 @@ "repo": "shg/ob-julia-vterm.el", "unstable": { "version": [ - 20230815, - 2332 + 20240514, + 328 ], "deps": [ "julia-vterm", "queue" ], - "commit": "22f8825185231654397ae31e2a586ec39f98ab6f", - "sha256": "1pvb602lrgrncbzqly9ga0rzxvlypysqzp2njf808jipdd9b2bja" + "commit": "e1aae4f54cd06f33c63a16d88df4856947f46201", + "sha256": "04hknkcqkfn5bfbxx9mx1naczjxnk1aalhyqvra6m7p1n832mvqm" }, "stable": { "version": [ 0, - 2 + 5 ], "deps": [ - "julia-vterm" + "julia-vterm", + "queue" ], - "commit": "5893d75cdb9e687b98b99b3675165f4edf0083a6", - "sha256": "12ya7dn7fd0szm6pi68f7h4cyb5cy56cfs43nl9f4v8v2qvlyh5y" + "commit": "e1aae4f54cd06f33c63a16d88df4856947f46201", + "sha256": "04hknkcqkfn5bfbxx9mx1naczjxnk1aalhyqvra6m7p1n832mvqm" } }, { @@ -85182,26 +85451,26 @@ "repo": "oer/oer-reveal", "unstable": { "version": [ - 20240414, - 1312 + 20240513, + 956 ], "deps": [ "org-re-reveal" ], - "commit": "4a8000a196e663be9fec61d0e6fed27814945086", - "sha256": "1rcydba1si626bqdh6j8537lnivyvr201dw7dmrxvkqpk9q6v1xy" + "commit": "08c44d4fd212a7433ad2f863299b5c1bdd87e23f", + "sha256": "19c7qx8lyiysm59fnlvzgj53phs8x0k36wwyvm845h42azrhha9k" }, "stable": { "version": [ 4, 24, - 3 + 7 ], "deps": [ "org-re-reveal" ], - "commit": "4a8000a196e663be9fec61d0e6fed27814945086", - "sha256": "1rcydba1si626bqdh6j8537lnivyvr201dw7dmrxvkqpk9q6v1xy" + "commit": "08c44d4fd212a7433ad2f863299b5c1bdd87e23f", + "sha256": "19c7qx8lyiysm59fnlvzgj53phs8x0k36wwyvm845h42azrhha9k" } }, { @@ -85252,16 +85521,16 @@ "repo": "tarsius/ol-notmuch", "unstable": { "version": [ - 20240415, - 1546 + 20240503, + 1711 ], "deps": [ "compat", "notmuch", "org" ], - "commit": "05f3fc9ea77d32892726c94cd7a876733890da91", - "sha256": "1jbwi4vpvcl7zzbx5rjmpmxp1mh1lxbprgxryqmj5mync0gx3a0k" + "commit": "f176ad73496ee086688ec5eeafcfff9372a833bc", + "sha256": "0gychpz53nhrrbs9w67400hbpyxp3q5jmhpj84fnqhnmf9q2dmnz" }, "stable": { "version": [ @@ -85358,11 +85627,11 @@ "repo": "rnkn/olivetti", "unstable": { "version": [ - 20231104, - 538 + 20240519, + 914 ], - "commit": "1f8b3d5cb155f7497083001037a09a972befab21", - "sha256": "1v5f0glp0ggmmzzhaxlijc58w4ip1nlik9lx7rcl6symsqcmqmq1" + "commit": "5a7bd951d6135ff7ee3b45086308c14abce0936f", + "sha256": "1hww0900rfvfj43bn86ybzyc745js1xabp2whqd6dxajiklynky1" }, "stable": { "version": [ @@ -85970,20 +86239,20 @@ "repo": "danielfleischer/opensub", "unstable": { "version": [ - 20240405, - 750 + 20240501, + 1946 ], - "commit": "2e3d55fd1ebc909caa81b06f3323d123ec557d03", - "sha256": "1bw3sp5i9zanrkgkwd69rc11ay3pmk5x42ifgyvg08ql7zlghxx2" + "commit": "22cc8ef1e119c3cc5f605ca5be4cf680745c503a", + "sha256": "1v7cn4j43xzdwgpn9103bv057n5pmd9yrdvciv3lwz85dqimlp9a" }, "stable": { "version": [ 0, - 2, + 3, 0 ], - "commit": "2e3d55fd1ebc909caa81b06f3323d123ec557d03", - "sha256": "1bw3sp5i9zanrkgkwd69rc11ay3pmk5x42ifgyvg08ql7zlghxx2" + "commit": "22cc8ef1e119c3cc5f605ca5be4cf680745c503a", + "sha256": "1v7cn4j43xzdwgpn9103bv057n5pmd9yrdvciv3lwz85dqimlp9a" } }, { @@ -86237,26 +86506,26 @@ "repo": "rksm/org-ai", "unstable": { "version": [ - 20240103, - 235 + 20240517, + 1114 ], "deps": [ "websocket" ], - "commit": "329bebaf90f013a54449806e6e65f2fab04cee1f", - "sha256": "104w41syib8dyysf4k551yrrw0s3cfn1w9dk9336zf2cz9n33svx" + "commit": "fdcff489ef11bbc4b54c87b34a97bcc02f3994d4", + "sha256": "1j6rr8kn10j9wxqwhs4yd9k4fzjf2rz545if23xwqlg6ca39l16x" }, "stable": { "version": [ 0, 4, - 3 + 7 ], "deps": [ "websocket" ], - "commit": "329bebaf90f013a54449806e6e65f2fab04cee1f", - "sha256": "104w41syib8dyysf4k551yrrw0s3cfn1w9dk9336zf2cz9n33svx" + "commit": "44e1298fd1b6ca9466f13ab6aadb08be6bde0b12", + "sha256": "0bag3ysg94l8dbvn7qnpyv2cd9f164aipmvkmxpvrgw4xl41lcqw" } }, { @@ -86629,6 +86898,29 @@ } }, { + "ename": "org-bookmarks", + "commit": "f5f6d68cdd49cea0f9baa7457a945df4ca530a8f", + "sha256": "1781jkbq16bxgjf86gnaprdpxrmzcqm6b2dc2nza7ycg300md7sg", + "fetcher": "git", + "url": "https://repo.or.cz/org-bookmarks.git", + "unstable": { + "version": [ + 20240520, + 16 + ], + "commit": "774b2cad8b77920e5ea2089d7dd11c8ccab4a471", + "sha256": "0z2703qjwbvivpqxqdxjb7rzv3yrcxvzksrpm768wdazvrk7gq9b" + }, + "stable": { + "version": [ + 1, + 1 + ], + "commit": "cdd57bf2aee9a26883312a2c5e48701e4b60802f", + "sha256": "04ydqa930b4xkk67i1ql59man08pc9y6l3nx3bpsi6va2djh0zjz" + } + }, + { "ename": "org-bookmarks-extractor", "commit": "75eb7d9f514db21c776f90ac856ea747b1060036", "sha256": "1bzwmqm23h8vsp3bskzwg9hzpvqbs4lznqs3wyn9zqxsv9h80fb5", @@ -87079,14 +87371,14 @@ "url": "https://repo.or.cz/org-contacts.git", "unstable": { "version": [ - 20240410, - 1128 + 20240521, + 1144 ], "deps": [ "org" ], - "commit": "0ff9a6dae6c1b67f0da0c63bc75b8c1063eac85d", - "sha256": "00ds6zyraf2nzj73mr3ncq2p9dn1b39cddqwj0fsglk3hlwg7d87" + "commit": "722bc2ec91ca66a33f6b57cd02010f4fdbf542a9", + "sha256": "0750kckr7qfwnz5c3vr0s0d4nnfx3dshpgj19wh9yijq92v6q6mf" } }, { @@ -88064,16 +88356,16 @@ "repo": "beacoder/org-ivy-search", "unstable": { "version": [ - 20231213, - 857 + 20240430, + 1713 ], "deps": [ "beacon", "ivy", "org" ], - "commit": "aeff31203c4c407d3f921124b6798ffd04772a11", - "sha256": "0rdbka4c0vfnpcvy1s08pk7qk4g9q651wlfhqqv5fmzm7gm9ylrq" + "commit": "2ec41a54f3849e783cfb16eddcfd310097ed6d5e", + "sha256": "08y2hzx5444cf16q44hyb53zna0yklp7jxjrj63cqvlyjgxx37pz" } }, { @@ -88227,30 +88519,29 @@ "repo": "gizmomogwai/org-kanban", "unstable": { "version": [ - 20220723, - 1216 + 20240430, + 944 ], "deps": [ "dash", - "org", "s" ], - "commit": "e78deb03880ae89d6bceae6563ef1383526233a1", - "sha256": "006y8glnd3h5nmcb0fdq650xnknhi5n74v7adk1maf26r8rpc6vy" + "commit": "e316be6a4f64c4869b911d2cbdc4673a0e398a5f", + "sha256": "10hczqx620vhf93y61rf4hliqpasrw3r12sxsh6z03x2zv6jhl0s" }, "stable": { "version": [ 0, 6, - 5 + 6 ], "deps": [ "dash", "org", "s" ], - "commit": "e78deb03880ae89d6bceae6563ef1383526233a1", - "sha256": "006y8glnd3h5nmcb0fdq650xnknhi5n74v7adk1maf26r8rpc6vy" + "commit": "83d5a657d4c190c62663c9b2357105002795b2e3", + "sha256": "1ma1grcwjfkps3chs1f0md33hkkl4bj7s9apws61anr2yfcj5j7k" } }, { @@ -88584,14 +88875,14 @@ "repo": "minad/org-modern", "unstable": { "version": [ - 20240428, - 741 + 20240515, + 1932 ], "deps": [ "compat" ], - "commit": "a06443c1d0251decada41a3bdca30f712cf9a96e", - "sha256": "18q7xab693ql68vlpxbn066pn7yshrmmqi6m0r2v4193mhlffflr" + "commit": "ea829ce4b3ac035808d411b1a088e0947d75f554", + "sha256": "1igv0ph5nk0b6bav5fndgl5jrnf20hml0vkx81ia1amhv7isbiax" }, "stable": { "version": [ @@ -88659,11 +88950,11 @@ "repo": "unhammer/org-mru-clock", "unstable": { "version": [ - 20230704, - 850 + 20240522, + 826 ], - "commit": "66fe744df9100efc4ec68089f7d0ce56a0d38b8b", - "sha256": "03xb95qxsr86xv3g0x36dlrm5sidd9fhnfxawjiqkj02bpp9by1n" + "commit": "198beb2089ea5e457dd13e8ac64d775eeff8fd89", + "sha256": "06v5hjbj3ikch68wnqqcf5h3ihjp5ki5p8z58ql5v5rl3yrgr5pq" }, "stable": { "version": [ @@ -88837,15 +89128,15 @@ "repo": "org-noter/org-noter", "unstable": { "version": [ - 20240207, - 2329 + 20240509, + 1756 ], "deps": [ "cl-lib", "org" ], - "commit": "9e4f57957b8f54db20a4e13bf8d6b32e004ab3e8", - "sha256": "13i6xq1rq2dz9c41h97c69fziqvvjjw8nzh45qc35fyc53zqdphl" + "commit": "68646b685a0d8c02419234922a9e2d885d6419df", + "sha256": "17kgy2b89cc0v3q49pgrp6x46f2908v6vscxg4pczf6zc83rmwzp" } }, { @@ -89469,15 +89760,15 @@ "repo": "oer/org-re-reveal", "unstable": { "version": [ - 20240421, - 716 + 20240430, + 1155 ], "deps": [ "htmlize", "org" ], - "commit": "81cf9dfd3be4480bbaa6d0b6452ea38e8d4e45c0", - "sha256": "1qbp198xg8pkd9zdvapq8bdsxilgqqync8m3r1csg8nz8lbpkk1b" + "commit": "ceb5420fd5200c3b4165ffc71360d5388dba7d29", + "sha256": "1ibdcjma6km680ckygd55plwjn5aagf1bfw1sa4374715k4r7722" }, "stable": { "version": [ @@ -89648,8 +89939,8 @@ "repo": "jkitchin/org-ref", "unstable": { "version": [ - 20240426, - 1644 + 20240509, + 1211 ], "deps": [ "avy", @@ -89665,8 +89956,8 @@ "request", "s" ], - "commit": "feaf7ea25cefaa347e6d593bf3a56064b92f16d6", - "sha256": "0ksyrc3wcbw965mpg6avd2qawksbz745lyqh15hlsmx70q0rvs02" + "commit": "e435bc60228b985806ea7ea0856ceef1e5262c83", + "sha256": "1d13p33aypa3jip4xs5lx6vsimv7xg0m766nm35xapbmjjfihjkv" }, "stable": { "version": [ @@ -89882,8 +90173,8 @@ "repo": "ahmed-shariff/org-roam-ql", "unstable": { "version": [ - 20240226, - 1311 + 20240503, + 1845 ], "deps": [ "magit-section", @@ -89892,13 +90183,13 @@ "s", "transient" ], - "commit": "2bd7c59ce1216b5d76e2a067be2f25807cd4d831", - "sha256": "05cjwqqsflw42mgz4ca1l73z35jwv3y1nlba4spwbsmp3p2nigls" + "commit": "f628fef081394f159f196f4350132aecb3edb8cc", + "sha256": "1ssxvy6y79f035whk9b8jg1vqsy6vymgq9yrzbxv06g5vsggvlh5" }, "stable": { "version": [ 0, - 1 + 2 ], "deps": [ "magit-section", @@ -89907,8 +90198,8 @@ "s", "transient" ], - "commit": "b45260649453779c87688f5dae4041a338c53744", - "sha256": "12bdadwwj69bbv676jb706ik9slp7rwb5mhrbsl0plmwq9mv6ii6" + "commit": "f628fef081394f159f196f4350132aecb3edb8cc", + "sha256": "1ssxvy6y79f035whk9b8jg1vqsy6vymgq9yrzbxv06g5vsggvlh5" } }, { @@ -89919,8 +90210,8 @@ "repo": "ahmed-shariff/org-roam-ql", "unstable": { "version": [ - 20230902, - 613 + 20240503, + 1845 ], "deps": [ "org-ql", @@ -89929,13 +90220,13 @@ "s", "transient" ], - "commit": "31b7de04430e2e989564cc58d82c2b92f2383ee4", - "sha256": "1wj6ark2a4lk2f95y6d7hf3m8calm98ws3mvdm6x459rnfmgx78a" + "commit": "f628fef081394f159f196f4350132aecb3edb8cc", + "sha256": "1ssxvy6y79f035whk9b8jg1vqsy6vymgq9yrzbxv06g5vsggvlh5" }, "stable": { "version": [ 0, - 1 + 2 ], "deps": [ "org-ql", @@ -89944,8 +90235,8 @@ "s", "transient" ], - "commit": "b45260649453779c87688f5dae4041a338c53744", - "sha256": "12bdadwwj69bbv676jb706ik9slp7rwb5mhrbsl0plmwq9mv6ii6" + "commit": "f628fef081394f159f196f4350132aecb3edb8cc", + "sha256": "1ssxvy6y79f035whk9b8jg1vqsy6vymgq9yrzbxv06g5vsggvlh5" } }, { @@ -89994,11 +90285,11 @@ "repo": "LionyxML/ros", "unstable": { "version": [ - 20220320, - 1705 + 20240512, + 452 ], - "commit": "70e0f33ee027ca1dce68351ad14a9e47a452fc17", - "sha256": "0qjfb2fllzkh1d0jprxdsvg6fcrrhc7wc2lg0kffp5vwmfv7m3db" + "commit": "50e16f5031d281458bd574f07aad16c0d1d18663", + "sha256": "0i84ik1rwmp77575vk6kq9cmv0cfh9iy43wcmcv5zgvyw57878kl" } }, { @@ -91205,6 +91496,40 @@ } }, { + "ename": "org-web-track", + "commit": "25771b652e4d2e73dfe3c50fec31c1f606855692", + "sha256": "0h44zagzkr1d857im39q6yn9pxcqc57kkkagn33smxp6xl0hv5gh", + "fetcher": "github", + "repo": "p-snow/org-web-track", + "unstable": { + "version": [ + 20240424, + 756 + ], + "deps": [ + "enlive", + "request" + ], + "commit": "92e97112aa63cbe14f7727b157eb3c11239bf86c", + "sha256": "1ni3l38zh2lzr2ri7vh6khp9c6fn4hafgc6234y707ysniz9dryx" + }, + "stable": { + "version": [ + 0, + 0, + 1 + ], + "deps": [ + "enlive", + "org", + "org-agenda", + "request" + ], + "commit": "dab6a42982ad290564b09d2c1c3dbe3c63295964", + "sha256": "1v6zj6hkhn5xjq318vs5yhsdg6mgaw4qjd9fgi2fps7ry79drzf3" + } + }, + { "ename": "org-wild-notifier", "commit": "114552a24f73f13b253e3db4885039b680f6ef33", "sha256": "1lmpa614jnkpmfg3m1d2wjn9w0zig3gwd02n3dyjn23n71fiyhkp", @@ -91763,11 +92088,11 @@ "repo": "Artawower/orgnote.el", "unstable": { "version": [ - 20231211, - 2104 + 20240516, + 1842 ], - "commit": "0919f9fd05b83870b8a7073eb94f77199e681241", - "sha256": "1p23qas9kdycp0l634a74a6h039ccg6f6maqqdi49kp9mwlsd1p9" + "commit": "0b6ab72bede2fa757758016ae69db2cc8332fa2d", + "sha256": "0g05x2ns54c4vyx1rxspi8x7b1q5z8cib4k7qlm5wnbblccmbvk3" }, "stable": { "version": [ @@ -93783,14 +94108,14 @@ "repo": "purcell/package-lint", "unstable": { "version": [ - 20240330, - 1458 + 20240507, + 1722 ], "deps": [ "let-alist" ], - "commit": "17e4ab20dd3e36fa540007b4f4047170c23bdb10", - "sha256": "1xr7sq7pvvdw9prf2vds048s5s7fq1s0cxs21sxdc54sszy17nsg" + "commit": "cb8b0ddaa14cafe9e4ab9a81b2ad47319fd54f27", + "sha256": "0rq1205jnm6rf1zgsccfbf649qdzrlf8rh21qszwb367q9vawfm9" }, "stable": { "version": [ @@ -94495,20 +94820,26 @@ "repo": "justinbarclay/parinfer-rust-mode", "unstable": { "version": [ - 20240419, - 415 + 20240506, + 816 ], - "commit": "823188f3d8d1f00693c3d1d754e58ad95ad0a8dd", - "sha256": "0cfn4na6xrapc096yyqs0kw8ni7ls49fds9k92ahlr67919m437v" + "deps": [ + "track-changes" + ], + "commit": "d3bfb2745cc0858e2741dc2a2f00a86f456656ec", + "sha256": "0q60hj9300wiz1kr5x1r3zqhfk97ndyzj2ks49y1r5klmp9w5l9a" }, "stable": { "version": [ 0, - 8, - 6 + 9, + 0 + ], + "deps": [ + "track-changes" ], - "commit": "39f588e3f58ef1a8a301c031f831b8f74fbb3ec1", - "sha256": "1pr4dqzawgqid2aws31zxnlf3363bgnj7djav324b5q2xic5qfy7" + "commit": "d3bfb2745cc0858e2741dc2a2f00a86f456656ec", + "sha256": "0q60hj9300wiz1kr5x1r3zqhfk97ndyzj2ks49y1r5klmp9w5l9a" } }, { @@ -95395,15 +95726,15 @@ "repo": "vedang/pdf-tools", "unstable": { "version": [ - 20240411, - 1703 + 20240429, + 407 ], "deps": [ "let-alist", "tablist" ], - "commit": "94e9f20a78f64a83daf641891923681a52d03919", - "sha256": "0gz20v97aaf7mny029xwypnagy6cm20hh4slcsfhcd0s9dvdqfsl" + "commit": "30b50544e55b8dbf683c2d932d5c33ac73323a16", + "sha256": "1ci9g8aj77a34pgp21d768pglfw1h0dcw68d61xxlzwrrclzfhgx" }, "stable": { "version": [ @@ -95427,15 +95758,15 @@ "repo": "kimim/pdf-view-pagemark", "unstable": { "version": [ - 20230901, - 2245 + 20240518, + 626 ], "deps": [ "pdf-tools", "posframe" ], - "commit": "5a044bead5855c5fd46a691fee01dc931c959cab", - "sha256": "1miwmnrijkmzjrfnigag3dvyp68h8d2516zp1xsp368n392y1gc2" + "commit": "a746cf8b86d030ebfc61bb2ff10c0e16b5d195c6", + "sha256": "12srnrkscf840g447mdc487ds061rhwv26rd2w9mj57mgxndqxzm" } }, { @@ -95623,11 +95954,11 @@ "repo": "mpwang/perfect-margin", "unstable": { "version": [ - 20240111, - 1158 + 20240512, + 1120 ], - "commit": "bd15823219c93261536966b4dc65c1ae45a404cf", - "sha256": "1z1f9fkzaryqfrgszjd2s16xi2s9mlzdpl9nsb7c049n8xh0611i" + "commit": "d2973b0dc44b086353a2920a66fec0fcc1b3b60a", + "sha256": "15m60851pzfm4kiql0w1l7h8y5cyhcxmfzan86wswcxhssyi7673" } }, { @@ -96083,19 +96414,25 @@ "repo": "emarsden/pg-el", "unstable": { "version": [ - 20240414, - 1912 + 20240520, + 1322 ], - "commit": "4b71a337fedf16678e546fa8d1df0ea496762f40", - "sha256": "0m1pcabz5mxxxsk0ixw8388q9fkbydkj64mnzn371a9jxdl16b0v" + "deps": [ + "peg" + ], + "commit": "0f20a0051ab898ea53903284c47a4703555380ca", + "sha256": "0ynv154yhb878aqcjg1fv7zfvfrp839n8ys4wqp7gqhdqdwrf68h" }, "stable": { "version": [ 0, - 32 + 34 ], - "commit": "4b71a337fedf16678e546fa8d1df0ea496762f40", - "sha256": "0m1pcabz5mxxxsk0ixw8388q9fkbydkj64mnzn371a9jxdl16b0v" + "deps": [ + "peg" + ], + "commit": "0f20a0051ab898ea53903284c47a4703555380ca", + "sha256": "0ynv154yhb878aqcjg1fv7zfvfrp839n8ys4wqp7gqhdqdwrf68h" } }, { @@ -97260,6 +97597,30 @@ } }, { + "ename": "pkl-mode", + "commit": "0380195d1ed91de7aad8b1d0620d978eac43e47f", + "sha256": "1ffm7p4y353wpfv62zj9rc8n0qgcivm0nivn9qsn138af32hkhh2", + "fetcher": "github", + "repo": "sin-ack/pkl-mode", + "unstable": { + "version": [ + 20240422, + 1529 + ], + "commit": "c57fe374a9c57eee6432d0b449e410ab8dc40a89", + "sha256": "0wmaydx4lvanqr27i1bs4lxhxviyvwf9fzih8hra1qm21n54bw11" + }, + "stable": { + "version": [ + 1, + 0, + 3 + ], + "commit": "c57fe374a9c57eee6432d0b449e410ab8dc40a89", + "sha256": "0wmaydx4lvanqr27i1bs4lxhxviyvwf9fzih8hra1qm21n54bw11" + } + }, + { "ename": "plain-org-wiki", "commit": "6b515386c3969b8d79e14b506bc0d9e1ec3097c4", "sha256": "0m0mm0ki92561axm89mwc6vcx9rwdb7ai9hlvgnhf40k94s97lz6", @@ -98045,32 +98406,34 @@ "repo": "mavit/poly-ansible", "unstable": { "version": [ - 20240418, - 1123 + 20240520, + 1500 ], "deps": [ "ansible", "ansible-doc", "jinja2-mode", - "polymode" + "polymode", + "yaml-mode" ], - "commit": "5c4423671c051db26a48de72773abdf2395bb6aa", - "sha256": "0fmbxhn8cbfdad37m1jssm1jblia0b4fzdv89lrz0k5wqyzlkz4g" + "commit": "187ad18b7c03eb2b286b4d49eb36572bb7847d57", + "sha256": "0980z444419pk7xgic6g5vvi30yibxfimd0rp0zznrshmc9xxra8" }, "stable": { "version": [ 0, 4, - 0 + 1 ], "deps": [ "ansible", "ansible-doc", "jinja2-mode", - "polymode" + "polymode", + "yaml-mode" ], - "commit": "5c4423671c051db26a48de72773abdf2395bb6aa", - "sha256": "0fmbxhn8cbfdad37m1jssm1jblia0b4fzdv89lrz0k5wqyzlkz4g" + "commit": "187ad18b7c03eb2b286b4d49eb36572bb7847d57", + "sha256": "0980z444419pk7xgic6g5vvi30yibxfimd0rp0zznrshmc9xxra8" } }, { @@ -98826,11 +99189,11 @@ "repo": "tumashu/posframe", "unstable": { "version": [ - 20240426, - 604 + 20240507, + 148 ], - "commit": "468ac1ab50d7e0feae2c06f12596bbc169f2abe4", - "sha256": "10q76iggl3hpdhwzm48kadn129i2567fjnpxid8kxmqffk712k8y" + "commit": "f4e9e509ba96ceb3c2b2b054957291607fb52651", + "sha256": "0hz7jgpsg3adgwg2qqgd9vy1mhbkr3c9rsy0zx5kmn42npdcf4az" }, "stable": { "version": [ @@ -99820,6 +100183,30 @@ } }, { + "ename": "project-butler", + "commit": "bb78b814f378e58997f2032fc79a41dfb1442a2c", + "sha256": "0jdk3fax67f1prly0g8s3kb4fg1hjqyjcajhalzg1x2cxvwwbz70", + "fetcher": "codeberg", + "repo": "jabbo/project-butler", + "unstable": { + "version": [ + 20240520, + 943 + ], + "commit": "1cf28f5e5e584bac2411662405c96f13d43179f9", + "sha256": "129m9mhpfsghk5gwvqjn7zblncj3wd2n3b46mcj0j20qqbkmbblr" + }, + "stable": { + "version": [ + 0, + 3, + 0 + ], + "commit": "1cf28f5e5e584bac2411662405c96f13d43179f9", + "sha256": "129m9mhpfsghk5gwvqjn7zblncj3wd2n3b46mcj0j20qqbkmbblr" + } + }, + { "ename": "project-explorer", "commit": "c2e5d686b8a18c7a17965ff6c5af8f5817b7ab31", "sha256": "076lzmyi1n7yrgdgyh9qinq271qk6k64x0msbzarihr3p4psrn8m", @@ -100291,8 +100678,8 @@ "repo": "mohkale/projection", "unstable": { "version": [ - 20240421, - 1410 + 20240517, + 2023 ], "deps": [ "compat", @@ -100300,8 +100687,8 @@ "project", "s" ], - "commit": "d0aa74fbe08d7e28b95a0d2006399565f51655ef", - "sha256": "1j02vy7s10c8ddhfclj66xfnk34rb5paf2hzjm9lnpn4krif64wm" + "commit": "c6df3b19204113642ee14a87598d65c03688f0fa", + "sha256": "1f78nq135waqgkr5z9m5gxhplb2spbkap0diykb6h9j8l6g8xij7" } }, { @@ -100331,15 +100718,15 @@ "repo": "mohkale/projection", "unstable": { "version": [ - 20240316, - 2222 + 20240517, + 2021 ], "deps": [ "compile-multi", "projection" ], - "commit": "dc489480a6e4be82e570266202144730b3ddde5f", - "sha256": "198jlknm3za6n1wp1ns5vbw5554xfrdqdaayhrgqr3f8cil2y0vh" + "commit": "68f2387219f2627506f5e345e9be04bd11aa0e65", + "sha256": "0785a47xirwk7q2159gmlibg3rkl54z211xykr0bld2jj73g0jyc" } }, { @@ -100525,11 +100912,11 @@ "repo": "ProofGeneral/PG", "unstable": { "version": [ - 20240425, - 939 + 20240513, + 720 ], - "commit": "6cace58d0d632c4eafa18959319a484fb5c07238", - "sha256": "128ixkmfjs4g83r00fvj7wp0azgmmabkhhhv8mqqm7zbj9rii611" + "commit": "55e133360c1b66b834f9ae2c4478d2c81b2d33ef", + "sha256": "00r3zyrc08j5a5np0xc6jkzvlpjxnax7dg2br8h85hk3fml2gihf" }, "stable": { "version": [ @@ -100810,15 +101197,15 @@ "repo": "thierryvolpiatto/psession", "unstable": { "version": [ - 20231117, - 1648 + 20240515, + 1449 ], "deps": [ "async", "cl-lib" ], - "commit": "5fdca68ca4bf4fafaf3aa438401ec611bc430782", - "sha256": "1696cqk9p06n9b8jqn37qb5y15slvfljsp5yxvahmscfcfnjfqs3" + "commit": "5a5b11df882339b4474ab0cc6dd847aaab6a84b6", + "sha256": "1cgx1k9vgq8avpjr1ig87wf6mv042504bf770x46dba3zswwy98z" }, "stable": { "version": [ @@ -101650,28 +102037,28 @@ "repo": "tumashu/pyim", "unstable": { "version": [ - 20230908, - 39 + 20240508, + 256 ], "deps": [ "async", "xr" ], - "commit": "64067b20ce0e964b1342b378180f24a1d4503797", - "sha256": "0fggdwxrvnc8aqyp9zibzs53sdhqhamkv55chf8qklqcg19ghn6a" + "commit": "f22c20f2e6af55b3a758defabe4c842fb94cde2b", + "sha256": "0bnlz5bja6gg619sldlwqzdy1pccmcsxkk4g91njp7d8670xc241" }, "stable": { "version": [ 5, 3, - 3 + 4 ], "deps": [ "async", "xr" ], - "commit": "64067b20ce0e964b1342b378180f24a1d4503797", - "sha256": "0fggdwxrvnc8aqyp9zibzs53sdhqhamkv55chf8qklqcg19ghn6a" + "commit": "f22c20f2e6af55b3a758defabe4c842fb94cde2b", + "sha256": "0bnlz5bja6gg619sldlwqzdy1pccmcsxkk4g91njp7d8670xc241" } }, { @@ -101965,15 +102352,15 @@ "repo": "wbolster/emacs-python-black", "unstable": { "version": [ - 20230313, - 1037 + 20240520, + 729 ], "deps": [ "dash", "reformatter" ], - "commit": "0714b0007c0b620f88ed9cc91035caea43f3d75f", - "sha256": "17jaw7pcgb27sq1aklq0hqb827152vvmbxdxrrgwsfag6ccw75pr" + "commit": "4da1519345b3d5c513d82ef0d39536dd9c626d42", + "sha256": "0haxkpjggf91ahy6zl4qzpv7l9chi9yd0c0a054y3kjpvn64axqd" }, "stable": { "version": [ @@ -102012,16 +102399,16 @@ "repo": "wbolster/emacs-python-coverage", "unstable": { "version": [ - 20211224, - 1420 + 20240509, + 856 ], "deps": [ "dash", "s", "xml+" ], - "commit": "a341615af03dbe3ce0ac9b63cf43dc01c1ae5ebe", - "sha256": "1k5air9sgg95jl949lwf9hz8i4ivy646mnm4pc37wsxkh4g46wqh" + "commit": "7f130066460ab8a58c2667d9f76a3e2c168e0759", + "sha256": "0dxc09422nqpwdcvh90j41631198dxsxc6np1hhs5m6qf3fjsx1m" } }, { @@ -102175,11 +102562,11 @@ "repo": "python-mode-devs/python-mode", "unstable": { "version": [ - 20231218, - 645 + 20240520, + 1744 ], - "commit": "9678f77d0d0ab3d672374c4457b5a02ce49cd206", - "sha256": "10k1n6pmhy7ia60h1i2c4mzavlam8hqymq22w6r372pasfdp0x89" + "commit": "5279a81ecaa9fc535915c58336c96baf3f2aa8b1", + "sha256": "0vhi7rlpd696244xl2kvlmqkq94cqwrhd6cvg8hfz6b4v1bbdf4r" }, "stable": { "version": [ @@ -102902,11 +103289,11 @@ "repo": "greghendershott/racket-mode", "unstable": { "version": [ - 20240418, - 1446 + 20240514, + 1524 ], - "commit": "d5f4007fd2c2604673125035f4852dce1b639b33", - "sha256": "0di1xb89i6r9lxc86ny53f7w7pqqd0r21qrf663jkjxlakhbwjzk" + "commit": "d2cff2b7f210846108875c7eccb1b5ab98bceb74", + "sha256": "0gxjm594k1i0xiavmk27z9mv9qh5q4k5h3ih198pm637k31ziviy" } }, { @@ -103132,11 +103519,11 @@ "repo": "Raku/raku-mode", "unstable": { "version": [ - 20210927, - 1227 + 20240429, + 1007 ], - "commit": "4ee9045eeb90f7831d7c0ee2e4adfcd957f712be", - "sha256": "0z8yclpb67x0k7x4ai13wvpc6w6s9z6kkib6a1lm4jpp4gyyraqw" + "commit": "14f9b9bba08c0bbb7f3895380d0b1a9feb7a168d", + "sha256": "03r858crkxfp2nswsk81ajr8ynqm501a3l6qmbmlk57pb1p2a1py" }, "stable": { "version": [ @@ -103195,11 +103582,11 @@ "repo": "kakakaya/random-splash-image", "unstable": { "version": [ - 20151003, - 130 + 20240501, + 1550 ], - "commit": "907e2db5ceff781ac7f4dbdd65fe71736c36aa22", - "sha256": "1z25xmz8pl3rsfahw6ay8wx5wbnlxabnzr2dq20m0i5jyci8lqll" + "commit": "05a5cdb8315577536de5e425f6ef6cbb994c6282", + "sha256": "1kjkgg577v2ddwkh3zvghyw8zr7lkzg51qiwdzf722p5ml5afnf4" } }, { @@ -105297,26 +105684,26 @@ "repo": "swflint/retraction-viewer", "unstable": { "version": [ - 20240419, - 1316 + 20240509, + 1440 ], "deps": [ "plz" ], - "commit": "280fbb60c44a184e0060640966ad9ddc80602e21", - "sha256": "0a9zrlhb943ni4bqc9ma8f2wx0y7vp51jmmf8b0kgy82yx8m6blq" + "commit": "e8ab96e5a95a93849b912e2684b9776c685ac4bd", + "sha256": "10kyj2jjykbzi2afyqg57w1pkf310155zjb3hzl6nm6h844gnhji" }, "stable": { "version": [ 1, 0, - 4 + 6 ], "deps": [ "plz" ], - "commit": "87efb813a0dd3b320299d771779e68efe4344cf0", - "sha256": "0kmhmak47c9ffi0wc21k1qrq8gxgdzv064s38vzfw67781d6mi8a" + "commit": "e8ab96e5a95a93849b912e2684b9776c685ac4bd", + "sha256": "10kyj2jjykbzi2afyqg57w1pkf310155zjb3hzl6nm6h844gnhji" } }, { @@ -105327,28 +105714,28 @@ "repo": "swflint/retraction-viewer", "unstable": { "version": [ - 20240419, - 837 + 20240509, + 1440 ], "deps": [ "retraction-viewer", "universal-sidecar" ], - "commit": "87efb813a0dd3b320299d771779e68efe4344cf0", - "sha256": "0kmhmak47c9ffi0wc21k1qrq8gxgdzv064s38vzfw67781d6mi8a" + "commit": "e8ab96e5a95a93849b912e2684b9776c685ac4bd", + "sha256": "10kyj2jjykbzi2afyqg57w1pkf310155zjb3hzl6nm6h844gnhji" }, "stable": { "version": [ 1, 0, - 4 + 6 ], "deps": [ "retraction-viewer", "universal-sidecar" ], - "commit": "87efb813a0dd3b320299d771779e68efe4344cf0", - "sha256": "0kmhmak47c9ffi0wc21k1qrq8gxgdzv064s38vzfw67781d6mi8a" + "commit": "e8ab96e5a95a93849b912e2684b9776c685ac4bd", + "sha256": "10kyj2jjykbzi2afyqg57w1pkf310155zjb3hzl6nm6h844gnhji" } }, { @@ -105751,6 +106138,21 @@ } }, { + "ename": "ride-mode", + "commit": "07536aeb9581da1ffbe25cc4e7d6d5d056062cf7", + "sha256": "0yhqg5qnkl4rz2b524md7z8x5b80ck2mgcdhwh5dr5wfqc72sbnl", + "fetcher": "github", + "repo": "deadblackclover/ride-mode", + "unstable": { + "version": [ + 20240511, + 1623 + ], + "commit": "b693e5c33090530d2ea9d792fa148ea983f8607f", + "sha256": "1iwb941ld1rfshdq11km561xr75a3n63cw70h6x8wyb6iqdwbwk3" + } + }, + { "ename": "right-click-context", "commit": "f6963fc11d697b95ebbdaf7fe27c91a6229d08b6", "sha256": "189nkxkc7lr2fm5qgmylmz6xv6mpphslj4fgpmr8ynnx9z3nxms2", @@ -106052,11 +106454,11 @@ "repo": "jgkamat/rmsbolt", "unstable": { "version": [ - 20240301, - 1749 + 20240507, + 47 ], - "commit": "1aeeadf7114316b9949e3c212a883ca95c3ddab0", - "sha256": "01nhxmildizza26vkf20qvmhh7n5g1sl7vyn7i1dwpi74334in64" + "commit": "32604147643dbfebe499ea8a4b139cc68acd2746", + "sha256": "07l5c1apdck8a73z4mh3r7jpwz1c97p4i6qz1lg5ygmr1wnhpncy" } }, { @@ -106067,14 +106469,14 @@ "repo": "dgutov/robe", "unstable": { "version": [ - 20240327, - 308 + 20240509, + 155 ], "deps": [ "inf-ruby" ], - "commit": "e8c86ee553589ff03418102426420b5049d4a044", - "sha256": "070r79mdydhv6l7mia7xshzmp0jgvkfjvnpgg361m5xs92mprxfr" + "commit": "6bc8a07fc483407971de0966d367a11006b3ab80", + "sha256": "144cdg0wp53g4rsmr5ps4r9fhqr686qvikf2pcyi0idyx7dcsaij" }, "stable": { "version": [ @@ -107055,11 +107457,11 @@ "repo": "rust-lang/rust-mode", "unstable": { "version": [ - 20240415, - 936 + 20240520, + 749 ], - "commit": "e54bbae8c4c2af580b5721ad5ac151f2ad19293e", - "sha256": "1vzgyizvn3p7f1p8awnlm4n2fh7b6j3cs636zyqpqck32x4pdqda" + "commit": "d00d83d3a207a5b7c2994392b2781f627e3159ce", + "sha256": "08b4aj8achz3rl311m5p98sdgnh96ggfmia4qp2l147vd1a23r93" }, "stable": { "version": [ @@ -107308,16 +107710,16 @@ "repo": "sagemath/sage-shell-mode", "unstable": { "version": [ - 20231013, - 1408 + 20240504, + 726 ], "deps": [ "cl-lib", "deferred", "let-alist" ], - "commit": "2f069323cb722c608405a3621d8185f4b7130fc3", - "sha256": "16mchj8glijkn1ycqzgkc424ij1gxa9qp6dhkhgrskqcyjgxxaly" + "commit": "4291700e981a2105d55fa56382ba25046d3d268d", + "sha256": "1dch7cwwslffgnzp1djlhz6a792ci42p4bvazxd9lqzhzal0rsbb" }, "stable": { "version": [ @@ -107684,14 +108086,14 @@ "repo": "openscad/emacs-scad-mode", "unstable": { "version": [ - 20240224, - 1251 + 20240429, + 1628 ], "deps": [ "compat" ], - "commit": "1bae3dab16adf1f0d47befcc6d2b63a50af87231", - "sha256": "137kn3ilbl6gnq6jc21mzhlc7vyy9nvr3qf0p6f1hmdixm2cbyr7" + "commit": "8b830727c343bf762d9469b413f0c2a4c1996fe2", + "sha256": "07rk69b0sbcwh4mjpapzv93awwl4w5n0q73915rrxifqf6n3bjsp" }, "stable": { "version": [ @@ -107748,6 +108150,21 @@ } }, { + "ename": "scala-repl", + "commit": "68a9875d9551ef6003f8ed853489b164cf1e71b5", + "sha256": "0cdw913dsvyzflhbijy0n1rwh5hq3ghfcinmpkn6i3y2j5dk4agh", + "fetcher": "github", + "repo": "sheepduke/scala-repl.el", + "unstable": { + "version": [ + 20240427, + 1456 + ], + "commit": "679bdf663e0b32a5a285d6f98daa2e3d5de60289", + "sha256": "1qvx7p58fr2v0vpxarliacw97dlw839av4n8chn3g18cw34k7ir0" + } + }, + { "ename": "scala-ts-mode", "commit": "0dce6a06d842251ca42c515bcdd5c8e4b63424b6", "sha256": "0x3ip9x72jbn56ddvjxd0qggq5bcp1bdvyy36nx51czlvz8vw4gf", @@ -108035,14 +108452,11 @@ "repo": "zk-phi/scratch-palette", "unstable": { "version": [ - 20210306, - 427 - ], - "deps": [ - "popwin" + 20240516, + 1817 ], - "commit": "e4642ed8a2b744ba48a8e11ca83861f8e4b9c5b3", - "sha256": "1cvcsj6ayhfwdpp2mb75ja8bif33z085dip76bvyqliwjnjl2sgn" + "commit": "6b344af6b33b6b0bfd08e213dd0d43b714f7a5e9", + "sha256": "0a09lxfj49m1x894byqb6bgcbckiasaxka5r6g2n4rmk7hpj1rmq" } }, { @@ -108468,11 +108882,11 @@ "repo": "erjoalgo/selcand", "unstable": { "version": [ - 20230628, - 733 + 20240430, + 1408 ], - "commit": "b6fc231a784df570df0f817d34f926f141a65126", - "sha256": "1hh0y9qy19kvq29z5zrjpk2lll2iydl16dhl88kapfprmv9mrli2" + "commit": "6baa1771eacbcfe7ec854362bed17baea865424e", + "sha256": "0df2h0ahzp6zqvg104dp8cq3nc6q7wg0v4v7mac0mpibgd35j0qq" }, "stable": { "version": [ @@ -109956,14 +110370,14 @@ "repo": "xuchunyang/shr-tag-pre-highlight.el", "unstable": { "version": [ - 20200626, - 1047 + 20240515, + 1420 ], "deps": [ "language-detection" ], - "commit": "931c447bc0d6c134ddc9657c664eeee33afbc54d", - "sha256": "09gcprqhl1ds4k407rlsjqr9y56a9wvjkli70wrf2l7w3dcm4qq0" + "commit": "af8ae8d558d1e26d276130c100e02746278ce037", + "sha256": "1ncmgziclhj3694kzq6qwsrafzcpn6a5r6fwbcjnjk6z9dahisq8" }, "stable": { "version": [ @@ -110110,14 +110524,14 @@ "repo": "cask/shut-up", "unstable": { "version": [ - 20210403, - 1249 + 20240429, + 605 ], "deps": [ "cl-lib" ], - "commit": "ff6f06f3b080ee833a25a22da8cb5b96e911dc77", - "sha256": "1kghm1vwy38k9l4a4jjabhqi49v4p27abk82q6yfpm304ygw816v" + "commit": "ed62a7fefdf04c81346061016f1bc69ca045aaf6", + "sha256": "1wrxdkgsr7rrz0h6kl6a68r1f1nn098p1cmg4693yaam5pl8lscf" }, "stable": { "version": [ @@ -110140,11 +110554,11 @@ "repo": "riscy/shx-for-emacs", "unstable": { "version": [ - 20221224, - 2230 + 20240512, + 1515 ], - "commit": "b99d16f36bc278d668d8428c4bc9af77064c336a", - "sha256": "1wkqnc5n8if8fsh7f3bdr5nzn6dbj1nzdxlmnz8nflmx4g32fp6v" + "commit": "ae32d2f6917e16c8feb8b7372267449179abd608", + "sha256": "1gkfh5zhcxi9xwffc8ydbn6879h20ddfwvk6279dysg15gasb551" }, "stable": { "version": [ @@ -110263,14 +110677,14 @@ "repo": "emacs-sideline/sideline", "unstable": { "version": [ - 20240404, - 900 + 20240521, + 31 ], "deps": [ "ht" ], - "commit": "c1729b2b9d2ca6b37bf605ca2271e570f30316f0", - "sha256": "0ck92g14fhhi1xg76na8ck8ivv5wx5igh898wzr5p6qx92mv5hf7" + "commit": "31ef3c21d99785e7a066ad8c188ddcd2b478b5fe", + "sha256": "17qflpmc7kwn0cikysardxda25wanmax55hc6ifwgcp330wp4742" }, "stable": { "version": [ @@ -110322,16 +110736,16 @@ "repo": "emacs-sideline/sideline-flycheck", "unstable": { "version": [ - 20240402, - 2255 + 20240509, + 742 ], "deps": [ "flycheck", "ht", "sideline" ], - "commit": "212b8193becc012d39ccb1e68abf0e19f68764f4", - "sha256": "0g6i9ql35w9p3k941g2n9rj0md7j1snr6dpm9y4sid8fbyxvs1f2" + "commit": "f809e627e433bd9a58471e4dea1ed50305eef7f2", + "sha256": "0z0152cnkb8bwc3j0gi1zyasvwxc7anlrj2qr0zj6pbxyl61k5m3" }, "stable": { "version": [ @@ -110355,14 +110769,14 @@ "repo": "emacs-sideline/sideline-flymake", "unstable": { "version": [ - 20240309, - 1112 + 20240509, + 742 ], "deps": [ "sideline" ], - "commit": "e6a9ae69fc048f8eaacbf653e7136678dbef4597", - "sha256": "08mng3wqlrflnywiy8m29psk9sks32niy3xgzxrawkkidfv79m9p" + "commit": "06e84875022a5645ece8f4c2c8b56aa5f003c65d", + "sha256": "10gk7l93c13z8mpvd598x06bhv8zz21157madxdw1f7jarkssqh7" }, "stable": { "version": [ @@ -110854,8 +111268,8 @@ "repo": "magit/sisyphus", "unstable": { "version": [ - 20240415, - 1548 + 20240506, + 1558 ], "deps": [ "compat", @@ -110863,8 +111277,8 @@ "llama", "magit" ], - "commit": "38285f880302b9a2363085d816d6cd660ff7d17d", - "sha256": "0vkyfc9rbc22x7a7qy8i3w97a8p65qvjz5jxiqbh2vldp57hx5f7" + "commit": "db9b36065faf149fef214248bdba1d90492cd2e9", + "sha256": "0czzvnchviwszgdpq1s3j2m9881a7dxh7hdd7hg7ay9ab18j0f1i" }, "stable": { "version": [ @@ -111155,11 +111569,11 @@ "repo": "slim-template/emacs-slim", "unstable": { "version": [ - 20170728, - 1348 + 20240513, + 2118 ], - "commit": "3636d18ab1c8b316eea71c4732eb44743e2ded87", - "sha256": "1sqylm6ipmlh9249mmwfb16b4pv94cvzdwvi3zakdpz713phyjw5" + "commit": "8c92169817f2fa59255f547f0a9fb4fbb8309db9", + "sha256": "051clmalyyvbqq2gj1b69mymx34c46wsk02k6izp6igfnjf4isjv" }, "stable": { "version": [ @@ -111178,14 +111592,14 @@ "repo": "slime/slime", "unstable": { "version": [ - 20240427, - 406 + 20240516, + 319 ], "deps": [ "macrostep" ], - "commit": "c2e45e7004743fdd8620e2fea67f30a17b6a558a", - "sha256": "1f8i31b2b21v5r0awahhjqn499agalqnzy8lyp3wj91r0pbsqn1f" + "commit": "5ced74ab35d91f6be7d8fa10e1098aaae6b749e3", + "sha256": "0bq0vi22mr43l64q501hkv11sp58bmn8hgxmc61if0xc1rlcs68v" }, "stable": { "version": [ @@ -111433,11 +111847,11 @@ "repo": "joaotavora/sly", "unstable": { "version": [ - 20240413, - 2145 + 20240501, + 1118 ], - "commit": "0ebe705c08af7126e0b2ce66a33fc7d23864b193", - "sha256": "1a7xi627dqm9zvhj5ky50h7z4nkcr54xal05mgq8hf9r0c8xba9g" + "commit": "ba40c8f054ec3b7040a6c36a1ef3e9596b936421", + "sha256": "0qhnn09pinrdjbkgl89xhgbrji2gagq05rrknklybklyvik851l6" }, "stable": { "version": [ @@ -113599,11 +114013,11 @@ "repo": "condy0919/spdx.el", "unstable": { "version": [ - 20240425, - 103 + 20240522, + 104 ], - "commit": "28801aa911d43bb0b2545f83781a3c629266fd72", - "sha256": "15a26n645snjr92vp46pyv1pbkskb8arvvfb6hi8sy8m4vxc1bm3" + "commit": "448e0e5e491e2447da2590ff216675e083d910ff", + "sha256": "160h11025fkxg734ri944l2jndfpmg9mlar0jy8aqk3bys3mc85i" } }, { @@ -113641,11 +114055,11 @@ "repo": "brailcom/speechd-el", "unstable": { "version": [ - 20240427, - 2112 + 20240513, + 1716 ], - "commit": "64218c59f1636af6a0cb3690bf0bedae1dd17442", - "sha256": "1m7bfbk1iwdqa9dnf1b0isbl7pj3msxx4j6grr4d4pzb4hqphbfl" + "commit": "ac7497e394bf7d46e0b2c27570f5507f6a50a157", + "sha256": "1y8r75sl28kll8r6qzqnbri18j2kgvqfh73yi9kszld5zz8d95mp" } }, { @@ -114365,11 +114779,11 @@ "repo": "srfi-explorations/emacs-srfi", "unstable": { "version": [ - 20240425, - 1823 + 20240507, + 58 ], - "commit": "75b5b3e9b49bb450c1245ba7d7627ecb27baa53d", - "sha256": "0xaa2wa8p3606gclw2myj57sglii150dq9w26qisvhxym3i97r4k" + "commit": "7d3584b0b887a3bedebe5fd829fa7623c1d730fc", + "sha256": "13652cn287d17jfvj37a14iy3awisibmrm7dglivm8hcjlkaj9fg" }, "stable": { "version": [ @@ -114837,20 +115251,20 @@ "repo": "stacked-git/stgit", "unstable": { "version": [ - 20240407, - 2229 + 20240505, + 2218 ], - "commit": "9afe502c74f51ed7d4e794da11c01e25718b0f64", - "sha256": "1sa9pndfjsja0gk7jc8vlfpzmahpvbqpb8b1dx6cl0568w13s1b5" + "commit": "e2b799d7bd39f69b66b54d556e345699dee740d6", + "sha256": "1x1f0qrwk5nxcqlyk6ga0mh919pa5fgs72dpr86fh778vraadw2d" }, "stable": { "version": [ 2, 4, - 6 + 7 ], - "commit": "9afe502c74f51ed7d4e794da11c01e25718b0f64", - "sha256": "1sa9pndfjsja0gk7jc8vlfpzmahpvbqpb8b1dx6cl0568w13s1b5" + "commit": "e2b799d7bd39f69b66b54d556e345699dee740d6", + "sha256": "1x1f0qrwk5nxcqlyk6ga0mh919pa5fgs72dpr86fh778vraadw2d" } }, { @@ -114940,15 +115354,15 @@ "repo": "beacoder/stock-tracker", "unstable": { "version": [ - 20230625, - 524 + 20240430, + 247 ], "deps": [ "async", "dash" ], - "commit": "cdffcaa6bb75c450a511a31d0c69e30a4edd562d", - "sha256": "0dmg2zh92la3qw9swzn4pz3qmn0qs6rd84dihf43v9r2682nrqb7" + "commit": "7004467c995e0104cad874361669e6b395b3da48", + "sha256": "03f27qmmfdqj4khjgs611222lc38s80fjimfggg4641rzqgxqq4h" }, "stable": { "version": [ @@ -115766,14 +116180,14 @@ "repo": "rougier/svg-tag-mode", "unstable": { "version": [ - 20240122, - 1209 + 20240429, + 1052 ], "deps": [ "svg-lib" ], - "commit": "f01307dd7720ed952355db0a552ae555c13ced13", - "sha256": "13fyg7wn2rzf19ni2niv868rp2iqm1ckqyg0rc99sbgz5i2qdzcw" + "commit": "a152bc90a7c9dc17112893a19ddf91078b909057", + "sha256": "12spnrblv3h7yzc0cpk0xj6sbcfcq2y4j3mg7a16m2nhafw2kn0y" } }, { @@ -116133,14 +116547,14 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20240405, - 1642 + 20240520, + 1202 ], "deps": [ "ivy" ], - "commit": "e0b1a6c224afb652d11b315913b8ad0c3ca8ecbc", - "sha256": "06370wzd058lx1k9dl76zzs0r9nycnlggfxxdw2691q8ypjqbd7q" + "commit": "c8808d88c633fdd00f7671fee054954f3a7598b8", + "sha256": "14f5kfs3sj699397pz6w59pyv9qhw8jbswyq0964k483570n4skp" }, "stable": { "version": [ @@ -116444,11 +116858,11 @@ "repo": "liushihao456/symbols-outline.el", "unstable": { "version": [ - 20231229, - 941 + 20240517, + 819 ], - "commit": "af4cba0c409a38e25eb572687a3a6848953ef868", - "sha256": "0jqw0p3cmjjbgsihnk49v88v7ypbxmpcsl4wb3cs83n2c4qgd11y" + "commit": "bfebe73b1322cdc32353375b55f5f56aad85fb57", + "sha256": "0gnmqw3gdgjqb0vfzl2vi3zvk89mnx2yxq8sdz7rn4y8hbyxsmh0" } }, { @@ -117577,16 +117991,16 @@ "repo": "zevlg/telega.el", "unstable": { "version": [ - 20240410, - 928 + 20240515, + 2217 ], "deps": [ "rainbow-identifiers", "transient", "visual-fill-column" ], - "commit": "d73e02dfe41580ff2d93a6c6feb2af254087bbf6", - "sha256": "1jg9l1dkiji5mqhbbfmgi0p4gdzw0m8hf7k4imnn61046llar8q0" + "commit": "3d2e5ee323366906b00d8ed40e818d41e82b73e5", + "sha256": "117mck96hd0ai0ra7kv8kv78v88vms55ac64dqbrqndiwna4c6sl" }, "stable": { "version": [ @@ -117666,14 +118080,14 @@ "repo": "caramelhooves/teleport.el", "unstable": { "version": [ - 20240101, - 1358 + 20240501, + 740 ], "deps": [ "dash" ], - "commit": "d8fa80e7f548287279c9620e26c354e68b1559af", - "sha256": "1b301mkvbr22bzj0hm0v0mr9ahw7491rl7l6374kiq4l8rlyp54g" + "commit": "7a99ec17e5c1d3bab3bc842e045b06ea335c97b9", + "sha256": "15kns3478xvwnn0dl883swh7x7k043b71zrv3gk0jazh60vn3q6j" } }, { @@ -117746,14 +118160,14 @@ "repo": "Crandel/tempel-collection", "unstable": { "version": [ - 20240404, - 1026 + 20240507, + 805 ], "deps": [ "tempel" ], - "commit": "e87b1fee9554f9bc7415df053c8d8c9f03c13955", - "sha256": "1j762811nlnimzvsmv6h1l3mpsd8wxa2ay48n73wxj3cv8qxz82r" + "commit": "cf2594313a41f6a29205e378411ebb10e9d764c3", + "sha256": "1zq17avwf9mfgr5jq9fnvx4c25a2mfr2wf3ip1ix5n3700z48ry7" } }, { @@ -118415,15 +118829,15 @@ "repo": "johannes-mueller/test-cockpit.el", "unstable": { "version": [ - 20240220, - 2058 + 20240519, + 1747 ], "deps": [ "projectile", "toml" ], - "commit": "11c23ddb9284b21a1072c37f168574096ee3bd2f", - "sha256": "0lg3f03a0bh6crffms1qfs7vlp32cg3rjhr1phmghcxdcm8xj4ca" + "commit": "2b836e5f954059210b6efaecebfe5fd7c72e726c", + "sha256": "0f62xly0pvsfqnkzm0yfflbd54mljbfc6jzp8kqk8w8598j548ak" } }, { @@ -118684,11 +119098,11 @@ "repo": "monkeyjunglejuice/matrix-emacs-theme", "unstable": { "version": [ - 20240422, - 919 + 20240429, + 920 ], - "commit": "2e373d5de799ef2546d6905949aa9ef21da5eea4", - "sha256": "15bf21y0sfsy1wpyazfcwr9cqs2vvmhwr2j2p37a2fiadrv27da4" + "commit": "d0c7fd3584c07952de26a5ae44ca6159f1960bb7", + "sha256": "0vhmmya0dayjsmvyxiyh1sf3hmdxdgv8qcfx7ffh385saqpqifkd" } }, { @@ -118908,21 +119322,21 @@ "repo": "facebook/fbthrift", "unstable": { "version": [ - 20240421, - 1632 + 20240519, + 1631 ], - "commit": "a1067af97a4a6070f4247657faf66ff25c1caffd", - "sha256": "0kjxyhr0kbw8dzd79gdj32srn5avnp4650ws1iy8q9rrppya9rr5" + "commit": "8baf3aed99934494267647ee8f309f9d712d4325", + "sha256": "0svd697slkv6k46byvca8b9l4vkxgikyxanik78iwpz52mmgpc88" }, "stable": { "version": [ 2024, - 4, - 22, + 5, + 20, 0 ], - "commit": "a1067af97a4a6070f4247657faf66ff25c1caffd", - "sha256": "0kjxyhr0kbw8dzd79gdj32srn5avnp4650ws1iy8q9rrppya9rr5" + "commit": "8baf3aed99934494267647ee8f309f9d712d4325", + "sha256": "0svd697slkv6k46byvca8b9l4vkxgikyxanik78iwpz52mmgpc88" } }, { @@ -120333,15 +120747,15 @@ "repo": "magit/transient", "unstable": { "version": [ - 20240421, - 1737 + 20240509, + 1849 ], "deps": [ "compat", "seq" ], - "commit": "2dd0102ec3df901d421fc338e5c768467cc54ecf", - "sha256": "02qhhm37pmqpm51hn7sz7wn34x1vwixxka2fvlllq1vbmvzxinp6" + "commit": "3d395d643b1476b07c6c3d7217f5b2ad2c0b425e", + "sha256": "1vrnxd95dmf6v6nzvzcf4nxz4sag9qwl1hj2ciiffl2d420shjsh" }, "stable": { "version": [ @@ -120791,14 +121205,14 @@ "repo": "erickgnavar/tree-sitter-ispell.el", "unstable": { "version": [ - 20230205, - 533 + 20240522, + 1356 ], "deps": [ "tree-sitter" ], - "commit": "d8c33c05f689c2cab36b8a9856811f18a4ab7c59", - "sha256": "19i2hv6zy9797dz4b6xrwlkci5fdq4v2mxd55li2bpd6sgga28ns" + "commit": "960e68d6c4a296e5ecf10d27bfd8bac42ba4a2ed", + "sha256": "1v0v6m5g03ydv38a9465nx3i5qfi106macwd5s63rllx88m395xg" } }, { @@ -120809,26 +121223,26 @@ "repo": "emacs-tree-sitter/tree-sitter-langs", "unstable": { "version": [ - 20240425, - 231 + 20240519, + 717 ], "deps": [ "tree-sitter" ], - "commit": "ace4624f78ddb6c29e4efa904c6dd8636fad53fe", - "sha256": "1kaklazmr26gh6ff8p7r2xs1pc40ajwlhhinsbnl52prz3bc7702" + "commit": "6ce3de71c21a55ffe33ecdead57fff290a5d07df", + "sha256": "1i36zfww14zjxlcq8gkwj5346356zfcx6ldi59bp9c7vvi2gavg8" }, "stable": { "version": [ 0, 12, - 182 + 196 ], "deps": [ "tree-sitter" ], - "commit": "f75e8c1b4aa6c13d4b9a48545993d66a1d7e2eb1", - "sha256": "0zvz1kmx145g73wh2zjvrswcl9iiqlq59dlwf88p93n7wzk2ivbg" + "commit": "6ce3de71c21a55ffe33ecdead57fff290a5d07df", + "sha256": "1i36zfww14zjxlcq8gkwj5346356zfcx6ldi59bp9c7vvi2gavg8" } }, { @@ -120905,8 +121319,8 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20240229, - 2108 + 20240518, + 932 ], "deps": [ "ace-window", @@ -120918,8 +121332,8 @@ "pfuture", "s" ], - "commit": "8c6df39f01a4d47fda2cc943645fa067f771b748", - "sha256": "12jfivx5gqayv8n2q08f7inwqmxck51q0r9nxgb1m1kzi5vdisqp" + "commit": "923fbbdea57b27ed3293079b13846206add85d9d", + "sha256": "1dw8igrag918c9s2pz80nmri09kxay10v617zafg91kdqzpnwgyy" }, "stable": { "version": [ @@ -121243,11 +121657,11 @@ "repo": "renzmann/treesit-auto", "unstable": { "version": [ - 20240420, - 1457 + 20240511, + 1425 ], - "commit": "ecd898c4879614bf36d84a77c08a10aca25c3841", - "sha256": "190sv2ig3lisp2yiwy38ng8k9ckhpgjga5njnf88qnyp3r44bvcc" + "commit": "016bd286a1ba4628f833a626f8b9d497882ecdf3", + "sha256": "03bvam7cpxqp4idhd235n76qdqhsbgw7m2lphy8qqwslbmcq23m4" }, "stable": { "version": [ @@ -121864,11 +122278,11 @@ "repo": "emacs-typescript/typescript.el", "unstable": { "version": [ - 20230116, - 1533 + 20240507, + 617 ], - "commit": "4fcb4594819caf472ae42ea068a1c7795cf07f46", - "sha256": "12vw5mjl8d4cfv0z46180llmwdwfqrfp88p1fvgp2viizwmw03ym" + "commit": "1cf78d7ef8e0a1684a2cf265539c54ccff4068c0", + "sha256": "1f2sba6ld55w6mdbwwz4kqfp2rsgmbdm88apxjfglsa5nlh7g50b" }, "stable": { "version": [ @@ -122911,26 +123325,26 @@ "repo": "swflint/emacs-universal-sidecar", "unstable": { "version": [ - 20240130, - 2120 + 20240429, + 1525 ], "deps": [ "magit-section" ], - "commit": "d7a30e53fdda44a07160ef438ae1068178f23785", - "sha256": "0zhafx5rk6221whi167j6vvlld7wwnd7capzdflv3x8d5jbhy87k" + "commit": "e16f5974c77e7126cd5c9b7448116ee94a6a1e72", + "sha256": "0n0ndahcamfqz9wrj1l43xr8q5lc03k204ny95mwlnahq27z9qsm" }, "stable": { "version": [ 1, - 5, - 2 + 6, + 0 ], "deps": [ "magit-section" ], - "commit": "9050eaea7946e613a4b9ecd9dd1462614699edb1", - "sha256": "169n0d4hsx9azch1w14wlmilm411hb7v0564xrcwww5w145jrs9m" + "commit": "4c78015d10caba9c700e6e6b582004ae1c1d5344", + "sha256": "0s48sbvqchaakz3nyn8qjwdy4yjdfq6wbjshwdp6ix1ykm5xd0h4" } }, { @@ -122941,26 +123355,26 @@ "repo": "swflint/emacs-universal-sidecar", "unstable": { "version": [ - 20240115, - 1727 + 20240428, + 1852 ], "deps": [ "citeproc" ], - "commit": "9050eaea7946e613a4b9ecd9dd1462614699edb1", - "sha256": "169n0d4hsx9azch1w14wlmilm411hb7v0564xrcwww5w145jrs9m" + "commit": "4c78015d10caba9c700e6e6b582004ae1c1d5344", + "sha256": "0s48sbvqchaakz3nyn8qjwdy4yjdfq6wbjshwdp6ix1ykm5xd0h4" }, "stable": { "version": [ 1, - 5, - 2 + 6, + 0 ], "deps": [ "citeproc" ], - "commit": "9050eaea7946e613a4b9ecd9dd1462614699edb1", - "sha256": "169n0d4hsx9azch1w14wlmilm411hb7v0564xrcwww5w145jrs9m" + "commit": "4c78015d10caba9c700e6e6b582004ae1c1d5344", + "sha256": "0s48sbvqchaakz3nyn8qjwdy4yjdfq6wbjshwdp6ix1ykm5xd0h4" } }, { @@ -122971,30 +123385,30 @@ "repo": "swflint/emacs-universal-sidecar", "unstable": { "version": [ - 20240115, - 1727 + 20240428, + 1852 ], "deps": [ "bibtex-completion", "elfeed", "universal-sidecar" ], - "commit": "9050eaea7946e613a4b9ecd9dd1462614699edb1", - "sha256": "169n0d4hsx9azch1w14wlmilm411hb7v0564xrcwww5w145jrs9m" + "commit": "4c78015d10caba9c700e6e6b582004ae1c1d5344", + "sha256": "0s48sbvqchaakz3nyn8qjwdy4yjdfq6wbjshwdp6ix1ykm5xd0h4" }, "stable": { "version": [ 1, - 5, - 2 + 6, + 0 ], "deps": [ "bibtex-completion", "elfeed", "universal-sidecar" ], - "commit": "9050eaea7946e613a4b9ecd9dd1462614699edb1", - "sha256": "169n0d4hsx9azch1w14wlmilm411hb7v0564xrcwww5w145jrs9m" + "commit": "4c78015d10caba9c700e6e6b582004ae1c1d5344", + "sha256": "0s48sbvqchaakz3nyn8qjwdy4yjdfq6wbjshwdp6ix1ykm5xd0h4" } }, { @@ -123005,30 +123419,30 @@ "repo": "swflint/emacs-universal-sidecar", "unstable": { "version": [ - 20240115, - 1727 + 20240428, + 1852 ], "deps": [ "elfeed", "elfeed-score", "universal-sidecar" ], - "commit": "9050eaea7946e613a4b9ecd9dd1462614699edb1", - "sha256": "169n0d4hsx9azch1w14wlmilm411hb7v0564xrcwww5w145jrs9m" + "commit": "4c78015d10caba9c700e6e6b582004ae1c1d5344", + "sha256": "0s48sbvqchaakz3nyn8qjwdy4yjdfq6wbjshwdp6ix1ykm5xd0h4" }, "stable": { "version": [ 1, - 5, - 2 + 6, + 0 ], "deps": [ "elfeed", "elfeed-score", "universal-sidecar" ], - "commit": "9050eaea7946e613a4b9ecd9dd1462614699edb1", - "sha256": "169n0d4hsx9azch1w14wlmilm411hb7v0564xrcwww5w145jrs9m" + "commit": "4c78015d10caba9c700e6e6b582004ae1c1d5344", + "sha256": "0s48sbvqchaakz3nyn8qjwdy4yjdfq6wbjshwdp6ix1ykm5xd0h4" } }, { @@ -123039,28 +123453,28 @@ "repo": "swflint/emacs-universal-sidecar", "unstable": { "version": [ - 20240115, - 1727 + 20240428, + 1852 ], "deps": [ "org-roam", "universal-sidecar" ], - "commit": "9050eaea7946e613a4b9ecd9dd1462614699edb1", - "sha256": "169n0d4hsx9azch1w14wlmilm411hb7v0564xrcwww5w145jrs9m" + "commit": "4c78015d10caba9c700e6e6b582004ae1c1d5344", + "sha256": "0s48sbvqchaakz3nyn8qjwdy4yjdfq6wbjshwdp6ix1ykm5xd0h4" }, "stable": { "version": [ 1, - 5, - 2 + 6, + 0 ], "deps": [ "org-roam", "universal-sidecar" ], - "commit": "9050eaea7946e613a4b9ecd9dd1462614699edb1", - "sha256": "169n0d4hsx9azch1w14wlmilm411hb7v0564xrcwww5w145jrs9m" + "commit": "4c78015d10caba9c700e6e6b582004ae1c1d5344", + "sha256": "0s48sbvqchaakz3nyn8qjwdy4yjdfq6wbjshwdp6ix1ykm5xd0h4" } }, { @@ -124548,13 +124962,13 @@ "repo": "minad/vertico", "unstable": { "version": [ - 20240424, - 1959 + 20240511, + 2047 ], "deps": [ "compat" ], - "commit": "1def56a1e678ff9a8eeafafda9c474a5fbb097c4", + "commit": "ba650a7ab90d66686ba787937ac9e71f749c598e", "sha256": "0cxaqlg0mllrnf7zx7j6rdmx3x42s9b2marisi7zwfiymsnbgarr" }, "stable": { @@ -124577,16 +124991,16 @@ "repo": "radian-software/prescient.el", "unstable": { "version": [ - 20240226, - 204 + 20240505, + 2249 ], "deps": [ "compat", "prescient", "vertico" ], - "commit": "c39bf07c56b427bf41aafd7d20eaef5cf3c312b5", - "sha256": "0pfc0ycp4cr9zwkjv3rqfkwkx8p52ad7aq2c60j0qwp3yd0cghc4" + "commit": "0765418e4362099db8788fcb745ce9b7602aa001", + "sha256": "1194racjqb6m2npsdyzbyf77ajrw8qkaq87ciy2z9fxxmzgwj84w" }, "stable": { "version": [ @@ -125271,11 +125685,11 @@ "repo": "emacs-vs/vs-dark-theme", "unstable": { "version": [ - 20240410, - 216 + 20240521, + 2336 ], - "commit": "26fb8e1dee98fd8d423abc35655859e1098325ee", - "sha256": "0ixa8kk4m0bg03qcahli8pp6srcavggkrfncyqg5igf8wg7d1wy5" + "commit": "d0d9fb57582677fc1f9a4a1467ec3f6470aff0d6", + "sha256": "03qy8d7vbnkx2ssfby7kgdjmz691rqw4vlikhpb37xkmhsqa0w0d" }, "stable": { "version": [ @@ -125294,11 +125708,11 @@ "repo": "emacs-vs/vs-light-theme", "unstable": { "version": [ - 20240410, - 216 + 20240521, + 2340 ], - "commit": "0ede987bac1c8dbeb07990a75e70b63cf9baf7e2", - "sha256": "0y5p2jbcjby0hrnhh2z99j27wsvkk8lrwdq2krd5188ssj66ca17" + "commit": "bc0250f261c066f576fa13112dcfbb10a4e5c6ef", + "sha256": "1ys5xhll909zfx02hf2gqbwcf3jcq83b5xxvajrr6xxqwa4mk9h3" }, "stable": { "version": [ @@ -125371,11 +125785,11 @@ "repo": "akermu/emacs-libvterm", "unstable": { "version": [ - 20240325, - 1551 + 20240520, + 231 ], - "commit": "ae4ae1aef2fcae98a37aad83f2a6aeeaeacedd4f", - "sha256": "180fa3ihcgp9f6gnp9z34cpc1k8ai75kmdagb4rc9qqb4z8lp9i2" + "commit": "df057b1af2bb89a1deb288086f13be296af42090", + "sha256": "11j89pldhmw9v2g1sqcg4piniijz4wzgmim1jv46iwnaiwzw20fi" } }, { @@ -126341,26 +126755,26 @@ "repo": "pzel/weblio", "unstable": { "version": [ - 20210718, - 1410 + 20240514, + 1005 ], "deps": [ "request" ], - "commit": "2b4b0c206440b5c63960214feacfceb0c26231c7", - "sha256": "1iy1finnxqjbdivzyn7crpnha87mq1fmd98pkx2r8sk551nfw35s" + "commit": "952d085fd814b139562ef947c7dcabc31f92341d", + "sha256": "1v36x3iyav5i28zp5b1899071xlxawq6ml642258bilhaba2j37a" }, "stable": { "version": [ 0, - 3, - 4 + 4, + 0 ], "deps": [ "request" ], - "commit": "2b4b0c206440b5c63960214feacfceb0c26231c7", - "sha256": "1iy1finnxqjbdivzyn7crpnha87mq1fmd98pkx2r8sk551nfw35s" + "commit": "952d085fd814b139562ef947c7dcabc31f92341d", + "sha256": "1v36x3iyav5i28zp5b1899071xlxawq6ml642258bilhaba2j37a" } }, { @@ -126841,11 +127255,11 @@ "repo": "justbur/emacs-which-key", "unstable": { "version": [ - 20240423, - 1320 + 20240501, + 1251 ], - "commit": "ba323d6712d54806aa82847d017e94eafcf99d6f", - "sha256": "1ainrah6qnn9qvjcfgx133v4rvvyq15iy7kvi2rmbxxlfj5x6y1i" + "commit": "1e89fa000e9ba9549f15ef57abccd118d5f2fe1a", + "sha256": "01g5fgrbdgzh302ah7pqdrf98hxgah40140jjwfrx3mwcdicj7f1" }, "stable": { "version": [ @@ -127417,15 +127831,15 @@ "repo": "bmag/emacs-purpose", "unstable": { "version": [ - 20210628, - 715 + 20240504, + 1017 ], "deps": [ "imenu-list", "let-alist" ], - "commit": "bb462f12f836414425edac32ebd069b4fd5b98d4", - "sha256": "1cw513mh3gyl21qpmgwqjgpi8kwddmd4n69l4ax5a5pv3vvwrcx9" + "commit": "776c5ef8fe2f0da0f9885526e3556af0f5736600", + "sha256": "0w23mljzw314nbr63wzl8m04ii1zjbl5gxgvmr9g8mfq848brsbf" }, "stable": { "version": [ @@ -127925,15 +128339,28 @@ "repo": "swflint/emacs-universal-sidecar", "unstable": { "version": [ - 20240323, - 1901 + 20240428, + 1852 ], "deps": [ "compat", "universal-sidecar" ], - "commit": "b67153c880284db0ed9864370b16287fd855fb54", - "sha256": "0irbpsfndggi1fmwsnqdr6nky4b9xbiila5rxkbrr28y2r6bxsck" + "commit": "4c78015d10caba9c700e6e6b582004ae1c1d5344", + "sha256": "0s48sbvqchaakz3nyn8qjwdy4yjdfq6wbjshwdp6ix1ykm5xd0h4" + }, + "stable": { + "version": [ + 1, + 6, + 0 + ], + "deps": [ + "compat", + "universal-sidecar" + ], + "commit": "4c78015d10caba9c700e6e6b582004ae1c1d5344", + "sha256": "0s48sbvqchaakz3nyn8qjwdy4yjdfq6wbjshwdp6ix1ykm5xd0h4" } }, { @@ -128337,14 +128764,14 @@ "repo": "cjennings/emacs-wttrin", "unstable": { "version": [ - 20240422, - 1633 + 20240521, + 2004 ], "deps": [ "xterm-color" ], - "commit": "9b98fedc44b1ddcebaa48df2975493b37797c2fb", - "sha256": "180amp1n0qdn6m6vlzg0ddfxfqf37fjaswfxdxn03298j0jgzw14" + "commit": "5655b5fd438622581f84eb84c8880f20e11b87ed", + "sha256": "1mna2jahwv6kyr832jba4ch3xwx618v4dwhwaxxchv9hzgxpf38g" }, "stable": { "version": [ @@ -128622,6 +129049,30 @@ } }, { + "ename": "xkb-mode", + "commit": "e2eedab31d075174dcc0151cc063927430462923", + "sha256": "1jd7gw9c01fmp1d3bh1ilnrcmrb0l1v6i18pw33fjnr4788v2m5s", + "fetcher": "github", + "repo": "captainflasmr/xkb-mode", + "unstable": { + "version": [ + 20240506, + 904 + ], + "commit": "b1de5233dc12749a97ad6a63d86b921bf1e33d3b", + "sha256": "0lhmr10k8vszfmq6s0x2vilxf15chci0lhf3990jwnl0y8x08i33" + }, + "stable": { + "version": [ + 0, + 2, + 0 + ], + "commit": "b1de5233dc12749a97ad6a63d86b921bf1e33d3b", + "sha256": "0lhmr10k8vszfmq6s0x2vilxf15chci0lhf3990jwnl0y8x08i33" + } + }, + { "ename": "xkcd", "commit": "855ea20024b606314f8590129259747cac0bcc97", "sha256": "0gy2952zg1rq5gl10x7iwbchz5jibfcvikd3chifqbmil80wh6b5", @@ -128882,14 +129333,14 @@ "repo": "js-emacs/xref-js2", "unstable": { "version": [ - 20240417, - 1454 + 20240504, + 1449 ], "deps": [ "js2-mode" ], - "commit": "db816e926302293c134d1260322b0553953a43e2", - "sha256": "0wsi4ix44h0vzjbw25iga4ghk5l06398l7fpv75iayyspmnl6gxq" + "commit": "e215af9eedac69b40942fff9d5514704f9f4d43e", + "sha256": "0ngry3ncs6cixxxbb361ifrp2z466j4gw2d381n3siva1vvwcdqi" }, "stable": { "version": [ @@ -129327,26 +129778,26 @@ "repo": "zkry/yaml-pro", "unstable": { "version": [ - 20240313, - 307 + 20240520, + 1215 ], "deps": [ "yaml" ], - "commit": "775c0a4b82c79da0eb91620fb0cbbf6c8642815b", - "sha256": "16l1nmi9rizrcmx53xc8yr4y6lw5cg26hnwbw6l38i9nzhklx23n" + "commit": "d57cbd84ad0afd0fd3168e3d0e6cb5969b610b39", + "sha256": "1h6a6na77xfm88qcly6nc1r6bmf5l9aihjdyajfagfdms1wh8qf3" }, "stable": { "version": [ 1, - 0, + 1, 0 ], "deps": [ "yaml" ], - "commit": "c5d4d7eb3d2221dea7ee8c04286f1272806929c1", - "sha256": "0b0s3c7h3l94743qqpx16djn4d6xsrb59yhmz3fr7afrysp7d77q" + "commit": "d57cbd84ad0afd0fd3168e3d0e6cb5969b610b39", + "sha256": "1h6a6na77xfm88qcly6nc1r6bmf5l9aihjdyajfagfdms1wh8qf3" } }, { @@ -129612,14 +130063,14 @@ "repo": "AndreaCrotti/yasnippet-snippets", "unstable": { "version": [ - 20240221, - 1621 + 20240507, + 943 ], "deps": [ "yasnippet" ], - "commit": "e6ec9f1822913cea7dc67cde6aeb8f2625980950", - "sha256": "0jvpsqbfl5ax2jzc30hkhd7z9l98ncnaqnpl72lws8iknhjnd29k" + "commit": "6fafad13bb4689600285d9e38c61958dd63c356d", + "sha256": "0p38k8a3l9vpph1g2a6wz40y30wb2nhp770rv8947bxzjc5xc0gf" }, "stable": { "version": [ @@ -130575,14 +131026,14 @@ "repo": "ymherklotz/emacs-zettelkasten", "unstable": { "version": [ - 20230108, - 1724 + 20240517, + 1319 ], "deps": [ "s" ], - "commit": "cc4d69c302a46b8f802a1871aae091df1f3398ba", - "sha256": "16an3pym99r0w6810zw1m1jydb7zvk01mw55zxl64kjc37zdlckr" + "commit": "6a33faf7b4231b03d056099a1aff40bbeee6e720", + "sha256": "0y67wpkivv947v0hi1n32azb8l9avxy7ss51psyyl5bnpzynxhxa" }, "stable": { "version": [ diff --git a/pkgs/applications/editors/emacs/elisp-packages/update-from-overlay.flake.sh b/pkgs/applications/editors/emacs/elisp-packages/update-from-overlay.flake.sh new file mode 100755 index 0000000000000..6f8e4d058c733 --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/update-from-overlay.flake.sh @@ -0,0 +1,9 @@ +#!/usr/bin/env nix +#! nix shell nixpkgs#bash nixpkgs#curl nixpkgs#nix nixpkgs#coreutils --command bash +set -xeuo pipefail + +# Since flakes are not stable yet, we can't suppose everyone is using them. +# Therefore, the original ./update-from-overlay should not be modified. +# So, let's create a wrapper! + +source ./update-from-overlay diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix index 8b38e1c6e6e4a..eb5b49a443450 100644 --- a/pkgs/applications/editors/vim/common.nix +++ b/pkgs/applications/editors/vim/common.nix @@ -1,6 +1,6 @@ { lib, fetchFromGitHub }: rec { - version = "9.1.0377"; + version = "9.1.0412"; outputs = [ "out" "xxd" ]; @@ -8,7 +8,7 @@ rec { owner = "vim"; repo = "vim"; rev = "v${version}"; - hash = "sha256-cfN/QbnpWIQmLtpXWPc1JnaaX+J10ietObN/B9lE1F0="; + hash = "sha256-uLdXFZ8eW+iMXrvkaEkArZmRfAiyORaEZxFFPt0TrdI="; }; enableParallelBuilding = true; diff --git a/pkgs/applications/misc/pagefind/default.nix b/pkgs/applications/misc/pagefind/default.nix index d1ae9f68270ec..2da4e5eb7eb10 100644 --- a/pkgs/applications/misc/pagefind/default.nix +++ b/pkgs/applications/misc/pagefind/default.nix @@ -96,7 +96,6 @@ rustPlatform.buildRustPackage rec { echo entering pagefind_web... ( cd pagefind_web - export RUSTFLAGS="-C linker=lld" bash ./local_build.sh ) diff --git a/pkgs/applications/misc/slippy/default.nix b/pkgs/applications/misc/slippy/default.nix index 40de95838ad5b..cf5cd1ff0b3db 100644 --- a/pkgs/applications/misc/slippy/default.nix +++ b/pkgs/applications/misc/slippy/default.nix @@ -53,11 +53,6 @@ rustPlatform.buildRustPackage rec { darwin.apple_sdk.frameworks.Security ]; - # Cargo.lock is outdated - postConfigure = '' - cargo metadata --offline - ''; - meta = with lib; { description = "Markdown slideshows in Rust"; homepage = "https://github.com/axodotdev/slippy"; diff --git a/pkgs/applications/networking/browsers/firefox/bindgen-0.64-clang-18.patch b/pkgs/applications/networking/browsers/firefox/bindgen-0.64-clang-18.patch new file mode 100644 index 0000000000000..ee0b916bdcd9c --- /dev/null +++ b/pkgs/applications/networking/browsers/firefox/bindgen-0.64-clang-18.patch @@ -0,0 +1,39 @@ +From 043ab6ab28df63fd1b3459df5c52fd8c87c0ba21 Mon Sep 17 00:00:00 2001 +From: David Tolnay <dtolnay@gmail.com> +Date: Tue, 28 Nov 2023 11:21:18 -0800 +Subject: [PATCH] Handle CXCursor_LinkageSpec in Clang 18+ + +(cherry picked from commit 86f3dbe846020e2ba573d6eb38d1434d0cbcbb40) +--- + third_party/rust/bindgen/.cargo-checksum.json | 2 +- + third_party/rust/bindgen/ir/item.rs | 5 +++-- + 2 files changed, 4 insertions(+), 3 deletions(-) + +diff --git a/third_party/rust/bindgen/.cargo-checksum.json b/third_party/rust/bindgen/.cargo-checksum.json +index 2242180..88718bd 100644 +--- a/third_party/rust/bindgen/.cargo-checksum.json ++++ b/third_party/rust/bindgen/.cargo-checksum.json +@@ -1 +1 @@ +-{"files":{"Cargo.toml":"ae6de5b309f8bf07c259436b1113ccf405b2d7dd862e1b289bfef47a550956d1","LICENSE":"c23953d9deb0a3312dbeaf6c128a657f3591acee45067612fa68405eaa4525db","build.rs":"4a9c4ac3759572e17de312a9d3f4ced3b6fd3c71811729e5a8d06bfbd1ac8f82","callbacks.rs":"9cbda648159897f93a07dbe90a1ee9ba92e2b020a02bc9725b87db4d025df3b6","clang.rs":"a38d153516c6685b46723010793b2f4e8b16468f3cd3296781dea6e485cd66da","codegen/bitfield_unit.rs":"fddeaeab5859f4e82081865595b7705f5c0774d997df95fa5c655b81b9cae125","codegen/bitfield_unit_tests.rs":"9df86490de5e9d66ccea583dcb686dd440375dc1a3c3cf89a89d5de3883bf28a","codegen/dyngen.rs":"7d727a737c616f7f2d3a07d825be8baad9078b3f35ad96277904559b4534ffcc","codegen/error.rs":"5e308b8c54b68511fc8ea2ad15ddac510172c4ff460a80a265336440b0c9653d","codegen/helpers.rs":"5f24007a09e50db7bd2b49b07100cfed649c7b22232558e28c99c759d5d14152","codegen/impl_debug.rs":"71d8e28873ba2de466f2637a824746963702f0511728037d72ee5670c51194cb","codegen/impl_partialeq.rs":"f4599e32c66179ae515a6518a3e94b686689cf59f7dd9ab618c3fb69f17d2c77","codegen/mod.rs":"25ef86b9dd894b40724d78b99e2743654f09bb427a23ccf5940a620c6408688e","codegen/postprocessing/merge_extern_blocks.rs":"be5c5ff6d3d3d4e940814c4dc77f8d687aa6b053dcfbd2185c09616ba9022bf2","codegen/postprocessing/mod.rs":"d1e8c2864d5194a4cb2f6731c0ef582a55b363df9c4f888c26942ff37f728e1c","codegen/postprocessing/sort_semantically.rs":"3071dd509f2e5d3dfd99cafa6ee19bbacb9fec1c61a0b3f6e284a75c1f2c3db6","codegen/serialize.rs":"b1d8fff0bd9717ee7ca883fd3f376cf7b93adb65dc5bb89ede467b087e985a5f","codegen/struct_layout.rs":"7dfc814d3c914a0c53d8ed031baf543dab1def5959e8ab85220cad69a506383a","deps.rs":"5ee2332fdb10325f3b0a0c6d9ba94e13eb631ef39e955fa958afc3625bdb5448","extra_assertions.rs":"494534bd4f18b80d89b180c8a93733e6617edcf7deac413e9a73fd6e7bc9ced7","features.rs":"af20bd617cce27f6716ab3d61a1c8ddfaa46227f4a0d435b08a19d5f277cf8ba","ir/analysis/derive.rs":"ec514585eb40f0e3306bf3302aec0152a2e95e8dce13a67c36b5f00c0cbb76ef","ir/analysis/has_destructor.rs":"7a82f01e7e0595a31b56f7c398fa3019b3fe9100a2a73b56768f7e6943dcc3ce","ir/analysis/has_float.rs":"58ea1e38a59ef208400fd65d426cb5b288949df2d383b3a194fa01b99d2a87fa","ir/analysis/has_type_param_in_array.rs":"d1b9eb119dc14f662eb9bd1394c859f485479e4912589709cdd33f6752094e22","ir/analysis/has_vtable.rs":"368cf30fbe3fab7190fab48718b948caac5da8c9e797b709488716b919315636","ir/analysis/mod.rs":"0c10d8eeb26d7e6f4ce18e9dfb74ea1f9deff5cd350298aca3dc1041b17c20c4","ir/analysis/sizedness.rs":"944443d6aab35d2dd80e4f5e59176ac1e1c463ba2f0eb25d33f1d95dfac1a6d0","ir/analysis/template_params.rs":"d3cc41041b1c45e0b5be2c9f3f1cc0c2341481b9ff51589cba2428df4e6a1ea9","ir/annotations.rs":"f79de09803a3f3ccb33e366a10a707da98cd00a56ba18312ea927d6c977220a4","ir/comment.rs":"5dcfab0095d967daad9b2927093fce3786b1a2146171580afbf526ba56855e36","ir/comp.rs":"b7b28b96e4206b3215881d814661c63c5dd182f34b1163d54bcedbe85998cb06","ir/context.rs":"a7608f7d3dd607647f2af5f45fc7c09483d2a694f91265bba353a71652e2d419","ir/derive.rs":"e5581852eec87918901a129284b4965aefc8a19394187a8095779a084f28fabe","ir/dot.rs":"2d79d698e6ac59ce032840e62ff11103abed1d5e9e700cf383b492333eeebe1f","ir/enum_ty.rs":"0b612e0b57112068455eee519f894016d0a8f425d6a67b98c56b858f57d99f4a","ir/function.rs":"60407267473d785ea33ac854a70c8ca34749bc868024270992deca68a951f74c","ir/int.rs":"68a86182743ec338d58e42203364dc7c8970cb7ec3550433ca92f0c9489b4442","ir/item.rs":"880c982df0843cbdff38b9f9c3829a2d863a224e4de2260c41c3ac69e9148ad4","ir/item_kind.rs":"7666a1ff1b8260978b790a08b4139ab56b5c65714a5652bbcec7faa7443adc36","ir/layout.rs":"61a0e4250ceab889606973f930f4d692837a13a69ae2579738ff09843fed3d65","ir/mod.rs":"713cd537434567003197a123cbae679602c715e976d22f7b23dafd0826ea4c70","ir/module.rs":"7cae5561bcf84a5c3b1ee8f1c3336a33b7f44f0d5ffe885fb108289983fe763e","ir/objc.rs":"4eecdb754542d78acea27d2f547d18d49164047e6efaff8a8d283d6c2dc9875b","ir/template.rs":"4f0e3736558aa8ec359cd9749dc48f87bfff494dd195a67b39cfee7d8a7542ef","ir/traversal.rs":"0c37a0898801ad39bffc8dddd1ee8baa61bb7cf4f3fdc25c8fdd56b6c96ada65","ir/ty.rs":"ba0d7b16a1080caf4960cc7dea0d0800365da0dd5c6e735d508ec448e87b1d40","ir/var.rs":"ced3496cf0683fef91ce94aa09b0ee37255db8425ea8634d52bd73b1b5c160f6","lib.rs":"0bed6f10b2dd25753a40e6e7fa11239f08c05be414ad264c6d7e2f7a8b71f1b2","log_stubs.rs":"9f974e041e35c8c7e29985d27ae5cd0858d68f8676d1dc005c6388d7d011707f","parse.rs":"ccb2c506f08123708ae673b8216404fb22b4c951330662f9b7140b412b063260","regex_set.rs":"7dcc1ad52194f057ea00e8ebc9c23c465ffa6761eed6ba41560d2d02e03c43a6","time.rs":"8efe317e7c6b5ba8e0865ce7b49ca775ee8a02590f4241ef62f647fa3c22b68e"},"package":"c4243e6031260db77ede97ad86c27e501d646a27ab57b59a574f725d98ab1fb4"} +\ No newline at end of file ++{"files":{"Cargo.toml":"ae6de5b309f8bf07c259436b1113ccf405b2d7dd862e1b289bfef47a550956d1","LICENSE":"c23953d9deb0a3312dbeaf6c128a657f3591acee45067612fa68405eaa4525db","build.rs":"4a9c4ac3759572e17de312a9d3f4ced3b6fd3c71811729e5a8d06bfbd1ac8f82","callbacks.rs":"9cbda648159897f93a07dbe90a1ee9ba92e2b020a02bc9725b87db4d025df3b6","clang.rs":"a38d153516c6685b46723010793b2f4e8b16468f3cd3296781dea6e485cd66da","codegen/bitfield_unit.rs":"fddeaeab5859f4e82081865595b7705f5c0774d997df95fa5c655b81b9cae125","codegen/bitfield_unit_tests.rs":"9df86490de5e9d66ccea583dcb686dd440375dc1a3c3cf89a89d5de3883bf28a","codegen/dyngen.rs":"7d727a737c616f7f2d3a07d825be8baad9078b3f35ad96277904559b4534ffcc","codegen/error.rs":"5e308b8c54b68511fc8ea2ad15ddac510172c4ff460a80a265336440b0c9653d","codegen/helpers.rs":"5f24007a09e50db7bd2b49b07100cfed649c7b22232558e28c99c759d5d14152","codegen/impl_debug.rs":"71d8e28873ba2de466f2637a824746963702f0511728037d72ee5670c51194cb","codegen/impl_partialeq.rs":"f4599e32c66179ae515a6518a3e94b686689cf59f7dd9ab618c3fb69f17d2c77","codegen/mod.rs":"25ef86b9dd894b40724d78b99e2743654f09bb427a23ccf5940a620c6408688e","codegen/postprocessing/merge_extern_blocks.rs":"be5c5ff6d3d3d4e940814c4dc77f8d687aa6b053dcfbd2185c09616ba9022bf2","codegen/postprocessing/mod.rs":"d1e8c2864d5194a4cb2f6731c0ef582a55b363df9c4f888c26942ff37f728e1c","codegen/postprocessing/sort_semantically.rs":"3071dd509f2e5d3dfd99cafa6ee19bbacb9fec1c61a0b3f6e284a75c1f2c3db6","codegen/serialize.rs":"b1d8fff0bd9717ee7ca883fd3f376cf7b93adb65dc5bb89ede467b087e985a5f","codegen/struct_layout.rs":"7dfc814d3c914a0c53d8ed031baf543dab1def5959e8ab85220cad69a506383a","deps.rs":"5ee2332fdb10325f3b0a0c6d9ba94e13eb631ef39e955fa958afc3625bdb5448","extra_assertions.rs":"494534bd4f18b80d89b180c8a93733e6617edcf7deac413e9a73fd6e7bc9ced7","features.rs":"af20bd617cce27f6716ab3d61a1c8ddfaa46227f4a0d435b08a19d5f277cf8ba","ir/analysis/derive.rs":"ec514585eb40f0e3306bf3302aec0152a2e95e8dce13a67c36b5f00c0cbb76ef","ir/analysis/has_destructor.rs":"7a82f01e7e0595a31b56f7c398fa3019b3fe9100a2a73b56768f7e6943dcc3ce","ir/analysis/has_float.rs":"58ea1e38a59ef208400fd65d426cb5b288949df2d383b3a194fa01b99d2a87fa","ir/analysis/has_type_param_in_array.rs":"d1b9eb119dc14f662eb9bd1394c859f485479e4912589709cdd33f6752094e22","ir/analysis/has_vtable.rs":"368cf30fbe3fab7190fab48718b948caac5da8c9e797b709488716b919315636","ir/analysis/mod.rs":"0c10d8eeb26d7e6f4ce18e9dfb74ea1f9deff5cd350298aca3dc1041b17c20c4","ir/analysis/sizedness.rs":"944443d6aab35d2dd80e4f5e59176ac1e1c463ba2f0eb25d33f1d95dfac1a6d0","ir/analysis/template_params.rs":"d3cc41041b1c45e0b5be2c9f3f1cc0c2341481b9ff51589cba2428df4e6a1ea9","ir/annotations.rs":"f79de09803a3f3ccb33e366a10a707da98cd00a56ba18312ea927d6c977220a4","ir/comment.rs":"5dcfab0095d967daad9b2927093fce3786b1a2146171580afbf526ba56855e36","ir/comp.rs":"b7b28b96e4206b3215881d814661c63c5dd182f34b1163d54bcedbe85998cb06","ir/context.rs":"a7608f7d3dd607647f2af5f45fc7c09483d2a694f91265bba353a71652e2d419","ir/derive.rs":"e5581852eec87918901a129284b4965aefc8a19394187a8095779a084f28fabe","ir/dot.rs":"2d79d698e6ac59ce032840e62ff11103abed1d5e9e700cf383b492333eeebe1f","ir/enum_ty.rs":"0b612e0b57112068455eee519f894016d0a8f425d6a67b98c56b858f57d99f4a","ir/function.rs":"60407267473d785ea33ac854a70c8ca34749bc868024270992deca68a951f74c","ir/int.rs":"68a86182743ec338d58e42203364dc7c8970cb7ec3550433ca92f0c9489b4442","ir/item.rs":"f215cc40c013cdd6151149dd92b73e13a635a1056f5724174c0f0ff7da9286f8","ir/item_kind.rs":"7666a1ff1b8260978b790a08b4139ab56b5c65714a5652bbcec7faa7443adc36","ir/layout.rs":"61a0e4250ceab889606973f930f4d692837a13a69ae2579738ff09843fed3d65","ir/mod.rs":"713cd537434567003197a123cbae679602c715e976d22f7b23dafd0826ea4c70","ir/module.rs":"7cae5561bcf84a5c3b1ee8f1c3336a33b7f44f0d5ffe885fb108289983fe763e","ir/objc.rs":"4eecdb754542d78acea27d2f547d18d49164047e6efaff8a8d283d6c2dc9875b","ir/template.rs":"4f0e3736558aa8ec359cd9749dc48f87bfff494dd195a67b39cfee7d8a7542ef","ir/traversal.rs":"0c37a0898801ad39bffc8dddd1ee8baa61bb7cf4f3fdc25c8fdd56b6c96ada65","ir/ty.rs":"ba0d7b16a1080caf4960cc7dea0d0800365da0dd5c6e735d508ec448e87b1d40","ir/var.rs":"ced3496cf0683fef91ce94aa09b0ee37255db8425ea8634d52bd73b1b5c160f6","lib.rs":"0bed6f10b2dd25753a40e6e7fa11239f08c05be414ad264c6d7e2f7a8b71f1b2","log_stubs.rs":"9f974e041e35c8c7e29985d27ae5cd0858d68f8676d1dc005c6388d7d011707f","parse.rs":"ccb2c506f08123708ae673b8216404fb22b4c951330662f9b7140b412b063260","regex_set.rs":"7dcc1ad52194f057ea00e8ebc9c23c465ffa6761eed6ba41560d2d02e03c43a6","time.rs":"8efe317e7c6b5ba8e0865ce7b49ca775ee8a02590f4241ef62f647fa3c22b68e"},"package":"c4243e6031260db77ede97ad86c27e501d646a27ab57b59a574f725d98ab1fb4"} +\ No newline at end of file +diff --git a/third_party/rust/bindgen/ir/item.rs b/third_party/rust/bindgen/ir/item.rs +index 40f6f7d..d443bda 100644 +--- a/third_party/rust/bindgen/ir/item.rs ++++ b/third_party/rust/bindgen/ir/item.rs +@@ -1427,8 +1427,9 @@ impl Item { + } + } + +- // Guess how does clang treat extern "C" blocks? +- if cursor.kind() == CXCursor_UnexposedDecl { ++ // On Clang 18+, extern "C" is reported accurately as a LinkageSpec. ++ // Older LLVM treat it as UnexposedDecl. ++ if cursor.kind() == CXCursor_LinkageSpec || cursor.kind() == CXCursor_UnexposedDecl { + Err(ParseError::Recurse) + } else { + // We allowlist cursors here known to be unhandled, to prevent being +-- +2.44.0 + diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 56dda27e54c92..d518aeec23fe2 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -254,9 +254,22 @@ buildStdenv.mkDerivation { hash = "sha256-cWOyvjIPUU1tavPRqg61xJ53XE4EJTdsFzadfVxyTyM="; }) ] + ++ lib.optionals (lib.versionOlder version "122") [ + ./bindgen-0.64-clang-18.patch + ] ++ lib.optionals (lib.versionAtLeast version "122" && lib.versionOlder version "123") [ ./122.0-libvpx-mozbz1875201.patch ] + ++ lib.optionals (lib.versionOlder version "123") [ + (fetchpatch { + name = "clang-18.patch"; + url = "https://hg.mozilla.org/mozilla-central/raw-rev/ba6abbd36b496501cea141e17b61af674a18e279"; + hash = "sha256-2IpdSyye3VT4VB95WurnyRFtdN1lfVtYpgEiUVhfNjw="; + }) + ] + ++ lib.optionals (lib.versionOlder version "125") [ + ./rust-1.78.patch + ] ++ extraPatches; postPatch = '' diff --git a/pkgs/applications/networking/browsers/firefox/rust-1.78.patch b/pkgs/applications/networking/browsers/firefox/rust-1.78.patch new file mode 100644 index 0000000000000..8484109d5b08d --- /dev/null +++ b/pkgs/applications/networking/browsers/firefox/rust-1.78.patch @@ -0,0 +1,77 @@ +From 9dd8048e28b65da0b904dfbace482f70ae768fd8 Mon Sep 17 00:00:00 2001 +From: Jeff Muizelaar <jmuizelaar@mozilla.com> +Date: Tue, 5 Mar 2024 04:12:28 +0100 +Subject: [PATCH] Bug 1882291. Switch to stdarch_arm_neon_intrinsics feature on + rust >=1.78. r=glandium + +We only need this on ARM32 because the ARM64 intrinsics are stable. + +stdarch_arm_neon_intrinsics was split out from stdsimd here: +https://github.com/rust-lang/stdarch/pull/1486 + +Differential Revision: https://phabricator.services.mozilla.com/D203039 +--- + Cargo.lock | 1 + + gfx/qcms/Cargo.toml | 3 +++ + gfx/qcms/build.rs | 7 +++++++ + gfx/qcms/src/lib.rs | 6 ++++-- + 4 files changed, 15 insertions(+), 2 deletions(-) + create mode 100644 gfx/qcms/build.rs + +diff --git a/Cargo.lock b/Cargo.lock +index aba397832e..8f0a879a87 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -4276,6 +4276,7 @@ name = "qcms" + version = "0.2.0" + dependencies = [ + "libc", ++ "version_check", + ] + + [[package]] +diff --git a/gfx/qcms/Cargo.toml b/gfx/qcms/Cargo.toml +index e976054a7b..f50d6623a1 100644 +--- a/gfx/qcms/Cargo.toml ++++ b/gfx/qcms/Cargo.toml +@@ -20,3 +20,6 @@ cmyk = [] + + [dependencies] + libc = {version = "0.2", optional = true } ++ ++[build-dependencies] ++version_check = "0.9" +diff --git a/gfx/qcms/build.rs b/gfx/qcms/build.rs +new file mode 100644 +index 0000000000..6810a8828e +--- /dev/null ++++ b/gfx/qcms/build.rs +@@ -0,0 +1,7 @@ ++extern crate version_check as rustc; ++ ++fn main() { ++ if rustc::is_min_version("1.78.0").unwrap_or(false) { ++ println!("cargo:rustc-cfg=stdsimd_split"); ++ } ++} +diff --git a/gfx/qcms/src/lib.rs b/gfx/qcms/src/lib.rs +index c311964ee3..fc496816a8 100644 +--- a/gfx/qcms/src/lib.rs ++++ b/gfx/qcms/src/lib.rs +@@ -7,9 +7,11 @@ + #![allow(non_upper_case_globals)] + // These are needed for the neon SIMD code and can be removed once the MSRV supports the + // instrinsics we use +-#![cfg_attr(feature = "neon", feature(stdsimd))] ++#![cfg_attr(all(stdsimd_split, target_arch = "arm", feature = "neon"), feature(stdarch_arm_neon_intrinsics))] ++#![cfg_attr(all(stdsimd_split, target_arch = "arm", feature = "neon"), feature(stdarch_arm_feature_detection))] ++#![cfg_attr(all(not(stdsimd_split), target_arch = "arm", feature = "neon"), feature(stdsimd))] + #![cfg_attr( +- feature = "neon", ++ all(target_arch = "arm", feature = "neon"), + feature(arm_target_feature, raw_ref_op) + + )] +-- +2.44.0 + diff --git a/pkgs/applications/networking/irc/tiny/default.nix b/pkgs/applications/networking/irc/tiny/default.nix index 4eae9c18111cf..a4bca115a0b0c 100644 --- a/pkgs/applications/networking/irc/tiny/default.nix +++ b/pkgs/applications/networking/irc/tiny/default.nix @@ -23,11 +23,6 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-AhQCfLCoJU7o8s+XL3hDOPmZi9QjOxXSA9uglA1KSuY="; - # Cargo.lock is outdated - preConfigure = '' - cargo metadata --offline - ''; - nativeBuildInputs = lib.optional stdenv.isLinux pkg-config; buildInputs = lib.optionals dbusSupport [ dbus ] ++ lib.optionals useOpenSSL [ openssl ] diff --git a/pkgs/applications/networking/sync/celeste/default.nix b/pkgs/applications/networking/sync/celeste/default.nix index 1836ebd1e6d99..7eef4f4510051 100644 --- a/pkgs/applications/networking/sync/celeste/default.nix +++ b/pkgs/applications/networking/sync/celeste/default.nix @@ -47,11 +47,6 @@ rustPlatform.buildRustPackage rec { sed -i "#/bin/celeste#d" justfile ''; - # Cargo.lock is outdated - preConfigure = '' - cargo update --offline - ''; - RUSTC_BOOTSTRAP = 1; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/sync/rsync/default.nix b/pkgs/applications/networking/sync/rsync/default.nix index 5216617bf4d1a..555fb68416b8d 100644 --- a/pkgs/applications/networking/sync/rsync/default.nix +++ b/pkgs/applications/networking/sync/rsync/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, updateAutotoolsGnuConfigScriptsHook , perl , libiconv , zlib @@ -28,7 +29,7 @@ stdenv.mkDerivation rec { hash = "sha256-c5nppnCMMtZ4pypjIZ6W8jvgviM25Q/RNISY0HBB35A="; }; - nativeBuildInputs = [ perl ]; + nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook perl ]; buildInputs = [ libiconv zlib popt ] ++ lib.optional enableACLs acl diff --git a/pkgs/applications/version-management/git/default.nix b/pkgs/applications/version-management/git/default.nix index 375908863a2ab..d7f738adee514 100644 --- a/pkgs/applications/version-management/git/default.nix +++ b/pkgs/applications/version-management/git/default.nix @@ -29,7 +29,7 @@ assert sendEmailSupport -> perlSupport; assert svnSupport -> perlSupport; let - version = "2.44.1"; + version = "2.45.1"; svn = subversionClient.override { perlBindings = perlSupport; }; gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ]; in @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - hash = "sha256-e2CmJMD3AJoWuFYlBiGq/c3YXrjUS7AgYXtlJbhyYeQ="; + hash = "sha256-5k00Co5ieuIs+4vMZRzKC0l88en99SNzVUT/SnMvEr8="; }; outputs = [ "out" ] ++ lib.optional withManual "doc"; @@ -374,6 +374,7 @@ stdenv.mkDerivation (finalAttrs: { }); buildbot-integration = nixosTests.buildbot; } // tests.fetchgit; + updateScript = ./update.sh; }; meta = { diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 2f87cb4a473bd..c5d3a6fd75685 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -55,11 +55,11 @@ stdenv.mkDerivation (finalAttrs: { + lib.optionalString hostCpuOnly "-host-cpu-only" + lib.optionalString nixosTestRunner "-for-vm-tests" + lib.optionalString toolsOnly "-utils"; - version = "8.2.4"; + version = "9.0.0"; src = fetchurl { url = "https://download.qemu.org/qemu-${finalAttrs.version}.tar.xz"; - hash = "sha256-7PVTf+q5JkG5nXSC9VHyGV06W9NKzvnVK/v/NTpgc5c="; + hash = "sha256-MnCKxmww2MiSYz6paMdxwcdtWX1w3erSGg0izPOG2mk="; }; depsBuildBuild = [ buildPackages.stdenv.cc ] @@ -124,11 +124,9 @@ stdenv.mkDerivation (finalAttrs: { # Cocoa clipboard support only works on macOS 10.14+ ./revert-ui-cocoa-add-clipboard-support.patch # Standard about panel requires AppKit and macOS 10.13+ - (fetchpatch { - url = "https://gitlab.com/qemu-project/qemu/-/commit/99eb313ddbbcf73c1adcdadceba1423b691c6d05.diff"; - sha256 = "sha256-gTRf9XENAfbFB3asYCXnw4OV4Af6VE1W56K2xpYDhgM="; - revert = true; - }) + ./revert-ui-cocoa-use-the-standard-about-panel.patch + # Safe area insets require macOS 11+ + ./remove-ui-cocoa-use-safe-area-insets.patch # Workaround for upstream issue with nested virtualisation: https://gitlab.com/qemu-project/qemu/-/issues/1008 (fetchpatch { url = "https://gitlab.com/qemu-project/qemu/-/commit/3e4546d5bd38a1e98d4bd2de48631abf0398a3a2.diff"; @@ -239,6 +237,10 @@ stdenv.mkDerivation (finalAttrs: { # get-fsinfo attempts to access block devices, disallowed by sandbox sed -i -e '/\/qga\/get-fsinfo/d' -e '/\/qga\/blacklist/d' \ ../tests/unit/test-qga.c + + # xattrs are not allowed in the sandbox + substituteInPlace ../tests/qtest/virtio-9p-test.c \ + --replace-fail mapped-xattr mapped-file '' + lib.optionalString stdenv.isDarwin '' # skip test that stalls on darwin, perhaps due to subtle differences # in fifo behaviour diff --git a/pkgs/applications/virtualization/qemu/remove-ui-cocoa-use-safe-area-insets.patch b/pkgs/applications/virtualization/qemu/remove-ui-cocoa-use-safe-area-insets.patch new file mode 100644 index 0000000000000..2a8430afaa705 --- /dev/null +++ b/pkgs/applications/virtualization/qemu/remove-ui-cocoa-use-safe-area-insets.patch @@ -0,0 +1,14 @@ +diff --git a/ui/cocoa.m b/ui/cocoa.m +index 25e0db9dd0..7ce889d798 100644 +--- a/ui/cocoa.m ++++ b/ui/cocoa.m +@@ -539,9 +539,6 @@ - (NSSize)fixAspectRatio:(NSSize)max + - (NSSize) screenSafeAreaSize + { + NSSize size = [[[self window] screen] frame].size; +- NSEdgeInsets insets = [[[self window] screen] safeAreaInsets]; +- size.width -= insets.left + insets.right; +- size.height -= insets.top + insets.bottom; + return size; + } + diff --git a/pkgs/applications/virtualization/qemu/revert-ui-cocoa-add-clipboard-support.patch b/pkgs/applications/virtualization/qemu/revert-ui-cocoa-add-clipboard-support.patch index d0e511c0403d7..c429bce03dcf6 100644 --- a/pkgs/applications/virtualization/qemu/revert-ui-cocoa-add-clipboard-support.patch +++ b/pkgs/applications/virtualization/qemu/revert-ui-cocoa-add-clipboard-support.patch @@ -47,7 +47,7 @@ index 660d3e0935..0e6760c360 100644 -static QemuClipboardInfo *cbinfo; -static QemuEvent cbevent; - - // Utility functions to run specified code block with iothread lock held + // Utility functions to run specified code block with the BQL held typedef void (^CodeBlock)(void); typedef bool (^BoolCodeBlock)(void); @@ -1799,107 +1794,6 @@ static void addRemovableDevicesMenuItems(void) @@ -65,7 +65,7 @@ index 660d3e0935..0e6760c360 100644 - return; - } - -- with_iothread_lock(^{ +- with_bql(^{ - QemuClipboardInfo *info = qemu_clipboard_info_ref(cbinfo); - qemu_event_reset(&cbevent); - qemu_clipboard_request(info, QEMU_CLIPBOARD_TYPE_TEXT); @@ -73,9 +73,9 @@ index 660d3e0935..0e6760c360 100644 - while (info == cbinfo && - info->types[QEMU_CLIPBOARD_TYPE_TEXT].available && - info->types[QEMU_CLIPBOARD_TYPE_TEXT].data == NULL) { -- qemu_mutex_unlock_iothread(); +- bql_unlock(); - qemu_event_wait(&cbevent); -- qemu_mutex_lock_iothread(); +- bql_lock(); - } - - if (info == cbinfo) { @@ -186,9 +186,9 @@ index 660d3e0935..0e6760c360 100644 } @@ -2071,12 +1952,6 @@ static void cocoa_display_init(DisplayState *ds, DisplayOptions *opts) - // register vga output callbacks register_displaychangelistener(&dcl); + [cocoaView updateUIInfo]; - - qemu_event_init(&cbevent, false); - cbowner = [[QemuCocoaPasteboardTypeOwner alloc] init]; diff --git a/pkgs/applications/virtualization/qemu/revert-ui-cocoa-use-the-standard-about-panel.patch b/pkgs/applications/virtualization/qemu/revert-ui-cocoa-use-the-standard-about-panel.patch new file mode 100644 index 0000000000000..08620da3b9632 --- /dev/null +++ b/pkgs/applications/virtualization/qemu/revert-ui-cocoa-use-the-standard-about-panel.patch @@ -0,0 +1,145 @@ +diff --git a/ui/cocoa.m b/ui/cocoa.m +index 25e0db9dd0..4af0712036 100644 +--- a/ui/cocoa.m ++++ b/ui/cocoa.m +@@ -93,6 +93,7 @@ static void cocoa_switch(DisplayChangeListener *dcl, + + static void cocoa_refresh(DisplayChangeListener *dcl); + ++static NSWindow *about_window; + static const DisplayChangeListenerOps dcl_ops = { + .dpy_name = "cocoa", + .dpy_gfx_update = cocoa_update, +@@ -1180,6 +1181,7 @@ - (void)changeDeviceMedia:(id)sender; + - (BOOL)verifyQuit; + - (void)openDocumentation:(NSString *)filename; + - (IBAction) do_about_menu_item: (id) sender; ++- (void)make_about_window; + - (void)adjustSpeed:(id)sender; + @end + +@@ -1227,6 +1229,8 @@ - (id) init + [pauseLabel setFont: [NSFont fontWithName: @"Helvetica" size: 90]]; + [pauseLabel setTextColor: [NSColor blackColor]]; + [pauseLabel sizeToFit]; ++ ++ [self make_about_window]; + } + return self; + } +@@ -1549,29 +1553,92 @@ - (BOOL)verifyQuit + /* The action method for the About menu item */ + - (IBAction) do_about_menu_item: (id) sender + { +- NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; +- char *icon_path_c = get_relocated_path(CONFIG_QEMU_ICONDIR "/hicolor/512x512/apps/qemu.png"); +- NSString *icon_path = [NSString stringWithUTF8String:icon_path_c]; +- g_free(icon_path_c); +- NSImage *icon = [[NSImage alloc] initWithContentsOfFile:icon_path]; +- NSString *version = @"QEMU emulator version " QEMU_FULL_VERSION; +- NSString *copyright = @QEMU_COPYRIGHT; +- NSDictionary *options; +- if (icon) { +- options = @{ +- NSAboutPanelOptionApplicationIcon : icon, +- NSAboutPanelOptionApplicationVersion : version, +- @"Copyright" : copyright, +- }; +- [icon release]; +- } else { +- options = @{ +- NSAboutPanelOptionApplicationVersion : version, +- @"Copyright" : copyright, +- }; +- } +- [NSApp orderFrontStandardAboutPanelWithOptions:options]; +- [pool release]; ++ [about_window makeKeyAndOrderFront: nil]; ++} ++ ++/* Create and display the about dialog */ ++- (void)make_about_window ++{ ++ /* Make the window */ ++ int x = 0, y = 0, about_width = 400, about_height = 200; ++ NSRect window_rect = NSMakeRect(x, y, about_width, about_height); ++ about_window = [[NSWindow alloc] initWithContentRect:window_rect ++ styleMask:NSWindowStyleMaskTitled | NSWindowStyleMaskClosable | ++ NSWindowStyleMaskMiniaturizable ++ backing:NSBackingStoreBuffered ++ defer:NO]; ++ [about_window setTitle: @"About"]; ++ [about_window setReleasedWhenClosed: NO]; ++ [about_window center]; ++ NSView *superView = [about_window contentView]; ++ ++ /* Create the dimensions of the picture */ ++ int picture_width = 80, picture_height = 80; ++ x = (about_width - picture_width)/2; ++ y = about_height - picture_height - 10; ++ NSRect picture_rect = NSMakeRect(x, y, picture_width, picture_height); ++ ++ /* Make the picture of QEMU */ ++ NSImageView *picture_view = [[NSImageView alloc] initWithFrame: ++ picture_rect]; ++ char *qemu_image_path_c = get_relocated_path(CONFIG_QEMU_ICONDIR "/hicolor/512x512/apps/qemu.png"); ++ NSString *qemu_image_path = [NSString stringWithUTF8String:qemu_image_path_c]; ++ g_free(qemu_image_path_c); ++ NSImage *qemu_image = [[NSImage alloc] initWithContentsOfFile:qemu_image_path]; ++ [picture_view setImage: qemu_image]; ++ [picture_view setImageScaling: NSImageScaleProportionallyUpOrDown]; ++ [superView addSubview: picture_view]; ++ ++ /* Make the name label */ ++ NSBundle *bundle = [NSBundle mainBundle]; ++ if (bundle) { ++ x = 0; ++ y = y - 25; ++ int name_width = about_width, name_height = 20; ++ NSRect name_rect = NSMakeRect(x, y, name_width, name_height); ++ NSTextField *name_label = [[NSTextField alloc] initWithFrame: name_rect]; ++ [name_label setEditable: NO]; ++ [name_label setBezeled: NO]; ++ [name_label setDrawsBackground: NO]; ++ [name_label setAlignment: NSTextAlignmentCenter]; ++ NSString *qemu_name = [[bundle executablePath] lastPathComponent]; ++ [name_label setStringValue: qemu_name]; ++ [superView addSubview: name_label]; ++ } ++ ++ /* Set the version label's attributes */ ++ x = 0; ++ y = 50; ++ int version_width = about_width, version_height = 20; ++ NSRect version_rect = NSMakeRect(x, y, version_width, version_height); ++ NSTextField *version_label = [[NSTextField alloc] initWithFrame: ++ version_rect]; ++ [version_label setEditable: NO]; ++ [version_label setBezeled: NO]; ++ [version_label setAlignment: NSTextAlignmentCenter]; ++ [version_label setDrawsBackground: NO]; ++ ++ /* Create the version string*/ ++ NSString *version_string; ++ version_string = [[NSString alloc] initWithFormat: ++ @"QEMU emulator version %s", QEMU_FULL_VERSION]; ++ [version_label setStringValue: version_string]; ++ [superView addSubview: version_label]; ++ ++ /* Make copyright label */ ++ x = 0; ++ y = 35; ++ int copyright_width = about_width, copyright_height = 20; ++ NSRect copyright_rect = NSMakeRect(x, y, copyright_width, copyright_height); ++ NSTextField *copyright_label = [[NSTextField alloc] initWithFrame: ++ copyright_rect]; ++ [copyright_label setEditable: NO]; ++ [copyright_label setBezeled: NO]; ++ [copyright_label setDrawsBackground: NO]; ++ [copyright_label setAlignment: NSTextAlignmentCenter]; ++ [copyright_label setStringValue: [NSString stringWithFormat: @"%s", ++ QEMU_COPYRIGHT]]; ++ [superView addSubview: copyright_label]; + } + + /* Used by the Speed menu items */ diff --git a/pkgs/build-support/deterministic-uname/default.nix b/pkgs/build-support/deterministic-uname/default.nix index 6d150557aa9d6..a39ff4c206c7e 100644 --- a/pkgs/build-support/deterministic-uname/default.nix +++ b/pkgs/build-support/deterministic-uname/default.nix @@ -30,6 +30,8 @@ substituteAll { then "GNU/Linux" else if stdenv.buildPlatform.isDarwin then "Darwin" # darwin isn't in host-os.m4 so where does this come from? + else if stdenv.buildPlatform.isFreeBSD + then "FreeBSD" else "unknown"; # in os-specific/linux module packages diff --git a/pkgs/build-support/deterministic-uname/deterministic-uname.sh b/pkgs/build-support/deterministic-uname/deterministic-uname.sh index 31772aeee3cc1..cb6f419b03311 100644 --- a/pkgs/build-support/deterministic-uname/deterministic-uname.sh +++ b/pkgs/build-support/deterministic-uname/deterministic-uname.sh @@ -131,6 +131,8 @@ fi # Darwin *nodename* 22.1.0 Darwin Kernel Version 22.1.0: Sun Oct 9 20:14:30 PDT 2022; root:xnu-8792.41.9~2/RELEASE_ARM64_T8103 arm64 arm Darwin # NixOS: # Linux *nodename* 6.0.13 #1-NixOS SMP PREEMPT_DYNAMIC Wed Dec 14 10:41:06 UTC 2022 x86_64 GNU/Linux +# FreeBSD: +# FreeBSD *nodename* 14.0-RELEASE FreeBSD 14.0-RELEASE #0 releng/14.0-n265380-f9716eee8ab4: Fri Nov 10 05:57:23 UTC 2023 root@releng1.nyi.freebsd.org:/usr/obj/usr/src/amd64.amd64/sys/GENERIC amd64 amd64 AMD Ryzen 9 5950X 16-Core Processor FreeBSD output=() if [[ "$all" = "1" ]]; then output+=("$KERNEL_NAME_VAL" "$NODENAME_VAL" "$KERNEL_RELEASE_VAL" "$KERNEL_VERSION_VAL" "$MACHINE_VAL") diff --git a/pkgs/build-support/rust/hooks/cargo-build-hook.sh b/pkgs/build-support/rust/hooks/cargo-build-hook.sh index 0ac9bf51a8334..26dde914f22aa 100644 --- a/pkgs/build-support/rust/hooks/cargo-build-hook.sh +++ b/pkgs/build-support/rust/hooks/cargo-build-hook.sh @@ -39,7 +39,7 @@ cargoBuildHook() { set -x @setEnv@ cargo build -j $NIX_BUILD_CORES \ --target @rustHostPlatformSpec@ \ - --frozen \ + --offline \ ${cargoBuildProfileFlag} \ ${cargoBuildNoDefaultFeaturesFlag} \ ${cargoBuildFeaturesFlag} \ diff --git a/pkgs/build-support/rust/hooks/cargo-check-hook.sh b/pkgs/build-support/rust/hooks/cargo-check-hook.sh index 971a140ec178f..96b87dbf15b45 100644 --- a/pkgs/build-support/rust/hooks/cargo-check-hook.sh +++ b/pkgs/build-support/rust/hooks/cargo-check-hook.sh @@ -29,7 +29,7 @@ cargoCheckHook() { fi argstr="${cargoCheckProfileFlag} ${cargoCheckNoDefaultFeaturesFlag} ${cargoCheckFeaturesFlag} - --target @rustHostPlatformSpec@ --frozen ${cargoTestFlags}" + --target @rustHostPlatformSpec@ --offline ${cargoTestFlags}" ( set -x diff --git a/pkgs/build-support/rust/hooks/cargo-nextest-hook.sh b/pkgs/build-support/rust/hooks/cargo-nextest-hook.sh index 29ba18a6a1e3f..16d32513a0d01 100644 --- a/pkgs/build-support/rust/hooks/cargo-nextest-hook.sh +++ b/pkgs/build-support/rust/hooks/cargo-nextest-hook.sh @@ -29,7 +29,7 @@ cargoNextestHook() { fi argstr="${cargoCheckProfileFlag} ${cargoCheckNoDefaultFeaturesFlag} ${cargoCheckFeaturesFlag} - --target @rustHostPlatformSpec@ --frozen ${cargoTestFlags}" + --target @rustHostPlatformSpec@ --offline ${cargoTestFlags}" ( set -x diff --git a/pkgs/build-support/rust/hooks/maturin-build-hook.sh b/pkgs/build-support/rust/hooks/maturin-build-hook.sh index 028441d18160e..b3cc1ced79647 100644 --- a/pkgs/build-support/rust/hooks/maturin-build-hook.sh +++ b/pkgs/build-support/rust/hooks/maturin-build-hook.sh @@ -11,7 +11,7 @@ maturinBuildHook() { set -x @setEnv@ maturin build \ --jobs=$NIX_BUILD_CORES \ - --frozen \ + --offline \ --target @rustTargetPlatformSpec@ \ --manylinux off \ --strip \ diff --git a/pkgs/build-support/setup-hooks/strip.sh b/pkgs/build-support/setup-hooks/strip.sh index ce41e6ea0562a..49a350af1fa5c 100644 --- a/pkgs/build-support/setup-hooks/strip.sh +++ b/pkgs/build-support/setup-hooks/strip.sh @@ -74,13 +74,17 @@ stripDirs() { echo "stripping (with command $cmd and flags $stripFlags) in $paths" local striperr striperr="$(mktemp --tmpdir="$TMPDIR" 'striperr.XXXXXX')" - # Do not strip lib/debug. This is a directory used by setup-hooks/separate-debug-info.sh. - find $paths -type f "${excludeFlags[@]}" -a '!' -path "$prefix/lib/debug/*" -print0 | - # Make sure we process files under symlinks only once. Otherwise - # 'strip` can corrupt files when writes to them in parallel: - # https://github.com/NixOS/nixpkgs/issues/246147#issuecomment-1657072039 - xargs -r -0 -n1 -- realpath -z | sort -u -z | + # Make sure we process files only once. `strip`ping the same file through different + # links in parallel can corrupt it: + # https://github.com/NixOS/nixpkgs/issues/246147#issuecomment-1657072039 + # Do not strip lib/debug. This is a directory used by setup-hooks/separate-debug-info.sh. + # Print out each file's device and inode (which will be the same if two files are hardlinked + # or are the same file found through different symlinks), followed by its path... + find $paths -type f "${excludeFlags[@]}" -a '!' -path "$prefix/lib/debug/*" -printf '%D-%i,%p\0' | + # ... sort/uniq by device/inode, then cut them out and keep the path, ... + sort -t, -k1,1 -u -z | cut -d, -f2- -z | + # and finally strip each unique path in parallel. xargs -r -0 -n1 -P "$NIX_BUILD_CORES" -- $cmd $stripFlags 2>"$striperr" || exit_code=$? # xargs exits with status code 123 if some but not all of the # processes fail. We don't care if some of the files couldn't diff --git a/pkgs/build-support/src-only/default.nix b/pkgs/build-support/src-only/default.nix index 2b0db0e267aa7..cd8572629cad8 100644 --- a/pkgs/build-support/src-only/default.nix +++ b/pkgs/build-support/src-only/default.nix @@ -13,7 +13,7 @@ let in stdenv.mkDerivation (args // { name = "${name}-source"; - installPhase = "cp -r . $out"; + installPhase = "cp -pr --reflink=auto -- . $out"; outputs = [ "out" ]; separateDebugInfo = false; dontUnpack = false; diff --git a/pkgs/by-name/bo/boehmgc/package.nix b/pkgs/by-name/bo/boehmgc/package.nix index 213d0ec9e3e32..03192ad284f54 100644 --- a/pkgs/by-name/bo/boehmgc/package.nix +++ b/pkgs/by-name/bo/boehmgc/package.nix @@ -50,8 +50,9 @@ stdenv.mkDerivation (finalAttrs: { "CFLAGS_EXTRA=-DNO_SOFT_VDB" ]; - # `gctest` fails under emulation on aarch64-darwin - doCheck = !(stdenv.isDarwin && stdenv.isx86_64); + # `gctest` fails under x86_64 emulation on aarch64-darwin + # and also on aarch64-linux (qemu-user) + doCheck = !((stdenv.isDarwin && stdenv.isx86_64) || (stdenv.isLinux && stdenv.isAarch64)); enableParallelBuilding = true; diff --git a/pkgs/by-name/bu/bunbun/package.nix b/pkgs/by-name/bu/bunbun/package.nix index 79d158fb6ae70..915f29fcec096 100644 --- a/pkgs/by-name/bu/bunbun/package.nix +++ b/pkgs/by-name/bu/bunbun/package.nix @@ -24,11 +24,6 @@ rustPlatform.buildRustPackage rec { darwin.apple_sdk.frameworks.SystemConfiguration ]; - # Cargo.lock is outdated - preConfigure = '' - cargo update --offline - ''; - meta = with lib; { description = "A simple and adorable sysinfo utility written in Rust"; homepage = "https://github.com/devraza/bunbun"; diff --git a/pkgs/by-name/cm/cmake/007-darwin-bsd-ps-abspath.diff b/pkgs/by-name/cm/cmake/007-darwin-bsd-ps-abspath.diff new file mode 100644 index 0000000000000..d610192074367 --- /dev/null +++ b/pkgs/by-name/cm/cmake/007-darwin-bsd-ps-abspath.diff @@ -0,0 +1,41 @@ +diff -ur a/Source/kwsys/ProcessUNIX.c b/Source/kwsys/ProcessUNIX.c +--- a/Source/kwsys/ProcessUNIX.c 2024-04-11 07:12:19.000000000 -0700 ++++ b/Source/kwsys/ProcessUNIX.c 2024-05-15 10:41:00.286160616 -0700 +@@ -2501,20 +2501,20 @@ + have two integers to store: the pid and then the ppid. */ + #if defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) || \ + defined(__OpenBSD__) || defined(__GLIBC__) || defined(__GNU__) +-# define KWSYSPE_PS_COMMAND "ps axo pid,ppid" ++# define KWSYSPE_PS_COMMAND "@ps@ axo pid,ppid" + # define KWSYSPE_PS_FORMAT "%d %d\n" + #elif defined(__sun) && (defined(__SVR4) || defined(__svr4__)) /* Solaris */ +-# define KWSYSPE_PS_COMMAND "ps -e -o pid,ppid" ++# define KWSYSPE_PS_COMMAND "@ps@ -e -o pid,ppid" + # define KWSYSPE_PS_FORMAT "%d %d\n" + #elif defined(__hpux) || defined(__sun__) || defined(__sgi) || \ + defined(_AIX) || defined(__sparc) +-# define KWSYSPE_PS_COMMAND "ps -ef" ++# define KWSYSPE_PS_COMMAND "@ps@ -ef" + # define KWSYSPE_PS_FORMAT "%*s %d %d %*[^\n]\n" + #elif defined(__QNX__) +-# define KWSYSPE_PS_COMMAND "ps -Af" ++# define KWSYSPE_PS_COMMAND "@ps@ -Af" + # define KWSYSPE_PS_FORMAT "%*d %d %d %*[^\n]\n" + #elif defined(__CYGWIN__) +-# define KWSYSPE_PS_COMMAND "ps aux" ++# define KWSYSPE_PS_COMMAND "@ps@ aux" + # define KWSYSPE_PS_FORMAT "%d %d %*[^\n]\n" + #endif + +diff -ur a/Source/kwsys/SystemInformation.cxx b/Source/kwsys/SystemInformation.cxx +--- a/Source/kwsys/SystemInformation.cxx 2024-04-11 07:12:19.000000000 -0700 ++++ b/Source/kwsys/SystemInformation.cxx 2024-05-15 10:40:00.901059278 -0700 +@@ -3884,7 +3884,7 @@ + long long memUsed = 0; + pid_t pid = getpid(); + std::ostringstream oss; +- oss << "ps -o rss= -p " << pid; ++ oss << "@ps@ -o rss= -p " << pid; + FILE* file = popen(oss.str().c_str(), "r"); + if (file == nullptr) { + return -1; diff --git a/pkgs/by-name/cm/cmake/package.nix b/pkgs/by-name/cm/cmake/package.nix index ce5ec0803a902..5c2a9983d6270 100644 --- a/pkgs/by-name/cm/cmake/package.nix +++ b/pkgs/by-name/cm/cmake/package.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, substituteAll , buildPackages , bzip2 , curlMinimal @@ -47,11 +48,11 @@ stdenv.mkDerivation (finalAttrs: { + lib.optionalString isMinimalBuild "-minimal" + lib.optionalString cursesUI "-cursesUI" + lib.optionalString qt5UI "-qt5UI"; - version = "3.29.2"; + version = "3.29.3"; src = fetchurl { url = "https://cmake.org/files/v${lib.versions.majorMinor finalAttrs.version}/cmake-${finalAttrs.version}.tar.gz"; - hash = "sha256-NttLaSaqt0G6bksuotmckZMiITIwi03IJNQSPLcwNS4="; + hash = "sha256-JSruFEjUnKoElU/V4n0YndUVcFVzE+eygWNnFqI4vMs="; }; patches = [ @@ -66,7 +67,13 @@ stdenv.mkDerivation (finalAttrs: { # Derived from https://github.com/curl/curl/commit/31f631a142d855f069242f3e0c643beec25d1b51 ++ lib.optional (stdenv.isDarwin && isMinimalBuild) ./005-remove-systemconfiguration-dep.diff # On Darwin, always set CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG. - ++ lib.optional stdenv.isDarwin ./006-darwin-always-set-runtime-c-flag.diff; + ++ lib.optional stdenv.isDarwin ./006-darwin-always-set-runtime-c-flag.diff + # On platforms where ps is not part of stdenv, patch the invocation of ps to use an absolute path. + ++ lib.optional (stdenv.isDarwin || stdenv.isFreeBSD) ( + substituteAll { + src = ./007-darwin-bsd-ps-abspath.diff; + ps = lib.getExe ps; + }); outputs = [ "out" ] ++ lib.optionals buildDocs [ "man" "info" ]; separateDebugInfo = true; @@ -101,8 +108,6 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional stdenv.isDarwin CoreServices ++ lib.optional (stdenv.isDarwin && !isMinimalBuild) SystemConfiguration; - propagatedBuildInputs = lib.optional stdenv.isDarwin ps; - preConfigure = '' fixCmakeFiles . substituteInPlace Modules/Platform/UnixPaths.cmake \ diff --git a/pkgs/by-name/es/esbuild-config/package.nix b/pkgs/by-name/es/esbuild-config/package.nix index d68db5c89a476..6324add2b9343 100644 --- a/pkgs/by-name/es/esbuild-config/package.nix +++ b/pkgs/by-name/es/esbuild-config/package.nix @@ -16,11 +16,6 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-Z7uYOjMNxsEmsEXDOIr1zIq4nCgHvHIqpRnRH037b8g="; - # Cargo.lock is outdated - postConfigure = '' - cargo metadata --offline - ''; - meta = with lib; { description = "Config files for esbuild"; homepage = "https://github.com/bpierre/esbuild-config"; diff --git a/pkgs/by-name/ja/jasper/package.nix b/pkgs/by-name/ja/jasper/package.nix index 34e517c81eaba..11a298208f567 100644 --- a/pkgs/by-name/ja/jasper/package.nix +++ b/pkgs/by-name/ja/jasper/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "jasper"; - version = "4.2.3"; + version = "4.2.4"; src = fetchFromGitHub { owner = "jasper-software"; repo = "jasper"; rev = "version-${finalAttrs.version}"; - hash = "sha256-Hmmoe1lzUR1DBwgg30KGfsIDzSNe5shghaieEXX/am4="; + hash = "sha256-YliWVuNEtq/Rgra+WnorSOFoAYwYmPmPRv0r734FJ1c="; }; outputs = [ "out" "dev" "doc" "lib" "man" ]; diff --git a/pkgs/by-name/li/libcamera/package.nix b/pkgs/by-name/li/libcamera/package.nix index 8bf654f209037..e6d417f3c2157 100644 --- a/pkgs/by-name/li/libcamera/package.nix +++ b/pkgs/by-name/li/libcamera/package.nix @@ -9,7 +9,6 @@ , libdrm , libevent , libyaml -, lttng-ust , gst_all_1 , gtest , graphviz @@ -17,6 +16,8 @@ , python3 , python3Packages , systemd # for libudev +, withTracing ? lib.meta.availableOn stdenv.hostPlatform lttng-ust +, lttng-ust # withTracing , withQcam ? false , qt5 # withQcam , libtiff # withQcam @@ -67,14 +68,12 @@ stdenv.mkDerivation rec { # hotplugging systemd - # lttng tracing - lttng-ust - # yamlparser libyaml gtest - ] ++ lib.optionals withQcam [ libtiff qt5.qtbase qt5.qttools ]; + ] ++ lib.optionals withTracing [ lttng-ust ] + ++ lib.optionals withQcam [ libtiff qt5.qtbase qt5.qttools ]; nativeBuildInputs = [ meson @@ -92,7 +91,8 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dv4l2=true" - "-Dqcam=${if withQcam then "enabled" else "disabled"}" + (lib.mesonEnable "tracing" withTracing) + (lib.mesonEnable "qcam" withQcam) "-Dlc-compliance=disabled" # tries unconditionally to download gtest when enabled # Avoid blanket -Werror to evade build failures on less # tested compilers. diff --git a/pkgs/by-name/li/libiconv-darwin/0001-Support-static-module-loading.patch b/pkgs/by-name/li/libiconv-darwin/0001-Support-static-module-loading.patch new file mode 100644 index 0000000000000..691b483b27efe --- /dev/null +++ b/pkgs/by-name/li/libiconv-darwin/0001-Support-static-module-loading.patch @@ -0,0 +1,72 @@ +From a3e945c630180e9aa182603207238302e58fe8fe Mon Sep 17 00:00:00 2001 +From: Randy Eckenrode <randy@largeandhighquality.com> +Date: Sat, 25 May 2024 19:03:58 -0400 +Subject: [PATCH 1/2] Support static module loading + +--- + citrus/citrus_module.c | 21 ++++++++++++++++++--- + 1 file changed, 18 insertions(+), 3 deletions(-) + +diff --git a/citrus/citrus_module.c b/citrus/citrus_module.c +index 5103d30..c22c9da 100644 +--- a/citrus/citrus_module.c ++++ b/citrus/citrus_module.c +@@ -324,22 +324,36 @@ out: + return (path[0] ? path : NULL); + } + ++#if defined(ENABLE_STATIC) ++#include "static-modules.h" ++#endif ++ + void * + _citrus_find_getops(_citrus_module_t handle, const char *modname, + const char *ifname) + { + char name[PATH_MAX]; + void *p; +- ++#if defined(ENABLE_STATIC) ++ const struct getops_pair* res = lookup_getops(modname, strlen(modname)); ++ p = res ? res->opsfn : NULL; ++#else + snprintf(name, sizeof(name), "_citrus_%s_%s_getops", + modname, ifname); + p = dlsym((void *)handle, name); ++#endif + return (p); + } + + int + _citrus_load_module(_citrus_module_t *rhandle, const char *encname) + { ++#if defined(ENABLE_STATIC) ++ if (is_known_encoding(encname, strnlen(encname, MAX_WORD_LENGTH)) > MAX_HASH_VALUE) { ++ return (EINVAL); ++ } ++ *rhandle = (_citrus_module_t)encodings; ++#else + const char *p; + char path[PATH_MAX]; + void *handle; +@@ -368,14 +382,15 @@ _citrus_load_module(_citrus_module_t *rhandle, const char *encname) + } + + *rhandle = (_citrus_module_t)handle; +- ++#endif + return (0); + } + + void + _citrus_unload_module(_citrus_module_t handle) + { +- ++#if !defined(ENABLE_STATIC) + if (handle) + dlclose((void *)handle); ++#endif + } +-- +2.44.1 + diff --git a/pkgs/by-name/li/libiconv-darwin/0002-Fix-ISO-2022-out-of-bounds-write-with-encoded-charac.patch b/pkgs/by-name/li/libiconv-darwin/0002-Fix-ISO-2022-out-of-bounds-write-with-encoded-charac.patch new file mode 100644 index 0000000000000..e6bce71abd938 --- /dev/null +++ b/pkgs/by-name/li/libiconv-darwin/0002-Fix-ISO-2022-out-of-bounds-write-with-encoded-charac.patch @@ -0,0 +1,43 @@ +From 6a2c81d23558d19a68d5494f8f8618bd55c89405 Mon Sep 17 00:00:00 2001 +From: Randy Eckenrode <randy@largeandhighquality.com> +Date: Mon, 27 May 2024 13:43:43 -0400 +Subject: [PATCH 2/2] Fix ISO-2022 out-of-bounds write with encoded characters + +--- + libiconv_modules/ISO2022/citrus_iso2022.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/libiconv_modules/ISO2022/citrus_iso2022.c b/libiconv_modules/ISO2022/citrus_iso2022.c +index 46da1d6..c2eeaa8 100644 +--- a/libiconv_modules/ISO2022/citrus_iso2022.c ++++ b/libiconv_modules/ISO2022/citrus_iso2022.c +@@ -1031,7 +1031,7 @@ _ISO2022_sputwchar(_ISO2022EncodingInfo * __restrict ei, wchar_t wc, + { + _ISO2022Charset cs; + char *p; +- char tmp[MB_LEN_MAX]; ++ char tmp[MB_LEN_MAX + 4]; + size_t len; + int bit8, i = 0, target; + unsigned char mask; +@@ -1196,7 +1196,7 @@ _citrus_ISO2022_put_state_reset(_ISO2022EncodingInfo * __restrict ei, + size_t * __restrict nresult) + { + char *result; +- char buf[MB_LEN_MAX]; ++ char buf[MB_LEN_MAX + 4]; + size_t len; + int ret; + +@@ -1225,7 +1225,7 @@ _citrus_ISO2022_wcrtomb_priv(_ISO2022EncodingInfo * __restrict ei, + _ISO2022State * __restrict psenc, size_t * __restrict nresult) + { + char *result; +- char buf[MB_LEN_MAX]; ++ char buf[MB_LEN_MAX + 4]; + size_t len; + int ret; + +-- +2.44.1 + diff --git a/pkgs/by-name/li/libiconv-darwin/meson.build b/pkgs/by-name/li/libiconv-darwin/meson.build index 99adeb7fe0849..9473cb8911423 100644 --- a/pkgs/by-name/li/libiconv-darwin/meson.build +++ b/pkgs/by-name/li/libiconv-darwin/meson.build @@ -19,6 +19,19 @@ i18nmoduledir = prefix_libdir / 'i18n' esdbdir = prefix_datadir / 'i18n/esdb' csmapperdir = prefix_datadir / 'i18n/csmapper' +is_static = get_option('default_library') == 'static' +static_suffix = is_static ? '_static' : '' + +# Generators +if is_static + gperf_bin = find_program('gperf', required : true) + gperf = generator( + gperf_bin, + arguments : ['@INPUT@', '--output-file=@OUTPUT@'], + output : '@BASENAME@.h' + ) +endif + # Libraries libcharset = library( @@ -37,15 +50,16 @@ install_headers( ) libiconv = library( - 'iconv', + 'iconv' + static_suffix, build_rpath : fs.parent(libcharset.full_path()), c_args : [ f'-D_PATH_I18NMODULE="@i18nmoduledir@"', f'-D_PATH_ESDB="@esdbdir@"', - f'-D_PATH_CSMAPPER="@csmapperdir@"' + f'-D_PATH_CSMAPPER="@csmapperdir@"', + is_static ? '-DENABLE_STATIC=1' : [ ] ], darwin_versions : '7', - install : true, + install : not is_static, include_directories : ['citrus', 'libcharset'], link_args : ['-Wl,-reexport_library', fs.name(libcharset.full_path())], link_depends : [libcharset], @@ -84,6 +98,7 @@ libiconv = library( 'citrus/iconvctl.c', 'citrus/iconvlist.c', 'citrus/iconv.c', + is_static ? gperf.process('static-modules.gperf') : [ ] ], soversion : '2' ) @@ -99,19 +114,6 @@ install_man( ) -# Binaries -executable( - 'iconv', - install : true, - include_directories : ['citrus', 'libcharset'], - link_with : [libiconv], - sources : [ - 'iconv/iconv.c' - ] -) -install_man('iconv/iconv.1') - - # Data ## csmapper csmapper_modules = [ @@ -216,6 +218,7 @@ libiconv_modules = [ 'mapper_zone' ] +modules = [ ] foreach module : libiconv_modules module_source = module.to_lower() module_path = 'libiconv_modules' / module @@ -230,14 +233,19 @@ foreach module : libiconv_modules # See: https://github.com/apple-oss-distributions/libiconv/blob/81be60a93521c931a01aab9c747dd2b078bc0679/libiconv.xcodeproj/project.pbxproj#L2549-L2556 # See also: https://cgit.freebsd.org/src/tree/lib/libiconv_modules/mapper_parallel/Makefile?id=9241ebc796c11cf133c550f188f324bd2c12d89a if module == 'mapper_parallel' + # Skip including mapper_parallel since it’s the same as mapper_serial, which would result in duplicate symbols. + if is_static + continue + endif + module_source = 'mapper_serial' module_path = 'libiconv_modules/mapper_serial' endif - library( + modules += library( module, darwin_versions : '1', - install : true, + install : not is_static, install_dir : i18nmoduledir, include_directories : [module_path, 'citrus', 'libcharset'] + extra_headers, link_with : [libiconv], @@ -249,6 +257,38 @@ foreach module : libiconv_modules endforeach +# Bundle the modules into libiconv.a +if is_static + objects = [libiconv.extract_all_objects(recursive : true)] + foreach module : modules + objects += module.extract_all_objects(recursive : true) + endforeach + + libiconv = static_library( + 'iconv', + install : true, + objects : objects + ) +endif + + +# Binaries +executable( + 'iconv', + install : true, + include_directories : ['citrus', 'libcharset'], + link_with : [ + libiconv, + # Darwin’s system `iconv` relies on the reexported symbols from libiconv + is_static ? libcharset : [ ] + ], + sources : [ + 'iconv/iconv.c' + ] +) +install_man('iconv/iconv.1') + + # Tests if get_option('tests') == true ## Only required for running the tests @@ -259,7 +299,11 @@ if get_option('tests') == true suite, dependencies : [atf], include_directories : ['citrus', 'libcharset'], - link_with : [libiconv], + link_with : [ + libiconv, + # Make sure the libcharset reexport is working by relying on libiconv to provide its symbols. + is_static ? libcharset : [ ] + ], sources : [test_src] ) diff --git a/pkgs/by-name/li/libiconv-darwin/nixpkgs_test.c b/pkgs/by-name/li/libiconv-darwin/nixpkgs_test.c index 40400ef832832..90981c5820f35 100644 --- a/pkgs/by-name/li/libiconv-darwin/nixpkgs_test.c +++ b/pkgs/by-name/li/libiconv-darwin/nixpkgs_test.c @@ -73,10 +73,44 @@ ATF_TC_BODY(test_cp932_cp932, tc) ATF_CHECK_STREQ(expected, output); } +ATF_TC(test_iso2022_crash); +ATF_TC_HEAD(test_iso2022_crash, tc) +{ + atf_tc_set_md_var(tc, "descr", "regression test for converting to ISO-2022 with escape sequences"); +} +ATF_TC_BODY(test_iso2022_crash, tc) +{ + char expected[] = ""; + size_t expected_length = sizeof(expected) - 1; + + char input[] = "\x41\x41\x41\x41\x41\xe5\x8a\x84"; + size_t input_length = sizeof(input) - 1; + + size_t output_available = sizeof(expected) - 1 ; + char output[sizeof(expected)] = { 0 }; + + iconv_t cd = iconv_open("ISO-2022-CN-EXT", "UTF-8"); + ATF_REQUIRE((size_t)cd != -1); + + char* input_buf = input; + char* output_buf = output; + + size_t res = iconv(cd, &input_buf, &input_length, &output_buf, &output_available); + iconv_close(cd); + + ATF_CHECK(res == -1); + + size_t output_length = sizeof(output) - output_available - 1; + + ATF_CHECK_INTEQ(expected_length, output_length); + ATF_CHECK_STREQ(expected, output); +} + ATF_TP_ADD_TCS(tp) { ATF_TP_ADD_TC(tp, test_cp932_eucjp); ATF_TP_ADD_TC(tp, test_cp932_cp932); + ATF_TP_ADD_TC(tp, test_iso2022_crash); return atf_no_error(); } diff --git a/pkgs/by-name/li/libiconv-darwin/package.nix b/pkgs/by-name/li/libiconv-darwin/package.nix index 0cb34224a6c78..6396de93262c7 100644 --- a/pkgs/by-name/li/libiconv-darwin/package.nix +++ b/pkgs/by-name/li/libiconv-darwin/package.nix @@ -3,6 +3,7 @@ stdenv, fetchFromGitHub, atf, + gperf, libiconvReal, meson, ninja, @@ -10,6 +11,9 @@ gitUpdater, }: +let + inherit (stdenv) hostPlatform; +in stdenv.mkDerivation (finalAttrs: { pname = "libiconv"; version = "99"; @@ -19,6 +23,9 @@ stdenv.mkDerivation (finalAttrs: { "dev" ]; + # Propagate `out` only when there are dylibs to link (i.e., don’t propagate when doing a static build). + propagatedBuildOutputs = lib.optionalString (!hostPlatform.isStatic) "out"; + src = fetchFromGitHub { owner = "apple-oss-distributions"; repo = "libiconv"; @@ -26,7 +33,13 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-TGt6rsU52ztfW2rCqwnhMAExLbexI/59IoDOGY+XGu0="; }; - inherit (libiconvReal) setupHooks; + setupHooks = + libiconvReal.setupHooks + ++ lib.optionals hostPlatform.isStatic [ ./static-setup-hook.sh ]; + + patches = lib.optionals hostPlatform.isStatic [ ./0001-Support-static-module-loading.patch ] ++ [ + ./0002-Fix-ISO-2022-out-of-bounds-write-with-encoded-charac.patch + ]; postPatch = '' @@ -41,30 +54,42 @@ stdenv.mkDerivation (finalAttrs: { header cp ${./nixpkgs_test.c} tests/libiconv/nixpkgs_test.c + '' + + lib.optionalString hostPlatform.isStatic '' + cp ${./static-modules.gperf} static-modules.gperf ''; strictDeps = true; - nativeBuildInputs = [ - meson - ninja - ]; + nativeBuildInputs = + [ + meson + ninja + ] + # Dynamic builds use `dlopen` to load modules, but static builds have to link them all. + # `gperf` is used to generate a lookup table from module to ops functions. + ++ lib.optionals hostPlatform.isStatic [ gperf ]; mesonBuildType = "release"; mesonFlags = [ (lib.mesonBool "tests" finalAttrs.doInstallCheck) ]; - postInstall = lib.optionalString stdenv.isDarwin '' - ${stdenv.cc.targetPrefix}install_name_tool "$out/lib/libiconv.2.dylib" \ - -change '@rpath/libcharset.1.dylib' "$out/lib/libcharset.1.dylib" - ''; + postInstall = + lib.optionalString (stdenv.isDarwin && !hostPlatform.isStatic) '' + ${stdenv.cc.targetPrefix}install_name_tool "$out/lib/libiconv.2.dylib" \ + -change '@rpath/libcharset.1.dylib' "$out/lib/libcharset.1.dylib" + '' + # Move the static library to the `dev` output + + lib.optionalString hostPlatform.isStatic '' + moveToOutput lib "$dev" + ''; # Tests have to be run in `installCheckPhase` because libiconv expects to `dlopen` # modules from `$out/lib/i18n`. nativeInstallCheckInputs = [ pkg-config ]; installCheckInputs = [ atf ]; - doInstallCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; + doInstallCheck = stdenv.buildPlatform.canExecute hostPlatform; # Can’t use `mesonCheckPhase` because it runs the wrong hooks for `installCheckPhase`. installCheckPhase = '' diff --git a/pkgs/by-name/li/libiconv-darwin/static-modules.gperf b/pkgs/by-name/li/libiconv-darwin/static-modules.gperf new file mode 100644 index 0000000000000..be916fb257ec2 --- /dev/null +++ b/pkgs/by-name/li/libiconv-darwin/static-modules.gperf @@ -0,0 +1,73 @@ +%language=ANSI-C +%compare-strncmp +%pic +%readonly-tables +%{ +#include "citrus_namespace.h" +#include "citrus_types.h" +#include "citrus_module.h" +#include "citrus_hash.h" + +#include "citrus_iconv.h" +#include "citrus_mapper.h" +#include "citrus_stdenc.h" + +extern _CITRUS_STDENC_GETOPS_FUNC(BIG5); +extern _CITRUS_STDENC_GETOPS_FUNC(DECHanyu); +extern _CITRUS_STDENC_GETOPS_FUNC(DECKanji); +extern _CITRUS_STDENC_GETOPS_FUNC(EUC); +extern _CITRUS_STDENC_GETOPS_FUNC(EUCTW); +extern _CITRUS_STDENC_GETOPS_FUNC(GBK2K); +extern _CITRUS_STDENC_GETOPS_FUNC(HZ); +extern _CITRUS_STDENC_GETOPS_FUNC(ISO2022); +extern _CITRUS_STDENC_GETOPS_FUNC(JOHAB); +extern _CITRUS_STDENC_GETOPS_FUNC(MSKanji); +extern _CITRUS_STDENC_GETOPS_FUNC(UES); +extern _CITRUS_STDENC_GETOPS_FUNC(UTF1632); +extern _CITRUS_STDENC_GETOPS_FUNC(UTF7); +extern _CITRUS_STDENC_GETOPS_FUNC(UTF8); +extern _CITRUS_STDENC_GETOPS_FUNC(UTF8MAC); +extern _CITRUS_STDENC_GETOPS_FUNC(VIQR); +extern _CITRUS_STDENC_GETOPS_FUNC(ZW); + +extern _CITRUS_ICONV_GETOPS_FUNC(iconv_none); +extern _CITRUS_ICONV_GETOPS_FUNC(iconv_std); + +extern _CITRUS_MAPPER_GETOPS_FUNC(mapper_646); +extern _CITRUS_MAPPER_GETOPS_FUNC(mapper_none); +extern _CITRUS_MAPPER_GETOPS_FUNC(mapper_parallel); +extern _CITRUS_MAPPER_GETOPS_FUNC(mapper_serial); +extern _CITRUS_MAPPER_GETOPS_FUNC(mapper_std); +extern _CITRUS_MAPPER_GETOPS_FUNC(mapper_zone); +%} +%define lookup-function-name lookup_getops +%define hash-function-name is_known_encoding +%define string-pool-name encodings +%struct-type +struct getops_pair { int name; void* opsfn; }; +%% +BIG5, _citrus_BIG5_stdenc_getops +DECHanyu, _citrus_DECHanyu_stdenc_getops +DECKanji, _citrus_DECKanji_stdenc_getops +EUC, _citrus_EUC_stdenc_getops +EUCTW, _citrus_EUCTW_stdenc_getops +GBK2K, _citrus_GBK2K_stdenc_getops +HZ, _citrus_HZ_stdenc_getops +ISO2022, _citrus_ISO2022_stdenc_getops +JOHAB, _citrus_JOHAB_stdenc_getops +MSKanji, _citrus_MSKanji_stdenc_getops +UES, _citrus_UES_stdenc_getops +UTF1632, _citrus_UTF1632_stdenc_getops +UTF7, _citrus_UTF7_stdenc_getops +UTF8, _citrus_UTF8_stdenc_getops +UTF8MAC, _citrus_UTF8MAC_stdenc_getops +VIQR, _citrus_VIQR_stdenc_getops +ZW, _citrus_ZW_stdenc_getops +iconv_none, _citrus_iconv_none_iconv_getops +iconv_std, _citrus_iconv_std_iconv_getops +mapper_646, _citrus_mapper_646_mapper_getops +mapper_none, _citrus_mapper_none_mapper_getops +mapper_serial, _citrus_mapper_serial_mapper_getops +mapper_parallel, _citrus_mapper_parallel_mapper_getops +mapper_std, _citrus_mapper_std_mapper_getops +mapper_zone, _citrus_mapper_zone_mapper_getops diff --git a/pkgs/by-name/li/libiconv-darwin/static-setup-hook.sh b/pkgs/by-name/li/libiconv-darwin/static-setup-hook.sh new file mode 100644 index 0000000000000..2ad108b82f1d2 --- /dev/null +++ b/pkgs/by-name/li/libiconv-darwin/static-setup-hook.sh @@ -0,0 +1,5 @@ +# Darwin’s dynamic libiconv reexports libcharset, so reproduce that in static builds. +if [ -z "${dontAddExtraLibs-}" ]; then + getHostRole + export NIX_LDFLAGS${role_post}+=" -lcharset" +fi diff --git a/pkgs/by-name/me/meson/007-Allow-building-via-ninja-12.patch b/pkgs/by-name/me/meson/007-Allow-building-via-ninja-12.patch new file mode 100644 index 0000000000000..009d826aab036 --- /dev/null +++ b/pkgs/by-name/me/meson/007-Allow-building-via-ninja-12.patch @@ -0,0 +1,190 @@ +From 8e46d3e37f81bf13f3f62a14fb603feb2e37229d Mon Sep 17 00:00:00 2001 +From: John Titor <50095635+JohnRTitor@users.noreply.github.com> +Date: Fri, 10 May 2024 23:25:58 +0530 +Subject: [PATCH] Fix builds with Ninja 12 and remove a 5 year old workaround. + +Co-authored-by: Jussi Pakkanen <jpakkane@gmail.com> +Co-authored-by: Masum Reza <masumrezarock100@gmail.com> +--- + run_project_tests.py | 3 +-- + run_tests.py | 35 ++++++++++------------------------ + unittests/baseplatformtests.py | 34 +++++++++++++++++++++++++++------ + 3 files changed, 39 insertions(+), 33 deletions(-) + +diff --git a/run_project_tests.py b/run_project_tests.py +index a14741364..222e12f74 100755 +--- a/run_project_tests.py ++++ b/run_project_tests.py +@@ -45,7 +45,7 @@ from mesonbuild.coredata import backendlist, version as meson_version + from mesonbuild.modules.python import PythonExternalProgram + from run_tests import ( + get_fake_options, run_configure, get_meson_script, get_backend_commands, +- get_backend_args_for_dir, Backend, ensure_backend_detects_changes, ++ get_backend_args_for_dir, Backend, + guess_backend, handle_meson_skip_test, + ) + +@@ -720,7 +720,6 @@ def _run_test(test: TestDef, + + # Touch the meson.build file to force a regenerate + def force_regenerate() -> None: +- ensure_backend_detects_changes(backend) + os.utime(str(test.path / 'meson.build')) + + # just test building +diff --git a/run_tests.py b/run_tests.py +index 207653219..0c51f3d69 100755 +--- a/run_tests.py ++++ b/run_tests.py +@@ -39,29 +39,27 @@ from mesonbuild.mesonlib import OptionKey, setup_vsenv + if T.TYPE_CHECKING: + from mesonbuild.coredata import SharedCMDOptions + +-NINJA_1_9_OR_NEWER = False ++NINJA_1_12_OR_NEWER = False + NINJA_CMD = None + # If we're on CI, detecting ninja for every subprocess unit test that we run is slow + # Optimize this by respecting $NINJA and skipping detection, then exporting it on + # first run. + try: +- NINJA_1_9_OR_NEWER = bool(int(os.environ['NINJA_1_9_OR_NEWER'])) ++ NINJA_1_12_OR_NEWER = bool(int(os.environ['NINJA_1_12_OR_NEWER'])) + NINJA_CMD = [os.environ['NINJA']] + except (KeyError, ValueError): +- # Look for 1.9 to see if https://github.com/ninja-build/ninja/issues/1219 +- # is fixed +- NINJA_CMD = detect_ninja('1.9') ++ # Look for 1.12, which removes -w dupbuild=err ++ NINJA_CMD = detect_ninja('1.12') + if NINJA_CMD is not None: +- NINJA_1_9_OR_NEWER = True ++ NINJA_1_12_OR_NEWER = True + else: +- mlog.warning('Found ninja <1.9, tests will run slower', once=True) + NINJA_CMD = detect_ninja() + + if NINJA_CMD is not None: +- os.environ['NINJA_1_9_OR_NEWER'] = str(int(NINJA_1_9_OR_NEWER)) ++ os.environ['NINJA_1_12_OR_NEWER'] = str(int(NINJA_1_12_OR_NEWER)) + os.environ['NINJA'] = NINJA_CMD[0] + else: +- raise RuntimeError('Could not find Ninja v1.7 or newer') ++ raise RuntimeError('Could not find Ninja.') + + # Emulate running meson with -X utf8 by making sure all open() calls have a + # sane encoding. This should be a python default, but PEP 540 considered it not +@@ -271,7 +269,9 @@ def get_backend_commands(backend: Backend, debug: bool = False) -> \ + test_cmd = cmd + ['-target', 'RUN_TESTS'] + elif backend is Backend.ninja: + global NINJA_CMD +- cmd = NINJA_CMD + ['-w', 'dupbuild=err', '-d', 'explain'] ++ cmd = NINJA_CMD + ['-d', 'explain'] ++ if not NINJA_1_12_OR_NEWER: ++ cmd += ['-w', 'dupbuild=err'] + if debug: + cmd += ['-v'] + clean_cmd = cmd + ['clean'] +@@ -282,21 +282,6 @@ def get_backend_commands(backend: Backend, debug: bool = False) -> \ + raise AssertionError(f'Unknown backend: {backend!r}') + return cmd, clean_cmd, test_cmd, install_cmd, uninstall_cmd + +-def ensure_backend_detects_changes(backend: Backend) -> None: +- global NINJA_1_9_OR_NEWER +- if backend is not Backend.ninja: +- return +- need_workaround = False +- # We're using ninja >= 1.9 which has QuLogic's patch for sub-1s resolution +- # timestamps +- if not NINJA_1_9_OR_NEWER: +- mlog.warning('Don\'t have ninja >= 1.9, enabling timestamp resolution workaround', once=True) +- need_workaround = True +- # Increase the difference between build.ninja's timestamp and the timestamp +- # of whatever you changed: https://github.com/ninja-build/ninja/issues/371 +- if need_workaround: +- time.sleep(1) +- + def run_mtest_inprocess(commandlist: T.List[str]) -> T.Tuple[int, str, str]: + out = StringIO() + with mock.patch.object(sys, 'stdout', out), mock.patch.object(sys, 'stderr', out): +diff --git a/unittests/baseplatformtests.py b/unittests/baseplatformtests.py +index 6125ed933..226b2e11e 100644 +--- a/unittests/baseplatformtests.py ++++ b/unittests/baseplatformtests.py +@@ -1,6 +1,8 @@ + # SPDX-License-Identifier: Apache-2.0 + # Copyright 2016-2021 The Meson development team ++# Copyright © 2024 Intel Corporation + ++from __future__ import annotations + from pathlib import PurePath + from unittest import mock, TestCase, SkipTest + import json +@@ -9,6 +11,7 @@ import os + import re + import subprocess + import sys ++import shutil + import tempfile + import typing as T + +@@ -28,7 +31,7 @@ import mesonbuild.modules.pkgconfig + + + from run_tests import ( +- Backend, ensure_backend_detects_changes, get_backend_commands, ++ Backend, get_backend_commands, + get_builddir_target_args, get_meson_script, run_configure_inprocess, + run_mtest_inprocess, handle_meson_skip_test, + ) +@@ -286,11 +289,11 @@ class BasePlatformTests(TestCase): + ''' + return self.build(target=target, override_envvars=override_envvars) + +- def setconf(self, arg, will_build=True): +- if not isinstance(arg, list): ++ def setconf(self, arg: T.Sequence[str], will_build: bool = True) -> None: ++ if isinstance(arg, str): + arg = [arg] +- if will_build: +- ensure_backend_detects_changes(self.backend) ++ else: ++ arg = list(arg) + self._run(self.mconf_command + arg + [self.builddir]) + + def getconf(self, optname: str): +@@ -304,7 +307,6 @@ class BasePlatformTests(TestCase): + windows_proof_rmtree(self.builddir) + + def utime(self, f): +- ensure_backend_detects_changes(self.backend) + os.utime(f) + + def get_compdb(self): +@@ -492,3 +494,23 @@ class BasePlatformTests(TestCase): + + def assertLength(self, val, length): + assert len(val) == length, f'{val} is not length {length}' ++ ++ def copy_srcdir(self, srcdir: str) -> str: ++ """Copies a source tree and returns that copy. ++ ++ ensures that the copied tree is deleted after running. ++ ++ :param srcdir: The locaiton of the source tree to copy ++ :return: The location of the copy ++ """ ++ dest = tempfile.mkdtemp() ++ self.addCleanup(windows_proof_rmtree, dest) ++ ++ # shutil.copytree expects the destinatin directory to not exist, Once ++ # python 3.8 is required the `dirs_exist_ok` parameter negates the need ++ # for this ++ dest = os.path.join(dest, 'subdir') ++ ++ shutil.copytree(srcdir, dest) ++ ++ return dest +\ No newline at end of file +-- +2.44.0 + diff --git a/pkgs/by-name/me/meson/007-freebsd-pkgconfig-path.patch b/pkgs/by-name/me/meson/007-freebsd-pkgconfig-path.patch new file mode 100644 index 0000000000000..3a9ba6f092dda --- /dev/null +++ b/pkgs/by-name/me/meson/007-freebsd-pkgconfig-path.patch @@ -0,0 +1,15 @@ +diff -ur a/mesonbuild/modules/pkgconfig.py b/mesonbuild/modules/pkgconfig.py +--- a/mesonbuild/modules/pkgconfig.py 2024-05-17 17:52:30.880877000 -0700 ++++ b/mesonbuild/modules/pkgconfig.py 2024-05-17 17:53:10.901068000 -0700 +@@ -693,10 +693,7 @@ + pcfile = filebase + '.pc' + pkgroot = pkgroot_name = kwargs['install_dir'] or default_install_dir + if pkgroot is None: +- if mesonlib.is_freebsd(): +- pkgroot = os.path.join(_as_str(state.environment.coredata.get_option(mesonlib.OptionKey('prefix'))), 'libdata', 'pkgconfig') +- pkgroot_name = os.path.join('{prefix}', 'libdata', 'pkgconfig') +- elif mesonlib.is_haiku(): ++ if mesonlib.is_haiku(): + pkgroot = os.path.join(_as_str(state.environment.coredata.get_option(mesonlib.OptionKey('prefix'))), 'develop', 'lib', 'pkgconfig') + pkgroot_name = os.path.join('{prefix}', 'develop', 'lib', 'pkgconfig') + else: diff --git a/pkgs/by-name/me/meson/package.nix b/pkgs/by-name/me/meson/package.nix index b2c85c431e01d..5598baeb81ef4 100644 --- a/pkgs/by-name/me/meson/package.nix +++ b/pkgs/by-name/me/meson/package.nix @@ -66,9 +66,16 @@ python3.pkgs.buildPythonApplication rec { # Nixpkgs cctools does not have bitcode support. ./006-disable-bitcode.patch + # This edge case is explicitly part of meson but is wrong for nix + ./007-freebsd-pkgconfig-path.patch + # Fix cross-compilation of proc-macro (and mesa) # https://github.com/mesonbuild/meson/issues/12973 ./0001-Revert-rust-recursively-pull-proc-macro-dependencies.patch + + # Fix compilation of Meson using Ninja 1.12 + # FIXME: remove in the next point release + ./007-Allow-building-via-ninja-12.patch ]; buildInputs = lib.optionals (python3.pythonOlder "3.9") [ @@ -106,7 +113,7 @@ python3.pkgs.buildPythonApplication rec { '' ] # Remove problematic tests - ++ (builtins.map (f: ''rm -vr "${f}";'') [ + ++ (builtins.map (f: ''rm -vr "${f}";'') ([ # requires git, creating cyclic dependency ''test cases/common/66 vcstag'' # requires glib, creating cyclic dependency @@ -116,7 +123,10 @@ python3.pkgs.buildPythonApplication rec { ''test cases/linuxlike/14 static dynamic linkage'' # Nixpkgs cctools does not have bitcode support. ''test cases/osx/7 bitcode'' - ]) + ] ++ lib.optionals stdenv.isFreeBSD [ + # pch doesn't work quite right on FreeBSD, I think + ''test cases/common/13 pch'' + ])) ++ [ ''HOME="$TMPDIR" python ./run_project_tests.py'' "runHook postCheck" diff --git a/pkgs/by-name/me/meson/setup-hook.sh b/pkgs/by-name/me/meson/setup-hook.sh index 85849fbec734a..3f3c7ac59fdea 100644 --- a/pkgs/by-name/me/meson/setup-hook.sh +++ b/pkgs/by-name/me/meson/setup-hook.sh @@ -56,7 +56,7 @@ mesonCheckPhase() { local flagsArray=($mesonCheckFlags "${mesonCheckFlagsArray[@]}") echoCmd 'mesonCheckPhase flags' "${flagsArray[@]}" - meson test --no-rebuild "${flagsArray[@]}" + meson test --no-rebuild --print-errorlogs "${flagsArray[@]}" runHook postCheck } diff --git a/pkgs/development/tools/build-managers/ninja/default.nix b/pkgs/by-name/ni/ninja/package.nix index 3402bcfca625f..23d279e362d76 100644 --- a/pkgs/development/tools/build-managers/ninja/default.nix +++ b/pkgs/by-name/ni/ninja/package.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , asciidoc , docbook_xml_dtd_45 , docbook_xsl @@ -11,17 +10,18 @@ , re2c , buildPackages , buildDocs ? true +, nix-update-script }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ninja"; - version = "1.11.1"; + version = "1.12.1"; src = fetchFromGitHub { owner = "ninja-build"; repo = "ninja"; - rev = "v${version}"; - hash = "sha256-LvV/Fi2ARXBkfyA1paCRmLUwCh/rTyz+tGMg2/qEepI="; + rev = "v${finalAttrs.version}"; + hash = "sha256-RT5u+TDvWxG5EVQEYj931EZyrHUSAqK73OKDAascAwA="; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; @@ -38,15 +38,6 @@ stdenv.mkDerivation rec { libxslt.bin ]; - patches = lib.optionals stdenv.is32bit [ - # Otherwise ninja may fail on some files in a larger FS. - (fetchpatch { - name = "stat64.patch"; - url = "https://github.com/ninja-build/ninja/commit/7bba11ae704efc84cac5fde5e9be53f653f237d1.diff"; - hash = "sha256-tINS57xLh1lwnYFWCQs5OudfgtIShaOh5zbmv7w5BnQ="; - }) - ]; - postPatch = '' # write rebuild args to file after bootstrap substituteInPlace configure.py --replace "subprocess.check_call(rebuild_args)" "open('rebuild_args','w').write(rebuild_args[0])" @@ -91,7 +82,9 @@ stdenv.mkDerivation rec { setupHook = ./setup-hook.sh; - meta = with lib; { + passthru.updateScript = nix-update-script {}; + + meta = { description = "Small build system with a focus on speed"; mainProgram = "ninja"; longDescription = '' @@ -101,8 +94,8 @@ stdenv.mkDerivation rec { to run builds as fast as possible. ''; homepage = "https://ninja-build.org/"; - license = licenses.asl20; - platforms = platforms.unix; - maintainers = with maintainers; [ thoughtpolice bjornfor orivej ]; + license = lib.licenses.asl20; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ thoughtpolice bjornfor orivej ]; }; -} +}) diff --git a/pkgs/development/tools/build-managers/ninja/setup-hook.sh b/pkgs/by-name/ni/ninja/setup-hook.sh index 7fa5e4675f39b..7fa5e4675f39b 100644 --- a/pkgs/development/tools/build-managers/ninja/setup-hook.sh +++ b/pkgs/by-name/ni/ninja/setup-hook.sh diff --git a/pkgs/by-name/re/rerun/package.nix b/pkgs/by-name/re/rerun/package.nix index 844f97700c226..4d9c8da8041c0 100644 --- a/pkgs/by-name/re/rerun/package.nix +++ b/pkgs/by-name/re/rerun/package.nix @@ -78,8 +78,6 @@ rustPlatform.buildRustPackage rec { ] ++ lib.optionals stdenv.isLinux [ (lib.getLib wayland) ]; - env.CARGO_TARGET_WASM32_UNKNOWN_UNKNOWN_LINKER = "lld"; - addDlopenRunpaths = map (p: "${lib.getLib p}/lib") ( lib.optionals stdenv.hostPlatform.isLinux [ libxkbcommon diff --git a/pkgs/by-name/su/surrealist/package.nix b/pkgs/by-name/su/surrealist/package.nix index e67cf28fcdb60..efd1773dee2f8 100644 --- a/pkgs/by-name/su/surrealist/package.nix +++ b/pkgs/by-name/su/surrealist/package.nix @@ -83,7 +83,7 @@ in stdenv.mkDerivation (finalAttrs: { ]; postBuild = '' - CC=clang CARGO_TARGET_WASM32_UNKNOWN_UNKNOWN_LINKER=lld cargo build \ + CC=clang cargo build \ --target wasm32-unknown-unknown \ --release diff --git a/pkgs/by-name/sy/symfony-cli/package.nix b/pkgs/by-name/sy/symfony-cli/package.nix index 20a30fd5d2499..567e4fa36c862 100644 --- a/pkgs/by-name/sy/symfony-cli/package.nix +++ b/pkgs/by-name/sy/symfony-cli/package.nix @@ -10,14 +10,14 @@ buildGoModule rec { pname = "symfony-cli"; - version = "5.8.17"; - vendorHash = "sha256-ARTKJVHgN1Y3xOUc3P2Ch7e8gN9BZbhBEZ1DiM7nEWs="; + version = "5.8.19"; + vendorHash = "sha256-oo4lLJTF44hBb8QaIMONj+2WRdDSlhImZaC/nniWAhs="; src = fetchFromGitHub { owner = "symfony-cli"; repo = "symfony-cli"; rev = "v${version}"; - hash = "sha256-UmGyIZk5s5A8ModafWMZqeJHdZ4fa+hAHi62pdlfJ8I="; + hash = "sha256-TOtz/IPeNmWqDRtenWm+58NWxeIq1gihHnpawOa66YE="; leaveDotGit = true; postFetch = '' git --git-dir $out/.git log -1 --pretty=%cd --date=format:'%Y-%m-%dT%H:%M:%SZ' > $out/SOURCE_DATE diff --git a/pkgs/by-name/te/tetrio-desktop/tetrio-plus.nix b/pkgs/by-name/te/tetrio-desktop/tetrio-plus.nix index a9c6f6080b03a..43102d6c8a26e 100644 --- a/pkgs/by-name/te/tetrio-desktop/tetrio-plus.nix +++ b/pkgs/by-name/te/tetrio-desktop/tetrio-plus.nix @@ -63,7 +63,7 @@ let ]; buildPhase = '' - HOME=$(mktemp -d) RUSTFLAGS="-C linker=lld" wasm-pack build --target web --release + HOME=$(mktemp -d) wasm-pack build --target web --release ''; installPhase = '' diff --git a/pkgs/by-name/wa/waf/hook.nix b/pkgs/by-name/wa/waf/hook.nix index ac497d2278314..8b52538a1b650 100644 --- a/pkgs/by-name/wa/waf/hook.nix +++ b/pkgs/by-name/wa/waf/hook.nix @@ -13,8 +13,6 @@ makeSetupHook { # waf is not inserted into propagatedBuildInputs, rather it is inserted # directly inherit waf; - wafCrossFlags = lib.optionalString (stdenv.hostPlatform.system != stdenv.targetPlatform.system) - ''--cross-compile "--cross-execute=${stdenv.targetPlatform.emulator pkgs}"''; }; meta = { diff --git a/pkgs/by-name/wa/waf/setup-hook.sh b/pkgs/by-name/wa/waf/setup-hook.sh index d3e2bf97e6823..a154ae378a07c 100644 --- a/pkgs/by-name/wa/waf/setup-hook.sh +++ b/pkgs/by-name/wa/waf/setup-hook.sh @@ -22,10 +22,6 @@ wafConfigurePhase() { ${wafConfigureTargets:-configure} ) - if [ -z "${dontAddWafCrossFlags:-}" ]; then - flagsArray+=(@wafCrossFlags@) - fi - echoCmd 'waf configure flags' "${flagsArray[@]}" python "$wafPath" "${flagsArray[@]}" diff --git a/pkgs/development/compilers/gcc/patches/13/ICE-PR110280.patch b/pkgs/development/compilers/gcc/patches/13/ICE-PR110280.patch deleted file mode 100644 index 7338b3dd1ede3..0000000000000 --- a/pkgs/development/compilers/gcc/patches/13/ICE-PR110280.patch +++ /dev/null @@ -1,60 +0,0 @@ -From f4029de35fb1b293a4fd586574b1b4b73ddf7880 Mon Sep 17 00:00:00 2001 -From: Prathamesh Kulkarni <prathamesh.kulkarni@linaro.org> -Date: Wed, 26 Jul 2023 22:36:26 +0530 -Subject: [PATCH] [aarch64/match.pd] Fix ICE observed in PR110280. - -gcc/ChangeLog: - PR tree-optimization/110280 - * match.pd (vec_perm_expr(v, v, mask) -> v): Explicitly build vector - using build_vector_from_val with the element of input operand, and - mask's type if operand and mask's types don't match. - -gcc/testsuite/ChangeLog: - PR tree-optimization/110280 - * gcc.target/aarch64/sve/pr110280.c: New test. - -(cherry picked from commit 85d8e0d8d5342ec8b4e6a54e22741c30b33c6f04) ---- - gcc/match.pd | 9 ++++++++- - gcc/testsuite/gcc.target/aarch64/sve/pr110280.c | 12 ++++++++++++ - 2 files changed, 20 insertions(+), 1 deletion(-) - create mode 100644 gcc/testsuite/gcc.target/aarch64/sve/pr110280.c - -diff --git a/gcc/match.pd b/gcc/match.pd -index 9118244825054..c3bb4fbc0a7a2 100644 ---- a/gcc/match.pd -+++ b/gcc/match.pd -@@ -8292,7 +8292,14 @@ and, - - (simplify - (vec_perm vec_same_elem_p@0 @0 @1) -- @0) -+ (if (types_match (type, TREE_TYPE (@0))) -+ @0 -+ (with -+ { -+ tree elem = uniform_vector_p (@0); -+ } -+ (if (elem) -+ { build_vector_from_val (type, elem); })))) - - /* Push VEC_PERM earlier if that may help FMA perception (PR101895). */ - (simplify -diff --git a/gcc/testsuite/gcc.target/aarch64/sve/pr110280.c b/gcc/testsuite/gcc.target/aarch64/sve/pr110280.c -new file mode 100644 -index 0000000000000..d3279f383629f ---- /dev/null -+++ b/gcc/testsuite/gcc.target/aarch64/sve/pr110280.c -@@ -0,0 +1,12 @@ -+/* { dg-do compile } */ -+/* { dg-options "-O3 -fdump-tree-optimized" } */ -+ -+#include "arm_sve.h" -+ -+svuint32_t l() -+{ -+ _Alignas(16) const unsigned int lanes[4] = {0, 0, 0, 0}; -+ return svld1rq_u32(svptrue_b8(), lanes); -+} -+ -+/* { dg-final { scan-tree-dump-not "VEC_PERM_EXPR" "optimized" } } */ diff --git a/pkgs/development/compilers/gcc/patches/default.nix b/pkgs/development/compilers/gcc/patches/default.nix index 13b4bcbf6f8cd..8f0a499da362a 100644 --- a/pkgs/development/compilers/gcc/patches/default.nix +++ b/pkgs/development/compilers/gcc/patches/default.nix @@ -77,7 +77,6 @@ in ++ optional langFortran (if atLeast12 then ./gcc-12-gfortran-driving.patch else ./gfortran-driving.patch) ++ optional atLeast7 ./ppc-musl.patch ++ optional is12 ./12/lambda-ICE-PR109241.patch # backport ICE fix on ccache code -++ optional is13 ./13/ICE-PR110280.patch # backport ICE fix on const_unop ++ optional (atLeast9 && langD) ./libphobos.patch @@ -153,8 +152,8 @@ in }) ]; "13" = [ (fetchpatch { name = "gcc-13-darwin-aarch64-support.patch"; - url = "https://raw.githubusercontent.com/Homebrew/formula-patches/3c5cbc8e9cf444a1967786af48e430588e1eb481/gcc/gcc-13.2.0.diff"; - sha256 = "sha256-Y5r3U3dwAFG6+b0TNCFd18PNxYu2+W/5zDbZ5cHvv+U="; + url = "https://raw.githubusercontent.com/Homebrew/formula-patches/bda0faddfbfb392e7b9c9101056b2c5ab2500508/gcc/gcc-13.3.0.diff"; + sha256 = "sha256-RBTCBXIveGwuQGJLzMW/UexpUZdDgdXprp/G2NHkmQo="; }) ]; "12" = [ (fetchurl { name = "gcc-12-darwin-aarch64-support.patch"; diff --git a/pkgs/development/compilers/gcc/versions.nix b/pkgs/development/compilers/gcc/versions.nix index 90c4949b19ea1..3421152ef12ac 100644 --- a/pkgs/development/compilers/gcc/versions.nix +++ b/pkgs/development/compilers/gcc/versions.nix @@ -1,7 +1,7 @@ let majorMinorToVersionMap = { "14" = "14.1.0"; - "13" = "13.2.0"; + "13" = "13.3.0"; "12" = "12.3.0"; "11" = "11.4.0"; "10" = "10.5.0"; @@ -21,7 +21,7 @@ let # NOTE: there is no need to remove hashes of obsolete minor # versions when adding a new minor version. "14.1.0" = "sha256-4oPGVJh6/j3p2AgLwL15U0tcoNaBpzoR/ytdN2dCaEA="; - "13.2.0" = "sha256-4nXnZEKmBnNBon8Exca4PYYTFEAEwEE1KIY9xrXHQ9o="; + "13.3.0" = "sha256-CEXpYhyVQ6E/SE6UWEpJ/8ASmXDpkUYkI1/B0GGgwIM="; "12.3.0" = "sha256-lJpdT5nnhkIak7Uysi/6tVeN5zITaZdbka7Jet/ajDs="; "11.4.0" = "sha256-Py2yIrAH6KSiPNW6VnJu8I6LHx6yBV7nLBQCzqc6jdk="; "10.5.0" = "sha256-JRCVQ/30bzl8NHtdi3osflaUpaUczkucbh6opxyjB8E="; diff --git a/pkgs/development/compilers/llvm/16/compiler-rt/asan-offset.patch b/pkgs/development/compilers/llvm/16/compiler-rt/asan-offset.patch new file mode 100644 index 0000000000000..46afe5c007347 --- /dev/null +++ b/pkgs/development/compilers/llvm/16/compiler-rt/asan-offset.patch @@ -0,0 +1,11 @@ +--- a/lib/asan/CMakeLists.txt 2022-06-22 16:46:24.000000000 +0000 ++++ b/lib/asan/CMakeLists.txt +@@ -46,7 +46,7 @@ set(ASAN_STATIC_SOURCES + asan_rtl_static.cpp + ) + +-if (NOT WIN32 AND NOT APPLE) ++if (LINUX) + list(APPEND ASAN_STATIC_SOURCES + asan_rtl_x86_64.S + ) diff --git a/pkgs/development/compilers/llvm/16/compiler-rt/freebsd-i386.patch b/pkgs/development/compilers/llvm/16/compiler-rt/freebsd-i386.patch new file mode 100644 index 0000000000000..0a221750552a0 --- /dev/null +++ b/pkgs/development/compilers/llvm/16/compiler-rt/freebsd-i386.patch @@ -0,0 +1,21 @@ +--- a/lib/builtins/fp_lib.h 1969-12-31 16:00:01.000000000 -0800 ++++ b/lib/builtins/fp_lib.h 2023-12-21 23:39:36.066927293 -0800 +@@ -26,18 +26,6 @@ + #include <stdbool.h> + #include <stdint.h> + +-// x86_64 FreeBSD prior v9.3 define fixed-width types incorrectly in +-// 32-bit mode. +-#if defined(__FreeBSD__) && defined(__i386__) +-#include <sys/param.h> +-#if __FreeBSD_version < 903000 // v9.3 +-#define uint64_t unsigned long long +-#define int64_t long long +-#undef UINT64_C +-#define UINT64_C(c) (c##ULL) +-#endif +-#endif +- + #if defined SINGLE_PRECISION + + typedef uint16_t half_rep_t; diff --git a/pkgs/development/compilers/llvm/common/compiler-rt/default.nix b/pkgs/development/compilers/llvm/common/compiler-rt/default.nix index 7d47436b714ff..23a966ce238f6 100644 --- a/pkgs/development/compilers/llvm/common/compiler-rt/default.nix +++ b/pkgs/development/compilers/llvm/common/compiler-rt/default.nix @@ -139,11 +139,17 @@ stdenv.mkDerivation ({ '') + '' substituteInPlace lib/builtins/int_util.c \ --replace "#include <stdlib.h>" "" + '' + (if stdenv.hostPlatform.isFreeBSD then + # As per above, but in FreeBSD assert is a macro and simply allowing it to be implicitly declared causes Issues!!!!! + '' + substituteInPlace lib/builtins/clear_cache.c lib/builtins/cpu_model.c \ + --replace "#include <assert.h>" "#define assert(e) ((e)?(void)0:__assert(__FUNCTION__,__FILE__,__LINE__,#e))" + '' else '' substituteInPlace lib/builtins/clear_cache.c \ --replace "#include <assert.h>" "" substituteInPlace lib/builtins/cpu_model${lib.optionalString (lib.versionAtLeast version "18") "/x86"}.c \ --replace "#include <assert.h>" "" - ''); + '')); # Hack around weird upsream RPATH bug postInstall = lib.optionalString (stdenv.hostPlatform.isDarwin) '' diff --git a/pkgs/development/compilers/llvm/common/libcxx/default.nix b/pkgs/development/compilers/llvm/common/libcxx/default.nix index de2efed85936f..b2c23f35f0a18 100644 --- a/pkgs/development/compilers/llvm/common/libcxx/default.nix +++ b/pkgs/development/compilers/llvm/common/libcxx/default.nix @@ -13,12 +13,16 @@ , python3 , fixDarwinDylibNames , version -, cxxabi ? if stdenv.hostPlatform.isFreeBSD then libcxxrt else null +, cxxabi ? null , libcxxrt , libunwind , enableShared ? !stdenv.hostPlatform.isStatic }: +# note: our setup using libcxxabi instead of libcxxrt on FreeBSD diverges from +# normal FreeBSD. This may cause issues with binary patching down the line. +# If this becomes an issue, try adding as symlink libcxxrt.so -> libc++abi.so + # external cxxabi is not supported on Darwin as the build will not link libcxx # properly and not re-export the cxxabi symbols into libcxx # https://github.com/NixOS/nixpkgs/issues/166205 diff --git a/pkgs/development/compilers/llvm/common/llvm/default.nix b/pkgs/development/compilers/llvm/common/llvm/default.nix index 705dfed8a2496..d43e62d5a8952 100644 --- a/pkgs/development/compilers/llvm/common/llvm/default.nix +++ b/pkgs/development/compilers/llvm/common/llvm/default.nix @@ -39,6 +39,7 @@ # broken for the armv7l builder && !stdenv.hostPlatform.isAarch , enablePolly ? lib.versionAtLeast release_version "14" +, enableTerminfo ? true }: let @@ -124,59 +125,54 @@ stdenv.mkDerivation (rec { substituteInPlace cmake/modules/AddLLVM.cmake \ --replace 'set(_install_name_dir INSTALL_NAME_DIR "@rpath")' "set(_install_name_dir)" \ --replace 'set(_install_rpath "@loader_path/../''${CMAKE_INSTALL_LIBDIR}''${LLVM_LIBDIR_SUFFIX}" ''${extra_libdir})' "" - '' + (optionalString (lib.versionAtLeast release_version "15") ('' - + '' + # As of LLVM 15, marked as XFAIL on arm64 macOS but lit doesn't seem to pick # this up: https://github.com/llvm/llvm-project/blob/c344d97a125b18f8fed0a64aace73c49a870e079/llvm/test/MC/ELF/cfi-version.ll#L7 + (optionalString (lib.versionAtLeast release_version "15") ('' rm test/MC/ELF/cfi-version.ll + '' + # This test tries to call `sw_vers` by absolute path (`/usr/bin/sw_vers`) # and thus fails under the sandbox: - '' + (if lib.versionAtLeast release_version "16" then '' + (if lib.versionAtLeast release_version "16" then '' substituteInPlace unittests/TargetParser/Host.cpp \ --replace '/usr/bin/sw_vers' "${(builtins.toString darwin.DarwinTools) + "/bin/sw_vers" }" '' else '' substituteInPlace unittests/Support/Host.cpp \ --replace '/usr/bin/sw_vers' "${(builtins.toString darwin.DarwinTools) + "/bin/sw_vers" }" - '') + optionalString (lib.versionAtLeast release_version "16") '' - + '') + # This test tries to call the intrinsics `@llvm.roundeven.f32` and # `@llvm.roundeven.f64` which seem to (incorrectly?) lower to `roundevenf` - # and `roundeven` on macOS. + # and `roundeven` on macOS and FreeBSD. # # However these functions are glibc specific so the test fails: # - https://www.gnu.org/software/gnulib/manual/html_node/roundevenf.html # - https://www.gnu.org/software/gnulib/manual/html_node/roundeven.html # + # TODO(@rrbutani): this seems to run fine on `aarch64-darwin`, why does it + # pass there? + optionalString (lib.versionAtLeast release_version "16") '' substituteInPlace test/ExecutionEngine/Interpreter/intrinsics.ll \ --replace "%roundeven32 = call float @llvm.roundeven.f32(float 0.000000e+00)" "" \ --replace "%roundeven64 = call double @llvm.roundeven.f64(double 0.000000e+00)" "" - '' + optionalString (!stdenv.hostPlatform.isx86 && lib.versionAtLeast release_version "18") '' - + '' + # fails when run in sandbox + optionalString (!stdenv.hostPlatform.isx86 && lib.versionAtLeast release_version "18") '' substituteInPlace unittests/Support/VirtualFileSystemTest.cpp \ --replace "PhysicalFileSystemWorkingDirFailure" "DISABLED_PhysicalFileSystemWorkingDirFailure" - ''))) + optionalString (stdenv.isDarwin && stdenv.hostPlatform.isx86 && lib.versionAtLeast release_version "15") (optionalString (lib.versionOlder release_version "16") '' - # This test tries to call the intrinsics `@llvm.roundeven.f32` and - # `@llvm.roundeven.f64` which seem to (incorrectly?) lower to `roundevenf` - # and `roundeven` on x86_64 macOS. - # - # However these functions are glibc specific so the test fails: - # - https://www.gnu.org/software/gnulib/manual/html_node/roundevenf.html - # - https://www.gnu.org/software/gnulib/manual/html_node/roundeven.html - # - # TODO(@rrbutani): this seems to run fine on `aarch64-darwin`, why does it - # pass there? + ''))) + + # dup of above patch with different conditions + optionalString (stdenv.isDarwin && stdenv.hostPlatform.isx86 && lib.versionAtLeast release_version "15") (optionalString (lib.versionOlder release_version "16") '' substituteInPlace test/ExecutionEngine/Interpreter/intrinsics.ll \ --replace "%roundeven32 = call float @llvm.roundeven.f32(float 0.000000e+00)" "" \ --replace "%roundeven64 = call double @llvm.roundeven.f64(double 0.000000e+00)" "" - '' + ((optionalString (lib.versionAtLeast release_version "18") '' - + '' + # fails when run in sandbox + ((optionalString (lib.versionAtLeast release_version "18") '' substituteInPlace unittests/Support/VirtualFileSystemTest.cpp \ --replace "PhysicalFileSystemWorkingDirFailure" "DISABLED_PhysicalFileSystemWorkingDirFailure" - '') + '' + '') + # This test fails on darwin x86_64 because `sw_vers` reports a different # macOS version than what LLVM finds by reading # `/System/Library/CoreServices/SystemVersion.plist` (which is passed into @@ -205,19 +201,20 @@ stdenv.mkDerivation (rec { # not clear to me when/where/for what this even gets used in LLVM. # # TODO(@rrbutani): fix/follow-up - '' + (if lib.versionAtLeast release_version "16" then '' + (if lib.versionAtLeast release_version "16" then '' substituteInPlace unittests/TargetParser/Host.cpp \ --replace "getMacOSHostVersion" "DISABLED_getMacOSHostVersion" '' else '' substituteInPlace unittests/Support/Host.cpp \ --replace "getMacOSHostVersion" "DISABLED_getMacOSHostVersion" - '') + '' - + '') + # This test fails with a `dysmutil` crash; have not yet dug into what's # going on here (TODO(@rrbutani)). + '' rm test/tools/dsymutil/ARM/obfuscated.test - '')) + '' + '')) + # FileSystem permissions tests fail with various special bits + '' substituteInPlace unittests/Support/CMakeLists.txt \ --replace "Path.cpp" "" rm unittests/Support/Path.cpp @@ -229,22 +226,24 @@ stdenv.mkDerivation (rec { '' + lib.optionalString (lib.versionOlder release_version "13") '' # TODO: Fix failing tests: rm test/DebugInfo/X86/vla-multi.ll - '' + lib.optionalString (lib.versionAtLeast release_version "16") ('' - + '' + # Fails in the presence of anti-virus software or other intrusion-detection software that # modifies the atime when run. See #284056. + lib.optionalString (lib.versionAtLeast release_version "16") ('' rm test/tools/llvm-objcopy/ELF/strip-preserve-atime.test '' + lib.optionalString (lib.versionOlder release_version "17") '' - '') + lib.optionalString (lib.versionAtLeast release_version "15" && lib.versionOlder release_version "17") '' + '') + # timing-based tests are trouble + lib.optionalString (lib.versionAtLeast release_version "15" && lib.versionOlder release_version "17") '' rm utils/lit/tests/googletest-timeout.py - '' + optionalString stdenv.hostPlatform.isMusl '' + '' + + # valgrind unhappy with musl or glibc, but fails w/musl only + optionalString stdenv.hostPlatform.isMusl '' patch -p1 -i ${./TLI-musl.patch} substituteInPlace unittests/Support/CMakeLists.txt \ --replace "add_subdirectory(DynamicLibrary)" "" rm unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp - # valgrind unhappy with musl or glibc, but fails w/musl only rm test/CodeGen/AArch64/wineh4.mir '' + optionalString stdenv.hostPlatform.isAarch32 '' # skip failing X86 test cases on 32-bit ARM @@ -254,18 +253,28 @@ stdenv.mkDerivation (rec { rm test/tools/dsymutil/X86/op-convert.test rm test/tools/gold/X86/split-dwarf.ll rm test/tools/llvm-objcopy/MachO/universal-object.test - '' + optionalString (stdenv.hostPlatform.system == "armv6l-linux") '' + '' + # Seems to require certain floating point hardware (NEON?) + optionalString (stdenv.hostPlatform.system == "armv6l-linux") '' rm test/ExecutionEngine/frem.ll + '' + + # 1. TODO: Why does this test fail on FreeBSD? + # It seems to reference /usr/local/lib/libfile.a, which is clearly a problem. + # 2. This test fails for the same reason it fails on MacOS, but the fix is + # not trivial to apply. + optionalString stdenv.isFreeBSD '' + rm test/tools/llvm-libtool-darwin/L-and-l.test + rm test/ExecutionEngine/Interpreter/intrinsics.ll '' + '' patchShebangs test/BugPoint/compile-custom.ll.py - '' + (lib.optionalString (lib.versionOlder release_version "13") '' + '' + # Tweak tests to ignore namespace part of type to support # gcc-12: https://gcc.gnu.org/PR103598. # The change below mangles strings like: # CHECK-NEXT: Starting llvm::Function pass manager run. # to: # CHECK-NEXT: Starting {{.*}}Function pass manager run. + (lib.optionalString (lib.versionOlder release_version "13") ('' for f in \ test/Other/new-pass-manager.ll \ test/Other/new-pm-O0-defaults.ll \ @@ -286,18 +295,19 @@ stdenv.mkDerivation (rec { --replace 'Starting llvm::' 'Starting {{.*}}' \ --replace 'Finished llvm::' 'Finished {{.*}}' done + '' + # gcc-13 fix + '' sed -i '/#include <string>/i#include <cstdint>' \ include/llvm/DebugInfo/Symbolize/DIPrinter.h - ''); + '')); + # Workaround for configure flags that need to have spaces preConfigure = if lib.versionAtLeast release_version "15" then '' - # Workaround for configure flags that need to have spaces cmakeFlagsArray+=( -DLLVM_LIT_ARGS="-svj''${NIX_BUILD_CORES} --no-progress-bar" ) '' else '' - # Workaround for configure flags that need to have spaces cmakeFlagsArray+=( -DLLVM_LIT_ARGS='-svj''${NIX_BUILD_CORES} --no-progress-bar' ) @@ -332,9 +342,13 @@ stdenv.mkDerivation (rec { "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}" "-DLLVM_ENABLE_DUMP=ON" + (lib.cmakeBool "LLVM_ENABLE_TERMINFO" enableTerminfo) + ] ++ optionals (!doCheck) [ + "-DLLVM_INCLUDE_TESTS=OFF" ] ++ optionals stdenv.hostPlatform.isStatic [ # Disables building of shared libs, -fPIC is still injected by cc-wrapper "-DLLVM_ENABLE_PIC=OFF" + "-DCMAKE_SKIP_INSTALL_RPATH=ON" "-DLLVM_BUILD_STATIC=ON" # libxml2 needs to be disabled because the LLVM build system ignores its .la # file and doesn't link zlib as well. diff --git a/pkgs/development/compilers/rust/1_77.nix b/pkgs/development/compilers/rust/1_77.nix deleted file mode 100644 index ab501aba8ffbe..0000000000000 --- a/pkgs/development/compilers/rust/1_77.nix +++ /dev/null @@ -1,59 +0,0 @@ -# New rust versions should first go to staging. -# Things to check after updating: -# 1. Rustc should produce rust binaries on x86_64-linux, aarch64-linux and x86_64-darwin: -# i.e. nix-shell -p fd or @GrahamcOfBorg build fd on github -# This testing can be also done by other volunteers as part of the pull -# request review, in case platforms cannot be covered. -# 2. The LLVM version used for building should match with rust upstream. -# Check the version number in the src/llvm-project git submodule in: -# https://github.com/rust-lang/rust/blob/<version-tag>/.gitmodules -# 3. Firefox and Thunderbird should still build on x86_64-linux. - -{ stdenv, lib -, newScope, callPackage -, CoreFoundation, Security, SystemConfiguration -, pkgsBuildTarget, pkgsBuildBuild, pkgsBuildHost, pkgsTargetTarget -, makeRustPlatform -, wrapRustcWith -, llvmPackages_17, llvm_17 -} @ args: - -import ./default.nix { - rustcVersion = "1.77.2"; - rustcSha256 = "xhRX749ZZjj928dxZ3iy9rmf8SUTo7DxOZTDvFIWOMM="; - - llvmSharedForBuild = pkgsBuildBuild.llvmPackages_17.libllvm.override { enableSharedLibraries = true; }; - llvmSharedForHost = pkgsBuildHost.llvmPackages_17.libllvm.override { enableSharedLibraries = true; }; - llvmSharedForTarget = pkgsBuildTarget.llvmPackages_17.libllvm.override { enableSharedLibraries = true; }; - - # For use at runtime - llvmShared = llvm_17.override { enableSharedLibraries = true; }; - - # Expose llvmPackages used for rustc from rustc via passthru for LTO in Firefox - llvmPackages = llvmPackages_17; - - # Note: the version MUST be one version prior to the version we're - # building - bootstrapVersion = "1.76.0"; - - # fetch hashes by running `print-hashes.sh ${bootstrapVersion}` - bootstrapHashes = { - i686-unknown-linux-gnu = "4c3eefc9341b8809235e6c4fbcbc19ab52a5cbe771292c400df068c12984fa3e"; - x86_64-unknown-linux-gnu = "9d589d2036b503cc45ecc94992d616fb3deec074deb36cacc2f5c212408f7399"; - x86_64-unknown-linux-musl = "aa8568f4d262468aaf4f622bd421c5435b24454d8fbcdae48da1162962205384"; - arm-unknown-linux-gnueabihf = "7d1da067362fc64bcad198d90a61e024d5712aed76e17b28e1cd7e8ba263cc6f"; - armv7-unknown-linux-gnueabihf = "c03346d56d4a860cd3a8d2d2a7ea75c510b68204e3ad97b3770076595261c913"; - aarch64-unknown-linux-gnu = "2e8313421e8fb673efdf356cdfdd4bc16516f2610d4f6faa01327983104c05a0"; - aarch64-unknown-linux-musl = "a1d1c8ccb8ea00cfa2b79d80411b8eb22b2bef5214f86536825361e98d7c617a"; - x86_64-apple-darwin = "7bdbe085695df8e46389115e99eda7beed37a9494f6b961b45554c658e53b8e7"; - aarch64-apple-darwin = "17496f15c3cb6ff73d5c36f5b54cc110f1ac31fa09521a7991c0d7ddd890dceb"; - powerpc64le-unknown-linux-gnu = "44b3494675284d26b04747a824dc974e32fd8fd46fc0aa06a7c8ebe851332d2c"; - riscv64gc-unknown-linux-gnu = "4a9db321874fc441235b71eb8aa295fc50251305e461540b25b4eef89fb56255"; - }; - - selectRustPackage = pkgs: pkgs.rust_1_77; - - rustcPatches = [ ]; -} - -(builtins.removeAttrs args [ "llvmPackages_17" "llvm_17"]) diff --git a/pkgs/development/compilers/rust/1_78.nix b/pkgs/development/compilers/rust/1_78.nix new file mode 100644 index 0000000000000..3ce368e8d99fb --- /dev/null +++ b/pkgs/development/compilers/rust/1_78.nix @@ -0,0 +1,59 @@ +# New rust versions should first go to staging. +# Things to check after updating: +# 1. Rustc should produce rust binaries on x86_64-linux, aarch64-linux and x86_64-darwin: +# i.e. nix-shell -p fd or @GrahamcOfBorg build fd on github +# This testing can be also done by other volunteers as part of the pull +# request review, in case platforms cannot be covered. +# 2. The LLVM version used for building should match with rust upstream. +# Check the version number in the src/llvm-project git submodule in: +# https://github.com/rust-lang/rust/blob/<version-tag>/.gitmodules +# 3. Firefox and Thunderbird should still build on x86_64-linux. + +{ stdenv, lib +, newScope, callPackage +, CoreFoundation, Security, SystemConfiguration +, pkgsBuildTarget, pkgsBuildBuild, pkgsBuildHost, pkgsTargetTarget +, makeRustPlatform +, wrapRustcWith +, llvmPackages_18, llvm_18 +} @ args: + +import ./default.nix { + rustcVersion = "1.78.0"; + rustcSha256 = "/1RII6XLJ/JzgShXfx5+AO6PTIPyo0h4GuT8NV6R1ak="; + + llvmSharedForBuild = pkgsBuildBuild.llvmPackages_18.libllvm.override { enableSharedLibraries = true; }; + llvmSharedForHost = pkgsBuildHost.llvmPackages_18.libllvm.override { enableSharedLibraries = true; }; + llvmSharedForTarget = pkgsBuildTarget.llvmPackages_18.libllvm.override { enableSharedLibraries = true; }; + + # For use at runtime + llvmShared = llvm_18.override { enableSharedLibraries = true; }; + + # Expose llvmPackages used for rustc from rustc via passthru for LTO in Firefox + llvmPackages = llvmPackages_18; + + # Note: the version MUST be one version prior to the version we're + # building + bootstrapVersion = "1.77.2"; + + # fetch hashes by running `print-hashes.sh ${bootstrapVersion}` + bootstrapHashes = { + i686-unknown-linux-gnu = "168e653fbc30b3a80801bc7735a79ff644651618434234959925f669bf77d1a2"; + x86_64-unknown-linux-gnu = "b7d12b1b162c36c1fd5234b4b16856aa7eafca91d17c49787f6487cb26f4062d"; + x86_64-unknown-linux-musl = "2e08fe23c4837a780a40ebfac601760cd6297581d21eae2f88cb59060243a375"; + arm-unknown-linux-gnueabihf = "9f14a31dbef0153c0a7463a79cf8f9e8295b355354de41aa054953027beb70d7"; + armv7-unknown-linux-gnueabihf = "b37649399081228244b3ff3acc6047f6c138e602c721cd500efe43715d043c5e"; + aarch64-unknown-linux-gnu = "297c6201edd42e580f242fcd75b521b0392f6f3be02cf03ca76690fece4a74da"; + aarch64-unknown-linux-musl = "fdd9c485f93c73a085c113b4f0fbad0989f79153079d394ec4bbac2b3804f71b"; + x86_64-apple-darwin = "16bbbfcf0c982b35271d8904977d80fda1bb7caa7f898abceed3569a867d9cea"; + aarch64-apple-darwin = "415bb2bc198feb0f2d8329e33c57d0890bbd57977d1ae48b17f6c7e1f632eaa7"; + powerpc64le-unknown-linux-gnu = "79582acb339bd2d79fef095b977049049ffa04616011f1af1793fb8e98194b19"; + riscv64gc-unknown-linux-gnu = "300fe4861e2d1f6e4c4f5e36ae7997beca8a979343a7f661237ab78a37a54648"; + }; + + selectRustPackage = pkgs: pkgs.rust_1_78; + + rustcPatches = [ ]; +} + +(builtins.removeAttrs args [ "llvmPackages_18" "llvm_18"]) diff --git a/pkgs/development/compilers/rust/cargo-auditable.nix b/pkgs/development/compilers/rust/cargo-auditable.nix index 1cf765b35100d..0b3b6a4ede982 100644 --- a/pkgs/development/compilers/rust/cargo-auditable.nix +++ b/pkgs/development/compilers/rust/cargo-auditable.nix @@ -22,11 +22,6 @@ let cargoHash = "sha256-4o3ctun/8VcBRuj+j0Yaawdkyn6Z6LPp+FTyhPxQWU8="; - # Cargo.lock is outdated - preConfigure = '' - cargo update --offline - ''; - meta = with lib; { description = "A tool to make production Rust binaries auditable"; mainProgram = "cargo-auditable"; diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index 4c02692b75bd5..254732ed26035 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -192,6 +192,12 @@ in stdenv.mkDerivation (finalAttrs: { postPatch = '' patchShebangs src/etc + # rust-lld is the name rustup uses for its bundled lld, so that it + # doesn't conflict with any system lld. This is not an + # appropriate default for Nixpkgs, where there is no rust-lld. + substituteInPlace compiler/rustc_target/src/spec/*/*.rs \ + --replace-quiet '"rust-lld"' '"lld"' + ${optionalString (!withBundledLLVM) "rm -rf src/llvm"} # Useful debugging parameter diff --git a/pkgs/development/interpreters/emilua/default.nix b/pkgs/development/interpreters/emilua/default.nix index e71c47ae59cbc..396164b14a891 100644 --- a/pkgs/development/interpreters/emilua/default.nix +++ b/pkgs/development/interpreters/emilua/default.nix @@ -98,13 +98,11 @@ stdenv.mkDerivation rec { doCheck = true; - # Skipped test: libpsx - # Known issue with no-new-privs disabled in the Nix build environment. - checkPhase = '' - runHook preCheck - meson test --print-errorlogs --no-suite libpsx - runHook postCheck - ''; + mesonCheckFlags = [ + # Skipped test: libpsx + # Known issue with no-new-privs disabled in the Nix build environment. + "--no-suite" "libpsx" + ]; meta = with lib; { description = "Lua execution engine"; diff --git a/pkgs/development/interpreters/luajit/2.0.nix b/pkgs/development/interpreters/luajit/2.0.nix index 29ad88f0ec160..9ad3099143c8d 100644 --- a/pkgs/development/interpreters/luajit/2.0.nix +++ b/pkgs/development/interpreters/luajit/2.0.nix @@ -1,18 +1,19 @@ { self, callPackage, fetchFromGitHub, lib, passthruFun }: -callPackage ./default.nix rec { +callPackage ./default.nix { # The patch version is the timestamp of the git commit, # obtain via `cat $(nix-build -A luajit_2_0.src)/.relver` - version = "2.0.1693340858"; + version = "2.0.1713483859"; src = fetchFromGitHub { owner = "LuaJIT"; repo = "LuaJIT"; - rev = "c6ee7e19d107b4f9a140bb2ccf99162e26318c69"; - hash = "sha256-3/7ASZRniytw5RkOy0F9arHkZevq6dxmya+Ba3A5IIA="; + rev = "9b5e837ac2dfdc0638830c048a47ca9378c504d3"; + hash = "sha256-GflF/sELSNanc9G4WMzoOadUBOFSs6OwqhAXa4sudWA="; }; - extraMeta = { # this isn't precise but it at least stops the useless Hydra build + extraMeta = { + # this isn't precise but it at least stops the useless Hydra build platforms = with lib; filter (p: !hasPrefix "aarch64-" p) (platforms.linux ++ platforms.darwin); }; diff --git a/pkgs/development/interpreters/luajit/2.1.nix b/pkgs/development/interpreters/luajit/2.1.nix index cf8531b7352d4..90d7769e1d57d 100644 --- a/pkgs/development/interpreters/luajit/2.1.nix +++ b/pkgs/development/interpreters/luajit/2.1.nix @@ -1,15 +1,15 @@ { self, callPackage, fetchFromGitHub, passthruFun }: -callPackage ./default.nix rec { +callPackage ./default.nix { # The patch version is the timestamp of the git commit, # obtain via `cat $(nix-build -A luajit_2_1.src)/.relver` - version = "2.1.1693350652"; + version = "2.1.1713773202"; src = fetchFromGitHub { owner = "LuaJIT"; repo = "LuaJIT"; - rev = "41fb94defa8f830ce69a8122b03f6ac3216d392a"; - hash = "sha256-iY80CA97RqJ9gF1Kl7ms/lC6m6KScjxWmljh5Gy7Brg="; + rev = "5790d253972c9d78a0c2aece527eda5b134bbbf7"; + hash = "sha256-WG8AWDI182/9O7NrZlQ6ZH/esyYE2pWXMuSzWUuntSA="; }; inherit self passthruFun; diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index 37b9d19fe88d9..2df060a526132 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -121,6 +121,9 @@ let versionOlder ; + # mixes libc and libxcrypt headers and libs and causes segfaults on importing crypt + libxcrypt = if stdenv.hostPlatform.isFreeBSD then null else inputs.libxcrypt; + buildPackages = pkgsBuildHost; inherit (passthru) pythonOnBuildForHost; @@ -261,6 +264,7 @@ let multiarch = if isDarwin then "darwin" + else if isFreeBSD then "" else if isWindows then "" else "${multiarchCpu}-${machdep}-${pythonAbiName}"; @@ -445,7 +449,11 @@ in with passthru; stdenv.mkDerivation (finalAttrs: { "LDFLAGS=-static" ]; - preConfigure = optionalString (pythonOlder "3.12") '' + preConfigure = '' + # Attempt to purify some of the host info collection + sed -E -i -e 's/uname -r/echo/g' -e 's/uname -n/echo nixpkgs/g' config.guess + sed -E -i -e 's/uname -r/echo/g' -e 's/uname -n/echo nixpkgs/g' configure + '' + optionalString (pythonOlder "3.12") '' # Improve purity for path in /usr /sw /opt /pkg; do substituteInPlace ./setup.py --replace-warn $path /no-such-path @@ -453,6 +461,8 @@ in with passthru; stdenv.mkDerivation (finalAttrs: { '' + optionalString stdenv.isDarwin '' # Override the auto-detection in setup.py, which assumes a universal build export PYTHON_DECIMAL_WITH_MACHINE=${if stdenv.isAarch64 then "uint128" else "x64"} + # Ensure that modern platform features are enabled on Darwin in spite of having no version suffix. + sed -E -i -e 's|Darwin/\[12\]\[0-9\]\.\*|Darwin/*|' configure '' + optionalString (stdenv.isDarwin && x11Support && pythonAtLeast "3.11") '' export TCLTK_LIBS="-L${tcl}/lib -L${tk}/lib -l${tcl.libPrefix} -l${tk.libPrefix}" export TCLTK_CFLAGS="-I${tcl}/include -I${tk}/include" @@ -476,10 +486,10 @@ in with passthru; stdenv.mkDerivation (finalAttrs: { postInstall = let # References *not* to nuke from (sys)config files keep-references = concatMapStringsSep " " (val: "-e ${val}") ([ - (placeholder "out") libxcrypt - ] ++ optionals tzdataSupport [ - tzdata - ]); + (placeholder "out") + ] ++ lib.optional (libxcrypt != null) libxcrypt + ++ lib.optional tzdataSupport tzdata + ); in lib.optionalString enableFramework '' for dir in include lib share; do ln -s $out/Library/Frameworks/Python.framework/Versions/Current/$dir $out/$dir @@ -661,7 +671,7 @@ in with passthru; stdenv.mkDerivation (finalAttrs: { ''; license = licenses.psfl; pkgConfigModules = [ "python3" ]; - platforms = platforms.linux ++ platforms.darwin ++ platforms.windows; + platforms = platforms.linux ++ platforms.darwin ++ platforms.windows ++ platforms.freebsd; mainProgram = executable; }; }) diff --git a/pkgs/development/interpreters/ruby/rubygems/default.nix b/pkgs/development/interpreters/ruby/rubygems/default.nix index 8c0bc2208c10c..9ad7a04eab066 100644 --- a/pkgs/development/interpreters/ruby/rubygems/default.nix +++ b/pkgs/development/interpreters/ruby/rubygems/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "rubygems"; - version = "3.5.9"; + version = "3.5.11"; src = fetchurl { url = "https://rubygems.org/rubygems/rubygems-${version}.tgz"; - hash = "sha256-KyA2Qhkea7ns4ZB19iJ1qIUmMZsSRoTEZmdBXcpDY/E="; + hash = "sha256-RSG1L4Q2IKn8XKdBRSa3RjsJiVZMOugLJraPvRMEyBg="; }; patches = [ diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix index 1e63f3bfdef18..0096f3b265b64 100644 --- a/pkgs/development/libraries/SDL2/default.nix +++ b/pkgs/development/libraries/SDL2/default.nix @@ -58,13 +58,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "SDL2"; - version = "2.30.2"; + version = "2.30.3"; src = fetchFromGitHub { owner = "libsdl-org"; repo = "SDL"; rev = "release-${finalAttrs.version}"; - hash = "sha256-yYYtsF6+IKynXpfay0rUmCQPdL8vp6dlmon8N7UG89A="; + hash = "sha256-ycY/AkWulV3vAu/+vKw+j/b6jTZWjqKjIgjRwqNHFl8="; }; dontDisableStatic = if withStatic then 1 else 0; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/aubio/default.nix b/pkgs/development/libraries/aubio/default.nix index 89f81e26de407..6702eb91c9b17 100644 --- a/pkgs/development/libraries/aubio/default.nix +++ b/pkgs/development/libraries/aubio/default.nix @@ -15,7 +15,6 @@ stdenv.mkDerivation rec { buildInputs = [ alsa-lib fftw libjack2 libsamplerate libsndfile ]; strictDeps = true; - dontAddWafCrossFlags = true; wafFlags = lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "--disable-tests"; postPatch = '' diff --git a/pkgs/development/libraries/audio/libopenmpt/default.nix b/pkgs/development/libraries/audio/libopenmpt/default.nix index da288f145613e..0f4c3509244d8 100644 --- a/pkgs/development/libraries/audio/libopenmpt/default.nix +++ b/pkgs/development/libraries/audio/libopenmpt/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "libopenmpt"; - version = "0.7.6"; + version = "0.7.7"; outputs = [ "out" "dev" "bin" ]; src = fetchurl { url = "https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${version}+release.autotools.tar.gz"; - hash = "sha256-Fi1yowa7LhFMJPolJn0NCgrBbzn9laXA38daZm7l5PU="; + hash = "sha256-WMaiiXISaCim9ljghK7nqo+L/bdaC9DjRcf/Km2e8Iw="; }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/c-ares/default.nix b/pkgs/development/libraries/c-ares/default.nix index 87b86036cff28..e0bc7941b39e6 100644 --- a/pkgs/development/libraries/c-ares/default.nix +++ b/pkgs/development/libraries/c-ares/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, writeTextDir +{ lib, stdenv, fetchurl, updateAutotoolsGnuConfigScriptsHook , withCMake ? true, cmake # sensitive downstream packages @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "man" ]; - nativeBuildInputs = lib.optionals withCMake [ cmake ]; + nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ] ++ lib.optionals withCMake [ cmake ]; cmakeFlags = [] ++ lib.optionals stdenv.hostPlatform.isStatic [ "-DCARES_SHARED=OFF" diff --git a/pkgs/development/libraries/expat/default.nix b/pkgs/development/libraries/expat/default.nix index 9944277e946b6..a26fd46abfde9 100644 --- a/pkgs/development/libraries/expat/default.nix +++ b/pkgs/development/libraries/expat/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, updateAutotoolsGnuConfigScriptsHook # for passthru.tests , python3 , perlPackages @@ -29,6 +30,7 @@ stdenv.mkDerivation (finalAttrs: { }; strictDeps = true; + nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ]; outputs = [ "out" "dev" ]; # TODO: fix referrers outputBin = "dev"; diff --git a/pkgs/development/libraries/folks/default.nix b/pkgs/development/libraries/folks/default.nix index 0f40be439a3ab..cfcdfe6ed0795 100644 --- a/pkgs/development/libraries/folks/default.nix +++ b/pkgs/development/libraries/folks/default.nix @@ -90,12 +90,10 @@ stdenv.mkDerivation (finalAttrs: { # occur inconsistently doCheck = false; - # Prevents e-d-s add-contacts-stress-test from timing out - checkPhase = '' - runHook preCheck - meson test --timeout-multiplier 4 - runHook postCheck - ''; + mesonCheckFlags = [ + # Prevents e-d-s add-contacts-stress-test from timing out + "--timeout-multiplier" "4" + ]; postPatch = lib.optionalString telepathySupport '' patchShebangs tests/tools/manager-file.py diff --git a/pkgs/development/libraries/gdbm/default.nix b/pkgs/development/libraries/gdbm/default.nix index e1a3def0ba420..d6ed7d32e7016 100644 --- a/pkgs/development/libraries/gdbm/default.nix +++ b/pkgs/development/libraries/gdbm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl }: +{ stdenv, lib, fetchurl, updateAutotoolsGnuConfigScriptsHook }: stdenv.mkDerivation rec { pname = "gdbm"; @@ -9,6 +9,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-dLEIHSH/8TrkvXwW5dblBKTCb3zeHcoNljpIQXS7ys0="; }; + nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ]; + doCheck = true; # not cross; # Linking static stubs on cygwin requires correct ordering. diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix index f9fd75f1a6af9..d8d51bc19920b 100644 --- a/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -21,12 +21,11 @@ , buildPackages , withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages , gobject-introspection -, fetchpatch }: stdenv.mkDerivation (finalAttrs: { pname = "gdk-pixbuf"; - version = "2.42.11"; + version = "2.42.12"; outputs = [ "out" "dev" "man" ] ++ lib.optional withIntrospection "devdoc" @@ -36,18 +35,12 @@ stdenv.mkDerivation (finalAttrs: { inherit (finalAttrs) pname version; in fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-Sdy0AjiHCGR+jDIdVrb7MPIeUeUV0MWpQiaNIwUqLwA="; + hash = "sha256-uVBbNEW5p+SM7TR2DDvLc+lm3zrJTJWhSMtmmrdI48c="; }; patches = [ # Move installed tests to a separate output ./installed-tests-path.patch - # Remove post 2.42.11 - (fetchpatch { - name = "fix-meson.build-typo.patch"; - url = "https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/commit/238893d8cd6f9c2616a05ab521a29651a17a38c2.patch"; - hash = "sha256-6IhdNH6hhygSXD7EJo/hoBLFeb2lJlBIHNBPTkA3Do0="; - }) ]; # gdk-pixbuf-thumbnailer is not wrapped therefore strictDeps will work diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix index 8f0b277a73c4c..7a0d7a3ee667b 100644 --- a/pkgs/development/libraries/gettext/default.nix +++ b/pkgs/development/libraries/gettext/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, libiconv, xz, bash +{ stdenv, lib, fetchurl, libiconv, bash, updateAutotoolsGnuConfigScriptsHook }: # Note: this package is used for bootstrapping fetchurl, and thus @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { LDFLAGS = lib.optionalString stdenv.isSunOS "-lm -lmd -lmp -luutil -lnvpair -lnsl -lidmap -lavl -lsec"; configureFlags = [ - "--disable-csharp" "--with-xz" + "--disable-csharp" ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ # On cross building, gettext supposes that the wchar.h from libc # does not fulfill gettext needs, so it tries to work with its @@ -51,8 +51,7 @@ stdenv.mkDerivation rec { strictDeps = true; nativeBuildInputs = [ - xz - xz.bin + updateAutotoolsGnuConfigScriptsHook ]; buildInputs = lib.optionals (!stdenv.hostPlatform.isMinGW) [ bash diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index feef4630afd8c..a60ba9fae6bfd 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -2,6 +2,7 @@ , lib , stdenv , fetchurl +, fetchpatch , gettext , meson , ninja @@ -73,6 +74,15 @@ stdenv.mkDerivation (finalAttrs: { ./quark_init_on_demand.patch ./gobject_init_on_demand.patch ] ++ [ + # Fix double-free & segfault issues on menu and dbus connection action group export failures + # https://gitlab.gnome.org/GNOME/glib/-/merge_requests/4073 + # Remove when version > 2.80.2 + (fetchpatch { + name = "GLib-Fix-memory-problems-on-gmenuexporter-and-gactiongroupexporter-error-paths.patch"; + url = "https://gitlab.gnome.org/GNOME/glib/-/commit/b9490a499a004618c883f180b1081a166ff1a86b.patch"; + hash = "sha256-c6uZ9NEhg26/2RdgjQ4s5ErCDm5HH6T/tfJXTwh/H6o="; + }) + # This patch lets GLib's GDesktopAppInfo API watch and notice changes # to the Nix user and system profiles. That way, the list of available # applications shown by the desktop environment is immediately updated @@ -269,14 +279,6 @@ stdenv.mkDerivation (finalAttrs: { ln -s $PWD/glib/libglib-${librarySuffix} $out/lib/libglib-${librarySuffix} ''; - checkPhase = '' - runHook preCheck - - meson test --print-errorlogs - - runHook postCheck - ''; - postCheck = '' rm $out/lib/libgobject-${librarySuffix} rm $out/lib/libgio-${librarySuffix} diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index 8cc7bdc71a646..91639c441b481 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -112,13 +112,13 @@ stdenv.mkDerivation rec { pname = "gst-plugins-bad"; - version = "1.24.2"; + version = "1.24.3"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-RI4yeHvIK1hsbLL4HJqO9AT+pPd/JVZv4G5Zej9ZE2s="; + hash = "sha256-6Q8mx9ycdvSqWZt1jP1tjBDWoLnLJluiw8m984iFWPg="; }; patches = [ diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix index 72dbef5c6dee0..f48fe22f50001 100644 --- a/pkgs/development/libraries/gstreamer/base/default.nix +++ b/pkgs/development/libraries/gstreamer/base/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gst-plugins-base"; - version = "1.24.2"; + version = "1.24.3"; outputs = [ "out" "dev" ]; @@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: { inherit (finalAttrs) pname version; in fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-KC8cyAZcm2Lragog+56DKPjlKW3yRYtyNtqnKcQa52k="; + hash = "sha256-8QlDl+qnky8G5X67sHWqM6osduS3VjChawLI1K9Ggy4="; }; strictDeps = true; diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix index eb9231155b80a..3136b6f886755 100644 --- a/pkgs/development/libraries/gstreamer/core/default.nix +++ b/pkgs/development/libraries/gstreamer/core/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gstreamer"; - version = "1.24.2"; + version = "1.24.3"; outputs = [ "bin" @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { inherit (finalAttrs) pname version; in fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-nK/dI70YDxaBxWzTpoeahJfM8k2m9CKmtvNW+gdKhIE="; + hash = "sha256-EiXvSjKfrhytxexyfaskmtVn6AcoeUk1Yc65HtNKpBQ="; }; depsBuildBuild = [ diff --git a/pkgs/development/libraries/gstreamer/devtools/default.nix b/pkgs/development/libraries/gstreamer/devtools/default.nix index 5b1d4c8618cea..44a79bb2c998d 100644 --- a/pkgs/development/libraries/gstreamer/devtools/default.nix +++ b/pkgs/development/libraries/gstreamer/devtools/default.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { pname = "gst-devtools"; - version = "1.24.2"; + version = "1.24.3"; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-/dfDDBqhuweADdmKUeVSEQZWGYNeSIn1yS/oI7hs2PQ="; + hash = "sha256-uREUov2Vj0Ks9EEYbofivsk1OO81qfgkgREZc2D/sjc="; }; outputs = [ diff --git a/pkgs/development/libraries/gstreamer/ges/default.nix b/pkgs/development/libraries/gstreamer/ges/default.nix index 0838dec0fdb06..79ece373b57d0 100644 --- a/pkgs/development/libraries/gstreamer/ges/default.nix +++ b/pkgs/development/libraries/gstreamer/ges/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { pname = "gst-editing-services"; - version = "1.24.2"; + version = "1.24.3"; outputs = [ "out" @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-cgF3jqXZN0QMU9dDndEqpaxoQGiK8fBJmFInUHS5kHM="; + hash = "sha256-z3QyFWiLATkFzSyff+3aIeLTTIRDQJkMbqJdEKA3KT8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix index 1cf3fef79f08a..bd301e7b45c22 100644 --- a/pkgs/development/libraries/gstreamer/good/default.nix +++ b/pkgs/development/libraries/gstreamer/good/default.nix @@ -58,13 +58,13 @@ assert raspiCameraSupport -> (stdenv.isLinux && stdenv.isAarch32); stdenv.mkDerivation rec { pname = "gst-plugins-good"; - version = "1.24.2"; + version = "1.24.3"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-bjR8ctS4sohtiQ/+n2dnqe2wLyAViOjDpXLc0I2YUr0="; + hash = "sha256-FQ+RTmHcBWALaLiMoQPHzCJxMBWOOJ6p6hWfQFCi67A="; }; patches = [ diff --git a/pkgs/development/libraries/gstreamer/libav/default.nix b/pkgs/development/libraries/gstreamer/libav/default.nix index 35d0b461d9bc9..872627009e215 100644 --- a/pkgs/development/libraries/gstreamer/libav/default.nix +++ b/pkgs/development/libraries/gstreamer/libav/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "gst-libav"; - version = "1.24.2"; + version = "1.24.3"; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-lig4ZI4Uzop4Miqxb4TH2E2Gpte+u2V0rAXeqEp8fJs="; + hash = "sha256-2cWxUkaKRcH6g1FBBCIJCnGScHrXTS4aQ2f1JU4YjZE="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/gstreamer/rtsp-server/default.nix b/pkgs/development/libraries/gstreamer/rtsp-server/default.nix index cb848efca39f9..db56d895f7876 100644 --- a/pkgs/development/libraries/gstreamer/rtsp-server/default.nix +++ b/pkgs/development/libraries/gstreamer/rtsp-server/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { pname = "gst-rtsp-server"; - version = "1.24.2"; + version = "1.24.3"; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-5MhKeGdefv7zsm6cueLkJzGEIbStnuS1E2767rtrugw="; + hash = "sha256-YmKOzKeLj1tRxZpNYCxl6SBf/FDDyDzWH6sfY0i2NWU="; }; outputs = [ diff --git a/pkgs/development/libraries/gstreamer/ugly/default.nix b/pkgs/development/libraries/gstreamer/ugly/default.nix index 40b6e169c225a..0b39bad01020b 100644 --- a/pkgs/development/libraries/gstreamer/ugly/default.nix +++ b/pkgs/development/libraries/gstreamer/ugly/default.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation rec { pname = "gst-plugins-ugly"; - version = "1.24.2"; + version = "1.24.3"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-RdqYvxBAyUcv1Z9icSgt4lo3IauFt4qq+BBJSVUPvvU="; + hash = "sha256-TJUTQcTGSGMLb+EjTsET2B3S0khSm/K1R44K0HfIDtM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/gstreamer/vaapi/default.nix b/pkgs/development/libraries/gstreamer/vaapi/default.nix index a5cd9cace4e74..cdad2eaf232d9 100644 --- a/pkgs/development/libraries/gstreamer/vaapi/default.nix +++ b/pkgs/development/libraries/gstreamer/vaapi/default.nix @@ -24,11 +24,11 @@ stdenv.mkDerivation rec { pname = "gstreamer-vaapi"; - version = "1.24.2"; + version = "1.24.3"; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-zFq4yIRD4PW/I9YRC0qsM99Z5K5ib1NtlosWBcx7li8="; + hash = "sha256-hF8u/g3KjasjTd6PsJHaLNBqnSpoNCK1bctoiVT5Bw4="; }; outputs = [ diff --git a/pkgs/development/libraries/gtk/3.x.nix b/pkgs/development/libraries/gtk/3.x.nix index b2b156051bf89..5664332898e1f 100644 --- a/pkgs/development/libraries/gtk/3.x.nix +++ b/pkgs/development/libraries/gtk/3.x.nix @@ -64,7 +64,7 @@ in stdenv.mkDerivation (finalAttrs: { pname = "gtk+3"; - version = "3.24.41"; + version = "3.24.42"; outputs = [ "out" "dev" ] ++ lib.optional withIntrospection "devdoc"; outputBin = "dev"; @@ -78,7 +78,7 @@ stdenv.mkDerivation (finalAttrs: { inherit (finalAttrs) version; in fetchurl { url = "mirror://gnome/sources/gtk+/${lib.versions.majorMinor version}/gtk+-${version}.tar.xz"; - sha256 = "sha256-R9phSHrzCHqUvEkpb9AlygvAL5bvBsVW58iYi9ZRtvo="; + sha256 = "sha256-UPifYVCS1N0Bu9dZcZ+L04Dl8Un2/XipRyXi3hEjd+I="; }; patches = [ diff --git a/pkgs/development/libraries/gtk/4.x.nix b/pkgs/development/libraries/gtk/4.x.nix index 34a5582ffa676..7d0417beb8c5b 100644 --- a/pkgs/development/libraries/gtk/4.x.nix +++ b/pkgs/development/libraries/gtk/4.x.nix @@ -70,7 +70,7 @@ in stdenv.mkDerivation (finalAttrs: { pname = "gtk4"; - version = "4.14.3"; + version = "4.14.4"; outputs = [ "out" "dev" ] ++ lib.optionals x11Support [ "devdoc" ]; outputBin = "dev"; @@ -82,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = with finalAttrs; "mirror://gnome/sources/gtk/${lib.versions.majorMinor version}/gtk-${version}.tar.xz"; - hash = "sha256-K+XIWL3vEQTTeEjJd5wIk3LI0xUD9u/EuU5TtUb8mkM="; + hash = "sha256-RDUYuX6DSPn2QwrENbEBD5psUgf03Gp81dJOOCDO5jM="; }; depsBuildBuild = [ diff --git a/pkgs/development/libraries/jemalloc/default.nix b/pkgs/development/libraries/jemalloc/default.nix index 902c0d77739c2..7541e6b0c1a31 100644 --- a/pkgs/development/libraries/jemalloc/default.nix +++ b/pkgs/development/libraries/jemalloc/default.nix @@ -26,6 +26,12 @@ stdenv.mkDerivation rec { url = "https://github.com/jemalloc/jemalloc/commit/d00ecee6a8dfa90afcb1bbc0858985c17bef6559.patch"; hash = "sha256-N5i4IxGJ4SSAgFiq5oGRnrNeegdk2flw9Sh2mP0yl4c="; }) + # fix linking with libc++, can be removed in the next update (after 5.3.0). + # https://github.com/jemalloc/jemalloc/pull/2348 + (fetchpatch { + url = "https://github.com/jemalloc/jemalloc/commit/4422f88d17404944a312825a1aec96cd9dc6c165.patch"; + hash = "sha256-dunkE7XHzltn5bOb/rSHqzpRniAFuGubBStJeCxh0xo="; + }) ]; configureFlags = diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix index 9f3fbdbf7eb04..8dd68af4fd1d5 100644 --- a/pkgs/development/libraries/kerberos/krb5.nix +++ b/pkgs/development/libraries/kerberos/krb5.nix @@ -74,6 +74,11 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace config/shlib.conf \ --replace "'ld " "'${stdenv.cc.targetPrefix}ld " + '' + # this could be accomplished by updateAutotoolsGnuConfigScriptsHook, but that causes infinite recursion + # necessary for FreeBSD code path in configure + + '' + substituteInPlace ./config/config.guess --replace-fail /usr/bin/uname uname ''; libFolders = [ "util" "include" "lib" "build-tools" ]; diff --git a/pkgs/development/libraries/ldb/default.nix b/pkgs/development/libraries/ldb/default.nix index cdcf21edd799c..3a1a8a8ebf1dc 100644 --- a/pkgs/development/libraries/ldb/default.nix +++ b/pkgs/development/libraries/ldb/default.nix @@ -12,6 +12,7 @@ , docbook_xml_dtd_42 , cmocka , wafHook +, buildPackages , libxcrypt , testers }: @@ -62,6 +63,9 @@ stdenv.mkDerivation (finalAttrs: { "--bundled-libraries=NONE" "--builtin-libraries=replace" "--without-ldb-lmdb" + ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + "--cross-compile" + "--cross-execute=${stdenv.hostPlatform.emulator buildPackages}" ]; # python-config from build Python gives incorrect values when cross-compiling. diff --git a/pkgs/development/libraries/libev/default.nix b/pkgs/development/libraries/libev/default.nix index 750cb3974cf75..aa9f078d42b09 100644 --- a/pkgs/development/libraries/libev/default.nix +++ b/pkgs/development/libraries/libev/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl +{ lib, stdenv, fetchurl, updateAutotoolsGnuConfigScriptsHook , # Note: -static hasn’t work on darwin static ? with stdenv.hostPlatform; isStatic && !isDarwin }: @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { sha256 = "1sjs4324is7fp21an4aas2z4dwsvs6z4xwrmp72vwpq1s6wbfzjh"; }; + nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ]; + configureFlags = lib.optional (static) "LDFLAGS=-static"; meta = { diff --git a/pkgs/development/libraries/libfaketime/default.nix b/pkgs/development/libraries/libfaketime/default.nix index f44702582f27a..2cb94d11fd670 100644 --- a/pkgs/development/libraries/libfaketime/default.nix +++ b/pkgs/development/libraries/libfaketime/default.nix @@ -18,6 +18,11 @@ stdenv.mkDerivation rec { url = "https://github.com/wolfcw/libfaketime/commit/e0e6b79568d36a8fd2b3c41f7214769221182128.patch"; sha256 = "sha256-KwwP76v0DXNW73p/YBvwUOPdKMAcVdbQSKexD/uFOYo="; }) + (fetchpatch { + name = "LFS64.patch"; + url = "https://github.com/wolfcw/libfaketime/commit/f32986867addc9d22b0fab29c1c927f079d44ac1.patch"; + hash = "sha256-fIXuxxcV9J2IcgwcwSrMo4maObkH9WYv1DC/wdtbq/g="; + }) ] ++ (lib.optionals stdenv.cc.isClang [ # https://github.com/wolfcw/libfaketime/issues/277 ./0001-Remove-unsupported-clang-flags.patch diff --git a/pkgs/development/libraries/libgpg-error/default.nix b/pkgs/development/libraries/libgpg-error/default.nix index 1d262a0a44023..15c83ffd4e983 100644 --- a/pkgs/development/libraries/libgpg-error/default.nix +++ b/pkgs/development/libraries/libgpg-error/default.nix @@ -17,11 +17,11 @@ }; in stdenv.mkDerivation (rec { pname = "libgpg-error"; - version = "1.48"; + version = "1.49"; src = fetchurl { url = "mirror://gnupg/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-ic4a6JPhIpJLhY3oTcT2eq4p/6YQ6/Zo1apTkEVmPW8="; + sha256 = "sha256-i3nVRjnb9KvAi1QG+y835mmi3sCR3QJPuH3TZxMcY6k="; }; postPatch = '' diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index a682b39bbcd80..b5f2ffd76b032 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.58.0"; + version = "2.58.1"; 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-18REqSZAa1l5C+DerhluGO0mBZ2lc/oaqeycp2WKVZw="; + hash = "sha256-NyhZYpCoV20wXQbsiv30c1Fv7unf8i4DI16sQz1Wgk4="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit (finalAttrs) src; name = "librsvg-deps-${finalAttrs.version}"; - hash = "sha256-ta+3KkDtqTLGoKknUn89c+3XHzvcZyPFPFpgLH5f5uw="; + hash = "sha256-FIW92Cr83YkGTOe/xjyZGZvHYSrG70GBpHc9l0sMjLg="; # TODO: move this to fetchCargoTarball dontConfigure = true; }; diff --git a/pkgs/development/libraries/libsodium/default.nix b/pkgs/development/libraries/libsodium/default.nix index 4570b10db39c7..2a41550d9077f 100644 --- a/pkgs/development/libraries/libsodium/default.nix +++ b/pkgs/development/libraries/libsodium/default.nix @@ -1,28 +1,18 @@ -{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook +{ lib, stdenv, fetchurl, autoreconfHook , testers }: stdenv.mkDerivation (finalAttrs: { pname = "libsodium"; - version = "1.0.19"; + version = "1.0.20"; src = fetchurl { url = "https://download.libsodium.org/libsodium/releases/${finalAttrs.pname}-${finalAttrs.version}.tar.gz"; - hash = "sha256-AY15/goEXMoHMx03vQy1ey6DjFG8SP2DehRy5QBou+o="; + hash = "sha256-67Ze9spDkzPCu0GgwZkFhyiNoH9sf9B8s6GMwY0wzhk="; }; outputs = [ "out" "dev" ]; - patches = [ - # Drop -Ofast as it breaks floating point arithmetics in downstream - # users. - (fetchpatch { - name = "drop-Ofast.patch"; - url = "https://github.com/jedisct1/libsodium/commit/ffd1e374989197b44d815ac8b5d8f0b43b6ce534.patch"; - hash = "sha256-jG0VirIoFBwYmRx6zHSu2xe6pXYwbeqNVhPJxO6eJEY="; - }) - ]; - nativeBuildInputs = [ autoreconfHook ]; separateDebugInfo = stdenv.isLinux && stdenv.hostPlatform.libc != "musl"; diff --git a/pkgs/development/libraries/libssh2/default.nix b/pkgs/development/libraries/libssh2/default.nix index f7a51da9fa672..653575c5563b2 100644 --- a/pkgs/development/libraries/libssh2/default.nix +++ b/pkgs/development/libraries/libssh2/default.nix @@ -15,6 +15,12 @@ stdenv.mkDerivation rec { ./CVE-2023-48795.patch ]; + # this could be accomplished by updateAutotoolsGnuConfigScriptsHook, but that causes infinite recursion + # necessary for FreeBSD code path in configure + postPatch = '' + substituteInPlace ./config.guess --replace-fail /usr/bin/uname uname + ''; + outputs = [ "out" "dev" "devdoc" ]; propagatedBuildInputs = [ openssl ]; # see Libs: in libssh2.pc diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix index c8871a4ba68e8..f1e5c7da1803d 100644 --- a/pkgs/development/libraries/libtiff/default.nix +++ b/pkgs/development/libraries/libtiff/default.nix @@ -10,8 +10,10 @@ , lerc , libdeflate , libjpeg +, libwebp , xz , zlib +, zstd # for passthru.tests , libgeotiff @@ -62,14 +64,19 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ lerc + zstd ]; # TODO: opengl support (bogus configure detection) propagatedBuildInputs = [ libdeflate libjpeg + # libwebp depends on us; this will cause infinite + # recursion otherwise + (libwebp.override { tiffSupport = false; }) xz zlib + zstd ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/libxcrypt/default.nix b/pkgs/development/libraries/libxcrypt/default.nix index d71cb7027570a..efd3acb643fbe 100644 --- a/pkgs/development/libraries/libxcrypt/default.nix +++ b/pkgs/development/libraries/libxcrypt/default.nix @@ -15,6 +15,12 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-5eH0yu4KAd4q7ibjE4gH1tPKK45nKHlm0f79ZeH9iUM="; }; + # this could be accomplished by updateAutotoolsGnuConfigScriptsHook, but that causes infinite recursion + # necessary for FreeBSD code path in configure + postPatch = '' + substituteInPlace ./build-aux/m4-autogen/config.guess --replace-fail /usr/bin/uname uname + ''; + outputs = [ "out" "man" diff --git a/pkgs/development/libraries/lzo/default.nix b/pkgs/development/libraries/lzo/default.nix index 480e2bb909cd3..43d551819a657 100644 --- a/pkgs/development/libraries/lzo/default.nix +++ b/pkgs/development/libraries/lzo/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl}: +{ lib, stdenv, fetchurl, updateAutotoolsGnuConfigScriptsHook }: stdenv.mkDerivation rec { pname = "lzo"; @@ -9,6 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0wm04519pd3g8hqpjqhfr72q8qmbiwqaxcs3cndny9h86aa95y60"; }; + nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ]; + configureFlags = lib.optional (!stdenv.hostPlatform.isStatic) "--enable-shared" ; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 79c9c0cdf18b6..a68518932af63 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -110,8 +110,8 @@ # nix build .#mesa .#pkgsi686Linux.mesa .#pkgsCross.aarch64-multiplatform.mesa .#pkgsMusl.mesa let - version = "24.0.7"; - hash = "sha256-dFRCXx7UpvG1sQfhZyswyIsi6g7+oACuLH2W25P2wmo="; + version = "24.0.8"; + hash = "sha256-0e2GombVt7jBNq5YfvVhjtGpg3pDRA83E2Ir8BI79cE="; # Release calendar: https://www.mesa3d.org/release-calendar.html # Release frequency: https://www.mesa3d.org/releasing.html#schedule diff --git a/pkgs/development/libraries/mpdecimal/default.nix b/pkgs/development/libraries/mpdecimal/default.nix index 514c61ffcb0c0..687abab7d45b9 100644 --- a/pkgs/development/libraries/mpdecimal/default.nix +++ b/pkgs/development/libraries/mpdecimal/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl }: +{ lib, stdenv, fetchurl, updateAutotoolsGnuConfigScriptsHook }: stdenv.mkDerivation rec { pname = "mpdecimal"; @@ -10,6 +10,8 @@ stdenv.mkDerivation rec { hash = "sha256-lCRFwyRbInMP1Bpnp8XCMdEcsbmTa5wPdjNPt9C0Row="; }; + nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ]; + configureFlags = [ "LD=${stdenv.cc.targetPrefix}cc" ]; postInstall = '' diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix index adf310cef2b7f..85bf4bee634e0 100644 --- a/pkgs/development/libraries/ncurses/default.nix +++ b/pkgs/development/libraries/ncurses/default.nix @@ -2,6 +2,7 @@ , stdenv , fetchurl , buildPackages +, updateAutotoolsGnuConfigScriptsHook , ncurses , pkg-config , abiVersion ? "6" @@ -13,11 +14,11 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "6.4"; + version = "6.4.20221231"; pname = "ncurses" + lib.optionalString (abiVersion == "5") "-abi5-compat"; src = fetchurl { - url = "https://invisible-island.net/archives/ncurses/ncurses-${finalAttrs.version}.tar.gz"; + url = "https://invisible-island.net/archives/ncurses/ncurses-${lib.versions.majorMinor finalAttrs.version}.tar.gz"; hash = "sha256-aTEoPZrIfFBz8wtikMTHXyFjK7T8NgOsgQCBK+0kgVk="; }; @@ -39,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals stdenv.hostPlatform.isWindows [ "--enable-sp-funcs" "--enable-term-driver" - ] ++ lib.optionals (stdenv.hostPlatform.isUnix && stdenv.hostPlatform.isStatic) [ + ] ++ lib.optionals (stdenv.hostPlatform.isUnix && enableStatic) [ # For static binaries, the point is to have a standalone binary with # minimum dependencies. So here we make sure that binaries using this # package won't depend on a terminfo database located in the Nix store. @@ -68,6 +69,7 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; nativeBuildInputs = [ + updateAutotoolsGnuConfigScriptsHook pkg-config ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ # for `tic`, build already depends on for build `cc` so it's weird the build doesn't just build `tic`. diff --git a/pkgs/development/libraries/nghttp2/default.nix b/pkgs/development/libraries/nghttp2/default.nix index 5566b0c8f67df..0fe8f1d88d513 100644 --- a/pkgs/development/libraries/nghttp2/default.nix +++ b/pkgs/development/libraries/nghttp2/default.nix @@ -67,6 +67,12 @@ stdenv.mkDerivation rec { export TZDIR=${tzdata}/share/zoneinfo ''; + # this could be accomplished by updateAutotoolsGnuConfigScriptsHook, but that causes infinite recursion + # necessary for FreeBSD code path in configure + postPatch = '' + substituteInPlace ./config.guess --replace-fail /usr/bin/uname uname + ''; + postInstall = lib.optionalString (enableApp) '' installShellCompletion --bash doc/bash_completion/{h2load,nghttp,nghttpd,nghttpx} '' + lib.optionalString (!enableApp) '' diff --git a/pkgs/development/libraries/openfec/default.nix b/pkgs/development/libraries/openfec/default.nix index dd6b0ce10c0b0..35ce5806aea77 100644 --- a/pkgs/development/libraries/openfec/default.nix +++ b/pkgs/development/libraries/openfec/default.nix @@ -20,10 +20,13 @@ stdenv.mkDerivation rec { cmake ]; - cmakeFlags = [ "-DDEBUG:STRING=OFF" ]; + cmakeFlags = [ + "-DDEBUG:STRING=OFF" + (lib.cmakeBool "BUILD_STATIC_LIBS" stdenv.hostPlatform.isStatic) + ]; installPhase = - let so = stdenv.hostPlatform.extensions.sharedLibrary; + let so = stdenv.hostPlatform.extensions.library; in '' # This is pretty horrible but sadly there is not installation procedure # provided. diff --git a/pkgs/development/libraries/pcre2/default.nix b/pkgs/development/libraries/pcre2/default.nix index c30a3c379d1de..3450f910effef 100644 --- a/pkgs/development/libraries/pcre2/default.nix +++ b/pkgs/development/libraries/pcre2/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, updateAutotoolsGnuConfigScriptsHook , withJitSealloc ? true }: @@ -13,6 +14,8 @@ stdenv.mkDerivation rec { hash = "sha256-4qU5hP8LB9/bWuRIa7ubIcyo598kNAlsyb8bcow1C8s="; }; + nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ]; + postPatch = '' # Fix jit autodetection: # https://github.com/PCRE2Project/pcre2/pull/396 diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index 2c2442547ebbd..c3532d93683d9 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -75,7 +75,7 @@ assert ldacbtSupport -> bluezSupport; stdenv.mkDerivation(finalAttrs: { pname = "pipewire"; - version = "1.0.6"; + version = "1.0.7"; outputs = [ "out" @@ -91,7 +91,7 @@ stdenv.mkDerivation(finalAttrs: { owner = "pipewire"; repo = "pipewire"; rev = finalAttrs.version; - sha256 = "sha256-JrKSsYCMNRHHh92Sn/03Bq2gPaXNYTqmwaLXkE0axdA="; + sha256 = "sha256-YzI+hkX1ZdeTfxuKaw5P9OYPtkWtUg9cNo32wLCgjNU="; }; patches = [ diff --git a/pkgs/development/libraries/plasma-wayland-protocols/default.nix b/pkgs/development/libraries/plasma-wayland-protocols/default.nix index 9f2798ce51b61..99e8b3fd9d11d 100644 --- a/pkgs/development/libraries/plasma-wayland-protocols/default.nix +++ b/pkgs/development/libraries/plasma-wayland-protocols/default.nix @@ -7,11 +7,11 @@ mkDerivation rec { pname = "plasma-wayland-protocols"; - version = "1.12.0"; + version = "1.13.0"; src = fetchurl { url = "mirror://kde/stable/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-FIO/0nnLkTyDV5tdccWPmVh2T5ukMDs2R+EAfLcNT54="; + hash = "sha256-3Ud+NS9f9uasaGKGxLIrGb9aSSG4XuWn2gK7eqEV1X4="; }; nativeBuildInputs = [ extra-cmake-modules ]; diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/development/libraries/polkit/default.nix index 69b2233a8559b..b6066b1b56c53 100644 --- a/pkgs/development/libraries/polkit/default.nix +++ b/pkgs/development/libraries/polkit/default.nix @@ -53,6 +53,8 @@ stdenv.mkDerivation rec { # Allow changing base for paths in pkg-config file as before. # https://gitlab.freedesktop.org/polkit/polkit/-/merge_requests/100 ./0001-build-Use-datarootdir-in-Meson-generated-pkg-config-.patch + + ./elogind.patch ]; depsBuildBuild = [ @@ -178,6 +180,10 @@ stdenv.mkDerivation rec { description = "A toolkit for defining and handling the policy that allows unprivileged processes to speak to privileged processes"; license = licenses.lgpl2Plus; platforms = platforms.linux; + badPlatforms = [ + # mandatory libpolkit-gobject shared library + lib.systems.inspect.platformPatterns.isStatic + ]; maintainers = teams.freedesktop.members ++ (with maintainers; [ ]); }; } diff --git a/pkgs/development/libraries/polkit/elogind.patch b/pkgs/development/libraries/polkit/elogind.patch new file mode 100644 index 0000000000000..e7d97a7b131c1 --- /dev/null +++ b/pkgs/development/libraries/polkit/elogind.patch @@ -0,0 +1,66 @@ +From 78e625dbafa8543b17ffaf9c42cf90c9cf9a612e Mon Sep 17 00:00:00 2001 +From: Alyssa Ross <hi@alyssa.is> +Date: Wed, 8 May 2024 11:20:42 +0200 +Subject: [PATCH] Fix configuration with elogind + +Previously, it would try to get sysusers_dir from systemd even though +systemd_dep was undefined. Determining systemd_systemdsystemunitdir +from systemd was already checking for systemd logind specifically, and +systemd_sysusers_dir is only used in the systemd logind case, so move +both of those into the systemd-logind-specific branch above. + +(cherry picked from commit b58b58af10c390ab9a11a4cfe6a4ff3d50cc0fa5) +--- + meson.build | 22 +++++++++++----------- + 1 file changed, 11 insertions(+), 11 deletions(-) + +diff --git a/meson.build b/meson.build +index 2f81c90..0888322 100644 +--- a/meson.build ++++ b/meson.build +@@ -202,6 +202,16 @@ if enable_logind + if not logind_dep.found() + logind_dep = dependency('libsystemd-login', not_found_message: 'libsystemd support requested but libsystemd or libsystemd-login library not found') + endif ++ ++ # systemd unit / service files ++ systemd_systemdsystemunitdir = get_option('systemdsystemunitdir') ++ if systemd_systemdsystemunitdir == '' and session_tracking == 'libsystemd-login' ++ systemd_dep = dependency('systemd', not_found_message: 'systemd required but not found, please provide a valid systemd user unit dir or disable it') ++ # FIXME: systemd.pc file does not use variables with relative paths, so `define_variable` cannot be used ++ systemd_systemdsystemunitdir = systemd_dep.get_pkgconfig_variable('systemdsystemunitdir') ++ endif ++ ++ systemd_sysusers_dir = systemd_dep.get_pkgconfig_variable('sysusers_dir', default: '/usr/lib/sysusers.d') + else + logind_dep = dependency('libelogind', not_found_message: 'libelogind support requested but libelogind library not found') + endif +@@ -210,16 +220,6 @@ if enable_logind + config_h.set10('HAVE_' + func.to_upper(), cc.has_function(func, dependencies: logind_dep)) + func = 'sd_pidfd_get_session' + config_h.set10('HAVE_' + func.to_upper(), cc.has_function(func, dependencies: logind_dep)) +- +- # systemd unit / service files +- systemd_systemdsystemunitdir = get_option('systemdsystemunitdir') +- if systemd_systemdsystemunitdir == '' and session_tracking == 'libsystemd-login' +- systemd_dep = dependency('systemd', not_found_message: 'systemd required but not found, please provide a valid systemd user unit dir or disable it') +- # FIXME: systemd.pc file does not use variables with relative paths, so `define_variable` cannot be used +- systemd_systemdsystemunitdir = systemd_dep.get_pkgconfig_variable('systemdsystemunitdir') +- endif +- +- systemd_sysusers_dir = systemd_dep.get_pkgconfig_variable('sysusers_dir', default: '/usr/lib/sysusers.d') + endif + config_h.set('HAVE_LIBSYSTEMD', enable_logind) + +@@ -404,7 +404,7 @@ output += ' introspection: ' + enable_introspection.to_string( + output += ' Distribution/OS: ' + os_type + '\n' + output += ' Authentication framework: ' + auth_fw + '\n' + output += ' Session tracking: ' + session_tracking + '\n' +-if enable_logind ++if session_tracking == 'logind' + output += ' systemdsystemunitdir: ' + systemd_systemdsystemunitdir + '\n' + endif + output += ' polkitd user: ' + polkitd_user + ' \n' +-- +2.44.0 + diff --git a/pkgs/development/libraries/popt/default.nix b/pkgs/development/libraries/popt/default.nix index fdccb4d093367..e97629b0dfd05 100644 --- a/pkgs/development/libraries/popt/default.nix +++ b/pkgs/development/libraries/popt/default.nix @@ -2,6 +2,7 @@ , stdenv , fetchurl , fetchpatch2 +, updateAutotoolsGnuConfigScriptsHook }: stdenv.mkDerivation rec { @@ -13,6 +14,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-wlpIOPyOTByKrLi9Yg7bMISj1jv4mH/a08onWMYyQPk="; }; + nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ]; + patches = lib.optionals stdenv.isCygwin [ ./1.16-cygwin.patch ./1.16-vpath.patch diff --git a/pkgs/development/libraries/protobufc/default.nix b/pkgs/development/libraries/protobufc/default.nix index d152512783f0e..5a39725275508 100644 --- a/pkgs/development/libraries/protobufc/default.nix +++ b/pkgs/development/libraries/protobufc/default.nix @@ -10,15 +10,17 @@ stdenv.mkDerivation rec { pname = "protobuf-c"; - version = "unstable-2023-07-08"; + version = "1.5.0"; src = fetchFromGitHub { owner = "protobuf-c"; repo = "protobuf-c"; - rev = "fa86fddbd000316772d1deb5a8d1201fa7599ef7"; - hash = "sha256-pmqZYFREPgSrWPekymTglhtAv6gQR1gP3dOl3hqjYig="; + rev = "refs/tags/v${version}"; + hash = "sha256-Dkpcc7ZfvAIVY91trRiHuiRFcUGUbQxbheYKTBcq80I="; }; + outputs = [ "out" "dev" "lib" ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ protobuf zlib ]; diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix index a8885fc5647bc..38ee3973c0f24 100644 --- a/pkgs/development/libraries/qt-5/5.15/default.nix +++ b/pkgs/development/libraries/qt-5/5.15/default.nix @@ -190,6 +190,10 @@ let hash = "sha256-s4GsGMJTBNWw2gTJuIEP3tqT82AmTsR2mbj59m2p6rM="; }) ./qtwebengine-link-pulseaudio.patch + # Fixes Chromium build failure with Ninja 1.12. + # See: https://bugreports.qt.io/browse/QTBUG-124375 + # Backport of: https://code.qt.io/cgit/qt/qtwebengine-chromium.git/commit/?id=a766045f65f934df3b5f1aa63bc86fbb3e003a09 + ./qtwebengine-ninja-1.12.patch ] ++ lib.optionals stdenv.isDarwin [ ./qtwebengine-darwin-no-platform-check.patch ./qtwebengine-mac-dont-set-dsymutil-path.patch diff --git a/pkgs/development/libraries/qt-5/5.15/qtwebengine-ninja-1.12.patch b/pkgs/development/libraries/qt-5/5.15/qtwebengine-ninja-1.12.patch new file mode 100644 index 0000000000000..c70788516fd4e --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.15/qtwebengine-ninja-1.12.patch @@ -0,0 +1,11 @@ +diff -ur a/src/3rdparty/chromium/content/public/browser/BUILD.gn b/src/3rdparty/chromium/content/public/browser/BUILD.gn +--- a/src/3rdparty/chromium/content/public/browser/BUILD.gn 1969-12-31 19:00:01.000000000 -0500 ++++ b/src/3rdparty/chromium/content/public/browser/BUILD.gn 2024-05-29 22:12:36.416136269 -0400 +@@ -469,6 +469,7 @@ + "//build:chromeos_buildflags", + "//cc", + "//components/viz/host", ++ "//components/spellcheck:buildflags", + "//content/browser", # Must not be public_deps! + "//device/fido", + "//gpu", diff --git a/pkgs/development/libraries/readline/8.2.nix b/pkgs/development/libraries/readline/8.2.nix index 72e3370576e72..7bf5caf4060f1 100644 --- a/pkgs/development/libraries/readline/8.2.nix +++ b/pkgs/development/libraries/readline/8.2.nix @@ -1,5 +1,6 @@ { lib, stdenv , fetchpatch, fetchurl +, updateAutotoolsGnuConfigScriptsHook , ncurses, termcap , curses-library ? if stdenv.hostPlatform.isWindows @@ -20,6 +21,7 @@ stdenv.mkDerivation rec { strictDeps = true; propagatedBuildInputs = [ curses-library ]; + nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ]; patchFlags = [ "-p0" ]; diff --git a/pkgs/development/libraries/s2n-tls/default.nix b/pkgs/development/libraries/s2n-tls/default.nix index 36f11372775d7..60e6eaf5b5350 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.12"; + version = "1.4.14"; src = fetchFromGitHub { owner = "aws"; repo = pname; rev = "v${version}"; - hash = "sha256-gOCnRuJ1YM+SkrOJ/5TGANl442e7Umh3HK5DFNLJi/A="; + hash = "sha256-FEEjsJ5l87yuFDDzJPcAQ0O7OG6neK5PX+DMY5OIKJM="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index fe39cac8a25f8..1932d659d1803 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -1,4 +1,5 @@ { lib, stdenv, fetchurl, zlib, readline, ncurses +, updateAutotoolsGnuConfigScriptsHook # for tests , python3Packages, sqldiff, sqlite-analyzer, tracker @@ -27,6 +28,7 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "out" ]; separateDebugInfo = stdenv.isLinux; + nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ]; buildInputs = [ zlib ] ++ lib.optionals interactive [ readline ncurses ]; # required for aarch64 but applied for all arches for simplicity diff --git a/pkgs/development/libraries/talloc/default.nix b/pkgs/development/libraries/talloc/default.nix index 73cb8a65a162d..793fc1ccf5cb5 100644 --- a/pkgs/development/libraries/talloc/default.nix +++ b/pkgs/development/libraries/talloc/default.nix @@ -9,6 +9,7 @@ , docbook_xml_dtd_42 , fixDarwinDylibNames , wafHook +, buildPackages }: stdenv.mkDerivation rec { @@ -50,6 +51,9 @@ stdenv.mkDerivation rec { "--enable-talloc-compat1" "--bundled-libraries=NONE" "--builtin-libraries=replace" + ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + "--cross-compile" + "--cross-execute=${stdenv.hostPlatform.emulator buildPackages}" ]; # python-config from build Python gives incorrect values when cross-compiling. diff --git a/pkgs/development/libraries/tdb/default.nix b/pkgs/development/libraries/tdb/default.nix index 1a289f7c2d618..f8b3d4df4b703 100644 --- a/pkgs/development/libraries/tdb/default.nix +++ b/pkgs/development/libraries/tdb/default.nix @@ -2,6 +2,7 @@ , fetchurl , pkg-config , wafHook +, buildPackages , python3 , readline , libxslt @@ -46,6 +47,9 @@ stdenv.mkDerivation rec { wafConfigureFlags = [ "--bundled-libraries=NONE" "--builtin-libraries=replace" + ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + "--cross-compile" + "--cross-execute=${stdenv.hostPlatform.emulator buildPackages}" ]; postFixup = if stdenv.isDarwin diff --git a/pkgs/development/libraries/tevent/default.nix b/pkgs/development/libraries/tevent/default.nix index 18e4522de9ea2..d4a7d9c4342d9 100644 --- a/pkgs/development/libraries/tevent/default.nix +++ b/pkgs/development/libraries/tevent/default.nix @@ -10,6 +10,7 @@ , docbook_xml_dtd_42 , which , wafHook +, buildPackages , libxcrypt }: @@ -52,6 +53,9 @@ stdenv.mkDerivation rec { wafConfigureFlags = [ "--bundled-libraries=NONE" "--builtin-libraries=replace" + ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + "--cross-compile" + "--cross-execute=${stdenv.hostPlatform.emulator buildPackages}" ]; # python-config from build Python gives incorrect values when cross-compiling. diff --git a/pkgs/development/libraries/tpm2-tss/default.nix b/pkgs/development/libraries/tpm2-tss/default.nix index 354ab06d26b23..b28d031be83ad 100644 --- a/pkgs/development/libraries/tpm2-tss/default.nix +++ b/pkgs/development/libraries/tpm2-tss/default.nix @@ -15,13 +15,13 @@ in stdenv.mkDerivation rec { pname = "tpm2-tss"; - version = "4.1.1"; + version = "4.1.3"; src = fetchFromGitHub { owner = "tpm2-software"; repo = pname; rev = version; - hash = "sha256-paqTQ7DQI0Nd8q0qUPRa2UZ/oE5nrVEq5KUiG8hRXuQ="; + hash = "sha256-BP28utEUI9g1VNv3lCXuiKrDtEImFQxxZfIjLiE3Wr8="; }; outputs = [ "out" "man" "dev" ]; diff --git a/pkgs/development/libraries/umockdev/default.nix b/pkgs/development/libraries/umockdev/default.nix index 6576377e549f9..b7926eecb4f24 100644 --- a/pkgs/development/libraries/umockdev/default.nix +++ b/pkgs/development/libraries/umockdev/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "umockdev"; - version = "0.18.1"; + version = "0.18.2"; outputs = [ "bin" "out" "dev" "devdoc" ]; src = fetchurl { url = "https://github.com/martinpitt/umockdev/releases/download/${finalAttrs.version}/umockdev-${finalAttrs.version}.tar.xz"; - hash = "sha256-ZRtoaQM7sUiBNu1zxY6SRfWwGFYmHhzqBBAwuD+x7Xw="; + hash = "sha256-1HKV6IA8bWfgdgMcIlgeP470aIAj1I925ed2qM7IkHM="; }; patches = [ diff --git a/pkgs/development/libraries/xsimd/default.nix b/pkgs/development/libraries/xsimd/default.nix index d775cef4d6734..db761aae70941 100644 --- a/pkgs/development/libraries/xsimd/default.nix +++ b/pkgs/development/libraries/xsimd/default.nix @@ -1,39 +1,28 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , cmake , doctest }: stdenv.mkDerivation (finalAttrs: { pname = "xsimd"; - version = "12.1.1"; + version = "13.0.0"; src = fetchFromGitHub { owner = "xtensor-stack"; repo = "xsimd"; rev = finalAttrs.version; - hash = "sha256-ofUFieeRtpnzNv3Ad5oYwKWb2XcqQHoj601TIhydJyI="; + hash = "sha256-qElJYW5QDj3s59L3NgZj5zkhnUMzIP2mBa1sPks3/CE="; }; patches = [ - # Ideally, Accelerate/Accelerate.h should be used for this implementation, - # but it doesn't work... Needs a Darwin user to debug this. We apply this - # patch unconditionally, because the #if macros make sure it doesn't - # interfer with the Linux implementations. - ./fix-darwin-exp10-implementation.patch - ] ++ lib.optionals stdenv.isDarwin [ - # https://github.com/xtensor-stack/xsimd/issues/807 - ./disable-test_error_gamma-test.patch - ] ++ lib.optionals (stdenv.isDarwin || stdenv.hostPlatform.isMusl) [ - # - Darwin report: https://github.com/xtensor-stack/xsimd/issues/917 - # - Musl report: https://github.com/xtensor-stack/xsimd/issues/798 - ./disable-exp10-test.patch - ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ - # https://github.com/xtensor-stack/xsimd/issues/798 - ./disable-polar-test.patch - ] ++ lib.optionals stdenv.hostPlatform.isMusl [ - # Fix suggested here: https://github.com/xtensor-stack/xsimd/issues/798#issuecomment-1356884601 - # Upstream didn't merge that from some reason. - ./fix-atan-test.patch + # Fix of https://github.com/xtensor-stack/xsimd/pull/1024 for + # https://github.com/xtensor-stack/xsimd/issues/456 and + # https://github.com/xtensor-stack/xsimd/issues/807, + (fetchpatch { + url = "https://github.com/xtensor-stack/xsimd/commit/c8a87ed6e04b6782f48f94713adfb0cad6c11ddf.patch"; + hash = "sha256-2/FvBGdqTPcayD7rdHPSzL+F8IYKAfMW0WBJ0cW9EZ0="; + }) ]; nativeBuildInputs = [ @@ -41,7 +30,9 @@ stdenv.mkDerivation (finalAttrs: { ]; cmakeFlags = [ - "-DBUILD_TESTS=${if (finalAttrs.finalPackage.doCheck && stdenv.hostPlatform == stdenv.buildPlatform) then "ON" else "OFF"}" + # Always build the tests, even if not running them, because testing whether + # they can be built is a test in itself. + "-DBUILD_TESTS=ON" ]; doCheck = true; diff --git a/pkgs/development/libraries/xsimd/disable-exp10-test.patch b/pkgs/development/libraries/xsimd/disable-exp10-test.patch deleted file mode 100644 index 8d2940c3b080b..0000000000000 --- a/pkgs/development/libraries/xsimd/disable-exp10-test.patch +++ /dev/null @@ -1,36 +0,0 @@ -commit 87433035c70578507e08565723c99158290f2488 -Author: Doron Behar <doron.behar@gmail.com> -Date: Tue Aug 1 13:26:04 2023 +0300 - - Darwin & Musl: Disable failing exp10 test - ---- a/test/test_xsimd_api.cpp -+++ b/test/test_xsimd_api.cpp -@@ -515,15 +515,6 @@ struct xsimd_api_float_types_functions - value_type val(2); - CHECK_EQ(extract(xsimd::exp(T(val))), std::exp(val)); - } -- void test_exp10() -- { -- value_type val(2); --#ifdef EMSCRIPTEN -- CHECK_EQ(extract(xsimd::exp10(T(val))), doctest::Approx(std::pow(value_type(10), val))); --#else -- CHECK_EQ(extract(xsimd::exp10(T(val))), std::pow(value_type(10), val)); --#endif -- } - void test_exp2() - { - value_type val(2); -@@ -813,11 +804,6 @@ TEST_CASE_TEMPLATE("[xsimd api | float types functions]", B, FLOAT_TYPES) - Test.test_exp(); - } - -- SUBCASE("exp10") -- { -- Test.test_exp10(); -- } -- - SUBCASE("exp2") - { - Test.test_exp2(); diff --git a/pkgs/development/libraries/xsimd/disable-polar-test.patch b/pkgs/development/libraries/xsimd/disable-polar-test.patch deleted file mode 100644 index 91128f43c2d5c..0000000000000 --- a/pkgs/development/libraries/xsimd/disable-polar-test.patch +++ /dev/null @@ -1,38 +0,0 @@ -commit 9374b88b97911d9c6e19d5e764e25183cd45d534 -Author: Doron Behar <doron.behar@gmail.com> -Date: Tue Aug 1 13:29:16 2023 +0300 - - aarch64-Darwin: Disable failing polar test - ---- a/test/test_xsimd_api.cpp -+++ b/test/test_xsimd_api.cpp -@@ -661,17 +661,6 @@ struct xsimd_api_float_types_functions - value_type val1(4); - CHECK_EQ(extract(xsimd::nextafter(T(val0), T(val1))), std::nextafter(val0, val1)); - } -- void test_polar() -- { -- value_type val0(3); -- value_type val1(4); --#ifndef EMSCRIPTEN -- CHECK_EQ(extract(xsimd::polar(T(val0), T(val1))), std::polar(val0, val1)); --#else -- CHECK_EQ(std::real(extract(xsimd::polar(T(val0), T(val1)))), doctest::Approx(std::real(std::polar(val0, val1)))); -- CHECK_EQ(std::imag(extract(xsimd::polar(T(val0), T(val1)))), doctest::Approx(std::imag(std::polar(val0, val1)))); --#endif -- } - void test_pow() - { - value_type val0(2); -@@ -931,11 +920,6 @@ TEST_CASE_TEMPLATE("[xsimd api | float types functions]", B, FLOAT_TYPES) - Test.test_nextafter(); - } - -- SUBCASE("polar") -- { -- Test.test_polar(); -- } -- - SUBCASE("pow") - { - Test.test_pow(); diff --git a/pkgs/development/libraries/xsimd/disable-test_error_gamma-test.patch b/pkgs/development/libraries/xsimd/disable-test_error_gamma-test.patch deleted file mode 100644 index a7344d231b8db..0000000000000 --- a/pkgs/development/libraries/xsimd/disable-test_error_gamma-test.patch +++ /dev/null @@ -1,36 +0,0 @@ -commit 3f751cef6b27ec13418a92c5b5f36b22bb5ffd55 -Author: Doron Behar <doron.behar@gmail.com> -Date: Tue Aug 1 13:24:34 2023 +0300 - - Darwin: Disable failing test from test_error_gamma.cpp - -diff --git a/test/test_error_gamma.cpp b/test/test_error_gamma.cpp -index 214cbb5..299e5b8 100644 ---- a/test/test_error_gamma.cpp -+++ b/test/test_error_gamma.cpp -@@ -131,25 +131,6 @@ struct error_gamma_test - INFO("lgamma"); - CHECK_EQ(diff, 0); - } --#if !(XSIMD_WITH_AVX && !XSIMD_WITH_AVX2) -- -- // tgamma (negative input) -- { -- std::transform(gamma_neg_input.cbegin(), gamma_neg_input.cend(), expected.begin(), -- [](const value_type& v) -- { return std::lgamma(v); }); -- batch_type in, out; -- for (size_t i = 0; i < nb_input; i += size) -- { -- detail::load_batch(in, gamma_neg_input, i); -- out = lgamma(in); -- detail::store_batch(out, res, i); -- } -- size_t diff = detail::get_nb_diff(res, expected); -- INFO("lgamma (negative input)"); -- CHECK_EQ(diff, 0); -- } --#endif - } - }; - diff --git a/pkgs/development/libraries/xsimd/fix-atan-test.patch b/pkgs/development/libraries/xsimd/fix-atan-test.patch deleted file mode 100644 index 3d1517610aae5..0000000000000 --- a/pkgs/development/libraries/xsimd/fix-atan-test.patch +++ /dev/null @@ -1,19 +0,0 @@ -commit f60dad2c1d8ad47fbff761ce1cb027fc7c3a40e8 -Author: Doron Behar <doron.behar@gmail.com> -Date: Tue Aug 1 13:47:37 2023 +0300 - - Musl: Fix atan test from test_complex_trigonometric.cpp - -diff --git a/test/test_complex_trigonometric.cpp b/test/test_complex_trigonometric.cpp -index a486110..691db77 100644 ---- a/test/test_complex_trigonometric.cpp -+++ b/test/test_complex_trigonometric.cpp -@@ -155,7 +155,7 @@ struct complex_trigonometric_test - out = atan(in); - detail::store_batch(out, res, i); - } -- size_t diff = detail::get_nb_diff(res, expected); -+ size_t diff = detail::get_nb_diff_near(res, expected, 1e-12); - CHECK_EQ(diff, 0); - } - diff --git a/pkgs/development/libraries/xsimd/fix-darwin-exp10-implementation.patch b/pkgs/development/libraries/xsimd/fix-darwin-exp10-implementation.patch deleted file mode 100644 index caa7db0bcc134..0000000000000 --- a/pkgs/development/libraries/xsimd/fix-darwin-exp10-implementation.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git i/include/xsimd/arch/xsimd_scalar.hpp w/include/xsimd/arch/xsimd_scalar.hpp -index 9066da6..7aa3b6b 100644 ---- i/include/xsimd/arch/xsimd_scalar.hpp -+++ w/include/xsimd/arch/xsimd_scalar.hpp -@@ -502,16 +502,7 @@ namespace xsimd - return !(x0 == x1); - } - --#if defined(__APPLE__) -- inline float exp10(const float& x) noexcept -- { -- return __exp10f(x); -- } -- inline double exp10(const double& x) noexcept -- { -- return __exp10(x); -- } --#elif defined(__GLIBC__) -+#if defined(__GLIBC__) - inline float exp10(const float& x) noexcept - { - return ::exp10f(x); diff --git a/pkgs/development/libraries/xtensor/default.nix b/pkgs/development/libraries/xtensor/default.nix index 678f87af74cfa..da85a37ab5bc0 100644 --- a/pkgs/development/libraries/xtensor/default.nix +++ b/pkgs/development/libraries/xtensor/default.nix @@ -13,24 +13,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "xtensor"; - version = "0.24.7"; + version = "0.25.0"; src = fetchFromGitHub { owner = "xtensor-stack"; repo = "xtensor"; rev = finalAttrs.version; - hash = "sha256-dVbpcBW+jK9nIl5efk5LdKdBm8CkaJWEZ0ZY7ZuApwk="; + hash = "sha256-hVfdtYcJ6mzqj0AUu6QF9aVKQGYKd45RngY6UN3yOH4="; }; - patches = [ - # Support for xsimd 11 - (fetchpatch { - url = "https://github.com/xtensor-stack/xtensor/commit/77a650a8018e0be6fcc76bf66685ff352ae23ef1.patch"; - hash = "sha256-vOdUzzsSK+lYcA7fZXWOTVV202GZC0DhkMMjzggnmWE="; - }) - # A single test fails on Darwin, see: - # https://github.com/xtensor-stack/xtensor/issues/2718 - ./remove-failing-test_xinfo.patch - ]; nativeBuildInputs = [ cmake @@ -38,18 +28,15 @@ stdenv.mkDerivation (finalAttrs: { propagatedBuildInputs = [ nlohmann_json xtl - ] ++ lib.optionals (!(stdenv.isAarch64 && stdenv.isLinux)) [ - # xsimd support is broken on aarch64-linux, see: - # https://github.com/xtensor-stack/xsimd/issues/945 xsimd ]; - cmakeFlags = let - cmakeBool = x: if x then "ON" else "OFF"; - in [ - "-DBUILD_TESTS=${cmakeBool finalAttrs.finalPackage.doCheck}" - "-DXTENSOR_ENABLE_ASSERT=${cmakeBool enableAssertions}" - "-DXTENSOR_CHECK_DIMENSION=${cmakeBool enableBoundChecks}" + cmakeFlags = [ + # Always build the tests, even if not running them, because testing whether + # they can be built is a test in itself. + (lib.cmakeBool "BUILD_TESTS" true) + (lib.cmakeBool "XTENSOR_ENABLE_ASSERT" enableAssertions) + (lib.cmakeBool "XTENSOR_CHECK_DIMENSION" enableBoundChecks) ]; doCheck = true; @@ -59,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { checkTarget = "xtest"; meta = with lib; { - description = "Multi-dimensional arrays with broadcasting and lazy computing."; + description = "Multi-dimensional arrays with broadcasting and lazy computing"; homepage = "https://github.com/xtensor-stack/xtensor"; license = licenses.bsd3; maintainers = with maintainers; [ cpcloud ]; diff --git a/pkgs/development/libraries/xtensor/remove-failing-test_xinfo.patch b/pkgs/development/libraries/xtensor/remove-failing-test_xinfo.patch deleted file mode 100644 index c3352c453c598..0000000000000 --- a/pkgs/development/libraries/xtensor/remove-failing-test_xinfo.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git i/test/CMakeLists.txt w/test/CMakeLists.txt -index 46127597..727b66bd 100644 ---- i/test/CMakeLists.txt -+++ w/test/CMakeLists.txt -@@ -189,7 +189,6 @@ set(XTENSOR_TESTS - test_xhistogram.cpp - test_xpad.cpp - test_xindex_view.cpp -- test_xinfo.cpp - test_xio.cpp - test_xlayout.cpp - test_xmanipulation.cpp diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix index a98441952ed67..274f742015207 100644 --- a/pkgs/development/python-modules/boto3/default.nix +++ b/pkgs/development/python-modules/boto3/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "boto3"; - version = "1.34.58"; # N.B: if you change this, change botocore and awscli to a matching version + inherit (botocore) version; # N.B: botocore, boto3, awscli needs to be updated in lockstep, bump botocore version for updating these. pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "boto"; repo = "boto3"; rev = "refs/tags/${version}"; - hash = "sha256-2L4pHjrDoy7dPZm0nx+NXZV/K3ZVx7FrNGYZTMrwAs4="; + hash = "sha256-1qnWJjYsDc70VkHYbKt0X26f0f4TugqMiS1FeaPjhq4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix index 4d2237c461f7d..7022fe5eb8768 100644 --- a/pkgs/development/python-modules/botocore/default.nix +++ b/pkgs/development/python-modules/botocore/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "botocore"; - version = "1.34.87"; # N.B: if you change this, change boto3 and awscli to a matching version + version = "1.34.109"; # N.B: if you change this, change boto3 and awscli to a matching version pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-o6TYV/CUHZih5c6M1kw5BiJx/qC+TZ89DWr/bLWBI7k="; + hash = "sha256-gEghJSWXgh9yI8s7/KKipROuC7mnHo4iYFr/aGbhPnE="; }; pythonRelaxDeps = [ "urllib3" ]; diff --git a/pkgs/development/python-modules/curio/default.nix b/pkgs/development/python-modules/curio/default.nix index 03a5454f55cec..087d85405e260 100644 --- a/pkgs/development/python-modules/curio/default.nix +++ b/pkgs/development/python-modules/curio/default.nix @@ -38,6 +38,7 @@ buildPythonPackage rec { disabledTests = [ + "test_cpu" # timing sensitive "test_aside_basic" # times out "test_write_timeout" # flaky, does not always time out "test_aside_cancel" # fails because modifies PYTHONPATH and cant find pytest diff --git a/pkgs/development/python-modules/docker-py/default.nix b/pkgs/development/python-modules/docker-py/default.nix deleted file mode 100644 index 159722a7a7567..0000000000000 --- a/pkgs/development/python-modules/docker-py/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - six, - requests, - websocket-client, - docker-pycreds, -}: - -buildPythonPackage rec { - version = "1.10.6"; - format = "setuptools"; - pname = "docker-py"; - - src = fetchPypi { - inherit pname version; - sha256 = "05f49f6hnl7npmi7kigg0ibqk8s3fhzx1ivvz1kqvlv4ay3paajc"; - }; - - # The tests access the network. - doCheck = false; - - propagatedBuildInputs = [ - six - requests - websocket-client - docker-pycreds - ]; - - meta = { - description = "Python library for the Docker Remote API"; - homepage = "https://github.com/docker/docker-py/"; - license = lib.licenses.asl20; - maintainers = [ lib.maintainers.pmiddend ]; - }; -} diff --git a/pkgs/development/python-modules/docker/default.nix b/pkgs/development/python-modules/docker/default.nix index 38b3ab00e068b..77a7d25266457 100644 --- a/pkgs/development/python-modules/docker/default.nix +++ b/pkgs/development/python-modules/docker/default.nix @@ -2,12 +2,12 @@ lib, stdenv, buildPythonPackage, - fetchPypi, + fetchFromGitHub, pythonOlder, # build-system - setuptools, - setuptools-scm, + hatchling, + hatch-vcs, # dependencies packaging, @@ -24,29 +24,32 @@ buildPythonPackage rec { pname = "docker"; - version = "7.0.0"; - format = "pyproject"; + version = "7.1.0"; + pyproject = true; disabled = pythonOlder "3.8"; - src = fetchPypi { - inherit pname version; - hash = "sha256-Mjc2+5LNlBj8XnEzvJU+EanaBPRIP4KLUn21U/Hn5aM="; + src = fetchFromGitHub { + owner = "docker"; + repo = "docker-py"; + rev = "refs/tags/${version}"; + hash = "sha256-sk6TZLek+fRkKq7kG9g6cR9lvfPC8v8qUXKb7Tq4pLU="; }; - nativeBuildInputs = [ - setuptools - setuptools-scm + build-system = [ + hatchling + hatch-vcs ]; - propagatedBuildInputs = [ + dependencies = [ packaging requests urllib3 ]; - passthru.optional-dependencies = { + optional-dependencies = { ssh = [ paramiko ]; + tls = []; websockets = [ websocket-client ]; }; @@ -54,7 +57,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); pytestFlagsArray = [ "tests/unit" ]; diff --git a/pkgs/development/python-modules/elastic-transport/default.nix b/pkgs/development/python-modules/elastic-transport/default.nix index dac3236e6c7e2..4f569fc29a53e 100644 --- a/pkgs/development/python-modules/elastic-transport/default.nix +++ b/pkgs/development/python-modules/elastic-transport/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "elastic-transport"; - version = "8.13.0"; + version = "8.13.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "elastic"; repo = "elastic-transport-python"; rev = "refs/tags/v${version}"; - hash = "sha256-KmZCaAbzbfqbPwFuF43ckwgVhZVbPvwjF7uqPKHml9Q="; + hash = "sha256-zxx5BvqQf5ipaOANKpThWUTsfhDkNMJqUejAWH68wpo="; }; postPatch = '' diff --git a/pkgs/development/python-modules/gst-python/default.nix b/pkgs/development/python-modules/gst-python/default.nix index 77e37baa7c0d5..f2cc5a2edfac1 100644 --- a/pkgs/development/python-modules/gst-python/default.nix +++ b/pkgs/development/python-modules/gst-python/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "gst-python"; - version = "1.24.2"; + version = "1.24.3"; format = "other"; @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchurl { url = "https://gstreamer.freedesktop.org/src/gst-python/${pname}-${version}.tar.xz"; - hash = "sha256-vZDzvIrxfc478mtmU377SVGGn/zmQD9ZhGG5heKy144="; + hash = "sha256-7Ns+K6lOosgrk6jHFdWn4E+XJqiDjAprF2lJKP0ehZU="; }; # Python 2.x is not supported. diff --git a/pkgs/development/python-modules/hypothesis/default.nix b/pkgs/development/python-modules/hypothesis/default.nix index 8a00cae1e1a4a..a76b8e2ff29d3 100644 --- a/pkgs/development/python-modules/hypothesis/default.nix +++ b/pkgs/development/python-modules/hypothesis/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "hypothesis"; - version = "6.100.1"; + version = "6.103.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "HypothesisWorks"; repo = "hypothesis"; rev = "hypothesis-python-${version}"; - hash = "sha256-3Mwa1nS6rvFBcU5QXLH4/wa38qCvDX9sRina1aJS1Rs="; + hash = "sha256-sll0GAI1nvBQvRqgpTkLpj7GQI988AftDQHV1zh2t1w="; }; # I tried to package sphinx-selective-exclude, but it throws @@ -73,16 +73,18 @@ buildPythonPackage rec { pytestFlagsArray = [ "tests/cover" ]; disabledTests = - if (pythonOlder "3.10") then - [ - # not sure why these tests fail with only 3.9 - # FileNotFoundError: [Errno 2] No such file or directory: 'git' - "test_observability" - "test_assume_has_status_reason" - "test_observability_captures_stateful_reprs" - ] - else - null; + [ + # racy, fails to find a file sometimes + "test_recreate_charmap" + "test_uses_cached_charmap" + ] + ++ lib.optionals (pythonOlder "3.10") [ + # not sure why these tests fail with only 3.9 + # FileNotFoundError: [Errno 2] No such file or directory: 'git' + "test_observability" + "test_assume_has_status_reason" + "test_observability_captures_stateful_reprs" + ]; pythonImportsCheck = [ "hypothesis" ]; diff --git a/pkgs/development/python-modules/orjson/default.nix b/pkgs/development/python-modules/orjson/default.nix index 75440aeaa8606..5bb2acb5dfd8c 100644 --- a/pkgs/development/python-modules/orjson/default.nix +++ b/pkgs/development/python-modules/orjson/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "orjson"; - version = "3.10.1"; + version = "3.10.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -40,13 +40,13 @@ buildPythonPackage rec { owner = "ijl"; repo = "orjson"; rev = "refs/tags/${version}"; - hash = "sha256-vEJriLd7f+zlYcMIyhDTkq2kmNc5MaNLHo0qMLS5hro="; + hash = "sha256-bK6wA8P/IXEbiuJAx7psd0nUUKjR1jX4scFfJr1MBAk="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-yQkpjedHwgsZiiZEzYV66aa9RepCFW0PBqtD29tfoMI="; + hash = "sha256-ilGq+/gPSuNwURUWy2ZxInzmUv+PxYMxd8esxrMpr2o="; }; maturinBuildFlags = [ "--interpreter ${python.executable}" ]; diff --git a/pkgs/development/python-modules/pytest-httpbin/default.nix b/pkgs/development/python-modules/pytest-httpbin/default.nix index 7674158066022..8d7f98c78ffe8 100644 --- a/pkgs/development/python-modules/pytest-httpbin/default.nix +++ b/pkgs/development/python-modules/pytest-httpbin/default.nix @@ -7,13 +7,13 @@ pytestCheckHook, pythonOlder, requests, - six, + setuptools, }: buildPythonPackage rec { pname = "pytest-httpbin"; version = "2.0.0"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -24,12 +24,11 @@ buildPythonPackage rec { hash = "sha256-tq9nz2na94HkLACt7xB1MUanh9/JOoe2vyEm5sAq0/4="; }; + build-system = [ setuptools ]; + buildInputs = [ pytest ]; - propagatedBuildInputs = [ - httpbin - six - ]; + propagatedBuildInputs = [ httpbin ]; nativeCheckInputs = [ pytestCheckHook @@ -39,6 +38,8 @@ buildPythonPackage rec { disabledTests = [ # incompatible with flask 2.3 "test_redirect_location_is_https_for_secure_server" + # Timeout on Hydra + "test_dont_crash_on_handshake_timeout" ]; __darwinAllowLocalNetworking = true; @@ -48,6 +49,7 @@ buildPythonPackage rec { meta = with lib; { description = "Test your HTTP library against a local copy of httpbin.org"; homepage = "https://github.com/kevin1024/pytest-httpbin"; + changelog = "https://github.com/kevin1024/pytest-httpbin/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/quil/default.nix b/pkgs/development/python-modules/quil/default.nix index a987561d08573..c1530c320617c 100644 --- a/pkgs/development/python-modules/quil/default.nix +++ b/pkgs/development/python-modules/quil/default.nix @@ -33,10 +33,6 @@ buildPythonPackage rec { buildAndTestSubdir = "quil-py"; - preConfigure = '' - cargo metadata --offline - ''; - build-system = [ rustPlatform.cargoSetupHook rustPlatform.maturinBuildHook diff --git a/pkgs/development/python-modules/requests/default.nix b/pkgs/development/python-modules/requests/default.nix index ef4526a709185..a483d00695188 100644 --- a/pkgs/development/python-modules/requests/default.nix +++ b/pkgs/development/python-modules/requests/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "requests"; - version = "2.31.0"; + version = "2.32.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-lCxadY+Y15Dq7Ropy27vx/+w0c968Fw9J5Flbb1q0eE="; + hash = "sha256-VTZUF3NOsYJVWQqf+euX6eHaho1MzWQCOZ6vaK8gp2A="; }; dependencies = [ diff --git a/pkgs/development/python-modules/scipy/default.nix b/pkgs/development/python-modules/scipy/default.nix index 19bba41bfa501..1bd02b708089e 100644 --- a/pkgs/development/python-modules/scipy/default.nix +++ b/pkgs/development/python-modules/scipy/default.nix @@ -38,8 +38,8 @@ let # nix-shell maintainers/scripts/update.nix --argstr package python3.pkgs.scipy # # The update script uses sed regexes to replace them with the updated hashes. - version = "1.13.0"; - srcHash = "sha256-HaYk92hOREHMOXppK+Bs9DrBu9KUVUsZ0KV+isTofUo="; + version = "1.13.1"; + srcHash = "sha256-KpTvBJhiJ/IBjIFQhvS+NhRP3tbyXU5gQnAiFv47sKU="; datasetsHashes = { ascent = "1qjp35ncrniq9rhzb14icwwykqg2208hcssznn3hz27w39615kh3"; ecg = "1bwbjp43b7znnwha5hv6wiz3g0bhwrpqpi75s12zidxrbwvd62pj"; @@ -80,12 +80,6 @@ buildPythonPackage { hash = "sha256-Vf6/hhwu6X5s8KWhq8bUZKtSkdVu/GtEpGtj8Olxe7s="; excludes = [ "doc/source/dev/contributor/meson_advanced.rst" ]; }) - # Fix for https://github.com/scipy/scipy/issues/20300 until 1.13.1 is - # released. Patch is based upon: - # https://github.com/scipy/pocketfft/commit/9367142748fcc9696a1c9e5a99b76ed9897c9daa - # Couldn't use fetchpatch because it is a submodule of scipy, and - # extraPrefix doesn't fit this purpose. - ./pocketfft-aligned_alloc.patch ]; # Upstream says in a comment in their pyproject.toml that building against diff --git a/pkgs/development/python-modules/scipy/pocketfft-aligned_alloc.patch b/pkgs/development/python-modules/scipy/pocketfft-aligned_alloc.patch deleted file mode 100644 index 80b047c7061c5..0000000000000 --- a/pkgs/development/python-modules/scipy/pocketfft-aligned_alloc.patch +++ /dev/null @@ -1,30 +0,0 @@ -From fbe3c10d117de98d80a86a10f76d4cd74efc55a8 Mon Sep 17 00:00:00 2001 -From: Martin Reinecke <martin@mpa-garching.mpg.de> -Date: Fri, 22 Mar 2024 10:53:05 +0100 -Subject: [PATCH] unconditionaly disable use of aligned_alloc - ---- - pocketfft_hdronly.h | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/scipy/_lib/pocketfft/pocketfft_hdronly.h b/scipy/_lib/pocketfft/pocketfft_hdronly.h -index 6c98f2d..66eea06 100644 ---- a/scipy/_lib/pocketfft/pocketfft_hdronly.h -+++ b/scipy/_lib/pocketfft/pocketfft_hdronly.h -@@ -152,11 +152,11 @@ template<> struct VLEN<double> { static constexpr size_t val=2; }; - #endif - #endif - --// the __MINGW32__ part in the conditional below works around the problem that --// the standard C++ library on Windows does not provide aligned_alloc() even --// though the MinGW compiler and MSVC may advertise C++17 compliance. --// aligned_alloc is only supported from MacOS 10.15. --#if (__cplusplus >= 201703L) && (!defined(__MINGW32__)) && (!defined(_MSC_VER)) && (__MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_15) -+// std::aligned_alloc is a bit cursed ... it doesn't exist on MacOS < 10.15 -+// and in musl, and other OSes seem to have even more peculiarities. -+// Let's unconditionally work around it for now. -+# if 0 -+//#if (__cplusplus >= 201703L) && (!defined(__MINGW32__)) && (!defined(_MSC_VER)) && (__MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_15) - inline void *aligned_alloc(size_t align, size_t size) - { - // aligned_alloc() requires that the requested size is a multiple of "align" diff --git a/pkgs/development/python-modules/tappy/default.nix b/pkgs/development/python-modules/tappy/default.nix index 5c464707f2cc6..332848bafb446 100644 --- a/pkgs/development/python-modules/tappy/default.nix +++ b/pkgs/development/python-modules/tappy/default.nix @@ -3,18 +3,33 @@ buildPythonPackage, pythonOlder, fetchPypi, + setuptools, + pyyaml, + more-itertools, pytestCheckHook, }: buildPythonPackage rec { pname = "tap.py"; version = "3.1"; + pyproject = true; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "3c0cd45212ad5a25b35445964e2517efa000a118a1bfc3437dae828892eaf1e1"; + hash = "sha256-PAzUUhKtWiWzVEWWTiUX76AAoRihv8NDfa6CiJLq8eE="; + }; + + build-system = [ + setuptools + ]; + + optional-dependencies = { + yaml = [ + pyyaml + more-itertools + ]; }; nativeCheckInputs = [ pytestCheckHook ]; @@ -25,6 +40,7 @@ buildPythonPackage rec { description = "A set of tools for working with the Test Anything Protocol (TAP) in Python"; homepage = "https://github.com/python-tap/tappy"; changelog = "https://tappy.readthedocs.io/en/latest/releases.html"; + mainProgram = "tappy"; license = licenses.bsd2; maintainers = with maintainers; [ sfrijters ]; }; diff --git a/pkgs/development/python-modules/tokenizers/default.nix b/pkgs/development/python-modules/tokenizers/default.nix index 18ccce25f08d5..cda6f1b7a58ef 100644 --- a/pkgs/development/python-modules/tokenizers/default.nix +++ b/pkgs/development/python-modules/tokenizers/default.nix @@ -99,12 +99,6 @@ buildPythonPackage rec { Security ]; - # Cargo.lock is outdated - # TODO: remove at next release - preConfigure = '' - cargo update --offline - ''; - dependencies = [ numpy huggingface-hub diff --git a/pkgs/development/python-modules/typing-extensions/default.nix b/pkgs/development/python-modules/typing-extensions/default.nix index fbe96efda4190..793b26917617b 100644 --- a/pkgs/development/python-modules/typing-extensions/default.nix +++ b/pkgs/development/python-modules/typing-extensions/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "typing-extensions"; - version = "4.11.0"; + version = "4.12.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "typing_extensions"; inherit version; - hash = "sha256-g/CFvVylnIApX8KoKrXaxnnL4CufM/fYOvaOJBvqUbA="; + hash = "sha256-jLzchgbryw2VRTrX3FBl5iN7aqIwox6B0PRAww/tX9g="; }; nativeBuildInputs = [ flit-core ]; diff --git a/pkgs/development/python-modules/xtensor-python/default.nix b/pkgs/development/python-modules/xtensor-python/default.nix index 2467bac97096f..14d063a802d6a 100644 --- a/pkgs/development/python-modules/xtensor-python/default.nix +++ b/pkgs/development/python-modules/xtensor-python/default.nix @@ -13,20 +13,24 @@ toPythonModule ( stdenv.mkDerivation (finalAttrs: { pname = "xtensor-python"; - version = "0.26.1"; + version = "0.27.0"; src = fetchFromGitHub { owner = "xtensor-stack"; repo = "xtensor-python"; rev = finalAttrs.version; - sha256 = "sha256-kLFt5Ah5/ZO6wfTZQviVXeIAVok+/F/XCwpgPSagOMo="; + hash = "sha256-Cy/aXuiriE/qxSd4Apipzak30DjgE7jX8ai1ThJ/VnE="; }; nativeBuildInputs = [ cmake ]; buildInputs = [ pybind11 ]; nativeCheckInputs = [ gtest ]; doCheck = true; - cmakeFlags = [ "-DBUILD_TESTS=${if finalAttrs.finalPackage.doCheck then "ON" else "OFF"}" ]; + cmakeFlags = [ + # Always build the tests, even if not running them, because testing whether + # they can be built is a test in itself. + "-DBUILD_TESTS=ON" + ]; propagatedBuildInputs = [ xtensor diff --git a/pkgs/development/ruby-modules/bundler/default.nix b/pkgs/development/ruby-modules/bundler/default.nix index b9389603670d7..581c2544a2205 100644 --- a/pkgs/development/ruby-modules/bundler/default.nix +++ b/pkgs/development/ruby-modules/bundler/default.nix @@ -4,8 +4,8 @@ buildRubyGem rec { inherit ruby; name = "${gemName}-${version}"; gemName = "bundler"; - version = "2.5.9"; - source.sha256 = "sha256-4rYTJb41m85U6w/tiEBO/mfl4fgAPTSiIYQeO3Za7AY="; + version = "2.5.11"; + source.sha256 = "sha256-3XhL/lODSzmlbmQtvG4eyhmi5kVOTVOZTLcpgAWsTC4="; dontPatchShebangs = true; postFixup = '' diff --git a/pkgs/development/tools/analysis/valgrind/default.nix b/pkgs/development/tools/analysis/valgrind/default.nix index c8046b68cd96d..547f07d2ee6d3 100644 --- a/pkgs/development/tools/analysis/valgrind/default.nix +++ b/pkgs/development/tools/analysis/valgrind/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "valgrind"; - version = "3.22.0"; + version = "3.23.0"; src = fetchurl { url = "https://sourceware.org/pub/${pname}/${pname}-${version}.tar.bz2"; - hash = "sha256-yBHbWt0sX3KZRMr0fE56Zdyqu5Rh5HK1eHZd179tLUw="; + hash = "sha256-xcNKM4BFe5t1YG34kBAuffLHArlCDC6++VQPi11WJk0="; }; patches = [ @@ -28,18 +28,19 @@ stdenv.mkDerivation rec { }) # Fix build on armv7l. # https://bugs.kde.org/show_bug.cgi?id=454346 - (fetchpatch { - url = "https://bugsfiles.kde.org/attachment.cgi?id=149172"; - sha256 = "sha256-4MASLsEK8wcshboR4YOc6mIt7AvAgDPvqIZyHqlvTEs="; - }) - (fetchpatch { - url = "https://bugsfiles.kde.org/attachment.cgi?id=149173"; - sha256 = "sha256-jX9hD4utWRebbXMJYZ5mu9jecvdrNP05E5J+PnKRTyQ="; - }) - (fetchpatch { - url = "https://bugsfiles.kde.org/attachment.cgi?id=149174"; - sha256 = "sha256-f1YIFIhWhXYVw3/UNEWewDak2mvbAd3aGzK4B+wTlys="; - }) + # Applied on 3.22.0. Does not apply on 3.23.0. + #(fetchpatch { + # url = "https://bugsfiles.kde.org/attachment.cgi?id=149172"; + # sha256 = "sha256-4MASLsEK8wcshboR4YOc6mIt7AvAgDPvqIZyHqlvTEs="; + #}) + #(fetchpatch { + # url = "https://bugsfiles.kde.org/attachment.cgi?id=149173"; + # sha256 = "sha256-jX9hD4utWRebbXMJYZ5mu9jecvdrNP05E5J+PnKRTyQ="; + #}) + #(fetchpatch { + # url = "https://bugsfiles.kde.org/attachment.cgi?id=149174"; + # sha256 = "sha256-f1YIFIhWhXYVw3/UNEWewDak2mvbAd3aGzK4B+wTlys="; + #}) ]; outputs = [ "out" "dev" "man" "doc" ]; diff --git a/pkgs/development/tools/build-managers/gnumake/default.nix b/pkgs/development/tools/build-managers/gnumake/default.nix index 774ea50f86238..7c075b7d8b8bc 100644 --- a/pkgs/development/tools/build-managers/gnumake/default.nix +++ b/pkgs/development/tools/build-managers/gnumake/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, updateAutotoolsGnuConfigScriptsHook , guileSupport ? false, guile # avoid guile depend on bootstrap to prevent dependency cycles , inBootstrap ? false @@ -31,7 +32,7 @@ stdenv.mkDerivation rec { ./0002-remove-impure-dirs.patch ]; - nativeBuildInputs = lib.optionals guileEnabled [ pkg-config ]; + nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ] ++ lib.optionals guileEnabled [ pkg-config ]; buildInputs = lib.optionals guileEnabled [ guile ]; configureFlags = lib.optional guileEnabled "--with-guile" diff --git a/pkgs/development/tools/misc/automake/automake-1.16.x.nix b/pkgs/development/tools/misc/automake/automake-1.16.x.nix index 0d9572c6f3140..20fe31ef6cd7f 100644 --- a/pkgs/development/tools/misc/automake/automake-1.16.x.nix +++ b/pkgs/development/tools/misc/automake/automake-1.16.x.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, perl, autoconf }: +{ lib, stdenv, fetchurl, perl, autoconf, updateAutotoolsGnuConfigScriptsHook }: stdenv.mkDerivation rec { pname = "automake"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; strictDeps = true; - nativeBuildInputs = [ autoconf perl ]; + nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook autoconf perl ]; buildInputs = [ autoconf ]; setupHook = ./setup-hook.sh; diff --git a/pkgs/development/tools/misc/dejagnu/default.nix b/pkgs/development/tools/misc/dejagnu/default.nix index 5c7720a2024b4..55581aedce607 100644 --- a/pkgs/development/tools/misc/dejagnu/default.nix +++ b/pkgs/development/tools/misc/dejagnu/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, expect, makeWrapper }: +{ fetchurl, lib, stdenv, expect, makeWrapper, updateAutotoolsGnuConfigScriptsHook }: stdenv.mkDerivation rec { pname = "dejagnu"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1qx2cv6qkxbiqg87jh217jb62hk3s7dmcs4cz1llm2wmsynfznl7"; }; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook makeWrapper ]; buildInputs = [ expect ]; # dejagnu-1.6.3 can't successfully run tests in source tree: diff --git a/pkgs/development/tools/misc/gnum4/default.nix b/pkgs/development/tools/misc/gnum4/default.nix index 66de4ebf8b02e..5dea7f0595574 100644 --- a/pkgs/development/tools/misc/gnum4/default.nix +++ b/pkgs/development/tools/misc/gnum4/default.nix @@ -16,12 +16,17 @@ stdenv.mkDerivation rec { # https://gitweb.gentoo.org/repo/gentoo.git/tree/sys-devel/m4/m4-1.4.19-r1.ebuild patches = lib.optional stdenv.hostPlatform.isLoongArch64 ./loong-fix-build.patch; - postPatch = if stdenv.hostPlatform.isLoongArch64 then '' + # this could be accomplished by updateAutotoolsGnuConfigScriptsHook, but that causes infinite recursion + # necessary for FreeBSD code path in configure + postPatch = '' + substituteInPlace ./build-aux/config.guess --replace-fail /usr/bin/uname uname + '' + lib.optionalString stdenv.hostPlatform.isLoongArch64 '' touch ./aclocal.m4 ./lib/config.hin ./configure ./doc/stamp-vti || die find . -name Makefile.in -exec touch {} + || die - '' else null; + ''; strictDeps = true; + enableParallelBuilding = true; doCheck = false; diff --git a/pkgs/development/tools/misc/libtool/libtool2.nix b/pkgs/development/tools/misc/libtool/libtool2.nix index 259fb2b113c78..df07a2f6a5bfe 100644 --- a/pkgs/development/tools/misc/libtool/libtool2.nix +++ b/pkgs/development/tools/misc/libtool/libtool2.nix @@ -1,5 +1,6 @@ { lib, stdenv, fetchurl, m4 , runtimeShell +, updateAutotoolsGnuConfigScriptsHook , file }: @@ -38,7 +39,7 @@ stdenv.mkDerivation rec { # As libtool is an early bootstrap dependency try hard not to # add autoconf and automake or help2man dependencies here. That way we can # avoid pulling in perl and get away with just an `m4` depend. - nativeBuildInputs = [ m4 file ]; + nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook m4 file ]; propagatedBuildInputs = [ m4 file ]; # Don't fixup "#! /bin/sh" in Libtool, otherwise it will use the diff --git a/pkgs/development/tools/misc/lttng-ust/generic.nix b/pkgs/development/tools/misc/lttng-ust/generic.nix index 89bc888828e20..24d022e4d8512 100644 --- a/pkgs/development/tools/misc/lttng-ust/generic.nix +++ b/pkgs/development/tools/misc/lttng-ust/generic.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { mainProgram = "lttng-gen-tp"; homepage = "https://lttng.org/"; license = with licenses; [ lgpl21Only gpl2Only mit ]; - platforms = platforms.linux; + platforms = lib.intersectLists platforms.linux liburcu.meta.platforms; maintainers = [ maintainers.bjornfor ]; }; diff --git a/pkgs/development/tools/misc/pkg-config/default.nix b/pkgs/development/tools/misc/pkg-config/default.nix index 663f3184b221b..599d282858091 100644 --- a/pkgs/development/tools/misc/pkg-config/default.nix +++ b/pkgs/development/tools/misc/pkg-config/default.nix @@ -19,9 +19,14 @@ stdenv.mkDerivation rec { ++ lib.optional stdenv.isCygwin ./2.36.3-not-win32.patch; # These three tests fail due to a (desired) behavior change from our ./requires-private.patch - postPatch = if vanilla then null else '' - rm -f check/check-requires-private check/check-gtk check/missing - ''; + postPatch = + # this could be accomplished by updateAutotoolsGnuConfigScriptsHook, but that causes infinite recursion + # necessary for FreeBSD code path in configure + '' + substituteInPlace ./config.guess ./glib/config.guess --replace-fail /usr/bin/uname uname + '' + lib.optionalString (!vanilla) '' + rm -f check/check-requires-private check/check-gtk check/missing + ''; buildInputs = [ libiconv ]; diff --git a/pkgs/development/tools/misc/texinfo/common.nix b/pkgs/development/tools/misc/texinfo/common.nix index 858884461ce26..11144d7581a5f 100644 --- a/pkgs/development/tools/misc/texinfo/common.nix +++ b/pkgs/development/tools/misc/texinfo/common.nix @@ -1,7 +1,7 @@ { version, sha256, patches ? [] }: -{ lib, stdenv, buildPackages, fetchurl, perl, xz, libintl, bash -, gnulib, gawk, freebsd, libiconv +{ lib, stdenv, buildPackages, fetchurl, perl, libintl, bash +, updateAutotoolsGnuConfigScriptsHook, gnulib, gawk, freebsd, libiconv # we are a dependency of gcc, this simplifies bootstraping , interactive ? false, ncurses, procps @@ -49,7 +49,8 @@ stdenv.mkDerivation { # A native compiler is needed to build tools needed at build time depsBuildBuild = [ buildPackages.stdenv.cc perl ]; - buildInputs = [ xz.bin bash libintl ] + nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ]; + buildInputs = [ bash libintl ] ++ optionals stdenv.isSunOS [ libiconv gawk ] ++ optional interactive ncurses; diff --git a/pkgs/development/tools/rust/cargo-local-registry/default.nix b/pkgs/development/tools/rust/cargo-local-registry/default.nix index 0b2f31d05a805..36a52bc1763a8 100644 --- a/pkgs/development/tools/rust/cargo-local-registry/default.nix +++ b/pkgs/development/tools/rust/cargo-local-registry/default.nix @@ -42,11 +42,6 @@ rustPlatform.buildRustPackage rec { # tests require internet access doCheck = false; - # Cargo.lock is outdated - preConfigure = '' - cargo metadata --offline - ''; - meta = with lib; { description = "A cargo subcommand to manage local registries"; mainProgram = "cargo-local-registry"; diff --git a/pkgs/development/tools/rust/sqlx-cli/default.nix b/pkgs/development/tools/rust/sqlx-cli/default.nix index 81c02a0d636b8..fed8c02a5eaf4 100644 --- a/pkgs/development/tools/rust/sqlx-cli/default.nix +++ b/pkgs/development/tools/rust/sqlx-cli/default.nix @@ -27,12 +27,6 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-sMyK1v4pJmmlN47mvgUkpLBjcpmT346VSp984IpvVWY="; - # Prepare the Cargo.lock for offline use. - # See https://github.com/NixOS/nixpkgs/issues/261412 - postConfigure = '' - cargo metadata --offline > /dev/null - ''; - buildNoDefaultFeatures = true; buildFeatures = [ "native-tls" diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index c8df29776db95..8fae49e38ff54 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation rec { pname = "cups"; - version = "2.4.7"; + version = "2.4.8"; src = fetchurl { url = "https://github.com/OpenPrinting/cups/releases/download/v${version}/cups-${version}-source.tar.gz"; - sha256 = "sha256-3VQijdkDUmQozn43lhr67SMK0xB4gUHadc66oINiz2w="; + sha256 = "sha256-dcMmtLpzl178yaJQeMSwTNtO4zPKqtDQgj29UixkeaA="; }; outputs = [ "out" "lib" "dev" "man" ]; diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix index 1420290055cb5..8410f77d2c077 100644 --- a/pkgs/misc/ghostscript/default.nix +++ b/pkgs/misc/ghostscript/default.nix @@ -43,11 +43,11 @@ let srcs = [ (fetchurl { url = "mirror://sourceforge/gs-fonts/ghostscript-fonts-std-8.11.tar.gz"; - sha256 = "00f4l10xd826kak51wsmaz69szzm2wp8a41jasr4jblz25bg7dhf"; + hash = "sha256-DrbzVhGfLkmyVjIQhS4X9X+dzFdV81Cmmkag1kGgxAE="; }) (fetchurl { url = "mirror://gnu/ghostscript/gnu-gs-fonts-other-6.0.tar.gz"; - sha256 = "1cxaah3r52qq152bbkiyj2f7dx1rf38vsihlhjmrvzlr8v6cqil1"; + hash = "sha256-gUbMzEaZ/p2rhBRGvdFwOfR2nJA+zrVECRiLkgdUqrM="; }) # ... add other fonts here ]; @@ -61,11 +61,11 @@ let in stdenv.mkDerivation rec { pname = "ghostscript${lib.optionalString x11Support "-with-X"}"; - version = "10.02.1"; + version = "10.03.1"; src = fetchurl { url = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${lib.replaceStrings ["."] [""] version}/ghostscript-${version}.tar.xz"; - hash = "sha512-7g91TBvYoYQorRTqo+rYD/i5YnWvUBLnqDhPHxBJDaBW7smuPMeRp6E6JOFuVN9bzN0QnH1ToUU0u9c2CjALEQ="; + hash = "sha256-FXIS7clrjMxAlHXc4uSYM/tEJ/FQxFUlje2WMsEGq+4="; }; patches = [ diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix index 64f386e0378d3..53b900806ab3e 100644 --- a/pkgs/misc/jackaudio/default.nix +++ b/pkgs/misc/jackaudio/default.nix @@ -50,8 +50,6 @@ stdenv.mkDerivation (finalAttrs: { patchShebangs --build svnversion_regenerate.sh ''; - dontAddWafCrossFlags = true; - wafConfigureFlags = [ "--classic" "--autostart=${if (optDbus != null) then "dbus" else "classic"}" diff --git a/pkgs/os-specific/bsd/lib/install-wrapper.sh b/pkgs/os-specific/bsd/lib/install-wrapper.sh index 91a7a2679f209..97a2aaab22c0e 100644 --- a/pkgs/os-specific/bsd/lib/install-wrapper.sh +++ b/pkgs/os-specific/bsd/lib/install-wrapper.sh @@ -14,7 +14,6 @@ while (( $# )); do case $1 in -C) ;; -o | -g) shift ;; - -s) ;; -m | -l) # handle next arg so not counted as path arg args+=("$1" "$2") diff --git a/pkgs/os-specific/linux/anbox/default.nix b/pkgs/os-specific/linux/anbox/default.nix index 3a5649d9f2882..1cb614fa220bb 100644 --- a/pkgs/os-specific/linux/anbox/default.nix +++ b/pkgs/os-specific/linux/anbox/default.nix @@ -58,6 +58,7 @@ stdenv.mkDerivation rec { cmake pkg-config makeWrapper + protobufc ]; buildInputs = [ @@ -74,7 +75,7 @@ stdenv.mkDerivation rec { lxc mesa properties-cpp - protobuf protobufc + protobuf python3 SDL2 SDL2_image systemd diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix index 33fa7663f46dd..4a291cc03b8f6 100644 --- a/pkgs/os-specific/linux/busybox/default.nix +++ b/pkgs/os-specific/linux/busybox/default.nix @@ -121,6 +121,10 @@ stdenv.mkDerivation rec { # Bump from 4KB, much faster I/O CONFIG_FEATURE_COPYBUF_KB 64 + # Doesn't build with current kernel headers. + # https://bugs.busybox.net/show_bug.cgi?id=15934 + CONFIG_TC n + # Set the path for the udhcpc script CONFIG_UDHCPC_DEFAULT_SCRIPT "${outDispatchPath}" diff --git a/pkgs/os-specific/linux/ell/default.nix b/pkgs/os-specific/linux/ell/default.nix index 9c16a341a478f..1a5e119ef4737 100644 --- a/pkgs/os-specific/linux/ell/default.nix +++ b/pkgs/os-specific/linux/ell/default.nix @@ -9,14 +9,14 @@ stdenv.mkDerivation rec { pname = "ell"; - version = "0.64"; + version = "0.65"; outputs = [ "out" "dev" ]; src = fetchgit { url = "https://git.kernel.org/pub/scm/libs/ell/ell.git"; rev = version; - hash = "sha256-LONfgFgPg8KCDwtw//WTOYQT9RpnIskdHAWcgafOhcg="; + hash = "sha256-q0C9KfWHxdmrG7xcbb8zpFL4ro+BJb7BL2tyKdFIhew="; }; nativeBuildInputs = [ diff --git a/pkgs/os-specific/linux/kernel-headers/default.nix b/pkgs/os-specific/linux/kernel-headers/default.nix index fc2f8ddbd1434..bf3bf4950a259 100644 --- a/pkgs/os-specific/linux/kernel-headers/default.nix +++ b/pkgs/os-specific/linux/kernel-headers/default.nix @@ -111,12 +111,12 @@ let in { inherit makeLinuxHeaders; - linuxHeaders = let version = "6.7"; in + linuxHeaders = let version = "6.9"; in makeLinuxHeaders { inherit version; src = fetchurl { url = "mirror://kernel/linux/kernel/v${lib.versions.major version}.x/linux-${version}.tar.xz"; - hash = "sha256-7zEUSiV20IDYwxaY6D7J9mv5fGd/oqrw1bu58zRbEGk="; + hash = "sha256-JPoB+5icej4oRT8Rd5kWhxN2bhGcU4HawwEV8Y8mgUk="; }; patches = [ ./no-relocs.patch # for building x86 kernel headers on non-ELF platforms diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index 37c138402d006..081cfcaa8b60f 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -97,7 +97,7 @@ let # For further context, see https://github.com/NixOS/nixpkgs/pull/143113#issuecomment-953319957 basicArgs = builtins.removeAttrs args - (lib.filter (x: ! (builtins.elem x [ "version" "src" ])) (lib.attrNames args)); + (lib.filter (x: ! (builtins.elem x [ "version" "pname" "src" ])) (lib.attrNames args)); # Combine the `features' attribute sets of all the kernel patches. kernelFeatures = lib.foldr (x: y: (x.features or {}) // y) ({ diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix index 4bb2ebda3d028..9a03c39ec5691 100644 --- a/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/pkgs/os-specific/linux/kernel/linux-libre.nix @@ -23,6 +23,7 @@ in linux.override { argsOverride = { modDirVersion = "${linux.modDirVersion}-${versionPrefix}"; isLibre = true; + pname = "linux-libre"; src = stdenv.mkDerivation { name = "${linux.name}-libre-src"; diff --git a/pkgs/os-specific/linux/kernel/linux-rpi.nix b/pkgs/os-specific/linux/kernel/linux-rpi.nix index f1449998984be..e0ce6549235d6 100644 --- a/pkgs/os-specific/linux/kernel/linux-rpi.nix +++ b/pkgs/os-specific/linux/kernel/linux-rpi.nix @@ -8,6 +8,7 @@ in lib.overrideDerivation (buildLinux (args // { version = "${modDirVersion}-${tag}"; inherit modDirVersion; + pname = "linux-rpi"; src = fetchFromGitHub { owner = "raspberrypi"; diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix index d2cc98b8159dc..2792aacce3427 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix @@ -11,6 +11,7 @@ let kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { inherit version; + pname = "linux-rt"; # modDirVersion needs a patch number, change X.Y-rtZ to X.Y.0-rtZ. modDirVersion = lib.versions.pad 3 version; diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.15.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.15.nix index 5e43eca364d42..47634d116e9ac 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-5.15.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-5.15.nix @@ -11,6 +11,7 @@ let kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { inherit version; + pname = "linux-rt"; # modDirVersion needs a patch number, change X.Y-rtZ to X.Y.0-rtZ. modDirVersion = if (builtins.match "[^.]*[.][^.]*-.*" version) == null then version diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix index 463385036292e..2fc18c76e5706 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix @@ -11,6 +11,7 @@ let kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { inherit version; + pname = "linux-rt"; src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; diff --git a/pkgs/os-specific/linux/kernel/linux-rt-6.1.nix b/pkgs/os-specific/linux/kernel/linux-rt-6.1.nix index f7f21a71263bd..0427f9c15986d 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-6.1.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-6.1.nix @@ -11,6 +11,7 @@ let kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { inherit version; + pname = "linux-rt"; # modDirVersion needs a patch number, change X.Y-rtZ to X.Y.0-rtZ. modDirVersion = if (builtins.match "[^.]*[.][^.]*-.*" version) == null then version diff --git a/pkgs/os-specific/linux/kernel/linux-rt-6.6.nix b/pkgs/os-specific/linux/kernel/linux-rt-6.6.nix index 2f035b259b602..57c268fe397e0 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-6.6.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-6.6.nix @@ -11,6 +11,7 @@ let kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { inherit version; + pname = "linux-rt"; # modDirVersion needs a patch number, change X.Y-rtZ to X.Y.0-rtZ. modDirVersion = if (builtins.match "[^.]*[.][^.]*-.*" version) == null then version diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 0c176d3e12d93..cb75f013b6241 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -20,6 +20,8 @@ let in lib.makeOverridable ({ # The kernel version version, + # The kernel pname (should be set for variants) + pname ? "linux", # Position of the Linux build expression pos ? null, # Additional kernel make flags @@ -408,8 +410,7 @@ assert lib.versionOlder version "5.8" -> libelf != null; assert lib.versionAtLeast version "5.8" -> elfutils != null; stdenv.mkDerivation ((drvAttrs config stdenv.hostPlatform.linux-kernel kernelPatches configfile) // { - pname = "linux"; - inherit version; + inherit pname version; enableParallelBuilding = true; diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 20100774395e1..c1715a91e5fbc 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -82,15 +82,21 @@ rust_1_77-6_8 = { name = "rust-1.77.patch"; - patch = fetchurl { - name = "rust-1.77.patch"; - url = "https://lore.kernel.org/rust-for-linux/20240217002717.57507-1-ojeda@kernel.org/raw"; - hash = "sha256-0KW9nHpJeMSDssCPXWZbrN8kxq5bA434t+XuPfwslUc="; - }; + patch = ./rust-1.77-6.8.patch; }; rust_1_77-6_9 = { name = "rust-1.77.patch"; patch = ./rust-1.77.patch; }; + + rust_1_78 = { + name = "rust-1.78.patch"; + patch = fetchpatch { + name = "rust-1.78.patch"; + url = "https://lore.kernel.org/rust-for-linux/20240401212303.537355-4-ojeda@kernel.org/raw"; + excludes = [ "Documentation/process/changes.rst" ]; # Conflicts on 6.8. + hash = "sha256-EZ+Qa9z1AtAv08e72M7BEsCZi9UK572gmW+AR62a8EM="; + }; + }; } diff --git a/pkgs/os-specific/linux/kernel/rust-1.77-6.8.patch b/pkgs/os-specific/linux/kernel/rust-1.77-6.8.patch new file mode 100644 index 0000000000000..4b25d3e60e39d --- /dev/null +++ b/pkgs/os-specific/linux/kernel/rust-1.77-6.8.patch @@ -0,0 +1,799 @@ +From 82a754271336c7736fb0350692be85fecb30e38e Mon Sep 17 00:00:00 2001 +From: Miguel Ojeda <ojeda@kernel.org> +Date: Sat, 17 Feb 2024 01:27:17 +0100 +Subject: [PATCH] rust: upgrade to Rust 1.77.1 + +This is the next upgrade to the Rust toolchain, from 1.76.0 to 1.77.1 +(i.e. the latest) [1]. + +See the upgrade policy [2] and the comments on the first upgrade in +commit 3ed03f4da06e ("rust: upgrade to Rust 1.68.2"). + +# Unstable features + +The `offset_of` feature (single-field `offset_of!`) that we were using +got stabilized in Rust 1.77.0 [3]. + +Therefore, now the only unstable features allowed to be used outside the +`kernel` crate is `new_uninit`, though other code to be upstreamed may +increase the list. + +Please see [4] for details. + +# Required changes + +Rust 1.77.0 merged the `unused_tuple_struct_fields` lint into `dead_code`, +thus upgrading it from `allow` to `warn` [5]. In turn, this made `rustc` +complain about the `ThisModule`'s pointer field being never read, but +the previous patch adds the `as_ptr` method to it, needed by Binder [6], +so that we do not need to locally `allow` it. + +# Other changes + +Rust 1.77.0 introduces the `--check-cfg` feature [7], for which there +is a Call for Testing going on [8]. We were requested to test it and +we found it useful [9] -- we will likely enable it in the future. + +# `alloc` upgrade and reviewing + +The vast majority of changes are due to our `alloc` fork being upgraded +at once. + +There are two kinds of changes to be aware of: the ones coming from +upstream, which we should follow as closely as possible, and the updates +needed in our added fallible APIs to keep them matching the newer +infallible APIs coming from upstream. + +Instead of taking a look at the diff of this patch, an alternative +approach is reviewing a diff of the changes between upstream `alloc` and +the kernel's. This allows to easily inspect the kernel additions only, +especially to check if the fallible methods we already have still match +the infallible ones in the new version coming from upstream. + +Another approach is reviewing the changes introduced in the additions in +the kernel fork between the two versions. This is useful to spot +potentially unintended changes to our additions. + +To apply these approaches, one may follow steps similar to the following +to generate a pair of patches that show the differences between upstream +Rust and the kernel (for the subset of `alloc` we use) before and after +applying this patch: + + # Get the difference with respect to the old version. + git -C rust checkout $(linux/scripts/min-tool-version.sh rustc) + git -C linux ls-tree -r --name-only HEAD -- rust/alloc | + cut -d/ -f3- | + grep -Fv README.md | + xargs -IPATH cp rust/library/alloc/src/PATH linux/rust/alloc/PATH + git -C linux diff --patch-with-stat --summary -R > old.patch + git -C linux restore rust/alloc + + # Apply this patch. + git -C linux am rust-upgrade.patch + + # Get the difference with respect to the new version. + git -C rust checkout $(linux/scripts/min-tool-version.sh rustc) + git -C linux ls-tree -r --name-only HEAD -- rust/alloc | + cut -d/ -f3- | + grep -Fv README.md | + xargs -IPATH cp rust/library/alloc/src/PATH linux/rust/alloc/PATH + git -C linux diff --patch-with-stat --summary -R > new.patch + git -C linux restore rust/alloc + +Now one may check the `new.patch` to take a look at the additions (first +approach) or at the difference between those two patches (second +approach). For the latter, a side-by-side tool is recommended. + +Link: https://github.com/rust-lang/rust/blob/stable/RELEASES.md#version-1770-2024-03-21 [1] +Link: https://rust-for-linux.com/rust-version-policy [2] +Link: https://github.com/rust-lang/rust/pull/118799 [3] +Link: https://github.com/Rust-for-Linux/linux/issues/2 [4] +Link: https://github.com/rust-lang/rust/pull/118297 [5] +Link: https://lore.kernel.org/rust-for-linux/20231101-rust-binder-v1-2-08ba9197f637@google.com/#Z31rust:kernel:lib.rs [6] +Link: https://doc.rust-lang.org/nightly/unstable-book/compiler-flags/check-cfg.html [7] +Link: https://github.com/rust-lang/rfcs/pull/3013#issuecomment-1936648479 [8] +Link: https://github.com/rust-lang/rust/issues/82450#issuecomment-1947462977 [9] +Reviewed-by: Alice Ryhl <aliceryhl@google.com> +Tested-by: Boqun Feng <boqun.feng@gmail.com> +Link: https://lore.kernel.org/r/20240217002717.57507-1-ojeda@kernel.org +[ Upgraded to 1.77.1. Removed `allow(dead_code)` thanks to the previous + patch. Reworded accordingly. No changes to `alloc` during the beta. ] +Signed-off-by: Miguel Ojeda <ojeda@kernel.org> +Signed-off-by: Alyssa Ross <hi@alyssa.is> + +# Conflicts: +# Documentation/process/changes.rst +# rust/kernel/lib.rs +--- + Documentation/process/changes.rst | 2 +- + rust/alloc/alloc.rs | 6 +- + rust/alloc/boxed.rs | 4 +- + rust/alloc/lib.rs | 7 +- + rust/alloc/raw_vec.rs | 13 ++-- + rust/alloc/slice.rs | 4 +- + rust/alloc/vec/into_iter.rs | 104 +++++++++++++++++++----------- + rust/alloc/vec/mod.rs | 101 ++++++++++++++++++++--------- + rust/kernel/lib.rs | 1 - + scripts/Makefile.build | 2 +- + scripts/min-tool-version.sh | 2 +- + 11 files changed, 158 insertions(+), 88 deletions(-) + +diff --git a/Documentation/process/changes.rst b/Documentation/process/changes.rst +index c78ecc1e176f..641d67363b92 100644 +--- a/Documentation/process/changes.rst ++++ b/Documentation/process/changes.rst +@@ -31,7 +31,7 @@ you probably needn't concern yourself with pcmciautils. + ====================== =============== ======================================== + GNU C 5.1 gcc --version + Clang/LLVM (optional) 11.0.0 clang --version +-Rust (optional) 1.76.0 rustc --version ++Rust (optional) 1.77.1 rustc --version + bindgen (optional) 0.65.1 bindgen --version + GNU make 3.82 make --version + bash 4.2 bash --version +diff --git a/rust/alloc/alloc.rs b/rust/alloc/alloc.rs +index abb791cc2371..b1204f87227b 100644 +--- a/rust/alloc/alloc.rs ++++ b/rust/alloc/alloc.rs +@@ -5,7 +5,7 @@ + #![stable(feature = "alloc_module", since = "1.28.0")] + + #[cfg(not(test))] +-use core::intrinsics; ++use core::hint; + + #[cfg(not(test))] + use core::ptr::{self, NonNull}; +@@ -210,7 +210,7 @@ unsafe fn grow_impl( + let new_size = new_layout.size(); + + // `realloc` probably checks for `new_size >= old_layout.size()` or something similar. +- intrinsics::assume(new_size >= old_layout.size()); ++ hint::assert_unchecked(new_size >= old_layout.size()); + + let raw_ptr = realloc(ptr.as_ptr(), old_layout, new_size); + let ptr = NonNull::new(raw_ptr).ok_or(AllocError)?; +@@ -301,7 +301,7 @@ unsafe fn shrink( + // SAFETY: `new_size` is non-zero. Other conditions must be upheld by the caller + new_size if old_layout.align() == new_layout.align() => unsafe { + // `realloc` probably checks for `new_size <= old_layout.size()` or something similar. +- intrinsics::assume(new_size <= old_layout.size()); ++ hint::assert_unchecked(new_size <= old_layout.size()); + + let raw_ptr = realloc(ptr.as_ptr(), old_layout, new_size); + let ptr = NonNull::new(raw_ptr).ok_or(AllocError)?; +diff --git a/rust/alloc/boxed.rs b/rust/alloc/boxed.rs +index c93a22a5c97f..5fc39dfeb8e7 100644 +--- a/rust/alloc/boxed.rs ++++ b/rust/alloc/boxed.rs +@@ -26,6 +26,7 @@ + //! Creating a recursive data structure: + //! + //! ``` ++//! ##[allow(dead_code)] + //! #[derive(Debug)] + //! enum List<T> { + //! Cons(T, Box<List<T>>), +@@ -194,8 +195,7 @@ + #[fundamental] + #[stable(feature = "rust1", since = "1.0.0")] + // The declaration of the `Box` struct must be kept in sync with the +-// `alloc::alloc::box_free` function or ICEs will happen. See the comment +-// on `box_free` for more details. ++// compiler or ICEs will happen. + pub struct Box< + T: ?Sized, + #[unstable(feature = "allocator_api", issue = "32838")] A: Allocator = Global, +diff --git a/rust/alloc/lib.rs b/rust/alloc/lib.rs +index 36f79c075593..39afd55ec074 100644 +--- a/rust/alloc/lib.rs ++++ b/rust/alloc/lib.rs +@@ -105,7 +105,6 @@ + #![feature(allocator_api)] + #![feature(array_chunks)] + #![feature(array_into_iter_constructors)] +-#![feature(array_methods)] + #![feature(array_windows)] + #![feature(ascii_char)] + #![feature(assert_matches)] +@@ -122,7 +121,6 @@ + #![feature(const_size_of_val)] + #![feature(const_waker)] + #![feature(core_intrinsics)] +-#![feature(core_panic)] + #![feature(deprecated_suggestion)] + #![feature(dispatch_from_dyn)] + #![feature(error_generic_member_access)] +@@ -132,6 +130,7 @@ + #![feature(fmt_internals)] + #![feature(fn_traits)] + #![feature(hasher_prefixfree_extras)] ++#![feature(hint_assert_unchecked)] + #![feature(inline_const)] + #![feature(inplace_iteration)] + #![feature(iter_advance_by)] +@@ -141,6 +140,8 @@ + #![feature(maybe_uninit_slice)] + #![feature(maybe_uninit_uninit_array)] + #![feature(maybe_uninit_uninit_array_transpose)] ++#![feature(non_null_convenience)] ++#![feature(panic_internals)] + #![feature(pattern)] + #![feature(ptr_internals)] + #![feature(ptr_metadata)] +@@ -149,7 +150,6 @@ + #![feature(set_ptr_value)] + #![feature(sized_type_properties)] + #![feature(slice_from_ptr_range)] +-#![feature(slice_group_by)] + #![feature(slice_ptr_get)] + #![feature(slice_ptr_len)] + #![feature(slice_range)] +@@ -182,6 +182,7 @@ + #![feature(const_ptr_write)] + #![feature(const_trait_impl)] + #![feature(const_try)] ++#![feature(decl_macro)] + #![feature(dropck_eyepatch)] + #![feature(exclusive_range_pattern)] + #![feature(fundamental)] +diff --git a/rust/alloc/raw_vec.rs b/rust/alloc/raw_vec.rs +index 98b6abf30af6..1839d1c8ee7a 100644 +--- a/rust/alloc/raw_vec.rs ++++ b/rust/alloc/raw_vec.rs +@@ -4,7 +4,7 @@ + + use core::alloc::LayoutError; + use core::cmp; +-use core::intrinsics; ++use core::hint; + use core::mem::{self, ManuallyDrop, MaybeUninit, SizedTypeProperties}; + use core::ptr::{self, NonNull, Unique}; + use core::slice; +@@ -317,7 +317,7 @@ fn current_memory(&self) -> Option<(NonNull<u8>, Layout)> { + /// + /// # Panics + /// +- /// Panics if the new capacity exceeds `isize::MAX` bytes. ++ /// Panics if the new capacity exceeds `isize::MAX` _bytes_. + /// + /// # Aborts + /// +@@ -358,7 +358,7 @@ pub fn try_reserve(&mut self, len: usize, additional: usize) -> Result<(), TryRe + } + unsafe { + // Inform the optimizer that the reservation has succeeded or wasn't needed +- core::intrinsics::assume(!self.needs_to_grow(len, additional)); ++ hint::assert_unchecked(!self.needs_to_grow(len, additional)); + } + Ok(()) + } +@@ -381,7 +381,7 @@ pub fn try_reserve_for_push(&mut self, len: usize) -> Result<(), TryReserveError + /// + /// # Panics + /// +- /// Panics if the new capacity exceeds `isize::MAX` bytes. ++ /// Panics if the new capacity exceeds `isize::MAX` _bytes_. + /// + /// # Aborts + /// +@@ -402,7 +402,7 @@ pub fn try_reserve_exact( + } + unsafe { + // Inform the optimizer that the reservation has succeeded or wasn't needed +- core::intrinsics::assume(!self.needs_to_grow(len, additional)); ++ hint::assert_unchecked(!self.needs_to_grow(len, additional)); + } + Ok(()) + } +@@ -553,7 +553,7 @@ fn finish_grow<A>( + debug_assert_eq!(old_layout.align(), new_layout.align()); + unsafe { + // The allocator checks for alignment equality +- intrinsics::assume(old_layout.align() == new_layout.align()); ++ hint::assert_unchecked(old_layout.align() == new_layout.align()); + alloc.grow(ptr, old_layout, new_layout) + } + } else { +@@ -591,7 +591,6 @@ fn handle_reserve(result: Result<(), TryReserveError>) { + // `> isize::MAX` bytes will surely fail. On 32-bit and 16-bit we need to add + // an extra guard for this in case we're running on a platform which can use + // all 4GB in user-space, e.g., PAE or x32. +- + #[inline] + fn alloc_guard(alloc_size: usize) -> Result<(), TryReserveError> { + if usize::BITS < 64 && alloc_size > isize::MAX as usize { +diff --git a/rust/alloc/slice.rs b/rust/alloc/slice.rs +index 1181836da5f4..a36b072c9519 100644 +--- a/rust/alloc/slice.rs ++++ b/rust/alloc/slice.rs +@@ -53,14 +53,14 @@ + pub use core::slice::{from_mut_ptr_range, from_ptr_range}; + #[stable(feature = "rust1", since = "1.0.0")] + pub use core::slice::{from_raw_parts, from_raw_parts_mut}; ++#[stable(feature = "slice_group_by", since = "1.77.0")] ++pub use core::slice::{ChunkBy, ChunkByMut}; + #[stable(feature = "rust1", since = "1.0.0")] + pub use core::slice::{Chunks, Windows}; + #[stable(feature = "chunks_exact", since = "1.31.0")] + pub use core::slice::{ChunksExact, ChunksExactMut}; + #[stable(feature = "rust1", since = "1.0.0")] + pub use core::slice::{ChunksMut, Split, SplitMut}; +-#[unstable(feature = "slice_group_by", issue = "80552")] +-pub use core::slice::{GroupBy, GroupByMut}; + #[stable(feature = "rust1", since = "1.0.0")] + pub use core::slice::{Iter, IterMut}; + #[stable(feature = "rchunks", since = "1.31.0")] +diff --git a/rust/alloc/vec/into_iter.rs b/rust/alloc/vec/into_iter.rs +index 136bfe94af6c..0f11744c44b3 100644 +--- a/rust/alloc/vec/into_iter.rs ++++ b/rust/alloc/vec/into_iter.rs +@@ -20,6 +20,17 @@ + use core::ptr::{self, NonNull}; + use core::slice::{self}; + ++macro non_null { ++ (mut $place:expr, $t:ident) => {{ ++ #![allow(unused_unsafe)] // we're sometimes used within an unsafe block ++ unsafe { &mut *(ptr::addr_of_mut!($place) as *mut NonNull<$t>) } ++ }}, ++ ($place:expr, $t:ident) => {{ ++ #![allow(unused_unsafe)] // we're sometimes used within an unsafe block ++ unsafe { *(ptr::addr_of!($place) as *const NonNull<$t>) } ++ }}, ++} ++ + /// An iterator that moves out of a vector. + /// + /// This `struct` is created by the `into_iter` method on [`Vec`](super::Vec) +@@ -43,10 +54,12 @@ pub struct IntoIter< + // the drop impl reconstructs a RawVec from buf, cap and alloc + // to avoid dropping the allocator twice we need to wrap it into ManuallyDrop + pub(super) alloc: ManuallyDrop<A>, +- pub(super) ptr: *const T, +- pub(super) end: *const T, // If T is a ZST, this is actually ptr+len. This encoding is picked so that +- // ptr == end is a quick test for the Iterator being empty, that works +- // for both ZST and non-ZST. ++ pub(super) ptr: NonNull<T>, ++ /// If T is a ZST, this is actually ptr+len. This encoding is picked so that ++ /// ptr == end is a quick test for the Iterator being empty, that works ++ /// for both ZST and non-ZST. ++ /// For non-ZSTs the pointer is treated as `NonNull<T>` ++ pub(super) end: *const T, + } + + #[stable(feature = "vec_intoiter_debug", since = "1.13.0")] +@@ -70,7 +83,7 @@ impl<T, A: Allocator> IntoIter<T, A> { + /// ``` + #[stable(feature = "vec_into_iter_as_slice", since = "1.15.0")] + pub fn as_slice(&self) -> &[T] { +- unsafe { slice::from_raw_parts(self.ptr, self.len()) } ++ unsafe { slice::from_raw_parts(self.ptr.as_ptr(), self.len()) } + } + + /// Returns the remaining items of this iterator as a mutable slice. +@@ -99,7 +112,7 @@ pub fn allocator(&self) -> &A { + } + + fn as_raw_mut_slice(&mut self) -> *mut [T] { +- ptr::slice_from_raw_parts_mut(self.ptr as *mut T, self.len()) ++ ptr::slice_from_raw_parts_mut(self.ptr.as_ptr(), self.len()) + } + + /// Drops remaining elements and relinquishes the backing allocation. +@@ -126,7 +139,7 @@ pub(super) fn forget_allocation_drop_remaining(&mut self) { + // this creates less assembly + self.cap = 0; + self.buf = unsafe { NonNull::new_unchecked(RawVec::NEW.ptr()) }; +- self.ptr = self.buf.as_ptr(); ++ self.ptr = self.buf; + self.end = self.buf.as_ptr(); + + // Dropping the remaining elements can panic, so this needs to be +@@ -138,9 +151,9 @@ pub(super) fn forget_allocation_drop_remaining(&mut self) { + + /// Forgets to Drop the remaining elements while still allowing the backing allocation to be freed. + pub(crate) fn forget_remaining_elements(&mut self) { +- // For th ZST case, it is crucial that we mutate `end` here, not `ptr`. ++ // For the ZST case, it is crucial that we mutate `end` here, not `ptr`. + // `ptr` must stay aligned, while `end` may be unaligned. +- self.end = self.ptr; ++ self.end = self.ptr.as_ptr(); + } + + #[cfg(not(no_global_oom_handling))] +@@ -162,7 +175,7 @@ pub(crate) fn into_vecdeque(self) -> VecDeque<T, A> { + // say that they're all at the beginning of the "allocation". + 0..this.len() + } else { +- this.ptr.sub_ptr(buf)..this.end.sub_ptr(buf) ++ this.ptr.sub_ptr(this.buf)..this.end.sub_ptr(buf) + }; + let cap = this.cap; + let alloc = ManuallyDrop::take(&mut this.alloc); +@@ -189,29 +202,35 @@ impl<T, A: Allocator> Iterator for IntoIter<T, A> { + + #[inline] + fn next(&mut self) -> Option<T> { +- if self.ptr == self.end { +- None +- } else if T::IS_ZST { +- // `ptr` has to stay where it is to remain aligned, so we reduce the length by 1 by +- // reducing the `end`. +- self.end = self.end.wrapping_byte_sub(1); ++ if T::IS_ZST { ++ if self.ptr.as_ptr() == self.end as *mut _ { ++ None ++ } else { ++ // `ptr` has to stay where it is to remain aligned, so we reduce the length by 1 by ++ // reducing the `end`. ++ self.end = self.end.wrapping_byte_sub(1); + +- // Make up a value of this ZST. +- Some(unsafe { mem::zeroed() }) ++ // Make up a value of this ZST. ++ Some(unsafe { mem::zeroed() }) ++ } + } else { +- let old = self.ptr; +- self.ptr = unsafe { self.ptr.add(1) }; ++ if self.ptr == non_null!(self.end, T) { ++ None ++ } else { ++ let old = self.ptr; ++ self.ptr = unsafe { old.add(1) }; + +- Some(unsafe { ptr::read(old) }) ++ Some(unsafe { ptr::read(old.as_ptr()) }) ++ } + } + } + + #[inline] + fn size_hint(&self) -> (usize, Option<usize>) { + let exact = if T::IS_ZST { +- self.end.addr().wrapping_sub(self.ptr.addr()) ++ self.end.addr().wrapping_sub(self.ptr.as_ptr().addr()) + } else { +- unsafe { self.end.sub_ptr(self.ptr) } ++ unsafe { non_null!(self.end, T).sub_ptr(self.ptr) } + }; + (exact, Some(exact)) + } +@@ -219,7 +238,7 @@ fn size_hint(&self) -> (usize, Option<usize>) { + #[inline] + fn advance_by(&mut self, n: usize) -> Result<(), NonZeroUsize> { + let step_size = self.len().min(n); +- let to_drop = ptr::slice_from_raw_parts_mut(self.ptr as *mut T, step_size); ++ let to_drop = ptr::slice_from_raw_parts_mut(self.ptr.as_ptr(), step_size); + if T::IS_ZST { + // See `next` for why we sub `end` here. + self.end = self.end.wrapping_byte_sub(step_size); +@@ -261,7 +280,7 @@ fn count(self) -> usize { + // Safety: `len` indicates that this many elements are available and we just checked that + // it fits into the array. + unsafe { +- ptr::copy_nonoverlapping(self.ptr, raw_ary.as_mut_ptr() as *mut T, len); ++ ptr::copy_nonoverlapping(self.ptr.as_ptr(), raw_ary.as_mut_ptr() as *mut T, len); + self.forget_remaining_elements(); + return Err(array::IntoIter::new_unchecked(raw_ary, 0..len)); + } +@@ -270,7 +289,7 @@ fn count(self) -> usize { + // Safety: `len` is larger than the array size. Copy a fixed amount here to fully initialize + // the array. + return unsafe { +- ptr::copy_nonoverlapping(self.ptr, raw_ary.as_mut_ptr() as *mut T, N); ++ ptr::copy_nonoverlapping(self.ptr.as_ptr(), raw_ary.as_mut_ptr() as *mut T, N); + self.ptr = self.ptr.add(N); + Ok(raw_ary.transpose().assume_init()) + }; +@@ -288,7 +307,7 @@ unsafe fn __iterator_get_unchecked(&mut self, i: usize) -> Self::Item + // Also note the implementation of `Self: TrustedRandomAccess` requires + // that `T: Copy` so reading elements from the buffer doesn't invalidate + // them for `Drop`. +- unsafe { if T::IS_ZST { mem::zeroed() } else { ptr::read(self.ptr.add(i)) } } ++ unsafe { if T::IS_ZST { mem::zeroed() } else { self.ptr.add(i).read() } } + } + } + +@@ -296,18 +315,25 @@ unsafe fn __iterator_get_unchecked(&mut self, i: usize) -> Self::Item + impl<T, A: Allocator> DoubleEndedIterator for IntoIter<T, A> { + #[inline] + fn next_back(&mut self) -> Option<T> { +- if self.end == self.ptr { +- None +- } else if T::IS_ZST { +- // See above for why 'ptr.offset' isn't used +- self.end = self.end.wrapping_byte_sub(1); ++ if T::IS_ZST { ++ if self.end as *mut _ == self.ptr.as_ptr() { ++ None ++ } else { ++ // See above for why 'ptr.offset' isn't used ++ self.end = self.end.wrapping_byte_sub(1); + +- // Make up a value of this ZST. +- Some(unsafe { mem::zeroed() }) ++ // Make up a value of this ZST. ++ Some(unsafe { mem::zeroed() }) ++ } + } else { +- self.end = unsafe { self.end.sub(1) }; ++ if non_null!(self.end, T) == self.ptr { ++ None ++ } else { ++ let new_end = unsafe { non_null!(self.end, T).sub(1) }; ++ *non_null!(mut self.end, T) = new_end; + +- Some(unsafe { ptr::read(self.end) }) ++ Some(unsafe { ptr::read(new_end.as_ptr()) }) ++ } + } + } + +@@ -333,7 +359,11 @@ fn advance_back_by(&mut self, n: usize) -> Result<(), NonZeroUsize> { + #[stable(feature = "rust1", since = "1.0.0")] + impl<T, A: Allocator> ExactSizeIterator for IntoIter<T, A> { + fn is_empty(&self) -> bool { +- self.ptr == self.end ++ if T::IS_ZST { ++ self.ptr.as_ptr() == self.end as *mut _ ++ } else { ++ self.ptr == non_null!(self.end, T) ++ } + } + } + +diff --git a/rust/alloc/vec/mod.rs b/rust/alloc/vec/mod.rs +index 220fb9d6f45b..0be27fff4554 100644 +--- a/rust/alloc/vec/mod.rs ++++ b/rust/alloc/vec/mod.rs +@@ -360,7 +360,7 @@ + /// + /// `vec![x; n]`, `vec![a, b, c, d]`, and + /// [`Vec::with_capacity(n)`][`Vec::with_capacity`], will all produce a `Vec` +-/// with exactly the requested capacity. If <code>[len] == [capacity]</code>, ++/// with at least the requested capacity. If <code>[len] == [capacity]</code>, + /// (as is the case for the [`vec!`] macro), then a `Vec<T>` can be converted to + /// and from a [`Box<[T]>`][owned slice] without reallocating or moving the elements. + /// +@@ -447,7 +447,7 @@ pub const fn new() -> Self { + /// + /// # Panics + /// +- /// Panics if the new capacity exceeds `isize::MAX` bytes. ++ /// Panics if the new capacity exceeds `isize::MAX` _bytes_. + /// + /// # Examples + /// +@@ -690,7 +690,7 @@ pub const fn new_in(alloc: A) -> Self { + /// + /// # Panics + /// +- /// Panics if the new capacity exceeds `isize::MAX` bytes. ++ /// Panics if the new capacity exceeds `isize::MAX` _bytes_. + /// + /// # Examples + /// +@@ -1013,7 +1013,7 @@ pub fn capacity(&self) -> usize { + /// + /// # Panics + /// +- /// Panics if the new capacity exceeds `isize::MAX` bytes. ++ /// Panics if the new capacity exceeds `isize::MAX` _bytes_. + /// + /// # Examples + /// +@@ -1043,7 +1043,7 @@ pub fn reserve(&mut self, additional: usize) { + /// + /// # Panics + /// +- /// Panics if the new capacity exceeds `isize::MAX` bytes. ++ /// Panics if the new capacity exceeds `isize::MAX` _bytes_. + /// + /// # Examples + /// +@@ -1140,8 +1140,11 @@ pub fn try_reserve_exact(&mut self, additional: usize) -> Result<(), TryReserveE + + /// Shrinks the capacity of the vector as much as possible. + /// +- /// It will drop down as close as possible to the length but the allocator +- /// may still inform the vector that there is space for a few more elements. ++ /// The behavior of this method depends on the allocator, which may either shrink the vector ++ /// in-place or reallocate. The resulting vector might still have some excess capacity, just as ++ /// is the case for [`with_capacity`]. See [`Allocator::shrink`] for more details. ++ /// ++ /// [`with_capacity`]: Vec::with_capacity + /// + /// # Examples + /// +@@ -1191,10 +1194,10 @@ pub fn shrink_to(&mut self, min_capacity: usize) { + + /// Converts the vector into [`Box<[T]>`][owned slice]. + /// +- /// If the vector has excess capacity, its items will be moved into a +- /// newly-allocated buffer with exactly the right capacity. ++ /// Before doing the conversion, this method discards excess capacity like [`shrink_to_fit`]. + /// + /// [owned slice]: Box ++ /// [`shrink_to_fit`]: Vec::shrink_to_fit + /// + /// # Examples + /// +@@ -2017,7 +2020,7 @@ fn drop(&mut self) { + /// + /// # Panics + /// +- /// Panics if the new capacity exceeds `isize::MAX` bytes. ++ /// Panics if the new capacity exceeds `isize::MAX` _bytes_. + /// + /// # Examples + /// +@@ -2133,7 +2136,7 @@ pub fn pop(&mut self) -> Option<T> { + } else { + unsafe { + self.len -= 1; +- core::intrinsics::assume(self.len < self.capacity()); ++ core::hint::assert_unchecked(self.len < self.capacity()); + Some(ptr::read(self.as_ptr().add(self.len()))) + } + } +@@ -2143,7 +2146,7 @@ pub fn pop(&mut self) -> Option<T> { + /// + /// # Panics + /// +- /// Panics if the new capacity exceeds `isize::MAX` bytes. ++ /// Panics if the new capacity exceeds `isize::MAX` _bytes_. + /// + /// # Examples + /// +@@ -2315,6 +2318,12 @@ pub fn is_empty(&self) -> bool { + /// `[at, len)`. After the call, the original vector will be left containing + /// the elements `[0, at)` with its previous capacity unchanged. + /// ++ /// - If you want to take ownership of the entire contents and capacity of ++ /// the vector, see [`mem::take`] or [`mem::replace`]. ++ /// - If you don't need the returned vector at all, see [`Vec::truncate`]. ++ /// - If you want to take ownership of an arbitrary subslice, or you don't ++ /// necessarily want to store the removed items in a vector, see [`Vec::drain`]. ++ /// + /// # Panics + /// + /// Panics if `at > len`. +@@ -2346,14 +2355,6 @@ fn assert_failed(at: usize, len: usize) -> ! { + assert_failed(at, self.len()); + } + +- if at == 0 { +- // the new vector can take over the original buffer and avoid the copy +- return mem::replace( +- self, +- Vec::with_capacity_in(self.capacity(), self.allocator().clone()), +- ); +- } +- + let other_len = self.len - at; + let mut other = Vec::with_capacity_in(other_len, self.allocator().clone()); + +@@ -3027,6 +3028,50 @@ fn index_mut(&mut self, index: I) -> &mut Self::Output { + } + } + ++/// Collects an iterator into a Vec, commonly called via [`Iterator::collect()`] ++/// ++/// # Allocation behavior ++/// ++/// In general `Vec` does not guarantee any particular growth or allocation strategy. ++/// That also applies to this trait impl. ++/// ++/// **Note:** This section covers implementation details and is therefore exempt from ++/// stability guarantees. ++/// ++/// Vec may use any or none of the following strategies, ++/// depending on the supplied iterator: ++/// ++/// * preallocate based on [`Iterator::size_hint()`] ++/// * and panic if the number of items is outside the provided lower/upper bounds ++/// * use an amortized growth strategy similar to `pushing` one item at a time ++/// * perform the iteration in-place on the original allocation backing the iterator ++/// ++/// The last case warrants some attention. It is an optimization that in many cases reduces peak memory ++/// consumption and improves cache locality. But when big, short-lived allocations are created, ++/// only a small fraction of their items get collected, no further use is made of the spare capacity ++/// and the resulting `Vec` is moved into a longer-lived structure, then this can lead to the large ++/// allocations having their lifetimes unnecessarily extended which can result in increased memory ++/// footprint. ++/// ++/// In cases where this is an issue, the excess capacity can be discarded with [`Vec::shrink_to()`], ++/// [`Vec::shrink_to_fit()`] or by collecting into [`Box<[T]>`][owned slice] instead, which additionally reduces ++/// the size of the long-lived struct. ++/// ++/// [owned slice]: Box ++/// ++/// ```rust ++/// # use std::sync::Mutex; ++/// static LONG_LIVED: Mutex<Vec<Vec<u16>>> = Mutex::new(Vec::new()); ++/// ++/// for i in 0..10 { ++/// let big_temporary: Vec<u16> = (0..1024).collect(); ++/// // discard most items ++/// let mut result: Vec<_> = big_temporary.into_iter().filter(|i| i % 100 == 0).collect(); ++/// // without this a lot of unused capacity might be moved into the global ++/// result.shrink_to_fit(); ++/// LONG_LIVED.lock().unwrap().push(result); ++/// } ++/// ``` + #[cfg(not(no_global_oom_handling))] + #[stable(feature = "rust1", since = "1.0.0")] + impl<T> FromIterator<T> for Vec<T> { +@@ -3069,14 +3114,8 @@ fn into_iter(self) -> Self::IntoIter { + begin.add(me.len()) as *const T + }; + let cap = me.buf.capacity(); +- IntoIter { +- buf: NonNull::new_unchecked(begin), +- phantom: PhantomData, +- cap, +- alloc, +- ptr: begin, +- end, +- } ++ let buf = NonNull::new_unchecked(begin); ++ IntoIter { buf, phantom: PhantomData, cap, alloc, ptr: buf, end } + } + } + } +@@ -3598,8 +3637,10 @@ fn from(s: Box<[T], A>) -> Self { + impl<T, A: Allocator> From<Vec<T, A>> for Box<[T], A> { + /// Convert a vector into a boxed slice. + /// +- /// If `v` has excess capacity, its items will be moved into a +- /// newly-allocated buffer with exactly the right capacity. ++ /// Before doing the conversion, this method discards excess capacity like [`Vec::shrink_to_fit`]. ++ /// ++ /// [owned slice]: Box ++ /// [`Vec::shrink_to_fit`]: Vec::shrink_to_fit + /// + /// # Examples + /// +diff --git a/rust/kernel/lib.rs b/rust/kernel/lib.rs +index 75efe47522e4..f07bc5a2c6b4 100644 +--- a/rust/kernel/lib.rs ++++ b/rust/kernel/lib.rs +@@ -17,7 +17,6 @@ + #![feature(const_maybe_uninit_zeroed)] + #![feature(dispatch_from_dyn)] + #![feature(new_uninit)] +-#![feature(offset_of)] + #![feature(ptr_metadata)] + #![feature(receiver_trait)] + #![feature(unsize)] +diff --git a/scripts/Makefile.build b/scripts/Makefile.build +index 1633175846df..0bc7c5fe64b1 100644 +--- a/scripts/Makefile.build ++++ b/scripts/Makefile.build +@@ -262,7 +262,7 @@ $(obj)/%.lst: $(src)/%.c FORCE + # Compile Rust sources (.rs) + # --------------------------------------------------------------------------- + +-rust_allowed_features := new_uninit,offset_of ++rust_allowed_features := new_uninit + + # `--out-dir` is required to avoid temporaries being created by `rustc` in the + # current working directory, which may be not accessible in the out-of-tree +diff --git a/scripts/min-tool-version.sh b/scripts/min-tool-version.sh +index e217683b10d6..db2b0bc5866b 100755 +--- a/scripts/min-tool-version.sh ++++ b/scripts/min-tool-version.sh +@@ -33,7 +33,7 @@ llvm) + fi + ;; + rustc) +- echo 1.76.0 ++ echo 1.77.1 + ;; + bindgen) + echo 0.65.1 +-- +2.44.0 + diff --git a/pkgs/os-specific/linux/kernel/rust-1.77.patch b/pkgs/os-specific/linux/kernel/rust-1.77.patch index 8bd0a5e337154..ed9eb56bf6d7e 100644 --- a/pkgs/os-specific/linux/kernel/rust-1.77.patch +++ b/pkgs/os-specific/linux/kernel/rust-1.77.patch @@ -1,14 +1,16 @@ -From d69265b7d756931b2e763a3262f22ba4100895a0 Mon Sep 17 00:00:00 2001 +From b256fc507d4710287b22077834c16d18cee4ab17 Mon Sep 17 00:00:00 2001 From: Miguel Ojeda <ojeda@kernel.org> Date: Sat, 17 Feb 2024 01:27:17 +0100 -Subject: [PATCH] rust: upgrade to Rust 1.77.0 +Subject: [PATCH] rust: upgrade to Rust 1.77.1 -This is the next upgrade to the Rust toolchain, from 1.76.0 to 1.77.0 +This is the next upgrade to the Rust toolchain, from 1.76.0 to 1.77.1 (i.e. the latest) [1]. See the upgrade policy [2] and the comments on the first upgrade in commit 3ed03f4da06e ("rust: upgrade to Rust 1.68.2"). +# Unstable features + The `offset_of` feature (single-field `offset_of!`) that we were using got stabilized in Rust 1.77.0 [3]. @@ -18,16 +20,22 @@ increase the list. Please see [4] for details. +# Required changes + Rust 1.77.0 merged the `unused_tuple_struct_fields` lint into `dead_code`, -thus upgrading it from `allow` to `warn` [5]. In turn, this makes `rustc` -complain about the `ThisModule`'s pointer field being never read. Thus -locally `allow` it for the moment, since we will have users later on -(e.g. Binder needs a `as_ptr` method [6]). +thus upgrading it from `allow` to `warn` [5]. In turn, this made `rustc` +complain about the `ThisModule`'s pointer field being never read, but +the previous patch adds the `as_ptr` method to it, needed by Binder [6], +so that we do not need to locally `allow` it. + +# Other changes Rust 1.77.0 introduces the `--check-cfg` feature [7], for which there is a Call for Testing going on [8]. We were requested to test it and we found it useful [9] -- we will likely enable it in the future. +# `alloc` upgrade and reviewing + The vast majority of changes are due to our `alloc` fork being upgraded at once. @@ -85,9 +93,12 @@ Link: https://lore.kernel.org/rust-for-linux/20231101-rust-binder-v1-2-08ba9197f Link: https://doc.rust-lang.org/nightly/unstable-book/compiler-flags/check-cfg.html [7] Link: https://github.com/rust-lang/rfcs/pull/3013#issuecomment-1936648479 [8] Link: https://github.com/rust-lang/rust/issues/82450#issuecomment-1947462977 [9] -Signed-off-by: Miguel Ojeda <ojeda@kernel.org> +Reviewed-by: Alice Ryhl <aliceryhl@google.com> +Tested-by: Boqun Feng <boqun.feng@gmail.com> Link: https://lore.kernel.org/r/20240217002717.57507-1-ojeda@kernel.org -Link: https://github.com/Rust-for-Linux/linux/commit/d69265b7d756931b2e763a3262f22ba4100895a0 +[ Upgraded to 1.77.1. Removed `allow(dead_code)` thanks to the previous + patch. Reworded accordingly. No changes to `alloc` during the beta. ] +Signed-off-by: Miguel Ojeda <ojeda@kernel.org> Signed-off-by: Alyssa Ross <hi@alyssa.is> --- Documentation/process/changes.rst | 2 +- @@ -96,15 +107,15 @@ Signed-off-by: Alyssa Ross <hi@alyssa.is> rust/alloc/lib.rs | 7 +- rust/alloc/raw_vec.rs | 13 ++-- rust/alloc/slice.rs | 4 +- - rust/alloc/vec/into_iter.rs | 108 +++++++++++++++++++----------- - rust/alloc/vec/mod.rs | 101 +++++++++++++++++++--------- - rust/kernel/lib.rs | 3 +- + rust/alloc/vec/into_iter.rs | 104 +++++++++++++++++++----------- + rust/alloc/vec/mod.rs | 101 ++++++++++++++++++++--------- + rust/kernel/lib.rs | 1 - scripts/Makefile.build | 2 +- scripts/min-tool-version.sh | 2 +- - 11 files changed, 161 insertions(+), 91 deletions(-) + 11 files changed, 158 insertions(+), 88 deletions(-) diff --git a/Documentation/process/changes.rst b/Documentation/process/changes.rst -index 7ef8de58f7f892..879ee628893ae1 100644 +index 7ef8de58f7f8..b5d3107c6734 100644 --- a/Documentation/process/changes.rst +++ b/Documentation/process/changes.rst @@ -31,7 +31,7 @@ you probably needn't concern yourself with pcmciautils. @@ -112,12 +123,12 @@ index 7ef8de58f7f892..879ee628893ae1 100644 GNU C 5.1 gcc --version Clang/LLVM (optional) 13.0.1 clang --version -Rust (optional) 1.76.0 rustc --version -+Rust (optional) 1.77.0 rustc --version ++Rust (optional) 1.77.1 rustc --version bindgen (optional) 0.65.1 bindgen --version GNU make 3.82 make --version bash 4.2 bash --version diff --git a/rust/alloc/alloc.rs b/rust/alloc/alloc.rs -index abb791cc23715a..b1204f87227b23 100644 +index abb791cc2371..b1204f87227b 100644 --- a/rust/alloc/alloc.rs +++ b/rust/alloc/alloc.rs @@ -5,7 +5,7 @@ @@ -129,7 +140,7 @@ index abb791cc23715a..b1204f87227b23 100644 #[cfg(not(test))] use core::ptr::{self, NonNull}; -@@ -210,7 +210,7 @@ impl Global { +@@ -210,7 +210,7 @@ unsafe fn grow_impl( let new_size = new_layout.size(); // `realloc` probably checks for `new_size >= old_layout.size()` or something similar. @@ -138,7 +149,7 @@ index abb791cc23715a..b1204f87227b23 100644 let raw_ptr = realloc(ptr.as_ptr(), old_layout, new_size); let ptr = NonNull::new(raw_ptr).ok_or(AllocError)?; -@@ -301,7 +301,7 @@ unsafe impl Allocator for Global { +@@ -301,7 +301,7 @@ unsafe fn shrink( // SAFETY: `new_size` is non-zero. Other conditions must be upheld by the caller new_size if old_layout.align() == new_layout.align() => unsafe { // `realloc` probably checks for `new_size <= old_layout.size()` or something similar. @@ -148,7 +159,7 @@ index abb791cc23715a..b1204f87227b23 100644 let raw_ptr = realloc(ptr.as_ptr(), old_layout, new_size); let ptr = NonNull::new(raw_ptr).ok_or(AllocError)?; diff --git a/rust/alloc/boxed.rs b/rust/alloc/boxed.rs -index c93a22a5c97f14..5fc39dfeb8e7bf 100644 +index c93a22a5c97f..5fc39dfeb8e7 100644 --- a/rust/alloc/boxed.rs +++ b/rust/alloc/boxed.rs @@ -26,6 +26,7 @@ @@ -159,7 +170,7 @@ index c93a22a5c97f14..5fc39dfeb8e7bf 100644 //! #[derive(Debug)] //! enum List<T> { //! Cons(T, Box<List<T>>), -@@ -194,8 +195,7 @@ mod thin; +@@ -194,8 +195,7 @@ #[fundamental] #[stable(feature = "rust1", since = "1.0.0")] // The declaration of the `Box` struct must be kept in sync with the @@ -170,7 +181,7 @@ index c93a22a5c97f14..5fc39dfeb8e7bf 100644 T: ?Sized, #[unstable(feature = "allocator_api", issue = "32838")] A: Allocator = Global, diff --git a/rust/alloc/lib.rs b/rust/alloc/lib.rs -index 36f79c07559338..39afd55ec0749e 100644 +index 36f79c075593..39afd55ec074 100644 --- a/rust/alloc/lib.rs +++ b/rust/alloc/lib.rs @@ -105,7 +105,6 @@ @@ -223,7 +234,7 @@ index 36f79c07559338..39afd55ec0749e 100644 #![feature(exclusive_range_pattern)] #![feature(fundamental)] diff --git a/rust/alloc/raw_vec.rs b/rust/alloc/raw_vec.rs -index 98b6abf30af6e4..1839d1c8ee7a04 100644 +index 98b6abf30af6..1839d1c8ee7a 100644 --- a/rust/alloc/raw_vec.rs +++ b/rust/alloc/raw_vec.rs @@ -4,7 +4,7 @@ @@ -235,7 +246,7 @@ index 98b6abf30af6e4..1839d1c8ee7a04 100644 use core::mem::{self, ManuallyDrop, MaybeUninit, SizedTypeProperties}; use core::ptr::{self, NonNull, Unique}; use core::slice; -@@ -317,7 +317,7 @@ impl<T, A: Allocator> RawVec<T, A> { +@@ -317,7 +317,7 @@ fn current_memory(&self) -> Option<(NonNull<u8>, Layout)> { /// /// # Panics /// @@ -244,7 +255,7 @@ index 98b6abf30af6e4..1839d1c8ee7a04 100644 /// /// # Aborts /// -@@ -358,7 +358,7 @@ impl<T, A: Allocator> RawVec<T, A> { +@@ -358,7 +358,7 @@ pub fn try_reserve(&mut self, len: usize, additional: usize) -> Result<(), TryRe } unsafe { // Inform the optimizer that the reservation has succeeded or wasn't needed @@ -253,7 +264,7 @@ index 98b6abf30af6e4..1839d1c8ee7a04 100644 } Ok(()) } -@@ -381,7 +381,7 @@ impl<T, A: Allocator> RawVec<T, A> { +@@ -381,7 +381,7 @@ pub fn try_reserve_for_push(&mut self, len: usize) -> Result<(), TryReserveError /// /// # Panics /// @@ -262,7 +273,7 @@ index 98b6abf30af6e4..1839d1c8ee7a04 100644 /// /// # Aborts /// -@@ -402,7 +402,7 @@ impl<T, A: Allocator> RawVec<T, A> { +@@ -402,7 +402,7 @@ pub fn try_reserve_exact( } unsafe { // Inform the optimizer that the reservation has succeeded or wasn't needed @@ -271,7 +282,7 @@ index 98b6abf30af6e4..1839d1c8ee7a04 100644 } Ok(()) } -@@ -553,7 +553,7 @@ where +@@ -553,7 +553,7 @@ fn finish_grow<A>( debug_assert_eq!(old_layout.align(), new_layout.align()); unsafe { // The allocator checks for alignment equality @@ -289,10 +300,10 @@ index 98b6abf30af6e4..1839d1c8ee7a04 100644 fn alloc_guard(alloc_size: usize) -> Result<(), TryReserveError> { if usize::BITS < 64 && alloc_size > isize::MAX as usize { diff --git a/rust/alloc/slice.rs b/rust/alloc/slice.rs -index 1181836da5f462..a36b072c95195f 100644 +index 1181836da5f4..a36b072c9519 100644 --- a/rust/alloc/slice.rs +++ b/rust/alloc/slice.rs -@@ -53,14 +53,14 @@ pub use core::slice::{from_mut, from_ref}; +@@ -53,14 +53,14 @@ pub use core::slice::{from_mut_ptr_range, from_ptr_range}; #[stable(feature = "rust1", since = "1.0.0")] pub use core::slice::{from_raw_parts, from_raw_parts_mut}; @@ -310,10 +321,10 @@ index 1181836da5f462..a36b072c95195f 100644 pub use core::slice::{Iter, IterMut}; #[stable(feature = "rchunks", since = "1.31.0")] diff --git a/rust/alloc/vec/into_iter.rs b/rust/alloc/vec/into_iter.rs -index 136bfe94af6c83..0f11744c44b34c 100644 +index 136bfe94af6c..0f11744c44b3 100644 --- a/rust/alloc/vec/into_iter.rs +++ b/rust/alloc/vec/into_iter.rs -@@ -20,6 +20,17 @@ use core::ops::Deref; +@@ -20,6 +20,17 @@ use core::ptr::{self, NonNull}; use core::slice::{self}; @@ -357,7 +368,7 @@ index 136bfe94af6c83..0f11744c44b34c 100644 } /// Returns the remaining items of this iterator as a mutable slice. -@@ -99,7 +112,7 @@ impl<T, A: Allocator> IntoIter<T, A> { +@@ -99,7 +112,7 @@ pub fn allocator(&self) -> &A { } fn as_raw_mut_slice(&mut self) -> *mut [T] { @@ -366,7 +377,7 @@ index 136bfe94af6c83..0f11744c44b34c 100644 } /// Drops remaining elements and relinquishes the backing allocation. -@@ -126,7 +139,7 @@ impl<T, A: Allocator> IntoIter<T, A> { +@@ -126,7 +139,7 @@ pub(super) fn forget_allocation_drop_remaining(&mut self) { // this creates less assembly self.cap = 0; self.buf = unsafe { NonNull::new_unchecked(RawVec::NEW.ptr()) }; @@ -375,7 +386,7 @@ index 136bfe94af6c83..0f11744c44b34c 100644 self.end = self.buf.as_ptr(); // Dropping the remaining elements can panic, so this needs to be -@@ -138,9 +151,9 @@ impl<T, A: Allocator> IntoIter<T, A> { +@@ -138,9 +151,9 @@ pub(super) fn forget_allocation_drop_remaining(&mut self) { /// Forgets to Drop the remaining elements while still allowing the backing allocation to be freed. pub(crate) fn forget_remaining_elements(&mut self) { @@ -387,7 +398,7 @@ index 136bfe94af6c83..0f11744c44b34c 100644 } #[cfg(not(no_global_oom_handling))] -@@ -162,7 +175,7 @@ impl<T, A: Allocator> IntoIter<T, A> { +@@ -162,7 +175,7 @@ pub(crate) fn into_vecdeque(self) -> VecDeque<T, A> { // say that they're all at the beginning of the "allocation". 0..this.len() } else { @@ -406,9 +417,6 @@ index 136bfe94af6c83..0f11744c44b34c 100644 - // `ptr` has to stay where it is to remain aligned, so we reduce the length by 1 by - // reducing the `end`. - self.end = self.end.wrapping_byte_sub(1); -- -- // Make up a value of this ZST. -- Some(unsafe { mem::zeroed() }) + if T::IS_ZST { + if self.ptr.as_ptr() == self.end as *mut _ { + None @@ -416,7 +424,9 @@ index 136bfe94af6c83..0f11744c44b34c 100644 + // `ptr` has to stay where it is to remain aligned, so we reduce the length by 1 by + // reducing the `end`. + self.end = self.end.wrapping_byte_sub(1); -+ + +- // Make up a value of this ZST. +- Some(unsafe { mem::zeroed() }) + // Make up a value of this ZST. + Some(unsafe { mem::zeroed() }) + } @@ -446,7 +456,7 @@ index 136bfe94af6c83..0f11744c44b34c 100644 }; (exact, Some(exact)) } -@@ -219,7 +238,7 @@ impl<T, A: Allocator> Iterator for IntoIter<T, A> { +@@ -219,7 +238,7 @@ fn size_hint(&self) -> (usize, Option<usize>) { #[inline] fn advance_by(&mut self, n: usize) -> Result<(), NonZeroUsize> { let step_size = self.len().min(n); @@ -455,7 +465,7 @@ index 136bfe94af6c83..0f11744c44b34c 100644 if T::IS_ZST { // See `next` for why we sub `end` here. self.end = self.end.wrapping_byte_sub(step_size); -@@ -261,7 +280,7 @@ impl<T, A: Allocator> Iterator for IntoIter<T, A> { +@@ -261,7 +280,7 @@ fn count(self) -> usize { // Safety: `len` indicates that this many elements are available and we just checked that // it fits into the array. unsafe { @@ -464,7 +474,7 @@ index 136bfe94af6c83..0f11744c44b34c 100644 self.forget_remaining_elements(); return Err(array::IntoIter::new_unchecked(raw_ary, 0..len)); } -@@ -270,7 +289,7 @@ impl<T, A: Allocator> Iterator for IntoIter<T, A> { +@@ -270,7 +289,7 @@ fn count(self) -> usize { // Safety: `len` is larger than the array size. Copy a fixed amount here to fully initialize // the array. return unsafe { @@ -473,7 +483,7 @@ index 136bfe94af6c83..0f11744c44b34c 100644 self.ptr = self.ptr.add(N); Ok(raw_ary.transpose().assume_init()) }; -@@ -288,7 +307,7 @@ impl<T, A: Allocator> Iterator for IntoIter<T, A> { +@@ -288,7 +307,7 @@ unsafe fn __iterator_get_unchecked(&mut self, i: usize) -> Self::Item // Also note the implementation of `Self: TrustedRandomAccess` requires // that `T: Copy` so reading elements from the buffer doesn't invalidate // them for `Drop`. @@ -482,7 +492,7 @@ index 136bfe94af6c83..0f11744c44b34c 100644 } } -@@ -296,18 +315,25 @@ impl<T, A: Allocator> Iterator for IntoIter<T, A> { +@@ -296,18 +315,25 @@ unsafe fn __iterator_get_unchecked(&mut self, i: usize) -> Self::Item impl<T, A: Allocator> DoubleEndedIterator for IntoIter<T, A> { #[inline] fn next_back(&mut self) -> Option<T> { @@ -491,16 +501,15 @@ index 136bfe94af6c83..0f11744c44b34c 100644 - } else if T::IS_ZST { - // See above for why 'ptr.offset' isn't used - self.end = self.end.wrapping_byte_sub(1); -- -- // Make up a value of this ZST. -- Some(unsafe { mem::zeroed() }) + if T::IS_ZST { + if self.end as *mut _ == self.ptr.as_ptr() { + None + } else { + // See above for why 'ptr.offset' isn't used + self.end = self.end.wrapping_byte_sub(1); -+ + +- // Make up a value of this ZST. +- Some(unsafe { mem::zeroed() }) + // Make up a value of this ZST. + Some(unsafe { mem::zeroed() }) + } @@ -518,7 +527,7 @@ index 136bfe94af6c83..0f11744c44b34c 100644 } } -@@ -333,7 +359,11 @@ impl<T, A: Allocator> DoubleEndedIterator for IntoIter<T, A> { +@@ -333,7 +359,11 @@ fn advance_back_by(&mut self, n: usize) -> Result<(), NonZeroUsize> { #[stable(feature = "rust1", since = "1.0.0")] impl<T, A: Allocator> ExactSizeIterator for IntoIter<T, A> { fn is_empty(&self) -> bool { @@ -532,10 +541,10 @@ index 136bfe94af6c83..0f11744c44b34c 100644 } diff --git a/rust/alloc/vec/mod.rs b/rust/alloc/vec/mod.rs -index 220fb9d6f45b3f..0be27fff4554a1 100644 +index 220fb9d6f45b..0be27fff4554 100644 --- a/rust/alloc/vec/mod.rs +++ b/rust/alloc/vec/mod.rs -@@ -360,7 +360,7 @@ mod spec_extend; +@@ -360,7 +360,7 @@ /// /// `vec![x; n]`, `vec![a, b, c, d]`, and /// [`Vec::with_capacity(n)`][`Vec::with_capacity`], will all produce a `Vec` @@ -544,7 +553,7 @@ index 220fb9d6f45b3f..0be27fff4554a1 100644 /// (as is the case for the [`vec!`] macro), then a `Vec<T>` can be converted to /// and from a [`Box<[T]>`][owned slice] without reallocating or moving the elements. /// -@@ -447,7 +447,7 @@ impl<T> Vec<T> { +@@ -447,7 +447,7 @@ pub const fn new() -> Self { /// /// # Panics /// @@ -553,7 +562,7 @@ index 220fb9d6f45b3f..0be27fff4554a1 100644 /// /// # Examples /// -@@ -690,7 +690,7 @@ impl<T, A: Allocator> Vec<T, A> { +@@ -690,7 +690,7 @@ pub const fn new_in(alloc: A) -> Self { /// /// # Panics /// @@ -562,7 +571,7 @@ index 220fb9d6f45b3f..0be27fff4554a1 100644 /// /// # Examples /// -@@ -1013,7 +1013,7 @@ impl<T, A: Allocator> Vec<T, A> { +@@ -1013,7 +1013,7 @@ pub fn capacity(&self) -> usize { /// /// # Panics /// @@ -571,7 +580,7 @@ index 220fb9d6f45b3f..0be27fff4554a1 100644 /// /// # Examples /// -@@ -1043,7 +1043,7 @@ impl<T, A: Allocator> Vec<T, A> { +@@ -1043,7 +1043,7 @@ pub fn reserve(&mut self, additional: usize) { /// /// # Panics /// @@ -580,7 +589,7 @@ index 220fb9d6f45b3f..0be27fff4554a1 100644 /// /// # Examples /// -@@ -1140,8 +1140,11 @@ impl<T, A: Allocator> Vec<T, A> { +@@ -1140,8 +1140,11 @@ pub fn try_reserve_exact(&mut self, additional: usize) -> Result<(), TryReserveE /// Shrinks the capacity of the vector as much as possible. /// @@ -594,7 +603,7 @@ index 220fb9d6f45b3f..0be27fff4554a1 100644 /// /// # Examples /// -@@ -1191,10 +1194,10 @@ impl<T, A: Allocator> Vec<T, A> { +@@ -1191,10 +1194,10 @@ pub fn shrink_to(&mut self, min_capacity: usize) { /// Converts the vector into [`Box<[T]>`][owned slice]. /// @@ -607,7 +616,7 @@ index 220fb9d6f45b3f..0be27fff4554a1 100644 /// /// # Examples /// -@@ -2017,7 +2020,7 @@ impl<T, A: Allocator> Vec<T, A> { +@@ -2017,7 +2020,7 @@ fn drop(&mut self) { /// /// # Panics /// @@ -616,7 +625,7 @@ index 220fb9d6f45b3f..0be27fff4554a1 100644 /// /// # Examples /// -@@ -2133,7 +2136,7 @@ impl<T, A: Allocator> Vec<T, A> { +@@ -2133,7 +2136,7 @@ pub fn pop(&mut self) -> Option<T> { } else { unsafe { self.len -= 1; @@ -625,7 +634,7 @@ index 220fb9d6f45b3f..0be27fff4554a1 100644 Some(ptr::read(self.as_ptr().add(self.len()))) } } -@@ -2143,7 +2146,7 @@ impl<T, A: Allocator> Vec<T, A> { +@@ -2143,7 +2146,7 @@ pub fn pop(&mut self) -> Option<T> { /// /// # Panics /// @@ -634,7 +643,7 @@ index 220fb9d6f45b3f..0be27fff4554a1 100644 /// /// # Examples /// -@@ -2315,6 +2318,12 @@ impl<T, A: Allocator> Vec<T, A> { +@@ -2315,6 +2318,12 @@ pub fn is_empty(&self) -> bool { /// `[at, len)`. After the call, the original vector will be left containing /// the elements `[0, at)` with its previous capacity unchanged. /// @@ -647,7 +656,7 @@ index 220fb9d6f45b3f..0be27fff4554a1 100644 /// # Panics /// /// Panics if `at > len`. -@@ -2346,14 +2355,6 @@ impl<T, A: Allocator> Vec<T, A> { +@@ -2346,14 +2355,6 @@ fn assert_failed(at: usize, len: usize) -> ! { assert_failed(at, self.len()); } @@ -662,7 +671,7 @@ index 220fb9d6f45b3f..0be27fff4554a1 100644 let other_len = self.len - at; let mut other = Vec::with_capacity_in(other_len, self.allocator().clone()); -@@ -3027,6 +3028,50 @@ impl<T, I: SliceIndex<[T]>, A: Allocator> IndexMut<I> for Vec<T, A> { +@@ -3027,6 +3028,50 @@ fn index_mut(&mut self, index: I) -> &mut Self::Output { } } @@ -713,7 +722,7 @@ index 220fb9d6f45b3f..0be27fff4554a1 100644 #[cfg(not(no_global_oom_handling))] #[stable(feature = "rust1", since = "1.0.0")] impl<T> FromIterator<T> for Vec<T> { -@@ -3069,14 +3114,8 @@ impl<T, A: Allocator> IntoIterator for Vec<T, A> { +@@ -3069,14 +3114,8 @@ fn into_iter(self) -> Self::IntoIter { begin.add(me.len()) as *const T }; let cap = me.buf.capacity(); @@ -730,7 +739,7 @@ index 220fb9d6f45b3f..0be27fff4554a1 100644 } } } -@@ -3598,8 +3637,10 @@ impl<T, A: Allocator> From<Box<[T], A>> for Vec<T, A> { +@@ -3598,8 +3637,10 @@ fn from(s: Box<[T], A>) -> Self { impl<T, A: Allocator> From<Vec<T, A>> for Box<[T], A> { /// Convert a vector into a boxed slice. /// @@ -744,7 +753,7 @@ index 220fb9d6f45b3f..0be27fff4554a1 100644 /// # Examples /// diff --git a/rust/kernel/lib.rs b/rust/kernel/lib.rs -index be68d5e567b1a1..71f95e5aa09abd 100644 +index 6858e2f8a3ed..9e9b245ebab5 100644 --- a/rust/kernel/lib.rs +++ b/rust/kernel/lib.rs @@ -16,7 +16,6 @@ @@ -755,17 +764,8 @@ index be68d5e567b1a1..71f95e5aa09abd 100644 #![feature(receiver_trait)] #![feature(unsize)] -@@ -78,7 +77,7 @@ pub trait Module: Sized + Sync { - /// Equivalent to `THIS_MODULE` in the C API. - /// - /// C header: [`include/linux/export.h`](srctree/include/linux/export.h) --pub struct ThisModule(*mut bindings::module); -+pub struct ThisModule(#[allow(dead_code)] *mut bindings::module); - - // SAFETY: `THIS_MODULE` may be used from all threads within a module. - unsafe impl Sync for ThisModule {} diff --git a/scripts/Makefile.build b/scripts/Makefile.build -index baf86c0880b6d7..367cfeea74c5f5 100644 +index 533a7799fdfe..5a6ab6d965bc 100644 --- a/scripts/Makefile.build +++ b/scripts/Makefile.build @@ -263,7 +263,7 @@ $(obj)/%.lst: $(src)/%.c FORCE @@ -778,7 +778,7 @@ index baf86c0880b6d7..367cfeea74c5f5 100644 # `--out-dir` is required to avoid temporaries being created by `rustc` in the # current working directory, which may be not accessible in the out-of-tree diff --git a/scripts/min-tool-version.sh b/scripts/min-tool-version.sh -index 5927cc6b7de338..cc5141b67b4a71 100755 +index 5927cc6b7de3..6086e00e640e 100755 --- a/scripts/min-tool-version.sh +++ b/scripts/min-tool-version.sh @@ -33,7 +33,7 @@ llvm) @@ -786,7 +786,10 @@ index 5927cc6b7de338..cc5141b67b4a71 100755 ;; rustc) - echo 1.76.0 -+ echo 1.77.0 ++ echo 1.77.1 ;; bindgen) echo 0.65.1 +-- +2.44.0 + diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index 545bb02e95ec0..15c344efbed3d 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -19,6 +19,7 @@ let xanmodKernelFor = { version, suffix ? "xanmod1", hash, variant }: buildLinux (args // rec { inherit version; + pname = "linux-xanmod"; modDirVersion = lib.versions.pad 3 "${version}-${suffix}"; src = fetchFromGitHub { diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix index 89c776e611e5c..0a9b0db767244 100644 --- a/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix @@ -18,6 +18,7 @@ let }; zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // { inherit version; + pname = "linux-${if isLqx then "lqx" else "zen"}"; modDirVersion = lib.versions.pad 3 "${version}-${suffix}"; isZen = true; diff --git a/pkgs/os-specific/linux/kexec-tools/default.nix b/pkgs/os-specific/linux/kexec-tools/default.nix index 530fd767bb909..3861d5d0cd6f8 100644 --- a/pkgs/os-specific/linux/kexec-tools/default.nix +++ b/pkgs/os-specific/linux/kexec-tools/default.nix @@ -18,6 +18,11 @@ stdenv.mkDerivation rec { url = "https://raw.githubusercontent.com/void-linux/void-packages/6c1192cbf166698932030c2e3de71db1885a572d/srcpkgs/kexec-tools/patches/ppc64-elfv2.patch"; sha256 = "19wzfwb0azm932v0vhywv4221818qmlmvdfwpvvpfyw4hjsc2s1l"; }) + # binutils-2.42 support + (fetchpatch { + url = "https://github.com/horms/kexec-tools/commit/328de8e00e298f00d7ba6b25dc3950147e9642e6.patch"; + hash = "sha256-wVQI4oV+hBLq3kGIp2+F5J3f6s/TypDu3Xq583KYc3U="; + }) ]; hardeningDisable = [ "format" "pic" "relro" "pie" ]; diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index a0f019c610dc9..61eea1c66015d 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -407,6 +407,7 @@ stdenv.mkDerivation (finalAttrs: { ''; outputs = [ "out" "dev" ] ++ (lib.optional (!buildLibsOnly) "man"); + separateDebugInfo = true; hardeningDisable = [ # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=111523 @@ -500,6 +501,12 @@ stdenv.mkDerivation (finalAttrs: { (lib.mesonOption "default-hierarchy" "unified") (lib.mesonOption "kmod-path" "${kmod}/bin/kmod") + # Attempts to check /usr/sbin and that fails in macOS sandbox because + # permission is denied. If /usr/sbin is not a symlink, it defaults to true. + # We set it to false since stdenv moves sbin/* to bin and creates a symlink, + # that is, we do not have split bin. + (lib.mesonOption "split-bin" "false") + # D-Bus (lib.mesonOption "dbuspolicydir" "${placeholder "out"}/share/dbus-1/system.d") (lib.mesonOption "dbussessionservicedir" "${placeholder "out"}/share/dbus-1/services") @@ -814,6 +821,9 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace $i --replace /bin/false ${coreutils}/bin/false done + # For compatibility with dependents that use sbin instead of bin. + ln -s bin "$out/sbin" + rm -rf $out/etc/rpm '' + lib.optionalString (!withKernelInstall) '' # "kernel-install" shouldn't be used on NixOS. diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix index ef3614bce02ef..4b44a19def899 100644 --- a/pkgs/os-specific/linux/util-linux/default.nix +++ b/pkgs/os-specific/linux/util-linux/default.nix @@ -1,9 +1,7 @@ -{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook, gtk-doc, pkg-config -, zlib, shadow +{ lib, stdenv, fetchurl, pkg-config, zlib, shadow , capabilitiesSupport ? stdenv.isLinux , libcap_ng , libxcrypt -, sqlite , ncursesSupport ? true , ncurses , pamSupport ? true @@ -19,20 +17,14 @@ , memstreamHook , gitUpdater }: -let - # Temporarily avoid applying the patches on systems where already we have binaries - # (in particular x86_64-linux and aarch64-linux) as the package is a huge rebuild there. - avoidRebuild = with stdenv.hostPlatform; isLinux && is64bit && !isStatic; -in + stdenv.mkDerivation rec { pname = "util-linux" + lib.optionalString (!nlsSupport && !ncursesSupport && !systemdSupport) "-minimal"; - version = if avoidRebuild then "2.40.1" else "2.39.4"; + version = "2.39.4"; src = fetchurl { url = "mirror://kernel/linux/utils/util-linux/v${lib.versions.majorMinor version}/util-linux-${version}.tar.xz"; - hash = if avoidRebuild - then "sha256-WeZ2qlPMtEtsOfD/4BqPonSJHJG+8UdHUvrZJGHe8k8=" - else "sha256-bE+HI9r9QcOdk+y/FlCfyIwzzVvTJ3iArlodl6AU/Q4="; + hash = "sha256-bE+HI9r9QcOdk+y/FlCfyIwzzVvTJ3iArlodl6AU/Q4="; }; patches = [ @@ -48,7 +40,7 @@ stdenv.mkDerivation rec { separateDebugInfo = true; postPatch = '' - patchShebangs tests/run.sh tools/all_syscalls + patchShebangs tests/run.sh substituteInPlace sys-utils/eject.c \ --replace "/bin/umount" "$bin/bin/umount" @@ -67,7 +59,6 @@ stdenv.mkDerivation rec { "--enable-fs-paths-default=/run/wrappers/bin:/run/current-system/sw/bin:/sbin" "--disable-makeinstall-setuid" "--disable-makeinstall-chown" "--disable-su" # provided by shadow - "--with-tmpfilesdir=${placeholder "out"}/lib/tmpfiles.d" (lib.enableFeature writeSupport "write") (lib.enableFeature nlsSupport "nls") (lib.withFeature ncursesSupport "ncursesw") @@ -89,7 +80,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config installShellFiles ] ++ lib.optionals translateManpages [ po4a ]; - buildInputs = [ zlib libxcrypt sqlite ] + buildInputs = [ zlib libxcrypt ] ++ lib.optionals pamSupport [ pam ] ++ lib.optionals capabilitiesSupport [ libcap_ng ] ++ lib.optionals ncursesSupport [ ncurses ] @@ -118,6 +109,9 @@ stdenv.mkDerivation rec { ln -svf "$swap/bin/"* $bin/bin/ '' + '' + ln -svf "$bin/bin/hexdump" "$bin/bin/hd" + ln -svf "$man/share/man/man1/hexdump.1" "$man/share/man/man1/hd.1" + installShellCompletion --bash bash-completion/* ''; diff --git a/pkgs/servers/ldap/lldap/default.nix b/pkgs/servers/ldap/lldap/default.nix index cf4cc82ed8751..5097bf20dc7ac 100644 --- a/pkgs/servers/ldap/lldap/default.nix +++ b/pkgs/servers/ldap/lldap/default.nix @@ -51,7 +51,7 @@ let ]; buildPhase = '' - HOME=`pwd` RUSTFLAGS="-C linker=lld" ./app/build.sh + HOME=`pwd` ./app/build.sh ''; installPhase = '' diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix index afa63219e3572..1f6c401e3f658 100644 --- a/pkgs/servers/nosql/redis/default.nix +++ b/pkgs/servers/nosql/redis/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "redis"; - version = "7.2.4"; + version = "7.2.5"; src = fetchurl { url = "https://download.redis.io/releases/redis-${finalAttrs.version}.tar.gz"; - hash = "sha256-jRBMJqFUsp/WfWVotPN1ISISrUHgwsqj1mSA5429O1k="; + hash = "sha256-WYEXlwb4OR8DvpHZUayvrtqRr3+sVr7/snAZYxA+Qj0="; }; patches = [ diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index a52099460e780..ee37db169bbb4 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -173,6 +173,8 @@ stdenv.mkDerivation (finalAttrs: { ++ optional (!enablePam) "--without-pam" ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "--bundled-libraries=!asn1_compile,!compile_et" + "--cross-compile" + "--cross-execute=${stdenv.hostPlatform.emulator buildPackages}" ] ++ optionals stdenv.buildPlatform.is32bit [ # By default `waf configure` spawns as many as available CPUs. On # 32-bit systems with many CPUs (like `i686` chroot on `x86_64` diff --git a/pkgs/servers/teleport/generic.nix b/pkgs/servers/teleport/generic.nix index e47845ea56c6f..84b57160d4fa0 100644 --- a/pkgs/servers/teleport/generic.nix +++ b/pkgs/servers/teleport/generic.nix @@ -76,10 +76,6 @@ let cargoDeps = rustPlatform.importCargoLock cargoLock; - RUSTFLAGS = builtins.concatStringsSep " " [ - "-C linker=lld" - ]; - nativeBuildInputs = [ nodejs yarn fixup-yarn-lock ] ++ lib.optional (lib.versionAtLeast version "15") [ binaryen diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index a6d7d7e6a7f0c..cd7e116c17d59 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -3,7 +3,7 @@ automake, autoconf, libiconv, libtool, intltool, gettext, python3, perl, freetype, tradcpp, fontconfig, meson, ninja, ed, fontforge, libGL, spice-protocol, zlib, libGLU, dbus, libunwind, libdrm, netbsd, - ncompress, + ncompress, updateAutotoolsGnuConfigScriptsHook, mesa, udev, bootstrap_cmds, bison, flex, clangStdenv, autoreconfHook, mcpp, libepoxy, openssl, pkg-config, llvm, libxslt, libxcrypt, hwdata, ApplicationServices, Carbon, Cocoa, Xplugin, @@ -906,6 +906,7 @@ self: super: lndir = super.lndir.overrideAttrs (attrs: { buildInputs = []; + nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ]; preConfigure = '' export XPROTO_CFLAGS=" " export XPROTO_LIBS=" " diff --git a/pkgs/shells/bash/5.nix b/pkgs/shells/bash/5.nix index de0426fbcdcd3..25798533113c8 100644 --- a/pkgs/shells/bash/5.nix +++ b/pkgs/shells/bash/5.nix @@ -2,6 +2,7 @@ , stdenv , buildPackages , fetchurl +, updateAutotoolsGnuConfigScriptsHook , bison , util-linux @@ -88,12 +89,16 @@ stdenv.mkDerivation rec { "bash_cv_termcap_lib=libncurses" ] ++ lib.optionals (stdenv.hostPlatform.libc == "musl") [ "--disable-nls" + ] ++ lib.optionals stdenv.hostPlatform.isFreeBSD [ + # /dev/fd is optional on FreeBSD. we need it to work when built on a system + # with it and transferred to a system without it! This includes linux cross. + "bash_cv_dev_fd=absent" ]; strictDeps = true; # Note: Bison is needed because the patches above modify parse.y. depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ bison ] + nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook bison ] ++ lib.optional withDocs texinfo ++ lib.optional stdenv.hostPlatform.isDarwin stdenv.cc.bintools; diff --git a/pkgs/shells/bash/bash-completion/default.nix b/pkgs/shells/bash/bash-completion/default.nix index 80f5ffeff9519..3bdef89e722e0 100644 --- a/pkgs/shells/bash/bash-completion/default.nix +++ b/pkgs/shells/bash/bash-completion/default.nix @@ -1,5 +1,4 @@ { lib, stdenv, fetchurl -, fetchpatch , autoreconfHook , perl , ps @@ -9,15 +8,15 @@ stdenv.mkDerivation rec { pname = "bash-completion"; - version = "2.13.0"; + version = "2.14.0"; # Using fetchurl because fetchGithub or fetchzip will have trouble on # e.g. APFS filesystems (macOS) because of non UTF-8 characters in some of the # test fixtures that are part of the repository. # See discussion in https://github.com/NixOS/nixpkgs/issues/107768 src = fetchurl { - url = "https://github.com/scop/${pname}/releases/download/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-xfmaOeQPDRVMA/8VQ46H7OH1rGZjNqRFmJni/0vt89E="; + url = "https://github.com/scop/bash-completion/releases/download/${version}/bash-completion-${version}.tar.xz"; + sha256 = "sha256-XHSU+WgoCDLWrbWqGfdFpW8aed8xHlkzjF76b3KF4Wg="; }; strictDeps = true; diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix index 1c6cce5c8bc84..568282fa86ab6 100644 --- a/pkgs/tools/admin/awscli/default.nix +++ b/pkgs/tools/admin/awscli/default.nix @@ -20,7 +20,7 @@ let src = fetchPypi { inherit pname version; - hash = "sha256-GPcXkl2H0XNaeqt2/qD5+KvW23dRB0X+zLWo9hLigQM="; + hash = "sha256-96hFvXs3Fcvad+PBEpS9RFMJkcD1qHqfQ+8gtVfEbnc="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/archivers/gnutar/default.nix b/pkgs/tools/archivers/gnutar/default.nix index 34615d7e8bede..98f0b54e73fc9 100644 --- a/pkgs/tools/archivers/gnutar/default.nix +++ b/pkgs/tools/archivers/gnutar/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, autoreconfHook, acl, libintl }: +{ lib, stdenv, fetchurl, autoreconfHook, updateAutotoolsGnuConfigScriptsHook, acl, libintl }: # Note: this package is used for bootstrapping fetchurl, and thus # cannot use fetchpatch! All mutable patches (generated by GitHub or @@ -30,7 +30,8 @@ stdenv.mkDerivation rec { outputs = [ "out" "info" ]; - nativeBuildInputs = lib.optional stdenv.isDarwin autoreconfHook; + nativeBuildInputs = lib.optional stdenv.isDarwin autoreconfHook + ++ lib.optional (!stdenv.isDarwin) updateAutotoolsGnuConfigScriptsHook; # Add libintl on Darwin specifically as it fails to link (or skip) # NLS on it's own: # "_libintl_textdomain", referenced from: diff --git a/pkgs/tools/archivers/sharutils/default.nix b/pkgs/tools/archivers/sharutils/default.nix index 5c84e596531c3..2a656a9dd3273 100644 --- a/pkgs/tools/archivers/sharutils/default.nix +++ b/pkgs/tools/archivers/sharutils/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, gettext, coreutils }: +{ lib, stdenv, fetchurl, fetchpatch, gettext, coreutils, updateAutotoolsGnuConfigScriptsHook }: stdenv.mkDerivation rec { pname = "sharutils"; @@ -13,6 +13,7 @@ stdenv.mkDerivation rec { # GNU Gettext is needed on non-GNU platforms. buildInputs = [ coreutils gettext ]; + nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ]; # These tests try to hit /etc/passwd to find out your username if pass in a submitter # name on the command line. Since we block access to /etc/passwd on the Darwin sandbox diff --git a/pkgs/tools/archivers/zip/default.nix b/pkgs/tools/archivers/zip/default.nix index 8a81691d64488..a192b38785049 100644 --- a/pkgs/tools/archivers/zip/default.nix +++ b/pkgs/tools/archivers/zip/default.nix @@ -36,6 +36,8 @@ stdenv.mkDerivation rec { # Buffer overflow on Unicode characters in path names # https://bugzilla.redhat.com/show_bug.cgi?id=2165653 ./buffer-overflow-on-utf8-rh-bug-2165653.patch + # Fixes forward declaration errors with timezone.c + ./fix-time.h-not-included.patch ] ++ lib.optionals (enableNLS && !stdenv.isCygwin) [ ./natspec-gentoo.patch.bz2 ]; buildInputs = lib.optional enableNLS libnatspec diff --git a/pkgs/tools/archivers/zip/fix-time.h-not-included.patch b/pkgs/tools/archivers/zip/fix-time.h-not-included.patch new file mode 100644 index 0000000000000..9db8d66e9a10f --- /dev/null +++ b/pkgs/tools/archivers/zip/fix-time.h-not-included.patch @@ -0,0 +1,10 @@ +--- zip30/timezone.c 2024-05-21 05:14:55.959957517 +0000 ++++ zip30/timezone.c 2024-05-21 05:15:14.852006815 +0000 +@@ -41,6 +41,7 @@ + #include "timezone.h" + #include <ctype.h> + #include <errno.h> ++#include <time.h> + + #ifdef IZTZ_DEFINESTDGLOBALS + long timezone = 0; diff --git a/pkgs/tools/compression/gzip/default.nix b/pkgs/tools/compression/gzip/default.nix index baff7f0303874..05539050861f3 100644 --- a/pkgs/tools/compression/gzip/default.nix +++ b/pkgs/tools/compression/gzip/default.nix @@ -1,7 +1,9 @@ { lib, stdenv , fetchurl , makeWrapper +, updateAutotoolsGnuConfigScriptsHook , xz +, runtimeShellPackage }: # Note: this package is used for bootstrapping fetchurl, and thus @@ -22,7 +24,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - nativeBuildInputs = [ xz.bin makeWrapper ]; + nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook makeWrapper ]; + buildInputs = [ runtimeShellPackage ]; makeFlags = [ "SHELL=/bin/sh" diff --git a/pkgs/tools/compression/xz/default.nix b/pkgs/tools/compression/xz/default.nix index 4431a178ac02f..2a7ca487bcfd8 100644 --- a/pkgs/tools/compression/xz/default.nix +++ b/pkgs/tools/compression/xz/default.nix @@ -29,6 +29,12 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; doCheck = true; + # this could be accomplished by updateAutotoolsGnuConfigScriptsHook, but that causes infinite recursion + # necessary for FreeBSD code path in configure + postPatch = '' + substituteInPlace ./build-aux/config.guess --replace-fail /usr/bin/uname uname + ''; + preCheck = '' # Tests have a /bin/sh dependency... patchShebangs tests diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix index 6e2bdaea8f9e2..beaff7922e558 100644 --- a/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl +{ lib, stdenv, fetchurl, fetchpatch , buildPackages , pkg-config , zstd @@ -17,6 +17,14 @@ stdenv.mkDerivation rec { hash = "sha256-DkCgaKJsKWnLAqlbqf74iNemNW4/RX/5KtJHfQhzVng="; }; + patches = [ + # backport fix build with e2fsprogs 1.47.1 + (fetchpatch { + url = "https://github.com/kdave/btrfs-progs/commit/bcb887a4de2c56426a7a7de8d440b6ad75579f10.patch"; + hash = "sha256-Ir5EiiU0E8GBnGex0Q/WTNexW9XTWFNceiLQvXygIoo="; + }) + ]; + nativeBuildInputs = [ pkg-config ] ++ [ diff --git a/pkgs/tools/filesystems/e2fsprogs/default.nix b/pkgs/tools/filesystems/e2fsprogs/default.nix index a5ca282955f33..1ed100a3fe6b1 100644 --- a/pkgs/tools/filesystems/e2fsprogs/default.nix +++ b/pkgs/tools/filesystems/e2fsprogs/default.nix @@ -1,16 +1,16 @@ { lib, stdenv, buildPackages, fetchurl, fetchpatch, pkg-config, libuuid, gettext, texinfo -, withFuse ? stdenv.isLinux, fuse +, withFuse ? stdenv.isLinux, fuse3 , shared ? !stdenv.hostPlatform.isStatic , e2fsprogs, runCommand }: stdenv.mkDerivation rec { pname = "e2fsprogs"; - version = "1.47.0"; + version = "1.47.1"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; - hash = "sha256-Zmev3lbu8MavJmhJdEAOTSKI6knpRBv15iKRldUaNXg="; + hash = "sha256-mvzSAfOUKdLbJJKusT26XnXWzFBoK3MtyjVkO9XwkuM="; }; # fuse2fs adds 14mb of dependencies @@ -20,15 +20,9 @@ stdenv.mkDerivation rec { depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ pkg-config texinfo ]; buildInputs = [ libuuid gettext ] - ++ lib.optionals withFuse [ fuse ]; + ++ lib.optionals withFuse [ fuse3 ]; patches = [ - (fetchpatch { # avoid using missing __GNUC_PREREQ(X,Y) - url = "https://raw.githubusercontent.com/void-linux/void-packages/9583597eb3e6e6b33f61dbc615d511ce030bc443/srcpkgs/e2fsprogs/patches/fix-glibcism.patch"; - sha256 = "1gfcsr0i3q8q2f0lqza8na0iy4l4p3cbii51ds6zmj0y4hz2dwhb"; - excludes = [ "lib/ext2fs/hashmap.h" ]; - extraPrefix = ""; - }) # Avoid trouble with older systems like NixOS 23.05. # TODO: most likely drop this at some point, e.g. when 23.05 loses support. (fetchurl { @@ -36,6 +30,16 @@ stdenv.mkDerivation rec { url = "https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git/plain/debian/patches/disable-metadata_csum_seed-and-orphan_file-by-default?h=debian/master&id=3fb3d18baba90e5d48d94f4c0b79b2d271b0c913"; hash = "sha256-YD11K4s2bqv0rvzrxtaiodzLp3ztULlOlPUf1XcpxRY="; }) + (fetchurl { + name = "SIZEOF_SIZE_T.patch"; + url = "https://lore.kernel.org/linux-ext4/20240527074121.2767083-1-hi@alyssa.is/raw"; + hash = "sha256-QdsvcvBi0mC/4YErqG0UKl94MH0OZpFVTGszNqBe/qw="; + }) + (fetchurl { + name = "unused-parameters.patch"; + url = "https://lore.kernel.org/linux-ext4/20240527091542.4121237-2-hi@alyssa.is/raw"; + hash = "sha256-pMoqm2eo5zYaTdU+Ppa4+posCVFb2A9S4uo5oApaaqc="; + }) ]; configureFlags = diff --git a/pkgs/tools/graphics/gifski/default.nix b/pkgs/tools/graphics/gifski/default.nix index ba2427281528b..b95fc26e67158 100644 --- a/pkgs/tools/graphics/gifski/default.nix +++ b/pkgs/tools/graphics/gifski/default.nix @@ -44,11 +44,6 @@ rustPlatform.buildRustPackage rec { # checkType = "debug"; - # Cargo.lock is outdated - postPatch = '' - cargo metadata --offline - ''; - meta = with lib; { description = "GIF encoder based on libimagequant (pngquant)"; homepage = "https://gif.ski/"; diff --git a/pkgs/tools/misc/bartib/default.nix b/pkgs/tools/misc/bartib/default.nix index 0719f8a168bba..f958c5396f1d7 100644 --- a/pkgs/tools/misc/bartib/default.nix +++ b/pkgs/tools/misc/bartib/default.nix @@ -12,9 +12,6 @@ rustPlatform.buildRustPackage rec { }; cargoSha256 = "sha256-s/oGv7/0LgNpdGu6dnvvbxDgFDvcvcHL01dSPxhMVWE="; - preConfigure = '' - cargo metadata --offline - ''; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index 2e2f2f1601247..cf0142eeb9b2b 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -39,7 +39,13 @@ stdenv.mkDerivation rec { hash = "sha256-zTKO3qyS9qZl3p8yPJO3Eq8YWLwuDYjz9xAEaUcKG4o="; }; - patches = lib.optionals stdenv.hostPlatform.isMusl [ + patches = [ + # https://lists.gnu.org/archive/html/bug-coreutils/2024-05/msg00037.html + # This is not precisely the patch provided - this is a diff of the Makefile.in + # after the patch was applied and autoreconf was run, since adding autoreconf + # here causes infinite recursion. + ./fix-mix-flags-deps-libintl.patch + ] ++ lib.optionals stdenv.hostPlatform.isMusl [ # https://lists.gnu.org/archive/html/bug-coreutils/2024-03/msg00089.html ./fix-test-failure-musl.patch ]; @@ -99,13 +105,12 @@ stdenv.mkDerivation rec { separateDebugInfo = true; nativeBuildInputs = [ - # autoreconfHook is due to patch, normally only needed for cygwin - autoreconfHook perl xz.bin ] ++ optionals stdenv.hostPlatform.isCygwin [ # due to patch + autoreconfHook texinfo ]; diff --git a/pkgs/tools/misc/coreutils/fix-mix-flags-deps-libintl.patch b/pkgs/tools/misc/coreutils/fix-mix-flags-deps-libintl.patch new file mode 100644 index 0000000000000..f6002b55faf69 --- /dev/null +++ b/pkgs/tools/misc/coreutils/fix-mix-flags-deps-libintl.patch @@ -0,0 +1,49 @@ +--- a/Makefile.in 2024-05-21 17:03:50.488979000 -0700 ++++ b/Makefile.in 2024-05-21 17:18:56.243091000 -0700 +@@ -692,8 +692,6 @@ + @USE_PCLMUL_CRC32_TRUE@am__append_211 = $(cksum_pclmul_ldadd) + @USE_AVX2_WC_LINECOUNT_TRUE@am__append_212 = src/libwc_avx2.a + @USE_AVX2_WC_LINECOUNT_TRUE@am__append_213 = $(wc_avx2_ldadd) +-@SINGLE_BINARY_FALSE@src_coreutils_DEPENDENCIES = \ +-@SINGLE_BINARY_FALSE@ $(am__DEPENDENCIES_2) + # Command arch + # Command hostname + # Command chroot +@@ -2825,6 +2823,12 @@ + nodist_src_coreutils_OBJECTS = + src_coreutils_OBJECTS = $(am_src_coreutils_OBJECTS) \ + $(nodist_src_coreutils_OBJECTS) ++@SINGLE_BINARY_FALSE@src_coreutils_DEPENDENCIES = \ ++@SINGLE_BINARY_FALSE@ $(am__DEPENDENCIES_2) ++@SINGLE_BINARY_TRUE@src_coreutils_DEPENDENCIES = \ ++@SINGLE_BINARY_TRUE@ $(am__DEPENDENCIES_1) \ ++@SINGLE_BINARY_TRUE@ $(am__DEPENDENCIES_2) \ ++@SINGLE_BINARY_TRUE@ $(am__DEPENDENCIES_1) + src_coreutils_LINK = $(CCLD) $(src_coreutils_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ + am__objects_221 = src/copy.$(OBJEXT) src/cp-hash.$(OBJEXT) \ +@@ -7492,7 +7496,12 @@ + src_libstdbuf_so_CFLAGS = -fPIC $(AM_CFLAGS) + # Single binary dependencies + @SINGLE_BINARY_TRUE@src_coreutils_CFLAGS = -DSINGLE_BINARY $(AM_CFLAGS) +-@SINGLE_BINARY_TRUE@src_coreutils_DEPENDENCIES = $(LDADD) $(single_binary_deps) ++ ++# Creates symlinks or shebangs to the installed programs when building ++# coreutils single binary. ++@SINGLE_BINARY_TRUE@EXTRA_src_coreutils_DEPENDENCIES = \ ++@SINGLE_BINARY_TRUE@ $(single_binary_deps) \ ++@SINGLE_BINARY_TRUE@ src/coreutils_$(single_binary_install_type) + @SINGLE_BINARY_TRUE@src_libsinglebin_dir_a_DEPENDENCIES = src/libsinglebin_ls.a + @SINGLE_BINARY_TRUE@src_libsinglebin_vdir_a_DEPENDENCIES = src/libsinglebin_ls.a + @SINGLE_BINARY_TRUE@src_libsinglebin_arch_a_DEPENDENCIES = src/libsinglebin_uname.a +@@ -7880,10 +7889,6 @@ + @SINGLE_BINARY_TRUE@src_libsinglebin_yes_a_DEPENDENCIES = $(src_yes_DEPENDENCIES) + @SINGLE_BINARY_TRUE@src_libsinglebin_yes_a_CFLAGS = "-Dmain=single_binary_main_yes (int, char **); int single_binary_main_yes" -Dusage=_usage_yes $(src_coreutils_CFLAGS) + +-# Creates symlinks or shebangs to the installed programs when building +-# coreutils single binary. +-@SINGLE_BINARY_TRUE@EXTRA_src_coreutils_DEPENDENCIES = src/coreutils_$(single_binary_install_type) +- + # false exits nonzero even with --help or --version. + # test doesn't support --help or --version. + # Tell automake to exempt then from that installcheck test. diff --git a/pkgs/tools/misc/ethtool/default.nix b/pkgs/tools/misc/ethtool/default.nix index 72590420e1a1f..13b1b48158848 100644 --- a/pkgs/tools/misc/ethtool/default.nix +++ b/pkgs/tools/misc/ethtool/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "ethtool"; - version = "6.7"; + version = "6.9"; src = fetchurl { url = "mirror://kernel/software/network/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-w65SawHOTY32x5SrFw3kpBBNER6o2Ns/H9fCX8uQVhk="; + sha256 = "sha256-pxsDVAEGYcXPF4vGBu1Q/LkYBc8Yl60OsoGDh6X9DNk="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/misc/file/default.nix b/pkgs/tools/misc/file/default.nix index 8cff5ccd70afb..4aab839a8a560 100644 --- a/pkgs/tools/misc/file/default.nix +++ b/pkgs/tools/misc/file/default.nix @@ -1,4 +1,5 @@ { lib, stdenv, fetchurl, file, zlib, libgnurx +, updateAutotoolsGnuConfigScriptsHook , testers }: @@ -30,7 +31,8 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; enableParallelBuilding = true; - nativeBuildInputs = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) file; + nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ] + ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) file; buildInputs = [ zlib ] ++ lib.optional stdenv.hostPlatform.isWindows libgnurx; diff --git a/pkgs/tools/misc/findutils/default.nix b/pkgs/tools/misc/findutils/default.nix index b3810892ce03d..cfa4105cda0d4 100644 --- a/pkgs/tools/misc/findutils/default.nix +++ b/pkgs/tools/misc/findutils/default.nix @@ -1,4 +1,5 @@ { lib, stdenv, fetchurl +, updateAutotoolsGnuConfigScriptsHook , coreutils }: @@ -22,6 +23,7 @@ stdenv.mkDerivation rec { patches = [ ./no-install-statedir.patch ]; + nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ]; buildInputs = [ coreutils ]; # bin/updatedb script needs to call sort # Since glibc-2.25 the i686 tests hang reliably right after test-sleep. diff --git a/pkgs/tools/misc/kalker/default.nix b/pkgs/tools/misc/kalker/default.nix index ef152524da7ad..604fab1878f58 100644 --- a/pkgs/tools/misc/kalker/default.nix +++ b/pkgs/tools/misc/kalker/default.nix @@ -23,11 +23,6 @@ rustPlatform.buildRustPackage rec { outputs = [ "out" "lib" ]; - # Cargo.lock is outdated - preConfigure = '' - cargo metadata --offline - ''; - postInstall = '' moveToOutput "lib" "$lib" ''; diff --git a/pkgs/tools/misc/pouf/default.nix b/pkgs/tools/misc/pouf/default.nix index e114af2c2c1eb..ac37b64a7a885 100644 --- a/pkgs/tools/misc/pouf/default.nix +++ b/pkgs/tools/misc/pouf/default.nix @@ -16,11 +16,6 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-rVJAaeg27SdM8cTx12rKLIGEYtXUhLHXUYpT78oVNlo="; - # Cargo.lock is outdated. - preConfigure = '' - cargo update --offline - ''; - postInstall = "make PREFIX=$out copy-data"; meta = with lib; { diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index 0bd65a307b0b7..cee5be45a3ba2 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -49,14 +49,14 @@ assert !((lib.count (x: x) [ gnutlsSupport opensslSupport wolfsslSupport rustlsS stdenv.mkDerivation (finalAttrs: { pname = "curl"; - version = "8.7.1"; + version = "8.8.0"; src = fetchurl { urls = [ "https://curl.haxx.se/download/curl-${finalAttrs.version}.tar.xz" "https://github.com/curl/curl/releases/download/curl-${builtins.replaceStrings [ "." ] [ "_" ] finalAttrs.version}/curl-${finalAttrs.version}.tar.xz" ]; - hash = "sha256-b+oqrGpGEPvQQAr7C83b5yWKZMY/H2jlhV68DGWXEM0="; + hash = "sha256-D1i7lfwzDIpG7rPfVwGw2Qydm/zEK9HNCHkdElUdRAA="; }; patches = lib.optionals (lib.versionOlder finalAttrs.version "8.7.2") [ @@ -65,7 +65,10 @@ stdenv.mkDerivation (finalAttrs: { ./8.7.1-compression-fix.patch ]; + # this could be accomplished by updateAutotoolsGnuConfigScriptsHook, but that causes infinite recursion + # necessary for FreeBSD code path in configure postPatch = '' + substituteInPlace ./config.guess --replace-fail /usr/bin/uname uname patchShebangs scripts ''; diff --git a/pkgs/tools/networking/modemmanager/default.nix b/pkgs/tools/networking/modemmanager/default.nix index d432b590c5c3f..a91854865b1b2 100644 --- a/pkgs/tools/networking/modemmanager/default.nix +++ b/pkgs/tools/networking/modemmanager/default.nix @@ -4,7 +4,6 @@ , fetchpatch , glib , libgudev -, polkit , ppp , gettext , pkg-config @@ -12,14 +11,19 @@ , python3 , libmbim , libqmi -, systemd , bash-completion , meson , ninja , vala -, gobject-introspection , dbus , bash +, gobject-introspection +, buildPackages +, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages +, polkit +, withPolkit ? lib.meta.availableOn stdenv.hostPlatform polkit +, systemd +, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd }: stdenv.mkDerivation rec { @@ -51,25 +55,29 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - vala - gobject-introspection gettext + glib pkg-config libxslt python3 + ] ++ lib.optionals withIntrospection [ + gobject-introspection + vala ]; buildInputs = [ glib libgudev - polkit ppp libmbim libqmi - systemd bash-completion dbus bash # shebangs in share/ModemManager/fcc-unlock.available.d/ + ] ++ lib.optionals withPolkit [ + polkit + ] ++ lib.optionals withSystemd [ + systemd ]; nativeInstallCheckInputs = [ @@ -81,9 +89,15 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dudevdir=${placeholder "out"}/lib/udev" "-Ddbus_policy_dir=${placeholder "out"}/share/dbus-1/system.d" + "-Dsystemdsystemunitdir=${placeholder "out"}/lib/systemd/system" "--sysconfdir=/etc" "--localstatedir=/var" - "-Dvapi=true" + (lib.mesonBool "introspection" withIntrospection) + (lib.mesonBool "qrtr" withIntrospection) + (lib.mesonBool "vapi" withIntrospection) + (lib.mesonBool "systemd_suspend_resume" withSystemd) + (lib.mesonBool "systemd_journal" withSystemd) + (lib.mesonOption "polkit" (if withPolkit then "strict" else "no")) ]; postPatch = '' @@ -96,7 +110,7 @@ stdenv.mkDerivation rec { # load libraries from the install path, which doesn't usually exist # when `meson test' is run. So to work around that, we run it as an # install check instead, when those paths will have been created. - doInstallCheck = true; + doInstallCheck = withIntrospection; installCheckPhase = '' runHook preInstallCheck export G_TEST_DBUS_DAEMON="${dbus}/bin/dbus-daemon" diff --git a/pkgs/tools/text/diffutils/default.nix b/pkgs/tools/text/diffutils/default.nix index 8c4a160d4b1e5..6c1bc8bf01f13 100644 --- a/pkgs/tools/text/diffutils/default.nix +++ b/pkgs/tools/text/diffutils/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, xz, coreutils ? null }: +{ lib, stdenv, fetchurl, updateAutotoolsGnuConfigScriptsHook, xz, coreutils ? null }: # Note: this package is used for bootstrapping fetchurl, and thus # cannot use fetchpatch! All mutable patches (generated by GitHub or @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "info" ]; - nativeBuildInputs = [ (lib.getBin xz) ]; + nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook (lib.getBin xz) ]; /* If no explicit coreutils is given, use the one from stdenv. */ buildInputs = [ coreutils ]; diff --git a/pkgs/tools/text/gawk/default.nix b/pkgs/tools/text/gawk/default.nix index d85880e82e155..8857fa29d1c63 100644 --- a/pkgs/tools/text/gawk/default.nix +++ b/pkgs/tools/text/gawk/default.nix @@ -1,4 +1,5 @@ { lib, stdenv, fetchurl +, runtimeShellPackage # TODO: links -lsigsegv but loses the reference for some reason , withSigsegv ? (false && stdenv.hostPlatform.system != "x86_64-cygwin"), libsigsegv , interactive ? false, readline @@ -39,7 +40,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ] ++ lib.optional (doCheck && stdenv.isLinux) glibcLocales; - buildInputs = lib.optional withSigsegv libsigsegv + buildInputs = [ + runtimeShellPackage + ] ++ lib.optional withSigsegv libsigsegv ++ lib.optional interactive readline ++ lib.optional stdenv.isDarwin locale; diff --git a/pkgs/tools/text/gnugrep/default.nix b/pkgs/tools/text/gnugrep/default.nix index 5df81274c6a5d..7298fe881bea1 100644 --- a/pkgs/tools/text/gnugrep/default.nix +++ b/pkgs/tools/text/gnugrep/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, glibcLocales, fetchurl, pcre2, libiconv, perl }: +{ lib, stdenv, updateAutotoolsGnuConfigScriptsHook, glibcLocales, fetchurl, pcre2, libiconv, perl, runtimeShellPackage }: # Note: this package is used for bootstrapping fetchurl, and thus # cannot use fetchpatch! All mutable patches (generated by GitHub or @@ -26,7 +26,8 @@ stdenv.mkDerivation { nativeCheckInputs = [ perl glibcLocales ]; outputs = [ "out" "info" ]; # the man pages are rather small - buildInputs = [ pcre2 libiconv ]; + nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ]; + buildInputs = [ pcre2 libiconv runtimeShellPackage ]; # cygwin: FAIL: multibyte-white-space # freebsd: FAIL mb-non-UTF8-performance diff --git a/pkgs/tools/text/gnused/default.nix b/pkgs/tools/text/gnused/default.nix index f493e4f358d65..bc736f418725b 100644 --- a/pkgs/tools/text/gnused/default.nix +++ b/pkgs/tools/text/gnused/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, perl }: +{ lib, stdenv, fetchurl, updateAutotoolsGnuConfigScriptsHook, perl }: stdenv.mkDerivation rec { pname = "gnused"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "info" ]; - nativeBuildInputs = [ perl ]; + nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook perl ]; preConfigure = "patchShebangs ./build-aux/help2man"; # Prevents attempts of running 'help2man' on cross-built binaries. diff --git a/pkgs/tools/text/teip/default.nix b/pkgs/tools/text/teip/default.nix index caa665fc3c93c..df36a0a2129ca 100644 --- a/pkgs/tools/text/teip/default.nix +++ b/pkgs/tools/text/teip/default.nix @@ -23,11 +23,6 @@ rustPlatform.buildRustPackage rec { nativeCheckInputs = [ perl ]; - # Cargo.lock is outdated - preConfigure = '' - cargo update --offline - ''; - # tests are locale sensitive preCheck = '' export LANG=${if stdenv.isDarwin then "en_US.UTF-8" else "C.UTF-8"} diff --git a/pkgs/tools/typesetting/tex/texlive/build-texlive-package.nix b/pkgs/tools/typesetting/tex/texlive/build-texlive-package.nix index c5a55cf0f9c96..e289f9171c158 100644 --- a/pkgs/tools/typesetting/tex/texlive/build-texlive-package.nix +++ b/pkgs/tools/typesetting/tex/texlive/build-texlive-package.nix @@ -62,7 +62,7 @@ let # TeX Live packages should not be installed directly into the user profile outputsToInstall = [ ]; longDescription = '' - This package cannot be installed directly. Please use `texlive.withPackages`. + This package cannot be installed or used directly. Please use `texlive.withPackages (ps: [ ps.${lib.strings.escapeNixIdentifier pname} ])`. ''; # discourage nix-env from matching this package priority = 10; @@ -152,7 +152,7 @@ let # fake derivation for resolving dependencies in the absence of a "tex" containers fakeTeX = passthru - // { inherit meta; tlOutputName = "tex"; } + // { inherit meta; tlOutputName = "tex"; inherit build; } // outputDrvs; containers = rec { @@ -214,22 +214,31 @@ let ln -s {"$texdoc"/doc,"$out"/share}/info '') [ "out" ] // outputDrvs; }; -in -if outputs == [ ] then removeAttrs fakeTeX [ "outputSpecified" ] else -runCommand name - { - __structuredAttrs = true; - inherit meta outputDrvs outputs; - passthru = removeAttrs passthru [ "outputSpecified" ]; - - # force output name in case "out" is missing - nativeBuildInputs = lib.optional (! hasBinfiles) - (writeShellScript "force-output.sh" '' + + # multioutput derivation to be exported under texlivePackages + # to make Hydra build all containers + build = runCommand name + { + __structuredAttrs = true; + inherit meta outputDrvs; + outputs = if outputs != [ ] then outputs else [ "out" ]; + passthru = removeAttrs passthru [ "outputSpecified" ] // { inherit build; }; + + # force output name in case "out" is missing + preHook = lib.optionalString (!hasBinfiles && outputs != [ ]) '' export out="''${${builtins.head outputs}-}" - ''); - } - '' - for outputName in ''${!outputs[@]} ; do - ln -s "''${outputDrvs[$outputName]}" "''${outputs[$outputName]}" - done - '' // outputDrvs + ''; + } + # each output is just a symlink to the corresponding container + # if the container is missing (that is, outputs == [ ]), create a file, to prevent passing the package to .withPackages + '' + for outputName in ''${!outputs[@]} ; do + if [[ -z ''${outputDrvs[$outputName]} ]] ; then + ln -s "''${outputDrvs[$outputName]}" "''${outputs[$outputName]}" + else + touch "''${outputs[$outputName]}" + fi + done + ''; +in +if outputs == [ ] then removeAttrs fakeTeX [ "outputSpecified" ] else build // outputDrvs diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e1aca3dca5cf7..98365383a7c05 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5272,7 +5272,7 @@ with pkgs; # TeX Live; see https://nixos.org/nixpkgs/manual/#sec-language-texlive texlive = callPackage ../tools/typesetting/tex/texlive { }; inherit (texlive.schemes) texliveBasic texliveBookPub texliveConTeXt texliveFull texliveGUST texliveInfraOnly texliveMedium texliveMinimal texliveSmall texliveTeTeX; - texlivePackages = recurseIntoAttrs (lib.filterAttrs (_: lib.isDerivation) texlive.pkgs); + texlivePackages = recurseIntoAttrs (lib.mapAttrs (_: v: v.build) texlive.pkgs); fop = callPackage ../tools/typesetting/fop { }; @@ -16538,11 +16538,11 @@ with pkgs; wrapRustcWith = { rustc-unwrapped, ... } @ args: callPackage ../build-support/rust/rustc-wrapper args; wrapRustc = rustc-unwrapped: wrapRustcWith { inherit rustc-unwrapped; }; - rust_1_77 = callPackage ../development/compilers/rust/1_77.nix { + rust_1_78 = callPackage ../development/compilers/rust/1_78.nix { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security SystemConfiguration; - llvm_17 = llvmPackages_17.libllvm; + llvm_18 = llvmPackages_18.libllvm; }; - rust = rust_1_77; + rust = rust_1_78; mrustc = callPackage ../development/compilers/mrustc { }; mrustc-minicargo = callPackage ../development/compilers/mrustc/minicargo.nix { }; @@ -16550,8 +16550,8 @@ with pkgs; openssl = openssl_1_1; }; - rustPackages_1_77 = rust_1_77.packages.stable; - rustPackages = rustPackages_1_77; + rustPackages_1_78 = rust_1_78.packages.stable; + rustPackages = rustPackages_1_78; inherit (rustPackages) cargo cargo-auditable cargo-auditable-cargo-wrapper clippy rustc rustPlatform; @@ -19134,8 +19134,6 @@ with pkgs; nex = callPackage ../development/tools/parsing/nex { }; - ninja = callPackage ../development/tools/build-managers/ninja { }; - nimbo = with python3Packages; callPackage ../applications/misc/nimbo { }; gn = callPackage ../development/tools/build-managers/gn { }; @@ -23855,7 +23853,7 @@ with pkgs; prospector = callPackage ../development/tools/prospector { }; - protobuf = protobuf_24; + protobuf = protobuf_25; inherit ({ diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index bce80c21b32b5..54ab7e6b85385 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -40,6 +40,7 @@ let }; argsOverride = { inherit version; + pname = "linux-hardened"; modDirVersion = modDirVersion' + kernelPatches.hardened.${kernel.meta.branch}.extra; src = fetchurl { url = "mirror://kernel/linux/kernel/v${major}.x/linux-${version}.tar.xz"; @@ -193,6 +194,7 @@ in { kernelPatches.rust_1_75 kernelPatches.rust_1_76 kernelPatches.rust_1_77-6_8 + kernelPatches.rust_1_78 ]; }; @@ -213,6 +215,7 @@ in { kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper + kernelPatches.rust_1_78 ]; }; latest = packageAliases.linux_latest.kernel; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 9d18dc422d505..737e82255bfe0 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -141,6 +141,7 @@ mapAliases ({ django_treebeard = django-treebeard; # added 2023-07-25 dns = dnspython; # added 2017-12-10 docker_pycreds = docker-pycreds; # added 2024-01-03 + docker-py = throw "docker-py was renamed to docker in version 2.0.0 back in 2016"; # added 2024-05-29 doctest-ignore-unicode = throw "doctest-ignore-unicode has been removed since it has been unmaintained for 11 years"; # added 2024-05-20 dogpile_cache = dogpile-cache; # added 2021-10-28 dogpile-core = throw "dogpile-core is no longer maintained, use dogpile-cache instead"; # added 2021-11-20 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 16b8ff5cb46d0..b0db50a37f82e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3470,8 +3470,6 @@ self: super: with self; { docker-pycreds = callPackage ../development/python-modules/docker-pycreds { }; - docker-py = callPackage ../development/python-modules/docker-py { }; - dockerspawner = callPackage ../development/python-modules/dockerspawner { }; docloud = callPackage ../development/python-modules/docloud { }; |