diff options
Diffstat (limited to 'pkgs')
634 files changed, 14372 insertions, 7219 deletions
diff --git a/pkgs/applications/audio/castopod/default.nix b/pkgs/applications/audio/castopod/default.nix index bd66a6835562d..98e43b91a4a29 100644 --- a/pkgs/applications/audio/castopod/default.nix +++ b/pkgs/applications/audio/castopod/default.nix @@ -7,11 +7,11 @@ }: stdenv.mkDerivation { pname = "castopod"; - version = "1.10.5"; + version = "1.11.0"; src = fetchurl { - url = "https://code.castopod.org/adaures/castopod/uploads/66de724407be8f940af5eb1d633fbbc3/castopod-1.10.5.tar.gz"; - sha256 = "0ssdgqxqldg2f6ni54k5vlndnjjy9lah47q1crpz5nnkkjgvc96y"; + url = "https://code.castopod.org/adaures/castopod/uploads/0f1fbf6eb849b208e26b53d930b9e22f/castopod-1.11.0.tar.gz"; + sha256 = "09l4q8v809jnvgx9vpa1fyjhgqdbbrwkyk591kx5k1gg935rmgnx"; }; dontBuild = true; diff --git a/pkgs/applications/audio/psst/default.nix b/pkgs/applications/audio/psst/default.nix index 4d81f3f212bbb..2bd8573ab5807 100644 --- a/pkgs/applications/audio/psst/default.nix +++ b/pkgs/applications/audio/psst/default.nix @@ -16,13 +16,13 @@ let in rustPlatform.buildRustPackage rec { pname = "psst"; - version = "unstable-2024-04-01"; + version = "unstable-2024-05-26"; src = fetchFromGitHub { owner = "jpochyla"; repo = pname; - rev = "37d8da11774c6eff3d1c2902ac883dace178e832"; - hash = "sha256-BGIbf7jtrspFqURyy2AIYKSSkcirLgj0oUBq0CHl+2s="; + rev = "6c9cd3f91653764b832ea5136cda04c9e0f8fe50"; + hash = "sha256-bttF+yX1BT4t1TUmJBs0OZuPD+6uPxHlb8YzRIVNKTQ="; }; cargoLock = { diff --git a/pkgs/applications/audio/psst/make-build-reproducible.patch b/pkgs/applications/audio/psst/make-build-reproducible.patch index 5598c443b3c6b..17a93ef76caed 100644 --- a/pkgs/applications/audio/psst/make-build-reproducible.patch +++ b/pkgs/applications/audio/psst/make-build-reproducible.patch @@ -51,7 +51,7 @@ index fcbd491..2d71ee3 100644 -pub const GIT_VERSION: &str = git_version!(); -pub const BUILD_TIME: &str = include!(concat!(env!("OUT_DIR"), "/build-time.txt")); -pub const REMOTE_URL: &str = include!(concat!(env!("OUT_DIR"), "/remote-url.txt")); -+pub const GIT_VERSION: &str = "37d8da11774c6eff3d1c2902ac883dace178e832"; ++pub const GIT_VERSION: &str = "6c9cd3f91653764b832ea5136cda04c9e0f8fe50"; +pub const BUILD_TIME: &str = "1970-01-01 00:00:00"; +pub const REMOTE_URL: &str = "https://github.com/jpochyla/psst"; diff --git a/pkgs/applications/audio/waylyrics/default.nix b/pkgs/applications/audio/waylyrics/default.nix index 5d209e5a61ef0..2fb67fdda38bd 100644 --- a/pkgs/applications/audio/waylyrics/default.nix +++ b/pkgs/applications/audio/waylyrics/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "waylyrics"; - version = "0.3.9"; + version = "0.3.10"; src = fetchFromGitHub { owner = "waylyrics"; repo = "waylyrics"; rev = "v${version}"; - hash = "sha256-RLqBjN5haZKjbTK8U2Y62IY+D9lR3NaHK3erAcauhzE="; + hash = "sha256-JqCnVkqua/qOZjE+XKj3PyrGwqk7IToYOhLN78fKdq0="; }; - cargoHash = "sha256-yEoYPG362rloCXVO23/qR8vbmxHv2hot3AhYgJknrOY="; + cargoHash = "sha256-fVwY+lkfg/O1sPM0C7NOdb8/pln96vBcmCAWh0pEPHI="; nativeBuildInputs = [ pkg-config wrapGAppsHook4 ]; buildInputs = [ openssl dbus ]; diff --git a/pkgs/applications/audio/zita-at1/default.nix b/pkgs/applications/audio/zita-at1/default.nix index 4e9544e39602d..d55942368f8fe 100644 --- a/pkgs/applications/audio/zita-at1/default.nix +++ b/pkgs/applications/audio/zita-at1/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "zita-at1"; - version = "0.6.2"; + version = "0.8.2"; src = fetchurl { url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2"; - sha256 = "0mxfn61zvhlq3r1mqipyqzjbanrfdkk8x4nxbz8nlbdk0bf3vfqr"; + sha256 = "sha256-NSYTJmgOmL/CgGI/rBGQuqmccZEzvwYgchb7e4XqmmM="; }; buildInputs = [ 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/greetd/wlgreet.nix b/pkgs/applications/display-managers/greetd/wlgreet.nix index 1026f3a61e779..cdaf1ff0c9268 100644 --- a/pkgs/applications/display-managers/greetd/wlgreet.nix +++ b/pkgs/applications/display-managers/greetd/wlgreet.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "wlgreet"; - version = "0.4.1"; + version = "0.5.0"; src = fetchFromSourcehut { owner = "~kennylevinsen"; repo = pname; rev = version; - hash = "sha256-qfEzr8tAE1+PK7xs1NQ1q6d/GlFA7/kSWXbJDOCrEsw="; + hash = "sha256-TQTHFBOTxtSuzrAG4cjZ9oirl80xc0rPdYeLJ0t39DQ="; }; - cargoHash = "sha256-1ugExUtrzqyd9dTlBHcc44UrtEfYrfUryuG79IkTv2Y="; + cargoHash = "sha256-+YGhfEq2RltPq5oLLh1h+vGphDpoGZNVdvzko3P1iUQ="; nativeBuildInputs = [ autoPatchelfHook ]; buildInputs = [ gcc-unwrapped ]; 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/manual-packages/color-theme-solarized/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/color-theme-solarized/default.nix index 07322879b5bee..94486bdbfb4b4 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/color-theme-solarized/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/color-theme-solarized/default.nix @@ -6,7 +6,7 @@ trivialBuild { pname = "color-theme-solarized"; - version = "0.pre+unstable=2017-10-24"; + version = "0-unstable-2017-10-24"; src = fetchFromGitHub { owner = "sellout"; diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/copilot/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/copilot/default.nix index efe18de7600e1..3512ec8a5ec04 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/copilot/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/copilot/default.nix @@ -8,7 +8,7 @@ }: trivialBuild { pname = "copilot"; - version = "unstable-2023-12-26"; + version = "0-unstable-2023-12-26"; src = fetchFromGitHub { owner = "zerolfx"; repo = "copilot.el"; diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/evil-markdown/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/evil-markdown/default.nix index d4079a53dcaa0..b95b05f986107 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/evil-markdown/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/evil-markdown/default.nix @@ -8,7 +8,7 @@ trivialBuild rec { pname = "evil-markdown"; - version = "0.pre+unstable=2021-07-21"; + version = "0-unstable-2021-07-21"; src = fetchFromGitHub { owner = "Somelauw"; diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/font-lock-plus/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/font-lock-plus/default.nix index 019d241f507b0..be52cf155e5b3 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/font-lock-plus/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/font-lock-plus/default.nix @@ -5,7 +5,7 @@ trivialBuild { pname = "font-lock-plus"; - version = "208+unstable=2018-01-01"; + version = "208-unstable-2018-01-01"; src = fetchFromGitHub { owner = "emacsmirror"; diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/git-undo/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/git-undo/default.nix index b8bbe7db577bb..f0f16c8cf0636 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/git-undo/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/git-undo/default.nix @@ -6,7 +6,7 @@ trivialBuild { pname = "git-undo"; - version = "0.pre+unstable=2019-12-21"; + version = "0-unstable-2019-12-21"; src = fetchFromGitHub { owner = "jwiegley"; diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/helm-words/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/helm-words/default.nix index 21a65614398af..eb16701f3856f 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/helm-words/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/helm-words/default.nix @@ -8,7 +8,7 @@ trivialBuild rec { pname = "helm-words"; - version = "0.pre+unstable=2019-03-12"; + version = "0-unstable-2019-03-12"; src = fetchFromGitHub { owner = "emacsmirror"; diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/isearch-plus/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/isearch-plus/default.nix index c28a17743421f..d4f60c609381d 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/isearch-plus/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/isearch-plus/default.nix @@ -6,7 +6,7 @@ trivialBuild { pname = "isearch-plus"; - version = "3434+unstable=2021-08-23"; + version = "3434-unstable-2021-08-23"; src = fetchFromGitHub { owner = "emacsmirror"; diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/isearch-prop/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/isearch-prop/default.nix index d5283da41dff6..00ff1f0a9b216 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/isearch-prop/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/isearch-prop/default.nix @@ -6,7 +6,7 @@ trivialBuild { pname = "isearch-prop"; - version = "0.pre+unstable=2019-05-01"; + version = "0-unstable-2019-05-01"; src = fetchFromGitHub { owner = "emacsmirror"; diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix index 96c18bc07d2ec..808b9c8123f3c 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix @@ -88,6 +88,8 @@ melpaBuild { runHook postCheck ''; + __darwinAllowLocalNetworking = true; + passthru.updateScript = writeScript "update.sh" '' #!/usr/bin/env nix-shell #!nix-shell -i bash -p common-updater-scripts coreutils git gnused diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lspce/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lspce/default.nix index 398f366f52100..97a9bea4f96ca 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lspce/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lspce/default.nix @@ -9,7 +9,7 @@ }: let - version = "unstable-2024-02-03"; + version = "1.0.0-unstable-2024-02-03"; src = fetchFromGitHub { owner = "zbelial"; diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/rect-mark/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/rect-mark/default.nix index aef7fbf8c9a0b..8d4fcf5090c34 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/rect-mark/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/rect-mark/default.nix @@ -15,8 +15,6 @@ trivialBuild rec { hash = "sha256-/8T1VTYkKUxlNWXuuS54S5jpl4UxJBbgSuWc17a/VyM="; }; - buildInputs = [ emacs ]; - meta = with lib; { homepage = "http://emacswiki.org/emacs/RectangleMark"; description = "Mark a rectangle of text with highlighting"; diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/sunrise-commander/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/sunrise-commander/default.nix index 035f17d6415a0..efc422d601f06 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/sunrise-commander/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/sunrise-commander/default.nix @@ -6,7 +6,7 @@ trivialBuild { pname = "sunrise-commander"; - version = "unstable=2021-09-27"; + version = "0-unstable-2021-09-27"; src = fetchFromGitHub { owner = "sunrise-commander"; diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/voicemacs/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/voicemacs/default.nix index d7c3758bf324e..60f3e3a75e053 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/voicemacs/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/voicemacs/default.nix @@ -17,7 +17,7 @@ trivialBuild { pname = "voicemacs"; - version = "unstable-2022-02-16"; + version = "0-unstable-2022-02-16"; src = fetchFromGitHub { owner = "jcaw"; diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/yes-no/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/yes-no/default.nix index 2b51332c30d4a..2cb229a4e1e39 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/yes-no/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/yes-no/default.nix @@ -2,7 +2,7 @@ trivialBuild { pname = "yes-no"; - version = "2017-10-01"; + version = "0-unstable-2017-10-01"; src = fetchurl { url = "https://raw.githubusercontent.com/emacsmirror/emacswiki.org/143bcaeb679a8fa8a548e92a5a9d5c2baff50d9c/yes-no.el"; diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/youtube-dl/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/youtube-dl/default.nix index e6e645a3b3a1c..ec25ab9b1bdf8 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/youtube-dl/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/youtube-dl/default.nix @@ -6,7 +6,7 @@ trivialBuild { pname = "youtube-dl"; - version = "0.pre+unstable=2018-10-12"; + version = "1.0-unstable-2018-10-12"; src = fetchFromGitHub { owner = "skeeto"; @@ -15,8 +15,6 @@ trivialBuild { sha256 = "sha256-Etl95rcoRACDPjcTPQqYK2L+w8OZbOrTrRT0JadMdH4="; }; - buildInputs = [ emacs ]; - meta = with lib; { description = "Emacs youtube-dl download manager"; homepage = "https://github.com/skeeto/youtube-dl-emacs"; 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/netbeans/default.nix b/pkgs/applications/editors/netbeans/default.nix index b61d88450148f..54169113aba26 100644 --- a/pkgs/applications/editors/netbeans/default.nix +++ b/pkgs/applications/editors/netbeans/default.nix @@ -3,7 +3,7 @@ }: let - version = "21"; + version = "22"; desktopItem = makeDesktopItem { name = "netbeans"; exec = "netbeans"; @@ -19,7 +19,7 @@ stdenv.mkDerivation { inherit version; src = fetchurl { url = "mirror://apache/netbeans/netbeans/${version}/netbeans-${version}-bin.zip"; - hash = "sha256-enGpaDxSaoR8H/Q7yUA9XAHFC3OePFFw/v+yqn+69/0="; + hash = "sha256-uuzC2iiTSn3czWod3aBbNh8mVM5bCvmjKUl0ptNdm3M="; }; buildCommand = '' diff --git a/pkgs/applications/editors/poke/default.nix b/pkgs/applications/editors/poke/default.nix index 36d35bc44dc1a..604758d0df5ae 100644 --- a/pkgs/applications/editors/poke/default.nix +++ b/pkgs/applications/editors/poke/default.nix @@ -19,11 +19,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "poke"; - version = "4.0"; + version = "4.1"; src = fetchurl { url = "mirror://gnu/poke/poke-${finalAttrs.version}.tar.gz"; - hash = "sha256-ArqyLLH6YVOhtqknyLs81Y1QhUPBRIQqbX7nTxmXOnc="; + hash = "sha256-COyupB9zdKzUI44Su/l+jNXlctWRfpVrc7nUMCbp10A="; }; outputs = [ "out" "dev" "info" "lib" ] diff --git a/pkgs/applications/editors/sublime/4/packages.nix b/pkgs/applications/editors/sublime/4/packages.nix index d77a6205fc208..9bfbbd1c1d695 100644 --- a/pkgs/applications/editors/sublime/4/packages.nix +++ b/pkgs/applications/editors/sublime/4/packages.nix @@ -11,9 +11,9 @@ in } { }; sublime4-dev = common { - buildVersion = "4173"; + buildVersion = "4175"; dev = true; - x64sha256 = "JEf974X+m0XaZ5x2g4o5XYkdo2A0cIZNjFLCrIgFzEA="; - aarch64sha256 = "+aVV7o59ZFwSOyV0DDNUpaq3q21bXslE+Oz/i33X+4Y="; + x64sha256 = "xncyxAaFJLLMko/iF6fhnpkOEHzD3nzWWGQCRK9srq4="; + aarch64sha256 = "oqz1HASwmv0B1T3ZQBdIOZD9wYcHbni8tovW7jGp3KM="; } { }; } 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/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 8d86fafcd24b9..e0a62c0b63c3c 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -17370,5 +17370,17 @@ final: prev: meta.homepage = "https://github.com/jhradilek/vim-snippets/"; }; + faster-nvim = buildVimPlugin { + pname = "faster-nvim"; + version = "2024-04-11"; + src = fetchFromGitHub { + owner = "pteroctopus"; + repo = "faster.nvim"; + rev = "e85c5bdff0cd1e17cbee855ae23c25e7b8e597cb"; + sha256 = "sha256-oruxdxoMq46F9lf1JxkbrqdzR0JwDE1y/cVCaTD4SBg="; + }; + meta.homepage = "https://github.com/pteroctopus/faster.nvim"; + }; + } diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index af1e99b87d154..7c6479d415538 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -298,6 +298,7 @@ https://github.com/google/executor.nvim/,HEAD, https://github.com/jinh0/eyeliner.nvim/,HEAD, https://github.com/fenetikm/falcon/,, https://github.com/brooth/far.vim/,, +https://github.com/pteroctopus/faster.nvim/,HEAD, https://github.com/konfekt/fastfold/,, https://github.com/lilydjwg/fcitx.vim/,fcitx5, https://github.com/freddiehaddad/feline.nvim/,, diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 3eeb461261c89..f8db2003d38eb 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -406,8 +406,8 @@ let mktplcRef = { name = "vscode-neovim"; publisher = "asvetliakov"; - version = "1.11.4"; - hash = "sha256-dAovrYfA5muPNhFIHycxuO0CIWPT4T9hsEzri1JDOUI="; + version = "1.14.1"; + hash = "sha256-taO9jxNC4mvli08Gbl8oO70T+RkfZkztoVZYWeVY4Bs="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/asvetliakov.vscode-neovim/changelog"; @@ -1030,6 +1030,21 @@ let }; }; + danielgavin.ols = buildVscodeMarketplaceExtension { + mktplcRef = { + publisher = "DanielGavin"; + name = "ols"; + version = "0.1.28"; + hash = "sha256-yVXltjvtLc+zqela/Jyg+g66PU61+YTMX1hWPW8fIkk="; + }; + meta = { + description = "A Visual Studio Code extension for Odin language"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=DanielGavin.ols"; + homepage = "https://github.com/DanielGavin/ols"; + license = lib.licenses.mit; + }; + }; + daohong-emilio.yash = buildVscodeMarketplaceExtension { mktplcRef = { publisher = "daohong-emilio"; @@ -4897,18 +4912,18 @@ let }; aliases = super: { - _13xforever = super."13xforever"; - _1Password = super."1Password"; - _2gua = super."2gua"; - _4ops = super."4ops"; - Arjun.swagger-viewer = super.arjun.swagger-viewer; - jakebecker.elixir-ls = super.elixir-lsp.vscode-elixir-ls; - jpoissonnier.vscode-styled-components = super.styled-components.vscode-styled-components; - matklad.rust-analyzer = super.rust-lang.rust-analyzer; # Previous publisher - ms-vscode.go = super.golang.go; - ms-vscode.PowerShell = super.ms-vscode.powershell; - rioj7.commandOnAllFiles = super.rioj7.commandonallfiles; - WakaTime.vscode-wakatime = super.wakatime.vscode-wakatime; + _13xforever = throw "_13xforever is deprecated in favor of 13xforever"; # Added 2024-05-29 + _1Password = throw "_1Password is deprecated in favor of 1Password"; # Added 2024-05-29 + _2gua = throw "_2gua is deprecated in favor of 2gua"; # Added 2024-05-29 + _4ops = throw "_4ops is deprecated in favor of 4ops"; # Added 2024-05-29 + Arjun.swagger-viewer = throw "Arjun.swagger-viewer is deprecated in favor of arjun.swagger-viewer"; # Added 2024-05-29 + jakebecker.elixir-ls = throw "jakebecker.elixir-ls is deprecated in favor of elixir-lsp.vscode-elixir-ls"; # Added 2024-05-29 + jpoissonnier.vscode-styled-components = throw "jpoissonnier.vscode-styled-components is deprecated in favor of styled-components.vscode-styled-components"; # Added 2024-05-29 + matklad.rust-analyzer = throw "matklad.rust-analyzer is deprecated in favor of rust-lang.rust-analyzer"; # Added 2024-05-29 + ms-vscode.go = throw "ms-vscode.go is deprecated in favor of golang.go"; # Added 2024-05-29 + ms-vscode.PowerShell = throw "ms-vscode.PowerShell is deprecated in favor of super.ms-vscode.powershell"; # Added 2024-05-29 + rioj7.commandOnAllFiles = throw "rioj7.commandOnAllFiles is deprecated in favor of rioj7.commandonallfiles"; # Added 2024-05-29 + WakaTime.vscode-wakatime = throw "WakaTime.vscode-wakatime is deprecated in favor of wakatime.vscode-wakatime"; # Added 2024-05-29 }; # TODO: add overrides overlay, so that we can have a generated.nix diff --git a/pkgs/applications/emulators/box64/default.nix b/pkgs/applications/emulators/box64/default.nix index 6d15889ee50c8..5a6e87b0644aa 100644 --- a/pkgs/applications/emulators/box64/default.nix +++ b/pkgs/applications/emulators/box64/default.nix @@ -1,16 +1,23 @@ -{ lib -, stdenv -, fetchFromGitHub -, gitUpdater -, cmake -, python3 -, withDynarec ? (stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isRiscV64) -, runCommand -, hello-x86_64 +{ + lib, + stdenv, + fetchFromGitHub, + gitUpdater, + cmake, + python3, + withDynarec ? ( + stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isRiscV64 || stdenv.hostPlatform.isLoongArch64 + ), + runCommand, + hello-x86_64, }: -# Currently only supported on ARM & RISC-V -assert withDynarec -> (stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isRiscV64); +# Currently only supported on specific archs +assert + withDynarec + -> ( + stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isRiscV64 || stdenv.hostPlatform.isLoongArch64 + ); stdenv.mkDerivation (finalAttrs: { pname = "box64"; @@ -28,23 +35,27 @@ stdenv.mkDerivation (finalAttrs: { python3 ]; - cmakeFlags = [ - "-DNOGIT=ON" - - # Arch mega-option - "-DARM64=${lib.boolToString stdenv.hostPlatform.isAarch64}" - "-DRV64=${lib.boolToString stdenv.hostPlatform.isRiscV64}" - "-DPPC64LE=${lib.boolToString (stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian)}" - "-DLARCH64=${lib.boolToString stdenv.hostPlatform.isLoongArch64}" - ] ++ lib.optionals stdenv.hostPlatform.isx86_64 [ - # x86_64 has no arch-specific mega-option, manually enable the options that apply to it - "-DLD80BITS=ON" - "-DNOALIGN=ON" - ] ++ [ - # Arch dynarec - "-DARM_DYNAREC=${lib.boolToString (withDynarec && stdenv.hostPlatform.isAarch64)}" - "-DRV64_DYNAREC=${lib.boolToString (withDynarec && stdenv.hostPlatform.isRiscV64)}" - ]; + cmakeFlags = + [ + (lib.cmakeBool "NOGIT" true) + + # Arch mega-option + (lib.cmakeBool "ARM64" stdenv.hostPlatform.isAarch64) + (lib.cmakeBool "RV64" stdenv.hostPlatform.isRiscV64) + (lib.cmakeBool "PPC64LE" (stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian)) + (lib.cmakeBool "LARCH64" stdenv.hostPlatform.isLoongArch64) + ] + ++ lib.optionals stdenv.hostPlatform.isx86_64 [ + # x86_64 has no arch-specific mega-option, manually enable the options that apply to it + (lib.cmakeBool "LD80BITS" true) + (lib.cmakeBool "NOALIGN" true) + ] + ++ [ + # Arch dynarec + (lib.cmakeBool "ARM_DYNAREC" (withDynarec && stdenv.hostPlatform.isAarch64)) + (lib.cmakeBool "RV64_DYNAREC" (withDynarec && stdenv.hostPlatform.isRiscV64)) + (lib.cmakeBool "LARCH64_DYNAREC" (withDynarec && stdenv.hostPlatform.isLoongArch64)) + ]; installPhase = '' runHook preInstall @@ -71,24 +82,33 @@ stdenv.mkDerivation (finalAttrs: { ''; passthru = { - updateScript = gitUpdater { - rev-prefix = "v"; - }; - tests.hello = runCommand "box64-test-hello" { - nativeBuildInputs = [ finalAttrs.finalPackage ]; - } '' - # There is no actual "Hello, world!" with any of the logging enabled, and with all logging disabled it's hard to - # tell what problems the emulator has run into. - BOX64_NOBANNER=0 BOX64_LOG=1 box64 ${hello-x86_64}/bin/hello --version | tee $out - ''; + updateScript = gitUpdater { rev-prefix = "v"; }; + tests.hello = + runCommand "box64-test-hello" { nativeBuildInputs = [ finalAttrs.finalPackage ]; } + # There is no actual "Hello, world!" with any of the logging enabled, and with all logging disabled it's hard to + # tell what problems the emulator has run into. + '' + BOX64_NOBANNER=0 BOX64_LOG=1 box64 ${lib.getExe hello-x86_64} --version | tee $out + ''; }; - meta = with lib; { + meta = { homepage = "https://box86.org/"; description = "Lets you run x86_64 Linux programs on non-x86_64 Linux systems"; - license = licenses.mit; - maintainers = with maintainers; [ gador OPNA2608 ]; + changelog = "https://github.com/ptitSeb/box64/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + gador + OPNA2608 + ]; mainProgram = "box64"; - platforms = [ "x86_64-linux" "aarch64-linux" "riscv64-linux" "powerpc64le-linux" "loongarch64-linux" "mips64el-linux" ]; + platforms = [ + "x86_64-linux" + "aarch64-linux" + "riscv64-linux" + "powerpc64le-linux" + "loongarch64-linux" + "mips64el-linux" + ]; }; }) diff --git a/pkgs/applications/emulators/retroarch/default.nix b/pkgs/applications/emulators/retroarch/default.nix index 0e86d182f3e22..79fa7648fbe75 100644 --- a/pkgs/applications/emulators/retroarch/default.nix +++ b/pkgs/applications/emulators/retroarch/default.nix @@ -47,12 +47,12 @@ let in stdenv.mkDerivation rec { pname = "retroarch-bare"; - version = "1.18.0"; + version = "1.19.0"; src = fetchFromGitHub { owner = "libretro"; repo = "RetroArch"; - hash = "sha256-uOnFkLrLQlBbUlIFA8wrOkQdVIvO7Np7fvi+sPJPtHE="; + hash = "sha256-xn6lFknL5y9WozGZtqiZVyVzOuNheGhwxWlfFOYVFzU="; rev = "v${version}"; }; diff --git a/pkgs/applications/emulators/retroarch/libretro-core-info.nix b/pkgs/applications/emulators/retroarch/libretro-core-info.nix index b70d4431c59de..3e11deb4b40f0 100644 --- a/pkgs/applications/emulators/retroarch/libretro-core-info.nix +++ b/pkgs/applications/emulators/retroarch/libretro-core-info.nix @@ -6,13 +6,13 @@ stdenvNoCC.mkDerivation rec { pname = "libretro-core-info"; - version = "1.18.0"; + version = "1.19.0"; src = fetchFromGitHub { owner = "libretro"; repo = "libretro-core-info"; rev = "v${version}"; - hash = "sha256-tIuDDueYocvRDbA8CTR5ubGI7/Up02zUENw/HaDwC0U="; + hash = "sha256-dMMX9i2xPKay6BKC52fYxElcGSllHkSZyOXX/t3l6Io="; }; makeFlags = [ diff --git a/pkgs/applications/graphics/drawio/default.nix b/pkgs/applications/graphics/drawio/default.nix index 007f855d805db..b6d6007226a61 100644 --- a/pkgs/applications/graphics/drawio/default.nix +++ b/pkgs/applications/graphics/drawio/default.nix @@ -14,24 +14,24 @@ stdenv.mkDerivation rec { pname = "drawio"; - version = "24.4.0"; + version = "24.4.8"; src = fetchFromGitHub { owner = "jgraph"; repo = "drawio-desktop"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-x+9e0DPvYuxFqZAuCuzndz2E1iKdsmtN9WGUQPc9/uM="; + hash = "sha256-dtkRi7oisdgMAbaltPcz5umxcd6/F1WOjKQpJUAFFY0="; }; # `@electron/fuses` tries to run `codesign` and fails. Disable and use autoSignDarwinBinariesHook instead postPatch = '' - sed -i -e 's/resetAdHocDarwinSignature:.*/resetAdHocDarwinSignature: false,/' build/fuses.js + sed -i -e 's/resetAdHocDarwinSignature:.*/resetAdHocDarwinSignature: false,/' build/fuses.cjs ''; offlineCache = fetchYarnDeps { yarnLock = src + "/yarn.lock"; - hash = "sha256-OL4AcV8Fy25liRn4oVTLjUKyIuDKBsXHyN5RG3qexu4="; + hash = "sha256-JbDIaO5jgPAoSD3hkMaKp3vLU5Avt+G5h427bvWJ08k="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index 358931534ad99..c285fc3116401 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -3,6 +3,7 @@ , boehmgc , boost , cairo +, callPackage , cmake , desktopToDarwinBundle , fetchurl @@ -172,6 +173,8 @@ stdenv.mkDerivation rec { done ''; + passthru.tests.ps2pdf-plugin = callPackage ./test-ps2pdf-plugin.nix { }; + meta = with lib; { description = "Vector graphics editor"; homepage = "https://www.inkscape.org"; diff --git a/pkgs/applications/graphics/inkscape/fix-ps2pdf-path.patch b/pkgs/applications/graphics/inkscape/fix-ps2pdf-path.patch index 9cd8e4b34cb59..0a28533591e1e 100644 --- a/pkgs/applications/graphics/inkscape/fix-ps2pdf-path.patch +++ b/pkgs/applications/graphics/inkscape/fix-ps2pdf-path.patch @@ -6,7 +6,7 @@ diff -Naur inkscape-1.2.2_2022-12-01_b0a8486541.orig/share/extensions/eps_input. <id>org.inkscape.input.eps</id> <dependency type="extension">org.inkscape.input.pdf</dependency> - <dependency type="executable" location="path">ps2pdf</dependency> -+ <dependency type="executable" location="path">@ghostscript@/bin/ps2pdf</dependency> ++ <dependency type="executable" location="absolute">@ghostscript@/bin/ps2pdf</dependency> <param name="crop" type="bool" gui-hidden="true">true</param> <param name="autorotate" type="optiongroup" appearance="combo" gui-text="Determine page orientation from text direction" gui-description="The PS/EPS importer can try to determine the page orientation such that the majority of the text runs left-to-right."> @@ -18,7 +18,7 @@ diff -Naur inkscape-1.2.2_2022-12-01_b0a8486541.orig/share/extensions/ps_input.i <id>org.inkscape.input.postscript_input</id> <dependency type="extension">org.inkscape.input.pdf</dependency> - <dependency type="executable" location="path">ps2pdf</dependency> -+ <dependency type="executable" location="path">@ghostscript@/bin/ps2pdf</dependency> ++ <dependency type="executable" location="absolute">@ghostscript@/bin/ps2pdf</dependency> <param name="autorotate" type="optiongroup" appearance="combo" gui-text="Determine page orientation from text direction" gui-description="The PS/EPS importer can try to determine the page orientation such that the majority of the text runs left-to-right."> <option value="None">Disabled</option> diff --git a/pkgs/applications/graphics/inkscape/test-ps2pdf-plugin.nix b/pkgs/applications/graphics/inkscape/test-ps2pdf-plugin.nix new file mode 100644 index 0000000000000..3e55557c860e1 --- /dev/null +++ b/pkgs/applications/graphics/inkscape/test-ps2pdf-plugin.nix @@ -0,0 +1,27 @@ +{ inkscape, runCommand, writeTextFile }: + +let + svg_file = writeTextFile { + name = "test.svg"; + text = '' +<?xml version="1.0" encoding="UTF-8"?> +<svg width="50" height="50" version="1.1"> + <ellipse cx="1" cy="1" rx="1" ry="1" /> +</svg>''; + }; +in +runCommand "inkscape-test-eps" +{ + nativeBuildInputs = [ inkscape ]; +} '' + echo ps test + inkscape ${svg_file} --export-type=ps -o test.ps + inkscape test.ps -o test.ps.svg + + echo eps test + inkscape ${svg_file} --export-type=eps -o test.eps + inkscape test.eps -o test.eps.svg + + # inkscape does not return an error code, only does not create files + [[ -f test.ps.svg && -f test.eps.svg ]] && touch $out +'' diff --git a/pkgs/applications/graphics/sane/config.nix b/pkgs/applications/graphics/sane/config.nix index 8c7b94faca6cf..0405eeb05c2c4 100644 --- a/pkgs/applications/graphics/sane/config.nix +++ b/pkgs/applications/graphics/sane/config.nix @@ -29,8 +29,8 @@ installSanePath = path: '' fi ''; disableBackend = backend: '' - grep -q '${backend}' $out/etc/sane.d/dll.conf || { echo '${backend} is not a default plugin in $SANE_CONFIG_DIR/dll.conf'; exit 1; } - substituteInPlace $out/etc/sane.d/dll.conf --replace '${backend}' '# ${backend} disabled in nixos config' + grep -w -q '${backend}' $out/etc/sane.d/dll.conf || { echo '${backend} is not a default plugin in $SANE_CONFIG_DIR/dll.conf'; exit 1; } + sed -i 's/\b${backend}\b/# ${backend} disabled by nixos config/' $out/etc/sane.d/dll.conf ''; in stdenv.mkDerivation { diff --git a/pkgs/applications/graphics/upscayl/default.nix b/pkgs/applications/graphics/upscayl/default.nix index 12518b6f40a23..202900983e14c 100644 --- a/pkgs/applications/graphics/upscayl/default.nix +++ b/pkgs/applications/graphics/upscayl/default.nix @@ -4,11 +4,11 @@ lib, }: let pname = "upscayl"; - version = "2.11.0"; + version = "2.11.5"; src = fetchurl { url = "https://github.com/upscayl/upscayl/releases/download/v${version}/upscayl-${version}-linux.AppImage"; - hash = "sha256-XhvOzARP8Ytlf23vNMYZ5x1UKvKOlM/69yhysasW3dA="; + hash = "sha256-owxSm8t7rHM5ywJPp8sJQ5aAyNKgrbyJY6qFp78/UhM="; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/applications/graphics/vengi-tools/default.nix b/pkgs/applications/graphics/vengi-tools/default.nix index 402d820843ddc..21a0389949046 100644 --- a/pkgs/applications/graphics/vengi-tools/default.nix +++ b/pkgs/applications/graphics/vengi-tools/default.nix @@ -29,13 +29,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "vengi-tools"; - version = "0.0.31"; + version = "0.0.32"; src = fetchFromGitHub { owner = "mgerhardy"; repo = "vengi"; rev = "v${finalAttrs.version}"; - hash = "sha256-0ta7rBWc4qUqsKDU/KSzx2x+fF2GVw77lQvRgt4bkpI="; + hash = "sha256-3oL+hRFATdJmBmZK55Ui2blj8LTqt/zJWJ85kSUFCY4="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix index b6e6067875328..8ff55fda8e2b5 100644 --- a/pkgs/applications/misc/gpxsee/default.nix +++ b/pkgs/applications/misc/gpxsee/default.nix @@ -18,13 +18,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "gpxsee"; - version = "13.20"; + version = "13.21"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; rev = finalAttrs.version; - hash = "sha256-zZjE1mXZPPda4CjkOeKtLvFZO31ta4kucpzsriR2+Nw="; + hash = "sha256-rg4czTni8toAwzppgNdi/lfUDudKkEqZUZziiIiyJm0="; }; buildInputs = [ diff --git a/pkgs/applications/misc/notesnook/default.nix b/pkgs/applications/misc/notesnook/default.nix index 7742a54c6c0c5..a3423dcdb5a1c 100644 --- a/pkgs/applications/misc/notesnook/default.nix +++ b/pkgs/applications/misc/notesnook/default.nix @@ -1,8 +1,8 @@ -{ lib, stdenv, appimageTools, fetchurl, undmg }: +{ lib, stdenv, appimageTools, fetchurl, _7zz }: let pname = "notesnook"; - version = "2.6.1"; + version = "3.0.6"; inherit (stdenv.hostPlatform) system; throwSystem = throw "Unsupported system: ${system}"; @@ -16,9 +16,9 @@ let src = fetchurl { url = "https://github.com/streetwriters/notesnook/releases/download/v${version}/notesnook_${suffix}"; hash = { - x86_64-linux = "sha256-PLHP1Q4+xcHyr0323K4BD+oH57SspsrAcxRe/C6RFDU="; - x86_64-darwin = "sha256-gOUL3qLSM+/pr519Gc0baUtbmhA40lG6XzuCRyGILkc="; - aarch64-darwin = "sha256-d1nXdCv1mK4+4Gef1upIkHS3J2d9qzTLXbBWabsJwpw="; + x86_64-linux = "sha256-606+8euLnZdIPUwi+wilJgvnNQNwBCj6AGZFmp9HOWs="; + x86_64-darwin = "sha256-A0Rbm6boYI2B3Ne+FczAM3qmtM2KwNWD+C2N0sgWRtg="; + aarch64-darwin = "sha256-Jm7rZWEsMspjKrMODGPBGJP0I5fF3aj+WXdBNsmv4jw="; }.${system} or throwSystem; }; @@ -36,7 +36,7 @@ let ''; homepage = "https://notesnook.com"; license = licenses.gpl3Only; - maintainers = with maintainers; [ j0lol ]; + maintainers = with maintainers; [ cig0 j0lol ]; platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ]; mainProgram = "notesnook"; }; @@ -59,10 +59,15 @@ let darwin = stdenv.mkDerivation { inherit pname version src meta; - nativeBuildInputs = [ undmg ]; + nativeBuildInputs = [ _7zz ]; sourceRoot = "Notesnook.app"; + # 7zz did not unpack in setup hook for some reason, done manually here + unpackPhase = '' + 7zz x $src + ''; + installPhase = '' mkdir -p $out/Applications/Notesnook.app cp -R . $out/Applications/Notesnook.app 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/pdfstudio/default.nix b/pkgs/applications/misc/pdfstudio/default.nix index 21874519a7c7b..d326169e560dd 100644 --- a/pkgs/applications/misc/pdfstudio/default.nix +++ b/pkgs/applications/misc/pdfstudio/default.nix @@ -75,6 +75,9 @@ in url = "https://download.qoppa.com/pdfstudio/v${year}/PDFStudio_v${dot2dash version}_linux64.deb"; sha256 = "sha256-Po7BMmEWoC46rP7tUwZT9Ji/Wi8lKc6WN8x47fx2DXg="; }; + extraBuildInputs = [ + (lib.getLib stdenv.cc.cc) # for libstdc++.so.6 and libgomp.so.1 + ]; jdk = jdk17; }; }.${pname} 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/misc/tui-journal/default.nix b/pkgs/applications/misc/tui-journal/default.nix index 102b9ad354df5..4af9f8e2559a2 100644 --- a/pkgs/applications/misc/tui-journal/default.nix +++ b/pkgs/applications/misc/tui-journal/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "tui-journal"; - version = "0.8.4"; + version = "0.9.0"; src = fetchFromGitHub { owner = "AmmarAbouZor"; repo = "tui-journal"; rev = "v${version}"; - hash = "sha256-SgpIR7gLfmX6mCtuqRonqzX07Eblp9Mq80y71b05FZY="; + hash = "sha256-FAN0F54cCEfqoSr1La+X+et5MGTzB2Wb466Xr8eyeiI="; }; - cargoHash = "sha256-SetNhIengAiLRMHoYBRxHR1LgzYywRC7L6hmRF9COik="; + cargoHash = "sha256-y6gAv4Xf0yxpbOAdYhp3nDBH8skiyAI10+Ylz/uxf7w="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index facc0227abd0c..feba3721ba636 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -1,11 +1,11 @@ { stable = { chromedriver = { - hash_darwin = "sha256-1gi+hWrVL+mBB8pHMXnX/8kzRCQqGuut/+wO/9yBABs="; + hash_darwin = "sha256-Zz2U5zQWScID7rAE6FmTADecs4zR430KZVen+hsl+KI="; hash_darwin_aarch64 = - "sha256-skYFjXBvv+2u/K770Dd3uxFYFer6GGx/EgWfAgzE9pI="; - hash_linux = "sha256-67rXlDJeDSpcpEhNQq0rVS2bSWPy3GXVnTo6dwKAnZU="; - version = "125.0.6422.78"; + "sha256-NhnJdnrzTj8gQiyp4PzmXHx6ltsxUVrz0AL9x8nGibA="; + hash_linux = "sha256-iyhxx7KIpGPMYgf/I1hLUK8M49kWmgTy+UOXf5WBEWY="; + version = "125.0.6422.141"; }; deps = { gn = { @@ -15,8 +15,8 @@ version = "2024-04-10"; }; }; - hash = "sha256-EA8TzemtndFb8qAp4XWNjwWmNRz/P4Keh3k1Cn9qLEU="; - version = "125.0.6422.112"; + hash = "sha256-8Qe1hgDEjvdAf2ao4CIieC7l2pTSIPLTZb+vdctUEo0="; + version = "125.0.6422.141"; }; ungoogled-chromium = { deps = { @@ -27,11 +27,11 @@ version = "2024-04-10"; }; ungoogled-patches = { - hash = "sha256-vHnXIrDdHGIe8byb41CiEWq3FPTecKg006dU7+iESKA="; - rev = "125.0.6422.112-1"; + hash = "sha256-ZYYizL3hFSEQUdDDZIvsEzidq5td+UoaWdertY/pqOc="; + rev = "125.0.6422.141-1"; }; }; - hash = "sha256-EA8TzemtndFb8qAp4XWNjwWmNRz/P4Keh3k1Cn9qLEU="; - version = "125.0.6422.112"; + hash = "sha256-8Qe1hgDEjvdAf2ao4CIieC7l2pTSIPLTZb+vdctUEo0="; + version = "125.0.6422.141"; }; } 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/browsers/ladybird/default.nix b/pkgs/applications/networking/browsers/ladybird/default.nix index 80beebd5bb7c5..db00c8754791e 100644 --- a/pkgs/applications/networking/browsers/ladybird/default.nix +++ b/pkgs/applications/networking/browsers/ladybird/default.nix @@ -59,18 +59,22 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-+g/1F/v8nTVbvtSrtyvQbeYacjTlfRpg+Htu0lRlkcU="; }; - sourceRoot = "${finalAttrs.src.name}/Ladybird"; + patches = [ + ./nixos-font-path.patch + ]; postPatch = '' sed -i '/iconutil/d' CMakeLists.txt # Don't set absolute paths in RPATH - substituteInPlace ../Meta/CMake/lagom_install_options.cmake \ + substituteInPlace Meta/CMake/lagom_install_options.cmake \ --replace-fail "\''${CMAKE_INSTALL_BINDIR}" "bin" \ --replace-fail "\''${CMAKE_INSTALL_LIBDIR}" "lib" ''; preConfigure = '' + cd Ladybird + # Setup caches for LibLocale, LibUnicode, LibTimezone, LibTLS and LibGfx # Note that the versions of the input data packages must match the # expected version in the package's CMake. diff --git a/pkgs/applications/networking/browsers/ladybird/nixos-font-path.patch b/pkgs/applications/networking/browsers/ladybird/nixos-font-path.patch new file mode 100644 index 0000000000000..468eb10b2c313 --- /dev/null +++ b/pkgs/applications/networking/browsers/ladybird/nixos-font-path.patch @@ -0,0 +1,12 @@ +diff --git a/Userland/Libraries/LibCore/StandardPaths.cpp b/Userland/Libraries/LibCore/StandardPaths.cpp +index 77ddbeb9..76481497 100644 +--- a/Userland/Libraries/LibCore/StandardPaths.cpp ++++ b/Userland/Libraries/LibCore/StandardPaths.cpp +@@ -205,6 +205,7 @@ ErrorOr<Vector<String>> StandardPaths::font_directories() + "/Library/Fonts"_string, + TRY(String::formatted("{}/Library/Fonts"sv, home_directory())), + # else ++ "/run/current-system/sw/share/X11/fonts"_string, + "/usr/share/fonts"_string, + "/usr/local/share/fonts"_string, + TRY(String::formatted("{}/.local/share/fonts"sv, home_directory())), diff --git a/pkgs/applications/networking/browsers/microsoft-edge/default.nix b/pkgs/applications/networking/browsers/microsoft-edge/default.nix index c99b245cadc0f..e2a10aa6ec911 100644 --- a/pkgs/applications/networking/browsers/microsoft-edge/default.nix +++ b/pkgs/applications/networking/browsers/microsoft-edge/default.nix @@ -1,20 +1,20 @@ { beta = import ./browser.nix { channel = "beta"; - version = "125.0.2535.51"; + version = "126.0.2592.24"; revision = "1"; - hash = "sha256-ZOuC4+1Vp+i/vA783h+ilz97YwPwLMwk5eoc2hR5Y9E="; + hash = "sha256-OK38ss0M+GNP/wKLVheyKBgji3Df/qyrxaKvJayNZMM="; }; dev = import ./browser.nix { channel = "dev"; - version = "126.0.2578.1"; + version = "126.0.2592.11"; revision = "1"; - hash = "sha256-L1w8d0IdqCps7BuyL3AWMzPPkZtwLuiA+Z/dWSlEJU8="; + hash = "sha256-hUeVnGN5lxZmNsYojt7Fl0n7XF76Arw8Z3C16+fHRVA="; }; stable = import ./browser.nix { channel = "stable"; - version = "125.0.2535.51"; + version = "125.0.2535.67"; revision = "1"; - hash = "sha256-bpI3ePjjJLAoF/+ygXWYV1RY/FxOjs6/V8N0XWcal70="; + hash = "sha256-82bkiyKWJqVLB4jBaGu4EdJ0ukl44yKopDecAkrzuU0="; }; } diff --git a/pkgs/applications/networking/cluster/bosh-cli/default.nix b/pkgs/applications/networking/cluster/bosh-cli/default.nix index 9cfee1a86e56d..8da15d85765ae 100644 --- a/pkgs/applications/networking/cluster/bosh-cli/default.nix +++ b/pkgs/applications/networking/cluster/bosh-cli/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "bosh-cli"; - version = "7.5.7"; + version = "7.6.0"; src = fetchFromGitHub { owner = "cloudfoundry"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Ym4qSjLKT3b494IaxMAgrYHMWklHu7Vlc81nFRxAiOc="; + sha256 = "sha256-buhRRgwCOVTnlVLzAL4T9ymgMTIcvelHyv6mfPK61eM="; }; vendorHash = null; diff --git a/pkgs/applications/networking/cluster/k3s/1_27/versions.nix b/pkgs/applications/networking/cluster/k3s/1_27/versions.nix index 508ef6c4139db..c7d03c0087b31 100644 --- a/pkgs/applications/networking/cluster/k3s/1_27/versions.nix +++ b/pkgs/applications/networking/cluster/k3s/1_27/versions.nix @@ -1,8 +1,8 @@ { - k3sVersion = "1.27.13+k3s1"; - k3sCommit = "b23f142da8589854cc7ee45da08d96b5ad1ee1ff"; - k3sRepoSha256 = "052998644il0qra7cdpvmy007gw16k2rvyg418m1j02pm9a3zn10"; - k3sVendorHash = "sha256-rQZZnleRekkU1+I38LmFnnatZPuS+K1jbBwA+Dmc0jo="; + k3sVersion = "1.27.14+k3s1"; + k3sCommit = "b0b34e4d927369147a37f95ee8ba6441e4b4102b"; + k3sRepoSha256 = "0vvglvh8hl83jrpn9i2fgbck6cp7fbbwn292w76nmckmpclm47ap"; + k3sVendorHash = "sha256-eDzBpvaK1rHp28A5zvSsxnk0CNhy4oBSifBT98M7JWc="; chartVersions = import ./chart-versions.nix; k3sRootVersion = "0.12.2"; k3sRootSha256 = "1gjynvr350qni5mskgm7pcc7alss4gms4jmkiv453vs8mmma9c9k"; diff --git a/pkgs/applications/networking/cluster/k3s/1_29/versions.nix b/pkgs/applications/networking/cluster/k3s/1_29/versions.nix index 31dd51fa9ca6b..e06f394df94a0 100644 --- a/pkgs/applications/networking/cluster/k3s/1_29/versions.nix +++ b/pkgs/applications/networking/cluster/k3s/1_29/versions.nix @@ -1,8 +1,8 @@ { - k3sVersion = "1.29.4+k3s1"; - k3sCommit = "94e29e2ef5d79904f730e2024c8d1682b901b2d5"; - k3sRepoSha256 = "0kkhd2fnlmjanzvwgdclmbg6azw3r1a2lj5207716pavxmb9ld7y"; - k3sVendorHash = "sha256-wOX+ktGPFYUKLZBK/bQhWWG+SnRCkNYnk3Tz8wpMo5A="; + k3sVersion = "1.29.5+k3s1"; + k3sCommit = "4e53a32306759581f4ed938bcd18b6fa20b83230"; + k3sRepoSha256 = "169hzl23chs4qblicmqj3j10jg1xdq8s9717bd3pzx7wzz9s9mqw"; + k3sVendorHash = "sha256-QreiB4JMtfBjHlkAyflQAW2rnfgay62UD6emx8TgUpM="; chartVersions = import ./chart-versions.nix; k3sRootVersion = "0.13.0"; k3sRootSha256 = "1jq5f0lm08abx5ikarf92z56fvx4kjpy2nmzaazblb34lajw87vj"; diff --git a/pkgs/applications/networking/cluster/k3s/1_30/versions.nix b/pkgs/applications/networking/cluster/k3s/1_30/versions.nix index bc7c2d99c62c6..23a3021875752 100644 --- a/pkgs/applications/networking/cluster/k3s/1_30/versions.nix +++ b/pkgs/applications/networking/cluster/k3s/1_30/versions.nix @@ -1,8 +1,8 @@ { - k3sVersion = "1.30.0+k3s1"; - k3sCommit = "14549535f13c63fc239ba055d36d590e68b01503"; - k3sRepoSha256 = "1dph6clzzanlx7dbdzpamnw7gpw98j850my28lcb3zdzhvhsc74b"; - k3sVendorHash = "sha256-YBWiIf8F71ibR7sCiYtmsAcY1MsvkhTD/K45tOHQC5w="; + k3sVersion = "1.30.1+k3s1"; + k3sCommit = "80978b5b9a97908c5520c5ee51984e544e168859"; + k3sRepoSha256 = "085dmq49iwvlxpj9c528nfrvd67snkgpm5drj8ahfjv1nkjp0yy1"; + k3sVendorHash = "sha256-XtTahFaWnuHzKDI/U4d/j4C4gRxH163MCGEEM4hu/WM="; chartVersions = import ./chart-versions.nix; k3sRootVersion = "0.13.0"; k3sRootSha256 = "1jq5f0lm08abx5ikarf92z56fvx4kjpy2nmzaazblb34lajw87vj"; diff --git a/pkgs/applications/networking/cluster/kubecm/default.nix b/pkgs/applications/networking/cluster/kubecm/default.nix index 5be7992474d96..ffbb8a4cc83c1 100644 --- a/pkgs/applications/networking/cluster/kubecm/default.nix +++ b/pkgs/applications/networking/cluster/kubecm/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubecm"; - version = "0.29.0"; + version = "0.29.1"; src = fetchFromGitHub { owner = "sunny0826"; repo = "kubecm"; rev = "v${version}"; - hash = "sha256-zspAtLomgdIymP3xj3VG2rAhMJAquJCNWRdAM5wPcLg="; + hash = "sha256-Lz7mCbEEiCmNPmJ8RkxJLEOOdyvLZl3pT3qL2/kHYuA="; }; - vendorHash = "sha256-eWKGmVkvMP/vN03pWiShPzZN0vSkhneSK48S4AVBdkM="; + vendorHash = "sha256-JJ2B9sUrfo4fiRsxA8mBjvKP0mduIZMaGN8gFC1cTA4="; ldflags = [ "-s" "-w" "-X github.com/sunny0826/kubecm/version.Version=${version}"]; doCheck = false; diff --git a/pkgs/applications/networking/cluster/kyverno/default.nix b/pkgs/applications/networking/cluster/kyverno/default.nix index 92c36cce4ec20..86c1d41d05dca 100644 --- a/pkgs/applications/networking/cluster/kyverno/default.nix +++ b/pkgs/applications/networking/cluster/kyverno/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kyverno"; - version = "1.12.2"; + version = "1.12.3"; src = fetchFromGitHub { owner = "kyverno"; repo = "kyverno"; rev = "v${version}"; - hash = "sha256-gR/gpoldtwW0bVjWr5xwbfcKb6VJ43otWnSFrcYerII="; + hash = "sha256-vJ9HXpvkuZWOZtsoJhcpM0KGGiyd+D5HTQBHwb8l/II="; }; ldflags = [ diff --git a/pkgs/applications/networking/cluster/nixops/plugins/nixops-gce.nix b/pkgs/applications/networking/cluster/nixops/plugins/nixops-gce.nix index 84b785a7d5666..8f179e6755b46 100644 --- a/pkgs/applications/networking/cluster/nixops/plugins/nixops-gce.nix +++ b/pkgs/applications/networking/cluster/nixops/plugins/nixops-gce.nix @@ -50,5 +50,6 @@ buildPythonPackage { homepage = "https://github.com/nix-community/nixops-gce"; license = licenses.mit; maintainers = nixops.meta.maintainers; + broken = true; # never built on Hydra }; } diff --git a/pkgs/applications/networking/cluster/nixops/plugins/nixops-hetzner.nix b/pkgs/applications/networking/cluster/nixops/plugins/nixops-hetzner.nix index 6d883f5ba45fd..092a932a47cca 100644 --- a/pkgs/applications/networking/cluster/nixops/plugins/nixops-hetzner.nix +++ b/pkgs/applications/networking/cluster/nixops/plugins/nixops-hetzner.nix @@ -52,5 +52,6 @@ buildPythonPackage { homepage = "https://github.com/NixOS/nixops-hetzner"; license = licenses.mit; maintainers = nixops.meta.maintainers; + broken = true; # never built on Hydra }; } diff --git a/pkgs/applications/networking/cluster/nixops/plugins/nixops-hetznercloud.nix b/pkgs/applications/networking/cluster/nixops/plugins/nixops-hetznercloud.nix index ab9f54bcd8a32..0e9a5325141af 100644 --- a/pkgs/applications/networking/cluster/nixops/plugins/nixops-hetznercloud.nix +++ b/pkgs/applications/networking/cluster/nixops/plugins/nixops-hetznercloud.nix @@ -48,5 +48,6 @@ buildPythonPackage { homepage = "https://github.com/lukebfox/nixops-hetznercloud"; license = licenses.lgpl3Only; maintainers = with maintainers; [ lukebfox ]; + broken = true; # never built on Hydra }; } diff --git a/pkgs/applications/networking/cluster/nixops/plugins/nixops-libvirtd.nix b/pkgs/applications/networking/cluster/nixops/plugins/nixops-libvirtd.nix index 4fec552e528c2..a315a7e2ae9b8 100644 --- a/pkgs/applications/networking/cluster/nixops/plugins/nixops-libvirtd.nix +++ b/pkgs/applications/networking/cluster/nixops/plugins/nixops-libvirtd.nix @@ -48,5 +48,6 @@ buildPythonPackage { homepage = "https://github.com/nix-community/nixops-libvirtd"; license = licenses.lgpl3Only; maintainers = with maintainers; [ aminechikhaoui ]; + broken = true; # never built on Hydra }; } diff --git a/pkgs/applications/networking/cluster/nomad/default.nix b/pkgs/applications/networking/cluster/nomad/default.nix index dca404c73db28..d90124cbc4ddf 100644 --- a/pkgs/applications/networking/cluster/nomad/default.nix +++ b/pkgs/applications/networking/cluster/nomad/default.nix @@ -82,6 +82,18 @@ rec { nomad_1_7 = generic { buildGoModule = buildGo121Module; + version = "1.7.7"; + sha256 = "sha256-4nuRheidR6rIoytrnDQdIP69f+sBLJ3Ias5DvqVaLFc="; + vendorHash = "sha256-ZuaD8iDsT+/eW0QUavf485R804Jtjl76NcQWYHA8QII="; + license = lib.licenses.bsl11; + passthru.tests.nomad = nixosTests.nomad; + preCheck = '' + export PATH="$PATH:$NIX_BUILD_TOP/go/bin" + ''; + }; + + nomad_1_8 = generic { + buildGoModule = buildGo121Module; version = "1.8.0"; sha256 = "sha256-j/9wvnxYhv6h344904cO2Fi6pNeSV5IfcqS4mSjDqpo="; vendorHash = "sha256-jNdLLs/mfARl5Uk9RalwSDFLAKqIISEkek3l1wV8EYE="; diff --git a/pkgs/applications/networking/cluster/ssm-session-manager-plugin/default.nix b/pkgs/applications/networking/cluster/ssm-session-manager-plugin/default.nix index 866775702521e..ecc353a178ef1 100644 --- a/pkgs/applications/networking/cluster/ssm-session-manager-plugin/default.nix +++ b/pkgs/applications/networking/cluster/ssm-session-manager-plugin/default.nix @@ -5,7 +5,7 @@ buildGoPackage rec { pname = "ssm-session-manager-plugin"; - version = "1.2.553.0"; + version = "1.2.633.0"; goPackagePath = "github.com/aws/session-manager-plugin"; @@ -13,7 +13,7 @@ buildGoPackage rec { owner = "aws"; repo = "session-manager-plugin"; rev = version; - hash = "sha256-jyCHhD3KyHob7z200tEkAUR9ALJVsGsRQ7Wx4B6jBnQ="; + hash = "sha256-dwNCTJOxpothAcJSfch2jkxdgXg6xDd/fDQCQo2Xd+8="; }; postPatch = '' diff --git a/pkgs/applications/networking/feedreaders/newsflash/Cargo.lock b/pkgs/applications/networking/feedreaders/newsflash/Cargo.lock index 691d71e0decf3..68d085655d13e 100644 --- a/pkgs/applications/networking/feedreaders/newsflash/Cargo.lock +++ b/pkgs/applications/networking/feedreaders/newsflash/Cargo.lock @@ -89,9 +89,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.81" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" [[package]] name = "arbitrary" @@ -113,7 +113,7 @@ checksum = "0ae92a5119aa49cdbcf6b9f893fe4e1d98b04ccbf82ee0584ad948a44a734dea" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.66", ] [[package]] @@ -128,7 +128,7 @@ version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f2f3fa375ebee9245309680ef4b2178782a9ac5e7b1f7bf869cff93f8f3c55c6" dependencies = [ - "base64 0.22.0", + "base64 0.22.1", "chrono", "encoding_rs", "escaper", @@ -169,30 +169,29 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "258b52a1aa741b9f09783b2d86cf0aeeb617bbf847f6933340a39644227acbdb" dependencies = [ - "event-listener 5.2.0", - "event-listener-strategy 0.5.0", + "event-listener 5.3.0", + "event-listener-strategy 0.5.2", "futures-core", "pin-project-lite", ] [[package]] name = "async-channel" -version = "2.2.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f28243a43d821d11341ab73c80bed182dc015c514b951616cf79bd4af39af0c3" +checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a" dependencies = [ "concurrent-queue", - "event-listener 5.2.0", - "event-listener-strategy 0.5.0", + "event-listener-strategy 0.5.2", "futures-core", "pin-project-lite", ] [[package]] name = "async-compression" -version = "0.4.6" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a116f46a969224200a0a97f29cfd4c50e7534e4b4826bd23ea2c3c533039c82c" +checksum = "9c90a406b4495d129f00461241616194cb8a032c8d1c53c657f0961d5f8e0498" dependencies = [ "brotli", "flate2", @@ -204,11 +203,10 @@ dependencies = [ [[package]] name = "async-executor" -version = "1.8.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ae5ebefcc48e7452b4987947920dac9450be1110cadf34d1b8c116bdbaf97c" +checksum = "c8828ec6e544c02b0d6691d21ed9f9218d0384a82542855073c2a3f58304aaf0" dependencies = [ - "async-lock 3.3.0", "async-task", "concurrent-queue", "fastrand", @@ -218,11 +216,11 @@ dependencies = [ [[package]] name = "async-fs" -version = "2.1.1" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc19683171f287921f2405677dd2ed2549c3b3bda697a563ebc3a121ace2aba1" +checksum = "ebcd09b382f40fcd159c2d695175b2ae620ffa5f3bd6f664131efff4e8b9e04a" dependencies = [ - "async-lock 3.3.0", + "async-lock", "blocking", "futures-lite", ] @@ -233,7 +231,7 @@ version = "2.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dcccb0f599cfa2f8ace422d3555572f47424da5648a4382a9dd0310ff8210884" dependencies = [ - "async-lock 3.3.0", + "async-lock", "cfg-if", "concurrent-queue", "futures-io", @@ -248,15 +246,6 @@ dependencies = [ [[package]] name = "async-lock" -version = "2.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" -dependencies = [ - "event-listener 2.5.3", -] - -[[package]] -name = "async-lock" version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d034b430882f8381900d3fe6f0aaa3ad94f2cb4ac519b429692a1bc2dda4ae7b" @@ -279,41 +268,43 @@ dependencies = [ [[package]] name = "async-process" -version = "2.1.0" +version = "2.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "451e3cf68011bd56771c79db04a9e333095ab6349f7e47592b788e9b98720cc8" +checksum = "a53fc6301894e04a92cb2584fedde80cb25ba8e02d9dc39d4a87d036e22f397d" dependencies = [ "async-channel", "async-io", - "async-lock 3.3.0", + "async-lock", "async-signal", + "async-task", "blocking", "cfg-if", - "event-listener 5.2.0", + "event-listener 5.3.0", "futures-lite", "rustix", + "tracing", "windows-sys 0.52.0", ] [[package]] name = "async-recursion" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30c5ef0ede93efbf733c1a727f3b6b5a1060bbedd5600183e66f6e4be4af0ec5" +checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.66", ] [[package]] name = "async-signal" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e47d90f65a225c4527103a8d747001fc56e375203592b25ad103e1ca13124c5" +checksum = "afe66191c335039c7bb78f99dc7520b0cbb166b3a1cb33a03f53d8a1c6f2afda" dependencies = [ "async-io", - "async-lock 2.8.0", + "async-lock", "atomic-waker", "cfg-if", "futures-core", @@ -321,24 +312,24 @@ dependencies = [ "rustix", "signal-hook-registry", "slab", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "async-task" -version = "4.7.0" +version = "4.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbb36e985947064623dbd357f727af08ffd077f93d696782f3c56365fa2e2799" +checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" [[package]] name = "async-trait" -version = "0.1.79" +version = "0.1.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507401cad91ec6a857ed5513a2073c82a9b9048762b885bb98655b306964681" +checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.66", ] [[package]] @@ -349,9 +340,9 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" [[package]] name = "autocfg" -version = "1.1.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "av1-grain" @@ -399,9 +390,9 @@ checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" [[package]] name = "base64" -version = "0.22.0" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] name = "bigdecimal" @@ -436,9 +427,9 @@ checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" [[package]] name = "bitstream-io" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06c9989a51171e2e81038ab168b6ae22886fe9ded214430dbb4f41c28cf176da" +checksum = "7c12d1856e42f0d817a835fe55853957c85c8c8a470114029143d3f12671446e" [[package]] name = "block" @@ -483,25 +474,22 @@ checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae" [[package]] name = "blocking" -version = "1.5.1" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118" +checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea" dependencies = [ "async-channel", - "async-lock 3.3.0", "async-task", - "fastrand", "futures-io", "futures-lite", "piper", - "tracing", ] [[package]] name = "brotli" -version = "3.5.0" +version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d640d25bc63c50fb1f0b545ffd80207d2e10a4c965530809b40ba3386825c391" +checksum = "74f7971dbd9326d58187408ab83117d8ac1bb9c17b085fdacd1cf2f598719b6b" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -510,9 +498,9 @@ dependencies = [ [[package]] name = "brotli-decompressor" -version = "2.5.1" +version = "4.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e2e4afe60d7dd600fdd3de8d0f08c2b7ec039712e3b6137ff98b7004e82de4f" +checksum = "9a45bd2e4095a8b518033b128020dd4a55aab1c0a381ba4404a472630f4bc362" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -520,27 +508,21 @@ dependencies = [ [[package]] name = "built" -version = "0.7.1" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38d17f4d6e4dc36d1a02fbedc2753a096848e7c1b0772f7654eab8e2c927dd53" +checksum = "c6a6c0b39c38fd754ac338b00a88066436389c0f029da5d37d1e01091d9b7c17" [[package]] name = "bumpalo" -version = "3.15.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa" - -[[package]] -name = "bytecount" -version = "0.6.7" +version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1e5f035d16fc623ae5f74981db80a439803888314e3a555fd6f04acd51a3205" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "bytemuck" -version = "1.15.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15" +checksum = "78834c15cb5d5efe3452d58b1e8ba890dd62d21907f867f383358198e56ebca5" [[package]] name = "byteorder" @@ -549,6 +531,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] +name = "byteorder-lite" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495" + +[[package]] name = "bytes" version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -562,9 +550,9 @@ checksum = "a3e368af43e418a04d52505cf3dbc23dda4e3407ae2fa99fd0e4f308ce546acc" [[package]] name = "cairo-rs" -version = "0.19.2" +version = "0.19.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2650f66005301bd33cc486dec076e1293c4cecf768bc7ba9bf5d2b1be339b99c" +checksum = "b2ac2a4d0e69036cf0062976f6efcba1aaee3e448594e6514bb2ddf87acce562" dependencies = [ "bitflags 2.5.0", "cairo-sys-rs", @@ -585,51 +573,21 @@ dependencies = [ ] [[package]] -name = "camino" -version = "1.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c59e92b5a388f549b863a7bea62612c09f24c8393560709a54558a9abdfb3b9c" -dependencies = [ - "serde", -] - -[[package]] -name = "cargo-platform" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24b1f0365a6c6bb4020cd05806fd0d33c44d38046b8bd7f0e40814b9763cabfc" -dependencies = [ - "serde", -] - -[[package]] -name = "cargo_metadata" -version = "0.14.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4acbb09d9ee8e23699b9634375c72795d095bf268439da88562cf9b501f181fa" -dependencies = [ - "camino", - "cargo-platform", - "semver", - "serde", - "serde_json", -] - -[[package]] name = "cc" -version = "1.0.90" +version = "1.0.98" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5" +checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f" dependencies = [ "jobserver", "libc", + "once_cell", ] [[package]] name = "cfg-expr" -version = "0.15.7" +version = "0.15.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa50868b64a9a6fda9d593ce778849ea8715cd2a3d2cc17ffdb4a2f2f2f1961d" +checksum = "d067ad48b8650848b989a59a86c6c36a995d02d2bf778d45c3c5d57bc2718f02" dependencies = [ "smallvec", "target-lexicon", @@ -649,16 +607,16 @@ checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" [[package]] name = "chrono" -version = "0.4.35" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eaf5903dcbc0a39312feb77df2ff4c76387d591b9fc7b04a238dcf8bb62639a" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" dependencies = [ "android-tzdata", "iana-time-zone", "js-sys", "num-traits", "wasm-bindgen", - "windows-targets 0.52.4", + "windows-targets 0.52.5", ] [[package]] @@ -671,6 +629,60 @@ dependencies = [ ] [[package]] +name = "clapper" +version = "0.1.0" +source = "git+https://gitlab.gnome.org/JanGernert/clapper-rs.git#286198bdffd84b1e5eb539078b440ac25c7e31ba" +dependencies = [ + "bitflags 2.5.0", + "clapper-sys", + "gio", + "glib", + "gstreamer", + "libc", +] + +[[package]] +name = "clapper-gtk" +version = "0.1.0" +source = "git+https://gitlab.gnome.org/JanGernert/clapper-rs.git#286198bdffd84b1e5eb539078b440ac25c7e31ba" +dependencies = [ + "bitflags 2.5.0", + "clapper", + "clapper-gtk-sys", + "gdk4", + "gio", + "glib", + "gtk4", + "libc", +] + +[[package]] +name = "clapper-gtk-sys" +version = "0.0.1" +source = "git+https://gitlab.gnome.org/JanGernert/clapper-rs.git#286198bdffd84b1e5eb539078b440ac25c7e31ba" +dependencies = [ + "clapper-sys", + "gio-sys", + "glib-sys", + "gtk4-sys", + "libc", + "system-deps", +] + +[[package]] +name = "clapper-sys" +version = "0.0.1" +source = "git+https://gitlab.gnome.org/JanGernert/clapper-rs.git#286198bdffd84b1e5eb539078b440ac25c7e31ba" +dependencies = [ + "gio-sys", + "glib-sys", + "gobject-sys", + "gstreamer-sys", + "libc", + "system-deps", +] + +[[package]] name = "color-backtrace" version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -688,11 +700,11 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" [[package]] name = "commafeed_api" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "072ba524ee8f89cf270c0f0fecd79062c094cd1c7f9c657c32810f9448d2b002" +checksum = "b3cffc99ebe1b725a030c70780de1b4658220e13802281f64fdffbc56d4a16c2" dependencies = [ - "base64 0.22.0", + "base64 0.22.1", "chrono", "log", "reqwest", @@ -704,9 +716,9 @@ dependencies = [ [[package]] name = "concurrent-queue" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363" +checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" dependencies = [ "crossbeam-utils", ] @@ -766,27 +778,27 @@ dependencies = [ [[package]] name = "crc-any" -version = "2.4.4" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c01a5e1f881f6fb6099a7bdf949e946719fd4f1fefa56264890574febf0eb6d0" +checksum = "a62ec9ff5f7965e4d7280bd5482acd20aadb50d632cf6c1d74493856b011fa73" dependencies = [ "debug-helper", ] [[package]] name = "crc32fast" -version = "1.4.0" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" dependencies = [ "cfg-if", ] [[package]] name = "crossbeam-channel" -version = "0.5.12" +version = "0.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95" +checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" dependencies = [ "crossbeam-utils", ] @@ -812,9 +824,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.19" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" [[package]] name = "crunchy" @@ -834,9 +846,9 @@ dependencies = [ [[package]] name = "data-encoding" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" +checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2" [[package]] name = "debug-helper" @@ -883,9 +895,9 @@ checksum = "3c877555693c14d2f84191cfd3ad8582790fc52b5e2274b40b59cf5f5cea25c7" [[package]] name = "diesel" -version = "2.1.5" +version = "2.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03fc05c17098f21b89bc7d98fe1dd3cce2c11c2ad8e145f2a44fe08ed28eb559" +checksum = "ff236accb9a5069572099f0b350a92e9560e8e63a9b8d546162f4a5e03026bb2" dependencies = [ "bigdecimal", "chrono", @@ -904,14 +916,14 @@ dependencies = [ [[package]] name = "diesel_derives" -version = "2.1.3" +version = "2.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d02eecb814ae714ffe61ddc2db2dd03e6c49a42e269b5001355500d431cce0c" +checksum = "14701062d6bed917b5c7103bdffaee1e4609279e240488ad24e7bd979ca6866c" dependencies = [ "diesel_table_macro_syntax", "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.66", ] [[package]] @@ -931,7 +943,7 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc5557efc453706fed5e4fa85006fe9817c224c3f480a34c7e5959fd700921c5" dependencies = [ - "syn 2.0.55", + "syn 2.0.66", ] [[package]] @@ -997,15 +1009,15 @@ dependencies = [ [[package]] name = "either" -version = "1.10.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" +checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b" [[package]] name = "encoding_rs" -version = "0.8.33" +version = "0.8.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" +checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" dependencies = [ "cfg-if", ] @@ -1031,7 +1043,7 @@ dependencies = [ "heck 0.4.1", "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.66", ] [[package]] @@ -1052,7 +1064,7 @@ checksum = "5c785274071b1b420972453b306eeca06acf4633829db4223b58a2a8c5953bc4" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.66", ] [[package]] @@ -1063,24 +1075,15 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" dependencies = [ "libc", "windows-sys 0.52.0", ] [[package]] -name = "error-chain" -version = "0.12.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d2f06b9cac1506ece98fe3231e3cc9c4410ec3d5b1f24ae1c8946f0742cdefc" -dependencies = [ - "version_check", -] - -[[package]] name = "escaper" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1091,12 +1094,6 @@ dependencies = [ [[package]] name = "event-listener" -version = "2.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" - -[[package]] -name = "event-listener" version = "4.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "67b215c49b2b248c855fb73579eb1f4f26c38ffdc12973e20e07b91d78d5646e" @@ -1108,9 +1105,9 @@ dependencies = [ [[package]] name = "event-listener" -version = "5.2.0" +version = "5.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b5fb89194fa3cad959b833185b3063ba881dbfc7030680b314250779fb4cc91" +checksum = "6d9944b8ca13534cdfb2800775f8dd4902ff3fc75a50101466decadfdf322a24" dependencies = [ "concurrent-queue", "parking", @@ -1129,11 +1126,11 @@ dependencies = [ [[package]] name = "event-listener-strategy" -version = "0.5.0" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "feedafcaa9b749175d5ac357452a9d41ea2911da598fde46ce1fe02c37751291" +checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" dependencies = [ - "event-listener 5.2.0", + "event-listener 5.3.0", "pin-project-lite", ] @@ -1165,9 +1162,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.0.2" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "658bd65b1cf4c852a3cc96f18a8ce7b5640f6b703f905c7d74532294c2a63984" +checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" [[package]] name = "fdeflate" @@ -1180,13 +1177,12 @@ dependencies = [ [[package]] name = "feed-rs" -version = "1.4.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ebf574f2f8a63948eae0d786c1fe339d71b6c98e735d58c81c85d93c8a66edf" +checksum = "be5366c3d4ae865540354ecafa0e5b41dd56c2f31d0b2ef876669edf964daaec" dependencies = [ "chrono", - "lazy_static", - "mime", + "mediatype", "quick-xml", "regex", "serde", @@ -1256,9 +1252,9 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.28" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" dependencies = [ "crc32fast", "miniz_oxide", @@ -1383,7 +1379,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.66", ] [[package]] @@ -1430,9 +1426,9 @@ dependencies = [ [[package]] name = "gdk-pixbuf-sys" -version = "0.19.0" +version = "0.19.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dcbd04c1b2c4834cc008b4828bc917d062483b88d26effde6342e5622028f96" +checksum = "1fdbf021f8b9d19e30fb9ea6d6e5f2b6a712fe4645417c69f86f6ff1e1444a8f" dependencies = [ "gio-sys", "glib-sys", @@ -1443,9 +1439,9 @@ dependencies = [ [[package]] name = "gdk4" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9100b25604183f2fd97f55ef087fae96ab4934d7215118a35303e422688e6e4b" +checksum = "db265c9dd42d6a371e09e52deab3a84808427198b86ac792d75fd35c07990a07" dependencies = [ "cairo-rs", "gdk-pixbuf", @@ -1458,9 +1454,9 @@ dependencies = [ [[package]] name = "gdk4-sys" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0b76874c40bb8d1c7d03a7231e23ac75fa577a456cd53af32ec17ec8f121626" +checksum = "c9418fb4e8a67074919fe7604429c45aa74eb9df82e7ca529767c6d4e9dc66dd" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", @@ -1485,9 +1481,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.12" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", "libc", @@ -1532,9 +1528,9 @@ checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" [[package]] name = "gio" -version = "0.19.3" +version = "0.19.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c64947d08d7fbb03bf8ad1f25a8ac6cf4329bc772c9b7e5abe7bf9493c81194f" +checksum = "be548be810e45dd31d3bbb89c6210980bb7af9bca3ea1292b5f16b75f8e394a7" dependencies = [ "futures-channel", "futures-core", @@ -1550,9 +1546,9 @@ dependencies = [ [[package]] name = "gio-sys" -version = "0.19.0" +version = "0.19.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcf8e1d9219bb294636753d307b030c1e8a032062cba74f493c431a5c8b81ce4" +checksum = "d4bdbef451b0f0361e7f762987cc6bebd5facab1d535e85a3cf1115dfb08db40" dependencies = [ "glib-sys", "gobject-sys", @@ -1563,9 +1559,9 @@ dependencies = [ [[package]] name = "glib" -version = "0.19.3" +version = "0.19.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01e191cc1af1f35b9699213107068cd3fe05d9816275ac118dc785a0dd8faebf" +checksum = "e52355166df21c7ed16b6a01f615669c7911ed74e27ef60eba339c0d2da12490" dependencies = [ "bitflags 2.5.0", "futures-channel", @@ -1585,38 +1581,32 @@ dependencies = [ [[package]] name = "glib-macros" -version = "0.19.3" +version = "0.19.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9972bb91643d589c889654693a4f1d07697fdcb5d104b5c44fb68649ba1bf68d" +checksum = "70025dbfa1275cf7d0531c3317ba6270dae15d87e63342229d638246ff45202e" dependencies = [ "heck 0.5.0", "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.66", ] [[package]] name = "glib-sys" -version = "0.19.0" +version = "0.19.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630f097773d7c7a0bb3258df4e8157b47dc98bbfa0e60ad9ab56174813feced4" +checksum = "767d23ead9bbdfcbb1c2242c155c8128a7d13dde7bf69c176f809546135e2282" dependencies = [ "libc", "system-deps", ] [[package]] -name = "glob" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" - -[[package]] name = "gobject-sys" -version = "0.19.0" +version = "0.19.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c85e2b1080b9418dd0c58b498da3a5c826030343e0ef07bde6a955d28de54979" +checksum = "c3787b0bfacca12bb25f8f822b0dbee9f7e4a86e6469a29976d332d2c14c945b" dependencies = [ "glib-sys", "libc", @@ -1636,9 +1626,9 @@ dependencies = [ [[package]] name = "graphene-sys" -version = "0.19.0" +version = "0.19.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "236ed66cc9b18d8adf233716f75de803d0bf6fc806f60d14d948974a12e240d0" +checksum = "2a60e7381afdd7be43bd10a89d3b6741d162aabbca3a8db73505afb6a3aea59d" dependencies = [ "glib-sys", "libc", @@ -1664,9 +1654,9 @@ dependencies = [ [[package]] name = "gsk4" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c65036fc8f99579e8cb37b12487969b707ab23ec8ab953682ff347cbd15d396e" +checksum = "7563884bf6939f4468e5d94654945bdd9afcaf8c3ba4c5dd17b5342b747221be" dependencies = [ "cairo-rs", "gdk4", @@ -1679,9 +1669,9 @@ dependencies = [ [[package]] name = "gsk4-sys" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd24c814379f9c3199dc53e52253ee8d0f657eae389ab282c330505289d24738" +checksum = "23024bf2636c38bbd1f822f58acc9d1c25b28da896ff0f291a1a232d4272b3dc" dependencies = [ "cairo-sys-rs", "gdk4-sys", @@ -1694,10 +1684,47 @@ dependencies = [ ] [[package]] +name = "gstreamer" +version = "0.22.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56b59fdce2dfacda226d4b1b71ce4700b2f04228909b52252c197d8e30bd54a6" +dependencies = [ + "cfg-if", + "futures-channel", + "futures-core", + "futures-util", + "glib", + "gstreamer-sys", + "itertools 0.13.0", + "libc", + "muldiv", + "num-integer", + "num-rational", + "once_cell", + "option-operations", + "paste", + "pin-project-lite", + "smallvec", + "thiserror", +] + +[[package]] +name = "gstreamer-sys" +version = "0.22.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4975a75279a9cf658bac1798dcf57100c6ec89fca7886572c8250ea4d94b76bd" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "system-deps", +] + +[[package]] name = "gtk4" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa82753b8c26277e4af1446c70e35b19aad4fb794a7b143859e7eeb9a4025d83" +checksum = "b04e11319b08af11358ab543105a9e49b0c491faca35e2b8e7e36bfba8b671ab" dependencies = [ "cairo-rs", "field-offset", @@ -1716,23 +1743,21 @@ dependencies = [ [[package]] name = "gtk4-macros" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40300bf071d2fcd4c94eacc09e84ec6fe73129d2ceb635cf7e55b026b5443567" +checksum = "ec655a7ef88d8ce9592899deb8b2d0fa50bab1e6dd69182deb764e643c522408" dependencies = [ - "anyhow", "proc-macro-crate", - "proc-macro-error", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.66", ] [[package]] name = "gtk4-sys" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0db1b104138f087ccdc81d2c332de5dd049b89de3d384437cc1093b17cd2da18" +checksum = "8c8aa86b7f85ea71d66ea88c1d4bae1cfacf51ca4856274565133838d77e57b5" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", @@ -1749,15 +1774,15 @@ dependencies = [ [[package]] name = "h2" -version = "0.4.3" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51ee2dd2e4f378392eeff5d51618cd9a63166a2513846bbc55f21cfacd9199d4" +checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab" dependencies = [ + "atomic-waker", "bytes", "fnv", "futures-core", "futures-sink", - "futures-util", "http", "indexmap", "slab", @@ -1768,9 +1793,9 @@ dependencies = [ [[package]] name = "half" -version = "2.4.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5eceaaeec696539ddaf7b333340f1af35a5aa87ae3e4f3ead0532f72affab2e" +checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888" dependencies = [ "cfg-if", "crunchy", @@ -1803,9 +1828,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.14.3" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" [[package]] name = "heck" @@ -1833,9 +1858,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "hickory-proto" -version = "0.24.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "091a6fbccf4860009355e3efc52ff4acf37a63489aad7435372d44ceeb6fbbcf" +checksum = "07698b8420e2f0d6447a436ba999ec85d8fbf2a398bbd737b82cac4a2e96e512" dependencies = [ "async-trait", "cfg-if", @@ -1857,9 +1882,9 @@ dependencies = [ [[package]] name = "hickory-resolver" -version = "0.24.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35b8f021164e6a984c9030023544c57789c51760065cd510572fedcfb04164e8" +checksum = "28757f23aa75c98f254cf0405e6d8c25b831b32921b050a66692427679b1f243" dependencies = [ "cfg-if", "futures-util", @@ -1965,9 +1990,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "1.2.0" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "186548d73ac615b32a73aafe38fb4f56c0d340e110e5a200bcadbaf2e199263a" +checksum = "fe575dd17d0862a9a33781c8c4696a55c320909004a67a00fb286ba8b1bc496d" dependencies = [ "bytes", "futures-channel", @@ -2001,9 +2026,9 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca38ef113da30126bbff9cd1705f9273e15d45498615d138b0c20279ac7a76aa" +checksum = "3d8d52be92d09acc2e01dddb7fde3ad983fc6489c7db4837e605bc3fca4cb63e" dependencies = [ "bytes", "futures-channel", @@ -2074,9 +2099,9 @@ dependencies = [ [[package]] name = "image" -version = "0.25.0" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9b4f005360d32e9325029b38ba47ebd7a56f3316df09249368939562d518645" +checksum = "fd54d660e773627692c524beaad361aca785a4f9f5730ce91f42aabe5bce3d11" dependencies = [ "bytemuck", "byteorder", @@ -2097,11 +2122,11 @@ dependencies = [ [[package]] name = "image-webp" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a84a25dcae3ac487bc24ef280f9e20c79c9b1a3e5e32cbed3041d1c514aa87c" +checksum = "d730b085583c4d789dfd07fdcf185be59501666a90c97c40162b37e4fdad272d" dependencies = [ - "byteorder", + "byteorder-lite", "thiserror", ] @@ -2135,7 +2160,7 @@ checksum = "c34819042dc3d3971c46c2190835914dfbe0c3c13f61449b2997f4e9722dfa60" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.66", ] [[package]] @@ -2147,7 +2172,7 @@ dependencies = [ "socket2", "widestring", "windows-sys 0.48.0", - "winreg", + "winreg 0.50.0", ] [[package]] @@ -2184,10 +2209,19 @@ dependencies = [ ] [[package]] +name = "itertools" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" +dependencies = [ + "either", +] + +[[package]] name = "itoa" -version = "1.0.10" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "javascriptcore6" @@ -2220,9 +2254,9 @@ checksum = "47f142fe24a9c9944451e8349de0a56af5f3e7226dc46f3ed4d4ecc0b85af75e" [[package]] name = "jobserver" -version = "0.1.28" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab46a6e9526ddef3ae7f787c06f0f2600639ba80ea3eade3d8e670a2230f51d6" +checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" dependencies = [ "libc", ] @@ -2288,9 +2322,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.153" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "libfuzzer-sys" @@ -2311,13 +2345,12 @@ checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" [[package]] name = "libredox" -version = "0.0.1" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" +checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ "bitflags 2.5.0", "libc", - "redox_syscall", ] [[package]] @@ -2358,9 +2391,9 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.4.13" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "locale_config" @@ -2377,9 +2410,9 @@ dependencies = [ [[package]] name = "lock_api" -version = "0.4.11" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" dependencies = [ "autocfg", "scopeguard", @@ -2544,16 +2577,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771" [[package]] +name = "mediatype" +version = "0.19.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8878cd8d1b3c8c8ae4b2ba0a36652b7cf192f618a599a7fbdfa25cffd4ea72dd" + +[[package]] name = "memchr" -version = "2.7.1" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" +checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" [[package]] name = "memoffset" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" dependencies = [ "autocfg", ] @@ -2601,7 +2640,7 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2e6e3b827f7d7e0b921d129e27e2621d317bb38005e0f2512092aa33435e5dc0" dependencies = [ - "base64 0.22.0", + "base64 0.22.1", "log", "reqwest", "serde", @@ -2619,9 +2658,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" +checksum = "87dfd01fe195c66b572b37921ad8803d010623c0aca821bea2302239d155cdae" dependencies = [ "adler", "simd-adler32", @@ -2640,21 +2679,21 @@ dependencies = [ [[package]] name = "moka" -version = "0.12.5" +version = "0.12.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1911e88d5831f748a4097a43862d129e3c6fca831eecac9b8db6d01d93c9de2" +checksum = "9e0d88686dc561d743b40de8269b26eaf0dc58781bde087b0984646602021d08" dependencies = [ - "async-lock 2.8.0", + "async-lock", "async-trait", "crossbeam-channel", "crossbeam-epoch", "crossbeam-utils", + "event-listener 5.3.0", "futures-util", "once_cell", "parking_lot", "quanta", "rustc_version", - "skeptic", "smallvec", "tagptr", "thiserror", @@ -2663,6 +2702,12 @@ dependencies = [ ] [[package]] +name = "muldiv" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "956787520e75e9bd233246045d19f42fb73242759cc57fba9611d940ae96d4b0" + +[[package]] name = "nanohtml2text" version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2670,11 +2715,10 @@ checksum = "999681fe3c0524336e98ece1c25ee4278607f25cc1e361ad0f9201c8bf56dc2c" [[package]] name = "native-tls" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" +checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466" dependencies = [ - "lazy_static", "libc", "log", "openssl", @@ -2695,11 +2739,11 @@ checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086" [[package]] name = "news-flash" version = "2.3.0-alpha.0" -source = "git+https://gitlab.com/news_flash/news_flash.git#689cf86ca5eaa4f0aad85d99e7fb0184a2794a96" +source = "git+https://gitlab.com/news_flash/news_flash.git#d5d9cfcbd4a0c3f2e2c609062b539603490bcca3" dependencies = [ "article_scraper", "async-trait", - "base64 0.22.0", + "base64 0.22.1", "bitflags 2.5.0", "bytes", "chrono", @@ -2715,7 +2759,7 @@ dependencies = [ "greader_api", "hex", "image", - "itertools 0.12.1", + "itertools 0.13.0", "libxml", "log", "magic-crypt", @@ -2747,9 +2791,11 @@ name = "news_flash_gtk" version = "0.0.0" dependencies = [ "ashpd", - "base64 0.22.0", + "base64 0.22.1", "bytesize", "chrono", + "clapper", + "clapper-gtk", "color-backtrace", "diffus", "dirs", @@ -2804,7 +2850,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97ddbef370f5a6964ba87d2c93d40bcf1f017981d18337a5e177a769bd8c38e1" dependencies = [ - "base64 0.22.0", + "base64 0.22.1", "log", "reqwest", "serde", @@ -2846,11 +2892,10 @@ checksum = "0676bb32a98c1a483ce53e500a81ad9c3d5b3f7c920c28c24e9cb0980d0b5bc8" [[package]] name = "num-bigint" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" +checksum = "c165a9ab64cf766f73521c0dd2cfdff64f488b8f0b3e621face3462d3db536d7" dependencies = [ - "autocfg", "num-integer", "num-traits", ] @@ -2869,7 +2914,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.66", ] [[package]] @@ -2883,11 +2928,10 @@ dependencies = [ [[package]] name = "num-rational" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" +checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824" dependencies = [ - "autocfg", "num-bigint", "num-integer", "num-traits", @@ -2895,9 +2939,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.18" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", ] @@ -2991,7 +3035,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.66", ] [[package]] @@ -3002,9 +3046,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.101" +version = "0.9.102" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dda2b0f344e78efc2facf7d195d098df0dd72151b26ab98da807afc26c198dff" +checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2" dependencies = [ "cc", "libc", @@ -3030,6 +3074,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" [[package]] +name = "option-operations" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c26d27bb1aeab65138e4bf7666045169d1717febcc9ff870166be8348b223d0" +dependencies = [ + "paste", +] + +[[package]] name = "ordered-float" version = "2.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3050,9 +3103,9 @@ dependencies = [ [[package]] name = "pango" -version = "0.19.3" +version = "0.19.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1264d13deb823cc652f26cfe59afb1ec4b9db2a5bd27c41b738c879cc1bfaa1" +checksum = "504ce6e805439ea2c6791168fe7ef8e3da0c1b2ef82c44bc450dbc330592920d" dependencies = [ "gio", "glib", @@ -3062,9 +3115,9 @@ dependencies = [ [[package]] name = "pango-sys" -version = "0.19.0" +version = "0.19.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f52ef6a881c19fbfe3b1484df5cad411acaaba29dbec843941c3110d19f340ea" +checksum = "e4829555bdbb83692ddeaf5a6927fb2d025c8131e5ecaa4f7619fff6985d3505" dependencies = [ "glib-sys", "gobject-sys", @@ -3080,9 +3133,9 @@ checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" [[package]] name = "parking_lot" -version = "0.12.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" dependencies = [ "lock_api", "parking_lot_core", @@ -3090,22 +3143,22 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.9" +version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", "redox_syscall", "smallvec", - "windows-targets 0.48.5", + "windows-targets 0.52.5", ] [[package]] name = "paste" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "percent-encoding" @@ -3168,14 +3221,14 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.66", ] [[package]] name = "pin-project-lite" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" [[package]] name = "pin-utils" @@ -3185,9 +3238,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "piper" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" +checksum = "464db0c665917b13ebb5d453ccdec4add5658ee1adc7affc7677615356a8afaf" dependencies = [ "atomic-waker", "fastrand", @@ -3215,9 +3268,9 @@ dependencies = [ [[package]] name = "polling" -version = "3.6.0" +version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0c976a60b2d7e99d6f229e414670a9b85d13ac305cc6d1e9c134de58c5aaaf6" +checksum = "645493cf344456ef24219d02a768cf1fb92ddf8c92161679ae3d91b91a637be3" dependencies = [ "cfg-if", "concurrent-queue", @@ -3256,34 +3309,10 @@ dependencies = [ ] [[package]] -name = "proc-macro-error" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", - "syn 1.0.109", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -dependencies = [ - "proc-macro2", - "quote", - "version_check", -] - -[[package]] name = "proc-macro2" -version = "1.0.79" +version = "1.0.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" +checksum = "ec96c6a92621310b51366f1e28d05ef11489516e93be030060e5fc12024a49d6" dependencies = [ "unicode-ident", ] @@ -3304,7 +3333,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8021cf59c8ec9c432cfc2526ac6b8aa508ecaf29cd415f271b8406c1b851c3fd" dependencies = [ "quote", - "syn 2.0.55", + "syn 2.0.66", ] [[package]] @@ -3324,17 +3353,6 @@ dependencies = [ ] [[package]] -name = "pulldown-cmark" -version = "0.9.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57206b407293d2bcd3af849ce869d52068623f19e1b5ff8e8778e3309439682b" -dependencies = [ - "bitflags 2.5.0", - "memchr", - "unicase", -] - -[[package]] name = "qoi" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3345,9 +3363,9 @@ dependencies = [ [[package]] name = "quanta" -version = "0.12.2" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ca0b7bac0b97248c40bb77288fc52029cf1459c0461ea1b05ee32ccf011de2c" +checksum = "8e5167a477619228a0b284fac2674e3c388cba90631d7b7de620e6f1fcd08da5" dependencies = [ "crossbeam-utils", "libc", @@ -3382,9 +3400,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.35" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2", ] @@ -3491,9 +3509,9 @@ dependencies = [ [[package]] name = "raw-cpuid" -version = "11.0.1" +version = "11.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d86a7c4638d42c44551f4791a20e687dbb4c3de1f33c43dd71e355cd429def1" +checksum = "e29830cbb1290e404f24c73af91c5d8d631ce7e128691e9477556b540cd01ecd" dependencies = [ "bitflags 2.5.0", ] @@ -3526,18 +3544,18 @@ checksum = "ca8049c74229f22d8cba889ee1d541b05da9c9668d8fe2011bb922250d0be148" [[package]] name = "redox_syscall" -version = "0.4.1" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.5.0", ] [[package]] name = "redox_users" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" +checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" dependencies = [ "getrandom", "libredox", @@ -3569,18 +3587,18 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" +checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" [[package]] name = "reqwest" -version = "0.12.1" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e333b1eb9fe677f6893a9efcb0d277a2d3edd83f358a236b657c32301dc6e5f6" +checksum = "566cafdd92868e0939d3fb961bd0dc25fcfaaed179291093b3d43e6b3150ea10" dependencies = [ "async-compression", - "base64 0.21.7", + "base64 0.22.1", "bytes", "cookie", "cookie_store", @@ -3620,7 +3638,7 @@ dependencies = [ "wasm-bindgen-futures", "wasm-streams", "web-sys", - "winreg", + "winreg 0.52.0", ] [[package]] @@ -3644,9 +3662,9 @@ dependencies = [ [[package]] name = "rust-embed" -version = "8.3.0" +version = "8.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb78f46d0066053d16d4ca7b898e9343bc3530f71c61d5ad84cd404ada068745" +checksum = "19549741604902eb99a7ed0ee177a0663ee1eda51a29f71401f166e47e77806a" dependencies = [ "rust-embed-impl", "rust-embed-utils", @@ -3655,23 +3673,23 @@ dependencies = [ [[package]] name = "rust-embed-impl" -version = "8.3.0" +version = "8.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b91ac2a3c6c0520a3fb3dd89321177c3c692937c4eb21893378219da10c44fc8" +checksum = "cb9f96e283ec64401f30d3df8ee2aaeb2561f34c824381efa24a35f79bf40ee4" dependencies = [ "proc-macro2", "quote", "rust-embed-utils", "shellexpand", - "syn 2.0.55", + "syn 2.0.66", "walkdir", ] [[package]] name = "rust-embed-utils" -version = "8.3.0" +version = "8.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86f69089032567ffff4eada41c573fc43ff466c7db7c5688b2e7969584345581" +checksum = "38c74a686185620830701348de757fd36bef4aa9680fd23c49fc539ddcc1af32" dependencies = [ "sha2 0.10.8", "walkdir", @@ -3679,9 +3697,9 @@ dependencies = [ [[package]] name = "rustc-demangle" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustc_version" @@ -3694,9 +3712,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.32" +version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ "bitflags 2.5.0", "errno", @@ -3707,18 +3725,25 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "1.0.4" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" +checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d" dependencies = [ - "base64 0.21.7", + "base64 0.22.1", + "rustls-pki-types", ] [[package]] +name = "rustls-pki-types" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d" + +[[package]] name = "ryu" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "same-file" @@ -3765,11 +3790,11 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "security-framework" -version = "2.9.2" +version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" +checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.5.0", "core-foundation", "core-foundation-sys", "libc", @@ -3778,9 +3803,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.9.1" +version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" +checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7" dependencies = [ "core-foundation-sys", "libc", @@ -3788,18 +3813,15 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.22" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" -dependencies = [ - "serde", -] +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.197" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" +checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" dependencies = [ "serde_derive", ] @@ -3816,20 +3838,20 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.197" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" +checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.66", ] [[package]] name = "serde_json" -version = "1.0.114" +version = "1.0.117" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0" +checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" dependencies = [ "itoa", "ryu", @@ -3838,20 +3860,20 @@ dependencies = [ [[package]] name = "serde_repr" -version = "0.1.18" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb" +checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.66", ] [[package]] name = "serde_spanned" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" +checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" dependencies = [ "serde", ] @@ -3870,9 +3892,9 @@ dependencies = [ [[package]] name = "serde_yaml" -version = "0.9.33" +version = "0.9.34+deprecated" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0623d197252096520c6f2a5e1171ee436e5af99a5d7caa2891e55e61950e6d9" +checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" dependencies = [ "indexmap", "itoa", @@ -3927,9 +3949,9 @@ dependencies = [ [[package]] name = "signal-hook-registry" -version = "1.4.1" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" dependencies = [ "libc", ] @@ -3962,21 +3984,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d" [[package]] -name = "skeptic" -version = "0.13.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16d23b015676c90a0f01c197bfdc786c20342c73a0afdda9025adb0bc42940a8" -dependencies = [ - "bytecount", - "cargo_metadata", - "error-chain", - "glob", - "pulldown-cmark", - "tempfile", - "walkdir", -] - -[[package]] name = "slab" version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3993,9 +4000,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "socket2" -version = "0.5.6" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" dependencies = [ "libc", "windows-sys 0.52.0", @@ -4081,9 +4088,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.55" +version = "2.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "002a1b3dbf967edfafc32655d0f377ab0bb7b994aa1d32c8cc7e9b8bf3ebb8f0" +checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" dependencies = [ "proc-macro2", "quote", @@ -4126,7 +4133,7 @@ dependencies = [ "cfg-expr", "heck 0.5.0", "pkg-config", - "toml 0.8.12", + "toml 0.8.13", "version-compare", ] @@ -4182,22 +4189,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.58" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" +checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.58" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" +checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.66", ] [[package]] @@ -4234,9 +4241,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.34" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ "deranged", "itoa", @@ -4255,9 +4262,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.17" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" dependencies = [ "num-conv", "time-core", @@ -4280,9 +4287,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.36.0" +version = "1.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931" +checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" dependencies = [ "backtrace", "bytes", @@ -4303,7 +4310,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.66", ] [[package]] @@ -4330,16 +4337,15 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.10" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" +checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" dependencies = [ "bytes", "futures-core", "futures-sink", "pin-project-lite", "tokio", - "tracing", ] [[package]] @@ -4356,21 +4362,21 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.12" +version = "0.8.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3" +checksum = "a4e43f8cc456c9704c851ae29c67e17ef65d2c30017c17a9765b89c382dc8bba" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.9", + "toml_edit 0.22.13", ] [[package]] name = "toml_datetime" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" dependencies = [ "serde", ] @@ -4401,15 +4407,15 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.9" +version = "0.22.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e40bb779c5187258fd7aad0eb68cb8706a0a81fa712fbea808ab43c4b8374c4" +checksum = "c127785850e8c20836d49732ae6abfa47616e60bf9d9f57c43c250361a9db96c" dependencies = [ "indexmap", "serde", "serde_spanned", "toml_datetime", - "winnow 0.6.5", + "winnow 0.6.8", ] [[package]] @@ -4425,7 +4431,6 @@ dependencies = [ "tokio", "tower-layer", "tower-service", - "tracing", ] [[package]] @@ -4446,7 +4451,6 @@ version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ - "log", "pin-project-lite", "tracing-attributes", "tracing-core", @@ -4460,7 +4464,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.66", ] [[package]] @@ -4657,7 +4661,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.66", "wasm-bindgen-shared", ] @@ -4691,7 +4695,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.55", + "syn 2.0.66", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -4766,9 +4770,9 @@ checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" [[package]] name = "widestring" -version = "1.0.2" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8" +checksum = "7219d36b6eac893fa81e84ebe06485e7dcbb616177469b142df14f1f4deb1311" [[package]] name = "winapi" @@ -4788,11 +4792,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.6" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" dependencies = [ - "winapi", + "windows-sys 0.52.0", ] [[package]] @@ -4807,7 +4811,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.4", + "windows-targets 0.52.5", ] [[package]] @@ -4825,7 +4829,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.4", + "windows-targets 0.52.5", ] [[package]] @@ -4845,17 +4849,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" +checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" dependencies = [ - "windows_aarch64_gnullvm 0.52.4", - "windows_aarch64_msvc 0.52.4", - "windows_i686_gnu 0.52.4", - "windows_i686_msvc 0.52.4", - "windows_x86_64_gnu 0.52.4", - "windows_x86_64_gnullvm 0.52.4", - "windows_x86_64_msvc 0.52.4", + "windows_aarch64_gnullvm 0.52.5", + "windows_aarch64_msvc 0.52.5", + "windows_i686_gnu 0.52.5", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.5", + "windows_x86_64_gnu 0.52.5", + "windows_x86_64_gnullvm 0.52.5", + "windows_x86_64_msvc 0.52.5", ] [[package]] @@ -4866,9 +4871,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" +checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" [[package]] name = "windows_aarch64_msvc" @@ -4878,9 +4883,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" +checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" [[package]] name = "windows_i686_gnu" @@ -4890,9 +4895,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" +checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" [[package]] name = "windows_i686_msvc" @@ -4902,9 +4913,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" +checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" [[package]] name = "windows_x86_64_gnu" @@ -4914,9 +4925,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" +checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" [[package]] name = "windows_x86_64_gnullvm" @@ -4926,9 +4937,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" +checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" [[package]] name = "windows_x86_64_msvc" @@ -4938,9 +4949,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" +checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" [[package]] name = "winnow" @@ -4953,9 +4964,9 @@ dependencies = [ [[package]] name = "winnow" -version = "0.6.5" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dffa400e67ed5a4dd237983829e66475f0a4a26938c4b04c21baede6262215b8" +checksum = "c3c52e9c97a68071b23e836c9380edae937f17b9c4667bd021973efc689f618d" dependencies = [ "memchr", ] @@ -4971,6 +4982,16 @@ dependencies = [ ] [[package]] +name = "winreg" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] + +[[package]] name = "xdg-home" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4982,9 +5003,9 @@ dependencies = [ [[package]] name = "xml-rs" -version = "0.8.19" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fcb9cbac069e033553e8bb871be2fbdffcab578eb25bd0f7c508cedc6dcd75a" +checksum = "791978798f0597cfc70478424c2b4fdc2b7a8024aaff78497ef00f24ef674193" [[package]] name = "xml5ever" @@ -5014,23 +5035,22 @@ dependencies = [ [[package]] name = "zbus" -version = "4.1.2" +version = "4.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9ff46f2a25abd690ed072054733e0bc3157e3d4c45f41bd183dce09c2ff8ab9" +checksum = "989c3977a7aafa97b12b9a35d21cdcff9b0d2289762b14683f45d66b1ba6c48f" dependencies = [ "async-broadcast", "async-executor", "async-fs", "async-io", - "async-lock 3.3.0", + "async-lock", "async-process", "async-recursion", "async-task", "async-trait", "blocking", - "derivative", "enumflags2", - "event-listener 5.2.0", + "event-listener 5.3.0", "futures-core", "futures-sink", "futures-util", @@ -5053,15 +5073,14 @@ dependencies = [ [[package]] name = "zbus_macros" -version = "4.1.2" +version = "4.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e0e3852c93dcdb49c9462afe67a2a468f7bd464150d866e861eaf06208633e0" +checksum = "6fe9de53245dcf426b7be226a4217dd5e339080e5d46e64a02d6e5dcbf90fca1" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "regex", - "syn 1.0.109", + "syn 2.0.66", "zvariant_utils", ] @@ -5102,9 +5121,9 @@ dependencies = [ [[package]] name = "zvariant" -version = "4.0.2" +version = "4.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c1b3ca6db667bfada0f1ebfc94b2b1759ba25472ee5373d4551bb892616389a" +checksum = "9aa6d31a02fbfb602bfde791de7fedeb9c2c18115b3d00f3a36e489f46ffbbc7" dependencies = [ "endi", "enumflags2", @@ -5116,24 +5135,24 @@ dependencies = [ [[package]] name = "zvariant_derive" -version = "4.0.2" +version = "4.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7a4b236063316163b69039f77ce3117accb41a09567fd24c168e43491e521bc" +checksum = "642bf1b6b6d527988b3e8193d20969d53700a36eac734d21ae6639db168701c8" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.66", "zvariant_utils", ] [[package]] name = "zvariant_utils" -version = "1.1.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00bedb16a193cc12451873fee2a1bc6550225acece0e36f333e68326c73c8172" +checksum = "fc242db087efc22bd9ade7aa7809e4ba828132edc312871584a6b4391bdf8786" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.66", ] diff --git a/pkgs/applications/networking/feedreaders/newsflash/default.nix b/pkgs/applications/networking/feedreaders/newsflash/default.nix index 38ca720498ebb..f8fcea67a4896 100644 --- a/pkgs/applications/networking/feedreaders/newsflash/default.nix +++ b/pkgs/applications/networking/feedreaders/newsflash/default.nix @@ -1,44 +1,47 @@ -{ lib -, stdenv -, rustPlatform -, fetchFromGitLab -, substituteAll -, cargo -, meson -, ninja -, pkg-config -, rustc -, blueprint-compiler -, wrapGAppsHook4 -, gdk-pixbuf -, glib -, gtk4 -, libadwaita -, libxml2 -, openssl -, sqlite -, webkitgtk -, glib-networking -, librsvg -, gst_all_1 -, gitUpdater +{ + lib, + stdenv, + rustPlatform, + fetchFromGitLab, + substituteAll, + cargo, + meson, + ninja, + pkg-config, + rustc, + blueprint-compiler, + wrapGAppsHook4, + gdk-pixbuf, + glib, + clapper, + gtk4, + libadwaita, + libxml2, + openssl, + sqlite, + webkitgtk, + glib-networking, + librsvg, + gst_all_1, + gitUpdater, }: stdenv.mkDerivation (finalAttrs: { pname = "newsflash"; - version = "3.2.0"; + version = "3.3.0"; src = fetchFromGitLab { owner = "news-flash"; repo = "news_flash_gtk"; rev = "refs/tags/v.${finalAttrs.version}"; - hash = "sha256-buXFQ/QAFOcdcywlacySuq8arqPEJIti1nK+yl3yWck="; + hash = "sha256-s8h/OIJJzMmsCsaQJ0SOjCAVXfYQbjOupdDtLOqM9d0="; }; cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; outputHashes = { - "news-flash-2.3.0-alpha.0" = "sha256-WITvnqeEDp793AlZ3gj8Tg0dfccuOj0Us5H5FaEtkxk="; + "clapper-0.1.0" = "sha256-xQ7l6luO5E4PMjtN9elg0bkJa7IhWzA7KuYDJ+m/VY0="; + "news-flash-2.3.0-alpha.0" = "sha256-ZgX6tQmPDMSpLcYD04u2ReQXdzeGzQTwGaUy/y4z4do="; "newsblur_api-0.3.0" = "sha256-m2178zdJzeskl3BQpZr6tlxTAADehxz8uYcZzi15nhQ="; }; }; @@ -62,6 +65,8 @@ stdenv.mkDerivation (finalAttrs: { patchShebangs build-aux/cargo.sh ''; + strictDeps = true; + nativeBuildInputs = [ meson ninja @@ -79,36 +84,40 @@ stdenv.mkDerivation (finalAttrs: { blueprint-compiler ]; - buildInputs = [ - gtk4 - libadwaita - libxml2 - openssl - sqlite - webkitgtk + buildInputs = + [ + clapper + gtk4 + libadwaita + libxml2 + openssl + sqlite + webkitgtk - # TLS support for loading external content in webkitgtk WebView - glib-networking + # TLS support for loading external content in webkitgtk WebView + glib-networking - # SVG support for gdk-pixbuf - librsvg - ] ++ (with gst_all_1; [ - # Audio & video support for webkitgtk WebView - gstreamer - gst-plugins-base - gst-plugins-good - gst-plugins-bad - ]); + # SVG support for gdk-pixbuf + librsvg + ] + ++ (with gst_all_1; [ + # Audio & video support for webkitgtk WebView + gstreamer + gst-plugins-base + gst-plugins-good + gst-plugins-bad + ]); - passthru.updateScript = gitUpdater { - rev-prefix = "v."; - }; + passthru.updateScript = gitUpdater { rev-prefix = "v."; }; meta = with lib; { description = "A modern feed reader designed for the GNOME desktop"; homepage = "https://gitlab.com/news-flash/news_flash_gtk"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ kira-bruneau stunkymonkey ]; + maintainers = with maintainers; [ + kira-bruneau + stunkymonkey + ]; platforms = platforms.unix; mainProgram = "io.gitlab.news_flash.NewsFlash"; }; diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index d0bd8747d93a1..39a7ae4690fb8 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -5,7 +5,7 @@ python3.pkgs.buildPythonApplication rec { pname = "flexget"; - version = "3.11.34"; + version = "3.11.35"; pyproject = true; # Fetch from GitHub in order to use `requirements.in` @@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec { owner = "Flexget"; repo = "Flexget"; rev = "refs/tags/v${version}"; - hash = "sha256-g5TmjR3N/21JgXoRy56PN5A+Jbow2DFaAu0ammLtPxw="; + hash = "sha256-L3A0bU35IfFfwDIbcNVAU4jGb00jODgq7Z67RQrT4u0="; }; postPatch = '' diff --git a/pkgs/applications/networking/instant-messengers/briar-desktop/default.nix b/pkgs/applications/networking/instant-messengers/briar-desktop/default.nix index c0fd454a2fd83..9ce9801ae2ed0 100644 --- a/pkgs/applications/networking/instant-messengers/briar-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/briar-desktop/default.nix @@ -19,11 +19,11 @@ let in stdenv.mkDerivation rec { pname = "briar-desktop"; - version = "0.5.0-beta"; + version = "0.6.0-beta"; src = fetchurl { url = "https://desktop.briarproject.org/jars/linux/${version}/briar-desktop-linux-${version}.jar"; - hash = "sha256-J93ODYAiRbQxG2BF7P3H792ymAcJ3f07l7zRSw8kM+E="; + hash = "sha256-ITlg2THQwP91nVxHhLfXPBtC4e3EU9V7D/15XqWC7FE="; }; dontUnpack = true; diff --git a/pkgs/applications/networking/instant-messengers/jami/default.nix b/pkgs/applications/networking/instant-messengers/jami/default.nix index 6a6925d66627e..91a0b539d3d77 100644 --- a/pkgs/applications/networking/instant-messengers/jami/default.nix +++ b/pkgs/applications/networking/instant-messengers/jami/default.nix @@ -64,14 +64,14 @@ stdenv.mkDerivation rec { pname = "jami"; - version = "20240430.0"; + version = "20240529.0"; src = fetchFromGitLab { domain = "git.jami.net"; owner = "savoirfairelinux"; repo = "jami-client-qt"; rev = "stable/${version}"; - hash = "sha256-v7558m2h3RqvLLhf3BdYO9LKCFKuMTtPIXgH6OXiiY4="; + hash = "sha256-v2GFvgHHJ2EMoayZ+//OZ0U+P1fh5Mgp5fAoqtZts7U="; fetchSubmodules = true; }; @@ -128,14 +128,14 @@ stdenv.mkDerivation rec { dhtnet = stdenv.mkDerivation { pname = "dhtnet"; - version = "unstable-2022-04-26"; + version = "unstable-2024-05-17"; src = fetchFromGitLab { domain = "git.jami.net"; owner = "savoirfairelinux"; repo = "dhtnet"; - rev = "d7976982d24867c6faaf8103504ec8a10d932fa0"; - hash = "sha256-vazFDMIu/3AWeOz0LZhZD9NFO8cd5AK41zBpqpQrqnc="; + rev = "77331098ff663a5ac54fae7d0bedafe076c575a1"; + hash = "sha256-55LEnI1YgVujCtv1dGOFtJdvnzB2SKqwEptaHasZB7I="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix b/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix index 54c485525d7ea..6d39ab785cfa8 100644 --- a/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix +++ b/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix @@ -17,13 +17,13 @@ buildPythonApplication rec { pname = "matrix-commander"; - version = "7.2.0"; + version = "7.6.2"; src = fetchFromGitHub { owner = "8go"; repo = "matrix-commander"; rev = "v${version}"; - hash = "sha256-qL6ARkAWu0FEuYK2e9Z9hMSfK4TW0kGgoIFUfJ8Dgwk="; + hash = "sha256-BiQShJHCTvEdkhp21uxxCTxBZ1eezuWE6btMc/wkPlc="; }; format = "pyproject"; diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix index 2c73686e76837..558ace43ec161 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix @@ -181,7 +181,7 @@ stdenv.mkDerivation rec { homepage = "https://signal.org/"; changelog = "https://github.com/signalapp/Signal-Desktop/releases/tag/v${version}"; license = lib.licenses.agpl3Only; - maintainers = with lib.maintainers; [ eclairevoyant mic92 equirosa urandom bkchr ]; + maintainers = with lib.maintainers; [ eclairevoyant mic92 equirosa urandom bkchr teutat3s ]; mainProgram = pname; platforms = [ "x86_64-linux" "aarch64-linux" ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix index 48fe8491bdd9a..c27ee939ee4fd 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix @@ -2,7 +2,7 @@ callPackage ./generic.nix { } rec { pname = "signal-desktop"; dir = "Signal"; - version = "7.9.0"; + version = "7.10.0"; url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - hash = "sha256-Iv2WG1kvB3tEiFu4Oy0po0KlpWCwfalDNOXstO/C+e0="; + hash = "sha256-CAofRnG9BWaNtP8zL5YfE9+ofc5+sgniTbPGsnEtlVY="; } diff --git a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix index f40ae2be3b8df..14b593f13a441 100644 --- a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix +++ b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "signalbackup-tools"; - version = "20240528-1"; + version = "20240530"; src = fetchFromGitHub { owner = "bepaald"; repo = pname; rev = version; - hash = "sha256-kKSCP5CYc7G6fifm3T+v9tnH4MofL7xvVw6V2mqvdPU="; + hash = "sha256-bZFeIEILO1P56c1fXP7yaZ5IJYH2+T/YWYgX+b2XvhQ="; }; postPatch = '' diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix index 25669b9758157..e27bbcdb1bca6 100644 --- a/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -84,7 +84,7 @@ let changelog = "https://slack.com/release-notes"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; - maintainers = with maintainers; [ mmahut ]; + maintainers = with maintainers; [ mmahut teutat3s ]; platforms = [ "x86_64-darwin" "x86_64-linux" "aarch64-darwin" ]; mainProgram = "slack"; }; diff --git a/pkgs/applications/networking/instant-messengers/tangram/default.nix b/pkgs/applications/networking/instant-messengers/tangram/default.nix index c68af388f323c..c119733197ef2 100644 --- a/pkgs/applications/networking/instant-messengers/tangram/default.nix +++ b/pkgs/applications/networking/instant-messengers/tangram/default.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation rec { pname = "tangram"; - version = "3.0"; + version = "3.1"; src = fetchFromGitHub { owner = "sonnyp"; repo = "Tangram"; rev = "v${version}"; - hash = "sha256-6QOkvsYFgFFyxnDlA5Xpl3FnsSZOj9ooehCPOmpKe8M="; + hash = "sha256-vN9zRc8Ac9SI0lIcuf01A2WLqLGtV3DUiNzCSmc2ri4="; fetchSubmodules = true; }; diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix index 935e11103b828..f663d6f637a3e 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix @@ -64,14 +64,14 @@ let in stdenv.mkDerivation rec { pname = "telegram-desktop"; - version = "5.0.2"; + version = "5.0.6"; src = fetchFromGitHub { owner = "telegramdesktop"; repo = "tdesktop"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-RaIUk+49uNc+TycC/oV+02o5EpkbP4tSSv7DsLn+WHM="; + hash = "sha256-n3WeyGQCw9fbA/1hZ85mqdm5xuBLjy9qHMcVRb4cmAg="; }; patches = [ diff --git a/pkgs/applications/networking/instant-messengers/whatsapp-for-linux/default.nix b/pkgs/applications/networking/instant-messengers/whatsapp-for-linux/default.nix index 7022cc282f662..e699c761b6953 100644 --- a/pkgs/applications/networking/instant-messengers/whatsapp-for-linux/default.nix +++ b/pkgs/applications/networking/instant-messengers/whatsapp-for-linux/default.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "whatsapp-for-linux"; - version = "1.6.4"; + version = "1.6.5"; src = fetchFromGitHub { owner = "eneshecan"; repo = "whatsapp-for-linux"; rev = "v${finalAttrs.version}"; - hash = "sha256-DU9tvIvDfOtBydR68yeRMFYdMjiBrOobCDXIZMmm7pQ="; + hash = "sha256-hUIyn6BhAPoszBTHKa4qSj6IRa+8cUS0Gis/qjDDnyk="; }; nativeBuildInputs = [ 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/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index 87f7dc4f655ff..2f4ed4ba2decd 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -36,14 +36,14 @@ let in assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins; stdenv.mkDerivation rec { - version = "4.3.0"; + version = "4.3.1"; pname = "weechat"; hardeningEnable = [ "pie" ]; src = fetchurl { url = "https://weechat.org/files/src/weechat-${version}.tar.xz"; - hash = "sha256-Nvn5C/L2n3ejTR4NWPBsoI8PIPgmOrlAtjfnq/eWhi0="; + hash = "sha256-FX4ioX3MMDxmVzljGgRHDXhkdOgF/r7S7S1bYlDRhlM="; }; # Why is this needed? https://github.com/weechat/weechat/issues/2031 diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index 9406928ffba1d..91f72a3e5a312 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -5,13 +5,13 @@ rec { thunderbird-115 = (buildMozillaMach rec { pname = "thunderbird"; - version = "115.11.0"; + version = "115.11.1"; application = "comm/mail"; applicationName = "Mozilla Thunderbird"; binaryName = pname; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - sha512 = "002f783cff7f2b50d9a29f20061fe55a1f64487b38a18dcb49217c3d7b99c2852af842decbd0347939aaf4c4c73ae66a8b04527ccd1b6db7f87aab402cb84ca1"; + sha512 = "1a1f438c7047908788bc983aa681c3293ce02da006477b491a49ced5941433ca3381e01f76afc6bb5572415025acfd0fa657f063ef26b3a63646594c27202717"; }; extraPatches = [ # The file to be patched is different from firefox's `no-buildconfig-ffx90.patch`. diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix index 07c4ca3392f97..1ec2cbac9ce45 100644 --- a/pkgs/applications/networking/p2p/qbittorrent/default.nix +++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix @@ -30,13 +30,13 @@ stdenv.mkDerivation rec { pname = "qbittorrent" + lib.optionalString (guiSupport && qtVersion == "5") "-qt5" + lib.optionalString (!guiSupport) "-nox"; - version = "4.6.4"; + version = "4.6.5"; src = fetchFromGitHub { owner = "qbittorrent"; repo = "qBittorrent"; rev = "release-${version}"; - hash = "sha256-98iE+VM32eq56eB4B0KNrj8+DbmRSsyAb7eMlprSsjs="; + hash = "sha256-umJObvPv4VjdAZdQEuhqFCRvi1eZQViu1IO88oeTTq8="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/scaleft/default.nix b/pkgs/applications/networking/scaleft/default.nix index bcfde9f1a0057..8a500c5e162f0 100644 --- a/pkgs/applications/networking/scaleft/default.nix +++ b/pkgs/applications/networking/scaleft/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "scaleft"; - version = "1.67.4"; + version = "1.80.1"; src = fetchurl { - url = "http://pkg.scaleft.com/rpm/scaleft-client-tools-${version}-1.x86_64.rpm"; - sha256 = "kRCShTMKf5qKFth/8H8XHLj12YIVQ9G5f2MvVJRtyDs="; + url = "https://dist.scaleft.com/repos/rpm/stable/centos/9/x86_64/1.80.1/scaleft-client-tools-${version}-1.x86_64.rpm"; + sha256 = "sha256-QrkqAgkplFF6Tp6FWKb2TJaqeOw8ec4zd9pymDP2IyY="; }; nativeBuildInputs = [ patchelf rpmextract ]; 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/office/roam-research/common.nix b/pkgs/applications/office/roam-research/common.nix index 8e63b111ad2af..19e51e7b0eae3 100644 --- a/pkgs/applications/office/roam-research/common.nix +++ b/pkgs/applications/office/roam-research/common.nix @@ -1,22 +1,22 @@ { fetchurl }: let pname = "roam-research"; - version = "0.0.18"; + version = "0.0.19"; in { inherit pname version; sources = { x86_64-darwin = fetchurl { url = "https://roam-electron-deploy.s3.us-east-2.amazonaws.com/Roam+Research-${version}.dmg"; - hash = "sha256-jyFNH3qrgrsftExL/b2t8bY3W3fYVz+Gp11AuaIMxbg="; + hash = "sha256-pIH4p7dnmyOgGyruSJ39xB8iJ45wtxcIQmfUeBLlDes="; }; aarch64-darwin = fetchurl { url = "https://roam-electron-deploy.s3.us-east-2.amazonaws.com/Roam+Research-${version}-arm64.dmg"; - hash = "sha256-AnyvFCbyUi6tcgxYQAj+zPLl4/kVh9ZeupetRhzH0PU="; + hash = "sha256-iQRaaSU033t3WVWZSKuXCPJbMoNpwLnDHBz5QURu6Gw="; }; x86_64-linux = fetchurl { url = "https://roam-electron-deploy.s3.us-east-2.amazonaws.com/${pname}_${version}_amd64.deb"; - hash = "sha256-veDWBFZbODsdaO1UdfuC4w6oGCkeVBe+fqKn5XVHKDQ="; + hash = "sha256-eDN+hrAc+ePRELcXAs5WypzPlJ+Wtg3kUarf8rq5CnA="; }; }; } diff --git a/pkgs/applications/science/electronics/magic-vlsi/default.nix b/pkgs/applications/science/electronics/magic-vlsi/default.nix index 5fc4b0036f9fb..0be742f76e3c6 100644 --- a/pkgs/applications/science/electronics/magic-vlsi/default.nix +++ b/pkgs/applications/science/electronics/magic-vlsi/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "magic-vlsi"; - version = "8.3.465"; + version = "8.3.483"; src = fetchurl { url = "http://opencircuitdesign.com/magic/archive/magic-${version}.tgz"; - sha256 = "sha256-cb9A8rpjD3x3fJo+xexlyzn+/3M5iUJmSoBraom9zd8="; + sha256 = "sha256-JyawlH/zUTJ7fGf63zHvZ3q8AYRwFELwh+63RN9IkBA="; }; nativeBuildInputs = [ python3 ]; diff --git a/pkgs/applications/science/electronics/systemc/default.nix b/pkgs/applications/science/electronics/systemc/default.nix index 4e14d08e63bfa..c5ed88b8c65a8 100644 --- a/pkgs/applications/science/electronics/systemc/default.nix +++ b/pkgs/applications/science/electronics/systemc/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "systemc"; - version = "2.3.4"; + version = "3.0.0"; src = fetchFromGitHub { owner = "accellera-official"; repo = pname; rev = version; - sha256 = "0sj8wlkp68cjhmkd9c9lvm3lk3sckczpz7w9vby64inc1f9fnf0b"; + sha256 = "sha256-qeQUrPhD+Gb1lResM7NZzO/vEgJd3NE6lbnM380VVa0="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/science/misc/openmodelica/omcompiler/default.nix b/pkgs/applications/science/misc/openmodelica/omcompiler/default.nix index 360fea56fedfb..82b9f8e36fe1d 100644 --- a/pkgs/applications/science/misc/openmodelica/omcompiler/default.nix +++ b/pkgs/applications/science/misc/openmodelica/omcompiler/default.nix @@ -44,6 +44,11 @@ mkOpenModelicaDerivation ({ $(find ./OMCompiler -name 'Makefile*') ''; + env.CFLAGS = toString [ + "-Wno-error=dynamic-exception-spec" + "-Wno-error=implicit-function-declaration" + ]; + preFixup = '' for entry in $(find $out -name libipopt.so); do patchelf --shrink-rpath --allowed-rpath-prefixes "$NIX_STORE" "$entry" diff --git a/pkgs/applications/science/misc/openmodelica/omsimulator/default.nix b/pkgs/applications/science/misc/openmodelica/omsimulator/default.nix index d91d427a07703..3cbe1a6a55f10 100644 --- a/pkgs/applications/science/misc/openmodelica/omsimulator/default.nix +++ b/pkgs/applications/science/misc/openmodelica/omsimulator/default.nix @@ -5,6 +5,7 @@ , libxml2 , openmodelica , mkOpenModelicaDerivation +, fetchpatch }: mkOpenModelicaDerivation rec { @@ -12,10 +13,23 @@ mkOpenModelicaDerivation rec { omdir = "OMSimulator"; omdeps = [ openmodelica.omcompiler ]; + patches = [ + (fetchpatch { + url = "https://github.com/OpenModelica/OMSimulator/commit/5ef06e251d639a0224adc205cdbfa1f99bf9a956.patch"; + stripLen = 1; + extraPrefix = "OMSimulator/"; + hash = "sha256-hLsS6TNEjddm2o2Optnf8n6hh14up9bWJBoztNmisH0="; + }) + ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ readline libxml2 boost ]; + env.CFLAGS = toString [ + "-Wno-error=implicit-function-declaration" + ]; + meta = with lib; { description = "The OpenModelica FMI & SSP-based co-simulation environment"; homepage = "https://openmodelica.org"; diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index afc048cc41ef6..c369319bcc9e8 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -3,7 +3,6 @@ , callPackage , fetchgit , fetchurl -, fetchpatch , makeWrapper , cmake , coreutils @@ -25,7 +24,7 @@ , libGL , libxcrypt , libxml2 -, llvm_13 +, llvm_16 , lsof , lz4 , xz @@ -41,7 +40,6 @@ , xxHash , zlib , zstd -, libAfterImage , giflib , libjpeg , libtiff @@ -58,7 +56,7 @@ stdenv.mkDerivation rec { pname = "root"; - version = "6.30.06"; + version = "6.32.00"; passthru = { tests = import ./tests { inherit callPackage; }; @@ -66,13 +64,13 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://root.cern.ch/download/root_v${version}.source.tar.gz"; - hash = "sha256-MA237RtnjtL7ljXKZ1khoZRcfCED2oQAM7STCR9VcAw="; + hash = "sha256-EvIDaBpZBBxHTOlSN2Hm8OiGGzvueN9feZqNtVGJ5dI="; }; clad_src = fetchgit { url = "https://github.com/vgvassilev/clad"; - rev = "refs/tags/v1.4"; # Make sure that this is the same tag as in the ROOT build files! - hash = "sha256-OI9PaS7kQ/ewD5Soe3gG5FZdlR6qG6Y3mfHwi5dj1sI="; + rev = "refs/tags/v1.5"; # Make sure that this is the same tag as in the ROOT build files! + hash = "sha256-s0DbHfLthv51ZICnTd30O4qG/DyZPk5tADeu3bBRoOw="; }; nativeBuildInputs = [ makeWrapper cmake pkg-config git ]; @@ -90,7 +88,7 @@ stdenv.mkDerivation rec { lapack libxcrypt libxml2 - llvm_13 + llvm_16 lz4 xz gsl @@ -98,7 +96,6 @@ stdenv.mkDerivation rec { openblas openssl xxHash - libAfterImage giflib libjpeg libtiff @@ -116,17 +113,6 @@ stdenv.mkDerivation rec { patches = [ ./sw_vers.patch - - # compatibility with recent XRootD - # https://github.com/root-project/root/pull/13752 - (fetchpatch { - url = "https://github.com/root-project/root/commit/3d3cda6c520791282298782189cdb8ca07ace4b9.diff"; - hash = "sha256-O3aXzrOEQiPjZgbAj9TL6Wt/adN1kKFwjooeaFRyT4I="; - }) - (fetchpatch { - url = "https://github.com/root-project/root/commit/6e7798e62dbed1ffa8b91a180fa5a080b7c04ba3.diff"; - hash = "sha256-47/J631DBnVlvM1Pm9iicKXDKAqN8v9hjAstQuHmH8Q="; - }) ]; preConfigure = '' @@ -142,18 +128,13 @@ stdenv.mkDerivation rec { # This should probably be fixed upstream with a flag to disable the # connectivity check! substituteInPlace CMakeLists.txt \ - --replace 'if(NO_CONNECTION)' 'if(FALSE)' - substituteInPlace interpreter/cling/tools/plugins/CMakeLists.txt \ - --replace 'if(NOT DEFINED NO_CONNECTION OR NOT NO_CONNECTION)' 'if(TRUE)' + --replace 'if(clad AND NO_CONNECTION)' 'if(FALSE)' # Make sure that clad is not downloaded when building substituteInPlace interpreter/cling/tools/plugins/clad/CMakeLists.txt \ --replace 'UPDATE_COMMAND ""' 'SOURCE_DIR ${clad_src} DOWNLOAD_COMMAND "" UPDATE_COMMAND ""' # Make sure that clad is finding the right llvm version substituteInPlace interpreter/cling/tools/plugins/clad/CMakeLists.txt \ - --replace '-DLLVM_DIR=''${LLVM_BINARY_DIR}' '-DLLVM_DIR=${llvm_13.dev}/lib/cmake/llvm' - # Fix that will also be upstream in ROOT 6.32. TODO: remove it when updating to 6.32 - substituteInPlace interpreter/cling/tools/plugins/clad/CMakeLists.txt \ - --replace 'set(_CLAD_LIBRARY_PATH ''${clad_install_dir}/plugins/lib)' 'set(_CLAD_LIBRARY_PATH ''${CMAKE_CURRENT_BINARY_DIR}/clad-prefix/src/clad-build/lib''${LLVM_LIBDIR_SUFFIX})' + --replace '-DLLVM_DIR=''${LLVM_BINARY_DIR}' '-DLLVM_DIR=${llvm_16.dev}/lib/cmake/llvm' substituteInPlace interpreter/llvm-project/clang/tools/driver/CMakeLists.txt \ --replace 'add_clang_symlink(''${link} clang)' "" @@ -197,9 +178,6 @@ stdenv.mkDerivation rec { "-Druntime_cxxmodules=OFF" ]; - # suppress warnings from compilation of the vendored clang to avoid running into log limits on the Hydra - NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isGNU [ "-Wno-shadow" "-Wno-maybe-uninitialized" ]; - postInstall = '' for prog in rootbrowse rootcp rooteventselector rootls rootmkdir rootmv rootprint rootrm rootslimtree; do wrapProgram "$out/bin/$prog" \ diff --git a/pkgs/applications/terminal-emulators/rio/default.nix b/pkgs/applications/terminal-emulators/rio/default.nix index a1f89f6a4e0a9..86f06b50ef433 100644 --- a/pkgs/applications/terminal-emulators/rio/default.nix +++ b/pkgs/applications/terminal-emulators/rio/default.nix @@ -51,16 +51,16 @@ let in rustPlatform.buildRustPackage rec { pname = "rio"; - version = "0.0.37"; + version = "0.0.39"; src = fetchFromGitHub { owner = "raphamorim"; repo = "rio"; rev = "v${version}"; - hash = "sha256-rY5nuZcMbK9PYxfGYdVheOOVIC4I/11EOWpNmG6gH9A="; + hash = "sha256-pnU2wxgopHMWgJ7JGdO2P/MCfxqCY7MTEE39qtD0XKw="; }; - cargoHash = "sha256-tHcUMxe9HwTzm2oDwaTyuh+UZUwW64xPX/cftxqZoz8="; + cargoHash = "sha256-GwI2zHX1YcR4pC+qtkDoxx2U+zipbqqxsCI8/XNg2BU="; nativeBuildInputs = [ ncurses diff --git a/pkgs/applications/version-management/git-mit/default.nix b/pkgs/applications/version-management/git-mit/default.nix index 43d38f95a514b..859fe34c6e9c4 100644 --- a/pkgs/applications/version-management/git-mit/default.nix +++ b/pkgs/applications/version-management/git-mit/default.nix @@ -10,7 +10,7 @@ }: let - version = "5.12.202"; + version = "5.12.203"; in rustPlatform.buildRustPackage { pname = "git-mit"; @@ -20,10 +20,10 @@ rustPlatform.buildRustPackage { owner = "PurpleBooth"; repo = "git-mit"; rev = "v${version}"; - hash = "sha256-f2RiOdJVGfYzMYtgA0diz67h+h7DfTfqTOIpNObNrVc="; + hash = "sha256-8sxC8peASy13Q582DbHHpQUj0AZN0soJrOocuPyJeHI="; }; - cargoHash = "sha256-1xtTgIFaG2KUevxdZyu2IqgBLDgmeBMb7xCOECkieYc="; + cargoHash = "sha256-zDUANe5zQNufPepbFoADkfjtEAE48GkMCpmG41OP2og="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/version-management/git-town/default.nix b/pkgs/applications/version-management/git-town/default.nix index c2d9fd54f0033..634d529cafd2c 100644 --- a/pkgs/applications/version-management/git-town/default.nix +++ b/pkgs/applications/version-management/git-town/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "git-town"; - version = "14.2.0"; + version = "14.2.1"; src = fetchFromGitHub { owner = "git-town"; repo = "git-town"; rev = "v${version}"; - hash = "sha256-+OJ8aUA/VFOAzdCRcOCQKm6/RjRe13TITP1DAWqoAQI="; + hash = "sha256-7wsN95I8Xa5CXh1Mg3Wv4gyTSRzZMqJ06ALLsud3l2k="; }; vendorHash = null; 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/version-management/gitnuro/default.nix b/pkgs/applications/version-management/gitnuro/default.nix index d59287db4bb95..8809f748e6b71 100644 --- a/pkgs/applications/version-management/gitnuro/default.nix +++ b/pkgs/applications/version-management/gitnuro/default.nix @@ -5,16 +5,26 @@ , copyDesktopItems , makeDesktopItem , jre +, libGL }: stdenv.mkDerivation rec { pname = "gitnuro"; version = "1.3.1"; - src = fetchurl { - url = "https://github.com/JetpackDuba/Gitnuro/releases/download/v${version}/Gitnuro-linux-x86_64-${version}.jar"; - hash = "sha256-7yne9dD/7VT+H4tIBJvpOf8ksECCpoNAa8TSmFmjYMw="; - }; + src = fetchurl ( + if stdenv.hostPlatform.system == "x86_64-linux" then + { + url = "https://github.com/JetpackDuba/Gitnuro/releases/download/v${version}/Gitnuro-linux-x86_64-${version}.jar"; + hash = "sha256-7yne9dD/7VT+H4tIBJvpOf8ksECCpoNAa8TSmFmjYMw="; + } + else if stdenv.hostPlatform.system == "aarch64-linux" then + { + url = "https://github.com/JetpackDuba/Gitnuro/releases/download/v${version}/Gitnuro-linux-arm_aarch64-${version}.jar"; + hash = "sha256-6TRQfIhaKBjNPn3tEVWoUF92JAmwlHUtQZE8gKEZ/ZI="; + } + else throw "Unsupported architecture: ${stdenv.hostPlatform.system}" + ); icon = fetchurl { url = "https://raw.githubusercontent.com/JetpackDuba/Gitnuro/4cfc45069c176f807d9bfb1a7cba410257078d3c/icons/logo.svg"; @@ -30,8 +40,13 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - makeWrapper ${jre}/bin/java $out/bin/gitnuro --add-flags "-jar $src" + + makeWrapper ${jre}/bin/java $out/bin/gitnuro \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libGL ]}" \ + --add-flags "-jar $src" + install -Dm444 $icon $out/share/icons/hicolor/scalable/apps/com.jetpackduba.Gitnuro.svg + runHook postInstall ''; @@ -50,7 +65,8 @@ stdenv.mkDerivation rec { description = "A FOSS Git multiplatform client based on Compose and JGit"; homepage = "https://gitnuro.com/"; license = licenses.gpl3Plus; - platforms = [ "x86_64-linux" ]; + platforms = [ "x86_64-linux" "aarch64-linux" ]; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; maintainers = with maintainers; [ zendo ]; mainProgram = "gitnuro"; }; diff --git a/pkgs/applications/video/simplescreenrecorder/default.nix b/pkgs/applications/video/simplescreenrecorder/default.nix index cbeb325e7ce09..3669666cee8ac 100644 --- a/pkgs/applications/video/simplescreenrecorder/default.nix +++ b/pkgs/applications/video/simplescreenrecorder/default.nix @@ -1,16 +1,16 @@ { lib, stdenv, mkDerivation, fetchFromGitHub, alsa-lib, ffmpeg_4, libjack2, libX11, libXext, libXinerama, qtx11extras -, libXfixes, libGLU, libGL, pkg-config, libpulseaudio, libv4l, qtbase, qttools, cmake, ninja +, libXfixes, libGLU, libGL, pkg-config, libpulseaudio, libv4l, qtbase, qttools, cmake, ninja, nix-update-script }: mkDerivation rec { pname = "simplescreenrecorder"; - version = "0.4.3"; + version = "0.4.4"; src = fetchFromGitHub { owner = "MaartenBaert"; repo = "ssr"; rev = version; - sha256 = "0mrx8wprs8bi42fwwvk6rh634ic9jnn0gkfpd6q9pcawnnbz3vq8"; + sha256 = "sha256-cVjQmyk+rCqmDJzdnDk7bQ8kpyD3HtTw3wLVx2thHok="; }; cmakeFlags = [ @@ -18,14 +18,13 @@ mkDerivation rec { "-DWITH_GLINJECT=${if stdenv.hostPlatform.isx86 then "TRUE" else "FALSE"}" ]; - patches = [ ./fix-paths.patch ]; - postPatch = '' - for i in scripts/ssr-glinject src/AV/Input/GLInjectInput.cpp; do - substituteInPlace $i \ - --subst-var out \ - --subst-var-by sh ${stdenv.shell} - done + substituteInPlace scripts/ssr-glinject \ + --replace-fail "libssr-glinject.so" "$out/lib/libssr-glinject.so" + + substituteInPlace src/AV/Input/GLInjectInput.cpp \ + --replace-fail "/bin/sh" "${stdenv.shell}" \ + --replace-fail "libssr-glinject.so" "$out/lib/libssr-glinject.so" ''; nativeBuildInputs = [ pkg-config cmake ninja ]; @@ -34,6 +33,8 @@ mkDerivation rec { libpulseaudio libv4l qtbase qttools qtx11extras ]; + passthru.updateScript = nix-update-script { }; + meta = with lib; { description = "A screen recorder for Linux"; homepage = "https://www.maartenbaert.be/simplescreenrecorder"; diff --git a/pkgs/applications/video/simplescreenrecorder/fix-paths.patch b/pkgs/applications/video/simplescreenrecorder/fix-paths.patch deleted file mode 100644 index 9cf634285fcbf..0000000000000 --- a/pkgs/applications/video/simplescreenrecorder/fix-paths.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff --git a/scripts/ssr-glinject b/scripts/ssr-glinject -index 48be48d..5038d4c 100755 ---- a/scripts/ssr-glinject -+++ b/scripts/ssr-glinject -@@ -59,6 +59,6 @@ do - fi - done - --echo "ssr-glinject: LD_PRELOAD = $LD_PRELOAD:libssr-glinject.so" -+echo "ssr-glinject: LD_PRELOAD = $LD_PRELOAD:@out@/lib/libssr-glinject.so" - echo "ssr-glinject: command = $@" --LD_PRELOAD="$LD_PRELOAD:libssr-glinject.so" "$@" -+LD_PRELOAD="$LD_PRELOAD:@out@/lib/libssr-glinject.so" "$@" -diff --git a/src/AV/Input/GLInjectInput.cpp b/src/AV/Input/GLInjectInput.cpp -index fc98f31..18f5196 100644 ---- a/src/AV/Input/GLInjectInput.cpp -+++ b/src/AV/Input/GLInjectInput.cpp -@@ -113,7 +113,7 @@ bool ExecuteDetached(const char* command, const char* working_directory) { - - // try to execute command - do { -- res = execl("/bin/sh", "/bin/sh", "-c", command, (char*) NULL); -+ res = execl("@sh@", "@sh@", "-c", command, (char*) NULL); - } while(res == -1 and errno == EINTR); - - // failed, send feedback -@@ -207,7 +207,7 @@ void GLInjectInput::SetCapturing(bool capturing) { - bool GLInjectInput::LaunchApplication(const QString& channel, bool relax_permissions, const QString& command, const QString& working_directory) { - - // prepare command -- QString full_command = "LD_PRELOAD=\"libssr-glinject.so\" "; -+ QString full_command = "LD_PRELOAD=\"@out@/lib/libssr-glinject.so\" "; - full_command += "SSR_CHANNEL=\"" + ShellEscape(channel) + "\" "; - if(relax_permissions) - full_command += "SSR_STREAM_RELAX_PERMISSIONS=1 "; diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 742dd2d37c57a..88851516dd099 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -272,7 +272,7 @@ rec { To enable the docker daemon on NixOS, set the `virtualisation.docker.enable` option to `true`. ''; license = licenses.asl20; - maintainers = with maintainers; [ offline vdemeester periklis ]; + maintainers = with maintainers; [ offline vdemeester periklis teutat3s ]; mainProgram = "docker"; }; }); diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix index 1d5cb70e58861..a23ae61d598f0 100644 --- a/pkgs/applications/virtualization/podman/default.nix +++ b/pkgs/applications/virtualization/podman/default.nix @@ -65,13 +65,13 @@ let in buildGoModule rec { pname = "podman"; - version = "5.0.3"; + version = "5.1.0"; src = fetchFromGitHub { owner = "containers"; repo = "podman"; rev = "v${version}"; - hash = "sha256-PA7mKHPzPDFdwKXAHvHnDvHF+mTmm59jkoeUeiCP6vE="; + hash = "sha256-jmg/Yq80MasbW93BTo6p5EcEfNQVadeDmkYtiX7Ov1E="; }; patches = [ 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/applications/virtualization/tart/default.nix b/pkgs/applications/virtualization/tart/default.nix index 115499f9e413f..60a84cd306759 100644 --- a/pkgs/applications/virtualization/tart/default.nix +++ b/pkgs/applications/virtualization/tart/default.nix @@ -10,11 +10,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "tart"; - version = "2.11.0"; + version = "2.11.1"; src = fetchurl { url = "https://github.com/cirruslabs/tart/releases/download/${finalAttrs.version}/tart-arm64.tar.gz"; - hash = "sha256-Wf6JfEOUkCpUB0qsAGqh5v/sTV+iQ2NUmXKLyLgxgV0="; + hash = "sha256-LOU7nCJChXgYq10AeZVAMa/QSUD4AKUSLLUKUBrk4UA="; }; sourceRoot = "."; diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 3a9179b89d06b..9690ee757c0d5 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -28,26 +28,32 @@ assert enableKvm -> !enableHardening; # The web services use Java infrastructure. assert enableWebService -> javaBindings; -with lib; - let buildType = "release"; # Use maintainers/scripts/update.nix to update the version and all related hashes or # change the hashes in extpack.nix and guest-additions/default.nix as well manually. - version = "7.0.14"; + virtualboxVersion = "7.0.14"; + virtualboxSha256 = "45860d834804a24a163c1bb264a6b1cb802a5bc7ce7e01128072f8d6a4617ca9"; + + kvmPatchVersion = "20240502"; + kvmPatchHash = "sha256-KokIrrAoJutHzPg6e5YAJgDGs+nQoVjapmyn9kG5tV0="; # The KVM build is not compatible to VirtualBox's kernel modules. So don't export # modsrc at all. withModsrc = !enableKvm; virtualboxGuestAdditionsIso = callPackage guest-additions-iso/default.nix { }; -in stdenv.mkDerivation { + + inherit (lib) optional optionals optionalString getDev getLib; +in stdenv.mkDerivation (finalAttrs: { pname = "virtualbox"; - inherit version; + version = finalAttrs.virtualboxVersion; + + inherit buildType virtualboxVersion virtualboxSha256 kvmPatchVersion kvmPatchHash virtualboxGuestAdditionsIso; src = fetchurl { - url = "https://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2"; - sha256 = "45860d834804a24a163c1bb264a6b1cb802a5bc7ce7e01128072f8d6a4617ca9"; + url = "https://download.virtualbox.org/virtualbox/${finalAttrs.virtualboxVersion}/VirtualBox-${finalAttrs.virtualboxVersion}.tar.bz2"; + sha256 = finalAttrs.virtualboxSha256; }; outputs = [ "out" ] ++ optional withModsrc "modsrc"; @@ -74,7 +80,7 @@ in stdenv.mkDerivation { prePatch = '' set -x sed -e 's@MKISOFS --version@MKISOFS -version@' \ - -e 's@PYTHONDIR=.*@PYTHONDIR=${lib.optionalString pythonBindings python3}@' \ + -e 's@PYTHONDIR=.*@PYTHONDIR=${optionalString pythonBindings python3}@' \ -e 's@CXX_FLAGS="\(.*\)"@CXX_FLAGS="-std=c++11 \1"@' \ ${optionalString (!headless) '' -e 's@TOOLQT5BIN=.*@TOOLQT5BIN="${getDev qtbase}/bin"@' \ @@ -103,7 +109,7 @@ in stdenv.mkDerivation { # No update patch disables check for update function # https://bugs.launchpad.net/ubuntu/+source/virtualbox-ose/+bug/272212 (fetchpatch { - url = "https://salsa.debian.org/pkg-virtualbox-team/virtualbox/-/raw/debian/${version}-dfsg-1/debian/patches/16-no-update.patch"; + url = "https://salsa.debian.org/pkg-virtualbox-team/virtualbox/-/raw/debian/7.0.14-dfsg-1/debian/patches/16-no-update.patch"; hash = "sha256-UJHpuB6QB/BbxJorlqZXUF12lgq8gbLMRHRMsbyqRpY="; })] ++ [ ./extra_symbols.patch ] @@ -120,14 +126,11 @@ in stdenv.mkDerivation { }) # While the KVM patch should not break any other behavior if --with-kvm is not specified, # we don't take any chances and only apply it if people actually want to use KVM support. - ++ optional enableKvm (fetchpatch - (let - patchVersion = "20240502"; - in { - name = "virtualbox-${version}-kvm-dev-${patchVersion}.patch"; - url = "https://github.com/cyberus-technology/virtualbox-kvm/releases/download/dev-${patchVersion}/kvm-backend-${version}-dev-${patchVersion}.patch"; - hash = "sha256-KokIrrAoJutHzPg6e5YAJgDGs+nQoVjapmyn9kG5tV0="; - })) + ++ optional enableKvm (fetchpatch { + name = "virtualbox-${finalAttrs.virtualboxVersion}-kvm-dev-${finalAttrs.kvmPatchVersion}.patch"; + url = "https://github.com/cyberus-technology/virtualbox-kvm/releases/download/dev-${finalAttrs.kvmPatchVersion}/kvm-backend-${finalAttrs.virtualboxVersion}-dev-${finalAttrs.kvmPatchVersion}.patch"; + hash = finalAttrs.kvmPatchHash; + }) ++ [ ./qt-dependency-paths.patch # https://github.com/NixOS/nixpkgs/issues/123851 @@ -139,10 +142,6 @@ in stdenv.mkDerivation { postPatch = '' sed -i -e 's|/sbin/ifconfig|${nettools}/bin/ifconfig|' \ src/VBox/HostDrivers/adpctl/VBoxNetAdpCtl.cpp - '' + optionalString headless '' - # Fix compile error in version 6.1.6 - substituteInPlace src/VBox/HostServices/SharedClipboard/VBoxSharedClipboardSvc-x11-stubs.cpp \ - --replace PSHCLFORMATDATA PSHCLFORMATS ''; # first line: ugly hack, and it isn't yet clear why it's a problem @@ -163,6 +162,9 @@ in stdenv.mkDerivation { VBOX_WITH_RUNPATH := $out/libexec/virtualbox VBOX_PATH_APP_PRIVATE := $out/share/virtualbox VBOX_PATH_APP_DOCS := $out/doc + + VBOX_WITH_UPDATE_AGENT := + ${optionalString javaBindings '' VBOX_JAVA_HOME := ${jdk} ''} @@ -196,14 +198,14 @@ in stdenv.mkDerivation { -i AutoConfig.kmk sed -e 's@arch/x86/@@' \ -i Config.kmk - substituteInPlace Config.kmk --replace "VBOX_WITH_TESTCASES = 1" "#" + substituteInPlace Config.kmk --replace-fail "VBOX_WITH_TESTCASES = 1" "#" ''; enableParallelBuilding = true; buildPhase = '' source env.sh - kmk -j $NIX_BUILD_CORES BUILD_TYPE="${buildType}" + kmk -j $NIX_BUILD_CORES BUILD_TYPE="${finalAttrs.buildType}" ''; installPhase = '' @@ -212,7 +214,7 @@ in stdenv.mkDerivation { # Install VirtualBox files mkdir -p "$libexec" - find out/linux.*/${buildType}/bin -mindepth 1 -maxdepth 1 \ + find out/linux.*/${finalAttrs.buildType}/bin -mindepth 1 -maxdepth 1 \ -name src -o -exec cp -avt "$libexec" {} + mkdir -p $out/bin @@ -250,12 +252,12 @@ in stdenv.mkDerivation { ''} ${optionalString withModsrc '' - cp -rv out/linux.*/${buildType}/bin/src "$modsrc" + cp -rv out/linux.*/${finalAttrs.buildType}/bin/src "$modsrc" ''} mkdir -p "$out/share/virtualbox" cp -rv src/VBox/Main/UnattendedTemplates "$out/share/virtualbox" - ln -s "${virtualboxGuestAdditionsIso}" "$out/share/virtualbox/VBoxGuestAdditions.iso" + ln -s "${finalAttrs.virtualboxGuestAdditionsIso}" "$out/share/virtualbox/VBoxGuestAdditions.iso" ''; preFixup = optionalString (!headless) '' @@ -285,10 +287,10 @@ in stdenv.mkDerivation { fromSource binaryNativeCode ]; - license = licenses.gpl2; + license = lib.licenses.gpl2; homepage = "https://www.virtualbox.org/"; - maintainers = with maintainers; [ sander friedrichaltheide blitz ]; + maintainers = with lib.maintainers; [ sander friedrichaltheide blitz ]; platforms = [ "x86_64-linux" ]; mainProgram = "VirtualBox"; }; -} +}) diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/builder.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/builder.nix index 298acba8439de..f070f0df43223 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/builder.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/builder.nix @@ -1,11 +1,9 @@ { config, stdenv, kernel, fetchurl, lib, pam, libxslt , libX11, libXext, libXcursor, libXmu -, glib, alsa-lib, libXrandr, dbus +, glib, libXrandr, dbus, xz , pkg-config, which, zlib, xorg -, yasm, patchelf, makeWrapper, makeself, nasm -, linuxHeaders, openssl, libpulseaudio}: - -with lib; +, yasm, patchelf, makeself +, linuxHeaders, openssl}: let buildType = "release"; @@ -21,17 +19,21 @@ in stdenv.mkDerivation (finalAttrs: { env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types -Wno-error=implicit-function-declaration"; - nativeBuildInputs = [ patchelf makeWrapper pkg-config which yasm ]; - buildInputs = kernel.moduleBuildDependencies ++ [ libxslt libX11 libXext libXcursor - glib nasm alsa-lib makeself pam libXmu libXrandr linuxHeaders openssl libpulseaudio xorg.xorgserver ]; + nativeBuildInputs = [ patchelf pkg-config which yasm makeself xorg.xorgserver openssl linuxHeaders xz ] ++ kernel.moduleBuildDependencies; + buildInputs = [ dbus libxslt libXext libXcursor pam libXmu libXrandr ]; KERN_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; KERN_INCL = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/source/include"; prePatch = '' rm -r src/VBox/Additions/x11/x11include/ + rm -r src/VBox/Additions/3D/mesa/mesa-*/ rm -r src/libs/openssl-*/ rm -r src/libs/curl-*/ + rm -r src/libs/libpng-*/ + rm -r src/libs/libxml2-*/ + rm -r src/libs/liblzma-*/ + rm -r src/libs/zlib*/ ''; patches = [ @@ -81,6 +83,10 @@ in stdenv.mkDerivation (finalAttrs: { VBOX_USE_SYSTEM_XORG_HEADERS := 1 VBOX_USE_SYSTEM_GL_HEADERS := 1 VBOX_NO_LEGACY_XORG_X11 := 1 + SDK_VBoxLibPng_INCS := + SDK_VBoxLibXml2_INCS := + SDK_VBoxLibLzma_INCS := ${xz.dev}/include + SDK_VBoxLibLzma_LIBS := ${xz.out}/lib SDK_VBoxOpenSslStatic_INCS := ${openssl.dev}/include/ssl @@ -92,6 +98,9 @@ in stdenv.mkDerivation (finalAttrs: { VBOX_WITH_GUEST_CONTROL := 1 VBOX_WITHOUT_LINUX_GUEST_PACKAGE := 1 VBOX_WITH_PAM := + VBOX_WITH_UPDATE_AGENT := + VBOX_WITH_AUDIO_ALSA := + VBOX_WITH_AUDIO_PULSE := VBOX_BUILD_PUBLISHER := _NixOS LOCAL_CONFIG diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index ce23538ffc38e..ac867ce9ce720 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -34,16 +34,14 @@ in stdenv.mkDerivation { env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types -Wno-error=implicit-function-declaration"; - nativeBuildInputs = [ patchelf makeWrapper ]; - buildInputs = [ virtualBoxNixGuestAdditionsBuilder ] ++ kernel.moduleBuildDependencies; + nativeBuildInputs = [ patchelf makeWrapper virtualBoxNixGuestAdditionsBuilder ] ++ kernel.moduleBuildDependencies; + buildInputs = [ ]; buildPhase = '' runHook preBuild # Build kernel modules. - cd src - find . -type f | xargs sed 's/depmod -a/true/' -i - cd vboxguest-${virtualBoxNixGuestAdditionsBuilder.version}_NixOS + cd src/vboxguest-${virtualBoxNixGuestAdditionsBuilder.version}_NixOS # Run just make first. If we only did make install, we get symbol warnings during build. make cd ../.. @@ -61,6 +59,8 @@ in stdenv.mkDerivation { installPhase = '' runHook preInstall + mkdir -p $out/bin + # Install kernel modules. cd src/vboxguest-${virtualBoxNixGuestAdditionsBuilder.version}_NixOS make install INSTALL_MOD_PATH=$out KBUILD_EXTRA_SYMBOLS=$PWD/vboxsf/Module.symvers @@ -70,7 +70,6 @@ in stdenv.mkDerivation { install -D -m 755 other/mount.vboxsf $out/bin/mount.vboxsf install -D -m 755 sbin/VBoxService $out/bin/VBoxService - mkdir -p $out/bin install -m 755 bin/VBoxClient $out/bin install -m 755 bin/VBoxControl $out/bin install -m 755 bin/VBoxDRMClient $out/bin diff --git a/pkgs/applications/virtualization/virtualbox/update.sh b/pkgs/applications/virtualization/virtualbox/update.sh index 5269f85ee9389..f1b1d71a355c2 100755 --- a/pkgs/applications/virtualization/virtualbox/update.sh +++ b/pkgs/applications/virtualization/virtualbox/update.sh @@ -34,7 +34,9 @@ if [ ! "$oldVersion" = "$latestVersion" ]; then virtualBoxOldShaSum=$(oldHash ${attr}Extpack) extpackOldShaSum=$(oldHash ${attr}Extpack) - update-source-version $attr $latestVersion $virtualBoxShaSum + sed -e "s/virtualboxVersion =.*;/virtualboxVersion = \"$latestVersion\";/g" \ + -e "s/virtualboxSha256 =.*;/virtualboxSha256 = \"$virtualBoxShaSum\";/g" \ + -i $virtualboxNixFile sed -i -e 's|value = "'$extpackOldShaSum'"|value = "'$extpackShaSum'"|' $extpackNixFile sed -e "s/sha256 =.*;/sha256 = \"$guestAdditionsIsoShaSum\";/g" \ -i $guestAdditionsIsoNixFile diff --git a/pkgs/applications/window-managers/lemonbar/default.nix b/pkgs/applications/window-managers/lemonbar/default.nix index d5763a0489f1a..07b6d4353b51b 100644 --- a/pkgs/applications/window-managers/lemonbar/default.nix +++ b/pkgs/applications/window-managers/lemonbar/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "lemonbar"; - version = "1.4"; + version = "1.5"; src = fetchFromGitHub { owner = "LemonBoy"; repo = "bar"; rev = "v${version}"; - sha256 = "sha256-lmppcnQ8r4jEuhegpTBxYqxfTTS/IrbtQVZ44HqnoWo="; + sha256 = "sha256-OLhgu0kmMZhjv/VST8AXvIH+ysMq72m4TEOypdnatlU="; }; buildInputs = [ libxcb perl ]; 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/emacs/melpa.nix b/pkgs/build-support/emacs/melpa.nix index 323c6e65d9d90..c8f6567049180 100644 --- a/pkgs/build-support/emacs/melpa.nix +++ b/pkgs/build-support/emacs/melpa.nix @@ -35,25 +35,41 @@ in pname /* ename: Original Emacs package name, possibly containing special symbols. + Default: pname */ -, ename ? null +, ename ? pname , version -, recipe + /* + commit: Optional package history commit. + Default: src.rev or "unknown" + This will be written into the generated package but it is not needed during + the build process. + */ +, commit ? (args.src.rev or "unknown") + /* + files: Optional recipe property specifying the files used to build the package. + If null, do not set it in recipe, keeping the default upstream behaviour. + Default: null + */ +, files ? null + /* + recipe: Optional MELPA recipe. + Default: a minimally functional recipe + */ +, recipe ? (writeText "${pname}-recipe" '' + (${ename} :fetcher git :url "" + ${lib.optionalString (files != null) ":files ${files}"}) + '') , meta ? {} , ... }@args: genericBuild ({ - ename = - if ename == null - then pname - else ename; - elpa2nix = ./elpa2nix.el; melpa2nix = ./melpa2nix.el; - inherit packageBuild; + inherit packageBuild commit ename recipe; preUnpack = '' mkdir -p "$NIX_BUILD_TOP/recipes" 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/_6/_64gram/package.nix b/pkgs/by-name/_6/_64gram/package.nix index 67774f29c1e7a..a6c5564c1e57b 100644 --- a/pkgs/by-name/_6/_64gram/package.nix +++ b/pkgs/by-name/_6/_64gram/package.nix @@ -7,7 +7,7 @@ telegram-desktop.overrideAttrs (old: rec { pname = "64gram"; - version = "1.1.23"; + version = "1.1.24"; src = fetchFromGitHub { owner = "TDesktop-x64"; @@ -15,7 +15,7 @@ telegram-desktop.overrideAttrs (old: rec { rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-0/1qxz8MCDve8eazb9WT8t/UqWs/I1Mo9orhVXkxmqc="; + hash = "sha256-pAtV/uKWCh9sODCYXf6gM8B0i2o5OiVH7z2iLjIZKP0="; }; passthru.updateScript = nix-update-script {}; diff --git a/pkgs/by-name/ad/ad-miner/package.nix b/pkgs/by-name/ad/ad-miner/package.nix index 43170f87474e4..3987c12582c98 100644 --- a/pkgs/by-name/ad/ad-miner/package.nix +++ b/pkgs/by-name/ad/ad-miner/package.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "ad-miner"; - version = "1.2.0"; + version = "1.3.0"; pyproject = true; src = fetchFromGitHub { owner = "Mazars-Tech"; repo = "AD_Miner"; rev = "refs/tags/v${version}"; - hash = "sha256-o1RXuyX2dV0fQwXEeTgmeMYKXiKAqrl+fV8zi1J16Ic="; + hash = "sha256-MoU38UEhk9eUa+slXnYG1eOyDW79J0q5XiM+1UYIGaM="; }; # All requirements are pinned diff --git a/pkgs/by-name/ae/aegisub/package.nix b/pkgs/by-name/ae/aegisub/package.nix index cdec1259fd08b..aa15f116028a5 100644 --- a/pkgs/by-name/ae/aegisub/package.nix +++ b/pkgs/by-name/ae/aegisub/package.nix @@ -7,6 +7,7 @@ darwin, expat, fetchFromGitHub, + fetchpatch, ffmpeg, ffms, fftw, @@ -120,7 +121,13 @@ stdenv.mkDerivation (finalAttrs: { "relro" ]; - patches = lib.optionals (!useBundledLuaJIT) [ + patches = [ + (fetchpatch { + name = "move-iconv-include-to-charset_conv.h.patch"; + url = "https://github.com/arch1t3cht/Aegisub/commit/b8f4c98c4cbc698e4adbba302c2dc328fe193435.patch"; + hash = "sha256-dCm/VG+8yK7qWKWF4Ew/M2hbbAC/d3hiuRglR9BvWtw="; + }) + ] ++ lib.optionals (!useBundledLuaJIT) [ ./000-remove-bundled-luajit.patch ]; diff --git a/pkgs/by-name/au/audiness/package.nix b/pkgs/by-name/au/audiness/package.nix index 40dafa76288b8..f1f64afb3140f 100644 --- a/pkgs/by-name/au/audiness/package.nix +++ b/pkgs/by-name/au/audiness/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "audiness"; - version = "0.4.0"; + version = "0.5.0"; pyproject = true; src = fetchFromGitHub { owner = "audiusGmbH"; repo = "audiness"; rev = "refs/tags/${version}"; - hash = "sha256-UJe4ZawjAuUoSKEdIgjh8zZu/amYLZ8rpUDahSHokKA="; + hash = "sha256-+5NDea4p/JWEk305EhAtab3to36a74KR50eosw6c5qI="; }; pythonRelaxDeps = [ diff --git a/pkgs/tools/system/auto-cpufreq/fix-version-output.patch b/pkgs/by-name/au/auto-cpufreq/fix-version-output.patch index fad9f091da40e..be21ca889081d 100644 --- a/pkgs/tools/system/auto-cpufreq/fix-version-output.patch +++ b/pkgs/by-name/au/auto-cpufreq/fix-version-output.patch @@ -1,19 +1,17 @@ diff --git a/auto_cpufreq/core.py b/auto_cpufreq/core.py -index 99397a9..f3ef28f 100755 +index 58cedb7..89e77a4 100755 --- a/auto_cpufreq/core.py +++ b/auto_cpufreq/core.py -@@ -144,26 +144,10 @@ except PermissionError: - +@@ -136,26 +136,8 @@ except PermissionError: + # display running version of auto-cpufreq def app_version(): -+ print("auto-cpufreq version: @version@") -+ print("Git commit: v@version@") - +- - print("auto-cpufreq version: ", end="") - +- - # snap package - if os.getenv("PKG_MARKER") == "SNAP": -- print(getoutput("echo \(Snap\) $SNAP_VERSION")) +- print(getoutput(r"echo \(Snap\) $SNAP_VERSION")) - # aur package - elif dist_name in ["arch", "manjaro", "garuda"]: - aur_pkg_check = call("pacman -Qs auto-cpufreq > /dev/null", shell=True) @@ -28,6 +26,8 @@ index 99397a9..f3ef28f 100755 - except Exception as e: - print(repr(e)) - pass - def verify_update(): - # Specify the repository and package name - # IT IS IMPORTANT TO THAT IF THE REPOSITORY STRUCTURE IS CHANGED, THE FOLLOWING FUNCTION NEEDS TO BE UPDATED ACCORDINGLY \ No newline at end of file ++ print("auto-cpufreq version: @version@") ++ print("Git commit: v@version@") + + def check_for_update(): + # returns True if a new release is available from the GitHub repo diff --git a/pkgs/by-name/au/auto-cpufreq/package.nix b/pkgs/by-name/au/auto-cpufreq/package.nix new file mode 100644 index 0000000000000..4121096359c83 --- /dev/null +++ b/pkgs/by-name/au/auto-cpufreq/package.nix @@ -0,0 +1,100 @@ +{ + lib, + python3Packages, + fetchFromGitHub, + substituteAll, + gobject-introspection, + wrapGAppsHook3, + gtk3, +}: +python3Packages.buildPythonPackage rec { + pname = "auto-cpufreq"; + version = "2.3.0"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "AdnanHodzic"; + repo = "auto-cpufreq"; + rev = "v${version}"; + hash = "sha256-Bet/WOVveLIA+0Mvly4AsielR+r/AJXIgHdWrtc7i/U="; + }; + + nativeBuildInputs = [ + gobject-introspection + wrapGAppsHook3 + ]; + + buildInputs = [ + gtk3 + python3Packages.poetry-core + ]; + + propagatedBuildInputs = with python3Packages; [ + click + distro + psutil + pygobject3 + poetry-dynamic-versioning + setuptools + pyinotify + ]; + + doCheck = false; + pythonImportsCheck = [ "auto_cpufreq" ]; + + patches = [ + # hardcodes version output + (substituteAll { + src = ./fix-version-output.patch; + inherit version; + }) + + # patch to prevent script copying and to disable install + ./prevent-install-and-copy.patch + # patch to prevent update + ./prevent-update.patch + ]; + + postPatch = '' + substituteInPlace auto_cpufreq/core.py \ + --replace-fail '/opt/auto-cpufreq/override.pickle' /var/run/override.pickle + substituteInPlace scripts/org.auto-cpufreq.pkexec.policy \ + --replace-fail "/opt/auto-cpufreq/venv/bin/auto-cpufreq" $out/bin/auto-cpufreq + substituteInPlace auto_cpufreq/gui/app.py auto_cpufreq/gui/objects.py \ + --replace-fail "/usr/local/share/auto-cpufreq/images/icon.png" $out/share/pixmaps/auto-cpufreq.png + substituteInPlace auto_cpufreq/gui/app.py \ + --replace-fail "/usr/local/share/auto-cpufreq/scripts/style.css" $out/share/auto-cpufreq/scripts/style.css + ''; + + postInstall = '' + # copy script manually + cp ${src}/scripts/cpufreqctl.sh $out/bin/cpufreqctl.auto-cpufreq + + # copy css file + mkdir -p $out/share/auto-cpufreq/scripts + cp scripts/style.css $out/share/auto-cpufreq/scripts/style.css + + # systemd service + mkdir -p $out/lib/systemd/system + cp ${src}/scripts/auto-cpufreq.service $out/lib/systemd/system + + # desktop icon + mkdir -p $out/share/applications + mkdir $out/share/pixmaps + cp scripts/auto-cpufreq-gtk.desktop $out/share/applications + cp images/icon.png $out/share/pixmaps/auto-cpufreq.python3Packages + + # polkit policy + mkdir -p $out/share/polkit-1/actions + cp scripts/org.auto-cpufreq.pkexec.policy $out/share/polkit-1/actions + ''; + + meta = { + mainProgram = "auto-cpufreq"; + homepage = "https://github.com/AdnanHodzic/auto-cpufreq"; + description = "Automatic CPU speed & power optimizer for Linux"; + license = lib.licenses.lgpl3Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ Technical27 ]; + }; +} diff --git a/pkgs/tools/system/auto-cpufreq/prevent-install-and-copy.patch b/pkgs/by-name/au/auto-cpufreq/prevent-install-and-copy.patch index 9b5bffb5591ee..2b3c9de1b6b07 100644 --- a/pkgs/tools/system/auto-cpufreq/prevent-install-and-copy.patch +++ b/pkgs/by-name/au/auto-cpufreq/prevent-install-and-copy.patch @@ -1,8 +1,56 @@ +diff --git a/auto_cpufreq/bin/auto_cpufreq.py b/auto_cpufreq/bin/auto_cpufreq.py +index 4343b8d..dc286f6 100755 +--- a/auto_cpufreq/bin/auto_cpufreq.py ++++ b/auto_cpufreq/bin/auto_cpufreq.py +@@ -199,41 +199,9 @@ def main(config, daemon, debug, update, install, remove, live, log, monitor, sta + print("https://github.com/AdnanHodzic/auto-cpufreq/#donate") + footer() + elif install: +- if os.getenv("PKG_MARKER") == "SNAP": +- root_check() +- running_daemon_check() +- gnome_power_detect_snap() +- tlp_service_detect_snap() +- bluetooth_notif_snap() +- gov_check() +- run("snapctl set daemon=enabled", shell=True) +- run("snapctl start --enable auto-cpufreq", shell=True) +- deploy_complete_msg() +- else: +- root_check() +- running_daemon_check() +- gov_check() +- deploy_daemon() +- deploy_complete_msg() ++ print("install is disabled in the nix package") + elif remove: +- if os.getenv("PKG_MARKER") == "SNAP": +- root_check() +- run("snapctl set daemon=disabled", shell=True) +- run("snapctl stop --disable auto-cpufreq", shell=True) +- if auto_cpufreq_stats_path.exists(): +- if auto_cpufreq_stats_file is not None: +- auto_cpufreq_stats_file.close() +- +- auto_cpufreq_stats_path.unlink() +- # ToDo: +- # {the following snippet also used in --update, update it there too(if required)} +- # * undo bluetooth boot disable +- gnome_power_rm_reminder_snap() +- remove_complete_msg() +- else: +- root_check() +- remove_daemon() +- remove_complete_msg() ++ print("remove is disabled in the nix package") + elif update: + root_check() + custom_dir = "/opt/auto-cpufreq/source" diff --git a/auto_cpufreq/core.py b/auto_cpufreq/core.py -index 99397a9..48a377a 100755 +index 58cedb7..c50b0e1 100755 --- a/auto_cpufreq/core.py +++ b/auto_cpufreq/core.py -@@ -350,30 +334,13 @@ def get_current_gov(): +@@ -391,30 +391,13 @@ def get_current_gov(): def cpufreqctl(): @@ -37,7 +85,7 @@ index 99397a9..48a377a 100755 def footer(l=79): print("\n" + "-" * l + "\n") -@@ -400,30 +367,8 @@ def remove_complete_msg(): +@@ -441,30 +424,8 @@ def remove_complete_msg(): def deploy_daemon(): @@ -70,7 +118,7 @@ index 99397a9..48a377a 100755 def deploy_daemon_performance(): -@@ -463,40 +408,7 @@ def deploy_daemon_performance(): +@@ -504,40 +465,7 @@ def deploy_daemon_performance(): # remove auto-cpufreq daemon def remove_daemon(): @@ -112,52 +160,3 @@ index 99397a9..48a377a 100755 def gov_check(): - -diff --git a/bin/auto-cpufreq b/bin/auto-cpufreq -index b89d925..b73974c 100755 ---- a/bin/auto-cpufreq -+++ b/bin/auto-cpufreq -@@ -189,41 +189,9 @@ - print("https://github.com/AdnanHodzic/auto-cpufreq/#donate") - footer() - elif install: -- if os.getenv("PKG_MARKER") == "SNAP": -- root_check() -- running_daemon_check() -- gnome_power_detect_snap() -- tlp_service_detect_snap() -- bluetooth_notif_snap() -- gov_check() -- run("snapctl set daemon=enabled", shell=True) -- run("snapctl start --enable auto-cpufreq", shell=True) -- deploy_complete_msg() -- else: -- root_check() -- running_daemon_check() -- gov_check() -- deploy_daemon() -- deploy_complete_msg() -+ print("install is disabled in the nix package") - elif remove: -- if os.getenv("PKG_MARKER") == "SNAP": -- root_check() -- run("snapctl set daemon=disabled", shell=True) -- run("snapctl stop --disable auto-cpufreq", shell=True) -- if auto_cpufreq_stats_path.exists(): -- if auto_cpufreq_stats_file is not None: -- auto_cpufreq_stats_file.close() -- -- auto_cpufreq_stats_path.unlink() -- # ToDo: -- # {the following snippet also used in --update, update it there too(if required)} -- # * undo bluetooth boot disable -- gnome_power_rm_reminder_snap() -- remove_complete_msg() -- else: -- root_check() -- remove_daemon() -- remove_complete_msg() -+ print("remove is disabled in the nix package") - elif update: - root_check() - if os.getenv("PKG_MARKER") == "SNAP": \ No newline at end of file diff --git a/pkgs/by-name/au/auto-cpufreq/prevent-update.patch b/pkgs/by-name/au/auto-cpufreq/prevent-update.patch new file mode 100644 index 0000000000000..840c7230313d7 --- /dev/null +++ b/pkgs/by-name/au/auto-cpufreq/prevent-update.patch @@ -0,0 +1,152 @@ +diff --git a/auto_cpufreq/bin/auto_cpufreq.py b/auto_cpufreq/bin/auto_cpufreq.py +index 4343b8d..183c2e9 100755 +--- a/auto_cpufreq/bin/auto_cpufreq.py ++++ b/auto_cpufreq/bin/auto_cpufreq.py +@@ -235,47 +235,7 @@ def main(config, daemon, debug, update, install, remove, live, log, monitor, sta + remove_daemon() + remove_complete_msg() + elif update: +- root_check() +- custom_dir = "/opt/auto-cpufreq/source" +- for arg in sys.argv: +- if arg.startswith("--update="): +- custom_dir = arg.split("=")[1] +- sys.argv.remove(arg) +- +- if "--update" in sys.argv: +- update = True +- sys.argv.remove("--update") +- if len(sys.argv) == 2: +- custom_dir = sys.argv[1] +- +- if os.getenv("PKG_MARKER") == "SNAP": +- print("Detected auto-cpufreq was installed using snap") +- # refresh snap directly using this command +- # path wont work in this case +- +- print("Please update using snap package manager, i.e: `sudo snap refresh auto-cpufreq`.") +- #check for AUR +- elif subprocess.run(["bash", "-c", "command -v pacman >/dev/null 2>&1"]).returncode == 0 and subprocess.run(["bash", "-c", "pacman -Q auto-cpufreq >/dev/null 2>&1"]).returncode == 0: +- print("Arch-based distribution with AUR support detected. Please refresh auto-cpufreq using your AUR helper.") +- else: +- is_new_update = check_for_update() +- if not is_new_update: +- return +- ans = input("Do you want to update auto-cpufreq to the latest release? [Y/n]: ").strip().lower() +- if not os.path.exists(custom_dir): +- os.makedirs(custom_dir) +- if os.path.exists(os.path.join(custom_dir, "auto-cpufreq")): +- shutil.rmtree(os.path.join(custom_dir, "auto-cpufreq")) +- if ans in ['', 'y', 'yes']: +- remove_daemon() +- remove_complete_msg() +- new_update(custom_dir) +- print("enabling daemon") +- run(["auto-cpufreq", "--install"]) +- print("auto-cpufreq is installed with the latest version") +- run(["auto-cpufreq", "--version"]) +- else: +- print("Aborted") ++ print("update is disabled in the nix package") + + elif completions: + if completions == "bash": +diff --git a/auto_cpufreq/core.py b/auto_cpufreq/core.py +index 58cedb7..8b44712 100755 +--- a/auto_cpufreq/core.py ++++ b/auto_cpufreq/core.py +@@ -17,8 +17,7 @@ import importlib.metadata + from math import isclose + from pathlib import Path + from shutil import which +-from subprocess import getoutput, call, run, check_output, DEVNULL +-import requests ++from subprocess import getoutput, call, run, DEVNULL + import re + + # execution timestamp used in countdown func +@@ -158,55 +157,7 @@ def app_version(): + pass + + def check_for_update(): +- # returns True if a new release is available from the GitHub repo +- +- # Specify the repository and package name +- # IT IS IMPORTANT TO THAT IF THE REPOSITORY STRUCTURE IS CHANGED, THE FOLLOWING FUNCTION NEEDS TO BE UPDATED ACCORDINGLY +- # Fetch the latest release information from GitHub API +- latest_release_url = f"https://api.github.com/repos/AdnanHodzic/auto-cpufreq/releases/latest" +- try: +- response = requests.get(latest_release_url) +- if response.status_code == 200: +- latest_release = response.json() +- else: +- message = response.json().get("message") +- print("Error fetching recent release!") +- if message is not None and message.startswith("API rate limit exceeded"): +- print("GitHub Rate limit exceeded. Please try again later within 1 hour or use different network/VPN.") +- else: +- print("Unexpected status code:", response.status_code) +- return False +- except (requests.exceptions.ConnectionError, requests.exceptions.Timeout, +- requests.exceptions.RequestException, requests.exceptions.HTTPError) as err: +- print("Error Connecting to server!") +- return False +- +- latest_version = latest_release.get("tag_name") +- +- if latest_version is not None: +- # Get the current version of auto-cpufreq +- # Extract version number from the output string +- output = check_output(['auto-cpufreq', '--version']).decode('utf-8') +- try: +- version_line = next((re.search(r'\d+\.\d+\.\d+', line).group() for line in output.split('\n') if line.startswith('auto-cpufreq version')), None) +- except AttributeError: +- print("Error Retrieving Current Version!") +- exit(1) +- installed_version = "v" + version_line +- #Check whether the same is installed or not +- # Compare the latest version with the installed version and perform update if necessary +- if latest_version == installed_version: +- print("auto-cpufreq is up to date") +- return False +- else: +- print(f"Updates are available,\nCurrent version: {installed_version}\nLatest version: {latest_version}") +- print("Note that your previous custom settings might be erased with the following update") +- return True +- else: +- # Handle the case where "tag_name" key doesn't exist +- print("Malformed Released data!\nReinstall manually or Open an issue on GitHub for help!") +- +- ++ pass + + def new_update(custom_dir): + os.chdir(custom_dir) +diff --git a/poetry.lock b/poetry.lock +index 2a99ca6..9bc26e2 100644 +--- a/poetry.lock ++++ b/poetry.lock +@@ -1,4 +1,4 @@ +-# This file is automatically @generated by Poetry 1.8.2 and should not be changed by hand. ++# This file is automatically @generated by Poetry 1.8.3 and should not be changed by hand. + + [[package]] + name = "attrs" +@@ -1300,4 +1300,4 @@ testing = ["big-O", "jaraco.functools", "jaraco.itertools", "more-itertools", "p + [metadata] + lock-version = "2.0" + python-versions = "^3.8" +-content-hash = "ee73b2db6a43cac87120f38c93d0a8a297bec52f1346b55bc0ca2992aa464482" ++content-hash = "1ba0c404ffea01a611e7c74f9c104de44a914b0a6fad2350470f15880931ae42" +diff --git a/pyproject.toml b/pyproject.toml +index 876d80c..7190356 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -25,7 +25,6 @@ python = "^3.8" + psutil = {git = "https://github.com/giampaolo/psutil.git", rev = "4cf56e08c1bc883ec89758834b50954380759858"} + click = "^8.1.0" + distro = "^1.8.0" +-requests = "^2.31.0" + PyGObject = "^3.46.0" + pyinotify = {git = "https://github.com/shadeyg56/pyinotify-3.12"} + diff --git a/pkgs/by-name/bi/bicep/package.nix b/pkgs/by-name/bi/bicep/package.nix index 7cd6a06463f37..bdfdd74606fdb 100644 --- a/pkgs/by-name/bi/bicep/package.nix +++ b/pkgs/by-name/bi/bicep/package.nix @@ -1,9 +1,10 @@ -{ lib -, stdenv -, buildDotnetModule -, fetchFromGitHub -, dotnetCorePackages -, mono +{ + lib, + stdenv, + buildDotnetModule, + fetchFromGitHub, + dotnetCorePackages, + mono, }: buildDotnetModule rec { @@ -34,11 +35,11 @@ buildDotnetModule rec { passthru.updateScript = ./updater.sh; meta = { - broken = stdenv.isDarwin; description = "Domain Specific Language (DSL) for deploying Azure resources declaratively"; homepage = "https://github.com/Azure/bicep/"; changelog = "https://github.com/Azure/bicep/releases/tag/v${version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ khaneliman ]; + mainProgram = "bicep"; }; } 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/cc/ccache/package.nix b/pkgs/by-name/cc/ccache/package.nix index 393857f1fe4d6..f39066fba2895 100644 --- a/pkgs/by-name/cc/ccache/package.nix +++ b/pkgs/by-name/cc/ccache/package.nix @@ -1,30 +1,38 @@ -{ lib -, stdenv -, fetchFromGitHub -, substituteAll -, binutils -, asciidoctor -, cmake -, perl -, zstd -, bashInteractive -, xcodebuild -, makeWrapper -, nix-update-script +{ + lib, + stdenv, + fetchFromGitHub, + substituteAll, + binutils, + asciidoctor, + cmake, + perl, + fmt, + hiredis, + xxHash, + zstd, + bashInteractive, + doctest, + xcodebuild, + makeWrapper, + nix-update-script, }: stdenv.mkDerivation (finalAttrs: { pname = "ccache"; - version = "4.9.1"; + version = "4.10"; src = fetchFromGitHub { owner = "ccache"; repo = "ccache"; rev = "refs/tags/v${finalAttrs.version}"; - sha256 = "sha256-n0MTq8x6KNkgwhJQG7F+e3iCOS644nLkMsiRztJe8QU="; + sha256 = "sha256-0T9iJXnDX8LffhB/5hsfBNyZQ211f0lL/7dvTrjmiE0="; }; - outputs = [ "out" "man" ]; + outputs = [ + "out" + "man" + ]; patches = [ # When building for Darwin, test/run uses dwarfdump, whereas on @@ -39,32 +47,47 @@ stdenv.mkDerivation (finalAttrs: { }) ]; - nativeBuildInputs = [ asciidoctor cmake perl ]; - buildInputs = [ zstd ]; + strictDeps = true; + + nativeBuildInputs = [ + asciidoctor + cmake + perl + ]; - cmakeFlags = [ - # Build system does not autodetect redis library presence. - # Requires explicit flag. - "-DREDIS_STORAGE_BACKEND=OFF" + buildInputs = [ + fmt + hiredis + xxHash + zstd ]; + cmakeFlags = lib.optional (!finalAttrs.finalPackage.doCheck) "-DENABLE_TESTING=OFF"; + doCheck = true; + nativeCheckInputs = [ # test/run requires the compgen function which is available in # bashInteractive, but not bash. bashInteractive ] ++ lib.optional stdenv.isDarwin xcodebuild; + checkInputs = [ + doctest + ]; + checkPhase = let - badTests = [ - "test.trim_dir" # flaky on hydra (possibly filesystem-specific?) - ] ++ lib.optionals stdenv.isDarwin [ - "test.basedir" - "test.fileclone" # flaky on hydra (possibly filesystem-specific?) - "test.multi_arch" - "test.nocpp2" - ]; + badTests = + [ + "test.trim_dir" # flaky on hydra (possibly filesystem-specific?) + ] + ++ lib.optionals stdenv.isDarwin [ + "test.basedir" + "test.fileclone" # flaky on hydra (possibly filesystem-specific?) + "test.multi_arch" + "test.nocpp2" + ]; in '' runHook preCheck @@ -76,53 +99,59 @@ stdenv.mkDerivation (finalAttrs: { passthru = { # A derivation that provides gcc and g++ commands, but that # will end up calling ccache for the given cacheDir - links = { unwrappedCC, extraConfig }: stdenv.mkDerivation { - pname = "ccache-links"; - inherit (finalAttrs) version; - passthru = { - isClang = unwrappedCC.isClang or false; - isGNU = unwrappedCC.isGNU or false; - isCcache = true; + links = + { unwrappedCC, extraConfig }: + stdenv.mkDerivation { + pname = "ccache-links"; + inherit (finalAttrs) version; + passthru = { + isClang = unwrappedCC.isClang or false; + isGNU = unwrappedCC.isGNU or false; + isCcache = true; + }; + inherit (unwrappedCC) lib; + nativeBuildInputs = [ makeWrapper ]; + # Unwrapped clang does not have a targetPrefix because it is multi-target + # target is decided with argv0. + buildCommand = + let + targetPrefix = + if unwrappedCC.isClang or false then + "" + else + (lib.optionalString ( + unwrappedCC ? targetConfig && unwrappedCC.targetConfig != null && unwrappedCC.targetConfig != "" + ) "${unwrappedCC.targetConfig}-"); + in + '' + mkdir -p $out/bin + + wrap() { + local cname="${targetPrefix}$1" + if [ -x "${unwrappedCC}/bin/$cname" ]; then + makeWrapper ${finalAttrs.finalPackage}/bin/ccache $out/bin/$cname \ + --run ${lib.escapeShellArg extraConfig} \ + --add-flags ${unwrappedCC}/bin/$cname + fi + } + + wrap cc + wrap c++ + wrap gcc + wrap g++ + wrap clang + wrap clang++ + + for executable in $(ls ${unwrappedCC}/bin); do + if [ ! -x "$out/bin/$executable" ]; then + ln -s ${unwrappedCC}/bin/$executable $out/bin/$executable + fi + done + for file in $(ls ${unwrappedCC} | grep -vw bin); do + ln -s ${unwrappedCC}/$file $out/$file + done + ''; }; - inherit (unwrappedCC) lib; - nativeBuildInputs = [ makeWrapper ]; - # Unwrapped clang does not have a targetPrefix because it is multi-target - # target is decided with argv0. - buildCommand = let - targetPrefix = if unwrappedCC.isClang or false - then - "" - else - (lib.optionalString (unwrappedCC ? targetConfig && unwrappedCC.targetConfig != null && unwrappedCC.targetConfig != "") "${unwrappedCC.targetConfig}-"); - in '' - mkdir -p $out/bin - - wrap() { - local cname="${targetPrefix}$1" - if [ -x "${unwrappedCC}/bin/$cname" ]; then - makeWrapper ${finalAttrs.finalPackage}/bin/ccache $out/bin/$cname \ - --run ${lib.escapeShellArg extraConfig} \ - --add-flags ${unwrappedCC}/bin/$cname - fi - } - - wrap cc - wrap c++ - wrap gcc - wrap g++ - wrap clang - wrap clang++ - - for executable in $(ls ${unwrappedCC}/bin); do - if [ ! -x "$out/bin/$executable" ]; then - ln -s ${unwrappedCC}/bin/$executable $out/bin/$executable - fi - done - for file in $(ls ${unwrappedCC} | grep -vw bin); do - ln -s ${unwrappedCC}/$file $out/$file - done - ''; - }; updateScript = nix-update-script { }; }; @@ -136,7 +165,10 @@ stdenv.mkDerivation (finalAttrs: { }"; license = licenses.gpl3Plus; mainProgram = "ccache"; - maintainers = with maintainers; [ kira-bruneau r-burns ]; + maintainers = with maintainers; [ + kira-bruneau + r-burns + ]; platforms = platforms.unix; }; }) diff --git a/pkgs/by-name/ch/chezmoi/package.nix b/pkgs/by-name/ch/chezmoi/package.nix index afb575230e4c0..abe81e3225d35 100644 --- a/pkgs/by-name/ch/chezmoi/package.nix +++ b/pkgs/by-name/ch/chezmoi/package.nix @@ -8,16 +8,16 @@ let argset = { pname = "chezmoi"; - version = "2.48.1"; + version = "2.48.2"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; rev = "v${argset.version}"; - hash = "sha256-v24gS80s7dTDlOO9ouf+Am7KyZPTBWzjG+HyBfFZynw="; + hash = "sha256-Ikxp8PJ72UCRYmaoloruVdIpi46nF41bi7RK0rPvs1E="; }; - vendorHash = "sha256-8KcseMkYww+Ccaw+ovwXhakO9ira2TRI4uQ5TbCZcSE="; + vendorHash = "sha256-151l+yen1QI5DiYJgBvWV/OlbnE72ecmMtHUBRhxQM4="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/cl/clipcat/package.nix b/pkgs/by-name/cl/clipcat/package.nix index 68e6744bd1752..da6118d901cf7 100644 --- a/pkgs/by-name/cl/clipcat/package.nix +++ b/pkgs/by-name/cl/clipcat/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "clipcat"; - version = "0.17.0"; + version = "0.18.0"; src = fetchFromGitHub { owner = "xrelkd"; repo = pname; rev = "v${version}"; - hash = "sha256-e95h8YBVLcy9vubdJpfmeystT2Qw0Y8kap9IbTJW+s8="; + hash = "sha256-i+5hUwarJHa3QzHPqJ0N/gztKWoRCKXsEbX3Q/1PQ9Q="; }; - cargoHash = "sha256-+73vnGcdCDRMrav/Pi4Z37IlbArJ/SlYishz9KhF4x0="; + cargoHash = "sha256-lPH2v+OfO/NCLdAVvPbIgAeVAOWHjhNIOap94p0+NR0="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa diff --git a/pkgs/by-name/cl/cloudlogoffline/package.nix b/pkgs/by-name/cl/cloudlogoffline/package.nix index cc945302bf06d..04e6f0ed2c32a 100644 --- a/pkgs/by-name/cl/cloudlogoffline/package.nix +++ b/pkgs/by-name/cl/cloudlogoffline/package.nix @@ -1,15 +1,15 @@ { lib , stdenv , fetchFromGitHub -, qt5 +, qt6 , makeDesktopItem , copyDesktopItems }: stdenv.mkDerivation (self: { pname = "cloudlogoffline"; - version = "1.1.4"; - rev = "185f294ec36d7ebe40e37d70148b15f58d60bf0d"; - hash = "sha256-UEi7q3NbTgkg4tSjiksEO05YE4yjRul4qB9hFPswnK0="; + version = "1.1.5"; + rev = self.version; + hash = "sha256-CF56yk7hsM4M43le+CLy93oLyZ9kaqaRTFWtjJuF6Vo="; src = fetchFromGitHub { inherit (self) rev hash; @@ -18,20 +18,18 @@ stdenv.mkDerivation (self: { }; nativeBuildInputs = [ - qt5.qmake - qt5.wrapQtAppsHook + qt6.qmake + qt6.wrapQtAppsHook ] ++ lib.optionals (!stdenv.isDarwin) [ copyDesktopItems ]; buildInputs = [ - qt5.qtbase - qt5.qtgraphicaleffects - qt5.qtlocation - qt5.qtpositioning - qt5.qtquickcontrols2 - qt5.qtsvg + qt6.qtbase + qt6.qtlocation + qt6.qtpositioning + qt6.qtsvg ]; postPatch = let @@ -44,6 +42,15 @@ stdenv.mkDerivation (self: { postInstall = lib.optionalString (!stdenv.isDarwin) '' install -d $out/share/pixmaps install -m644 images/logo_circle.svg $out/share/pixmaps/cloudlogoffline.svg + '' + lib.optionalString stdenv.isDarwin '' + # FIXME: For some reason, the Info.plist isn't copied correctly to + # the application bundle when building normally, instead creating an + # empty file. This doesn't happen when building in a dev shell with + # genericBuild. + # So, just copy the file manually. + plistPath="$out/Applications/CloudLogOffline.app/Contents/Info.plist" + [[ -s "$plistPath" ]] && { echo "expected Info.plist to be empty; workaround no longer needed?"; exit 1; } + install -m644 macos/Info.plist $out/Applications/CloudLogOffline.app/Contents/Info.plist ''; desktopItems = lib.optionals (!stdenv.isDarwin) [ 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/dg/dgoss/package.nix b/pkgs/by-name/dg/dgoss/package.nix index cf396e70829e9..55014119c8265 100644 --- a/pkgs/by-name/dg/dgoss/package.nix +++ b/pkgs/by-name/dg/dgoss/package.nix @@ -1,22 +1,17 @@ -{ lib -, fetchFromGitHub -, resholve -, bash -, coreutils -, goss -, which +{ + bash, + coreutils, + gnused, + goss, + lib, + resholve, + which, }: resholve.mkDerivation rec { pname = "dgoss"; - version = "0.4.6"; - - src = fetchFromGitHub { - owner = "goss-org"; - repo = "goss"; - rev = "refs/tags/v${version}"; - hash = "sha256-4LJD70Y6nxRWdcaPe074iP2MVUMDgoTOwWbC1JecVcI="; - }; + version = goss.version; + src = goss.src; dontConfigure = true; dontBuild = true; @@ -30,7 +25,11 @@ resholve.mkDerivation rec { default = { scripts = [ "bin/dgoss" ]; interpreter = "${bash}/bin/bash"; - inputs = [ coreutils which ]; + inputs = [ + coreutils + gnused + which + ]; keep = { "$CONTAINER_RUNTIME" = true; }; diff --git a/pkgs/by-name/e1/e1s/package.nix b/pkgs/by-name/e1/e1s/package.nix index b13d5ff947e44..7b9b3b7272b0d 100644 --- a/pkgs/by-name/e1/e1s/package.nix +++ b/pkgs/by-name/e1/e1s/package.nix @@ -1,7 +1,7 @@ { stdenv, lib, buildGoModule, fetchFromGitHub }: let pname = "e1s"; - version = "1.0.34"; + version = "1.0.36"; in buildGoModule { inherit pname version; @@ -10,10 +10,10 @@ buildGoModule { owner = "keidarcy"; repo = "e1s"; rev = "refs/tags/v${version}"; - hash = "sha256-fxo7TQjFrp2BbXz7bwMC5AuacKpyi5UmAMEVBmR91ko="; + hash = "sha256-i2XCys/fXNS7aXxpAPVqFpuQGempcsBEbVuphXPpBIc="; }; - vendorHash = "sha256-pM6win2W6HqjIg9QBblDl3ptKEI6sANliXkpwlFnTb0="; + vendorHash = "sha256-fTrKqhfUg+/4xid9YWkTNkXm3HGaoeeJU0RIMW2mtq8="; meta = with lib; { description = "Easily Manage AWS ECS Resources in Terminal 🐱"; 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/fa/fastfetch/package.nix b/pkgs/by-name/fa/fastfetch/package.nix index e9394ab922670..2441f765482e6 100644 --- a/pkgs/by-name/fa/fastfetch/package.nix +++ b/pkgs/by-name/fa/fastfetch/package.nix @@ -47,13 +47,13 @@ let in stdenv'.mkDerivation (finalAttrs: { pname = "fastfetch"; - version = "2.13.2"; + version = "2.14.0"; src = fetchFromGitHub { owner = "fastfetch-cli"; repo = "fastfetch"; rev = finalAttrs.version; - hash = "sha256-Wt+HFl+HJKMzC8O0JslVLpHFrmVVSBpac79TsKVpz+k="; + hash = "sha256-RJDRxH9VKNxBSfoFl1rDTeKKyLC3C09F0Z3ksJoMDRk="; }; outputs = [ "out" "man" ]; diff --git a/pkgs/by-name/ga/gate/package.nix b/pkgs/by-name/ga/gate/package.nix index 454af42d9bae7..fd416bbef51ad 100644 --- a/pkgs/by-name/ga/gate/package.nix +++ b/pkgs/by-name/ga/gate/package.nix @@ -5,7 +5,7 @@ let pname = "gate"; - version = "0.36.7"; + version = "0.37.0"; in buildGoModule { inherit pname version; @@ -14,10 +14,10 @@ buildGoModule { owner = "minekube"; repo = "gate"; rev = "refs/tags/v${version}"; - hash = "sha256-WHxpx20O/HuCWqbY4zTxcjyIhW3+FQtTz5sUGAda71g="; + hash = "sha256-TsyiAPhSjz7xzvxx6EJswwUasMr/GCf+QXcSFgaG1Ko="; }; - vendorHash = "sha256-dswNJQWqN+u/mnpbj9se2j9uEi0ewNTXVlN3WnNbcyg="; + vendorHash = "sha256-Ls99x08erFM6iP0UlMteafD4FCiq6HMF2ME89jyOEdE="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/by-name/gm/gmic-qt/package.nix b/pkgs/by-name/gm/gmic-qt/package.nix index 8c3ff6ce4aeff..389f366680c14 100644 --- a/pkgs/by-name/gm/gmic-qt/package.nix +++ b/pkgs/by-name/gm/gmic-qt/package.nix @@ -49,13 +49,13 @@ assert lib.assertMsg stdenv.mkDerivation (finalAttrs: { pname = "gmic-qt${lib.optionalString (variant != "standalone") "-${variant}"}"; - version = "3.3.5"; + version = "3.3.6"; src = fetchFromGitHub { owner = "c-koi"; repo = "gmic-qt"; rev = "v.${finalAttrs.version}"; - hash = "sha256-WApuIWqVgVJAM2WdfOiqoQ2U+9kIuq8fy6wvJ55KoIc="; + hash = "sha256-0MtQTc2nUF8N1IDIcRxGqfXKULl9ZjnqDt4q84jA5ow="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/go/goss/package.nix b/pkgs/by-name/go/goss/package.nix index 5501d07e134fe..672800e410d4d 100644 --- a/pkgs/by-name/go/goss/package.nix +++ b/pkgs/by-name/go/goss/package.nix @@ -14,25 +14,23 @@ buildGoModule rec { pname = "goss"; - - # Don't forget to update dgoss to the same version. - version = "0.4.6"; + version = "0.4.7"; src = fetchFromGitHub { owner = "goss-org"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-4LJD70Y6nxRWdcaPe074iP2MVUMDgoTOwWbC1JecVcI="; + hash = "sha256-KP0i+ePmkx43MdokVQO3CvTsdIFO7rCWLd8vJVC9Qf0="; }; - vendorHash = "sha256-5/vpoJZu/swNwQQXtW6wuEVCtOq6HsbFywuipaiwHfs="; + vendorHash = "sha256-VLIDAlLO6COGDKDN12bYIBluFVgqPEmm8QRfSNPfLJY="; CGO_ENABLED = 0; ldflags = [ "-s" "-w" - "-X main.version=v${version}" + "-X github.com/goss-org/goss/util.Version=v${version}" ]; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/gr/grafana-kiosk/package.nix b/pkgs/by-name/gr/grafana-kiosk/package.nix index d9f21655d1cc8..452ec1977a9ff 100644 --- a/pkgs/by-name/gr/grafana-kiosk/package.nix +++ b/pkgs/by-name/gr/grafana-kiosk/package.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "grafana-kiosk"; - version = "1.0.6"; + version = "1.0.7"; src = fetchFromGitHub { owner = "grafana"; repo = "grafana-kiosk"; rev = "v${version}"; - hash = "sha256-KXEbhRFD++VeVI1Fbrai+IYb3lyGKs+plYPoKIZD0JM="; + hash = "sha256-JTz3EaedJFWE3YqsBLjKH4hWI7+dNeMlp0sZ2kW8IR8="; }; - vendorHash = "sha256-sXaxyPNuHDUOkYcWYm94YvJmr1mGe4HdzttWrNSK2Pw="; + vendorHash = "sha256-8sxfbSj0Jq5f0oJoe8PtP72PDWvLzgOeRiP7I/Pfam4="; nativeBuildInputs = [ makeWrapper ]; postFixup = '' diff --git a/pkgs/by-name/gu/gungnir/package.nix b/pkgs/by-name/gu/gungnir/package.nix index 04f02865c4b9b..bf77713f3b02c 100644 --- a/pkgs/by-name/gu/gungnir/package.nix +++ b/pkgs/by-name/gu/gungnir/package.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "gungnir"; - version = "1.0.8"; + version = "1.0.9"; src = fetchFromGitHub { owner = "g0ldencybersec"; repo = "gungnir"; rev = "v${version}"; - hash = "sha256-k6fxAvUBAAcTHzdeGhekYhPpnS05jHq/7EqxafQfMio="; + hash = "sha256-A4MPRsUSeYwKlhCHByty6T33wEp/BopZMDWOnOqlQqQ="; }; vendorHash = "sha256-r2aU59L0fnSdc/lpR04K/GQ1eZ7ihV+tKlyuS6sPX2o="; diff --git a/pkgs/tools/package-management/harmonia/default.nix b/pkgs/by-name/ha/harmonia/package.nix index 8e174cf68a891..a8f4c4b09d6bb 100644 --- a/pkgs/tools/package-management/harmonia/default.nix +++ b/pkgs/by-name/ha/harmonia/package.nix @@ -12,16 +12,18 @@ rustPlatform.buildRustPackage rec { pname = "harmonia"; - version = "0.7.5"; + version = "0.8.0"; src = fetchFromGitHub { owner = "nix-community"; repo = pname; rev = "refs/tags/${pname}-v${version}"; - hash = "sha256-QqRq5maYk4hDl0MXkj9wOPWUta5b+kXG9e/kqRorNE4="; + hash = "sha256-+V0V/l9Q7HR3J0aH1UWc1qHrpGiRWd6B4R+3MECFORg="; }; - cargoHash = "sha256-dlmSn4cWU6RqEiUoQYNJFhxu3owplkxlbtszBxm+GbU="; + cargoHash = "sha256-3Nx1YXjbYVOD7pYgI9Cp5Vsxv1j1XeX6pCl4+Q1OtVs="; + + doCheck = false; nativeBuildInputs = [ pkg-config nixVersions.nix_2_21 diff --git a/pkgs/by-name/he/hermitcli/package.nix b/pkgs/by-name/he/hermitcli/package.nix index fd0c79cb99bde..7da06c3a54fbe 100644 --- a/pkgs/by-name/he/hermitcli/package.nix +++ b/pkgs/by-name/he/hermitcli/package.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "hermit"; - version = "0.39.1"; + version = "0.39.2"; src = fetchFromGitHub { rev = "v${version}"; owner = "cashapp"; repo = "hermit"; - hash = "sha256-ukg/KQTLG2F7mDNgoUr8GEKnkFHEJtVpwDs+DiLXvlM="; + hash = "sha256-By6ZWOiv1A7wghIGD6+oGoBic9puo4M+DzsM/7fOpy8="; }; - vendorHash = "sha256-1QMZvxy6cCJVoIP8mG7s4V0nBAGhrHoPbiKKyYDDL2g="; + vendorHash = "sha256-vEv/sciynvxQE7KpxqpaSO1p5R3xYBK6o4EeuJ2JYmg="; subPackages = [ "cmd/hermit" ]; diff --git a/pkgs/by-name/hu/hugo/package.nix b/pkgs/by-name/hu/hugo/package.nix index 7e590a5dee61f..6b6a9088f1622 100644 --- a/pkgs/by-name/hu/hugo/package.nix +++ b/pkgs/by-name/hu/hugo/package.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "hugo"; - version = "0.126.1"; + version = "0.126.2"; src = fetchFromGitHub { owner = "gohugoio"; repo = "hugo"; rev = "refs/tags/v${version}"; - hash = "sha256-c421kzgD6PFM/9Rn+NmZGyRlJPWhQPraW/4HcuRoEUU="; + hash = "sha256-ySXnJJJDjZqZkWOiq9ByflfUG6bg+0GSzuXpNnuyMZc="; }; vendorHash = "sha256-VfwiA5LCAJ1pkmMCy/Dcc5bLKkNY1MHtxHcHvKLoWHs="; diff --git a/pkgs/tools/networking/hurl/default.nix b/pkgs/by-name/hu/hurl/package.nix index cd474a3e6f64c..bb40d40896a78 100644 --- a/pkgs/tools/networking/hurl/default.nix +++ b/pkgs/by-name/hu/hurl/package.nix @@ -39,6 +39,13 @@ rustPlatform.buildRustPackage rec { postInstall = '' installManPage docs/manual/hurl.1 docs/manual/hurlfmt.1 + installShellCompletion --cmd hurl \ + --bash completions/hurl.bash \ + --zsh completions/_hurl \ + --fish completions/hurl.fish + + installShellCompletion --cmd hurlfmt \ + --zsh completions/_hurlfmt ''; meta = with lib; { diff --git a/pkgs/by-name/in/incus/package.nix b/pkgs/by-name/in/incus/package.nix index be289a05e0772..e5249ac1d48f5 100644 --- a/pkgs/by-name/in/incus/package.nix +++ b/pkgs/by-name/in/incus/package.nix @@ -1,6 +1,6 @@ import ./generic.nix { - hash = "sha256-BFB4bdfh3hI7D1m7a20ckPPyP9CYXW7mjqeTZ/21Gqs="; - version = "6.1.0"; - vendorHash = "sha256-a8ZPhzs7sNIJLjQ9Y87Zf9SXAsmbdVn250Q0OQwy69A="; + hash = "sha256-33qUmET1BYAv6e8ZaFNSa7jrn8WGf3BqY8Nud/ZywSY="; + version = "6.2.0"; + vendorHash = "sha256-dFg3LSG/ao73ODWcPDq5s9xUjuHabCMOB2AtngNCrlA="; patches = [ ]; } diff --git a/pkgs/by-name/in/intiface-central/package.nix b/pkgs/by-name/in/intiface-central/package.nix index 6424f523b3b96..186c4918b9940 100644 --- a/pkgs/by-name/in/intiface-central/package.nix +++ b/pkgs/by-name/in/intiface-central/package.nix @@ -11,12 +11,12 @@ }: flutterPackages.v3_19.buildFlutterApplication rec { pname = "intiface-central"; - version = "2.5.6"; + version = "2.6.0"; src = fetchFromGitHub { owner = "intiface"; repo = pname; rev = "v${version}"; - hash = "sha256-EcOFiaWqljNZIvsCkhuCEChEC51ERxM74EYE6u7Q4U8="; + hash = "sha256-7+rw0cD8MJPFOkgmfHD6y+EojTGQhb15o1mn2p14eoE="; }; patches = [ ./corrosion.patch @@ -28,7 +28,7 @@ flutterPackages.v3_19.buildFlutterApplication rec { name = "${pname}-${version}-cargo-deps"; inherit src; sourceRoot = "${src.name}/intiface-engine-flutter-bridge"; - hash = "sha256-tkJcwT2lt8+FT9GZ0ROrm1jkOxoq875O3wZkgZl22r4="; + hash = "sha256-tPkLZmHReY1TU2qcY4aGWsQPhLFowrqxTPwmTHZ5fDE="; }; cargoRoot = "intiface-engine-flutter-bridge"; diff --git a/pkgs/by-name/in/intiface-central/pubspec.lock.json b/pkgs/by-name/in/intiface-central/pubspec.lock.json index e27fd28e9fe08..d3f088c6623de 100644 --- a/pkgs/by-name/in/intiface-central/pubspec.lock.json +++ b/pkgs/by-name/in/intiface-central/pubspec.lock.json @@ -230,6 +230,16 @@ "source": "hosted", "version": "1.18.0" }, + "console": { + "dependency": "transitive", + "description": { + "name": "console", + "sha256": "e04e7824384c5b39389acdd6dc7d33f3efe6b232f6f16d7626f194f6a01ad69a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.1.0" + }, "convert": { "dependency": "transitive", "description": { @@ -466,6 +476,16 @@ "source": "hosted", "version": "0.6.18+2" }, + "flutter_multi_slider": { + "dependency": "direct main", + "description": { + "name": "flutter_multi_slider", + "sha256": "3c4603999f5c399b57b5a85086cf92c8870e726fe07fd63bc3968bd3e564518b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.1" + }, "flutter_rust_bridge": { "dependency": "direct main", "description": { @@ -508,6 +528,16 @@ "source": "hosted", "version": "3.2.0" }, + "get_it": { + "dependency": "transitive", + "description": { + "name": "get_it", + "sha256": "d85128a5dae4ea777324730dc65edd9c9f43155c109d5cc0a69cab74139fbac1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.7.0" + }, "github": { "dependency": "direct main", "description": { @@ -738,6 +768,16 @@ "source": "hosted", "version": "1.0.4" }, + "msix": { + "dependency": "direct dev", + "description": { + "name": "msix", + "sha256": "519b183d15dc9f9c594f247e2d2339d855cf0eaacc30e19b128e14f3ecc62047", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.16.7" + }, "multicast_dns": { "dependency": "direct main", "description": { 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/libfmvoice/package.nix b/pkgs/by-name/li/libfmvoice/package.nix index 06284bfd5eafb..294b9c34c6b42 100644 --- a/pkgs/by-name/li/libfmvoice/package.nix +++ b/pkgs/by-name/li/libfmvoice/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libfmvoice"; - version = "0.0.0-unstable-2023-12-05"; + version = "0-unstable-2024-05-30"; src = fetchFromGitHub { owner = "vampirefrog"; repo = "libfmvoice"; - rev = "38b1a0c627ef66fcd9c672c215d2b9849163df12"; - hash = "sha256-kXthY9TynIXNX9wmgn13vs4Mrrv/dmEr7zlWiKstjGk="; + rev = "0e58cfb323dc6461c705a5fadac4362a17fbec4e"; + hash = "sha256-HyGB180roo28vJ+11/ocoKu1kHpn6GxtEg9NluQsECg="; }; strictDeps = true; 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/li/limine/package.nix b/pkgs/by-name/li/limine/package.nix index 464c57dce72e0..22eb4625cb560 100644 --- a/pkgs/by-name/li/limine/package.nix +++ b/pkgs/by-name/li/limine/package.nix @@ -12,7 +12,7 @@ }: let - version = "7.5.2"; + version = "7.5.3"; in # The output of the derivation is a tool to create bootable images using Limine # as bootloader for various platforms and corresponding binary and helper files. @@ -24,7 +24,7 @@ stdenv.mkDerivation { # Packaging that in Nix is very cumbersome. src = fetchurl { url = "https://github.com/limine-bootloader/limine/releases/download/v${version}/limine-${version}.tar.gz"; - sha256 = "sha256-l9ax89rNbQs8eNyuljdEXCvY5GRXsN9qzIDrsi76iEg="; + sha256 = "sha256-zuBHPuS+vdtSDfoRm6J0VdIYV3MtZtwW5qzCjDNmQKk="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ll/llama-cpp/package.nix b/pkgs/by-name/ll/llama-cpp/package.nix index 5488e10a87f66..2f9fc3fdbc09b 100644 --- a/pkgs/by-name/ll/llama-cpp/package.nix +++ b/pkgs/by-name/ll/llama-cpp/package.nix @@ -22,12 +22,11 @@ , pkg-config , metalSupport ? stdenv.isDarwin && stdenv.isAarch64 && !openclSupport , vulkanSupport ? false -, mpiSupport ? false # Increases the runtime closure by ~700M +, rpcSupport ? false , vulkan-headers , vulkan-loader , ninja , git -, mpi }: let @@ -35,7 +34,7 @@ let # otherwise we get libstdc++ errors downstream. # cuda imposes an upper bound on the gcc version, e.g. the latest gcc compatible with cudaPackages_11 is gcc11 effectiveStdenv = if cudaSupport then cudaPackages.backendStdenv else stdenv; - inherit (lib) cmakeBool cmakeFeature optionals; + inherit (lib) cmakeBool cmakeFeature optionals optionalString; darwinBuildInputs = with darwin.apple_sdk.frameworks; @@ -72,13 +71,13 @@ let in effectiveStdenv.mkDerivation (finalAttrs: { pname = "llama-cpp"; - version = "2953"; + version = "3015"; src = fetchFromGitHub { owner = "ggerganov"; repo = "llama.cpp"; rev = "refs/tags/b${finalAttrs.version}"; - hash = "sha256-IqR0tdTdrydrMCgOfNbRnVESN3pEzti3bAuTH9i3wQQ="; + hash = "sha256-/n5SiTU5//Vx/vtIev8Yxc/xYwjxVpPhiTr1LnDp4fs="; leaveDotGit = true; postFetch = '' git -C "$out" rev-parse --short HEAD > $out/COMMIT @@ -103,7 +102,6 @@ effectiveStdenv.mkDerivation (finalAttrs: { buildInputs = optionals effectiveStdenv.isDarwin darwinBuildInputs ++ optionals cudaSupport cudaBuildInputs - ++ optionals mpiSupport [ mpi ] ++ optionals openclSupport [ clblast ] ++ optionals rocmSupport rocmBuildInputs ++ optionals blasSupport [ blas ] @@ -120,7 +118,7 @@ effectiveStdenv.mkDerivation (finalAttrs: { (cmakeBool "LLAMA_CUDA" cudaSupport) (cmakeBool "LLAMA_HIPBLAS" rocmSupport) (cmakeBool "LLAMA_METAL" metalSupport) - (cmakeBool "LLAMA_MPI" mpiSupport) + (cmakeBool "LLAMA_RPC" rpcSupport) (cmakeBool "LLAMA_VULKAN" vulkanSupport) ] ++ optionals cudaSupport [ @@ -144,6 +142,11 @@ effectiveStdenv.mkDerivation (finalAttrs: { ++ optionals metalSupport [ (cmakeFeature "CMAKE_C_FLAGS" "-D__ARM_FEATURE_DOTPROD=1") (cmakeBool "LLAMA_METAL_EMBED_LIBRARY" true) + ] ++ optionals rpcSupport [ + "-DLLAMA_RPC=ON" + # This is done so we can move rpc-server out of bin because llama.cpp doesn't + # install rpc-server in their install target. + "-DCMAKE_SKIP_BUILD_RPATH=ON" ]; # upstream plans on adding targets at the cmakelevel, remove those @@ -153,7 +156,7 @@ effectiveStdenv.mkDerivation (finalAttrs: { mv $out/bin/server $out/bin/llama-server mkdir -p $out/include cp $src/llama.h $out/include/ - ''; + '' + optionalString rpcSupport "cp bin/rpc-server $out/bin/llama-rpc-server"; passthru.updateScript = nix-update-script { attrPath = "llama-cpp"; diff --git a/pkgs/by-name/lu/lunacy/package.nix b/pkgs/by-name/lu/lunacy/package.nix index 1e3ad510bf9ef..8f55e067126d2 100644 --- a/pkgs/by-name/lu/lunacy/package.nix +++ b/pkgs/by-name/lu/lunacy/package.nix @@ -14,15 +14,16 @@ , libXcursor , openssl , imagemagick +, makeWrapper }: stdenv.mkDerivation (finalAttrs: { pname = "lunacy"; - version = "9.6.0"; + version = "9.6.1"; src = fetchurl { url = "https://lcdn.icons8.com/setup/Lunacy_${finalAttrs.version}.deb"; - hash = "sha256-PvQGDUC9BsIql4xMM1OH45gq3YtJMKJcYg4N2o18hno="; + hash = "sha256-w7qw5HyJcEjeujz54bTkkofmzacIBLYqJvVuldvbytE="; }; unpackCmd = '' @@ -47,6 +48,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ dpkg autoPatchelfHook + makeWrapper ]; # adds to the RPATHS of all shared objects (exe and libs) @@ -82,22 +84,22 @@ stdenv.mkDerivation (finalAttrs: { # Prepare the desktop icon, the upstream icon is 200x200 but the hicolor theme does not # support this resolution. Nearest sizes are 192x192 and 256x256. ${imagemagick}/bin/convert "opt/icons8/lunacy/Assets/LunacyLogo.png" -resize 192x192 lunacy.png - install -D lunacy.png "$out/share/icons/hicolor/192x192/apps/${finalAttrs.pname}.png" + install -D lunacy.png "$out/share/icons/hicolor/192x192/apps/lunacy.png" runHook postInstall ''; postInstall = '' substituteInPlace $out/share/applications/lunacy.desktop \ - --replace "Exec=/opt/icons8/lunacy/Lunacy" "Exec=${finalAttrs.pname}" \ - --replace "Icon=/opt/icons8/lunacy/Assets/LunacyLogo.png" "Icon=${finalAttrs.pname}" + --replace "Exec=/opt/icons8/lunacy/Lunacy" "Exec=lunacy" \ + --replace "Icon=/opt/icons8/lunacy/Assets/LunacyLogo.png" "Icon=lunacy" ''; postFixup = '' mkdir $out/bin - # Fixes runtime error regarding missing libSkiaSharp.so (which is in the same directory as the binary). - ln -s "$out/lib/lunacy/Lunacy" "$out/bin/${finalAttrs.pname}" + # The wrapper is needed instead of a symlink to prevent a random "Unsupported file format" when running the app. + makeWrapper "$out/lib/lunacy/Lunacy" "$out/bin/lunacy" ''; meta = with lib; { diff --git a/pkgs/by-name/lx/lxgw-neoxihei/package.nix b/pkgs/by-name/lx/lxgw-neoxihei/package.nix index b3175e871b816..0794bc8c9d2e9 100644 --- a/pkgs/by-name/lx/lxgw-neoxihei/package.nix +++ b/pkgs/by-name/lx/lxgw-neoxihei/package.nix @@ -5,11 +5,11 @@ stdenvNoCC.mkDerivation rec { pname = "lxgw-neoxihei"; - version = "1.121"; + version = "1.123"; src = fetchurl { url = "https://github.com/lxgw/LxgwNeoXiHei/releases/download/v${version}/LXGWNeoXiHei.ttf"; - hash = "sha256-3+th4alWV+i9kRT4F5tx8kOD4j8emcN2melcyN/mMMQ="; + hash = "sha256-tXsJyz8O6Resenjp4ODS3YAYjE8pM0j/JiaCRQWmT9g="; }; dontUnpack = true; diff --git a/pkgs/by-name/ma/matugen/package.nix b/pkgs/by-name/ma/matugen/package.nix index d739ed720ef04..d762c65a753cf 100644 --- a/pkgs/by-name/ma/matugen/package.nix +++ b/pkgs/by-name/ma/matugen/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "matugen"; - version = "2.2.0"; + version = "2.3.0"; src = fetchFromGitHub { owner = "InioX"; repo = "matugen"; rev = "v${version}"; - hash = "sha256-4VX7Rt+ftEH8nwg59eT7TsvHYUf8/euUmwh/JLc4rLc="; + hash = "sha256-WFitpFF1Ah4HkzSe4H4aN/ZM0EEIcP5ozLMUWaDggFU="; }; - cargoHash = "sha256-axBdOzCUwseV2ltgarmIS3IOYLX3q3rXeA2y6y7aNFI="; + cargoHash = "sha256-pD1NKUJmvMTnYKWjRrGnvbA0zVvGpWRIlf/9ovP9Jq4="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security diff --git a/pkgs/by-name/me/mealie/mealie-frontend.nix b/pkgs/by-name/me/mealie/mealie-frontend.nix index a98d22761e71e..477dcd993abcf 100644 --- a/pkgs/by-name/me/mealie/mealie-frontend.nix +++ b/pkgs/by-name/me/mealie/mealie-frontend.nix @@ -6,7 +6,7 @@ src: version: yarnOfflineCache = fetchYarnDeps { yarnLock = "${src}/frontend/yarn.lock"; - hash = "sha256-zQUD/PQWzp2Q6fiVmLicvSusXffu6s9q3x/aAUnCN38="; + hash = "sha256-a2kIOQHaMzaMWId6+SSYN+SPQM2Ipa+F1ztFZgo3R6A="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/me/mealie/mealie-logs-to-stdout.patch b/pkgs/by-name/me/mealie/mealie-logs-to-stdout.patch deleted file mode 100644 index 521c5cebcf74d..0000000000000 --- a/pkgs/by-name/me/mealie/mealie-logs-to-stdout.patch +++ /dev/null @@ -1,103 +0,0 @@ -diff --git a/mealie/core/root_logger.py b/mealie/core/root_logger.py -index 29db504f..3da5ef84 100644 ---- a/mealie/core/root_logger.py -+++ b/mealie/core/root_logger.py -@@ -9,7 +9,6 @@ DATA_DIR = determine_data_dir() - - from .config import get_app_settings # noqa E402 - --LOGGER_FILE = DATA_DIR.joinpath("mealie.log") - DATE_FORMAT = "%d-%b-%y %H:%M:%S" - LOGGER_FORMAT = "%(levelname)s: %(asctime)s \t%(message)s" - -@@ -40,19 +39,17 @@ def get_logger_config(): - level=log_level, - ) - -- output_file_handler = logging.FileHandler(LOGGER_FILE) - handler_format = logging.Formatter(LOGGER_FORMAT, datefmt=DATE_FORMAT) -- output_file_handler.setFormatter(handler_format) - - # Stdout - stdout_handler = logging.StreamHandler(sys.stdout) - stdout_handler.setFormatter(handler_format) - - return LoggerConfig( -- handlers=[output_file_handler, stdout_handler], -+ handlers=[stdout_handler], - format="%(levelname)s: %(asctime)s \t%(message)s", - date_format="%d-%b-%y %H:%M:%S", -- logger_file=LOGGER_FILE, -+ logger_file=None, - level=log_level, - ) - -diff --git a/mealie/routes/admin/admin_log.py b/mealie/routes/admin/admin_log.py -index ac12c12e..0de98b99 100644 ---- a/mealie/routes/admin/admin_log.py -+++ b/mealie/routes/admin/admin_log.py -@@ -1,6 +1,5 @@ - from fastapi import APIRouter - --from mealie.core.root_logger import LOGGER_FILE - from mealie.core.security import create_file_token - - router = APIRouter(prefix="/logs") -@@ -9,15 +8,13 @@ router = APIRouter(prefix="/logs") - @router.get("/{num}") - async def get_log(num: int): - """Doc Str""" -- with open(LOGGER_FILE, "rb") as f: -- log_text = tail(f, num) -- return log_text -+ return "" - - - @router.get("") - async def get_log_file(): - """Returns a token to download a file""" -- return {"fileToken": create_file_token(LOGGER_FILE)} -+ return {"fileToken": create_file_token("nofile")} - - - def tail(f, lines=20): -diff --git a/mealie/routes/admin/admin_maintenance.py b/mealie/routes/admin/admin_maintenance.py -index 23ef8369..322b580f 100644 ---- a/mealie/routes/admin/admin_maintenance.py -+++ b/mealie/routes/admin/admin_maintenance.py -@@ -6,7 +6,6 @@ from pathlib import Path - - from fastapi import APIRouter, HTTPException - --from mealie.core.root_logger import LOGGER_FILE - from mealie.pkgs.stats import fs_stats - from mealie.routes._base import BaseAdminController, controller - from mealie.schema.admin import MaintenanceSummary -@@ -73,8 +72,6 @@ class AdminMaintenanceController(BaseAdminController): - Get the maintenance summary - """ - log_file_size = 0 -- with contextlib.suppress(FileNotFoundError): -- log_file_size = os.path.getsize(LOGGER_FILE) - - return MaintenanceSummary( - data_dir_size=fs_stats.pretty_size(fs_stats.get_dir_size(self.folders.DATA_DIR)), -@@ -85,7 +82,7 @@ class AdminMaintenanceController(BaseAdminController): - - @router.get("/logs", response_model=MaintenanceLogs) - def get_logs(self, lines: int = 200): -- return MaintenanceLogs(logs=tail_log(LOGGER_FILE, lines)) -+ return MaintenanceLogs(logs="") - - @router.get("/storage", response_model=MaintenanceStorageDetails) - def get_storage_details(self): -@@ -137,9 +134,6 @@ class AdminMaintenanceController(BaseAdminController): - Purges the logs - """ - try: -- with contextlib.suppress(FileNotFoundError): -- os.remove(LOGGER_FILE) -- LOGGER_FILE.touch() - return SuccessResponse.respond("Logs cleaned") - except Exception as e: - raise HTTPException(status_code=500, detail=ErrorResponse.respond("Failed to clean logs")) from e diff --git a/pkgs/by-name/me/mealie/package.nix b/pkgs/by-name/me/mealie/package.nix index 0bd096f7977c3..18d6ab736e68b 100644 --- a/pkgs/by-name/me/mealie/package.nix +++ b/pkgs/by-name/me/mealie/package.nix @@ -1,7 +1,6 @@ { lib , callPackage , fetchFromGitHub -, fetchpatch , makeWrapper , nixosTests , python3Packages @@ -10,21 +9,17 @@ }: let - version = "1.2.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = "mealie-recipes"; repo = "mealie"; rev = "v${version}"; - sha256 = "sha256-Kc49XDWcZLeJaYgiAO2/mHeVSOLMeiPr3U32e0IYfdU="; + hash = "sha256-z7kLBDzvzPWY7XmpROMpw3LcDpsl+hA+w1SdhrD/yNU="; }; frontend = callPackage (import ./mealie-frontend.nix src version) { }; - pythonpkgs = python3Packages.override { - overrides = self: super: { - pydantic = python3Packages.pydantic_1; - }; - }; + pythonpkgs = python3Packages; python = pythonpkgs.python; crfpp = stdenv.mkDerivation { @@ -37,34 +32,11 @@ let hash = "sha256-XNps3ZApU8m07bfPEnvip1w+3hLajdn9+L5+IpEaP0c="; }; }; - - mealie_patch = { name, commit, hash }: fetchpatch { - inherit name hash; - url = "https://github.com/mealie-recipes/mealie/commit/${commit}.patch"; - }; - in pythonpkgs.buildPythonPackage rec { pname = "mealie"; inherit version src; pyproject = true; - patches = [ - # See https://github.com/mealie-recipes/mealie/pull/3102 - # Replace hardcoded paths in code with environment variables (meant for inside Docker only) - # So we can configure easily where the data is stored on the server - (mealie_patch { - name = "model-path.patch"; - commit = "e445705c5d26b895d806b96b2f330d4e9aac3723"; - hash = "sha256-cf0MwvT81lNBTjvag8UUEbXkBu8Jyi/LFwUcs4lBVcY="; - }) - (mealie_patch { - name = "alembic-cfg-path.patch"; - commit = "06c528bfac0708af66aa0629f2e2232ddf07768f"; - hash = "sha256-IOgdZK7dmWeX2ox16J9v+bOS7nHgCMvCJy6RNJLj0p8="; - }) - ./mealie-logs-to-stdout.patch - ]; - nativeBuildInputs = [ pythonpkgs.poetry-core pythonpkgs.pythonRelaxDepsHook @@ -82,6 +54,7 @@ in pythonpkgs.buildPythonPackage rec { aniso8601 appdirs apprise + authlib bcrypt extruct fastapi @@ -90,15 +63,16 @@ in pythonpkgs.buildPythonPackage rec { httpx jinja2 lxml + openai orjson paho-mqtt - passlib pillow + pillow-heif psycopg2 + pydantic-settings pyhumps - pytesseract + pyjwt python-dotenv - python-jose python-ldap python-multipart python-slugify @@ -160,7 +134,7 @@ in pythonpkgs.buildPythonPackage rec { homepage = "https://mealie.io"; changelog = "https://github.com/mealie-recipes/mealie/releases/tag/${src.rev}"; license = licenses.agpl3Only; - maintainers = with maintainers; [ litchipi ]; + maintainers = with maintainers; [ litchipi anoa ]; mainProgram = "mealie"; }; } diff --git a/pkgs/by-name/me/mercure/package.nix b/pkgs/by-name/me/mercure/package.nix index 0e8cc02fbe724..a806b7f115408 100644 --- a/pkgs/by-name/me/mercure/package.nix +++ b/pkgs/by-name/me/mercure/package.nix @@ -8,18 +8,18 @@ buildGoModule rec { pname = "mercure"; - version = "0.15.11"; + version = "0.16.0"; src = fetchFromGitHub { owner = "dunglas"; repo = "mercure"; rev = "v${version}"; - hash = "sha256-qPKfF0awRsMfXu7N/xNwFVmmuqTMGsDDqrVgt6LwviI="; + hash = "sha256-HHErk1KX8HgAt4UrBuchK6ysNsxEsrf5uBzzvSNz+to="; }; sourceRoot = "${src.name}/caddy"; - vendorHash = "sha256-evUGa1kFWbj0ynDQruBRDx2opzh7Tc7eHnWn3H4xwxY="; + vendorHash = "sha256-aO0EvxZNOCAaqEWN1VIdPpS+y8KcsuXo7o8msicspNE="; subPackages = [ "mercure" ]; excludedPackages = [ "../cmd/mercure" ]; 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..8bc033168ccf0 100644 --- a/pkgs/by-name/me/meson/package.nix +++ b/pkgs/by-name/me/meson/package.nix @@ -4,6 +4,8 @@ , installShellFiles , coreutils , darwin +, libblocksruntime +, llvmPackages , libxcrypt , openldap , ninja @@ -66,9 +68,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") [ @@ -93,6 +102,11 @@ python3.pkgs.buildPythonApplication rec { OpenAL OpenGL openldap + ] ++ lib.optionals (stdenv.cc.isClang && !stdenv.isDarwin) [ + # https://github.com/mesonbuild/meson/blob/bd3f1b2e0e70ef16dfa4f441686003212440a09b/test%20cases/common/184%20openmp/meson.build + llvmPackages.openmp + # https://github.com/mesonbuild/meson/blob/1670fca36fcb1a4fe4780e96731e954515501a35/test%20cases/frameworks/29%20blocks/meson.build + libblocksruntime ]; checkPhase = lib.concatStringsSep "\n" ([ @@ -106,7 +120,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 +130,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/by-name/ne/neovide/package.nix b/pkgs/by-name/ne/neovide/package.nix index a4c8791c5aa6d..47dfa348169d3 100644 --- a/pkgs/by-name/ne/neovide/package.nix +++ b/pkgs/by-name/ne/neovide/package.nix @@ -26,16 +26,16 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec { pname = "neovide"; - version = "0.13.0"; + version = "0.13.1"; src = fetchFromGitHub { owner = "neovide"; repo = "neovide"; rev = version; - sha256 = "sha256-lYahMSaagT6DloFMXT2lLPM1xX/9IEGNIPvbo1MQgSw="; + hash = "sha256-vN4LwJdVU0OWBuG7omDYY3Q6QZ2pTyCxWxFzv9Z1/6I="; }; - cargoHash = "sha256-g/Ezyz2gC1YaPMdIy/WdoOvezJUH3aB2FA87viahRzc="; + cargoHash = "sha256-TiGEAwNXBNTXVU/CyKrUkjy8eIypYiLtoTyjskMpWvs="; SKIA_SOURCE_DIR = let @@ -44,7 +44,7 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec { repo = "skia"; # see rust-skia:skia-bindings/Cargo.toml#package.metadata skia rev = "m124-0.72.3"; - sha256 = "sha256-zlHUJUXukE4CsXwwmVl3KHf9mnNPT8lC/ETEE15Gb4s="; + hash = "sha256-zlHUJUXukE4CsXwwmVl3KHf9mnNPT8lC/ETEE15Gb4s="; }; # The externals for skia are taken from skia/DEPS externals = linkFarm "skia-externals" (lib.mapAttrsToList diff --git a/pkgs/by-name/ne/netease-cloud-music-gtk/Cargo.lock b/pkgs/by-name/ne/netease-cloud-music-gtk/Cargo.lock index 8bf8172424599..2e116556b7744 100644 --- a/pkgs/by-name/ne/netease-cloud-music-gtk/Cargo.lock +++ b/pkgs/by-name/ne/netease-cloud-music-gtk/Cargo.lock @@ -10,9 +10,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "aho-corasick" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" dependencies = [ "memchr", ] @@ -34,47 +34,48 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.13" +version = "0.6.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb" +checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b" dependencies = [ "anstyle", "anstyle-parse", "anstyle-query", "anstyle-wincon", "colorchoice", + "is_terminal_polyfill", "utf8parse", ] [[package]] name = "anstyle" -version = "1.0.6" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" +checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b" [[package]] name = "anstyle-parse" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" +checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" +checksum = "a64c907d4e79225ac72e2a354c9ce84d50ebb4586dee56c82b3ee73004f537f5" dependencies = [ "windows-sys 0.52.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.2" +version = "3.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" +checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19" dependencies = [ "anstyle", "windows-sys 0.52.0", @@ -82,18 +83,20 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.80" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ad32ce52e4161730f7098c077cd2ed6229b5804ccf99e5366be1ab72a98b4e1" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" [[package]] name = "async-broadcast" -version = "0.5.1" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c48ccdbf6ca6b121e0f586cbc0e73ae440e56c67c30fa0873b4e110d9c26d2b" +checksum = "258b52a1aa741b9f09783b2d86cf0aeeb617bbf847f6933340a39644227acbdb" dependencies = [ - "event-listener 2.5.3", + "event-listener 5.3.1", + "event-listener-strategy 0.5.2", "futures-core", + "pin-project-lite", ] [[package]] @@ -109,61 +112,38 @@ dependencies = [ [[package]] name = "async-channel" -version = "2.2.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f28243a43d821d11341ab73c80bed182dc015c514b951616cf79bd4af39af0c3" +checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a" dependencies = [ "concurrent-queue", - "event-listener 5.2.0", - "event-listener-strategy 0.5.0", + "event-listener-strategy 0.5.2", "futures-core", "pin-project-lite", ] [[package]] name = "async-executor" -version = "1.8.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ae5ebefcc48e7452b4987947920dac9450be1110cadf34d1b8c116bdbaf97c" +checksum = "c8828ec6e544c02b0d6691d21ed9f9218d0384a82542855073c2a3f58304aaf0" dependencies = [ - "async-lock 3.3.0", "async-task", "concurrent-queue", - "fastrand 2.0.1", - "futures-lite 2.2.0", + "fastrand 2.1.0", + "futures-lite 2.3.0", "slab", ] [[package]] name = "async-fs" -version = "1.6.0" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "279cf904654eeebfa37ac9bb1598880884924aab82e290aa65c9e77a0e142e06" +checksum = "ebcd09b382f40fcd159c2d695175b2ae620ffa5f3bd6f664131efff4e8b9e04a" dependencies = [ - "async-lock 2.8.0", - "autocfg", + "async-lock", "blocking", - "futures-lite 1.13.0", -] - -[[package]] -name = "async-io" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" -dependencies = [ - "async-lock 2.8.0", - "autocfg", - "cfg-if", - "concurrent-queue", - "futures-lite 1.13.0", - "log", - "parking", - "polling 2.8.0", - "rustix 0.37.27", - "slab", - "socket2 0.4.10", - "waker-fn", + "futures-lite 2.3.0", ] [[package]] @@ -172,14 +152,14 @@ version = "2.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dcccb0f599cfa2f8ace422d3555572f47424da5648a4382a9dd0310ff8210884" dependencies = [ - "async-lock 3.3.0", + "async-lock", "cfg-if", "concurrent-queue", "futures-io", - "futures-lite 2.2.0", + "futures-lite 2.3.0", "parking", - "polling 3.5.0", - "rustix 0.38.31", + "polling 3.7.0", + "rustix", "slab", "tracing", "windows-sys 0.52.0", @@ -187,15 +167,6 @@ dependencies = [ [[package]] name = "async-lock" -version = "2.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" -dependencies = [ - "event-listener 2.5.3", -] - -[[package]] -name = "async-lock" version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d034b430882f8381900d3fe6f0aaa3ad94f2cb4ac519b429692a1bc2dda4ae7b" @@ -207,65 +178,68 @@ dependencies = [ [[package]] name = "async-process" -version = "1.8.1" +version = "2.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea6438ba0a08d81529c69b36700fa2f95837bfe3e776ab39cde9c14d9149da88" +checksum = "a53fc6301894e04a92cb2584fedde80cb25ba8e02d9dc39d4a87d036e22f397d" dependencies = [ - "async-io 1.13.0", - "async-lock 2.8.0", + "async-channel 2.3.1", + "async-io", + "async-lock", "async-signal", + "async-task", "blocking", "cfg-if", - "event-listener 3.1.0", - "futures-lite 1.13.0", - "rustix 0.38.31", - "windows-sys 0.48.0", + "event-listener 5.3.1", + "futures-lite 2.3.0", + "rustix", + "tracing", + "windows-sys 0.52.0", ] [[package]] name = "async-recursion" -version = "1.0.5" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" +checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn", ] [[package]] name = "async-signal" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e47d90f65a225c4527103a8d747001fc56e375203592b25ad103e1ca13124c5" +checksum = "afe66191c335039c7bb78f99dc7520b0cbb166b3a1cb33a03f53d8a1c6f2afda" dependencies = [ - "async-io 2.3.2", - "async-lock 2.8.0", + "async-io", + "async-lock", "atomic-waker", "cfg-if", "futures-core", "futures-io", - "rustix 0.38.31", + "rustix", "signal-hook-registry", "slab", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "async-task" -version = "4.7.0" +version = "4.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbb36e985947064623dbd357f727af08ffd077f93d696782f3c56365fa2e2799" +checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" [[package]] name = "async-trait" -version = "0.1.77" +version = "0.1.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" +checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn", ] [[package]] @@ -282,15 +256,15 @@ checksum = "41e67cd8309bbd06cd603a9e693a784ac2e5d1e955f11286e355089fcab3047c" [[package]] name = "autocfg" -version = "1.1.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "base64" -version = "0.22.0" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] name = "bitflags" @@ -300,9 +274,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.2" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" +checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" [[package]] name = "block" @@ -321,31 +295,28 @@ dependencies = [ [[package]] name = "blocking" -version = "1.5.1" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118" +checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea" dependencies = [ - "async-channel 2.2.0", - "async-lock 3.3.0", + "async-channel 2.3.1", "async-task", - "fastrand 2.0.1", "futures-io", - "futures-lite 2.2.0", + "futures-lite 2.3.0", "piper", - "tracing", ] [[package]] name = "bumpalo" -version = "3.15.4" +version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "bytemuck" -version = "1.14.3" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2ef034f05691a48569bd920a96c81b9d91bbad1ab5ac7c4616c1f6ef36cb79f" +checksum = "78834c15cb5d5efe3452d58b1e8ba890dd62d21907f867f383358198e56ebca5" [[package]] name = "byteorder" @@ -355,17 +326,17 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.5.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" +checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" [[package]] name = "cairo-rs" -version = "0.19.2" +version = "0.19.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2650f66005301bd33cc486dec076e1293c4cecf768bc7ba9bf5d2b1be339b99c" +checksum = "b2ac2a4d0e69036cf0062976f6efcba1aaee3e448594e6514bb2ddf87acce562" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "cairo-sys-rs", "glib", "libc", @@ -391,15 +362,15 @@ checksum = "a2698f953def977c68f935bb0dfa959375ad4638570e969e2f1e9f433cbf1af6" [[package]] name = "cc" -version = "1.0.90" +version = "1.0.98" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5" +checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f" [[package]] name = "cfg-expr" -version = "0.15.7" +version = "0.15.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa50868b64a9a6fda9d593ce778849ea8715cd2a3d2cc17ffdb4a2f2f2f1961d" +checksum = "d067ad48b8650848b989a59a86c6c36a995d02d2bf778d45c3c5d57bc2718f02" dependencies = [ "smallvec", "target-lexicon", @@ -412,17 +383,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] +name = "cfg_aliases" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" + +[[package]] name = "chrono" -version = "0.4.35" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eaf5903dcbc0a39312feb77df2ff4c76387d591b9fc7b04a238dcf8bb62639a" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" dependencies = [ "android-tzdata", "iana-time-zone", "js-sys", "num-traits", "wasm-bindgen", - "windows-targets 0.52.4", + "windows-targets 0.52.5", ] [[package]] @@ -433,24 +410,24 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" [[package]] name = "colorchoice" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" +checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422" [[package]] name = "concurrent-queue" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363" +checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" dependencies = [ "crossbeam-utils", ] [[package]] name = "cookie" -version = "0.18.0" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cd91cf61412820176e137621345ee43b3f4423e589e7ae4e50d601d93e35ef8" +checksum = "4ddef33a339a91ea89fb53151bd0a4689cfce27055c291dfa69945475d22c747" dependencies = [ "percent-encoding", "time", @@ -491,18 +468,18 @@ dependencies = [ [[package]] name = "crc32fast" -version = "1.4.0" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" dependencies = [ "cfg-if", ] [[package]] name = "crossbeam-utils" -version = "0.8.19" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" [[package]] name = "crypto-common" @@ -525,7 +502,7 @@ dependencies = [ "openssl-probe", "openssl-sys", "schannel", - "socket2 0.5.6", + "socket2", "windows-sys 0.52.0", ] @@ -555,17 +532,6 @@ dependencies = [ ] [[package]] -name = "derivative" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] name = "digest" version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -577,20 +543,26 @@ dependencies = [ [[package]] name = "either" -version = "1.10.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" +checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b" [[package]] name = "encoding_rs" -version = "0.8.33" +version = "0.8.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" +checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" dependencies = [ "cfg-if", ] [[package]] +name = "endi" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3d8a32ae18130a3c84dd492d4215c3d913c3b07c6b63c2eb3eb7ff1101ab7bf" + +[[package]] name = "enumflags2" version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -608,7 +580,7 @@ checksum = "5c785274071b1b420972453b306eeca06acf4633829db4223b58a2a8c5953bc4" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn", ] [[package]] @@ -642,9 +614,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" dependencies = [ "libc", "windows-sys 0.52.0", @@ -658,17 +630,6 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] name = "event-listener" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d93877bcde0eb80ca09131a08d23f0a5c18a620b01db137dba666d18cd9b30c2" -dependencies = [ - "concurrent-queue", - "parking", - "pin-project-lite", -] - -[[package]] -name = "event-listener" version = "4.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "67b215c49b2b248c855fb73579eb1f4f26c38ffdc12973e20e07b91d78d5646e" @@ -680,9 +641,9 @@ dependencies = [ [[package]] name = "event-listener" -version = "5.2.0" +version = "5.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b5fb89194fa3cad959b833185b3063ba881dbfc7030680b314250779fb4cc91" +checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba" dependencies = [ "concurrent-queue", "parking", @@ -701,11 +662,11 @@ dependencies = [ [[package]] name = "event-listener-strategy" -version = "0.5.0" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "feedafcaa9b749175d5ac357452a9d41ea2911da598fde46ce1fe02c37751291" +checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" dependencies = [ - "event-listener 5.2.0", + "event-listener 5.3.1", "pin-project-lite", ] @@ -720,9 +681,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.0.1" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" +checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" [[package]] name = "fdeflate" @@ -739,15 +700,15 @@ version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f" dependencies = [ - "memoffset 0.9.0", + "memoffset", "rustc_version", ] [[package]] name = "flate2" -version = "1.0.28" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" dependencies = [ "crc32fast", "miniz_oxide", @@ -832,11 +793,11 @@ dependencies = [ [[package]] name = "futures-lite" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445ba825b27408685aaecefd65178908c36c6e96aaf6d8599419d46e624192ba" +checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" dependencies = [ - "fastrand 2.0.1", + "fastrand 2.1.0", "futures-core", "futures-io", "parking", @@ -851,7 +812,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn", ] [[package]] @@ -897,9 +858,9 @@ dependencies = [ [[package]] name = "gdk-pixbuf-sys" -version = "0.19.0" +version = "0.19.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dcbd04c1b2c4834cc008b4828bc917d062483b88d26effde6342e5622028f96" +checksum = "1fdbf021f8b9d19e30fb9ea6d6e5f2b6a712fe4645417c69f86f6ff1e1444a8f" dependencies = [ "gio-sys", "glib-sys", @@ -910,9 +871,9 @@ dependencies = [ [[package]] name = "gdk4" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9100b25604183f2fd97f55ef087fae96ab4934d7215118a35303e422688e6e4b" +checksum = "db265c9dd42d6a371e09e52deab3a84808427198b86ac792d75fd35c07990a07" dependencies = [ "cairo-rs", "gdk-pixbuf", @@ -925,9 +886,9 @@ dependencies = [ [[package]] name = "gdk4-sys" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0b76874c40bb8d1c7d03a7231e23ac75fa577a456cd53af32ec17ec8f121626" +checksum = "c9418fb4e8a67074919fe7604429c45aa74eb9df82e7ca529767c6d4e9dc66dd" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", @@ -952,9 +913,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.12" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", "libc", @@ -983,9 +944,9 @@ dependencies = [ [[package]] name = "gio" -version = "0.19.2" +version = "0.19.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2eae10b27b6dd27e22ed0d812c6387deba295e6fc004a8b379e459b663b05a02" +checksum = "be548be810e45dd31d3bbb89c6210980bb7af9bca3ea1292b5f16b75f8e394a7" dependencies = [ "futures-channel", "futures-core", @@ -1001,9 +962,9 @@ dependencies = [ [[package]] name = "gio-sys" -version = "0.19.0" +version = "0.19.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcf8e1d9219bb294636753d307b030c1e8a032062cba74f493c431a5c8b81ce4" +checksum = "d4bdbef451b0f0361e7f762987cc6bebd5facab1d535e85a3cf1115dfb08db40" dependencies = [ "glib-sys", "gobject-sys", @@ -1014,11 +975,11 @@ dependencies = [ [[package]] name = "glib" -version = "0.19.2" +version = "0.19.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab9e86540b5d8402e905ad4ce7d6aa544092131ab564f3102175af176b90a053" +checksum = "e52355166df21c7ed16b6a01f615669c7911ed74e27ef60eba339c0d2da12490" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "futures-channel", "futures-core", "futures-executor", @@ -1036,22 +997,22 @@ dependencies = [ [[package]] name = "glib-macros" -version = "0.19.2" +version = "0.19.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f5897ca27a83e4cdc7b4666850bade0a2e73e17689aabafcc9acddad9d823b8" +checksum = "70025dbfa1275cf7d0531c3317ba6270dae15d87e63342229d638246ff45202e" dependencies = [ "heck", - "proc-macro-crate 3.1.0", + "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.52", + "syn", ] [[package]] name = "glib-sys" -version = "0.19.0" +version = "0.19.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630f097773d7c7a0bb3258df4e8157b47dc98bbfa0e60ad9ab56174813feced4" +checksum = "767d23ead9bbdfcbb1c2242c155c8128a7d13dde7bf69c176f809546135e2282" dependencies = [ "libc", "system-deps", @@ -1059,9 +1020,9 @@ dependencies = [ [[package]] name = "gobject-sys" -version = "0.19.0" +version = "0.19.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c85e2b1080b9418dd0c58b498da3a5c826030343e0ef07bde6a955d28de54979" +checksum = "c3787b0bfacca12bb25f8f822b0dbee9f7e4a86e6469a29976d332d2c14c945b" dependencies = [ "glib-sys", "libc", @@ -1081,9 +1042,9 @@ dependencies = [ [[package]] name = "graphene-sys" -version = "0.19.0" +version = "0.19.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "236ed66cc9b18d8adf233716f75de803d0bf6fc806f60d14d948974a12e240d0" +checksum = "2a60e7381afdd7be43bd10a89d3b6741d162aabbca3a8db73505afb6a3aea59d" dependencies = [ "glib-sys", "libc", @@ -1093,9 +1054,9 @@ dependencies = [ [[package]] name = "gsk4" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c65036fc8f99579e8cb37b12487969b707ab23ec8ab953682ff347cbd15d396e" +checksum = "7563884bf6939f4468e5d94654945bdd9afcaf8c3ba4c5dd17b5342b747221be" dependencies = [ "cairo-rs", "gdk4", @@ -1108,9 +1069,9 @@ dependencies = [ [[package]] name = "gsk4-sys" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd24c814379f9c3199dc53e52253ee8d0f657eae389ab282c330505289d24738" +checksum = "23024bf2636c38bbd1f822f58acc9d1c25b28da896ff0f291a1a232d4272b3dc" dependencies = [ "cairo-sys-rs", "gdk4-sys", @@ -1124,9 +1085,9 @@ dependencies = [ [[package]] name = "gstreamer" -version = "0.22.2" +version = "0.22.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48a5e10c539f8b594c50f6cd1bd1cd07785e06d701a077bff397ad211bc92e88" +checksum = "56b59fdce2dfacda226d4b1b71ce4700b2f04228909b52252c197d8e30bd54a6" dependencies = [ "cfg-if", "futures-channel", @@ -1163,9 +1124,9 @@ dependencies = [ [[package]] name = "gstreamer-base-sys" -version = "0.22.0" +version = "0.22.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "286591e0f85bbda1adf9bab6f21d015acd9ca0a4d4acb61da65e3d0487e23c4e" +checksum = "2d8d11de9d94072657f2e9ca294b72326874a1e53de9f45613a9bf00773a5938" dependencies = [ "glib-sys", "gobject-sys", @@ -1189,9 +1150,9 @@ dependencies = [ [[package]] name = "gstreamer-play-sys" -version = "0.22.0" +version = "0.22.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19def7b12d3a53c520ad661b8f4501ae04158627e4a9fc49cc30c4ea04522cbf" +checksum = "5bdd875021fecd478d0ee3b787dc3fd41be86f83692c59344af2db6251028b3c" dependencies = [ "glib-sys", "gobject-sys", @@ -1203,9 +1164,9 @@ dependencies = [ [[package]] name = "gstreamer-sys" -version = "0.22.2" +version = "0.22.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5ddf526b3bf90ea627224c804f00b8bcb0452e3b447978b4d5092f8e8ff5918" +checksum = "4975a75279a9cf658bac1798dcf57100c6ec89fca7886572c8250ea4d94b76bd" dependencies = [ "glib-sys", "gobject-sys", @@ -1215,9 +1176,9 @@ dependencies = [ [[package]] name = "gstreamer-video" -version = "0.22.1" +version = "0.22.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ab3f4045ddb92bf2b469f5db8825d4f5eb46e4beff661fc97f50bb4e2b2c626" +checksum = "2a7900a4c4d7a48bd73405fb23289d2604c5efe483eb224cbe252d6a7517a6d5" dependencies = [ "cfg-if", "futures-channel", @@ -1232,9 +1193,9 @@ dependencies = [ [[package]] name = "gstreamer-video-sys" -version = "0.22.1" +version = "0.22.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1ea7996ba44fbbf563aeeda96e24259efc9f06b407854d837ee58e260d7ba78" +checksum = "1cbe811de2cc60da42eb6d374a106bb5446e8fcd2134a97319dd2b8cc11450c7" dependencies = [ "glib-sys", "gobject-sys", @@ -1246,9 +1207,9 @@ dependencies = [ [[package]] name = "gtk4" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa82753b8c26277e4af1446c70e35b19aad4fb794a7b143859e7eeb9a4025d83" +checksum = "b04e11319b08af11358ab543105a9e49b0c491faca35e2b8e7e36bfba8b671ab" dependencies = [ "cairo-rs", "field-offset", @@ -1267,23 +1228,21 @@ dependencies = [ [[package]] name = "gtk4-macros" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40300bf071d2fcd4c94eacc09e84ec6fe73129d2ceb635cf7e55b026b5443567" +checksum = "ec655a7ef88d8ce9592899deb8b2d0fa50bab1e6dd69182deb764e643c522408" dependencies = [ - "anyhow", - "proc-macro-crate 3.1.0", - "proc-macro-error", + "proc-macro-crate", "proc-macro2", "quote", - "syn 1.0.109", + "syn", ] [[package]] name = "gtk4-sys" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0db1b104138f087ccdc81d2c332de5dd049b89de3d384437cc1093b17cd2da18" +checksum = "8c8aa86b7f85ea71d66ea88c1d4bae1cfacf51ca4856274565133838d77e57b5" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", @@ -1300,15 +1259,15 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.14.3" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" [[package]] name = "heck" -version = "0.4.1" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] name = "hermit-abi" @@ -1412,9 +1371,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.2.5" +version = "2.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b0b929d511467233429c45a44ac1dcaa21ba0f5ba11e4879e6ed28ddb4f9df4" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", "hashbrown", @@ -1422,23 +1381,18 @@ dependencies = [ [[package]] name = "instant" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" dependencies = [ "cfg-if", ] [[package]] -name = "io-lifetimes" -version = "1.0.11" +name = "is_terminal_polyfill" +version = "1.70.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" -dependencies = [ - "hermit-abi", - "libc", - "windows-sys 0.48.0", -] +checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800" [[package]] name = "isahc" @@ -1470,18 +1424,18 @@ dependencies = [ [[package]] name = "itertools" -version = "0.12.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" dependencies = [ "either", ] [[package]] name = "itoa" -version = "1.0.10" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "js-sys" @@ -1532,15 +1486,15 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.153" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "libnghttp2-sys" -version = "0.1.9+1.58.0" +version = "0.1.10+1.61.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b57e858af2798e167e709b9d969325b6d8e9d50232fcbc494d7d54f976854a64" +checksum = "959c25552127d2e1fa72f0e52548ec04fc386e827ba71a7bd01db46a447dc135" dependencies = [ "cc", "libc", @@ -1548,9 +1502,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.15" +version = "1.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "037731f5d3aaa87a5675e895b63ddff1a87624bc29f77004ea829809654e48f6" +checksum = "c15da26e5af7e25c90b37a2d75cdbf940cf4a55316de9d84c679c9b8bfabf82e" dependencies = [ "cc", "libc", @@ -1560,15 +1514,9 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.3.8" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" - -[[package]] -name = "linux-raw-sys" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "locale_config" @@ -1600,24 +1548,15 @@ dependencies = [ [[package]] name = "memchr" -version = "2.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" - -[[package]] -name = "memoffset" -version = "0.7.1" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" -dependencies = [ - "autocfg", -] +checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" [[package]] name = "memoffset" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" dependencies = [ "autocfg", ] @@ -1630,9 +1569,9 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" [[package]] name = "miniz_oxide" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" +checksum = "87dfd01fe195c66b572b37921ad8803d010623c0aca821bea2302239d155cdae" dependencies = [ "adler", "simd-adler32", @@ -1640,14 +1579,14 @@ dependencies = [ [[package]] name = "mpris-server" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca665e9b0f892e42d7ad9ee6076adaf5de762497640816c67fb6406aca946d40" +checksum = "cc8408a42f7325f9217576c25dd3066d2741ed6a5b962e189493d83c440ca475" dependencies = [ - "async-trait", + "async-channel 2.3.1", "futures-channel", - "futures-util", "serde", + "trait-variant", "zbus", ] @@ -1659,8 +1598,8 @@ checksum = "956787520e75e9bd233246045d19f42fb73242759cc57fba9611d940ae96d4b0" [[package]] name = "netease-cloud-music-api" -version = "1.3.1" -source = "git+https://gitee.com/gmg137/netease-cloud-music-api.git?tag=1.3.1#fa13ca1fb89a97fff0bab58493ec353e4200ecd2" +version = "1.3.2" +source = "git+https://gitee.com/gmg137/netease-cloud-music-api.git?tag=1.3.2#4ea470a0e3b4f2a310a70ca485f60d3f6a643c03" dependencies = [ "anyhow", "base64", @@ -1677,14 +1616,14 @@ dependencies = [ [[package]] name = "netease-cloud-music-gtk4" -version = "2.3.1" +version = "2.4.0" dependencies = [ "anyhow", - "async-channel 2.2.0", + "async-channel 2.3.1", "chrono", "cookie_store", "env_logger", - "fastrand 2.0.1", + "fastrand 2.1.0", "gettext-rs", "gstreamer", "gstreamer-play", @@ -1700,14 +1639,15 @@ dependencies = [ [[package]] name = "nix" -version = "0.26.4" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" +checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.5.0", "cfg-if", + "cfg_aliases", "libc", - "memoffset 0.7.1", + "memoffset", ] [[package]] @@ -1727,20 +1667,19 @@ dependencies = [ [[package]] name = "num-rational" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" +checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824" dependencies = [ - "autocfg", "num-integer", "num-traits", ] [[package]] name = "num-traits" -version = "0.2.18" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", ] @@ -1786,7 +1725,7 @@ version = "0.10.64" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "cfg-if", "foreign-types", "libc", @@ -1803,7 +1742,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn", ] [[package]] @@ -1814,9 +1753,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.101" +version = "0.9.102" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dda2b0f344e78efc2facf7d195d098df0dd72151b26ab98da807afc26c198dff" +checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2" dependencies = [ "cc", "libc", @@ -1845,9 +1784,9 @@ dependencies = [ [[package]] name = "pango" -version = "0.19.2" +version = "0.19.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7809e8af4df8d024a066106b72ca6bc7253a484ae3867041a96103ef8a13188d" +checksum = "504ce6e805439ea2c6791168fe7ef8e3da0c1b2ef82c44bc450dbc330592920d" dependencies = [ "gio", "glib", @@ -1857,9 +1796,9 @@ dependencies = [ [[package]] name = "pango-sys" -version = "0.19.0" +version = "0.19.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f52ef6a881c19fbfe3b1484df5cad411acaaba29dbec843941c3110d19f340ea" +checksum = "e4829555bdbb83692ddeaf5a6927fb2d025c8131e5ecaa4f7619fff6985d3505" dependencies = [ "glib-sys", "gobject-sys", @@ -1875,9 +1814,9 @@ checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" [[package]] name = "paste" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "percent-encoding" @@ -1902,14 +1841,14 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn", ] [[package]] name = "pin-project-lite" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" [[package]] name = "pin-utils" @@ -1919,12 +1858,12 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "piper" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" +checksum = "464db0c665917b13ebb5d453ccdec4add5658ee1adc7affc7677615356a8afaf" dependencies = [ "atomic-waker", - "fastrand 2.0.1", + "fastrand 2.1.0", "futures-io", ] @@ -1965,14 +1904,15 @@ dependencies = [ [[package]] name = "polling" -version = "3.5.0" +version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24f040dee2588b4963afb4e420540439d126f73fdacf4a9c486a96d840bac3c9" +checksum = "645493cf344456ef24219d02a768cf1fb92ddf8c92161679ae3d91b91a637be3" dependencies = [ "cfg-if", "concurrent-queue", + "hermit-abi", "pin-project-lite", - "rustix 0.38.31", + "rustix", "tracing", "windows-sys 0.52.0", ] @@ -1991,16 +1931,6 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "proc-macro-crate" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" -dependencies = [ - "once_cell", - "toml_edit 0.19.15", -] - -[[package]] -name = "proc-macro-crate" version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" @@ -2009,34 +1939,10 @@ dependencies = [ ] [[package]] -name = "proc-macro-error" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", - "syn 1.0.109", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -dependencies = [ - "proc-macro2", - "quote", - "version_check", -] - -[[package]] name = "proc-macro2" -version = "1.0.78" +version = "1.0.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" +checksum = "ec96c6a92621310b51366f1e28d05ef11489516e93be030060e5fc12024a49d6" dependencies = [ "unicode-ident", ] @@ -2076,9 +1982,9 @@ checksum = "4339fc7a1021c9c1621d87f5e3505f2805c8c105420ba2f2a4df86814590c142" [[package]] name = "quote" -version = "1.0.35" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2", ] @@ -2115,9 +2021,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.3" +version = "1.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" +checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" dependencies = [ "aho-corasick", "memchr", @@ -2138,9 +2044,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" +checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" [[package]] name = "rustc_version" @@ -2153,36 +2059,22 @@ dependencies = [ [[package]] name = "rustix" -version = "0.37.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" -dependencies = [ - "bitflags 1.3.2", - "errno", - "io-lifetimes", - "libc", - "linux-raw-sys 0.3.8", - "windows-sys 0.48.0", -] - -[[package]] -name = "rustix" -version = "0.38.31" +version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "errno", "libc", - "linux-raw-sys 0.4.13", + "linux-raw-sys", "windows-sys 0.52.0", ] [[package]] name = "ryu" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "schannel" @@ -2195,35 +2087,35 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.22" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.197" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" +checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.197" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" +checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn", ] [[package]] name = "serde_json" -version = "1.0.114" +version = "1.0.117" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0" +checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" dependencies = [ "itoa", "ryu", @@ -2232,20 +2124,20 @@ dependencies = [ [[package]] name = "serde_repr" -version = "0.1.18" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb" +checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn", ] [[package]] name = "serde_spanned" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" +checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" dependencies = [ "serde", ] @@ -2263,9 +2155,9 @@ dependencies = [ [[package]] name = "signal-hook-registry" -version = "1.4.1" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" dependencies = [ "libc", ] @@ -2298,25 +2190,15 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" - -[[package]] -name = "socket2" -version = "0.4.10" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" -dependencies = [ - "libc", - "winapi", -] +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "socket2" -version = "0.5.6" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" dependencies = [ "libc", "windows-sys 0.52.0", @@ -2330,20 +2212,9 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] name = "syn" -version = "1.0.109" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "syn" -version = "2.0.52" +version = "2.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b699d15b36d1f02c3e7c69f8ffef53de37aefae075d8488d4ba1a7788d574a07" +checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" dependencies = [ "proc-macro2", "quote", @@ -2352,9 +2223,9 @@ dependencies = [ [[package]] name = "system-deps" -version = "6.2.0" +version = "6.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a2d580ff6a20c55dfb86be5f9c238f67835d0e81cbdea8bf5680e0897320331" +checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349" dependencies = [ "cfg-expr", "heck", @@ -2371,9 +2242,9 @@ checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" [[package]] name = "temp-dir" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd16aa9ffe15fe021c6ee3766772132c6e98dfa395a167e16864f61a9cfb71d6" +checksum = "1f227968ec00f0e5322f9b8173c7a0cbcff6181a0a5b28e9892491c286277231" [[package]] name = "tempfile" @@ -2382,36 +2253,36 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" dependencies = [ "cfg-if", - "fastrand 2.0.1", - "rustix 0.38.31", + "fastrand 2.1.0", + "rustix", "windows-sys 0.52.0", ] [[package]] name = "thiserror" -version = "1.0.57" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b" +checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.57" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81" +checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn", ] [[package]] name = "time" -version = "0.3.34" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ "deranged", "itoa", @@ -2430,9 +2301,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.17" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" dependencies = [ "num-conv", "time-core", @@ -2455,38 +2326,27 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "toml" -version = "0.8.10" +version = "0.8.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a9aad4a3066010876e8dcf5a8a06e70a558751117a145c6ce2b82c2e2054290" +checksum = "a4e43f8cc456c9704c851ae29c67e17ef65d2c30017c17a9765b89c382dc8bba" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.6", + "toml_edit 0.22.13", ] [[package]] name = "toml_datetime" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" dependencies = [ "serde", ] [[package]] name = "toml_edit" -version = "0.19.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" -dependencies = [ - "indexmap", - "toml_datetime", - "winnow 0.5.40", -] - -[[package]] -name = "toml_edit" version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" @@ -2498,15 +2358,15 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.6" +version = "0.22.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c1b5fd4128cc8d3e0cb74d4ed9a9cc7c7284becd4df68f5f940e1ad123606f6" +checksum = "c127785850e8c20836d49732ae6abfa47616e60bf9d9f57c43c250361a9db96c" dependencies = [ "indexmap", "serde", "serde_spanned", "toml_datetime", - "winnow 0.6.5", + "winnow 0.6.9", ] [[package]] @@ -2529,7 +2389,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn", ] [[package]] @@ -2552,6 +2412,17 @@ dependencies = [ ] [[package]] +name = "trait-variant" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70977707304198400eb4835a78f6a9f928bf41bba420deb8fdb175cd965d77a7" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] name = "typenum" version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2563,7 +2434,7 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9" dependencies = [ - "memoffset 0.9.0", + "memoffset", "tempfile", "winapi", ] @@ -2626,9 +2497,9 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" [[package]] name = "version-compare" -version = "0.1.1" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "579a42fc0b8e0c63b76519a339be31bed574929511fa53c1a3acae26eb258f29" +checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b" [[package]] name = "version_check" @@ -2638,9 +2509,9 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "waker-fn" -version = "1.1.1" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" +checksum = "317211a0dc0ceedd78fb2ca9a44aed3d7b9b26f81870d485c07122b4350673b7" [[package]] name = "wasi" @@ -2669,7 +2540,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.52", + "syn", "wasm-bindgen-shared", ] @@ -2691,7 +2562,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -2730,7 +2601,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.4", + "windows-targets 0.52.5", ] [[package]] @@ -2748,7 +2619,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.4", + "windows-targets 0.52.5", ] [[package]] @@ -2768,17 +2639,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" +checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" dependencies = [ - "windows_aarch64_gnullvm 0.52.4", - "windows_aarch64_msvc 0.52.4", - "windows_i686_gnu 0.52.4", - "windows_i686_msvc 0.52.4", - "windows_x86_64_gnu 0.52.4", - "windows_x86_64_gnullvm 0.52.4", - "windows_x86_64_msvc 0.52.4", + "windows_aarch64_gnullvm 0.52.5", + "windows_aarch64_msvc 0.52.5", + "windows_i686_gnu 0.52.5", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.5", + "windows_x86_64_gnu 0.52.5", + "windows_x86_64_gnullvm 0.52.5", + "windows_x86_64_msvc 0.52.5", ] [[package]] @@ -2789,9 +2661,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" +checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" [[package]] name = "windows_aarch64_msvc" @@ -2801,9 +2673,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" +checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" [[package]] name = "windows_i686_gnu" @@ -2813,9 +2685,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" +checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" [[package]] name = "windows_i686_msvc" @@ -2825,9 +2703,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" +checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" [[package]] name = "windows_x86_64_gnu" @@ -2837,9 +2715,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" +checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" [[package]] name = "windows_x86_64_gnullvm" @@ -2849,9 +2727,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" +checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" [[package]] name = "windows_x86_64_msvc" @@ -2861,9 +2739,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.4" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" +checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" [[package]] name = "winnow" @@ -2876,9 +2754,9 @@ dependencies = [ [[package]] name = "winnow" -version = "0.6.5" +version = "0.6.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dffa400e67ed5a4dd237983829e66475f0a4a26938c4b04c21baede6262215b8" +checksum = "86c949fede1d13936a99f14fafd3e76fd642b556dd2ce96287fbe2e0151bfac6" dependencies = [ "memchr", ] @@ -2895,30 +2773,27 @@ dependencies = [ [[package]] name = "zbus" -version = "3.15.2" +version = "4.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "675d170b632a6ad49804c8cf2105d7c31eddd3312555cffd4b740e08e97c25e6" +checksum = "989c3977a7aafa97b12b9a35d21cdcff9b0d2289762b14683f45d66b1ba6c48f" dependencies = [ "async-broadcast", "async-executor", "async-fs", - "async-io 1.13.0", - "async-lock 2.8.0", + "async-io", + "async-lock", "async-process", "async-recursion", "async-task", "async-trait", "blocking", - "byteorder", - "derivative", "enumflags2", - "event-listener 2.5.3", + "event-listener 5.3.1", "futures-core", "futures-sink", "futures-util", "hex", "nix", - "once_cell", "ordered-stream", "rand", "serde", @@ -2927,7 +2802,7 @@ dependencies = [ "static_assertions", "tracing", "uds_windows", - "winapi", + "windows-sys 0.52.0", "xdg-home", "zbus_macros", "zbus_names", @@ -2936,23 +2811,22 @@ dependencies = [ [[package]] name = "zbus_macros" -version = "3.15.2" +version = "4.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7131497b0f887e8061b430c530240063d33bf9455fa34438f388a245da69e0a5" +checksum = "6fe9de53245dcf426b7be226a4217dd5e339080e5d46e64a02d6e5dcbf90fca1" dependencies = [ - "proc-macro-crate 1.3.1", + "proc-macro-crate", "proc-macro2", "quote", - "regex", - "syn 1.0.109", + "syn", "zvariant_utils", ] [[package]] name = "zbus_names" -version = "2.6.1" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "437d738d3750bed6ca9b8d423ccc7a8eb284f6b1d6d4e225a0e4e6258d864c8d" +checksum = "4b9b1fef7d021261cc16cba64c351d291b715febe0fa10dc3a443ac5a5022e6c" dependencies = [ "serde", "static_assertions", @@ -2961,13 +2835,12 @@ dependencies = [ [[package]] name = "zvariant" -version = "3.15.2" +version = "4.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eef2be88ba09b358d3b58aca6e41cd853631d44787f319a1383ca83424fb2db" +checksum = "9aa6d31a02fbfb602bfde791de7fedeb9c2c18115b3d00f3a36e489f46ffbbc7" dependencies = [ - "byteorder", + "endi", "enumflags2", - "libc", "serde", "static_assertions", "zvariant_derive", @@ -2975,24 +2848,24 @@ dependencies = [ [[package]] name = "zvariant_derive" -version = "3.15.2" +version = "4.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37c24dc0bed72f5f90d1f8bb5b07228cbf63b3c6e9f82d82559d4bae666e7ed9" +checksum = "642bf1b6b6d527988b3e8193d20969d53700a36eac734d21ae6639db168701c8" dependencies = [ - "proc-macro-crate 1.3.1", + "proc-macro-crate", "proc-macro2", "quote", - "syn 1.0.109", + "syn", "zvariant_utils", ] [[package]] name = "zvariant_utils" -version = "1.0.1" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7234f0d811589db492d16893e3f21e8e2fd282e6d01b0cddee310322062cc200" +checksum = "fc242db087efc22bd9ade7aa7809e4ba828132edc312871584a6b4391bdf8786" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn", ] diff --git a/pkgs/by-name/ne/netease-cloud-music-gtk/package.nix b/pkgs/by-name/ne/netease-cloud-music-gtk/package.nix index c8dc77a6c2749..df6367c325608 100644 --- a/pkgs/by-name/ne/netease-cloud-music-gtk/package.nix +++ b/pkgs/by-name/ne/netease-cloud-music-gtk/package.nix @@ -6,11 +6,7 @@ , meson , ninja , pkg-config -, glib -, gtk4 -, appstream-glib , desktop-file-utils -, libxml2 , rustc , wrapGAppsHook4 , openssl @@ -22,19 +18,19 @@ stdenv.mkDerivation rec { pname = "netease-cloud-music-gtk"; - version = "2.3.1"; + version = "2.4.0"; src = fetchFromGitHub { owner = "gmg137"; repo = "netease-cloud-music-gtk"; rev = version; - hash = "sha256-75zovq7Q370L+bRczTCCC34G2w8xeMMUK5EUTfKAc+w="; + hash = "sha256-uoC9J09U2aI1dhaKc3TxIyFwRrPRxDrzaV+RyoZ6mKo="; }; cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; outputHashes = { - "netease-cloud-music-api-1.3.1" = "sha256-ZIc5zj9ZtLBYlZqBR7iUW+KmD71M+OYDiv0dkZrpFos="; + "netease-cloud-music-api-1.3.2" = "sha256-QRz9Sdu+0I7SwujoTBKWPQMjPDdX8ZyVlFwMw9pM7UY="; }; }; @@ -46,11 +42,7 @@ stdenv.mkDerivation rec { meson ninja pkg-config - glib # glib-compile-resources - gtk4 # gtk4-update-icon-cache - appstream-glib # appstream-util desktop-file-utils # update-desktop-database - libxml2 # xmllint wrapGAppsHook4 rustPlatform.cargoSetupHook cargo diff --git a/pkgs/by-name/ne/nezha-agent/package.nix b/pkgs/by-name/ne/nezha-agent/package.nix index d470290b8cae1..a873f48fe47b5 100644 --- a/pkgs/by-name/ne/nezha-agent/package.nix +++ b/pkgs/by-name/ne/nezha-agent/package.nix @@ -7,13 +7,13 @@ }: buildGoModule rec { pname = "nezha-agent"; - version = "0.16.9"; + version = "0.16.10"; src = fetchFromGitHub { owner = "nezhahq"; repo = "agent"; rev = "v${version}"; - hash = "sha256-WK9aTKRSpBrqEKje168Gmn6ROLFxE/fuYp10Ywtr4ks="; + hash = "sha256-aNonfJxEjK19+Um8tVCi/My88YGajr59+ubIPor5gOI="; }; vendorHash = "sha256-L6QdodI8Ur1H6Zc24KSTYAHfzvW2aq9SYwCVgjvSDII="; 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/nu/numbat/package.nix b/pkgs/by-name/nu/numbat/package.nix index 26e0c6f61d5cc..f9dcdb5031bde 100644 --- a/pkgs/by-name/nu/numbat/package.nix +++ b/pkgs/by-name/nu/numbat/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "numbat"; - version = "1.11.0"; + version = "1.12.0"; src = fetchFromGitHub { owner = "sharkdp"; repo = "numbat"; rev = "v${version}"; - hash = "sha256-/XUDtyOk//J4S9NoRP/s5s6URkdzePhW7UQ4FxDgmhs="; + hash = "sha256-MYoNziQiyppftLPNM8cqEuNwUA4KCmtotQqDhgyef1E="; }; - cargoHash = "sha256-uM4LmD78ZHAzx5purTO+MUstaSrR+j2LuSDUBI2tl3s="; + cargoHash = "sha256-t6vxJ0UIQJILCGv4PO5V4/QF5de/wtMQDkb8gPtE70E="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security diff --git a/pkgs/by-name/nw/nwg-hello/package.nix b/pkgs/by-name/nw/nwg-hello/package.nix index 8efe84411f501..004979ced17bd 100644 --- a/pkgs/by-name/nw/nwg-hello/package.nix +++ b/pkgs/by-name/nw/nwg-hello/package.nix @@ -9,13 +9,13 @@ python3Packages.buildPythonApplication rec { pname = "nwg-hello"; - version = "0.1.10"; + version = "0.2.0"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = "nwg-hello"; rev = "refs/tags/v${version}"; - hash = "sha256-naYouinDYgdGwySVxdEOZpNTK0vwnIyUKTkPgYaneew="; + hash = "sha256-WKDj68hQDPNsqyDG9kB1SklRIl/BSfVl7ebjVKA+33c="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/oe/oelint-adv/package.nix b/pkgs/by-name/oe/oelint-adv/package.nix index cf15799029644..d92ef6823c9c6 100644 --- a/pkgs/by-name/oe/oelint-adv/package.nix +++ b/pkgs/by-name/oe/oelint-adv/package.nix @@ -6,13 +6,13 @@ python3.pkgs.buildPythonApplication rec { pname = "oelint-adv"; - version = "5.3.2"; + version = "5.4.0"; format = "setuptools"; src = fetchPypi { inherit version; pname = "oelint_adv"; - hash = "sha256-9FLoQxh9HNWmZguczfC3CkXIt7oMfCFhfen2y+Tfac4="; + hash = "sha256-yatzxVzZ3MxsHrwSBtHDgRcme7y7n8ZDl9gLWy7Jikg="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/by-name/oh/oh-my-posh/package.nix b/pkgs/by-name/oh/oh-my-posh/package.nix index e36c1faf97a7d..625e2026b0c56 100644 --- a/pkgs/by-name/oh/oh-my-posh/package.nix +++ b/pkgs/by-name/oh/oh-my-posh/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "oh-my-posh"; - version = "20.2.0"; + version = "21.0.1"; src = fetchFromGitHub { owner = "jandedobbeleer"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-OkLQpU9FN7R+W8zNd3UMmNVgmEVzSVibZ/cl5mN8TU8="; + hash = "sha256-fN1vkDk9u4NWVnaNuFVjcKQ7rEMhOMxBlvTxrp8G1d8="; }; - vendorHash = "sha256-PDMmiU6NoJiCRZxJNKxt30sH+a14Snvk/CrD/+QpEEU="; + vendorHash = "sha256-MdHWAC46694hgCi1i/syNPdn4t+kY2ZhCAnE7aD8+8Y="; sourceRoot = "${src.name}/src"; diff --git a/pkgs/by-name/oo/oo7/Cargo.lock b/pkgs/by-name/oo/oo7/Cargo.lock new file mode 100644 index 0000000000000..25dabd4253ba0 --- /dev/null +++ b/pkgs/by-name/oo/oo7/Cargo.lock @@ -0,0 +1,1980 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "addr2line" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "aes" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" +dependencies = [ + "cfg-if", + "cipher", + "cpufeatures", + "zeroize", +] + +[[package]] +name = "android-tzdata" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + +[[package]] +name = "anstream" +version = "0.6.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "is_terminal_polyfill", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b" + +[[package]] +name = "anstyle-parse" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a64c907d4e79225ac72e2a354c9ce84d50ebb4586dee56c82b3ee73004f537f5" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "anstyle-wincon" +version = "3.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19" +dependencies = [ + "anstyle", + "windows-sys 0.52.0", +] + +[[package]] +name = "async-broadcast" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "258b52a1aa741b9f09783b2d86cf0aeeb617bbf847f6933340a39644227acbdb" +dependencies = [ + "event-listener 5.3.1", + "event-listener-strategy 0.5.2", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-channel" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a" +dependencies = [ + "concurrent-queue", + "event-listener-strategy 0.5.2", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-executor" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8828ec6e544c02b0d6691d21ed9f9218d0384a82542855073c2a3f58304aaf0" +dependencies = [ + "async-task", + "concurrent-queue", + "fastrand", + "futures-lite", + "slab", +] + +[[package]] +name = "async-fs" +version = "2.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebcd09b382f40fcd159c2d695175b2ae620ffa5f3bd6f664131efff4e8b9e04a" +dependencies = [ + "async-lock", + "blocking", + "futures-lite", +] + +[[package]] +name = "async-io" +version = "2.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcccb0f599cfa2f8ace422d3555572f47424da5648a4382a9dd0310ff8210884" +dependencies = [ + "async-lock", + "cfg-if", + "concurrent-queue", + "futures-io", + "futures-lite", + "parking", + "polling", + "rustix", + "slab", + "tracing", + "windows-sys 0.52.0", +] + +[[package]] +name = "async-lock" +version = "3.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d034b430882f8381900d3fe6f0aaa3ad94f2cb4ac519b429692a1bc2dda4ae7b" +dependencies = [ + "event-listener 4.0.3", + "event-listener-strategy 0.4.0", + "pin-project-lite", +] + +[[package]] +name = "async-process" +version = "2.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a53fc6301894e04a92cb2584fedde80cb25ba8e02d9dc39d4a87d036e22f397d" +dependencies = [ + "async-channel", + "async-io", + "async-lock", + "async-signal", + "async-task", + "blocking", + "cfg-if", + "event-listener 5.3.1", + "futures-lite", + "rustix", + "tracing", + "windows-sys 0.52.0", +] + +[[package]] +name = "async-recursion" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "async-signal" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afe66191c335039c7bb78f99dc7520b0cbb166b3a1cb33a03f53d8a1c6f2afda" +dependencies = [ + "async-io", + "async-lock", + "atomic-waker", + "cfg-if", + "futures-core", + "futures-io", + "rustix", + "signal-hook-registry", + "slab", + "windows-sys 0.52.0", +] + +[[package]] +name = "async-task" +version = "4.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" + +[[package]] +name = "async-trait" +version = "0.1.80" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + +[[package]] +name = "autocfg" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" + +[[package]] +name = "backtrace" +version = "0.3.72" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17c6a35df3749d2e8bb1b7b21a976d82b15548788d2735b9d82f329268f71a11" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + +[[package]] +name = "bitflags" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" + +[[package]] +name = "block-buffer" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +dependencies = [ + "generic-array", +] + +[[package]] +name = "block-padding" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8894febbff9f758034a5b8e12d87918f56dfc64a8e1fe757d65e29041538d93" +dependencies = [ + "generic-array", +] + +[[package]] +name = "blocking" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea" +dependencies = [ + "async-channel", + "async-task", + "futures-io", + "futures-lite", + "piper", +] + +[[package]] +name = "bumpalo" +version = "3.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "bytes" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" + +[[package]] +name = "cbc" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26b52a9543ae338f279b96b0b9fed9c8093744685043739079ce85cd58f289a6" +dependencies = [ + "cipher", +] + +[[package]] +name = "cc" +version = "1.0.98" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f" + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "cfg_aliases" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" + +[[package]] +name = "chrono" +version = "0.4.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" +dependencies = [ + "android-tzdata", + "iana-time-zone", + "num-traits", + "windows-targets 0.52.5", +] + +[[package]] +name = "cipher" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" +dependencies = [ + "crypto-common", + "inout", + "zeroize", +] + +[[package]] +name = "clap" +version = "4.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0" +dependencies = [ + "clap_builder", + "clap_derive", +] + +[[package]] +name = "clap_builder" +version = "4.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" +dependencies = [ + "anstream", + "anstyle", + "clap_lex", + "strsim", +] + +[[package]] +name = "clap_derive" +version = "4.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "clap_lex" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" + +[[package]] +name = "colorchoice" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422" + +[[package]] +name = "concurrent-queue" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" + +[[package]] +name = "cpufeatures" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" +dependencies = [ + "libc", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" + +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "rand_core", + "typenum", +] + +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "crypto-common", + "subtle", +] + +[[package]] +name = "endi" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3d8a32ae18130a3c84dd492d4215c3d913c3b07c6b63c2eb3eb7ff1101ab7bf" + +[[package]] +name = "enumflags2" +version = "0.7.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3278c9d5fb675e0a51dabcf4c0d355f692b064171535ba72361be1528a9d8e8d" +dependencies = [ + "enumflags2_derive", + "serde", +] + +[[package]] +name = "enumflags2_derive" +version = "0.7.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c785274071b1b420972453b306eeca06acf4633829db4223b58a2a8c5953bc4" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] +name = "errno" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "event-listener" +version = "4.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67b215c49b2b248c855fb73579eb1f4f26c38ffdc12973e20e07b91d78d5646e" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener" +version = "5.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener-strategy" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3" +dependencies = [ + "event-listener 4.0.3", + "pin-project-lite", +] + +[[package]] +name = "event-listener-strategy" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" +dependencies = [ + "event-listener 5.3.1", + "pin-project-lite", +] + +[[package]] +name = "fastrand" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" + +[[package]] +name = "foreign-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ + "foreign-types-shared", +] + +[[package]] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + +[[package]] +name = "futures-channel" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +dependencies = [ + "futures-core", +] + +[[package]] +name = "futures-core" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" + +[[package]] +name = "futures-io" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" + +[[package]] +name = "futures-lite" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" +dependencies = [ + "fastrand", + "futures-core", + "futures-io", + "parking", + "pin-project-lite", +] + +[[package]] +name = "futures-macro" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "futures-sink" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" + +[[package]] +name = "futures-task" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" + +[[package]] +name = "futures-util" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +dependencies = [ + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "getrandom" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "gimli" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" + +[[package]] +name = "hashbrown" +version = "0.14.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" + +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + +[[package]] +name = "hermit-abi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" + +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + +[[package]] +name = "hkdf" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7" +dependencies = [ + "hmac", +] + +[[package]] +name = "hmac" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" +dependencies = [ + "digest", +] + +[[package]] +name = "iana-time-zone" +version = "0.1.60" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "windows-core", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" +dependencies = [ + "cc", +] + +[[package]] +name = "indexmap" +version = "2.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" +dependencies = [ + "equivalent", + "hashbrown", +] + +[[package]] +name = "inout" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" +dependencies = [ + "block-padding", + "generic-array", +] + +[[package]] +name = "is_terminal_polyfill" +version = "1.70.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800" + +[[package]] +name = "js-sys" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +dependencies = [ + "spin 0.5.2", +] + +[[package]] +name = "libc" +version = "0.2.155" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" + +[[package]] +name = "libm" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" + +[[package]] +name = "linux-raw-sys" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" + +[[package]] +name = "log" +version = "0.4.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" + +[[package]] +name = "md-5" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" +dependencies = [ + "cfg-if", + "digest", +] + +[[package]] +name = "memchr" +version = "2.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" + +[[package]] +name = "memoffset" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" +dependencies = [ + "autocfg", +] + +[[package]] +name = "miniz_oxide" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87dfd01fe195c66b572b37921ad8803d010623c0aca821bea2302239d155cdae" +dependencies = [ + "adler", +] + +[[package]] +name = "mio" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" +dependencies = [ + "libc", + "wasi", + "windows-sys 0.48.0", +] + +[[package]] +name = "nix" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" +dependencies = [ + "bitflags", + "cfg-if", + "cfg_aliases", + "libc", + "memoffset", +] + +[[package]] +name = "nu-ansi-term" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +dependencies = [ + "overload", + "winapi", +] + +[[package]] +name = "num" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35bd024e8b2ff75562e5f34e7f4905839deb4b22955ef5e73d2fea1b9813cb23" +dependencies = [ + "num-bigint", + "num-complex", + "num-integer", + "num-iter", + "num-rational", + "num-traits", +] + +[[package]] +name = "num-bigint" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c165a9ab64cf766f73521c0dd2cfdff64f488b8f0b3e621face3462d3db536d7" +dependencies = [ + "num-integer", + "num-traits", +] + +[[package]] +name = "num-bigint-dig" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc84195820f291c7697304f3cbdadd1cb7199c0efc917ff5eafd71225c136151" +dependencies = [ + "byteorder", + "lazy_static", + "libm", + "num-integer", + "num-iter", + "num-traits", + "rand", + "serde", + "smallvec", + "zeroize", +] + +[[package]] +name = "num-complex" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495" +dependencies = [ + "num-traits", +] + +[[package]] +name = "num-integer" +version = "0.1.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" +dependencies = [ + "num-traits", +] + +[[package]] +name = "num-iter" +version = "0.1.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-rational" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824" +dependencies = [ + "num-bigint", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" +dependencies = [ + "autocfg", +] + +[[package]] +name = "num_cpus" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" +dependencies = [ + "hermit-abi", + "libc", +] + +[[package]] +name = "object" +version = "0.35.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8ec7ab813848ba4522158d5517a6093db1ded27575b070f4177b8d12b41db5e" +dependencies = [ + "memchr", +] + +[[package]] +name = "once_cell" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" + +[[package]] +name = "oo7" +version = "0.3.2" +dependencies = [ + "aes", + "async-fs", + "async-io", + "async-lock", + "blocking", + "cbc", + "cipher", + "digest", + "endi", + "futures-lite", + "futures-util", + "hkdf", + "hmac", + "md-5", + "num", + "num-bigint-dig", + "openssl", + "pbkdf2", + "rand", + "serde", + "sha2", + "subtle", + "tempfile", + "tokio", + "tracing", + "zbus", + "zeroize", + "zvariant", +] + +[[package]] +name = "oo7-cli" +version = "0.3.2" +dependencies = [ + "chrono", + "clap", + "oo7", + "rpassword", + "tokio", +] + +[[package]] +name = "oo7-portal" +version = "0.3.2" +dependencies = [ + "futures-channel", + "futures-util", + "oo7", + "ring", + "secrecy", + "serde", + "tokio", + "tracing", + "tracing-subscriber", + "zbus", + "zeroize", +] + +[[package]] +name = "openssl" +version = "0.10.64" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" +dependencies = [ + "bitflags", + "cfg-if", + "foreign-types", + "libc", + "once_cell", + "openssl-macros", + "openssl-sys", +] + +[[package]] +name = "openssl-macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "openssl-sys" +version = "0.9.102" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2" +dependencies = [ + "cc", + "libc", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "ordered-stream" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aa2b01e1d916879f73a53d01d1d6cee68adbb31d6d9177a8cfce093cced1d50" +dependencies = [ + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + +[[package]] +name = "parking" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" + +[[package]] +name = "pbkdf2" +version = "0.12.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2" +dependencies = [ + "digest", + "hmac", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "piper" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "464db0c665917b13ebb5d453ccdec4add5658ee1adc7affc7677615356a8afaf" +dependencies = [ + "atomic-waker", + "fastrand", + "futures-io", +] + +[[package]] +name = "pkg-config" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" + +[[package]] +name = "polling" +version = "3.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "645493cf344456ef24219d02a768cf1fb92ddf8c92161679ae3d91b91a637be3" +dependencies = [ + "cfg-if", + "concurrent-queue", + "hermit-abi", + "pin-project-lite", + "rustix", + "tracing", + "windows-sys 0.52.0", +] + +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[package]] +name = "proc-macro-crate" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" +dependencies = [ + "toml_edit", +] + +[[package]] +name = "proc-macro2" +version = "1.0.84" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec96c6a92621310b51366f1e28d05ef11489516e93be030060e5fc12024a49d6" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quote" +version = "1.0.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom", +] + +[[package]] +name = "ring" +version = "0.17.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" +dependencies = [ + "cc", + "cfg-if", + "getrandom", + "libc", + "spin 0.9.8", + "untrusted", + "windows-sys 0.52.0", +] + +[[package]] +name = "rpassword" +version = "7.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80472be3c897911d0137b2d2b9055faf6eeac5b14e324073d83bc17b191d7e3f" +dependencies = [ + "libc", + "rtoolbox", + "windows-sys 0.48.0", +] + +[[package]] +name = "rtoolbox" +version = "0.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c247d24e63230cdb56463ae328478bd5eac8b8faa8c69461a77e8e323afac90e" +dependencies = [ + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" + +[[package]] +name = "rustix" +version = "0.38.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" +dependencies = [ + "bitflags", + "errno", + "libc", + "linux-raw-sys", + "windows-sys 0.52.0", +] + +[[package]] +name = "secrecy" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9bd1c54ea06cfd2f6b63219704de0b9b4f72dcc2b8fdef820be6cd799780e91e" +dependencies = [ + "zeroize", +] + +[[package]] +name = "serde" +version = "1.0.203" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.203" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde_repr" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "sha1" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "sha2" +version = "0.10.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "sharded-slab" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" +dependencies = [ + "lazy_static", +] + +[[package]] +name = "signal-hook-registry" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" +dependencies = [ + "libc", +] + +[[package]] +name = "slab" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" +dependencies = [ + "autocfg", +] + +[[package]] +name = "smallvec" +version = "1.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" + +[[package]] +name = "socket2" +version = "0.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "spin" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" + +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" + +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + +[[package]] +name = "strsim" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + +[[package]] +name = "subtle" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" + +[[package]] +name = "syn" +version = "2.0.66" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "tempfile" +version = "3.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +dependencies = [ + "cfg-if", + "fastrand", + "rustix", + "windows-sys 0.52.0", +] + +[[package]] +name = "thread_local" +version = "1.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" +dependencies = [ + "cfg-if", + "once_cell", +] + +[[package]] +name = "tokio" +version = "1.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" +dependencies = [ + "backtrace", + "bytes", + "libc", + "mio", + "num_cpus", + "pin-project-lite", + "signal-hook-registry", + "socket2", + "tokio-macros", + "tracing", + "windows-sys 0.48.0", +] + +[[package]] +name = "tokio-macros" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "toml_datetime" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" + +[[package]] +name = "toml_edit" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" +dependencies = [ + "indexmap", + "toml_datetime", + "winnow", +] + +[[package]] +name = "tracing" +version = "0.1.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +dependencies = [ + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "tracing-core" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +dependencies = [ + "once_cell", + "valuable", +] + +[[package]] +name = "tracing-log" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" +dependencies = [ + "log", + "once_cell", + "tracing-core", +] + +[[package]] +name = "tracing-subscriber" +version = "0.3.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" +dependencies = [ + "nu-ansi-term", + "sharded-slab", + "smallvec", + "thread_local", + "tracing-core", + "tracing-log", +] + +[[package]] +name = "typenum" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" + +[[package]] +name = "uds_windows" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9" +dependencies = [ + "memoffset", + "tempfile", + "winapi", +] + +[[package]] +name = "unicode-ident" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" + +[[package]] +name = "untrusted" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" + +[[package]] +name = "utf8parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" + +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + +[[package]] +name = "vcpkg" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasm-bindgen" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" +dependencies = [ + "cfg-if", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows-core" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +dependencies = [ + "windows-targets 0.52.5", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.5", +] + +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" +dependencies = [ + "windows_aarch64_gnullvm 0.52.5", + "windows_aarch64_msvc 0.52.5", + "windows_i686_gnu 0.52.5", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.5", + "windows_x86_64_gnu 0.52.5", + "windows_x86_64_gnullvm 0.52.5", + "windows_x86_64_msvc 0.52.5", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" + +[[package]] +name = "winnow" +version = "0.5.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" +dependencies = [ + "memchr", +] + +[[package]] +name = "xdg-home" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21e5a325c3cb8398ad6cf859c1135b25dd29e186679cf2da7581d9679f63b38e" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "zbus" +version = "4.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "989c3977a7aafa97b12b9a35d21cdcff9b0d2289762b14683f45d66b1ba6c48f" +dependencies = [ + "async-broadcast", + "async-executor", + "async-fs", + "async-io", + "async-lock", + "async-process", + "async-recursion", + "async-task", + "async-trait", + "blocking", + "enumflags2", + "event-listener 5.3.1", + "futures-core", + "futures-sink", + "futures-util", + "hex", + "nix", + "ordered-stream", + "rand", + "serde", + "serde_repr", + "sha1", + "static_assertions", + "tokio", + "tracing", + "uds_windows", + "windows-sys 0.52.0", + "xdg-home", + "zbus_macros", + "zbus_names", + "zvariant", +] + +[[package]] +name = "zbus_macros" +version = "4.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fe9de53245dcf426b7be226a4217dd5e339080e5d46e64a02d6e5dcbf90fca1" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "syn", + "zvariant_utils", +] + +[[package]] +name = "zbus_names" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b9b1fef7d021261cc16cba64c351d291b715febe0fa10dc3a443ac5a5022e6c" +dependencies = [ + "serde", + "static_assertions", + "zvariant", +] + +[[package]] +name = "zeroize" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" +dependencies = [ + "zeroize_derive", +] + +[[package]] +name = "zeroize_derive" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "zvariant" +version = "4.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aa6d31a02fbfb602bfde791de7fedeb9c2c18115b3d00f3a36e489f46ffbbc7" +dependencies = [ + "endi", + "enumflags2", + "serde", + "static_assertions", + "zvariant_derive", +] + +[[package]] +name = "zvariant_derive" +version = "4.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "642bf1b6b6d527988b3e8193d20969d53700a36eac734d21ae6639db168701c8" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "syn", + "zvariant_utils", +] + +[[package]] +name = "zvariant_utils" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc242db087efc22bd9ade7aa7809e4ba828132edc312871584a6b4391bdf8786" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] diff --git a/pkgs/by-name/oo/oo7/package.nix b/pkgs/by-name/oo/oo7/package.nix new file mode 100644 index 0000000000000..8054daa560889 --- /dev/null +++ b/pkgs/by-name/oo/oo7/package.nix @@ -0,0 +1,60 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, nix-update-script +, oo7 +, openssl +, pkg-config +, testers +}: + +rustPlatform.buildRustPackage rec { + pname = "oo7"; + version = "0.3.2"; + + src = fetchFromGitHub { + owner = "bilelmoussaoui"; + repo = "oo7"; + rev = version; + hash = "sha256-oNzDjPMPM8opINSHC8T4ivQ6mfRVmN2VXPZAFkBZS8U="; + }; + + cargoLock = { + lockFile = ./Cargo.lock; + }; + + postPatch = '' + ln -s ${./Cargo.lock} Cargo.lock + ''; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + openssl + ]; + + postInstall = '' + install -Dm644 portal/data/oo7-portal.portal $out/share/xdg-desktop-portal/portals/oo7.portal + install -Dm644 portal/data/oo7-portal.service $out/share/dbus-1/services/oo7-portal.service + substituteInPlace $out/share/dbus-1/services/oo7-portal.service \ + --replace-fail "@bindir@" "$out/bin" + ''; + + passthru = { + tests.testVersion = testers.testVersion { + package = oo7; + }; + updateScript = nix-update-script { }; + }; + + meta = with lib; { + description = "James Bond went on a new mission as a Secret Service provider"; + homepage = "https://github.com/bilelmoussaoui/oo7"; + license = licenses.mit; + maintainers = with maintainers; [ getchoo Scrumplex ]; + platforms = platforms.linux; + mainProgram = "oo7-cli"; + }; +} diff --git a/pkgs/by-name/op/openfga/package.nix b/pkgs/by-name/op/openfga/package.nix index 3b034bb11643d..3335f93bd1d99 100644 --- a/pkgs/by-name/op/openfga/package.nix +++ b/pkgs/by-name/op/openfga/package.nix @@ -7,7 +7,7 @@ let pname = "openfga"; - version = "1.5.3"; + version = "1.5.4"; in buildGoModule { @@ -17,10 +17,10 @@ buildGoModule { owner = "openfga"; repo = "openfga"; rev = "v${version}"; - hash = "sha256-+ECfBG0Z1XnopMPbq9jngcZ3lcSFOIomWo5iD0T1teQ="; + hash = "sha256-0K4z5CPNx+MVJ1PeB8rmO8+6hDGZ3ZALTFBWwR2Xl1k="; }; - vendorHash = "sha256-MyoqdmNtpsoT08BKA9DPlpldIEXb82qzeXnW4KQXTiE="; + vendorHash = "sha256-sihNWuxwptBrVO9sXD2YNP20mgwYU2y4NSb8wqVWmCk="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/pl/plymouth-proxzima-theme/package.nix b/pkgs/by-name/pl/plymouth-proxzima-theme/package.nix new file mode 100644 index 0000000000000..f7591512a3f13 --- /dev/null +++ b/pkgs/by-name/pl/plymouth-proxzima-theme/package.nix @@ -0,0 +1,39 @@ +{ + stdenvNoCC, + fetchFromGitHub, + lib, + unstableGitUpdater, +}: + +stdenvNoCC.mkDerivation { + pname = "plymouth-proxzima-theme"; + version = "0-unstable-2023-01-30"; + + src = fetchFromGitHub { + owner = "PROxZIMA"; + repo = "proxzima-plymouth"; + rev = "b6e335a631e057942700de5c523198a5b8061d9c"; + hash = "sha256-f4CtXKsZPc/gZMVD+MJrHMrMw7TTFUndhUT4YLpfORU="; + }; + + dontBuild = true; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/plymouth/themes/proxzima + cp proxzima/* $out/share/plymouth/themes/proxzima + substituteInPlace $out/share/plymouth/themes/proxzima/proxzima.plymouth \ + --replace-fail "/usr/" "$out/" + runHook postInstall + ''; + + passthru.updateScript = unstableGitUpdater { }; + + meta = { + description = "A techno Plymouth theme with crazy animation"; + homepage = "https://github.com/PROxZIMA/proxzima-plymouth"; + license = lib.licenses.gpl3Only; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ johnrtitor ]; + }; +} diff --git a/pkgs/by-name/pl/plymouth-vortex-ubuntu-theme/package.nix b/pkgs/by-name/pl/plymouth-vortex-ubuntu-theme/package.nix new file mode 100644 index 0000000000000..d6223df07cda7 --- /dev/null +++ b/pkgs/by-name/pl/plymouth-vortex-ubuntu-theme/package.nix @@ -0,0 +1,43 @@ +{ + stdenvNoCC, + fetchFromGitHub, + lib, + unstableGitUpdater, +}: + +stdenvNoCC.mkDerivation { + pname = "plymouth-vortex-ubuntu-theme"; + version = "0-unstable-2024-05-05"; + + src = fetchFromGitHub { + owner = "emanuele-scarsella"; + repo = "vortex-ubuntu-plymouth-theme"; + rev = "331a201918a3b026dd200659403c1cf779c718f0"; + hash = "sha256-RSWfuKCdsuFA2e5kb0OXnxW+QV7b2iHVvZEKVHoLgMw="; + }; + + dontBuild = true; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/plymouth/themes/vortex-ubuntu + cp vortex-ubuntu/* $out/share/plymouth/themes/vortex-ubuntu + substituteInPlace $out/share/plymouth/themes/vortex-ubuntu/vortex-ubuntu.plymouth \ + --replace-fail "/usr/" "$out/" + runHook postInstall + ''; + + passthru.updateScript = unstableGitUpdater { }; + + meta = { + description = "Animated Plymouth boot theme with rotating Ubuntu logo"; + longDescription = '' + Animated Plymouth theme with the Ubuntu logo and a futuristic and elegant look. + Disk encryption password prompt is supported. + ''; + homepage = "https://github.com/emanuele-scarsella/vortex-ubuntu-plymouth-theme"; + license = lib.licenses.gpl2Only; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ johnrtitor ]; + }; +} diff --git a/pkgs/by-name/pr/proto/package.nix b/pkgs/by-name/pr/proto/package.nix index 26dd5c047118f..48e530ad948f2 100644 --- a/pkgs/by-name/pr/proto/package.nix +++ b/pkgs/by-name/pr/proto/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "proto"; - version = "0.35.3"; + version = "0.35.5"; src = fetchFromGitHub { owner = "moonrepo"; repo = pname; rev = "v${version}"; - hash = "sha256-ybWiJy4U3l0g2DdoebZ0XUPRres7+DLz3tES7I7M/JQ="; + hash = "sha256-KbrRACXFtchhsV5BjtHBckTxFcKf0Xe1/uGgDikSQww="; }; - cargoHash = "sha256-1DlDqzymrTFrtgDcgyoev864EBw8BGcxyquMt28NPTw="; + cargoHash = "sha256-CCjrbHYVERSVJayL+9kGo03ItCTaXwy5jEj+qGxyS1o="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration diff --git a/pkgs/by-name/pw/pwalarmd/package.nix b/pkgs/by-name/pw/pwalarmd/package.nix new file mode 100644 index 0000000000000..39a686f992883 --- /dev/null +++ b/pkgs/by-name/pw/pwalarmd/package.nix @@ -0,0 +1,37 @@ +{ lib +, fetchFromGitHub +, rustPlatform +, pkg-config +, alsa-lib +}: + +rustPlatform.buildRustPackage rec { + pname = "pwalarmd"; + version = "0.1.0"; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ alsa-lib ]; + + src = fetchFromGitHub { + owner = "amyipdev"; + repo = "pwalarmd"; + rev = "v${version}"; + hash = "sha256-xoC1PtDQjkvoWb9x8A43ITo6xyYOv9hxH2pxiZBBvKI="; + }; + + cargoHash = "sha256-cRAFnmgvzWLFAjB7H1rU4FdxMwm0J6d76kdFPoXpPMw="; + + meta = { + description = "Background CLI-based alarm system for *nix"; + longDescription = '' + pwalarmd is a command-line (daemon-based) alarm system. + It has extensive configuration and personalization, PulseAudio + and PipeWire support, and supports live configuration changes. + ''; + mainProgram = "pwalarmd"; + license = lib.licenses.gpl2Only; + platforms = lib.platforms.all; + badPlatforms = lib.platforms.darwin; + maintainers = with lib.maintainers; [ amyipdev ]; + }; +} diff --git a/pkgs/by-name/py/pyprland/package.nix b/pkgs/by-name/py/pyprland/package.nix index 3f4a57d7bcfc4..d4085a654cbd3 100644 --- a/pkgs/by-name/py/pyprland/package.nix +++ b/pkgs/by-name/py/pyprland/package.nix @@ -7,7 +7,7 @@ python3Packages.buildPythonApplication rec { pname = "pyprland"; - version = "2.3.4"; + version = "2.3.5"; format = "pyproject"; disabled = python3Packages.pythonOlder "3.10"; @@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec { owner = "hyprland-community"; repo = "pyprland"; rev = "refs/tags/${version}"; - hash = "sha256-mwBzLbKB/bO0Yl4VMA3roqiVs0FmmF1vfB+e+xhHe9c="; + hash = "sha256-3zTxmjk5fHo58eV6AO9oDJHbq9O5dcsdHypAOOQF5BY="; }; nativeBuildInputs = with python3Packages; [ poetry-core ]; diff --git a/pkgs/by-name/py/pyright/package.nix b/pkgs/by-name/py/pyright/package.nix index 12e7bebed001e..388831d78dcb9 100644 --- a/pkgs/by-name/py/pyright/package.nix +++ b/pkgs/by-name/py/pyright/package.nix @@ -1,13 +1,13 @@ { lib, buildNpmPackage, fetchFromGitHub, runCommand, jq }: let - version = "1.1.364"; + version = "1.1.365"; src = fetchFromGitHub { owner = "Microsoft"; repo = "pyright"; rev = "${version}"; - hash = "sha256-7XQ/DGba00sEg/DxcKuX2ehc4V96557yvtGXFFyHD74="; + hash = "sha256-plXNjT36xLmGftkLREsjKGHQWBGA12hIUOBCtTf8710="; }; patchedPackageJSON = runCommand "package.json" { } '' @@ -37,7 +37,7 @@ let pname = "pyright-internal"; inherit version src; sourceRoot = "${src.name}/packages/pyright-internal"; - npmDepsHash = "sha256-ce3338ugei4R7CYKn3676ijpgYKcuyY8CgkWbf8unKw="; + npmDepsHash = "sha256-oBpW4nEyiDGZhv+Yt0+yKg2xrLULpFjIOFRxIBLZ3bk="; dontNpmBuild = true; installPhase = '' runHook preInstall @@ -51,7 +51,7 @@ buildNpmPackage rec { inherit version src; sourceRoot = "${src.name}/packages/pyright"; - npmDepsHash = "sha256-E6txhG+1DNcAR9Nia8ggWL0tDaTXs9sF4je5nDqroys="; + npmDepsHash = "sha256-/P2rx7BgaHZPHBC3DO89JjYtPD5ri2goGmgCkGWfby4="; postPatch = '' chmod +w ../../ diff --git a/pkgs/by-name/re/redlib/package.nix b/pkgs/by-name/re/redlib/package.nix index c3778b9cd0fab..216b3f08a25c5 100644 --- a/pkgs/by-name/re/redlib/package.nix +++ b/pkgs/by-name/re/redlib/package.nix @@ -8,16 +8,16 @@ }: rustPlatform.buildRustPackage rec { pname = "redlib"; - version = "0.31.0"; + version = "0.34.0"; src = fetchFromGitHub { owner = "redlib-org"; repo = "redlib"; rev = "refs/tags/v${version}"; - hash = "sha256-d3Jjs/a2EgdqRBTjXKwDDRnU6orb7RQGl1CVz9b9SdI="; + hash = "sha256-JpuCX2ae9me+zHxQj5jqQlgDci2NV+TEVUAqnuTn3cA="; }; - cargoHash = "sha256-2MugS0/MO85lQvDbiFwnsX4LYdk7TACDFR8OOLEFGUQ="; + cargoHash = "sha256-gkRblCHUFiprZeYtu43GIGBZqCq5l/HEGaQN91XbfSs="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security 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/ri/ricochet-refresh/package.nix b/pkgs/by-name/ri/ricochet-refresh/package.nix index 4d753b760d696..1dcff630f5e58 100644 --- a/pkgs/by-name/ri/ricochet-refresh/package.nix +++ b/pkgs/by-name/ri/ricochet-refresh/package.nix @@ -13,13 +13,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "ricochet-refresh"; - version = "3.0.22"; + version = "3.0.23"; src = fetchFromGitHub { owner = "blueprint-freespeech"; repo = "ricochet-refresh"; rev = "v${finalAttrs.version}-release"; - hash = "sha256-xPOAtH+K3WTPjbDw4ZhwpO2+wUYe5JdqKdtfNKQbgSM="; + hash = "sha256-Wz53KeI3t12MqnvGuGS8Jd9gDY4eCTc5wcXBDHp5m0U="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/ri/ringracers/package.nix b/pkgs/by-name/ri/ringracers/package.nix new file mode 100644 index 0000000000000..2f8368b848c06 --- /dev/null +++ b/pkgs/by-name/ri/ringracers/package.nix @@ -0,0 +1,95 @@ +{ lib +, stdenv +, fetchzip +, fetchFromGitHub +, cmake +, curl +, nasm +, game-music-emu +, libpng +, SDL2 +, SDL2_mixer +, libvpx +, libyuv +, zlib +, makeWrapper +, makeDesktopItem +, copyDesktopItems +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "ringracers"; + version = "2.3"; + + src = fetchFromGitHub { + owner = "KartKrewDev"; + repo = "RingRacers"; + rev = "v${finalAttrs.version}"; + hash = "sha256-X2rSwZOEHtnSJBpu+Xf2vkxGUAZSNSXi6GCuGlM6jhY="; + }; + + assets = fetchzip { + name = "${finalAttrs.pname}-${finalAttrs.version}-assets"; + url = "https://github.com/KartKrewDev/RingRacers/releases/download/v${finalAttrs.version}/Dr.Robotnik.s-Ring-Racers-v${finalAttrs.version}-Assets.zip"; + hash = "sha256-sHeI1E6uNF0gBNd1e1AU/JT9wyZdkCQgYLiMPZqXAVc="; + stripRoot = false; + }; + + nativeBuildInputs = [ + cmake + nasm + makeWrapper + copyDesktopItems + ]; + + buildInputs = [ + curl + game-music-emu + libpng + SDL2 + SDL2_mixer + libvpx + libyuv + zlib + ]; + + cmakeFlags = [ + "-DSRB2_ASSET_DIRECTORY=${finalAttrs.assets}" + "-DGME_INCLUDE_DIR=${game-music-emu}/include" + "-DSDL2_MIXER_INCLUDE_DIR=${lib.getDev SDL2_mixer}/include/SDL2" + "-DSDL2_INCLUDE_DIR=${lib.getDev SDL2}/include/SDL2" + ]; + + desktopItems = [ + (makeDesktopItem { + name = "ringracers"; + exec = "ringracers"; + icon = "ringracers"; + comment = "This is Racing at the Next Level"; + desktopName = "Dr. Robotnik's Ring Racers"; + startupWMClass = ".ringracers-wrapped"; + categories = [ "Game" ]; + }) + ]; + + installPhase = '' + runHook preInstall + + install -Dm644 ../srb2.png $out/share/icons/hicolor/256x256/apps/ringracers.png + install -Dm755 bin/ringracers $out/bin/ringracers + + wrapProgram $out/bin/ringracers \ + --set RINGRACERSWADDIR "${finalAttrs.assets}" + + runHook postInstall + ''; + + meta = with lib; { + description = "Kart racing video game based on Sonic Robo Blast 2 (SRB2), itself based on a modified version of Doom Legacy"; + homepage = "https://kartkrew.org"; + platforms = platforms.linux; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ donovanglover thehans255 ]; + mainProgram = "ringracers"; + }; +}) diff --git a/pkgs/by-name/ri/ripunzip/package.nix b/pkgs/by-name/ri/ripunzip/package.nix index 0af8460c2611a..74d6f2ce87ab5 100644 --- a/pkgs/by-name/ri/ripunzip/package.nix +++ b/pkgs/by-name/ri/ripunzip/package.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "ripunzip"; - version = "1.2.1"; + version = "1.2.2"; src = fetchFromGitHub { owner = "google"; repo = "ripunzip"; rev = "v${version}"; - hash = "sha256-WcqN3Li0UiEhntKlQkGUrkP9N1I3NrjaGzIs9Q5i4y4="; + hash = "sha256-qDY81SxTVfGBCZU2jxuOswyTqzN7Mk3q7Ns6+ShRUnU="; }; - cargoHash = "sha256-CezigBDU632UVaeFNv+iM2dQQUabKhOP43etp6vjxTg="; + cargoHash = "sha256-8AKmIzMrxpQBDrW8C/OFZYvFn+u4yvWbMXSsCC0NX+Y="; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Security SystemConfiguration ]); diff --git a/pkgs/by-name/sa/satty/package.nix b/pkgs/by-name/sa/satty/package.nix index be27d9b8cd998..621da02a54a86 100644 --- a/pkgs/by-name/sa/satty/package.nix +++ b/pkgs/by-name/sa/satty/package.nix @@ -16,16 +16,16 @@ rustPlatform.buildRustPackage rec { pname = "satty"; - version = "0.12.0"; + version = "0.12.1"; src = fetchFromGitHub { owner = "gabm"; repo = "Satty"; rev = "v${version}"; - hash = "sha256-yidnpgUwfbaKmWznjN+TkF6ww/gVLDXFjQ0cIAQ4qFM="; + hash = "sha256-4upjVP7DEWD76wycmCQxl86nsJYI0+V7dSThRFJu9Ds="; }; - cargoHash = "sha256-GP7Bu11xim9lAfdhgm+MAxBghd5taA+Q0cWCbI8OxEM="; + cargoHash = "sha256-z2hRSGAwCI6DiXP87OzyyhJYjdB/7hSxYlUsKij1WQk="; nativeBuildInputs = [ copyDesktopItems diff --git a/pkgs/by-name/sr/srm-cuarzo/package.nix b/pkgs/by-name/sr/srm-cuarzo/package.nix index 5612520e626ec..d8d3f4622a1ea 100644 --- a/pkgs/by-name/sr/srm-cuarzo/package.nix +++ b/pkgs/by-name/sr/srm-cuarzo/package.nix @@ -14,9 +14,9 @@ }: stdenv.mkDerivation (self: { pname = "srm-cuarzo"; - version = "0.5.6-1"; + version = "0.5.6-2"; rev = "v${self.version}"; - hash = "sha256-REILtx4tPAWX4JnBjC0EU5dnnZhbVHhlVAWKo7n7sdA="; + hash = "sha256-shYYmXTWa0cd0zTsdCDw536BkEtm6UdbUz/lQFURi90="; src = fetchFromGitHub { inherit (self) rev hash; @@ -42,12 +42,6 @@ stdenv.mkDerivation (self: { outputs = [ "out" "dev" ]; - postPatch = '' - substituteInPlace src/meson.build \ - --replace "/usr/include/drm" "${libdrm.dev}/include/drm" \ - --replace "/usr/include/libdrm" "${libdrm.dev}/include/libdrm" - ''; - preConfigure = '' # The root meson.build file is in src/ cd src diff --git a/pkgs/by-name/st/stalwart-mail/package.nix b/pkgs/by-name/st/stalwart-mail/package.nix index 68e0d97bebb53..5ef0a24af0bef 100644 --- a/pkgs/by-name/st/stalwart-mail/package.nix +++ b/pkgs/by-name/st/stalwart-mail/package.nix @@ -62,6 +62,13 @@ rustPlatform.buildRustPackage { ROCKSDB_LIB_DIR = "${rocksdb}/lib"; }; + postInstall = '' + mkdir -p $out/lib/systemd/system + + substitute resources/systemd/stalwart-mail.service $out/lib/systemd/system/stalwart-mail.service \ + --replace "__PATH__" "$out" + ''; + # Tests require reading to /etc/resolv.conf doCheck = false; 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/tenv/package.nix b/pkgs/by-name/te/tenv/package.nix index c0d3e972801c3..26ac56fbb22b1 100644 --- a/pkgs/by-name/te/tenv/package.nix +++ b/pkgs/by-name/te/tenv/package.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tenv"; - version = "1.11.5"; + version = "1.11.6"; src = fetchFromGitHub { owner = "tofuutils"; repo = "tenv"; rev = "v${version}"; - hash = "sha256-GQZQJdhQxg2i61Wiazeag6XBYPmOdQ1nAv5ROJH50ns="; + hash = "sha256-k7IKzklqGP676xd6ptIfbPLqAxUwaBZUz1dZ88pJReU="; }; vendorHash = "sha256-OrMCzqqOFQkI8IwcfO/JVPyd/sw+Ud0VySV7UPiucwc="; diff --git a/pkgs/by-name/te/terraform-plugin-docs/package.nix b/pkgs/by-name/te/terraform-plugin-docs/package.nix index 5e893a6e6e2d5..32c8e7d573028 100644 --- a/pkgs/by-name/te/terraform-plugin-docs/package.nix +++ b/pkgs/by-name/te/terraform-plugin-docs/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "terraform-plugin-docs"; - version = "0.19.2"; + version = "0.19.3"; src = fetchFromGitHub { owner = "hashicorp"; repo = "terraform-plugin-docs"; rev = "refs/tags/v${version}"; - sha256 = "sha256-1ZJPy/kRYKcwr/k/u8ux5Eo1LIkrNpVyXrd9ff+Na6I="; + sha256 = "sha256-UPTiIY2aW6XDmJnMb1ATNWe3BvZQnPL0BweC/gxtztQ="; }; - vendorHash = "sha256-dBDvh3aIHu8iGwFt+29SdCl1gICwO7LnxQ7Wux+2tOk="; + vendorHash = "sha256-ZSHCP0eZWCvSObbUOSl0ohiiX79MyGC2ALowzvMXMv4="; nativeBuildInputs = [ makeWrapper ]; 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/tr/tradingview/package.nix b/pkgs/by-name/tr/tradingview/package.nix index d72e950052062..be05e2f5e8d39 100644 --- a/pkgs/by-name/tr/tradingview/package.nix +++ b/pkgs/by-name/tr/tradingview/package.nix @@ -22,12 +22,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "tradingview"; - version = "2.7.2"; - revision = "49"; + version = "2.7.7"; + revision = "53"; src = fetchurl { url = "https://api.snapcraft.io/api/v1/snaps/download/nJdITJ6ZJxdvfu8Ch7n5kH5P99ClzBYV_${finalAttrs.revision}.snap"; - hash = "sha256-GU5vWjZz8FBMtYawfP8cVmKp8X7bhJnLa0ft7Ku8czw="; + hash = "sha256-izASQXx/wTPKvPxWRh0csKsXoQlsFaOsLsNthepwW64="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/tr/trunk-ng/package.nix b/pkgs/by-name/tr/trunk-ng/package.nix index 2759b8f4f9218..3a7f9bd5ba05a 100644 --- a/pkgs/by-name/tr/trunk-ng/package.nix +++ b/pkgs/by-name/tr/trunk-ng/package.nix @@ -1,26 +1,29 @@ { lib, stdenv, rustPlatform, fetchFromGitHub, pkg-config -, openssl, libiconv, CoreServices, Security }: +, openssl, libiconv, CoreServices, Security, SystemConfiguration }: rustPlatform.buildRustPackage rec { pname = "trunk-ng"; - version = "0.17.11"; + version = "0.17.16"; src = fetchFromGitHub { owner = "ctron"; repo = "trunk"; rev = "v${version}"; - hash = "sha256-ZaSWfuz0w9bkilpDv4EAt6gn6ZdKOLTYJlJMQqtZAwY="; + hash = "sha256-SnE0z9Wa4gtX/ts0vG9pYnnxumILHTSV9/tVYkCHFck="; }; nativeBuildInputs = [ pkg-config ]; buildInputs = if stdenv.isDarwin - then [ libiconv CoreServices Security ] + then [ libiconv CoreServices Security SystemConfiguration ] else [ openssl ]; # requires network checkFlags = [ "--skip=tools::tests::download_and_install_binaries" ]; - cargoHash = "sha256-O3e8v0r76VeMYODah2RYTmwr9WNAX+HPhYVmDuP2gfg="; + cargoHash = { + darwin = "sha256-TwpGw3LH3TmZSbC4DkoOYpQdOpksXXoAoiacyZAefTU="; + linux = "sha256-AivISmT/r8xa/vSXUN8sU7z67t1hcyMQM+t6oXmIOhU="; + }.${stdenv.hostPlatform.parsed.kernel.name} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); meta = with lib; { homepage = "https://github.com/ctron/trunk"; diff --git a/pkgs/by-name/up/updatecli/package.nix b/pkgs/by-name/up/updatecli/package.nix index c3999383ba9ea..5c591970ce6c9 100644 --- a/pkgs/by-name/up/updatecli/package.nix +++ b/pkgs/by-name/up/updatecli/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "updatecli"; - version = "0.77.0"; + version = "0.78.0"; src = fetchFromGitHub { owner = "updatecli"; repo = pname; rev = "v${version}"; - hash = "sha256-sBkTdr4/DqNrCxtaM1tVTx+rQ1dvJ1KwlFvAJHIZCuw="; + hash = "sha256-VpMi+r7QUSD99PRzbTeIxXn1O9GdfHNJM1F0OBzvNmc="; }; - vendorHash = "sha256-xY2nNDMnUyV2sOMOJfSHbXaEU/gOKfZkA77d0lhDlgg="; + vendorHash = "sha256-Ji8r5c8LP7StGp/ve9RkQDeL21HBoK3Fln8LGBeqBpw="; # tests require network access doCheck = false; diff --git a/pkgs/by-name/ux/uxn/package.nix b/pkgs/by-name/ux/uxn/package.nix index 17a85dddce52a..ef5c66be8761b 100644 --- a/pkgs/by-name/ux/uxn/package.nix +++ b/pkgs/by-name/ux/uxn/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "uxn"; - version = "1.0-unstable-2024-05-10"; + version = "1.0-unstable-2024-05-30"; src = fetchFromSourcehut { owner = "~rabbits"; repo = "uxn"; - rev = "bb57b85f5724ccabdb081ff83080c2e3e0e122f7"; - hash = "sha256-S/lTa6nQ7qIIibYaLfaS4l2dEKgOwXuMryvK9j7FD9Y="; + rev = "987a3348a64be19fd7cd75bec7fa08c2619b478b"; + hash = "sha256-Yrlfnh9OuIEXEowM86UxkvX40522oP+yyQphmaQcY+s="; }; outputs = [ "out" "projects" ]; diff --git a/pkgs/by-name/vc/vcpkg/package.nix b/pkgs/by-name/vc/vcpkg/package.nix index 8e2753617ab9b..4a4aa3f3a11e4 100644 --- a/pkgs/by-name/vc/vcpkg/package.nix +++ b/pkgs/by-name/vc/vcpkg/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "vcpkg"; - version = "2024.04.26"; + version = "2024.05.24"; src = fetchFromGitHub { owner = "microsoft"; repo = "vcpkg"; rev = finalAttrs.version; - hash = "sha256-Bu1sZhk8fqG5D7m/0QK3uI97stXx8l8y30lnffTr9h0="; + hash = "sha256-R9iQIEmraXOzPi6rOd7wVV9BMC/wDDEveLIRJmAVISI="; }; installPhase = let 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/by-name/wi/wit-bindgen/package.nix b/pkgs/by-name/wi/wit-bindgen/package.nix index b1a7229d74d0b..88363c86c3350 100644 --- a/pkgs/by-name/wi/wit-bindgen/package.nix +++ b/pkgs/by-name/wi/wit-bindgen/package.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "wit-bindgen"; - version = "0.25.0"; + version = "0.26.0"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = "wit-bindgen"; rev = "v${version}"; - hash = "sha256-ckzS3hMdBHllpbzPq4MZ3K6L1fKEgcgI2nnpzSI1ky4="; + hash = "sha256-A73ONUSW5pDoDB7+U3kOcLWnYxco9brhhL1cRLh2wug="; }; - cargoHash = "sha256-BKNgPr5Yj+B0nAQEJdh6gat91WZ73sDSBgKDPrhn6bo="; + cargoHash = "sha256-L15XhJ1h9jmIBmtIob5X3EXkVDCqaBCrtI9sojtRUTQ="; # Some tests fail because they need network access to install the `wasm32-unknown-unknown` target. # However, GitHub Actions ensures a proper build. diff --git a/pkgs/by-name/wl/wlr-layout-ui/package.nix b/pkgs/by-name/wl/wlr-layout-ui/package.nix index efa72ee133d91..3d68538c16dc6 100644 --- a/pkgs/by-name/wl/wlr-layout-ui/package.nix +++ b/pkgs/by-name/wl/wlr-layout-ui/package.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "wlr-layout-ui"; - version = "1.6.10"; + version = "1.6.11"; pyproject = true; src = fetchFromGitHub { owner = "fdev31"; repo = "wlr-layout-ui"; rev = "refs/tags/${version}"; - hash = "sha256-UM1p5b5+xJY6BgPUMXjluIC9zQxe388+gBWTbNQPWYQ="; + hash = "sha256-aM8KV3jzim14lBVvn/AqUsfoRWrnKtRJeFSX1Thrq3M="; }; postPatch = '' diff --git a/pkgs/by-name/za/zabbix-agent2-plugin-postgresql/package.nix b/pkgs/by-name/za/zabbix-agent2-plugin-postgresql/package.nix index 951d26fa9642a..8f76f26202839 100644 --- a/pkgs/by-name/za/zabbix-agent2-plugin-postgresql/package.nix +++ b/pkgs/by-name/za/zabbix-agent2-plugin-postgresql/package.nix @@ -2,11 +2,11 @@ buildGoModule rec { pname = "zabbix-agent2-plugin-postgresql"; - version = "6.4.12"; + version = "6.4.14"; src = fetchurl { url = "https://cdn.zabbix.com/zabbix-agent2-plugins/sources/postgresql/zabbix-agent2-plugin-postgresql-${version}.tar.gz"; - hash = "sha256-fsWjgTUygO6P5bCJYa8i8IlJYs+KdFtKkEeEPjnd4R0="; + hash = "sha256-5+1RCJOAcnDg+aHWjzeI+5QImJQinkz7KKQ9vM55uzQ="; }; vendorHash = null; diff --git a/pkgs/by-name/ze/zed-editor/Cargo.lock b/pkgs/by-name/ze/zed-editor/Cargo.lock index 42b8a7aa4da7a..c47b14abbd997 100644 --- a/pkgs/by-name/ze/zed-editor/Cargo.lock +++ b/pkgs/by-name/ze/zed-editor/Cargo.lock @@ -13002,7 +13002,7 @@ dependencies = [ [[package]] name = "zed" -version = "0.137.5" +version = "0.137.6" dependencies = [ "activity_indicator", "anyhow", diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix index 633ed801374d5..71482e5540f23 100644 --- a/pkgs/by-name/ze/zed-editor/package.nix +++ b/pkgs/by-name/ze/zed-editor/package.nix @@ -27,13 +27,13 @@ rustPlatform.buildRustPackage rec { pname = "zed"; - version = "0.137.5"; + version = "0.137.6"; src = fetchFromGitHub { owner = "zed-industries"; repo = "zed"; rev = "refs/tags/v${version}"; - hash = "sha256-tztJzNY8H76ynMKWPbreQq87CYp/Iq2nDodObmEf8pg="; + hash = "sha256-1shK+Q8LTRaIXDqDLdJVsB4sAg2u5Kz0NXKf5jCniOU="; fetchSubmodules = true; }; diff --git a/pkgs/development/compilers/zig/shell-completions.nix b/pkgs/by-name/zi/zig-shell-completions/package.nix index 44773cf9a553e..f9ba4d0886ba2 100644 --- a/pkgs/development/compilers/zig/shell-completions.nix +++ b/pkgs/by-name/zi/zig-shell-completions/package.nix @@ -1,8 +1,9 @@ -{ lib -, stdenv -, fetchFromGitHub -, installShellFiles -, unstableGitUpdater +{ + lib, + stdenv, + fetchFromGitHub, + installShellFiles, + unstableGitUpdater, }: stdenv.mkDerivation (finalAttrs: { diff --git a/pkgs/data/fonts/iosevka/bin.nix b/pkgs/data/fonts/iosevka/bin.nix index 0f6d46546ded6..6e12c918cfb94 100644 --- a/pkgs/data/fonts/iosevka/bin.nix +++ b/pkgs/data/fonts/iosevka/bin.nix @@ -17,7 +17,7 @@ let in stdenv.mkDerivation rec { pname = "${name}-bin"; - version = "30.0.1"; + version = "30.1.1"; src = fetchurl { url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/PkgTTC-${name}-${version}.zip"; diff --git a/pkgs/data/fonts/iosevka/default.nix b/pkgs/data/fonts/iosevka/default.nix index 190170ebc28f4..2f749251cd142 100644 --- a/pkgs/data/fonts/iosevka/default.nix +++ b/pkgs/data/fonts/iosevka/default.nix @@ -55,16 +55,16 @@ assert (extraParameters != null) -> set != null; buildNpmPackage rec { pname = "Iosevka${toString set}"; - version = "30.1.0"; + version = "30.1.1"; src = fetchFromGitHub { owner = "be5invis"; repo = "iosevka"; rev = "v${version}"; - hash = "sha256-HYoCf5rwkKMjMPYW7E7EJgPXfgk7nELQu+ur4N3PC8s="; + hash = "sha256-PVPr/mI13UDJfXy+vmj3DfZ1vkcE7r7YoWTeXokJz50="; }; - npmDepsHash = "sha256-8EqIfgthhYkefAb+jFoL7Sk9/2gqwLwjZkc3WL35nYQ="; + npmDepsHash = "sha256-/MWONDfq+2TqwcOJFnjLatSdGvMqcgMjJnuuAduWJ14="; nativeBuildInputs = [ remarshal diff --git a/pkgs/data/fonts/iosevka/variants.nix b/pkgs/data/fonts/iosevka/variants.nix index 0bf703f6955cc..a3933935ad07f 100644 --- a/pkgs/data/fonts/iosevka/variants.nix +++ b/pkgs/data/fonts/iosevka/variants.nix @@ -1,93 +1,93 @@ # This file was autogenerated. DO NOT EDIT! { - Iosevka = "1p805i26vf0979k9rgf31634ll6sbyj9xp5mws1gpdpb9xainrzm"; - IosevkaAile = "1qxayq5cs0rf35k3gr8vilpcnnjq41dmldxb3nib178hi1kcagv2"; - IosevkaCurly = "1gbsm9x02mjl61l1xc5jbmqkhj7wgqs5mai9czrs0cqvcxgj2cp1"; - IosevkaCurlySlab = "14fcfspcgf0y7z4bbwvs54s6k82c4bcpj9fyj87ljmsxw2h325rx"; - IosevkaEtoile = "0qkq357kg1a4clbjgr8k2miainrl594jd054wv9igxb0iwjcqj49"; - IosevkaSlab = "1ygw3dn4zz62333bxd1k2zvyh8zmv2lrqybsbnidd654ikq0y2ly"; - IosevkaSS01 = "15j85zp1jqhb07fgl90qnidz8da64nq2r3dw4a337kwqzmgfrbl1"; - IosevkaSS02 = "0snia7xjh6d72ddz6yrzzx2pfx46c7kg2163qsp2b78p046s93ww"; - IosevkaSS03 = "1qg3vwp4ybih6vvbb6qpzh8qvqhc8z985k934vkirk41hp5p9564"; - IosevkaSS04 = "098pncahmhgvfh88m3mfrw7frjslrqly50p2x7qwv9lpz76n18xq"; - IosevkaSS05 = "1grdfghfh1plbcxqfx49vm3c7vkrlafss40cjf7f7j7ykkyx540z"; - IosevkaSS06 = "02qqffsyp2bgf6p4jp1ww1d9c7nj4hzs52psgvh5nnn0kvsxbjnn"; - IosevkaSS07 = "1avb06xsv1mp6lrrdawh6xnwiykh75vhb0364203mzjjj7gir7rw"; - IosevkaSS08 = "024qrzj8rkgwp71dpx7p424kgid1mzb0sbwfrg83i5v158slh65y"; - IosevkaSS09 = "178yc58lq1j42pmyap210cjk2qnqcsvhfdry56p7nd5l8gxik1v1"; - IosevkaSS10 = "0fhz69dhn7g64zyq947m85d73kn0qr2c751aqzrq1rlnbfm4cncs"; - IosevkaSS11 = "0zvf5a9k1mv1mgybqjqx4xcnpq7fni6vgwmr0hnmzcnxzxapmgqk"; - IosevkaSS12 = "1vjx11aalwbsm2vnqn9m695h943h3gln8bdayvv687x4bxj8dnfi"; - IosevkaSS13 = "165ikcmdsjfj30cs6ggsgfl9q0rpl1m4n57c75x8qq1p103yivia"; - IosevkaSS14 = "1iy95jyh7lsvwyc48rqasm9w9wr3rp0w8xvg8jqw3abnqyj30kxs"; - IosevkaSS15 = "0kws1bsyzij6mzf8wl80257an071l6r925mxcdh327scg8hdgq54"; - IosevkaSS16 = "06akd1mgdi9psf6j8ib97k617jilzs1likb3gbx57iqfnxyjfqkj"; - IosevkaSS17 = "08jvlgia29bd5q77j664hfcdd3y29iwy6gnxnxsq6i2ipgwszpr1"; - IosevkaSS18 = "01bp1zlfxrnz4b63d0j0zvdyilwxzb8b7m75yy5a73g7ghpjhf7w"; - SGr-Iosevka = "03zpmihwj1jcvc0q97bhyw8qgccpg8vqbiqw9rf1aaav3rix7jpl"; - SGr-IosevkaCurly = "1zkvih3ifkxf4ijbf9510b55xnp5rh488vqw899aw42sagdakqi3"; - SGr-IosevkaCurlySlab = "019hsqhghyw5njqrm2h20yyrrj8md6aqkfsi2nqdq83q8bs6qvq0"; - SGr-IosevkaFixed = "04g5l10ayvwwa0dhsaccxw2qbxbfyac5gnmlyly52lx126ifnhva"; - SGr-IosevkaFixedCurly = "0cygz3kz0cbjdx1pdig9qgm9z6kclrx96d9g7wiain4xn4i7dayg"; - SGr-IosevkaFixedCurlySlab = "1vdsrkbvdsqls344knqq0carcs3vc1ghhliipr44m7bpcnndavf4"; - SGr-IosevkaFixedSlab = "0hs88kng52iqicdjga0dkvn1b5ih3jsqz6lh7gxwh6qww4crrb84"; - SGr-IosevkaFixedSS01 = "1hllm1bxrdb8l796kkvd6mhr9fnf90qvxrcb815a6q4x1bxmcb47"; - SGr-IosevkaFixedSS02 = "0322ky5cwyk95c1xvgv0ny5jmxbsxzznynmq70p827m16mzakvcv"; - SGr-IosevkaFixedSS03 = "0041lnmv6vycfh7xbi6smr1csywha0ypbyxjk9j9727l16vvy3qp"; - SGr-IosevkaFixedSS04 = "0ybby2x08zzjgnczair43p3ixbk6igi0pfryjqryz9ziyw7ijx1n"; - SGr-IosevkaFixedSS05 = "1zf7q3m7pzf8cy28s4bijipxg9f6yl9dnd18syp2gibbzpvsyi9k"; - SGr-IosevkaFixedSS06 = "0d5gcfydin1a7a4xhsjpqrxk93j5pxc7x8myg0ci36zfcvsy4dg5"; - SGr-IosevkaFixedSS07 = "0lk43klql6046i9clk14fcqr6cn04dvadg8sv2cwr1130b5iz2b3"; - SGr-IosevkaFixedSS08 = "1b10x2fzx0clyflid8sz4lcr8is7rbqlk3jyy201sw0p7bfh9bhz"; - SGr-IosevkaFixedSS09 = "18dkkc4xsnxg0f6zj7hrpp8bybhpvzd0ls7rwyx06v7hcg1nnc7l"; - SGr-IosevkaFixedSS10 = "03s66zgpn7x1y09qymw9pnridcn7gd7mz0m5b2ccdhc1wmb6vihs"; - SGr-IosevkaFixedSS11 = "1xbal92f1wbkj1p3097z1cn5vffgdm2n7aa3ljgmrm5x2612whhj"; - SGr-IosevkaFixedSS12 = "0v34py726vfnrd85bqjr2y61f5rgl4w8w98m0fq18dd9ywjxi83c"; - SGr-IosevkaFixedSS13 = "1zm815hlff4kys0rg2qi5l8ilpqwmiwvy65qfw3rip1gqv04a3pj"; - SGr-IosevkaFixedSS14 = "0bvzsyrazd5cx5gi4i590nr0swwsm26647asxmwcfv0pcafnklqw"; - SGr-IosevkaFixedSS15 = "11cycsdda0dd1vlc5aqsgcpidppgy3fk6dycqxwc7p1cgbdnna60"; - SGr-IosevkaFixedSS16 = "0asqky6by2i102sapdfw8f91k0pbhlfnr150v0vy3181lryqabay"; - SGr-IosevkaFixedSS17 = "0yd58bci0f4sarzs2dshdawq4ki3zrdxghh98l6zzi3dnfwajmnq"; - SGr-IosevkaFixedSS18 = "1r672zk7np5fh934749n86xsxi9vc65bmznqjvhjsrjav3pnzsz1"; - SGr-IosevkaSlab = "061k6bld4jlylgad19xl8fcqh0yh95yi6hd8gmg4m3kpij64rbas"; - SGr-IosevkaSS01 = "195jg3wrcqkx98fjx252r6p3xq9gwhr6pzlp3riwvjpbx3avqmvb"; - SGr-IosevkaSS02 = "0mqhvkhyj9jrx80yh2lrkzpwz15008zs5rkzsimv89jxq0gn3a22"; - SGr-IosevkaSS03 = "0p92824nrkhn64hrc71b3xwl0pfk5h8nchr2kry3h14hgyq29pkf"; - SGr-IosevkaSS04 = "1c310vzl8cjjr1367x84vvp5vf6hn3q67qdaxa0hzsdn0w73w46j"; - SGr-IosevkaSS05 = "08fpvik3pf8zbx4lp3s4dv0w85nwdxfbdh83nh0kznhkpinbmpyn"; - SGr-IosevkaSS06 = "0dzcgn861lbsxcy7z584r6vpyi4y6hm16dm18k9nwgh21z7pr8n8"; - SGr-IosevkaSS07 = "038ldpln3yv5icgk5kd2i2ydw22f18y6qzkff968v1azjkmv60n0"; - SGr-IosevkaSS08 = "0qvj3rkhmpzcfgc26zjgcb36d6c427zgnr8lhwswd10a8dy1632a"; - SGr-IosevkaSS09 = "0c8m8ly03xgwpcyb9mvrjck7xih8qil9pzcrvg6vv4ssvrvr90lw"; - SGr-IosevkaSS10 = "1i168k7qgiawnxly129n6y7idjc14dj9iblgkiq60zy99n0q1b4j"; - SGr-IosevkaSS11 = "1fjxvg3jcx5qphr2ywkly3zdf2vsdjn2macfzkngbhlml79jz9y3"; - SGr-IosevkaSS12 = "1vbwinqpj5ahxgxd5r6rbzhlvx5q3v32bxmwxzw9krd517ra22kw"; - SGr-IosevkaSS13 = "1zzj3nb8739xq4bb7i02r0zlfcyczkq9c7rgxih6hdd4nch75pvi"; - SGr-IosevkaSS14 = "1bvn26mssy61nz1n3g76hbd0amq7cifh2rmdcxzs261wkiym01lw"; - SGr-IosevkaSS15 = "0r6ggg2w1y4l23k8z2dqbv8g3pzikmyi18bfpgnc3k1mbqaaxf76"; - SGr-IosevkaSS16 = "1nn8nk5rl1khw4ximl916ai49d1pa3b3wrsfb1qa51p5swsikf60"; - SGr-IosevkaSS17 = "1vn7s3i6jsv0b8y07ay0sbna7wrwxsk1dyw2h42jswzzv28m0p4c"; - SGr-IosevkaSS18 = "12zm8s4i8fzhfw63bc9smyj38mva8a69qj69sfkac5z81zrmxa8m"; - SGr-IosevkaTerm = "0rawxyhfjdd1xhgwf9f7adm2jqdh81ycc792kfi8vhn7piq1g109"; - SGr-IosevkaTermCurly = "1vrdx9kgy22blcm1ps0lv5snhxc39p6pd70ry6sa4np8swx6h7s3"; - SGr-IosevkaTermCurlySlab = "00hnq7s9bva1kq921gy410z8ld9mzpr09bifimmpm0kf6dr7q8ll"; - SGr-IosevkaTermSlab = "1sgvybj60qvh3wyxi11f6mjvik9d7pc517s387k2vfb66j5q3vvq"; - SGr-IosevkaTermSS01 = "1fg8vslmp3kp7yfr6kwkybmgd5nbyjyhpa6c8h7d5yrl8sghh1jq"; - SGr-IosevkaTermSS02 = "1qgsyh0jh8ik715n880gkfv3k7j2id06wrqbqkwdhlnljybzzvpv"; - SGr-IosevkaTermSS03 = "03ahlzgs0sjbvc9nc53fsavdi3j3ym0pj55d3xqyi3wvn0y6g172"; - SGr-IosevkaTermSS04 = "1b9bhvda2kzwpmsc0k8w44cm18sab3drxpskvb6rc252igd3fzzm"; - SGr-IosevkaTermSS05 = "0gz35z4zvh7afcppkmdc79x534qkpb3wg60gvnsj86v01xhw1whk"; - SGr-IosevkaTermSS06 = "07kg4137y3rzsk5pn1i8qcrr9nw5aqs3xhmikbysp28mlyd93xyr"; - SGr-IosevkaTermSS07 = "047af1c93vm3g3j0nqbav11za143xb638z3sh4hzcngr5jz3avk4"; - SGr-IosevkaTermSS08 = "0qzzxfkhzykmsn6dxf2h0yl1wgfar5i0dhgvdnibp9b54szxk0pk"; - SGr-IosevkaTermSS09 = "1fc0cfrpv6mly75jfzwvdga5rb4y3w088lhiy8wac8a9dq928dpk"; - SGr-IosevkaTermSS10 = "1k3paidjv8213gql5haismbyqsjv41zbflgxp5dk3599raimv8fd"; - SGr-IosevkaTermSS11 = "06nh95dri3y080rc1pvxcli11a1xq15mnpxzlqk9zs9bgx8aw41d"; - SGr-IosevkaTermSS12 = "1wisinglhrqfhpswvyhqfzdmx64mzli7ja96cj2bq0r9ksik09bx"; - SGr-IosevkaTermSS13 = "1xcn4b3cspjqmrpckwi355xhxh2vx7vmiyzvhpjal04zkfv2lqlx"; - SGr-IosevkaTermSS14 = "13s06y17vj1fp07h83d982l684jpg58ln1airxkvf6xb7dgh57yl"; - SGr-IosevkaTermSS15 = "0qwkdsc51ssm0y8qbi9m3m3x0adrlf82h36x77xrap29qkz5liwq"; - SGr-IosevkaTermSS16 = "00py2l35w9kaggrg7xhj333rc3li2lwkl5sblrpjkq98hdwc3m53"; - SGr-IosevkaTermSS17 = "0afa65dq97mq4c2p7vyhpjzbch0ab0sy12qy0a6krrr1q4abbl1b"; - SGr-IosevkaTermSS18 = "1ixy8nxm3n7pgswg5dfsy01fmzq5vg1g4r401f30zyri9f21010k"; + Iosevka = "0ymq4p5chaczhns24n4xal44ppay566pg95zkkkq51ck52f3zf44"; + IosevkaAile = "1v35phx8ki3yjg43s0fk8snpyc59pa8kg26q56hayxsfrj1dsmck"; + IosevkaCurly = "0d7sp0w7ryh8wwz4hxyhwimhw3ly668ygm4jcwf2amd3r4xxis5k"; + IosevkaCurlySlab = "1lajfma7jdwi453jgd3pq1vdgz5zn3f01j502dfiaskqzfan89cb"; + IosevkaEtoile = "0agg1gg3ymljln8msfask398w58p1wyy5bnzxc0pmmc7ivdajmh4"; + IosevkaSlab = "1rfzij1p3rybxrq461h3ykpq41hqrgaiwjd7x36dzm4bcm7mga9q"; + IosevkaSS01 = "0qhzmk8c0npisxqwn2qicxlad2awmnnvik91daidnndwhw4ylq8y"; + IosevkaSS02 = "15ipbca4c15vs7n62463asl58xshwsrqirhbp23gpr4ixmx2vrmy"; + IosevkaSS03 = "0nw7jx2smkn8aihcmwkmcqlzs0dhm54qmxrm9102vlsf61dawkpj"; + IosevkaSS04 = "1bk18a712xjngmv28fzkw6fs560k928b3ahp9w7cvq1xvji5g3qb"; + IosevkaSS05 = "1xgrbfg1am48j3ps7bnjryyy0pjnx6ahz75zaqwf35cwjb3f5wvf"; + IosevkaSS06 = "1wk1scyz34dc3dcq1af2c3nla1lh56zbgzx1xinf8qwypb6m01dw"; + IosevkaSS07 = "1z8gg8h2kbgq7d4lglfl4awbkmzxpjwcqa1xrxxpcpmxa04ppcfq"; + IosevkaSS08 = "1wid8y6wavxff7b62cxm00y93mjfc3zzjd76g4vgrb7r7ql9kd06"; + IosevkaSS09 = "06hwzhg4qb8cha7zl32pwzbcnzg1dv8432aq7hzfa0jq2jmvpxax"; + IosevkaSS10 = "1p8s2lfvr50pacs941gwxp211j4fn9rzxxvprz03swqklvwadir7"; + IosevkaSS11 = "15izq605ggr2lnc8lljk6lvwkdc87ilx53zw5j7cfdfq8bc6fv6k"; + IosevkaSS12 = "1xnbap1cm125pdg9x8dbc5lm691fr244k5vblj9mqhaqvbq9pqjs"; + IosevkaSS13 = "1l98yjgq4zbxnq5xwhlql9m864n2ha0d46xk0b5w32srnaq09ipb"; + IosevkaSS14 = "0rmd6gc624k3kls98wlz3v407xdq7cynjb06p9zhwxwfy3l9wpwl"; + IosevkaSS15 = "04qnx6lgp1g3vnwsgbxibjjia2fip1vhf5854kp9dx37qi8qzf7g"; + IosevkaSS16 = "13xx1s5gv1gly3pnc5rq6zx93rhllmga3k9ik3p86h3kd1valsvb"; + IosevkaSS17 = "00rc87a09j2v7f1s4spisqgrmlhf67gvvjy14dbmlv7s434z7ap2"; + IosevkaSS18 = "1fdpsqya1gn939v6b7iwj1sjpskbbxr5ypf0l5rvldxfqisx7zj4"; + SGr-Iosevka = "0raiapwifmf02560ibic8g47mal8w91wfdcivh8yh7g2ldf5hchr"; + SGr-IosevkaCurly = "1sg9prv501sa9iy9j4664qsp99d47lmfwn5hqms51kijliplfyfy"; + SGr-IosevkaCurlySlab = "1g216l92khl22w7833pmwaphvr94zjing3sx8ldnj4py26nvvfqp"; + SGr-IosevkaFixed = "0f0jk2fhqb4ch5gm6ndip04brchrz20kvs9ja4yarkmild3j1vmg"; + SGr-IosevkaFixedCurly = "10ayxf5v2yyclpb2gnd06jgkbqvqy0sq5n8vmkjmjb6fx5v0yl7f"; + SGr-IosevkaFixedCurlySlab = "14iyjj2i29bp084yi7ja1xxh3cl95xiyj29jcwgd6ndzv3xf8ir8"; + SGr-IosevkaFixedSlab = "0zvm0qy7bjlj9c3gqzip3ldg9lnm3003fdd1s4ks2zvaz6xwk9sy"; + SGr-IosevkaFixedSS01 = "09npaina3c9rsg84rlm1hadqd64v8i1rjcgbi6d8y5xs01dwn6jg"; + SGr-IosevkaFixedSS02 = "0r67l52pk1wlqdmfn2wbjkcd4szmpj4d24jcgy5b83gjr3hgmcr4"; + SGr-IosevkaFixedSS03 = "1dpj0hv1qghwhxqsymvk0xjhjnwxd9av23hr90bi5h10k7rx3nqy"; + SGr-IosevkaFixedSS04 = "1ffpj0g0jh72x12ibw6mrfkgh87jzhbz4ak15c0yh21rz3bya71a"; + SGr-IosevkaFixedSS05 = "1q6gw659p5fwgbqb20lzw89px8b0k2p65iasway0a4rihb7am18x"; + SGr-IosevkaFixedSS06 = "0axqqhlk0811yxnk34kq8a1ayl4cpykjqd7ma9z52y8a1kgdilx2"; + SGr-IosevkaFixedSS07 = "1jcwwp3w2j1chnn92r2whrq15ka3hfzw96w4ffppwk715s1kc63h"; + SGr-IosevkaFixedSS08 = "0f5xyr8dgbmgw21z9g12admbj4037lgid9agl6djiavljdn3xwlz"; + SGr-IosevkaFixedSS09 = "09xi1rrddivsqr2ddw3g10v2y4ybvbwa7p05jl7hz6kwgr1qrqwd"; + SGr-IosevkaFixedSS10 = "0m6qwkb7svjgskc391dri8vciydzjgx1s91bbsax8gy18mqh3vd7"; + SGr-IosevkaFixedSS11 = "1l04gmzdpccz1xmjqgn0jhpwxvq1axyqnrmkyafd116q4qszbayf"; + SGr-IosevkaFixedSS12 = "1i5jx8cffsl1zpjxvyb3m73r82vfh71z4s4dzg55svzh4lkkdfyc"; + SGr-IosevkaFixedSS13 = "013d0a2kli353vxlrrs5mgwdf1fipv3vsv626izp6whfxfg6pk6h"; + SGr-IosevkaFixedSS14 = "07n4hkrayr5chy46pa0d86srfaprm8kw56x86wndqj2blk5ydvh6"; + SGr-IosevkaFixedSS15 = "16lglz0ri7ww68whf8q009qq6kzaygy6lhbps5lmags34jhc9fa5"; + SGr-IosevkaFixedSS16 = "15j5b2w54bsq8mbi6swq6vd2xvvnnd0j0c3d4dcp4kbhr766841q"; + SGr-IosevkaFixedSS17 = "14j3miv97mk6hg3q7mafqc57m7z5sg6k7gap53v367793gkz6096"; + SGr-IosevkaFixedSS18 = "1iylhw0c05gdp48rx8417khs0yih0q917xx8k81bh5xdg0idyjim"; + SGr-IosevkaSlab = "1wyasyf0ydvh2q0akqvn7bzl66m7kyf2v9p3ry0lgcwv0flrwrpi"; + SGr-IosevkaSS01 = "1hs0pvamx149l2drvciqnwry75165sq2nvl7g0f4jazclfb4af3c"; + SGr-IosevkaSS02 = "05pl8asc5zqm1x4lcj00al27da1m301g96zyijsfxx2vybpw53jd"; + SGr-IosevkaSS03 = "0c60585ss53mzb0swf08r54673a426wq8mamxgnc733yinbsffwx"; + SGr-IosevkaSS04 = "0yml0y535kl2bid1qflkx3rrq2rq81nxpba18kk7xpscsg04ghjn"; + SGr-IosevkaSS05 = "03hxlchn96m0ll47rn8lg092c776b1v99pcrsmrlx3x8gslpdlka"; + SGr-IosevkaSS06 = "04cnymhvm5wi0hb956afi7029acqfqr0djhc1blhpkmldz8pzsn6"; + SGr-IosevkaSS07 = "1v4khps1z16k59snwxffwwn1y1yj2mp8k4fjkrxli7lb5mrn8lwl"; + SGr-IosevkaSS08 = "0pvy39fs5carcb0mh3ak8f5hkfjyk2pkmj7nfcaxdgkcgkys2ixn"; + SGr-IosevkaSS09 = "0cibn02752b2nfjgg12lb10hgigz3a4zcrsc76bh0r9dsgjphscn"; + SGr-IosevkaSS10 = "165snqk5livrkhpwcssb5b221f6gwwirm5rlsmx8d72y7rlc2vb0"; + SGr-IosevkaSS11 = "0czb0gxd2cq329123zcmz9axkfpza43kqhn6bi1rq8dgjh4qn0fx"; + SGr-IosevkaSS12 = "1ycqxpjm5k421a9iwiziab3j69frdgjiz7cwx1k7djqyshqn98k0"; + SGr-IosevkaSS13 = "18wiv124c868h7qaw6qvdy8xhgh4grfhqri8q2mi8zj5gadkh5yb"; + SGr-IosevkaSS14 = "1y2cfivf1zg03c2dn9xg5i29zmi4j3mj5diz3kyd68ih4csrzyla"; + SGr-IosevkaSS15 = "0ghg5f2ay6i2fzbw4xq28hcpbvwjzqvi1pz2nfvd2i2n61960xpr"; + SGr-IosevkaSS16 = "1132nf2xlsab8mhl5k1fvg8j9j6s1iy1avh5mj7jjb1z2i03z3fb"; + SGr-IosevkaSS17 = "155vfg5p114vdl722mqdfap3cm25wxydmhldd88n488yr3yviicv"; + SGr-IosevkaSS18 = "1y76pzsz5gfm0jjw8fa11aajf3zk188xr5fvsf3v89zdzk1ixzgj"; + SGr-IosevkaTerm = "0rkyy77cdcpf74kw59kbz3l7fs0xl2l0m2zwv8nl4i1x4dbxjj9x"; + SGr-IosevkaTermCurly = "09r4ag6madsc8889y1r12wk2763pjginrrykrj7w41j11bcvra39"; + SGr-IosevkaTermCurlySlab = "0bjm43znavfjni7bmi48g4j90v6fp7fg62h32wjvfcpldhycqw8m"; + SGr-IosevkaTermSlab = "0p4wvgp0nw70gdjn00dqh6vwwsl2fxcl11hf41s0hzr6cj8j0s93"; + SGr-IosevkaTermSS01 = "1m8n32qs5jlcbfvzjnhm9lafdc1vg2cjya3hb7sphgiiqqjdgkf1"; + SGr-IosevkaTermSS02 = "14fznvapw4pi3djhfr512pmmlb2air03jkik7d8rw8h69nnragb7"; + SGr-IosevkaTermSS03 = "14386dbd8yah6j74cp4pddp9cjwi175wg4mq62mi0pxkm1fla578"; + SGr-IosevkaTermSS04 = "038c4bkcfn8pd18dikipfbv7mqvils3v4fdrhyfmf83770qvkrf0"; + SGr-IosevkaTermSS05 = "10k49rgwiymbzys8sswfr5ryn1547i1hrg8phb71lbzwxhc4z5m3"; + SGr-IosevkaTermSS06 = "1pxyydwqbv1f51pdg36pvz5pj45nw28yc0vadj2q3617f2jb2n2h"; + SGr-IosevkaTermSS07 = "1p1aqqa5h4m6r97q00qf32myfli2fm7lg692aqw45baxxw8sn52l"; + SGr-IosevkaTermSS08 = "0r7hxaigz66cfgvci88hl0g55177kz3sbb8lji47h1v5r4xhzfl3"; + SGr-IosevkaTermSS09 = "1ah9kbw9zc0nzfnsyxkbv7wnlaaywyvlkmdv5bfi3ds06w2kjphk"; + SGr-IosevkaTermSS10 = "08b1l13g4j55sh10pfa6p7z72cvk4r694lml1m9vl4h4ail8w1ml"; + SGr-IosevkaTermSS11 = "1bqa6d95ga9309m2vr3xzyrhf92dhw3hd3n5awpxip2mfr2k1fbp"; + SGr-IosevkaTermSS12 = "00949ajl9xzpq7q045wb4hm8hfl94zpyp3fdjx0im7v4k2akzkjp"; + SGr-IosevkaTermSS13 = "1cdwxb3bykxkr3ifprmh4pwc33cbyrn26d2h1hix9xsjw5nw99c6"; + SGr-IosevkaTermSS14 = "1k0gwla5xkn8z70m36mhlhs7zm1sj7q33j68mb2wm783lapbll7v"; + SGr-IosevkaTermSS15 = "1gjac767vi97qs8hqdklzqqb75dz0yx0z9pjr2lribfv0dvxvhss"; + SGr-IosevkaTermSS16 = "0f738zydh51gvs68f0csax36bf2pi94pqbp0yjjqyrpx5c9m4pq0"; + SGr-IosevkaTermSS17 = "1rmdb0nbdy47q8v3b7mpb1df5x9yfv7ijs26xwv64aas75hjf8vk"; + SGr-IosevkaTermSS18 = "0jyidsr9aaccrc9bs7k8m5rj11p6vsxdrl2mslgc2bfwcarg89cm"; } diff --git a/pkgs/data/fonts/joypixels/default.nix b/pkgs/data/fonts/joypixels/default.nix index 5938172756697..12558f7d87e3f 100644 --- a/pkgs/data/fonts/joypixels/default.nix +++ b/pkgs/data/fonts/joypixels/default.nix @@ -20,9 +20,9 @@ let }; joypixels-free-license = with systemSpecific; { - spdxId = "LicenseRef-JoyPixels-Free-6.0"; - fullName = "JoyPixels Free License Agreement 6.0"; - url = "https://cdn.joypixels.com/distributions/${systemTag}/license/free-license.pdf"; + spdxId = "LicenseRef-JoyPixels-Free"; + fullName = "JoyPixels Free License Agreement"; + url = "https://cdn.joypixels.com/free-license.pdf"; free = false; }; @@ -43,11 +43,16 @@ let unfree licenses. configuration.nix: - nixpkgs.config.allowUnfree = true; + nixpkgs.config.allowUnfreePredicate = pkg: + builtins.elem (lib.getName pkg) [ + "joypixels" + ]; nixpkgs.config.joypixels.acceptLicense = true; config.nix: - allowUnfree = true; + allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ + "joypixels" + ]; joypixels.acceptLicense = true; [1]: ${joypixels-free-license.url} @@ -58,15 +63,15 @@ in stdenv.mkDerivation rec { pname = "joypixels"; - version = "6.6.0"; + version = "8.0.0"; src = assert !acceptLicense -> throwLicense; with systemSpecific; fetchurl { name = fontFile; url = "https://cdn.joypixels.com/distributions/${systemTag}/font/${version}/${fontFile}"; sha256 = { - darwin = "0qcmb2vn2nykyikzgnlma627zhks7ksy1vkgvpcmqwyxq4bd38d7"; - }.${kernel.name} or "17gjaz7353zyprmds64p01qivy2r8pwf88nvvhi57idas2qd604n"; + darwin = "0kj4nck6k91avhan9iy3n8hhk47xr44rd1lzljjx3w2yzw1w9zvv"; + }.${kernel.name} or "1bkyclgmvl6ppbdvidc5xr1g6f215slf0glnh5p6fsfbxc5h95bw"; }; dontUnpack = true; @@ -82,22 +87,27 @@ stdenv.mkDerivation rec { meta = with lib; { description = "The finest emoji you can use legally (formerly EmojiOne)"; longDescription = '' - Updated for 2021! JoyPixels 6.6 includes 3,559 originally crafted icon - designs and is 100% Unicode 13.1 compatible. We offer the largest - selection of files ranging from png, svg, iconjar, sprites, and fonts. + Updated for 2023! JoyPixels 8.0 includes 3,702 originally crafted icon + designs and is 100% Unicode 15.0 compatible. We offer the largest + selection of files ranging from png, svg, iconjar, and fonts (sprites + available upon request). ''; homepage = "https://www.joypixels.com/fonts"; + hydraPlatforms = []; # Just a binary file download, nothing to cache. license = let free-license = joypixels-free-license; appendix = joypixels-license-appendix; in with systemSpecific; { - spdxId = "LicenseRef-JoyPixels-Free-6.0-with-${capitalized}-Appendix"; + spdxId = "LicenseRef-JoyPixels-Free-with-${capitalized}-Appendix"; fullName = "${free-license.fullName} with ${appendix.fullName}"; url = free-license.url; appendixUrl = appendix.url; free = false; }; maintainers = with maintainers; [ toonn jtojnar ]; + # Not quite accurate since it's a font, not a program, but clearly + # indicates we're not actually building it from source. + sourceProvenance = [ sourceTypes.binaryNativeCode ]; }; } diff --git a/pkgs/data/icons/flat-remix-icon-theme/default.nix b/pkgs/data/icons/flat-remix-icon-theme/default.nix index c19f413ad7d09..9907b18203d7a 100644 --- a/pkgs/data/icons/flat-remix-icon-theme/default.nix +++ b/pkgs/data/icons/flat-remix-icon-theme/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "flat-remix-icon-theme"; - version = "20220525"; + version = "20240201"; src = fetchFromGitHub { owner = "daniruiz"; repo = "flat-remix"; rev = version; - sha256 = "sha256-JpUa2nxZxrLTd80qdiGpob4Trq41ONthsPA4zFj/6nk="; + sha256 = "sha256-3TkBRgoT2AW0Sb0CrXdxh53/jYARAMFC/TIj/r/zruo="; }; nativeBuildInputs = [ @@ -22,6 +22,7 @@ stdenvNoCC.mkDerivation rec { hicolor-icon-theme ]; + dontFixup = true; dontDropIconThemeCache = true; installPhase = '' @@ -31,6 +32,8 @@ stdenvNoCC.mkDerivation rec { for theme in $out/share/icons/*; do gtk-update-icon-cache $theme done + symlinkParentIconThemes + recordPropagatedDependencies ''; meta = with lib; { diff --git a/pkgs/data/misc/osinfo-db/default.nix b/pkgs/data/misc/osinfo-db/default.nix index 6689902ed56f2..0389ac7026595 100644 --- a/pkgs/data/misc/osinfo-db/default.nix +++ b/pkgs/data/misc/osinfo-db/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "osinfo-db"; - version = "20231215"; + version = "20240510"; src = fetchurl { url = "https://releases.pagure.org/libosinfo/${pname}-${version}.tar.xz"; - hash = "sha256-37fFl1zk7//ZKq3QAJSg98WTtBmI/aU5kV9kWfcWRVQ="; + hash = "sha256-CKLVIcSFaH9r45lA1bP2G8D1g7t+NlWhMcZYOF635co="; }; nativeBuildInputs = [ diff --git a/pkgs/data/themes/orchis-theme/default.nix b/pkgs/data/themes/orchis-theme/default.nix index e1dd0a2565942..15f406d68cb24 100644 --- a/pkgs/data/themes/orchis-theme/default.nix +++ b/pkgs/data/themes/orchis-theme/default.nix @@ -26,13 +26,13 @@ lib.checkListOfEnum "${pname}: theme tweaks" validTweaks tweaks stdenvNoCC.mkDerivation rec { inherit pname; - version = "2024-05-01"; + version = "2024-05-30"; src = fetchFromGitHub { repo = "Orchis-theme"; owner = "vinceliuice"; rev = version; - hash = "sha256-xi4kYT566bQqQEY4CByTrpwMfC1uhzeIqpprpe59oIM="; + hash = "sha256-Dpdt7acRodtR4EE4STIiYHidehZwFGoYS8Oh6DgpXOI="; }; nativeBuildInputs = [ gtk3 sassc ]; diff --git a/pkgs/desktops/gnome/core/gnome-color-manager/default.nix b/pkgs/desktops/gnome/core/gnome-color-manager/default.nix index 786e19277e8de..c00d2b97cdb6c 100644 --- a/pkgs/desktops/gnome/core/gnome-color-manager/default.nix +++ b/pkgs/desktops/gnome/core/gnome-color-manager/default.nix @@ -37,6 +37,7 @@ stdenv.mkDerivation rec { ninja pkg-config gettext + glib itstool desktop-file-utils ]; @@ -54,6 +55,8 @@ stdenv.mkDerivation rec { exiv2 ]; + strictDeps = true; + passthru = { updateScript = gnome.updateScript { packageName = pname; diff --git a/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix b/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix index 9887f7f11c522..cb5feb26e4080 100644 --- a/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix +++ b/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix @@ -1,14 +1,16 @@ -{ lib -, stdenv -, fetchurl -, meson -, ninja -, gettext -, pkg-config -, glib -, gnome -, gnome-menus -, substituteAll +{ + lib, + stdenv, + fetchurl, + meson, + ninja, + gettext, + pkg-config, + libgtop, + glib, + gnome, + gnome-menus, + substituteAll, }: stdenv.mkDerivation (finalAttrs: { @@ -25,6 +27,10 @@ stdenv.mkDerivation (finalAttrs: { src = ./fix_gmenu.patch; gmenu_path = "${gnome-menus}/lib/girepository-1.0"; }) + (substituteAll { + src = ./fix_gtop.patch; + gtop_path = "${libgtop}/lib/girepository-1.0"; + }) ]; nativeBuildInputs = [ @@ -35,9 +41,7 @@ stdenv.mkDerivation (finalAttrs: { glib ]; - mesonFlags = [ - "-Dextension_set=all" - ]; + mesonFlags = [ "-Dextension_set=all" ]; preFixup = '' # Since we do not install the schemas to central location, diff --git a/pkgs/desktops/gnome/core/gnome-shell-extensions/fix_gtop.patch b/pkgs/desktops/gnome/core/gnome-shell-extensions/fix_gtop.patch new file mode 100644 index 0000000000000..61c90f184d1ec --- /dev/null +++ b/pkgs/desktops/gnome/core/gnome-shell-extensions/fix_gtop.patch @@ -0,0 +1,25 @@ +diff --git a/extensions/system-monitor/extension.js b/extensions/system-monitor/extension.js +index 37d2eb1..232d0d5 100644 +--- a/extensions/system-monitor/extension.js ++++ b/extensions/system-monitor/extension.js +@@ -6,9 +6,9 @@ + + import Clutter from 'gi://Clutter'; + import Gio from 'gi://Gio'; ++import GIRepository from "gi://GIRepository"; + import GLib from 'gi://GLib'; + import GObject from 'gi://GObject'; +-import GTop from 'gi://GTop'; + import Pango from 'gi://Pango'; + import Shell from 'gi://Shell'; + import St from 'gi://St'; +@@ -19,6 +19,9 @@ import * as PopupMenu from 'resource:///org/gnome/shell/ui/popupMenu.js'; + + import * as Main from 'resource:///org/gnome/shell/ui/main.js'; + ++GIRepository.Repository.prepend_search_path('@gtop_path@'); ++const GTop = (await import("gi://GTop")).default; ++ + const THRESHOLD_HIGH = 0.80; + + // adapted from load-graph.cpp in gnome-system-monitor diff --git a/pkgs/desktops/pantheon/apps/elementary-mail/default.nix b/pkgs/desktops/pantheon/apps/elementary-mail/default.nix index 8f7a89ea23feb..ee4d259d18e1b 100644 --- a/pkgs/desktops/pantheon/apps/elementary-mail/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-mail/default.nix @@ -5,7 +5,6 @@ , pkg-config , meson , ninja -, python3 , vala , gtk3 , libxml2 @@ -24,13 +23,13 @@ stdenv.mkDerivation rec { pname = "elementary-mail"; - version = "7.2.0"; + version = "8.0.0"; src = fetchFromGitHub { owner = "elementary"; repo = "mail"; rev = version; - sha256 = "sha256-hBOogZ9ZNS9KnuNn+jNhTtlupBxZL2DG/CiuBR1kFu0="; + sha256 = "sha256-6T/OTiuDVAPBqp8BPawf/MVEuWTPrLa3/N1Blvt/7Q8="; }; nativeBuildInputs = [ @@ -38,7 +37,6 @@ stdenv.mkDerivation rec { meson ninja pkg-config - python3 vala wrapGAppsHook3 ]; @@ -56,11 +54,6 @@ stdenv.mkDerivation rec { webkitgtk_4_1 ]; - postPatch = '' - chmod +x meson/post_install.py - patchShebangs meson/post_install.py - ''; - preFixup = '' gappsWrapperArgs+=( # The GTK theme is hardcoded. diff --git a/pkgs/desktops/plasma-5/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix index 07e6b4b15b088..be39fe59556ed 100644 --- a/pkgs/desktops/plasma-5/srcs.nix +++ b/pkgs/desktops/plasma-5/srcs.nix @@ -412,11 +412,11 @@ }; }; plasma-workspace = { - version = "5.27.11"; + version = "5.27.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.27.11/plasma-workspace-5.27.11.tar.xz"; - sha256 = "1pbsxssa8jgpy2kkhf43ck6gdkjr216b7ashy8sm7v306v29pmh7"; - name = "plasma-workspace-5.27.11.tar.xz"; + url = "${mirror}/stable/plasma/5.27.11/plasma-workspace-5.27.11.1.tar.xz"; + sha256 = "1bib8z7pmb5mscw2p07mbfsphzpvwsiib84s0g25fz4mma6l4hn7"; + name = "plasma-workspace-5.27.11.1.tar.xz"; }; }; plasma-workspace-wallpapers = { 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..67f9661cf7438 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${lib.optionalString (lib.versionAtLeast version "18") "/x86"}.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..38813766897e4 100644 --- a/pkgs/development/compilers/llvm/common/libcxx/default.nix +++ b/pkgs/development/compilers/llvm/common/libcxx/default.nix @@ -13,8 +13,8 @@ , python3 , fixDarwinDylibNames , version -, cxxabi ? if stdenv.hostPlatform.isFreeBSD then libcxxrt else null -, libcxxrt +, freebsd +, cxxabi ? if stdenv.hostPlatform.isFreeBSD then freebsd.libcxxrt else null , libunwind , enableShared ? !stdenv.hostPlatform.isStatic }: @@ -89,6 +89,8 @@ let "-DLIBCXX_ENABLE_EXCEPTIONS=OFF" ] ++ lib.optionals (!enableShared) [ "-DLIBCXX_ENABLE_SHARED=OFF" + ] ++ lib.optionals (cxxabi != null && cxxabi.libName == "cxxrt") [ + "-DLIBCXX_ENABLE_NEW_DELETE_DEFINITIONS=ON" ]; cmakeFlags = [ 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/mlkit/default.nix b/pkgs/development/compilers/mlkit/default.nix index e5cd4992d6c60..cf0daa016bbcb 100644 --- a/pkgs/development/compilers/mlkit/default.nix +++ b/pkgs/development/compilers/mlkit/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "mlkit"; - version = "4.7.9"; + version = "4.7.10"; src = fetchFromGitHub { owner = "melsman"; repo = "mlkit"; rev = "v${version}"; - sha256 = "sha256-Q5HKNilXhoOaCMY05A09VzK4CpLPte78bivs1c78euM="; + sha256 = "sha256-ZHNr920N8pmz6ho5keT8Q/svCj4efEhwYwagpB+pMf8="; }; nativeBuildInputs = [ autoreconfHook mlton ]; diff --git a/pkgs/development/compilers/openjdk/21.nix b/pkgs/development/compilers/openjdk/21.nix index 623ac281acf7f..160b3da4c8eee 100644 --- a/pkgs/development/compilers/openjdk/21.nix +++ b/pkgs/development/compilers/openjdk/21.nix @@ -14,8 +14,8 @@ let version = { feature = "21"; - interim = ""; - build = "35"; + interim = ".0.3"; + build = "9"; }; # when building a headless jdk, also bootstrap it with a headless jdk @@ -29,7 +29,7 @@ let owner = "openjdk"; repo = "jdk${version.feature}u"; rev = "jdk-${version.feature}${version.interim}+${version.build}"; - hash = "sha256-fA8nRWBuTL87S8mwapmNfCPPQoI2aKHjbHJ6PDN3khs="; + hash = "sha256-zRN16lrc5gtDlTVIQJRRx103w/VbRkatCLeEc9AXWPE="; }; nativeBuildInputs = [ pkg-config autoconf unzip ensureNewerSourcesForZipFilesHook ]; diff --git a/pkgs/development/compilers/openjdk/openjfx/21.nix b/pkgs/development/compilers/openjdk/openjfx/21.nix index 34693b3f921cf..490c9dc7e53f9 100644 --- a/pkgs/development/compilers/openjdk/openjfx/21.nix +++ b/pkgs/development/compilers/openjdk/openjfx/21.nix @@ -7,7 +7,7 @@ let major = "21"; - update = ""; + update = ".0.3"; build = "-ga"; repover = "${major}${update}${build}"; gradle_ = (gradle_7.override { @@ -30,9 +30,9 @@ let src = fetchFromGitHub { owner = "openjdk"; - repo = "jfx"; + repo = "jfx21u"; rev = repover; - hash = "sha256-deNAGfnA6gwcAa64l0AWdkX+vJd3ZOfIgAifSl+/m+s="; + hash = "sha256-7z0GIbkQwG9mXY9dssaicqaKpMo3FkNEpyAvkswoQQ4="; }; buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4 ]; 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..d81e964fb7458 --- /dev/null +++ b/pkgs/development/compilers/rust/1_78.nix @@ -0,0 +1,60 @@ +# 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"; + x86_64-unknown-freebsd = "72f49040fc2ed4492cddfaef3b4a9cb28d008f9f5ce5cac50802a5fca910f58c"; + }; + + selectRustPackage = pkgs: pkgs.rust_1_78; + + rustcPatches = [ ]; +} + +(builtins.removeAttrs args [ "llvmPackages_18" "llvm_18"]) diff --git a/pkgs/development/compilers/rust/binary.nix b/pkgs/development/compilers/rust/binary.nix index c546e278e7fa8..80959d98fd7d6 100644 --- a/pkgs/development/compilers/rust/binary.nix +++ b/pkgs/development/compilers/rust/binary.nix @@ -35,7 +35,8 @@ rec { nativeBuildInputs = lib.optional (!stdenv.isDarwin) autoPatchelfHook; buildInputs = [ bash ] - ++ lib.optionals (!stdenv.isDarwin) [ gcc.cc.lib zlib ] + ++ lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) gcc.cc.lib + ++ lib.optional (!stdenv.isDarwin) zlib ++ lib.optional stdenv.isDarwin Security; postPatch = '' @@ -81,7 +82,7 @@ rec { nativeBuildInputs = [ makeWrapper ] ++ lib.optional (!stdenv.isDarwin) autoPatchelfHook; buildInputs = [ bash ] - ++ lib.optional (!stdenv.isDarwin) gcc.cc.lib + ++ lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) gcc.cc.lib ++ lib.optional stdenv.isDarwin Security; postPatch = '' 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/print-hashes.sh b/pkgs/development/compilers/rust/print-hashes.sh index ebf8d900bb3b5..54c15406df670 100755 --- a/pkgs/development/compilers/rust/print-hashes.sh +++ b/pkgs/development/compilers/rust/print-hashes.sh @@ -19,6 +19,7 @@ PLATFORMS=( aarch64-apple-darwin powerpc64le-unknown-linux-gnu riscv64gc-unknown-linux-gnu + x86_64-unknown-freebsd ) BASEURL=https://static.rust-lang.org/dist VERSION=${1:-} diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index 4c02692b75bd5..82a8e09c84afc 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -58,8 +58,11 @@ in stdenv.mkDerivation (finalAttrs: { NIX_LDFLAGS = toString ( # when linking stage1 libstd: cc: undefined reference to `__cxa_begin_catch' - optional (stdenv.isLinux && !withBundledLLVM) "--push-state --as-needed -lstdc++ --pop-state" + # This doesn't apply to cross-building for FreeBSD because the host + # uses libstdc++, but the target (used for building std) uses libc++ + optional (stdenv.isLinux && !withBundledLLVM && !stdenv.targetPlatform.isFreeBSD) "--push-state --as-needed -lstdc++ --pop-state" ++ optional (stdenv.isDarwin && !withBundledLLVM) "-lc++ -lc++abi" + ++ optional stdenv.isFreeBSD "-rpath ${llvmPackages.libunwind}/lib" ++ optional stdenv.isDarwin "-rpath ${llvmSharedForHost}/lib"); # Increase codegen units to introduce parallelism within the compiler. @@ -192,6 +195,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 @@ -208,6 +217,11 @@ in stdenv.mkDerivation (finalAttrs: { [source.vendored-sources] directory = "vendor" EOF + '' + lib.optionalString (stdenv.isFreeBSD) '' + # lzma-sys bundles an old version of xz that doesn't build + # on modern FreeBSD, use the system one instead + substituteInPlace src/bootstrap/src/core/build_steps/tool.rs \ + --replace 'cargo.env("LZMA_API_STATIC", "1");' ' ' ''; # rustc unfortunately needs cmake to compile llvm-rt but doesn't diff --git a/pkgs/development/compilers/zig/0.10.nix b/pkgs/development/compilers/zig/0.10.nix deleted file mode 100644 index d02b9ff1c976b..0000000000000 --- a/pkgs/development/compilers/zig/0.10.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, llvmPackages -, libxml2 -, zlib -, coreutils -, callPackage -}@args: - -import ./generic.nix args { - version = "0.10.1"; - - hash = "sha256-69QIkkKzApOGfrBdgtmxFMDytRkSh+0YiaJQPbXsBeo="; - - outputs = [ "out" "doc" ]; - - patches = [ - # Backport alignment related panics from zig-master to 0.10. - # Upstream issue: https://github.com/ziglang/zig/issues/14559 - ./002-0.10-macho-fixes.patch - ]; - - cmakeFlags = [ - # file RPATH_CHANGE could not write new RPATH - "-DCMAKE_SKIP_BUILD_RPATH=ON" - - # always link against static build of LLVM - "-DZIG_STATIC_LLVM=ON" - - # ensure determinism in the compiler build - "-DZIG_TARGET_MCPU=baseline" - ]; - - postBuild = '' - ./zig2 run ../doc/docgen.zig -- ./zig2 ../doc/langref.html.in langref.html - ''; - - postInstall = '' - install -Dm644 -t $doc/share/doc/zig-$version/html ./langref.html - ''; -} diff --git a/pkgs/development/compilers/zig/002-0.10-macho-fixes.patch b/pkgs/development/compilers/zig/0.10/001-0.10-macho-fixes.patch index 95f0bdf701e29..95f0bdf701e29 100644 --- a/pkgs/development/compilers/zig/002-0.10-macho-fixes.patch +++ b/pkgs/development/compilers/zig/0.10/001-0.10-macho-fixes.patch diff --git a/pkgs/development/compilers/zig/0.10/default.nix b/pkgs/development/compilers/zig/0.10/default.nix new file mode 100644 index 0000000000000..170edafa819cf --- /dev/null +++ b/pkgs/development/compilers/zig/0.10/default.nix @@ -0,0 +1,109 @@ +{ + lib, + callPackage, + cmake, + coreutils, + fetchFromGitHub, + libxml2, + llvmPackages, + stdenv, + testers, + zlib, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "zig"; + version = "0.10.1"; + + src = fetchFromGitHub { + owner = "ziglang"; + repo = "zig"; + rev = finalAttrs.version; + hash = "sha256-69QIkkKzApOGfrBdgtmxFMDytRkSh+0YiaJQPbXsBeo="; + }; + + patches = [ + # Backport alignment related panics from zig-master to 0.10. + # Upstream issue: https://github.com/ziglang/zig/issues/14559 + ./001-0.10-macho-fixes.patch + ]; + + nativeBuildInputs = [ + cmake + (lib.getDev llvmPackages.llvm) + ]; + + buildInputs = + [ + libxml2 + zlib + ] + ++ (with llvmPackages; [ + libclang + lld + llvm + ]); + + outputs = [ + "out" + "doc" + ]; + + cmakeFlags = [ + # file RPATH_CHANGE could not write new RPATH + (lib.cmakeBool "CMAKE_SKIP_BUILD_RPATH" true) + # always link against static build of LLVM + (lib.cmakeBool "ZIG_STATIC_LLVM" true) + # ensure determinism in the compiler build + (lib.cmakeFeature "ZIG_TARGET_MCPU" "baseline") + ]; + + env.ZIG_GLOBAL_CACHE_DIR = "$TMPDIR/zig-cache"; + + doInstallCheck = true; + + strictDeps = true; + + # Zig's build looks at /usr/bin/env to find dynamic linking info. This doesn't + # work in Nix's sandbox. Use env from our coreutils instead. + postPatch = '' + substituteInPlace lib/std/zig/system/NativeTargetInfo.zig \ + --replace "/usr/bin/env" "${lib.getExe' coreutils "env"}" + ''; + + postBuild = '' + ./zig2 run ../doc/docgen.zig -- ./zig2 ../doc/langref.html.in langref.html + ''; + + postInstall = '' + install -Dm644 -t $doc/share/doc/zig-$version/html ./langref.html + ''; + + installCheckPhase = '' + runHook preInstallCheck + + $out/bin/zig test --cache-dir "$TMPDIR/zig-test-cache" -I $src/test $src/test/behavior.zig + + runHook postInstallCheck + ''; + + passthru = { + hook = callPackage ./hook.nix { zig = finalAttrs.finalPackage; }; + tests = { + version = testers.testVersion { + package = finalAttrs.finalPackage; + command = "zig version"; + }; + }; + }; + + meta = { + description = "General-purpose programming language and toolchain for maintaining robust, optimal, and reusable software"; + homepage = "https://ziglang.org/"; + changelog = "https://ziglang.org/download/${finalAttrs.version}/release-notes.html"; + license = lib.licenses.mit; + mainProgram = "zig"; + maintainers = with lib.maintainers; [ andrewrk ] ++ lib.teams.zig.members; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/development/compilers/zig/0.10/hook.nix b/pkgs/development/compilers/zig/0.10/hook.nix new file mode 100644 index 0000000000000..298d50d9e5f9d --- /dev/null +++ b/pkgs/development/compilers/zig/0.10/hook.nix @@ -0,0 +1,47 @@ +{ + lib, + makeSetupHook, + zig, +}: + +makeSetupHook { + name = "zig-hook"; + + propagatedBuildInputs = [ zig ]; + + substitutions = { + # This zig_default_flags below is meant to avoid CPU feature impurity in + # Nixpkgs. However, this flagset is "unstable": it is specifically meant to + # be controlled by the upstream development team - being up to that team + # exposing or not that flags to the outside (especially the package manager + # teams). + + # Because of this hurdle, @andrewrk from Zig Software Foundation proposed + # some solutions for this issue. Hopefully they will be implemented in + # future releases of Zig. When this happens, this flagset should be + # revisited accordingly. + + # Below are some useful links describing the discovery process of this 'bug' + # in Nixpkgs: + + # https://github.com/NixOS/nixpkgs/issues/169461 + # https://github.com/NixOS/nixpkgs/issues/185644 + # https://github.com/NixOS/nixpkgs/pull/197046 + # https://github.com/NixOS/nixpkgs/pull/241741#issuecomment-1624227485 + # https://github.com/ziglang/zig/issues/14281#issuecomment-1624220653 + + zig_default_flags = [ + "-Dcpu=baseline" + "-Drelease-safe=true" + ]; + }; + + passthru = { + inherit zig; + }; + + meta = { + description = "A setup hook for using the Zig compiler in Nixpkgs"; + inherit (zig.meta) maintainers platforms broken; + }; +} ./setup-hook.sh diff --git a/pkgs/development/compilers/zig/0.10/setup-hook.sh b/pkgs/development/compilers/zig/0.10/setup-hook.sh new file mode 100644 index 0000000000000..689ebec8a3077 --- /dev/null +++ b/pkgs/development/compilers/zig/0.10/setup-hook.sh @@ -0,0 +1,70 @@ +# shellcheck shell=bash disable=SC2154,SC2086 + +readonly zigDefaultFlagsArray=(@zig_default_flags@) + +function zigSetGlobalCacheDir { + ZIG_GLOBAL_CACHE_DIR=$(mktemp -d) + export ZIG_GLOBAL_CACHE_DIR +} + +function zigBuildPhase { + runHook preBuild + + local flagsArray=( + "${zigDefaultFlagsArray[@]}" + $zigBuildFlags "${zigBuildFlagsArray[@]}" + ) + + echoCmd 'zig build flags' "${flagsArray[@]}" + zig build "${flagsArray[@]}" + + runHook postBuild +} + +function zigCheckPhase { + runHook preCheck + + local flagsArray=( + "${zigDefaultFlagsArray[@]}" + $zigCheckFlags "${zigCheckFlagsArray[@]}" + ) + + echoCmd 'zig check flags' "${flagsArray[@]}" + zig build test "${flagsArray[@]}" + + runHook postCheck +} + +function zigInstallPhase { + runHook preInstall + + local flagsArray=( + "${zigDefaultFlagsArray[@]}" + $zigBuildFlags "${zigBuildFlagsArray[@]}" + $zigInstallFlags "${zigInstallFlagsArray[@]}" + ) + + if [ -z "${dontAddPrefix-}" ]; then + # Zig does not recognize `--prefix=/dir/`, only `--prefix /dir/` + flagsArray+=("${prefixKey:---prefix}" "$prefix") + fi + + echoCmd 'zig install flags' "${flagsArray[@]}" + zig build install "${flagsArray[@]}" + + runHook postInstall +} + +addEnvHooks "$targetOffset" zigSetGlobalCacheDir + +if [ -z "${dontUseZigBuild-}" ] && [ -z "${buildPhase-}" ]; then + buildPhase=zigBuildPhase +fi + +if [ -z "${dontUseZigCheck-}" ] && [ -z "${checkPhase-}" ]; then + checkPhase=zigCheckPhase +fi + +if [ -z "${dontUseZigInstall-}" ] && [ -z "${installPhase-}" ]; then + installPhase=zigInstallPhase +fi diff --git a/pkgs/development/compilers/zig/0.11.nix b/pkgs/development/compilers/zig/0.11.nix deleted file mode 100644 index b393f42c65136..0000000000000 --- a/pkgs/development/compilers/zig/0.11.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, llvmPackages -, libxml2 -, zlib -, coreutils -, callPackage -}@args: - -import ./generic.nix args { - version = "0.11.0"; - - hash = "sha256-iuU1fzkbJxI+0N1PiLQM013Pd1bzrgqkbIyTxo5gB2I="; - - outputs = [ "out" "doc" ]; - - cmakeFlags = [ - # file RPATH_CHANGE could not write new RPATH - "-DCMAKE_SKIP_BUILD_RPATH=ON" - - # always link against static build of LLVM - "-DZIG_STATIC_LLVM=ON" - - # ensure determinism in the compiler build - "-DZIG_TARGET_MCPU=baseline" - ]; - - postBuild = '' - stage3/bin/zig run ../tools/docgen.zig -- ../doc/langref.html.in langref.html --zig $PWD/stage3/bin/zig - ''; - - postInstall = '' - install -Dm444 -t $doc/share/doc/zig-$version/html langref.html - ''; -} diff --git a/pkgs/development/compilers/zig/0.11/default.nix b/pkgs/development/compilers/zig/0.11/default.nix new file mode 100644 index 0000000000000..0f19f455cbb0f --- /dev/null +++ b/pkgs/development/compilers/zig/0.11/default.nix @@ -0,0 +1,103 @@ +{ + lib, + callPackage, + cmake, + coreutils, + fetchFromGitHub, + libxml2, + llvmPackages, + stdenv, + testers, + zlib, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "zig"; + version = "0.11.0"; + + src = fetchFromGitHub { + owner = "ziglang"; + repo = "zig"; + rev = finalAttrs.version; + hash = "sha256-iuU1fzkbJxI+0N1PiLQM013Pd1bzrgqkbIyTxo5gB2I="; + }; + + nativeBuildInputs = [ + cmake + (lib.getDev llvmPackages.llvm) + ]; + + buildInputs = + [ + libxml2 + zlib + ] + ++ (with llvmPackages; [ + libclang + lld + llvm + ]); + + outputs = [ + "out" + "doc" + ]; + + cmakeFlags = [ + # file RPATH_CHANGE could not write new RPATH + (lib.cmakeBool "CMAKE_SKIP_BUILD_RPATH" true) + # ensure determinism in the compiler build + (lib.cmakeFeature "ZIG_TARGET_MCPU" "baseline") + # always link against static build of LLVM + (lib.cmakeBool "ZIG_STATIC_LLVM" true) + ]; + + env.ZIG_GLOBAL_CACHE_DIR = "$TMPDIR/zig-cache"; + + doInstallCheck = true; + + strictDeps = true; + + # Zig's build looks at /usr/bin/env to find dynamic linking info. This doesn't + # work in Nix's sandbox. Use env from our coreutils instead. + postPatch = '' + substituteInPlace lib/std/zig/system/NativeTargetInfo.zig \ + --replace "/usr/bin/env" "${lib.getExe' coreutils "env"}" + ''; + + postBuild = '' + stage3/bin/zig run ../tools/docgen.zig -- ../doc/langref.html.in langref.html --zig $PWD/stage3/bin/zig + ''; + + postInstall = '' + install -Dm444 -t $doc/share/doc/zig-$version/html langref.html + ''; + + installCheckPhase = '' + runHook preInstallCheck + + $out/bin/zig test --cache-dir "$TMPDIR/zig-test-cache" -I $src/test $src/test/behavior.zig + + runHook postInstallCheck + ''; + + passthru = { + hook = callPackage ./hook.nix { zig = finalAttrs.finalPackage; }; + tests = { + version = testers.testVersion { + package = finalAttrs.finalPackage; + command = "zig version"; + }; + }; + }; + + meta = { + description = "General-purpose programming language and toolchain for maintaining robust, optimal, and reusable software"; + homepage = "https://ziglang.org/"; + changelog = "https://ziglang.org/download/${finalAttrs.version}/release-notes.html"; + license = lib.licenses.mit; + mainProgram = "zig"; + maintainers = with lib.maintainers; [ andrewrk ] ++ lib.teams.zig.members; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/development/compilers/zig/0.11/hook.nix b/pkgs/development/compilers/zig/0.11/hook.nix new file mode 100644 index 0000000000000..391140d4a7ff3 --- /dev/null +++ b/pkgs/development/compilers/zig/0.11/hook.nix @@ -0,0 +1,47 @@ +{ + lib, + makeSetupHook, + zig, +}: + +makeSetupHook { + name = "zig-hook"; + + propagatedBuildInputs = [ zig ]; + + substitutions = { + # This zig_default_flags below is meant to avoid CPU feature impurity in + # Nixpkgs. However, this flagset is "unstable": it is specifically meant to + # be controlled by the upstream development team - being up to that team + # exposing or not that flags to the outside (especially the package manager + # teams). + + # Because of this hurdle, @andrewrk from Zig Software Foundation proposed + # some solutions for this issue. Hopefully they will be implemented in + # future releases of Zig. When this happens, this flagset should be + # revisited accordingly. + + # Below are some useful links describing the discovery process of this 'bug' + # in Nixpkgs: + + # https://github.com/NixOS/nixpkgs/issues/169461 + # https://github.com/NixOS/nixpkgs/issues/185644 + # https://github.com/NixOS/nixpkgs/pull/197046 + # https://github.com/NixOS/nixpkgs/pull/241741#issuecomment-1624227485 + # https://github.com/ziglang/zig/issues/14281#issuecomment-1624220653 + + zig_default_flags = [ + "-Dcpu=baseline" + "-Doptimize=ReleaseSafe" + ]; + }; + + passthru = { + inherit zig; + }; + + meta = { + description = "A setup hook for using the Zig compiler in Nixpkgs"; + inherit (zig.meta) maintainers platforms broken; + }; +} ./setup-hook.sh diff --git a/pkgs/development/compilers/zig/0.11/setup-hook.sh b/pkgs/development/compilers/zig/0.11/setup-hook.sh new file mode 100644 index 0000000000000..689ebec8a3077 --- /dev/null +++ b/pkgs/development/compilers/zig/0.11/setup-hook.sh @@ -0,0 +1,70 @@ +# shellcheck shell=bash disable=SC2154,SC2086 + +readonly zigDefaultFlagsArray=(@zig_default_flags@) + +function zigSetGlobalCacheDir { + ZIG_GLOBAL_CACHE_DIR=$(mktemp -d) + export ZIG_GLOBAL_CACHE_DIR +} + +function zigBuildPhase { + runHook preBuild + + local flagsArray=( + "${zigDefaultFlagsArray[@]}" + $zigBuildFlags "${zigBuildFlagsArray[@]}" + ) + + echoCmd 'zig build flags' "${flagsArray[@]}" + zig build "${flagsArray[@]}" + + runHook postBuild +} + +function zigCheckPhase { + runHook preCheck + + local flagsArray=( + "${zigDefaultFlagsArray[@]}" + $zigCheckFlags "${zigCheckFlagsArray[@]}" + ) + + echoCmd 'zig check flags' "${flagsArray[@]}" + zig build test "${flagsArray[@]}" + + runHook postCheck +} + +function zigInstallPhase { + runHook preInstall + + local flagsArray=( + "${zigDefaultFlagsArray[@]}" + $zigBuildFlags "${zigBuildFlagsArray[@]}" + $zigInstallFlags "${zigInstallFlagsArray[@]}" + ) + + if [ -z "${dontAddPrefix-}" ]; then + # Zig does not recognize `--prefix=/dir/`, only `--prefix /dir/` + flagsArray+=("${prefixKey:---prefix}" "$prefix") + fi + + echoCmd 'zig install flags' "${flagsArray[@]}" + zig build install "${flagsArray[@]}" + + runHook postInstall +} + +addEnvHooks "$targetOffset" zigSetGlobalCacheDir + +if [ -z "${dontUseZigBuild-}" ] && [ -z "${buildPhase-}" ]; then + buildPhase=zigBuildPhase +fi + +if [ -z "${dontUseZigCheck-}" ] && [ -z "${checkPhase-}" ]; then + checkPhase=zigCheckPhase +fi + +if [ -z "${dontUseZigInstall-}" ] && [ -z "${installPhase-}" ]; then + installPhase=zigInstallPhase +fi diff --git a/pkgs/development/compilers/zig/0.12.nix b/pkgs/development/compilers/zig/0.12.nix deleted file mode 100644 index e234b600bc227..0000000000000 --- a/pkgs/development/compilers/zig/0.12.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, llvmPackages -, libxml2 -, zlib -, coreutils -, callPackage -}@args: - -import ./generic.nix args { - version = "0.12.0"; - - hash = "sha256-RNZiUZtaKXoab5kFrDij6YCAospeVvlLWheTc3FGMks="; - - outputs = [ "out" "doc" ]; - - cmakeFlags = [ - # file RPATH_CHANGE could not write new RPATH - (lib.cmakeBool "CMAKE_SKIP_BUILD_RPATH" true) - - # always link against static build of LLVM - (lib.cmakeBool "ZIG_STATIC_LLVM" true) - - # ensure determinism in the compiler build - (lib.cmakeFeature "ZIG_TARGET_MCPU" "baseline") - ]; - - postBuild = '' - stage3/bin/zig run ../tools/docgen.zig -- ../doc/langref.html.in langref.html --zig $PWD/stage3/bin/zig - ''; - - postInstall = '' - install -Dm444 langref.html -t $doc/share/doc/zig-$version/html - ''; -} diff --git a/pkgs/development/compilers/zig/0.12/default.nix b/pkgs/development/compilers/zig/0.12/default.nix new file mode 100644 index 0000000000000..831366419a934 --- /dev/null +++ b/pkgs/development/compilers/zig/0.12/default.nix @@ -0,0 +1,103 @@ +{ + lib, + callPackage, + cmake, + coreutils, + fetchFromGitHub, + libxml2, + llvmPackages, + stdenv, + testers, + zlib, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "zig"; + version = "0.12.0"; + + src = fetchFromGitHub { + owner = "ziglang"; + repo = "zig"; + rev = finalAttrs.version; + hash = "sha256-RNZiUZtaKXoab5kFrDij6YCAospeVvlLWheTc3FGMks="; + }; + + nativeBuildInputs = [ + cmake + (lib.getDev llvmPackages.llvm) + ]; + + buildInputs = + [ + libxml2 + zlib + ] + ++ (with llvmPackages; [ + libclang + lld + llvm + ]); + + outputs = [ + "out" + "doc" + ]; + + cmakeFlags = [ + # file RPATH_CHANGE could not write new RPATH + (lib.cmakeBool "CMAKE_SKIP_BUILD_RPATH" true) + # ensure determinism in the compiler build + (lib.cmakeFeature "ZIG_TARGET_MCPU" "baseline") + # always link against static build of LLVM + (lib.cmakeBool "ZIG_STATIC_LLVM" true) + ]; + + env.ZIG_GLOBAL_CACHE_DIR = "$TMPDIR/zig-cache"; + + doInstallCheck = true; + + strictDeps = true; + + # Zig's build looks at /usr/bin/env to find dynamic linking info. This doesn't + # work in Nix's sandbox. Use env from our coreutils instead. + postPatch = '' + substituteInPlace lib/std/zig/system.zig \ + --replace "/usr/bin/env" "${lib.getExe' coreutils "env"}" + ''; + + postBuild = '' + stage3/bin/zig run ../tools/docgen.zig -- ../doc/langref.html.in langref.html --zig $PWD/stage3/bin/zig + ''; + + postInstall = '' + install -Dm444 langref.html -t $doc/share/doc/zig-${finalAttrs.version}/html + ''; + + installCheckPhase = '' + runHook preInstallCheck + + $out/bin/zig test --cache-dir "$TMPDIR/zig-test-cache" -I $src/test $src/test/behavior.zig + + runHook postInstallCheck + ''; + + passthru = { + hook = callPackage ./hook.nix { zig = finalAttrs.finalPackage; }; + tests = { + version = testers.testVersion { + package = finalAttrs.finalPackage; + command = "zig version"; + }; + }; + }; + + meta = { + description = "General-purpose programming language and toolchain for maintaining robust, optimal, and reusable software"; + changelog = "https://ziglang.org/download/${finalAttrs.version}/release-notes.html"; + homepage = "https://ziglang.org/"; + license = lib.licenses.mit; + mainProgram = "zig"; + maintainers = with lib.maintainers; [ andrewrk ] ++ lib.teams.zig.members; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/development/compilers/zig/0.12/hook.nix b/pkgs/development/compilers/zig/0.12/hook.nix new file mode 100644 index 0000000000000..294aa851ce0d3 --- /dev/null +++ b/pkgs/development/compilers/zig/0.12/hook.nix @@ -0,0 +1,47 @@ +{ + lib, + makeSetupHook, + zig, +}: + +makeSetupHook { + name = "zig-hook"; + + propagatedBuildInputs = [ zig ]; + + substitutions = { + # This zig_default_flags below is meant to avoid CPU feature impurity in + # Nixpkgs. However, this flagset is "unstable": it is specifically meant to + # be controlled by the upstream development team - being up to that team + # exposing or not that flags to the outside (especially the package manager + # teams). + + # Because of this hurdle, @andrewrk from Zig Software Foundation proposed + # some solutions for this issue. Hopefully they will be implemented in + # future releases of Zig. When this happens, this flagset should be + # revisited accordingly. + + # Below are some useful links describing the discovery process of this 'bug' + # in Nixpkgs: + + # https://github.com/NixOS/nixpkgs/issues/169461 + # https://github.com/NixOS/nixpkgs/issues/185644 + # https://github.com/NixOS/nixpkgs/pull/197046 + # https://github.com/NixOS/nixpkgs/pull/241741#issuecomment-1624227485 + # https://github.com/ziglang/zig/issues/14281#issuecomment-1624220653 + + zig_default_flags = [ + "-Dcpu=baseline" + "--release=safe" + ]; + }; + + passthru = { + inherit zig; + }; + + meta = { + description = "A setup hook for using the Zig compiler in Nixpkgs"; + inherit (zig.meta) maintainers platforms broken; + }; +} ./setup-hook.sh diff --git a/pkgs/development/compilers/zig/0.12/setup-hook.sh b/pkgs/development/compilers/zig/0.12/setup-hook.sh new file mode 100644 index 0000000000000..689ebec8a3077 --- /dev/null +++ b/pkgs/development/compilers/zig/0.12/setup-hook.sh @@ -0,0 +1,70 @@ +# shellcheck shell=bash disable=SC2154,SC2086 + +readonly zigDefaultFlagsArray=(@zig_default_flags@) + +function zigSetGlobalCacheDir { + ZIG_GLOBAL_CACHE_DIR=$(mktemp -d) + export ZIG_GLOBAL_CACHE_DIR +} + +function zigBuildPhase { + runHook preBuild + + local flagsArray=( + "${zigDefaultFlagsArray[@]}" + $zigBuildFlags "${zigBuildFlagsArray[@]}" + ) + + echoCmd 'zig build flags' "${flagsArray[@]}" + zig build "${flagsArray[@]}" + + runHook postBuild +} + +function zigCheckPhase { + runHook preCheck + + local flagsArray=( + "${zigDefaultFlagsArray[@]}" + $zigCheckFlags "${zigCheckFlagsArray[@]}" + ) + + echoCmd 'zig check flags' "${flagsArray[@]}" + zig build test "${flagsArray[@]}" + + runHook postCheck +} + +function zigInstallPhase { + runHook preInstall + + local flagsArray=( + "${zigDefaultFlagsArray[@]}" + $zigBuildFlags "${zigBuildFlagsArray[@]}" + $zigInstallFlags "${zigInstallFlagsArray[@]}" + ) + + if [ -z "${dontAddPrefix-}" ]; then + # Zig does not recognize `--prefix=/dir/`, only `--prefix /dir/` + flagsArray+=("${prefixKey:---prefix}" "$prefix") + fi + + echoCmd 'zig install flags' "${flagsArray[@]}" + zig build install "${flagsArray[@]}" + + runHook postInstall +} + +addEnvHooks "$targetOffset" zigSetGlobalCacheDir + +if [ -z "${dontUseZigBuild-}" ] && [ -z "${buildPhase-}" ]; then + buildPhase=zigBuildPhase +fi + +if [ -z "${dontUseZigCheck-}" ] && [ -z "${checkPhase-}" ]; then + checkPhase=zigCheckPhase +fi + +if [ -z "${dontUseZigInstall-}" ] && [ -z "${installPhase-}" ]; then + installPhase=zigInstallPhase +fi diff --git a/pkgs/development/compilers/zig/0.9.nix b/pkgs/development/compilers/zig/0.9.nix deleted file mode 100644 index d648c9c2eb642..0000000000000 --- a/pkgs/development/compilers/zig/0.9.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, llvmPackages -, libxml2 -, zlib -, coreutils -, callPackage -}@args: - -import ./generic.nix args { - version = "0.9.1"; - - hash = "sha256-x2c4c9RSrNWGqEngio4ArW7dJjW0gg+8nqBwPcR721k="; - - patches = [ - # Fix index out of bounds reading RPATH (cherry-picked from 0.10-dev) - ./000-0.9-read-dynstr-at-rpath-offset.patch - # Fix build on macOS 13 (cherry-picked from 0.10-dev) - ./001-0.9-bump-macos-supported-version.patch - ]; - - prePatch = - let - zig_0_10_0 = fetchFromGitHub { - owner = "ziglang"; - repo = "zig"; - rev = "0.10.0"; - hash = "sha256-DNs937N7PLQimuM2anya4npYXcj6cyH+dRS7AiOX7tw="; - }; - in - '' - cp -R ${zig_0_10_0}/lib/libc/include/any-macos.13-any lib/libc/include/any-macos.13-any - cp -R ${zig_0_10_0}/lib/libc/include/aarch64-macos.13-none lib/libc/include/aarch64-macos.13-gnu - cp -R ${zig_0_10_0}/lib/libc/include/x86_64-macos.13-none lib/libc/include/x86_64-macos.13-gnu - cp ${zig_0_10_0}/lib/libc/darwin/libSystem.13.tbd lib/libc/darwin/ - ''; - - cmakeFlags = [ - # file RPATH_CHANGE could not write new RPATH - "-DCMAKE_SKIP_BUILD_RPATH=ON" - - # ensure determinism in the compiler build - "-DZIG_TARGET_MCPU=baseline" - ]; -} diff --git a/pkgs/development/compilers/zig/000-0.9-read-dynstr-at-rpath-offset.patch b/pkgs/development/compilers/zig/0.9/000-0.9-read-dynstr-at-rpath-offset.patch index 70633193f944d..70633193f944d 100644 --- a/pkgs/development/compilers/zig/000-0.9-read-dynstr-at-rpath-offset.patch +++ b/pkgs/development/compilers/zig/0.9/000-0.9-read-dynstr-at-rpath-offset.patch diff --git a/pkgs/development/compilers/zig/001-0.9-bump-macos-supported-version.patch b/pkgs/development/compilers/zig/0.9/001-0.9-bump-macos-supported-version.patch index 07b90e223553b..07b90e223553b 100644 --- a/pkgs/development/compilers/zig/001-0.9-bump-macos-supported-version.patch +++ b/pkgs/development/compilers/zig/0.9/001-0.9-bump-macos-supported-version.patch diff --git a/pkgs/development/compilers/zig/0.9/default.nix b/pkgs/development/compilers/zig/0.9/default.nix new file mode 100644 index 0000000000000..079773f00e88c --- /dev/null +++ b/pkgs/development/compilers/zig/0.9/default.nix @@ -0,0 +1,111 @@ +{ + lib, + callPackage, + cmake, + coreutils, + fetchFromGitHub, + libxml2, + llvmPackages, + stdenv, + testers, + zlib, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "zig"; + version = "0.9.1"; + + src = fetchFromGitHub { + owner = "ziglang"; + repo = "zig"; + rev = finalAttrs.version; + hash = "sha256-x2c4c9RSrNWGqEngio4ArW7dJjW0gg+8nqBwPcR721k="; + }; + + patches = [ + # Fix index out of bounds reading RPATH (cherry-picked from 0.10-dev) + ./000-0.9-read-dynstr-at-rpath-offset.patch + # Fix build on macOS 13 (cherry-picked from 0.10-dev) + ./001-0.9-bump-macos-supported-version.patch + ]; + + nativeBuildInputs = [ + cmake + (lib.getDev llvmPackages.llvm) + ]; + + buildInputs = + [ + libxml2 + zlib + ] + ++ (with llvmPackages; [ + libclang + lld + llvm + ]); + + cmakeFlags = [ + # file RPATH_CHANGE could not write new RPATH + (lib.cmakeBool "CMAKE_SKIP_BUILD_RPATH" true) + # ensure determinism in the compiler build + (lib.cmakeFeature "ZIG_TARGET_MCPU" "baseline") + ]; + + env.ZIG_GLOBAL_CACHE_DIR = "$TMPDIR/zig-cache"; + + doInstallCheck = true; + + strictDeps = true; + + prePatch = + let + zig_0_10_0 = fetchFromGitHub { + owner = "ziglang"; + repo = "zig"; + rev = "0.10.0"; + hash = "sha256-DNs937N7PLQimuM2anya4npYXcj6cyH+dRS7AiOX7tw="; + }; + in + '' + cp -R ${zig_0_10_0}/lib/libc/include/any-macos.13-any lib/libc/include/any-macos.13-any + cp -R ${zig_0_10_0}/lib/libc/include/aarch64-macos.13-none lib/libc/include/aarch64-macos.13-gnu + cp -R ${zig_0_10_0}/lib/libc/include/x86_64-macos.13-none lib/libc/include/x86_64-macos.13-gnu + cp ${zig_0_10_0}/lib/libc/darwin/libSystem.13.tbd lib/libc/darwin/ + ''; + + # Zig's build looks at /usr/bin/env to find dynamic linking info. This doesn't + # work in Nix's sandbox. Use env from our coreutils instead. + postPatch = '' + substituteInPlace lib/std/zig/system/NativeTargetInfo.zig \ + --replace "/usr/bin/env" "${lib.getExe' coreutils "env"}" + ''; + + installCheckPhase = '' + runHook preInstallCheck + + $out/bin/zig test --cache-dir "$TMPDIR/zig-test-cache" -I $src/test $src/test/behavior.zig + + runHook postInstallCheck + ''; + + passthru = { + hook = callPackage ./hook.nix { zig = finalAttrs.finalPackage; }; + tests = { + version = testers.testVersion { + package = finalAttrs.finalPackage; + command = "zig version"; + }; + }; + }; + + meta = { + description = "General-purpose programming language and toolchain for maintaining robust, optimal, and reusable software"; + homepage = "https://ziglang.org/"; + changelog = "https://ziglang.org/download/${finalAttrs.version}/release-notes.html"; + license = lib.licenses.mit; + mainProgram = "zig"; + maintainers = with lib.maintainers; [ andrewrk ] ++ lib.teams.zig.members; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/development/compilers/zig/0.9/hook.nix b/pkgs/development/compilers/zig/0.9/hook.nix new file mode 100644 index 0000000000000..298d50d9e5f9d --- /dev/null +++ b/pkgs/development/compilers/zig/0.9/hook.nix @@ -0,0 +1,47 @@ +{ + lib, + makeSetupHook, + zig, +}: + +makeSetupHook { + name = "zig-hook"; + + propagatedBuildInputs = [ zig ]; + + substitutions = { + # This zig_default_flags below is meant to avoid CPU feature impurity in + # Nixpkgs. However, this flagset is "unstable": it is specifically meant to + # be controlled by the upstream development team - being up to that team + # exposing or not that flags to the outside (especially the package manager + # teams). + + # Because of this hurdle, @andrewrk from Zig Software Foundation proposed + # some solutions for this issue. Hopefully they will be implemented in + # future releases of Zig. When this happens, this flagset should be + # revisited accordingly. + + # Below are some useful links describing the discovery process of this 'bug' + # in Nixpkgs: + + # https://github.com/NixOS/nixpkgs/issues/169461 + # https://github.com/NixOS/nixpkgs/issues/185644 + # https://github.com/NixOS/nixpkgs/pull/197046 + # https://github.com/NixOS/nixpkgs/pull/241741#issuecomment-1624227485 + # https://github.com/ziglang/zig/issues/14281#issuecomment-1624220653 + + zig_default_flags = [ + "-Dcpu=baseline" + "-Drelease-safe=true" + ]; + }; + + passthru = { + inherit zig; + }; + + meta = { + description = "A setup hook for using the Zig compiler in Nixpkgs"; + inherit (zig.meta) maintainers platforms broken; + }; +} ./setup-hook.sh diff --git a/pkgs/development/compilers/zig/0.9/setup-hook.sh b/pkgs/development/compilers/zig/0.9/setup-hook.sh new file mode 100644 index 0000000000000..689ebec8a3077 --- /dev/null +++ b/pkgs/development/compilers/zig/0.9/setup-hook.sh @@ -0,0 +1,70 @@ +# shellcheck shell=bash disable=SC2154,SC2086 + +readonly zigDefaultFlagsArray=(@zig_default_flags@) + +function zigSetGlobalCacheDir { + ZIG_GLOBAL_CACHE_DIR=$(mktemp -d) + export ZIG_GLOBAL_CACHE_DIR +} + +function zigBuildPhase { + runHook preBuild + + local flagsArray=( + "${zigDefaultFlagsArray[@]}" + $zigBuildFlags "${zigBuildFlagsArray[@]}" + ) + + echoCmd 'zig build flags' "${flagsArray[@]}" + zig build "${flagsArray[@]}" + + runHook postBuild +} + +function zigCheckPhase { + runHook preCheck + + local flagsArray=( + "${zigDefaultFlagsArray[@]}" + $zigCheckFlags "${zigCheckFlagsArray[@]}" + ) + + echoCmd 'zig check flags' "${flagsArray[@]}" + zig build test "${flagsArray[@]}" + + runHook postCheck +} + +function zigInstallPhase { + runHook preInstall + + local flagsArray=( + "${zigDefaultFlagsArray[@]}" + $zigBuildFlags "${zigBuildFlagsArray[@]}" + $zigInstallFlags "${zigInstallFlagsArray[@]}" + ) + + if [ -z "${dontAddPrefix-}" ]; then + # Zig does not recognize `--prefix=/dir/`, only `--prefix /dir/` + flagsArray+=("${prefixKey:---prefix}" "$prefix") + fi + + echoCmd 'zig install flags' "${flagsArray[@]}" + zig build install "${flagsArray[@]}" + + runHook postInstall +} + +addEnvHooks "$targetOffset" zigSetGlobalCacheDir + +if [ -z "${dontUseZigBuild-}" ] && [ -z "${buildPhase-}" ]; then + buildPhase=zigBuildPhase +fi + +if [ -z "${dontUseZigCheck-}" ] && [ -z "${checkPhase-}" ]; then + checkPhase=zigCheckPhase +fi + +if [ -z "${dontUseZigInstall-}" ] && [ -z "${installPhase-}" ]; then + installPhase=zigInstallPhase +fi diff --git a/pkgs/development/coq-modules/mathcomp-word/default.nix b/pkgs/development/coq-modules/mathcomp-word/default.nix index 0183de9812269..98fdefa6d1176 100644 --- a/pkgs/development/coq-modules/mathcomp-word/default.nix +++ b/pkgs/development/coq-modules/mathcomp-word/default.nix @@ -18,8 +18,10 @@ mkCoqDerivation { releaseRev = v: "v${v}"; + release."3.2".sha256 = "sha256-4HOFFQzKbHIq+ktjJaS5b2Qr8WL1eQ26YxF4vt1FdWM="; release."3.1".sha256 = "sha256-qQHis6554sG7NpCpWhT2wvelnxsrbEPVNv3fpxwxHMU="; release."3.0".sha256 = "sha256-xEgx5HHDOimOJbNMtIVf/KG3XBemOS9XwoCoW6btyJ4="; + release."2.4".sha256 = "sha256-OG99PfjhtKikxM9aBKRsej1gTo1O/llAdXdiiyjZf2Q="; release."2.3".sha256 = "sha256-whU1yvFFuxpwQutW41B/WBg5DrVZJW/Do/GuHtzuI3U="; release."2.2".sha256 = "sha256-8BB6SToCrMZTtU78t2K+aExuxk9O1lCqVQaa8wabSm8="; release."2.1".sha256 = "sha256-895gZzwwX8hN9UUQRhcgRlphHANka9R0PRotfmSEelA="; @@ -27,8 +29,8 @@ mkCoqDerivation { inherit version; defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [ - { cases = [ (range "8.16" "8.19") (isGe "2.0") ]; out = "3.1"; } - { cases = [ (range "8.12" "8.19") (range "1.12" "1.19") ]; out = "2.3"; } + { cases = [ (range "8.16" "8.19") (isGe "2.0") ]; out = "3.2"; } + { cases = [ (range "8.12" "8.19") (range "1.12" "1.19") ]; out = "2.4"; } ] null; propagatedBuildInputs = [ mathcomp.algebra mathcomp.ssreflect mathcomp.fingroup ]; 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/micropython/default.nix b/pkgs/development/interpreters/micropython/default.nix index 6437e942ae344..c28d09ede3a60 100644 --- a/pkgs/development/interpreters/micropython/default.nix +++ b/pkgs/development/interpreters/micropython/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "micropython"; - version = "1.22.2"; + version = "1.23.0"; src = fetchFromGitHub { owner = "micropython"; repo = "micropython"; rev = "v${version}"; - sha256 = "sha256-sdok17HvKub/sI+8cAIIDaLD/3mu8yXXqrTOej8/UfU="; + sha256 = "sha256-sfJohmsqq5FumUoVE8x3yWv12DiCJJXae62br0j+190="; fetchSubmodules = true; }; 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/julia-modules/depot.nix b/pkgs/development/julia-modules/depot.nix index 5614f1427aa5e..c2189ebaf94c0 100644 --- a/pkgs/development/julia-modules/depot.nix +++ b/pkgs/development/julia-modules/depot.nix @@ -52,7 +52,10 @@ runCommand "julia-depot" { # for finding the extra packages we need to add python ${./python}/find_package_implications.py "${closureYaml}" '${lib.generators.toJSON {} packageImplications}' extra_package_names.txt - # git config --global --add safe.directory '/nix' + # Work around new git security features added in git 2.44.1 + # See https://github.com/NixOS/nixpkgs/issues/315890 + git config --global --add safe.directory '*' + export JULIA_PKG_USE_CLI_GIT="true" # At time of writing, this appears to be the only way to turn precompiling's diff --git a/pkgs/development/julia-modules/tests/julia-top-n/app/Main.hs b/pkgs/development/julia-modules/tests/julia-top-n/app/Main.hs index ed9f8d405b12c..55f5fd3cfeef8 100644 --- a/pkgs/development/julia-modules/tests/julia-top-n/app/Main.hs +++ b/pkgs/development/julia-modules/tests/julia-top-n/app/Main.hs @@ -4,6 +4,7 @@ {-# LANGUAGE FlexibleContexts #-} {-# LANGUAGE LambdaCase #-} {-# LANGUAGE OverloadedStrings #-} +{-# LANGUAGE QuasiQuotes #-} {-# LANGUAGE RecordWildCards #-} {-# LANGUAGE ScopedTypeVariables #-} {-# LANGUAGE ViewPatterns #-} @@ -17,6 +18,7 @@ import qualified Data.Aeson.Key as A import qualified Data.Aeson.KeyMap as HM import qualified Data.ByteString.Lazy.Char8 as BL8 import qualified Data.List as L +import Data.String.Interpolate import Data.Text as T import qualified Data.Vector as V import qualified Data.Yaml as Yaml @@ -33,6 +35,7 @@ data Args = Args { countFilePath :: FilePath , topN :: Int , parallelism :: Int + , juliaAttr :: Text } argsParser :: Parser Args @@ -40,6 +43,7 @@ argsParser = Args <$> strOption (long "count-file" <> short 'c' <> help "YAML file containing package names and counts") <*> option auto (long "top-n" <> short 'n' <> help "How many of the top packages to build" <> showDefault <> value 100 <> metavar "INT") <*> option auto (long "parallelism" <> short 'p' <> help "How many builds to run at once" <> showDefault <> value 10 <> metavar "INT") + <*> strOption (long "julia-attr" <> short 'a' <> help "Which Julia attr to build with" <> showDefault <> value "julia" <> metavar "STRING") data NameAndCount = NameAndCount { name :: Text @@ -69,7 +73,7 @@ main = do introduce' (defaultNodeOptions { nodeOptionsVisibilityThreshold = 0 }) (T.unpack name) julia (newMVar Nothing) (const $ return ()) $ do it "Builds" $ do let cp = proc "nix" ["build", "--impure", "--no-link", "--json", "--expr" - , "with import ../../../../. {}; julia.withPackages [\"" <> T.unpack name <> "\"]" + , [i|with import ../../../../. {}; #{juliaAttr}.withPackages ["#{name}"]|] ] output <- readCreateProcessWithLogging cp "" juliaPath <- case A.eitherDecode (BL8.pack output) of diff --git a/pkgs/development/julia-modules/tests/julia-top-n/julia-top-n.cabal b/pkgs/development/julia-modules/tests/julia-top-n/julia-top-n.cabal index 834adac33f16a..e3a319702f7a7 100644 --- a/pkgs/development/julia-modules/tests/julia-top-n/julia-top-n.cabal +++ b/pkgs/development/julia-modules/tests/julia-top-n/julia-top-n.cabal @@ -27,6 +27,7 @@ executable julia-top-n-exe , filepath , optparse-applicative , sandwich + , string-interpolate , text , unliftio , vector diff --git a/pkgs/development/julia-modules/tests/julia-top-n/package.yaml b/pkgs/development/julia-modules/tests/julia-top-n/package.yaml index ffb9ab1d12ea4..404ebc72dd674 100644 --- a/pkgs/development/julia-modules/tests/julia-top-n/package.yaml +++ b/pkgs/development/julia-modules/tests/julia-top-n/package.yaml @@ -11,6 +11,7 @@ dependencies: - filepath - optparse-applicative - sandwich +- string-interpolate - text - unliftio - vector 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/dleyna-core/default.nix b/pkgs/development/libraries/dleyna-core/default.nix index 2f019977c89d4..c9bbae74611e2 100644 --- a/pkgs/development/libraries/dleyna-core/default.nix +++ b/pkgs/development/libraries/dleyna-core/default.nix @@ -32,6 +32,11 @@ stdenv.mkDerivation rec { gupnp ]; + env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isClang [ + "-Wno-error=implicit-function-declaration" + "-Wno-error=int-conversion" + ]); + meta = with lib; { description = "Library of utility functions that are used by the higher level dLeyna"; homepage = "https://github.com/phako/dleyna-core"; diff --git a/pkgs/development/libraries/eccodes/default.nix b/pkgs/development/libraries/eccodes/default.nix index e8b58762f9208..1597375cf7694 100644 --- a/pkgs/development/libraries/eccodes/default.nix +++ b/pkgs/development/libraries/eccodes/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "eccodes"; - version = "2.34.1"; + version = "2.35.0"; src = fetchurl { url = "https://confluence.ecmwf.int/download/attachments/45757960/eccodes-${version}-Source.tar.gz"; - hash = "sha256-+bhoASLjzOwm5u0kqB8bxQ7Z8iMrQx4F5XNniqxNlzQ="; + hash = "sha256-FoiPtmebHiQfULafMArFASSjGSNCri6pA9diG2ZOeeo="; }; postPatch = '' 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/fribidi/default.nix b/pkgs/development/libraries/fribidi/default.nix index d23cd352360bc..768c2185a1581 100644 --- a/pkgs/development/libraries/fribidi/default.nix +++ b/pkgs/development/libraries/fribidi/default.nix @@ -11,14 +11,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "fribidi"; - version = "1.0.13"; + version = "1.0.14"; outputs = [ "out" "dev" "devdoc" ]; # NOTE: Only URL tarball has "Have pre-generated man pages: true", which works-around upstream usage of some rare ancient `c2man` fossil application. src = fetchurl { url = with finalAttrs; "https://github.com/fribidi/fribidi/releases/download/v${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-f6FsgMgb1iL3sZjTE1baE5zDGKY/x3YSF69BMJA/VKI="; + sha256 = "sha256-dq4gSnAnZSrDmBufpYF8CDuiMRQ0AoTFjnVrJZzSJZo="; }; postPatch = '' 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/gegl/default.nix b/pkgs/development/libraries/gegl/default.nix index 93035b373eb45..addc4a9dbe448 100644 --- a/pkgs/development/libraries/gegl/default.nix +++ b/pkgs/development/libraries/gegl/default.nix @@ -31,6 +31,7 @@ , openexr , OpenCL , suitesparse +, withLuaJIT ? lib.meta.availableOn stdenv.hostPlatform luajit }: stdenv.mkDerivation rec { @@ -71,13 +72,14 @@ stdenv.mkDerivation rec { libraw libwebp gexiv2 - luajit openexr suitesparse ] ++ lib.optionals stdenv.isDarwin [ OpenCL ] ++ lib.optionals stdenv.cc.isClang [ llvmPackages.openmp + ] ++ lib.optionals withLuaJIT [ + luajit ]; # for gegl-4.0.pc @@ -97,6 +99,8 @@ stdenv.mkDerivation rec { # Disabled due to multiple vulnerabilities, see # https://github.com/NixOS/nixpkgs/pull/73586 "-Djasper=disabled" + ] ++ lib.optionals (!withLuaJIT) [ + "-Dlua=disabled" ]; postPatch = '' 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/json-fortran/default.nix b/pkgs/development/libraries/json-fortran/default.nix index 16f4cc34d1541..de1909fae4444 100644 --- a/pkgs/development/libraries/json-fortran/default.nix +++ b/pkgs/development/libraries/json-fortran/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "json-fortran"; - version = "8.5.0"; + version = "8.5.2"; src = fetchFromGitHub { owner = "jacobwilliams"; repo = pname; rev = version; - hash = "sha256-S5Vn2VjrwdIEPKJDStfgRgOqe8g3kuoi26GODmlKhig="; + hash = "sha256-ja/MIqAe4V5nasdtWThkRxNWCx4+twz7/dX4+8X+Bt8="; }; nativeBuildInputs = [ 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/libAfterImage/default.nix b/pkgs/development/libraries/libAfterImage/default.nix deleted file mode 100644 index 828a6891e293c..0000000000000 --- a/pkgs/development/libraries/libAfterImage/default.nix +++ /dev/null @@ -1,98 +0,0 @@ -{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook, giflib, libjpeg, libpng, libX11, zlib -, static ? stdenv.hostPlatform.isStatic -, withX ? !stdenv.isDarwin }: - -stdenv.mkDerivation { - pname = "libAfterImage"; - version = "1.20"; - - src = fetchurl { - name = "libAfterImage-1.20.tar.bz2"; - urls = [ - "https://sourceforge.net/projects/afterstep/files/libAfterImage/1.20/libAfterImage-1.20.tar.bz2/download" - "ftp://ftp.afterstep.org/stable/libAfterImage/libAfterImage-1.20.tar.bz2" - ]; - sha256 = "0n74rxidwig3yhr6fzxsk7y19n1nq1f296lzrvgj5pfiyi9k48vf"; - }; - - patches = [ - # add back --with-gif option - (fetchpatch { - name = "libafterimage-gif.patch"; - url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/libafterimage/files/libafterimage-gif.patch?id=4aa4fca00611b0b3a4007870da43cc5fd63f76c4"; - sha256 = "16pa94wlqpd7h6mzs4f0qm794yk1xczrwsgf93kdd3g0zbjq3rnr"; - }) - - # fix build with newer giflib - (fetchpatch { - name = "libafterimage-giflib5-v2.patch"; - url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/libafterimage/files/libafterimage-giflib5-v2.patch?id=4aa4fca00611b0b3a4007870da43cc5fd63f76c4"; - sha256 = "0qwydqy9bm73cg5n3vm97aj4jfi70p7fxqmfbi54vi78z593brln"; - stripLen = 1; - }) - - # fix build with newer libpng - (fetchpatch { - name = "libafterimage-libpng15.patch"; - url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/libafterimage/files/libafterimage-libpng15.patch?id=4aa4fca00611b0b3a4007870da43cc5fd63f76c4"; - sha256 = "1qyvf7786hayasfnnilfbri3p99cfz5wjpbli3gdqj2cvk6mpydv"; - }) - - # fix an ldconfig problem - (fetchpatch { - name = "libafterimage-makefile.patch"; - url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/libafterimage/files/libafterimage-makefile.in.patch?id=4aa4fca00611b0b3a4007870da43cc5fd63f76c4"; - sha256 = "1n6fniz6dldms615046yhc4mlg9gb53y4yfia8wfz6szgq5zicj4"; - }) - - # Fix build failure against binutils-2.36: - # https://sourceforge.net/p/afterstep/bugs/5/ - (fetchpatch { - name = "binutils-2.36.patch"; - url = "https://sourceforge.net/p/afterstep/bugs/5/attachment/libafterimage-binutils-2.36-support.patch"; - sha256 = "1cfgm2ffwlsmhvvfmrxlglddaigr99k88d5xqva9pkl3mmzy3jym"; - # workaround '-p0' patchflags below. - stripLen = 1; - }) - - # fix https://github.com/root-project/root/issues/10990 - (fetchpatch { - url = "https://github.com/root-project/root/pull/11243/commits/e177a477b0be05ef139094be1e96a99ece06350a.diff"; - hash = "sha256-2DQmJGHmATHawl3dk9dExncVe1sXzJQyy4PPwShoLTY="; - stripLen = 5; - }) - ]; - patchFlags = [ "-p0" ]; - - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ giflib libjpeg libpng zlib ] ++ lib.optional withX libX11; - - preConfigure = '' - rm -rf {libjpeg,libpng,libungif,zlib}/ - substituteInPlace Makefile.in \ - --replace "include .depend" "" - '' + lib.optionalString stdenv.isDarwin '' - substituteInPlace Makefile.in \ - --replace "-soname," "-install_name,$out/lib/" - ''; - - configureFlags = [ - "--with-gif" - "--disable-mmx-optimization" - "--${if static then "enable" else "disable"}-staticlibs" - "--${if !static then "enable" else "disable"}-sharedlibs" - "--${if withX then "with" else "without"}-x" - ]; - - env = lib.optionalAttrs stdenv.cc.isClang { - NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; - }; - - meta = with lib; { - homepage = "http://www.afterstep.org/afterimage/"; - description = "A generic image manipulation library"; - platforms = platforms.unix; - maintainers = [ maintainers.veprbl ]; - license = licenses.lgpl21; - }; -} 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/libunistring/default.nix b/pkgs/development/libraries/libunistring/default.nix index 51eb5558d626b..e865873c2851b 100644 --- a/pkgs/development/libraries/libunistring/default.nix +++ b/pkgs/development/libraries/libunistring/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, libiconv }: +{ fetchurl, lib, stdenv, libiconv, updateAutotoolsGnuConfigScriptsHook }: # Note: this package is used for bootstrapping fetchurl, and thus # cannot use fetchpatch! All mutable patches (generated by GitHub or @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { strictDeps = true; propagatedBuildInputs = lib.optional (!stdenv.isLinux) libiconv; + nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ]; configureFlags = [ "--with-libiconv-prefix=${libiconv}" 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/pdfhummus/default.nix b/pkgs/development/libraries/pdfhummus/default.nix index bfba4ad096202..d0c1b5060ee02 100644 --- a/pkgs/development/libraries/pdfhummus/default.nix +++ b/pkgs/development/libraries/pdfhummus/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "pdfhummus"; - version = "4.6.3"; + version = "4.6.4"; src = fetchFromGitHub { owner = "galkahana"; repo = "PDF-Writer"; rev = "v${version}"; - hash = "sha256-6Hp5hacMpVdsiUvMSXBQ5432tPrkHSOiVoWa91sv38k="; + hash = "sha256-7VltECiXQY+6M5EE17SKj0KwLk0+gOJfbLqprafIgLQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/physics/hepmc3/default.nix b/pkgs/development/libraries/physics/hepmc3/default.nix index 9d2eab6e7f15b..bf3ffe8425f89 100644 --- a/pkgs/development/libraries/physics/hepmc3/default.nix +++ b/pkgs/development/libraries/physics/hepmc3/default.nix @@ -39,6 +39,7 @@ stdenv.mkDerivation rec { ''; cmakeFlags = [ + "-DHEPMC3_CXX_STANDARD=17" "-DHEPMC3_ENABLE_PYTHON=${if withPython then "ON" else "OFF"}" ] ++ lib.optionals withPython [ "-DHEPMC3_PYTHON_VERSIONS=${if python.isPy3k then "3.X" else "2.X"}" 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/pipewire/wireplumber.nix b/pkgs/development/libraries/pipewire/wireplumber.nix index 2e2ef053a1198..c7099262000ce 100644 --- a/pkgs/development/libraries/pipewire/wireplumber.nix +++ b/pkgs/development/libraries/pipewire/wireplumber.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { pname = "wireplumber"; - version = "0.5.2"; + version = "0.5.3"; outputs = [ "out" "dev" ] ++ lib.optional enableDocs "doc"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { owner = "pipewire"; repo = "wireplumber"; rev = version; - hash = "sha256-SXLHQbjh4IygV+925fsPXgj7DFIPQj48oLNKWkUhuK8="; + hash = "sha256-bZZIrD+SxAolDM0BRjcN4YCM26lnjkw8pIX54wSYrsk="; }; nativeBuildInputs = [ 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/simdjson/default.nix b/pkgs/development/libraries/simdjson/default.nix index 410ef47b1bc3d..979eb92aa4637 100644 --- a/pkgs/development/libraries/simdjson/default.nix +++ b/pkgs/development/libraries/simdjson/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "simdjson"; - version = "3.9.2"; + version = "3.9.3"; src = fetchFromGitHub { owner = "simdjson"; repo = "simdjson"; rev = "v${version}"; - sha256 = "sha256-7YW0ylYQMi6D7YyRQGWRv980skjZ2t//QoZb8rRDHGk="; + sha256 = "sha256-TbCfAtP/mOgSWjG1eUE4atDU0gPXS7rkhsTWE3g1Z2U="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/spdk/0001-fix-setuptools-installation.patch b/pkgs/development/libraries/spdk/0001-fix-setuptools-installation.patch deleted file mode 100644 index 3c3fb50fc1525..0000000000000 --- a/pkgs/development/libraries/spdk/0001-fix-setuptools-installation.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 3f718fc1873c9c138684ea019e9bd42c9b24506c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io> -Date: Tue, 28 Nov 2023 11:28:11 +0100 -Subject: [PATCH] fix setuptools installation -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Jörg Thalheim <joerg@thalheim.io> ---- - python/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/python/Makefile b/python/Makefile -index f835daa..b41995a 100644 ---- a/python/Makefile -+++ b/python/Makefile -@@ -12,7 +12,7 @@ setup_cmd += --root $(DESTDIR) - endif - - ifneq ($(CONFIG_PYDIR),) --setup_cmd += --install-purelib $(CONFIG_PYDIR) -+setup_cmd += --root / --prefix $(CONFIG_PYDIR) - purelibdir := $(CONFIG_PYDIR) - else - purelibdir := $(shell python3 -c "import sysconfig; print(sysconfig.get_paths()['purelib'])") --- -2.42.0 - diff --git a/pkgs/development/libraries/spdk/default.nix b/pkgs/development/libraries/spdk/default.nix index 46ee5600a4daf..3c3bf275d709d 100644 --- a/pkgs/development/libraries/spdk/default.nix +++ b/pkgs/development/libraries/spdk/default.nix @@ -4,6 +4,7 @@ , python3 , cunit , dpdk +, fuse3 , libaio , libbsd , libuuid @@ -22,19 +23,22 @@ stdenv.mkDerivation rec { pname = "spdk"; - version = "23.09"; + version = "24.01"; src = fetchFromGitHub { owner = "spdk"; repo = "spdk"; rev = "v${version}"; - sha256 = "sha256-P10NDa+MIEY8B3bu34Dq2keyuv2a24XV5Wf+Ah701b8="; + sha256 = "sha256-5znYELR6WvVXbfFKAcRtJnSwAE5WHmA8v1rvZUtszS4="; fetchSubmodules = true; }; nativeBuildInputs = [ python3 + python3.pkgs.pip python3.pkgs.setuptools + python3.pkgs.wheel + python3.pkgs.wrapPython pkg-config ensureNewerSourcesForZipFilesHook ]; @@ -42,6 +46,7 @@ stdenv.mkDerivation rec { buildInputs = [ cunit dpdk + fuse3 jansson libaio libbsd @@ -56,10 +61,8 @@ stdenv.mkDerivation rec { zstd ]; - patches = [ - # https://review.spdk.io/gerrit/c/spdk/spdk/+/20394 - ./setuptools.patch - ./0001-fix-setuptools-installation.patch + propagatedBuildInputs = [ + python3.pkgs.configshell ]; postPatch = '' @@ -70,13 +73,16 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-dpdk=${dpdk}" - "--pydir=${placeholder "out"}" ]; postCheck = '' python3 -m spdk ''; + postFixup = '' + wrapPythonPrograms + ''; + env.NIX_CFLAGS_COMPILE = "-mssse3"; # Necessary to compile. # otherwise does not find strncpy when compiling env.NIX_LDFLAGS = "-lbsd"; diff --git a/pkgs/development/libraries/spdk/setuptools.patch b/pkgs/development/libraries/spdk/setuptools.patch deleted file mode 100644 index b3e7644c0076b..0000000000000 --- a/pkgs/development/libraries/spdk/setuptools.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 3a72290ba7e2d71ca887225fc0eb8792ca863be2 Mon Sep 17 00:00:00 2001 -From: Jörg Thalheim <joerg@thalheim.io> -Date: Tue, 24 Oct 2023 14:30:53 +0200 -Subject: [PATCH] python: drop deprecated distutils - -This is scheduled for removal in python 3.12: https://docs.python.org/3/whatsnew/3.12.html - -Change-Id: I728dc0cf4ed20f22016d3d58cca8aee3af2bcd8b -Signed-off-by: Jörg Thalheim <joerg@thalheim.io> ---- - -diff --git a/python/setup.py b/python/setup.py -index 47e2104..ae4dff7 100755 ---- a/python/setup.py -+++ b/python/setup.py -@@ -2,8 +2,7 @@ - # SPDX-License-Identifier: BSD-3-Clause - # Copyright (C) 2023 Intel Corporation. All rights reserved. - --from distutils.core import setup --from setuptools import find_packages -+from setuptools import setup, find_packages - from spdk import __version__ - - diff --git a/pkgs/development/libraries/spdlog/default.nix b/pkgs/development/libraries/spdlog/default.nix index f9255e3df5950..6aa91db83549a 100644 --- a/pkgs/development/libraries/spdlog/default.nix +++ b/pkgs/development/libraries/spdlog/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "spdlog"; - version = "1.13.0"; + version = "1.14.1"; src = fetchFromGitHub { owner = "gabime"; repo = "spdlog"; rev = "v${version}"; - hash = "sha256-3n8BnjZ7uMH8quoiT60yTU7poyOtoEmzNMOLa1+r7X0="; + hash = "sha256-F7khXbMilbh5b+eKnzcB0fPPWQqUHqAYPWJb83OnUKQ="; }; 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/toml-f/default.nix b/pkgs/development/libraries/toml-f/default.nix index e24ceec58c075..3f95d5682f9e0 100644 --- a/pkgs/development/libraries/toml-f/default.nix +++ b/pkgs/development/libraries/toml-f/default.nix @@ -25,7 +25,8 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - doCheck = true; + # tftest-build fails on aarch64-linux + doCheck = !stdenv.isAarch64; meta = with lib; { description = "TOML parser implementation for data serialization and deserialization in Fortran"; 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/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 276ee77363253..e9d8f98541134 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -2274,14 +2274,14 @@ buildLuarocksPackage { luv = callPackage({ buildLuarocksPackage, cmake, fetchurl, luaOlder }: buildLuarocksPackage { pname = "luv"; - version = "1.44.2-1"; + version = "1.48.0-2"; knownRockspec = (fetchurl { - url = "mirror://luarocks/luv-1.44.2-1.rockspec"; - sha256 = "07jwi50i16rv7sj914k1q3l9dy9wldbw2skmsdrzlkc57mqvg348"; + url = "mirror://luarocks/luv-1.48.0-2.rockspec"; + sha256 = "0353bjn9z90a1hd7rksdfrd9fbdd31hbvdaxr1fb0fh0bc1cpy94"; }).outPath; src = fetchurl { - url = "https://github.com/luvit/luv/releases/download/1.44.2-1/luv-1.44.2-1.tar.gz"; - sha256 = "0c2wkszxw6gwa4l6g1d2zzh660j13lif6c7a910vq7zn8jycgd9y"; + url = "https://github.com/luvit/luv/releases/download/1.48.0-2/luv-1.48.0-2.tar.gz"; + sha256 = "2c3a1ddfebb4f6550293a40ee789f7122e97647eede51511f57203de48c03b7a"; }; disabled = luaOlder "5.1"; diff --git a/pkgs/development/misc/brev-cli/default.nix b/pkgs/development/misc/brev-cli/default.nix index 812f063a3c620..3540c29e78ad3 100644 --- a/pkgs/development/misc/brev-cli/default.nix +++ b/pkgs/development/misc/brev-cli/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "brev-cli"; - version = "0.6.284"; + version = "0.6.287"; src = fetchFromGitHub { owner = "brevdev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-G70309GQ3C7ZBS4baRKN3Ms4MBvCmLmPorbByZy4Qh4="; + sha256 = "sha256-5P0cZ7zbzEqWLQTi1kMGcC0R0BQa2gJrLzEcw17GATA="; }; vendorHash = "sha256-IR/tgqh8rS4uN5jSOcopCutbHCKHSU9icUfRhOgu4t8="; diff --git a/pkgs/development/ocaml-modules/minisat/default.nix b/pkgs/development/ocaml-modules/minisat/default.nix index 257bbde0531ca..3a7c222c95728 100644 --- a/pkgs/development/ocaml-modules/minisat/default.nix +++ b/pkgs/development/ocaml-modules/minisat/default.nix @@ -2,7 +2,7 @@ buildDunePackage rec { pname = "minisat"; - version = "0.5"; + version = "0.6"; minimalOCamlVersion = "4.05"; @@ -10,7 +10,7 @@ buildDunePackage rec { owner = "c-cube"; repo = "ocaml-minisat"; rev = "v${version}"; - hash = "sha256-hqGSHxhT+Z2slRCIXnfYuasG1K3tVG/tsM0IXxmy9hQ="; + hash = "sha256-dH0Ndlyo/DTZ6Ao1S478aBuxoZFSkRBi5HblkTWCPas="; }; meta = { diff --git a/pkgs/development/ocaml-modules/yojson/default.nix b/pkgs/development/ocaml-modules/yojson/default.nix index c8600cf52b168..a6f30ab86694e 100644 --- a/pkgs/development/ocaml-modules/yojson/default.nix +++ b/pkgs/development/ocaml-modules/yojson/default.nix @@ -1,15 +1,14 @@ -{ lib, fetchurl, buildDunePackage, cppo, seq }: +{ lib, fetchurl, buildDunePackage, seq }: buildDunePackage rec { pname = "yojson"; - version = "2.1.2"; + version = "2.2.0"; src = fetchurl { url = "https://github.com/ocaml-community/yojson/releases/download/${version}/yojson-${version}.tbz"; - hash = "sha256-WfLxq7/Ip8y9v2CIlOXHXop2AG40iZJURG+D4gDftPk="; + hash = "sha256-v9wzvvMUG7qaj6ZqiFtUsp9r+rRQBAiE3Yz3zex4RRk="; }; - nativeBuildInputs = [ cppo ]; propagatedBuildInputs = [ seq ]; meta = with lib; { diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix index c64eece601c5e..bf6b4d5ba034a 100644 --- a/pkgs/development/python-modules/ailment/default.nix +++ b/pkgs/development/python-modules/ailment/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.2.102"; + version = "9.2.103"; pyproject = true; disabled = pythonOlder "3.11"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "angr"; repo = "ailment"; rev = "refs/tags/v${version}"; - hash = "sha256-xHxWP16XbVcsT+UIyouqyhbnxPBNx7oH1unBhJU44fI="; + hash = "sha256-yjLbgv6uUXQhJJZGd62ZlA3fbBbCS3JbbVWbz950dWY="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix index 665cc10fc58bb..371776aa17493 100644 --- a/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "aioesphomeapi"; - version = "24.3.0"; + version = "24.5.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "esphome"; repo = "aioesphomeapi"; rev = "refs/tags/v${version}"; - hash = "sha256-wQR3dwN5O++TdtQh+Wcj7c7TNMaRj2lMlOuXOAPVU0Q="; + hash = "sha256-i/tmPTDb5DJRSj//Ju9OERx8A9S69WkWyoN+j2MO6mI="; }; build-system = [ diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index b7f04cace7290..71629259ec073 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { pname = "angr"; - version = "9.2.102"; + version = "9.2.103"; pyproject = true; disabled = pythonOlder "3.11"; @@ -46,7 +46,7 @@ buildPythonPackage rec { owner = "angr"; repo = "angr"; rev = "refs/tags/v${version}"; - hash = "sha256-NZO4aQQfp+P9nbVr+cFd5Z2Ziz9cYzuLUi6nVY+Czr0="; + hash = "sha256-U1XO6MlXJzEBskp2pMZmIeRNKNQV3kWGMLbmlXS+zos="; }; pythonRelaxDeps = [ "capstone" ]; diff --git a/pkgs/development/python-modules/anywidget/default.nix b/pkgs/development/python-modules/anywidget/default.nix index dd45e8f4676e9..03b41c11e2515 100644 --- a/pkgs/development/python-modules/anywidget/default.nix +++ b/pkgs/development/python-modules/anywidget/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "anywidget"; - version = "0.9.11"; + version = "0.9.12"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-WN3tjobsJ84odgyUVzF2YxE9mvYIlH7mqNDstSiyLNw="; + hash = "sha256-JYVbJJbcZUE1a20mygyflSUgO7fPKBf4S5O/4/U8+B4="; }; # We do not need the jupyterlab build dependency, because we do not need to diff --git a/pkgs/development/python-modules/approvaltests/default.nix b/pkgs/development/python-modules/approvaltests/default.nix index 650aa440170ee..b3ca7780c696b 100644 --- a/pkgs/development/python-modules/approvaltests/default.nix +++ b/pkgs/development/python-modules/approvaltests/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "approvaltests"; - version = "11.2.1"; + version = "12.2.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "approvals"; repo = "ApprovalTests.Python"; rev = "refs/tags/v${version}"; - hash = "sha256-oG1TH9F8IYDZWLuL2TIesNuZQVzGQRqkGk502HTG+O8="; + hash = "sha256-ePItKdDnKX3283EiK8hOqwFDxi3ULByHEQj9XOKMsWM="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix index 47eef407bcb7c..476965442494c 100644 --- a/pkgs/development/python-modules/archinfo/default.nix +++ b/pkgs/development/python-modules/archinfo/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.2.102"; + version = "9.2.103"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "angr"; repo = "archinfo"; rev = "refs/tags/v${version}"; - hash = "sha256-aZwU/i1tBT6M5+PNR77vYzPKklWERXhvG1kknwC0RQQ="; + hash = "sha256-0tL0YNyKtX5Njq2yAWbcSll3YQEVYGM3+Xx9TwqhKaw="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/astropy-helpers/default.nix b/pkgs/development/python-modules/astropy-helpers/default.nix index 6588d88009dcd..c803ac0449c37 100644 --- a/pkgs/development/python-modules/astropy-helpers/default.nix +++ b/pkgs/development/python-modules/astropy-helpers/default.nix @@ -3,6 +3,7 @@ buildPythonPackage, fetchPypi, isPy3k, + pythonAtLeast, }: buildPythonPackage rec { @@ -10,7 +11,8 @@ buildPythonPackage rec { version = "4.0.1"; format = "setuptools"; - disabled = !isPy3k; + # ModuleNotFoundError: No module named 'imp' + disabled = !isPy3k || pythonAtLeast "3.12"; doCheck = false; # tests requires sphinx-astropy diff --git a/pkgs/development/python-modules/bilibili-api-python/default.nix b/pkgs/development/python-modules/bilibili-api-python/default.nix new file mode 100644 index 0000000000000..259c912438c4e --- /dev/null +++ b/pkgs/development/python-modules/bilibili-api-python/default.nix @@ -0,0 +1,76 @@ +{ + aiohttp, + apscheduler, + beautifulsoup4, + brotli, + buildPythonPackage, + colorama, + fetchPypi, + httpx, + lib, + lxml, + pillow, + pycryptodomex, + pyyaml, + qrcode, + qrcode-terminal, + requests, + rsa, + setuptools, + setuptools-scm, + tqdm, + yarl, +}: +buildPythonPackage rec { + pname = "bilibili-api-python"; + version = "16.2.0"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-ecv9lzp2L13seBosahgnglaZP8YZCD/13nlTPP8LCs0="; + }; + + postPatch = '' + # The upstream uses requirements.txt, which overly strict version constraints. + substituteInPlace requirements.txt \ + --replace-fail "~=" ">=" + ''; + + build-system = [ + setuptools-scm + setuptools + ]; + + dependencies = [ + aiohttp + beautifulsoup4 + colorama + lxml + pyyaml + brotli + httpx + qrcode + requests + apscheduler + rsa + pillow + tqdm + yarl + pycryptodomex + qrcode-terminal + ]; + + # tests require network + doCheck = false; + + pythonImportsCheck = [ "bilibili_api" ]; + + meta = { + changelog = "https://github.com/Nemo2011/bilibili-api/releases/tag/${version}"; + description = "A python module providing convenient integration for various Bilibili API along with some additional common features"; + homepage = "https://nemo2011.github.io/bilibili-api"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ moraxyc ]; + }; +} diff --git a/pkgs/development/python-modules/bnunicodenormalizer/default.nix b/pkgs/development/python-modules/bnunicodenormalizer/default.nix index 96e6323c5e4a9..a3a53f7c0091b 100644 --- a/pkgs/development/python-modules/bnunicodenormalizer/default.nix +++ b/pkgs/development/python-modules/bnunicodenormalizer/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "bnunicodenormalizer"; - version = "0.1.6"; + version = "0.1.7"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-qVC6+0SnAs25DFzKPHFUOoYPlrRvkGWFptjIVom8wJM="; + hash = "sha256-hqNInMgcc9KvtOJlvS0Ni8UvyKI3TiEMiZ4CYJQLwJE="; }; nativeCheckInputs = [ pytestCheckHook ]; 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/caio/default.nix b/pkgs/development/python-modules/caio/default.nix index 61a2a6ecb4e7f..936fcaf3e95e9 100644 --- a/pkgs/development/python-modules/caio/default.nix +++ b/pkgs/development/python-modules/caio/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "caio"; - version = "0.9.13"; + version = "0.9.17"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "mosquito"; repo = "caio"; rev = "refs/tags/${version}"; - hash = "sha256-Q87NuL6yZ5uKImQqqdKTMWNyfUOb4NaZDEvNdqZbHDk="; + hash = "sha256-aTJ02dCLb3CsT6KmJxkmOzwtg5nuXeBwz+mT7ZTTU9o="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/cirq-rigetti/default.nix b/pkgs/development/python-modules/cirq-rigetti/default.nix index 54f0907e70062..932ab71a15003 100644 --- a/pkgs/development/python-modules/cirq-rigetti/default.nix +++ b/pkgs/development/python-modules/cirq-rigetti/default.nix @@ -1,7 +1,7 @@ { buildPythonPackage, cirq-core, - requests, + lib, pytestCheckHook, attrs, certifi, @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "cirq-rigetti"; format = "setuptools"; - inherit (cirq-core) version src meta; + inherit (cirq-core) version src; disabled = pythonOlder "3.7"; @@ -84,4 +84,9 @@ buildPythonPackage rec { # cirq's importlib hook doesn't work here #pythonImportsCheck = [ "cirq_rigetti" ]; + + meta = cirq-core.meta // { + # ModuleNotFoundError: No module named 'pyquil.parser' + broken = lib.versionAtLeast pyquil.version "4"; + }; } diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix index d7e3079efdc30..520154c5bcaae 100644 --- a/pkgs/development/python-modules/claripy/default.nix +++ b/pkgs/development/python-modules/claripy/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.2.102"; + version = "9.2.103"; pyproject = true; disabled = pythonOlder "3.11"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "angr"; repo = "claripy"; rev = "refs/tags/v${version}"; - hash = "sha256-U7aN6MOptGjW61HDfZDM7Vit5G+rm1LujgHoo6oRX3s="; + hash = "sha256-Eh+P6/yKTn+zymfh6MU6zL36wt+roRPbtAfiJ/e8tjI="; }; # z3 does not provide a dist-info, so python-runtime-deps-check will fail diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix index d1d719e370f87..33a4bd5147785 100644 --- a/pkgs/development/python-modules/cle/default.nix +++ b/pkgs/development/python-modules/cle/default.nix @@ -18,14 +18,14 @@ let # The binaries are following the argr projects release cycle - version = "9.2.102"; + version = "9.2.103"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { owner = "angr"; repo = "binaries"; rev = "refs/tags/v${version}"; - hash = "sha256-6FVxlQ1MiJP2mtu4V/mPAyaeCRdBp/sk+u4fdFqxTyA="; + hash = "sha256-SPBco+1UKe9ra8eauBmsyS/0F9wxb8r/xhPWP9N1Nck="; }; in buildPythonPackage rec { @@ -39,7 +39,7 @@ buildPythonPackage rec { owner = "angr"; repo = "cle"; rev = "refs/tags/v${version}"; - hash = "sha256-BPKNrFBEKV8UuSdrl+HIgBqFClHTvRsGidz+X81bBLI="; + hash = "sha256-fUE0hfrIQrYCMH7txKvq8tsGhJIAXc+66JmcqQHg4J4="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/cpyparsing/default.nix b/pkgs/development/python-modules/cpyparsing/default.nix index 37cbd74567ee5..c2bb13f67bd58 100644 --- a/pkgs/development/python-modules/cpyparsing/default.nix +++ b/pkgs/development/python-modules/cpyparsing/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "cpyparsing"; - version = "2.4.7.2.3.2"; + version = "2.4.7.2.3.3"; pyproject = true; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "evhub"; repo = "cpyparsing"; rev = "refs/tags/v${version}"; - hash = "sha256-vnzZdJ7pZz1QxlTqw5UKjxB4GVcXuCfKWX4lu3ORWas="; + hash = "sha256-Ob3aSxJXM/J1KQ2dwxew9fH3g2WVU2KI6lynDz31r+Y="; }; nativeBuildInputs = [ 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/dbt-core/default.nix b/pkgs/development/python-modules/dbt-core/default.nix index aa510105bd5ea..2de11c94934d5 100644 --- a/pkgs/development/python-modules/dbt-core/default.nix +++ b/pkgs/development/python-modules/dbt-core/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { pname = "dbt-core"; - version = "1.7.13"; + version = "1.7.14"; pyproject = true; disabled = pythonOlder "3.8"; @@ -43,7 +43,7 @@ buildPythonPackage rec { owner = "dbt-labs"; repo = "dbt-core"; rev = "refs/tags/v${version}"; - hash = "sha256-uai1ihdmJpFkQqpx7edWiwwy0ek4dbclR/2OuiNbaXM="; + hash = "sha256-4PydrJGhriGCB6oc4kQE8/a24Sn9cqZhoKsiBJuEDYM="; }; sourceRoot = "${src.name}/core"; diff --git a/pkgs/development/python-modules/django-import-export/default.nix b/pkgs/development/python-modules/django-import-export/default.nix index f9898a8d6f9eb..b95ff428d39f7 100644 --- a/pkgs/development/python-modules/django-import-export/default.nix +++ b/pkgs/development/python-modules/django-import-export/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "django-import-export"; - version = "4.0.5"; + version = "4.0.7"; pyproject = true; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "django-import-export"; repo = "django-import-export"; rev = "refs/tags/${version}"; - hash = "sha256-jH/f2eebVcvd96XpaN2eBh5Yx5n0DRbDeKPh7+AaTE8="; + hash = "sha256-yN47HwIHGciE4w0xN+l/dOsbHNf5DZrYjrmJgZeWlE0="; }; pythonRelaxDeps = [ "tablib" ]; 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/edk2-pytool-library/default.nix b/pkgs/development/python-modules/edk2-pytool-library/default.nix index 02803adea5e1a..fc6c06f85d8ec 100644 --- a/pkgs/development/python-modules/edk2-pytool-library/default.nix +++ b/pkgs/development/python-modules/edk2-pytool-library/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "edk2-pytool-library"; - version = "0.21.5"; + version = "0.21.6"; pyproject = true; disabled = pythonOlder "3.10"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "tianocore"; repo = "edk2-pytool-library"; rev = "refs/tags/v${version}"; - hash = "sha256-4Sb8Lu/nYUXgGt9gVv+j32cwW7TjXfH8z+fwzKaOeM8="; + hash = "sha256-vVgqx6qccGNdgt/VkHEfMeiICkLDm8o7iqjNx0UlD38="; }; build-system = [ 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/elasticsearch-dsl/default.nix b/pkgs/development/python-modules/elasticsearch-dsl/default.nix index a74a4b5e5a99d..14eee9278f20c 100644 --- a/pkgs/development/python-modules/elasticsearch-dsl/default.nix +++ b/pkgs/development/python-modules/elasticsearch-dsl/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "elasticsearch-dsl"; - version = "8.13.0"; + version = "8.13.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-cy/IEae7B2O8P7WJLk6nzwbTG7o1XoezM1PpLfrNebQ="; + sha256 = "sha256-FTMFODQZp+5hulOG9P4iueIHMnmv75c01bWfXKtoL3o="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/flask-limiter/default.nix b/pkgs/development/python-modules/flask-limiter/default.nix index 88d7d34651369..3ccf3d41fcbb4 100644 --- a/pkgs/development/python-modules/flask-limiter/default.nix +++ b/pkgs/development/python-modules/flask-limiter/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "flask-limiter"; - version = "3.5.1"; + version = "3.7.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "alisaifee"; repo = "flask-limiter"; rev = "refs/tags/${version}"; - hash = "sha256-U7qgl8yg0ddKDPXqYE2Vqyc2ofxSP+6liWs5j4qD6fM="; + hash = "sha256-W40zuQ/xkoV35DXehwMUJwbX0grJMfRXawiPfpRKL/g="; }; postPatch = '' diff --git a/pkgs/development/python-modules/fyta-cli/default.nix b/pkgs/development/python-modules/fyta-cli/default.nix index 79189827c7e93..6251d39ac2d0f 100644 --- a/pkgs/development/python-modules/fyta-cli/default.nix +++ b/pkgs/development/python-modules/fyta-cli/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "fyta-cli"; - version = "0.4.1"; + version = "0.5.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "dontinelli"; repo = "fyta_cli"; rev = "refs/tags/v${version}"; - hash = "sha256-eWuuHIq79n1oFsvBfVySfGCtHz+MlFRR3j8uqtVR+V0="; + hash = "sha256-v89rgchfrPa0gOCBLOUK+BalnfpXD1Yt877WuBbkH3Y="; }; build-system = [ hatchling ]; 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/httpauth/default.nix b/pkgs/development/python-modules/httpauth/default.nix index 7ff2ef6d2e1ea..e99a7eaea0f5c 100644 --- a/pkgs/development/python-modules/httpauth/default.nix +++ b/pkgs/development/python-modules/httpauth/default.nix @@ -5,13 +5,13 @@ }: buildPythonPackage rec { - version = "0.4"; + version = "0.4.1"; format = "setuptools"; pname = "httpauth"; src = fetchPypi { inherit pname version; - sha256 = "sha256-lehPEuxYV4SQsdL1RWBqTNFIGz2pSoTs+nlkQ5fPX8M="; + sha256 = "sha256-C6rnFroAd5vOULBMwsLSyeSK5zPXOEgGHDSYt+Pm2dQ="; }; doCheck = false; 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/imbalanced-learn/default.nix b/pkgs/development/python-modules/imbalanced-learn/default.nix index 2f3c8cf3b72a9..ee070a516981c 100644 --- a/pkgs/development/python-modules/imbalanced-learn/default.nix +++ b/pkgs/development/python-modules/imbalanced-learn/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "imbalanced-learn"; - version = "0.12.2"; + version = "0.12.3"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-qAxWztywcSTyZr5i06XSq1tXeZCac0P98bmTR5Zi9sE="; + hash = "sha256-WwB5agFBnpECvUJeJ8MZ1Y0fbPLfp1HgLtf07fZ8PBs="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/islpy/default.nix b/pkgs/development/python-modules/islpy/default.nix index 83f0b26c0047b..d111e6b523d27 100644 --- a/pkgs/development/python-modules/islpy/default.nix +++ b/pkgs/development/python-modules/islpy/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "islpy"; - version = "2023.2.5"; + version = "2024.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,8 +25,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "inducer"; repo = "islpy"; - rev = "v${version}"; - hash = "sha256-0m41G5HlPrgt4rDY3Y9cKBJGHSnLg/R+IywBO1anRpQ="; + rev = "refs/tags/v${version}"; + hash = "sha256-N5XI6V3BvNobCh7NAvtzVejtDMnlcb31S5gseyab1T0="; }; postPatch = '' diff --git a/pkgs/development/python-modules/jupyter-client/default.nix b/pkgs/development/python-modules/jupyter-client/default.nix index 0a43bcf920a7b..82778299c799c 100644 --- a/pkgs/development/python-modules/jupyter-client/default.nix +++ b/pkgs/development/python-modules/jupyter-client/default.nix @@ -14,18 +14,18 @@ buildPythonPackage rec { pname = "jupyter-client"; - version = "8.6.1"; + version = "8.6.2"; pyproject = true; src = fetchPypi { pname = "jupyter_client"; inherit version; - hash = "sha256-6EJRXiurjhkYbYn9/qer0V453VgflOOZ8A4q9aFlLT8="; + hash = "sha256-K9oU1V7lulhVKoxTrkPSFa2YaIU0iSE/N9oGDO1U2N8="; }; - nativeBuildInputs = [ hatchling ]; + build-system = [ hatchling ]; - propagatedBuildInputs = [ + dependencies = [ jupyter-core python-dateutil pyzmq @@ -43,5 +43,6 @@ buildPythonPackage rec { homepage = "https://github.com/jupyter/jupyter_client"; changelog = "https://github.com/jupyter/jupyter_client/blob/v${version}/CHANGELOG.md"; license = lib.licenses.bsd3; + maintainers = lib.teams.jupyter.members; }; } diff --git a/pkgs/development/python-modules/jupyterhub/default.nix b/pkgs/development/python-modules/jupyterhub/default.nix index 7a08e773646d9..543564b606eae 100644 --- a/pkgs/development/python-modules/jupyterhub/default.nix +++ b/pkgs/development/python-modules/jupyterhub/default.nix @@ -8,156 +8,127 @@ certipy, configurable-http-proxy, cryptography, - entrypoints, - fetchPypi, - fetchzip, + fetchFromGitHub, + fetchNpmDeps, + idna, importlib-metadata, jinja2, jsonschema, - jupyter-telemetry, + jupyter-events, jupyterlab, - jupyter-core, - jupyter-server, mock, nbclassic, - nodePackages, - notebook, + nodejs, + npmHooks, oauthlib, packaging, pamela, playwright, prometheus-client, + pydantic, pytest-asyncio, pytestCheckHook, python-dateutil, pythonOlder, requests, requests-mock, - selenium, + setuptools, + setuptools-scm, sqlalchemy, tornado, traitlets, virtualenv, }: -let - # js/css assets that setup.py tries to fetch via `npm install` when building - # from source. https://github.com/jupyterhub/jupyterhub/blob/master/package.json - bootstrap = fetchzip { - url = "https://registry.npmjs.org/bootstrap/-/bootstrap-3.4.1.tgz"; - sha256 = "1ywmxqdccg0mgx0xknrn1hlrfnhcwphc12y9l91zizx26fqfmzgc"; - }; - font-awesome = fetchzip { - url = "https://registry.npmjs.org/font-awesome/-/font-awesome-4.7.0.tgz"; - sha256 = "1xnxbdlfdd60z5ix152m8r2kk9dkwlqwpypky1mm3dv64ajnzdbk"; - }; - jquery = fetchzip { - url = "https://registry.npmjs.org/jquery/-/jquery-3.5.1.tgz"; - sha256 = "0yi9ql493din1qa1s923nd5zvd0klk1sx00xj1wx2yambmq86vm9"; - }; - moment = fetchzip { - url = "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz"; - sha256 = "0ifzzla4zffw23g3xvhwx3fj3jny6cjzxfzl1x0317q8wa0c7w5i"; - }; - requirejs = fetchzip { - url = "https://registry.npmjs.org/requirejs/-/requirejs-2.3.6.tgz"; - sha256 = "165hkli3qcd59cjqvli9r5f92i0h7czkmhcg1cgwamw2d0b7xibz"; - }; -in - buildPythonPackage rec { pname = "jupyterhub"; - version = "4.1.5"; - format = "setuptools"; + version = "5.0.0"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; - src = fetchPypi { - inherit pname version; - hash = "sha256-Y7ofxxhDbBUZRqWKO0A+xP6LP2JPsZW8HY5ww5sz4ZQ="; + src = fetchFromGitHub { + owner = "jupyterhub"; + repo = "jupyterhub"; + rev = "refs/tags/${version}"; + hash = "sha256-YGDbyWe3JSXbluOX6qyLqzl92Z/f5sD/5TPc2LR7W80="; }; - # Most of this only applies when building from source (e.g. js/css assets are - # pre-built and bundled in the official release tarball on pypi). - # - # Stuff that's always needed: - # * At runtime, we need configurable-http-proxy, so we substitute the store - # path. - # - # Other stuff that's only needed when building from source: - # * js/css assets are fetched from npm. - # * substitute store path for `lessc` commmand. - # * set up NODE_PATH so `lessc` can find `less-plugin-clean-css`. - # * don't run `npm install`. - preBuild = '' - export NODE_PATH=${nodePackages.less-plugin-clean-css}/lib/node_modules + npmDeps = fetchNpmDeps { + inherit src; + hash = "sha256-7G/Y2yaMi9cyf20/o8rLXKIE6SdZ74HSWJ3Wfypl4Cc="; + }; - substituteInPlace jupyterhub/proxy.py --replace \ + postPatch = '' + substituteInPlace jupyterhub/proxy.py --replace-fail \ "'configurable-http-proxy'" \ "'${configurable-http-proxy}/bin/configurable-http-proxy'" - substituteInPlace jupyterhub/tests/test_proxy.py --replace \ + substituteInPlace jupyterhub/tests/test_proxy.py --replace-fail \ "'configurable-http-proxy'" \ "'${configurable-http-proxy}/bin/configurable-http-proxy'" + ''; - substituteInPlace setup.py --replace \ - "'npm'" "'true'" - - declare -A deps - deps[bootstrap]=${bootstrap} - deps[font-awesome]=${font-awesome} - deps[jquery]=${jquery} - deps[moment]=${moment} - deps[requirejs]=${requirejs} + nativeBuildInputs = [ + nodejs + npmHooks.npmConfigHook + ]; - mkdir -p share/jupyter/hub/static/components - for dep in "''${!deps[@]}"; do - if [ ! -e share/jupyter/hub/static/components/$dep ]; then - cp -r ''${deps[$dep]} share/jupyter/hub/static/components/$dep - fi - done - ''; + build-system = [ + setuptools + setuptools-scm + ]; - propagatedBuildInputs = [ - alembic - async-generator - certipy - python-dateutil - entrypoints - jinja2 - jupyter-telemetry - oauthlib - packaging - pamela - prometheus-client - requests - selenium - sqlalchemy - tornado - traitlets - jupyter-core - jupyter-server - ] ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ]; + dependencies = + [ + alembic + certipy + idna + jinja2 + jupyter-events + oauthlib + packaging + pamela + prometheus-client + pydantic + python-dateutil + requests + sqlalchemy + tornado + traitlets + ] + ++ lib.optionals (pythonOlder "3.10") [ + async-generator + importlib-metadata + ]; nativeCheckInputs = [ beautifulsoup4 cryptography - notebook jsonschema - nbclassic - mock jupyterlab + mock + nbclassic playwright - pytest-asyncio + # require pytest-asyncio<0.23 + # https://github.com/jupyterhub/jupyterhub/pull/4663 + (pytest-asyncio.overrideAttrs ( + final: prev: { + version = "0.21.2"; + src = fetchFromGitHub { + inherit (prev.src) owner repo; + rev = "refs/tags/v${final.version}"; + hash = "sha256-AVVvdo/CDF9IU6l779sLc7wKz5h3kzMttdDNTPLYxtQ="; + }; + } + )) pytestCheckHook requests-mock virtualenv ]; preCheck = '' - substituteInPlace jupyterhub/tests/test_spawner.py --replace \ - "'jupyterhub-singleuser'" "'$out/bin/jupyterhub-singleuser'" - export PATH="$PATH:$out/bin"; + export PATH=$out/bin:$PATH; ''; disabledTests = [ @@ -195,7 +166,7 @@ buildPythonPackage rec { meta = with lib; { description = "Serves multiple Jupyter notebook instances"; - homepage = "https://jupyter.org/"; + homepage = "https://github.com/jupyterhub/jupyterhub"; changelog = "https://github.com/jupyterhub/jupyterhub/blob/${version}/docs/source/reference/changelog.md"; license = licenses.bsd3; maintainers = teams.jupyter.members; diff --git a/pkgs/development/python-modules/jupyterlab-server/default.nix b/pkgs/development/python-modules/jupyterlab-server/default.nix index 7aab011ea3b1a..8926c561e8efc 100644 --- a/pkgs/development/python-modules/jupyterlab-server/default.nix +++ b/pkgs/development/python-modules/jupyterlab-server/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "jupyterlab-server"; - version = "2.27.1"; + version = "2.27.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -30,16 +30,16 @@ buildPythonPackage rec { src = fetchPypi { pname = "jupyterlab_server"; inherit version; - hash = "sha256-CXtaxwm2dscoSsnF43PxGTClYfUs1ahuT8flqcioYx0="; + hash = "sha256-FcuzSdxF6VTgm6z4G5+byxCBX/Zg+yA07NdBfbOn6ic="; }; postPatch = '' sed -i "/timeout/d" pyproject.toml ''; - nativeBuildInputs = [ hatchling ]; + build-system = [ hatchling ]; - propagatedBuildInputs = [ + dependencies = [ babel jinja2 json5 @@ -49,7 +49,7 @@ buildPythonPackage rec { requests ] ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ]; - passthru.optional-dependencies = { + optional-dependencies = { openapi = [ openapi-core ruamel-yaml @@ -61,7 +61,7 @@ buildPythonPackage rec { pytestCheckHook requests-mock strict-rfc3339 - ] ++ passthru.optional-dependencies.openapi; + ] ++ optional-dependencies.openapi; preCheck = '' export HOME=$(mktemp -d) diff --git a/pkgs/development/python-modules/jupyterlab/default.nix b/pkgs/development/python-modules/jupyterlab/default.nix index 7668dae613fd1..166a1bb82b3f0 100644 --- a/pkgs/development/python-modules/jupyterlab/default.nix +++ b/pkgs/development/python-modules/jupyterlab/default.nix @@ -21,22 +21,22 @@ buildPythonPackage rec { pname = "jupyterlab"; - version = "4.2.0"; + version = "4.2.1"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-NW6SBaaiq2icR8j+SRnbpsB243bQPya6rcBXSMJDXdU="; + hash = "sha256-oQ+3EIWmkAggxi1DMkAFBGQC/8jw/eaWED43I4qDlQc="; }; - nativeBuildInputs = [ + build-system = [ hatch-jupyter-builder hatchling ]; - propagatedBuildInputs = [ + dependencies = [ async-lru httpx packaging diff --git a/pkgs/development/python-modules/kanidm/default.nix b/pkgs/development/python-modules/kanidm/default.nix index e47f7b3f608d5..e565a00196789 100644 --- a/pkgs/development/python-modules/kanidm/default.nix +++ b/pkgs/development/python-modules/kanidm/default.nix @@ -21,7 +21,7 @@ let pname = "kanidm"; - version = "0.0.3-unstable-2023-08-23"; + version = "1.0.0-2024-04-22"; in buildPythonPackage rec { inherit pname version; @@ -32,8 +32,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "kanidm"; repo = "kanidm"; - rev = "def4420c4c5c3ec4f9b02776e1d5fdb07aa3a729"; - hash = "sha256-5qQb+Itguw2v1Wdvc2vp00zglfvNd3LFEDvaweRJcOc="; + rev = "a0f743d8c8e7a6b6b0775e64774fc5175464cab6"; + hash = "sha256-W2v3/osDrjRQqz2DqoG90SGcu4K6G2ypMTfE6Xq5qNI="; }; sourceRoot = "${src.name}/pykanidm"; diff --git a/pkgs/development/python-modules/langsmith/default.nix b/pkgs/development/python-modules/langsmith/default.nix index c02aae4844a30..c81ff1cc538c3 100644 --- a/pkgs/development/python-modules/langsmith/default.nix +++ b/pkgs/development/python-modules/langsmith/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "langsmith"; - version = "0.1.63"; + version = "0.1.64"; pyproject = true; disabled = pythonOlder "3.8"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "langchain-ai"; repo = "langsmith-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-zIrSQubYB5AuwAF0hktT/wY5/ktwQJ4Z/3F6po2wC3o="; + hash = "sha256-oAAbki0Mo4qmjIFpD4girpRuSKr9eLPU6Da6muG0NNk="; }; sourceRoot = "${src.name}/python"; diff --git a/pkgs/development/python-modules/litellm/default.nix b/pkgs/development/python-modules/litellm/default.nix index d55ecbefaf0d7..104b2cd58ad28 100644 --- a/pkgs/development/python-modules/litellm/default.nix +++ b/pkgs/development/python-modules/litellm/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { pname = "litellm"; - version = "1.38.8"; + version = "1.39.5"; pyproject = true; disabled = pythonOlder "3.8"; @@ -43,7 +43,7 @@ buildPythonPackage rec { owner = "BerriAI"; repo = "litellm"; rev = "refs/tags/v${version}"; - hash = "sha256-JzSAdr238wRAl2HGd6RVEgbHC4b2xw1GsYRCHSVVaQk="; + hash = "sha256-AAOXe+e7iNppKUaOoUIgofAj93FbwYJGfi+TFzj09RA="; }; postPatch = '' diff --git a/pkgs/development/python-modules/llama-index-core/default.nix b/pkgs/development/python-modules/llama-index-core/default.nix index 7324ad5b583dc..81ffe58b71195 100644 --- a/pkgs/development/python-modules/llama-index-core/default.nix +++ b/pkgs/development/python-modules/llama-index-core/default.nix @@ -46,7 +46,7 @@ in buildPythonPackage rec { pname = "llama-index-core"; - version = "0.10.40"; + version = "0.10.42"; pyproject = true; disabled = pythonOlder "3.8"; @@ -55,7 +55,7 @@ buildPythonPackage rec { owner = "run-llama"; repo = "llama_index"; rev = "refs/tags/v${version}"; - hash = "sha256-UFsXTH0yU16qJ4PxkcQFjg/XRo0kk22GvFzrPqukiAM="; + hash = "sha256-DdD0gllACmwtXDQutjaKQmB8OpCBu+jgQ963g0dNW2c="; }; sourceRoot = "${src.name}/${pname}"; diff --git a/pkgs/development/python-modules/llmx/default.nix b/pkgs/development/python-modules/llmx/default.nix new file mode 100644 index 0000000000000..d5ddcfdaec425 --- /dev/null +++ b/pkgs/development/python-modules/llmx/default.nix @@ -0,0 +1,73 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + setuptools-scm, + setuptools, + pythonOlder, + pydantic, + openai, + tiktoken, + diskcache, + cohere, + google-auth, + typer, + pyyaml, + transformers, + fastapi, + uvicorn, + accelerate, +}: + +buildPythonPackage rec { + pname = "llmx"; + version = "0.0.21a0"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-OEo6wIaDTktzAsP0rOmhxjFSHygTR/EpcRI6AXsu+6M="; + }; + + disabled = pythonOlder "3.9"; + + build-system = [ + setuptools + setuptools-scm + ]; + + dependencies = [ + pydantic + openai + tiktoken + diskcache + cohere + google-auth + typer + pyyaml + ]; + + passthru.optional-dependencies = { + web = [ + fastapi + uvicorn + ]; + transformers = [ + accelerate + transformers + ] ++ transformers.optional-dependencies.torch; + }; + + # Tests of llmx try to access openai, google, etc. + doCheck = false; + + pythonImportsCheck = [ "llmx" ]; + + meta = with lib; { + description = "Library for LLM Text Generation"; + homepage = "https://github.com/victordibia/llmx"; + mainProgram = "llmx"; + license = licenses.mit; + maintainers = with maintainers; [ moraxyc ]; + }; +} diff --git a/pkgs/development/python-modules/marimo/default.nix b/pkgs/development/python-modules/marimo/default.nix index bbe15353e09c6..b8bc348c2012e 100644 --- a/pkgs/development/python-modules/marimo/default.nix +++ b/pkgs/development/python-modules/marimo/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "marimo"; - version = "0.6.2"; + version = "0.6.11"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-sp3lQPLpU5qvHKQ02c/Ga1M8IsbmOX5nz2XPBMbGj30="; + hash = "sha256-gkt21YAxZuoLxvPLYh+1PKQL8AIZGpPtcwIHlSpshkU="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/meeko/default.nix b/pkgs/development/python-modules/meeko/default.nix index a1e49a19b9463..c422b962925c2 100644 --- a/pkgs/development/python-modules/meeko/default.nix +++ b/pkgs/development/python-modules/meeko/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "meeko"; - version = "0.5.0"; + version = "0.5.1"; format = "setuptools"; disabled = pythonOlder "3.5"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "forlilab"; repo = "Meeko"; rev = "refs/tags/v${version}"; - hash = "sha256-pngFu6M63W26P7wd6FUNLuf0NikxtRtVR/pnR5PR6Wo="; + hash = "sha256-I/kAO0a6DbDqmzjS36ETuoH/Z1gR2eNpyE3herHDKMs="; }; patches = [ diff --git a/pkgs/development/python-modules/mkdocs-git-revision-date-localized-plugin/default.nix b/pkgs/development/python-modules/mkdocs-git-revision-date-localized-plugin/default.nix index 306369d5b7626..2b75fe35c0b77 100644 --- a/pkgs/development/python-modules/mkdocs-git-revision-date-localized-plugin/default.nix +++ b/pkgs/development/python-modules/mkdocs-git-revision-date-localized-plugin/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "mkdocs-git-revision-date-localized-plugin"; - version = "1.2.5"; + version = "1.2.6"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "timvink"; repo = "mkdocs-git-revision-date-localized-plugin"; rev = "refs/tags/v${version}"; - hash = "sha256-cezL65Wsdaa9W4dGLgTz1x3UFrDRDJaGuttr58CBcuw="; + hash = "sha256-1H8K9vXgxYQlEmcXKwZQbJCLu4TRyuqffUI+Gm3ECrE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mmcv/default.nix b/pkgs/development/python-modules/mmcv/default.nix index a42ec4fe086fa..cd7a14b7749ed 100644 --- a/pkgs/development/python-modules/mmcv/default.nix +++ b/pkgs/development/python-modules/mmcv/default.nix @@ -53,7 +53,7 @@ let in buildPythonPackage rec { pname = "mmcv"; - version = "2.1.0"; + version = "2.2.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -62,7 +62,7 @@ buildPythonPackage rec { owner = "open-mmlab"; repo = "mmcv"; rev = "refs/tags/v${version}"; - hash = "sha256-an78tRvx18zQ5Q0ca74r4Oe2gJ9F9OfWXLbuP2+rL68="; + hash = "sha256-NNF9sLJWV1q6uBE73LUW4UWwYm4TBMTBJjJkFArBmsc="; }; preConfigure = diff --git a/pkgs/development/python-modules/nanobind/default.nix b/pkgs/development/python-modules/nanobind/default.nix index 9e632ff0f1b2a..b02f229ec136f 100644 --- a/pkgs/development/python-modules/nanobind/default.nix +++ b/pkgs/development/python-modules/nanobind/default.nix @@ -18,25 +18,26 @@ }: buildPythonPackage rec { pname = "nanobind"; - version = "1.9.2"; + version = "2.0.0"; pyproject = true; src = fetchFromGitHub { owner = "wjakob"; - repo = pname; - rev = "v${version}"; - hash = "sha256-6swDqw7sEYOawQbNWD8VfSQoi+9wjhOhOOwPPkahDas="; + repo = "nanobind"; + rev = "refs/tags/v${version}"; + hash = "sha256-yDFrhSIWywWw7ri5aHRPigi9ujDeazpJa4AVrkLx5BI="; fetchSubmodules = true; }; disabled = pythonOlder "3.8"; - nativeBuildInputs = [ + build-system = [ cmake ninja scikit-build setuptools ]; + buildInputs = [ eigen ]; dontUseCmakeBuildDir = true; @@ -51,13 +52,11 @@ buildPythonPackage rec { scipy torch tensorflow - # Uncomment at next release (1.9.3) - # See https://github.com/wjakob/nanobind/issues/578 - # jax - # jaxlib + jax + jaxlib ]; - meta = with lib; { + meta = { homepage = "https://github.com/wjakob/nanobind"; changelog = "https://github.com/wjakob/nanobind/blob/${src.rev}/docs/changelog.rst"; description = "Tiny and efficient C++/Python bindings"; @@ -68,7 +67,7 @@ buildPythonPackage rec { more efficient: bindings compile in a shorter amount of time, produce smaller binaries, and have better runtime performance. ''; - license = licenses.bsd3; - maintainers = with maintainers; [ parras ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ parras ]; }; } diff --git a/pkgs/development/python-modules/nbclassic/default.nix b/pkgs/development/python-modules/nbclassic/default.nix index 6b9cfcd9ba6a2..71cf418e13a2b 100644 --- a/pkgs/development/python-modules/nbclassic/default.nix +++ b/pkgs/development/python-modules/nbclassic/default.nix @@ -1,60 +1,43 @@ { lib, - argon2-cffi, buildPythonPackage, fetchPypi, + babel, ipykernel, ipython-genutils, - jinja2, - jupyter-client, - jupyter-core, + jupyter-packaging, jupyter-server, - nbconvert, - nbformat, nest-asyncio, notebook-shim, - prometheus-client, pytest-jupyter, pytest-tornasync, pytestCheckHook, pythonOlder, - pyzmq, - send2trash, - terminado, - tornado, - traitlets, }: buildPythonPackage rec { pname = "nbclassic"; - version = "1.0.0"; - format = "setuptools"; + version = "1.1.0"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-CuEesjGUVdgFWWvzIDNs2pVUtB2Zq5o8Mb+BgL/6MOM="; + hash = "sha256-d7d7qF+emI+brYXfNFtRTp5kx/DoIpkqsd9KeKxk/B4="; }; - propagatedBuildInputs = [ - argon2-cffi + build-system = [ + babel + jupyter-packaging + jupyter-server + ]; + + dependencies = [ ipykernel ipython-genutils - jinja2 - jupyter-client - jupyter-core - jupyter-server - nbconvert - nbformat nest-asyncio notebook-shim - prometheus-client - pyzmq - send2trash - terminado - tornado - traitlets ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/ocrmypdf/default.nix b/pkgs/development/python-modules/ocrmypdf/default.nix index 50610647ac988..da509f319fab9 100644 --- a/pkgs/development/python-modules/ocrmypdf/default.nix +++ b/pkgs/development/python-modules/ocrmypdf/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pname = "ocrmypdf"; - version = "16.2.0"; + version = "16.3.1"; disabled = pythonOlder "3.10"; @@ -46,7 +46,7 @@ buildPythonPackage rec { postFetch = '' rm "$out/.git_archival.txt" ''; - hash = "sha256-sqhuQ+no6UymxbVtDtWiYQK8kKpO1y37NxLDmRT1LEQ="; + hash = "sha256-AGBLxN4XVP298a2DS14nfpDFbYTCvX3gx/BNVAj0iH8="; }; patches = [ diff --git a/pkgs/development/python-modules/openai/default.nix b/pkgs/development/python-modules/openai/default.nix index 3a33a4b9b4642..57e7039f47543 100644 --- a/pkgs/development/python-modules/openai/default.nix +++ b/pkgs/development/python-modules/openai/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "openai"; - version = "1.30.3"; + version = "1.30.4"; pyproject = true; disabled = pythonOlder "3.7.1"; @@ -34,7 +34,7 @@ buildPythonPackage rec { owner = "openai"; repo = "openai-python"; rev = "refs/tags/v${version}"; - hash = "sha256-Z11gyTZ3UMlcWV3OFxVgMcFF11W+nm2dj2KK1ivTjEI="; + hash = "sha256-tzHU5yO7o7wxdqYnp7tBctvWGY7SYq5u6VnU3iPGPuk="; }; build-system = [ 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/peft/default.nix b/pkgs/development/python-modules/peft/default.nix index 52a53cee9328d..76eaac3b2df22 100644 --- a/pkgs/development/python-modules/peft/default.nix +++ b/pkgs/development/python-modules/peft/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "peft"; - version = "0.10.0"; + version = "0.11.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Aln5WyDgNnxOUwyhOz9NGsnV1zXt/Rs57ULxR5ZJXNM="; + hash = "sha256-FV/S/N9wA+rUos/uQIzvPWmWCIFi8wi2Tt6jMzvYfYQ="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/pikepdf/default.nix b/pkgs/development/python-modules/pikepdf/default.nix index c327e2e6df345..9883af306238c 100644 --- a/pkgs/development/python-modules/pikepdf/default.nix +++ b/pkgs/development/python-modules/pikepdf/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "pikepdf"; - version = "8.14.0"; + version = "8.15.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -40,7 +40,7 @@ buildPythonPackage rec { postFetch = '' rm "$out/.git_archival.txt" ''; - hash = "sha256-3ORvbhO3eLu/NIE0Lwdf93QtUHUmyMf7LmdMBJpkYIg="; + hash = "sha256-YyrGqcLRhCEWaJ6duUMpQMj1kx27t9EilhZ3tll8nbY="; }; patches = [ diff --git a/pkgs/development/python-modules/pyathena/default.nix b/pkgs/development/python-modules/pyathena/default.nix index 38a4956c9a6db..8a81fa5b34f4c 100644 --- a/pkgs/development/python-modules/pyathena/default.nix +++ b/pkgs/development/python-modules/pyathena/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "pyathena"; - version = "3.8.2"; + version = "3.8.3"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-uVYnhxQJy6BvSZ/7JbKZPtE+uJkOtEZrd3uTokfZ3f8="; + hash = "sha256-mcYIYOgww4UM0CAcdtOD12pp53clPdDqN85bLRHGDag="; }; nativeBuildInputs = [ hatchling ]; diff --git a/pkgs/development/python-modules/pydal/default.nix b/pkgs/development/python-modules/pydal/default.nix index 847744549dd9b..58c47c79f5b2f 100644 --- a/pkgs/development/python-modules/pydal/default.nix +++ b/pkgs/development/python-modules/pydal/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pydal"; - version = "20231114.3"; + version = "20240428.2"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-xC0W/Knju205mu+yQ0wOcIYu4Tx1Q3hS9CGSBDLuX7E="; + hash = "sha256-Iz4PXbNKqwud9TYBFGlZYMYtq/QG9rzKn80gVWi8we8="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyhocon/default.nix b/pkgs/development/python-modules/pyhocon/default.nix index 81d30e3cea268..ce479ce4c2da4 100644 --- a/pkgs/development/python-modules/pyhocon/default.nix +++ b/pkgs/development/python-modules/pyhocon/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pyhocon"; - version = "0.3.60"; + version = "0.3.61"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "chimpler"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-H460j/DjY1lltapva3l87oyOJVjzUE9Q/oKti3SsUyU="; + hash = "sha256-xXx30uxJ8+KPVdYC6yRzEDJbwYSzIO/Gy1xrehvI5ZE="; }; propagatedBuildInputs = [ 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/python-musicpd/default.nix b/pkgs/development/python-modules/python-musicpd/default.nix index 45846d2995172..0807494dce91a 100644 --- a/pkgs/development/python-modules/python-musicpd/default.nix +++ b/pkgs/development/python-modules/python-musicpd/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchPypi, + setuptools, }: buildPythonPackage rec { @@ -14,7 +15,9 @@ buildPythonPackage rec { sha256 = "sha256-/FdM0UolVqhJNpS60Q/nra1hSHKL/LiSMX7/Hcipwco="; }; - format = "setuptools"; + pyproject = true; + + build-system = [ setuptools ]; doCheck = true; diff --git a/pkgs/development/python-modules/pytransportnswv2/default.nix b/pkgs/development/python-modules/pytransportnswv2/default.nix index 6b12a533ca336..e2e8c0c81e248 100644 --- a/pkgs/development/python-modules/pytransportnswv2/default.nix +++ b/pkgs/development/python-modules/pytransportnswv2/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pytransportnswv2"; - version = "0.3.4"; + version = "0.4.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Vj16Mmi3cH0V7d+GMQUTr1mmOyXcnZ3BarrE8fHWSns="; + hash = "sha256-LbFBzC7kGa2qz+XQZDmjhE2FhmScesx5jtLtkV0hlg8="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pytun/default.nix b/pkgs/development/python-modules/pytun/default.nix index ab11320ec4369..166afc4544339 100644 --- a/pkgs/development/python-modules/pytun/default.nix +++ b/pkgs/development/python-modules/pytun/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "pytun"; - version = "2.3.0"; + version = "2.4.1"; format = "setuptools"; src = fetchFromGitHub { rev = "v${version}"; owner = "montag451"; repo = "pytun"; - sha256 = "1cqq8aci38058fjh4a0xf21wac177fw576p2yjl2b8jd9rnsqbl5"; + sha256 = "sha256-DZ7CoLi6LPhuc55HF9dtek+/N4A29ecnZn7bk7jweuI="; }; # Test directory contains examples, not tests. diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index 8537a3240814a..536bf986df978 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.2.102"; + version = "9.2.103"; pyproject = true; disabled = pythonOlder "3.11"; src = fetchPypi { inherit pname version; - hash = "sha256-P16jsBmFkuzMHcVTvGEK7/SzIkVpFJsUlxFeHCHivig="; + hash = "sha256-pmvdAdp/2uAsRMoDnp1naPVh47a0m8NNothbIFcptGI="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyvo/default.nix b/pkgs/development/python-modules/pyvo/default.nix index dd6e670e78237..f5f79271998c1 100644 --- a/pkgs/development/python-modules/pyvo/default.nix +++ b/pkgs/development/python-modules/pyvo/default.nix @@ -9,24 +9,28 @@ pytest-astropy, requests, requests-mock, + setuptools, setuptools-scm, }: buildPythonPackage rec { pname = "pyvo"; - version = "1.5.1"; - format = "setuptools"; + version = "1.5.2"; + pyproject = true; disabled = pythonOlder "3.8"; # according to setup.cfg src = fetchPypi { inherit pname version; - hash = "sha256-ByCBD+e3ZrpT0Q6dnkuyO8lnwVGm85LiKmy/4NRTpjI="; + hash = "sha256-uKJMRNrOXGB7HZOv0CV9FfoQnx6GV3I0fqlJ7qAcj3E="; }; - nativeBuildInputs = [ setuptools-scm ]; + build-system = [ + setuptools + setuptools-scm + ]; - propagatedBuildInputs = [ + dependencies = [ astropy requests ]; diff --git a/pkgs/development/python-modules/qrcode-terminal/default.nix b/pkgs/development/python-modules/qrcode-terminal/default.nix new file mode 100644 index 0000000000000..2ec58510c7070 --- /dev/null +++ b/pkgs/development/python-modules/qrcode-terminal/default.nix @@ -0,0 +1,38 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + setuptools, + qrcode, + pillow, +}: +buildPythonPackage rec { + pname = "qrcode-terminal"; + version = "0.8"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-Hitp5mK5NG6Y3ZWYMDPp1Dz/BkPYr9oSYF9RVCjmZsA="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + qrcode + pillow + ]; + + # have no test + doCheck = false; + + pythonImportsCheck = [ "qrcode_terminal" ]; + + meta = { + description = "Display QRCode in Terminal"; + homepage = "https://github.com/alishtory/qrcode-terminal"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ moraxyc ]; + mainProgram = "qrcode-terminal-py"; + }; +} 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/qutip/default.nix b/pkgs/development/python-modules/qutip/default.nix index 6884ca0fe925c..8cc5ccba6c306 100644 --- a/pkgs/development/python-modules/qutip/default.nix +++ b/pkgs/development/python-modules/qutip/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, buildPythonPackage, cvxopt, cvxpy, @@ -9,18 +8,20 @@ ipython, matplotlib, numpy, + oldest-supported-numpy, packaging, pytest-rerunfailures, pytestCheckHook, python, pythonOlder, scipy, + setuptools, }: buildPythonPackage rec { pname = "qutip"; - version = "4.7.5"; - format = "setuptools"; + version = "5.0.2"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -28,10 +29,14 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-4nXZPZFu9L+Okha3qvPil1KvLGO1EbrzotQjqQ8r9l8="; + hash = "sha256-lMPzgmUaoEQB5TzmqEJFiFTuS3AGpyMMjPHlPUKTLvk="; }; - nativeBuildInputs = [ cython_0 ]; + nativeBuildInputs = [ + cython_0 + setuptools + oldest-supported-numpy + ]; propagatedBuildInputs = [ numpy @@ -44,9 +49,6 @@ buildPythonPackage rec { pytest-rerunfailures ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); - # Disabling OpenMP support on Darwin. - setupPyGlobalFlags = lib.optionals (!stdenv.isDarwin) [ "--with-openmp" ]; - # QuTiP tries to access the home directory to create an rc file for us. # We need to go to another directory to run the tests from there. # This is due to the Cython-compiled modules not being in the correct location diff --git a/pkgs/development/python-modules/rapidfuzz/default.nix b/pkgs/development/python-modules/rapidfuzz/default.nix index 747611f2b17b0..0708cc6c3d64a 100644 --- a/pkgs/development/python-modules/rapidfuzz/default.nix +++ b/pkgs/development/python-modules/rapidfuzz/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "rapidfuzz"; - version = "3.9.1"; + version = "3.9.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "maxbachmann"; repo = "RapidFuzz"; rev = "refs/tags/v${version}"; - hash = "sha256-HwTVaPFVktdt1/MfNYajRqVr9uSg6oc++yVvY0WC9AQ="; + hash = "sha256-mPfS/p/Gwc/aobTZMJqbUkpEq60PC7DSiAXBanlNt+8="; }; postPatch = '' diff --git a/pkgs/development/python-modules/reqif/default.nix b/pkgs/development/python-modules/reqif/default.nix index f07d88a5f3fa7..e8fb4e1e9665e 100644 --- a/pkgs/development/python-modules/reqif/default.nix +++ b/pkgs/development/python-modules/reqif/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "reqif"; - version = "0.0.40"; + version = "0.0.42"; pyproject = true; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "strictdoc-project"; repo = "reqif"; rev = "refs/tags/${version}"; - hash = "sha256-VQvwynFv/DN5RHT00rxtDcJ9wsEpKdsh3rdyUakBr2Q="; + hash = "sha256-cQhis7jrcly3cw2LRv7hpPBFAB0Uag69czf+wJvbh/Q="; }; postPatch = '' 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/sphinxawesome-theme/default.nix b/pkgs/development/python-modules/sphinxawesome-theme/default.nix new file mode 100644 index 0000000000000..8d073b7fe123f --- /dev/null +++ b/pkgs/development/python-modules/sphinxawesome-theme/default.nix @@ -0,0 +1,36 @@ +{ + buildPythonPackage, + fetchPypi, + lib, + poetry-core, + sphinx, + beautifulsoup4, + pythonRelaxDepsHook +}: + +buildPythonPackage rec { + pname = "sphinxawesome-theme"; + version = "5.2.0"; + pyproject = true; + + src = fetchPypi { + inherit version; + pname = "sphinxawesome_theme"; + hash = "sha256-wk8eXAueR1OA0W/F8fO/2ElVgX2gkF2V9+IICdfNPF0="; + }; + + build-system = [ poetry-core pythonRelaxDepsHook ]; + dependencies = [ + sphinx + beautifulsoup4 + ]; + + pythonRelaxDeps = [ "sphinx" ]; + + meta = { + description = "Awesome Sphinx Theme"; + homepage = "https://sphinxawesome.xyz/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [sigmanificient]; + }; +} diff --git a/pkgs/development/python-modules/stringly/default.nix b/pkgs/development/python-modules/stringly/default.nix index 7d830ff2f839a..c7637bb082c7c 100644 --- a/pkgs/development/python-modules/stringly/default.nix +++ b/pkgs/development/python-modules/stringly/default.nix @@ -1,6 +1,5 @@ { lib, - python, buildPythonPackage, fetchPypi, typing-extensions, @@ -20,10 +19,6 @@ buildPythonPackage rec { propagatedBuildInputs = [ typing-extensions ]; - checkPhase = '' - ${python.interpreter} -m unittest - ''; - meta = with lib; { description = "Stringly: Human Readable Object Serialization"; homepage = "https://github.com/evalf/stringly"; diff --git a/pkgs/development/python-modules/syncedlyrics/default.nix b/pkgs/development/python-modules/syncedlyrics/default.nix index 7ec1a229cac4f..9b2fb010b04ad 100644 --- a/pkgs/development/python-modules/syncedlyrics/default.nix +++ b/pkgs/development/python-modules/syncedlyrics/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "syncedlyrics"; - version = "0.10.0"; + version = "0.10.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "rtcq"; repo = "syncedlyrics"; rev = "refs/tags/v${version}"; - hash = "sha256-B3+0DPR30MwPL53YIS/3jmMU73Z0NDDaR0pV8wE6P5Q="; + hash = "sha256-jqd68Npt7qq9aMWO3AVR4JRAs9avO4x9u+MC/brU1Cw="; }; build-system = [ 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/taskw/default.nix b/pkgs/development/python-modules/taskw/default.nix index e04f9c0284b52..97b3031c067e7 100644 --- a/pkgs/development/python-modules/taskw/default.nix +++ b/pkgs/development/python-modules/taskw/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchPypi, + pythonAtLeast, # build-system setuptools, @@ -23,6 +24,9 @@ buildPythonPackage rec { version = "2.0.0"; pyproject = true; + # ModuleNotFoundError: No module named 'distutils' + disabled = pythonAtLeast "3.12"; + src = fetchPypi { inherit pname version; hash = "sha256-EQm9+b3nqbMqUAejAsh4MD/2UYi2QiWsdKMomkxUi90="; diff --git a/pkgs/development/python-modules/testcontainers/default.nix b/pkgs/development/python-modules/testcontainers/default.nix index 561f2bcfeb725..362a4f36b94ed 100644 --- a/pkgs/development/python-modules/testcontainers/default.nix +++ b/pkgs/development/python-modules/testcontainers/default.nix @@ -12,16 +12,16 @@ buildPythonPackage rec { pname = "testcontainers"; - version = "4.5.0"; - disabled = pythonOlder "3.9"; - + version = "4.5.1"; pyproject = true; + disabled = pythonOlder "3.9"; + src = fetchFromGitHub { owner = "testcontainers"; repo = "testcontainers-python"; rev = "refs/tags/testcontainers-v${version}"; - hash = "sha256-+kMKxitRRjNGVqMJuDdJA0QnYpLicJ6qdD8tzplEbT8="; + hash = "sha256-7QlT3ibSUDeC+aWi2MCagLkomXG3/VU1xHQ7Xgoh/Pw="; }; postPatch = '' diff --git a/pkgs/development/python-modules/testfixtures/default.nix b/pkgs/development/python-modules/testfixtures/default.nix index 57e1f49ceedb9..6d8252e3713a4 100644 --- a/pkgs/development/python-modules/testfixtures/default.nix +++ b/pkgs/development/python-modules/testfixtures/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "testfixtures"; - version = "8.1.0"; + version = "8.2.0"; pyproject = true; # DO NOT CONTACT upstream. # https://github.com/simplistix/ is only concerned with internal CI process. @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-gISJkDBIWcOito3+S8r3e25kJaOSUEe8JaUnVSd7+m0="; + hash = "sha256-70O2VxNMh+ijBE9LAqMq4uvd9Esrl7x5iaIBFkA5iO4="; }; build-system = [ setuptools ]; 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/treelog/default.nix b/pkgs/development/python-modules/treelog/default.nix index 87ef2eca9f147..7739b8253bb42 100644 --- a/pkgs/development/python-modules/treelog/default.nix +++ b/pkgs/development/python-modules/treelog/default.nix @@ -1,6 +1,5 @@ { lib, - python, buildPythonPackage, fetchPypi, typing-extensions, @@ -20,10 +19,6 @@ buildPythonPackage rec { propagatedBuildInputs = [ typing-extensions ]; - checkPhase = '' - ${python.interpreter} -m unittest - ''; - meta = with lib; { description = "Logging framework that organizes messages in a tree structure"; homepage = "https://github.com/evalf/treelog"; diff --git a/pkgs/development/python-modules/troposphere/default.nix b/pkgs/development/python-modules/troposphere/default.nix index cd1126da2eac2..42326544c3405 100644 --- a/pkgs/development/python-modules/troposphere/default.nix +++ b/pkgs/development/python-modules/troposphere/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "troposphere"; - version = "4.7.0"; + version = "4.8.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "cloudtools"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-9zzbBtIJ4v+eI0eJZ6vGUABN4i9GLJcMAzerRSnzpqQ="; + hash = "sha256-JmoPXYEqaFxDIW8NmmZ8VpKX9gfZ1rVFu+dPZOL7C5k="; }; propagatedBuildInputs = [ cfn-flip ] ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ]; diff --git a/pkgs/development/python-modules/txtai/default.nix b/pkgs/development/python-modules/txtai/default.nix index a6f36840e0b65..143650d2ee509 100644 --- a/pkgs/development/python-modules/txtai/default.nix +++ b/pkgs/development/python-modules/txtai/default.nix @@ -52,7 +52,7 @@ unittestCheckHook, }: let - version = "7.1.0"; + version = "7.2.0"; api = [ aiohttp fastapi @@ -154,7 +154,7 @@ buildPythonPackage { owner = "neuml"; repo = "txtai"; rev = "refs/tags/v${version}"; - hash = "sha256-L+L2jRkCQKOgd1k3N4mft0Kt6kvCN81lgSQUjoon5rk="; + hash = "sha256-2d31wzUz0/FcrejDIog2EI4BXgjd7XXpN4tRXpLk5DI="; }; nativeBuildInputs = [ pythonRelaxDepsHook ]; 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/wasserstein/default.nix b/pkgs/development/python-modules/wasserstein/default.nix index c4534dcdf5d03..c9a9495b42ef3 100644 --- a/pkgs/development/python-modules/wasserstein/default.nix +++ b/pkgs/development/python-modules/wasserstein/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + fetchpatch, numpy, llvmPackages, wurlitzer, @@ -16,10 +17,17 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pkomiske"; repo = "Wasserstein"; - rev = "89c2d6279a7e0aa3b56bcc8fb7b6009420f2563e"; # https://github.com/pkomiske/Wasserstein/issues/1 + rev = "v${version}"; hash = "sha256-s9en6XwvO/WPsF7/+SEmGePHZQgl7zLgu5sEn4nD9YE="; }; + patches = [ + (fetchpatch { + url = "https://github.com/thaler-lab/Wasserstein/commit/8667d59dfdf89eabf01f3ae93b23a30a27c21c58.patch"; + hash = "sha256-jp5updB3E1MYgLhBJwmBMTwBiFXtABMwTxt0G6xhoyA="; + }) + ]; + buildInputs = [ llvmPackages.openmp ]; propagatedBuildInputs = [ numpy diff --git a/pkgs/development/python-modules/xdoctest/default.nix b/pkgs/development/python-modules/xdoctest/default.nix index 30be646bcf652..0f9f033bdb64e 100644 --- a/pkgs/development/python-modules/xdoctest/default.nix +++ b/pkgs/development/python-modules/xdoctest/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "xdoctest"; - version = "1.1.3"; + version = "1.1.4"; pyproject = true; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "Erotemic"; repo = "xdoctest"; rev = "refs/tags/v${version}"; - hash = "sha256-MOjT8adJoSxigSG2Gy5gqRfYswjUsgbBOV1ZU0LBDN8="; + hash = "sha256-gKs8HsXm7hskSIw8bhEX1Vo8RbtO0YDjtjBJViz1rCE="; }; nativeBuildInputs = [ 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/python-modules/youless-api/default.nix b/pkgs/development/python-modules/youless-api/default.nix index 5c923e0bb3130..7d5cf2f89b3e6 100644 --- a/pkgs/development/python-modules/youless-api/default.nix +++ b/pkgs/development/python-modules/youless-api/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "youless-api"; - version = "1.1.1"; + version = "2.0.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "gjong"; repo = "youless-python-bridge"; rev = "refs/tags/${version}"; - hash = "sha256-J3YRRVcA4LYxuJMi//LJO8Qt8hapJruZGzONODE3SsQ="; + hash = "sha256-FnbfwjrzorLDUi9GJLY+pt5zSn4VpVC3Umc/FH46Pzo="; }; build-system = [ setuptools ]; 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/ruby-modules/gem/default.nix b/pkgs/development/ruby-modules/gem/default.nix index 409c2c9d027b8..6f3245849f68c 100644 --- a/pkgs/development/ruby-modules/gem/default.nix +++ b/pkgs/development/ruby-modules/gem/default.nix @@ -62,7 +62,7 @@ let if type == "gem" then fetchurl { urls = map ( - remote: "${remote}/gems/${gemName}-${version}.gem" + remote: "${remote}/gems/${gemName}-${suffix}.gem" ) (attrs.source.remotes or [ "https://rubygems.org" ]); inherit (attrs.source) sha256; } @@ -80,6 +80,8 @@ let suffix = if type == "git" then builtins.substring 0 12 attrs.source.rev + else if platform != "ruby" then + "${version}-${platform}" else version; diff --git a/pkgs/development/tools/air/default.nix b/pkgs/development/tools/air/default.nix index 467f05150622c..edddbe3fe194a 100644 --- a/pkgs/development/tools/air/default.nix +++ b/pkgs/development/tools/air/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "air"; - version = "1.52.0"; + version = "1.52.1"; src = fetchFromGitHub { owner = "cosmtrek"; repo = "air"; rev = "v${version}"; - hash = "sha256-7iqS8p53Pyk2WQVkbTVA7eJNnD2KvO41S+JJBTFOToQ="; + hash = "sha256-KTutLvcLH1dOsJFDaEU2c4wGbQyRE7qUHah4mEXCL08="; }; vendorHash = "sha256-dSu00NAq6hEOdJxXp+12UaUq32z53Wzla3/u+2nxqPw="; diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 911e51ed6ca90..2e270c265a068 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "checkov"; - version = "3.2.106"; + version = "3.2.112"; pyproject = true; src = fetchFromGitHub { owner = "bridgecrewio"; repo = "checkov"; rev = "refs/tags/${version}"; - hash = "sha256-N62tdVnrgOLHi4k/OpKrAfJ7sBu5Xf8lUAmEqatEAGo="; + hash = "sha256-VE9dxDDIZVT1aajEWHXbui711HjFvgZMEbXCBiq1nKc="; }; patches = [ ./flake8-compat-5.x.patch ]; diff --git a/pkgs/development/tools/analysis/stylelint/default.nix b/pkgs/development/tools/analysis/stylelint/default.nix index f60751bc33b15..c2a216afea9a9 100644 --- a/pkgs/development/tools/analysis/stylelint/default.nix +++ b/pkgs/development/tools/analysis/stylelint/default.nix @@ -2,16 +2,16 @@ buildNpmPackage rec { pname = "stylelint"; - version = "16.6.0"; + version = "16.6.1"; src = fetchFromGitHub { owner = "stylelint"; repo = "stylelint"; rev = version; - hash = "sha256-yNEXtuemNzpy7gIlVUWM5crP0LpLHmiVYznomC5eGYs="; + hash = "sha256-wt9EVE3AAnOVJsDHG+qIXSqZ1I2MSITHjGpEGLPWOBY="; }; - npmDepsHash = "sha256-e9helwaAiW3KtPHOWN7S0VxG87nKj6X4lTHTEdXoRZc="; + npmDepsHash = "sha256-+74oklREFCDEa8E0QDBlIzfW943AStJxfXkQDqRGFyo="; dontNpmBuild = true; 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/azure-static-sites-client/versions.json b/pkgs/development/tools/azure-static-sites-client/versions.json index 6c672039bd721..c2bd3989b8bc6 100644 --- a/pkgs/development/tools/azure-static-sites-client/versions.json +++ b/pkgs/development/tools/azure-static-sites-client/versions.json @@ -1,58 +1,58 @@ [ { "version": "latest", - "buildId": "1.0.026361", - "publishDate": "2024-03-20T18:04:43.3376902Z", + "buildId": "1.0.026911", + "publishDate": "2024-05-15T19:23:23.3973684Z", "files": { "linux-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.026361/linux/StaticSitesClient", - "sha": "e7430ccd96669bbb91204affa5bc313dc6af1f848d704dd7dacf9a2927b3d130" + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.026911/linux/StaticSitesClient", + "sha": "e1d9e033c973a35f64b7e41b6a114bd8e48022c9c3f7676e79047e87245a874d" }, "win-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.026361/windows/StaticSitesClient.exe", - "sha": "f3e2e686f742029a7b641e7cc6d3727398fbe783505df8cf75c334da980d2cd4" + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.026911/windows/StaticSitesClient.exe", + "sha": "c67e5eed2b28fcf5c98348732653d1e2b37d842e6dde9a6b30322832c5d86fc7" }, "osx-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.026361/macOS/StaticSitesClient", - "sha": "85bc201ed956ec41bc0a730dc5652c3c8bded946ebcf1c1ff31350490118a324" + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.026911/macOS/StaticSitesClient", + "sha": "18ca42a1b13db9b8b6db6bd8c77e65def56fa7bf3ce3fb1184e890d8cd7dd033" } } }, { "version": "stable", - "buildId": "1.0.026361", - "publishDate": "2024-03-20T18:04:43.3376902Z", + "buildId": "1.0.026911", + "publishDate": "2024-05-15T19:23:23.3973684Z", "files": { "linux-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.026361/linux/StaticSitesClient", - "sha": "e7430ccd96669bbb91204affa5bc313dc6af1f848d704dd7dacf9a2927b3d130" + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.026911/linux/StaticSitesClient", + "sha": "e1d9e033c973a35f64b7e41b6a114bd8e48022c9c3f7676e79047e87245a874d" }, "win-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.026361/windows/StaticSitesClient.exe", - "sha": "f3e2e686f742029a7b641e7cc6d3727398fbe783505df8cf75c334da980d2cd4" + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.026911/windows/StaticSitesClient.exe", + "sha": "c67e5eed2b28fcf5c98348732653d1e2b37d842e6dde9a6b30322832c5d86fc7" }, "osx-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.026361/macOS/StaticSitesClient", - "sha": "85bc201ed956ec41bc0a730dc5652c3c8bded946ebcf1c1ff31350490118a324" + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.026911/macOS/StaticSitesClient", + "sha": "18ca42a1b13db9b8b6db6bd8c77e65def56fa7bf3ce3fb1184e890d8cd7dd033" } } }, { "version": "backup", - "buildId": "1.0.026164", - "publishDate": "2024-02-29T20:38:30.619614Z", + "buildId": "1.0.026792", + "publishDate": "2024-05-03T18:31:36.0288058Z", "files": { "linux-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.026164/linux/StaticSitesClient", - "sha": "7b2d674a63fb0cb1ee39b84348260755c872a2922d03c0ee55eea1c8eb385524" + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.026792/linux/StaticSitesClient", + "sha": "a9dcd998d22a3476fb97fe1c446e83cc7f060a3a36cdb6757b828d0facc42347" }, "win-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.026164/windows/StaticSitesClient.exe", - "sha": "57f8db0e48c772f4eadd9cbab1996354ecdf193f0d123df02dfa4a7eb6398a15" + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.026792/windows/StaticSitesClient.exe", + "sha": "15f03e3f91208db2ea4015c4fce0623a692da1a289f23a782578ab7bc8a810e2" }, "osx-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.026164/macOS/StaticSitesClient", - "sha": "fd0e8fe34ba0776c1fc44a8e66017b3abe33b044f429a95e6863919e920bf555" + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.026792/macOS/StaticSitesClient", + "sha": "454b10f0351694ec3475a3d85b8746356932b2061a5be7e7fc093a6509cf000c" } } } diff --git a/pkgs/development/tools/backblaze-b2/default.nix b/pkgs/development/tools/backblaze-b2/default.nix index 2021604637a19..99ce90cc77455 100644 --- a/pkgs/development/tools/backblaze-b2/default.nix +++ b/pkgs/development/tools/backblaze-b2/default.nix @@ -20,8 +20,9 @@ python3Packages.buildPythonApplication rec { hash = "sha256-/P1cgAC+a2YCcvbsysYdD+fEwibo+GyE0XY4A0+gMh4="; }; - nativeBuildInputs = [ + nativeBuildInputs = with python3Packages; [ installShellFiles + argcomplete ]; build-system = with python3Packages; [ @@ -77,8 +78,8 @@ python3Packages.buildPythonApplication rec { '' + '' installShellCompletion --cmd ${execName} \ - --bash <(${python3Packages.argcomplete}/bin/register-python-argcomplete ${execName}) \ - --zsh <(${python3Packages.argcomplete}/bin/register-python-argcomplete ${execName}) + --bash <(register-python-argcomplete ${execName}) \ + --zsh <(register-python-argcomplete ${execName}) ''; passthru.tests.version = (testers.testVersion { diff --git a/pkgs/development/tools/bearer/default.nix b/pkgs/development/tools/bearer/default.nix index d7437187cd7a9..388e529bf2902 100644 --- a/pkgs/development/tools/bearer/default.nix +++ b/pkgs/development/tools/bearer/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "bearer"; - version = "1.43.6"; + version = "1.43.7"; src = fetchFromGitHub { owner = "bearer"; repo = "bearer"; rev = "refs/tags/v${version}"; - hash = "sha256-Ew9f6L4hrMrIuJzSXbP5bYJLmsq2BRLYBohy0Gy8P2M="; + hash = "sha256-n48HpPAga3/CBKAzJOg5uc+y9gNvVtmlsme/nY5dSRo="; }; - vendorHash = "sha256-XACZVPf1a+TIi2YdHerPkt9QKjS5BQJ5alrsHIG+qRA="; + vendorHash = "sha256-84YJ9CXnOu0JeCzF2Ip54PRz8uJ3j+nkIwEMD++Gabg="; subPackages = [ "cmd/bearer" ]; 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/build-managers/sbt-extras/default.nix b/pkgs/development/tools/build-managers/sbt-extras/default.nix index e510b0fd29adf..f3cbd6091ca18 100644 --- a/pkgs/development/tools/build-managers/sbt-extras/default.nix +++ b/pkgs/development/tools/build-managers/sbt-extras/default.nix @@ -1,16 +1,17 @@ { lib, stdenv, fetchFromGitHub, which, curl, makeWrapper, jdk, writeScript -, common-updater-scripts, cacert, git, nixfmt-classic, nix, jq, coreutils, gnused }: +, common-updater-scripts, cacert, git, nixfmt-classic, nix, jq, coreutils +, gnused }: stdenv.mkDerivation rec { pname = "sbt-extras"; - rev = "e3e7378fa325f942da4b0688c83fc42e28bd67f1"; - version = "2024-02-27"; + rev = "7208170046457c70a67e4b86c833a074be9de958"; + version = "2024-05-06"; src = fetchFromGitHub { owner = "paulp"; repo = "sbt-extras"; inherit rev; - sha256 = "W9aol4bJ5UC1LICDlcV2uQH0YHLpLQwSn4GEBEujeiw="; + sha256 = "Ci4V1GHKzGux5qU33Z6+NC+YApqlQfgjekGb+WHtLaQ="; }; dontBuild = true; diff --git a/pkgs/development/tools/cmake-format/default.nix b/pkgs/development/tools/cmake-format/default.nix index 85efc5f19ccfd..281f36dfe0070 100644 --- a/pkgs/development/tools/cmake-format/default.nix +++ b/pkgs/development/tools/cmake-format/default.nix @@ -31,6 +31,7 @@ buildPythonApplication rec { homepage = "https://github.com/cheshirekow/cmake_format"; license = licenses.gpl3; maintainers = [ maintainers.tobim ]; + mainProgram = "cmake-format"; platforms = platforms.all; }; } diff --git a/pkgs/development/tools/devbox/default.nix b/pkgs/development/tools/devbox/default.nix index c11e8cdf81ab6..4dc9e4d87fe5d 100644 --- a/pkgs/development/tools/devbox/default.nix +++ b/pkgs/development/tools/devbox/default.nix @@ -5,13 +5,13 @@ }: buildGoModule rec { pname = "devbox"; - version = "0.10.7"; + version = "0.11.0"; src = fetchFromGitHub { owner = "jetpack-io"; repo = pname; rev = version; - hash = "sha256-iaPdFDoYmukv1T+HSaGRrbvjvkioX5PlCc9t2VHGJ30="; + hash = "sha256-v2EBN9zp6ssY0hWJQnhsIlRU3L7oOad46bvDUILGIv0="; }; ldflags = [ @@ -23,7 +23,7 @@ buildGoModule rec { # integration tests want file system access doCheck = false; - vendorHash = "sha256-bSCgjSXdPOWgftlInl3MailtiXslLH/TZw95FiEnCxQ="; + vendorHash = "sha256-efXYFVs+W6jkShWrU21WCiQqfaNX/9HLD8CxesbkR0s="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/doctl/default.nix b/pkgs/development/tools/doctl/default.nix index f12baca266756..ea74f5eae4cb1 100644 --- a/pkgs/development/tools/doctl/default.nix +++ b/pkgs/development/tools/doctl/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "doctl"; - version = "1.106.0"; + version = "1.107.0"; vendorHash = null; @@ -31,7 +31,7 @@ buildGoModule rec { owner = "digitalocean"; repo = "doctl"; rev = "v${version}"; - sha256 = "sha256-Un1qBQbrgdudAfnviP8d6A7nNwi1ZGAFPN33NLKXNwI="; + sha256 = "sha256-svwFIM1lJI60bdmzZS/QZSzy30HtOf498GgnqLFGKAQ="; }; meta = with lib; { diff --git a/pkgs/development/tools/earthly/default.nix b/pkgs/development/tools/earthly/default.nix index 6662cf4e37659..9f6bc0b98f7c0 100644 --- a/pkgs/development/tools/earthly/default.nix +++ b/pkgs/development/tools/earthly/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "earthly"; - version = "0.8.12"; + version = "0.8.13"; src = fetchFromGitHub { owner = "earthly"; repo = "earthly"; rev = "v${version}"; - hash = "sha256-9yo2LgZ/c23FcZuOxUTlp1CfwFmg6yvhlOsDpY71Pic="; + hash = "sha256-CldKyw9VEXMxfrQAUZozjhWZaF5QKIpRQ7l5Scus588="; }; - vendorHash = "sha256-OuZypIUIUDG1Gipg4RYkQZVUD8+G/U3N2VkbP+rnbkc="; + vendorHash = "sha256-jbzNzwa69qgySOYOSmzVC70Beqy7SGOo9I1xSBLAdfc="; subPackages = [ "cmd/earthly" "cmd/debugger" ]; CGO_ENABLED = 0; diff --git a/pkgs/development/tools/electron/common.nix b/pkgs/development/tools/electron/common.nix index 3ac10225bedfc..3514d7cdad229 100644 --- a/pkgs/development/tools/electron/common.nix +++ b/pkgs/development/tools/electron/common.nix @@ -236,7 +236,7 @@ in (chromium.override { upstream-info = info.chromium; }).mkDerivation (base: { homepage = "https://github.com/electron/electron"; platforms = lib.platforms.linux; license = licenses.mit; - maintainers = with maintainers; [ yayayayaka ]; + maintainers = with maintainers; [ yayayayaka teutat3s ]; mainProgram = "electron"; hydraPlatforms = lib.optionals (!(hasInfix "alpha" info.version) && !(hasInfix "beta" info.version)) ["aarch64-linux" "x86_64-linux"]; timeout = 172800; # 48 hours (increased from the Hydra default of 10h) diff --git a/pkgs/development/tools/esbuild/default.nix b/pkgs/development/tools/esbuild/default.nix index f4d9c8542ed0e..08131310aa359 100644 --- a/pkgs/development/tools/esbuild/default.nix +++ b/pkgs/development/tools/esbuild/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "esbuild"; - version = "0.20.2"; + version = "0.21.4"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; rev = "v${version}"; - hash = "sha256-h/Vqwax4B4nehRP9TaYbdixAZdb1hx373dNxNHvDrtY="; + hash = "sha256-T/qbf6nMORVWD2G/hJtAlUlg7xep7Bw5zZnBvYoL5cQ="; }; vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; diff --git a/pkgs/development/tools/jql/default.nix b/pkgs/development/tools/jql/default.nix index 661526f30b96f..14e813046fee5 100644 --- a/pkgs/development/tools/jql/default.nix +++ b/pkgs/development/tools/jql/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "jql"; - version = "7.1.9"; + version = "7.1.10"; src = fetchFromGitHub { owner = "yamafaktory"; repo = pname; rev = "jql-v${version}"; - hash = "sha256-DNR+5ygTFXmly1XVyV1x3ly+n9MHor/6BlMe+q0JLYA="; + hash = "sha256-Y2c+qcI+IuPE7kmgPXTDLSkqCBw7wPmdmmYhZmBjwJ8="; }; - cargoHash = "sha256-6bB/qqr+IMZz1I8JzxxOM3YVIDO5TW9hLc6PQpQcFx8="; + cargoHash = "sha256-GRIR5CfrELLlImw3jKn2CDrmxQ+6WWTi674esic2O2U="; meta = with lib; { description = "A JSON Query Language CLI tool built with Rust"; diff --git a/pkgs/development/tools/knightos/scas/default.nix b/pkgs/development/tools/knightos/scas/default.nix index 221c5a0d12d5f..e05953e87ec72 100644 --- a/pkgs/development/tools/knightos/scas/default.nix +++ b/pkgs/development/tools/knightos/scas/default.nix @@ -24,6 +24,11 @@ stdenv.mkDerivation rec { depsBuildBuild = lib.optionals isCrossCompiling [ buildPackages.knightos-scas ]; nativeBuildInputs = [ asciidoc libxslt.bin cmake ]; + + env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isClang [ + "-Wno-error=implicit-function-declaration" + ]); + postInstall = '' cd .. make DESTDIR=$out install_man diff --git a/pkgs/development/tools/language-servers/jq-lsp/default.nix b/pkgs/development/tools/language-servers/jq-lsp/default.nix index 6952bea00d63e..ad43af981e394 100644 --- a/pkgs/development/tools/language-servers/jq-lsp/default.nix +++ b/pkgs/development/tools/language-servers/jq-lsp/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "jq-lsp"; - version = "0.1.2"; + version = "0.1.3"; src = fetchFromGitHub { owner = "wader"; repo = "jq-lsp"; rev = "refs/tags/v${version}"; - hash = "sha256-a3ZqVWG7kjWQzL1efrKc4s4D14qD/+6JM26vaduxhWg="; + hash = "sha256-c7uK8WPM/h2PLVLFGeN66SztvzjBCgJje7L14+oErVU="; }; - vendorHash = "sha256-bIe006I1ryvIJ4hC94Ux2YVdlmDIM4oZaK/qXafYYe0="; + vendorHash = "sha256-8sZGnoP7l09ZzLJqq8TUCquTOPF0qiwZcFhojUnnEIY="; # based on https://github.com/wader/jq-lsp/blob/master/.goreleaser.yml CGO_ENABLED = 0; diff --git a/pkgs/development/tools/language-servers/neocmakelsp/default.nix b/pkgs/development/tools/language-servers/neocmakelsp/default.nix index d3c8d86a14e12..9d911ef43fa3c 100644 --- a/pkgs/development/tools/language-servers/neocmakelsp/default.nix +++ b/pkgs/development/tools/language-servers/neocmakelsp/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "neocmakelsp"; - version = "0.6.26"; + version = "0.6.27"; src = fetchFromGitHub { owner = "Decodetalkers"; repo = "neocmakelsp"; rev = "v${version}"; - hash = "sha256-9pCi7bevgE2tO0n1LvhLIcFV8sVpAagkVB8l5WWdIbM="; + hash = "sha256-In+Z/MCjgV/iPkAh4mTfrlThKZEMQqMYyfOP0m11+ps="; }; - cargoHash = "sha256-xm+8IDLvPDOFJ6FyeQdpbWgQ9XE6bW5i29W0S9JSQzc="; + cargoHash = "sha256-fLtbaL0h3tmX5INwYn7fPj+TAxfBQarD44twq0ggXRU="; meta = with lib; { description = "A cmake lsp based on tower-lsp and treesitter"; diff --git a/pkgs/development/tools/metal-cli/default.nix b/pkgs/development/tools/metal-cli/default.nix index e3c95bbb244fc..4702615564d04 100644 --- a/pkgs/development/tools/metal-cli/default.nix +++ b/pkgs/development/tools/metal-cli/default.nix @@ -47,7 +47,7 @@ buildGoModule rec { homepage = "https://github.com/equinix/metal-cli/"; changelog = "https://github.com/equinix/metal-cli/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ Br1ght0ne nshalman ]; + maintainers = with maintainers; [ Br1ght0ne nshalman teutat3s ]; mainProgram = "metal"; }; } diff --git a/pkgs/development/tools/misc/act/default.nix b/pkgs/development/tools/misc/act/default.nix index b4b3d2f1b7442..a8c253e4333cc 100644 --- a/pkgs/development/tools/misc/act/default.nix +++ b/pkgs/development/tools/misc/act/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "act"; - version = "0.2.62"; + version = "0.2.63"; src = fetchFromGitHub { owner = "nektos"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-zHtRdwBqwQMW/M4TYA609beCrC5B4hyhtcptJSbN6M8="; + hash = "sha256-umYP/U1UjqWbF1YDZYbQrlMubhxr80FFBDS1NeiI9wI="; }; - vendorHash = "sha256-+hK1qG0p7MSYACkvzTnuPvlccbHNJRRZdC/LAM1Cp2k="; + vendorHash = "sha256-Dt6V1zngSra4ZMSboHzreqwxgH5ovMIB+Bq3eWK6tjA="; doCheck = false; 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/premake/5.nix b/pkgs/development/tools/misc/premake/5.nix index 841e8480da1ab..d33a9c73c9c7f 100644 --- a/pkgs/development/tools/misc/premake/5.nix +++ b/pkgs/development/tools/misc/premake/5.nix @@ -19,7 +19,9 @@ stdenv.mkDerivation rec { --replace "ca = nil" "ca = '${cacert}/etc/ssl/certs/ca-bundle.crt'" '' + lib.optionalString stdenv.isDarwin '' substituteInPlace premake5.lua \ - --replace -mmacosx-version-min=10.4 -mmacosx-version-min=10.5 + --replace -mmacosx-version-min=10.4 -mmacosx-version-min=10.5 \ + --replace-fail '"-arch arm64"' '""' \ + --replace-fail '"-arch x86_64"' '""' '' + lib.optionalString stdenv.hostPlatform.isStatic '' substituteInPlace \ binmodules/example/premake5.lua \ @@ -34,6 +36,10 @@ stdenv.mkDerivation rec { make -f Bootstrap.mak linux ''; + env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isClang [ + "-Wno-error=implicit-function-declaration" + ]); + installPhase = '' install -Dm755 bin/release/premake5 $out/bin/premake5 ''; @@ -47,6 +53,5 @@ stdenv.mkDerivation rec { mainProgram = "premake5"; license = lib.licenses.bsd3; platforms = lib.platforms.darwin ++ lib.platforms.linux; - broken = stdenv.isDarwin && stdenv.isAarch64; }; } diff --git a/pkgs/development/tools/misc/seer/default.nix b/pkgs/development/tools/misc/seer/default.nix index b797287a02dc2..abc718b15893b 100644 --- a/pkgs/development/tools/misc/seer/default.nix +++ b/pkgs/development/tools/misc/seer/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, cmake, gdb, qtcharts, qtbase, wrapQtAppsHook }: +{ lib, stdenv, fetchFromGitHub, cmake, gdb, kdePackages, wrapQtAppsHook }: stdenv.mkDerivation rec { pname = "seer"; - version = "1.17"; + version = "2.4"; src = fetchFromGitHub { owner = "epasveer"; repo = "seer"; rev = "v${version}"; - sha256 = "sha256-lM6w+QwIRYP/2JDx4yynJxhVXt8SouOWgsLGXSwolIw="; + sha256 = "sha256-ZvoRC34496fUldL3jOdxcO/TVmfPNmmr2GkJG4gJXzk="; }; preConfigure = '' @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { patchPhase = '' substituteInPlace src/{SeerGdbConfigPage,SeerMainWindow,SeerGdbWidget}.cpp \ - --replace "/usr/bin/gdb" "${gdb}/bin/gdb" + --replace-fail "/usr/bin/gdb" "${gdb}/bin/gdb" ''; - buildInputs = [ qtbase qtcharts ]; - nativeBuildInputs = [ cmake wrapQtAppsHook ]; + buildInputs = with kdePackages; [ qtbase qtcharts qtsvg ]; + nativeBuildInputs = [ cmake kdePackages.wrapQtAppsHook ]; meta = with lib; { description = "A Qt gui frontend for GDB"; 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/packer/default.nix b/pkgs/development/tools/packer/default.nix index b4c2afb080722..442ac1155f33f 100644 --- a/pkgs/development/tools/packer/default.nix +++ b/pkgs/development/tools/packer/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "packer"; - version = "1.10.3"; + version = "1.11.0"; src = fetchFromGitHub { owner = "hashicorp"; repo = "packer"; rev = "v${version}"; - hash = "sha256-oLN7FU7Er0GnfOhoKd0bSsiB7uZsr2BNL3aSDrWJEUw="; + hash = "sha256-LU3URVklSjpsQas9xtvIU2OcyMZHqkcA7WaUYCQHfns="; }; - vendorHash = "sha256-2YsFwWalMhbZP4vdEQguCijGC9kCiqDpfZCAKVOk5bs="; + vendorHash = "sha256-ipinfk+nFAeyND1HNOehHd+0l5meOPOgbkmCzJlvw+A="; subPackages = [ "." ]; diff --git a/pkgs/development/tools/ruff/Cargo.lock b/pkgs/development/tools/ruff/Cargo.lock index 6e9301ad473ac..1ee4a7ef6bc2c 100644 --- a/pkgs/development/tools/ruff/Cargo.lock +++ b/pkgs/development/tools/ruff/Cargo.lock @@ -1903,7 +1903,7 @@ dependencies = [ [[package]] name = "ruff" -version = "0.4.6" +version = "0.4.7" dependencies = [ "anyhow", "argfile", @@ -2064,7 +2064,7 @@ dependencies = [ [[package]] name = "ruff_linter" -version = "0.4.6" +version = "0.4.7" dependencies = [ "aho-corasick", "annotate-snippets 0.9.2", diff --git a/pkgs/development/tools/ruff/default.nix b/pkgs/development/tools/ruff/default.nix index a04f03c6ec449..25ed93f4ba6c2 100644 --- a/pkgs/development/tools/ruff/default.nix +++ b/pkgs/development/tools/ruff/default.nix @@ -10,13 +10,13 @@ rustPlatform.buildRustPackage rec { pname = "ruff"; - version = "0.4.6"; + version = "0.4.7"; src = fetchFromGitHub { owner = "astral-sh"; repo = "ruff"; rev = "refs/tags/v${version}"; - hash = "sha256-ECFBciJjVmz8yvZci6dV4L3o4objkbU5HwB2qy0Mqv4="; + hash = "sha256-1WQQpIdGFWEq6HzFFA5qRC3wnqtUvdzC/6VIkDY1pZI="; }; cargoLock = { diff --git a/pkgs/development/tools/rust/cargo-about/default.nix b/pkgs/development/tools/rust/cargo-about/default.nix index 8ac62bdae1117..67a7220031a6f 100644 --- a/pkgs/development/tools/rust/cargo-about/default.nix +++ b/pkgs/development/tools/rust/cargo-about/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-about"; - version = "0.6.1"; + version = "0.6.2"; src = fetchFromGitHub { owner = "EmbarkStudios"; repo = "cargo-about"; rev = version; - sha256 = "sha256-+FtTD2vr1+BxSXHlFqpXmzP54vZ8CP1vJ0BQVFp/Zx4="; + sha256 = "sha256-W2qE4QqwVgC/J6NQkUcC501Dcc1qHnAhTIDvlr2El2k="; }; - cargoHash = "sha256-5Kh0GpyAq6jeMuPO3x+lC46zkVcxoMVMjQXZCBZRlk8="; + cargoHash = "sha256-9Cw9FKbpGNsoWTqJtsm+dplvvPkZghj2uQ1M/WMw/LM="; nativeBuildInputs = [ pkg-config ]; 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/development/tools/semantic-release/default.nix b/pkgs/development/tools/semantic-release/default.nix index b50a8337d4fa7..7da3d9e164e73 100644 --- a/pkgs/development/tools/semantic-release/default.nix +++ b/pkgs/development/tools/semantic-release/default.nix @@ -8,16 +8,16 @@ buildNpmPackage rec { pname = "semantic-release"; - version = "23.1.1"; + version = "24.0.0"; src = fetchFromGitHub { owner = "semantic-release"; repo = "semantic-release"; rev = "v${version}"; - hash = "sha256-gO/HOLzPFPI2QzVFmyHMJGOKWACiHJEtj+cxq+I0/to="; + hash = "sha256-UoxsuCGWgHL7tYrBKS83VUkvGTUMBtpdO8ByKv5Dbrk="; }; - npmDepsHash = "sha256-j64Hr3uJT2r8paoAcxkf+ijDg0rc6sIAZssZcaLNxzM="; + npmDepsHash = "sha256-MmdgUa3j3MD/SCqtMtAGvocHTgv5OIu8RdT27JgNvcg="; dontNpmBuild = true; diff --git a/pkgs/development/tools/squawk/default.nix b/pkgs/development/tools/squawk/default.nix index 7a70c6378d60d..c4cb979b909dd 100644 --- a/pkgs/development/tools/squawk/default.nix +++ b/pkgs/development/tools/squawk/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "squawk"; - version = "0.28.0"; + version = "0.29.0"; src = fetchFromGitHub { owner = "sbdchd"; repo = pname; rev = "v${version}"; - hash = "sha256-RnY41G0ombqJewv+kxvg8AwQeRaVb+frZjmU/Cd28Jo="; + hash = "sha256-YKwoMZkr+UWri4WLm+a44DA8sygy67UkSm160OqDGus="; }; - cargoHash = "sha256-YR2ZSwrCkX8eyHTj1Dtk9f01/y9fDtknouige68kS8I="; + cargoHash = "sha256-pX87ccAyMkR7qA/k3zLgqYEIhNLFa5yrrVZVtWUKfyc="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/development/web/bun/default.nix b/pkgs/development/web/bun/default.nix index e769924b86291..019ed66411016 100644 --- a/pkgs/development/web/bun/default.nix +++ b/pkgs/development/web/bun/default.nix @@ -12,7 +12,7 @@ }: stdenvNoCC.mkDerivation rec { - version = "1.1.9"; + version = "1.1.10"; pname = "bun"; src = passthru.sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}"); @@ -51,19 +51,19 @@ stdenvNoCC.mkDerivation rec { sources = { "aarch64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-aarch64.zip"; - hash = "sha256-gk3Zi8AcpMTCexL8ASY29W2LcwYICpD2QwpvuEbQpB4="; + hash = "sha256-txTr+uYvGOsytyTO2mXZUQOOJMcNT4uyzNCdz4pn0AQ="; }; "aarch64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-aarch64.zip"; - hash = "sha256-F5yfovHAsWeLiQ4Uigrm0hy3gwz8pK5PA6AuZiyrfOI="; + hash = "sha256-8Wp3RDvP2/tonU8ngDTWuGD1m7q7gxwnuwbxpc6N/+Y="; }; "x86_64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-x64.zip"; - hash = "sha256-HV8iVZwHPPyini8rCVMnSHmqL7HUM27uOSfaTcdnnZ0="; + hash = "sha256-cV3NO0qGqZqSgVLj1U2bvQUqGzgGugLPwk4eq+XfjTU="; }; "x86_64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-x64.zip"; - hash = "sha256-yIz/CWKTSKoeOTb/2rxbyYovw0rralSj0r2ZMPu29i8="; + hash = "sha256-iQM/BtoaDBRlH/jx9qH6WlV2Ox7MbtWMzHc8RxVCHH0="; }; }; updateScript = writeShellScript "update-bun" '' diff --git a/pkgs/development/web/deno/default.nix b/pkgs/development/web/deno/default.nix index ad9ef96a71e74..5ab9f6840facb 100644 --- a/pkgs/development/web/deno/default.nix +++ b/pkgs/development/web/deno/default.nix @@ -13,16 +13,16 @@ }: rustPlatform.buildRustPackage rec { pname = "deno"; - version = "1.43.5"; + version = "1.43.6"; src = fetchFromGitHub { owner = "denoland"; repo = pname; rev = "v${version}"; - hash = "sha256-Kkm7tU+pV/GHAqiiylX2quC+NhzFBKxcp12f2bH93lY="; + hash = "sha256-8yBcSiaav28AevAH5wh0VwpMR5U5Vong8D+UFCx/wjo="; }; - cargoHash = "sha256-Lr8aMHMZlfgwQhl0R13f5C9fdicxgPSB+5VtNqbDP38="; + cargoHash = "sha256-o8DsFtn3+gtIMO5LS3mHbQS1iWT46iC9ZHr8hEOXZrs="; postPatch = '' # upstream uses lld on aarch64-darwin for faster builds diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index 6ff332b5a5cda..8c80fd03d8cd1 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -72,7 +72,7 @@ buildGoModule rec { downloadPage = "https://github.com/superfly/flyctl"; homepage = "https://fly.io/"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ adtya jsierles techknowlogick RaghavSood ]; + maintainers = with lib.maintainers; [ adtya jsierles techknowlogick RaghavSood teutat3s ]; mainProgram = "flyctl"; }; } diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix index 962bc3e246bec..7fef97677b827 100644 --- a/pkgs/development/web/nodejs/nodejs.nix +++ b/pkgs/development/web/nodejs/nodejs.nix @@ -137,10 +137,16 @@ let "build-node-api-tests" "tooltest" "cctest" + "test-ci-js" ]; - # Do not create __pycache__ when running tests. - checkFlags = [ "PYTHONDONTWRITEBYTECODE=1" ]; + checkFlags = [ + # Do not create __pycache__ when running tests. + "PYTHONDONTWRITEBYTECODE=1" + "FLAKY_TESTS=skip" + # Skip some tests that are not passing in this context + "CI_SKIP_TESTS=test-setproctitle,test-tls-cli-max-version-1.3,test-tls-client-auth,test-child-process-exec-env,test-fs-write-stream-eagain,test-tls-sni-option,test-https-foafssl,test-child-process-uid-gid,test-process-euid-egid,test-process-initgroups,test-process-uid-gid,test-process-setgroups" + ]; postInstall = '' HOST_PATH=$out/bin patchShebangs --host $out diff --git a/pkgs/development/web/nodejs/use-correct-env-in-tests.patch b/pkgs/development/web/nodejs/use-correct-env-in-tests.patch new file mode 100644 index 0000000000000..d2fda8d2ceadf --- /dev/null +++ b/pkgs/development/web/nodejs/use-correct-env-in-tests.patch @@ -0,0 +1,24 @@ +`/usr/bin/env` is not available. + +--- old/test/common/assertSnapshot.js ++++ new/test/common/assertSnapshot.js +@@ -81,2 +81,2 @@ async function spawnAndAssert(filename, transform = (x) => x, { tty = false, ... +- const executable = tty ? 'tools/pseudo-tty.py' : process.execPath; +- const args = tty ? [process.execPath, ...flags, filename] : [...flags, filename]; ++ const executable = tty ? 'python3' : process.execPath; ++ const args = tty ? ['tools/pseudo-tty.py', process.execPath, ...flags, filename] : [...flags, filename]; +--- old/test/parallel/test-child-process-default-options.js ++++ new/test/parallel/test-child-process-default-options.js +@@ -35 +35 @@ if (isWindows) { +- child = spawn('/usr/bin/env', [], {}); ++ child = spawn('env', [], {}); +--- old/test/parallel/test-child-process-env.js ++++ new/test/parallel/test-child-process-env.js +@@ -51 +51 @@ if (isWindows) { +- child = spawn('/usr/bin/env', [], { env }); ++ child = spawn('env', [], { env }); +--- old/test/parallel/test-child-process-exec-env.js ++++ new/test/parallel/test-child-process-exec-env.js +@@ -47 +47 @@ if (!isWindows) { +- child = exec('/usr/bin/env', { env: { 'HELLO': 'WORLD' } }, after); ++ child = exec('env', { env: { 'HELLO': 'WORLD' } }, after); diff --git a/pkgs/development/web/nodejs/v18.nix b/pkgs/development/web/nodejs/v18.nix index 6b3ca7635e436..7f80e2070f383 100644 --- a/pkgs/development/web/nodejs/v18.nix +++ b/pkgs/development/web/nodejs/v18.nix @@ -1,4 +1,4 @@ -{ callPackage, lib, overrideCC, pkgs, buildPackages, openssl, python3, enableNpm ? true }: +{ callPackage, lib, overrideCC, pkgs, buildPackages, openssl, python3, fetchpatch2, enableNpm ? true }: let # Clang 16+ cannot build Node v18 due to -Wenum-constexpr-conversion errors. @@ -27,5 +27,10 @@ buildNodejs { ./revert-arm64-pointer-auth.patch ./node-npm-build-npm-package-logic.patch ./trap-handler-backport.patch + ./use-correct-env-in-tests.patch + (fetchpatch2 { + url = "https://github.com/nodejs/node/commit/534c122de166cb6464b489f3e6a9a544ceb1c913.patch"; + hash = "sha256-4q4LFsq4yU1xRwNsM1sJoNVphJCnxaVe2IyL6AeHJ/I="; + }) ]; } diff --git a/pkgs/development/web/nodejs/v20.nix b/pkgs/development/web/nodejs/v20.nix index b716f9bdd1ed5..b72018290a077 100644 --- a/pkgs/development/web/nodejs/v20.nix +++ b/pkgs/development/web/nodejs/v20.nix @@ -1,4 +1,4 @@ -{ callPackage, openssl, python3, enableNpm ? true }: +{ callPackage, fetchpatch2, openssl, python3, enableNpm ? true }: let buildNodejs = callPackage ./nodejs.nix { @@ -15,5 +15,10 @@ buildNodejs { ./disable-darwin-v8-system-instrumentation-node19.patch ./bypass-darwin-xcrun-node16.patch ./node-npm-build-npm-package-logic.patch + ./use-correct-env-in-tests.patch + (fetchpatch2 { + url = "https://github.com/nodejs/node/commit/534c122de166cb6464b489f3e6a9a544ceb1c913.patch"; + hash = "sha256-4q4LFsq4yU1xRwNsM1sJoNVphJCnxaVe2IyL6AeHJ/I="; + }) ]; } diff --git a/pkgs/development/web/nodejs/v22.nix b/pkgs/development/web/nodejs/v22.nix index 676ef1c7e5452..5a2dc68ad16e1 100644 --- a/pkgs/development/web/nodejs/v22.nix +++ b/pkgs/development/web/nodejs/v22.nix @@ -1,4 +1,4 @@ -{ callPackage, openssl, python3, enableNpm ? true }: +{ callPackage, fetchpatch2, openssl, python3, enableNpm ? true }: let buildNodejs = callPackage ./nodejs.nix { @@ -14,5 +14,10 @@ buildNodejs { ./disable-darwin-v8-system-instrumentation-node19.patch ./bypass-darwin-xcrun-node16.patch ./node-npm-build-npm-package-logic.patch + ./use-correct-env-in-tests.patch + (fetchpatch2 { + url = "https://github.com/nodejs/node/commit/534c122de166cb6464b489f3e6a9a544ceb1c913.patch"; + hash = "sha256-4q4LFsq4yU1xRwNsM1sJoNVphJCnxaVe2IyL6AeHJ/I="; + }) ]; } diff --git a/pkgs/games/space-station-14-launcher/space-station-14-launcher.nix b/pkgs/games/space-station-14-launcher/space-station-14-launcher.nix index c2071552e4cc2..be4a50034b914 100644 --- a/pkgs/games/space-station-14-launcher/space-station-14-launcher.nix +++ b/pkgs/games/space-station-14-launcher/space-station-14-launcher.nix @@ -31,7 +31,7 @@ , gdk-pixbuf }: let - version = "0.26.0"; + version = "0.27.2"; pname = "space-station-14-launcher"; in buildDotnetModule rec { @@ -44,7 +44,7 @@ buildDotnetModule rec { owner = "space-wizards"; repo = "SS14.Launcher"; rev = "v${version}"; - hash = "sha256-Gh2gQucn3VsfFrPAS/vehfVy5WqlVpvSeISB4/j08MQ="; + hash = "sha256-r+nNZ2xkHMp8bmNNqbf4WnmGP3SIxCtHUCfGxfydTH4="; fetchSubmodules = true; }; diff --git a/pkgs/games/vcmi/default.nix b/pkgs/games/vcmi/default.nix index ec6905e2d1304..b4f1df8eed0b8 100644 --- a/pkgs/games/vcmi/default.nix +++ b/pkgs/games/vcmi/default.nix @@ -20,6 +20,7 @@ , tbb , unshield , wrapQtAppsHook +, xz , zlib , testers , vcmi @@ -27,13 +28,14 @@ stdenv.mkDerivation rec { pname = "vcmi"; - version = "1.4.5"; + version = "1.5.1"; src = fetchFromGitHub { owner = "vcmi"; repo = "vcmi"; rev = version; - hash = "sha256-nyYzG0O7tZwo77r7QwenVgaTffZ3ELEyUrkZmdvwm/w="; + fetchSubmodules = true; + hash = "sha256-w4SYgc8T57PyezY6UspNCwBcoM6ytnNu6QsxwB4QYDw="; }; nativeBuildInputs = [ @@ -57,13 +59,14 @@ stdenv.mkDerivation rec { qtbase qttools tbb + xz zlib ]; cmakeFlags = [ "-DENABLE_LUA:BOOL=ON" "-DENABLE_ERM:BOOL=ON" - "-DENABLE_GITVERSION:BOOL=OFF" + "-DENABLE_GOLDMASTER:BOOL=ON" "-DENABLE_PCH:BOOL=OFF" "-DENABLE_TEST:BOOL=OFF" # Tests require HOMM3 data files. "-DFORCE_BUNDLED_MINIZIP:BOOL=OFF" diff --git a/pkgs/kde/generated/sources/plasma.json b/pkgs/kde/generated/sources/plasma.json index a33d287efa958..e44e3b0e2cc9f 100644 --- a/pkgs/kde/generated/sources/plasma.json +++ b/pkgs/kde/generated/sources/plasma.json @@ -255,9 +255,9 @@ "hash": "sha256-XChjJlDcoDD9mpNl28Vv4ImObUhjwkYlrW5QPBzCPsY=" }, "plasma-workspace": { - "version": "6.0.5", - "url": "mirror://kde/stable/plasma/6.0.5/plasma-workspace-6.0.5.tar.xz", - "hash": "sha256-xU0tWt9esv7vcJK5IX8e1ZyY42n5tdexLddzZfTresk=" + "version": "6.0.5.1", + "url": "mirror://kde/stable/plasma/6.0.5/plasma-workspace-6.0.5.1.tar.xz", + "hash": "sha256-iQf5/e1fxuXZU1X4NGMo3hjXyIUNq9kQnXVFjVru2BM=" }, "plasma-workspace-wallpapers": { "version": "6.0.5", 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/cups/drivers/hl1210w/default.nix b/pkgs/misc/cups/drivers/hl1210w/default.nix index c8cd6e95651b6..b4bf573d68e57 100644 --- a/pkgs/misc/cups/drivers/hl1210w/default.nix +++ b/pkgs/misc/cups/drivers/hl1210w/default.nix @@ -43,9 +43,9 @@ stdenv.mkDerivation { substituteInPlace $out/opt/brother/Printers/HL1210W/cupswrapper/brother_lpdwrapper_HL1210W --replace /opt "$out/opt" - mkdir -p $out/lib/cups/filter + mkdir -p $out/lib/cups/filter $out/share/cups/model ln -s $out/opt/brother/Printers/HL1210W/cupswrapper/brother_lpdwrapper_HL1210W $out/lib/cups/filter/brother_lpdwrapper_HL1210W - ln -s $out/opt/brother/Printers/HL1210W/cupswrapper/brother-HL1210W-cups-en.ppd $out/lib/cups/filter/brother-HL1210W-cups-en.ppd + ln -s $out/opt/brother/Printers/HL1210W/cupswrapper/brother-HL1210W-cups-en.ppd $out/share/cups/model/ # cp brcupsconfig4 $out/opt/brother/Printers/HL1110/cupswrapper/ ln -s $out/opt/brother/Printers/HL1210W/cupswrapper/brcupsconfig4 $out/lib/cups/filter/brcupsconfig4 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/misc/tmux-plugins/default.nix b/pkgs/misc/tmux-plugins/default.nix index 167fe8f9475c6..76b786001d803 100644 --- a/pkgs/misc/tmux-plugins/default.nix +++ b/pkgs/misc/tmux-plugins/default.nix @@ -587,12 +587,12 @@ in rec { session-wizard = mkTmuxPlugin rec { pluginName = "session-wizard"; rtpFilePath = "session-wizard.tmux"; - version = "1.2.0"; + version = "1.3.1"; src = pkgs.fetchFromGitHub { owner = "27medkamal"; repo = "tmux-session-wizard"; rev = "V${version}"; - sha256 = "sha256-IfSgX02vXdpzyu1GRF1EvzVCqqOEiTjeXtl1EvNr7EI="; + sha256 = "sha256-nJaC5aX+cR/+ks3I/lW/tUnVG0CrEYfsIjPDisgMrTE="; }; meta = with lib; { homepage = "https://github.com/27medkamal/tmux-session-wizard"; @@ -610,9 +610,11 @@ in rec { }; nativeBuildInputs = [ pkgs.makeWrapper ]; postInstall = '' - substituteInPlace $target/session-wizard.tmux \ - --replace \$CURRENT_DIR/session-wizard.sh $target/session-wizard.sh - wrapProgram $target/session-wizard.sh \ + for f in .gitignore Dockerfile flake.* scripts tests; do + rm -rf $target/$f + done + substituteInPlace $target/session-wizard.tmux --replace \$CURRENT_DIR $target + wrapProgram $target/bin/t \ --prefix PATH : ${with pkgs; lib.makeBinPath ([ fzf zoxide coreutils gnugrep gnused ])} ''; }; 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/apparmor/default.nix b/pkgs/os-specific/linux/apparmor/default.nix index cebae9b8402dd..873dde7873166 100644 --- a/pkgs/os-specific/linux/apparmor/default.nix +++ b/pkgs/os-specific/linux/apparmor/default.nix @@ -1,4 +1,5 @@ { stdenv, lib, fetchFromGitLab, fetchpatch, makeWrapper, autoreconfHook +, autoconf-archive , pkg-config, which , flex, bison , linuxHeaders ? stdenv.cc.libc.linuxHeaders @@ -22,7 +23,7 @@ }: let - apparmor-version = "3.1.7"; + apparmor-version = "4.0.1"; apparmor-meta = component: with lib; { homepage = "https://apparmor.net/"; @@ -36,7 +37,7 @@ let owner = "apparmor"; repo = "apparmor"; rev = "v${apparmor-version}"; - hash = "sha256-AzY05bcpNYXix2GL4Rhc9d3RBA1pd2fwOa7yoiwc2nQ="; + hash = "sha256-0S/P62wi3/aPATvJL6afu+SebjoSHsTMu/WV9m7E1OE="; }; aa-teardown = writeShellScript "aa-teardown" '' @@ -86,6 +87,7 @@ let strictDeps = false; nativeBuildInputs = [ + autoconf-archive autoreconfHook bison flex 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/htmldocs.nix b/pkgs/os-specific/linux/kernel/htmldocs.nix index eb22645d2e9e7..b811cf12bb01d 100644 --- a/pkgs/os-specific/linux/kernel/htmldocs.nix +++ b/pkgs/os-specific/linux/kernel/htmldocs.nix @@ -7,7 +7,6 @@ , perl , python3 , which -, fetchpatch }: stdenv.mkDerivation { @@ -15,16 +14,6 @@ stdenv.mkDerivation { inherit (linux_latest) version src; - patches = [ - # docutils 0.21 has removed nodes.reprunicode - # fixes the `AttributeError` thrown when building docs. - (fetchpatch { - name = "docutils_fix.patch"; - url = "https://lore.kernel.org/linux-doc/faf5fa45-2a9d-4573-9d2e-3930bdc1ed65@gmail.com/raw"; - hash = "sha256-JuV1B/8iDysbH0tl+wr/rdXvoC34uUq25ejMFmD0hio="; - }) - ]; - postPatch = '' patchShebangs \ Documentation/sphinx/parse-headers.pl \ 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/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index fcf45f40531da..bc4cd53b1394b 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -62,11 +62,11 @@ rec { # Vulkan developer beta driver # See here for more information: https://developer.nvidia.com/vulkan-driver vulkan_beta = generic rec { - version = "550.40.61"; + version = "550.40.63"; persistencedVersion = "550.54.14"; settingsVersion = "550.54.14"; - sha256_64bit = "sha256-JNVeA5/u5/ictU3QpPnbXIHDKOtwou8wGmMt3We4FJY="; - openSha256 = "sha256-kWGTj3eAvwLTJ7zgzRFvyhXmfpxQbUMmyxWxER9i9m0="; + sha256_64bit = "sha256-YvlNgxcFsCl3DzHFpKe+VXzfc0QIgf3N/hTKsWZ7gDE="; + openSha256 = "sha256-mITh1kdSPtB+jP6TDHw04EN7gRx48KGbzbLO0wTSS/U="; settingsSha256 = "sha256-m2rNASJp0i0Ez2OuqL+JpgEF0Yd8sYVCyrOoo/ln2a4="; persistencedSha256 = "sha256-XaPN8jVTjdag9frLPgBtqvO/goB5zxeGzaTU0CdL6C4="; url = "https://developer.nvidia.com/downloads/vulkan-beta-${lib.concatStrings (lib.splitVersion version)}-linux"; diff --git a/pkgs/os-specific/linux/prl-tools/default.nix b/pkgs/os-specific/linux/prl-tools/default.nix index 1eff2088a6c75..3a3016d14b4be 100644 --- a/pkgs/os-specific/linux/prl-tools/default.nix +++ b/pkgs/os-specific/linux/prl-tools/default.nix @@ -36,13 +36,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "prl-tools"; - version = "19.3.1-54941"; + version = "19.4.0-54962"; # We download the full distribution to extract prl-tools-lin.iso from # => ${dmg}/Parallels\ Desktop.app/Contents/Resources/Tools/prl-tools-lin.iso src = fetchurl { url = "https://download.parallels.com/desktop/v${lib.versions.major finalAttrs.version}/${finalAttrs.version}/ParallelsDesktop-${finalAttrs.version}.dmg"; - hash = "sha256-2M87+dbQaDerajzc6bCXmrpIyUNXfMxFiX1SbLJ0fss="; + hash = "sha256-c/MrWUvwY/Z38uOBbetJSVkZlwkdzFhw6wpk1L0BuQs="; }; hardeningDisable = [ "pic" "format" ]; 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/db-rest/default.nix b/pkgs/servers/db-rest/default.nix index e8fb0ae506a2d..dc216b08e3c2c 100644 --- a/pkgs/servers/db-rest/default.nix +++ b/pkgs/servers/db-rest/default.nix @@ -8,7 +8,7 @@ }: buildNpmPackage rec { pname = "db-rest"; - version = "6.0.4"; + version = "6.0.5"; nodejs = nodejs_18; @@ -16,10 +16,10 @@ buildNpmPackage rec { owner = "derhuerst"; repo = pname; rev = version; - hash = "sha256-guiAtPOvU/yqspq+G+mTSIFqBp6Kl0JZBPfjPC+ZM1g="; + hash = "sha256-jMHqJ1whGPz2ti7gn8SPz6o7Fm4oMF6hYjB4wsjKAEU="; }; - npmDepsHash = "sha256-lJT344HpHJFN3QO6kVAj1NhRFTwS+EVkR0ePbtIguFo="; + npmDepsHash = "sha256-rXBIpar5L6fGpDlphr1PqRNxARSccV7Gi+uTNlCqh7I="; preConfigure = '' patchShebangs ./build/index.js diff --git a/pkgs/servers/dns/pdns/default.nix b/pkgs/servers/dns/pdns/default.nix index dfa4a3e617328..1037c88229aa9 100644 --- a/pkgs/servers/dns/pdns/default.nix +++ b/pkgs/servers/dns/pdns/default.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "pdns"; - version = "4.9.0"; + version = "4.9.1"; src = fetchurl { url = "https://downloads.powerdns.com/releases/pdns-${finalAttrs.version}.tar.bz2"; - hash = "sha256-/h1UM8iERu1w2TFgXG7Dd9qZg5xOFRuQtxqiEb1u6pI="; + hash = "sha256-MNlnG48IR3Tby6IPWlOjE00IIqsu3D75aNoDDmMN0Jo="; }; # redact configure flags from version output to reduce closure size patches = [ ./version.patch ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index d122c85fc75ef..12ed4a7a36cdd 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -267,6 +267,16 @@ let patches = []; }); + pymelcloud = super.pymelcloud.overridePythonAttrs (oldAttrs: { + version = "2.5.9"; + src = fetchFromGitHub { + owner = "vilppuvuorinen"; + repo = "pymelcloud"; + rev = "33a827b6cd0b34f276790faa49bfd0994bb7c2e4"; # 2.5.x branch + sha256 = "sha256-Q3FIo9YJwtWPHfukEBjBANUQ1N1vr/DMnl1dgiN7vYg="; + }; + }); + notifications-android-tv = super.notifications-android-tv.overridePythonAttrs (oldAttrs: rec { version = "0.1.5"; format = "setuptools"; diff --git a/pkgs/servers/home-automation/evcc/default.nix b/pkgs/servers/home-automation/evcc/default.nix index e4696c138aa5b..d6c8fcb836888 100644 --- a/pkgs/servers/home-automation/evcc/default.nix +++ b/pkgs/servers/home-automation/evcc/default.nix @@ -21,13 +21,13 @@ in buildGoModule rec { pname = "evcc"; - version = "0.126.4"; + version = "0.126.5"; src = fetchFromGitHub { owner = "evcc-io"; repo = "evcc"; rev = version; - hash = "sha256-GDAj85zIrhu6XsY/XV1wKPtHNkj3bm3ooDcQaQeMHW0="; + hash = "sha256-hw8DImLXFwTEAyPEFUVnyNPXrQTfEk7OOk+w/izJz9s="; }; vendorHash = "sha256-gfKJiZ7wSFWEEB/UCAbH18jdZdgG/58q3Yj0FQqMH8E="; diff --git a/pkgs/servers/http/nginx/mainline.nix b/pkgs/servers/http/nginx/mainline.nix index ddb9c14740bb0..669eb65323642 100644 --- a/pkgs/servers/http/nginx/mainline.nix +++ b/pkgs/servers/http/nginx/mainline.nix @@ -1,6 +1,6 @@ { callPackage, ... }@args: callPackage ./generic.nix args { - version = "1.25.4"; - hash = "sha256-dgcpkBrLqlF5luaB7m6iWQMpheN8J2i+74DfOod97tk="; + version = "1.27.0"; + hash = "sha256-tyMOPPh+qi1LC8VqrckgqWDHhzuZkaG2b/zAj8ZQEpw="; } diff --git a/pkgs/servers/http/nginx/stable.nix b/pkgs/servers/http/nginx/stable.nix index cc6a521af6626..3a6a049c12069 100644 --- a/pkgs/servers/http/nginx/stable.nix +++ b/pkgs/servers/http/nginx/stable.nix @@ -1,6 +1,6 @@ { callPackage, ... } @ args: callPackage ./generic.nix args { - version = "1.26.0"; - hash = "sha256-0ubIQ51sbbUBXY6qskcKtSrvhae/NjGCh5l34IQ3BJc="; + version = "1.26.1"; + hash = "sha256-+Rh0aP8usVkmC/1Thnwl/44zRyYjes8ie56HDlPT42s="; } diff --git a/pkgs/servers/http/pomerium/external-envoy.diff b/pkgs/servers/http/pomerium/0001-envoy-allow-specification-of-external-binary.patch index 49f4985ad77c3..d595dc6ccae29 100644 --- a/pkgs/servers/http/pomerium/external-envoy.diff +++ b/pkgs/servers/http/pomerium/0001-envoy-allow-specification-of-external-binary.patch @@ -1,5 +1,14 @@ +From fa51c56049a99ef17d86b0327bcf66f47338da45 Mon Sep 17 00:00:00 2001 +From: Morgan Helton <mhelton@gmail.com> +Date: Sun, 26 May 2024 12:17:01 -0500 +Subject: [PATCH] envoy: allow specification of external binary + +--- + pkg/envoy/envoy.go | 17 ++++++++++------- + 1 file changed, 10 insertions(+), 7 deletions(-) + diff --git a/pkg/envoy/envoy.go b/pkg/envoy/envoy.go -index e32cfc29..9d32c057 100644 +index 62f2d34c..879001cd 100644 --- a/pkg/envoy/envoy.go +++ b/pkg/envoy/envoy.go @@ -8,9 +8,9 @@ import ( @@ -13,7 +22,7 @@ index e32cfc29..9d32c057 100644 "path/filepath" "regexp" "strconv" -@@ -36,8 +36,12 @@ import ( +@@ -34,8 +34,12 @@ import ( const ( configFileName = "envoy-config.yaml" @@ -25,15 +34,18 @@ index e32cfc29..9d32c057 100644 + type serverOptions struct { services string - logLevel string -@@ -60,13 +64,16 @@ type Server struct { + logLevel config.LogLevel +@@ -58,17 +62,16 @@ type Server struct { // NewServer creates a new server with traffic routed by envoy. func NewServer(ctx context.Context, src config.Source, builder *envoyconfig.Builder) (*Server, error) { -- envoyPath, err := Extract() +- if err := preserveRlimitNofile(); err != nil { +- log.Debug(ctx).Err(err).Msg("couldn't preserve RLIMIT_NOFILE before starting Envoy") +- } + envoyPath := OverrideEnvoyPath + wd := filepath.Join(os.TempDir(), workingDirectoryName) -+ + +- envoyPath, err := Extract() + err := os.MkdirAll(wd, embeddedEnvoyPermissions) if err != nil { - return nil, fmt.Errorf("extracting envoy: %w", err) @@ -46,3 +58,6 @@ index e32cfc29..9d32c057 100644 builder: builder, grpcPort: src.GetConfig().GRPCPort, httpPort: src.GetConfig().HTTPPort, +-- +2.44.1 + diff --git a/pkgs/servers/http/pomerium/default.nix b/pkgs/servers/http/pomerium/default.nix index 6fe47f9853929..bd8873ce100e7 100644 --- a/pkgs/servers/http/pomerium/default.nix +++ b/pkgs/servers/http/pomerium/default.nix @@ -1,6 +1,5 @@ { buildGoModule , fetchFromGitHub -, callPackage , lib , envoy , mkYarnPackage @@ -14,15 +13,15 @@ let in buildGoModule rec { pname = "pomerium"; - version = "0.25.2"; + version = "0.26.0"; src = fetchFromGitHub { owner = "pomerium"; repo = "pomerium"; rev = "v${version}"; - hash = "sha256-JateIiVao5IiPXmphA5+PlzB2XtP6zRR4rURqXSqJ6Q="; + hash = "sha256-AkpfLKPirl8fz4s0hQI15aSgI2PZFPakAzC+j66MVY0="; }; - vendorHash = "sha256-GdeZkKkENacc11FmEAFUfX9efInfhpv2Lz0/3CtixFQ="; + vendorHash = "sha256-kabWL7yqNkI2JRPmVv0tp0nIfVDwT9QbbDIbdM8sL5s="; ui = mkYarnPackage { inherit version; @@ -54,7 +53,9 @@ buildGoModule rec { ]; # patch pomerium to allow use of external envoy - patches = [ ./external-envoy.diff ]; + patches = [ + ./0001-envoy-allow-specification-of-external-binary.patch + ]; ldflags = let # Set a variety of useful meta variables for stamping the build with. diff --git a/pkgs/servers/http/pomerium/package.json b/pkgs/servers/http/pomerium/package.json index 4f81e118d85a5..59e65c4fcbaa6 100644 --- a/pkgs/servers/http/pomerium/package.json +++ b/pkgs/servers/http/pomerium/package.json @@ -29,21 +29,21 @@ "@fontsource/dm-sans": "^5.0.13", "@mui/icons-material": "^5.14.9", "@mui/material": "^5.4.0", - "luxon": "^2.5.2", + "lodash": "^4.17.21", "markdown-to-jsx": "^7.2.1", "react": "^17.0.2", "react-dom": "^17.0.2", "react-feather": "^2.0.10" }, "devDependencies": { - "@trivago/prettier-plugin-sort-imports": "2.0.4", - "@types/luxon": "^2.0.9", - "@types/node": "^17.0.14", + "@trivago/prettier-plugin-sort-imports": "^4.2.1", + "@types/lodash": "^4.17.1", + "@types/node": "^20.12.11", "@types/react": "^17.0.34", "@types/react-dom": "^17.0.11", "@typescript-eslint/eslint-plugin": "^5.10.2", "@typescript-eslint/parser": "^5.59.11", - "esbuild": "^0.13.12", + "esbuild": "^0.21.1", "eslint": "7.32.0", "eslint-config-prettier": "^8.3.0", "eslint-plugin-react": "^7.28.0", diff --git a/pkgs/servers/http/pomerium/yarn-hash b/pkgs/servers/http/pomerium/yarn-hash index 71760c6384c7f..a631334cc391c 100644 --- a/pkgs/servers/http/pomerium/yarn-hash +++ b/pkgs/servers/http/pomerium/yarn-hash @@ -1 +1 @@ -1cjwkdvg9rfp55674gns44xwi32ws8z57sa4ffb0zzgdgy2yx2zm +1xkn1zbhg4q35azlhcgc1bk1sykrawngq1fcb5r5ghgh3m2kmz76 diff --git a/pkgs/servers/klipper/default.nix b/pkgs/servers/klipper/default.nix index 10732156ada41..7e98146e924a2 100644 --- a/pkgs/servers/klipper/default.nix +++ b/pkgs/servers/klipper/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "klipper"; - version = "0.12.0-unstable-2024-05-25"; + version = "0.12.0-unstable-2024-05-27"; src = fetchFromGitHub { owner = "KevinOConnor"; repo = "klipper"; - rev = "3078912f1d9e063906b9b40eda73d63065900212"; - sha256 = "sha256-DvGxsUJ24yfbSR8gNA6vBBSw72VIOr1R6mGXzcpQZ7I="; + rev = "6cd174208bd9bbd51dc0d519a26661fb926d038a"; + sha256 = "sha256-mIBJtrkh+SIGx9s+ZyUcn0343HEkGN8i0N/Ap/AETVs="; }; sourceRoot = "${src.name}/klippy"; 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/mail/dovecot/plugins/fts_xapian/default.nix b/pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix index 619d8a7c054c9..fe3d4a2c67b9e 100644 --- a/pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix +++ b/pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "dovecot-fts-xapian"; - version = "1.7.12"; + version = "1.7.13"; src = fetchFromGitHub { owner = "grosjo"; repo = "fts-xapian"; rev = version; - hash = "sha256-bKCZqv4nml+lCsQ10nfObctpZyYXoLYKVO0nuJOX/JM="; + hash = "sha256-WStdB8oeMNHwjF+n254vZFFK5R+2pZhZcQPsVJ88og4="; }; buildInputs = [ xapian icu sqlite ]; diff --git a/pkgs/servers/mail/smtprelay/default.nix b/pkgs/servers/mail/smtprelay/default.nix index be8cfb4861f2a..d71d9c5135dd7 100644 --- a/pkgs/servers/mail/smtprelay/default.nix +++ b/pkgs/servers/mail/smtprelay/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "smtprelay"; - version = "1.11.0"; + version = "1.11.1"; src = fetchFromGitHub { owner = "decke"; repo = "smtprelay"; rev = "refs/tags/v${version}"; - hash = "sha256-8N+JJp0/d59s8rU7t0YtrTepVXpxXc8PET1f+AgEpG0="; + hash = "sha256-2fZA2vYJ6c5oaNImvS0KKZo1+Eu7LFO6jCRnChReMcE="; }; vendorHash = "sha256-BX1Ll0EEo59p+Pe5oM6+6zT6fvnv1RsfX8YEh9RKkWU="; diff --git a/pkgs/servers/matrix-conduit/Cargo.lock b/pkgs/servers/matrix-conduit/Cargo.lock index 35a42085bed6b..0063a3e066215 100644 --- a/pkgs/servers/matrix-conduit/Cargo.lock +++ b/pkgs/servers/matrix-conduit/Cargo.lock @@ -3,6 +3,15 @@ version = 3 [[package]] +name = "addr2line" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +dependencies = [ + "gimli", +] + +[[package]] name = "adler" version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -10,41 +19,42 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "ahash" -version = "0.8.3" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ "cfg-if", "once_cell", "version_check", + "zerocopy", ] [[package]] name = "aho-corasick" -version = "1.0.2" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" dependencies = [ "memchr", ] [[package]] name = "allocator-api2" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56fc6cf8dc8c4158eed8649f9b8b0ea1518eb62b544fe9490d66fa0b349eafe9" +checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" [[package]] name = "anstyle" -version = "1.0.1" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a30da5c5f2d5e72842e00bcb57657162cdabef0931f40e2deb9b4140440cecd" +checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" [[package]] name = "arc-swap" -version = "1.6.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6" +checksum = "7b3d0060af21e8d11a926981cc00c6c1541aa91dd64b9f881985c3da1094425f" [[package]] name = "arrayref" @@ -59,6 +69,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" [[package]] +name = "as_variant" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f38fa22307249f86fb7fad906fcae77f2564caeb56d7209103c551cd1cf4798f" + +[[package]] name = "assign" version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -66,20 +82,23 @@ checksum = "5f093eed78becd229346bf859eec0aa4dd7ddde0757287b2b4107a1f09c80002" [[package]] name = "async-trait" -version = "0.1.68" +version = "0.1.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" +checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.21", + "syn 2.0.52", ] [[package]] name = "atomic" -version = "0.5.3" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c59bdb34bc650a32731b31bd8f0829cc15d24a708ee31559e0bb34f2bc320cba" +checksum = "8d818003e740b63afc82337e3160717f4f63078720a810b7b903e70a5d1d2994" +dependencies = [ + "bytemuck", +] [[package]] name = "autocfg" @@ -89,9 +108,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "axum" -version = "0.6.18" +version = "0.6.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8175979259124331c1d7bf6586ee7e0da434155e4b2d48ec2c8386281d8df39" +checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf" dependencies = [ "async-trait", "axum-core", @@ -149,24 +168,33 @@ dependencies = [ "http-body", "hyper", "pin-project-lite", - "rustls 0.21.2", - "rustls-pemfile 1.0.2", + "rustls", + "rustls-pemfile", "tokio", - "tokio-rustls 0.24.1", + "tokio-rustls", "tower-service", ] [[package]] -name = "base64" -version = "0.13.1" +name = "backtrace" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" +checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] [[package]] name = "base64" -version = "0.21.2" +version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" [[package]] name = "base64ct" @@ -175,33 +203,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" [[package]] -name = "bincode" -version = "1.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" -dependencies = [ - "serde", -] - -[[package]] name = "bindgen" -version = "0.65.1" +version = "0.69.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfdf7b466f9a4903edc73f95d6d2bcd5baf8ae620638762244d3f60143643cc5" +checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.2", "cexpr", "clang-sys", + "itertools 0.12.1", "lazy_static", "lazycell", - "peeking_take_while", - "prettyplease", "proc-macro2", "quote", "regex", "rustc-hash", "shlex", - "syn 2.0.21", + "syn 2.0.52", ] [[package]] @@ -212,28 +230,19 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.3.2" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6dbe3c979c178231552ecba20214a8272df4e09f232a87aef4320cf06539aded" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "blake2b_simd" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c2f0dc9a68c6317d884f97cc36cf5a3d20ba14ce404227df55e1af708ab04bc" +checksum = "23285ad32269793932e830392f2fe2f83e26488fd3ec778883a93c8323735780" dependencies = [ "arrayref", "arrayvec", - "constant_time_eq 0.2.6", -] - -[[package]] -name = "block-buffer" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" -dependencies = [ - "generic-array", + "constant_time_eq", ] [[package]] @@ -247,27 +256,27 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.13.0" +version = "3.15.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" +checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa" [[package]] name = "bytemuck" -version = "1.13.1" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea" +checksum = "5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15" [[package]] name = "byteorder" -version = "1.4.3" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" +checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" [[package]] name = "bzip2-sys" @@ -282,11 +291,12 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.79" +version = "1.0.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5" dependencies = [ "jobserver", + "libc", ] [[package]] @@ -305,10 +315,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] +name = "cfg_aliases" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" + +[[package]] name = "clang-sys" -version = "1.6.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f" +checksum = "67523a3b4be3ce1989d607a828d036249522dd9c1c8de7f4dd2dae43a37369d1" dependencies = [ "glob", "libc", @@ -317,43 +333,41 @@ dependencies = [ [[package]] name = "clap" -version = "4.3.8" +version = "4.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9394150f5b4273a1763355bd1c2ec54cc5a2593f790587bcd6b2c947cfa9211" +checksum = "b230ab84b0ffdf890d5a10abdbc8b83ae1c4918275daea1ab8801f71536b2651" dependencies = [ "clap_builder", "clap_derive", - "once_cell", ] [[package]] name = "clap_builder" -version = "4.3.8" +version = "4.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a78fbdd3cc2914ddf37ba444114bc7765bbdcb55ec9cbe6fa054f0137400717" +checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" dependencies = [ "anstyle", - "bitflags 1.3.2", "clap_lex", ] [[package]] name = "clap_derive" -version = "4.3.2" +version = "4.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8cd2b2a819ad6eec39e8f1d6b53001af1e5469f8c177579cdaeb313115b825f" +checksum = "307bc0538d5f0f83b8248db3087aa92fe504e4691294d0c96c0eabc33f47ba47" dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.21", + "syn 2.0.52", ] [[package]] name = "clap_lex" -version = "0.5.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b" +checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" [[package]] name = "color_quant" @@ -363,21 +377,20 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" [[package]] name = "conduit" -version = "0.6.0" +version = "0.7.0" dependencies = [ "async-trait", "axum", "axum-server", - "base64 0.21.2", + "base64", "bytes", "clap", - "crossbeam", "directories", "figment", "futures-util", - "heed", "hmac", "http", + "hyper", "image", "jsonwebtoken", "lazy_static", @@ -388,14 +401,14 @@ dependencies = [ "opentelemetry-jaeger", "parking_lot", "persy", - "rand 0.8.5", + "rand", "regex", "reqwest", "ring", - "rocksdb", "ruma", "rusqlite", "rust-argon2", + "rust-rocksdb", "sd-notify", "serde", "serde_html_form", @@ -419,9 +432,9 @@ dependencies = [ [[package]] name = "const-oid" -version = "0.9.2" +version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "520fbf3c07483f94e3e3ca9d0cfd913d7718ef2483d2cfd91c0d9e91474ab913" +checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" [[package]] name = "const_panic" @@ -431,21 +444,15 @@ checksum = "6051f239ecec86fde3410901ab7860d458d160371533842974fc61f96d15879b" [[package]] name = "constant_time_eq" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" - -[[package]] -name = "constant_time_eq" -version = "0.2.6" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21a53c0a4d288377e7415b53dcfc3c04da5cdc2cc95c8d5ac178b58f0b861ad6" +checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" [[package]] name = "core-foundation" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" dependencies = [ "core-foundation-sys", "libc", @@ -453,15 +460,15 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.4" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" [[package]] name = "cpufeatures" -version = "0.2.8" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03e69e28e9f7f77debdedbaafa2866e1de9ba56df55a8bd7cfc724c25a09987c" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" dependencies = [ "libc", ] @@ -477,85 +484,33 @@ dependencies = [ [[package]] name = "crc-catalog" -version = "2.2.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cace84e55f07e7301bae1c519df89cdad8cc3cd868413d3fdbdeca9ff3db484" +checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5" [[package]] name = "crc32fast" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "crossbeam" -version = "0.8.2" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2801af0d36612ae591caa9568261fddce32ce6e08a7275ea334a06a4ad021a2c" +checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" dependencies = [ "cfg-if", - "crossbeam-channel", - "crossbeam-deque", - "crossbeam-epoch", - "crossbeam-queue", - "crossbeam-utils", ] [[package]] name = "crossbeam-channel" -version = "0.5.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" -dependencies = [ - "cfg-if", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-deque" -version = "0.8.3" +version = "0.5.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" +checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95" dependencies = [ - "cfg-if", - "crossbeam-epoch", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-epoch" -version = "0.9.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" -dependencies = [ - "autocfg", - "cfg-if", - "crossbeam-utils", - "memoffset 0.9.0", - "scopeguard", -] - -[[package]] -name = "crossbeam-queue" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1cfb3ea8a53f37c40dea2c7bedcbd88bdfae54f5e2175d6ecaff1c988353add" -dependencies = [ - "cfg-if", "crossbeam-utils", ] [[package]] name = "crossbeam-utils" -version = "0.8.16" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" -dependencies = [ - "cfg-if", -] +checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" [[package]] name = "crypto-common" @@ -569,25 +524,40 @@ dependencies = [ [[package]] name = "curve25519-dalek" -version = "3.2.0" +version = "4.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b9fdf9972b2bd6af2d913799d9ebc165ea4d2e65878e329d9c6b372c4491b61" +checksum = "0a677b8922c94e01bdbb12126b0bc852f00447528dee1782229af9c720c3f348" dependencies = [ - "byteorder", - "digest 0.9.0", - "rand_core 0.5.1", + "cfg-if", + "cpufeatures", + "curve25519-dalek-derive", + "digest", + "fiat-crypto", + "platforms", + "rustc_version", "subtle", "zeroize", ] [[package]] +name = "curve25519-dalek-derive" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.52", +] + +[[package]] name = "dashmap" -version = "5.4.0" +version = "5.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "907076dfda823b0b36d2a1bb5f90c96660a5bbcd7729e10727f07858f22c4edc" +checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ "cfg-if", - "hashbrown 0.12.3", + "hashbrown 0.14.3", "lock_api", "once_cell", "parking_lot_core", @@ -595,27 +565,27 @@ dependencies = [ [[package]] name = "data-encoding" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308" +checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" [[package]] name = "der" -version = "0.6.1" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1a467a65c5e759bce6e65eaf91cc29f466cdc57cb65777bd646872a8a1fd4de" +checksum = "fffa369a668c8af7dbf8b5e56c9f744fbd399949ed171606040001947de40b1c" dependencies = [ "const-oid", "zeroize", ] [[package]] -name = "digest" -version = "0.9.0" +name = "deranged" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" dependencies = [ - "generic-array", + "powerfmt", ] [[package]] @@ -624,7 +594,7 @@ version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ - "block-buffer 0.10.4", + "block-buffer", "crypto-common", "subtle", ] @@ -651,38 +621,40 @@ dependencies = [ [[package]] name = "ed25519" -version = "1.5.3" +version = "2.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91cff35c70bba8a626e3185d8cd48cc11b5437e1a5bcd15b9b5fa3c64b6dfee7" +checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53" dependencies = [ + "pkcs8", "signature", ] [[package]] name = "ed25519-dalek" -version = "1.0.1" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c762bae6dcaf24c4c84667b8579785430908723d5c889f469d76a41d59cc7a9d" +checksum = "4a3daa8e81a3963a60642bcc1f90a670680bd4a77535faa384e9d1c79d620871" dependencies = [ "curve25519-dalek", "ed25519", - "rand 0.7.3", + "rand_core", "serde", - "sha2 0.9.9", + "sha2", + "subtle", "zeroize", ] [[package]] name = "either" -version = "1.8.1" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" +checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" [[package]] name = "encoding_rs" -version = "0.8.32" +version = "0.8.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" +checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" dependencies = [ "cfg-if", ] @@ -701,9 +673,9 @@ dependencies = [ [[package]] name = "equivalent" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88bffebc5d80432c9b140ee17875ff173a8ab62faad5b257da912bd2f6c1c0a1" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "fallible-iterator" @@ -719,18 +691,24 @@ checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a" [[package]] name = "fdeflate" -version = "0.3.0" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d329bdeac514ee06249dabc27877490f17f5d371ec693360768b838e19f3ae10" +checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645" dependencies = [ "simd-adler32", ] [[package]] +name = "fiat-crypto" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1676f435fc1dadde4d03e43f5d62b259e1ce5f40bd4ffb21db2b42ebe59c1382" + +[[package]] name = "figment" -version = "0.10.10" +version = "0.10.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4547e226f4c9ab860571e070a9034192b3175580ecea38da34fcdb53a018c9a5" +checksum = "2b6e5bc7bd59d60d0d45a6ccab6cf0f4ce28698fb4e81e750ddf229c9b824026" dependencies = [ "atomic", "pear", @@ -742,9 +720,9 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.26" +version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" +checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" dependencies = [ "crc32fast", "miniz_oxide", @@ -758,9 +736,9 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "form_urlencoded" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" dependencies = [ "percent-encoding", ] @@ -777,9 +755,9 @@ dependencies = [ [[package]] name = "futures" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" dependencies = [ "futures-channel", "futures-core", @@ -792,9 +770,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" dependencies = [ "futures-core", "futures-sink", @@ -802,15 +780,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" [[package]] name = "futures-executor" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" dependencies = [ "futures-core", "futures-task", @@ -819,38 +797,38 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" [[package]] name = "futures-macro" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.21", + "syn 2.0.52", ] [[package]] name = "futures-sink" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" [[package]] name = "futures-task" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" [[package]] name = "futures-util" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" dependencies = [ "futures-channel", "futures-core", @@ -876,37 +854,34 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.1.16" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" -dependencies = [ - "cfg-if", - "libc", - "wasi 0.9.0+wasi-snapshot-preview1", -] - -[[package]] -name = "getrandom" -version = "0.2.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" +checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" dependencies = [ "cfg-if", + "js-sys", "libc", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", + "wasm-bindgen", ] [[package]] name = "gif" -version = "0.12.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80792593675e051cf94a4b111980da2ba60d4a83e43e0048c5693baab3977045" +checksum = "3fb2d69b19215e18bb912fa30f7ce15846e301408695e44e0ef719f1da9e19f2" dependencies = [ "color_quant", "weezl", ] [[package]] +name = "gimli" +version = "0.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" + +[[package]] name = "glob" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -914,9 +889,9 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "h2" -version = "0.3.19" +version = "0.3.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d357c7ae988e7d2182f7d7871d0b963962420b0678b0997ce7de72001aeab782" +checksum = "bb2c4422095b67ee78da96fbb51a4cc413b3b25883c7717ff7ca1ab31022c9c9" dependencies = [ "bytes", "fnv", @@ -924,7 +899,7 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap 1.9.3", + "indexmap 2.2.5", "slab", "tokio", "tokio-util", @@ -939,9 +914,9 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" [[package]] name = "hashbrown" -version = "0.14.0" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" dependencies = [ "ahash", "allocator-api2", @@ -949,21 +924,20 @@ dependencies = [ [[package]] name = "hashlink" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "312f66718a2d7789ffef4f4b7b213138ed9f1eb3aa1d0d82fc99f88fb3ffd26f" +checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" dependencies = [ - "hashbrown 0.14.0", + "hashbrown 0.14.3", ] [[package]] name = "headers" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3e372db8e5c0d213e0cd0b9be18be2aca3d44cf2fe30a9d46a65581cd454584" +checksum = "06683b93020a07e3dbcf5f8c0f6d40080d725bea7936fc01ad345c01b97dc270" dependencies = [ - "base64 0.13.1", - "bitflags 1.3.2", + "base64", "bytes", "headers-core", "http", @@ -988,49 +962,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] -name = "heed" -version = "0.10.6" -source = "git+https://github.com/timokoesters/heed.git?rev=f6f825da7fb2c758867e05ad973ef800a6fe1d5d#f6f825da7fb2c758867e05ad973ef800a6fe1d5d" -dependencies = [ - "bytemuck", - "byteorder", - "heed-traits", - "heed-types", - "libc", - "lmdb-rkv-sys", - "once_cell", - "page_size", - "serde", - "synchronoise", - "url", -] - -[[package]] -name = "heed-traits" -version = "0.7.0" -source = "git+https://github.com/timokoesters/heed.git?rev=f6f825da7fb2c758867e05ad973ef800a6fe1d5d#f6f825da7fb2c758867e05ad973ef800a6fe1d5d" - -[[package]] -name = "heed-types" -version = "0.7.2" -source = "git+https://github.com/timokoesters/heed.git?rev=f6f825da7fb2c758867e05ad973ef800a6fe1d5d#f6f825da7fb2c758867e05ad973ef800a6fe1d5d" -dependencies = [ - "bincode", - "bytemuck", - "byteorder", - "heed-traits", - "serde", - "serde_json", -] - -[[package]] name = "hermit-abi" -version = "0.2.6" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" -dependencies = [ - "libc", -] +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" [[package]] name = "hmac" @@ -1038,7 +973,7 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" dependencies = [ - "digest 0.10.7", + "digest", ] [[package]] @@ -1054,9 +989,9 @@ dependencies = [ [[package]] name = "http" -version = "0.2.9" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" +checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" dependencies = [ "bytes", "fnv", @@ -1065,9 +1000,9 @@ dependencies = [ [[package]] name = "http-body" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" +checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" dependencies = [ "bytes", "http", @@ -1076,9 +1011,9 @@ dependencies = [ [[package]] name = "http-range-header" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bfe8eed0a9285ef776bb792479ea3834e8b94e13d615c2f66d03dd50a435a29" +checksum = "add0ab9360ddbd88cfeb3bd9574a1d85cfdfa14db10b3e21d3700dbc4328758f" [[package]] name = "httparse" @@ -1088,15 +1023,15 @@ checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" [[package]] name = "httpdate" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "hyper" -version = "0.14.26" +version = "0.14.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab302d72a6f11a3b910431ff93aae7e773078c769f0a3ef15fb9ec692ed147d4" +checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" dependencies = [ "bytes", "futures-channel", @@ -1109,7 +1044,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2 0.4.9", + "socket2", "tokio", "tower-service", "tracing", @@ -1118,15 +1053,16 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.23.2" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1788965e61b367cd03a62950836d5cd41560c3577d90e40e0819373194d1661c" +checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" dependencies = [ + "futures-util", "http", "hyper", - "rustls 0.20.8", + "rustls", "tokio", - "tokio-rustls 0.23.4", + "tokio-rustls", ] [[package]] @@ -1142,9 +1078,9 @@ dependencies = [ [[package]] name = "idna" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" dependencies = [ "unicode-bidi", "unicode-normalization", @@ -1152,16 +1088,15 @@ dependencies = [ [[package]] name = "image" -version = "0.24.6" +version = "0.24.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "527909aa81e20ac3a44803521443a765550f09b5130c2c2fa1ea59c2f8f50a3a" +checksum = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d" dependencies = [ "bytemuck", "byteorder", "color_quant", "gif", "jpeg-decoder", - "num-rational", "num-traits", "png", ] @@ -1178,12 +1113,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.0.0" +version = "2.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +checksum = "7b0b929d511467233429c45a44ac1dcaa21ba0f5ba11e4879e6ed28ddb4f9df4" dependencies = [ "equivalent", - "hashbrown 0.14.0", + "hashbrown 0.14.3", "serde", ] @@ -1205,17 +1140,17 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f" dependencies = [ - "socket2 0.5.3", + "socket2", "widestring", "windows-sys 0.48.0", - "winreg 0.50.0", + "winreg", ] [[package]] name = "ipnet" -version = "2.7.2" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12b6ee2129af8d4fb011108c73d99a1b83a85977f23b82460c0ae2e25bb4b57f" +checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" [[package]] name = "itertools" @@ -1227,31 +1162,40 @@ dependencies = [ ] [[package]] +name = "itertools" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +dependencies = [ + "either", +] + +[[package]] name = "itoa" -version = "1.0.6" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" +checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" [[package]] name = "jobserver" -version = "0.1.26" +version = "0.1.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" +checksum = "ab46a6e9526ddef3ae7f787c06f0f2600639ba80ea3eade3d8e670a2230f51d6" dependencies = [ "libc", ] [[package]] name = "jpeg-decoder" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e" +checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0" [[package]] name = "js-sys" -version = "0.3.64" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" dependencies = [ "wasm-bindgen", ] @@ -1276,11 +1220,12 @@ dependencies = [ [[package]] name = "jsonwebtoken" -version = "8.3.0" +version = "9.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6971da4d9c3aa03c3d8f3ff0f4155b534aad021292003895a469716b2a230378" +checksum = "5c7ea04a7c5c055c175f189b6dc6ba036fd62306b58c66c9f6389036c503a3f4" dependencies = [ - "base64 0.21.2", + "base64", + "js-sys", "pem", "ring", "serde", @@ -1290,9 +1235,9 @@ dependencies = [ [[package]] name = "konst" -version = "0.3.5" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d9a8bb6c7c71d151b25936b03e012a4c00daea99e3a3797c6ead66b0a0d55e2" +checksum = "8d712a8c49d4274f8d8a5cf61368cb5f3c143d149882b1a2918129e53395fdb0" dependencies = [ "const_panic", "konst_kernel", @@ -1301,9 +1246,9 @@ dependencies = [ [[package]] name = "konst_kernel" -version = "0.3.5" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55d2ab266022e7309df89ed712bddc753e3a3c395c3ced1bb2e4470ec2a8146d" +checksum = "dac6ea8c376b6e208a81cf39b8e82bebf49652454d98a4829e907dac16ef1790" dependencies = [ "typewit", ] @@ -1322,34 +1267,29 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.146" +version = "0.2.153" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f92be4933c13fd498862a9e02a3055f8a8d9c039ce33db97306fd5a6caa7f29b" +checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" [[package]] name = "libloading" -version = "0.7.4" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" +checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" dependencies = [ "cfg-if", - "winapi", + "windows-targets 0.52.4", ] [[package]] -name = "librocksdb-sys" -version = "0.11.0+8.1.1" +name = "libredox" +version = "0.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3386f101bcb4bd252d8e9d2fb41ec3b0862a15a62b478c355b2982efa469e3e" +checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" dependencies = [ - "bindgen", - "bzip2-sys", - "cc", - "glob", + "bitflags 2.4.2", "libc", - "libz-sys", - "lz4-sys", - "zstd-sys", + "redox_syscall", ] [[package]] @@ -1365,9 +1305,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.9" +version = "1.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56ee889ecc9568871456d42f603d6a0ce59ff328d291063a45cbdf0036baf6db" +checksum = "037731f5d3aaa87a5675e895b63ddff1a87624bc29f77004ea829809654e48f6" dependencies = [ "cc", "pkg-config", @@ -1381,21 +1321,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] -name = "lmdb-rkv-sys" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61b9ce6b3be08acefa3003c57b7565377432a89ec24476bbe72e11d101f852fe" -dependencies = [ - "cc", - "libc", - "pkg-config", -] - -[[package]] name = "lock_api" -version = "0.4.10" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" dependencies = [ "autocfg", "scopeguard", @@ -1403,9 +1332,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.19" +version = "0.4.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" +checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" [[package]] name = "lru-cache" @@ -1444,7 +1373,7 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" dependencies = [ - "regex-automata", + "regex-automata 0.1.10", ] [[package]] @@ -1455,33 +1384,15 @@ checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" [[package]] name = "matchit" -version = "0.7.0" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b87248edafb776e59e6ee64a79086f65890d3510f2c656c000bf2a7e8a0aea40" +checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" [[package]] name = "memchr" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" - -[[package]] -name = "memoffset" -version = "0.7.1" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" -dependencies = [ - "autocfg", -] - -[[package]] -name = "memoffset" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" -dependencies = [ - "autocfg", -] +checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" [[package]] name = "mime" @@ -1497,9 +1408,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" dependencies = [ "adler", "simd-adler32", @@ -1507,27 +1418,25 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.8" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" dependencies = [ "libc", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", "windows-sys 0.48.0", ] [[package]] name = "nix" -version = "0.26.2" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" +checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.2", "cfg-if", + "cfg_aliases", "libc", - "memoffset 0.7.1", - "pin-utils", - "static_assertions", ] [[package]] @@ -1552,9 +1461,9 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" +checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" dependencies = [ "autocfg", "num-integer", @@ -1562,56 +1471,53 @@ dependencies = [ ] [[package]] -name = "num-integer" -version = "0.1.45" +name = "num-conv" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" -dependencies = [ - "autocfg", - "num-traits", -] +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" [[package]] -name = "num-rational" -version = "0.4.1" +name = "num-integer" +version = "0.1.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" dependencies = [ - "autocfg", - "num-integer", "num-traits", ] [[package]] name = "num-traits" -version = "0.2.15" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" dependencies = [ "autocfg", ] [[package]] name = "num_cpus" -version = "1.15.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ "hermit-abi", "libc", ] [[package]] -name = "once_cell" -version = "1.18.0" +name = "object" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" +checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" +dependencies = [ + "memchr", +] [[package]] -name = "opaque-debug" -version = "0.3.0" +name = "once_cell" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "openssl-probe" @@ -1687,7 +1593,7 @@ dependencies = [ "once_cell", "opentelemetry_api", "percent-encoding", - "rand 0.8.5", + "rand", "thiserror", "tokio", "tokio-stream", @@ -1709,16 +1615,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] -name = "page_size" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eebde548fbbf1ea81a99b128872779c437752fb99f217c45245e1a61dcd9edcd" -dependencies = [ - "libc", - "winapi", -] - -[[package]] name = "parking_lot" version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1730,28 +1626,28 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.8" +version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.3.5", + "redox_syscall", "smallvec", - "windows-targets", + "windows-targets 0.48.5", ] [[package]] name = "paste" -version = "1.0.12" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79" +checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" [[package]] name = "pear" -version = "0.2.4" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ec95680a7087503575284e5063e14b694b7a9c0b065e5dceec661e0497127e8" +checksum = "4ccca0f6c17acc81df8e242ed473ec144cbf5c98037e69aa6d144780aad103c8" dependencies = [ "inlinable_string", "pear_codegen", @@ -1760,48 +1656,43 @@ dependencies = [ [[package]] name = "pear_codegen" -version = "0.2.4" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9661a3a53f93f09f2ea882018e4d7c88f6ff2956d809a276060476fd8c879d3c" +checksum = "2e22670e8eb757cff11d6c199ca7b987f352f0346e0be4dd23869ec72cb53c77" dependencies = [ "proc-macro2", "proc-macro2-diagnostics", "quote", - "syn 2.0.21", + "syn 2.0.52", ] [[package]] -name = "peeking_take_while" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" - -[[package]] name = "pem" -version = "1.1.1" +version = "3.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8835c273a76a90455d7344889b0964598e3316e2a79ede8e36f16bdcf2228b8" +checksum = "1b8fcc794035347fb64beda2d3b462595dd2753e3f268d89c5aae77e8cf2c310" dependencies = [ - "base64 0.13.1", + "base64", + "serde", ] [[package]] name = "percent-encoding" -version = "2.3.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "persy" -version = "1.4.4" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3712821f12453814409ec149071bd4832a8ec458e648579c104aee30ed70b300" +checksum = "9ef4b7250ab3a90ded0e284b2633469c23ef01ea868fe7cbb64e2f0a7d6f6d02" dependencies = [ "crc", "data-encoding", "fs2", "linked-hash-map", - "rand 0.8.5", + "rand", "thiserror", "unsigned-varint", "zigzag", @@ -1809,29 +1700,29 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.1.0" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c95a7476719eab1e366eaf73d0260af3021184f18177925b07f54b30089ceead" +checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.0" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39407670928234ebc5e6e580247dd567ad73a3578460c5990f9503df207e8f07" +checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.21", + "syn 2.0.52", ] [[package]] name = "pin-project-lite" -version = "0.2.9" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" [[package]] name = "pin-utils" @@ -1841,9 +1732,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkcs8" -version = "0.9.0" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9eca2c590a5f85da82668fa685c09ce2888b9430e83299debf1f34b65fd4a4ba" +checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" dependencies = [ "der", "spki", @@ -1851,15 +1742,21 @@ dependencies = [ [[package]] name = "pkg-config" -version = "0.3.27" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" + +[[package]] +name = "platforms" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" +checksum = "626dec3cac7cc0e1577a2ec3fc496277ec2baa084bebad95bb6fdbfae235f84c" [[package]] name = "png" -version = "0.17.9" +version = "0.17.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59871cc5b6cce7eaccca5a802b4173377a1c2ba90654246789a8fa2334426d11" +checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1" dependencies = [ "bitflags 1.3.2", "crc32fast", @@ -1869,49 +1766,45 @@ dependencies = [ ] [[package]] -name = "ppv-lite86" -version = "0.2.17" +name = "powerfmt" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" [[package]] -name = "prettyplease" -version = "0.2.9" +name = "ppv-lite86" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9825a04601d60621feed79c4e6b56d65db77cdca55cef43b46b0de1096d1c282" -dependencies = [ - "proc-macro2", - "syn 2.0.21", -] +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "proc-macro-crate" -version = "1.3.1" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" +checksum = "b00f26d3400549137f92511a46ac1cd8ce37cb5598a96d382381458b992a5d24" dependencies = [ - "once_cell", + "toml_datetime", "toml_edit", ] [[package]] name = "proc-macro2" -version = "1.0.61" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "363a6f739a0c0addeaf6ed75150b95743aa18643a3c6f40409ed7b6db3a6911f" +checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" dependencies = [ "unicode-ident", ] [[package]] name = "proc-macro2-diagnostics" -version = "0.10.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "606c4ba35817e2922a308af55ad51bab3645b59eae5c570d4a6cf07e36bd493b" +checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.21", + "syn 2.0.52", "version_check", "yansi", ] @@ -1924,45 +1817,22 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" [[package]] name = "quote" -version = "1.0.28" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" dependencies = [ "proc-macro2", ] [[package]] name = "rand" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -dependencies = [ - "getrandom 0.1.16", - "libc", - "rand_chacha 0.2.2", - "rand_core 0.5.1", - "rand_hc", -] - -[[package]] -name = "rand" version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ "libc", - "rand_chacha 0.3.1", - "rand_core 0.6.4", -] - -[[package]] -name = "rand_chacha" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" -dependencies = [ - "ppv-lite86", - "rand_core 0.5.1", + "rand_chacha", + "rand_core", ] [[package]] @@ -1972,16 +1842,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" dependencies = [ "ppv-lite86", - "rand_core 0.6.4", -] - -[[package]] -name = "rand_core" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -dependencies = [ - "getrandom 0.1.16", + "rand_core", ] [[package]] @@ -1990,56 +1851,39 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.10", -] - -[[package]] -name = "rand_hc" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -dependencies = [ - "rand_core 0.5.1", -] - -[[package]] -name = "redox_syscall" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -dependencies = [ - "bitflags 1.3.2", + "getrandom", ] [[package]] name = "redox_syscall" -version = "0.3.5" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" dependencies = [ "bitflags 1.3.2", ] [[package]] name = "redox_users" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" +checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" dependencies = [ - "getrandom 0.2.10", - "redox_syscall 0.2.16", + "getrandom", + "libredox", "thiserror", ] [[package]] name = "regex" -version = "1.8.4" +version = "1.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0ab3ca65655bb1e41f2a8c8cd662eb4fb035e67c3f78da1d61dffe89d07300f" +checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.7.2", + "regex-automata 0.4.6", + "regex-syntax 0.8.2", ] [[package]] @@ -2052,6 +1896,17 @@ dependencies = [ ] [[package]] +name = "regex-automata" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax 0.8.2", +] + +[[package]] name = "regex-syntax" version = "0.6.29" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2059,16 +1914,17 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.7.2" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "reqwest" -version = "0.11.9" -source = "git+https://github.com/timokoesters/reqwest?rev=57b7cf4feb921573dfafad7d34b9ac6e44ead0bd#57b7cf4feb921573dfafad7d34b9ac6e44ead0bd" +version = "0.11.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78bf93c4af7a8bb7d879d51cebe797356ff10ae8516ace542b5182d9dcac10b2" dependencies = [ - "base64 0.13.1", + "base64", "bytes", "encoding_rs", "futures-core", @@ -2080,25 +1936,28 @@ dependencies = [ "hyper-rustls", "ipnet", "js-sys", - "lazy_static", "log", "mime", + "once_cell", "percent-encoding", "pin-project-lite", - "rustls 0.20.8", + "rustls", "rustls-native-certs", - "rustls-pemfile 0.2.1", + "rustls-pemfile", "serde", "serde_json", "serde_urlencoded", + "sync_wrapper", + "system-configuration", "tokio", - "tokio-rustls 0.23.4", + "tokio-rustls", "tokio-socks", + "tower-service", "url", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "winreg 0.7.0", + "winreg", ] [[package]] @@ -2113,33 +1972,23 @@ dependencies = [ [[package]] name = "ring" -version = "0.16.20" +version = "0.17.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" +checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" dependencies = [ "cc", + "cfg-if", + "getrandom", "libc", - "once_cell", "spin", "untrusted", - "web-sys", - "winapi", -] - -[[package]] -name = "rocksdb" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb6f170a4041d50a0ce04b0d2e14916d6ca863ea2e422689a5b694395d299ffe" -dependencies = [ - "libc", - "librocksdb-sys", + "windows-sys 0.52.0", ] [[package]] name = "ruma" -version = "0.8.2" -source = "git+https://github.com/ruma/ruma?rev=3bd58e3c899457c2d55c45268dcb8a65ae682d54#3bd58e3c899457c2d55c45268dcb8a65ae682d54" +version = "0.9.4" +source = "git+https://github.com/ruma/ruma?rev=5495b85aa311c2805302edb0a7de40399e22b397#5495b85aa311c2805302edb0a7de40399e22b397" dependencies = [ "assign", "js_int", @@ -2147,6 +1996,7 @@ dependencies = [ "ruma-appservice-api", "ruma-client-api", "ruma-common", + "ruma-events", "ruma-federation-api", "ruma-identity-service-api", "ruma-push-gateway-api", @@ -2156,20 +2006,22 @@ dependencies = [ [[package]] name = "ruma-appservice-api" -version = "0.8.1" -source = "git+https://github.com/ruma/ruma?rev=3bd58e3c899457c2d55c45268dcb8a65ae682d54#3bd58e3c899457c2d55c45268dcb8a65ae682d54" +version = "0.9.0" +source = "git+https://github.com/ruma/ruma?rev=5495b85aa311c2805302edb0a7de40399e22b397#5495b85aa311c2805302edb0a7de40399e22b397" dependencies = [ "js_int", "ruma-common", + "ruma-events", "serde", "serde_json", ] [[package]] name = "ruma-client-api" -version = "0.16.2" -source = "git+https://github.com/ruma/ruma?rev=3bd58e3c899457c2d55c45268dcb8a65ae682d54#3bd58e3c899457c2d55c45268dcb8a65ae682d54" +version = "0.17.4" +source = "git+https://github.com/ruma/ruma?rev=5495b85aa311c2805302edb0a7de40399e22b397#5495b85aa311c2805302edb0a7de40399e22b397" dependencies = [ + "as_variant", "assign", "bytes", "http", @@ -2177,6 +2029,7 @@ dependencies = [ "js_option", "maplit", "ruma-common", + "ruma-events", "serde", "serde_html_form", "serde_json", @@ -2184,19 +2037,19 @@ dependencies = [ [[package]] name = "ruma-common" -version = "0.11.3" -source = "git+https://github.com/ruma/ruma?rev=3bd58e3c899457c2d55c45268dcb8a65ae682d54#3bd58e3c899457c2d55c45268dcb8a65ae682d54" +version = "0.12.1" +source = "git+https://github.com/ruma/ruma?rev=5495b85aa311c2805302edb0a7de40399e22b397#5495b85aa311c2805302edb0a7de40399e22b397" dependencies = [ - "base64 0.21.2", + "as_variant", + "base64", "bytes", "form_urlencoded", "http", - "indexmap 2.0.0", + "indexmap 2.2.5", "js_int", - "js_option", "konst", "percent-encoding", - "rand 0.8.5", + "rand", "regex", "ruma-identifiers-validation", "ruma-macros", @@ -2204,27 +2057,52 @@ dependencies = [ "serde_html_form", "serde_json", "thiserror", + "time", "tracing", "url", "uuid", + "web-time", + "wildmatch", +] + +[[package]] +name = "ruma-events" +version = "0.27.11" +source = "git+https://github.com/ruma/ruma?rev=5495b85aa311c2805302edb0a7de40399e22b397#5495b85aa311c2805302edb0a7de40399e22b397" +dependencies = [ + "as_variant", + "indexmap 2.2.5", + "js_int", + "js_option", + "percent-encoding", + "regex", + "ruma-common", + "ruma-identifiers-validation", + "ruma-macros", + "serde", + "serde_json", + "thiserror", + "tracing", + "url", "wildmatch", ] [[package]] name = "ruma-federation-api" -version = "0.7.1" -source = "git+https://github.com/ruma/ruma?rev=3bd58e3c899457c2d55c45268dcb8a65ae682d54#3bd58e3c899457c2d55c45268dcb8a65ae682d54" +version = "0.8.0" +source = "git+https://github.com/ruma/ruma?rev=5495b85aa311c2805302edb0a7de40399e22b397#5495b85aa311c2805302edb0a7de40399e22b397" dependencies = [ "js_int", "ruma-common", + "ruma-events", "serde", "serde_json", ] [[package]] name = "ruma-identifiers-validation" -version = "0.9.1" -source = "git+https://github.com/ruma/ruma?rev=3bd58e3c899457c2d55c45268dcb8a65ae682d54#3bd58e3c899457c2d55c45268dcb8a65ae682d54" +version = "0.9.3" +source = "git+https://github.com/ruma/ruma?rev=5495b85aa311c2805302edb0a7de40399e22b397#5495b85aa311c2805302edb0a7de40399e22b397" dependencies = [ "js_int", "thiserror", @@ -2232,8 +2110,8 @@ dependencies = [ [[package]] name = "ruma-identity-service-api" -version = "0.7.1" -source = "git+https://github.com/ruma/ruma?rev=3bd58e3c899457c2d55c45268dcb8a65ae682d54#3bd58e3c899457c2d55c45268dcb8a65ae682d54" +version = "0.8.0" +source = "git+https://github.com/ruma/ruma?rev=5495b85aa311c2805302edb0a7de40399e22b397#5495b85aa311c2805302edb0a7de40399e22b397" dependencies = [ "js_int", "ruma-common", @@ -2242,8 +2120,8 @@ dependencies = [ [[package]] name = "ruma-macros" -version = "0.11.3" -source = "git+https://github.com/ruma/ruma?rev=3bd58e3c899457c2d55c45268dcb8a65ae682d54#3bd58e3c899457c2d55c45268dcb8a65ae682d54" +version = "0.12.0" +source = "git+https://github.com/ruma/ruma?rev=5495b85aa311c2805302edb0a7de40399e22b397#5495b85aa311c2805302edb0a7de40399e22b397" dependencies = [ "once_cell", "proc-macro-crate", @@ -2251,45 +2129,47 @@ dependencies = [ "quote", "ruma-identifiers-validation", "serde", - "syn 2.0.21", + "syn 2.0.52", "toml", ] [[package]] name = "ruma-push-gateway-api" -version = "0.7.1" -source = "git+https://github.com/ruma/ruma?rev=3bd58e3c899457c2d55c45268dcb8a65ae682d54#3bd58e3c899457c2d55c45268dcb8a65ae682d54" +version = "0.8.0" +source = "git+https://github.com/ruma/ruma?rev=5495b85aa311c2805302edb0a7de40399e22b397#5495b85aa311c2805302edb0a7de40399e22b397" dependencies = [ "js_int", "ruma-common", + "ruma-events", "serde", "serde_json", ] [[package]] name = "ruma-signatures" -version = "0.13.1" -source = "git+https://github.com/ruma/ruma?rev=3bd58e3c899457c2d55c45268dcb8a65ae682d54#3bd58e3c899457c2d55c45268dcb8a65ae682d54" +version = "0.14.0" +source = "git+https://github.com/ruma/ruma?rev=5495b85aa311c2805302edb0a7de40399e22b397#5495b85aa311c2805302edb0a7de40399e22b397" dependencies = [ - "base64 0.21.2", + "base64", "ed25519-dalek", "pkcs8", - "rand 0.7.3", + "rand", "ruma-common", "serde_json", - "sha2 0.10.7", + "sha2", "subslice", "thiserror", ] [[package]] name = "ruma-state-res" -version = "0.9.1" -source = "git+https://github.com/ruma/ruma?rev=3bd58e3c899457c2d55c45268dcb8a65ae682d54#3bd58e3c899457c2d55c45268dcb8a65ae682d54" +version = "0.10.0" +source = "git+https://github.com/ruma/ruma?rev=5495b85aa311c2805302edb0a7de40399e22b397#5495b85aa311c2805302edb0a7de40399e22b397" dependencies = [ - "itertools", + "itertools 0.11.0", "js_int", "ruma-common", + "ruma-events", "serde", "serde_json", "thiserror", @@ -2302,7 +2182,7 @@ version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "549b9d036d571d42e6e85d1c1425e2ac83491075078ca9a15be021c56b1641f2" dependencies = [ - "bitflags 2.3.2", + "bitflags 2.4.2", "fallible-iterator", "fallible-streaming-iterator", "hashlink", @@ -2312,39 +2192,68 @@ dependencies = [ [[package]] name = "rust-argon2" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b50162d19404029c1ceca6f6980fe40d45c8b369f6f44446fa14bb39573b5bb9" +checksum = "a5885493fdf0be6cdff808d1533ce878d21cfa49c7086fa00c66355cd9141bfc" dependencies = [ - "base64 0.13.1", + "base64", "blake2b_simd", - "constant_time_eq 0.1.5", + "constant_time_eq", "crossbeam-utils", ] [[package]] +name = "rust-librocksdb-sys" +version = "0.20.0+9.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48b14f4848d8574c074bb26445b43e63735d802ef2fc5cc40c1b015134baee0c" +dependencies = [ + "bindgen", + "bzip2-sys", + "cc", + "glob", + "libc", + "libz-sys", + "lz4-sys", + "zstd-sys", +] + +[[package]] +name = "rust-rocksdb" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d36eae38b1d3d0018e273191f791343bd3eb030d7da63aaa20350e41c0182881" +dependencies = [ + "libc", + "rust-librocksdb-sys", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" + +[[package]] name = "rustc-hash" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] -name = "rustls" -version = "0.20.8" +name = "rustc_version" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ - "log", - "ring", - "sct", - "webpki", + "semver", ] [[package]] name = "rustls" -version = "0.21.2" +version = "0.21.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e32ca28af694bc1bbf399c33a516dbdf1c90090b8ab23c2bc24f834aa2247f5f" +checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" dependencies = [ "log", "ring", @@ -2359,34 +2268,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" dependencies = [ "openssl-probe", - "rustls-pemfile 1.0.2", + "rustls-pemfile", "schannel", "security-framework", ] [[package]] name = "rustls-pemfile" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eebeaeb360c87bfb72e84abdb3447159c0eaececf1bef2aecd65a8be949d1c9" -dependencies = [ - "base64 0.13.1", -] - -[[package]] -name = "rustls-pemfile" -version = "1.0.2" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d194b56d58803a43635bdc398cd17e383d6f71f9182b9a192c127ca42494a59b" +checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" dependencies = [ - "base64 0.21.2", + "base64", ] [[package]] name = "rustls-webpki" -version = "0.100.1" +version = "0.101.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6207cd5ed3d8dca7816f8f3725513a34609c0c765bf652b8c3cb4cfd87db46b" +checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" dependencies = [ "ring", "untrusted", @@ -2394,36 +2294,36 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.12" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06" +checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" [[package]] name = "ryu" -version = "1.0.13" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" +checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" [[package]] name = "schannel" -version = "0.1.21" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3" +checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" dependencies = [ - "windows-sys 0.42.0", + "windows-sys 0.52.0", ] [[package]] name = "scopeguard" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "sct" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" +checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" dependencies = [ "ring", "untrusted", @@ -2437,9 +2337,9 @@ checksum = "621e3680f3e07db4c9c2c3fb07c6223ab2fab2e54bd3c04c3ae037990f428c32" [[package]] name = "security-framework" -version = "2.9.1" +version = "2.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fc758eb7bffce5b308734e9b0c1468893cae9ff70ebf13e7090be8dcbcc83a8" +checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" dependencies = [ "bitflags 1.3.2", "core-foundation", @@ -2450,42 +2350,48 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.9.0" +version = "2.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f51d0c0d83bec45f16480d0ce0058397a69e48fcdc52d1dc8855fb68acbd31a7" +checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" dependencies = [ "core-foundation-sys", "libc", ] [[package]] +name = "semver" +version = "1.0.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" + +[[package]] name = "serde" -version = "1.0.164" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e8c8cf938e98f769bc164923b06dce91cea1751522f46f8466461af04c9027d" +checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.164" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9735b638ccc51c28bf6914d90a2e9725b377144fc612c49a611fddd1b631d68" +checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.21", + "syn 2.0.52", ] [[package]] name = "serde_html_form" -version = "0.2.0" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53192e38d5c88564b924dbe9b60865ecbb71b81d38c4e61c817cffd3e36ef696" +checksum = "50437e6a58912eecc08865e35ea2e8d365fbb2db0debb1c8bb43bf1faf055f25" dependencies = [ "form_urlencoded", - "indexmap 1.9.3", + "indexmap 2.2.5", "itoa", "ryu", "serde", @@ -2493,9 +2399,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.99" +version = "1.0.114" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46266871c240a00b8f503b877622fe33430b3c7d963bdc0f2adc511e54a1eae3" +checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0" dependencies = [ "itoa", "ryu", @@ -2504,18 +2410,19 @@ dependencies = [ [[package]] name = "serde_path_to_error" -version = "0.1.11" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7f05c1d5476066defcdfacce1f52fc3cae3af1d3089727100c02ae92e5abbe0" +checksum = "af99884400da37c88f5e9146b7f1fd0fbcae8f6eec4e9da38b67d05486f814a6" dependencies = [ + "itoa", "serde", ] [[package]] name = "serde_spanned" -version = "0.6.3" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186" +checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" dependencies = [ "serde", ] @@ -2534,11 +2441,11 @@ dependencies = [ [[package]] name = "serde_yaml" -version = "0.9.22" +version = "0.9.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "452e67b9c20c37fa79df53201dc03839651086ed9bbe92b3ca585ca9fdaa7d85" +checksum = "8fd075d994154d4a774f95b51fb96bdc2832b0ea48425c92546073816cda1f2f" dependencies = [ - "indexmap 2.0.0", + "indexmap 2.2.5", "itoa", "ryu", "serde", @@ -2553,58 +2460,45 @@ checksum = "f5058ada175748e33390e40e872bd0fe59a19f265d0158daa551c5a88a76009c" dependencies = [ "cfg-if", "cpufeatures", - "digest 0.10.7", + "digest", ] [[package]] name = "sha1" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest 0.10.7", -] - -[[package]] -name = "sha2" -version = "0.9.9" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" dependencies = [ - "block-buffer 0.9.0", "cfg-if", "cpufeatures", - "digest 0.9.0", - "opaque-debug", + "digest", ] [[package]] name = "sha2" -version = "0.10.7" +version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" dependencies = [ "cfg-if", "cpufeatures", - "digest 0.10.7", + "digest", ] [[package]] name = "sharded-slab" -version = "0.1.4" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31" +checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" dependencies = [ "lazy_static", ] [[package]] name = "shlex" -version = "1.1.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" [[package]] name = "signal-hook-registry" @@ -2617,15 +2511,18 @@ dependencies = [ [[package]] name = "signature" -version = "1.6.4" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c" +checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" +dependencies = [ + "rand_core", +] [[package]] name = "simd-adler32" -version = "0.3.5" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "238abfbb77c1915110ad968465608b68e869e0772622c9656714e73e5a1a522f" +checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" [[package]] name = "simple_asn1" @@ -2641,62 +2538,46 @@ dependencies = [ [[package]] name = "slab" -version = "0.4.8" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" dependencies = [ "autocfg", ] [[package]] name = "smallvec" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" - -[[package]] -name = "socket2" -version = "0.4.9" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" -dependencies = [ - "libc", - "winapi", -] +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "socket2" -version = "0.5.3" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877" +checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" dependencies = [ "libc", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "spin" -version = "0.5.2" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" [[package]] name = "spki" -version = "0.6.0" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67cf02bbac7a337dc36e4f5a693db6c21e7863f45070f7064577eb4367a3212b" +checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" dependencies = [ "base64ct", "der", ] [[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - -[[package]] name = "subslice" version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2724,9 +2605,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.21" +version = "2.0.52" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1182caafaab7018eaea9b404afa8184c0baf42a04d5e10ae4f4843c2029c8aab" +checksum = "b699d15b36d1f02c3e7c69f8ffef53de37aefae075d8488d4ba1a7788d574a07" dependencies = [ "proc-macro2", "quote", @@ -2740,39 +2621,51 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" [[package]] -name = "synchronoise" -version = "1.0.1" +name = "system-configuration" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dbc01390fc626ce8d1cffe3376ded2b72a11bb70e1c75f404a210e4daa4def2" +checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" dependencies = [ - "crossbeam-queue", + "bitflags 1.3.2", + "core-foundation", + "system-configuration-sys", +] + +[[package]] +name = "system-configuration-sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" +dependencies = [ + "core-foundation-sys", + "libc", ] [[package]] name = "thiserror" -version = "1.0.40" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" +checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.40" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" +checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.21", + "syn 2.0.52", ] [[package]] name = "thread_local" -version = "1.1.7" +version = "1.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" +checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" dependencies = [ "cfg-if", "once_cell", @@ -2802,9 +2695,9 @@ dependencies = [ [[package]] name = "tikv-jemalloc-ctl" -version = "0.5.0" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e37706572f4b151dff7a0146e040804e9c26fe3a3118591112f05cf12a4216c1" +checksum = "619bfed27d807b54f7f776b9430d4f8060e66ee138a28632ca898584d462c31c" dependencies = [ "libc", "paste", @@ -2813,9 +2706,9 @@ dependencies = [ [[package]] name = "tikv-jemalloc-sys" -version = "0.5.3+5.3.0-patched" +version = "0.5.4+5.3.0-patched" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a678df20055b43e57ef8cddde41cdfda9a3c1a060b67f4c5836dfb1d78543ba8" +checksum = "9402443cb8fd499b6f327e40565234ff34dbda27460c5b47db0db77443dd85d1" dependencies = [ "cc", "libc", @@ -2823,9 +2716,9 @@ dependencies = [ [[package]] name = "tikv-jemallocator" -version = "0.5.0" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20612db8a13a6c06d57ec83953694185a367e16945f66565e8028d2c0bd76979" +checksum = "965fe0c26be5c56c94e38ba547249074803efd52adfb66de62107d95aab3eaca" dependencies = [ "libc", "tikv-jemalloc-sys", @@ -2833,11 +2726,14 @@ dependencies = [ [[package]] name = "time" -version = "0.3.22" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea9e1b3cf1243ae005d9e74085d4d542f3125458f3a81af210d901dcd7411efd" +checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749" dependencies = [ + "deranged", "itoa", + "num-conv", + "powerfmt", "serde", "time-core", "time-macros", @@ -2845,16 +2741,17 @@ dependencies = [ [[package]] name = "time-core" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.9" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "372950940a5f07bf38dbe211d7283c9e6d7327df53794992d293e534c733d09b" +checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774" dependencies = [ + "num-conv", "time-core", ] @@ -2875,42 +2772,31 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.28.2" +version = "1.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94d7b1cfd2aa4011f2de74c2c4c63665e27a71006b0a192dcd2710272e73dfa2" +checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931" dependencies = [ - "autocfg", + "backtrace", "bytes", "libc", "mio", "num_cpus", "pin-project-lite", "signal-hook-registry", - "socket2 0.4.9", + "socket2", "tokio-macros", "windows-sys 0.48.0", ] [[package]] name = "tokio-macros" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" +checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.21", -] - -[[package]] -name = "tokio-rustls" -version = "0.23.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" -dependencies = [ - "rustls 0.20.8", - "tokio", - "webpki", + "syn 2.0.52", ] [[package]] @@ -2919,7 +2805,7 @@ version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" dependencies = [ - "rustls 0.21.2", + "rustls", "tokio", ] @@ -2948,9 +2834,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.8" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" +checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" dependencies = [ "bytes", "futures-core", @@ -2962,9 +2848,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.7.5" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ebafdf5ad1220cb59e7d17cf4d2c72015297b75b19a10472f99b89225089240" +checksum = "185d8ab0dfbb35cf1399a6344d8484209c088f75f8f68230da55d48d95d43e3d" dependencies = [ "serde", "serde_spanned", @@ -2983,11 +2869,11 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.19.11" +version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "266f016b7f039eec8a1a80dfe6156b633d208b9fccca5e4db1d6775b0c4e34a7" +checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338" dependencies = [ - "indexmap 2.0.0", + "indexmap 2.2.5", "serde", "serde_spanned", "toml_datetime", @@ -3011,11 +2897,11 @@ dependencies = [ [[package]] name = "tower-http" -version = "0.4.1" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8bd22a874a2d0b70452d5597b12c537331d49060824a95f49f108994f94aa4c" +checksum = "61c5bb1d698276a2443e5ecfabc1008bf15a36c12e6a7176e7bf089ea9131140" dependencies = [ - "bitflags 2.3.2", + "bitflags 2.4.2", "bytes", "futures-core", "futures-util", @@ -3043,11 +2929,10 @@ checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" [[package]] name = "tracing" -version = "0.1.37" +version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ - "cfg-if", "log", "pin-project-lite", "tracing-attributes", @@ -3056,20 +2941,20 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.26" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.21", + "syn 2.0.52", ] [[package]] name = "tracing-core" -version = "0.1.31" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" dependencies = [ "once_cell", "valuable", @@ -3088,12 +2973,23 @@ dependencies = [ [[package]] name = "tracing-log" -version = "0.1.3" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f751112709b4e791d8ce53e32c4ed2d353565a795ce84da2285393f41557bdf2" +dependencies = [ + "log", + "once_cell", + "tracing-core", +] + +[[package]] +name = "tracing-log" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922" +checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" dependencies = [ - "lazy_static", "log", + "once_cell", "tracing-core", ] @@ -3107,15 +3003,15 @@ dependencies = [ "opentelemetry", "tracing", "tracing-core", - "tracing-log", + "tracing-log 0.1.4", "tracing-subscriber", ] [[package]] name = "tracing-subscriber" -version = "0.3.17" +version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" +checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" dependencies = [ "matchers", "nu-ansi-term", @@ -3126,7 +3022,7 @@ dependencies = [ "thread_local", "tracing", "tracing-core", - "tracing-log", + "tracing-log 0.2.0", ] [[package]] @@ -3145,7 +3041,7 @@ dependencies = [ "idna 0.2.3", "ipnet", "lazy_static", - "rand 0.8.5", + "rand", "smallvec", "thiserror", "tinyvec", @@ -3176,88 +3072,97 @@ dependencies = [ [[package]] name = "try-lock" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "typenum" -version = "1.16.0" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "typewit" -version = "1.4.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4061a10d4d8f3081a8ccc025182afd8434302d8d4b4503ec6d8510d09df08c2d" +checksum = "c6fb9ae6a3cafaf0a5d14c2302ca525f9ae8e07a0f0e6949de88d882c37a6e24" +dependencies = [ + "typewit_proc_macros", +] + +[[package]] +name = "typewit_proc_macros" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e36a83ea2b3c704935a01b4642946aadd445cea40b10935e3f8bd8052b8193d6" [[package]] name = "uncased" -version = "0.9.9" +version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b9bc53168a4be7402ab86c3aad243a84dd7381d09be0eddc81280c1da95ca68" +checksum = "e1b88fcfe09e89d3866a5c11019378088af2d24c3fbd4f0543f96b479ec90697" dependencies = [ "version_check", ] [[package]] name = "unicode-bidi" -version = "0.3.13" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" [[package]] name = "unicode-ident" -version = "1.0.9" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-normalization" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" dependencies = [ "tinyvec", ] [[package]] name = "unsafe-libyaml" -version = "0.2.8" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1865806a559042e51ab5414598446a5871b561d21b6764f2eabb0dd481d880a6" +checksum = "ab4c90930b95a82d00dc9e9ac071b4991924390d46cbd0dfe566148667605e4b" [[package]] name = "unsigned-varint" -version = "0.7.1" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d86a8dc7f45e4c1b0d30e43038c38f274e77af056aa5f74b93c2cf9eb3c1c836" +checksum = "eb066959b24b5196ae73cb057f45598450d2c5f71460e98c49b738086eff9c06" [[package]] name = "untrusted" -version = "0.7.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "url" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" +checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" dependencies = [ "form_urlencoded", - "idna 0.4.0", + "idna 0.5.0", "percent-encoding", ] [[package]] name = "uuid" -version = "1.3.4" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa2982af2eec27de306107c027578ff7f423d65f7250e40ce0fea8f45248b81" +checksum = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a" dependencies = [ - "getrandom 0.2.10", + "getrandom", ] [[package]] @@ -3289,21 +3194,15 @@ dependencies = [ [[package]] name = "wasi" -version = "0.9.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" - -[[package]] -name = "wasi" version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.87" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -3311,24 +3210,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.87" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.21", + "syn 2.0.52", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.37" +version = "0.4.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03" +checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" dependencies = [ "cfg-if", "js-sys", @@ -3338,9 +3237,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.87" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -3348,48 +3247,48 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.87" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.21", + "syn 2.0.52", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.87" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] name = "web-sys" -version = "0.3.64" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" +checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" dependencies = [ "js-sys", "wasm-bindgen", ] [[package]] -name = "webpki" -version = "0.22.0" +name = "web-time" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" +checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb" dependencies = [ - "ring", - "untrusted", + "js-sys", + "wasm-bindgen", ] [[package]] name = "weezl" -version = "0.1.7" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb" +checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" [[package]] name = "widestring" @@ -3399,9 +3298,9 @@ checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8" [[package]] name = "wildmatch" -version = "2.1.1" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee583bdc5ff1cf9db20e9db5bb3ff4c3089a8f6b8b31aff265c9aba85812db86" +checksum = "017f0a8ed8331210d91b7a4c30d4edef8f21a65c02f2540496e2e79725f6d8a8" [[package]] name = "winapi" @@ -3427,147 +3326,147 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows-sys" -version = "0.42.0" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", + "windows-targets 0.48.5", ] [[package]] name = "windows-sys" -version = "0.48.0" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets", + "windows-targets 0.52.4", ] [[package]] name = "windows-targets" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ - "windows_aarch64_gnullvm 0.48.0", - "windows_aarch64_msvc 0.48.0", - "windows_i686_gnu 0.48.0", - "windows_i686_msvc 0.48.0", - "windows_x86_64_gnu 0.48.0", - "windows_x86_64_gnullvm 0.48.0", - "windows_x86_64_msvc 0.48.0", + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" +dependencies = [ + "windows_aarch64_gnullvm 0.52.4", + "windows_aarch64_msvc 0.52.4", + "windows_i686_gnu 0.52.4", + "windows_i686_msvc 0.52.4", + "windows_x86_64_gnu 0.52.4", + "windows_x86_64_gnullvm 0.52.4", + "windows_x86_64_msvc 0.52.4", ] [[package]] name = "windows_aarch64_gnullvm" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.48.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" +checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" [[package]] name = "windows_aarch64_msvc" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.48.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" +checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" [[package]] name = "windows_i686_gnu" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.48.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" +checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" [[package]] name = "windows_i686_msvc" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.48.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" +checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" [[package]] name = "windows_x86_64_gnu" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.48.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" +checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" [[package]] name = "windows_x86_64_gnullvm" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.48.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" +checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" [[package]] name = "windows_x86_64_msvc" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.48.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" +checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" [[package]] name = "winnow" -version = "0.4.7" +version = "0.5.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca0ace3845f0d96209f0375e6d367e3eb87eb65d27d445bdc9f1843a26f39448" +checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" dependencies = [ "memchr", ] [[package]] name = "winreg" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0120db82e8a1e0b9fb3345a539c478767c0048d842860994d96113d5b667bd69" -dependencies = [ - "winapi", -] - -[[package]] -name = "winreg" version = "0.50.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" @@ -3578,31 +3477,37 @@ dependencies = [ [[package]] name = "yansi" -version = "0.5.1" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" +checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049" [[package]] -name = "zeroize" -version = "1.6.0" +name = "zerocopy" +version = "0.7.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9" +checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" dependencies = [ - "zeroize_derive", + "zerocopy-derive", ] [[package]] -name = "zeroize_derive" -version = "1.4.2" +name = "zerocopy-derive" +version = "0.7.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" +checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.21", + "syn 2.0.52", ] [[package]] +name = "zeroize" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" + +[[package]] name = "zigzag" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3613,11 +3518,10 @@ dependencies = [ [[package]] name = "zstd-sys" -version = "2.0.8+zstd.1.5.5" +version = "2.0.9+zstd.1.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5556e6ee25d32df2586c098bbfa278803692a20d0ab9565e049480d52707ec8c" +checksum = "9e16efa8a874a0481a574084d34cc26fdb3b99627480f785888deb6386506656" dependencies = [ "cc", - "libc", "pkg-config", ] diff --git a/pkgs/servers/matrix-conduit/default.nix b/pkgs/servers/matrix-conduit/default.nix index 115c7e226e847..faa62ce7d1f92 100644 --- a/pkgs/servers/matrix-conduit/default.nix +++ b/pkgs/servers/matrix-conduit/default.nix @@ -6,22 +6,19 @@ , stdenv , darwin , nixosTests -, rocksdb_8_3 +, rocksdb , rust-jemalloc-sys }: -let - rocksdb = rocksdb_8_3; -in rustPlatform.buildRustPackage rec { pname = "matrix-conduit"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitLab { owner = "famedly"; repo = "conduit"; rev = "v${version}"; - hash = "sha256-TpNssMHvSKcxJMas5lQNWEbIv09u4/niBN2C27Mp0JY="; + hash = "sha256-6osKiwEm3H7NR8vuOaD5Jlns5alfgprg+c3D98msxcE="; }; # We have to use importCargoLock here because `cargo vendor` currently doesn't support workspace @@ -29,9 +26,7 @@ rustPlatform.buildRustPackage rec { cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "heed-0.10.6" = "sha256-rm02pJ6wGYN4SsAbp85jBVHDQ5ITjZZd+79EC2ubRsY="; - "reqwest-0.11.9" = "sha256-wH/q7REnkz30ENBIK5Rlxnc1F6vOyuEANMHFmiVPaGw="; - "ruma-0.8.2" = "sha256-GkHLY5unh7uyFNe0RS+3xQ4Ou8qBhzd+kEnCC7xUnMo="; + "ruma-0.9.4" = "sha256-ICz2Mi94XA2os3dTBLWTL4B60Dopw2u0Fq/mM3HoG2A="; }; }; diff --git a/pkgs/servers/monitoring/prometheus/redis-exporter.nix b/pkgs/servers/monitoring/prometheus/redis-exporter.nix index af56a220feaa2..0dae325ae5d08 100644 --- a/pkgs/servers/monitoring/prometheus/redis-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/redis-exporter.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "redis_exporter"; - version = "1.59.0"; + version = "1.60.0"; src = fetchFromGitHub { owner = "oliver006"; repo = "redis_exporter"; rev = "v${version}"; - sha256 = "sha256-/nfAB4h5VvAzuludQ7Zx3OoJThyyD5nS6B5pOSbQYFs="; + sha256 = "sha256-eqS/qlrktlKiM1GAYI0CoJxjxc4a1ODyosEFITnmKTE="; }; - vendorHash = "sha256-Nns8hpKwxL1GQfjVt9+rnmjGjmdm2TB+8wob7ze4RrI="; + vendorHash = "sha256-nrEglhb22LANgm6hiZToPVPfGpkpxpJ7TQlLW0Z7+/4="; ldflags = [ "-X main.BuildVersion=${version}" diff --git a/pkgs/servers/monitoring/sensu-go/default.nix b/pkgs/servers/monitoring/sensu-go/default.nix index 81ec65598cc61..c95b4d7644492 100644 --- a/pkgs/servers/monitoring/sensu-go/default.nix +++ b/pkgs/servers/monitoring/sensu-go/default.nix @@ -39,7 +39,7 @@ let homepage = "https://sensu.io"; description = "Open source monitoring tool for ephemeral infrastructure & distributed applications"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ thefloweringash ]; + maintainers = with lib.maintainers; [ thefloweringash teutat3s ]; }; }; in 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/search/qdrant/Cargo.lock b/pkgs/servers/search/qdrant/Cargo.lock index 4cdac0d8b37c2..3daf47e49fcbb 100644 --- a/pkgs/servers/search/qdrant/Cargo.lock +++ b/pkgs/servers/search/qdrant/Cargo.lock @@ -59,9 +59,9 @@ dependencies = [ [[package]] name = "actix-http" -version = "3.6.0" +version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d223b13fd481fc0d1f83bb12659ae774d9e3601814c68a0bc539731698cca743" +checksum = "4eb9843d84c775696c37d9a418bbb01b932629d01870722c0f13eb3f95e2536d" dependencies = [ "actix-codec", "actix-rt", @@ -69,7 +69,7 @@ dependencies = [ "actix-tls", "actix-utils", "ahash", - "base64 0.21.0", + "base64 0.22.0", "bitflags 2.4.1", "brotli", "bytes", @@ -147,13 +147,15 @@ dependencies = [ [[package]] name = "actix-router" -version = "0.5.1" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d66ff4d247d2b160861fa2866457e85706833527840e4133f8f49aa423a38799" +checksum = "13d324164c51f63867b57e73ba5936ea151b8a41a1d23d1031eeb9f70d0236f8" dependencies = [ "bytestring", + "cfg-if", "http 0.2.9", "regex", + "regex-lite", "serde", "tracing", ] @@ -199,9 +201,9 @@ dependencies = [ [[package]] name = "actix-tls" -version = "3.3.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4cce60a2f2b477bc72e5cde0af1812a6e82d8fd85b5570a5dcf2a5bf2c5be5f" +checksum = "ac453898d866cdbecdbc2334fe1738c747b4eba14a677261f2b768ba05329389" dependencies = [ "actix-rt", "actix-service", @@ -211,7 +213,7 @@ dependencies = [ "pin-project-lite", "rustls-pki-types", "tokio", - "tokio-rustls 0.25.0", + "tokio-rustls 0.26.0", "tokio-util", "tracing", ] @@ -228,9 +230,9 @@ dependencies = [ [[package]] name = "actix-web" -version = "4.5.1" +version = "4.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43a6556ddebb638c2358714d853257ed226ece6023ef9364f23f0c70737ea984" +checksum = "b1cf67dadb19d7c95e5a299e2dda24193b89d5d4f33a3b9800888ede9e19aa32" dependencies = [ "actix-codec", "actix-http", @@ -258,6 +260,7 @@ dependencies = [ "once_cell", "pin-project-lite", "regex", + "regex-lite", "serde", "serde_json", "serde_urlencoded", @@ -460,17 +463,17 @@ checksum = "34fde25430d87a9388dadbe6e34d7f72a462c8b43ac8d309b42b0a8505d7e2a5" [[package]] name = "anyhow" -version = "1.0.82" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" [[package]] name = "api" -version = "1.9.0" +version = "1.9.4" dependencies = [ "chrono", "common", - "log", + "itertools 0.12.1", "parking_lot", "prost 0.11.9", "prost-build 0.11.9", @@ -760,9 +763,9 @@ dependencies = [ [[package]] name = "brotli" -version = "3.3.4" +version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1a0b1dbcc8ae29329621f8d4f0d835787c1c38bb1401979b49d13b0b305ff68" +checksum = "74f7971dbd9326d58187408ab83117d8ac1bb9c17b085fdacd1cf2f598719b6b" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -771,9 +774,9 @@ dependencies = [ [[package]] name = "brotli-decompressor" -version = "2.3.2" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59ad2d4653bf5ca36ae797b1f4bb4dbddb60ce49ca4aed8a2ce4829f60425b80" +checksum = "e6221fe77a248b9117d431ad93761222e1cf8ff282d9d1d5d9f53d6299a1cf76" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -850,12 +853,13 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[package]] name = "cc" -version = "1.0.83" +version = "1.0.98" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f" dependencies = [ "jobserver", "libc", + "once_cell", ] [[package]] @@ -970,7 +974,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "213030a2b5a4e0c0892b6652260cf6ccac84827b83a85a534e178e3906c4cf1b" dependencies = [ "ciborium-io", - "half", + "half 1.8.2", ] [[package]] @@ -1048,19 +1052,24 @@ dependencies = [ name = "collection" version = "0.4.2" dependencies = [ + "actix-files", + "actix-web", "actix-web-validator", "api", "approx", "arc-swap", "async-trait", "atomicwrites", + "bitvec", "bytes", "cancel", "chrono", + "collection", "common", "criterion", "env_logger", "fnv", + "fs4", "fs_extra", "futures", "hashring", @@ -1072,6 +1081,7 @@ dependencies = [ "lazy_static", "log", "merge", + "object_store", "ordered-float 4.2.0", "parking_lot", "pprof", @@ -1087,6 +1097,7 @@ dependencies = [ "serde_cbor", "serde_json", "sha2", + "smallvec", "sparse", "strum", "tar", @@ -1264,6 +1275,16 @@ dependencies = [ ] [[package]] +name = "core-foundation" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] name = "core-foundation-sys" version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1520,6 +1541,16 @@ dependencies = [ ] [[package]] +name = "dataset" +version = "0.0.0" +dependencies = [ + "anyhow", + "flate2", + "indicatif", + "reqwest", +] + +[[package]] name = "debugid" version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1568,6 +1599,12 @@ dependencies = [ ] [[package]] +name = "doc-comment" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" + +[[package]] name = "docopt" version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1785,9 +1822,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flate2" -version = "1.0.28" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" dependencies = [ "crc32fast", "miniz_oxide 0.7.1", @@ -1843,9 +1880,9 @@ dependencies = [ [[package]] name = "fs4" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21dabded2e32cd57ded879041205c60a4a4c4bab47bd0fd2fa8b01f30849f02b" +checksum = "73969b81e8bc90a3828d913dd3973d80771bfb9d7fbe1a78a79122aad456af15" dependencies = [ "rustix 0.38.31", "windows-sys 0.52.0", @@ -2163,6 +2200,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" [[package]] +name = "half" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888" +dependencies = [ + "cfg-if", + "crunchy", + "num-traits", + "serde", +] + +[[package]] name = "hash32" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2195,9 +2244,9 @@ dependencies = [ [[package]] name = "hashring" -version = "0.3.3" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa283406d74fcfeb4778f4e300beaae30db96793371da168d003cbc833e149e0" +checksum = "a2e670d8fa425ec0d91dae7d6ab4a32721e775060a5d2d7cd572a9f0736dfddc" dependencies = [ "siphasher", ] @@ -2551,7 +2600,7 @@ dependencies = [ "log", "num-format", "once_cell", - "quick-xml", + "quick-xml 0.26.0", "rgb", "str_stack", ] @@ -2586,6 +2635,7 @@ version = "0.0.0" dependencies = [ "atomicwrites", "bincode", + "semver", "serde", "serde_json", "thiserror", @@ -2604,9 +2654,9 @@ dependencies = [ [[package]] name = "io-uring" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9febecd4aebbe9c7c23c8e536e966805fdf09944c8a915e7991ee51acb67087" +checksum = "595a0399f411a508feb2ec1e970a4a30c249351e30208960d58298de8660b0e5" dependencies = [ "bitflags 1.3.2", "libc", @@ -2655,7 +2705,6 @@ dependencies = [ "dashmap", "http 1.0.0", "http-serde", - "log", "schemars", "serde", "serde_json", @@ -2703,9 +2752,9 @@ dependencies = [ [[package]] name = "jobserver" -version = "0.1.25" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "068b1ee6743e4d11fb9c6a1e6064b3693a1b600e7f5f5988047d98b3dc9fb90b" +checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" dependencies = [ "libc", ] @@ -3131,6 +3180,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b87248edafb776e59e6ee64a79086f65890d3510f2c656c000bf2a7e8a0aea40" [[package]] +name = "md-5" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" +dependencies = [ + "cfg-if", + "digest", +] + +[[package]] name = "memchr" version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3367,9 +3426,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.18" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", "libm", @@ -3401,6 +3460,36 @@ dependencies = [ ] [[package]] +name = "object_store" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbebfd32c213ba1907fa7a9c9138015a8de2b43e30c5aa45b18f7deb46786ad6" +dependencies = [ + "async-trait", + "base64 0.22.0", + "bytes", + "chrono", + "futures", + "humantime", + "hyper 1.2.0", + "itertools 0.12.1", + "md-5", + "parking_lot", + "percent-encoding", + "quick-xml 0.31.0", + "rand 0.8.5", + "reqwest", + "ring 0.17.5", + "serde", + "serde_json", + "snafu", + "tokio", + "tracing", + "url", + "walkdir", +] + +[[package]] name = "once_cell" version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3413,6 +3502,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" [[package]] +name = "openssl-probe" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" + +[[package]] name = "ordered-float" version = "2.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3448,9 +3543,9 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] name = "parking_lot" -version = "0.12.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" dependencies = [ "lock_api", "parking_lot_core", @@ -3752,9 +3847,9 @@ dependencies = [ [[package]] name = "prettyplease" -version = "0.2.4" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ceca8aaf45b5c46ec7ed39fff75f57290368c1846d33d24a122ca81416ab058" +checksum = "8d3928fb5db768cb86f891ff014f0144589297e3c6a1aba6ed7cecfdace270c7" dependencies = [ "proc-macro2", "syn 2.0.48", @@ -3818,9 +3913,9 @@ dependencies = [ [[package]] name = "prometheus" -version = "0.13.3" +version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "449811d15fbdf5ceb5c1144416066429cf82316e2ec8ce0c1f6f8a02e7bbcf8c" +checksum = "3d33c28a30771f7f96db69893f78b857f7450d7e0237e9c8fc6427a81bae7ed1" dependencies = [ "cfg-if", "fnv", @@ -3907,7 +4002,7 @@ dependencies = [ "multimap", "once_cell", "petgraph", - "prettyplease 0.2.4", + "prettyplease 0.2.17", "prost 0.12.3", "prost-types 0.12.3", "regex", @@ -4047,7 +4142,7 @@ dependencies = [ [[package]] name = "qdrant" -version = "1.9.0" +version = "1.9.4" dependencies = [ "actix-cors", "actix-files", @@ -4081,7 +4176,7 @@ dependencies = [ "rand 0.8.5", "reqwest", "rstack-self", - "rustls 0.22.4", + "rustls 0.23.8", "rustls-pemfile 2.1.2", "rustls-pki-types", "rusty-hook", @@ -4096,7 +4191,6 @@ dependencies = [ "slog-stdlog", "storage", "sys-info", - "tar", "tempfile", "thiserror", "tikv-jemallocator", @@ -4143,6 +4237,16 @@ dependencies = [ ] [[package]] +name = "quick-xml" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" +dependencies = [ + "memchr", + "serde", +] + +[[package]] name = "quote" version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4333,6 +4437,12 @@ dependencies = [ ] [[package]] +name = "regex-lite" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30b661b2f27137bdbc16f00eda72866a92bb28af1753ffbd56744fb6e2e9cd8e" + +[[package]] name = "regex-syntax" version = "0.6.28" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4358,9 +4468,9 @@ checksum = "4bf2521270932c3c7bed1a59151222bd7643c79310f2916f01925e1e16255698" [[package]] name = "reqwest" -version = "0.12.3" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e6cc1e89e689536eb5aeede61520e874df5a4707df811cd5da4aa5fbb2aae19" +checksum = "566cafdd92868e0939d3fb961bd0dc25fcfaaed179291093b3d43e6b3150ea10" dependencies = [ "base64 0.22.0", "bytes", @@ -4382,6 +4492,7 @@ dependencies = [ "percent-encoding", "pin-project-lite", "rustls 0.22.4", + "rustls-native-certs", "rustls-pemfile 2.1.2", "rustls-pki-types", "serde", @@ -4447,9 +4558,9 @@ checksum = "3df6368f71f205ff9c33c076d170dd56ebf68e8161c733c0caa07a7a5509ed53" [[package]] name = "rmp" -version = "0.8.11" +version = "0.8.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44519172358fd6d58656c86ab8e7fbc9e1490c3e8f14d35ed78ca0dd07403c9f" +checksum = "228ed7c16fa39782c3b3468e974aec2795e9089153cd08ee2e9aefb3613334c4" dependencies = [ "byteorder", "num-traits", @@ -4458,9 +4569,9 @@ dependencies = [ [[package]] name = "rmp-serde" -version = "1.1.2" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bffea85eea980d8a74453e5d02a8d93028f3c34725de143085a844ebe953258a" +checksum = "52e599a477cf9840e92f2cde9a7189e67b42c57532749bf90aea6ec10facd4db" dependencies = [ "byteorder", "rmp", @@ -4641,12 +4752,40 @@ dependencies = [ "log", "ring 0.17.5", "rustls-pki-types", - "rustls-webpki 0.102.2", + "rustls-webpki 0.102.4", + "subtle", + "zeroize", +] + +[[package]] +name = "rustls" +version = "0.23.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79adb16721f56eb2d843e67676896a61ce7a0fa622dc18d3e372477a029d2740" +dependencies = [ + "log", + "once_cell", + "ring 0.17.5", + "rustls-pki-types", + "rustls-webpki 0.102.4", "subtle", "zeroize", ] [[package]] +name = "rustls-native-certs" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f1fb85efa936c42c6d5fc28d2629bb51e4b2f4b8a5211e297d599cc5a093792" +dependencies = [ + "openssl-probe", + "rustls-pemfile 2.1.2", + "rustls-pki-types", + "schannel", + "security-framework", +] + +[[package]] name = "rustls-pemfile" version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4667,9 +4806,9 @@ dependencies = [ [[package]] name = "rustls-pki-types" -version = "1.4.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecd36cc4259e3e4514335c4a138c6b43171a8d61d8f5c9348f9fc7529416f247" +checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d" [[package]] name = "rustls-webpki" @@ -4683,9 +4822,9 @@ dependencies = [ [[package]] name = "rustls-webpki" -version = "0.102.2" +version = "0.102.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "faaa0a62740bedb9b2ef5afa303da42764c012f743917351dc9a237ea1663610" +checksum = "ff448f7e92e913c4b7d4c6d8e4540a1724b319b4152b8aef6d4cf8339712b33e" dependencies = [ "ring 0.17.5", "rustls-pki-types", @@ -4750,10 +4889,28 @@ dependencies = [ ] [[package]] +name = "scc" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec96560eea317a9cc4e0bb1f6a2c93c09a19b8c4fc5cb3fcc0ec1c094cd783e2" +dependencies = [ + "sdd", +] + +[[package]] +name = "schannel" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] name = "schemars" -version = "0.8.16" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45a28f4c49489add4ce10783f7911893516f15afe45d015608d41faca6bc4d29" +checksum = "b0218ceea14babe24a4a5836f86ade86c1effbc198164e619194cb5069187e29" dependencies = [ "chrono", "dyn-clone", @@ -4768,14 +4925,14 @@ dependencies = [ [[package]] name = "schemars_derive" -version = "0.8.16" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c767fd6fa65d9ccf9cf026122c1b555f2ef9a4f0cea69da4d7dbc3e258d30967" +checksum = "3ed5a1ccce8ff962e31a165d41f6e2a2dd1245099dc4d594f5574a86cd90f4d3" dependencies = [ "proc-macro2", "quote", "serde_derive_internals", - "syn 1.0.107", + "syn 2.0.48", ] [[package]] @@ -4807,6 +4964,12 @@ dependencies = [ ] [[package]] +name = "sdd" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b84345e4c9bd703274a082fb80caaa99b7612be48dfaa1dd9266577ec412309d" + +[[package]] name = "seahash" version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4835,6 +4998,29 @@ dependencies = [ ] [[package]] +name = "security-framework" +version = "2.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "770452e37cad93e0a50d5abc3990d2bc351c36d0328f86cefec2f2fb206eaef6" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] name = "segment" version = "0.6.0" dependencies = [ @@ -4844,20 +5030,26 @@ dependencies = [ "bincode", "bitpacking", "bitvec", + "cc", "cgroups-rs", "charabia", "chrono", "common", "criterion", + "dataset", "fnv", "fs_extra", "generic-tests", "geo", "geohash", + "half 2.4.1", + "http 1.0.0", "indexmap 2.2.6", + "indicatif", "io", "io-uring", "is_sorted", + "issues", "itertools 0.12.1", "log", "macro_rules_attribute", @@ -4881,14 +5073,16 @@ dependencies = [ "rstest", "schemars", "seahash", - "semver", + "segment", "serde", + "serde-untagged", "serde-value", "serde_cbor", "serde_json", "smallvec", "smol_str", "sparse", + "strum", "sysinfo", "tar", "tempfile", @@ -4902,23 +5096,34 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.22" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" dependencies = [ "serde", ] [[package]] name = "serde" -version = "1.0.197" +version = "1.0.202" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" +checksum = "226b61a0d411b2ba5ff6d7f73a476ac4f8bb900373459cd00fab8512828ba395" dependencies = [ "serde_derive", ] [[package]] +name = "serde-untagged" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2676ba99bd82f75cae5cbd2c8eda6fa0b8760f18978ea840e980dd5567b5c5b6" +dependencies = [ + "erased-serde", + "serde", + "typeid", +] + +[[package]] name = "serde-value" version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4934,15 +5139,15 @@ version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2bef2ebfde456fb76bbcf9f59315333decc4fda0b2b44b420243c11e0f5ec1f5" dependencies = [ - "half", + "half 1.8.2", "serde", ] [[package]] name = "serde_derive" -version = "1.0.197" +version = "1.0.202" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" +checksum = "6048858004bcff69094cd972ed40a32500f153bd3be9f716b2eed2e8217c4838" dependencies = [ "proc-macro2", "quote", @@ -4951,20 +5156,20 @@ dependencies = [ [[package]] name = "serde_derive_internals" -version = "0.26.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85bf8229e7920a9f636479437026331ce11aa132b4dde37d121944a44d6e5f3c" +checksum = "330f01ce65a3a5fe59a60c82f3c9a024b573b8a6e875bd233fe5f934e71d54e3" dependencies = [ "proc-macro2", "quote", - "syn 1.0.107", + "syn 2.0.48", ] [[package]] name = "serde_json" -version = "1.0.115" +version = "1.0.117" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd" +checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" dependencies = [ "itoa", "ryu", @@ -5016,21 +5221,21 @@ dependencies = [ [[package]] name = "serial_test" -version = "3.0.0" +version = "3.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "953ad9342b3aaca7cb43c45c097dd008d4907070394bd0751a0aa8817e5a018d" +checksum = "4b4b487fe2acf240a021cf57c6b2b4903b1e78ca0ecd862a71b71d2a51fed77d" dependencies = [ - "dashmap", - "lazy_static", + "once_cell", "parking_lot", + "scc", "serial_test_derive", ] [[package]] name = "serial_test_derive" -version = "3.0.0" +version = "3.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b93fb4adc70021ac1b47f7d45e8cc4169baaa7ea58483bc5b721d19a26202212" +checksum = "82fe9db325bcef1fbcde82e078a5cc4efdf787e96b3b9cf45b50b529f2083d67" dependencies = [ "proc-macro2", "quote", @@ -5152,14 +5357,36 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "smol_str" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6845563ada680337a52d43bb0b29f396f2d911616f6573012645b9e3d048a49" +checksum = "dd538fb6910ac1099850255cf94a94df6551fbdd602454387d0adb2d1ca6dead" dependencies = [ "serde", ] [[package]] +name = "snafu" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4de37ad025c587a29e8f3f5605c00f70b98715ef90b9061a815b9e59e9042d6" +dependencies = [ + "doc-comment", + "snafu-derive", +] + +[[package]] +name = "snafu-derive" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "990079665f075b699031e9c08fd3ab99be5029b96f3b78dc0709e8f77e4efebf" +dependencies = [ + "heck 0.4.1", + "proc-macro2", + "quote", + "syn 1.0.107", +] + +[[package]] name = "socket2" version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5195,16 +5422,24 @@ dependencies = [ name = "sparse" version = "0.1.0" dependencies = [ + "bitpacking", "common", + "criterion", + "dataset", + "indicatif", "io", "itertools 0.12.1", + "log", "memmap2 0.9.4", "memory", "ordered-float 4.2.0", "parking_lot", + "pprof", "rand 0.8.5", "schemars", "serde", + "serde_json", + "sparse", "tempfile", "validator", ] @@ -5249,6 +5484,7 @@ dependencies = [ "futures", "http 0.2.9", "io", + "issues", "itertools 0.12.1", "log", "memory", @@ -5386,9 +5622,9 @@ dependencies = [ [[package]] name = "sysinfo" -version = "0.30.10" +version = "0.30.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d7c217777061d5a2d652aea771fb9ba98b6dade657204b08c4b9604d11555b" +checksum = "732ffa00f53e6b2af46208fba5718d9662a421049204e156328b66791ffa15ae" dependencies = [ "cfg-if", "core-foundation-sys", @@ -5449,18 +5685,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.58" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" +checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.58" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" +checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" dependencies = [ "proc-macro2", "quote", @@ -5480,9 +5716,9 @@ dependencies = [ [[package]] name = "thread-priority" -version = "0.16.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a617e9eeeb20448b01a8e2427fb80dfbc9c49d79a1de3b11f25731edbf547e3c" +checksum = "0d3b04d33c9633b8662b167b847c7ab521f83d1ae20f2321b65b5b925e532e36" dependencies = [ "bitflags 2.4.1", "cfg-if", @@ -5647,6 +5883,17 @@ dependencies = [ ] [[package]] +name = "tokio-rustls" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" +dependencies = [ + "rustls 0.23.8", + "rustls-pki-types", + "tokio", +] + +[[package]] name = "tokio-stream" version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5659,16 +5906,15 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.10" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" +checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" dependencies = [ "bytes", "futures-core", "futures-sink", "pin-project-lite", "tokio", - "tracing", ] [[package]] @@ -5751,7 +5997,7 @@ version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d021fc044c18582b9a2408cd0dd05b1596e3ecdb5c4df822bb0183545683889" dependencies = [ - "prettyplease 0.2.4", + "prettyplease 0.2.17", "proc-macro2", "prost-build 0.12.3", "quote", @@ -5904,6 +6150,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" [[package]] +name = "typeid" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "059d83cc991e7a42fc37bd50941885db0888e34209f8cfd9aab07ddec03bc9cf" + +[[package]] name = "typenum" version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6031,7 +6283,7 @@ dependencies = [ "once_cell", "rustls 0.22.4", "rustls-pki-types", - "rustls-webpki 0.102.2", + "rustls-webpki 0.102.4", "url", "webpki-roots", ] @@ -6154,7 +6406,7 @@ dependencies = [ "memmap2 0.9.4", "rand 0.8.5", "rand_distr", - "rustix 0.37.27", + "rustix 0.38.31", "serde", ] diff --git a/pkgs/servers/search/qdrant/default.nix b/pkgs/servers/search/qdrant/default.nix index 8a9ec8e3a4591..79c541145bd2e 100644 --- a/pkgs/servers/search/qdrant/default.nix +++ b/pkgs/servers/search/qdrant/default.nix @@ -13,13 +13,13 @@ rustPlatform.buildRustPackage rec { pname = "qdrant"; - version = "1.9.0"; + version = "1.9.4"; src = fetchFromGitHub { owner = "qdrant"; repo = "qdrant"; rev = "refs/tags/v${version}"; - sha256 = "sha256-SirqQW/OxFvsyra80znSDakHwFjHk2YkpAaNwXnbK60="; + sha256 = "sha256-jpZJtnQx8r9j12GObXxcpzH0i1rJe46qYodLhWlWLMY="; }; cargoLock = { diff --git a/pkgs/servers/sql/mysql/jdbc/default.nix b/pkgs/servers/sql/mysql/jdbc/default.nix index cdc1ad095919e..b7add5c5b09a5 100644 --- a/pkgs/servers/sql/mysql/jdbc/default.nix +++ b/pkgs/servers/sql/mysql/jdbc/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mysql-connector-java"; - version = "8.3.0"; + version = "8.4.0"; src = fetchurl { url = "https://dev.mysql.com/get/Downloads/Connector-J/mysql-connector-j-${version}.zip"; - hash = "sha256-w2xddRQMjSTEprB9pmK8zKskGtthNuUd9YBPaMym7WE="; + hash = "sha256-iavSaf1BCqoFjWUPpwo/NvbbFiXTktXqZc7TRcUtaeU="; }; installPhase = '' diff --git a/pkgs/servers/sqlpage/default.nix b/pkgs/servers/sqlpage/default.nix index d68ad9ddcace3..2f635e30182ea 100644 --- a/pkgs/servers/sqlpage/default.nix +++ b/pkgs/servers/sqlpage/default.nix @@ -11,8 +11,8 @@ let apexcharts = fetchurl { - url = "https://cdn.jsdelivr.net/npm/apexcharts@3.43.2-0/dist/apexcharts.min.js"; - sha256 = "sha256-7al9VaQHu7u5jfx1HZf+T8k27kbIhgHvRwaeIeYEjVI="; + url = "https://cdn.jsdelivr.net/npm/apexcharts@3.47.0/dist/apexcharts.min.js"; + sha256 = "sha256-StFDdV+DR9yItbCXAGTK6EUcu613N3vM0i5ngrYZlz4="; }; tablerCss = fetchurl { url = "https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0-beta20/dist/css/tabler.min.css"; @@ -31,25 +31,25 @@ let sha256 = "sha256-sYy7qNJW7RTuaNA0jq6Yrtfs57ypYrItZ3f8T7kqfPM="; }; tablerIcons = fetchurl { - url = "https://cdn.jsdelivr.net/npm/@tabler/icons@2.39.0/tabler-sprite.svg"; - sha256 = "sha256-8C9PPhDyVnym0q/RkQlTyfjKbAMRsYBlRtsMbNAepvY="; + url = "https://cdn.jsdelivr.net/npm/@tabler/icons@2.47.0/tabler-sprite.svg"; + sha256 = "sha256-dphCRqfQZmC7finy/HU9QnJQESwgWoUxRHkz7On877I="; }; in rustPlatform.buildRustPackage rec { pname = "sqlpage"; - version = "0.15.1"; + version = "0.20.0"; src = fetchFromGitHub { owner = "lovasoa"; repo = "SQLpage"; rev = "v${version}"; - hash = "sha256-0CPWMVdX0HGPMfIiDfC6TJ2t07O6eZcS7yEDVAvjLUc="; + sha256 = "sha256-zmAnlsYL36qqO2cLSVdsnUG47xHslOvDzcGICNxG/5c="; }; postPatch = '' substituteInPlace sqlpage/apexcharts.js \ - --replace '/* !include https://cdn.jsdelivr.net/npm/apexcharts@3.43.2-0/dist/apexcharts.min.js */' \ + --replace '/* !include https://cdn.jsdelivr.net/npm/apexcharts@3.47.0/dist/apexcharts.min.js */' \ "$(cat ${apexcharts})" substituteInPlace sqlpage/sqlpage.css \ --replace '/* !include https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0-beta20/dist/css/tabler.min.css */' \ @@ -64,11 +64,11 @@ rustPlatform.buildRustPackage rec { --replace '/* !include https://cdn.jsdelivr.net/npm/list.js-fixed@2.3.4/dist/list.min.js */' \ "$(cat ${listJsFixed})" substituteInPlace sqlpage/tabler-icons.svg \ - --replace '/* !include https://cdn.jsdelivr.net/npm/@tabler/icons@2.39.0/tabler-sprite.svg */' \ + --replace '/* !include https://cdn.jsdelivr.net/npm/@tabler/icons@2.47.0/tabler-sprite.svg */' \ "$(cat ${tablerIcons})" ''; - cargoHash = "sha256-ooK4eIaPbUsxgDuVJkWHlArMa81TtlRfR6YYEAh7cLY="; + cargoHash = "sha256-dPqO+yychyOybdTvdhWkcXyDlxIXO39KUZ80v+7Syqg="; nativeBuildInputs = [ pkg-config 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/shells/carapace/default.nix b/pkgs/shells/carapace/default.nix index 9f9c963c73c15..12c88764e5542 100644 --- a/pkgs/shells/carapace/default.nix +++ b/pkgs/shells/carapace/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "carapace"; - version = "1.0.2"; + version = "1.0.3"; src = fetchFromGitHub { owner = "rsteube"; repo = "${pname}-bin"; rev = "v${version}"; - hash = "sha256-mwn7oJjVlZli4vhTGui6HCxnjL3Qz8ygejaqvdbZ6co="; + hash = "sha256-nmih6kyVaYLVOG+EEaCUYkVRAXPXXUdPchv6JFzlU+U="; }; - vendorHash = "sha256-HWczvkItE9SVGGQkddnb7/PBkTWrDAdKHjMOztlYV9M="; + vendorHash = "sha256-QG+50wqYYpASzFv8Y3rpuyahW/lTV8Kz+v3rDt1kAN4="; ldflags = [ "-s" diff --git a/pkgs/shells/nushell/plugins/formats.nix b/pkgs/shells/nushell/plugins/formats.nix index 7cca0840f47af..b108c633840e0 100644 --- a/pkgs/shells/nushell/plugins/formats.nix +++ b/pkgs/shells/nushell/plugins/formats.nix @@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec { description = "A formats plugin for Nushell"; mainProgram = "nu_plugin_formats"; homepage = "https://github.com/nushell/nushell/tree/${version}/crates/nu_plugin_formats"; - license = licenses.mpl20; + license = licenses.mit; maintainers = with maintainers; [ viraptor aidalgol ]; platforms = with platforms; all; }; diff --git a/pkgs/shells/nushell/plugins/gstat.nix b/pkgs/shells/nushell/plugins/gstat.nix index b05a000d57852..32b93ba76535e 100644 --- a/pkgs/shells/nushell/plugins/gstat.nix +++ b/pkgs/shells/nushell/plugins/gstat.nix @@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec { description = "A git status plugin for Nushell"; mainProgram = "nu_plugin_gstat"; homepage = "https://github.com/nushell/nushell/tree/${version}/crates/nu_plugin_gstat"; - license = licenses.mpl20; + license = licenses.mit; maintainers = with maintainers; [ mrkkrp aidalgol ]; platforms = with platforms; all; }; diff --git a/pkgs/shells/nushell/plugins/query.nix b/pkgs/shells/nushell/plugins/query.nix index b20af7bbd3b8f..b6792d42ceab7 100644 --- a/pkgs/shells/nushell/plugins/query.nix +++ b/pkgs/shells/nushell/plugins/query.nix @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage { description = "A Nushell plugin to query JSON, XML, and various web data"; mainProgram = "nu_plugin_query"; homepage = "https://github.com/nushell/nushell/tree/${version}/crates/nu_plugin_query"; - license = licenses.mpl20; + license = licenses.mit; maintainers = with maintainers; [ happysalada aidalgol ]; platforms = with platforms; all; }; diff --git a/pkgs/test/check-by-name/README.md b/pkgs/test/check-by-name/README.md index c68e7a93b7d0e..140f5951ca335 100644 --- a/pkgs/test/check-by-name/README.md +++ b/pkgs/test/check-by-name/README.md @@ -13,7 +13,7 @@ In turn when running locally, we don't want to have to push commits to test them and we can also rely on the local Git history to do the mergeability check. Arguments: -- `BASE_BRANCH`: The base branch to use, e.g. master or release-23.11 +- `BASE_BRANCH`: The base branch to use, e.g. master or release-24.05 - `REPOSITORY`: The repository to fetch the base branch from, defaults to https://github.com/NixOS/nixpkgs.git ## `./update-pinned-tool.sh` 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/admin/awscli2/default.nix b/pkgs/tools/admin/awscli2/default.nix index cb76180fa7ab8..44818869dc827 100644 --- a/pkgs/tools/admin/awscli2/default.nix +++ b/pkgs/tools/admin/awscli2/default.nix @@ -59,14 +59,14 @@ let in with py.pkgs; buildPythonApplication rec { pname = "awscli2"; - version = "2.15.43"; # N.B: if you change this, check if overrides are still up-to-date + version = "2.15.62"; # N.B: if you change this, check if overrides are still up-to-date pyproject = true; src = fetchFromGitHub { owner = "aws"; repo = "aws-cli"; rev = "refs/tags/${version}"; - hash = "sha256-L+1+4QXDya8wwjexPB0fwx6/nRDPDrMYaaYeRm2SEU8="; + hash = "sha256-hhjxhdrU4FFJWNcq4JiKpSSDr6YxKbUDGIuBoixryWU="; }; postPatch = '' diff --git a/pkgs/tools/admin/lego/default.nix b/pkgs/tools/admin/lego/default.nix index dc35c0b563db7..fc4ed942e9799 100644 --- a/pkgs/tools/admin/lego/default.nix +++ b/pkgs/tools/admin/lego/default.nix @@ -2,23 +2,23 @@ buildGoModule rec { pname = "lego"; - version = "4.16.1"; + version = "4.17.3"; src = fetchFromGitHub { owner = "go-acme"; repo = pname; rev = "v${version}"; - sha256 = "sha256-BGD0fVLTlM0BlYK/XK11W0OV8sDO4SVfXEKHEFdqOzs="; + sha256 = "sha256-IfgZd8dXSJU4WlW6i2EUP5DJcfaCNFT6STlCdLD+7nI="; }; - vendorHash = "sha256-jiVtgzNWj91J/YSBOrhXZH2WmVqA2gxjIfytCGYG25A="; + vendorHash = "sha256-0QL/+Oaulk2PUAKTUZaYzZ7wLjrTgh2m2WoJM3QxvXw="; doCheck = false; subPackages = [ "cmd/lego" ]; ldflags = [ - "-X main.version=${version}" + "-s" "-w" "-X main.version=${version}" ]; meta = with lib; { 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/audio/kaldi/default.nix b/pkgs/tools/audio/kaldi/default.nix index 689cea017ab35..7bc50da5c4cd9 100644 --- a/pkgs/tools/audio/kaldi/default.nix +++ b/pkgs/tools/audio/kaldi/default.nix @@ -19,13 +19,13 @@ assert blas.implementation == "openblas" && lapack.implementation == "openblas"; stdenv.mkDerivation (finalAttrs: { pname = "kaldi"; - version = "0-unstable-2024-01-31"; + version = "0-unstable-2024-04-30"; src = fetchFromGitHub { owner = "kaldi-asr"; repo = "kaldi"; - rev = "8c451e28582f5d91f84ea3d64bb76c794c3b1683"; - sha256 = "sha256-iW/2gDZ/ib0M+bfWtZ9XuMWXMwTGoKCRLVl2lHLNh6c="; + rev = "51744d32acc9b19457f9aaed09c83f218f4b5de4"; + sha256 = "sha256-StONwrzu3i+OCTQ7IAB6slM2cPGZVfCoVqa5gPnREc4="; }; cmakeFlags = [ 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/filesystems/httm/Cargo.lock b/pkgs/tools/filesystems/httm/Cargo.lock index dd039c32b0d81..571ac1756d506 100644 --- a/pkgs/tools/filesystems/httm/Cargo.lock +++ b/pkgs/tools/filesystems/httm/Cargo.lock @@ -4,47 +4,87 @@ version = 3 [[package]] name = "ahash" -version = "0.8.3" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" +checksum = "e8fd72866655d1904d6b0997d0b07ba561047d070fbe29de039031c641b61217" + +[[package]] +name = "ahash" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ "cfg-if", "once_cell", "version_check", + "zerocopy", ] [[package]] name = "aho-corasick" -version = "0.7.20" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" +checksum = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04" dependencies = [ "memchr", ] [[package]] -name = "android_system_properties" -version = "0.1.5" +name = "ansi_term" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" dependencies = [ - "libc", + "winapi", ] [[package]] -name = "ansi_term" -version = "0.12.1" +name = "anstream" +version = "0.6.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" +checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb" dependencies = [ - "winapi", + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "utf8parse", ] [[package]] -name = "arrayvec" -version = "0.7.2" +name = "anstyle" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" +checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" + +[[package]] +name = "anstyle-parse" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "anstyle-wincon" +version = "3.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" +dependencies = [ + "anstyle", + "windows-sys 0.52.0", +] [[package]] name = "atty" @@ -64,28 +104,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] -name = "beef" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a8241f3ebb85c056b509d4327ad0358fbbba6ffb340bf388f26350aeda225b1" - -[[package]] name = "bitflags" version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] -name = "bumpalo" -version = "3.11.1" +name = "bitflags" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba" +checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" [[package]] -name = "cc" -version = "1.0.77" +name = "blake2" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9f73505338f7d905b19d18738976aae232eb46b8efc15554ffc56deb5d9ebe4" +checksum = "0a4e37d16930f5459780f5621038b6382b9bb37c19016f39fb6b5808d831f174" +dependencies = [ + "crypto-mac", + "digest", + "opaque-debug", +] [[package]] name = "cfg-if" @@ -94,103 +133,87 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] -name = "chrono" -version = "0.4.23" +name = "cfg_aliases" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f" -dependencies = [ - "iana-time-zone", - "js-sys", - "num-integer", - "num-traits", - "time 0.1.45", - "wasm-bindgen", - "winapi", -] +checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" [[package]] name = "clap" -version = "3.2.23" +version = "2.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71655c45cb9845d3270c9d6df84ebe72b4dad3c2ba3f7023ad47c144e4e473a5" +checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" dependencies = [ + "ansi_term", "atty", - "bitflags", - "clap_lex", - "indexmap", - "once_cell", - "strsim", - "termcolor", + "bitflags 1.3.2", + "strsim 0.8.0", "textwrap", + "unicode-width", + "vec_map", + "yaml-rust", ] [[package]] -name = "clap_lex" -version = "0.2.4" +name = "clap" +version = "4.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" +checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0" dependencies = [ - "os_str_bytes", + "clap_builder", ] [[package]] -name = "codespan-reporting" -version = "0.11.1" +name = "clap_builder" +version = "4.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" +checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" dependencies = [ - "termcolor", - "unicode-width", + "anstream", + "anstyle", + "clap_lex", + "strsim 0.11.1", ] [[package]] -name = "console" -version = "0.15.2" +name = "clap_lex" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c050367d967ced717c04b65d8c619d863ef9292ce0c5760028655a2fb298718c" -dependencies = [ - "encode_unicode", - "lazy_static", - "libc", - "terminal_size 0.1.17", - "winapi", -] +checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" [[package]] -name = "core-foundation-sys" -version = "0.8.3" +name = "colorchoice" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" [[package]] -name = "crossbeam" -version = "0.8.2" +name = "console" +version = "0.15.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2801af0d36612ae591caa9568261fddce32ce6e08a7275ea334a06a4ad021a2c" +checksum = "c3d79fbe8970a77e3e34151cc13d3b3e248aa0faaecb9f6091fa07ebefe5ad60" dependencies = [ - "cfg-if", - "crossbeam-channel", - "crossbeam-deque", - "crossbeam-epoch", - "crossbeam-queue", - "crossbeam-utils", + "encode_unicode", + "lazy_static", + "libc", + "unicode-width", + "windows-sys 0.42.0", ] [[package]] name = "crossbeam-channel" -version = "0.5.6" +version = "0.5.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521" +checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95" dependencies = [ - "cfg-if", "crossbeam-utils", ] [[package]] name = "crossbeam-deque" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "715e8152b692bba2d374b53d4875445368fdf21a94751410af607a5ac677d1fc" +checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" dependencies = [ "cfg-if", "crossbeam-epoch", @@ -199,85 +222,38 @@ dependencies = [ [[package]] name = "crossbeam-epoch" -version = "0.9.13" +version = "0.9.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01a9af1f4c2ef74bb8aa1f7e19706bc72d03598c8a570bb5de72243c7a9d9d5a" +checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695" dependencies = [ "autocfg", "cfg-if", "crossbeam-utils", - "memoffset 0.7.1", + "memoffset", "scopeguard", ] [[package]] -name = "crossbeam-queue" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1cfb3ea8a53f37c40dea2c7bedcbd88bdfae54f5e2175d6ecaff1c988353add" -dependencies = [ - "cfg-if", - "crossbeam-utils", -] - -[[package]] name = "crossbeam-utils" -version = "0.8.14" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb766fa798726286dbbb842f174001dab8abc7b627a1dd86e0b7222a95d929f" -dependencies = [ - "cfg-if", -] +checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" [[package]] -name = "cxx" -version = "1.0.83" +name = "crypto-mac" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdf07d07d6531bfcdbe9b8b739b104610c6508dcc4d63b410585faf338241daf" +checksum = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab" dependencies = [ - "cc", - "cxxbridge-flags", - "cxxbridge-macro", - "link-cplusplus", -] - -[[package]] -name = "cxx-build" -version = "1.0.83" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2eb5b96ecdc99f72657332953d4d9c50135af1bac34277801cc3937906ebd39" -dependencies = [ - "cc", - "codespan-reporting", - "once_cell", - "proc-macro2", - "quote", - "scratch", - "syn", -] - -[[package]] -name = "cxxbridge-flags" -version = "1.0.83" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac040a39517fd1674e0f32177648334b0f4074625b5588a64519804ba0553b12" - -[[package]] -name = "cxxbridge-macro" -version = "1.0.83" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1362b0ddcfc4eb0a1f57b68bd77dd99f0e826958a96abd0ae9bd092e114ffed6" -dependencies = [ - "proc-macro2", - "quote", - "syn", + "generic-array", + "subtle", ] [[package]] name = "darling" -version = "0.14.2" +version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0dd3cd20dc6b5a876612a6e5accfe7f3dd883db6d07acfbf14c128f61550dfa" +checksum = "54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391" dependencies = [ "darling_core", "darling_macro", @@ -285,68 +261,76 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.14.2" +version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a784d2ccaf7c98501746bf0be29b2022ba41fd62a2e622af997a03e9f972859f" +checksum = "9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", - "strsim", - "syn", + "strsim 0.10.0", + "syn 2.0.48", ] [[package]] name = "darling_macro" -version = "0.14.2" +version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7618812407e9402654622dd402b0a89dff9ba93badd6540781526117b92aab7e" +checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" dependencies = [ "darling_core", "quote", - "syn", + "syn 2.0.48", ] [[package]] -name = "defer-drop" -version = "1.3.0" +name = "deranged" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f613ec9fa66a6b28cdb1842b27f9adf24f39f9afc4dcdd9fdecee4aca7945c57" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" dependencies = [ - "crossbeam-channel", - "once_cell", + "powerfmt", ] [[package]] name = "derive_builder" -version = "0.11.2" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d07adf7be193b71cc36b193d0f5fe60b918a3a9db4dad0449f57bcfd519704a3" +checksum = "0350b5cb0331628a5916d6c5c0b72e97393b8b6b03b47a9284f4e7f5a405ffd7" dependencies = [ "derive_builder_macro", ] [[package]] name = "derive_builder_core" -version = "0.11.2" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f91d4cfa921f1c05904dc3c57b4a32c38aed3340cce209f3a6fd1478babafc4" +checksum = "d48cda787f839151732d396ac69e3473923d54312c070ee21e9effcaa8ca0b1d" dependencies = [ "darling", "proc-macro2", "quote", - "syn", + "syn 2.0.48", ] [[package]] name = "derive_builder_macro" -version = "0.11.2" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f0314b72bed045f3a68671b3c86328386762c93f82d98c65c3cb5e5f573dd68" +checksum = "206868b8242f27cecce124c19fd88157fbd0dd334df2587f36417bafbc85097b" dependencies = [ "derive_builder_core", - "syn", + "syn 2.0.48", +] + +[[package]] +name = "digest" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" +dependencies = [ + "generic-array", ] [[package]] @@ -372,9 +356,9 @@ dependencies = [ [[package]] name = "either" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" [[package]] name = "encode_unicode" @@ -383,33 +367,41 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" [[package]] -name = "errno" -version = "0.2.8" +name = "env_logger" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" +checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36" dependencies = [ - "errno-dragonfly", - "libc", - "winapi", + "atty", + "humantime", + "log", + "regex", + "termcolor", ] [[package]] -name = "errno-dragonfly" -version = "0.1.2" +name = "equivalent" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] +name = "errno" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" dependencies = [ - "cc", "libc", + "windows-sys 0.52.0", ] [[package]] name = "exacl" -version = "0.10.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cfeb22a59deb24c3262c43ffcafd1eb807180f371f9fcc99098d181b5d639be" +checksum = "22be12de19decddab85d09f251ec8363f060ccb22ec9c81bc157c0c8433946d8" dependencies = [ - "bitflags", + "bitflags 2.5.0", "log", "scopeguard", "uuid", @@ -422,38 +414,53 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] -name = "fuzzy-matcher" -version = "0.3.7" +name = "fuzzy-muff" +version = "0.3.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54614a3312934d066701a80f20f15fa3b56d67ac7722b39eea5b4c9dd1d66c94" +checksum = "d9b471332520d987f877cd86f529817c3c537b477199aa856e3b29012a4e37d2" dependencies = [ "thread_local", ] [[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] name = "getrandom" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" +checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4" dependencies = [ "cfg-if", "libc", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", ] [[package]] name = "hashbrown" -version = "0.12.3" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +checksum = "e91b62f79061a0bc2e046024cb7ba44b08419ed238ecbd9adbd787434b9e8c25" +dependencies = [ + "ahash 0.3.8", + "autocfg", + "rayon", +] [[package]] name = "hashbrown" -version = "0.13.1" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33ff8ae62cd3a9102e5637afc8452c55acf3844001bd5374e0b0bd7b6616c038" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" dependencies = [ - "ahash", + "ahash 0.8.11", "rayon", ] @@ -467,54 +474,51 @@ dependencies = [ ] [[package]] +name = "home" +version = "0.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] name = "httm" -version = "0.23.3" +version = "0.38.1" dependencies = [ - "ansi_term", - "chrono", - "clap", - "crossbeam", + "ahash 0.8.11", + "clap 4.5.4", + "crossbeam-channel", "exacl", - "hashbrown 0.13.1", - "indicatif", + "hashbrown 0.14.3", + "indicatif 0.17.8", + "itertools", + "libc", + "lms", "lscolors", - "nix 0.26.1", - "number_prefix", + "nix 0.28.0", + "nu-ansi-term", + "number_prefix 0.4.0", "once_cell", "proc-mounts", "rayon", + "realpath-ext", "serde", "serde_json", - "simd-adler32", - "skim", - "terminal_size 0.2.3", - "time 0.3.17", + "terminal_size", + "time", + "two_percent", "which", "xattr", ] [[package]] -name = "iana-time-zone" -version = "0.1.53" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765" -dependencies = [ - "android_system_properties", - "core-foundation-sys", - "iana-time-zone-haiku", - "js-sys", - "wasm-bindgen", - "winapi", -] - -[[package]] -name = "iana-time-zone-haiku" -version = "0.1.1" +name = "humantime" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca" +checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f" dependencies = [ - "cxx", - "cxx-build", + "quick-error", ] [[package]] @@ -525,51 +529,63 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" [[package]] name = "indexmap" -version = "1.9.2" +version = "2.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" +checksum = "233cf39063f058ea2caae4091bf4a3ef70a653afbc026f5c4a4135d114e3c177" dependencies = [ - "autocfg", - "hashbrown 0.12.3", + "equivalent", + "hashbrown 0.14.3", ] [[package]] name = "indicatif" -version = "0.17.2" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4295cbb7573c16d310e99e713cf9e75101eb190ab31fccd35f2d2691b4352b19" +checksum = "7baab56125e25686df467fe470785512329883aab42696d661247aca2a2896e4" dependencies = [ "console", - "number_prefix", - "portable-atomic", + "lazy_static", + "number_prefix 0.3.0", + "regex", ] [[package]] -name = "io-lifetimes" -version = "1.0.3" +name = "indicatif" +version = "0.17.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46112a93252b123d31a119a8d1a1ac19deac4fac6e0e8b0df58f0d4e5870e63c" +checksum = "763a5a8f45087d6bcea4222e7b72c291a054edf80e4ef6efd2a4979878c7bea3" dependencies = [ - "libc", - "windows-sys", + "console", + "instant", + "number_prefix 0.4.0", + "portable-atomic", ] [[package]] -name = "itoa" -version = "1.0.4" +name = "instant" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +dependencies = [ + "cfg-if", +] [[package]] -name = "js-sys" -version = "0.3.60" +name = "itertools" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" dependencies = [ - "wasm-bindgen", + "either", ] [[package]] +name = "itoa" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" + +[[package]] name = "lazy_static" version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -577,64 +593,60 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.138" +version = "0.2.153" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db6d7e329c562c5dfab7a46a2afabc8b987ab9a4834c9d1ca04dc54c1546cef8" +checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" [[package]] -name = "link-cplusplus" -version = "1.0.7" +name = "linux-raw-sys" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9272ab7b96c9046fbc5bc56c06c117cb639fe2d509df0c421cad82d2915cf369" -dependencies = [ - "cc", -] +checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" [[package]] -name = "linux-raw-sys" -version = "0.1.3" +name = "lms" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f9f08d8963a6c613f4b1a78f4f4a4dbfadf8e6545b2d72861731e4858b8b47f" +checksum = "164b6100e88b387adf64d289e247bebae8f77810566f58159f119d0be90ed958" +dependencies = [ + "bitflags 1.3.2", + "blake2", + "clap 2.34.0", + "env_logger", + "hashbrown 0.8.2", + "indicatif 0.15.0", + "lazy_static", + "log", + "rayon", + "seahash", +] [[package]] name = "log" -version = "0.4.17" +version = "0.4.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -dependencies = [ - "cfg-if", -] +checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" [[package]] name = "lscolors" -version = "0.13.0" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2dedc85d67baf5327114fad78ab9418f8893b1121c17d5538dd11005ad1ddf2" +checksum = "53304fff6ab1e597661eee37e42ea8c47a146fca280af902bb76bff8a896e523" dependencies = [ - "ansi_term", "nu-ansi-term", ] [[package]] name = "memchr" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" - -[[package]] -name = "memoffset" -version = "0.6.5" +version = "2.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" -dependencies = [ - "autocfg", -] +checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" [[package]] name = "memoffset" -version = "0.7.1" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" +checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" dependencies = [ "autocfg", ] @@ -645,77 +657,43 @@ version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cfg-if", "libc", ] [[package]] name = "nix" -version = "0.25.1" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f346ff70e7dbfd675fe90590b92d59ef2de15a8779ae305ebcbfd3f0caf59be4" +checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" dependencies = [ - "autocfg", - "bitflags", + "bitflags 2.5.0", "cfg-if", + "cfg_aliases", "libc", - "memoffset 0.6.5", - "pin-utils", ] [[package]] -name = "nix" -version = "0.26.1" +name = "nohash" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46a58d1d356c6597d08cde02c2f09d785b09e28711837b1ed667dc652c08a694" -dependencies = [ - "bitflags", - "cfg-if", - "libc", - "memoffset 0.7.1", - "pin-utils", - "static_assertions", -] +checksum = "a0f889fb66f7acdf83442c35775764b51fed3c606ab9cee51500dbde2cf528ca" [[package]] name = "nu-ansi-term" -version = "0.46.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" -dependencies = [ - "overload", - "winapi", -] - -[[package]] -name = "num-integer" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" -dependencies = [ - "autocfg", - "num-traits", -] - -[[package]] -name = "num-traits" -version = "0.2.15" +version = "0.50.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +checksum = "dd2800e1520bdc966782168a627aa5d1ad92e33b984bf7c7615d31280c83ff14" dependencies = [ - "autocfg", + "windows-sys 0.48.0", ] [[package]] -name = "num_cpus" -version = "1.14.0" +name = "num-conv" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6058e64324c71e02bc2b150e4f3bc8286db6c83092132ffa3f6b1eab0f9def5" -dependencies = [ - "hermit-abi", - "libc", -] +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" [[package]] name = "num_threads" @@ -728,27 +706,27 @@ dependencies = [ [[package]] name = "number_prefix" -version = "0.4.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" +checksum = "17b02fc0ff9a9e4b35b3342880f48e896ebf69f2967921fe8646bf5b7125956a" [[package]] -name = "once_cell" -version = "1.16.0" +name = "number_prefix" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860" +checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" [[package]] -name = "os_str_bytes" -version = "6.4.1" +name = "once_cell" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] -name = "overload" -version = "0.1.1" +name = "opaque-debug" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" +checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "partition-identity" @@ -760,22 +738,22 @@ dependencies = [ ] [[package]] -name = "pin-utils" -version = "0.1.0" +name = "portable-atomic" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" +checksum = "3bccab0e7fd7cc19f820a1c8c91720af652d0c88dc9664dd72aef2614f04af3b" [[package]] -name = "portable-atomic" -version = "0.3.15" +name = "powerfmt" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15eb2c6e362923af47e13c23ca5afb859e83d54452c55b0b9ac763b8f7c1ac16" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" [[package]] name = "proc-macro2" -version = "1.0.47" +version = "1.0.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725" +checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" dependencies = [ "unicode-ident", ] @@ -790,35 +768,49 @@ dependencies = [ ] [[package]] +name = "quick-error" +version = "1.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" + +[[package]] name = "quote" -version = "1.0.21" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" dependencies = [ "proc-macro2", ] [[package]] name = "rayon" -version = "1.6.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e060280438193c554f654141c9ea9417886713b7acd75974c85b18a69a88e0b" +checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" dependencies = [ - "crossbeam-deque", "either", "rayon-core", ] [[package]] name = "rayon-core" -version = "1.10.1" +version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cac410af5d00ab6884528b4ab69d1e8e146e8d471201800fa1b4524126de6ad3" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" dependencies = [ - "crossbeam-channel", "crossbeam-deque", "crossbeam-utils", - "num_cpus", +] + +[[package]] +name = "realpath-ext" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "692f72862a0d532b44a0f4965fb10f17e7659eaedf24d2ce3c989ca778bd092f" +dependencies = [ + "bitflags 1.3.2", + "errno", + "libc", ] [[package]] @@ -827,7 +819,7 @@ version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] @@ -843,9 +835,21 @@ dependencies = [ [[package]] name = "regex" -version = "1.7.0" +version = "1.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a" +checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" dependencies = [ "aho-corasick", "memchr", @@ -854,59 +858,72 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.6.28" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "rustix" -version = "0.36.5" +version = "0.38.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3807b5d10909833d3e9acd1eb5fb988f79376ff10fce42937de71a449c4c588" +checksum = "322394588aaf33c24007e8bb3238ee3e4c5c09c084ab32bc73890b99ff326bca" dependencies = [ - "bitflags", + "bitflags 2.5.0", "errno", - "io-lifetimes", "libc", "linux-raw-sys", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] name = "rustversion" -version = "1.0.9" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97477e48b4cf8603ad5f7aaf897467cf42ab4218a38ef76fb14c2d6773a6d6a8" +checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06" [[package]] name = "ryu" -version = "1.0.12" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde" +checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" [[package]] name = "scopeguard" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] -name = "scratch" -version = "1.0.2" +name = "seahash" +version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8132065adcfd6e02db789d9285a0deb2f3fcb04002865ab67d5fb103533898" +checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" [[package]] name = "serde" -version = "1.0.152" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb" +checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.197" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] [[package]] name = "serde_json" -version = "1.0.93" +version = "1.0.115" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cad406b69c91885b5107daf2c29572f6c8cdb3c66826821e286c533490c0bc76" +checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd" dependencies = [ "indexmap", "itoa", @@ -915,53 +932,45 @@ dependencies = [ ] [[package]] -name = "simd-adler32" -version = "0.3.4" +name = "strsim" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14a5df39617d7c8558154693a1bb8157a4aab8179209540cc0b10e5dc24e0b18" +checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" [[package]] -name = "skim" -version = "0.10.2" -source = "git+https://github.com/kimono-koans/skim?branch=httm-vendored#00b10497101d206340919f3ae411bdc0342484e7" -dependencies = [ - "beef", - "bitflags", - "chrono", - "crossbeam", - "defer-drop", - "derive_builder", - "fuzzy-matcher", - "lazy_static", - "log", - "nix 0.25.1", - "once_cell", - "rayon", - "regex", - "time 0.3.17", - "timer", - "tuikit", - "unicode-width", - "vte", -] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] -name = "static_assertions" -version = "1.1.0" +name = "strsim" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] -name = "strsim" -version = "0.10.0" +name = "subtle" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" + +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] [[package]] name = "syn" -version = "1.0.105" +version = "2.0.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60b9b43d45702de4c839cb9b51d9f529c5dd26a4aff255b42b1ebc03e88ee908" +checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" dependencies = [ "proc-macro2", "quote", @@ -981,88 +990,74 @@ dependencies = [ [[package]] name = "termcolor" -version = "1.1.3" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" +checksum = "ff1bc3d3f05aff0403e8ac0d92ced918ec05b666a43f83297ccef5bea8a3d449" dependencies = [ "winapi-util", ] [[package]] name = "terminal_size" -version = "0.1.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "633c1a546cee861a1a6d0dc69ebeca693bf4296661ba7852b9d21d159e0506df" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "terminal_size" -version = "0.2.3" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb20089a8ba2b69debd491f8d2d023761cbf196e999218c591fa1e7e15a21907" +checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7" dependencies = [ "rustix", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] name = "textwrap" -version = "0.16.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" +checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" +dependencies = [ + "unicode-width", +] [[package]] name = "thiserror" -version = "1.0.37" +version = "1.0.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e" +checksum = "a5ab016db510546d856297882807df8da66a16fb8c4101cb8b30054b0d5b2d9c" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.37" +version = "1.0.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb" +checksum = "5420d42e90af0c38c3290abcca25b9b3bdf379fc9f55c528f53a269d9c9a267e" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "thread_local" -version = "1.1.4" +version = "1.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5516c27b78311c50bf42c071425c560ac799b11c30b31f87e3081965fe5e0180" +checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" dependencies = [ + "cfg-if", "once_cell", ] [[package]] name = "time" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" -dependencies = [ - "libc", - "wasi 0.10.0+wasi-snapshot-preview1", - "winapi", -] - -[[package]] -name = "time" -version = "0.3.17" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a561bf4617eebd33bca6434b988f39ed798e527f51a1e797d0ee4f61c0a38376" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ + "deranged", "itoa", "libc", + "num-conv", "num_threads", + "powerfmt", "serde", "time-core", "time-macros", @@ -1070,35 +1065,27 @@ dependencies = [ [[package]] name = "time-core" -version = "0.1.0" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.6" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d967f99f534ca7e495c575c62638eebc2898a8c84c119b89e250477bc4ba16b2" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" dependencies = [ + "num-conv", "time-core", ] [[package]] -name = "timer" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31d42176308937165701f50638db1c31586f183f1aab416268216577aec7306b" -dependencies = [ - "chrono", -] - -[[package]] name = "tuikit" version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5e19c6ab038babee3d50c8c12ff8b910bdb2196f62278776422f50390d8e53d8" dependencies = [ - "bitflags", + "bitflags 1.3.2", "lazy_static", "log", "nix 0.24.3", @@ -1107,28 +1094,64 @@ dependencies = [ ] [[package]] +name = "two_percent" +version = "0.11.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84167b95c58bc7cdd169699ab51938076616cee3a9c5c7a7292e0498361e868a" +dependencies = [ + "ahash 0.8.11", + "bitflags 2.5.0", + "crossbeam-channel", + "derive_builder", + "fuzzy-muff", + "hashbrown 0.14.3", + "libc", + "log", + "nohash", + "once_cell", + "rayon", + "regex", + "tuikit", + "unicode-width", + "vte", + "which", +] + +[[package]] +name = "typenum" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" + +[[package]] name = "unicode-ident" -version = "1.0.5" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3" +checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" [[package]] name = "unicode-width" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" +checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" [[package]] name = "utf8parse" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "936e4b492acfd135421d8dca4b1aa80a7bfc26e702ef3af710e0752684df5372" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "uuid" -version = "1.2.2" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a" + +[[package]] +name = "vec_map" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "422ee0de9031b5b948b97a8fc04e3aa35230001a722ddd27943e0be31564ce4c" +checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" [[package]] name = "version_check" @@ -1138,11 +1161,10 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "vte" -version = "0.11.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1aae21c12ad2ec2d168c236f369c38ff332bc1134f7246350dca641437365045" +checksum = "40eb22ae96f050e0c0d6f7ce43feeae26c348fc4dea56928ca81537cfaa6188b" dependencies = [ - "arrayvec", "utf8parse", "vte_generate_state_changes", ] @@ -1159,174 +1181,281 @@ dependencies = [ [[package]] name = "wasi" -version = "0.10.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" - -[[package]] -name = "wasi" version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] -name = "wasm-bindgen" -version = "0.2.83" +name = "which" +version = "6.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268" +checksum = "8211e4f58a2b2805adfbefbc07bab82958fc91e3836339b1ab7ae32465dce0d7" dependencies = [ - "cfg-if", - "wasm-bindgen-macro", + "either", + "home", + "rustix", + "winsafe", ] [[package]] -name = "wasm-bindgen-backend" -version = "0.2.83" +name = "winapi" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" dependencies = [ - "bumpalo", - "log", - "once_cell", - "proc-macro2", - "quote", - "syn", - "wasm-bindgen-shared", + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", ] [[package]] -name = "wasm-bindgen-macro" -version = "0.2.83" +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.83" +name = "winapi-util" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c" +checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" dependencies = [ - "proc-macro2", - "quote", - "syn", - "wasm-bindgen-backend", - "wasm-bindgen-shared", + "winapi", ] [[package]] -name = "wasm-bindgen-shared" -version = "0.2.83" +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] -name = "which" -version = "4.3.0" +name = "windows-sys" +version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c831fbbee9e129a8cf93e7747a82da9d95ba8e16621cae60ec2cdc849bacb7b" +checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" dependencies = [ - "either", - "libc", - "once_cell", + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", ] [[package]] -name = "winapi" -version = "0.3.9" +name = "windows-sys" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", + "windows-targets 0.48.0", ] [[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" +name = "windows-sys" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.0", +] [[package]] -name = "winapi-util" -version = "0.1.5" +name = "windows-targets" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" dependencies = [ - "winapi", + "windows_aarch64_gnullvm 0.48.0", + "windows_aarch64_msvc 0.48.0", + "windows_i686_gnu 0.48.0", + "windows_i686_msvc 0.48.0", + "windows_x86_64_gnu 0.48.0", + "windows_x86_64_gnullvm 0.48.0", + "windows_x86_64_msvc 0.48.0", ] [[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" +name = "windows-targets" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +dependencies = [ + "windows_aarch64_gnullvm 0.52.0", + "windows_aarch64_msvc 0.52.0", + "windows_i686_gnu 0.52.0", + "windows_i686_msvc 0.52.0", + "windows_x86_64_gnu 0.52.0", + "windows_x86_64_gnullvm 0.52.0", + "windows_x86_64_msvc 0.52.0", +] [[package]] -name = "windows-sys" -version = "0.42.0" +name = "windows_aarch64_gnullvm" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" -dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", -] +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.42.0" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e" +checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" [[package]] name = "windows_aarch64_msvc" -version = "0.42.0" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4" +checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" [[package]] name = "windows_i686_gnu" -version = "0.42.0" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" [[package]] name = "windows_i686_msvc" -version = "0.42.0" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246" +checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" [[package]] name = "windows_x86_64_gnu" -version = "0.42.0" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed" +checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" [[package]] name = "windows_x86_64_gnullvm" -version = "0.42.0" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028" +checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" [[package]] name = "windows_x86_64_msvc" -version = "0.42.0" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" + +[[package]] +name = "winsafe" +version = "0.0.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5" +checksum = "d135d17ab770252ad95e9a872d365cf3090e3be864a34ab46f48555993efc904" [[package]] name = "xattr" -version = "1.0.0" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea263437ca03c1522846a4ddafbca2542d0ad5ed9b784909d4b27b76f62bc34a" +checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" dependencies = [ "libc", + "linux-raw-sys", + "rustix", +] + +[[package]] +name = "yaml-rust" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e66366e18dc58b46801afbf2ca7661a9f59cc8c5962c29892b6039b4f86fa992" + +[[package]] +name = "zerocopy" +version = "0.7.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", ] diff --git a/pkgs/tools/filesystems/httm/default.nix b/pkgs/tools/filesystems/httm/default.nix index 3a36af72462e7..b2fd6522bc3d0 100644 --- a/pkgs/tools/filesystems/httm/default.nix +++ b/pkgs/tools/filesystems/httm/default.nix @@ -6,29 +6,37 @@ rustPlatform.buildRustPackage rec { pname = "httm"; - version = "0.23.3"; + version = "0.38.1"; src = fetchFromGitHub { owner = "kimono-koans"; repo = pname; rev = version; - hash = "sha256-yia7GEPemFVHzTkhrL7HejQsFO1zwpdUtq4DLdm4s2g="; + hash = "sha256-aCWhjMXLNx5/wV1HFDtyUuUfpRAxDZhI/Bk7roqZkJ8="; }; cargoLock = { lockFile = ./Cargo.lock; - outputHashes = { - "skim-0.10.2" = "sha256-5bDQZer4r9sNupIilY3afXbyFE1UB8kNsZIFOPmuyu4="; - }; }; nativeBuildInputs = [ installShellFiles ]; + postPatch = '' + chmod +x scripts/*.bash + patchShebangs scripts/*.bash + ''; + postInstall = '' installManPage httm.1 installShellCompletion --cmd httm \ --zsh scripts/httm-key-bindings.zsh + + for script in scripts/*.bash; do + install -Dm755 "$script" "$out/bin/$(basename "$script" .bash)" + done + + install -Dm644 README.md $out/share/doc/README.md ''; meta = with lib; { 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/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix index 64e00642889c1..67ab83e37e341 100644 --- a/pkgs/tools/graphics/gnuplot/default.nix +++ b/pkgs/tools/graphics/gnuplot/default.nix @@ -21,11 +21,11 @@ let in (if withQt then mkDerivation else stdenv.mkDerivation) rec { pname = "gnuplot"; - version = "6.0.0"; + version = "6.0.1"; src = fetchurl { url = "mirror://sourceforge/gnuplot/${pname}-${version}.tar.gz"; - sha256 = "sha256-Y1oo8Jk/arDRF54HKtObgTnQf1Ejf4Qdk8bC/0sXWOw="; + sha256 = "sha256-6FpmDBoqGAj/JPfmmYH/y6xmpFydz3EbZWELJupxN5o="; }; nativeBuildInputs = [ makeWrapper pkg-config texinfo ] ++ lib.optional withQt qttools; diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix index 2acd97cbab7c8..07bc78f0920ed 100644 --- a/pkgs/tools/inputmethods/ibus/default.nix +++ b/pkgs/tools/inputmethods/ibus/default.nix @@ -58,13 +58,13 @@ in stdenv.mkDerivation rec { pname = "ibus"; - version = "1.5.29"; + version = "1.5.30"; src = fetchFromGitHub { owner = "ibus"; repo = "ibus"; rev = version; - sha256 = "sha256-d4EUIg0v8rfHdvzG5USc6GLY6QHtQpIJp1PrPaaBxxE="; + sha256 = "sha256-VgSjeKF9DCkDfE9lHEaWpgZb6ibdgoDf/I6qeJf8Ah4="; }; patches = [ 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/broot/default.nix b/pkgs/tools/misc/broot/default.nix index fc1d076c1ad69..c0a173c8058db 100644 --- a/pkgs/tools/misc/broot/default.nix +++ b/pkgs/tools/misc/broot/default.nix @@ -18,16 +18,16 @@ rustPlatform.buildRustPackage rec { pname = "broot"; - version = "1.38.0"; + version = "1.39.0"; src = fetchFromGitHub { owner = "Canop"; repo = pname; rev = "v${version}"; - hash = "sha256-eKvJyORTb8gFgyeWW7C6PngQ+bKE9Oln2lpd646YbMU="; + hash = "sha256-OmkO7qZ8l9HvSJFGNgTeCo/gS17fF0edfOc8wvf29/I="; }; - cargoHash = "sha256-uX0pQMt6WLUsXaUmbMojyScykdFe8DqpyGrK0QC66eE="; + cargoHash = "sha256-lfFv8NF5nID96tCcLB7bXnDfAyrjoXhnBa2QDHz3nY4="; 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/expect/0004-enable-cross-compilation.patch b/pkgs/tools/misc/expect/0004-enable-cross-compilation.patch new file mode 100644 index 0000000000000..c09623d292b2e --- /dev/null +++ b/pkgs/tools/misc/expect/0004-enable-cross-compilation.patch @@ -0,0 +1,295 @@ +From: Andrew Ruder <andrew.ruder@elecsyscorp.com> +Subject: [PATCH] enable cross compilation for expect + +This patch was created by running ./configure on a modern Linux machine +and inserting the results into the cross compilation section of +each AC_MSG_CHECKING that bombed out with an error. + +Signed-off-by: Andrew Ruder <andrew.ruder@elecsyscorp.com> + +-- + +The original patch, and description above, is originally from +https://github.com/buildroot/buildroot/blob/master/package/expect/0001-enable-cross-compilation.patch + +This patch has been further modified to not hard-code Linux assumptions. + +--- + +Index: expect-5.45/configure.in +=================================================================== +--- expect-5.45.orig/configure.in 2013-11-14 07:59:58.732100595 -0600 ++++ expect-5.45/configure.in 2013-11-14 07:59:58.732100595 -0600 +@@ -6,10 +6,12 @@ + AC_INIT([expect],[5.45.4]) + + TEA_INIT([3.9]) + + AC_CONFIG_AUX_DIR(tclconfig) ++ ++AC_LANG([C]) + + #-------------------------------------------------------------------- + # Configure script for package 'Expect'. + # TEA compliant. + #-------------------------------------------------------------------- +@@ -465,26 +467,20 @@ + # Some systems only define WNOHANG if _POSIX_SOURCE is defined + # The following merely tests that sys/wait.h can be included + # and if so that WNOHANG is not defined. The only place I've + # seen this is ISC. + AC_MSG_CHECKING([if WNOHANG requires _POSIX_SOURCE]) +-AC_TRY_RUN([ ++AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ + #include <sys/wait.h> +-int +-main() { + #ifndef WNOHANG +- return 0; +-#else +- return 1; ++# error "WNOHANG requires _POSIX_SOURCE to be defined" + #endif +-}], ++]])], + AC_MSG_RESULT(yes) + AC_DEFINE(WNOHANG_REQUIRES_POSIX_SOURCE) + , + AC_MSG_RESULT(no) +-, +- AC_MSG_ERROR([Expect can't be cross compiled]) + ) + + AC_MSG_CHECKING([if any value exists for WNOHANG]) + rm -rf wnohang + AC_TRY_RUN([ +@@ -504,11 +501,12 @@ + rm -f wnohang + , + AC_MSG_RESULT(no) + AC_DEFINE(WNOHANG_BACKUP_VALUE, 1) + , +- AC_MSG_ERROR([Expect can't be cross compiled]) ++ AC_MSG_RESULT(yes) ++ AC_DEFINE(WNOHANG_BACKUP_VALUE, 1) + ) + + # + # check how signals work + # +@@ -572,11 +570,11 @@ + }], + AC_MSG_RESULT(yes) + AC_DEFINE(REARM_SIG) + , + AC_MSG_RESULT(no) +-, AC_MSG_WARN([Expect can't be cross compiled]) ++, AC_MSG_RESULT(no) + ) + + # HPUX7 has trouble with the big cat so split it + # Owen Rees <rtor@ansa.co.uk> 29Mar93 + SEDDEFS="${SEDDEFS}CONFEOF +@@ -710,25 +708,19 @@ + AC_DEFINE(POSIX) + fi + + # first check for the pure bsd + AC_MSG_CHECKING([for struct sgttyb]) +-AC_TRY_RUN([ ++AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ + #include <sgtty.h> +-int +-main() +-{ +- struct sgttyb tmp; +- return 0; +-}], ++static struct sgttyb tmp; ++]])], + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_SGTTYB) + PTY_TYPE=sgttyb + , + AC_MSG_RESULT(no) +-, +- AC_MSG_ERROR([Expect can't be cross compiled]) + ) + + # mach systems have include files for unimplemented features + # so avoid doing following test on those systems + if test $mach -eq 0 ; then +@@ -735,116 +728,88 @@ + # next check for the older style ttys + # note that if we detect termio.h (only), we still set PTY_TYPE=termios + # since that just controls which of pty_XXXX.c file is use and + # pty_termios.c is set up to handle pty_termio. + AC_MSG_CHECKING([for struct termio]) +- AC_TRY_RUN([#include <termio.h> +- int +- main() +- { +- struct termio tmp; +- return 0; +- }], ++AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ ++#include <termio.h> ++static struct termio tmp; ++]])], + AC_DEFINE(HAVE_TERMIO) + PTY_TYPE=termios + AC_MSG_RESULT(yes) + , + AC_MSG_RESULT(no) +-, +- AC_MSG_ERROR([Expect can't be cross compiled]) + ) + + # now check for the new style ttys (not yet posix) + AC_MSG_CHECKING([for struct termios]) +- AC_TRY_RUN([ +- /* including termios.h on Solaris 5.6 fails unless inttypes.h included */ +-# ifdef HAVE_INTTYPES_H ++AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ ++/* including termios.h on Solaris 5.6 fails unless inttypes.h included */ ++#ifdef HAVE_INTTYPES_H + # include <inttypes.h> +-# endif +-# include <termios.h> +- int +- main() +- { +- struct termios tmp; +- return 0; +- }], ++#endif ++#include <termios.h> ++static struct termios tmp; ++]])], + AC_DEFINE(HAVE_TERMIOS) + PTY_TYPE=termios + AC_MSG_RESULT(yes) + , + AC_MSG_RESULT(no) +- , +- AC_MSG_ERROR([Expect can't be cross compiled]) + ) + fi + + AC_MSG_CHECKING([if TCGETS or TCGETA in termios.h]) +-AC_TRY_RUN([ ++AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ + /* including termios.h on Solaris 5.6 fails unless inttypes.h included */ + #ifdef HAVE_INTTYPES_H +-#include <inttypes.h> ++# include <inttypes.h> + #endif + #include <termios.h> +-int +-main() { +-#if defined(TCGETS) || defined(TCGETA) +- return 0; +-#else +- return 1; ++# ++#if !(defined(TCGETS) || defined(TCGETA)) ++# error "missing both of TCGETS and TCGETA" + #endif +-}], ++]])], + AC_DEFINE(HAVE_TCGETS_OR_TCGETA_IN_TERMIOS_H) + AC_MSG_RESULT(yes) + , + AC_MSG_RESULT(no) +-, +- AC_MSG_ERROR([Expect can't be cross compiled]) + ) + + AC_MSG_CHECKING([if TIOCGWINSZ in termios.h]) +-AC_TRY_RUN([ ++AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ + /* including termios.h on Solaris 5.6 fails unless inttypes.h included */ + #ifdef HAVE_INTTYPES_H +-#include <inttypes.h> ++# include <inttypes.h> + #endif + #include <termios.h> +-int +-main() { +-#ifdef TIOCGWINSZ +- return 0; +-#else +- return 1; ++ ++#ifndef TIOCGWINSZ ++# error "missing TIOCGWINSZ" + #endif +-}], ++]])], + AC_DEFINE(HAVE_TIOCGWINSZ_IN_TERMIOS_H) + AC_MSG_RESULT(yes) + , + AC_MSG_RESULT(no) +-, +- AC_MSG_ERROR([Expect can't be cross compiled]) + ) + + # finally check for Cray style ttys + AC_MSG_CHECKING([for Cray-style ptys]) + SETUID=":" +-AC_TRY_RUN([ +-int +-main(){ +-#ifdef CRAY +- return 0; +-#else +- return 1; ++AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ ++#ifndef CRAY ++# error "CRAY is not defined" + #endif +-} +-], ++]])], + PTY_TYPE=unicos + SETUID="chmod u+s" + AC_MSG_RESULT(yes) + , + AC_MSG_RESULT(no) +-, +- AC_MSG_ERROR([Expect can't be cross compiled]) + ) + + # + # Check for select and/or poll. If both exist, we prefer select. + # if neither exists, define SIMPLE_EVENT. +@@ -873,26 +842,24 @@ + + # + # check for timezones + # + AC_MSG_CHECKING([for SV-style timezone]) +-AC_TRY_RUN([ ++AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ + extern char *tzname[2]; + extern int daylight; + int + main() + { + int *x = &daylight; + char **y = tzname; + + return 0; +-}], ++}]])], + AC_DEFINE(HAVE_SV_TIMEZONE) + AC_MSG_RESULT(yes), + AC_MSG_RESULT(no) +-, +- AC_MSG_ERROR([Expect can't be cross compiled]) + ) + + + # Following comment stolen from Tcl's configure.in: + # Note: in the following variable, it's important to use the absolute + diff --git a/pkgs/tools/misc/expect/default.nix b/pkgs/tools/misc/expect/default.nix index e2457ad63e137..a7d25fecc7be7 100644 --- a/pkgs/tools/misc/expect/default.nix +++ b/pkgs/tools/misc/expect/default.nix @@ -10,12 +10,8 @@ tcl.mkTclDerivation rec { }; patches = [ - (fetchpatch { - url = "https://raw.githubusercontent.com/buildroot/buildroot/c05e6aa361a4049eabd8b21eb64a34899ef83fc7/package/expect/0001-enable-cross-compilation.patch"; - hash = "sha256-yyzE0Jjac5qaj7Svn4VpMiAqSNLYrw7VZbtFqgMVncs="; - }) (substituteAll { - src = ./fix-cross-compilation.patch; + src = ./fix-build-time-run-tcl.patch; tcl = "${buildPackages.tcl}/bin/tclsh"; }) # The following patches fix compilation with clang 15+ @@ -27,8 +23,12 @@ tcl.mkTclDerivation rec { url = "https://sourceforge.net/p/expect/patches/_discuss/thread/b813ca9895/6759/attachment/expect-configure-c99.patch"; hash = "sha256-PxQQ9roWgVXUoCMxkXEgu+it26ES/JuzHF6oML/nk54="; }) + ./0004-enable-cross-compilation.patch # Include `sys/ioctl.h` and `util.h` on Darwin, which are required for `ioctl` and `openpty`. - ./fix-darwin-clang16.patch + # Include `termios.h` on FreeBSD for `openpty` + ./fix-darwin-bsd-clang16.patch + # Remove some code which causes it to link against a file that does not exist at build time on native FreeBSD + ./freebsd-unversioned.patch ]; postPatch = '' diff --git a/pkgs/tools/misc/expect/fix-cross-compilation.patch b/pkgs/tools/misc/expect/fix-build-time-run-tcl.patch index 8edc4bea39d69..8edc4bea39d69 100644 --- a/pkgs/tools/misc/expect/fix-cross-compilation.patch +++ b/pkgs/tools/misc/expect/fix-build-time-run-tcl.patch diff --git a/pkgs/tools/misc/expect/fix-darwin-clang16.patch b/pkgs/tools/misc/expect/fix-darwin-bsd-clang16.patch index 9454769c99c8f..a0e11a5f9d6bc 100644 --- a/pkgs/tools/misc/expect/fix-darwin-clang16.patch +++ b/pkgs/tools/misc/expect/fix-darwin-bsd-clang16.patch @@ -14,16 +14,21 @@ diff -ur a/exp_win.c b/exp_win.c diff -ur d/pty_termios.c c/pty_termios.c --- d/pty_termios.c 2023-10-10 07:59:23.244452442 -0400 +++ c/pty_termios.c 2023-10-10 08:00:35.303231582 -0400 -@@ -7,7 +7,13 @@ +@@ -7,7 +7,18 @@ */ -#include <pty.h> /* openpty */ +/* openpty */ -+#ifdef __APPLE__ -+#include <util.h> ++#if defined(__APPLE__) ++# include <util.h> ++#elif defined(__FreeBSD__) ++# include <sys/types.h> ++# include <sys/ioctl.h> ++# include <termios.h> ++# include <libutil.h> +#else /* pty.h is Linux-specific */ -+#include <pty.h> ++# include <pty.h> +#endif + #include <stdio.h> diff --git a/pkgs/tools/misc/expect/freebsd-unversioned.patch b/pkgs/tools/misc/expect/freebsd-unversioned.patch new file mode 100644 index 0000000000000..345fa4f6277f6 --- /dev/null +++ b/pkgs/tools/misc/expect/freebsd-unversioned.patch @@ -0,0 +1,14 @@ +--- expect5.45.4/tclconfig/tcl.m4.orig 2024-05-29 11:24:56.150656190 -0700 ++++ expect5.45.4/tclconfig/tcl.m4 2024-05-29 11:25:22.850790934 -0700 +@@ -1643,11 +1643,6 @@ + LIBS=`echo $LIBS | sed s/-pthread//` + CFLAGS="$CFLAGS $PTHREAD_CFLAGS" + LDFLAGS="$LDFLAGS $PTHREAD_LIBS"]) +- # Version numbers are dot-stripped by system policy. +- TCL_TRIM_DOTS=`echo ${VERSION} | tr -d .` +- UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a' +- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1' +- TCL_LIB_VERSIONS_OK=nodots + ;; + Darwin-*) + CFLAGS_OPTIMIZE="-Os" 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/pandoc-include/default.nix b/pkgs/tools/misc/pandoc-include/default.nix index da509e094f847..9e552adbfc9c0 100644 --- a/pkgs/tools/misc/pandoc-include/default.nix +++ b/pkgs/tools/misc/pandoc-include/default.nix @@ -5,6 +5,7 @@ , panflute , lxml , setuptools +, nix-update-script }: buildPythonApplication rec { @@ -23,6 +24,8 @@ buildPythonApplication rec { setuptools ]; + passthru.updateScript = nix-update-script {}; + propagatedBuildInputs = [ natsort panflute lxml ]; pythonImportsCheck = [ "pandoc_include.main" ]; diff --git a/pkgs/tools/misc/panoply/default.nix b/pkgs/tools/misc/panoply/default.nix index b5df3adc7b3d4..d2a04e3c38f7e 100644 --- a/pkgs/tools/misc/panoply/default.nix +++ b/pkgs/tools/misc/panoply/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "panoply"; - version = "5.4.0"; + version = "5.4.1"; src = fetchurl { url = "https://www.giss.nasa.gov/tools/panoply/download/PanoplyJ-${version}.tgz"; - sha256 = "sha256-mWk0wuTxkITVU3SwWYPHrX8Y9NceXeRMwyvpwEDWIiA="; + sha256 = "sha256-C/9kFWDpv4bzqpsUcGpZn7P+fqU6teU39HibYhhva3o="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/misc/phrase-cli/default.nix b/pkgs/tools/misc/phrase-cli/default.nix index fc00c5936b06b..0e267537c1b25 100644 --- a/pkgs/tools/misc/phrase-cli/default.nix +++ b/pkgs/tools/misc/phrase-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "phrase-cli"; - version = "2.27.0"; + version = "2.27.1"; src = fetchFromGitHub { owner = "phrase"; repo = "phrase-cli"; rev = version; - sha256 = "sha256-PStbkJbSGCN92eAk4TZaIzbkG1C25PKI6R6LJgaQuxQ="; + sha256 = "sha256-96avkMhIjVdUou6gOddEGOsRNI5HEH5jLQu39HdJmSQ="; }; - vendorHash = "sha256-5EgttRimT+TTL9QhT36AO9rx2DdZBmnQrllBfRpdhg0="; + vendorHash = "sha256-srLQ2T8Ltigm6vcov4l4/f6DRs9+Mqyy9tovvnpUASc="; ldflags = [ "-X=github.com/phrase/phrase-cli/cmd.PHRASE_CLIENT_VERSION=${version}" ]; 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/misc/scdl/default.nix b/pkgs/tools/misc/scdl/default.nix index 2637c892e03ea..8cff2ac8979e2 100644 --- a/pkgs/tools/misc/scdl/default.nix +++ b/pkgs/tools/misc/scdl/default.nix @@ -2,15 +2,17 @@ python3Packages.buildPythonApplication rec { pname = "scdl"; - version = "2.7.7"; - format = "setuptools"; + version = "2.7.9"; + pyproject = true; src = fetchPypi { inherit pname version; - sha256 = "sha256-/QQb8xbi0rv5dU3WFr/hm2BuM/iDZ2OhrGjuqsQMqdk="; + hash = "sha256-/TRRVZc0b7WRjNNe24KdCFyKuaic3I3B5Tnb8ZnMS1o="; }; - propagatedBuildInputs = with python3Packages; [ + build-system = [ python3Packages.setuptools ]; + + dependencies = with python3Packages; [ docopt mutagen termcolor diff --git a/pkgs/tools/misc/thin-provisioning-tools/Cargo.lock b/pkgs/tools/misc/thin-provisioning-tools/Cargo.lock new file mode 100644 index 0000000000000..8f9a97c8733ee --- /dev/null +++ b/pkgs/tools/misc/thin-provisioning-tools/Cargo.lock @@ -0,0 +1,907 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "aho-corasick" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +dependencies = [ + "memchr", +] + +[[package]] +name = "anstyle" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" + +[[package]] +name = "anyhow" +version = "1.0.80" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ad32ce52e4161730f7098c077cd2ed6229b5804ccf99e5366be1ab72a98b4e1" + +[[package]] +name = "atty" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +dependencies = [ + "hermit-abi 0.1.19", + "libc", + "winapi", +] + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "base64" +version = "0.21.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitflags" +version = "2.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" + +[[package]] +name = "bytemuck" +version = "1.14.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2ef034f05691a48569bd920a96c81b9d91bbad1ab5ac7c4616c1f6ef36cb79f" + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "cassowary" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53" + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "clap" +version = "4.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c918d541ef2913577a0f9566e9ce27cb35b6df072075769e0b26cb5a554520da" +dependencies = [ + "clap_builder", +] + +[[package]] +name = "clap_builder" +version = "4.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f3e7391dad68afb0c2ede1bf619f579a3dc9c2ec67f089baa397123a2f3d1eb" +dependencies = [ + "anstyle", + "clap_lex", + "strsim", +] + +[[package]] +name = "clap_lex" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" + +[[package]] +name = "console" +version = "0.15.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb" +dependencies = [ + "encode_unicode", + "lazy_static", + "libc", + "unicode-width", + "windows-sys", +] + +[[package]] +name = "crc32c" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89254598aa9b9fa608de44b3ae54c810f0f06d755e24c50177f1f8f31ff50ce2" +dependencies = [ + "rustc_version", +] + +[[package]] +name = "crc32fast" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "data-encoding" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" + +[[package]] +name = "downcast" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1435fa1053d8b2fbbe9be7e97eca7f33d37b28409959813daefc1446a14247f1" + +[[package]] +name = "duct" +version = "0.13.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4ab5718d1224b63252cd0c6f74f6480f9ffeb117438a2e0f5cf6d9a4798929c" +dependencies = [ + "libc", + "once_cell", + "os_pipe", + "shared_child", +] + +[[package]] +name = "encode_unicode" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" + +[[package]] +name = "env_logger" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a19187fea3ac7e84da7dacf48de0c45d63c6a76f9490dae389aead16c243fce3" +dependencies = [ + "log", + "regex", +] + +[[package]] +name = "errno" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +dependencies = [ + "libc", + "windows-sys", +] + +[[package]] +name = "exitcode" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de853764b47027c2e862a995c34978ffa63c1501f2e15f987ba11bd4f9bba193" + +[[package]] +name = "fastrand" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" + +[[package]] +name = "fixedbitset" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" + +[[package]] +name = "flate2" +version = "1.0.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +dependencies = [ + "crc32fast", + "miniz_oxide", +] + +[[package]] +name = "fragile" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa" + +[[package]] +name = "getrandom" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "hermit-abi" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +dependencies = [ + "libc", +] + +[[package]] +name = "hermit-abi" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd5256b483761cd23699d0da46cc6fd2ee3be420bbe6d020ae4a091e70b7e9fd" + +[[package]] +name = "indicatif" +version = "0.17.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "763a5a8f45087d6bcea4222e7b72c291a054edf80e4ef6efd2a4979878c7bea3" +dependencies = [ + "console", + "instant", + "number_prefix", + "portable-atomic", + "unicode-width", +] + +[[package]] +name = "instant" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "iovec" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e" +dependencies = [ + "libc", +] + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "libc" +version = "0.2.153" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" + +[[package]] +name = "linux-raw-sys" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" + +[[package]] +name = "log" +version = "0.4.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" + +[[package]] +name = "memchr" +version = "2.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" + +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + +[[package]] +name = "miniz_oxide" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" +dependencies = [ + "adler", +] + +[[package]] +name = "mockall" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43766c2b5203b10de348ffe19f7e54564b64f3d6018ff7648d1e2d6d3a0f0a48" +dependencies = [ + "cfg-if", + "downcast", + "fragile", + "lazy_static", + "mockall_derive", + "predicates", + "predicates-tree", +] + +[[package]] +name = "mockall_derive" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af7cbce79ec385a1d4f54baa90a76401eb15d9cab93685f62e7e9f942aa00ae2" +dependencies = [ + "cfg-if", + "proc-macro2", + "quote", + "syn 2.0.50", +] + +[[package]] +name = "nom" +version = "7.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +dependencies = [ + "memchr", + "minimal-lexical", +] + +[[package]] +name = "num-derive" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.50", +] + +[[package]] +name = "num-traits" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" +dependencies = [ + "autocfg", +] + +[[package]] +name = "num_cpus" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" +dependencies = [ + "hermit-abi 0.3.6", + "libc", +] + +[[package]] +name = "number_prefix" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" + +[[package]] +name = "numtoa" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8f8bdf33df195859076e54ab11ee78a1b208382d3a26ec40d142ffc1ecc49ef" + +[[package]] +name = "once_cell" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" + +[[package]] +name = "os_pipe" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57119c3b893986491ec9aa85056780d3a0f3cf4da7cc09dd3650dbd6c6738fb9" +dependencies = [ + "libc", + "windows-sys", +] + +[[package]] +name = "portable-atomic" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" + +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[package]] +name = "predicates" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68b87bfd4605926cdfefc1c3b5f8fe560e3feca9d5552cf68c466d3d8236c7e8" +dependencies = [ + "anstyle", + "predicates-core", +] + +[[package]] +name = "predicates-core" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b794032607612e7abeb4db69adb4e33590fa6cf1149e95fd7cb00e634b92f174" + +[[package]] +name = "predicates-tree" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "368ba315fb8c5052ab692e68a0eefec6ec57b23a36959c14496f0b0df2c0cecf" +dependencies = [ + "predicates-core", + "termtree", +] + +[[package]] +name = "proc-macro2" +version = "1.0.78" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quick-xml" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" +dependencies = [ + "memchr", +] + +[[package]] +name = "quickcheck" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "588f6378e4dd99458b60ec275b4477add41ce4fa9f64dcba6f15adccb19b50d6" +dependencies = [ + "env_logger", + "log", + "rand", +] + +[[package]] +name = "quickcheck_macros" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b22a693222d716a9587786f37ac3f6b4faedb5b80c23914e7303ff5a1d8016e9" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "quote" +version = "1.0.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom", +] + +[[package]] +name = "rangemap" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "795915a3930a5d6bafd9053d37602fea3e61be2e5d4d788983a8ba9654c1c6f2" + +[[package]] +name = "redox_syscall" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "redox_termios" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20145670ba436b55d91fc92d25e71160fbfbdd57831631c8d7d36377a476f1cb" + +[[package]] +name = "regex" +version = "1.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" + +[[package]] +name = "rio" +version = "0.9.4" +source = "git+https://github.com/jthornber/rio?branch=master#2979a720f671e836302c01546f9cc9f7988610c8" +dependencies = [ + "libc", +] + +[[package]] +name = "roaring" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1c77081a55300e016cb86f2864415b7518741879db925b8d488a0ee0d2da6bf" +dependencies = [ + "bytemuck", + "byteorder", +] + +[[package]] +name = "rustc_version" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +dependencies = [ + "semver", +] + +[[package]] +name = "rustix" +version = "0.38.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" +dependencies = [ + "bitflags 2.4.2", + "errno", + "libc", + "linux-raw-sys", + "windows-sys", +] + +[[package]] +name = "safemem" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" + +[[package]] +name = "semver" +version = "1.0.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" + +[[package]] +name = "shared_child" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0d94659ad3c2137fef23ae75b03d5241d633f8acded53d672decfa0e6e0caef" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "strsim" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01" + +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.50" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74f1bdc9872430ce9b75da68329d1c1746faf50ffac5f19e02b71e37ff881ffb" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "tempfile" +version = "3.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a365e8cd18e44762ef95d87f284f4b5cd04107fec2ff3052bd6a3e6069669e67" +dependencies = [ + "cfg-if", + "fastrand", + "rustix", + "windows-sys", +] + +[[package]] +name = "termion" +version = "1.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "077185e2eac69c3f8379a4298e1e07cd36beb962290d4a51199acf0fdc10607e" +dependencies = [ + "libc", + "numtoa", + "redox_syscall", + "redox_termios", +] + +[[package]] +name = "termtree" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" + +[[package]] +name = "thinp" +version = "1.0.12" +dependencies = [ + "anyhow", + "atty", + "base64", + "byteorder", + "clap", + "crc32c", + "data-encoding", + "duct", + "exitcode", + "fixedbitset", + "flate2", + "indicatif", + "iovec", + "libc", + "mockall", + "nom", + "num-derive", + "num-traits", + "num_cpus", + "quick-xml", + "quickcheck", + "quickcheck_macros", + "rand", + "rangemap", + "rio", + "roaring", + "safemem", + "tempfile", + "termion", + "thinp", + "thiserror", + "threadpool", + "tui", +] + +[[package]] +name = "thiserror" +version = "1.0.57" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.57" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.50", +] + +[[package]] +name = "threadpool" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa" +dependencies = [ + "num_cpus", +] + +[[package]] +name = "tui" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccdd26cbd674007e649a272da4475fb666d3aa0ad0531da7136db6fab0e5bad1" +dependencies = [ + "bitflags 1.3.2", + "cassowary", + "termion", + "unicode-segmentation", + "unicode-width", +] + +[[package]] +name = "unicode-ident" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" + +[[package]] +name = "unicode-segmentation" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" + +[[package]] +name = "unicode-width" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.52.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d380ba1dc7187569a8a9e91ed34b8ccfc33123bbacb8c0aed2d1ad7f3ef2dc5f" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68e5dcfb9413f53afd9c8f86e56a7b4d86d9a2fa26090ea2dc9e40fba56c6ec6" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8dab469ebbc45798319e69eebf92308e541ce46760b49b18c6b3fe5e8965b30f" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a4e9b6a7cac734a8b4138a4e1044eac3404d8326b6c0f939276560687a033fb" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28b0ec9c422ca95ff34a78755cfa6ad4a51371da2a5ace67500cf7ca5f232c58" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "704131571ba93e89d7cd43482277d6632589b18ecf4468f591fbae0a8b101614" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42079295511643151e98d61c38c0acc444e52dd42ab456f7ccfd5152e8ecf21c" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0770833d60a970638e989b3fa9fd2bb1aaadcf88963d1659fd7d9990196ed2d6" diff --git a/pkgs/tools/misc/thin-provisioning-tools/default.nix b/pkgs/tools/misc/thin-provisioning-tools/default.nix index bff6c9c96887a..f4699a9f37d9f 100644 --- a/pkgs/tools/misc/thin-provisioning-tools/default.nix +++ b/pkgs/tools/misc/thin-provisioning-tools/default.nix @@ -1,21 +1,29 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, expat, libaio, boost }: +{ lib +, rustPlatform +, fetchFromGitHub +, nixosTests }: -stdenv.mkDerivation rec { +rustPlatform.buildRustPackage rec { pname = "thin-provisioning-tools"; - version = "0.9.0"; + version = "1.0.12"; src = fetchFromGitHub { owner = "jthornber"; repo = "thin-provisioning-tools"; rev = "v${version}"; - sha256 = "1iwg04rhmdhijmlk5hfl8wvv83115lzb65if6cc1glkkfva8jfjp"; + hash = "sha256-wliyTWo3iOonqf4UW50V5co0RQlc75VwLofF9FHV2LI="; }; - nativeBuildInputs = [ autoreconfHook ]; - - buildInputs = [ expat libaio boost ]; + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "rio-0.9.4" = "sha256-2l5cm7YLZyf2kuRPMytu7Fdewi6x3+9KyyQBv2F8ZDA="; + }; + }; - enableParallelBuilding = true; + passthru.tests = { + inherit (nixosTests.lvm2) lvm-thinpool-linux-latest; + }; meta = with lib; { homepage = "https://github.com/jthornber/thin-provisioning-tools/"; diff --git a/pkgs/tools/networking/aardvark-dns/default.nix b/pkgs/tools/networking/aardvark-dns/default.nix index f8770612b2537..3daebbead08c8 100644 --- a/pkgs/tools/networking/aardvark-dns/default.nix +++ b/pkgs/tools/networking/aardvark-dns/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "aardvark-dns"; - version = "1.10.0"; + version = "1.11.0"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - hash = "sha256-BZJn0XrqDttNlKNpLy2iZzt8xcpxCoBrWV+L8MstMnM="; + hash = "sha256-MejXcHleJ6AmnoiZefZfp9La8D4PxHgEg0pMxUk2740="; }; - cargoHash = "sha256-hDskOYyOo18EWsYTIf1trZxhRQK0Jf+T4bXb1JJKjEo="; + cargoHash = "sha256-r7etdWr/0cY38A7fRB5QQ86EyQ5YpuxyY3vx5qrdquc="; passthru.tests = { inherit (nixosTests) podman; }; diff --git a/pkgs/tools/networking/croc/default.nix b/pkgs/tools/networking/croc/default.nix index 36d92d275b7d9..bcb329c8eff86 100644 --- a/pkgs/tools/networking/croc/default.nix +++ b/pkgs/tools/networking/croc/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "croc"; - version = "10.0.5"; + version = "10.0.7"; src = fetchFromGitHub { owner = "schollz"; repo = pname; rev = "v${version}"; - hash = "sha256-JrlNvfOxoOhvsjaRacGLZAc4r9HG69UdjFjb3GnSnW0="; + hash = "sha256-8sC3v59ODNdR3W3spAJi5ZgcQirFVvC3RsfJz9QjRBg="; }; - vendorHash = "sha256-SxdN1IyQd/DLI8ZXyCWsW3JLi4dlGSvpr+ub/Oqkw70="; + vendorHash = "sha256-o/8TFAiee7ANSOFxTCFY9fDS4WOOO4IKQfjiMCXUf8w="; subPackages = [ "." ]; 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/dnsproxy/default.nix b/pkgs/tools/networking/dnsproxy/default.nix index 6036d6658d021..08624565dcd07 100644 --- a/pkgs/tools/networking/dnsproxy/default.nix +++ b/pkgs/tools/networking/dnsproxy/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dnsproxy"; - version = "0.71.1"; + version = "0.71.2"; src = fetchFromGitHub { owner = "AdguardTeam"; repo = "dnsproxy"; rev = "v${version}"; - hash = "sha256-g+QjGU+9//Ms7s61IzkxLTffmu1XIhzUX841e86JqE4="; + hash = "sha256-fsJWyb3YFmTeLf1qbO42RTldiEv3MeXyrySywGmIg5A="; }; - vendorHash = "sha256-8t1/XIjDXRHumHkRNxQBeexL2qN94AHModk8ioLpMNY="; + vendorHash = "sha256-oINdRXLtfoCOpZ+n4HAkPtXyKen4m9VaDz1ggiEzehc="; ldflags = [ "-s" "-w" "-X" "github.com/AdguardTeam/dnsproxy/internal/version.version=${version}" ]; diff --git a/pkgs/tools/networking/flannel/default.nix b/pkgs/tools/networking/flannel/default.nix index a2654b90d3e15..eee9b8a8b6f58 100644 --- a/pkgs/tools/networking/flannel/default.nix +++ b/pkgs/tools/networking/flannel/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "flannel"; - version = "0.25.2"; + version = "0.25.3"; rev = "v${version}"; - vendorHash = "sha256-Oo5vguQJOV0rh9gjFO9WdDWZFep3tdUg0ItMo8x4Lkk="; + vendorHash = "sha256-3Lm8r1Hm27l5iGgZsXI91RT3aDb2QXKAeo2UbA2D+/I="; src = fetchFromGitHub { inherit rev; owner = "flannel-io"; repo = "flannel"; - sha256 = "sha256-OyYZMSQGsJaYvGwMC2JpJDosYSjIP7c4/CgwcmYEr5Q="; + sha256 = "sha256-tdoGOZTt1/y4n351xAtDIiDYunske4v5Abxe2i3BSbk="; }; ldflags = [ "-X github.com/flannel-io/flannel/pkg/version.Version=${rev}" ]; diff --git a/pkgs/tools/networking/grpc_cli/default.nix b/pkgs/tools/networking/grpc_cli/default.nix index 84f498b0a1fac..d06034196e2bf 100644 --- a/pkgs/tools/networking/grpc_cli/default.nix +++ b/pkgs/tools/networking/grpc_cli/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "grpc_cli"; - version = "1.64.0"; + version = "1.64.1"; src = fetchFromGitHub { owner = "grpc"; repo = "grpc"; rev = "v${version}"; - hash = "sha256-5mTyXA7jxos+PclImuFDyLTEVkqxm4Kxnorm8R12i9U="; + hash = "sha256-FfAH9vGlqzSGCPFKZtYhYFLQtbUbdksZvDptx94gkDE="; fetchSubmodules = true; }; nativeBuildInputs = [ automake cmake autoconf ]; 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/networking/nexttrace/default.nix b/pkgs/tools/networking/nexttrace/default.nix index df8bce88dcaab..d29de0a3b9bd5 100644 --- a/pkgs/tools/networking/nexttrace/default.nix +++ b/pkgs/tools/networking/nexttrace/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "nexttrace"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "nxtrace"; repo = "NTrace-core"; rev = "v${version}"; - sha256 = "sha256-15ONnY0ST3e9FPyNkyUfQLgKUXjrMX2+4Op4WDumyyk="; + sha256 = "sha256-mJkAV4eUecJv2H3smfTNPcj+liCH8wNl/wiO+Q92eDE="; }; - vendorHash = "sha256-dlubG+2UvlZI0r9CU2ljCbLs1+t+xgwP2yrbiAt8MgQ="; + vendorHash = "sha256-immUT11gO3dFkrwrjwwYtPLxhYvSKcxmwaEkjFGrMsE="; doCheck = false; # Tests require a network connection. diff --git a/pkgs/tools/networking/ockam/default.nix b/pkgs/tools/networking/ockam/default.nix index 0b8c0ad1c5fc7..8cff2e5bc49d1 100644 --- a/pkgs/tools/networking/ockam/default.nix +++ b/pkgs/tools/networking/ockam/default.nix @@ -13,7 +13,7 @@ let pname = "ockam"; - version = "0.124.0"; + version = "0.125.0"; in rustPlatform.buildRustPackage { inherit pname version; @@ -22,10 +22,10 @@ rustPlatform.buildRustPackage { owner = "build-trust"; repo = pname; rev = "ockam_v${version}"; - hash = "sha256-ovcZD9D/iVF3iIti+vQ29YIJE+UI64BeuA2huJsAx5s="; + hash = "sha256-CFJ2Z/PI7du9wlvh3/Ew8AejcU//xPuUXJweQ4phYc8="; }; - cargoHash = "sha256-z+GIFN5Q3LWnT5PrZ291G2lHgd5mzDFkKwdcxUXvUnU="; + cargoHash = "sha256-j9c1m6beT70E0+czXMVOqY36wAHR1uqL5zKHkrlIAQk="; nativeBuildInputs = [ git pkg-config ]; buildInputs = [ openssl dbus ] ++ lib.optionals stdenv.isDarwin [ AppKit Security ]; diff --git a/pkgs/tools/package-management/apk-tools/default.nix b/pkgs/tools/package-management/apk-tools/default.nix index 4800a6641bd0c..55a406d595695 100644 --- a/pkgs/tools/package-management/apk-tools/default.nix +++ b/pkgs/tools/package-management/apk-tools/default.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { pname = "apk-tools"; - version = "2.14.1"; + version = "2.14.4"; src = fetchFromGitLab { domain = "gitlab.alpinelinux.org"; owner = "alpine"; repo = "apk-tools"; rev = "v${version}"; - sha256 = "sha256-gO7Yf60eabvAdPDSzxvxeEMsvc6ixy1iQ6/o7WWlE2Q="; + sha256 = "sha256-NaLa975AJrfvxxUkPTGLno/BoMQKBGaMIJjSbs+63NA="; }; nativeBuildInputs = [ pkg-config scdoc ] diff --git a/pkgs/tools/security/beyond-identity/default.nix b/pkgs/tools/security/beyond-identity/default.nix index 31b3439f0e876..cb3dcec44557b 100644 --- a/pkgs/tools/security/beyond-identity/default.nix +++ b/pkgs/tools/security/beyond-identity/default.nix @@ -5,7 +5,7 @@ let pname = "beyond-identity"; - version = "2.60.0-0"; + version = "2.97.0-0"; libPath = lib.makeLibraryPath ([ glib glibc openssl tpm2-tss gtk3 gnome.gnome-keyring polkit polkit_gnome ]); meta = with lib; { description = "Passwordless MFA identities for workforces, customers, and developers"; @@ -22,7 +22,7 @@ let src = fetchurl { url = "https://packages.beyondidentity.com/public/linux-authenticator/deb/ubuntu/pool/focal/main/b/be/${pname}_${version}/${pname}_${version}_amd64.deb"; - hash = "sha512-JrHLf7KkJVbJLxx54OTvOSaIzY3+hjX+bpkeBHKX23YriCJssUUvEP6vlbI4r6gjMMFMhW92k0iikAgD1Tr4ug=="; + hash = "sha512-aOQi0hG7AZ3lIAPCDgGAjqVmNCuqFC62CjI9XPLBpvbxBgr2yi7alP952i31MufzzruzVweoQb8SWgNIHq/zIw=="; }; nativeBuildInputs = [ @@ -38,9 +38,6 @@ let rm -rf usr/share/doc - # https://github.com/NixOS/nixpkgs/issues/42117 - sed -i -e 's/auth_self/yes/g' usr/share/polkit-1/actions/com.beyondidentity.endpoint.stepup.policy - cp -ar usr/{bin,share} $out cp -ar opt/beyond-identity/bin $out/opt/beyond-identity diff --git a/pkgs/tools/security/cnquery/default.nix b/pkgs/tools/security/cnquery/default.nix index 241692b6b2cca..3974810ab7fa9 100644 --- a/pkgs/tools/security/cnquery/default.nix +++ b/pkgs/tools/security/cnquery/default.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "cnquery"; - version = "11.5.0"; + version = "11.6.0"; src = fetchFromGitHub { owner = "mondoohq"; repo = "cnquery"; rev = "refs/tags/v${version}"; - hash = "sha256-Fp+NYMAOIiw8g4awfSYMvbjThwfGt87q3Nv7O36IkAk="; + hash = "sha256-QeC1ql/ohUoc06jqoDudHSYX6vl2RNMcvVe+qmEkS0w="; }; subPackages = [ "apps/cnquery" ]; - vendorHash = "sha256-MtOqop0FIuNbhG+gL5fRcMZZn5QC6tXzWHxX+NI0CYg="; + vendorHash = "sha256-9jDXEfIZ6qPZOKImqup7Y/1xqu+Hp6uR8Hm+RXggWg4="; ldflags = [ "-w" diff --git a/pkgs/tools/security/ggshield/default.nix b/pkgs/tools/security/ggshield/default.nix index 45b66653d6bfc..aba9ce1c22775 100644 --- a/pkgs/tools/security/ggshield/default.nix +++ b/pkgs/tools/security/ggshield/default.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication rec { pname = "ggshield"; - version = "1.27.0"; + version = "1.28.0"; pyproject = true; src = fetchFromGitHub { owner = "GitGuardian"; repo = "ggshield"; rev = "refs/tags/v${version}"; - hash = "sha256-esrDJar9J7V0ZIupfyURFWeGigV04Kxo06o/jMz17Fk="; + hash = "sha256-iayxm234Rvi5O0Vb0RCid0iAvRQ2fCjoKAQVJY/9nbE="; }; pythonRelaxDeps = true; diff --git a/pkgs/tools/security/ldeep/default.nix b/pkgs/tools/security/ldeep/default.nix index 0b3a2b47df4cf..44cc59a9fa408 100644 --- a/pkgs/tools/security/ldeep/default.nix +++ b/pkgs/tools/security/ldeep/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "ldeep"; - version = "1.0.53"; + version = "1.0.54"; pyproject = true; src = fetchFromGitHub { owner = "franc-pentest"; repo = "ldeep"; rev = "refs/tags/${version}"; - hash = "sha256-67jVpzvdjEcjFmTRE2YjPr4AO1iN+PakwoKcjvimt8g="; + hash = "sha256-YH7n+gvMzOYY9xnGaQZUOHKLlwtrtmyh8AcuLWFGlJM="; }; pythonRelaxDeps = [ diff --git a/pkgs/tools/security/osv-scanner/default.nix b/pkgs/tools/security/osv-scanner/default.nix index 3196ebe5706b9..32be96f853e72 100644 --- a/pkgs/tools/security/osv-scanner/default.nix +++ b/pkgs/tools/security/osv-scanner/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "osv-scanner"; - version = "1.7.3"; + version = "1.7.4"; src = fetchFromGitHub { owner = "google"; repo = "osv-scanner"; rev = "refs/tags/v${version}"; - hash = "sha256-tagTrjsYPT5csm841HvPbtUsbsaapS8JuHwsPTZWheA="; + hash = "sha256-Z5dRXVbisVoTeS/KVS2tnpaL0i9DMFZYu+vHGWQ1Mvc="; }; - vendorHash = "sha256-yu6qefmTiMRGeyOkiQVOtXQu3BGE2SBHerWNlDDlZxw="; + vendorHash = "sha256-6soB9XLh+ez+iGrnDYh1qrz94KQCoUJPiQA8Cv0oz+o="; subPackages = [ "cmd/osv-scanner" diff --git a/pkgs/tools/security/proxmark3/default.nix b/pkgs/tools/security/proxmark3/default.nix index ee37f938b5d99..94d9d76b92889 100644 --- a/pkgs/tools/security/proxmark3/default.nix +++ b/pkgs/tools/security/proxmark3/default.nix @@ -26,13 +26,13 @@ assert withBlueshark -> stdenv.hostPlatform.isLinux; stdenv.mkDerivation (finalAttrs: { pname = "proxmark3"; - version = "4.18341"; + version = "4.18589"; src = fetchFromGitHub { owner = "RfidResearchGroup"; repo = "proxmark3"; rev = "v${finalAttrs.version}"; - hash = "sha256-YeBrrzCiDgl4WdhWYatm9sOAtBAECIv/f+OzB/RTdeg="; + hash = "sha256-e/FoyaHU/uH2yovEqtkrCXwHMlF94Acxl2lUA422Pig="; }; patches = [ diff --git a/pkgs/tools/system/auto-cpufreq/default.nix b/pkgs/tools/system/auto-cpufreq/default.nix deleted file mode 100644 index 4c15908eab191..0000000000000 --- a/pkgs/tools/system/auto-cpufreq/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ lib, python3Packages, fetchFromGitHub, substituteAll }: - -python3Packages.buildPythonPackage rec { - pname = "auto-cpufreq"; - version = "1.9.9"; - - src = fetchFromGitHub { - owner = "AdnanHodzic"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-D/5pwE2V+yXj92ECOUcl/dajMDbvVdz9YNJrl2Pzvts="; - }; - - propagatedBuildInputs = with python3Packages; [ setuptools-git-versioning click distro psutil ]; - - doCheck = false; - pythonImportsCheck = [ "auto_cpufreq" ]; - - patches = [ - # hardcodes version output - (substituteAll { - src = ./fix-version-output.patch; - inherit version; - }) - - # patch to prevent script copying and to disable install - ./prevent-install-and-copy.patch - # patch to prevent update - ./prevent-update.patch - ]; - - postInstall = '' - # copy script manually - cp ${src}/scripts/cpufreqctl.sh $out/bin/cpufreqctl.auto-cpufreq - - # systemd service - mkdir -p $out/lib/systemd/system - cp ${src}/scripts/auto-cpufreq.service $out/lib/systemd/system - ''; - - meta = with lib; { - mainProgram = "${pname}"; - homepage = "https://github.com/AdnanHodzic/auto-cpufreq"; - description = "Automatic CPU speed & power optimizer for Linux"; - license = licenses.lgpl3Plus; - platforms = platforms.linux; - maintainers = [ maintainers.Technical27 ]; - }; -} diff --git a/pkgs/tools/system/auto-cpufreq/prevent-update.patch b/pkgs/tools/system/auto-cpufreq/prevent-update.patch deleted file mode 100644 index 10da9fec97855..0000000000000 --- a/pkgs/tools/system/auto-cpufreq/prevent-update.patch +++ /dev/null @@ -1,60 +0,0 @@ -diff --git a/requirements.txt b/requirements.txt -index f492cac..e61d1a4 100755 ---- a/requirements.txt -+++ b/requirements.txt -@@ -2,4 +2,3 @@ - psutil - click - distro --requests - -diff --git a/auto_cpufreq/core.py b/auto_cpufreq/core.py -index 99397a9..697fb68 100755 ---- a/auto_cpufreq/core.py -+++ b/auto_cpufreq/core.py -@@ -18,7 +18,6 @@ from math import isclose - from pathlib import Path - from shutil import which - from subprocess import getoutput, call, run, check_output, DEVNULL --import requests - import re - - # execution timestamp used in countdown func - -diff --git a/bin/auto-cpufreq b/bin/auto-cpufreq -index b89d925..b73974c 100755 ---- a/bin/auto-cpufreq -+++ b/bin/auto-cpufreq -@@ -193,31 +193,7 @@ - elif remove: - print("remove is disabled in the nix package") - elif update: -- root_check() -- if os.getenv("PKG_MARKER") == "SNAP": -- print("Detected auto-cpufreq was installed using snap") -- # refresh snap directly using this command -- -- print("Please update using snap package manager, i.e: `sudo snap refresh auto-cpufreq`.") -- #check for AUR -- elif subprocess.run(["bash", "-c", "command -v yay >/dev/null 2>&1"]).returncode == 0 or subprocess.run(["bash", "-c", "command -v pacman >/dev/null 2>&1"]).returncode == 0: -- print("Arch-based distribution with AUR support detected. Please refresh auto-cpufreq using your AUR helper.") -- else: -- verify_update() -- ans = input ("Do you want to update auto-cpufreq to the latest release? [y/n]: ") -- valid_options = ['y', 'Y', 'yes', 'YES', 'Yes'] -- if ans.lower() in valid_options: -- remove_daemon() -- remove_complete_msg() -- new_update() -- else: -- print("incorrect input\n") -- print("Aborted") -- print("enabling daemon") -- run(["auto-cpufreq", "--install"]) -- print("auto-cpufreq is installed with the latest version") -- app_version() -- -+ print("update is disabled in the nix package") - - - if __name__ == "__main__": \ No newline at end of file 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/aliases.nix b/pkgs/top-level/aliases.nix index 9cccfbaa7cafd..62db9f557ec16 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -637,6 +637,7 @@ mapAliases ({ ledger_agent = ledger-agent; # Added 2024-01-07 lfs = dysk; # Added 2023-07-03 llvmPackages_rocm = throw "'llvmPackages_rocm' has been replaced with 'rocmPackages.llvm'"; # Added 2023-10-08 + libAfterImage = throw "'libAfterImage' has been removed from nixpkgs, as it's no longer in development for a long time"; # Added 2024-06-01 libayatana-indicator-gtk3 = libayatana-indicator; # Added 2022-10-18 libayatana-appindicator-gtk3 = libayatana-appindicator; # Added 2022-10-18 libbencodetools = bencodetools; # Added 2022-07-30 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e1aca3dca5cf7..86858b7049f72 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 { }; @@ -8858,8 +8858,6 @@ with pkgs; hardinfo = callPackage ../tools/system/hardinfo { }; - harmonia = callPackage ../tools/package-management/harmonia { }; - hayagriva = callPackage ../tools/typesetting/hayagriva { }; hcl2json = callPackage ../applications/misc/hcl2json { }; @@ -9011,8 +9009,6 @@ with pkgs; hue-plus = libsForQt5.callPackage ../applications/misc/hue-plus { }; - hurl = callPackage ../tools/networking/hurl { }; - hubicfuse = callPackage ../tools/filesystems/hubicfuse { }; humanfriendly = with python3Packages; toPythonApplication humanfriendly; @@ -10940,6 +10936,7 @@ with pkgs; nomad_1_5 nomad_1_6 nomad_1_7 + nomad_1_8 ; nomad-autoscaler = callPackage ../applications/networking/cluster/nomad-autoscaler { }; @@ -13715,7 +13712,7 @@ with pkgs; trunk-io = callPackage ../development/tools/trunk-io { }; trunk-ng = callPackage ../by-name/tr/trunk-ng/package.nix { - inherit (darwin.apple_sdk.frameworks) CoreServices Security; + inherit (darwin.apple_sdk.frameworks) CoreServices Security SystemConfiguration; }; tthsum = callPackage ../applications/misc/tthsum { }; @@ -16538,11 +16535,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 +16547,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 +19131,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 { }; @@ -21710,8 +21705,6 @@ with pkgs; lib3mf = callPackage ../development/libraries/lib3mf { }; - libAfterImage = callPackage ../development/libraries/libAfterImage { }; - libaacs = callPackage ../development/libraries/libaacs { }; libaal = callPackage ../development/libraries/libaal { }; @@ -23855,7 +23848,7 @@ with pkgs; prospector = callPackage ../development/tools/prospector { }; - protobuf = protobuf_24; + protobuf = protobuf_25; inherit ({ @@ -25047,25 +25040,23 @@ with pkgs; libzra = callPackage ../development/libraries/libzra { }; # requires a newer Apple SDK - zig_0_9 = darwin.apple_sdk_11_0.callPackage ../development/compilers/zig/0.9.nix { + zig_0_9 = darwin.apple_sdk_11_0.callPackage ../development/compilers/zig/0.9 { llvmPackages = llvmPackages_13; }; # requires a newer Apple SDK - zig_0_10 = darwin.apple_sdk_11_0.callPackage ../development/compilers/zig/0.10.nix { + zig_0_10 = darwin.apple_sdk_11_0.callPackage ../development/compilers/zig/0.10 { llvmPackages = llvmPackages_15; }; # requires a newer Apple SDK - zig_0_11 = darwin.apple_sdk_11_0.callPackage ../development/compilers/zig/0.11.nix { + zig_0_11 = darwin.apple_sdk_11_0.callPackage ../development/compilers/zig/0.11 { llvmPackages = llvmPackages_16; }; # requires a newer Apple SDK - zig_0_12 = darwin.apple_sdk_11_0.callPackage ../development/compilers/zig/0.12.nix { + zig_0_12 = darwin.apple_sdk_11_0.callPackage ../development/compilers/zig/0.12 { llvmPackages = llvmPackages_17; }; zig = zig_0_12; - zig-shell-completions = callPackage ../development/compilers/zig/shell-completions.nix { }; - zimlib = callPackage ../development/libraries/zimlib { }; zita-convolver = callPackage ../development/libraries/audio/zita-convolver { }; @@ -40176,8 +40167,6 @@ with pkgs; ssh-tools = callPackage ../applications/misc/ssh-tools { }; - auto-cpufreq = callPackage ../tools/system/auto-cpufreq { }; - thermald = callPackage ../tools/system/thermald { }; therion = callPackage ../applications/misc/therion { }; 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..3aea4864d9ded 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1525,6 +1525,8 @@ self: super: with self; { biliass = callPackage ../development/python-modules/biliass { }; + bilibili-api-python = callPackage ../development/python-modules/bilibili-api-python { }; + billiard = callPackage ../development/python-modules/billiard { }; bimmer-connected = callPackage ../development/python-modules/bimmer-connected { }; @@ -3470,8 +3472,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 { }; @@ -6951,6 +6951,8 @@ self: super: with self; { llm = callPackage ../development/python-modules/llm { }; + llmx = callPackage ../development/python-modules/llmx { }; + llvmlite = callPackage ../development/python-modules/llvmlite { # llvmlite always requires a specific version of llvm. llvm = pkgs.llvm_14; @@ -12905,6 +12907,8 @@ self: super: with self; { qrcode = callPackage ../development/python-modules/qrcode { }; + qrcode-terminal = callPackage ../development/python-modules/qrcode-terminal { }; + qreactor = callPackage ../development/python-modules/qreactor { }; qscintilla-qt5 = pkgs.libsForQt5.callPackage ../development/python-modules/qscintilla-qt5 { @@ -14309,6 +14313,8 @@ self: super: with self; { sphinx-togglebutton = callPackage ../development/python-modules/sphinx-togglebutton { }; + sphinxawesome-theme = callPackage ../development/python-modules/sphinxawesome-theme { }; + sphinxcontrib-actdiag = callPackage ../development/python-modules/sphinxcontrib-actdiag { }; sphinxcontrib-apidoc = callPackage ../development/python-modules/sphinxcontrib-apidoc { }; |