From 396c219fec1179fd54c2d7a7aa7a4b3e08f7063a Mon Sep 17 00:00:00 2001 From: 3JlOy_PYCCKUI <3jl0y_pycckui@riseup.net> Date: Fri, 21 Jul 2023 19:53:13 +0300 Subject: [PATCH 01/80] nhentai: 0.4.16 -> 0.5.3 --- pkgs/applications/misc/nhentai/default.nix | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/nhentai/default.nix b/pkgs/applications/misc/nhentai/default.nix index f5284c1ad74d..1f409466adc5 100644 --- a/pkgs/applications/misc/nhentai/default.nix +++ b/pkgs/applications/misc/nhentai/default.nix @@ -1,13 +1,21 @@ -{ lib, python3Packages, fetchPypi }: +{ lib +, python3Packages +, fetchFromGitHub +}: python3Packages.buildPythonApplication rec { pname = "nhentai"; - version = "0.4.16"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-2lzrQqUx3lPM+OAUO/SwT+fAuG7kWmUnTACNUiP7d1M="; + version = "0.5.3"; + src = fetchFromGitHub { + owner = "RicterZ"; + repo = pname; + rev = version; + hash = "sha256-SjWIctAyczjYGP4buXQBA/RcrdikMSuSBtfhORNmXMc="; }; + # tests require a network connection + doCheck = false; + propagatedBuildInputs = with python3Packages; [ requests iso8601 From 39862cd40deab773c91a9d2166f24fc62e75072d Mon Sep 17 00:00:00 2001 From: Lily Foster Date: Mon, 11 Sep 2023 07:11:40 -0400 Subject: [PATCH 02/80] openutau: pull in bump for avalonia to fix crashes --- pkgs/applications/audio/openutau/default.nix | 18 ++++++++++-- pkgs/applications/audio/openutau/deps.nix | 30 ++++++++++---------- 2 files changed, 31 insertions(+), 17 deletions(-) diff --git a/pkgs/applications/audio/openutau/default.nix b/pkgs/applications/audio/openutau/default.nix index 645b0715611d..b92282c473d4 100644 --- a/pkgs/applications/audio/openutau/default.nix +++ b/pkgs/applications/audio/openutau/default.nix @@ -2,6 +2,7 @@ , stdenv , buildDotnetModule , fetchFromGitHub +, fetchpatch , dotnetCorePackages , dbus , fontconfig @@ -22,6 +23,19 @@ buildDotnetModule rec { hash = "sha256-/+hlL2sj/juzWrDcb5dELp8Zdg688XK8OnjKz20rx/M="; }; + patches = [ + # Needed until stakira/OpenUtau#836 is merged and released to fix crashing issues. See stakira/OpenUtau#822 + (fetchpatch { + name = "openutau-update-avalonia-to-11.0.4.patch"; + url = "https://github.com/stakira/OpenUtau/commit/0130d7387fb626a72850305dc61d7c175caccc0f.diff"; + hash = "sha256-w9PLnfiUtiKY/8+y4qqINeEul4kP72nKEVc5c8p2g7c="; + # It looks like fetched files use CRLF but patch comes back with LF + decode = "sed -e 's/$/\\r/'"; + }) + ]; + # Needs binary for above patch due to CRLF shenanigans otherwise being ignored + patchFlags = [ "-p1" "--binary" ]; + dotnet-sdk = dotnetCorePackages.sdk_7_0; dotnet-runtime = dotnetCorePackages.runtime_7_0; @@ -47,8 +61,8 @@ buildDotnetModule rec { # needed until upstream bumps to dotnet 7 postPatch = '' substituteInPlace OpenUtau/OpenUtau.csproj OpenUtau.Test/OpenUtau.Test.csproj --replace \ - "net6.0" \ - "net7.0" + 'net6.0' \ + 'net7.0' ''; # need to make sure proprietary worldline resampler is copied diff --git a/pkgs/applications/audio/openutau/deps.nix b/pkgs/applications/audio/openutau/deps.nix index ea369c140803..842159177558 100644 --- a/pkgs/applications/audio/openutau/deps.nix +++ b/pkgs/applications/audio/openutau/deps.nix @@ -3,22 +3,22 @@ { fetchNuGet }: [ (fetchNuGet { pname = "AsyncIO"; version = "0.1.69"; sha256 = "1anby58bs94gf338vmn6vvwxw0kcz6y8yap57vgh8dgm9vysl0i5"; }) - (fetchNuGet { pname = "Avalonia"; version = "11.0.0-rc1.1"; sha256 = "15gn6qbbx6zars37fvfdsyvqg9303zr8dsx7k1v6a4mzm190xhmm"; }) + (fetchNuGet { pname = "Avalonia"; version = "11.0.4"; sha256 = "0jid0x90dc8m609wqwbq87014yzih2iimz74wm6zi1j02k080jk0"; }) (fetchNuGet { pname = "Avalonia.Angle.Windows.Natives"; version = "2.1.0.2023020321"; sha256 = "1az4s1g22ipak9a3xfh55z2h3rm6lpqh7svbpw6ag4ysrgsjjsjd"; }) - (fetchNuGet { pname = "Avalonia.BuildServices"; version = "0.0.19"; sha256 = "1vlhyjb2g98hh5gnisg4bdl9p93x8lmnkc97d24hpxgflcd7szs7"; }) - (fetchNuGet { pname = "Avalonia.Controls.ColorPicker"; version = "11.0.0-rc1.1"; sha256 = "0nflr62lywmgby1lc6zasn24rinkq72imkazhv77wnj28ayid3bx"; }) - (fetchNuGet { pname = "Avalonia.Controls.DataGrid"; version = "11.0.0-rc1.1"; sha256 = "088xz8llm8298agk4dkpzrb1bqyksgvzhj3pw1s4r1fcdfl0z64j"; }) - (fetchNuGet { pname = "Avalonia.Desktop"; version = "11.0.0-rc1.1"; sha256 = "06580q0il62f3464vq2113gbv0yng4jqm79k2wvn3brzl82pyhvq"; }) - (fetchNuGet { pname = "Avalonia.Diagnostics"; version = "11.0.0-rc1.1"; sha256 = "1jia97djk33za7spfr9276plvx8mybm7i3ckp1wprlnmh5b6nykp"; }) - (fetchNuGet { pname = "Avalonia.FreeDesktop"; version = "11.0.0-rc1.1"; sha256 = "1mpm34lgxcxh5hglyq2fpggdf18cadzx9030kxax5ilp69mk93df"; }) - (fetchNuGet { pname = "Avalonia.Native"; version = "11.0.0-rc1.1"; sha256 = "0hzk1gb4zh9n5k3wv2n8nw9qcgyj9pvwysph3shg9m8wwrdhkiy5"; }) - (fetchNuGet { pname = "Avalonia.ReactiveUI"; version = "11.0.0-rc1.1"; sha256 = "08116ixw118i2v11dylhwkj1ilgkpk29cp9n7zqj3zk7pxkln2f7"; }) - (fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "11.0.0-rc1.1"; sha256 = "1m3r05b14vw4mn1m9ak91j00q0ppnkysb6m7w86sacqjfhpl8faa"; }) - (fetchNuGet { pname = "Avalonia.Skia"; version = "11.0.0-rc1.1"; sha256 = "0a8xvqd0hgi8bynjipvvhg0cm9qr63p0h3ji1wbn3y9vrysliykh"; }) - (fetchNuGet { pname = "Avalonia.Themes.Fluent"; version = "11.0.0-rc1.1"; sha256 = "03lp3m40hwbpasa4q6gykj1y5772lpzzr59y5k1nbi54k2n3fl3k"; }) - (fetchNuGet { pname = "Avalonia.Themes.Simple"; version = "11.0.0-rc1.1"; sha256 = "0bgz8djfmb17qrf44bivcyf9hwdfccl5f8hgyq158y7ag4a313sn"; }) - (fetchNuGet { pname = "Avalonia.Win32"; version = "11.0.0-rc1.1"; sha256 = "1zslv10kcmclx5ajd74yi6j1f8p3a9iy2r0w4k8kwkc56d5jg30c"; }) - (fetchNuGet { pname = "Avalonia.X11"; version = "11.0.0-rc1.1"; sha256 = "0b4bmza84bv8hbh6jmy1kxxp9pnz4q4wq6bw8jc30w4jkdhp588r"; }) + (fetchNuGet { pname = "Avalonia.BuildServices"; version = "0.0.29"; sha256 = "05mm7f0jssih3gbzqfgjnfq5cnqa85ihsg0z1897ciihv8qd3waq"; }) + (fetchNuGet { pname = "Avalonia.Controls.ColorPicker"; version = "11.0.4"; sha256 = "1sqdcaknqazq4mw2x1jb6pfmfnyhpkd4xh6fl4ld85qikzzj7796"; }) + (fetchNuGet { pname = "Avalonia.Controls.DataGrid"; version = "11.0.4"; sha256 = "10kc1pfyi0jq29xavq059vfjm51igi45yikz7i1ys061zbjs0n62"; }) + (fetchNuGet { pname = "Avalonia.Desktop"; version = "11.0.4"; sha256 = "101jlqx24d19nk0nd7x19pvbjjybckzgqh9h78c85vb98xbwh3ky"; }) + (fetchNuGet { pname = "Avalonia.Diagnostics"; version = "11.0.4"; sha256 = "1dxylsvaffzravz64rwq2wjjlr3392i5153nmkqk89ldaq70wjja"; }) + (fetchNuGet { pname = "Avalonia.FreeDesktop"; version = "11.0.4"; sha256 = "1sbgs6d1b751h0ipq249w7z3aclpfb42sw3f7g31vin9w8wxwa6q"; }) + (fetchNuGet { pname = "Avalonia.Native"; version = "11.0.4"; sha256 = "10fyr63sqb4xyr7rlk94rzjbnb9mbln95mb9papip5kb3sm8jx60"; }) + (fetchNuGet { pname = "Avalonia.ReactiveUI"; version = "11.0.4"; sha256 = "1hs29qvbhm5qdhys0j3d89c37qfalx1pcpxl3hh9adz11wc0nb3b"; }) + (fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "11.0.4"; sha256 = "096436hhg45v02pp4f43mf00xn6blx7x66sb8fq5j4jn7479fynp"; }) + (fetchNuGet { pname = "Avalonia.Skia"; version = "11.0.4"; sha256 = "1ysmq4f8bxabpq3nhcrrvgwvxb9z7gx9565bvdyksdhsq16wyxym"; }) + (fetchNuGet { pname = "Avalonia.Themes.Fluent"; version = "11.0.4"; sha256 = "03zdixi6m9g4mcxmp24z8dzamzqqy9i0wg069m4gl5p3wcvfbqla"; }) + (fetchNuGet { pname = "Avalonia.Themes.Simple"; version = "11.0.4"; sha256 = "1rncb8ifqarjc5gfh6ld0ldahvxy57a2hzi7vs826an4zl3r0yrx"; }) + (fetchNuGet { pname = "Avalonia.Win32"; version = "11.0.4"; sha256 = "07ijkpbhz59gvsxsik8mib8rhpm5yrpnjz66sjnxl8m0ghqnkf02"; }) + (fetchNuGet { pname = "Avalonia.X11"; version = "11.0.4"; sha256 = "0xq6xqd3cwwdcqsipvrs4rpf82nqhr45ispwjj4dxlyn4i1n8ryd"; }) (fetchNuGet { pname = "BunLabs.NAudio.Flac"; version = "2.0.1"; sha256 = "1ps7fs451ydsaz5g4j7bhcfawp8fys6vcah3rsrl36g7ni0dwf3v"; }) (fetchNuGet { pname = "Concentus"; version = "1.1.7"; sha256 = "0y5z444wrbhlmsqpy2sxmajl1fbf74843lvgj3y6vz260dn2q0l0"; }) (fetchNuGet { pname = "Concentus.Oggfile"; version = "1.0.4"; sha256 = "12n5bcg1i91daqgnl7q6d55phbkv1srkrvk2k7k8vxpyv231yb6v"; }) From daa1757df572301570edc5faf4786dad95347317 Mon Sep 17 00:00:00 2001 From: Jeremy Date: Mon, 18 Sep 2023 12:58:03 +1200 Subject: [PATCH 03/80] youtube-tui: 0.7.1 -> 0.8.0 --- .../applications/video/youtube-tui/Cargo.lock | 1563 +++++++++++++++++ .../video/youtube-tui/default.nix | 14 +- 2 files changed, 1573 insertions(+), 4 deletions(-) create mode 100644 pkgs/applications/video/youtube-tui/Cargo.lock diff --git a/pkgs/applications/video/youtube-tui/Cargo.lock b/pkgs/applications/video/youtube-tui/Cargo.lock new file mode 100644 index 000000000000..7aadf62090f5 --- /dev/null +++ b/pkgs/applications/video/youtube-tui/Cargo.lock @@ -0,0 +1,1563 @@ +# 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 = "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 = "ansi_colours" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7db9d9767fde724f83933a716ee182539788f293828244e9d999695ce0f7ba1e" +dependencies = [ + "rgb", +] + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "base64" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" + +[[package]] +name = "bit_field" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc827186963e592360843fb5ba4b973e145841266c1357f7180c43526f2e5b61" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "block" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" + +[[package]] +name = "bumpalo" +version = "3.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" + +[[package]] +name = "bytemuck" +version = "1.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea" + +[[package]] +name = "byteorder" +version = "1.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" + +[[package]] +name = "cassowary" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53" + +[[package]] +name = "cc" +version = "1.0.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "chrono" +version = "0.4.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" +dependencies = [ + "android-tzdata", + "iana-time-zone", + "num-traits", + "winapi", +] + +[[package]] +name = "clipboard" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25a904646c0340239dcf7c51677b33928bf24fdf424b79a57909c0109075b2e7" +dependencies = [ + "clipboard-win", + "objc", + "objc-foundation", + "objc_id", + "x11-clipboard", +] + +[[package]] +name = "clipboard-win" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3a093d6fed558e5fe24c3dfc85a68bb68f1c824f440d3ba5aca189e2998786b" +dependencies = [ + "winapi", +] + +[[package]] +name = "color_quant" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" + +[[package]] +name = "console" +version = "0.15.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c926e00cc70edefdc64d3a5ff31cc65bb97a3460097762bd23afb4d8145fccf8" +dependencies = [ + "encode_unicode", + "lazy_static", + "libc", + "windows-sys 0.45.0", +] + +[[package]] +name = "core-foundation" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" + +[[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-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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" +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", + "scopeguard", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crossterm" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e64e6c0fbe2c17357405f7c758c1ef960fce08bdfb2c03d88d2a18d7e09c4b67" +dependencies = [ + "bitflags", + "crossterm_winapi", + "libc", + "mio", + "parking_lot", + "signal-hook", + "signal-hook-mio", + "winapi", +] + +[[package]] +name = "crossterm" +version = "0.26.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a84cda67535339806297f1b331d6dd6320470d2a0fe65381e79ee9e156dd3d13" +dependencies = [ + "bitflags", + "crossterm_winapi", + "libc", + "mio", + "parking_lot", + "serde", + "signal-hook", + "signal-hook-mio", + "winapi", +] + +[[package]] +name = "crossterm_winapi" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acdd7c62a3665c7f6830a51635d9ac9b23ed385797f70a83bb8bafe9c572ab2b" +dependencies = [ + "winapi", +] + +[[package]] +name = "crunchy" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" + +[[package]] +name = "dyn-clone" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68b0cf012f1230e43cd00ebb729c6bb58707ecfa8ad08b52ef3a4ccd2697fc30" + +[[package]] +name = "either" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" + +[[package]] +name = "encode_unicode" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" + +[[package]] +name = "equivalent" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88bffebc5d80432c9b140ee17875ff173a8ab62faad5b257da912bd2f6c1c0a1" + +[[package]] +name = "errno" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" +dependencies = [ + "errno-dragonfly", + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "errno-dragonfly" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "exr" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1e481eb11a482815d3e9d618db8c42a93207134662873809335a92327440c18" +dependencies = [ + "bit_field", + "flume", + "half", + "lebe", + "miniz_oxide", + "rayon-core", + "smallvec", + "zune-inflate", +] + +[[package]] +name = "fastrand" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" +dependencies = [ + "instant", +] + +[[package]] +name = "fdeflate" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d329bdeac514ee06249dabc27877490f17f5d371ec693360768b838e19f3ae10" +dependencies = [ + "simd-adler32", +] + +[[package]] +name = "flate2" +version = "1.0.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" +dependencies = [ + "crc32fast", + "miniz_oxide", +] + +[[package]] +name = "flume" +version = "0.10.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1657b4441c3403d9f7b3409e47575237dac27b1b5726df654a6ecbf92f0f7577" +dependencies = [ + "futures-core", + "futures-sink", + "nanorand", + "pin-project", + "spin", +] + +[[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-core" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" + +[[package]] +name = "futures-sink" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" + +[[package]] +name = "getrandom" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" +dependencies = [ + "cfg-if", + "js-sys", + "libc", + "wasi", + "wasm-bindgen", +] + +[[package]] +name = "gif" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80792593675e051cf94a4b111980da2ba60d4a83e43e0048c5693baab3977045" +dependencies = [ + "color_quant", + "weezl", +] + +[[package]] +name = "half" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02b4af3693f1b705df946e9fe5631932443781d0aabb423b62fcd4d73f6d2fd0" +dependencies = [ + "crunchy", +] + +[[package]] +name = "hashbrown" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" + +[[package]] +name = "hermit-abi" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" + +[[package]] +name = "home" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" +dependencies = [ + "windows-sys 0.48.0", +] + +[[package]] +name = "http_req" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f680177f2ebe4aabd573d07b322d15a5e0fbc97cd739fd627b08043c89041f8" +dependencies = [ + "native-tls", + "unicase", +] + +[[package]] +name = "iana-time-zone" +version = "0.1.57" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "windows", +] + +[[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 = "image" +version = "0.24.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "527909aa81e20ac3a44803521443a765550f09b5130c2c2fa1ea59c2f8f50a3a" +dependencies = [ + "bytemuck", + "byteorder", + "color_quant", + "exr", + "gif", + "jpeg-decoder", + "num-rational", + "num-traits", + "png", + "qoi", + "tiff", +] + +[[package]] +name = "indexmap" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +dependencies = [ + "equivalent", + "hashbrown", +] + +[[package]] +name = "instant" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "invidious" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcf06ca3149bc691b638f1eed94bc5ea5d7eae85ddc01c23249f0af0bd16d62e" +dependencies = [ + "http_req", + "serde", + "serde_json", +] + +[[package]] +name = "io-lifetimes" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" +dependencies = [ + "hermit-abi", + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "itoa" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62b02a5381cc465bd3041d84623d0fa3b66738b52b8e2fc3bab8ad63ab032f4a" + +[[package]] +name = "jpeg-decoder" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e" +dependencies = [ + "rayon", +] + +[[package]] +name = "js-sys" +version = "0.3.64" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "lebe" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" + +[[package]] +name = "libc" +version = "0.2.147" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" + +[[package]] +name = "libmpv" +version = "2.0.1" +source = "git+https://github.com/sudipghimire533/libmpv-rs#18aa79a6b73e309360d3dcaeb434e862f9483350" +dependencies = [ + "libmpv-sys", +] + +[[package]] +name = "libmpv-sys" +version = "3.1.0" +source = "git+https://github.com/sudipghimire533/libmpv-rs#18aa79a6b73e309360d3dcaeb434e862f9483350" + +[[package]] +name = "linux-raw-sys" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" + +[[package]] +name = "lock_api" +version = "0.4.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" + +[[package]] +name = "make-cmd" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8ca8afbe8af1785e09636acb5a41e08a765f5f0340568716c18a8700ba3c0d3" + +[[package]] +name = "malloc_buf" +version = "0.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" +dependencies = [ + "libc", +] + +[[package]] +name = "memoffset" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +dependencies = [ + "autocfg", +] + +[[package]] +name = "miniz_oxide" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +dependencies = [ + "adler", + "simd-adler32", +] + +[[package]] +name = "mio" +version = "0.8.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" +dependencies = [ + "libc", + "log", + "wasi", + "windows-sys 0.48.0", +] + +[[package]] +name = "nanorand" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3" +dependencies = [ + "getrandom", +] + +[[package]] +name = "native-tls" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" +dependencies = [ + "lazy_static", + "libc", + "log", + "openssl", + "openssl-probe", + "openssl-sys", + "schannel", + "security-framework", + "security-framework-sys", + "tempfile", +] + +[[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-rational" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +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 = "objc" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" +dependencies = [ + "malloc_buf", +] + +[[package]] +name = "objc-foundation" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9" +dependencies = [ + "block", + "objc", + "objc_id", +] + +[[package]] +name = "objc_id" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b" +dependencies = [ + "objc", +] + +[[package]] +name = "once_cell" +version = "1.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" + +[[package]] +name = "openssl" +version = "0.10.55" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "345df152bc43501c5eb9e4654ff05f794effb78d4efe3d53abc158baddc0703d" +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-probe" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" + +[[package]] +name = "openssl-sys" +version = "0.9.90" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "374533b0e45f3a7ced10fcaeccca020e66656bc03dac384f852e4e5a7a8104a6" +dependencies = [ + "cc", + "libc", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "parking_lot" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +dependencies = [ + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "smallvec", + "windows-targets 0.48.1", +] + +[[package]] +name = "pin-project" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "030ad2bc4db10a8944cb0d837f158bdfec4d4a4873ab701a95046770d11f8842" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec2e072ecce94ec471b13398d5402c188e76ac03cf74dd1a975161b23a3f6d9c" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "pkg-config" +version = "0.3.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" + +[[package]] +name = "png" +version = "0.17.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59871cc5b6cce7eaccca5a802b4173377a1c2ba90654246789a8fa2334426d11" +dependencies = [ + "bitflags", + "crc32fast", + "fdeflate", + "flate2", + "miniz_oxide", +] + +[[package]] +name = "proc-macro2" +version = "1.0.63" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b368fba921b0dce7e60f5e04ec15e565b3303972b42bcfde1d0713b881959eb" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "qoi" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f6d64c71eb498fe9eae14ce4ec935c555749aef511cca85b5568910d6e48001" +dependencies = [ + "bytemuck", +] + +[[package]] +name = "quote" +version = "1.0.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "573015e8ab27661678357f27dc26460738fd2b6c86e46f386fde94cb5d913105" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "ratatui" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce841e0486e7c2412c3740168ede33adeba8e154a15107b879d8162d77c7174e" +dependencies = [ + "bitflags", + "cassowary", + "crossterm 0.26.1", + "serde", + "unicode-segmentation", + "unicode-width", +] + +[[package]] +name = "rayon" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" +dependencies = [ + "either", + "rayon-core", +] + +[[package]] +name = "rayon-core" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" +dependencies = [ + "crossbeam-channel", + "crossbeam-deque", + "crossbeam-utils", + "num_cpus", +] + +[[package]] +name = "redox_syscall" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +dependencies = [ + "bitflags", +] + +[[package]] +name = "rgb" +version = "0.8.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20ec2d3e3fc7a92ced357df9cebd5a10b6fb2aa1ee797bf7e9ce2f17dffc8f59" +dependencies = [ + "bytemuck", +] + +[[package]] +name = "rustix" +version = "0.37.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06" +dependencies = [ + "bitflags", + "errno", + "io-lifetimes", + "libc", + "linux-raw-sys", + "windows-sys 0.48.0", +] + +[[package]] +name = "ryu" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe232bdf6be8c8de797b22184ee71118d63780ea42ac85b61d1baa6d3b782ae9" + +[[package]] +name = "schannel" +version = "0.1.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" +dependencies = [ + "windows-sys 0.48.0", +] + +[[package]] +name = "scopeguard" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" + +[[package]] +name = "security-framework" +version = "2.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fc758eb7bffce5b308734e9b0c1468893cae9ff70ebf13e7090be8dcbcc83a8" +dependencies = [ + "bitflags", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f51d0c0d83bec45f16480d0ce0058397a69e48fcdc52d1dc8855fb68acbd31a7" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "serde" +version = "1.0.167" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7daf513456463b42aa1d94cff7e0c24d682b429f020b9afa4f5ba5c40a22b237" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.167" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b69b106b68bc8054f0e974e70d19984040f8a5cf9215ca82626ea4853f82c4b9" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde_json" +version = "1.0.100" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f1e14e89be7aa4c4b78bdbdc9eb5bf8517829a600ae8eaa39a6e1d960b5185c" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serde_yaml" +version = "0.9.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "452e67b9c20c37fa79df53201dc03839651086ed9bbe92b3ca585ca9fdaa7d85" +dependencies = [ + "indexmap", + "itoa", + "ryu", + "serde", + "unsafe-libyaml", +] + +[[package]] +name = "signal-hook" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "732768f1176d21d09e076c23a93123d40bba92d50c4058da34d45c8de8e682b9" +dependencies = [ + "libc", + "signal-hook-registry", +] + +[[package]] +name = "signal-hook-mio" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af" +dependencies = [ + "libc", + "mio", + "signal-hook", +] + +[[package]] +name = "signal-hook-registry" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +dependencies = [ + "libc", +] + +[[package]] +name = "simd-adler32" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "238abfbb77c1915110ad968465608b68e869e0772622c9656714e73e5a1a522f" + +[[package]] +name = "sixel-rs" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfa95c014543113a192d906e5971d0c8d1e8b4cc1e61026539687a7016644ce5" +dependencies = [ + "sixel-sys", +] + +[[package]] +name = "sixel-sys" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb46e0cd5569bf910390844174a5a99d52dd40681fff92228d221d9f8bf87dea" +dependencies = [ + "make-cmd", +] + +[[package]] +name = "smallvec" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" + +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" +dependencies = [ + "lock_api", +] + +[[package]] +name = "syn" +version = "2.0.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59fb7d6d8281a51045d62b8eb3a7d1ce347b76f312af50cd3dc0af39c87c1737" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "tempfile" +version = "3.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31c0432476357e58790aaa47a8efb0c5138f137343f3b5f23bd36a27e3b0a6d6" +dependencies = [ + "autocfg", + "cfg-if", + "fastrand", + "redox_syscall", + "rustix", + "windows-sys 0.48.0", +] + +[[package]] +name = "termcolor" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "tiff" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7449334f9ff2baf290d55d73983a7d6fa15e01198faef72af07e2a8db851e471" +dependencies = [ + "flate2", + "jpeg-decoder", + "weezl", +] + +[[package]] +name = "traitobject" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "efd1f82c56340fdf16f2a953d7bda4f8fdffba13d93b00844c25572110b26079" + +[[package]] +name = "tui-additions" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1de5841ec45de71c46252a832bb1e3e69abf2ee2492eb309ea077c8d78e798e7" +dependencies = [ + "crossterm 0.26.1", + "dyn-clone", + "ratatui", + "typemap", + "unicode-segmentation", +] + +[[package]] +name = "typemap" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "653be63c80a3296da5551e1bfd2cca35227e13cdd08c6668903ae2f4f77aa1f6" +dependencies = [ + "unsafe-any", +] + +[[package]] +name = "unicase" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" +dependencies = [ + "version_check", +] + +[[package]] +name = "unicode-ident" +version = "1.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22049a19f4a68748a168c0fc439f9516686aa045927ff767eca0a85101fb6e73" + +[[package]] +name = "unicode-segmentation" +version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" + +[[package]] +name = "unicode-width" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" + +[[package]] +name = "unsafe-any" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f30360d7979f5e9c6e6cea48af192ea8fab4afb3cf72597154b8f08935bc9c7f" +dependencies = [ + "traitobject", +] + +[[package]] +name = "unsafe-libyaml" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1865806a559042e51ab5414598446a5871b561d21b6764f2eabb0dd481d880a6" + +[[package]] +name = "urlencoding" +version = "2.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8db7427f936968176eaa7cdf81b7f98b980b18495ec28f1b5791ac3bfe3eea9" + +[[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 = "viuer" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b511f7e9ae27b5750f12ca50c353a1179bd4cc964a47294eb0d2cdad40cb41c0" +dependencies = [ + "ansi_colours", + "base64", + "console", + "crossterm 0.25.0", + "image", + "lazy_static", + "sixel-rs", + "tempfile", + "termcolor", +] + +[[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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" +dependencies = [ + "cfg-if", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" + +[[package]] +name = "weezl" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb" + +[[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-util" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +dependencies = [ + "winapi", +] + +[[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" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +dependencies = [ + "windows-targets 0.48.1", +] + +[[package]] +name = "windows-sys" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets 0.42.2", +] + +[[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.1", +] + +[[package]] +name = "windows-targets" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +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", +] + +[[package]] +name = "windows-targets" +version = "0.48.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" +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", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" + +[[package]] +name = "windows_aarch64_msvc" +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_i686_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +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_msvc" +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_x86_64_gnu" +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_gnullvm" +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_msvc" +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 = "x11-clipboard" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89bd49c06c9eb5d98e6ba6536cf64ac9f7ee3a009b2f53996d405b3944f6bcea" +dependencies = [ + "xcb", +] + +[[package]] +name = "xcb" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e917a3f24142e9ff8be2414e36c649d47d6cc2ba81f16201cdef96e533e02de" +dependencies = [ + "libc", + "log", +] + +[[package]] +name = "youtube-tui" +version = "0.8.0" +dependencies = [ + "chrono", + "clipboard", + "crossterm 0.26.1", + "dyn-clone", + "home", + "invidious", + "libmpv", + "ratatui", + "serde", + "serde_json", + "serde_yaml", + "tui-additions", + "typemap", + "unicode-segmentation", + "urlencoding", + "viuer", +] + +[[package]] +name = "zune-inflate" +version = "0.2.54" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73ab332fe2f6680068f3582b16a24f90ad7096d5d39b974d1c0aff0125116f02" +dependencies = [ + "simd-adler32", +] diff --git a/pkgs/applications/video/youtube-tui/default.nix b/pkgs/applications/video/youtube-tui/default.nix index f789c125089c..e0ede1f1e704 100644 --- a/pkgs/applications/video/youtube-tui/default.nix +++ b/pkgs/applications/video/youtube-tui/default.nix @@ -7,24 +7,29 @@ , stdenv , python3 , libsixel +, mpv , CoreFoundation , Security , AppKit -, }: rustPlatform.buildRustPackage rec { pname = "youtube-tui"; - version = "0.7.4"; + version = "0.8.0"; src = fetchFromGitHub { owner = "Siriusmart"; repo = pname; rev = "v${version}"; - hash = "sha256-UN70V+RGYlYJxCQGPH8cnQDSqpihGuwzETYEhbG6Ggo="; + hash = "sha256-FOiK3yQcQuwdCEjBtRPW4iBd+8uNsvZ6l5tclHVzL+M="; }; - cargoHash = "sha256-kAhxsSFIJAoKlmN7hVUoTSSHQ2G23f21rEvxcIRQ+kw="; + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "libmpv-2.0.1" = "sha256-efbXk0oXkzlIqgbP4wKm7sWlVZBT2vzDSN3iwsw2vL0="; + }; + }; nativeBuildInputs = [ pkg-config @@ -35,6 +40,7 @@ rustPlatform.buildRustPackage rec { openssl xorg.libxcb libsixel + mpv ] ++ lib.optionals stdenv.isDarwin [ CoreFoundation Security From 088ef51c9c9a62ddbcfba1dd33ae779437cbdb65 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Sep 2023 09:25:10 +0000 Subject: [PATCH 04/80] sfrotz: 2.52 -> 2.54 --- pkgs/games/sfrotz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/sfrotz/default.nix b/pkgs/games/sfrotz/default.nix index e6b959371995..e90f1639e170 100644 --- a/pkgs/games/sfrotz/default.nix +++ b/pkgs/games/sfrotz/default.nix @@ -15,14 +15,14 @@ stdenv.mkDerivation rec { pname = "sfrotz"; - version = "2.52"; + version = "2.54"; src = fetchFromGitLab { domain = "gitlab.com"; owner = "DavidGriffith"; repo = "frotz"; rev = version; - sha256 = "11ca1dz31b7s5vxjqncwjwmbbcr2m5v2rxjn49g4gnvwd6mqw48y"; + sha256 = "sha256-GvGxojD8d5GVy/d8h3q6K7KJroz2lsKbfE0F0acjBl8="; }; buildInputs = [ From 5662c6bad8514b6948737136957ef715a1f52417 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Sep 2023 21:54:07 +0000 Subject: [PATCH 05/80] klayout: 0.28.11 -> 0.28.12 --- pkgs/applications/misc/klayout/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/klayout/default.nix b/pkgs/applications/misc/klayout/default.nix index 6306400a3c12..0901e82f3d0b 100644 --- a/pkgs/applications/misc/klayout/default.nix +++ b/pkgs/applications/misc/klayout/default.nix @@ -5,13 +5,13 @@ mkDerivation rec { pname = "klayout"; - version = "0.28.11"; + version = "0.28.12"; src = fetchFromGitHub { owner = "KLayout"; repo = "klayout"; rev = "v${version}"; - hash = "sha256-PEWb2QBWK3XMuOAkSI2nAk6UJronG+3+NBU92uWO5LQ="; + hash = "sha256-QvEoXKJ9sH5WIarYPsYEWwoFwA/pZa2etegA+AD8rPo="; }; postPatch = '' From 7b40659214992d0ee1b8ec0772b7e6212d67f1d5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 Sep 2023 20:29:43 +0000 Subject: [PATCH 06/80] moarvm: 2023.08 -> 2023.09 --- pkgs/development/interpreters/rakudo/moarvm.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/rakudo/moarvm.nix b/pkgs/development/interpreters/rakudo/moarvm.nix index 0bc35bac51b3..041ac00b2c3a 100644 --- a/pkgs/development/interpreters/rakudo/moarvm.nix +++ b/pkgs/development/interpreters/rakudo/moarvm.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "moarvm"; - version = "2023.08"; + version = "2023.09"; src = fetchFromGitHub { owner = "moarvm"; repo = "moarvm"; rev = version; - hash = "sha256-oYdXzbT+2L/nDySKq8ZYVuVfNgzLDiskwacOM1L4lzw="; + hash = "sha256-/78Qr/Td+dIBlzK0kYa2E4duxEjMj2haefw9Uia+3EA="; fetchSubmodules = true; }; From 6ffd0d3ff3e77c3b1e101d73964e74b6facd9487 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 3 Oct 2023 05:53:47 +0000 Subject: [PATCH 07/80] secp256k1: 0.3.2 -> 0.4.0 --- pkgs/tools/security/secp256k1/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/secp256k1/default.nix b/pkgs/tools/security/secp256k1/default.nix index 8485b28ce5a0..1af6812cfc99 100644 --- a/pkgs/tools/security/secp256k1/default.nix +++ b/pkgs/tools/security/secp256k1/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "secp256k1"; - version = "0.3.2"; + version = "0.4.0"; src = fetchFromGitHub { owner = "bitcoin-core"; repo = "secp256k1"; rev = "refs/tags/v${version}"; - sha256 = "sha256-9nJJVENMXjXEJZzw8DHzin1DkFkF8h9m/c6PuM7Uk4s="; + sha256 = "sha256-KNEOEwxeCQybFdUFfItEF5KoZ/fZ/mahFU1LSlRyHZE="; }; nativeBuildInputs = [ autoreconfHook ]; From ede5717d800eb91b8c3b856a1d5f700f9a4ada66 Mon Sep 17 00:00:00 2001 From: Dominik Chrastecky Date: Wed, 4 Oct 2023 14:21:03 +0200 Subject: [PATCH 08/80] sweethome3d.application: 7.0.2 -> 7.2 https://www.sweethome3d.com/history.jsp --- pkgs/applications/misc/sweethome3d/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/sweethome3d/default.nix b/pkgs/applications/misc/sweethome3d/default.nix index d505761f8076..5755c5610281 100644 --- a/pkgs/applications/misc/sweethome3d/default.nix +++ b/pkgs/applications/misc/sweethome3d/default.nix @@ -111,13 +111,13 @@ in { application = mkSweetHome3D rec { pname = lib.toLower module + "-application"; - version = "7.0.2"; + version = "7.2"; module = "SweetHome3D"; description = "Design and visualize your future home"; license = lib.licenses.gpl2Plus; src = fetchurl { url = "mirror://sourceforge/sweethome3d/${module}-${version}-src.zip"; - sha256 = "sha256-9Jv/U7afG6+LwPB6IhqLePjQA67bPKelP+UcuvizBqo="; + sha256 = "sha256-Io3HfussfSy6CLHE0JCAk0gjBAla/u+pS1Gan8BxozY="; }; desktopName = "Sweet Home 3D"; icons = { From 4bdf812bc1ee70e7555593d936fded575dca6931 Mon Sep 17 00:00:00 2001 From: Mark Sagi-Kazar Date: Wed, 4 Oct 2023 11:53:56 +0200 Subject: [PATCH 09/80] clarity-city: init at 1.0.0 Signed-off-by: Mark Sagi-Kazar --- pkgs/by-name/cl/clarity-city/package.nix | 33 ++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 pkgs/by-name/cl/clarity-city/package.nix diff --git a/pkgs/by-name/cl/clarity-city/package.nix b/pkgs/by-name/cl/clarity-city/package.nix new file mode 100644 index 000000000000..3d3fc445d7ad --- /dev/null +++ b/pkgs/by-name/cl/clarity-city/package.nix @@ -0,0 +1,33 @@ +{ lib, stdenvNoCC, fetchFromGitHub }: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "clarity-city"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "vmware"; + repo = "clarity-city"; + rev = "v${finalAttrs.version}"; + hash = "sha256-1POSdd2ICnyNNmGadIujezNK8qvARD0kkLR4yWjs5kA="; + }; + + installPhase = '' + runHook preInstall + + install -Dm644 TrueType/*.ttf -t $out/share/fonts/truetype + install -Dm644 OpenType/*.otf -t $out/share/fonts/opentype + install -Dm644 Webfonts/EOT/*.eot -t $out/share/fonts/eot + install -Dm644 Webfonts/WOFF/*.woff -t $out/share/fonts/woff + install -Dm644 Webfonts/WOFF2/*.woff2 -t $out/share/fonts/woff2 + + runHook postInstall + ''; + + meta = with lib; { + description = "An open source sans-serif typeface"; + homepage = "https://github.com/vmware/clarity-city"; + license = licenses.ofl; + platforms = platforms.all; + maintainers = with maintainers; [ sagikazarmark ]; + }; +}) From bf06bb0f8924be3e5c71d2009cf96381ad9c7990 Mon Sep 17 00:00:00 2001 From: BlankParticle Date: Thu, 5 Oct 2023 00:03:29 +0530 Subject: [PATCH 10/80] spotify: use hash instead of sha512 in update script --- pkgs/applications/audio/spotify/update.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/spotify/update.sh b/pkgs/applications/audio/spotify/update.sh index 8c466e836cd2..9bd983755c71 100755 --- a/pkgs/applications/audio/spotify/update.sh +++ b/pkgs/applications/audio/spotify/update.sh @@ -39,12 +39,11 @@ snap_info=($( # just for human consumption. Revision is just an integer that gets increased # by one every (stable or unstable) release. revision="${snap_info[0]}" -sha512="${snap_info[1]}" +# We need to escape the slashes +hash="$(nix-hash --to-sri --type sha512 ${snap_info[1]} | sed 's|/|\\/|g')" upstream_version="${snap_info[2]}" last_updated="${snap_info[3]}" - echo "Latest $channel release is $upstream_version from $last_updated." - # # read the current spotify version from the currently *committed* nix expression # @@ -70,7 +69,7 @@ echo "Updating from ${current_nix_version} to ${upstream_version}, released on $ # search-and-replace revision, hash and version sed --regexp-extended \ -e 's/rev\s*=\s*"[0-9]+"\s*;/rev = "'"${revision}"'";/' \ - -e 's/sha512\s*=\s*"[^"]*"\s*;/sha512 = "'"${sha512}"'";/' \ + -e 's/hash\s*=\s*"[^"]*"\s*;/hash = "'"${hash}"'";/' \ -e 's/version\s*=\s*".*"\s*;/version = "'"${upstream_version}"'";/' \ -i "$spotify_nix" From c49eefdfe2216c13043c3b6ae507ed632fcf945b Mon Sep 17 00:00:00 2001 From: MaxHearnden Date: Thu, 5 Oct 2023 08:46:38 +0100 Subject: [PATCH 11/80] shairport-sync: add xxd to the nativeBuildInputs it is run while building shairport-sync and strictdeps means that it is not added to the path in buildInputs --- pkgs/servers/shairport-sync/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/shairport-sync/default.nix b/pkgs/servers/shairport-sync/default.nix index b9b4ff868e0f..1c41729a4bc5 100644 --- a/pkgs/servers/shairport-sync/default.nix +++ b/pkgs/servers/shairport-sync/default.nix @@ -58,6 +58,8 @@ stdenv.mkDerivation rec { # To achieve this, we coerce the output to a string to prevent # mkDerivation's splicing logic from kicking in. "${glib.dev}" + ] ++ optional enableAirplay2 [ + unixtools.xxd ]; makeFlags = [ @@ -83,7 +85,6 @@ stdenv.mkDerivation rec { libgcrypt libuuid ffmpeg - unixtools.xxd ] ++ optional stdenv.isLinux glib; From 0b4a67b071cfc1771eb7d332a69dcec0f529f5ac Mon Sep 17 00:00:00 2001 From: Sebastian Neubauer Date: Thu, 5 Oct 2023 11:02:47 +0200 Subject: [PATCH 12/80] vulkan-cts: 1.3.6.3 -> 1.3.7.0 Changelog: https://github.com/KhronosGroup/VK-GL-CTS/releases/tag/vulkan-cts-1.3.7.0 --- pkgs/tools/graphics/vulkan-cts/default.nix | 9 +++-- pkgs/tools/graphics/vulkan-cts/sources.nix | 38 +++++++++++----------- 2 files changed, 23 insertions(+), 24 deletions(-) diff --git a/pkgs/tools/graphics/vulkan-cts/default.nix b/pkgs/tools/graphics/vulkan-cts/default.nix index e448160f2a88..aba088a1128f 100644 --- a/pkgs/tools/graphics/vulkan-cts/default.nix +++ b/pkgs/tools/graphics/vulkan-cts/default.nix @@ -37,17 +37,15 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "vulkan-cts"; - version = "1.3.6.3"; + version = "1.3.7.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "VK-GL-CTS"; rev = "${finalAttrs.pname}-${finalAttrs.version}"; - hash = "sha256-jpKPmUduH3IuUYzBAZJFl/w1FqjGC8sXSTnet8YEZ0I="; + hash = "sha256-f7i7gytk3cKeFQD0FR+nrUR2o0FWaJWKG7OpDz9u42E="; }; - outputs = [ "out" "lib" ]; - prePatch = '' mkdir -p external/renderdoc/src @@ -92,7 +90,8 @@ stdenv.mkDerivation (finalAttrs: { ]; postInstall = '' - mv $out $lib + # Check that nothing was installed so far + ! test -e $out mkdir -p $out/bin $out/archive-dir cp -a external/vulkancts/modules/vulkan/deqp-vk external/vulkancts/modules/vulkan/deqp-vksc $out/bin/ diff --git a/pkgs/tools/graphics/vulkan-cts/sources.nix b/pkgs/tools/graphics/vulkan-cts/sources.nix index 24d2c9de387f..59480657da06 100644 --- a/pkgs/tools/graphics/vulkan-cts/sources.nix +++ b/pkgs/tools/graphics/vulkan-cts/sources.nix @@ -4,8 +4,8 @@ rec { ESExtractor = fetchFromGitHub { owner = "Igalia"; repo = "ESExtractor"; - rev = "v0.2.5"; - hash = "sha256-A3lyTTarR1ZJrXcrLDR5D7H1kBwJNyrPPjEklRM9YBY="; + rev = "v0.3.3"; + hash = "sha256-qqhDv08cLQlLaEj0qfghByK+IohdvQdI2ePfUNFEArQ="; }; amber = fetchFromGitHub { @@ -18,8 +18,8 @@ rec { glslang = fetchFromGitHub { owner = "KhronosGroup"; repo = "glslang"; - rev = "77417d5c9e0a5d4c79ddd0285d530b45f7259f0d"; - hash = "sha256-BNgnhTl7/+nC5D7Jl7QME5+qIbm+I0Wh/tf9F4WhW3U="; + rev = "c5117b328afc86e16edff6ed6afe0fe7872a7cf3"; + hash = "sha256-4SoET76fCfutttK00JGCKVQUn0ivGdTw6GhndvxbIDU="; }; jsoncpp = fetchFromGitHub { @@ -29,45 +29,45 @@ rec { hash = "sha256-m0tz8w8HbtDitx3Qkn3Rxj/XhASiJVkThdeBxIwv3WI="; }; + nvidia-video-samples = fetchFromGitHub { + owner = "Igalia"; + repo = "vk_video_samples"; + rev = "cts-integration-0.9.9-1"; + hash = "sha256-vHUyGAx/n8yTnrFjeefbb8LsHxONxsjH3BG2D/RO99E="; + }; + spirv-headers = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Headers"; - rev = "1feaf4414eb2b353764d01d88f8aa4bcc67b60db"; - hash = "sha256-VOq3r6ZcbDGGxjqC4IoPMGC5n1APUPUAs9xcRzxdyfk="; + rev = "b8b9eb8640c8c0107ba580fbcb10f969022ca32c"; + hash = "sha256-gcKwML5ItccAhX+QtR9G86h0JnaiVQEmOQzQpL005dg="; }; spirv-tools = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Tools"; - rev = "01828dac778d08f4ebafd2e06bd419f6c84e5984"; - hash = "sha256-i1rDMVpUiNdacDe20DsN67/rzK5V434EzfSv97y+xGU="; - }; - - video-parser = fetchFromGitHub { - owner = "nvpro-samples"; - repo = "vk_video_samples"; - rev = "7d68747d3524842afaf050c5e00a10f5b8c07904"; - hash = "sha256-L5IYDm0bLq+NlNrzozu0VQx8zL1na6AhrkjZKxOWSnU="; + rev = "bfc94f63a7adbcf8ae166f5f108ac9f69079efc0"; + hash = "sha256-gju6hJSIWOswGnRxKeJZsU1jgp3HSZAf7wFRxswY+Js="; }; vulkan-docs = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-Docs"; - rev = "9fff8b252a3688c0231fa78709084bbe677d3bf7"; - hash = "sha256-KpKsKTY5xCSZ5Y92roa0fq/iqc1hVJNS7l87RFcxyRQ="; + rev = "b9aad705f0d9e5e6734ac2ad671d5d1de57b05e0"; + hash = "sha256-bJ2C1+zjvLiYp5A5AHTevFPU9Yka99imqLwH+uApuoY="; }; prePatch = '' - mkdir -p external/ESExtractor external/amber external/glslang external/jsoncpp external/spirv-headers external/spirv-tools external/video-parser external/vulkan-docs + mkdir -p external/ESExtractor external/amber external/glslang external/jsoncpp external/nvidia-video-samples external/spirv-headers external/spirv-tools external/vulkan-docs cp -r ${ESExtractor} external/ESExtractor/src cp -r ${amber} external/amber/src cp -r ${glslang} external/glslang/src cp -r ${jsoncpp} external/jsoncpp/src + cp -r ${nvidia-video-samples} external/nvidia-video-samples/src cp -r ${spirv-headers} external/spirv-headers/src cp -r ${spirv-tools} external/spirv-tools/src - cp -r ${video-parser} external/video-parser/src cp -r ${vulkan-docs} external/vulkan-docs/src ''; } From 0329cbc02a3b28c56cd5804309b4ca0c7087f1ee Mon Sep 17 00:00:00 2001 From: lelgenio Date: Thu, 5 Oct 2023 20:52:33 -0300 Subject: [PATCH 13/80] dart-sass: 1.68.0 -> 1.69.0 --- pkgs/development/tools/misc/dart-sass/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/misc/dart-sass/default.nix b/pkgs/development/tools/misc/dart-sass/default.nix index f379844fa228..a137f5b21ba6 100644 --- a/pkgs/development/tools/misc/dart-sass/default.nix +++ b/pkgs/development/tools/misc/dart-sass/default.nix @@ -13,23 +13,23 @@ let sass-language = fetchFromGitHub { owner = "sass"; repo = "sass"; - rev = "refs/tags/embedded-protocol-2.2.0"; - hash = "sha256-rSjhQZnLL4UXhp8rBIcaEtQyE81utTfljJTkyhQW5wA="; + rev = "refs/tags/embedded-protocol-2.3.0"; + hash = "sha256-J2heASfIwj4lxjsRs/0zRHSaF2tij9bO7IgXp0u/eiI="; }; in buildDartApplication rec { pname = "dart-sass"; - version = "1.68.0"; + version = "1.69.0"; src = fetchFromGitHub { owner = "sass"; repo = pname; rev = version; - hash = "sha256-Q7pXYcEOqROxVMw5irB23i44PwhFz7YWBVJcftzu998="; + hash = "sha256-kn3cwi1k2CkzbS+Q/JaYy8Nq3Ej0GyWifG1Bq5ZEVHA="; }; pubspecLockFile = ./pubspec.lock; - vendorHash = "sha256-ypKiiLW4Zr0rhTLTXzOoRqZsFC3nGzqUhPFdKKIWDmk="; + vendorHash = "sha256-PQvY+qFXovSXH5wuc60wCrt5RiooKcaGKYzbjKSvqso="; nativeBuildInputs = [ buf From 982e8657eae2f0fbf70213d448505c9eea23cfe9 Mon Sep 17 00:00:00 2001 From: Lin Xianyi Date: Fri, 6 Oct 2023 17:46:40 +0800 Subject: [PATCH 14/80] font-awesome: 6.1.1 -> 6.4.2 --- pkgs/data/fonts/font-awesome/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/data/fonts/font-awesome/default.nix b/pkgs/data/fonts/font-awesome/default.nix index a6f748f2f07f..dfc808971b67 100644 --- a/pkgs/data/fonts/font-awesome/default.nix +++ b/pkgs/data/fonts/font-awesome/default.nix @@ -44,11 +44,11 @@ in hash = "sha256-LL9zWFC+76wH74nqKszPQf2ZDfXq8BiH6tuiK43wYHA="; }; v5 = font-awesome { - version = "5.15.3"; - hash = "sha256-CFXGsl70o/gXUCEKu8Wkv4EBRhrrcMIq8NpfWzcxEus="; + version = "5.15.4"; + hash = "sha256-gd23ZplNY56sm1lfkU3kPXUOmNmY5SRnT0qlQZRNuBo="; }; v6 = font-awesome { - version = "6.1.1"; - hash = "sha256-rujqhKI33Pi2xugMKGoTJDkPkCDK407+Da6yNJP2yAc="; + version = "6.4.2"; + hash = "sha256-/utIhn7CWxlWXshcCUj57WuObRmLTGhTfQo7L6FDHqA="; }; } From 0776733a1dece8ad1085432c0d5f6a5ae9f40091 Mon Sep 17 00:00:00 2001 From: Alexey Orlenko Date: Sat, 7 Oct 2023 01:37:24 +0200 Subject: [PATCH 15/80] prisma-engines: 5.2.0 -> 5.4.1 --- .../tools/database/prisma-engines/Cargo.lock | 102 ++++++++---------- .../tools/database/prisma-engines/default.nix | 6 +- 2 files changed, 50 insertions(+), 58 deletions(-) diff --git a/pkgs/development/tools/database/prisma-engines/Cargo.lock b/pkgs/development/tools/database/prisma-engines/Cargo.lock index 535adb0d320f..5f4df8b9a2f9 100644 --- a/pkgs/development/tools/database/prisma-engines/Cargo.lock +++ b/pkgs/development/tools/database/prisma-engines/Cargo.lock @@ -323,6 +323,7 @@ dependencies = [ "enumflags2", "indoc", "insta", + "query-engine-metrics", "query-engine-tests", "query-tests-setup", "reqwest", @@ -1046,6 +1047,30 @@ dependencies = [ "similar", ] +[[package]] +name = "driver-adapters" +version = "0.1.0" +dependencies = [ + "async-trait", + "bigdecimal", + "chrono", + "expect-test", + "futures", + "metrics 0.18.1", + "napi", + "napi-derive", + "num-bigint", + "once_cell", + "psl", + "quaint", + "serde", + "serde_json", + "tokio", + "tracing", + "tracing-core", + "uuid", +] + [[package]] name = "either" version = "1.9.0" @@ -1149,18 +1174,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "enum_dispatch" -version = "0.3.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f33313078bb8d4d05a2733a94ac4c2d8a0df9a2b84424ebf4f33bfc224a890e" -dependencies = [ - "once_cell", - "proc-macro2", - "quote", - "syn 2.0.28", -] - [[package]] name = "enumflags2" version = "0.7.7" @@ -1881,28 +1894,6 @@ version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" -[[package]] -name = "js-connectors" -version = "0.1.0" -dependencies = [ - "async-trait", - "bigdecimal", - "chrono", - "expect-test", - "futures", - "napi", - "napi-derive", - "num-bigint", - "once_cell", - "psl", - "quaint", - "serde", - "serde_json", - "tokio", - "tracing", - "tracing-core", -] - [[package]] name = "js-sys" version = "0.3.61" @@ -2319,9 +2310,9 @@ dependencies = [ [[package]] name = "mobc" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc79c4a77e312fee9c7bd4b957c12ad1196db73c4a81e5c0b13f02083c4f7f2f" +checksum = "0bdeff49b387edef305eccfe166af3e1483bb57902dbf369dddc42dc824df23b" dependencies = [ "async-trait", "futures-channel", @@ -3162,7 +3153,7 @@ dependencies = [ [[package]] name = "postgres-native-tls" version = "0.5.0" -source = "git+https://github.com/prisma/rust-postgres?branch=pgbouncer-mode#429e76047f28e64761ad63bc6cc9335c3d3337b5" +source = "git+https://github.com/prisma/rust-postgres?branch=pgbouncer-mode#a1a2dc6d9584deaf70a14293c428e7b6ca614d98" dependencies = [ "native-tls", "tokio", @@ -3173,7 +3164,7 @@ dependencies = [ [[package]] name = "postgres-protocol" version = "0.6.4" -source = "git+https://github.com/prisma/rust-postgres?branch=pgbouncer-mode#429e76047f28e64761ad63bc6cc9335c3d3337b5" +source = "git+https://github.com/prisma/rust-postgres?branch=pgbouncer-mode#a1a2dc6d9584deaf70a14293c428e7b6ca614d98" dependencies = [ "base64 0.13.1", "byteorder", @@ -3190,7 +3181,7 @@ dependencies = [ [[package]] name = "postgres-types" version = "0.2.4" -source = "git+https://github.com/prisma/rust-postgres?branch=pgbouncer-mode#429e76047f28e64761ad63bc6cc9335c3d3337b5" +source = "git+https://github.com/prisma/rust-postgres?branch=pgbouncer-mode#a1a2dc6d9584deaf70a14293c428e7b6ca614d98" dependencies = [ "bit-vec", "bytes", @@ -3625,8 +3616,8 @@ dependencies = [ "anyhow", "async-trait", "connection-string", + "driver-adapters", "futures", - "js-connectors", "napi", "napi-build", "napi-derive", @@ -3693,12 +3684,12 @@ version = "0.1.0" dependencies = [ "async-trait", "colored", - "enum_dispatch", "enumflags2", "hyper", "indexmap 1.9.3", "indoc", "itertools", + "jsonrpc-core", "nom", "once_cell", "parse-hyperlinks", @@ -3713,6 +3704,7 @@ dependencies = [ "request-handlers", "serde", "serde_json", + "sql-query-connector", "strip-ansi-escapes", "thiserror", "tokio", @@ -5171,7 +5163,7 @@ dependencies = [ [[package]] name = "tokio-postgres" version = "0.7.7" -source = "git+https://github.com/prisma/rust-postgres?branch=pgbouncer-mode#429e76047f28e64761ad63bc6cc9335c3d3337b5" +source = "git+https://github.com/prisma/rust-postgres?branch=pgbouncer-mode#a1a2dc6d9584deaf70a14293c428e7b6ca614d98" dependencies = [ "async-trait", "byteorder", @@ -5509,7 +5501,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" dependencies = [ "cfg-if", - "rand 0.8.5", + "rand 0.7.3", "static_assertions", ] @@ -5743,9 +5735,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.84" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" +checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -5753,16 +5745,16 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.84" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" +checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.28", "wasm-bindgen-shared", ] @@ -5780,9 +5772,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.84" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" +checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -5790,22 +5782,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.84" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" +checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.28", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.84" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" +checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" [[package]] name = "wasm-logger" diff --git a/pkgs/development/tools/database/prisma-engines/default.nix b/pkgs/development/tools/database/prisma-engines/default.nix index bb76554c3d0d..a180878f9a1c 100644 --- a/pkgs/development/tools/database/prisma-engines/default.nix +++ b/pkgs/development/tools/database/prisma-engines/default.nix @@ -14,13 +14,13 @@ # function correctly. rustPlatform.buildRustPackage rec { pname = "prisma-engines"; - version = "5.2.0"; + version = "5.4.1"; src = fetchFromGitHub { owner = "prisma"; repo = "prisma-engines"; rev = version; - sha256 = "sha256-7bZ6qy5AL7c2F6HfyM7/G36XTkSVsq+T+xxNlrBCXL4="; + sha256 = "sha256-KYPDocC6S6YhJeneyI++UmmpuAYDoX6okqgOtGetilw="; }; # Use system openssl. @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec { "barrel-0.6.6-alpha.0" = "sha256-USh0lQ1z+3Spgc69bRFySUzhuY79qprLlEExTmYWFN8="; "graphql-parser-0.3.0" = "sha256-0ZAsj2mW6fCLhwTETucjbu4rPNzfbNiHu2wVTBlTNe4="; "mysql_async-0.31.3" = "sha256-QIO9s0Upc0/1W7ux1RNJNGKqzO4gB4gMV3NoakAbxkQ="; - "postgres-native-tls-0.5.0" = "sha256-150GAIccGDAD+t/iWkLbXe4SblrW/KUcxkTy4Mrie5U="; + "postgres-native-tls-0.5.0" = "sha256-UYPsxhCkXXWk8yPbqjNS0illwjS5mVm3Z/jFwpVwqfw="; }; }; From 566d7348ee28d4223a15bf8219e7d64b4afd792d Mon Sep 17 00:00:00 2001 From: Alexey Orlenko Date: Sat, 7 Oct 2023 01:43:29 +0200 Subject: [PATCH 16/80] nodePackages.prisma: 5.2.0 -> 5.4.1 --- pkgs/development/node-packages/overrides.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/node-packages/overrides.nix b/pkgs/development/node-packages/overrides.nix index a7afac111eb8..26b1d43c256e 100644 --- a/pkgs/development/node-packages/overrides.nix +++ b/pkgs/development/node-packages/overrides.nix @@ -257,7 +257,7 @@ final: prev: { src = fetchurl { url = "https://registry.npmjs.org/prisma/-/prisma-${version}.tgz"; - hash = "sha256-HiZtNHXkoSl3Q4cAerUs8c138AiDJJxzYNQT3I4+ea8="; + hash = "sha256-rwpwB+vli3CXRhUFL+UvyUpPlxRk6P/2zLCn0SL9E6s="; }; postInstall = with pkgs; '' wrapProgram "$out/bin/prisma" \ From 47f4cd9933899cbce92867fd0b79b5c2b1d34bc0 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sat, 7 Oct 2023 12:59:12 +0200 Subject: [PATCH 17/80] vyper: 0.3.9 -> 0.3.10 Fixes CVE-2023-40015, CVE-2023-41052, CVE-2023-42441, CVE-2023-42443 and CVE-2023-42460 Release notes: https://github.com/vyperlang/vyper/releases/tag/v0.3.10 --- pkgs/development/compilers/vyper/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/vyper/default.nix b/pkgs/development/compilers/vyper/default.nix index ad35d95bff65..1a621f54acd4 100644 --- a/pkgs/development/compilers/vyper/default.nix +++ b/pkgs/development/compilers/vyper/default.nix @@ -7,6 +7,7 @@ , asttokens , pycryptodome , importlib-metadata +, cbor2 , recommonmark , semantic-version , sphinx @@ -28,14 +29,14 @@ let in buildPythonPackage rec { pname = "vyper"; - version = "0.3.9"; + version = "0.3.10"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-4UBSH4qRBgsy+VO9XzosWedM65R1lTo9ml2C95T9OAA="; + hash = "sha256-jcH1AcqrQX+wzpxoppRFh/AUfsfMfTiJzzpFwZRm5Ik="; }; nativeBuildInputs = [ @@ -55,6 +56,7 @@ buildPythonPackage rec { pycryptodome semantic-version importlib-metadata + cbor2 # docs recommonmark From bc0c8dd4a095e38a19e2b2d7af98be60240d6fc3 Mon Sep 17 00:00:00 2001 From: Morgan Helton Date: Sun, 24 Sep 2023 12:42:09 -0500 Subject: [PATCH 18/80] duplicacy: 3.1.0 -> 3.2.3 --- pkgs/tools/backup/duplicacy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/backup/duplicacy/default.nix b/pkgs/tools/backup/duplicacy/default.nix index 99bc32455867..55abb3462ee4 100644 --- a/pkgs/tools/backup/duplicacy/default.nix +++ b/pkgs/tools/backup/duplicacy/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "duplicacy"; - version = "3.1.0"; + version = "3.2.3"; src = fetchFromGitHub { owner = "gilbertchen"; repo = "duplicacy"; rev = "v${version}"; - sha256 = "sha256-PYUfECxtUG2WuLmYLtE3Ugcr8GeQMQwQa4uFzcl1RoY="; + hash = "sha256-7LflTRBB4JG84QM46wvSJrP4o3CHV4gnR24RJgDSlDg="; }; - vendorHash = "sha256-90NWpMEUlPo5+G7DnqFrZyTlAYDAFfZrsctNTaWVjX4="; + vendorHash = "sha256-4M/V4vP9XwHBkZ6UwsAxZ81YAzP4inuNC5yI+5ygQsA="; doCheck = false; From 70c8adce8d3b399d9e6e9b6528d3407588b35db6 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Sun, 8 Oct 2023 02:00:10 +0200 Subject: [PATCH 19/80] kubo: 0.22.0 -> 0.23.0 https://github.com/ipfs/kubo/releases/tag/v0.23.0 Support for /quic (Draft 29) was removed, so remove it from `services.kubo.settings.Addresses.Swarm`. The changelog says that there have been some fixes to the FUSE mountpoint functionality but the test still requires the workaround, so leave that unchanged. --- nixos/modules/services/network-filesystems/kubo.nix | 2 -- pkgs/applications/networking/kubo/default.nix | 10 +++++----- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/nixos/modules/services/network-filesystems/kubo.nix b/nixos/modules/services/network-filesystems/kubo.nix index 5a355f3441d8..bc746bed31f2 100644 --- a/nixos/modules/services/network-filesystems/kubo.nix +++ b/nixos/modules/services/network-filesystems/kubo.nix @@ -203,10 +203,8 @@ in default = [ "/ip4/0.0.0.0/tcp/4001" "/ip6/::/tcp/4001" - "/ip4/0.0.0.0/udp/4001/quic" "/ip4/0.0.0.0/udp/4001/quic-v1" "/ip4/0.0.0.0/udp/4001/quic-v1/webtransport" - "/ip6/::/udp/4001/quic" "/ip6/::/udp/4001/quic-v1" "/ip6/::/udp/4001/quic-v1/webtransport" ]; diff --git a/pkgs/applications/networking/kubo/default.nix b/pkgs/applications/networking/kubo/default.nix index 793f8b8d8613..9539c282c056 100644 --- a/pkgs/applications/networking/kubo/default.nix +++ b/pkgs/applications/networking/kubo/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "kubo"; - version = "0.22.0"; # When updating, also check if the repo version changed and adjust repoVersion below + version = "0.23.0"; # When updating, also check if the repo version changed and adjust repoVersion below rev = "v${version}"; - passthru.repoVersion = "14"; # Also update kubo-migrator when changing the repo version + passthru.repoVersion = "15"; # Also update kubo-migrator when changing the repo version # Kubo makes changes to it's source tarball that don't match the git source. src = fetchurl { url = "https://github.com/ipfs/kubo/releases/download/${rev}/kubo-source.tar.gz"; - hash = "sha256-TX5ZM8Kyj3LZ12Ro7MsHRd+P5XLk/mU7DUxZaopSEV0="; + hash = "sha256-ycXn8h8sFGJXVMldneN51lZgXoPaZ/XeXLtqqJ4w6H0="; }; # tarball contains multiple files/directories @@ -33,9 +33,9 @@ buildGoModule rec { postPatch = '' substituteInPlace 'misc/systemd/ipfs.service' \ - --replace '/usr/bin/ipfs' "$out/bin/ipfs" + --replace '/usr/local/bin/ipfs' "$out/bin/ipfs" substituteInPlace 'misc/systemd/ipfs-hardened.service' \ - --replace '/usr/bin/ipfs' "$out/bin/ipfs" + --replace '/usr/local/bin/ipfs' "$out/bin/ipfs" ''; postInstall = '' From d48011b75d564bd31a082a5924600c67b314c7ea Mon Sep 17 00:00:00 2001 From: Taylor Everding Date: Fri, 6 Oct 2023 22:25:08 -0600 Subject: [PATCH 20/80] cargo-lambda: 0.18.1 -> 0.21.1 --- .../tools/rust/cargo-lambda/Cargo.lock | 1001 +++++++++++------ .../tools/rust/cargo-lambda/default.nix | 11 +- 2 files changed, 677 insertions(+), 335 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-lambda/Cargo.lock b/pkgs/development/tools/rust/cargo-lambda/Cargo.lock index dc7fda56ec73..ce1eea3f15c5 100644 --- a/pkgs/development/tools/rust/cargo-lambda/Cargo.lock +++ b/pkgs/development/tools/rust/cargo-lambda/Cargo.lock @@ -23,7 +23,7 @@ version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "cipher", "cpufeatures", "opaque-debug", @@ -35,7 +35,7 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" dependencies = [ - "getrandom 0.2.8", + "getrandom", "once_cell", "version_check", ] @@ -58,6 +58,54 @@ dependencies = [ "libc", ] +[[package]] +name = "anstream" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1f58811cfac344940f1a400b6e6231ce35171f614f26439e80f8c1465c5cc0c" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b84bf0a05bbb2a83e5eb6fa36bb6e87baa08193c35ff52bbf6b38d8af2890e46" + +[[package]] +name = "anstyle-parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" +dependencies = [ + "windows-sys 0.48.0", +] + +[[package]] +name = "anstyle-wincon" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58f54d10c6dfa51283a066ceab3ec1ab78d13fae00aa49243a45e4571fb79dfd" +dependencies = [ + "anstyle", + "windows-sys 0.48.0", +] + [[package]] name = "anyhow" version = "1.0.66" @@ -70,6 +118,15 @@ version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d301b3b94cb4b2f23d7917810addbbaff90738e0ca2be692bd027e70d7e0330c" +[[package]] +name = "ascii-canvas" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8824ecca2e851cec16968d54a01dd372ef8f95b244fb84b84e70128be347c3c6" +dependencies = [ + "term", +] + [[package]] name = "async-priority-channel" version = "0.1.0" @@ -87,7 +144,7 @@ checksum = "2cda8f4bcc10624c4e85bc66b3f452cca98cfa5ca002dc83a16aad2367641bea" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.103", ] [[package]] @@ -98,7 +155,7 @@ checksum = "1e805d94e6b5001b651426cf4cd446b1ab5f319d27bab5c644f61de0a804360c" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.103", ] [[package]] @@ -107,17 +164,6 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f9f65e4fb35ff6a80b3298d1f028649f3a23da141fa3951e9b24dde1d515b67e" -[[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" @@ -545,7 +591,7 @@ version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "55d7e5deac5e49330042b4e174dafe84ebf71685bfcd94f285bac7aa31e0aeb1" dependencies = [ - "base64", + "base64 0.13.1", "bytes", "chrono", "http", @@ -612,19 +658,34 @@ checksum = "cab84319d616cfb654d03394f38ab7e6f0919e181b1b57e1fd15e7fb4077d9a7" dependencies = [ "addr2line", "cc", - "cfg-if 1.0.0", + "cfg-if", "libc", "miniz_oxide 0.5.4", "object 0.29.0", "rustc-demangle", ] +[[package]] +name = "backtrace-ext" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "537beee3be4a18fb023b570f80e3ae28003db9167a751266b259926e25539d50" +dependencies = [ + "backtrace", +] + [[package]] name = "base64" version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" +[[package]] +name = "base64" +version = "0.21.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" + [[package]] name = "base64-simd" version = "0.7.0" @@ -640,6 +701,27 @@ version = "1.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b645a089122eccb6111b4f81cbc1a49f5900ac4666bb93ac027feaecf15607bf" +[[package]] +name = "beef" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a8241f3ebb85c056b509d4327ad0358fbbba6ffb340bf388f26350aeda225b1" + +[[package]] +name = "bit-set" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" +dependencies = [ + "bit-vec", +] + +[[package]] +name = "bit-vec" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" + [[package]] name = "bitflags" version = "1.3.2" @@ -759,7 +841,7 @@ dependencies = [ [[package]] name = "cargo-lambda" -version = "0.18.1" +version = "0.21.1" dependencies = [ "build-data", "cargo-lambda-build", @@ -770,17 +852,19 @@ dependencies = [ "cargo-test-macro", "cargo-test-support", "clap", + "clap-cargo", "dunce", - "miette 4.7.1", + "miette 5.10.0", "snapbox", "tokio", "tracing", "tracing-subscriber", + "zip", ] [[package]] name = "cargo-lambda-build" -version = "0.18.1" +version = "0.21.1" dependencies = [ "async-trait", "cargo-lambda-interactive", @@ -789,14 +873,17 @@ dependencies = [ "cargo-zigbuild", "clap", "home", - "miette 4.7.1", + "miette 5.10.0", "object 0.28.4", "rustc_version", + "serde", + "serde_json", "sha2", "strum", "strum_macros", "thiserror", "tokio", + "toml", "tracing", "which", "zip", @@ -804,7 +891,7 @@ dependencies = [ [[package]] name = "cargo-lambda-deploy" -version = "0.18.1" +version = "0.21.1" dependencies = [ "aws-sdk-iam", "aws-sdk-s3", @@ -815,7 +902,7 @@ dependencies = [ "cargo-lambda-metadata", "cargo-lambda-remote", "clap", - "miette 4.7.1", + "miette 5.10.0", "serde", "serde_json", "strum", @@ -827,23 +914,24 @@ dependencies = [ [[package]] name = "cargo-lambda-interactive" -version = "0.18.1" +version = "0.21.1" dependencies = [ "indicatif", "inquire", "is-terminal", - "miette 4.7.1", + "miette 5.10.0", "tokio", ] [[package]] name = "cargo-lambda-invoke" -version = "0.18.1" +version = "0.21.1" dependencies = [ + "base64 0.21.2", "cargo-lambda-remote", "clap", - "dirs 4.0.0", - "miette 4.7.1", + "dirs", + "miette 5.10.0", "reqwest", "serde", "serde_json", @@ -856,11 +944,12 @@ dependencies = [ [[package]] name = "cargo-lambda-metadata" -version = "0.18.1" +version = "0.21.1" dependencies = [ "aws-sdk-lambda", - "cargo_metadata 0.14.2", + "cargo_metadata", "clap", + "env-file-reader", "miette 4.7.1", "remove_dir_all", "serde", @@ -873,14 +962,14 @@ dependencies = [ [[package]] name = "cargo-lambda-new" -version = "0.18.1" +version = "0.21.1" dependencies = [ "cargo-lambda-interactive", "cargo-lambda-metadata", "clap", "dunce", "liquid", - "miette 4.7.1", + "miette 5.10.0", "regex", "reqwest", "strum", @@ -894,7 +983,7 @@ dependencies = [ [[package]] name = "cargo-lambda-remote" -version = "0.18.1" +version = "0.21.1" dependencies = [ "aws-config", "aws-credential-types", @@ -906,23 +995,23 @@ dependencies = [ [[package]] name = "cargo-lambda-watch" -version = "0.18.1" +version = "0.21.1" dependencies = [ "aws_lambda_events", "axum", - "base64", + "base64 0.21.2", "cargo-lambda-invoke", "cargo-lambda-metadata", "chrono", "clap", "dunce", "http-api-problem", + "http-serde", "hyper", "ignore-files", - "miette 4.7.1", + "miette 5.10.0", "opentelemetry", "opentelemetry-aws", - "project-origins", "query_map", "reqwest", "serde", @@ -982,7 +1071,7 @@ dependencies = [ "snapbox", "tar", "termcolor", - "toml_edit", + "toml_edit 0.15.0", "url", "winapi", ] @@ -1016,9 +1105,9 @@ checksum = "f7f66533431659d54043e78b4867fe62cad4e9a5c65c8e659d84e5ae19cec5d6" dependencies = [ "anyhow", "cargo-options", - "cargo_metadata 0.15.2", + "cargo_metadata", "clap", - "dirs 4.0.0", + "dirs", "fs-err", "path-slash", "rustc_version", @@ -1031,22 +1120,9 @@ dependencies = [ [[package]] name = "cargo_metadata" -version = "0.14.2" +version = "0.15.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4acbb09d9ee8e23699b9634375c72795d095bf268439da88562cf9b501f181fa" -dependencies = [ - "camino", - "cargo-platform", - "semver", - "serde", - "serde_json", -] - -[[package]] -name = "cargo_metadata" -version = "0.15.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "982a0cf6a99c350d7246035613882e376d58cebe571785abc5da4f648d53ac0a" +checksum = "08a1ec454bc3eead8719cb56e15dbbfecdbc14e4b3a3ae4936cc6e31f5fc0d07" dependencies = [ "camino", "cargo-platform", @@ -1065,12 +1141,6 @@ dependencies = [ "jobserver", ] -[[package]] -name = "cfg-if" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" - [[package]] name = "cfg-if" version = "1.0.0" @@ -1104,47 +1174,60 @@ dependencies = [ [[package]] name = "clap" -version = "4.0.27" +version = "4.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0acbd8d28a0a60d7108d7ae850af6ba34cf2d1257fc646980e5f97ce14275966" +checksum = "6a13b88d2c62ff462f88e4a121f17a82c1af05693a2f192b5c38d14de73c19f6" dependencies = [ - "bitflags", + "clap_builder", "clap_derive", +] + +[[package]] +name = "clap-cargo" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "383f21342a464d4af96e9a4cad22a0b4f2880d4a5b3bbf5c9654dd1d9a224ee4" +dependencies = [ + "anstyle", + "clap", +] + +[[package]] +name = "clap_builder" +version = "4.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bb9faaa7c2ef94b2743a21f5a29e6f0010dff4caa69ac8e9d6cf8b6fa74da08" +dependencies = [ + "anstream", + "anstyle", "clap_lex", - "is-terminal", - "once_cell", "strsim", - "termcolor", "terminal_size 0.2.2", ] [[package]] name = "clap_derive" -version = "4.0.21" +version = "4.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0177313f9f02afc995627906bbd8967e2be069f5261954222dac78290c2b9014" +checksum = "0862016ff20d69b84ef8247369fabf5c008a7417002411897d40ee1f4532b873" dependencies = [ "heck", - "proc-macro-error", "proc-macro2", "quote", - "syn", + "syn 2.0.28", ] [[package]] name = "clap_lex" -version = "0.3.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d4198f73e42b4936b35b5bb248d81d2b595ecb170da0bac7655c54eedfa8da8" -dependencies = [ - "os_str_bytes", -] +checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961" [[package]] name = "clearscreen" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41aa24cc5e1d6b3fc49ad4cd540b522fedcbe88bc6f259ff16e20e7010b6f8c7" +checksum = "72f3f22f1a586604e62efd23f78218f3ccdecf7a33c4500db2d37d85a24fe994" dependencies = [ "nix", "terminfo", @@ -1163,6 +1246,12 @@ dependencies = [ "unicode-width", ] +[[package]] +name = "colorchoice" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" + [[package]] name = "combine" version = "4.6.6" @@ -1302,7 +1391,7 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", ] [[package]] @@ -1311,7 +1400,7 @@ version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "crossbeam-utils", ] @@ -1321,7 +1410,7 @@ version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "715e8152b692bba2d374b53d4875445368fdf21a94751410af607a5ac677d1fc" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "crossbeam-epoch", "crossbeam-utils", ] @@ -1333,7 +1422,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "01a9af1f4c2ef74bb8aa1f7e19706bc72d03598c8a570bb5de72243c7a9d9d5a" dependencies = [ "autocfg", - "cfg-if 1.0.0", + "cfg-if", "crossbeam-utils", "memoffset", "scopeguard", @@ -1345,7 +1434,7 @@ version = "0.8.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4fb766fa798726286dbbb842f174001dab8abc7b627a1dd86e0b7222a95d929f" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", ] [[package]] @@ -1373,6 +1462,12 @@ dependencies = [ "winapi", ] +[[package]] +name = "crunchy" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" + [[package]] name = "crypto-common" version = "0.1.6" @@ -1449,7 +1544,7 @@ dependencies = [ "proc-macro2", "quote", "scratch", - "syn", + "syn 1.0.103", ] [[package]] @@ -1466,9 +1561,15 @@ checksum = "a08a6e2fcc370a089ad3b4aaf54db3b1b4cee38ddabce5896b33eb693275f470" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.103", ] +[[package]] +name = "diff" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" + [[package]] name = "digest" version = "0.10.6" @@ -1480,16 +1581,6 @@ dependencies = [ "subtle", ] -[[package]] -name = "dirs" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13aea89a5c93364a98e9b37b2fa237effbb694d5cfe01c5b70941f7eb087d5e3" -dependencies = [ - "cfg-if 0.1.10", - "dirs-sys", -] - [[package]] name = "dirs" version = "4.0.0" @@ -1499,6 +1590,16 @@ dependencies = [ "dirs-sys", ] +[[package]] +name = "dirs-next" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" +dependencies = [ + "cfg-if", + "dirs-sys-next", +] + [[package]] name = "dirs-sys" version = "0.3.7" @@ -1510,6 +1611,17 @@ dependencies = [ "winapi", ] +[[package]] +name = "dirs-sys-next" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" +dependencies = [ + "libc", + "redox_users", + "winapi", +] + [[package]] name = "doc-comment" version = "0.3.3" @@ -1534,6 +1646,15 @@ version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" +[[package]] +name = "ena" +version = "0.14.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c533630cf40e9caa44bd91aadc88a75d75a4c3a12b4cfde353cbed41daa1e1f1" +dependencies = [ + "log", +] + [[package]] name = "encode_unicode" version = "0.3.6" @@ -1546,9 +1667,26 @@ version = "0.8.31" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9852635589dc9f9ea1b6fe9f05b50ef208c85c834a562f0c6abb1c475736ec2b" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", ] +[[package]] +name = "env-file-reader" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0a86dcbc0fd1a07f5c318a2215338f0c870336851e8b566ebef1576eddb3728" +dependencies = [ + "lalrpop", + "lalrpop-util", + "logos", +] + +[[package]] +name = "equivalent" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88bffebc5d80432c9b140ee17875ff173a8ab62faad5b257da912bd2f6c1c0a1" + [[package]] name = "errno" version = "0.2.8" @@ -1560,6 +1698,17 @@ dependencies = [ "winapi", ] +[[package]] +name = "errno" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" +dependencies = [ + "errno-dragonfly", + "libc", + "windows-sys 0.48.0", +] + [[package]] name = "errno-dragonfly" version = "0.1.2" @@ -1591,12 +1740,18 @@ version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4b9663d381d07ae25dc88dbdf27df458faa83a9b25336bcac83d5e452b5fc9d3" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "libc", "redox_syscall", "windows-sys 0.42.0", ] +[[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.25" @@ -1709,7 +1864,7 @@ checksum = "bdfb8ce053d86b91919aad980c220b1fb8401a9394410e1c289ed7e66b61835d" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.103", ] [[package]] @@ -1752,24 +1907,13 @@ dependencies = [ "version_check", ] -[[package]] -name = "getrandom" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "wasi 0.9.0+wasi-snapshot-preview1", -] - [[package]] name = "getrandom" version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "libc", "wasi 0.11.0+wasi-snapshot-preview1", ] @@ -1805,7 +1949,7 @@ dependencies = [ "btoi", "gix-date", "itoa", - "nom 7.1.1", + "nom", "thiserror", ] @@ -1823,7 +1967,7 @@ dependencies = [ "gix-ref", "gix-sec", "memchr", - "nom 7.1.1", + "nom", "once_cell", "smallvec", "thiserror", @@ -1912,7 +2056,7 @@ dependencies = [ "gix-validate", "hex 0.4.3", "itoa", - "nom 7.1.1", + "nom", "smallvec", "thiserror", ] @@ -1942,7 +2086,7 @@ dependencies = [ "gix-tempfile", "gix-validate", "memmap2", - "nom 7.1.1", + "nom", "thiserror", ] @@ -1953,7 +2097,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8ffa5bf0772f9b01de501c035b6b084cf9b8bb07dec41e3afc6a17336a65f47" dependencies = [ "bitflags", - "dirs 4.0.0", + "dirs", "gix-path", "libc", "windows", @@ -2012,7 +2156,7 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap", + "indexmap 1.9.2", "slab", "tokio", "tokio-util", @@ -2028,6 +2172,12 @@ dependencies = [ "ahash", ] +[[package]] +name = "hashbrown" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" + [[package]] name = "heck" version = "0.4.0" @@ -2045,12 +2195,9 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.2.6" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" -dependencies = [ - "libc", -] +checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" [[package]] name = "hex" @@ -2084,9 +2231,9 @@ dependencies = [ [[package]] name = "http" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399" +checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" dependencies = [ "bytes", "fnv", @@ -2124,9 +2271,9 @@ checksum = "0bfe8eed0a9285ef776bb792479ea3834e8b94e13d615c2f66d03dd50a435a29" [[package]] name = "http-serde" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e272971f774ba29341db2f686255ff8a979365a26fb9e4277f6b6d9ec0cdd5e" +checksum = "6f560b665ad9f1572cfcaf034f7fb84338a7ce945216d64a90fd81f046a3caee" dependencies = [ "http", "serde", @@ -2146,9 +2293,9 @@ checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" [[package]] name = "hyper" -version = "0.14.23" +version = "0.14.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "034711faac9d2166cb1baf1a2fb0b60b1f277f8492fd72176c17f3515e1abd3c" +checksum = "cc5e554ff619822309ffd57d8734d77cd5ce6238bc956f037ea06c58238c9899" dependencies = [ "bytes", "futures-channel", @@ -2244,7 +2391,7 @@ dependencies = [ "futures", "gix-config", "ignore", - "miette 5.5.0", + "miette 5.10.0", "project-origins", "thiserror", "tokio", @@ -2258,7 +2405,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" dependencies = [ "autocfg", - "hashbrown", + "hashbrown 0.12.3", +] + +[[package]] +name = "indexmap" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +dependencies = [ + "equivalent", + "hashbrown 0.14.0", ] [[package]] @@ -2315,7 +2472,7 @@ version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", ] [[package]] @@ -2342,14 +2499,14 @@ checksum = "f88c5561171189e69df9d98bcf18fd5f9558300f7ea7b801eb8a0fd748bd8745" [[package]] name = "is-terminal" -version = "0.4.0" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aae5bc6e2eb41c9def29a3e0f1306382807764b9b53112030eff57435667352d" +checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" dependencies = [ - "hermit-abi 0.2.6", + "hermit-abi 0.3.1", "io-lifetimes 1.0.2", - "rustix 0.36.3", - "windows-sys 0.42.0", + "rustix 0.37.3", + "windows-sys 0.48.0", ] [[package]] @@ -2421,6 +2578,37 @@ dependencies = [ "static_assertions", ] +[[package]] +name = "lalrpop" +version = "0.19.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a1cbf952127589f2851ab2046af368fd20645491bb4b376f04b7f94d7a9837b" +dependencies = [ + "ascii-canvas", + "bit-set", + "diff", + "ena", + "is-terminal", + "itertools", + "lalrpop-util", + "petgraph", + "regex", + "regex-syntax", + "string_cache", + "term", + "tiny-keccak", + "unicode-xid", +] + +[[package]] +name = "lalrpop-util" +version = "0.19.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3c48237b9604c5a4702de6b824e02006c3214327564636aef27c1028a8fa0ed" +dependencies = [ + "regex", +] + [[package]] name = "lazy_static" version = "1.4.0" @@ -2494,6 +2682,12 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f9f08d8963a6c613f4b1a78f4f4a4dbfadf8e6545b2d72861731e4858b8b47f" +[[package]] +name = "linux-raw-sys" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" + [[package]] name = "liquid" version = "0.26.0" @@ -2533,7 +2727,7 @@ checksum = "926454345f103e8433833077acdbfaa7c3e4b90788d585a8358f02f0b8f5a469" dependencies = [ "proc-macro2", "proc-quote", - "syn", + "syn 1.0.103", ] [[package]] @@ -2567,7 +2761,30 @@ version = "0.4.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", +] + +[[package]] +name = "logos" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf8b031682c67a8e3d5446840f9573eb7fe26efe7ec8d195c9ac4c0647c502f1" +dependencies = [ + "logos-derive", +] + +[[package]] +name = "logos-derive" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1d849148dbaf9661a6151d1ca82b13bb4c4c128146a88d05253b38d4e2f496c" +dependencies = [ + "beef", + "fnv", + "proc-macro2", + "quote", + "regex-syntax", + "syn 1.0.103", ] [[package]] @@ -2624,10 +2841,23 @@ version = "4.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1c90329e44f9208b55f45711f9558cec15d7ef8295cc65ecd6d4188ae8edc58c" dependencies = [ - "atty", - "backtrace", "miette-derive 4.7.1", "once_cell", + "thiserror", + "unicode-width", +] + +[[package]] +name = "miette" +version = "5.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59bb584eaeeab6bd0226ccf3509a69d7936d148cf3d036ad350abe35e8c6856e" +dependencies = [ + "backtrace", + "backtrace-ext", + "is-terminal", + "miette-derive 5.10.0", + "once_cell", "owo-colors", "supports-color", "supports-hyperlinks", @@ -2638,18 +2868,6 @@ dependencies = [ "unicode-width", ] -[[package]] -name = "miette" -version = "5.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4afd9b301defa984bbdbe112b4763e093ed191750a0d914a78c1106b2d0fe703" -dependencies = [ - "miette-derive 5.5.0", - "once_cell", - "thiserror", - "unicode-width", -] - [[package]] name = "miette-derive" version = "4.7.1" @@ -2658,18 +2876,18 @@ checksum = "6b5bc45b761bcf1b5e6e6c4128cd93b84c218721a8d9b894aa0aff4ed180174c" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.103", ] [[package]] name = "miette-derive" -version = "5.5.0" +version = "5.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97c2401ab7ac5282ca5c8b518a87635b1a93762b0b90b9990c509888eeccba29" +checksum = "49e7bc1560b95a3c4a25d03de42fe76ca718ab92d1a22a55b9b4cf67b3ae635c" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.28", ] [[package]] @@ -2723,6 +2941,12 @@ dependencies = [ "windows-sys 0.42.0", ] +[[package]] +name = "new_debug_unreachable" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54" + [[package]] name = "newline-converter" version = "0.2.2" @@ -2739,23 +2963,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" dependencies = [ "bitflags", - "cfg-if 1.0.0", + "cfg-if", "libc", "memoffset", "pin-utils", "static_assertions", ] -[[package]] -name = "nom" -version = "5.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af" -dependencies = [ - "memchr", - "version_check", -] - [[package]] name = "nom" version = "7.1.1" @@ -2888,7 +3102,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "29d971fd5722fec23977260f6e81aa67d2f22cadbdc2aa049f1022d9a3be1566" dependencies = [ "bitflags", - "cfg-if 1.0.0", + "cfg-if", "foreign-types", "libc", "once_cell", @@ -2904,7 +3118,7 @@ checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.103", ] [[package]] @@ -2941,7 +3155,7 @@ dependencies = [ "lazy_static", "percent-encoding", "pin-project", - "rand 0.8.5", + "rand", "thiserror", ] @@ -2965,12 +3179,6 @@ dependencies = [ "windows-sys 0.42.0", ] -[[package]] -name = "os_str_bytes" -version = "6.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee" - [[package]] name = "outref" version = "0.1.0" @@ -3005,7 +3213,7 @@ version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4dc9e0dc2adc1c69d09143aff38d3d30c5c3f0df0dad82e6d25547af174ebec0" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "libc", "redox_syscall", "smallvec", @@ -3019,7 +3227,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7676374caaee8a325c9e7a2ae557f216c5563a171d6997b0ef8a65af35147700" dependencies = [ "base64ct", - "rand_core 0.6.4", + "rand_core", "subtle", ] @@ -3077,7 +3285,7 @@ dependencies = [ "pest_meta", "proc-macro2", "quote", - "syn", + "syn 1.0.103", ] [[package]] @@ -3092,39 +3300,58 @@ dependencies = [ ] [[package]] -name = "phf" -version = "0.8.0" +name = "petgraph" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12" +checksum = "4dd7d28ee937e54fe3080c91faa1c3a46c06de6252988a7f4592ba2310ef22a4" dependencies = [ - "phf_shared", + "fixedbitset", + "indexmap 1.9.2", +] + +[[package]] +name = "phf" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" +dependencies = [ + "phf_shared 0.11.2", ] [[package]] name = "phf_codegen" -version = "0.8.0" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbffee61585b0411840d3ece935cce9cb6321f01c45477d30066498cd5e1a815" +checksum = "e8d39688d359e6b34654d328e262234662d16cc0f60ec8dcbe5e718709342a5a" dependencies = [ "phf_generator", - "phf_shared", + "phf_shared 0.11.2", ] [[package]] name = "phf_generator" -version = "0.8.0" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17367f0cc86f2d25802b2c26ee58a7b23faeccf78a396094c13dced0d0182526" +checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" dependencies = [ - "phf_shared", - "rand 0.7.3", + "phf_shared 0.11.2", + "rand", ] [[package]] name = "phf_shared" -version = "0.8.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c00cf8b9eafe68dde5e9eaa2cef8ee84a9336a47d566ec55ca16589633b65af7" +checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" +dependencies = [ + "siphasher", +] + +[[package]] +name = "phf_shared" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" dependencies = [ "siphasher", ] @@ -3146,7 +3373,7 @@ checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.103", ] [[package]] @@ -3180,28 +3407,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] -name = "proc-macro-error" -version = "1.0.4" +name = "precomputed-hash" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", - "syn", - "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", -] +checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" [[package]] name = "proc-macro-hack" @@ -3211,9 +3420,9 @@ checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" [[package]] name = "proc-macro2" -version = "1.0.47" +version = "1.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725" +checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" dependencies = [ "unicode-ident", ] @@ -3228,7 +3437,7 @@ dependencies = [ "proc-macro2", "proc-quote-impl", "quote", - "syn", + "syn 1.0.103", ] [[package]] @@ -3266,27 +3475,13 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.21" +version = "1.0.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" +checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965" 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", - "rand_pcg", -] - [[package]] name = "rand" version = "0.8.5" @@ -3294,18 +3489,8 @@ 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]] @@ -3315,16 +3500,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]] @@ -3333,25 +3509,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.8", -] - -[[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 = "rand_pcg" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429" -dependencies = [ - "rand_core 0.5.1", + "getrandom", ] [[package]] @@ -3392,7 +3550,7 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" dependencies = [ - "getrandom 0.2.8", + "getrandom", "redox_syscall", "thiserror", ] @@ -3442,7 +3600,7 @@ version = "0.11.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68cc60575865c7831548863cc02356512e3f1dc2f3f82cb837d7fc4cc8f3c97c" dependencies = [ - "base64", + "base64 0.13.1", "bytes", "encoding_rs", "futures-core", @@ -3512,7 +3670,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "727a1a6d65f786ec22df8a81ca3121107f235970dc1705ed681d3e6e8b9cd5f9" dependencies = [ "bitflags", - "errno", + "errno 0.2.8", "io-lifetimes 0.7.5", "libc", "linux-raw-sys 0.0.46", @@ -3526,13 +3684,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b1fbb4dfc4eb1d390c02df47760bb19a84bb80b301ecc947ab5406394d8223e" dependencies = [ "bitflags", - "errno", + "errno 0.2.8", "io-lifetimes 1.0.2", "libc", "linux-raw-sys 0.1.3", "windows-sys 0.42.0", ] +[[package]] +name = "rustix" +version = "0.37.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62b24138615de35e32031d041a09032ef3487a616d901ca4db224e7d557efae2" +dependencies = [ + "bitflags", + "errno 0.3.1", + "io-lifetimes 1.0.2", + "libc", + "linux-raw-sys 0.3.8", + "windows-sys 0.45.0", +] + [[package]] name = "rustls" version = "0.20.7" @@ -3563,7 +3735,7 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0864aeff53f8c05aa08d86e5ef839d3dfcf07aeba2db32f12db0ef716e87bd55" dependencies = [ - "base64", + "base64 0.13.1", ] [[package]] @@ -3721,7 +3893,7 @@ checksum = "4f1d362ca8fc9c3e3a7484440752472d68a6caa98f1ab81d99b5dfe517cec852" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.103", ] [[package]] @@ -3735,6 +3907,15 @@ dependencies = [ "serde", ] +[[package]] +name = "serde_spanned" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186" +dependencies = [ + "serde", +] + [[package]] name = "serde_urlencoded" version = "0.7.1" @@ -3753,7 +3934,7 @@ version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "cpufeatures", "digest", ] @@ -3770,7 +3951,7 @@ version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "cpufeatures", "digest", ] @@ -3913,6 +4094,19 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" +[[package]] +name = "string_cache" +version = "0.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b" +dependencies = [ + "new_debug_unreachable", + "once_cell", + "parking_lot", + "phf_shared 0.10.0", + "precomputed-hash", +] + [[package]] name = "strsim" version = "0.10.0" @@ -3935,7 +4129,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn", + "syn 1.0.103", ] [[package]] @@ -3946,30 +4140,30 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" [[package]] name = "supports-color" -version = "1.3.1" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ba6faf2ca7ee42fdd458f4347ae0a9bd6bcc445ad7cb57ad82b383f18870d6f" +checksum = "4950e7174bffabe99455511c39707310e7e9b440364a2fcb1cc21521be57b354" dependencies = [ - "atty", + "is-terminal", "is_ci", ] [[package]] name = "supports-hyperlinks" -version = "1.2.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "590b34f7c5f01ecc9d78dba4b3f445f31df750a67621cf31626f3b7441ce6406" +checksum = "f84231692eb0d4d41e4cdd0cabfdd2e6cd9e255e65f80c9aa7c98dd502b4233d" dependencies = [ - "atty", + "is-terminal", ] [[package]] name = "supports-unicode" -version = "1.0.2" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8b945e45b417b125a8ec51f1b7df2f8df7920367700d1f98aedd21e5735f8b2" +checksum = "4b6c2cb240ab5dd21ed4906895ee23fe5a48acdbd15a3ce388e7b62a9b66baf7" dependencies = [ - "atty", + "is-terminal", ] [[package]] @@ -3983,6 +4177,17 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "syn" +version = "2.0.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04361975b3f5e348b2189d8dc55bc942f278b2d482a6a0365de5bdd62d351567" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + [[package]] name = "sync_wrapper" version = "0.1.1" @@ -4011,13 +4216,24 @@ version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af18f7ae1acd354b992402e9ec5864359d693cd8a79dcbef59f76891701c1e95" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "fastrand", "redox_syscall", "rustix 0.36.3", "windows-sys 0.42.0", ] +[[package]] +name = "term" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c59df8ac95d96ff9bede18eb7300b0fda5e5d8d90960e76f8e14ae765eedbf1f" +dependencies = [ + "dirs-next", + "rustversion", + "winapi", +] + [[package]] name = "termcolor" version = "1.1.3" @@ -4049,13 +4265,13 @@ dependencies = [ [[package]] name = "terminfo" -version = "0.7.3" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76971977e6121664ec1b960d1313aacfa75642adc93b9d4d53b247bd4cb1747e" +checksum = "666cd3a6681775d22b200409aad3b089c5b99fb11ecdd8a204d9d62f8148498f" dependencies = [ - "dirs 2.0.2", + "dirs", "fnv", - "nom 5.1.2", + "nom", "phf", "phf_codegen", ] @@ -4073,22 +4289,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.38" +version = "1.0.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0" +checksum = "611040a08a0439f8248d1990b111c95baa9c704c805fa1f62104b39655fd7f90" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.38" +version = "1.0.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f" +checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.28", ] [[package]] @@ -4140,6 +4356,15 @@ dependencies = [ "time-core", ] +[[package]] +name = "tiny-keccak" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" +dependencies = [ + "crunchy", +] + [[package]] name = "tinyvec" version = "1.6.0" @@ -4176,14 +4401,17 @@ dependencies = [ [[package]] name = "tokio-graceful-shutdown" -version = "0.5.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b9614e6d7b687b4daf9b5191d45039258b19405fb1493051cee400f29ec0e57" +checksum = "30666f313a52f7e87e9f14212d3e33c2ab59b444c405188ffcf8c36a84ca7688" dependencies = [ - "anyhow", "async-recursion", + "async-trait", "futures", "log", + "miette 5.10.0", + "pin-project-lite", + "thiserror", "tokio", "tokio-util", ] @@ -4196,7 +4424,7 @@ checksum = "9724f9a975fb987ef7a3cd9be0350edcbe130698af5b8f7a631e23d42d052484" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.103", ] [[package]] @@ -4235,6 +4463,18 @@ dependencies = [ "tracing", ] +[[package]] +name = "toml" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ebafdf5ad1220cb59e7d17cf4d2c72015297b75b19a10472f99b89225089240" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime 0.6.3", + "toml_edit 0.19.11", +] + [[package]] name = "toml_datetime" version = "0.5.0" @@ -4244,6 +4484,15 @@ dependencies = [ "serde", ] +[[package]] +name = "toml_datetime" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" +dependencies = [ + "serde", +] + [[package]] name = "toml_edit" version = "0.15.0" @@ -4251,11 +4500,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b1541ba70885967e662f69d31ab3aeca7b1aaecfcd58679590b893e9239c3646" dependencies = [ "combine", - "indexmap", + "indexmap 1.9.2", "itertools", "kstring", "serde", - "toml_datetime", + "toml_datetime 0.5.0", +] + +[[package]] +name = "toml_edit" +version = "0.19.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "266f016b7f039eec8a1a80dfe6156b633d208b9fccca5e4db1d6775b0c4e34a7" +dependencies = [ + "indexmap 2.0.0", + "serde", + "serde_spanned", + "toml_datetime 0.6.3", + "winnow", ] [[package]] @@ -4313,7 +4575,7 @@ version = "0.1.37" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "log", "pin-project-lite", "tracing-attributes", @@ -4328,7 +4590,7 @@ checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.103", ] [[package]] @@ -4426,7 +4688,7 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c5faade31a542b8b35855fff6e8def199853b2da8da256da52f52f1316ee3137" dependencies = [ - "hashbrown", + "hashbrown 0.12.3", "regex", ] @@ -4480,13 +4742,19 @@ version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8db7427f936968176eaa7cdf81b7f98b980b18495ec28f1b5791ac3bfe3eea9" +[[package]] +name = "utf8parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" + [[package]] name = "uuid" version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "422ee0de9031b5b948b97a8fc04e3aa35230001a722ddd27943e0be31564ce4c" dependencies = [ - "getrandom 0.2.8", + "getrandom", ] [[package]] @@ -4537,12 +4805,6 @@ dependencies = [ "try-lock", ] -[[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.10.0+wasi-snapshot-preview1" @@ -4561,7 +4823,7 @@ version = "0.2.83" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "wasm-bindgen-macro", ] @@ -4576,7 +4838,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn", + "syn 1.0.103", "wasm-bindgen-shared", ] @@ -4586,7 +4848,7 @@ version = "0.4.33" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "23639446165ca5a5de86ae1d8896b737ae80319560fbaa4c2887b7da6e7ebd7d" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "js-sys", "wasm-bindgen", "web-sys", @@ -4610,7 +4872,7 @@ checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.103", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -4623,9 +4885,9 @@ checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f" [[package]] name = "watchexec" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f44a7216549b0e37228ec8ffd46ef32119c5f27a29a2a1cddd655e3059b80e6e" +checksum = "f8b97d05a9305a9aa6a7bedef64cd012ebc9b6f1f5ed0368fb48f0fe58f96988" dependencies = [ "async-priority-channel", "async-recursion", @@ -4634,7 +4896,7 @@ dependencies = [ "command-group", "futures", "ignore-files", - "miette 5.5.0", + "miette 5.10.0", "nix", "normalize-path", "notify", @@ -4676,7 +4938,7 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cc2a5df96c388901c94ca04055fcd51d4196ca3e971c5e805bd4a4b61dd6a7e5" dependencies = [ - "miette 5.5.0", + "miette 5.10.0", "nix", "thiserror", ] @@ -4758,12 +5020,12 @@ version = "0.43.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04662ed0e3e5630dfa9b26e4cb823b817f1a9addda855d973a9458c236556244" dependencies = [ - "windows_aarch64_gnullvm", + "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", + "windows_x86_64_gnullvm 0.42.2", "windows_x86_64_msvc 0.42.2", ] @@ -4786,12 +5048,12 @@ version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" dependencies = [ - "windows_aarch64_gnullvm", + "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", + "windows_x86_64_gnullvm 0.42.2", "windows_x86_64_msvc 0.42.2", ] @@ -4801,7 +5063,16 @@ version = "0.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" dependencies = [ - "windows-targets", + "windows-targets 0.42.2", +] + +[[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.0", ] [[package]] @@ -4810,21 +5081,42 @@ version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" dependencies = [ - "windows_aarch64_gnullvm", + "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", + "windows_x86_64_gnullvm 0.42.2", "windows_x86_64_msvc 0.42.2", ] +[[package]] +name = "windows-targets" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" +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", +] + [[package]] name = "windows_aarch64_gnullvm" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" + [[package]] name = "windows_aarch64_msvc" version = "0.36.1" @@ -4837,6 +5129,12 @@ 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_i686_gnu" version = "0.36.1" @@ -4849,6 +5147,12 @@ version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" 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_msvc" version = "0.36.1" @@ -4861,6 +5165,12 @@ 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_x86_64_gnu" version = "0.36.1" @@ -4873,12 +5183,24 @@ 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_gnullvm" 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_msvc" version = "0.36.1" @@ -4891,6 +5213,21 @@ 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 = "winnow" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca0ace3845f0d96209f0375e6d367e3eb87eb65d27d445bdc9f1843a26f39448" +dependencies = [ + "memchr", +] + [[package]] name = "winreg" version = "0.10.1" diff --git a/pkgs/development/tools/rust/cargo-lambda/default.nix b/pkgs/development/tools/rust/cargo-lambda/default.nix index f3cceec061ed..9efbc79ca0d1 100644 --- a/pkgs/development/tools/rust/cargo-lambda/default.nix +++ b/pkgs/development/tools/rust/cargo-lambda/default.nix @@ -14,13 +14,13 @@ rustPlatform.buildRustPackage rec { pname = "cargo-lambda"; - version = "0.18.1"; + version = "0.21.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-un+GQflxhMHCMH5UEeUVsYx59ryn7MR4ApooeOuhccc="; + hash = "sha256-QlTAYfd0taXfK370nzqictwK7bZ4bnh1oPBJKZzhnMo="; }; cargoLock = { @@ -37,10 +37,15 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ curl CoreServices Security ]; checkFlags = [ - # Disabled because they accesses the network. + # Disabled because they access the network. "--skip=test_build_basic_extension" "--skip=test_build_basic_function" + "--skip=test_build_basic_zip_extension" + "--skip=test_build_basic_zip_function" + "--skip=test_build_event_type_function" + "--skip=test_build_http_feature_function" "--skip=test_build_http_function" + "--skip=test_build_internal_zip_extension" "--skip=test_build_logs_extension" "--skip=test_build_telemetry_extension" "--skip=test_download_example" From cd7babfc8bd9c45bc336436a097f84ba36c90415 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 8 Oct 2023 13:58:31 +0300 Subject: [PATCH 21/80] uhd: add passthru.updateScript --- pkgs/applications/radio/uhd/default.nix | 20 ++++++++++++++---- pkgs/applications/radio/uhd/update.sh | 27 +++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 4 deletions(-) create mode 100755 pkgs/applications/radio/uhd/update.sh diff --git a/pkgs/applications/radio/uhd/default.nix b/pkgs/applications/radio/uhd/default.nix index 5dbed65484de..1bfd8476aee8 100644 --- a/pkgs/applications/radio/uhd/default.nix +++ b/pkgs/applications/radio/uhd/default.nix @@ -49,8 +49,10 @@ in stdenv.mkDerivation (finalAttrs: { pname = "uhd"; - # UHD seems to use three different version number styles: x.y.z, xxx_yyy_zzz - # and xxx.yyy.zzz. Hrmpf... style keeps changing + # NOTE: Use the following command to update the package, and the uhdImageSrc attribute: + # + # nix-shell maintainers/scripts/update.nix --argstr package uhd --argstr commit true + # version = "4.4.0.0"; outputs = [ "out" "dev" ]; @@ -59,14 +61,24 @@ stdenv.mkDerivation (finalAttrs: { owner = "EttusResearch"; repo = "uhd"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-khVOHlvacZc4EMg4m55rxEqPvLY1xURpAfOW905/3jg="; + # The updateScript relies on the `src` using `hash`, and not `sha256. To + # update the correct hash for the `src` vs the `uhdImagesSrc` + hash = "sha256-khVOHlvacZc4EMg4m55rxEqPvLY1xURpAfOW905/3jg="; }; # Firmware images are downloaded (pre-built) from the respective release on Github uhdImagesSrc = fetchurl { url = "https://github.com/EttusResearch/uhd/releases/download/v${finalAttrs.version}/uhd-images_${finalAttrs.version}.tar.xz"; + # Please don't convert this to a hash, in base64, see comment near src's + # hash. sha256 = "V8ldW8bvYWbrDAvpWpHcMeLf9YvF8PIruDAyNK/bru4="; }; - # TODO: Add passthru.updateScript that will update both of the above hashes... + passthru = { + updateScript = [ + ./update.sh + # Pass it this file name as argument + (builtins.unsafeGetAttrPos "pname" finalAttrs.finalPackage).file + ]; + }; cmakeFlags = [ "-DENABLE_LIBUHD=ON" diff --git a/pkgs/applications/radio/uhd/update.sh b/pkgs/applications/radio/uhd/update.sh new file mode 100755 index 000000000000..e52fb0590410 --- /dev/null +++ b/pkgs/applications/radio/uhd/update.sh @@ -0,0 +1,27 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p jq nix nix-prefetch-github + +set -euo pipefail +echoerr() { echo "$@" 1>&2; } + +fname="$1" +echoerr got fname $fname +shift +latest_release=$(curl --silent https://api.github.com/repos/EttusResearch/uhd/releases/latest) +version=$(jq -r '.tag_name' <<<"$latest_release" | cut -c2-) +# Update version, if needed +if grep -q 'version = "'$version $fname; then + echoerr Current version $version is the latest available + exit 0; +fi +echoerr got version $version +sed -i -E 's/(version = ").*(";)/\1'$version'\2/g' $fname +# Verify the sed command above did not fail +grep -q $version $fname +# Update srcHash +srcHash="$(nix-prefetch-github EttusResearch uhd --rev v${version} | jq --raw-output .hash)" +sed -i -E 's#(hash = ").*(";)#\1'$srcHash'\2#g' $fname +grep -q $srcHash $fname +imageHash="$(nix-prefetch-url https://github.com/EttusResearch/uhd/releases/download/v${version}/uhd-images_${version}.tar.xz)" +sed -i -E 's#(sha256 = ").*(";)#\1'$imageHash'\2#g' $fname +grep -q $imageHash $fname From 4f03332c703142bfcc3fb4cc7efd6f5f3ecec45e Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 8 Oct 2023 11:08:33 +0000 Subject: [PATCH 22/80] uhd: 4.4.0.0 -> 4.5.0.0 --- pkgs/applications/radio/uhd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/radio/uhd/default.nix b/pkgs/applications/radio/uhd/default.nix index 1bfd8476aee8..6a196cdea350 100644 --- a/pkgs/applications/radio/uhd/default.nix +++ b/pkgs/applications/radio/uhd/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: { # # nix-shell maintainers/scripts/update.nix --argstr package uhd --argstr commit true # - version = "4.4.0.0"; + version = "4.5.0.0"; outputs = [ "out" "dev" ]; @@ -63,14 +63,14 @@ stdenv.mkDerivation (finalAttrs: { rev = "v${finalAttrs.version}"; # The updateScript relies on the `src` using `hash`, and not `sha256. To # update the correct hash for the `src` vs the `uhdImagesSrc` - hash = "sha256-khVOHlvacZc4EMg4m55rxEqPvLY1xURpAfOW905/3jg="; + hash = "sha256-0EqMBaQiNr8PE542YNkPvX3o1HhnhrO0Kz1euphY6Ps="; }; # Firmware images are downloaded (pre-built) from the respective release on Github uhdImagesSrc = fetchurl { url = "https://github.com/EttusResearch/uhd/releases/download/v${finalAttrs.version}/uhd-images_${finalAttrs.version}.tar.xz"; # Please don't convert this to a hash, in base64, see comment near src's # hash. - sha256 = "V8ldW8bvYWbrDAvpWpHcMeLf9YvF8PIruDAyNK/bru4="; + sha256 = "13cn41wv7vldk4vx7vy3jbb3wb3a5vpfg3ay893klpi6vzxc1dly"; }; passthru = { updateScript = [ From 45b1d202eff8fad701bba815cdfc30dea79b91f3 Mon Sep 17 00:00:00 2001 From: Justin Bedo Date: Mon, 9 Oct 2023 09:20:18 +1100 Subject: [PATCH 23/80] rstudio: fix server node patching --- pkgs/applications/editors/rstudio/default.nix | 3 ++ .../editors/rstudio/use-system-node.patch | 30 ++++++++++++++++++- 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix index 2ce482f356c8..82a572eaf4c5 100644 --- a/pkgs/applications/editors/rstudio/default.nix +++ b/pkgs/applications/editors/rstudio/default.nix @@ -145,6 +145,9 @@ in --replace '@node@' ${nodejs} \ --replace './lib/quarto' ${quartoSrc} + substituteInPlace src/cpp/conf/rsession-dev.conf \ + --replace '@node@' ${nodejs} + substituteInPlace src/cpp/core/libclang/LibClang.cpp \ --replace '@libclang@' ${llvmPackages.libclang.lib} \ --replace '@libclang.so@' ${llvmPackages.libclang.lib}/lib/libclang.so diff --git a/pkgs/applications/editors/rstudio/use-system-node.patch b/pkgs/applications/editors/rstudio/use-system-node.patch index 859349096134..bb4480b4ae5f 100644 --- a/pkgs/applications/editors/rstudio/use-system-node.patch +++ b/pkgs/applications/editors/rstudio/use-system-node.patch @@ -1,5 +1,33 @@ +diff --git a/src/cpp/conf/rsession-dev.conf b/src/cpp/conf/rsession-dev.conf +index d18362b..98cdd4c 100644 +--- a/src/cpp/conf/rsession-dev.conf ++++ b/src/cpp/conf/rsession-dev.conf +@@ -39,7 +39,7 @@ external-mathjax-path=${RSTUDIO_DEPENDENCIES_MATHJAX_DIR} + external-pandoc-path=${RSTUDIO_DEPENDENCIES_PANDOC_DIR} + external-quarto-path=${RSTUDIO_DEPENDENCIES_QUARTO_DIR} + external-libclang-path=${RSTUDIO_DEPENDENCIES_DIR}/common/libclang +-external-node-path=${RSTUDIO_DEPENDENCIES_DIR}/common/node/16.14.0/bin/node ++external-node-path=@node@/bin/node + + # enable copilot + copilot-enabled=1 +diff --git a/src/cpp/server/CMakeLists.txt b/src/cpp/server/CMakeLists.txt +index 30dd638..cb4a645 100644 +--- a/src/cpp/server/CMakeLists.txt ++++ b/src/cpp/server/CMakeLists.txt +@@ -250,10 +250,6 @@ if (UNIX AND NOT APPLE) + DESTINATION ${RSERVER_SYSTEMD_DIR}) + + # install node +- install( +- DIRECTORY "${RSTUDIO_DEPENDENCIES_DIR}/common/node/${RSTUDIO_NODE_VERSION}/" +- DESTINATION "${RSTUDIO_INSTALL_BIN}/node" +- USE_SOURCE_PERMISSIONS) + + elseif(APPLE) + diff --git a/src/gwt/build.xml b/src/gwt/build.xml -index 83e9433..f1ee63d 100644 +index 033d605..f1ee63d 100644 --- a/src/gwt/build.xml +++ b/src/gwt/build.xml @@ -87,29 +87,7 @@ From 6af2ce359094a2d89557261da7332737cc31c6f5 Mon Sep 17 00:00:00 2001 From: Max Hille Date: Mon, 2 Oct 2023 09:58:26 +0200 Subject: [PATCH 24/80] aether: remove (unmaintained upstream, sec issues) --- maintainers/maintainer-list.nix | 6 - .../networking/aether/default.nix | 112 ------------------ pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 4 files changed, 1 insertion(+), 120 deletions(-) delete mode 100644 pkgs/applications/networking/aether/default.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 227456f2e95d..7ca1c4051512 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -11013,12 +11013,6 @@ githubId = 4708337; name = "Marcelo A. de L. Santos"; }; - maxhille = { - email = "mh@lambdasoup.com"; - github = "maxhille"; - githubId = 693447; - name = "Max Hille"; - }; maximsmol = { email = "maximsmol@gmail.com"; github = "maximsmol"; diff --git a/pkgs/applications/networking/aether/default.nix b/pkgs/applications/networking/aether/default.nix deleted file mode 100644 index 62dbae082d9a..000000000000 --- a/pkgs/applications/networking/aether/default.nix +++ /dev/null @@ -1,112 +0,0 @@ -{ autoPatchelfHook, makeDesktopItem, lib, stdenv, wrapGAppsHook -, alsa-lib, at-spi2-atk, at-spi2-core, atk, cairo, cups, dbus, expat, fontconfig -, freetype, gdk-pixbuf, glib, gtk3, libcxx, libdrm, libnotify, libpulseaudio, libuuid -, libX11, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext -, libXfixes, libXi, libXrandr, libXrender, libXtst, libxcb, libxshmfence -, mesa, nspr, nss, pango, systemd, libappindicator-gtk3, libdbusmenu -, fetchurl, fetchFromGitHub, imagemagick, copyDesktopItems -}: - -let - binaryName = "AetherP2P"; - aether-app-git = fetchFromGitHub { - owner = "aethereans"; - repo = "aether-app"; - rev = "53b6c8b2a9253cbf056ea3ebb077e0e08cbc5b1d"; - sha256 = "1kgkzh7ih2q9dsckdkinh5dbzvr7gdykf8yz6h8pyhvzyjhk1v0r"; - }; -in -stdenv.mkDerivation rec { - pname = "aether"; - version = "2.0.0-dev.15"; - - src = fetchurl { - url = "https://static.getaether.net/Releases/Aether-${version}/2011262249.19338c93/linux/Aether-${version}%2B2011262249.19338c93.tar.gz"; - sha256 = "1hi8w83zal3ciyzg2m62shkbyh6hj7gwsidg3dn88mhfy68himf7"; - # % in the url / canonical filename causes an error - name = "aether-tarball.tar.gz"; - }; - - # there is no logo in the tarball so we grab it from github and convert it in the build phase - buildPhase = '' - convert ${aether-app-git}/aether-core/aether/client/src/app/ext_dep/images/Linux-Windows-App-Icon.png -resize 512x512 aether.png - ''; - - dontWrapGApps = true; - - buildInputs = [ - alsa-lib - cups - libdrm - libuuid - libXdamage - libX11 - libXScrnSaver - libXtst - libxcb - libxshmfence - mesa - nss - ]; - - nativeBuildInputs = [ - imagemagick - autoPatchelfHook - wrapGAppsHook - copyDesktopItems - ]; - - desktopItems = [ - (makeDesktopItem { - name = pname; - exec = binaryName; - icon = pname; - desktopName = "Aether"; - genericName = meta.description; - categories = [ "Network" ]; - mimeTypes = [ "x-scheme-handler/aether" ]; - }) - ]; - - installPhase = - let - libPath = lib.makeLibraryPath [ - libcxx systemd libpulseaudio libdrm mesa - stdenv.cc.cc alsa-lib atk at-spi2-atk at-spi2-core cairo cups dbus expat fontconfig freetype - gdk-pixbuf glib gtk3 libnotify libX11 libXcomposite libuuid - libXcursor libXdamage libXext libXfixes libXi libXrandr libXrender - libXtst nspr nss libxcb pango systemd libXScrnSaver - libappindicator-gtk3 libdbusmenu - ]; - in - '' - mkdir -p $out/{bin,opt/${binaryName},share/icons/hicolor/512x512/apps} - mv * $out/opt/${binaryName} - - chmod +x $out/opt/${binaryName}/${binaryName} - patchelf --set-interpreter ${stdenv.cc.bintools.dynamicLinker} \ - $out/opt/${binaryName}/${binaryName} - - wrapProgram $out/opt/${binaryName}/${binaryName} \ - "''${gappsWrapperArgs[@]}" \ - --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}" \ - --prefix LD_LIBRARY_PATH : ${libPath} - - ln -s $out/opt/${binaryName}/${binaryName} $out/bin/ - - ln -s $out/opt/${binaryName}/aether.png $out/share/icons/hicolor/512x512/apps/ - - runHook postInstall - ''; - - meta = with lib; { - description = "Peer-to-peer ephemeral public communities"; - homepage = "https://getaether.net/"; - downloadPage = "https://getaether.net/download/"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.agpl3Only; - maintainers = with maintainers; [ maxhille ]; - # other platforms could be supported by building from source - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 8831f69b60c0..92278a94c887 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -56,6 +56,7 @@ mapAliases ({ ### A ### a4term = a4; # Added 2023-10-06 + aether = throw "aether has been removed from nixpkgs; upstream unmaintained, security issues"; # Added 2023-10-03 airfield = throw "airfield has been removed due to being unmaintained"; # Added 2023-05-19 alertmanager-bot = throw "alertmanager-bot is broken and has been archived by upstream" ; # Added 2023-07-28 alsaLib = alsa-lib; # Added 2021-06-09 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c4af87459a2b..c55a0b4c1e5d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -237,8 +237,6 @@ with pkgs; adcli = callPackage ../os-specific/linux/adcli { }; - aether = callPackage ../applications/networking/aether { }; - alda = callPackage ../development/interpreters/alda { }; align = callPackage ../tools/text/align { }; From 116ab287c59d9861ecc1404488bff0219cba6d69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Mon, 9 Oct 2023 09:01:53 -0400 Subject: [PATCH 25/80] maintainers/fix-maintainers.pl: handle null github handles * use attrname in log messages instead of github handle * don't remove users simply for empty github handles, if their user still exists (prevents #259555) --- maintainers/scripts/fix-maintainers.pl | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/maintainers/scripts/fix-maintainers.pl b/maintainers/scripts/fix-maintainers.pl index a83df9ec0cf0..6432f0ca83e1 100755 --- a/maintainers/scripts/fix-maintainers.pl +++ b/maintainers/scripts/fix-maintainers.pl @@ -18,7 +18,6 @@ while(my($k, $v) = each %$maintainers_json) { my $current_user = %$v{'github'}; if (!defined $current_user) { print "$k has no github handle\n"; - next; } my $github_id = %$v{'githubId'}; if (!defined $github_id) { @@ -37,13 +36,16 @@ while(my($k, $v) = each %$maintainers_json) { sleep($ratelimit_reset - time() + 5); } if ($resp->code != 200) { - print $current_user . " likely deleted their github account\n"; + print "$k likely deleted their github account\n"; next; } my $resp_json = from_json($resp->content); my $api_user = %$resp_json{"login"}; - if (lc($current_user) ne lc($api_user)) { - print $current_user . " is now known on github as " . $api_user . ". Editing maintainer-list.nix…\n"; + if (!defined $current_user) { + print "$k is known on github as $api_user.\n"; + } + elsif (lc($current_user) ne lc($api_user)) { + print "$k is now known on github as $api_user. Editing maintainer-list.nix…\n"; my $file = path($maintainers_list_nix); my $data = $file->slurp_utf8; $data =~ s/github = "$current_user";$/github = "$api_user";/m; From b623143563badceb3fe59056f26bbab21de97783 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Mon, 9 Oct 2023 09:05:38 -0400 Subject: [PATCH 26/80] maintainers/fix-maintainers.pl: error on unset GH_TOKEN --- maintainers/scripts/fix-maintainers.pl | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/maintainers/scripts/fix-maintainers.pl b/maintainers/scripts/fix-maintainers.pl index 6432f0ca83e1..c953cff5cc48 100755 --- a/maintainers/scripts/fix-maintainers.pl +++ b/maintainers/scripts/fix-maintainers.pl @@ -13,6 +13,10 @@ STDOUT->autoflush(1); my $ua = LWP::UserAgent->new(); +if (!defined $ENV{GH_TOKEN}) { + die "Set GH_TOKEN before running this script"; +} + keys %$maintainers_json; # reset the internal iterator so a prior each() doesn't affect the loop while(my($k, $v) = each %$maintainers_json) { my $current_user = %$v{'github'}; From 2e722bdfdbe6cef13d88f9c466f84be4122f0d13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Mon, 9 Oct 2023 09:15:55 -0400 Subject: [PATCH 27/80] maintainers: Fix github account names MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit and drop package maintainership for removed maintainers. davidarmstronglewis is now known on github as oceanlewis. Editing maintainer-list.nix… TravisDavis-ops likely deleted their github account rs0vere likely deleted their github account SamirTalwar is now known on github as abstracte. Editing maintainer-list.nix… --- maintainers/maintainer-list.nix | 19 ++----------------- pkgs/applications/misc/nhentai/default.nix | 2 +- pkgs/by-name/cl/clzip/package.nix | 2 +- pkgs/by-name/re/replxx/package.nix | 2 +- pkgs/development/libraries/kcp/default.nix | 2 +- .../libraries/wfa2-lib/default.nix | 2 +- pkgs/development/tools/cocogitto/default.nix | 2 +- pkgs/games/hmcl/default.nix | 2 +- pkgs/tools/wayland/sov/default.nix | 2 +- 9 files changed, 10 insertions(+), 25 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index a7041571a97b..cced058d67f2 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3956,7 +3956,7 @@ }; davidarmstronglewis = { email = "davidlewis@mac.com"; - github = "davidarmstronglewis"; + github = "oceanlewis"; githubId = 6754950; name = "David Armstrong Lewis"; }; @@ -15094,15 +15094,6 @@ }]; name = "Rahul Butani"; }; - rs0vere = { - email = "rs0vere@proton.me"; - github = "rs0vere"; - githubId = 140035635; - keys = [{ - fingerprint = "C6D8 B5C2 FA79 901B DCCF 95E1 FEC4 5C5A ED00 C58D"; - }]; - name = "Red Star Over Earth"; - }; rski = { name = "rski"; email = "rom.skiad+nix@gmail.com"; @@ -15358,7 +15349,7 @@ }; SamirTalwar = { email = "lazy.git@functional.computer"; - github = "SamirTalwar"; + github = "abstracte"; githubId = 47852; name = "Samir Talwar"; }; @@ -17761,12 +17752,6 @@ githubId = 10110; name = "Travis B. Hartwell"; }; - travisdavis-ops = { - email = "travisdavismedia@gmail.com"; - github = "TravisDavis-ops"; - githubId = 52011418; - name = "Travis Davis"; - }; traxys = { email = "quentin+dev@familleboyer.net"; github = "traxys"; diff --git a/pkgs/applications/misc/nhentai/default.nix b/pkgs/applications/misc/nhentai/default.nix index f5284c1ad74d..f1d632a89a32 100644 --- a/pkgs/applications/misc/nhentai/default.nix +++ b/pkgs/applications/misc/nhentai/default.nix @@ -21,6 +21,6 @@ python3Packages.buildPythonApplication rec { homepage = "https://github.com/RicterZ/nhentai"; description = "nHentai is a CLI tool for downloading doujinshi from "; license = licenses.mit; - maintainers = with maintainers; [ travisdavis-ops ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/by-name/cl/clzip/package.nix b/pkgs/by-name/cl/clzip/package.nix index 84f485d39891..feced814f4e5 100644 --- a/pkgs/by-name/cl/clzip/package.nix +++ b/pkgs/by-name/cl/clzip/package.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://www.nongnu.org/lzip/clzip.html"; description = "C language version of lzip"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ rs0vere ]; + maintainers = with maintainers; [ ]; platforms = platforms.all; }; }) diff --git a/pkgs/by-name/re/replxx/package.nix b/pkgs/by-name/re/replxx/package.nix index 2e910855707b..ae8d185bb530 100644 --- a/pkgs/by-name/re/replxx/package.nix +++ b/pkgs/by-name/re/replxx/package.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/AmokHuginnsson/replxx"; description = "A readline and libedit replacement that supports UTF-8, syntax highlighting, hints and Windows and is BSD licensed"; license = licenses.bsd3; - maintainers = with maintainers; [ rs0vere ]; + maintainers = with maintainers; [ ]; platforms = platforms.all; }; }) diff --git a/pkgs/development/libraries/kcp/default.nix b/pkgs/development/libraries/kcp/default.nix index 69a2b91553e4..29bab0087989 100644 --- a/pkgs/development/libraries/kcp/default.nix +++ b/pkgs/development/libraries/kcp/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { description = "A Fast and Reliable ARQ Protocol"; homepage = "https://github.com/skywind3000/kcp"; license = licenses.mit; - maintainers = with maintainers; [ rs0vere ]; + maintainers = with maintainers; [ ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/wfa2-lib/default.nix b/pkgs/development/libraries/wfa2-lib/default.nix index 9555b9faea60..1f97f9c95a6c 100644 --- a/pkgs/development/libraries/wfa2-lib/default.nix +++ b/pkgs/development/libraries/wfa2-lib/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { description = "Wavefront alignment algorithm library v2"; homepage = "https://github.com/smarco/WFA2-lib"; license = licenses.mit; - maintainers = with maintainers; [ rs0vere ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/tools/cocogitto/default.nix b/pkgs/development/tools/cocogitto/default.nix index 1ed22b7eb4f9..8b7b39bba1b1 100644 --- a/pkgs/development/tools/cocogitto/default.nix +++ b/pkgs/development/tools/cocogitto/default.nix @@ -32,6 +32,6 @@ rustPlatform.buildRustPackage rec { description = "A set of cli tools for the conventional commit and semver specifications"; homepage = "https://github.com/oknozor/cocogitto"; license = licenses.mit; - maintainers = with maintainers; [ travisdavis-ops ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/games/hmcl/default.nix b/pkgs/games/hmcl/default.nix index f6ded13dc0f4..fcaa01ea2d95 100644 --- a/pkgs/games/hmcl/default.nix +++ b/pkgs/games/hmcl/default.nix @@ -91,7 +91,7 @@ stdenv.mkDerivation (finalAttrs: { description = "A Minecraft Launcher which is multi-functional, cross-platform and popular"; sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.gpl3Only; - maintainers = with maintainers; [ rs0vere ]; + maintainers = with maintainers; [ ]; inherit (jre.meta) platforms; }; }) diff --git a/pkgs/tools/wayland/sov/default.nix b/pkgs/tools/wayland/sov/default.nix index d7415a5fa517..38578544feb4 100644 --- a/pkgs/tools/wayland/sov/default.nix +++ b/pkgs/tools/wayland/sov/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { description = "An overlay that shows schemas for all workspaces to make navigation in sway easier."; homepage = "https://github.com/milgra/sov"; license = with licenses; [ mit ]; - maintainers = with maintainers; [ travisdavis-ops ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } From a4e79d756a056a608d498a030f81084b0a0f00c2 Mon Sep 17 00:00:00 2001 From: nova madeline <126072875+nova-r@users.noreply.github.com> Date: Tue, 10 Oct 2023 09:14:01 +0200 Subject: [PATCH 28/80] valeronoi: 0.1.9 -> 0.2.0 --- pkgs/tools/misc/valeronoi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/valeronoi/default.nix b/pkgs/tools/misc/valeronoi/default.nix index 95669bbeeb32..8fda179b3042 100644 --- a/pkgs/tools/misc/valeronoi/default.nix +++ b/pkgs/tools/misc/valeronoi/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "valeronoi"; - version = "0.1.9"; + version = "0.2.0"; src = fetchFromGitHub { owner = "ccoors"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-Xa70kOPQLavuJTF9PxCgpKYj15C2fna++cFlCId0a08="; + sha256 = "sha256-4BTBF6h/BEVr0E3E0EvvKOQGHZ4wCtdXgKBWLSfOcOI="; }; buildInputs = [ From eef69c2ee4d2deb7534b1c341c5e71c3102274f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Fern=C3=A1ndez=20L=C3=B3pez?= Date: Tue, 10 Oct 2023 15:09:57 +0200 Subject: [PATCH 29/80] viceroy: 0.8.1 -> 0.9.1 --- pkgs/development/tools/viceroy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/viceroy/default.nix b/pkgs/development/tools/viceroy/default.nix index b093d8c1099f..9f6716e191ee 100644 --- a/pkgs/development/tools/viceroy/default.nix +++ b/pkgs/development/tools/viceroy/default.nix @@ -2,18 +2,18 @@ rustPlatform.buildRustPackage rec { pname = "viceroy"; - version = "0.8.1"; + version = "0.9.1"; src = fetchFromGitHub { owner = "fastly"; repo = pname; rev = "v${version}"; - hash = "sha256-DeKqLbgHmk6034ItyBzWRXLSeOj3+h49bzf9IX3Aa00="; + hash = "sha256-Z5poizMXp4xgn0Tx0E36rvueBx3dFL7++alewqG9E9w="; }; buildInputs = lib.optional stdenv.isDarwin Security; - cargoHash = "sha256-g6XdHl/Jxa+kpIjvnaP/RtoByo5O4IDC+s8M4DfGU/8="; + cargoHash = "sha256-EbvEclXwQgNIYQ/ppbZGhT4v4rMSpreURg2OYhQ7dRI="; cargoTestFlags = [ "--package viceroy-lib" From c24956a978a6bffee1a47c7f2abecc46a155a3fc Mon Sep 17 00:00:00 2001 From: Philipp Woelfel Date: Tue, 10 Oct 2023 20:24:22 -0600 Subject: [PATCH 30/80] pdfstudio2023: init at 2023.0.3 pdfstudio2022: 2022.2.4 -> 2022.2.5 pdfstudio2021: 2021.2.1 -> 2022.2.2 pdfstudioviewer: 2022.2.4->2023.0.3 --- pkgs/applications/misc/pdfstudio/default.nix | 28 ++++++++++++-------- pkgs/top-level/all-packages.nix | 14 ++++------ 2 files changed, 22 insertions(+), 20 deletions(-) diff --git a/pkgs/applications/misc/pdfstudio/default.nix b/pkgs/applications/misc/pdfstudio/default.nix index c6e575a97a69..21874519a7c7 100644 --- a/pkgs/applications/misc/pdfstudio/default.nix +++ b/pkgs/applications/misc/pdfstudio/default.nix @@ -11,7 +11,7 @@ { lib , stdenv , program ? "pdfstudio" -, year ? "2022" +, year ? "2023" , fetchurl , callPackage , jdk11 @@ -31,27 +31,23 @@ in { pdfstudioviewer = callPackage ./common.nix rec { inherit desktopName pname program year; - version = "${year}.2.4"; + version = "${year}.0.3"; longDescription = '' PDF Studio Viewer is an easy to use, full-featured PDF editing software. This is the free edition. For the standard/pro edition, see the package pdfstudio. ''; src = fetchurl { url = "https://download.qoppa.com/pdfstudioviewer/PDFStudioViewer_linux64.deb"; - sha256 = "sha256-QXNsH1T+ItV3s9r8CnwgRUo1mhVbe8LkEun9gUmlVQg="; + sha256 = "sha256-JQx5yJLjwW4VRXLM+/VNDXFN8ZcHJxlxyKDIzc++hEs="; }; jdk = jdk17; - - # Bad hash, got sha256-afRhx9VCVRFUJoUnqs1bzF0yXpz3yEgLiFjMRB9xvsk= - # Likely unstable. - broken = true; }; pdfstudio2021 = callPackage ./common.nix rec { inherit desktopName longDescription pname program year; - version = "${year}.2.1"; + version = "${year}.2.2"; src = fetchurl { url = "https://download.qoppa.com/pdfstudio/v${year}/PDFStudio_v${dot2dash version}_linux64.deb"; - sha256 = "sha256-yELpza2C3HJJIP+ZQP7x3Tfez0Nl6ctCbHCmTmpX3jo="; + sha256 = "sha256-HdkwRMqwquAaW6l3AukGReFtw2f5n36tZ8vXo6QiPvU="; }; extraBuildInputs = [ (lib.getLib stdenv.cc.cc) # for libstdc++.so.6 and libgomp.so.1 @@ -61,14 +57,24 @@ in pdfstudio2022 = callPackage ./common.nix rec { inherit desktopName longDescription pname program year; - version = "${year}.2.4"; + version = "${year}.2.5"; src = fetchurl { url = "https://download.qoppa.com/pdfstudio/v${year}/PDFStudio_v${dot2dash version}_linux64.deb"; - sha256 = "sha256-bti+WI8JdOmUsHq8ijfxGC4ZsWXwbwwM26kuBgPDUMQ="; + sha256 = "sha256-3faZyWUnFe//S+gOskWhsZ6jzHw67FRsv/xP77R1jj4="; }; extraBuildInputs = [ (lib.getLib stdenv.cc.cc) # for libstdc++.so.6 and libgomp.so.1 ]; jdk = jdk17; }; + + pdfstudio2023 = callPackage ./common.nix rec { + inherit desktopName longDescription pname program year; + version = "${year}.0.3"; + src = fetchurl { + url = "https://download.qoppa.com/pdfstudio/v${year}/PDFStudio_v${dot2dash version}_linux64.deb"; + sha256 = "sha256-Po7BMmEWoC46rP7tUwZT9Ji/Wi8lKc6WN8x47fx2DXg="; + }; + jdk = jdk17; + }; }.${pname} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 14bbc19384bf..76bab0c90f42 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30333,17 +30333,13 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Cocoa; }; - pdfstudio2021 = callPackage ../applications/misc/pdfstudio { - year = "2021"; - }; + pdfstudio2021 = callPackage ../applications/misc/pdfstudio { year = "2021"; }; - pdfstudio2022 = callPackage ../applications/misc/pdfstudio { - year = "2022"; - }; + pdfstudio2022 = callPackage ../applications/misc/pdfstudio { year = "2022"; }; - pdfstudioviewer = callPackage ../applications/misc/pdfstudio { - program = "pdfstudioviewer"; - }; + pdfstudio2023 = callPackage ../applications/misc/pdfstudio { year = "2023"; }; + + pdfstudioviewer = callPackage ../applications/misc/pdfstudio { program = "pdfstudioviewer"; }; abaddon = callPackage ../applications/networking/instant-messengers/abaddon { }; From 22db1d7cad1832a9d7781a5631dba02bcae2e4ed Mon Sep 17 00:00:00 2001 From: John Chadwick Date: Tue, 10 Oct 2023 22:34:01 -0400 Subject: [PATCH 31/80] sfwbar: 1.0_beta11 -> 1.0_beta13 --- pkgs/applications/misc/sfwbar/default.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/sfwbar/default.nix b/pkgs/applications/misc/sfwbar/default.nix index ec85d9d0e40a..bd46c449ffab 100644 --- a/pkgs/applications/misc/sfwbar/default.nix +++ b/pkgs/applications/misc/sfwbar/default.nix @@ -10,17 +10,19 @@ , libpulseaudio , libmpdclient , libxkbcommon +, alsa-lib +, makeWrapper , }: stdenv.mkDerivation rec { pname = "sfwbar"; - version = "1.0_beta11"; + version = "1.0_beta13"; src = fetchFromGitHub { owner = "LBCrion"; repo = pname; rev = "v${version}"; - sha256 = "PmpiO5gvurpaFpoq8bQdZ53FYSVDnyjN8MxDpelMnAU="; + hash = "sha256-7oiuTEqdXDReKdakJX6+HRaSi1XovM+MkHFkaFZtq64="; }; buildInputs = [ @@ -30,14 +32,21 @@ stdenv.mkDerivation rec { libpulseaudio libmpdclient libxkbcommon + alsa-lib ]; nativeBuildInputs = [ meson ninja pkg-config + makeWrapper ]; + postFixup = '' + wrapProgram $out/bin/sfwbar \ + --suffix XDG_DATA_DIRS : $out/share + ''; + meta = with lib; { homepage = "https://github.com/LBCrion/sfwbar"; description = "A flexible taskbar application for wayland compositors, designed with a stacking layout in mind"; From 6a927f93f1d9b1e35af775c09f24ca2f026040ae Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 11 Oct 2023 03:10:59 +0000 Subject: [PATCH 32/80] marvin: 23.4.0 -> 23.12.0 --- pkgs/applications/science/chemistry/marvin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/chemistry/marvin/default.nix b/pkgs/applications/science/chemistry/marvin/default.nix index 0f4d76c3f26b..e266ee8e32ed 100644 --- a/pkgs/applications/science/chemistry/marvin/default.nix +++ b/pkgs/applications/science/chemistry/marvin/default.nix @@ -4,12 +4,12 @@ with lib; stdenv.mkDerivation rec { pname = "marvin"; - version = "23.4.0"; + version = "23.12.0"; src = fetchurl { name = "marvin-${version}.deb"; url = "http://dl.chemaxon.com/marvin/${version}/marvin_linux_${versions.majorMinor version}.deb"; - sha256 = "sha256-+jzGcuAcbXOwsyAL+Hr9Fas2vO2S8ZKSaZeCf/bnl7A="; + sha256 = "sha256-5ycOteXcdgZaeDl3WQ95H2lD0OnnobCbmnVlfYwVdeI="; }; nativeBuildInputs = [ dpkg makeWrapper ]; From 96f0cea13421efa43f495b9c6374e3d58bd02d18 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 11 Oct 2023 07:33:20 +0000 Subject: [PATCH 33/80] mmc-utils: unstable-2023-08-07 -> unstable-2023-10-10 --- pkgs/os-specific/linux/mmc-utils/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/mmc-utils/default.nix b/pkgs/os-specific/linux/mmc-utils/default.nix index 58ceb7404b96..0fea46da56d2 100644 --- a/pkgs/os-specific/linux/mmc-utils/default.nix +++ b/pkgs/os-specific/linux/mmc-utils/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation { pname = "mmc-utils"; - version = "unstable-2023-08-07"; + version = "unstable-2023-10-10"; src = fetchzip rec { url = "https://git.kernel.org/pub/scm/utils/mmc/mmc-utils.git/snapshot/mmc-utils-${passthru.rev}.tar.gz"; - passthru.rev = "613495ecaca97a19fa7f8f3ea23306472b36453c"; - sha256 = "zOjm/YDxqU6bu6GMyQTuzuZbrCfaU4FBodRWLb8GTdE="; + passthru.rev = "b5ca140312d279ad2f22068fd72a6230eea13436"; + sha256 = "QU4r8eajrrhT6u6WHEf1xtB1iyecBeHxu4vS+QcwAgM="; }; makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" "prefix=$(out)" ]; From 7f560763b071f7add467b18825191f67cb29186d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 11 Oct 2023 08:30:55 +0000 Subject: [PATCH 34/80] monetdb: 11.47.5 -> 11.47.11 --- pkgs/servers/sql/monetdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/monetdb/default.nix b/pkgs/servers/sql/monetdb/default.nix index 09c9bfaa3c44..668f5190be40 100644 --- a/pkgs/servers/sql/monetdb/default.nix +++ b/pkgs/servers/sql/monetdb/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "monetdb"; - version = "11.47.5"; + version = "11.47.11"; src = fetchurl { url = "https://dev.monetdb.org/downloads/sources/archive/MonetDB-${finalAttrs.version}.tar.bz2"; - hash = "sha256-GuGGs3hAheNYsaiUG7femLhi38c4gB528bruRotOdNE="; + hash = "sha256-ZYogc8KjFYbmS7OlL2ufGxdnMAYOYeUFk8AVe7rDer0="; }; nativeBuildInputs = [ bison cmake python3 ]; From 0a31bb4564dc6cf702abab10cafb49dd10701273 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 11 Oct 2023 10:28:05 +0000 Subject: [PATCH 35/80] mullvad-vpn: 2023.4 -> 2023.5 --- pkgs/applications/networking/mullvad-vpn/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/mullvad-vpn/default.nix b/pkgs/applications/networking/mullvad-vpn/default.nix index cd4642f906d9..bd09e6b8be9a 100644 --- a/pkgs/applications/networking/mullvad-vpn/default.nix +++ b/pkgs/applications/networking/mullvad-vpn/default.nix @@ -64,7 +64,7 @@ let systemd ]; - version = "2023.4"; + version = "2023.5"; selectSystem = attrs: attrs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); @@ -74,8 +74,8 @@ let }; hash = selectSystem { - x86_64-linux = "sha256-7NoifrX1/3pUJHTYK+2dVos/oFsKiYwyhCGi07SsEhM="; - aarch64-linux = "sha256-e0lp+SpBUmtYBcJPvql8ALeCkVtneZ1Cd3IFMVX6R2Q="; + x86_64-linux = "sha256-FpVruI80PmpBo2JrMvgvOg7ou6LceTeit9HbWKgcPa4="; + aarch64-linux = "sha256-NlYh8K5Xbad4xSoZ02yC5fh3SrQzyNyS9uoA73REcpo="; }; in From 438a71d461d167fedce8b4e9d6e68640ef339c71 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 11 Oct 2023 11:28:13 +0000 Subject: [PATCH 36/80] nali: 0.7.3 -> 0.8.0 --- pkgs/applications/networking/nali/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/nali/default.nix b/pkgs/applications/networking/nali/default.nix index 96f5bc2cf0dd..8b5009c5f6d5 100644 --- a/pkgs/applications/networking/nali/default.nix +++ b/pkgs/applications/networking/nali/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "nali"; - version = "0.7.3"; + version = "0.8.0"; src = fetchFromGitHub { owner = "zu1k"; repo = "nali"; rev = "v${version}"; - sha256 = "sha256-ZKLxsq7ybom96NKWkioROAVXUoY20zFBZn7ksk4XvT4="; + sha256 = "sha256-JIP0QX1okCfDj2Y6wZ5TaV3QH0WP3oU3JjaKK6vMfWY="; }; - vendorHash = "sha256-l3Fs1Hd0kXI56uotic1407tb4ltkCSMzqqozFpvobH8="; + vendorHash = "sha256-wIp/ShUddz+RIcsEuKWUfxsV/wNB2X1jZtIltBZ0ROM="; subPackages = [ "." ]; nativeBuildInputs = [ installShellFiles ]; From c49efca702c8862cbb09b7f5eda02b2ed119b29f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 11 Oct 2023 16:19:10 +0000 Subject: [PATCH 37/80] nmrpflash: 0.9.20 -> 0.9.21 --- pkgs/development/embedded/nmrpflash/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/embedded/nmrpflash/default.nix b/pkgs/development/embedded/nmrpflash/default.nix index 71bc39498720..323e54578a7b 100644 --- a/pkgs/development/embedded/nmrpflash/default.nix +++ b/pkgs/development/embedded/nmrpflash/default.nix @@ -7,13 +7,13 @@ }: stdenv.mkDerivation rec { pname = "nmrpflash"; - version = "0.9.20"; + version = "0.9.21"; src = fetchFromGitHub { owner = "jclehner"; repo = "nmrpflash"; rev = "v${version}"; - sha256 = "sha256-xfKZXaKzSTnCOC8qt6Zc/eidc1bnrKZOJPw/wwMoCaM="; + sha256 = "sha256-nW+VD2a0vmgODbJi4H8Esnq502bEkeCKjXQi23DfdqA="; }; nativeBuildInputs = [ pkg-config ]; From cf2c289cbd5552c964a9817ff670e7d1219dc1ce Mon Sep 17 00:00:00 2001 From: Zane van Iperen Date: Thu, 12 Oct 2023 02:47:12 +1000 Subject: [PATCH 38/80] supersonic: add darwin support --- pkgs/by-name/su/supersonic/package.nix | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/su/supersonic/package.nix b/pkgs/by-name/su/supersonic/package.nix index 0c2f34cf5fee..9de886758526 100644 --- a/pkgs/by-name/su/supersonic/package.nix +++ b/pkgs/by-name/su/supersonic/package.nix @@ -1,16 +1,21 @@ { lib +, stdenv , buildGoModule , fetchFromGitHub , makeDesktopItem , copyDesktopItems , pkg-config +, desktopToDarwinBundle , xorg , libglvnd , mpv , glfw3 +, darwin , waylandSupport ? false }: +assert waylandSupport -> stdenv.isLinux; + buildGoModule rec { pname = "supersonic" + lib.optionalString waylandSupport "-wayland"; version = "0.5.2"; @@ -27,6 +32,8 @@ buildGoModule rec { nativeBuildInputs = [ copyDesktopItems pkg-config + ] ++ lib.optionals stdenv.isDarwin [ + desktopToDarwinBundle ]; # go-glfw doesn't support both X11 and Wayland in single build @@ -35,9 +42,18 @@ buildGoModule rec { buildInputs = [ libglvnd mpv + ] ++ lib.optionals stdenv.isLinux [ xorg.libXxf86vm xorg.libX11 - ] ++ (glfw3.override { inherit waylandSupport; }).buildInputs; + ] + ++ (builtins.filter (p: !(lib.hasPrefix "apple-framework" p.name)) + (glfw3.override { inherit waylandSupport; }).buildInputs) + ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk_11_0.frameworks.Cocoa + darwin.apple_sdk_11_0.frameworks.Kernel + darwin.apple_sdk_11_0.frameworks.OpenGL + darwin.apple_sdk_11_0.frameworks.UserNotifications + ]; postInstall = '' for dimension in 128 256 512;do @@ -66,7 +82,7 @@ buildGoModule rec { mainProgram = "supersonic" + lib.optionalString waylandSupport "-wayland"; description = "A lightweight cross-platform desktop client for Subsonic music servers"; homepage = "https://github.com/dweymouth/supersonic"; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; license = licenses.gpl3Plus; maintainers = with maintainers; [ zane sochotnicky ]; }; From 386b2f2ba60e109e7891ad080d9f816c7bc8efb2 Mon Sep 17 00:00:00 2001 From: Sean Buckley Date: Wed, 11 Oct 2023 16:33:40 -0400 Subject: [PATCH 39/80] brave: 1.58.137 -> 1.59.117 https://community.brave.com/t/release-channel-1-59-117/509958 --- pkgs/applications/networking/browsers/brave/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index 2121e74d36aa..8466850808cb 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -92,11 +92,11 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "1.58.137"; + version = "1.59.117"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "sha256-6vsdQU9NbEKFp/1A0bNQvutF4I+vI0zfrx70QvU1KV4="; + sha256 = "sha256-yckxTKAgglk6YRXist9RZufZdI22iitecmb01NmYPGQ="; }; dontConfigure = true; From 21d520fbf202e84c80e32afc6b1377974335e4e4 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Thu, 12 Oct 2023 00:32:31 +0200 Subject: [PATCH 40/80] tests.nixpkgs-check-by-name: Minor Nix refactor --- pkgs/test/nixpkgs-check-by-name/src/eval.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/test/nixpkgs-check-by-name/src/eval.nix b/pkgs/test/nixpkgs-check-by-name/src/eval.nix index 7c0ae755215a..378ecef46b57 100644 --- a/pkgs/test/nixpkgs-check-by-name/src/eval.nix +++ b/pkgs/test/nixpkgs-check-by-name/src/eval.nix @@ -39,14 +39,18 @@ let overlays = [ callPackageOverlay ]; }; - attrInfo = attr: { + attrInfo = attr: + let + value = pkgs.${attr}; + in + { # These names are used by the deserializer on the Rust side call_package_path = - if pkgs.${attr} ? _callPackagePath && builtins.isPath pkgs.${attr}._callPackagePath then - toString pkgs.${attr}._callPackagePath + if value ? _callPackagePath && builtins.isPath value._callPackagePath then + toString value._callPackagePath else null; - is_derivation = pkgs.lib.isDerivation pkgs.${attr}; + is_derivation = pkgs.lib.isDerivation value; }; attrInfos = builtins.listToAttrs (map (name: { From 6710bc250a090c01da8659787e96aaea3df9ad32 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Thu, 12 Oct 2023 00:35:20 +0200 Subject: [PATCH 41/80] tests.nixpkgs-check-by-name: Minor refactor Allows a smaller diff for future changes --- pkgs/test/nixpkgs-check-by-name/src/eval.nix | 22 +++++++-------- pkgs/test/nixpkgs-check-by-name/src/eval.rs | 29 ++++++++++++++------ 2 files changed, 32 insertions(+), 19 deletions(-) diff --git a/pkgs/test/nixpkgs-check-by-name/src/eval.nix b/pkgs/test/nixpkgs-check-by-name/src/eval.nix index 378ecef46b57..087b0a519c71 100644 --- a/pkgs/test/nixpkgs-check-by-name/src/eval.nix +++ b/pkgs/test/nixpkgs-check-by-name/src/eval.nix @@ -18,19 +18,23 @@ let callPackage = fn: args: let result = super.callPackage fn args; + variantInfo._attributeVariant = { + # These names are used by the deserializer on the Rust side + CallPackage.path = + if builtins.isPath fn then + toString fn + else + null; + }; in if builtins.isAttrs result then # If this was the last overlay to be applied, we could just only return the `_callPackagePath`, # but that's not the case because stdenv has another overlays on top of user-provided ones. # So to not break the stdenv build we need to return the mostly proper result here - result // { - _callPackagePath = fn; - } + result // variantInfo else # It's very rare that callPackage doesn't return an attribute set, but it can occur. - { - _callPackagePath = fn; - }; + variantInfo; }; pkgs = import nixpkgsPath { @@ -45,11 +49,7 @@ let in { # These names are used by the deserializer on the Rust side - call_package_path = - if value ? _callPackagePath && builtins.isPath value._callPackagePath then - toString value._callPackagePath - else - null; + variant = value._attributeVariant or { Other = null; }; is_derivation = pkgs.lib.isDerivation value; }; diff --git a/pkgs/test/nixpkgs-check-by-name/src/eval.rs b/pkgs/test/nixpkgs-check-by-name/src/eval.rs index 17e22495b22a..458986a687a0 100644 --- a/pkgs/test/nixpkgs-check-by-name/src/eval.rs +++ b/pkgs/test/nixpkgs-check-by-name/src/eval.rs @@ -13,10 +13,19 @@ use tempfile::NamedTempFile; /// Attribute set of this structure is returned by eval.nix #[derive(Deserialize)] struct AttributeInfo { - call_package_path: Option, + variant: AttributeVariant, is_derivation: bool, } +#[derive(Deserialize)] +enum AttributeVariant { + /// The attribute is defined as a pkgs.callPackage + /// The path is None when the argument isn't a path + CallPackage { path: Option }, + /// The attribute is not defined as pkgs.callPackage + Other, +} + const EXPR: &str = include_str!("eval.nix"); /// Check that the Nixpkgs attribute values corresponding to the packages in pkgs/by-name are @@ -97,14 +106,18 @@ pub fn check_values( let absolute_package_file = nixpkgs.path.join(&relative_package_file); if let Some(attribute_info) = actual_files.get(package_name) { - let is_expected_file = - if let Some(call_package_path) = &attribute_info.call_package_path { - absolute_package_file == *call_package_path - } else { - false - }; + let valid = match &attribute_info.variant { + AttributeVariant::CallPackage { path } => { + if let Some(call_package_path) = path { + absolute_package_file == *call_package_path + } else { + false + } + } + AttributeVariant::Other => false, + }; - if !is_expected_file { + if !valid { error_writer.write(&format!( "pkgs.{package_name}: This attribute is not defined as `pkgs.callPackage {} {{ ... }}`.", relative_package_file.display() From 26cec0dbe31c11fc8ccbf2fa32d503212a217916 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Thu, 12 Oct 2023 01:02:44 +0200 Subject: [PATCH 42/80] tests.nixpkgs-check-by-name: Add custom argument test --- .../tests/override-success/all-packages.nix | 5 +++++ .../tests/override-success/default.nix | 1 + .../override-success/pkgs/by-name/fo/foo/package.nix | 8 ++++++++ 3 files changed, 14 insertions(+) create mode 100644 pkgs/test/nixpkgs-check-by-name/tests/override-success/all-packages.nix create mode 100644 pkgs/test/nixpkgs-check-by-name/tests/override-success/default.nix create mode 100644 pkgs/test/nixpkgs-check-by-name/tests/override-success/pkgs/by-name/fo/foo/package.nix diff --git a/pkgs/test/nixpkgs-check-by-name/tests/override-success/all-packages.nix b/pkgs/test/nixpkgs-check-by-name/tests/override-success/all-packages.nix new file mode 100644 index 000000000000..6b323756ae41 --- /dev/null +++ b/pkgs/test/nixpkgs-check-by-name/tests/override-success/all-packages.nix @@ -0,0 +1,5 @@ +self: super: { + foo = self.callPackage ./pkgs/by-name/fo/foo/package.nix { + enableBar = true; + }; +} diff --git a/pkgs/test/nixpkgs-check-by-name/tests/override-success/default.nix b/pkgs/test/nixpkgs-check-by-name/tests/override-success/default.nix new file mode 100644 index 000000000000..af25d1450122 --- /dev/null +++ b/pkgs/test/nixpkgs-check-by-name/tests/override-success/default.nix @@ -0,0 +1 @@ +import ../mock-nixpkgs.nix { root = ./.; } diff --git a/pkgs/test/nixpkgs-check-by-name/tests/override-success/pkgs/by-name/fo/foo/package.nix b/pkgs/test/nixpkgs-check-by-name/tests/override-success/pkgs/by-name/fo/foo/package.nix new file mode 100644 index 000000000000..c811a7215a28 --- /dev/null +++ b/pkgs/test/nixpkgs-check-by-name/tests/override-success/pkgs/by-name/fo/foo/package.nix @@ -0,0 +1,8 @@ +{ + someDrv, + enableBar ? false, +}: +if enableBar then + someDrv +else + {} From f394f738faaee2a749eae7c507dccb1830dd440a Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Thu, 12 Oct 2023 00:38:43 +0200 Subject: [PATCH 43/80] tests.nixpkgs-check-by-name: Improve an error message --- pkgs/test/nixpkgs-check-by-name/src/eval.rs | 2 +- .../tests/override-different-file/expected | 2 +- .../tests/override-no-call-package/expected | 2 +- pkgs/test/nixpkgs-check-by-name/tests/override-no-file/expected | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/test/nixpkgs-check-by-name/src/eval.rs b/pkgs/test/nixpkgs-check-by-name/src/eval.rs index 458986a687a0..53a813045eee 100644 --- a/pkgs/test/nixpkgs-check-by-name/src/eval.rs +++ b/pkgs/test/nixpkgs-check-by-name/src/eval.rs @@ -119,7 +119,7 @@ pub fn check_values( if !valid { error_writer.write(&format!( - "pkgs.{package_name}: This attribute is not defined as `pkgs.callPackage {} {{ ... }}`.", + "pkgs.{package_name}: This attribute is manually defined (most likely in pkgs/top-level/all-packages.nix), which is only allowed if the definition is of the form `pkgs.callPackage {} {{ ... }}`.", relative_package_file.display() ))?; continue; diff --git a/pkgs/test/nixpkgs-check-by-name/tests/override-different-file/expected b/pkgs/test/nixpkgs-check-by-name/tests/override-different-file/expected index 1c6377d8aef0..36fa40d18ead 100644 --- a/pkgs/test/nixpkgs-check-by-name/tests/override-different-file/expected +++ b/pkgs/test/nixpkgs-check-by-name/tests/override-different-file/expected @@ -1 +1 @@ -pkgs.nonDerivation: This attribute is not defined as `pkgs.callPackage pkgs/by-name/no/nonDerivation/package.nix { ... }`. +pkgs.nonDerivation: This attribute is manually defined (most likely in pkgs/top-level/all-packages.nix), which is only allowed if the definition is of the form `pkgs.callPackage pkgs/by-name/no/nonDerivation/package.nix { ... }`. diff --git a/pkgs/test/nixpkgs-check-by-name/tests/override-no-call-package/expected b/pkgs/test/nixpkgs-check-by-name/tests/override-no-call-package/expected index 1c6377d8aef0..36fa40d18ead 100644 --- a/pkgs/test/nixpkgs-check-by-name/tests/override-no-call-package/expected +++ b/pkgs/test/nixpkgs-check-by-name/tests/override-no-call-package/expected @@ -1 +1 @@ -pkgs.nonDerivation: This attribute is not defined as `pkgs.callPackage pkgs/by-name/no/nonDerivation/package.nix { ... }`. +pkgs.nonDerivation: This attribute is manually defined (most likely in pkgs/top-level/all-packages.nix), which is only allowed if the definition is of the form `pkgs.callPackage pkgs/by-name/no/nonDerivation/package.nix { ... }`. diff --git a/pkgs/test/nixpkgs-check-by-name/tests/override-no-file/expected b/pkgs/test/nixpkgs-check-by-name/tests/override-no-file/expected index 1c6377d8aef0..36fa40d18ead 100644 --- a/pkgs/test/nixpkgs-check-by-name/tests/override-no-file/expected +++ b/pkgs/test/nixpkgs-check-by-name/tests/override-no-file/expected @@ -1 +1 @@ -pkgs.nonDerivation: This attribute is not defined as `pkgs.callPackage pkgs/by-name/no/nonDerivation/package.nix { ... }`. +pkgs.nonDerivation: This attribute is manually defined (most likely in pkgs/top-level/all-packages.nix), which is only allowed if the definition is of the form `pkgs.callPackage pkgs/by-name/no/nonDerivation/package.nix { ... }`. From fcaa408d005743b34aed8b7e2992ef885b4ce027 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Thu, 12 Oct 2023 01:00:37 +0200 Subject: [PATCH 44/80] tests.nixpkgs-check-by-name: auto-calling differentiation Allows detecting whether attributes are overridden in all-packages.nix. In a future commit we'll use this to detect empty arguments being set in all-packages.nix and complain about that. --- pkgs/test/nixpkgs-check-by-name/src/eval.nix | 17 +++++++++++++++++ pkgs/test/nixpkgs-check-by-name/src/eval.rs | 7 ++++++- .../tests/mock-nixpkgs.nix | 11 ++++++++--- pkgs/top-level/by-name-overlay.nix | 15 ++++++++++++--- 4 files changed, 43 insertions(+), 7 deletions(-) diff --git a/pkgs/test/nixpkgs-check-by-name/src/eval.nix b/pkgs/test/nixpkgs-check-by-name/src/eval.nix index 087b0a519c71..2fa0c5a9709c 100644 --- a/pkgs/test/nixpkgs-check-by-name/src/eval.nix +++ b/pkgs/test/nixpkgs-check-by-name/src/eval.nix @@ -35,6 +35,23 @@ let else # It's very rare that callPackage doesn't return an attribute set, but it can occur. variantInfo; + + _internalCallByNamePackageFile = file: + let + result = super._internalCallByNamePackageFile file; + variantInfo._attributeVariant = { + # This name is used by the deserializer on the Rust side + AutoCalled = null; + }; + in + if builtins.isAttrs result then + # If this was the last overlay to be applied, we could just only return the `_callPackagePath`, + # but that's not the case because stdenv has another overlays on top of user-provided ones. + # So to not break the stdenv build we need to return the mostly proper result here + result // variantInfo + else + # It's very rare that callPackage doesn't return an attribute set, but it can occur. + variantInfo; }; pkgs = import nixpkgsPath { diff --git a/pkgs/test/nixpkgs-check-by-name/src/eval.rs b/pkgs/test/nixpkgs-check-by-name/src/eval.rs index 53a813045eee..b1c1a44f8c08 100644 --- a/pkgs/test/nixpkgs-check-by-name/src/eval.rs +++ b/pkgs/test/nixpkgs-check-by-name/src/eval.rs @@ -19,7 +19,11 @@ struct AttributeInfo { #[derive(Deserialize)] enum AttributeVariant { - /// The attribute is defined as a pkgs.callPackage + /// The attribute is auto-called as pkgs.callPackage using pkgs/by-name, + /// and it is not overridden by a definition in all-packages.nix + AutoCalled, + /// The attribute is defined as a pkgs.callPackage , + /// and overridden by all-packages.nix /// The path is None when the argument isn't a path CallPackage { path: Option }, /// The attribute is not defined as pkgs.callPackage @@ -107,6 +111,7 @@ pub fn check_values( if let Some(attribute_info) = actual_files.get(package_name) { let valid = match &attribute_info.variant { + AttributeVariant::AutoCalled => true, AttributeVariant::CallPackage { path } => { if let Some(call_package_path) = path { absolute_package_file == *call_package_path diff --git a/pkgs/test/nixpkgs-check-by-name/tests/mock-nixpkgs.nix b/pkgs/test/nixpkgs-check-by-name/tests/mock-nixpkgs.nix index 50ad67617542..01bb27a48038 100644 --- a/pkgs/test/nixpkgs-check-by-name/tests/mock-nixpkgs.nix +++ b/pkgs/test/nixpkgs-check-by-name/tests/mock-nixpkgs.nix @@ -75,9 +75,14 @@ let # Turns autoCalledPackageFiles into an overlay that `callPackage`'s all of them autoCalledPackages = self: super: - builtins.mapAttrs (name: file: - self.callPackage file { } - ) autoCalledPackageFiles; + { + # Needed to be able to detect empty arguments in all-packages.nix + # See a more detailed description in pkgs/top-level/by-name-overlay.nix + _internalCallByNamePackageFile = file: self.callPackage file { }; + } + // builtins.mapAttrs + (name: self._internalCallByNamePackageFile) + autoCalledPackageFiles; # A list optionally containing the `all-packages.nix` file from the test case as an overlay optionalAllPackagesOverlay = diff --git a/pkgs/top-level/by-name-overlay.nix b/pkgs/top-level/by-name-overlay.nix index 41944c4e3b01..3df9843d03df 100644 --- a/pkgs/top-level/by-name-overlay.nix +++ b/pkgs/top-level/by-name-overlay.nix @@ -45,6 +45,15 @@ in # Currently this would be hard to measure until we have more packages # and ideally https://github.com/NixOS/nix/pull/8895 self: super: -mapAttrs (name: file: - self.callPackage file { } -) packageFiles +{ + # This attribute is necessary to allow CI to ensure that all packages defined in `pkgs/by-name` + # don't have an overriding definition in `all-packages.nix` with an empty (`{ }`) second `callPackage` argument. + # It achieves that with an overlay that modifies both `callPackage` and this attribute to signal whether `callPackage` is used + # and whether it's defined by this file here or `all-packages.nix`. + # TODO: This can be removed once `pkgs/by-name` can handle custom `callPackage` arguments without `all-packages.nix` (or any other way of achieving the same result). + # Because at that point the code in ./stage.nix can be changed to not allow definitions in `all-packages.nix` to override ones from `pkgs/by-name` anymore and throw an error if that happens instead. + _internalCallByNamePackageFile = file: self.callPackage file { }; +} +// mapAttrs + (name: self._internalCallByNamePackageFile) + packageFiles From 23541bed72c8385acddfc8e7ba0bd15d5a2c26af Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Thu, 12 Oct 2023 01:51:21 +0200 Subject: [PATCH 45/80] tests.nixpkgs-check-by-name: Introduce --version --- pkgs/test/nixpkgs-check-by-name/README.md | 6 ++++++ pkgs/test/nixpkgs-check-by-name/src/main.rs | 22 +++++++++++++++++---- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/pkgs/test/nixpkgs-check-by-name/README.md b/pkgs/test/nixpkgs-check-by-name/README.md index 4dd694acd2f0..ebd1cd40aba0 100644 --- a/pkgs/test/nixpkgs-check-by-name/README.md +++ b/pkgs/test/nixpkgs-check-by-name/README.md @@ -11,6 +11,12 @@ This API may be changed over time if the CI workflow making use of it is adjuste - Command line: `nixpkgs-check-by-name ` - Arguments: - ``: The path to the Nixpkgs to check + - `--version `: The version of the checks to perform. + + Possible values: + - `v0` (default) + + See [validation](#validity-checks) for the differences. - Exit code: - `0`: If the [validation](#validity-checks) is successful - `1`: If the [validation](#validity-checks) is not successful diff --git a/pkgs/test/nixpkgs-check-by-name/src/main.rs b/pkgs/test/nixpkgs-check-by-name/src/main.rs index 8c663061bb09..5c51f32b5cec 100644 --- a/pkgs/test/nixpkgs-check-by-name/src/main.rs +++ b/pkgs/test/nixpkgs-check-by-name/src/main.rs @@ -4,7 +4,7 @@ mod structure; mod utils; use anyhow::Context; -use clap::Parser; +use clap::{Parser, ValueEnum}; use colored::Colorize; use std::io; use std::path::{Path, PathBuf}; @@ -15,14 +15,26 @@ use utils::ErrorWriter; /// Program to check the validity of pkgs/by-name #[derive(Parser, Debug)] #[command(about)] -struct Args { +pub struct Args { /// Path to nixpkgs nixpkgs: PathBuf, + /// The version of the checks + /// Increasing this may cause failures for a Nixpkgs that succeeded before + /// TODO: Remove default once Nixpkgs CI passes this argument + #[arg(long, value_enum, default_value_t = Version::V0)] + version: Version, +} + +/// The version of the checks +#[derive(Debug, Clone, PartialEq, PartialOrd, ValueEnum)] +pub enum Version { + /// Initial version + V0, } fn main() -> ExitCode { let args = Args::parse(); - match check_nixpkgs(&args.nixpkgs, vec![], &mut io::stderr()) { + match check_nixpkgs(&args.nixpkgs, args.version, vec![], &mut io::stderr()) { Ok(true) => { eprintln!("{}", "Validated successfully".green()); ExitCode::SUCCESS @@ -53,6 +65,7 @@ fn main() -> ExitCode { /// - `Ok(true)` if the structure is valid, nothing will have been written to `error_writer`. pub fn check_nixpkgs( nixpkgs_path: &Path, + _version: Version, eval_accessible_paths: Vec<&Path>, error_writer: &mut W, ) -> anyhow::Result { @@ -86,6 +99,7 @@ pub fn check_nixpkgs( mod tests { use crate::check_nixpkgs; use crate::structure; + use crate::Version; use anyhow::Context; use std::fs; use std::path::Path; @@ -174,7 +188,7 @@ mod tests { // We don't want coloring to mess up the tests let writer = temp_env::with_var("NO_COLOR", Some("1"), || -> anyhow::Result<_> { let mut writer = vec![]; - check_nixpkgs(&path, vec![&extra_nix_path], &mut writer) + check_nixpkgs(&path, Version::V0, vec![&extra_nix_path], &mut writer) .context(format!("Failed test case {name}"))?; Ok(writer) })?; From d3bf6133e826a6901c50d8524cb3fbbce038df28 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Thu, 12 Oct 2023 01:20:56 +0200 Subject: [PATCH 46/80] tests.nixpkgs-check-by-name: Disallow empty all-packages.nix overrides Only enabled with `--version v1` --- pkgs/test/nixpkgs-check-by-name/README.md | 2 ++ pkgs/test/nixpkgs-check-by-name/src/eval.nix | 2 ++ pkgs/test/nixpkgs-check-by-name/src/eval.rs | 28 ++++++++++++++----- pkgs/test/nixpkgs-check-by-name/src/main.rs | 8 ++++-- .../tests/override-different-file/expected | 2 +- .../tests/override-empty-arg/all-packages.nix | 3 ++ .../tests/override-empty-arg/default.nix | 1 + .../tests/override-empty-arg/expected | 1 + .../pkgs/by-name/no/nonDerivation/package.nix | 1 + .../tests/override-no-call-package/expected | 2 +- .../tests/override-no-file/expected | 2 +- 11 files changed, 39 insertions(+), 13 deletions(-) create mode 100644 pkgs/test/nixpkgs-check-by-name/tests/override-empty-arg/all-packages.nix create mode 100644 pkgs/test/nixpkgs-check-by-name/tests/override-empty-arg/default.nix create mode 100644 pkgs/test/nixpkgs-check-by-name/tests/override-empty-arg/expected create mode 100644 pkgs/test/nixpkgs-check-by-name/tests/override-empty-arg/pkgs/by-name/no/nonDerivation/package.nix diff --git a/pkgs/test/nixpkgs-check-by-name/README.md b/pkgs/test/nixpkgs-check-by-name/README.md index ebd1cd40aba0..2d2db9a58bc5 100644 --- a/pkgs/test/nixpkgs-check-by-name/README.md +++ b/pkgs/test/nixpkgs-check-by-name/README.md @@ -15,6 +15,7 @@ This API may be changed over time if the CI workflow making use of it is adjuste Possible values: - `v0` (default) + - `v1` See [validation](#validity-checks) for the differences. - Exit code: @@ -41,6 +42,7 @@ These checks are performed by this tool: ### Nix evaluation checks - `pkgs.${name}` is defined as `callPackage pkgs/by-name/${shard}/${name}/package.nix args` for some `args`. + - **Only after --version v1**: If `pkgs.${name}` is not auto-called from `pkgs/by-name`, `args` must not be empty - `pkgs.lib.isDerivation pkgs.${name}` is `true`. ## Development diff --git a/pkgs/test/nixpkgs-check-by-name/src/eval.nix b/pkgs/test/nixpkgs-check-by-name/src/eval.nix index 2fa0c5a9709c..bf9f19d8e460 100644 --- a/pkgs/test/nixpkgs-check-by-name/src/eval.nix +++ b/pkgs/test/nixpkgs-check-by-name/src/eval.nix @@ -25,6 +25,8 @@ let toString fn else null; + CallPackage.empty_arg = + args == { }; }; in if builtins.isAttrs result then diff --git a/pkgs/test/nixpkgs-check-by-name/src/eval.rs b/pkgs/test/nixpkgs-check-by-name/src/eval.rs index b1c1a44f8c08..26836501c97a 100644 --- a/pkgs/test/nixpkgs-check-by-name/src/eval.rs +++ b/pkgs/test/nixpkgs-check-by-name/src/eval.rs @@ -1,5 +1,6 @@ use crate::structure; use crate::utils::ErrorWriter; +use crate::Version; use std::path::Path; use anyhow::Context; @@ -22,10 +23,14 @@ enum AttributeVariant { /// The attribute is auto-called as pkgs.callPackage using pkgs/by-name, /// and it is not overridden by a definition in all-packages.nix AutoCalled, - /// The attribute is defined as a pkgs.callPackage , + /// The attribute is defined as a pkgs.callPackage , /// and overridden by all-packages.nix - /// The path is None when the argument isn't a path - CallPackage { path: Option }, + CallPackage { + /// The argument or None if it's not a path + path: Option, + /// true if is { } + empty_arg: bool, + }, /// The attribute is not defined as pkgs.callPackage Other, } @@ -36,6 +41,7 @@ const EXPR: &str = include_str!("eval.nix"); /// of the form `callPackage { ... }`. /// See the `eval.nix` file for how this is achieved on the Nix side pub fn check_values( + version: Version, error_writer: &mut ErrorWriter, nixpkgs: &structure::Nixpkgs, eval_accessible_paths: Vec<&Path>, @@ -112,19 +118,27 @@ pub fn check_values( if let Some(attribute_info) = actual_files.get(package_name) { let valid = match &attribute_info.variant { AttributeVariant::AutoCalled => true, - AttributeVariant::CallPackage { path } => { - if let Some(call_package_path) = path { + AttributeVariant::CallPackage { path, empty_arg } => { + let correct_file = if let Some(call_package_path) = path { absolute_package_file == *call_package_path } else { false - } + }; + // Only check for the argument to be non-empty if the version is V1 or + // higher + let non_empty = if version >= Version::V1 { + !empty_arg + } else { + true + }; + correct_file && non_empty } AttributeVariant::Other => false, }; if !valid { error_writer.write(&format!( - "pkgs.{package_name}: This attribute is manually defined (most likely in pkgs/top-level/all-packages.nix), which is only allowed if the definition is of the form `pkgs.callPackage {} {{ ... }}`.", + "pkgs.{package_name}: This attribute is manually defined (most likely in pkgs/top-level/all-packages.nix), which is only allowed if the definition is of the form `pkgs.callPackage {} {{ ... }}` with a non-empty second argument.", relative_package_file.display() ))?; continue; diff --git a/pkgs/test/nixpkgs-check-by-name/src/main.rs b/pkgs/test/nixpkgs-check-by-name/src/main.rs index 5c51f32b5cec..5d28077ae4ae 100644 --- a/pkgs/test/nixpkgs-check-by-name/src/main.rs +++ b/pkgs/test/nixpkgs-check-by-name/src/main.rs @@ -30,6 +30,8 @@ pub struct Args { pub enum Version { /// Initial version V0, + /// Empty argument check + V1, } fn main() -> ExitCode { @@ -65,7 +67,7 @@ fn main() -> ExitCode { /// - `Ok(true)` if the structure is valid, nothing will have been written to `error_writer`. pub fn check_nixpkgs( nixpkgs_path: &Path, - _version: Version, + version: Version, eval_accessible_paths: Vec<&Path>, error_writer: &mut W, ) -> anyhow::Result { @@ -88,7 +90,7 @@ pub fn check_nixpkgs( if error_writer.empty { // Only if we could successfully parse the structure, we do the semantic checks - eval::check_values(&mut error_writer, &nixpkgs, eval_accessible_paths)?; + eval::check_values(version, &mut error_writer, &nixpkgs, eval_accessible_paths)?; references::check_references(&mut error_writer, &nixpkgs)?; } } @@ -188,7 +190,7 @@ mod tests { // We don't want coloring to mess up the tests let writer = temp_env::with_var("NO_COLOR", Some("1"), || -> anyhow::Result<_> { let mut writer = vec![]; - check_nixpkgs(&path, Version::V0, vec![&extra_nix_path], &mut writer) + check_nixpkgs(&path, Version::V1, vec![&extra_nix_path], &mut writer) .context(format!("Failed test case {name}"))?; Ok(writer) })?; diff --git a/pkgs/test/nixpkgs-check-by-name/tests/override-different-file/expected b/pkgs/test/nixpkgs-check-by-name/tests/override-different-file/expected index 36fa40d18ead..51479e22d26f 100644 --- a/pkgs/test/nixpkgs-check-by-name/tests/override-different-file/expected +++ b/pkgs/test/nixpkgs-check-by-name/tests/override-different-file/expected @@ -1 +1 @@ -pkgs.nonDerivation: This attribute is manually defined (most likely in pkgs/top-level/all-packages.nix), which is only allowed if the definition is of the form `pkgs.callPackage pkgs/by-name/no/nonDerivation/package.nix { ... }`. +pkgs.nonDerivation: This attribute is manually defined (most likely in pkgs/top-level/all-packages.nix), which is only allowed if the definition is of the form `pkgs.callPackage pkgs/by-name/no/nonDerivation/package.nix { ... }` with a non-empty second argument. diff --git a/pkgs/test/nixpkgs-check-by-name/tests/override-empty-arg/all-packages.nix b/pkgs/test/nixpkgs-check-by-name/tests/override-empty-arg/all-packages.nix new file mode 100644 index 000000000000..d369dd7228dc --- /dev/null +++ b/pkgs/test/nixpkgs-check-by-name/tests/override-empty-arg/all-packages.nix @@ -0,0 +1,3 @@ +self: super: { + nonDerivation = self.callPackage ./pkgs/by-name/no/nonDerivation/package.nix { }; +} diff --git a/pkgs/test/nixpkgs-check-by-name/tests/override-empty-arg/default.nix b/pkgs/test/nixpkgs-check-by-name/tests/override-empty-arg/default.nix new file mode 100644 index 000000000000..af25d1450122 --- /dev/null +++ b/pkgs/test/nixpkgs-check-by-name/tests/override-empty-arg/default.nix @@ -0,0 +1 @@ +import ../mock-nixpkgs.nix { root = ./.; } diff --git a/pkgs/test/nixpkgs-check-by-name/tests/override-empty-arg/expected b/pkgs/test/nixpkgs-check-by-name/tests/override-empty-arg/expected new file mode 100644 index 000000000000..51479e22d26f --- /dev/null +++ b/pkgs/test/nixpkgs-check-by-name/tests/override-empty-arg/expected @@ -0,0 +1 @@ +pkgs.nonDerivation: This attribute is manually defined (most likely in pkgs/top-level/all-packages.nix), which is only allowed if the definition is of the form `pkgs.callPackage pkgs/by-name/no/nonDerivation/package.nix { ... }` with a non-empty second argument. diff --git a/pkgs/test/nixpkgs-check-by-name/tests/override-empty-arg/pkgs/by-name/no/nonDerivation/package.nix b/pkgs/test/nixpkgs-check-by-name/tests/override-empty-arg/pkgs/by-name/no/nonDerivation/package.nix new file mode 100644 index 000000000000..a1b92efbbadb --- /dev/null +++ b/pkgs/test/nixpkgs-check-by-name/tests/override-empty-arg/pkgs/by-name/no/nonDerivation/package.nix @@ -0,0 +1 @@ +{ someDrv }: someDrv diff --git a/pkgs/test/nixpkgs-check-by-name/tests/override-no-call-package/expected b/pkgs/test/nixpkgs-check-by-name/tests/override-no-call-package/expected index 36fa40d18ead..51479e22d26f 100644 --- a/pkgs/test/nixpkgs-check-by-name/tests/override-no-call-package/expected +++ b/pkgs/test/nixpkgs-check-by-name/tests/override-no-call-package/expected @@ -1 +1 @@ -pkgs.nonDerivation: This attribute is manually defined (most likely in pkgs/top-level/all-packages.nix), which is only allowed if the definition is of the form `pkgs.callPackage pkgs/by-name/no/nonDerivation/package.nix { ... }`. +pkgs.nonDerivation: This attribute is manually defined (most likely in pkgs/top-level/all-packages.nix), which is only allowed if the definition is of the form `pkgs.callPackage pkgs/by-name/no/nonDerivation/package.nix { ... }` with a non-empty second argument. diff --git a/pkgs/test/nixpkgs-check-by-name/tests/override-no-file/expected b/pkgs/test/nixpkgs-check-by-name/tests/override-no-file/expected index 36fa40d18ead..51479e22d26f 100644 --- a/pkgs/test/nixpkgs-check-by-name/tests/override-no-file/expected +++ b/pkgs/test/nixpkgs-check-by-name/tests/override-no-file/expected @@ -1 +1 @@ -pkgs.nonDerivation: This attribute is manually defined (most likely in pkgs/top-level/all-packages.nix), which is only allowed if the definition is of the form `pkgs.callPackage pkgs/by-name/no/nonDerivation/package.nix { ... }`. +pkgs.nonDerivation: This attribute is manually defined (most likely in pkgs/top-level/all-packages.nix), which is only allowed if the definition is of the form `pkgs.callPackage pkgs/by-name/no/nonDerivation/package.nix { ... }` with a non-empty second argument. From 0ed137f66508a44d8ce39aee8a7688399b481c3b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 12 Oct 2023 01:25:18 +0000 Subject: [PATCH 47/80] octavePackages.communications: 1.2.4 -> 1.2.6 --- pkgs/development/octave-modules/communications/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/octave-modules/communications/default.nix b/pkgs/development/octave-modules/communications/default.nix index 8348aba3c3e9..74acc26bb032 100644 --- a/pkgs/development/octave-modules/communications/default.nix +++ b/pkgs/development/octave-modules/communications/default.nix @@ -7,11 +7,11 @@ buildOctavePackage rec { pname = "communications"; - version = "1.2.4"; + version = "1.2.6"; src = fetchurl { url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz"; - sha256 = "sha256-SfA81UP0c7VgroxSA/RZVVKZ4arl8Uhpf324F7yGFTo="; + sha256 = "sha256-psQuiBOI1mXXZaH4EesVO91r2ViCc0KrKxKM7Xw+gts="; }; buildInputs = [ From 01deb5f08581a03992d16c73dfddb42ad5813621 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 12 Oct 2023 01:27:51 +0000 Subject: [PATCH 48/80] octavePackages.control: 3.5.2 -> 3.6.1 --- pkgs/development/octave-modules/control/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/octave-modules/control/default.nix b/pkgs/development/octave-modules/control/default.nix index 74df9fcda085..8b17493bb36c 100644 --- a/pkgs/development/octave-modules/control/default.nix +++ b/pkgs/development/octave-modules/control/default.nix @@ -8,13 +8,13 @@ buildOctavePackage rec { pname = "control"; - version = "3.5.2"; + version = "3.6.1"; src = fetchFromGitHub { owner = "gnu-octave"; repo = "pkg-control"; - rev = "${pname}-${version}"; - sha256 = "sha256-isUHovpknIFclspHjAtUxGLkrdxitdWSnQMED9n+R3s="; + rev = "refs/tags/control-${version}"; + sha256 = "sha256-7beEsdrne50NY4lGCotxGXwwWnMzUR2CKCc20OCjd0g="; }; # Running autoreconfHook inside the src directory fixes a compile issue about From 7c107e81d122b9ec77bfba141bc9c661e2673aad Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 12 Oct 2023 01:40:28 +0000 Subject: [PATCH 49/80] octavePackages.general: 2.1.2 -> 2.1.3 --- pkgs/development/octave-modules/general/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/octave-modules/general/default.nix b/pkgs/development/octave-modules/general/default.nix index 8dabd86ef933..33caeb1ea554 100644 --- a/pkgs/development/octave-modules/general/default.nix +++ b/pkgs/development/octave-modules/general/default.nix @@ -7,11 +7,11 @@ buildOctavePackage rec { pname = "general"; - version = "2.1.2"; + version = "2.1.3"; src = fetchurl { url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz"; - sha256 = "sha256-owzRp5dDxiUo2uRuvUqD+EiuRqHB2sPqq8NmYtQilM8="; + sha256 = "sha256-amslJm3haXaAehdm6jYJxcGZl+ggUcnJc3i6YJ3QkyM="; }; nativeBuildInputs = [ From 04789c1996da7de587d494332e4dcf93d9c9bfd9 Mon Sep 17 00:00:00 2001 From: natsukium Date: Thu, 12 Oct 2023 11:22:37 +0900 Subject: [PATCH 50/80] python311Packages.ipython-genutils: rename from ipython_genutils --- pkgs/development/python-modules/ipympl/default.nix | 4 ++-- .../{ipython_genutils => ipython-genutils}/default.nix | 5 +++-- pkgs/development/python-modules/ipython-sql/default.nix | 4 ++-- .../python-modules/jupyter-contrib-nbextensions/default.nix | 4 ++-- pkgs/development/python-modules/nbclassic/default.nix | 4 ++-- pkgs/development/python-modules/qtconsole/default.nix | 4 ++-- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 +- 8 files changed, 15 insertions(+), 13 deletions(-) rename pkgs/development/python-modules/{ipython_genutils => ipython-genutils}/default.nix (86%) diff --git a/pkgs/development/python-modules/ipympl/default.nix b/pkgs/development/python-modules/ipympl/default.nix index 9863064f16ea..f461659c6500 100644 --- a/pkgs/development/python-modules/ipympl/default.nix +++ b/pkgs/development/python-modules/ipympl/default.nix @@ -3,7 +3,7 @@ , pythonOlder , fetchPypi , ipykernel -, ipython_genutils +, ipython-genutils , ipywidgets , matplotlib , numpy @@ -25,7 +25,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ ipykernel - ipython_genutils + ipython-genutils ipywidgets matplotlib numpy diff --git a/pkgs/development/python-modules/ipython_genutils/default.nix b/pkgs/development/python-modules/ipython-genutils/default.nix similarity index 86% rename from pkgs/development/python-modules/ipython_genutils/default.nix rename to pkgs/development/python-modules/ipython-genutils/default.nix index 2283444c23db..673370d34060 100644 --- a/pkgs/development/python-modules/ipython_genutils/default.nix +++ b/pkgs/development/python-modules/ipython-genutils/default.nix @@ -6,11 +6,12 @@ }: buildPythonPackage rec { - pname = "ipython_genutils"; + pname = "ipython-genutils"; version = "0.2.0"; src = fetchPypi { - inherit pname version; + pname = "ipython_genutils"; + inherit version; sha256 = "eb2e116e75ecef9d4d228fdc66af54269afa26ab4463042e33785b887c628ba8"; }; diff --git a/pkgs/development/python-modules/ipython-sql/default.nix b/pkgs/development/python-modules/ipython-sql/default.nix index 8853b066ecb6..2fc59859ab2a 100644 --- a/pkgs/development/python-modules/ipython-sql/default.nix +++ b/pkgs/development/python-modules/ipython-sql/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , pythonOlder , ipython -, ipython_genutils +, ipython-genutils , pandas , prettytable , pytest @@ -29,7 +29,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ ipython - ipython_genutils + ipython-genutils prettytable sqlalchemy sqlparse diff --git a/pkgs/development/python-modules/jupyter-contrib-nbextensions/default.nix b/pkgs/development/python-modules/jupyter-contrib-nbextensions/default.nix index 73ba031e3992..5656043625f3 100644 --- a/pkgs/development/python-modules/jupyter-contrib-nbextensions/default.nix +++ b/pkgs/development/python-modules/jupyter-contrib-nbextensions/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub -, ipython_genutils +, ipython-genutils , jupyter-contrib-core , jupyter-highlight-selected-word , jupyter-nbextensions-configurator @@ -23,7 +23,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - ipython_genutils + ipython-genutils jupyter-contrib-core jupyter-highlight-selected-word jupyter-nbextensions-configurator diff --git a/pkgs/development/python-modules/nbclassic/default.nix b/pkgs/development/python-modules/nbclassic/default.nix index 79febaf68518..d4730414006c 100644 --- a/pkgs/development/python-modules/nbclassic/default.nix +++ b/pkgs/development/python-modules/nbclassic/default.nix @@ -3,7 +3,7 @@ , buildPythonPackage , fetchPypi , ipykernel -, ipython_genutils +, ipython-genutils , jinja2 , jupyter-client , jupyter-core @@ -39,7 +39,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ argon2-cffi ipykernel - ipython_genutils + ipython-genutils jinja2 jupyter-client jupyter-core diff --git a/pkgs/development/python-modules/qtconsole/default.nix b/pkgs/development/python-modules/qtconsole/default.nix index b963798f6560..a49b63eaeb15 100644 --- a/pkgs/development/python-modules/qtconsole/default.nix +++ b/pkgs/development/python-modules/qtconsole/default.nix @@ -4,7 +4,7 @@ , ipykernel , jupyter-core , jupyter-client -, ipython_genutils +, ipython-genutils , pygments , pyqt5 , pytestCheckHook @@ -28,7 +28,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ ipykernel - ipython_genutils + ipython-genutils jupyter-core jupyter-client pygments diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index a791b8ccd86c..fc73f642cf2d 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -185,6 +185,7 @@ mapAliases ({ imgaug = throw "imgaug has been removed as it is no longer maintained"; # added 2023-07-10 intreehook = throw "intreehooks has been removed because it is obsolete as a backend-path key was added to PEP 517"; # added 2023-04-11 ipaddress = throw "ipaddress has been removed because it is no longer required since python 2.7."; # added 2022-05-30 + ipython_genutils = ipython-genutils; # added 2023-10-12 influxgraph = throw "influxgraph has been removed because it is no longer maintained"; # added 2022-07-10 itanium_demangler = itanium-demangler; # added 2022-10-17 jaraco_classes = jaraco-classes; # added 2023-07-14 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6e845f54927d..3c007b4e637e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5412,7 +5412,7 @@ self: super: with self; { ipytablewidgets = callPackage ../development/python-modules/ipytablewidgets { }; - ipython_genutils = callPackage ../development/python-modules/ipython_genutils { }; + ipython-genutils = callPackage ../development/python-modules/ipython-genutils { }; ipython = callPackage ../development/python-modules/ipython { }; From 5fec7350602401ab432bed1b0e20fd8541cd1ef2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 12 Oct 2023 02:27:31 +0000 Subject: [PATCH 51/80] octavePackages.sockets: 1.4.0 -> 1.4.1 --- pkgs/development/octave-modules/sockets/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/octave-modules/sockets/default.nix b/pkgs/development/octave-modules/sockets/default.nix index 690c775f67e9..80f2f6dc15eb 100644 --- a/pkgs/development/octave-modules/sockets/default.nix +++ b/pkgs/development/octave-modules/sockets/default.nix @@ -5,11 +5,11 @@ buildOctavePackage rec { pname = "sockets"; - version = "1.4.0"; + version = "1.4.1"; src = fetchurl { url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz"; - sha256 = "sha256-GNwFLNV1u3UKJp9lhLtCclD2VSKC9Mko1hBoSn5dTpI="; + sha256 = "sha256-u5Nb9PVyMoR0lIzXEMtkZntXbBfpyXrtLB8U+dkgYrc="; }; meta = with lib; { From 25fbe77939927fd9c7b64b4a0673bc5082440837 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 12 Oct 2023 02:42:58 +0000 Subject: [PATCH 52/80] octavePackages.splines: 1.3.4 -> 1.3.5 --- pkgs/development/octave-modules/splines/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/octave-modules/splines/default.nix b/pkgs/development/octave-modules/splines/default.nix index 9a249c467446..1e05ef98c0ce 100644 --- a/pkgs/development/octave-modules/splines/default.nix +++ b/pkgs/development/octave-modules/splines/default.nix @@ -5,11 +5,11 @@ buildOctavePackage rec { pname = "splines"; - version = "1.3.4"; + version = "1.3.5"; src = fetchurl { url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz"; - sha256 = "11a34f6a7615fc8x1smk3lx8vslilx4mrxi8f01la3wq68khnq5f"; + sha256 = "sha256-r4hod3l8OpyKNs59lGE8EFn3n6tIg0KeezKjsB4D16Y="; }; meta = with lib; { From 224063778cad501556b62b36ecc90ee7c2bc31e2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 12 Oct 2023 02:51:00 +0000 Subject: [PATCH 53/80] octavePackages.statistics: 1.5.4 -> 1.6.0 --- pkgs/development/octave-modules/statistics/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/octave-modules/statistics/default.nix b/pkgs/development/octave-modules/statistics/default.nix index 433a70f19bdc..552f7a4f8e37 100644 --- a/pkgs/development/octave-modules/statistics/default.nix +++ b/pkgs/development/octave-modules/statistics/default.nix @@ -6,13 +6,13 @@ buildOctavePackage rec { pname = "statistics"; - version = "1.5.4"; + version = "1.6.0"; src = fetchFromGitHub { owner = "gnu-octave"; repo = "statistics"; rev = "refs/tags/release-${version}"; - sha256 = "sha256-gFauFIaXKzcPeNvpWHv5FAxYQvZNh7ELrSUIvn43IfQ="; + sha256 = "sha256-XJXDiVDg3Nw7a/ih49jtkYRmyvAhTfs3LbBQmw+87oc="; }; requiredOctavePackages = [ From 712c5943f7d2766205885d1458825b9151a9fb4e Mon Sep 17 00:00:00 2001 From: natsukium Date: Thu, 12 Oct 2023 11:51:05 +0900 Subject: [PATCH 54/80] python311Packages.ipython-genutils: refactor --- .../ipython-genutils/default.nix | 25 +++++++++++++++---- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/ipython-genutils/default.nix b/pkgs/development/python-modules/ipython-genutils/default.nix index 673370d34060..e3a7b6c0a444 100644 --- a/pkgs/development/python-modules/ipython-genutils/default.nix +++ b/pkgs/development/python-modules/ipython-genutils/default.nix @@ -1,26 +1,41 @@ { lib , buildPythonPackage , fetchPypi +, setuptools , nose -, glibcLocales +, pytestCheckHook }: buildPythonPackage rec { pname = "ipython-genutils"; version = "0.2.0"; + pyproject = true; src = fetchPypi { pname = "ipython_genutils"; inherit version; - sha256 = "eb2e116e75ecef9d4d228fdc66af54269afa26ab4463042e33785b887c628ba8"; + hash = "sha256-6y4RbnXs751NIo/cZq9UJpr6JqtEYwQuM3hbiHxii6g="; }; - nativeCheckInputs = [ nose glibcLocales ]; + nativeBuildInputs = [ + setuptools + ]; - checkPhase = '' - LC_ALL="en_US.UTF-8" nosetests -v ipython_genutils/tests + nativeCheckInputs = [ + nose + pytestCheckHook + ]; + + preCheck = '' + substituteInPlace ipython_genutils/tests/test_path.py \ + --replace "setUp" "setup_method" \ + --replace "tearDown" "teardown_method" ''; + pythonImportsCheck = [ + "ipython_genutils" + ]; + meta = { description = "Vestigial utilities from IPython"; homepage = "https://ipython.org/"; From a0d5762b012ec283d6dc89a0adbda7f6bc7d2da1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 12 Oct 2023 02:53:50 +0000 Subject: [PATCH 55/80] octavePackages.stk: 2.8.0 -> 2.8.1 --- pkgs/development/octave-modules/stk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/octave-modules/stk/default.nix b/pkgs/development/octave-modules/stk/default.nix index 192115309fa7..7afebb9ad942 100644 --- a/pkgs/development/octave-modules/stk/default.nix +++ b/pkgs/development/octave-modules/stk/default.nix @@ -5,11 +5,11 @@ buildOctavePackage rec { pname = "stk"; - version = "2.8.0"; + version = "2.8.1"; src = fetchurl { url = "https://github.com/stk-kriging/stk/releases/download/${version}/${pname}-${version}-octpkg.tar.gz"; - sha256 = "sha256-dgxpw2L7e9o/zimsLPoqW7dEihrrNsks62XtuXt4zTI="; + sha256 = "sha256-wTjM9LUcC8BEj3TNxAz877LqJvuoxWUse9PIZoWGnIU="; }; meta = with lib; { From 634165056348e338561906ec64d598c93a61fb26 Mon Sep 17 00:00:00 2001 From: squedd <40431572+squedd@users.noreply.github.com> Date: Thu, 12 Oct 2023 16:08:09 +1000 Subject: [PATCH 56/80] anytype: change src to github --- pkgs/applications/misc/anytype/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/anytype/default.nix b/pkgs/applications/misc/anytype/default.nix index f9ca3c316e26..b8f8d09bdfd7 100644 --- a/pkgs/applications/misc/anytype/default.nix +++ b/pkgs/applications/misc/anytype/default.nix @@ -6,7 +6,7 @@ let name = "Anytype-${version}"; nameExecutable = pname; src = fetchurl { - url = "https://anytype-release.fra1.cdn.digitaloceanspaces.com/Anytype-${version}.AppImage"; + url = "https://github.com/anyproto/anytype-ts/releases/download/v${version}/${name}.AppImage"; name = "Anytype-${version}.AppImage"; sha256 = "sha256-heS+3ucxv4WTiqegdmjpv8aWuC+3knxC00SDDg4R8iU="; }; From eb0da9b1e32ac76f50c47327ada8f750b53786b4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 12 Oct 2023 10:04:01 +0200 Subject: [PATCH 57/80] python311Packages.elastic-apm: 6.18.0 -> 6.19.0 Diff: https://github.com/elastic/apm-agent-python/compare/refs/tags/v6.18.0...v6.19.0 Changelog: https://github.com/elastic/apm-agent-python/releases/tag/v6.19.0 --- pkgs/development/python-modules/elastic-apm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/elastic-apm/default.nix b/pkgs/development/python-modules/elastic-apm/default.nix index c50b5042a6c1..e00e188492fe 100644 --- a/pkgs/development/python-modules/elastic-apm/default.nix +++ b/pkgs/development/python-modules/elastic-apm/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pname = "elastic-apm"; - version = "6.18.0"; + version = "6.19.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -39,7 +39,7 @@ buildPythonPackage rec { owner = "elastic"; repo = "apm-agent-python"; rev = "refs/tags/v${version}"; - hash = "sha256-s4aM2HuagqcF2sLHHRh2kj1tglf+JZ7hXT4PcAeFStQ="; + hash = "sha256-XwAKydZuvNMOIT4GkfID8YW019OfatRekXmGrssZfMw="; }; propagatedBuildInputs = [ From 5d41ee3bf74ed05c62346a3f20d2ae44e898f499 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 12 Oct 2023 10:04:36 +0200 Subject: [PATCH 58/80] python311Packages.pyenphase: 1.11.4 -> 1.12.0 Diff: https://github.com/pyenphase/pyenphase/compare/refs/tags/v1.11.4...v1.12.0 Changelog: https://github.com/pyenphase/pyenphase/blob/1.12.0/CHANGELOG.md --- pkgs/development/python-modules/pyenphase/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyenphase/default.nix b/pkgs/development/python-modules/pyenphase/default.nix index 716846949ade..360db9124175 100644 --- a/pkgs/development/python-modules/pyenphase/default.nix +++ b/pkgs/development/python-modules/pyenphase/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "pyenphase"; - version = "1.11.4"; + version = "1.12.0"; format = "pyproject"; disabled = pythonOlder "3.11"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "pyenphase"; repo = "pyenphase"; rev = "refs/tags/v${version}"; - hash = "sha256-ZFK7Pyn8YsxdxPICtDXx2L+3t/xG3x2HC+F0plDbvHk="; + hash = "sha256-gqbRz0JAp8hjZpFUzlFzqq86UKgD0TLWSp1Z9rdrk3s="; }; postPatch = '' From 4d38796041da3a4441323b54e38eee30284a2a1e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 12 Oct 2023 10:09:52 +0200 Subject: [PATCH 59/80] python311Packages.simplisafe-python: 2023.08.0 -> 2023.10.0 Diff: https://github.com/bachya/simplisafe-python/compare/refs/tags/2023.08.0...2023.10.0 Changelog: https://github.com/bachya/simplisafe-python/releases/tag/2023.10.0 --- .../simplisafe-python/default.nix | 20 +++---------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/pkgs/development/python-modules/simplisafe-python/default.nix b/pkgs/development/python-modules/simplisafe-python/default.nix index c3264d7366f1..6863d1f1a889 100644 --- a/pkgs/development/python-modules/simplisafe-python/default.nix +++ b/pkgs/development/python-modules/simplisafe-python/default.nix @@ -6,7 +6,6 @@ , buildPythonPackage , docutils , fetchFromGitHub -, fetchpatch , poetry-core , pytest-aiohttp , pytest-asyncio @@ -20,31 +19,18 @@ buildPythonPackage rec { pname = "simplisafe-python"; - version = "2023.08.0"; + version = "2023.10.0"; format = "pyproject"; disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "bachya"; - repo = pname; + repo = "simplisafe-python"; rev = "refs/tags/${version}"; - hash = "sha256-DExMa9z/VYAMoqUmr/gfZzYFWfTxnC+Cz4rRTaNSLBM="; + hash = "sha256-U3SbaR8PTTvoAMu65+LAHSwTmR7iwqiidbefW8bNSCo="; }; - patches = [ - # This patch removes references to setuptools and wheel that are no longer - # necessary and changes poetry to poetry-core, so that we don't need to add - # unnecessary nativeBuildInputs. - # - # https://github.com/bachya/simplisafe-python/pull/596 - # - (fetchpatch { - name = "clean-up-build-dependencies.patch"; - url = "https://github.com/bachya/simplisafe-python/commit/60f41c690fac7acb614490b542cbbf2fa0052266.patch"; - hash = "sha256-RLRbHmaR2A8MNc96WHx0L8ccyygoBUaOulAuRJkFuUM="; - }) - ]; nativeBuildInputs = [ poetry-core From 29dd7cb6eb75b0be3dd4848a08cedfc012dc8df3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 12 Oct 2023 10:12:45 +0200 Subject: [PATCH 60/80] python311Packages.rich-click: 1.6.1 -> 1.7.0 Diff: https://github.com/ewels/rich-click/compare/refs/tags/v1.6.1...v1.7.0 Changelog: https://github.com/ewels/rich-click/blob/v1.7.0/CHANGELOG.md --- pkgs/development/python-modules/rich-click/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rich-click/default.nix b/pkgs/development/python-modules/rich-click/default.nix index 4c4de7f75d8b..bd6dfe20f082 100644 --- a/pkgs/development/python-modules/rich-click/default.nix +++ b/pkgs/development/python-modules/rich-click/default.nix @@ -5,11 +5,12 @@ , pythonOlder , rich , typer +, typing-extensions }: buildPythonPackage rec { pname = "rich-click"; - version = "1.6.1"; + version = "1.7.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -18,12 +19,13 @@ buildPythonPackage rec { owner = "ewels"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Be6okg3zmbdbdlB4/uwioUxn6CZUay/istiIoiFrsJk="; + hash = "sha256-Fmdxs7yeaHe8++LSQGuYK3Qwc0CdPvV9UCSXa09Djt4="; }; propagatedBuildInputs = [ click rich + typing-extensions ]; # Module has no test From 487867ffa519378e979870964f38b0eee3397c22 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 12 Oct 2023 10:43:09 +0200 Subject: [PATCH 61/80] python311Packages.aioridwell: 2023.08.0 -> 2023.10.0 Diff: https://github.com/bachya/aioridwell/compare/refs/tags/2023.08.0...2023.10.0 Changelog: https://github.com/bachya/aioridwell/releases/tag/2023.10.0 --- .../python-modules/aioridwell/default.nix | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/pkgs/development/python-modules/aioridwell/default.nix b/pkgs/development/python-modules/aioridwell/default.nix index 150486cf4aea..c5b1c9bb70fa 100644 --- a/pkgs/development/python-modules/aioridwell/default.nix +++ b/pkgs/development/python-modules/aioridwell/default.nix @@ -3,7 +3,6 @@ , aresponses , buildPythonPackage , fetchFromGitHub -, fetchpatch , freezegun , poetry-core , pyjwt @@ -18,7 +17,7 @@ buildPythonPackage rec { pname = "aioridwell"; - version = "2023.08.0"; + version = "2023.10.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -27,23 +26,9 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-AreQC5LOthnOEj0HnEww4zLob394XwCvqZBwjsT2Lcg="; + hash = "sha256-psynooRbX34EFYY7FTqy3KdFsv939z/qYfIfyNTVkiM="; }; - patches = [ - # This patch removes references to setuptools and wheel that are no longer - # necessary and changes poetry to poetry-core, so that we don't need to add - # unnecessary nativeBuildInputs. - # - # https://github.com/bachya/aioridwell/pull/234 - # - (fetchpatch { - name = "clean-up-build-dependencies.patch"; - url = "https://github.com/bachya/aioridwell/commit/79a9dd7462dcfeb0833abca73a1f184827120a6f.patch"; - hash = "sha256-RLRbHmaR2A8MNc96WHx0L8ccyygoBUaOulAuRJkFuUM="; - }) - ]; - nativeBuildInputs = [ poetry-core ]; From 9a84d0ec60c09ae9cb46906435de701c8b4f8334 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 12 Oct 2023 11:14:14 +0000 Subject: [PATCH 62/80] php81Packages.castor: 0.8.0 -> 0.9.1 --- pkgs/development/php-packages/castor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/php-packages/castor/default.nix b/pkgs/development/php-packages/castor/default.nix index b2bf7da5c2c7..369b6220adc5 100644 --- a/pkgs/development/php-packages/castor/default.nix +++ b/pkgs/development/php-packages/castor/default.nix @@ -8,13 +8,13 @@ php.buildComposerProject (finalAttrs: { pname = "castor"; - version = "0.8.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "jolicode"; repo = "castor"; rev = "v${finalAttrs.version}"; - hash = "sha256-rJz4BY74BI8gyT4ZlABc4PA+SCsd8guM0m2MTej350g="; + hash = "sha256-zTtMNBZcWjEQB70/6i4pvYEepDVCItJgkwrQ2xrXDAU="; }; vendorHash = "sha256-Jh4mNNYEM9sy0Dp+dZtD+xrMICjAuspe9D9BDXcfUPM="; From 9b3bc22b2fa4a0daa83080e90886849cfb224140 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 12 Oct 2023 11:40:23 +0000 Subject: [PATCH 63/80] php81Packages.php-cs-fixer: 3.28.0 -> 3.34.1 --- pkgs/development/php-packages/php-cs-fixer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/php-packages/php-cs-fixer/default.nix b/pkgs/development/php-packages/php-cs-fixer/default.nix index 937b1f100128..2665a321fdb5 100644 --- a/pkgs/development/php-packages/php-cs-fixer/default.nix +++ b/pkgs/development/php-packages/php-cs-fixer/default.nix @@ -2,14 +2,14 @@ let pname = "php-cs-fixer"; - version = "3.28.0"; + version = "3.34.1"; in mkDerivation { inherit pname version; src = fetchurl { url = "https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v${version}/php-cs-fixer.phar"; - sha256 = "sha256-5dhS4QroRY9tGGSsXQfzWw5ObWO5fIoc+nkOUpAjUlQ="; + sha256 = "sha256-wVqGINDvVr11QDamo1SHmkwKuDqu8GRDFBNsk3C7mt8="; }; dontUnpack = true; From 4776c5baf57567bf35636057afc335712629f581 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 12 Oct 2023 12:06:31 +0000 Subject: [PATCH 64/80] php81Packages.phpcs: 3.7.1 -> 3.7.2 --- pkgs/development/php-packages/phpcs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/php-packages/phpcs/default.nix b/pkgs/development/php-packages/phpcs/default.nix index 0e2d886e6d5a..84e9effbc159 100644 --- a/pkgs/development/php-packages/phpcs/default.nix +++ b/pkgs/development/php-packages/phpcs/default.nix @@ -2,14 +2,14 @@ let pname = "phpcs"; - version = "3.7.1"; + version = "3.7.2"; in mkDerivation { inherit pname version; src = fetchurl { url = "https://github.com/squizlabs/PHP_CodeSniffer/releases/download/${version}/phpcs.phar"; - sha256 = "sha256-ehQyOhSvn1gwLRVEJJLuEHaozXLAGKgWy0SWW/OpsBU="; + sha256 = "sha256-IEIUwepbqBT7CyYIwZzKLBC/X/zJ8OPUw0qtwBeVF7c="; }; dontUnpack = true; From 50d78b0ed6c2e04719f8f5d33d3b487e98f1f57c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 12 Oct 2023 12:12:04 +0000 Subject: [PATCH 65/80] php81Packages.phpmd: 2.13.0 -> 2.14.1 --- pkgs/development/php-packages/phpmd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/php-packages/phpmd/default.nix b/pkgs/development/php-packages/phpmd/default.nix index ba8c0c70c837..c524b3f2b807 100644 --- a/pkgs/development/php-packages/phpmd/default.nix +++ b/pkgs/development/php-packages/phpmd/default.nix @@ -2,14 +2,14 @@ let pname = "phpmd"; - version = "2.13.0"; + version = "2.14.1"; in mkDerivation { inherit pname version; src = fetchurl { url = "https://github.com/phpmd/phpmd/releases/download/${version}/phpmd.phar"; - sha256 = "LNR7qT3KIhIeq9WPdXVGsnuzzXN4ze/juDMpt1Ke/A0="; + sha256 = "sha256-C5VDs0G21EyUVlldg05cbrSYG4/fk01VKE7Eq/zODu8="; }; dontUnpack = true; From 035fbc134ee82a310637f3ce8634846ce49f020c Mon Sep 17 00:00:00 2001 From: SharzyL Date: Thu, 12 Oct 2023 21:20:42 +0800 Subject: [PATCH 66/80] nexttrace: 1.2.1.1 -> 1.2.2.2 --- pkgs/tools/networking/nexttrace/default.nix | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/networking/nexttrace/default.nix b/pkgs/tools/networking/nexttrace/default.nix index b7991ac2c39f..844d2123b272 100644 --- a/pkgs/tools/networking/nexttrace/default.nix +++ b/pkgs/tools/networking/nexttrace/default.nix @@ -2,24 +2,28 @@ buildGoModule rec { pname = "nexttrace"; - version = "1.2.1.1"; + version = "1.2.2.2"; src = fetchFromGitHub { - owner = "sjlleo"; - repo = pname; + owner = "nxtrace"; + repo = "NTrace-core"; rev = "v${version}"; - sha256 = "sha256-B3NHY4wYCa3lR3XPqhjcrgf9iA4Bz/8bKrwxdNSa1Bk="; + sha256 = "sha256-a9l6nsrbgwmk6cq/rPBwPwZ8yhH35VxKmn9x5PgcqGI="; }; - vendorHash = "sha256-8etZelvdUmHNWC0FnSX9oO3reuhB7xIzd/KxPTt6Szc="; + vendorHash = "sha256-YAmGvmHkR1G2MLlDja5aPJqX2F3etogebasqD72YJ3M="; doCheck = false; # Tests require a network connection. ldflags = [ "-s" "-w" - "-X github.com/xgadget-lab/nexttrace/config.Version=v${version}" + "-X github.com/nxtrace/NTrace-core/config.Version=v${version}" ]; + postInstall = '' + mv $out/bin/NTrace-core $out/bin/nexttrace + ''; + meta = with lib; { description = "An open source visual route tracking CLI tool"; homepage = "https://mtr.moe"; From bbdfe21e6bf9225a4f928a765de6eca4c7bad623 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 12 Oct 2023 13:45:21 +0000 Subject: [PATCH 67/80] ispc: 1.21.0 -> 1.21.1 --- pkgs/development/compilers/ispc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/ispc/default.nix b/pkgs/development/compilers/ispc/default.nix index 606d77c1737f..3f7c286d5903 100644 --- a/pkgs/development/compilers/ispc/default.nix +++ b/pkgs/development/compilers/ispc/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "ispc"; - version = "1.21.0"; + version = "1.21.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256:029rlkh7vh8hxg8ygpspxb9hvw5q97m460zbxwb7xnx1jnq8msh4"; + sha256 = "sha256-QnGD27f1GWcuyFxFtzm1f7U/ng7VHZKSeSTcKINO/SA="; }; nativeBuildInputs = [ cmake which m4 bison flex python3 llvmPackages.libllvm.dev tbb ] ++ lib.lists.optionals stdenv.isDarwin [ xcode ]; From b869f7d909562d04dd19183321fd84d8c9c17e4b Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 12 Oct 2023 12:50:25 +0200 Subject: [PATCH 68/80] supersonic: drop glfw3.buildInputs --- pkgs/by-name/su/supersonic/package.nix | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/su/supersonic/package.nix b/pkgs/by-name/su/supersonic/package.nix index 9de886758526..9b0fe4fd0634 100644 --- a/pkgs/by-name/su/supersonic/package.nix +++ b/pkgs/by-name/su/supersonic/package.nix @@ -7,9 +7,11 @@ , pkg-config , desktopToDarwinBundle , xorg +, wayland +, wayland-protocols +, libxkbcommon , libglvnd , mpv -, glfw3 , darwin , waylandSupport ? false }: @@ -45,10 +47,17 @@ buildGoModule rec { ] ++ lib.optionals stdenv.isLinux [ xorg.libXxf86vm xorg.libX11 - ] - ++ (builtins.filter (p: !(lib.hasPrefix "apple-framework" p.name)) - (glfw3.override { inherit waylandSupport; }).buildInputs) - ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals (stdenv.isLinux && !waylandSupport) [ + xorg.libXrandr + xorg.libXinerama + xorg.libXcursor + xorg.libXi + xorg.libXext + ] ++ lib.optionals (stdenv.isLinux && waylandSupport) [ + wayland + wayland-protocols + libxkbcommon + ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk_11_0.frameworks.Cocoa darwin.apple_sdk_11_0.frameworks.Kernel darwin.apple_sdk_11_0.frameworks.OpenGL From e1a273c11ba4af3fcac83fbd5c8b56a272f567dc Mon Sep 17 00:00:00 2001 From: Markus Theil Date: Thu, 12 Oct 2023 19:36:05 +0200 Subject: [PATCH 69/80] botan3: 3.1.1 -> 3.2.0 Changelog: https://botan.randombit.net/news.html Most notable changes: better PQC and TLS 1.3 support Signed-off-by: Markus Theil --- pkgs/development/libraries/botan/3.0.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/botan/3.0.nix b/pkgs/development/libraries/botan/3.0.nix index 139c002bb3be..a9b6a7aa27d3 100644 --- a/pkgs/development/libraries/botan/3.0.nix +++ b/pkgs/development/libraries/botan/3.0.nix @@ -1,9 +1,9 @@ { callPackage, fetchpatch, lib, ... } @ args: callPackage ./generic.nix (args // { - baseVersion = "3.1"; - revision = "1"; - sha256 = "sha256-MMhP6RmTapj+9TMfJGxiqiwOTSCFstRREgf2ogr6Oms="; + baseVersion = "3.2"; + revision = "0"; + sha256 = "BJyEeDX89u86niBrM94F3TiZnDJeJHSCdypVmNnl7OM="; # reconsider removing this platform marking, when MacOS uses Clang 14.0+ by default. badPlatforms = lib.platforms.darwin; }) From 2d1830dc220ae894393b6227432c6469b0d02aee Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Thu, 12 Oct 2023 18:02:28 +0200 Subject: [PATCH 70/80] fs-uae-launcher: fix F12 menu in a running emulator session Adding the shared/ folder allows fs-uae to find the icons --- pkgs/applications/emulators/fs-uae/launcher.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/emulators/fs-uae/launcher.nix b/pkgs/applications/emulators/fs-uae/launcher.nix index 6135ee064e15..51349182832a 100644 --- a/pkgs/applications/emulators/fs-uae/launcher.nix +++ b/pkgs/applications/emulators/fs-uae/launcher.nix @@ -36,10 +36,11 @@ stdenv.mkDerivation (finalAttrs: { wrapQtApp "$out/bin/fs-uae-launcher" \ --set PYTHONPATH "$PYTHONPATH" - # fs-uae-launcher search side by side for fs-uae + # fs-uae-launcher search side by side for executables and shared files # see $src/fsgs/plugins/pluginexecutablefinder.py#find_executable ln -s ${fsuae}/bin/fs-uae $out/bin ln -s ${fsuae}/bin/fs-uae-device-helper $out/bin + ln -s ${fsuae}/share/fs-uae $out/share/fs-uae ''; meta = { From 68096b855d06600776709565be184aa071648333 Mon Sep 17 00:00:00 2001 From: seth Date: Thu, 12 Oct 2023 14:42:44 -0400 Subject: [PATCH 71/80] just: 1.14.0 -> 1.15.0 Diff: https://github.com/casey/just/compare/refs/tags/1.14.0...1.15.0 Changelog: https://github.com/casey/just/blob/1.15.0/CHANGELOG.md --- pkgs/development/tools/just/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/just/default.nix b/pkgs/development/tools/just/default.nix index 0a4ba7c346f2..f95483c144a2 100644 --- a/pkgs/development/tools/just/default.nix +++ b/pkgs/development/tools/just/default.nix @@ -12,17 +12,17 @@ rustPlatform.buildRustPackage rec { pname = "just"; - version = "1.14.0"; + version = "1.15.0"; outputs = [ "out" "man" "doc" ]; src = fetchFromGitHub { owner = "casey"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-gItTmei+nxa56CoVv9xBmsOUH5AP48XNxdlHmXRqo2Y="; + hash = "sha256-r1YJ7L98aLAwBd3g+WlW/UijceR7t9z7aXSZZjlMNnM="; }; - cargoHash = "sha256-iZh9M3QgTH0brh6DkKeQyJiCDmYFUggMiZWTkAGjggE="; + cargoHash = "sha256-Fx2BdSHo+W43ZM/SX1ccddXG9QHlftrupT2cbyT4KM0="; nativeBuildInputs = [ installShellFiles mdbook ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; From 43140284ddc6b1cf375f9369b414e952a112ac49 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 12 Oct 2023 16:35:58 +0000 Subject: [PATCH 72/80] pkg: 1.20.7 -> 1.20.8 --- pkgs/tools/package-management/pkg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/pkg/default.nix b/pkgs/tools/package-management/pkg/default.nix index 07d42879c896..9ca25dd31c38 100644 --- a/pkgs/tools/package-management/pkg/default.nix +++ b/pkgs/tools/package-management/pkg/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "pkg"; - version = "1.20.7"; + version = "1.20.8"; src = fetchFromGitHub { owner = "freebsd"; repo = "pkg"; rev = finalAttrs.version; - sha256 = "sha256-k7QDdHwxM1RYoZy37rzhJunk3RQXVC3rkdoXUVL00wQ="; + sha256 = "sha256-pQgZMCd4PEjNZKm9V35Rca7Miblv1EgkH+CxaiKvhpY="; }; setOutputFlags = false; From 22522136f0da5964773c45722a181dce75581510 Mon Sep 17 00:00:00 2001 From: jacekpoz Date: Wed, 11 Oct 2023 11:34:16 +0200 Subject: [PATCH 73/80] signal-desktop-beta: remove tray icon fix it's unnecessary, the beta has an option in the preferences for it --- .../networking/instant-messengers/signal-desktop/generic.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix index 72a5c55e9cb6..38719920d8a2 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix @@ -159,7 +159,7 @@ stdenv.mkDerivation rec { # Fix the desktop link and fix showing application icon in tray substituteInPlace $out/share/applications/${pname}.desktop \ --replace "/opt/${dir}/${pname}" $out/bin/${pname} \ - --replace "bin/signal-desktop" "bin/signal-desktop --use-tray-icon" + ${if pname == "signal-desktop" then "--replace \"bin/signal-desktop\" \"bin/signal-desktop --use-tray-icon\"" else ""} autoPatchelf --no-recurse -- "$out/lib/${dir}/" patchelf --add-needed ${libpulseaudio}/lib/libpulse.so "$out/lib/${dir}/resources/app.asar.unpacked/node_modules/@signalapp/ringrtc/build/linux/libringrtc-x64.node" From 11c04faa83d1e057652f0042b41261abab100447 Mon Sep 17 00:00:00 2001 From: emilylange Date: Thu, 12 Oct 2023 22:20:36 +0200 Subject: [PATCH 74/80] caddy: fix caddyserver/dist hash after upstream updated the tag This was a due to a miscommunication in the caddy team. --- pkgs/servers/caddy/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/caddy/default.nix b/pkgs/servers/caddy/default.nix index 15b510df3fc3..87123f000c1e 100644 --- a/pkgs/servers/caddy/default.nix +++ b/pkgs/servers/caddy/default.nix @@ -12,7 +12,7 @@ let owner = "caddyserver"; repo = "dist"; rev = "v${version}"; - hash = "sha256-b4cDDUcdVoB7kU677nrKf8W/5QMnB5vEaPYVBMllEA8="; + hash = "sha256-aZ7hdAZJH1PvrX9GQLzLquzzZG3LZSKOvt7sWQhTiR8="; }; in buildGoModule { From 3608abee2e1a7aa6a6c6418d211b87343b765a9d Mon Sep 17 00:00:00 2001 From: Muhammad Falak R Wani Date: Sat, 16 Sep 2023 18:30:28 +0530 Subject: [PATCH 75/80] firecracker: 1.4.0 -> 1.4.1 Diff: https://github.com/firecracker-microvm/firecracker/compare/v1.4.0...v1.4.1 Changelog: https://github.com/firecracker-microvm/firecracker/releases/tag/v1.4.1 Signed-off-by: Muhammad Falak R Wani --- pkgs/applications/virtualization/firecracker/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/firecracker/default.nix b/pkgs/applications/virtualization/firecracker/default.nix index b366a28e59a3..521936fac3c4 100644 --- a/pkgs/applications/virtualization/firecracker/default.nix +++ b/pkgs/applications/virtualization/firecracker/default.nix @@ -1,7 +1,7 @@ { fetchurl, lib, stdenv }: let - version = "1.4.0"; + version = "1.4.1"; # nixpkgs-update: no auto update suffix = { @@ -23,7 +23,7 @@ stdenv.mkDerivation { sourceRoot = "."; src = dlbin { - x86_64-linux = "sha256-WSa8fd0OSPo1HFkH6i8cGMNH1df88xI6PCx39ONb73c="; + x86_64-linux = "sha256-iSz0XlaJqsGICtoG23Y2jDkKU/GM6vPR3kcwsAcJ3X8="; aarch64-linux = "sha256-eOsO/nbwKT50tC5g6INPELh2yVb5C3EGqNLQLT7IGBs="; }; @@ -50,6 +50,8 @@ stdenv.mkDerivation { meta = with lib; { description = "Secure, fast, minimal micro-container virtualization"; homepage = "http://firecracker-microvm.io"; + changelog = "https://github.com/firecracker-microvm/firecracker/releases/tag/v${version}"; + mainProgram = "firecracker"; license = licenses.asl20; platforms = [ "x86_64-linux" "aarch64-linux" ]; maintainers = with maintainers; [ thoughtpolice endocrimes ]; From 2f0415e5899b0bb2ba194bb115b1a01b6a5607ab Mon Sep 17 00:00:00 2001 From: Astro Date: Thu, 12 Oct 2023 19:48:53 +0200 Subject: [PATCH 76/80] firecracker: 1.4.1 -> 1.5.0 --- pkgs/applications/virtualization/firecracker/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/firecracker/default.nix b/pkgs/applications/virtualization/firecracker/default.nix index 521936fac3c4..ee95b55a0b90 100644 --- a/pkgs/applications/virtualization/firecracker/default.nix +++ b/pkgs/applications/virtualization/firecracker/default.nix @@ -1,7 +1,7 @@ { fetchurl, lib, stdenv }: let - version = "1.4.1"; + version = "1.5.0"; # nixpkgs-update: no auto update suffix = { @@ -23,8 +23,8 @@ stdenv.mkDerivation { sourceRoot = "."; src = dlbin { - x86_64-linux = "sha256-iSz0XlaJqsGICtoG23Y2jDkKU/GM6vPR3kcwsAcJ3X8="; - aarch64-linux = "sha256-eOsO/nbwKT50tC5g6INPELh2yVb5C3EGqNLQLT7IGBs="; + x86_64-linux = "sha256-TzNPWcLDKOv12eJ9PHckdJ7tfdlozPoXj2fbdOzHfAk="; + aarch64-linux = "sha256-cHNMfcoHCBw+BnWx9USny8jyvH97gXCCJW1aKvPXgCs="; }; dontConfigure = true; From 1f51f18e01e7afbe25e1ae2fad7933188699156c Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 12 Oct 2023 22:51:40 +0200 Subject: [PATCH 77/80] prometheus-imap-mailstat-exporter: vendorSha256 -> vendorHash --- pkgs/servers/monitoring/prometheus/imap-mailstat-exporter.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/monitoring/prometheus/imap-mailstat-exporter.nix b/pkgs/servers/monitoring/prometheus/imap-mailstat-exporter.nix index fbd5b162a695..e603c2a8811d 100644 --- a/pkgs/servers/monitoring/prometheus/imap-mailstat-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/imap-mailstat-exporter.nix @@ -15,7 +15,7 @@ buildGoModule rec { hash = "sha256-aR/94C9SI+FPs3zg3bpexmgGYrhxghyHwpXj25x0yuw="; }; - vendorSha256 = "sha256-M5Ho4CiO5DC6mWzenXEo2pu0WLHj5S8AV3oEFwD31Sw="; + vendorHash = "sha256-M5Ho4CiO5DC6mWzenXEo2pu0WLHj5S8AV3oEFwD31Sw="; nativeBuildInputs = [ installShellFiles ]; From 30e70aded1a399e13b515426ec8e17841b9a9f1d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 12 Oct 2023 18:17:03 +0000 Subject: [PATCH 78/80] cargo-pgrx: 0.10.2 -> 0.11.0 --- pkgs/development/tools/rust/cargo-pgrx/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-pgrx/default.nix b/pkgs/development/tools/rust/cargo-pgrx/default.nix index 3bb615f3c110..c7a5cc9574b7 100644 --- a/pkgs/development/tools/rust/cargo-pgrx/default.nix +++ b/pkgs/development/tools/rust/cargo-pgrx/default.nix @@ -2,17 +2,17 @@ let pname = "cargo-pgrx"; - version = "0.10.2"; + version = "0.11.0"; in rustPlatform.buildRustPackage rec { inherit version pname; src = fetchCrate { inherit version pname; - hash = "sha256-FqjfbJmSy5UCpPPPk4bkEyvQCnaH9zYtkI7txgIn+ls="; + hash = "sha256-GiUjsSqnrUNgiT/d3b8uK9BV7cHFvaDoq6cUGRwPigM="; }; - cargoHash = "sha256-syZ3cQq8qDHBLvqmNDGoxeK6zXHJ47Jwkw3uhaXNCzI="; + cargoHash = "sha256-oXOPpK8VWzbFE1xHBQYyM5+YP/pRdLvTVN/fjxrgD/c="; nativeBuildInputs = [ pkg-config ]; From bc0e786a549b56233f5d638db2d8943968b4c01a Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 13 Oct 2023 00:00:21 +0200 Subject: [PATCH 79/80] marvin: sha256 -> hash MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Christina Sørensen --- pkgs/applications/science/chemistry/marvin/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/science/chemistry/marvin/default.nix b/pkgs/applications/science/chemistry/marvin/default.nix index e266ee8e32ed..5f08bebd47fc 100644 --- a/pkgs/applications/science/chemistry/marvin/default.nix +++ b/pkgs/applications/science/chemistry/marvin/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchurl { name = "marvin-${version}.deb"; url = "http://dl.chemaxon.com/marvin/${version}/marvin_linux_${versions.majorMinor version}.deb"; - sha256 = "sha256-5ycOteXcdgZaeDl3WQ95H2lD0OnnobCbmnVlfYwVdeI="; + hash = "sha256-5ycOteXcdgZaeDl3WQ95H2lD0OnnobCbmnVlfYwVdeI="; }; nativeBuildInputs = [ dpkg makeWrapper ]; From d4709448594cd0e2657085f06fdc81da96653e6c Mon Sep 17 00:00:00 2001 From: Artturin Date: Fri, 13 Oct 2023 01:13:49 +0300 Subject: [PATCH 80/80] nixos/x11: create xkb option by default without this ``` nix-repl> nixosTests.xfce.nodes.machine.services.xserver.xkb error: The option 'nodes.machine.services.xserver.xkb' is used but not defined. ``` with this ``` nix-repl> nixosTests.xfce.nodes.machine.services.xserver.xkb { dir = "/nix/store/096yg7fc67py86w0bm6g7a32npgyh5ic-xkeyboard-config-2.39/etc/X11/xkb"; layout = "us"; model = "pc104"; options = "terminate:ctrl_alt_bksp"; variant = ""; } ``` --- nixos/modules/services/x11/xserver.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index b2e348a218e9..a5b624fcfdb2 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -365,6 +365,7 @@ in }; xkb = mkOption { + default = { }; description = "X keyboard extension (XKB) configuration"; type = types.submodule { options = {