From 2d07b69bf0ed5708768824ca07ed3da0ddff671e Mon Sep 17 00:00:00 2001 From: Noah Gitsham Date: Mon, 26 Aug 2024 23:07:30 +0100 Subject: [PATCH 001/129] maintainers: add noahgitsham --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index f756e9314f62..c0e6570ba907 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -14924,6 +14924,11 @@ github = "noaccOS"; githubId = 24324352; }; + noahgitsham = { + name = "Noah Gitsham"; + github = "noahgitsham"; + githubId = 73707948; + }; nobbz = { name = "Norbert Melzer"; email = "timmelzer+nixpkgs@gmail.com"; From 9faaa27620c96e7e3e4384341b7f1d8c1b0c0abd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 27 Aug 2024 19:31:39 +0000 Subject: [PATCH 002/129] dnglab: 0.5.2 -> 0.6.3 --- pkgs/tools/graphics/dnglab/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/graphics/dnglab/default.nix b/pkgs/tools/graphics/dnglab/default.nix index 6354c4f495fe..ebcced6e2e23 100644 --- a/pkgs/tools/graphics/dnglab/default.nix +++ b/pkgs/tools/graphics/dnglab/default.nix @@ -4,16 +4,16 @@ }: rustPlatform.buildRustPackage rec { pname = "dnglab"; - version = "0.5.2"; + version = "0.6.3"; src = fetchFromGitHub { owner = "dnglab"; repo = pname; rev = "v${version}"; - sha256 = "sha256-jkOkkcMFK1RLY8Hn/bMMuMZtyGwnwGdm0os8QKhcWqo="; + sha256 = "sha256-EJ0uWc3pp7ixRxDIdTIVVaT2ph3P2IvuK+ecBSB5HYw="; }; - cargoHash = "sha256-qwhOJxFYRJC51dKB1pi/WVJs7H955jM6KmKbxsAScDI="; + cargoHash = "sha256-6qJFNfgWh3i1CpuM/QdLksVAFz4XIV8uT5oz5BZ3U30="; postInstall = '' rm $out/bin/benchmark $out/bin/identify From 7855201741d7fac25d4458e448b1d63c3c8283d1 Mon Sep 17 00:00:00 2001 From: Noah Gitsham Date: Mon, 26 Aug 2024 23:08:11 +0100 Subject: [PATCH 003/129] fragment-mono: init at 1.21 --- pkgs/by-name/fr/fragment-mono/package.nix | 36 +++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 pkgs/by-name/fr/fragment-mono/package.nix diff --git a/pkgs/by-name/fr/fragment-mono/package.nix b/pkgs/by-name/fr/fragment-mono/package.nix new file mode 100644 index 000000000000..6a860a27049f --- /dev/null +++ b/pkgs/by-name/fr/fragment-mono/package.nix @@ -0,0 +1,36 @@ +{ + lib, + stdenvNoCC, + fetchzip, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "fragment-mono"; + version = "1.21"; + + src = fetchzip { + url = "https://github.com/weiweihuanghuang/fragment-mono/releases/download/${finalAttrs.version}/fragment-mono-${finalAttrs.version}.zip"; + hash = "sha256-H5s4rYDN2d0J+zVRgBzg8vfZXCA/jjHrGBV8o8Dxutc="; + }; + + installPhase = '' + runHook preInstall + + install -Dm644 fonts/ttf/*.ttf -t $out/share/fonts/truetype + + runHook postInstall + ''; + + meta = { + homepage = "https://github.com/weiweihuanghuang/fragment-mono"; + description = "Helvetica Monospace Coding Font"; + changelog = "https://github.com/weiweihuanghuang/fragment-mono/releases/tag/${finalAttrs.version}"; + longDescription = '' + Fragment Mono is a monospaced coding version of Helvetica created + by modifying and extending Nimbus Sans by URW Design Studio. + ''; + license = lib.licenses.ofl; + platforms = lib.platforms.all; + maintainers = [ lib.maintainers.noahgitsham ]; + }; +}) From 30a4e6db2a30994ce66c45599370b98eaed25f33 Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Thu, 22 Aug 2024 18:32:14 -0400 Subject: [PATCH 004/129] ffts: init at unstable-2019-03-19 Co-Authored-By: Hans Baier --- pkgs/by-name/ff/ffts/package.nix | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 pkgs/by-name/ff/ffts/package.nix diff --git a/pkgs/by-name/ff/ffts/package.nix b/pkgs/by-name/ff/ffts/package.nix new file mode 100644 index 000000000000..50ea6c26d21b --- /dev/null +++ b/pkgs/by-name/ff/ffts/package.nix @@ -0,0 +1,30 @@ +{ + stdenv, + lib, + cmake, + fetchFromGitHub, +}: + +stdenv.mkDerivation rec { + pname = "ffts"; + version = "0-unstable-2019-03-19"; + + src = fetchFromGitHub { + owner = "linkotec"; + repo = "ffts"; + rev = "2c8da4877588e288ff4cd550f14bec2dc7bf668c"; + hash = "sha256-Cj0n7fwFAu6+3ojgczL0Unobdx/XzGNFvNVMXdyHXE4="; + }; + + nativeBuildInputs = [ cmake ]; + + cmakeFlags = [ "-DENABLE_SHARED=ON" ]; + + meta = { + description = "The Fastest Fourier Transform in the South"; + homepage = "https://github.com/linkotec/ffts"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ bgamari ]; + platforms = lib.platforms.linux; + }; +} From d74187c8b4c768ee202406e2b4acaeb8b5263cf7 Mon Sep 17 00:00:00 2001 From: Chris Dombroski Date: Tue, 17 Sep 2024 17:24:30 -0400 Subject: [PATCH 005/129] knossosnet: 1.2.0 -> 1.2.3 Manual update due to changes needed in deps.nix --- pkgs/by-name/kn/knossosnet/deps.nix | 221 +++++++++++++------------ pkgs/by-name/kn/knossosnet/package.nix | 4 +- 2 files changed, 113 insertions(+), 112 deletions(-) diff --git a/pkgs/by-name/kn/knossosnet/deps.nix b/pkgs/by-name/kn/knossosnet/deps.nix index 233d43f5c0fe..e0481a153b29 100644 --- a/pkgs/by-name/kn/knossosnet/deps.nix +++ b/pkgs/by-name/kn/knossosnet/deps.nix @@ -2,114 +2,115 @@ # Please dont edit it manually, your changes might get overwritten! { fetchNuGet }: [ - (fetchNuGet { pname = "Avalonia"; version = "11.0.5"; sha256 = "1l8vpw7dmkgll197i42r98ikkl0g08469wkl1kxkcv8f0allgah6"; }) - (fetchNuGet { pname = "Avalonia.Angle.Windows.Natives"; version = "2.1.0.2023020321"; sha256 = "1az4s1g22ipak9a3xfh55z2h3rm6lpqh7svbpw6ag4ysrgsjjsjd"; }) - (fetchNuGet { pname = "Avalonia.BuildServices"; version = "0.0.29"; sha256 = "05mm7f0jssih3gbzqfgjnfq5cnqa85ihsg0z1897ciihv8qd3waq"; }) - (fetchNuGet { pname = "Avalonia.Controls.ColorPicker"; version = "11.0.5"; sha256 = "0w1909yjg1s1h6zzxbfw1dazvlknpgk9v7d03ik7ihd14lxzr1i2"; }) - (fetchNuGet { pname = "Avalonia.Controls.DataGrid"; version = "11.0.5"; sha256 = "14nr767zhxcqwis901sn5s9qala0wf2ip4pic3ncdvkhyhq6w9fs"; }) - (fetchNuGet { pname = "Avalonia.Desktop"; version = "11.0.5"; sha256 = "1zqp8whkvm95zxhjpwska7rhkbxjfkv2fz3821pn782931pn59ah"; }) - (fetchNuGet { pname = "Avalonia.Diagnostics"; version = "11.0.5"; sha256 = "1plr03dgq24gjlcx39qlbcg2ywh7in58yfkkq9snvnagh8yk3ifi"; }) - (fetchNuGet { pname = "Avalonia.FreeDesktop"; version = "11.0.5"; sha256 = "0sn6c3mqvc62vhy8ssmz515wbcaq418qfrck67zysp2qzw5iyv9v"; }) - (fetchNuGet { pname = "Avalonia.HtmlRenderer"; version = "11.0.0"; sha256 = "1glnc82dasxcajb84h41273cfaa5apxwfrh12bgd294hfzbza40c"; }) - (fetchNuGet { pname = "Avalonia.Native"; version = "11.0.5"; sha256 = "1n41g1z36sgvhfl7bdavc3j7ccr3qkbqjc4znimqazzyfifh0m99"; }) - (fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "11.0.5"; sha256 = "0a6a8lbpna3z5bcall7a953r3xjibcl90ic21gimwhipyp29sfn1"; }) - (fetchNuGet { pname = "Avalonia.Skia"; version = "11.0.5"; sha256 = "008pqpim91i6mya0nfn3g9gclh0dw5mqmhi2fdalbh62sa8a18xc"; }) - (fetchNuGet { pname = "Avalonia.Themes.Fluent"; version = "11.0.5"; sha256 = "1zhg11c8iah06gkv6gk7vzs0q9lbx1whfma5p2s00k3kyhv9lcqi"; }) - (fetchNuGet { pname = "Avalonia.Themes.Simple"; version = "11.0.5"; sha256 = "1i6xpihpw32i9mywzzhw0nyc2gkifmri6ylila21y8xb0jdazdyv"; }) - (fetchNuGet { pname = "Avalonia.Win32"; version = "11.0.5"; sha256 = "03rbx4msnl8jvw1017wi88rxvgg8iz7idy7wajp3nzk9m0c4pilx"; }) - (fetchNuGet { pname = "Avalonia.X11"; version = "11.0.5"; sha256 = "1bixdr5yzd9spyjc4n2kf1bwg52q3p5akj9xsr25xp310j3kgyxf"; }) - (fetchNuGet { pname = "CommunityToolkit.Mvvm"; version = "8.2.2"; sha256 = "01kkwhz3r7l9d70p6mcgpdc0f05dad0lv6dmcj4sq9ry9ic6pnmx"; }) - (fetchNuGet { pname = "HarfBuzzSharp"; version = "2.8.2.3"; sha256 = "115aybicqs9ijjlcv6k6r5v0agkjm1bm1nkd0rj3jglv8s0xvmp2"; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Linux"; version = "2.8.2.3"; sha256 = "1f18ahwkaginrg0vwsi6s56lvnqvvxv7pzklfs5lnknasxy1a76z"; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.macOS"; version = "2.8.2.3"; sha256 = "052d8frpkj4ijs6fm6xp55xbv95b1s9biqwa0w8zp3rgm88m9236"; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.WebAssembly"; version = "2.8.2.3"; sha256 = "043hv36bg5240znbm8x5la7py17m4jfzy57q3ka32f6zjld83j36"; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "2.8.2.3"; sha256 = "08khd2jqm8sw58ljz5srangzfm2sz3gd2q1jzc5fr80lj8rv6r74"; }) - (fetchNuGet { pname = "ini-parser-netstandard"; version = "2.5.2"; sha256 = "14alsxh7ik07xl9xab8bdi108f4xhz8vcchxvxy1k5w3zf3gdml9"; }) - (fetchNuGet { pname = "MicroCom.Runtime"; version = "0.11.0"; sha256 = "0p9c3m0zk59x9dcqw077hzd2yk60myisbacvm36mnwpcjwzjkp2m"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.0.0"; sha256 = "0bbl0jpqywqmzz2gagld1p2gvdfldjfjmm25hil9wj2nq1zc4di8"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "3.8.0"; sha256 = "12n7rvr39bzkf2maw7zplw8rwpxpxss4ich3bb2pw770rx4nyvyw"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "3.8.0"; sha256 = "1kmry65csvfn72zzc16vj1nfbfwam28wcmlrk3m5rzb8ydbzgylb"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Scripting"; version = "3.8.0"; sha256 = "0w0yx0lpg54iw5jazqk46h48gx43ij32gwac8iywdj6kxfxm03vw"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Scripting.Common"; version = "3.8.0"; sha256 = "0hjgxcsj5zy27lqk0986m59n5dbplx2vjjla2lsvg4bwg8qa7bpk"; }) - (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.3.0"; sha256 = "0gw297dgkh0al1zxvgvncqs0j15lsna9l1wpqas4rflmys440xvb"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "7.0.0"; sha256 = "121zs4jp8iimgbpzm3wsglhjwkc06irg1pxy8c1zcdlsg34cfq1p"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "7.0.0"; sha256 = "181d7mp9307fs17lyy42f8cxnjwysddmpsalky4m0pqxcimnr6g7"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Http"; version = "7.0.0"; sha256 = "196b13zkkq0fhfgigkhwcw1hhaj4dj5pc27z7d5niaizzx6ycwiw"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "7.0.0"; sha256 = "1bqd3pqn5dacgnkq0grc17cgb2i0w8z1raw12nwm3p3zhrfcvgxf"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "7.0.0"; sha256 = "1gn7d18i1wfy13vrwhmdv1rmsb4vrk26kqdld4cgvh77yigj90xs"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "7.0.0"; sha256 = "0b90zkrsk5dw3wr749rbynhpxlg4bgqdnd7d5vdlw2g9c7zlhgx6"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "7.0.0"; sha256 = "1b4km9fszid9vp2zb3gya5ni9fn8bq62bzaas2ck2r7gs0sdys80"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.1.2"; sha256 = "1507hnpr9my3z4w1r6xk5n0s1j3y6a2c2cnynj76za7cphxi1141"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) - (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "6.0.0"; sha256 = "0c6pcj088g1yd1vs529q3ybgsd2vjlk5y1ic6dkmbhvrp5jibl9p"; }) - (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; }) - (fetchNuGet { pname = "runtime.any.System.Globalization"; version = "4.3.0"; sha256 = "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x"; }) - (fetchNuGet { pname = "runtime.any.System.IO"; version = "4.3.0"; sha256 = "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x"; }) - (fetchNuGet { pname = "runtime.any.System.Reflection"; version = "4.3.0"; sha256 = "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly"; }) - (fetchNuGet { pname = "runtime.any.System.Reflection.Extensions"; version = "4.3.0"; sha256 = "0zyri97dfc5vyaz9ba65hjj1zbcrzaffhsdlpxc9bh09wy22fq33"; }) - (fetchNuGet { pname = "runtime.any.System.Reflection.Primitives"; version = "4.3.0"; sha256 = "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf"; }) - (fetchNuGet { pname = "runtime.any.System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl"; }) - (fetchNuGet { pname = "runtime.any.System.Runtime"; version = "4.3.0"; sha256 = "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b"; }) - (fetchNuGet { pname = "runtime.any.System.Runtime.Handles"; version = "4.3.0"; sha256 = "0bh5bi25nk9w9xi8z23ws45q5yia6k7dg3i4axhfqlnj145l011x"; }) - (fetchNuGet { pname = "runtime.any.System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "0c3g3g3jmhlhw4klrc86ka9fjbl7i59ds1fadsb2l8nqf8z3kb19"; }) - (fetchNuGet { pname = "runtime.any.System.Text.Encoding"; version = "4.3.0"; sha256 = "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3"; }) - (fetchNuGet { pname = "runtime.any.System.Threading.Tasks"; version = "4.3.0"; sha256 = "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va"; }) - (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; }) - (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"; }) - (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"; }) - (fetchNuGet { pname = "runtime.native.System"; version = "4.3.0"; sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; }) - (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; }) - (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3"; }) - (fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf"; }) - (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3"; }) - (fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn"; }) - (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3"; }) - (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy"; }) - (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; }) - (fetchNuGet { pname = "runtime.unix.System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5"; }) - (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; }) - (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; }) - (fetchNuGet { pname = "SharpCompress"; version = "0.33.0"; sha256 = "1j94hfjvkygpp97svv75jay0rmnx9ygg86d5syyahl9hayns4ig9"; }) - (fetchNuGet { pname = "SkiaSharp"; version = "2.88.6"; sha256 = "0xs11zjw9ha68maw3l825kfwlrid43qwy0mswljxhpjh0y1k6k6b"; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.Linux"; version = "2.88.6"; sha256 = "0cg38xgddww1y93xrnbfn40sin63yl39j5zm7gm5pdgp5si0cf2n"; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.6"; sha256 = "1fp9h8c8k6sbsh48b69dc6461isd4dajq7yw5i7j6fhkas78q4zf"; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.WebAssembly"; version = "2.88.6"; sha256 = "02wpxwqwknhdhkl00in766samqfzi7r6jmhxs4d047v0fmygv1h8"; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.6"; sha256 = "1w2mwcwkqvrg4x4ybc4674xnkqwh1n2ihg520gqgpnqfc11ghc4n"; }) - (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) - (fetchNuGet { pname = "System.Collections.Immutable"; version = "5.0.0"; sha256 = "1kvcllagxz2q92g81zkz81djkn2lid25ayjfgjalncyc68i15p0r"; }) - (fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "4.5.0"; sha256 = "1jj6f6g87k0iwsgmg3xmnn67a14mq88np0l1ys5zkxhkvbc8976p"; }) - (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; }) - (fetchNuGet { pname = "System.Drawing.Common"; version = "6.0.0"; sha256 = "02n8rzm58dac2np8b3xw8ychbvylja4nh6938l5k2fhyn40imlgz"; }) - (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.3.0"; sha256 = "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk"; }) - (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; }) - (fetchNuGet { pname = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; }) - (fetchNuGet { pname = "System.IO.Pipelines"; version = "6.0.0"; sha256 = "08211lvckdsdbd67xz4f6cyk76cli565j0dby1grlc4k9bhwby65"; }) - (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; }) - (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; }) - (fetchNuGet { pname = "System.Memory"; version = "4.5.4"; sha256 = "14gbbs22mcxwggn0fcfs1b062521azb9fbb7c113x0mq6dzq9h6y"; }) - (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.5.0"; sha256 = "1kzrj37yzawf1b19jq0253rcs8hsq1l2q8g69d7ipnhzb0h97m59"; }) - (fetchNuGet { pname = "System.ObjectModel"; version = "4.3.0"; sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; }) - (fetchNuGet { pname = "System.Private.Uri"; version = "4.3.0"; sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"; }) - (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; }) - (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.3.0"; sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; }) - (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.3.0"; sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"; }) - (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.3.0"; sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"; }) - (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.3.0"; sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; }) - (fetchNuGet { pname = "System.Reflection.Metadata"; version = "5.0.0"; sha256 = "17qsl5nanlqk9iz0l5wijdn6ka632fs1m1fvx18dfgswm258r3ss"; }) - (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; }) - (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.3.0"; sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"; }) - (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; }) - (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; }) - (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.7.1"; sha256 = "119br3pd85lq8zcgh4f60jzmv1g976q1kdgi3hvqdlhfbw6siz2j"; }) - (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; sha256 = "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc"; }) - (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; }) - (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; }) - (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; }) - (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; }) - (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "4.5.1"; sha256 = "1z21qyfs6sg76rp68qdx0c9iy57naan89pg7p6i3qpj8kyzn921w"; }) - (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; }) - (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; }) - (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; sha256 = "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153"; }) - (fetchNuGet { pname = "Tmds.DBus.Protocol"; version = "0.15.0"; sha256 = "0d99kcs7r9cp6gpyc7z230czkkyx4164x86dhy0mca73f2ykc2g2"; }) + (fetchNuGet { pname = "AnimatedImage.Avalonia"; version = "1.0.7"; hash = "sha256-E3wguYRmXYbdP7qcVER5IdxvB5S7rbGoZD7+jwrk5zM="; }) + (fetchNuGet { pname = "Avalonia"; version = "11.0.5"; hash = "sha256-BqpHqQIObTb7DHTyZAgCD9A5I0pZkHhSoPTN2g6/G9E="; }) + (fetchNuGet { pname = "Avalonia.Angle.Windows.Natives"; version = "2.1.0.2023020321"; hash = "sha256-TWop9cvak6cMv2vrA/GlpuYBxS8Fuj5UmupGIV7Q5Ks="; }) + (fetchNuGet { pname = "Avalonia.BuildServices"; version = "0.0.29"; hash = "sha256-WPHRMNowRnYSCh88DWNBCltWsLPyOfzXGzBqLYE7tRY="; }) + (fetchNuGet { pname = "Avalonia.Controls.ColorPicker"; version = "11.0.5"; hash = "sha256-Iob8OyWhwXhmHKCdnea7dtL9VQvcrf6/gUGHJ30CKXA="; }) + (fetchNuGet { pname = "Avalonia.Controls.DataGrid"; version = "11.0.5"; hash = "sha256-2iVuMPRw7sbsYPGSG4XjQFGFky5WB5B05Jh1+I852ZI="; }) + (fetchNuGet { pname = "Avalonia.Desktop"; version = "11.0.5"; hash = "sha256-UKVibxhJoGNvEGh8J/Z0sq8J81FT8yth/yXVPSFHF/8="; }) + (fetchNuGet { pname = "Avalonia.Diagnostics"; version = "11.0.5"; hash = "sha256-0cUxPYJP2W11wnM6j4qNB3IvHlsUp9EZlY8I/NoAmd4="; }) + (fetchNuGet { pname = "Avalonia.FreeDesktop"; version = "11.0.5"; hash = "sha256-O20fC/9YXO3/MZNlh1EgWLHFSyi/ao083MKwjetgxmo="; }) + (fetchNuGet { pname = "Avalonia.HtmlRenderer"; version = "11.0.0"; hash = "sha256-DBD113eQJNHeEgFmx/tVRSnHxhGBQIKWVKxr1QRilr4="; }) + (fetchNuGet { pname = "Avalonia.Native"; version = "11.0.5"; hash = "sha256-KVUAXXT+f4VrtJ8widfEIzN25GBbtXWog/tpM354gdg="; }) + (fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "11.0.5"; hash = "sha256-wTqdxPU3Ql7jC4JFkChbUfaRR0nqUKrYKn8oexdFyig="; }) + (fetchNuGet { pname = "Avalonia.Skia"; version = "11.0.5"; hash = "sha256-rKOgkNLCwEVVcyLCimvhDUDKXnrDOguUryaGVOPFFwE="; }) + (fetchNuGet { pname = "Avalonia.Themes.Fluent"; version = "11.0.5"; hash = "sha256-ETOaNvRzTAC0uEVVB3noiyYM9N9nPrPnMwCqiFgID/4="; }) + (fetchNuGet { pname = "Avalonia.Themes.Simple"; version = "11.0.5"; hash = "sha256-27evmgSrIx+EopF6E3N1cT7BvAUc/s99TVEMfmG83cQ="; }) + (fetchNuGet { pname = "Avalonia.Win32"; version = "11.0.5"; hash = "sha256-ncZLGKhpfjuuVPz4Fs+P6L3dM0KRnwAC3xJRqyvpKw8="; }) + (fetchNuGet { pname = "Avalonia.X11"; version = "11.0.5"; hash = "sha256-rvs3hwRh3F5E1j3JqcodWJTHV3BTWMKkvzq170tuPa4="; }) + (fetchNuGet { pname = "CommunityToolkit.Mvvm"; version = "8.2.2"; hash = "sha256-vdprWEw+J6yJZLWZTUFTrQAHWLuPVXPBaYmePD7kcwY="; }) + (fetchNuGet { pname = "HarfBuzzSharp"; version = "2.8.2.3"; hash = "sha256-4tbdgUabPjlkBm3aUFeocj4Fdslmms2olDFpzOLyqoQ="; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Linux"; version = "2.8.2.3"; hash = "sha256-3xwVfNfKTkuLdnT+e3bfG9tNTdEmar7ByzY+NTlUKLg="; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.macOS"; version = "2.8.2.3"; hash = "sha256-ZohUEaovj/sRB4rjuJIOq6S9eim3m+qMlpHIebNDTRQ="; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.WebAssembly"; version = "2.8.2.3"; hash = "sha256-ZsiBGpXfODHUHPgU/50k9QR/j6Klo7rsB0SUt8zYcBA="; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "2.8.2.3"; hash = "sha256-5GSzM5IUoOwK+zJg0d74WlT3n1VZly8pKlyjiqVocCI="; }) + (fetchNuGet { pname = "ini-parser-netstandard"; version = "2.5.2"; hash = "sha256-idb2hvuDlxl83x0yttGHnTgEQmwLLdUT7QfMeGDXVJE="; }) + (fetchNuGet { pname = "MicroCom.Runtime"; version = "0.11.0"; hash = "sha256-VdwpP5fsclvNqJuppaOvwEwv2ofnAI5ZSz2V+UEdLF0="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.0.0"; hash = "sha256-KDbCfsBWSJ5ohEXUKp1s1LX9xA2NPvXE/xVzj68EdC0="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "3.8.0"; hash = "sha256-3G9vSc/gHH7FWgOySLTut1+eEaf3H66qcPOvNPLOx4o="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "3.8.0"; hash = "sha256-i/r3V/No/VzqmJlWxpGoirvlbJDbBPa/ONZtzYrxuc4="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Scripting"; version = "3.8.0"; hash = "sha256-fA9Qu+vTyMZ9REzxJ4aMg/SHCDRk4q9k4ZGUdynoHnA="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Scripting.Common"; version = "3.8.0"; hash = "sha256-866jMHp8kbc1FYpKuUWnd7ViU6kGJTAxPcL/IjXrT0I="; }) + (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.3.0"; hash = "sha256-a3dAiPaVuky0wpcHmpTVtAQJNGZ2v91/oArA+dpJgj8="; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "7.0.0"; hash = "sha256-N2DHyHiaNvYDQ77f8HI0gE0uIX2aj/rvejVGdCXRP4g="; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "7.0.0"; hash = "sha256-55lsa2QdX1CJn1TpW1vTnkvbGXKCeE9P0O6AkW49LaA="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Http"; version = "7.0.0"; hash = "sha256-PHLmTf8/qmhLO/8IdotsRCoIA2cczhefgw7gOf8Iy6Q="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "7.0.0"; hash = "sha256-rr/NXIZ/3FG5FYGrHD7iIIr12AksP4CnfUy1YvEdDa8="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "7.0.0"; hash = "sha256-uoMkX/TnwP0YabThacTMmyxdc9itQp73CN7xEFFox74="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "7.0.0"; hash = "sha256-pj9I/2HpCU7bLu002/Bb5NF+ofUrJ3IyH7yVqfP8IC0="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "7.0.0"; hash = "sha256-AGnfNNDvZDGZ0Er9JQxeyLoUbVH+jfXF3anFr12qk6w="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; hash = "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.1.2"; hash = "sha256-gYQQO7zsqG+OtN4ywYQyfsiggS2zmxw4+cPXlK+FB5Q="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; hash = "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ="; }) + (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "6.0.0"; hash = "sha256-N9EVZbl5w1VnMywGXyaVWzT9lh84iaJ3aD48hIBk1zA="; }) + (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; hash = "sha256-4PGZqyWhZ6/HCTF2KddDsbmTTjxs2oW79YfkberDZS8="; }) + (fetchNuGet { pname = "runtime.any.System.Globalization"; version = "4.3.0"; hash = "sha256-PaiITTFI2FfPylTEk7DwzfKeiA/g/aooSU1pDcdwWLU="; }) + (fetchNuGet { pname = "runtime.any.System.IO"; version = "4.3.0"; hash = "sha256-vej7ySRhyvM3pYh/ITMdC25ivSd0WLZAaIQbYj/6HVE="; }) + (fetchNuGet { pname = "runtime.any.System.Reflection"; version = "4.3.0"; hash = "sha256-ns6f++lSA+bi1xXgmW1JkWFb2NaMD+w+YNTfMvyAiQk="; }) + (fetchNuGet { pname = "runtime.any.System.Reflection.Extensions"; version = "4.3.0"; hash = "sha256-Y2AnhOcJwJVYv7Rp6Jz6ma0fpITFqJW+8rsw106K2X8="; }) + (fetchNuGet { pname = "runtime.any.System.Reflection.Primitives"; version = "4.3.0"; hash = "sha256-LkPXtiDQM3BcdYkAm5uSNOiz3uF4J45qpxn5aBiqNXQ="; }) + (fetchNuGet { pname = "runtime.any.System.Resources.ResourceManager"; version = "4.3.0"; hash = "sha256-9EvnmZslLgLLhJ00o5MWaPuJQlbUFcUF8itGQNVkcQ4="; }) + (fetchNuGet { pname = "runtime.any.System.Runtime"; version = "4.3.0"; hash = "sha256-qwhNXBaJ1DtDkuRacgHwnZmOZ1u9q7N8j0cWOLYOELM="; }) + (fetchNuGet { pname = "runtime.any.System.Runtime.Handles"; version = "4.3.0"; hash = "sha256-PQRACwnSUuxgVySO1840KvqCC9F8iI9iTzxNW0RcBS4="; }) + (fetchNuGet { pname = "runtime.any.System.Runtime.InteropServices"; version = "4.3.0"; hash = "sha256-Kaw5PnLYIiqWbsoF3VKJhy7pkpoGsUwn4ZDCKscbbzA="; }) + (fetchNuGet { pname = "runtime.any.System.Text.Encoding"; version = "4.3.0"; hash = "sha256-Q18B9q26MkWZx68exUfQT30+0PGmpFlDgaF0TnaIGCs="; }) + (fetchNuGet { pname = "runtime.any.System.Threading.Tasks"; version = "4.3.0"; hash = "sha256-agdOM0NXupfHbKAQzQT8XgbI9B8hVEh+a/2vqeHctg4="; }) + (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-LXUPLX3DJxsU1Pd3UwjO1PO9NM2elNEDXeu2Mu/vNps="; }) + (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-qeSqaUI80+lqw5MK4vMpmO0CZaqrmYktwp6L+vQAb0I="; }) + (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-SrHqT9wrCBsxILWtaJgGKd6Odmxm8/Mh7Kh0CUkZVzA="; }) + (fetchNuGet { pname = "runtime.native.System"; version = "4.3.0"; hash = "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y="; }) + (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-Jy01KhtcCl2wjMpZWH+X3fhHcVn+SyllWFY8zWlz/6I="; }) + (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-wyv00gdlqf8ckxEdV7E+Ql9hJIoPcmYEuyeWb5Oz3mM="; }) + (fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-zi+b4sCFrA9QBiSGDD7xPV27r3iHGlV99gpyVUjRmc4="; }) + (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-gybQU6mPgaWV3rBG2dbH6tT3tBq8mgze3PROdsuWnX0="; }) + (fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-VsP72GVveWnGUvS/vjOQLv1U80H2K8nZ4fDAmI61Hm4="; }) + (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-4yKGa/IrNCKuQ3zaDzILdNPD32bNdy6xr5gdJigyF5g="; }) + (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-HmdJhhRsiVoOOCcUvAwdjpMRiyuSwdcgEv2j9hxi+Zc="; }) + (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-pVFUKuPPIx0edQKjzRon3zKq8zhzHEzko/lc01V/jdw="; }) + (fetchNuGet { pname = "runtime.unix.System.Diagnostics.Debug"; version = "4.3.0"; hash = "sha256-ReoazscfbGH+R6s6jkg5sIEHWNEvjEoHtIsMbpc7+tI="; }) + (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; hash = "sha256-c5tXWhE/fYbJVl9rXs0uHh3pTsg44YD1dJvyOA0WoMs="; }) + (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; hash = "sha256-l8S9gt6dk3qYG6HYonHtdlYtBKyPb29uQ6NDjmrt3V4="; }) + (fetchNuGet { pname = "SharpCompress"; version = "0.33.0"; hash = "sha256-6UWirVcwUai816UZ9J5P3dYMvJLl7K1Puvf5uaWDJMk="; }) + (fetchNuGet { pname = "SkiaSharp"; version = "2.88.6"; hash = "sha256-y0wzgwdQXtgl5boCz/EgLWbK3SwC0cFVRUbBxOUPQXc="; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.Linux"; version = "2.88.6"; hash = "sha256-VjgGoi73tVvqO/UXmQb1w9ioAbFu2dxH8oHz1l5H4zE="; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.6"; hash = "sha256-7hOMjlYTOiNPLNwfLFUjTcdgiGEtmYUI1EubiRiC6bo="; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.WebAssembly"; version = "2.88.6"; hash = "sha256-CIb9fHVgHwIa0R1WafKJ3+GqtDHHRgDohA3ayTHvlws="; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.6"; hash = "sha256-ljD4QmAO2/vwA6I8GIUNkONpOzmGsOVJJy9vPDnjVfA="; }) + (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; hash = "sha256-afY7VUtD6w/5mYqrce8kQrvDIfS2GXDINDh73IjxJKc="; }) + (fetchNuGet { pname = "System.Collections.Immutable"; version = "5.0.0"; hash = "sha256-GdwSIjLMM0uVfE56VUSLVNgpW0B//oCeSFj8/hSlbM8="; }) + (fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "4.5.0"; hash = "sha256-15yE2NoT9vmL9oGCaxHClQR1jLW1j1ef5hHMg55xRso="; }) + (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; hash = "sha256-fkA79SjPbSeiEcrbbUsb70u9B7wqbsdM9s1LnoKj0gM="; }) + (fetchNuGet { pname = "System.Drawing.Common"; version = "6.0.0"; hash = "sha256-/9EaAbEeOjELRSMZaImS1O8FmUe8j4WuFUw1VOrPyAo="; }) + (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.3.0"; hash = "sha256-k75gjOYimIQtLBD5NDzwwi3ZMUBPRW3jmc3evDMMJbU="; }) + (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; hash = "sha256-caL0pRmFSEsaoeZeWN5BTQtGrAtaQPwFi8YOZPZG5rI="; }) + (fetchNuGet { pname = "System.IO"; version = "4.3.0"; hash = "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY="; }) + (fetchNuGet { pname = "System.IO.Pipelines"; version = "6.0.0"; hash = "sha256-xfjF4UqTMJpf8KsBWUyJlJkzPTOO/H5MW023yTYNQSA="; }) + (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; hash = "sha256-R5uiSL3l6a3XrXSSL6jz+q/PcyVQzEAByiuXZNSqD/A="; }) + (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; hash = "sha256-+3pvhZY7rip8HCbfdULzjlC9FPZFpYoQxhkcuFm2wk8="; }) + (fetchNuGet { pname = "System.Memory"; version = "4.5.4"; hash = "sha256-3sCEfzO4gj5CYGctl9ZXQRRhwAraMQfse7yzKoRe65E="; }) + (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.5.0"; hash = "sha256-qdSTIFgf2htPS+YhLGjAGiLN8igCYJnCCo6r78+Q+c8="; }) + (fetchNuGet { pname = "System.ObjectModel"; version = "4.3.0"; hash = "sha256-gtmRkWP2Kwr3nHtDh0yYtce38z1wrGzb6fjm4v8wN6Q="; }) + (fetchNuGet { pname = "System.Private.Uri"; version = "4.3.0"; hash = "sha256-fVfgcoP4AVN1E5wHZbKBIOPYZ/xBeSIdsNF+bdukIRM="; }) + (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; hash = "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY="; }) + (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.3.0"; hash = "sha256-5LhkDmhy2FkSxulXR+bsTtMzdU3VyyuZzsxp7/DwyIU="; }) + (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.3.0"; hash = "sha256-mKRknEHNls4gkRwrEgi39B+vSaAz/Gt3IALtS98xNnA="; }) + (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.3.0"; hash = "sha256-rKx4a9yZKcajloSZHr4CKTVJ6Vjh95ni+zszPxWjh2I="; }) + (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.3.0"; hash = "sha256-mMOCYzUenjd4rWIfq7zIX9PFYk/daUyF0A8l1hbydAk="; }) + (fetchNuGet { pname = "System.Reflection.Metadata"; version = "5.0.0"; hash = "sha256-Wo+MiqhcP9dQ6NuFGrQTw6hpbJORFwp+TBNTq2yhGp8="; }) + (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; hash = "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM="; }) + (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.3.0"; hash = "sha256-4U4/XNQAnddgQIHIJq3P2T80hN0oPdU2uCeghsDTWng="; }) + (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; hash = "sha256-idiOD93xbbrbwwSnD4mORA9RYi/D/U48eRUsn/WnWGo="; }) + (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; hash = "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg="; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.7.1"; hash = "sha256-UvyoDV8O0oY3HPG1GbA56YVdvwTGEfjYR5gW1O7IK4U="; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; hash = "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I="; }) + (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; hash = "sha256-wLDHmozr84v1W2zYCWYxxj0FR0JDYHSVRaRuDm0bd/o="; }) + (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; hash = "sha256-KJ5aXoGpB56Y6+iepBkdpx/AfaJDAitx4vrkLqR7gms="; }) + (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; hash = "sha256-8sDH+WUJfCR+7e4nfpftj/+lstEiZixWUBueR2zmHgI="; }) + (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; hash = "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg="; }) + (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "4.5.1"; hash = "sha256-PIhkv59IXjyiuefdhKxS9hQfEwO9YWRuNudpo53HQfw="; }) + (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; hash = "sha256-ZDQ3dR4pzVwmaqBg4hacZaVenQ/3yAF/uV7BXZXjiWc="; }) + (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; hash = "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w="; }) + (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; hash = "sha256-owSpY8wHlsUXn5xrfYAiu847L6fAKethlvYx97Ri1ng="; }) + (fetchNuGet { pname = "Tmds.DBus.Protocol"; version = "0.15.0"; hash = "sha256-4gk2vXDjKFaBh82gTkwg3c/5GRjiH+bvM5elfDSbKTU="; }) ] diff --git a/pkgs/by-name/kn/knossosnet/package.nix b/pkgs/by-name/kn/knossosnet/package.nix index 7abcb75f3c9a..b621f549ccf5 100644 --- a/pkgs/by-name/kn/knossosnet/package.nix +++ b/pkgs/by-name/kn/knossosnet/package.nix @@ -7,13 +7,13 @@ buildDotnetModule rec { pname = "knossosnet"; - version = "1.2.0"; + version = "1.2.3"; src = fetchFromGitHub { owner = "KnossosNET"; repo = "Knossos.NET"; rev = "v${version}"; - hash = "sha256-4GVbwBykagSMGF3TxyZeoRb7Km+yLEMFOO8fCkH3U5A="; + hash = "sha256-5FNb+L+ABkR/ubSZXuV4hlzy6pIWEXaTXl4piNsmkmw="; }; patches = [ ./targetframework.patch ]; From f373abe60b11bf83c48a7fa84fc9f2c5c8d5151e Mon Sep 17 00:00:00 2001 From: Alexander Heldt Date: Thu, 19 Sep 2024 21:15:39 +0200 Subject: [PATCH 006/129] liquibase: Use `finalAttrs` for recursive fixpoint --- .../tools/database/liquibase/default.nix | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/pkgs/development/tools/database/liquibase/default.nix b/pkgs/development/tools/database/liquibase/default.nix index 41861eb4e5e1..57b4a7d7c8e6 100644 --- a/pkgs/development/tools/database/liquibase/default.nix +++ b/pkgs/development/tools/database/liquibase/default.nix @@ -23,22 +23,18 @@ let ]; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "liquibase"; version = "4.29.2"; src = fetchurl { - url = "https://github.com/liquibase/liquibase/releases/download/v${version}/${pname}-${version}.tar.gz"; + url = "https://github.com/liquibase/liquibase/releases/download/v${finalAttrs.version}/liquibase-${finalAttrs.version}.tar.gz"; hash = "sha256-HQF6IGqVqzB2pS9mBnnC2AufIXSULLBxXjXVOTHiDuk="; }; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ jre ]; - unpackPhase = '' - tar xfz ${src} - ''; - installPhase = let addJars = dir: '' for jar in ${dir}/*.jar; do @@ -53,12 +49,12 @@ stdenv.mkDerivation rec { mkdir -p $out/internal/lib mv ./internal/lib/*.jar $out/internal/lib/ - mkdir -p $out/share/doc/${pname}-${version} + mkdir -p $out/share/doc/liquibase-${finalAttrs.version} mv LICENSE.txt \ README.txt \ ABOUT.txt \ changelog.txt \ - $out/share/doc/${pname}-${version} + $out/share/doc/liquibase-${finalAttrs.version} mkdir -p $out/bin # there’s a lot of escaping, but I’m not sure how to improve that @@ -89,10 +85,10 @@ stdenv.mkDerivation rec { description = "Version Control for your database"; mainProgram = "liquibase"; homepage = "https://www.liquibase.org/"; - changelog = "https://raw.githubusercontent.com/liquibase/liquibase/v${version}/changelog.txt"; + changelog = "https://raw.githubusercontent.com/liquibase/liquibase/v${finalAttrs.version}/changelog.txt"; sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.asl20; maintainers = with maintainers; [ jsoo1 ]; platforms = with platforms; unix; }; -} +}) From 342a47f9bcbdf636158bf7fed22f9d94af1189d9 Mon Sep 17 00:00:00 2001 From: Tom Herbers Date: Sat, 21 Sep 2024 02:08:33 +0200 Subject: [PATCH 007/129] nixos/networkd: add DHCPv4 - IPv6OnlyMode toggle The option was introduced in systemd version 255. https://www.freedesktop.org/software/systemd/man/latest/systemd.network.html#IPv6OnlyMode= --- nixos/modules/system/boot/networkd.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index e000d99cfb48..94a5de7e2bd4 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -855,6 +855,7 @@ let "UseGateway" "UseRoutes" "UseTimezone" + "IPv6OnlyMode" "ClientIdentifier" "VendorClassIdentifier" "UserClass" @@ -888,6 +889,7 @@ let (assertValueOneOf "UseGateway" boolValues) (assertValueOneOf "UseRoutes" boolValues) (assertValueOneOf "UseTimezone" boolValues) + (assertValueOneOf "IPv6OnlyMode" boolValues) (assertValueOneOf "ClientIdentifier" ["mac" "duid" "duid-only"]) (assertInt "IAID") (assertValueOneOf "RequestBroadcast" boolValues) From cbb3d6d9b716757243eb78bfdf943bfa7762d881 Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Mon, 23 Sep 2024 16:18:12 +0300 Subject: [PATCH 008/129] stats: 2.11.7 -> 2.11.11 Changelog: https://github.com/exelban/stats/releases/tag/v2.11.11 Diff: https://github.com/exelban/stats/compare/v2.11.7...v2.11.11 --- pkgs/by-name/st/stats/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/st/stats/package.nix b/pkgs/by-name/st/stats/package.nix index bfa58b5bb7c1..f37e4dfdb73b 100644 --- a/pkgs/by-name/st/stats/package.nix +++ b/pkgs/by-name/st/stats/package.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "stats"; - version = "2.11.7"; + version = "2.11.11"; src = fetchurl { url = "https://github.com/exelban/stats/releases/download/v${finalAttrs.version}/Stats.dmg"; - hash = "sha256-UppO7Cky+9xYg292t/78GPJ822kJ0RMG9yvetxRMVsU="; + hash = "sha256-6USopfRy+ffxXYNAp14RcO/uKZa1yfnz2S3RP8HmCWw="; }; sourceRoot = "."; From e123625aa94e98f5aadec07ba854762a99991bc1 Mon Sep 17 00:00:00 2001 From: Matthias Thym Date: Mon, 23 Sep 2024 21:38:06 +0200 Subject: [PATCH 009/129] markdown-anki-decks: fix build --- pkgs/tools/misc/markdown-anki-decks/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/markdown-anki-decks/default.nix b/pkgs/tools/misc/markdown-anki-decks/default.nix index 178e78bee6ff..b8fbc37ae81e 100644 --- a/pkgs/tools/misc/markdown-anki-decks/default.nix +++ b/pkgs/tools/misc/markdown-anki-decks/default.nix @@ -24,13 +24,14 @@ python3.pkgs.buildPythonApplication rec { dependencies = with python3.pkgs; [ beautifulsoup4 + colorama genanki markdown python-frontmatter typer ]; - # No tests available on Pypi and there is only a failing version assertion test in the repo. + # No tests available on PyPI and there is only a failing version assertion test in the repo. doCheck = false; pythonImportsCheck = [ @@ -42,7 +43,7 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://github.com/lukesmurray/markdown-anki-decks"; changelog = "https://github.com/lukesmurray/markdown-anki-decks/blob/${version}/CHANGELOG.md"; license = licenses.mit; - maintainers = [ ]; + maintainers = with maintainers; [ totoroot ]; platforms = platforms.unix; mainProgram = "mdankideck"; }; From 76f1ad84c833a96091313739edee2d85a972c6cc Mon Sep 17 00:00:00 2001 From: Luflosi Date: Mon, 23 Sep 2024 23:19:17 +0200 Subject: [PATCH 010/129] satellite: 0.4.3 -> 0.5.0 https://codeberg.org/tpikonen/satellite/releases/tag/0.5.0 --- pkgs/by-name/sa/satellite/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sa/satellite/package.nix b/pkgs/by-name/sa/satellite/package.nix index 2eb747758bd1..077c4bfef8ca 100644 --- a/pkgs/by-name/sa/satellite/package.nix +++ b/pkgs/by-name/sa/satellite/package.nix @@ -10,7 +10,7 @@ python3.pkgs.buildPythonApplication rec { pname = "satellite"; - version = "0.4.3"; + version = "0.5.0"; pyproject = true; @@ -19,7 +19,7 @@ python3.pkgs.buildPythonApplication rec { owner = "tpikonen"; repo = "satellite"; rev = version; - hash = "sha256-4L6zbHjWAIJJv2N3XKcfHSZUAUC2FPjK5hT9XGBtQ3w="; + hash = "sha256-61HCk0W07w0LybSVB4APvQX4PMSsqH9mKGzc+Rmno90="; }; nativeBuildInputs = [ From 52fd714a84706f6a751e565a0009802e8bfa73e1 Mon Sep 17 00:00:00 2001 From: Michael Hoang Date: Fri, 20 Sep 2024 17:16:31 +0700 Subject: [PATCH 011/129] berkeleydb: skip tests on macOS to fix build --- pkgs/development/python-modules/berkeleydb/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/berkeleydb/default.nix b/pkgs/development/python-modules/berkeleydb/default.nix index bf6c93b633d3..01135c55dbbf 100644 --- a/pkgs/development/python-modules/berkeleydb/default.nix +++ b/pkgs/development/python-modules/berkeleydb/default.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildPythonPackage, fetchPypi, setuptools, @@ -19,6 +20,10 @@ buildPythonPackage rec { build-system = [ setuptools ]; + # Every test currently fails with: + # berkeleydb.db.DBRunRecoveryError: (-30973, 'BDB0087 DB_RUNRECOVERY: Fatal error, run database recovery -- BDB1546 unable to join the environment') + doCheck = !stdenv.isDarwin; + checkPhase = '' ${python.interpreter} test.py ''; From 193cfe48d476ede39aa3399cf25263fbc1894639 Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Sun, 22 Sep 2024 22:01:26 +0200 Subject: [PATCH 012/129] activemq: migrate to pkgs/by-name, format with nixfmt-rfc-style --- .../ac/activemq/package.nix} | 22 +++++++++++++------ pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 15 insertions(+), 9 deletions(-) rename pkgs/{development/libraries/apache-activemq/default.nix => by-name/ac/activemq/package.nix} (55%) diff --git a/pkgs/development/libraries/apache-activemq/default.nix b/pkgs/by-name/ac/activemq/package.nix similarity index 55% rename from pkgs/development/libraries/apache-activemq/default.nix rename to pkgs/by-name/ac/activemq/package.nix index 5543c12ac9ed..6788978e8d42 100644 --- a/pkgs/development/libraries/apache-activemq/default.nix +++ b/pkgs/by-name/ac/activemq/package.nix @@ -1,21 +1,29 @@ -{ lib, stdenv, fetchurl }: +{ + lib, + stdenvNoCC, + fetchurl, +}: -stdenv.mkDerivation rec { - pname = "apache-activemq"; +stdenvNoCC.mkDerivation rec { + pname = "activemq"; version = "6.1.2"; src = fetchurl { - sha256 = "sha256-EJZWrGvXICxp+eDzrX5BPnl/ZuUMO7utKgaS2c4IBQ0="; - url = "mirror://apache/activemq/${version}/${pname}-${version}-bin.tar.gz"; + url = "https://archive.apache.org/dist/activemq/${version}/apache-activemq-${version}-bin.tar.gz"; + hash = "sha256-EJZWrGvXICxp+eDzrX5BPnl/ZuUMO7utKgaS2c4IBQ0="; }; installPhase = '' + runHook preInstall + mkdir -p $out mv * $out/ - for j in `find $out/lib -name "*.jar"`; do + for j in $(find $out/lib -name "*.jar"); do cp="''${cp:+"$cp:"}$j"; done echo "CLASSPATH=$cp" > $out/lib/classpath.env + + runHook postInstall ''; meta = { @@ -23,7 +31,7 @@ stdenv.mkDerivation rec { description = "Messaging and Integration Patterns server written in Java"; sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; license = lib.licenses.asl20; + mainProgram = "activemq"; platforms = lib.platforms.unix; }; - } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 757459aa5645..596efa36c982 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19005,8 +19005,6 @@ with pkgs; acsccid = callPackage ../tools/security/acsccid { }; - activemq = callPackage ../development/libraries/apache-activemq { }; - adns = callPackage ../development/libraries/adns { }; adslib = callPackage ../development/libraries/adslib { }; From d6f05e3a846768ecf9cafc2f69a68f5313cfbcd1 Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Sun, 22 Sep 2024 22:05:54 +0200 Subject: [PATCH 013/129] activemq: 6.1.2 -> 6.1.3 https://activemq.apache.org/components/classic/download/classic-06-01-03 --- pkgs/by-name/ac/activemq/package.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ac/activemq/package.nix b/pkgs/by-name/ac/activemq/package.nix index 6788978e8d42..3cbb03d6b25e 100644 --- a/pkgs/by-name/ac/activemq/package.nix +++ b/pkgs/by-name/ac/activemq/package.nix @@ -4,13 +4,16 @@ fetchurl, }: -stdenvNoCC.mkDerivation rec { +let + version = "6.1.3"; +in +stdenvNoCC.mkDerivation { pname = "activemq"; - version = "6.1.2"; + inherit version; src = fetchurl { url = "https://archive.apache.org/dist/activemq/${version}/apache-activemq-${version}-bin.tar.gz"; - hash = "sha256-EJZWrGvXICxp+eDzrX5BPnl/ZuUMO7utKgaS2c4IBQ0="; + hash = "sha256-ytFOgW6ZDxMScJ6/wij0KJXYxUxlLTzVbwtRRWNdx5Q="; }; installPhase = '' From b0a499578ca1afd075a1bf3597002b55f5416f47 Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Sun, 22 Sep 2024 22:07:40 +0200 Subject: [PATCH 014/129] activemq: add anthonyroussel to maintainers --- pkgs/by-name/ac/activemq/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/ac/activemq/package.nix b/pkgs/by-name/ac/activemq/package.nix index 3cbb03d6b25e..81a6b540f232 100644 --- a/pkgs/by-name/ac/activemq/package.nix +++ b/pkgs/by-name/ac/activemq/package.nix @@ -35,6 +35,7 @@ stdenvNoCC.mkDerivation { sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; license = lib.licenses.asl20; mainProgram = "activemq"; + maintainers = [ lib.maintainers.anthonyroussel ]; platforms = lib.platforms.unix; }; } From e7e8be8c740f48ee13dc8a91169e7b529b07b68f Mon Sep 17 00:00:00 2001 From: John Lago <750845+Lagoja@users.noreply.github.com> Date: Fri, 20 Sep 2024 15:29:37 -0700 Subject: [PATCH 015/129] devbox: 0.12.0 -> 0.13.0 --- pkgs/development/tools/devbox/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/devbox/default.nix b/pkgs/development/tools/devbox/default.nix index 59200d18b259..de3625a17b15 100644 --- a/pkgs/development/tools/devbox/default.nix +++ b/pkgs/development/tools/devbox/default.nix @@ -5,13 +5,13 @@ }: buildGoModule rec { pname = "devbox"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "jetpack-io"; repo = pname; rev = version; - hash = "sha256-+bnFaopmK8Yz2XSkN3wPiipoO5TsRD0IuAKUlx1KvKM="; + hash = "sha256-gTJotzg7ot9C7NVDiauVJHpkSXBwaK7arjtnwUGFqgE="; }; ldflags = [ @@ -23,7 +23,7 @@ buildGoModule rec { # integration tests want file system access doCheck = false; - vendorHash = "sha256-fuLKo6m/n06W4jyCc4Ki0GLlSIYZNdGFOhpasTd95x0="; + vendorHash = "sha256-rwmNzYzmZqNcNVV4GgqCVLT6ofIkblVCMJHLGwlhcGw="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c874ee7429e3..66f5d2325879 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17599,7 +17599,7 @@ with pkgs; inherit (darwin.apple_sdk_11_0.frameworks) CoreFoundation Security; }; - devbox = callPackage ../development/tools/devbox { }; + devbox = callPackage ../development/tools/devbox { buildGoModule = buildGo123Module; }; libcxx = llvmPackages.libcxx; From b14d6d0e1c4a066556df7c3d78f6843d06bff029 Mon Sep 17 00:00:00 2001 From: Ashish SHUKLA Date: Wed, 25 Sep 2024 09:32:33 +0000 Subject: [PATCH 016/129] fnc: 0.16 -> 0.18 Changes: https://fnc.bsdbox.org/doc/trunk/CHANGES.md --- pkgs/applications/version-management/fnc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/fnc/default.nix b/pkgs/applications/version-management/fnc/default.nix index b52314180816..4b8e629cd4e6 100644 --- a/pkgs/applications/version-management/fnc/default.nix +++ b/pkgs/applications/version-management/fnc/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "fnc"; - version = "0.16"; + version = "0.18"; src = fetchurl { url = "https://fnc.bsdbox.org/tarball/${finalAttrs.version}/fnc-${finalAttrs.version}.tar.gz"; - hash = "sha256-6I6wtSMHaKdnlUK4pYiaybJeODGu2P+smYW8lQDIWGM="; + hash = "sha256-npS+sOxF0S/9TuFjtEFlev0HpIOsaP6zmcfopPNUehk="; }; buildInputs = [ libiconv ncurses zlib ]; From 32e29a2dd630d575d49acce80b6dda45e4c63346 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 25 Sep 2024 13:48:43 +0000 Subject: [PATCH 017/129] nwjs-ffmpeg-prebuilt: 0.91.0 -> 0.92.0 --- pkgs/by-name/nw/nwjs-ffmpeg-prebuilt/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/nw/nwjs-ffmpeg-prebuilt/package.nix b/pkgs/by-name/nw/nwjs-ffmpeg-prebuilt/package.nix index 6acad5ed2c12..c4b85cac55bb 100644 --- a/pkgs/by-name/nw/nwjs-ffmpeg-prebuilt/package.nix +++ b/pkgs/by-name/nw/nwjs-ffmpeg-prebuilt/package.nix @@ -7,7 +7,7 @@ let bits = if stdenv.hostPlatform.is64bit then "x64" else "ia32"; - version = "0.91.0"; + version = "0.92.0"; in stdenv.mkDerivation { pname = "nwjs-ffmpeg-prebuilt"; @@ -16,8 +16,8 @@ stdenv.mkDerivation { src = let hashes = { - "x64" = "sha256-C6ZOY+oFyWYqLvpYmM9KnQ3B7y0JAXp4SbeNBYvcUe0="; - "ia32" = "sha256-C6ZOY+oFyWYqLvpYmM9KnQ3B7y0JAXp4SbeNBYvcUe0="; + "x64" = "sha256-0Y0m9wGZGqH78LTPSWw+OCTvxd6kmIjuYzSaepwt9/I="; + "ia32" = "sha256-0Y0m9wGZGqH78LTPSWw+OCTvxd6kmIjuYzSaepwt9/I="; }; in fetchurl { From 49fd638a47bca86a5258ccb0d207cef9a47474b5 Mon Sep 17 00:00:00 2001 From: Gaute Ravndal Date: Wed, 25 Sep 2024 22:16:24 +0200 Subject: [PATCH 018/129] ncmpcpp: fix visualizer configure flag --- pkgs/applications/audio/ncmpcpp/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/audio/ncmpcpp/default.nix b/pkgs/applications/audio/ncmpcpp/default.nix index fdc377118d27..ebe6eb1530f3 100644 --- a/pkgs/applications/audio/ncmpcpp/default.nix +++ b/pkgs/applications/audio/ncmpcpp/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { configureFlags = [ "BOOST_LIB_SUFFIX=" (lib.enableFeature outputsSupport "outputs") - (lib.enableFeature visualizerSupport "enable-visualizer") + (lib.enableFeature visualizerSupport "visualizer") (lib.withFeature visualizerSupport "fftw") (lib.enableFeature clockSupport "clock") (lib.withFeature taglibSupport "taglib") From 65eea0383988286f43dc2bf8450fdd5d09021707 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Thu, 26 Sep 2024 18:31:39 +0200 Subject: [PATCH 019/129] lib/modules: Improve error when loading a flake as a module --- lib/modules.nix | 111 ++++++++++++++++++++++++++++++++++++++++--- lib/tests/modules.sh | 5 +- 2 files changed, 108 insertions(+), 8 deletions(-) diff --git a/lib/modules.nix b/lib/modules.nix index 381480a1a073..3472085a763b 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -354,12 +354,7 @@ let else if m._type == "if" || m._type == "override" then loadModule args fallbackFile fallbackKey { config = m; } else - throw ( - "Could not load a value as a module, because it is of type ${lib.strings.escapeNixString m._type}" - + optionalString (fallbackFile != unknownModule) ", in file ${toString fallbackFile}." - + optionalString (m._type == "configuration") " If you do intend to import this configuration, please only import the modules that make up the configuration. You may have to create a `let` binding, file or attribute to give yourself access to the relevant modules.\nWhile loading a configuration into the module system is a very sensible idea, it can not be done cleanly in practice." - # Extended explanation: That's because a finalized configuration is more than just a set of modules. For instance, it has its own `specialArgs` that, by the nature of `specialArgs` can't be loaded through `imports` or the the `modules` argument. So instead, we have to ask you to extract the relevant modules and use those instead. This way, we keep the module system comparatively simple, and hopefully avoid a bad surprise down the line. - ) + throw (messages.not_a_module { inherit fallbackFile; value = m; _type = m._type; expectedClass = class; }) else if isList m then let defs = [{ file = fallbackFile; value = m; }]; in throw "Module imports can't be nested lists. Perhaps you meant to remove one level of lists? Definitions: ${showDefs defs}" @@ -1450,6 +1445,110 @@ let collectModules = collectModules null; }; + /** + Error messages produced by the module system. + + We factor these out to improve the flow when reading the code. + + Functions in `messages` that produce error messages are spelled in + lower_snake_case. This goes against the convention in order to make the + error message implementation more readable, and to visually distinguish + them from other functions in the module system. + */ + messages = let + inherit (lib.strings) concatMapStringsSep escapeNixString trim; + /** "" or ", in file FOO" */ + into_fallback_file_maybe = file: + optionalString + (file != null && file != unknownModule) + ", while trying to load a module into ${toString file}"; + + /** Format text with one line break between each list item. */ + lines = concatMapStringsSep "\n" trim; + + /** Format text with two line break between each list item. */ + paragraphs = concatMapStringsSep "\n\n" trim; + + /** + ``` + optionalMatch + { foo = "Foo result"; + bar = "Bar result"; + } "foo" + == [ "Foo result" ] + + optionalMatch { foo = "Foo"; } "baz" == [ ] + + optionalMatch { foo = "Foo"; } true == [ ] + ``` + */ + optionalMatch = cases: value: + if isString value && cases?${value} + then [ cases.${value} ] + else []; + + # esc = builtins.fromJSON "\"\\u001b\""; + esc = builtins.fromJSON "\"\\u001b\""; + # Bold purple for warnings + warn = s: "${esc}[1;35m${s}${esc}[0m"; + # Bold green for suggestions + good = s: "${esc}[1;32m${s}${esc}[0m"; + # Bold, default color for code + code = s: "${esc}[1m${s}${esc}[0m"; + + in { + + /** When load a value with a (wrong) _type as a module */ + not_a_module = { fallbackFile, value, _type, expectedClass ? null }: + paragraphs ( + [ '' + Expected a module, but found a value of type ${warn (escapeNixString _type)}${into_fallback_file_maybe fallbackFile}. + A module is typically loaded by adding it the ${code "imports = [ ... ];"} attribute of an existing module, or in the ${code "modules = [ ... ];"} argument of various functions. + Please make sure that each of the list items is a module, and not a different kind of value. + '' + ] + ++ (optionalMatch + { + "configuration" = trim '' + If you really mean to import this configuration, instead please only import the modules that make up the configuration. + You may have to create a `let` binding, file or attribute to give yourself access to the relevant modules. + While loading a configuration into the module system is a very sensible idea, it can not be done cleanly in practice. + ''; + # ^^ Extended explanation: That's because a finalized configuration is more than just a set of modules. For instance, it has its own `specialArgs` that, by the nature of `specialArgs` can't be loaded through `imports` or the the `modules` argument. So instead, we have to ask you to extract the relevant modules and use those instead. This way, we keep the module system comparatively simple, and hopefully avoid a bad surprise down the line. + + "flake" = lines + ([(trim '' + Perhaps you forgot to select an attribute name? + Instead of, for example, + ${warn "inputs.someflake"} + you need to write something like + ${warn "inputs.someflake"}${ + if expectedClass == null + then good ".modules.someApp.default" + else good ".modules.${expectedClass}.default" + + } + '')] + ++ optionalMatch + { # We'll no more than 5 custom suggestions here. + # Please switch to `.modules.${class}` in your Module System application. + "nixos" = trim '' + or + ${warn "inputs.someflake"}${good ".nixosModules.default"} + ''; + "darwin" = trim '' + or + ${warn "inputs.someflake"}${good ".darwinModules.default"} + ''; + } + expectedClass + ); + } + _type + ) + ); + }; + in private // { diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh index 685856f16f69..999e105f4a27 100755 --- a/lib/tests/modules.sh +++ b/lib/tests/modules.sh @@ -534,9 +534,10 @@ checkConfigError 'The module .*/module-class-is-darwin.nix was imported into nix checkConfigError 'A submoduleWith option is declared multiple times with conflicting class values "darwin" and "nixos".' config.sub.mergeFail.config ./class-check.nix # _type check -checkConfigError 'Could not load a value as a module, because it is of type "flake", in file .*/module-imports-_type-check.nix' config.ok.config ./module-imports-_type-check.nix +checkConfigError 'Expected a module, but found a value of type .*"flake".*, while trying to load a module into .*/module-imports-_type-check.nix' config.ok.config ./module-imports-_type-check.nix checkConfigOutput '^true$' "$@" config.enable ./declare-enable.nix ./define-enable-with-top-level-mkIf.nix -checkConfigError 'Could not load a value as a module, because it is of type "configuration", in file .*/import-configuration.nix.*please only import the modules that make up the configuration.*' config ./import-configuration.nix +checkConfigError 'Expected a module, but found a value of type .*"configuration".*, while trying to load a module into .*/import-configuration.nix.' config ./import-configuration.nix +checkConfigError 'please only import the modules that make up the configuration' config ./import-configuration.nix # doRename works when `warnings` does not exist. checkConfigOutput '^1234$' config.c.d.e ./doRename-basic.nix From 0a221ab2dedc11c89ed4e565b82155fe9cf0321b Mon Sep 17 00:00:00 2001 From: Cathal Mullan Date: Thu, 26 Sep 2024 23:56:35 +0100 Subject: [PATCH 020/129] dioxus-cli: 0.5.6 -> 0.5.7 --- pkgs/development/tools/rust/dioxus-cli/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/rust/dioxus-cli/default.nix b/pkgs/development/tools/rust/dioxus-cli/default.nix index b66b99b87bd3..148bb86601f6 100644 --- a/pkgs/development/tools/rust/dioxus-cli/default.nix +++ b/pkgs/development/tools/rust/dioxus-cli/default.nix @@ -7,20 +7,21 @@ , cacert , openssl , darwin +, nix-update-script , testers , dioxus-cli }: rustPlatform.buildRustPackage rec { pname = "dioxus-cli"; - version = "0.5.6"; + version = "0.5.7"; src = fetchCrate { inherit pname version; - hash = "sha256-cOd8OGkmebUYw6fNLO/kja81qKwqBuVpJqCix1Izf64="; + hash = "sha256-/LeMh5WX4dvkveu5w6qBQLbtoi5yUW6iad0YatA/tMQ="; }; - cargoHash = "sha256-shllaNdg9g6fD8qRyCKpN47keFUTu0g96MzVX4BrhXI="; + cargoHash = "sha256-D6y2NiFqSf0u6icSKCRZK7ycR+GswOX627M7PEy/D6U="; nativeBuildInputs = [ pkg-config cacert ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ @@ -38,10 +39,9 @@ rustPlatform.buildRustPackage rec { "--skip=server::web::proxy::test::add_proxy_trailing_slash" ]; - passthru.tests.version = testers.testVersion { - package = dioxus-cli; - command = "${meta.mainProgram} --version"; - inherit version; + passthru = { + updateScript = nix-update-script { }; + tests.version = testers.testVersion { package = dioxus-cli; }; }; meta = with lib; { From 7b76bb2be13a60e6ed388b97522c4dcb43b2192a Mon Sep 17 00:00:00 2001 From: Yarny0 <41838844+Yarny0@users.noreply.github.com> Date: Fri, 27 Sep 2024 08:45:18 +0200 Subject: [PATCH 021/129] hylafaxplus: 7.0.8 -> 7.0.9 ...released on Sept 26 2024. Also adapt the libtiff compatibility patch. Release notes: https://hylafax.sourceforge.io/news/7.0.9.php --- pkgs/servers/hylafaxplus/default.nix | 4 ++-- pkgs/servers/hylafaxplus/libtiff-4.patch | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/hylafaxplus/default.nix b/pkgs/servers/hylafaxplus/default.nix index 246ad636ceb4..3c66ce8129f3 100644 --- a/pkgs/servers/hylafaxplus/default.nix +++ b/pkgs/servers/hylafaxplus/default.nix @@ -32,8 +32,8 @@ let pname = "hylafaxplus"; - version = "7.0.8"; - hash = "sha512-6wTLVcaHpASy+2i+jeoJ1cM2aLgI5vznGrLd4NCkLHiOxlfCh/ASRaj2Nxt9ZZ5NN/deEwf9tNSZ7MkFZHVsqA=="; + version = "7.0.9"; + hash = "sha512-3OJwM4vFC9pzPozPobFLiNNx/Qnkl8BpNNziRUpJNBDLBxjtg/eDm3GnprS2hpt7VUoV4PCsFvp1hxhNnhlUwQ=="; configSite = substituteAll { name = "${pname}-config.site"; diff --git a/pkgs/servers/hylafaxplus/libtiff-4.patch b/pkgs/servers/hylafaxplus/libtiff-4.patch index d7284e242865..2257705710c0 100644 --- a/pkgs/servers/hylafaxplus/libtiff-4.patch +++ b/pkgs/servers/hylafaxplus/libtiff-4.patch @@ -5,7 +5,7 @@ https://bugs.gentoo.org/706154 echo '#define TIFFSTRIPBYTECOUNTS uint32_t' echo '#define TIFFVERSION TIFF_VERSION' echo '#define TIFFHEADER TIFFHeader';; -- 4.[0123456]) tiff_runlen_t="uint32_t" +- 4.[01234567]) tiff_runlen_t="uint32_t" + 4.[0-9]) tiff_runlen_t="uint32_t" tiff_offset_t="uint64_t" echo '#define TIFFSTRIPBYTECOUNTS uint64_t' From 6358d98704567a129314f700f1a35724c3358a0f Mon Sep 17 00:00:00 2001 From: Mirko Lenz Date: Fri, 27 Sep 2024 11:00:05 +0200 Subject: [PATCH 022/129] ulauncher: add mainProgram --- pkgs/applications/misc/ulauncher/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/misc/ulauncher/default.nix b/pkgs/applications/misc/ulauncher/default.nix index 438277bc98cd..cf3a6a46f9de 100644 --- a/pkgs/applications/misc/ulauncher/default.nix +++ b/pkgs/applications/misc/ulauncher/default.nix @@ -121,6 +121,7 @@ python3Packages.buildPythonApplication rec { homepage = "https://ulauncher.io/"; license = licenses.gpl3; platforms = platforms.linux; + mainProgram = "ulauncher"; maintainers = with maintainers; [ aaronjanse sebtm ]; }; } From a2054f705bebb757a7bc1b5156eab063f7398117 Mon Sep 17 00:00:00 2001 From: Alex Platz Date: Mon, 23 Sep 2024 11:34:41 -0700 Subject: [PATCH 023/129] airshipper 10.0 -> 14.0 --- pkgs/games/airshipper/Cargo.lock | 5355 ----------------------------- pkgs/games/airshipper/default.nix | 21 +- 2 files changed, 12 insertions(+), 5364 deletions(-) delete mode 100644 pkgs/games/airshipper/Cargo.lock diff --git a/pkgs/games/airshipper/Cargo.lock b/pkgs/games/airshipper/Cargo.lock deleted file mode 100644 index d89ec3a7472a..000000000000 --- a/pkgs/games/airshipper/Cargo.lock +++ /dev/null @@ -1,5355 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "Inflector" -version = "0.11.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3" - -[[package]] -name = "ab_glyph" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04a9283dace1c41c265496614998d5b9c4a97b3eb770e804f007c5144bf03f2b" -dependencies = [ - "ab_glyph_rasterizer", - "owned_ttf_parser", -] - -[[package]] -name = "ab_glyph_rasterizer" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "363b9b88fad3af3be80bc8f762c9a3f9dfe906fd0327b8e92f1c12e5ae1b8bbb" - -[[package]] -name = "addr2line" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b" -dependencies = [ - "gimli", -] - -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - -[[package]] -name = "adler32" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234" - -[[package]] -name = "aead" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b613b8e1e3cf911a086f53f03bf286f52fd7a7258e4fa606f0ef220d39d8877" -dependencies = [ - "generic-array", -] - -[[package]] -name = "aes" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8" -dependencies = [ - "cfg-if 1.0.0", - "cipher", - "cpufeatures", - "opaque-debug", -] - -[[package]] -name = "aes-gcm" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df5f85a83a7d8b0442b6aa7b504b8212c1733da07b98aae43d4bc21b2cb3cdf6" -dependencies = [ - "aead", - "aes", - "cipher", - "ctr", - "ghash", - "subtle", -] - -[[package]] -name = "ahash" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" -dependencies = [ - "getrandom 0.2.7", - "once_cell", - "version_check", -] - -[[package]] -name = "aho-corasick" -version = "0.7.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e" -dependencies = [ - "memchr", -] - -[[package]] -name = "airshipper" -version = "0.10.0" -dependencies = [ - "bytesize", - "chrono", - "clap", - "colored", - "country-parser", - "derive_more", - "dirs-next", - "find_folder", - "futures-util", - "html2text", - "iced", - "iced_lazy", - "iced_native", - "image", - "indicatif 0.16.2", - "lazy_static", - "md5", - "opener", - "openssl-sys", - "pulldown-cmark 0.8.0", - "rand 0.8.5", - "regex", - "reqwest", - "ron 0.6.6", - "rss", - "rustyline", - "self_update", - "semver 1.0.13", - "serde", - "socket2", - "strip_markdown", - "surge-ping", - "termcolor", - "thiserror", - "tokio", - "tokio-stream", - "tracing", - "tracing-appender", - "tracing-futures", - "tracing-log", - "tracing-subscriber", - "url", - "veloren-serverbrowser-api", - "winapi", - "winres", - "zip", -] - -[[package]] -name = "airshipper-server" -version = "0.10.0" -dependencies = [ - "bytes", - "chrono", - "diesel", - "diesel_migrations", - "dotenv", - "futures", - "lazy_static", - "libsqlite3-sys", - "md5", - "octocrab", - "openssl-sys", - "prometheus", - "regex", - "reqwest", - "rocket", - "rocket_sync_db_pools", - "ron 0.7.1", - "serde", - "serde_json", - "termcolor", - "thiserror", - "tokio", - "tokio-util 0.6.10", - "tracing", - "tracing-appender", - "tracing-log", - "tracing-subscriber", - "url", -] - -[[package]] -name = "aliasable" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "250f629c0161ad8107cf89319e990051fae62832fd343083bea452d93e2205fd" - -[[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_term" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" -dependencies = [ - "winapi", -] - -[[package]] -name = "approx" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cab112f0a86d568ea0e627cc1d6be74a1e9cd55214684db5561995f6dad897c6" -dependencies = [ - "num-traits", -] - -[[package]] -name = "arc-swap" -version = "1.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "983cd8b9d4b02a6dc6ffa557262eb5858a27a0038ffffe21a0f133eaa819a164" - -[[package]] -name = "arrayvec" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" - -[[package]] -name = "ash" -version = "0.34.0+1.2.203" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0f780da53d0063880d45554306489f09dd8d1bda47688b4a57bc579119356df" -dependencies = [ - "libloading", -] - -[[package]] -name = "async-stream" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dad5c83079eae9969be7fadefe640a1c566901f05ff91ab221de4b6f68d9507e" -dependencies = [ - "async-stream-impl", - "futures-core", -] - -[[package]] -name = "async-stream-impl" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10f203db73a71dfa2fb6dd22763990fa26f3d2625a6da2da900d23b87d26be27" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "async-trait" -version = "0.1.57" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76464446b8bc32758d7e88ee1a804d9914cd9b1cb264c029899680b0be29826f" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "atom_syndication" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d5016bf52ff4f3ed28bf3ec1fed96b53daf4b137d5e6b9f97a8cfae7b57a3a2" -dependencies = [ - "chrono", - "derive_builder", - "diligent-date-parser", - "quick-xml", -] - -[[package]] -name = "atomic" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b88d82667eca772c4aa12f0f1348b3ae643424c8876448f3f7bd5787032e234c" -dependencies = [ - "autocfg", -] - -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi", - "libc", - "winapi", -] - -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "backtrace" -version = "0.3.66" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cab84319d616cfb654d03394f38ab7e6f0919e181b1b57e1fd15e7fb4077d9a7" -dependencies = [ - "addr2line", - "cc", - "cfg-if 1.0.0", - "libc", - "miniz_oxide 0.5.4", - "object", - "rustc-demangle", -] - -[[package]] -name = "base64" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff" - -[[package]] -name = "base64" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" - -[[package]] -name = "binascii" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "383d29d513d8764dcdc42ea295d979eb99c3c9f00607b3692cf68a431f7dca72" - -[[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" -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 = "block-buffer" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e" -dependencies = [ - "generic-array", -] - -[[package]] -name = "bstr" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223" -dependencies = [ - "lazy_static", - "memchr", - "regex-automata", -] - -[[package]] -name = "bumpalo" -version = "3.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1ad822118d20d2c234f427000d5acc36eabe1e29a348c89b63dd60b13f28e5d" - -[[package]] -name = "bytemuck" -version = "1.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f5715e491b5a1598fc2bef5a606847b5dc1d48ea625bd3c02c00de8285591da" -dependencies = [ - "bytemuck_derive", -] - -[[package]] -name = "bytemuck_derive" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b9e1f5fa78f69496407a27ae9ed989e3c3b072310286f5ef385525e4cbc24a9" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "byteorder" -version = "1.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" - -[[package]] -name = "bytes" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8" - -[[package]] -name = "bytesize" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c58ec36aac5066d5ca17df51b3e70279f5670a72102f5752cb7e7c856adfc70" - -[[package]] -name = "bzip2" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6afcd980b5f3a45017c57e57a2fcccbb351cc43a356ce117ef760ef8052b89b0" -dependencies = [ - "bzip2-sys", - "libc", -] - -[[package]] -name = "bzip2-sys" -version = "0.1.11+1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc" -dependencies = [ - "cc", - "libc", - "pkg-config", -] - -[[package]] -name = "calloop" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf2eec61efe56aa1e813f5126959296933cf0700030e4314786c48779a66ab82" -dependencies = [ - "log", - "nix 0.22.3", -] - -[[package]] -name = "cc" -version = "1.0.73" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11" - -[[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" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "cfg_aliases" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" - -[[package]] -name = "chrono" -version = "0.4.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfd4d1b31faaa3a89d7934dbded3111da0d2ef28e3ebccdb4f0179f5929d1ef1" -dependencies = [ - "iana-time-zone", - "js-sys", - "num-integer", - "num-traits", - "serde", - "time 0.1.44", - "wasm-bindgen", - "winapi", -] - -[[package]] -name = "cipher" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7" -dependencies = [ - "generic-array", -] - -[[package]] -name = "clap" -version = "3.2.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b71c3ce99b7611011217b366d923f1d0a7e07a92bb2dbf1e84508c673ca3bd" -dependencies = [ - "atty", - "bitflags", - "clap_derive", - "clap_lex", - "indexmap", - "once_cell", - "strsim 0.10.0", - "termcolor", - "textwrap", -] - -[[package]] -name = "clap_derive" -version = "3.2.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea0c8bce528c4be4da13ea6fead8965e95b6073585a2f05204bd8f4119f82a65" -dependencies = [ - "heck", - "proc-macro-error", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "clap_lex" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" -dependencies = [ - "os_str_bytes", -] - -[[package]] -name = "clipboard-win" -version = "4.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4ab1b92798304eedc095b53942963240037c0516452cb11aeba709d420b2219" -dependencies = [ - "error-code", - "str-buf", - "winapi", -] - -[[package]] -name = "clipboard_macos" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "145a7f9e9b89453bc0a5e32d166456405d389cea5b578f57f1274b1397588a95" -dependencies = [ - "objc", - "objc-foundation", - "objc_id", -] - -[[package]] -name = "clipboard_wayland" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f6364a9f7a66f2ac1a1a098aa1c7f6b686f2496c6ac5e5c0d773445df912747" -dependencies = [ - "smithay-clipboard", -] - -[[package]] -name = "clipboard_x11" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "983a7010836ecd04dde2c6d27a0cb56ec5d21572177e782bdcb24a600124e921" -dependencies = [ - "thiserror", - "x11rb", -] - -[[package]] -name = "cocoa" -version = "0.24.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f63902e9223530efb4e26ccd0cf55ec30d592d3b42e21a28defc42a9586e832" -dependencies = [ - "bitflags", - "block", - "cocoa-foundation", - "core-foundation 0.9.3", - "core-graphics 0.22.3", - "foreign-types", - "libc", - "objc", -] - -[[package]] -name = "cocoa-foundation" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ade49b65d560ca58c403a479bb396592b155c0185eada742ee323d1d68d6318" -dependencies = [ - "bitflags", - "block", - "core-foundation 0.9.3", - "core-graphics-types", - "foreign-types", - "libc", - "objc", -] - -[[package]] -name = "codespan-reporting" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" -dependencies = [ - "termcolor", - "unicode-width", -] - -[[package]] -name = "color_quant" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" - -[[package]] -name = "colored" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3616f750b84d8f0de8a58bda93e08e2a81ad3f523089b05f1dffecab48c6cbd" -dependencies = [ - "atty", - "lazy_static", - "winapi", -] - -[[package]] -name = "console" -version = "0.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89eab4d20ce20cea182308bca13088fecea9c05f6776cf287205d41a0ed3c847" -dependencies = [ - "encode_unicode", - "libc", - "once_cell", - "terminal_size", - "unicode-width", - "winapi", -] - -[[package]] -name = "convert_case" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" - -[[package]] -name = "cookie" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94d4706de1b0fa5b132270cddffa8585166037822e260a944fe161acd137ca05" -dependencies = [ - "aes-gcm", - "base64 0.13.0", - "hkdf", - "hmac", - "percent-encoding", - "rand 0.8.5", - "sha2", - "subtle", - "time 0.3.14", - "version_check", -] - -[[package]] -name = "copyless" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2df960f5d869b2dd8532793fde43eb5427cceb126c929747a26823ab0eeb536" - -[[package]] -name = "core-foundation" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57d24c7a13c43e870e37c1556b74555437870a04514f7685f5b354e090567171" -dependencies = [ - "core-foundation-sys 0.7.0", - "libc", -] - -[[package]] -name = "core-foundation" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" -dependencies = [ - "core-foundation-sys 0.8.3", - "libc", -] - -[[package]] -name = "core-foundation-sys" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac" - -[[package]] -name = "core-foundation-sys" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" - -[[package]] -name = "core-graphics" -version = "0.19.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3889374e6ea6ab25dba90bb5d96202f61108058361f6dc72e8b03e6f8bbe923" -dependencies = [ - "bitflags", - "core-foundation 0.7.0", - "foreign-types", - "libc", -] - -[[package]] -name = "core-graphics" -version = "0.22.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb" -dependencies = [ - "bitflags", - "core-foundation 0.9.3", - "core-graphics-types", - "foreign-types", - "libc", -] - -[[package]] -name = "core-graphics-types" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a68b68b3446082644c91ac778bf50cd4104bfb002b5a6a7c44cca5a2c70788b" -dependencies = [ - "bitflags", - "core-foundation 0.9.3", - "foreign-types", - "libc", -] - -[[package]] -name = "core-video-sys" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34ecad23610ad9757664d644e369246edde1803fcb43ed72876565098a5d3828" -dependencies = [ - "cfg-if 0.1.10", - "core-foundation-sys 0.7.0", - "core-graphics 0.19.2", - "libc", - "objc", -] - -[[package]] -name = "country-parser" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dee23a8308105cbce67c6b9bf85d204949b614bf9286c24f5eebfae50f17b60" -dependencies = [ - "lazy_static", - "ron 0.6.6", - "serde", -] - -[[package]] -name = "cpufeatures" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" -dependencies = [ - "libc", -] - -[[package]] -name = "crc32fast" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" -dependencies = [ - "cfg-if 1.0.0", -] - -[[package]] -name = "crossbeam-channel" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521" -dependencies = [ - "cfg-if 1.0.0", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-deque" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "715e8152b692bba2d374b53d4875445368fdf21a94751410af607a5ac677d1fc" -dependencies = [ - "cfg-if 1.0.0", - "crossbeam-epoch", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-epoch" -version = "0.9.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "045ebe27666471bb549370b4b0b3e51b07f56325befa4284db65fc89c02511b1" -dependencies = [ - "autocfg", - "cfg-if 1.0.0", - "crossbeam-utils", - "memoffset", - "once_cell", - "scopeguard", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51887d4adc7b564537b15adcfb307936f8075dfcd5f00dde9a9f1d29383682bc" -dependencies = [ - "cfg-if 1.0.0", - "once_cell", -] - -[[package]] -name = "crypto-common" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" -dependencies = [ - "generic-array", - "typenum", -] - -[[package]] -name = "ctr" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "049bb91fb4aaf0e3c7efa6cd5ef877dbbbd15b39dad06d9948de4ec8a75761ea" -dependencies = [ - "cipher", -] - -[[package]] -name = "cty" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35" - -[[package]] -name = "d3d12" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2daefd788d1e96e0a9d66dee4b828b883509bc3ea9ce30665f04c3246372690c" -dependencies = [ - "bitflags", - "libloading", - "winapi", -] - -[[package]] -name = "darling" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d706e75d87e35569db781a9b5e2416cff1236a47ed380831f959382ccd5f858" -dependencies = [ - "darling_core 0.10.2", - "darling_macro 0.10.2", -] - -[[package]] -name = "darling" -version = "0.13.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a01d95850c592940db9b8194bc39f4bc0e89dee5c4265e4b1807c34a9aba453c" -dependencies = [ - "darling_core 0.13.4", - "darling_macro 0.13.4", -] - -[[package]] -name = "darling_core" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0c960ae2da4de88a91b2d920c2a7233b400bc33cb28453a2987822d8392519b" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim 0.9.3", - "syn", -] - -[[package]] -name = "darling_core" -version = "0.13.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim 0.10.0", - "syn", -] - -[[package]] -name = "darling_macro" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b5a2f4ac4969822c62224815d069952656cadc7084fdca9751e6d959189b72" -dependencies = [ - "darling_core 0.10.2", - "quote", - "syn", -] - -[[package]] -name = "darling_macro" -version = "0.13.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835" -dependencies = [ - "darling_core 0.13.4", - "quote", - "syn", -] - -[[package]] -name = "deflate" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73770f8e1fe7d64df17ca66ad28994a0a623ea497fa69486e14984e715c5d174" -dependencies = [ - "adler32", - "byteorder", -] - -[[package]] -name = "derive_builder" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2658621297f2cf68762a6f7dc0bb7e1ff2cfd6583daef8ee0fed6f7ec468ec0" -dependencies = [ - "darling 0.10.2", - "derive_builder_core", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "derive_builder_core" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2791ea3e372c8495c0bc2033991d76b512cd799d07491fbd6890124db9458bef" -dependencies = [ - "darling 0.10.2", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "derive_more" -version = "0.99.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" -dependencies = [ - "convert_case", - "proc-macro2", - "quote", - "rustc_version", - "syn", -] - -[[package]] -name = "devise" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50c7580b072f1c8476148f16e0a0d5dedddab787da98d86c5082c5e9ed8ab595" -dependencies = [ - "devise_codegen", - "devise_core", -] - -[[package]] -name = "devise_codegen" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "123c73e7a6e51b05c75fe1a1b2f4e241399ea5740ed810b0e3e6cacd9db5e7b2" -dependencies = [ - "devise_core", - "quote", -] - -[[package]] -name = "devise_core" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "841ef46f4787d9097405cac4e70fb8644fc037b526e8c14054247c0263c400d0" -dependencies = [ - "bitflags", - "proc-macro2", - "proc-macro2-diagnostics", - "quote", - "syn", -] - -[[package]] -name = "diesel" -version = "1.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b28135ecf6b7d446b43e27e225622a038cc4e2930a1022f51cdb97ada19b8e4d" -dependencies = [ - "byteorder", - "chrono", - "diesel_derives", - "libsqlite3-sys", - "r2d2", -] - -[[package]] -name = "diesel_derives" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45f5098f628d02a7a0f68ddba586fb61e80edec3bdc1be3b921f4ceec60858d3" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "diesel_migrations" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf3cde8413353dc7f5d72fa8ce0b99a560a359d2c5ef1e5817ca731cd9008f4c" -dependencies = [ - "migrations_internals", - "migrations_macros", -] - -[[package]] -name = "digest" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2fb860ca6fafa5552fb6d0e816a69c8e49f0908bf524e30a90d97c85892d506" -dependencies = [ - "block-buffer", - "crypto-common", - "subtle", -] - -[[package]] -name = "diligent-date-parser" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2d0fd95c7c02e2d6c588c6c5628466fff9bdde4b8c6196465e087b08e792720" -dependencies = [ - "chrono", -] - -[[package]] -name = "dirs-next" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" -dependencies = [ - "cfg-if 1.0.0", - "dirs-sys-next", -] - -[[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 = "dispatch" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b" - -[[package]] -name = "dlib" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac1b7517328c04c2aa68422fc60a41b92208182142ed04a25879c26c8f878794" -dependencies = [ - "libloading", -] - -[[package]] -name = "doc-comment" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" - -[[package]] -name = "dotenv" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77c90badedccf4105eca100756a0b1289e191f6fcbdadd3cee1d2f614f97da8f" - -[[package]] -name = "downcast-rs" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" - -[[package]] -name = "either" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" - -[[package]] -name = "encode_unicode" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" - -[[package]] -name = "encoding_rs" -version = "0.8.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9852635589dc9f9ea1b6fe9f05b50ef208c85c834a562f0c6abb1c475736ec2b" -dependencies = [ - "cfg-if 1.0.0", -] - -[[package]] -name = "endian-type" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d" - -[[package]] -name = "errno" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" -dependencies = [ - "errno-dragonfly", - "libc", - "winapi", -] - -[[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 = "error-code" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64f18991e7bf11e7ffee451b5318b5c1a73c52d0d0ada6e5a3017c8c1ced6a21" -dependencies = [ - "libc", - "str-buf", -] - -[[package]] -name = "euclid" -version = "0.22.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b52c2ef4a78da0ba68fbe1fd920627411096d2ac478f7f4c9f3a54ba6705bade" -dependencies = [ - "num-traits", -] - -[[package]] -name = "fastrand" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499" -dependencies = [ - "instant", -] - -[[package]] -name = "fd-lock" -version = "3.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb21c69b9fea5e15dbc1049e4b77145dd0ba1c84019c488102de0dc4ea4b0a27" -dependencies = [ - "cfg-if 1.0.0", - "rustix", - "windows-sys 0.42.0", -] - -[[package]] -name = "figment" -version = "0.10.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e3bd154d9ae2f1bb0ada5b7eebd56529513efa5de7d2fc8c6adf33bc43260cf" -dependencies = [ - "atomic", - "pear", - "serde", - "toml", - "uncased", - "version_check", -] - -[[package]] -name = "find_folder" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f6d018fb95a0b59f854aed68ecd96ce2b80af7911b92b1fed3c4b1fa516b91b" - -[[package]] -name = "flate2" -version = "1.0.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f82b0f4c27ad9f8bfd1f3208d882da2b09c301bc1c828fd3a00d0216d2fbbff6" -dependencies = [ - "crc32fast", - "miniz_oxide 0.5.4", -] - -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[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 = "form_urlencoded" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191" -dependencies = [ - "matches", - "percent-encoding", -] - -[[package]] -name = "futf" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df420e2e84819663797d1ec6544b13c5be84629e7bb00dc960d6917db2987843" -dependencies = [ - "mac", - "new_debug_unreachable", -] - -[[package]] -name = "futures" -version = "0.3.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f21eda599937fba36daeb58a22e8f5cee2d14c4a17b5b7739c7c8e5e3b8230c" -dependencies = [ - "futures-channel", - "futures-core", - "futures-executor", - "futures-io", - "futures-sink", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-channel" -version = "0.3.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30bdd20c28fadd505d0fd6712cdfcb0d4b5648baf45faef7f852afb2399bb050" -dependencies = [ - "futures-core", - "futures-sink", -] - -[[package]] -name = "futures-core" -version = "0.3.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e5aa3de05362c3fb88de6531e6296e85cde7739cccad4b9dfeeb7f6ebce56bf" - -[[package]] -name = "futures-executor" -version = "0.3.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ff63c23854bee61b6e9cd331d523909f238fc7636290b96826e9cfa5faa00ab" -dependencies = [ - "futures-core", - "futures-task", - "futures-util", - "num_cpus", -] - -[[package]] -name = "futures-io" -version = "0.3.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbf4d2a7a308fd4578637c0b17c7e1c7ba127b8f6ba00b29f717e9655d85eb68" - -[[package]] -name = "futures-macro" -version = "0.3.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42cd15d1c7456c04dbdf7e88bcd69760d74f3a798d6444e16974b505b0e62f17" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "futures-sink" -version = "0.3.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21b20ba5a92e727ba30e72834706623d94ac93a725410b6a6b6fbc1b07f7ba56" - -[[package]] -name = "futures-task" -version = "0.3.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6508c467c73851293f390476d4491cf4d227dbabcd4170f3bb6044959b294f1" - -[[package]] -name = "futures-util" -version = "0.3.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44fb6cb1be61cc1d2e43b262516aafcf63b241cffdb1d3fa115f91d9c7b09c90" -dependencies = [ - "futures-channel", - "futures-core", - "futures-io", - "futures-macro", - "futures-sink", - "futures-task", - "memchr", - "pin-project-lite", - "pin-utils", - "slab", -] - -[[package]] -name = "fxhash" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" -dependencies = [ - "byteorder", -] - -[[package]] -name = "generator" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc184cace1cea8335047a471cc1da80f18acf8a76f3bab2028d499e328948ec7" -dependencies = [ - "cc", - "libc", - "log", - "rustversion", - "windows", -] - -[[package]] -name = "generic-array" -version = "0.14.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" -dependencies = [ - "typenum", - "version_check", -] - -[[package]] -name = "gethostname" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1ebd34e35c46e00bb73e81363248d627782724609fe1b6396f553f68fe3862e" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "getopts" -version = "0.2.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5" -dependencies = [ - "unicode-width", -] - -[[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.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "wasi 0.11.0+wasi-snapshot-preview1", -] - -[[package]] -name = "ghash" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1583cc1656d7839fd3732b80cf4f38850336cdb9b8ded1cd399ca62958de3c99" -dependencies = [ - "opaque-debug", - "polyval", -] - -[[package]] -name = "gif" -version = "0.11.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3edd93c6756b4dfaf2709eafcc345ba2636565295c198a9cfbf75fa5e3e00b06" -dependencies = [ - "color_quant", - "weezl", -] - -[[package]] -name = "gimli" -version = "0.26.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22030e2c5a68ec659fde1e949a745124b48e6fa8b045b7ed5bd1fe4ccc5c4e5d" - -[[package]] -name = "glam" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "579160312273c954cc51bd440f059dde741029ac8daf8c84fece76cb77f62c15" -dependencies = [ - "version_check", -] - -[[package]] -name = "glob" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" - -[[package]] -name = "glow" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8bd5877156a19b8ac83a29b2306fe20537429d318f3ff0a1a2119f8d9c61919" -dependencies = [ - "js-sys", - "slotmap", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "glyph_brush" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac02497410cdb5062cc056a33f2e1e19ff69fbf26a4be9a02bf29d6e17ea105b" -dependencies = [ - "glyph_brush_draw_cache", - "glyph_brush_layout", - "log", - "ordered-float", - "rustc-hash", - "twox-hash", -] - -[[package]] -name = "glyph_brush_draw_cache" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6010675390f6889e09a21e2c8b575b3ee25667ea8237a8d59423f73cb8c28610" -dependencies = [ - "ab_glyph", - "crossbeam-channel", - "crossbeam-deque", - "linked-hash-map", - "rayon", - "rustc-hash", -] - -[[package]] -name = "glyph_brush_layout" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc32c2334f00ca5ac3695c5009ae35da21da8c62d255b5b96d56e2597a637a38" -dependencies = [ - "ab_glyph", - "approx", - "xi-unicode", -] - -[[package]] -name = "gpu-alloc" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fc59e5f710e310e76e6707f86c561dd646f69a8876da9131703b2f717de818d" -dependencies = [ - "bitflags", - "gpu-alloc-types", -] - -[[package]] -name = "gpu-alloc-types" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54804d0d6bc9d7f26db4eaec1ad10def69b599315f487d32c334a80d1efe67a5" -dependencies = [ - "bitflags", -] - -[[package]] -name = "gpu-descriptor" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b0c02e1ba0bdb14e965058ca34e09c020f8e507a760df1121728e0aef68d57a" -dependencies = [ - "bitflags", - "gpu-descriptor-types", - "hashbrown", -] - -[[package]] -name = "gpu-descriptor-types" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "363e3677e55ad168fef68cf9de3a4a310b53124c5e784c53a1d70e92d23f2126" -dependencies = [ - "bitflags", -] - -[[package]] -name = "guillotiere" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b62d5865c036cb1393e23c50693df631d3f5d7bcca4c04fe4cc0fd592e74a782" -dependencies = [ - "euclid", - "svg_fmt", -] - -[[package]] -name = "h2" -version = "0.3.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ca32592cf21ac7ccab1825cd87f6c9b3d9022c44d086172ed0966bec8af30be" -dependencies = [ - "bytes", - "fnv", - "futures-core", - "futures-sink", - "futures-util", - "http", - "indexmap", - "slab", - "tokio", - "tokio-util 0.7.3", - "tracing", -] - -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" -dependencies = [ - "ahash", -] - -[[package]] -name = "heck" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" - -[[package]] -name = "hermit-abi" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - -[[package]] -name = "hex" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" - -[[package]] -name = "hexf-parse" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df" - -[[package]] -name = "hkdf" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "791a029f6b9fc27657f6f188ec6e5e43f6911f6f878e0dc5501396e09809d437" -dependencies = [ - "hmac", -] - -[[package]] -name = "hmac" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" -dependencies = [ - "digest", -] - -[[package]] -name = "html2text" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26379dcb715e237b96102a12b505c553e2bffa74bae2e54658748d298660ef1" -dependencies = [ - "html5ever", - "markup5ever_rcdom", - "unicode-width", -] - -[[package]] -name = "html5ever" -version = "0.25.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5c13fb08e5d4dfc151ee5e88bae63f7773d61852f3bdc73c9f4b9e1bde03148" -dependencies = [ - "log", - "mac", - "markup5ever", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "http" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399" -dependencies = [ - "bytes", - "fnv", - "itoa", -] - -[[package]] -name = "http-body" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" -dependencies = [ - "bytes", - "http", - "pin-project-lite", -] - -[[package]] -name = "httparse" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" - -[[package]] -name = "httpdate" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" - -[[package]] -name = "hyper" -version = "0.14.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02c929dc5c39e335a03c405292728118860721b10190d98c2a0f0efd5baafbac" -dependencies = [ - "bytes", - "futures-channel", - "futures-core", - "futures-util", - "h2", - "http", - "http-body", - "httparse", - "httpdate", - "itoa", - "pin-project-lite", - "socket2", - "tokio", - "tower-service", - "tracing", - "want", -] - -[[package]] -name = "hyper-rustls" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d87c48c02e0dc5e3b849a2041db3029fd066650f8f717c07bf8ed78ccb895cac" -dependencies = [ - "http", - "hyper", - "rustls", - "tokio", - "tokio-rustls", -] - -[[package]] -name = "hyper-tls" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" -dependencies = [ - "bytes", - "hyper", - "native-tls", - "tokio", - "tokio-native-tls", -] - -[[package]] -name = "hyperx" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5617e92fc2f2501c3e2bc6ce547cad841adba2bae5b921c7e52510beca6d084c" -dependencies = [ - "base64 0.13.0", - "bytes", - "http", - "httpdate", - "language-tags", - "mime", - "percent-encoding", - "unicase", -] - -[[package]] -name = "iana-time-zone" -version = "0.1.47" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c495f162af0bf17656d0014a0eded5f3cd2f365fdd204548c2869db89359dc7" -dependencies = [ - "android_system_properties", - "core-foundation-sys 0.8.3", - "js-sys", - "once_cell", - "wasm-bindgen", - "winapi", -] - -[[package]] -name = "iced" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6025abe6b1056c9b5adad79c484c5fd8b7012e5230f3b0439a1294ade7ded7bf" -dependencies = [ - "iced_core", - "iced_futures", - "iced_graphics", - "iced_native", - "iced_pure", - "iced_wgpu", - "iced_winit", - "thiserror", -] - -[[package]] -name = "iced_core" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccf9133ceb345ec640047d5597fb8aa88e9cf74ce2d0277a9a62e2d6ed4a8148" -dependencies = [ - "bitflags", - "wasm-timer", -] - -[[package]] -name = "iced_futures" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13d13241d5ed32846bbcffaf60e27e7ceebb60cf16d791ff00d582f0d4d1b07b" -dependencies = [ - "futures", - "log", - "tokio", - "wasm-bindgen-futures", - "wasm-timer", -] - -[[package]] -name = "iced_graphics" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2adcf703fc326e0985ea99c75f1b73e718560a7b220d57ec6478417ccb2f463f" -dependencies = [ - "bytemuck", - "glam", - "iced_native", - "iced_pure", - "iced_style", - "raw-window-handle 0.4.3", - "thiserror", -] - -[[package]] -name = "iced_lazy" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "333979d705964832864ee7676516ab3c3df4ab0b65efb603c86a256d4adbec6f" -dependencies = [ - "iced_native", - "ouroboros", -] - -[[package]] -name = "iced_native" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ca174d4693a5daa2ffcae38d5c28cf0dbd54bd8fc19848f28392cd52624751a" -dependencies = [ - "iced_core", - "iced_futures", - "iced_style", - "num-traits", - "twox-hash", - "unicode-segmentation", -] - -[[package]] -name = "iced_pure" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80aeaecadfd6832c2c787cbdfd357adc256a51c55d68142d852037451e72f393" -dependencies = [ - "iced_native", - "iced_style", - "num-traits", -] - -[[package]] -name = "iced_style" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a90028c94ab62c13cd3b6fb1499a593a51510d4729c5b4e8e60705b2b28c6bc2" -dependencies = [ - "iced_core", -] - -[[package]] -name = "iced_wgpu" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bc44ca209f77bd855f035d2e86e50e66332f55fb60d9fb67eeb09eae9d9de2e" -dependencies = [ - "bitflags", - "bytemuck", - "futures", - "glyph_brush", - "guillotiere", - "iced_graphics", - "iced_native", - "image", - "kamadak-exif", - "log", - "raw-window-handle 0.4.3", - "wgpu", - "wgpu_glyph", -] - -[[package]] -name = "iced_winit" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72011b895e439e2ebad8f545720e3e97c7368ecfc47a23cbfeaa9508a98af90c" -dependencies = [ - "iced_futures", - "iced_graphics", - "iced_native", - "log", - "thiserror", - "web-sys", - "winapi", - "window_clipboard", - "winit", -] - -[[package]] -name = "ident_case" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" - -[[package]] -name = "idna" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" -dependencies = [ - "matches", - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "image" -version = "0.23.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24ffcb7e7244a9bf19d35bf2883b9c080c4ced3c07a9895572178cdb8f13f6a1" -dependencies = [ - "bytemuck", - "byteorder", - "color_quant", - "gif", - "jpeg-decoder", - "num-iter", - "num-rational", - "num-traits", - "png", -] - -[[package]] -name = "indexmap" -version = "1.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e" -dependencies = [ - "autocfg", - "hashbrown", - "serde", -] - -[[package]] -name = "indicatif" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7baab56125e25686df467fe470785512329883aab42696d661247aca2a2896e4" -dependencies = [ - "console", - "lazy_static", - "number_prefix 0.3.0", - "regex", -] - -[[package]] -name = "indicatif" -version = "0.16.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d207dc617c7a380ab07ff572a6e52fa202a2a8f355860ac9c38e23f8196be1b" -dependencies = [ - "console", - "lazy_static", - "number_prefix 0.4.0", - "regex", -] - -[[package]] -name = "inlinable_string" -version = "0.1.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8fae54786f62fb2918dcfae3d568594e50eb9b5c25bf04371af6fe7516452fb" - -[[package]] -name = "inplace_it" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67f0347836f3f6362c1e7efdadde2b1c4b4556d211310b70631bae7eb692070b" - -[[package]] -name = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if 1.0.0", - "js-sys", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "io-lifetimes" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7d367024b3f3414d8e01f437f704f41a9f64ab36f9067fa73e526ad4c763c87" -dependencies = [ - "libc", - "windows-sys 0.42.0", -] - -[[package]] -name = "ipnet" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "879d54834c8c76457ef4293a689b2a8c59b076067ad77b15efafbb05f92a592b" - -[[package]] -name = "itoa" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8af84674fe1f223a982c933a0ee1086ac4d4052aa0fb8060c12c6ad838e754" - -[[package]] -name = "jni-sys" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" - -[[package]] -name = "jpeg-decoder" -version = "0.1.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "229d53d58899083193af11e15917b5640cd40b29ff475a1fe4ef725deb02d0f2" -dependencies = [ - "rayon", -] - -[[package]] -name = "js-sys" -version = "0.3.59" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "258451ab10b34f8af53416d1fdab72c22e805f0c92a1136d59470ec0b11138b2" -dependencies = [ - "wasm-bindgen", -] - -[[package]] -name = "jsonwebtoken" -version = "7.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afabcc15e437a6484fc4f12d0fd63068fe457bf93f1c148d3d9649c60b103f32" -dependencies = [ - "base64 0.12.3", - "pem", - "ring", - "serde", - "serde_json", - "simple_asn1", -] - -[[package]] -name = "kamadak-exif" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70494964492bf8e491eb3951c5d70c9627eb7100ede6cc56d748b9a3f302cfb6" -dependencies = [ - "mutate_once", -] - -[[package]] -name = "khronos-egl" -version = "4.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c2352bd1d0bceb871cb9d40f24360c8133c11d7486b68b5381c1dd1a32015e3" -dependencies = [ - "libc", - "libloading", -] - -[[package]] -name = "language-tags" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4345964bb142484797b161f473a503a434de77149dd8c7427788c6e13379388" - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] -name = "libc" -version = "0.2.137" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc7fcc620a3bff7cdd7a365be3376c97191aeaccc2a603e600951e452615bf89" - -[[package]] -name = "libloading" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efbc0f03f9a775e9f6aed295c6a1ba2253c5757a9e03d55c6caa46a681abcddd" -dependencies = [ - "cfg-if 1.0.0", - "winapi", -] - -[[package]] -name = "libsqlite3-sys" -version = "0.22.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290b64917f8b0cb885d9de0f9959fe1f775d7fa12f1da2db9001c1c8ab60f89d" -dependencies = [ - "cc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "linked-hash-map" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" - -[[package]] -name = "linux-raw-sys" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb68f22743a3fb35785f1e7f844ca5a3de2dde5bd0c0ef5b372065814699b121" - -[[package]] -name = "lock_api" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f80bf5aacaf25cbfc8210d1cfb718f2bf3b11c4c54e5afe36c236853a8ec390" -dependencies = [ - "autocfg", - "scopeguard", -] - -[[package]] -name = "log" -version = "0.4.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -dependencies = [ - "cfg-if 1.0.0", -] - -[[package]] -name = "loom" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff50ecb28bb86013e935fb6683ab1f6d3a20016f123c76fd4c27470076ac30f5" -dependencies = [ - "cfg-if 1.0.0", - "generator", - "scoped-tls", - "serde", - "serde_json", - "tracing", - "tracing-subscriber", -] - -[[package]] -name = "mac" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4" - -[[package]] -name = "malloc_buf" -version = "0.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" -dependencies = [ - "libc", -] - -[[package]] -name = "markup5ever" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a24f40fb03852d1cdd84330cddcaf98e9ec08a7b7768e952fad3b4cf048ec8fd" -dependencies = [ - "log", - "phf", - "phf_codegen", - "string_cache", - "string_cache_codegen", - "tendril", -] - -[[package]] -name = "markup5ever_rcdom" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f015da43bcd8d4f144559a3423f4591d69b8ce0652c905374da7205df336ae2b" -dependencies = [ - "html5ever", - "markup5ever", - "tendril", - "xml5ever", -] - -[[package]] -name = "matchers" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" -dependencies = [ - "regex-automata", -] - -[[package]] -name = "matches" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" - -[[package]] -name = "md5" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771" - -[[package]] -name = "memchr" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" - -[[package]] -name = "memmap2" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b6c2ebff6180198788f5db08d7ce3bc1d0b617176678831a7510825973e357" -dependencies = [ - "libc", -] - -[[package]] -name = "memmap2" -version = "0.5.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95af15f345b17af2efc8ead6080fb8bc376f8cec1b35277b935637595fe77498" -dependencies = [ - "libc", -] - -[[package]] -name = "memoffset" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" -dependencies = [ - "autocfg", -] - -[[package]] -name = "metal" -version = "0.23.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0514f491f4cc03632ab399ee01e2c1c1b12d3e1cf2d667c1ff5f87d6dcd2084" -dependencies = [ - "bitflags", - "block", - "core-graphics-types", - "foreign-types", - "log", - "objc", -] - -[[package]] -name = "migrations_internals" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b4fc84e4af020b837029e017966f86a1c2d5e83e64b589963d5047525995860" -dependencies = [ - "diesel", -] - -[[package]] -name = "migrations_macros" -version = "1.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9753f12909fd8d923f75ae5c3258cae1ed3c8ec052e1b38c93c21a6d157f789c" -dependencies = [ - "migrations_internals", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "mime" -version = "0.3.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" - -[[package]] -name = "minimal-lexical" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" - -[[package]] -name = "miniz_oxide" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "791daaae1ed6889560f8c4359194f56648355540573244a5448a83ba1ecc7435" -dependencies = [ - "adler32", -] - -[[package]] -name = "miniz_oxide" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96590ba8f175222643a85693f33d26e9c8a015f599c216509b1a6894af675d34" -dependencies = [ - "adler", -] - -[[package]] -name = "mio" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57ee1c23c7c63b0c9250c339ffdc69255f110b298b901b9f6c82547b7b87caaf" -dependencies = [ - "libc", - "log", - "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.36.1", -] - -[[package]] -name = "multer" -version = "2.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a30ba6d97eb198c5e8a35d67d5779d6680cca35652a60ee90fc23dc431d4fde8" -dependencies = [ - "bytes", - "encoding_rs", - "futures-util", - "http", - "httparse", - "log", - "memchr", - "mime", - "spin 0.9.4", - "tokio", - "tokio-util 0.7.3", - "version_check", -] - -[[package]] -name = "mutate_once" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16cf681a23b4d0a43fc35024c176437f9dcd818db34e0f42ab456a0ee5ad497b" - -[[package]] -name = "naga" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3012f2dbcc79e8e0b5825a4836a7106a75dd9b2fe42c528163be0f572538c705" -dependencies = [ - "bit-set", - "bitflags", - "codespan-reporting", - "hexf-parse", - "indexmap", - "log", - "num-traits", - "rustc-hash", - "spirv", - "thiserror", -] - -[[package]] -name = "native-tls" -version = "0.2.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd7e2f3618557f980e0b17e8856252eee3c97fa12c54dff0ca290fb6266ca4a9" -dependencies = [ - "lazy_static", - "libc", - "log", - "openssl", - "openssl-probe", - "openssl-sys", - "schannel", - "security-framework", - "security-framework-sys", - "tempfile", -] - -[[package]] -name = "ndk" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96d868f654c72e75f8687572699cdabe755f03effbb62542768e995d5b8d699d" -dependencies = [ - "bitflags", - "jni-sys", - "ndk-sys", - "num_enum", - "thiserror", -] - -[[package]] -name = "ndk-context" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" - -[[package]] -name = "ndk-glue" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c71bee8ea72d685477e28bd004cfe1bf99c754d688cd78cad139eae4089484d4" -dependencies = [ - "lazy_static", - "libc", - "log", - "ndk", - "ndk-context", - "ndk-macro", - "ndk-sys", -] - -[[package]] -name = "ndk-macro" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0df7ac00c4672f9d5aece54ee3347520b7e20f158656c7db2e6de01902eb7a6c" -dependencies = [ - "darling 0.13.4", - "proc-macro-crate", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "ndk-sys" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1bcdd74c20ad5d95aacd60ef9ba40fdf77f767051040541df557b7a9b2a2121" - -[[package]] -name = "new_debug_unreachable" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54" - -[[package]] -name = "nibble_vec" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a5d83df9f36fe23f0c3648c6bbb8b0298bb5f1939c8f2704431371f4b84d43" -dependencies = [ - "smallvec", -] - -[[package]] -name = "nix" -version = "0.22.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4916f159ed8e5de0082076562152a76b7a1f64a01fd9d1e0fea002c37624faf" -dependencies = [ - "bitflags", - "cc", - "cfg-if 1.0.0", - "libc", - "memoffset", -] - -[[package]] -name = "nix" -version = "0.24.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "195cdbc1741b8134346d515b3a56a1c94b0912758009cfd53f99ea0f57b065fc" -dependencies = [ - "bitflags", - "cfg-if 1.0.0", - "libc", - "memoffset", -] - -[[package]] -name = "no-std-net" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43794a0ace135be66a25d3ae77d41b91615fb68ae937f904090203e81f755b65" - -[[package]] -name = "nom" -version = "7.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8903e5a29a317527874d0402f867152a3d21c908bb0b933e416c65e301d4c36" -dependencies = [ - "memchr", - "minimal-lexical", -] - -[[package]] -name = "num-bigint" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "090c7f9998ee0ff65aa5b723e4009f7b217707f1fb5ea551329cc4d6231fb304" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[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-iter" -version = "0.1.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-rational" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12ac428b1cb17fce6f731001d307d351ec70a6d202fc2e60f7d4c5e42d8f4f07" -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.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1" -dependencies = [ - "hermit-abi", - "libc", -] - -[[package]] -name = "num_enum" -version = "0.5.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf5395665662ef45796a4ff5486c5d41d29e0c09640af4c5f17fd94ee2c119c9" -dependencies = [ - "num_enum_derive", -] - -[[package]] -name = "num_enum_derive" -version = "0.5.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b0498641e53dd6ac1a4f22547548caa6864cc4933784319cd1775271c5a46ce" -dependencies = [ - "proc-macro-crate", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "num_threads" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" -dependencies = [ - "libc", -] - -[[package]] -name = "number_prefix" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17b02fc0ff9a9e4b35b3342880f48e896ebf69f2967921fe8646bf5b7125956a" - -[[package]] -name = "number_prefix" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" - -[[package]] -name = "objc" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" -dependencies = [ - "malloc_buf", - "objc_exception", -] - -[[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_exception" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad970fb455818ad6cba4c122ad012fae53ae8b4795f86378bce65e4f6bab2ca4" -dependencies = [ - "cc", -] - -[[package]] -name = "objc_id" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b" -dependencies = [ - "objc", -] - -[[package]] -name = "object" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21158b2c33aa6d4561f1c0a6ea283ca92bc54802a93b263e910746d679a7eb53" -dependencies = [ - "memchr", -] - -[[package]] -name = "octocrab" -version = "0.15.4" -source = "git+https://github.com/XAMPPRocky/octocrab?rev=c78edcd87fa5edcd5a6d0d0878b2a8d020802c40#c78edcd87fa5edcd5a6d0d0878b2a8d020802c40" -dependencies = [ - "arc-swap", - "async-trait", - "base64 0.13.0", - "bytes", - "chrono", - "hyperx", - "jsonwebtoken", - "once_cell", - "reqwest", - "serde", - "serde_json", - "serde_path_to_error", - "snafu", - "url", -] - -[[package]] -name = "once_cell" -version = "1.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f7254b99e31cad77da24b08ebf628882739a608578bb1bcdfc1f9c21260d7c0" - -[[package]] -name = "opaque-debug" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" - -[[package]] -name = "opener" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ea3ebcd72a54701f56345f16785a6d3ac2df7e986d273eb4395c0b01db17952" -dependencies = [ - "bstr", - "winapi", -] - -[[package]] -name = "openssl" -version = "0.10.41" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "618febf65336490dfcf20b73f885f5651a0c89c64c2d4a8c3662585a70bf5bd0" -dependencies = [ - "bitflags", - "cfg-if 1.0.0", - "foreign-types", - "libc", - "once_cell", - "openssl-macros", - "openssl-sys", -] - -[[package]] -name = "openssl-macros" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c" -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-src" -version = "111.22.0+1.1.1q" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f31f0d509d1c1ae9cada2f9539ff8f37933831fd5098879e482aa687d659853" -dependencies = [ - "cc", -] - -[[package]] -name = "openssl-sys" -version = "0.9.75" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5f9bd0c2710541a3cda73d6f9ac4f1b240de4ae261065d309dbe73d9dceb42f" -dependencies = [ - "autocfg", - "cc", - "libc", - "openssl-src", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "ordered-float" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96bcbab4bfea7a59c2c0fe47211a1ac4e3e96bea6eb446d704f310bc5c732ae2" -dependencies = [ - "num-traits", -] - -[[package]] -name = "os_str_bytes" -version = "6.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ff7415e9ae3fff1225851df9e0d9e4e5479f947619774677a63572e55e80eff" - -[[package]] -name = "ouroboros" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f357ef82d1b4db66fbed0b8d542cbd3c22d0bf5b393b3c257b9ba4568e70c9c3" -dependencies = [ - "aliasable", - "ouroboros_macro", - "stable_deref_trait", -] - -[[package]] -name = "ouroboros_macro" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44a0b52c2cbaef7dffa5fec1a43274afe8bd2a644fa9fc50a9ef4ff0269b1257" -dependencies = [ - "Inflector", - "proc-macro-error", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "owned_ttf_parser" -version = "0.15.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05e6affeb1632d6ff6a23d2cd40ffed138e82f1532571a26f527c8a284bb2fbb" -dependencies = [ - "ttf-parser", -] - -[[package]] -name = "parking_lot" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" -dependencies = [ - "instant", - "lock_api", - "parking_lot_core 0.8.5", -] - -[[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 0.9.3", -] - -[[package]] -name = "parking_lot_core" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216" -dependencies = [ - "cfg-if 1.0.0", - "instant", - "libc", - "redox_syscall", - "smallvec", - "winapi", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09a279cbf25cb0757810394fbc1e359949b59e348145c643a939a525692e6929" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "redox_syscall", - "smallvec", - "windows-sys 0.36.1", -] - -[[package]] -name = "pear" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15e44241c5e4c868e3eaa78b7c1848cadd6344ed4f54d029832d32b415a58702" -dependencies = [ - "inlinable_string", - "pear_codegen", - "yansi", -] - -[[package]] -name = "pear_codegen" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82a5ca643c2303ecb740d506539deba189e16f2754040a42901cd8105d0282d0" -dependencies = [ - "proc-macro2", - "proc-macro2-diagnostics", - "quote", - "syn", -] - -[[package]] -name = "pem" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd56cbd21fea48d0c440b41cd69c589faacade08c992d9a54e471b79d0fd13eb" -dependencies = [ - "base64 0.13.0", - "once_cell", - "regex", -] - -[[package]] -name = "percent-encoding" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" - -[[package]] -name = "pest" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b0560d531d1febc25a3c9398a62a71256c0178f2e3443baedd9ad4bb8c9deb4" -dependencies = [ - "thiserror", - "ucd-trie", -] - -[[package]] -name = "phf" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12" -dependencies = [ - "phf_shared 0.8.0", -] - -[[package]] -name = "phf_codegen" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbffee61585b0411840d3ece935cce9cb6321f01c45477d30066498cd5e1a815" -dependencies = [ - "phf_generator 0.8.0", - "phf_shared 0.8.0", -] - -[[package]] -name = "phf_generator" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17367f0cc86f2d25802b2c26ee58a7b23faeccf78a396094c13dced0d0182526" -dependencies = [ - "phf_shared 0.8.0", - "rand 0.7.3", -] - -[[package]] -name = "phf_generator" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6" -dependencies = [ - "phf_shared 0.10.0", - "rand 0.8.5", -] - -[[package]] -name = "phf_shared" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c00cf8b9eafe68dde5e9eaa2cef8ee84a9336a47d566ec55ca16589633b65af7" -dependencies = [ - "siphasher", -] - -[[package]] -name = "phf_shared" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" -dependencies = [ - "siphasher", -] - -[[package]] -name = "pin-project" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad29a609b6bcd67fee905812e544992d216af9d755757c05ed2d0e15a74c6ecc" -dependencies = [ - "pin-project-internal", -] - -[[package]] -name = "pin-project-internal" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "pin-project-lite" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" - -[[package]] -name = "pin-utils" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - -[[package]] -name = "pkg-config" -version = "0.3.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae" - -[[package]] -name = "pnet_base" -version = "0.30.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e88341c6c842f89bdc7287f7b1e26b6fa64fa11c7ea3756971e6f18cd2510c4" -dependencies = [ - "no-std-net", -] - -[[package]] -name = "pnet_macros" -version = "0.30.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebfcdc9c072966723026b3596a1f655fb8bbfe0142f9770f8d481aee4459d6b9" -dependencies = [ - "proc-macro2", - "quote", - "regex", - "syn", -] - -[[package]] -name = "pnet_macros_support" -version = "0.30.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bba532f5a4b320c029d89e612671fb621851b3b07e972c53850d34130033a5cd" -dependencies = [ - "pnet_base", -] - -[[package]] -name = "pnet_packet" -version = "0.30.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7009716ac86091c1b6e2cdec95a2b028c880f516054c1ec11edd02f9f463cbde" -dependencies = [ - "glob", - "pnet_base", - "pnet_macros", - "pnet_macros_support", -] - -[[package]] -name = "png" -version = "0.16.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c3287920cb847dee3de33d301c463fba14dda99db24214ddf93f83d3021f4c6" -dependencies = [ - "bitflags", - "crc32fast", - "deflate", - "miniz_oxide 0.3.7", -] - -[[package]] -name = "polyval" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8419d2b623c7c0896ff2d5d96e2cb4ede590fed28fcc34934f4c33c036e620a1" -dependencies = [ - "cfg-if 1.0.0", - "cpufeatures", - "opaque-debug", - "universal-hash", -] - -[[package]] -name = "ppv-lite86" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872" - -[[package]] -name = "precomputed-hash" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" - -[[package]] -name = "proc-macro-crate" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eda0fc3b0fb7c975631757e14d9049da17374063edb6ebbcbc54d880d4fe94e9" -dependencies = [ - "once_cell", - "thiserror", - "toml", -] - -[[package]] -name = "proc-macro-error" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", - "syn", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -dependencies = [ - "proc-macro2", - "quote", - "version_check", -] - -[[package]] -name = "proc-macro2" -version = "1.0.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a2ca2c61bc9f3d74d2886294ab7b9853abd9c1ad903a3ac7815c58989bb7bab" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "proc-macro2-diagnostics" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bf29726d67464d49fa6224a1d07936a8c08bb3fba727c7493f6cf1616fdaada" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "version_check", - "yansi", -] - -[[package]] -name = "profiling" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f61dcf0b917cd75d4521d7343d1ffff3d1583054133c9b5cbea3375c703c40d" - -[[package]] -name = "prometheus" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5986aa8d62380092d2f50f8b1cdba9cb9b6731ffd4b25b51fd126b6c3e05b99c" -dependencies = [ - "cfg-if 1.0.0", - "fnv", - "lazy_static", - "memchr", - "parking_lot 0.11.2", - "protobuf", - "thiserror", -] - -[[package]] -name = "protobuf" -version = "2.27.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf7e6d18738ecd0902d30d1ad232c9125985a3422929b16c65517b38adc14f96" - -[[package]] -name = "pulldown-cmark" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca36dea94d187597e104a5c8e4b07576a8a45aa5db48a65e12940d3eb7461f55" -dependencies = [ - "bitflags", - "getopts", - "memchr", - "unicase", -] - -[[package]] -name = "pulldown-cmark" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffade02495f22453cd593159ea2f59827aae7f53fa8323f756799b670881dcf8" -dependencies = [ - "bitflags", - "getopts", - "memchr", - "unicase", -] - -[[package]] -name = "quick-xml" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26aab6b48e2590e4a64d1ed808749ba06257882b461d01ca71baeb747074a6dd" -dependencies = [ - "encoding_rs", - "memchr", -] - -[[package]] -name = "quote" -version = "1.0.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "r2d2" -version = "0.8.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51de85fb3fb6524929c8a2eb85e6b6d363de4e8c48f9e2c2eac4944abc181c93" -dependencies = [ - "log", - "parking_lot 0.12.1", - "scheduled-thread-pool", -] - -[[package]] -name = "radix_trie" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c069c179fcdc6a2fe24d8d18305cf085fdbd4f922c041943e203685d6a1c58fd" -dependencies = [ - "endian-type", - "nibble_vec", -] - -[[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" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" -dependencies = [ - "libc", - "rand_chacha 0.3.1", - "rand_core 0.6.3", -] - -[[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", -] - -[[package]] -name = "rand_chacha" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" -dependencies = [ - "ppv-lite86", - "rand_core 0.6.3", -] - -[[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", -] - -[[package]] -name = "rand_core" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" -dependencies = [ - "getrandom 0.2.7", -] - -[[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", -] - -[[package]] -name = "range-alloc" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63e935c45e09cc6dcf00d2f0b2d630a58f4095320223d47fc68918722f0538b6" - -[[package]] -name = "raw-window-handle" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e28f55143d0548dad60bb4fbdc835a3d7ac6acc3324506450c5fdd6e42903a76" -dependencies = [ - "libc", - "raw-window-handle 0.4.3", -] - -[[package]] -name = "raw-window-handle" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b800beb9b6e7d2df1fe337c9e3d04e3af22a124460fb4c30fcc22c9117cefb41" -dependencies = [ - "cty", -] - -[[package]] -name = "rayon" -version = "1.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd99e5772ead8baa5215278c9b15bf92087709e9c1b2d1f97cdb5a183c933a7d" -dependencies = [ - "autocfg", - "crossbeam-deque", - "either", - "rayon-core", -] - -[[package]] -name = "rayon-core" -version = "1.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "258bcdb5ac6dad48491bb2992db6b7cf74878b0384908af124823d118c99683f" -dependencies = [ - "crossbeam-channel", - "crossbeam-deque", - "crossbeam-utils", - "num_cpus", -] - -[[package]] -name = "redox_syscall" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -dependencies = [ - "bitflags", -] - -[[package]] -name = "redox_users" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" -dependencies = [ - "getrandom 0.2.7", - "redox_syscall", - "thiserror", -] - -[[package]] -name = "ref-cast" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed13bcd201494ab44900a96490291651d200730904221832b9547d24a87d332b" -dependencies = [ - "ref-cast-impl", -] - -[[package]] -name = "ref-cast-impl" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5234cd6063258a5e32903b53b1b6ac043a0541c8adc1f610f67b0326c7a578fa" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "regex" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-automata" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" -dependencies = [ - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.6.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244" - -[[package]] -name = "remove_dir_all" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" -dependencies = [ - "winapi", -] - -[[package]] -name = "renderdoc-sys" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1382d1f0a252c4bf97dc20d979a2fdd05b024acd7c2ed0f7595d7817666a157" - -[[package]] -name = "reqwest" -version = "0.11.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b75aa69a3f06bbcc66ede33af2af253c6f7a86b1ca0033f60c580a27074fbf92" -dependencies = [ - "base64 0.13.0", - "bytes", - "encoding_rs", - "futures-core", - "futures-util", - "h2", - "http", - "http-body", - "hyper", - "hyper-rustls", - "hyper-tls", - "ipnet", - "js-sys", - "lazy_static", - "log", - "mime", - "native-tls", - "percent-encoding", - "pin-project-lite", - "rustls", - "rustls-pemfile", - "serde", - "serde_json", - "serde_urlencoded", - "tokio", - "tokio-native-tls", - "tokio-rustls", - "tokio-util 0.7.3", - "tower-service", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "webpki-roots", - "winreg", -] - -[[package]] -name = "ring" -version = "0.16.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" -dependencies = [ - "cc", - "libc", - "once_cell", - "spin 0.5.2", - "untrusted", - "web-sys", - "winapi", -] - -[[package]] -name = "rocket" -version = "0.5.0-rc.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98ead083fce4a405feb349cf09abdf64471c6077f14e0ce59364aa90d4b99317" -dependencies = [ - "async-stream", - "async-trait", - "atomic", - "atty", - "binascii", - "bytes", - "either", - "figment", - "futures", - "indexmap", - "log", - "memchr", - "multer", - "num_cpus", - "parking_lot 0.12.1", - "pin-project-lite", - "rand 0.8.5", - "ref-cast", - "rocket_codegen", - "rocket_http", - "serde", - "serde_json", - "state", - "tempfile", - "time 0.3.14", - "tokio", - "tokio-stream", - "tokio-util 0.7.3", - "ubyte", - "version_check", - "yansi", -] - -[[package]] -name = "rocket_codegen" -version = "0.5.0-rc.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6aeb6bb9c61e9cd2c00d70ea267bf36f76a4cc615e5908b349c2f9d93999b47" -dependencies = [ - "devise", - "glob", - "indexmap", - "proc-macro2", - "quote", - "rocket_http", - "syn", - "unicode-xid", -] - -[[package]] -name = "rocket_http" -version = "0.5.0-rc.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ded65d127954de3c12471630bf4b81a2792f065984461e65b91d0fdaafc17a2" -dependencies = [ - "cookie", - "either", - "futures", - "http", - "hyper", - "indexmap", - "log", - "memchr", - "pear", - "percent-encoding", - "pin-project-lite", - "ref-cast", - "serde", - "smallvec", - "stable-pattern", - "state", - "time 0.3.14", - "tokio", - "uncased", -] - -[[package]] -name = "rocket_sync_db_pools" -version = "0.1.0-rc.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fa48b6ab25013e9812f1b0c592741900b3a2a83c0936292e0565c0ac842f558" -dependencies = [ - "diesel", - "r2d2", - "rocket", - "rocket_sync_db_pools_codegen", - "serde", - "tokio", -] - -[[package]] -name = "rocket_sync_db_pools_codegen" -version = "0.1.0-rc.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "280ef2d232923e69cb93da156972eb5476a7cce5ba44843f6608f46a4abf7aab" -dependencies = [ - "devise", - "quote", -] - -[[package]] -name = "ron" -version = "0.6.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86018df177b1beef6c7c8ef949969c4f7cb9a9344181b92486b23c79995bdaa4" -dependencies = [ - "base64 0.13.0", - "bitflags", - "serde", -] - -[[package]] -name = "ron" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88073939a61e5b7680558e6be56b419e208420c2adb92be54921fa6b72283f1a" -dependencies = [ - "base64 0.13.0", - "bitflags", - "serde", -] - -[[package]] -name = "rss" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02e70d6ae72f8a4333af8ce9dce58942020528430eb0d46ee2fcb5e8d4d16377" -dependencies = [ - "atom_syndication", - "derive_builder", - "quick-xml", -] - -[[package]] -name = "rustc-demangle" -version = "0.1.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342" - -[[package]] -name = "rustc-hash" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" - -[[package]] -name = "rustc_version" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" -dependencies = [ - "semver 1.0.13", -] - -[[package]] -name = "rustix" -version = "0.36.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "203974af07ea769452490ee8de3e5947971efc3a090dca8a779dd432d3fa46a7" -dependencies = [ - "bitflags", - "errno", - "io-lifetimes", - "libc", - "linux-raw-sys", - "windows-sys 0.42.0", -] - -[[package]] -name = "rustls" -version = "0.20.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aab8ee6c7097ed6057f43c187a62418d0c05a4bd5f18b3571db50ee0f9ce033" -dependencies = [ - "log", - "ring", - "sct", - "webpki", -] - -[[package]] -name = "rustls-pemfile" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0864aeff53f8c05aa08d86e5ef839d3dfcf07aeba2db32f12db0ef716e87bd55" -dependencies = [ - "base64 0.13.0", -] - -[[package]] -name = "rustversion" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97477e48b4cf8603ad5f7aaf897467cf42ab4218a38ef76fb14c2d6773a6d6a8" - -[[package]] -name = "rustyline" -version = "10.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d1cd5ae51d3f7bf65d7969d579d502168ef578f289452bd8ccc91de28fda20e" -dependencies = [ - "bitflags", - "cfg-if 1.0.0", - "clipboard-win", - "dirs-next", - "fd-lock", - "libc", - "log", - "memchr", - "nix 0.24.2", - "radix_trie", - "scopeguard", - "unicode-segmentation", - "unicode-width", - "utf8parse", - "winapi", -] - -[[package]] -name = "ryu" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09" - -[[package]] -name = "schannel" -version = "0.1.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88d6731146462ea25d9244b2ed5fd1d716d25c52e4d54aa4fb0f3c4e9854dbe2" -dependencies = [ - "lazy_static", - "windows-sys 0.36.1", -] - -[[package]] -name = "scheduled-thread-pool" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "977a7519bff143a44f842fd07e80ad1329295bd71686457f18e496736f4bf9bf" -dependencies = [ - "parking_lot 0.12.1", -] - -[[package]] -name = "scoped-tls" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2" - -[[package]] -name = "scopeguard" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" - -[[package]] -name = "sct" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "security-framework" -version = "2.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bc1bb97804af6631813c55739f771071e0f2ed33ee20b68c86ec505d906356c" -dependencies = [ - "bitflags", - "core-foundation 0.9.3", - "core-foundation-sys 0.8.3", - "libc", - "security-framework-sys", -] - -[[package]] -name = "security-framework-sys" -version = "2.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0160a13a177a45bfb43ce71c01580998474f556ad854dcbca936dd2841a5c556" -dependencies = [ - "core-foundation-sys 0.8.3", - "libc", -] - -[[package]] -name = "self_update" -version = "0.27.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fb85f1802f7b987237b8525c0fde86ea86f31c957c1875467c727d5b921179c" -dependencies = [ - "hyper", - "indicatif 0.15.0", - "log", - "quick-xml", - "regex", - "reqwest", - "semver 0.11.0", - "serde_json", - "tempfile", - "zip", -] - -[[package]] -name = "semver" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6" -dependencies = [ - "semver-parser", -] - -[[package]] -name = "semver" -version = "1.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93f6841e709003d68bb2deee8c343572bf446003ec20a583e76f7b15cebf3711" - -[[package]] -name = "semver-parser" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7" -dependencies = [ - "pest", -] - -[[package]] -name = "serde" -version = "1.0.144" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f747710de3dcd43b88c9168773254e809d8ddbdf9653b84e2554ab219f17860" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.144" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94ed3a816fb1d101812f83e789f888322c34e291f894f19590dc310963e87a00" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "serde_json" -version = "1.0.85" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e55a28e3aaef9d5ce0506d0a14dbba8054ddc7e499ef522dd8b26859ec9d4a44" -dependencies = [ - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "serde_path_to_error" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "184c643044780f7ceb59104cef98a5a6f12cb2288a7bc701ab93a362b49fd47d" -dependencies = [ - "serde", -] - -[[package]] -name = "serde_urlencoded" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" -dependencies = [ - "form_urlencoded", - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "sha2" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9db03534dff993187064c4e0c05a5708d2a9728ace9a8959b77bedf415dac5" -dependencies = [ - "cfg-if 1.0.0", - "cpufeatures", - "digest", -] - -[[package]] -name = "sharded-slab" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31" -dependencies = [ - "lazy_static", -] - -[[package]] -name = "signal-hook-registry" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0" -dependencies = [ - "libc", -] - -[[package]] -name = "simple_asn1" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "692ca13de57ce0613a363c8c2f1de925adebc81b04c923ac60c5488bb44abe4b" -dependencies = [ - "chrono", - "num-bigint", - "num-traits", -] - -[[package]] -name = "siphasher" -version = "0.3.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" - -[[package]] -name = "slab" -version = "0.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef" -dependencies = [ - "autocfg", -] - -[[package]] -name = "slotmap" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1e08e261d0e8f5c43123b7adf3e4ca1690d655377ac93a03b2c9d3e98de1342" -dependencies = [ - "version_check", -] - -[[package]] -name = "smallvec" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fd0db749597d91ff862fd1d55ea87f7855a744a8425a64695b6fca237d1dad1" - -[[package]] -name = "smithay-client-toolkit" -version = "0.15.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a28f16a97fa0e8ce563b2774d1e732dd5d4025d2772c5dba0a41a0f90a29da3" -dependencies = [ - "bitflags", - "calloop", - "dlib", - "lazy_static", - "log", - "memmap2 0.3.1", - "nix 0.22.3", - "pkg-config", - "wayland-client", - "wayland-cursor", - "wayland-protocols", -] - -[[package]] -name = "smithay-client-toolkit" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f307c47d32d2715eb2e0ece5589057820e0e5e70d07c247d1063e844e107f454" -dependencies = [ - "bitflags", - "dlib", - "lazy_static", - "log", - "memmap2 0.5.7", - "nix 0.24.2", - "pkg-config", - "wayland-client", - "wayland-cursor", - "wayland-protocols", -] - -[[package]] -name = "smithay-clipboard" -version = "0.6.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a345c870a1fae0b1b779085e81b51e614767c239e93503588e54c5b17f4b0e8" -dependencies = [ - "smithay-client-toolkit 0.16.0", - "wayland-client", -] - -[[package]] -name = "snafu" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5177903bf45656592d9eb5c0e22f408fc023aae51dbe2088889b71633ba451f2" -dependencies = [ - "backtrace", - "doc-comment", - "snafu-derive", -] - -[[package]] -name = "snafu-derive" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "410b26ed97440d90ced3e2488c868d56a86e2064f5d7d6f417909b286afe25e5" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "socket2" -version = "0.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "spin" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" - -[[package]] -name = "spin" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f6002a767bff9e83f8eeecf883ecb8011875a21ae8da43bffb817a57e78cc09" - -[[package]] -name = "spirv" -version = "0.2.0+1.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "246bfa38fe3db3f1dfc8ca5a2cdeb7348c78be2112740cc0ec8ef18b6d94f830" -dependencies = [ - "bitflags", - "num-traits", -] - -[[package]] -name = "stable-pattern" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4564168c00635f88eaed410d5efa8131afa8d8699a612c80c455a0ba05c21045" -dependencies = [ - "memchr", -] - -[[package]] -name = "stable_deref_trait" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" - -[[package]] -name = "state" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbe866e1e51e8260c9eed836a042a5e7f6726bb2b411dffeaa712e19c388f23b" -dependencies = [ - "loom", -] - -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - -[[package]] -name = "str-buf" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e08d8363704e6c71fc928674353e6b7c23dcea9d82d7012c8faf2a3a025f8d0" - -[[package]] -name = "string_cache" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213494b7a2b503146286049378ce02b482200519accc31872ee8be91fa820a08" -dependencies = [ - "new_debug_unreachable", - "once_cell", - "parking_lot 0.12.1", - "phf_shared 0.10.0", - "precomputed-hash", - "serde", -] - -[[package]] -name = "string_cache_codegen" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bb30289b722be4ff74a408c3cc27edeaad656e06cb1fe8fa9231fa59c728988" -dependencies = [ - "phf_generator 0.10.0", - "phf_shared 0.10.0", - "proc-macro2", - "quote", -] - -[[package]] -name = "strip_markdown" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32c754386109f9adc8ca62513c51cf81cc2d8502588064103aa8e9f69b4276da" -dependencies = [ - "log", - "pulldown-cmark 0.7.2", -] - -[[package]] -name = "strsim" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c" - -[[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - -[[package]] -name = "subtle" -version = "2.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" - -[[package]] -name = "surge-ping" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d33636a95261e9f939742d4712b20f8813a9b3cfaf1510b751096329cd3902b" -dependencies = [ - "hex", - "parking_lot 0.12.1", - "pnet_packet", - "rand 0.8.5", - "socket2", - "thiserror", - "tokio", - "tracing", -] - -[[package]] -name = "svg_fmt" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fb1df15f412ee2e9dfc1c504260fa695c1c3f10fe9f4a6ee2d2184d7d6450e2" - -[[package]] -name = "syn" -version = "1.0.99" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58dbef6ec655055e20b86b15a8cc6d439cca19b667537ac6a1369572d151ab13" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "tempfile" -version = "3.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" -dependencies = [ - "cfg-if 1.0.0", - "fastrand", - "libc", - "redox_syscall", - "remove_dir_all", - "winapi", -] - -[[package]] -name = "tendril" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d24a120c5fc464a3458240ee02c299ebcb9d67b5249c8848b09d639dca8d7bb0" -dependencies = [ - "futf", - "mac", - "utf-8", -] - -[[package]] -name = "termcolor" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "terminal_size" -version = "0.1.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "633c1a546cee861a1a6d0dc69ebeca693bf4296661ba7852b9d21d159e0506df" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "textwrap" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb" - -[[package]] -name = "thiserror" -version = "1.0.34" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c1b05ca9d106ba7d2e31a9dab4a64e7be2cce415321966ea3132c49a656e252" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.34" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8f2591983642de85c921015f3f070c665a197ed69e417af436115e3a1407487" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "thread_local" -version = "1.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5516c27b78311c50bf42c071425c560ac799b11c30b31f87e3081965fe5e0180" -dependencies = [ - "once_cell", -] - -[[package]] -name = "time" -version = "0.1.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" -dependencies = [ - "libc", - "wasi 0.10.0+wasi-snapshot-preview1", - "winapi", -] - -[[package]] -name = "time" -version = "0.3.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c3f9a28b618c3a6b9251b6908e9c99e04b9e5c02e6581ccbb67d59c34ef7f9b" -dependencies = [ - "itoa", - "libc", - "num_threads", - "time-macros", -] - -[[package]] -name = "time-macros" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42657b1a6f4d817cda8e7a0ace261fe0cc946cf3a80314390b22cc61ae080792" - -[[package]] -name = "tinyvec" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" -dependencies = [ - "tinyvec_macros", -] - -[[package]] -name = "tinyvec_macros" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" - -[[package]] -name = "tokio" -version = "1.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89797afd69d206ccd11fb0ea560a44bbb87731d020670e79416d442919257d42" -dependencies = [ - "autocfg", - "bytes", - "libc", - "memchr", - "mio", - "num_cpus", - "once_cell", - "pin-project-lite", - "signal-hook-registry", - "socket2", - "tokio-macros", - "winapi", -] - -[[package]] -name = "tokio-macros" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9724f9a975fb987ef7a3cd9be0350edcbe130698af5b8f7a631e23d42d052484" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "tokio-native-tls" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b" -dependencies = [ - "native-tls", - "tokio", -] - -[[package]] -name = "tokio-rustls" -version = "0.23.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" -dependencies = [ - "rustls", - "tokio", - "webpki", -] - -[[package]] -name = "tokio-stream" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df54d54117d6fdc4e4fea40fe1e4e566b3505700e148a6827e59b34b0d2600d9" -dependencies = [ - "futures-core", - "pin-project-lite", - "tokio", -] - -[[package]] -name = "tokio-util" -version = "0.6.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36943ee01a6d67977dd3f84a5a1d2efeb4ada3a1ae771cadfaa535d9d9fc6507" -dependencies = [ - "bytes", - "futures-core", - "futures-sink", - "log", - "pin-project-lite", - "tokio", -] - -[[package]] -name = "tokio-util" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc463cd8deddc3770d20f9852143d50bf6094e640b485cb2e189a2099085ff45" -dependencies = [ - "bytes", - "futures-core", - "futures-sink", - "pin-project-lite", - "tokio", - "tracing", -] - -[[package]] -name = "toml" -version = "0.5.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7" -dependencies = [ - "serde", -] - -[[package]] -name = "tower-service" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" - -[[package]] -name = "tracing" -version = "0.1.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fce9567bd60a67d08a16488756721ba392f24f29006402881e43b19aac64307" -dependencies = [ - "cfg-if 1.0.0", - "log", - "pin-project-lite", - "tracing-attributes", - "tracing-core", -] - -[[package]] -name = "tracing-appender" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09d48f71a791638519505cefafe162606f706c25592e4bde4d97600c0195312e" -dependencies = [ - "crossbeam-channel", - "time 0.3.14", - "tracing-subscriber", -] - -[[package]] -name = "tracing-attributes" -version = "0.1.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11c75893af559bc8e10716548bdef5cb2b983f8e637db9d0e15126b61b484ee2" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "tracing-core" -version = "0.1.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aeea4303076558a00714b823f9ad67d58a3bbda1df83d8827d21193156e22f7" -dependencies = [ - "once_cell", - "valuable", -] - -[[package]] -name = "tracing-futures" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" -dependencies = [ - "pin-project", - "tracing", -] - -[[package]] -name = "tracing-log" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922" -dependencies = [ - "lazy_static", - "log", - "tracing-core", -] - -[[package]] -name = "tracing-subscriber" -version = "0.3.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60db860322da191b40952ad9affe65ea23e7dd6a5c442c2c42865810c6ab8e6b" -dependencies = [ - "ansi_term", - "matchers", - "once_cell", - "regex", - "sharded-slab", - "smallvec", - "thread_local", - "time 0.3.14", - "tracing", - "tracing-core", - "tracing-log", -] - -[[package]] -name = "try-lock" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" - -[[package]] -name = "ttf-parser" -version = "0.15.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b3e06c9b9d80ed6b745c7159c40b311ad2916abb34a49e9be2653b90db0d8dd" - -[[package]] -name = "twox-hash" -version = "1.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" -dependencies = [ - "cfg-if 1.0.0", - "rand 0.8.5", - "static_assertions", -] - -[[package]] -name = "typenum" -version = "1.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" - -[[package]] -name = "ubyte" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c81f0dae7d286ad0d9366d7679a77934cfc3cf3a8d67e82669794412b2368fe6" -dependencies = [ - "serde", -] - -[[package]] -name = "ucd-trie" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e79c4d996edb816c91e4308506774452e55e95c3c9de07b6729e17e15a5ef81" - -[[package]] -name = "uncased" -version = "0.9.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09b01702b0fd0b3fadcf98e098780badda8742d4f4a7676615cad90e8ac73622" -dependencies = [ - "serde", - "version_check", -] - -[[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-bidi" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992" - -[[package]] -name = "unicode-ident" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4f5b37a154999a8f3f98cc23a628d850e154479cd94decf3414696e12e31aaf" - -[[package]] -name = "unicode-normalization" -version = "0.1.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "854cbdc4f7bc6ae19c820d44abdc3277ac3e1b2b93db20a636825d9322fb60e6" -dependencies = [ - "tinyvec", -] - -[[package]] -name = "unicode-segmentation" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e8820f5d777f6224dc4be3632222971ac30164d4a258d595640799554ebfd99" - -[[package]] -name = "unicode-width" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973" - -[[package]] -name = "unicode-xid" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "957e51f3646910546462e67d5f7599b9e4fb8acdd304b087a6494730f9eebf04" - -[[package]] -name = "universal-hash" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f214e8f697e925001e66ec2c6e37a4ef93f0f78c2eed7814394e10c62025b05" -dependencies = [ - "generic-array", - "subtle", -] - -[[package]] -name = "untrusted" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" - -[[package]] -name = "url" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22fe195a4f217c25b25cb5058ced57059824a678474874038dc88d211bf508d3" -dependencies = [ - "form_urlencoded", - "idna", - "percent-encoding", - "serde", -] - -[[package]] -name = "utf-8" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" - -[[package]] -name = "utf8parse" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "936e4b492acfd135421d8dca4b1aa80a7bfc26e702ef3af710e0752684df5372" - -[[package]] -name = "valuable" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" - -[[package]] -name = "vcpkg" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" - -[[package]] -name = "veloren-serverbrowser-api" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b25e966b27a95a55d4903c4646dc55ffdf59f23bef7e27978b97fa92fd64ca27" -dependencies = [ - "country-parser", - "serde", -] - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "want" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0" -dependencies = [ - "log", - "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" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" - -[[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - -[[package]] -name = "wasm-bindgen" -version = "0.2.82" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc7652e3f6c4706c8d9cd54832c4a4ccb9b5336e2c3bd154d5cccfbf1c1f5f7d" -dependencies = [ - "cfg-if 1.0.0", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.82" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "662cd44805586bd52971b9586b1df85cdbbd9112e4ef4d8f41559c334dc6ac3f" -dependencies = [ - "bumpalo", - "log", - "once_cell", - "proc-macro2", - "quote", - "syn", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-futures" -version = "0.4.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa76fb221a1f8acddf5b54ace85912606980ad661ac7a503b4570ffd3a624dad" -dependencies = [ - "cfg-if 1.0.0", - "js-sys", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.82" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b260f13d3012071dfb1512849c033b1925038373aea48ced3012c09df952c602" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.82" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5be8e654bdd9b79216c2929ab90721aa82faf65c48cdf08bdc4e7f51357b80da" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.82" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6598dd0bd3c7d51095ff6531a5b23e02acdc81804e30d8f07afb77b7215a140a" - -[[package]] -name = "wasm-timer" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be0ecb0db480561e9a7642b5d3e4187c128914e58aa84330b9493e3eb68c5e7f" -dependencies = [ - "futures", - "js-sys", - "parking_lot 0.11.2", - "pin-utils", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", -] - -[[package]] -name = "wayland-client" -version = "0.29.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f3b068c05a039c9f755f881dc50f01732214f5685e379829759088967c46715" -dependencies = [ - "bitflags", - "downcast-rs", - "libc", - "nix 0.24.2", - "scoped-tls", - "wayland-commons", - "wayland-scanner", - "wayland-sys", -] - -[[package]] -name = "wayland-commons" -version = "0.29.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8691f134d584a33a6606d9d717b95c4fa20065605f798a3f350d78dced02a902" -dependencies = [ - "nix 0.24.2", - "once_cell", - "smallvec", - "wayland-sys", -] - -[[package]] -name = "wayland-cursor" -version = "0.29.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6865c6b66f13d6257bef1cd40cbfe8ef2f150fb8ebbdb1e8e873455931377661" -dependencies = [ - "nix 0.24.2", - "wayland-client", - "xcursor", -] - -[[package]] -name = "wayland-protocols" -version = "0.29.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b950621f9354b322ee817a23474e479b34be96c2e909c14f7bc0100e9a970bc6" -dependencies = [ - "bitflags", - "wayland-client", - "wayland-commons", - "wayland-scanner", -] - -[[package]] -name = "wayland-scanner" -version = "0.29.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f4303d8fa22ab852f789e75a967f0a2cdc430a607751c0499bada3e451cbd53" -dependencies = [ - "proc-macro2", - "quote", - "xml-rs", -] - -[[package]] -name = "wayland-sys" -version = "0.29.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be12ce1a3c39ec7dba25594b97b42cb3195d54953ddb9d3d95a7c3902bc6e9d4" -dependencies = [ - "dlib", - "lazy_static", - "pkg-config", -] - -[[package]] -name = "web-sys" -version = "0.3.57" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b17e741662c70c8bd24ac5c5b18de314a2c26c32bf8346ee1e6f53de919c283" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "webpki" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "webpki-roots" -version = "0.22.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1c760f0d366a6c24a02ed7816e23e691f5d92291f94d15e836006fd11b04daf" -dependencies = [ - "webpki", -] - -[[package]] -name = "weezl" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb" - -[[package]] -name = "wgpu" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b97cd781ff044d6d697b632a2e212032c2e957d1afaa21dbf58069cbb8f78567" -dependencies = [ - "arrayvec", - "js-sys", - "log", - "naga", - "parking_lot 0.11.2", - "raw-window-handle 0.4.3", - "smallvec", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "wgpu-core", - "wgpu-hal", - "wgpu-types", -] - -[[package]] -name = "wgpu-core" -version = "0.12.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4688c000eb841ca55f7b35db659b78d6e1cd77d7caf8fb929f4e181f754047d" -dependencies = [ - "arrayvec", - "bitflags", - "cfg_aliases", - "codespan-reporting", - "copyless", - "fxhash", - "log", - "naga", - "parking_lot 0.11.2", - "profiling", - "raw-window-handle 0.4.3", - "smallvec", - "thiserror", - "wgpu-hal", - "wgpu-types", -] - -[[package]] -name = "wgpu-hal" -version = "0.12.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d684ea6a34974a2fc19f1dfd183d11a62e22d75c4f187a574bb1224df8e056c2" -dependencies = [ - "arrayvec", - "ash", - "bit-set", - "bitflags", - "block", - "core-graphics-types", - "d3d12", - "foreign-types", - "fxhash", - "glow", - "gpu-alloc", - "gpu-descriptor", - "inplace_it", - "js-sys", - "khronos-egl", - "libloading", - "log", - "metal", - "naga", - "objc", - "parking_lot 0.11.2", - "profiling", - "range-alloc", - "raw-window-handle 0.4.3", - "renderdoc-sys", - "thiserror", - "wasm-bindgen", - "web-sys", - "wgpu-types", - "winapi", -] - -[[package]] -name = "wgpu-types" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "549533d9e1cdd4b4cda7718d33ff500fc4c34b5467b71d76b547ae0324f3b2a2" -dependencies = [ - "bitflags", -] - -[[package]] -name = "wgpu_glyph" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8134edb15ae465caf308125646c9e98bdef7398cdefc69227ac77a5eb795e7fe" -dependencies = [ - "bytemuck", - "glyph_brush", - "log", - "wgpu", -] - -[[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-wsapoll" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44c17110f57155602a80dca10be03852116403c9ff3cd25b079d666f2aa3df6e" -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 = "window_clipboard" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b47d7fb4df5cd1fea61e5ee3841380f54359bac814e227d8f72709f4f193f8cf" -dependencies = [ - "clipboard-win", - "clipboard_macos", - "clipboard_wayland", - "clipboard_x11", - "raw-window-handle 0.3.4", - "thiserror", -] - -[[package]] -name = "windows" -version = "0.32.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbedf6db9096bc2364adce0ae0aa636dcd89f3c3f2cd67947062aaf0ca2a10ec" -dependencies = [ - "windows_aarch64_msvc 0.32.0", - "windows_i686_gnu 0.32.0", - "windows_i686_msvc 0.32.0", - "windows_x86_64_gnu 0.32.0", - "windows_x86_64_msvc 0.32.0", -] - -[[package]] -name = "windows-sys" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" -dependencies = [ - "windows_aarch64_msvc 0.36.1", - "windows_i686_gnu 0.36.1", - "windows_i686_msvc 0.36.1", - "windows_x86_64_gnu 0.36.1", - "windows_x86_64_msvc 0.36.1", -] - -[[package]] -name = "windows-sys" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" -dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc 0.42.0", - "windows_i686_gnu 0.42.0", - "windows_i686_msvc 0.42.0", - "windows_x86_64_gnu 0.42.0", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc 0.42.0", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.32.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8e92753b1c443191654ec532f14c199742964a061be25d77d7a96f09db20bf5" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4" - -[[package]] -name = "windows_i686_gnu" -version = "0.32.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a711c68811799e017b6038e0922cb27a5e2f43a2ddb609fe0b6f3eeda9de615" - -[[package]] -name = "windows_i686_gnu" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" - -[[package]] -name = "windows_i686_gnu" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7" - -[[package]] -name = "windows_i686_msvc" -version = "0.32.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "146c11bb1a02615db74680b32a68e2d61f553cc24c4eb5b4ca10311740e44172" - -[[package]] -name = "windows_i686_msvc" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" - -[[package]] -name = "windows_i686_msvc" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.32.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c912b12f7454c6620635bbff3450962753834be2a594819bd5e945af18ec64bc" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.32.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "504a2476202769977a040c6364301a3f65d0cc9e3fb08600b2bda150a0488316" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5" - -[[package]] -name = "winit" -version = "0.26.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b43cc931d58b99461188607efd7acb2a093e65fc621f54cad78517a6063e73a" -dependencies = [ - "bitflags", - "cocoa", - "core-foundation 0.9.3", - "core-graphics 0.22.3", - "core-video-sys", - "dispatch", - "instant", - "lazy_static", - "libc", - "log", - "mio", - "ndk", - "ndk-glue", - "ndk-sys", - "objc", - "parking_lot 0.11.2", - "percent-encoding", - "raw-window-handle 0.4.3", - "smithay-client-toolkit 0.15.4", - "wasm-bindgen", - "wayland-client", - "wayland-protocols", - "web-sys", - "winapi", - "x11-dl", -] - -[[package]] -name = "winreg" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" -dependencies = [ - "winapi", -] - -[[package]] -name = "winres" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b68db261ef59e9e52806f688020631e987592bd83619edccda9c47d42cde4f6c" -dependencies = [ - "toml", -] - -[[package]] -name = "x11-dl" -version = "2.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c83627bc137605acc00bb399c7b908ef460b621fc37c953db2b09f88c449ea6" -dependencies = [ - "lazy_static", - "libc", - "pkg-config", -] - -[[package]] -name = "x11rb" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e99be55648b3ae2a52342f9a870c0e138709a3493261ce9b469afe6e4df6d8a" -dependencies = [ - "gethostname", - "nix 0.22.3", - "winapi", - "winapi-wsapoll", -] - -[[package]] -name = "xcursor" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "463705a63313cd4301184381c5e8042f0a7e9b4bb63653f216311d4ae74690b7" -dependencies = [ - "nom", -] - -[[package]] -name = "xi-unicode" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a67300977d3dc3f8034dae89778f502b6ba20b269527b3223ba59c0cf393bb8a" - -[[package]] -name = "xml-rs" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2d7d3948613f75c98fd9328cfdcc45acc4d360655289d0a7d4ec931392200a3" - -[[package]] -name = "xml5ever" -version = "0.16.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9234163818fd8e2418fcde330655e757900d4236acd8cc70fef345ef91f6d865" -dependencies = [ - "log", - "mac", - "markup5ever", - "time 0.1.44", -] - -[[package]] -name = "yansi" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" - -[[package]] -name = "zip" -version = "0.5.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93ab48844d61251bb3835145c521d88aa4031d7139e8485990f60ca911fa0815" -dependencies = [ - "byteorder", - "bzip2", - "crc32fast", - "flate2", - "thiserror", - "time 0.1.44", -] diff --git a/pkgs/games/airshipper/default.nix b/pkgs/games/airshipper/default.nix index 56369398942a..0d55a703c0d5 100644 --- a/pkgs/games/airshipper/default.nix +++ b/pkgs/games/airshipper/default.nix @@ -15,13 +15,17 @@ , alsa-lib , stdenv , libxcb +, bzip2 +, cmake +, fontconfig +, freetype , pkg-config , makeWrapper , writeShellScript , patchelf }: let - version = "0.10.0"; + version = "0.14.0"; # Patch for airshipper to install veloren patch = let runtimeLibs = [ @@ -59,17 +63,13 @@ rustPlatform.buildRustPackage { owner = "Veloren"; repo = "airshipper"; rev = "v${version}"; - hash = "sha256-5zP1Ye1fJNQp8eWKwdxLqBr4qzBfWEEBsJ9s7+8idL4="; + hash = "sha256-+ZU3WAjmPDAFAevebePcIlYcgSYSJJ3LyvwbTBKGUH4="; }; - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "octocrab-0.15.4" = "sha256-uKHLlb0EyWF0Ho8FP38DFZsEWXiAG8FEYzJgwO9W90U="; - }; - }; + cargoHash = "sha256-mwfYCVcOH2zFr76W9ZC4t/LmEwO5P2eGYXRVkwn6Fm4="; buildInputs = [ + fontconfig openssl wayland wayland-protocols @@ -79,7 +79,7 @@ rustPlatform.buildRustPackage { libXi libXcursor ]; - nativeBuildInputs = [ pkg-config makeWrapper ]; + nativeBuildInputs = [ cmake pkg-config makeWrapper ]; RUSTC_BOOTSTRAP = 1; # We need rust unstable features @@ -95,6 +95,9 @@ rustPlatform.buildRustPackage { vulkan-loader wayland wayland-protocols + bzip2 + fontconfig + freetype libxkbcommon libX11 libXrandr From 6474ec11bc438f7966cd112af847c03b6756e686 Mon Sep 17 00:00:00 2001 From: Gary Guo Date: Fri, 27 Sep 2024 22:43:02 +0100 Subject: [PATCH 024/129] google-cloud-sdk: remove bundled python It seems that the bundled python location has changed. This reduces ~500M size. --- pkgs/tools/admin/google-cloud-sdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix index 80087bf65a5e..2064022d80c5 100644 --- a/pkgs/tools/admin/google-cloud-sdk/default.nix +++ b/pkgs/tools/admin/google-cloud-sdk/default.nix @@ -49,8 +49,8 @@ in stdenv.mkDerivation rec { runHook preInstall mkdir -p $out/google-cloud-sdk - if [ -d .install/platform/bundledpythonunix ]; then - rm -r .install/platform/bundledpythonunix + if [ -d platform/bundledpythonunix ]; then + rm -r platform/bundledpythonunix fi cp -R * .install $out/google-cloud-sdk/ From 602fa25bef368e7949f74f7ac6ca3964d4ff1920 Mon Sep 17 00:00:00 2001 From: con-f-use Date: Sat, 28 Sep 2024 00:16:03 +0200 Subject: [PATCH 025/129] docs: fix links in "Automatic package updates" --- pkgs/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/README.md b/pkgs/README.md index 8c0e52458fb0..1e565f1b587b 100644 --- a/pkgs/README.md +++ b/pkgs/README.md @@ -745,7 +745,7 @@ stdenv.mkDerivation { Nixpkgs periodically tries to update all packages that have a `passthru.updateScript` attribute. > [!Note] -> A common pattern is to use the [`nix-update-script`](../pkgs/common-updater/nix-update.nix) attribute provided in Nixpkgs, which runs [`nix-update`](https://github.com/Mic92/nix-update): +> A common pattern is to use the [`nix-update-script`](../pkgs/by-name/ni/nix-update/nix-update-script.nix) attribute provided in Nixpkgs, which runs [`nix-update`](https://github.com/Mic92/nix-update): > > ```nix > { stdenv, nix-update-script }: @@ -755,7 +755,7 @@ Nixpkgs periodically tries to update all packages that have a `passthru.updateSc > } > ``` > -> For simple packages, this is often enough, and will ensure that the package is updated automatically by [`nixpkgs-update`](https://ryantm.github.io/nixpkgs-update) when a new version is released. +> For simple packages, this is often enough, and will ensure that the package is updated automatically by [`nixpkgs-update`](https://github.com/nix-community/nixpkgs-update) when a new version is released. > The [update bot](https://nix-community.org/update-bot) runs periodically to attempt to automatically update packages, and will run `passthru.updateScript` if set. > While not strictly necessary if the project is listed on [Repology](https://repology.org), using `nix-update-script` allows the package to update via many more sources (e.g. GitHub releases). From 55a77e199391e2358cce831cb6e2cc5fe1f344f1 Mon Sep 17 00:00:00 2001 From: LuoChen Date: Sat, 28 Sep 2024 08:22:32 +0800 Subject: [PATCH 026/129] dae: add passthru.updateScript --- pkgs/tools/networking/dae/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/tools/networking/dae/default.nix b/pkgs/tools/networking/dae/default.nix index 330c02dea26b..dce001decfab 100644 --- a/pkgs/tools/networking/dae/default.nix +++ b/pkgs/tools/networking/dae/default.nix @@ -4,6 +4,7 @@ fetchFromGitHub, buildGoModule, nixosTests, + gitUpdater, }: buildGoModule rec { pname = "dae"; @@ -51,6 +52,10 @@ buildGoModule rec { inherit (nixosTests) dae; }; + passthru.updateScript = gitUpdater { + rev-prefix = "v"; + }; + meta = with lib; { description = "Linux high-performance transparent proxy solution based on eBPF"; homepage = "https://github.com/daeuniverse/dae"; From a14f9808a8f938e24ea1f80519f48dc290e9135d Mon Sep 17 00:00:00 2001 From: LuoChen Date: Sat, 28 Sep 2024 08:24:50 +0800 Subject: [PATCH 027/129] dae: add luochen1990 to maintainers --- pkgs/tools/networking/dae/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/networking/dae/default.nix b/pkgs/tools/networking/dae/default.nix index dce001decfab..e67a54dfe209 100644 --- a/pkgs/tools/networking/dae/default.nix +++ b/pkgs/tools/networking/dae/default.nix @@ -63,6 +63,7 @@ buildGoModule rec { maintainers = with maintainers; [ oluceps pokon548 + luochen1990 ]; platforms = platforms.linux; mainProgram = "dae"; From bc7ca67350992e15b80e900f7d7cf9904339659a Mon Sep 17 00:00:00 2001 From: LuoChen Date: Sat, 28 Sep 2024 08:24:25 +0800 Subject: [PATCH 028/129] dae: 0.7.1 -> 0.7.4 --- pkgs/tools/networking/dae/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/dae/default.nix b/pkgs/tools/networking/dae/default.nix index e67a54dfe209..de31e4dff23e 100644 --- a/pkgs/tools/networking/dae/default.nix +++ b/pkgs/tools/networking/dae/default.nix @@ -8,17 +8,17 @@ }: buildGoModule rec { pname = "dae"; - version = "0.7.1"; + version = "0.7.4"; src = fetchFromGitHub { owner = "daeuniverse"; repo = "dae"; rev = "v${version}"; - hash = "sha256-A82JwjZTzYvRc0PY2FekRUwLszdCEHv6wcLYHvqwiWU="; + hash = "sha256-bJ/a/SCNCutQDbmxPp36SYY7qhji2XRv6awp7buZVc0="; fetchSubmodules = true; }; - vendorHash = "sha256-PCGv1DcOOP2LE5wGmnuB2t3aJP8nqJ/ChafVxeJnRIg="; + vendorHash = "sha256-CVQTBJDwu7AYz6q0MnFPMINRShcnS1JOGqH+Ro4lIRo="; proxyVendor = true; From d6c5ad2634acade16012552acbcb28245d683b90 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 28 Sep 2024 05:00:04 +0000 Subject: [PATCH 029/129] fanficfare: 4.37.0 -> 4.38.0 --- pkgs/tools/text/fanficfare/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/fanficfare/default.nix b/pkgs/tools/text/fanficfare/default.nix index ffdd96058139..6a1ce2c059c2 100644 --- a/pkgs/tools/text/fanficfare/default.nix +++ b/pkgs/tools/text/fanficfare/default.nix @@ -2,12 +2,12 @@ python3Packages.buildPythonApplication rec { pname = "fanficfare"; - version = "4.37.0"; + version = "4.38.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-Wh/eWseR+SSVYUqNG6krYCgS1gipSJGTJ+fi6uZNCO8="; + hash = "sha256-E18svvnr9Wc1t8nU2akO2C055BwHb2GCKu4CT0tRhjA="; }; nativeBuildInputs = with python3Packages; [ From 347255a29a2f420560647bfc55b912e8ddde47dd Mon Sep 17 00:00:00 2001 From: Atemu Date: Sat, 28 Sep 2024 08:48:52 +0200 Subject: [PATCH 030/129] github/PULL_REQUEST_TEMPLATE: replace first heading with comment When creating a PR from a branch that only adds a single commit, this heading would always jankily be left *below* the actual commit message because github simply inserts the commit message before the template. The heading also only served as a light call to action whereas the comment is rather explicit in asking the PR author to provide a proper PR description. --- .github/PULL_REQUEST_TEMPLATE.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index c2351056bf8b..20e260b40894 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,6 +1,7 @@ -## Description of changes From ddbc429f152020afef41b3530e7f27e6f792a12c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 28 Sep 2024 11:24:22 +0000 Subject: [PATCH 031/129] graphite-cli: 1.4.4 -> 1.4.5 --- pkgs/by-name/gr/graphite-cli/package-lock.json | 4 ++-- pkgs/by-name/gr/graphite-cli/package.nix | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/gr/graphite-cli/package-lock.json b/pkgs/by-name/gr/graphite-cli/package-lock.json index 084871ab3177..7a5780d2f79c 100644 --- a/pkgs/by-name/gr/graphite-cli/package-lock.json +++ b/pkgs/by-name/gr/graphite-cli/package-lock.json @@ -1,12 +1,12 @@ { "name": "@withgraphite/graphite-cli", - "version": "1.4.4", + "version": "1.4.5", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@withgraphite/graphite-cli", - "version": "1.4.4", + "version": "1.4.5", "hasInstallScript": true, "license": "None", "dependencies": { diff --git a/pkgs/by-name/gr/graphite-cli/package.nix b/pkgs/by-name/gr/graphite-cli/package.nix index a94f4bfd6c25..4b268f294c36 100644 --- a/pkgs/by-name/gr/graphite-cli/package.nix +++ b/pkgs/by-name/gr/graphite-cli/package.nix @@ -7,14 +7,14 @@ buildNpmPackage rec { pname = "graphite-cli"; - version = "1.4.4"; + version = "1.4.5"; src = fetchurl { url = "https://registry.npmjs.org/@withgraphite/graphite-cli/-/graphite-cli-${version}.tgz"; - hash = "sha256-a/ouR93i887/QnIeSZX5zVgF194LCCc2hNmSGsH8aDY="; + hash = "sha256-ftTJPI3h/v2W3t5CQHn0CdHTYcDeoOdGjfJcRZi58Bc="; }; - npmDepsHash = "sha256-MwJ7ALO0Ebh7K0LW4xJ79tL1FikNe5hiY06X1lwXlC4="; + npmDepsHash = "sha256-jXrH8HltxnIU/TIllYZyUueqCEI3Q9rhUY1tzHvXvSE="; postPatch = '' ln -s ${./package-lock.json} package-lock.json From c2fb683ac8e68c5eb97ee5dcfd07b0cf11f65fc9 Mon Sep 17 00:00:00 2001 From: "Iztok Fister Jr." Date: Sat, 28 Sep 2024 14:37:37 +0200 Subject: [PATCH 032/129] python312Packages.niaarm: 0.3.9 -> 0.3.12 --- pkgs/development/python-modules/niaarm/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/niaarm/default.nix b/pkgs/development/python-modules/niaarm/default.nix index 31060540d170..9295c45cd23c 100644 --- a/pkgs/development/python-modules/niaarm/default.nix +++ b/pkgs/development/python-modules/niaarm/default.nix @@ -6,15 +6,17 @@ nltk, numpy, pandas, + plotly, poetry-core, pytestCheckHook, pythonOlder, + scikit-learn, tomli, }: buildPythonPackage rec { pname = "niaarm"; - version = "0.3.9"; + version = "0.3.12"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -23,9 +25,11 @@ buildPythonPackage rec { owner = "firefly-cpp"; repo = "NiaARM"; rev = "refs/tags/${version}"; - hash = "sha256-J3126RSJYBCSyxoPsvsDgmx9E+9fP2h6avPiCHISL7c="; + hash = "sha256-rYFfLtPJgIdSjRIzDIQeHwoQm9NrI6nM3/BF7wAMr1Y="; }; + pythonRelaxDeps = [ "scikit-learn" ]; + nativeBuildInputs = [ poetry-core ]; propagatedBuildInputs = [ @@ -33,6 +37,8 @@ buildPythonPackage rec { nltk numpy pandas + plotly + scikit-learn ] ++ lib.optionals (pythonOlder "3.11") [ tomli ]; disabledTests = [ From bb12bc9c790d731fd48508108fcb881385685745 Mon Sep 17 00:00:00 2001 From: melvyn Date: Sat, 28 Sep 2024 11:28:31 -0400 Subject: [PATCH 033/129] python3Packages.xdis: 6.1.0 -> 6.1.1 --- .../python-modules/xdis/default.nix | 30 +++++++++++++++---- 1 file changed, 25 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/xdis/default.nix b/pkgs/development/python-modules/xdis/default.nix index ebbad75f8408..9a17ffa46517 100644 --- a/pkgs/development/python-modules/xdis/default.nix +++ b/pkgs/development/python-modules/xdis/default.nix @@ -3,6 +3,7 @@ buildPythonPackage, click, fetchFromGitHub, + fetchpatch, pytestCheckHook, pythonOlder, six, @@ -10,7 +11,7 @@ buildPythonPackage rec { pname = "xdis"; - version = "6.1.0"; + version = "6.1.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -19,9 +20,22 @@ buildPythonPackage rec { owner = "rocky"; repo = "python-xdis"; rev = "refs/tags/${version}"; - hash = "sha256-KgKTO99T2/be1sBs5rY3Oy7/Yl9WGgdG3hqqkZ7D7ZY="; + hash = "sha256-Fn1cyUPMrn1SEXl4sdQwJiNHaY+BbxBDz3nKZY965/0="; }; + # Backport magics for newer newer python versions + # 6.1.1 only supports up to 3.12.4 while nixpkgs is already on 3.12.5+ + patches = [ + (fetchpatch { + url = "https://github.com/rocky/python-xdis/commit/fcba74a7f64c5e2879ca0779ff10f38f9229e7da.patch"; + hash = "sha256-D7eJ97g4G6pmYL/guq0Ndf8yKTVBD2gAuUCAKwvlYbE="; + }) + (fetchpatch { + url = "https://github.com/rocky/python-xdis/commit/b66976ff53a2c6e17a73fb7652ddd6c8054df8db.patch"; + hash = "sha256-KO1y0nDTPmEZ+0/3Pjh+CvTdpr/p4AYZ8XdH5J+XzXo="; + }) + ]; + propagatedBuildInputs = [ click six @@ -41,6 +55,9 @@ buildPythonPackage rec { # Doesn't run on non-2.7 but has global-level mis-import "test_unit/test_dis27.py" + + # Has Python 2 style prints + "test/decompyle/test_nested_scopes.py" ]; disabledTests = [ @@ -50,11 +67,14 @@ buildPythonPackage rec { "test_basic" ]; - meta = with lib; { + meta = { description = "Python cross-version byte-code disassembler and marshal routines"; homepage = "https://github.com/rocky/python-xdis"; changelog = "https://github.com/rocky/python-xdis/releases/tag/${version}"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ onny ]; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ + onny + melvyn2 + ]; }; } From bacecfa3b617eefe9e1391b935c98c0bc78efaaa Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 5 Sep 2024 15:28:59 +0200 Subject: [PATCH 034/129] lighthouse: use OpenSSL from Nixpkgs --- pkgs/applications/blockchains/lighthouse/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/lighthouse/default.nix b/pkgs/applications/blockchains/lighthouse/default.nix index 4d1a81d5da1a..2afce895da6e 100644 --- a/pkgs/applications/blockchains/lighthouse/default.nix +++ b/pkgs/applications/blockchains/lighthouse/default.nix @@ -6,7 +6,7 @@ , lighthouse , nix-update-script , nodePackages -, perl +, openssl , pkg-config , postgresql , protobuf @@ -57,7 +57,6 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ rustPlatform.bindgenHook cmake - perl pkg-config protobuf ]; @@ -65,6 +64,8 @@ rustPlatform.buildRustPackage rec { buildInputs = [ rust-jemalloc-sys sqlite + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ + openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreFoundation Security @@ -84,6 +85,8 @@ rustPlatform.buildRustPackage rec { LIGHTHOUSE_DEPOSIT_CONTRACT_SPEC_URL = "file://${depositContractSpec}"; LIGHTHOUSE_DEPOSIT_CONTRACT_TESTNET_URL = "file://${testnetDepositContractSpec}"; + OPENSSL_NO_VENDOR = true; + cargoBuildFlags = [ "--package lighthouse" ]; From fc93b376c228979a0fa92f53649ffe2d3bc54761 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 5 Sep 2024 15:42:09 +0200 Subject: [PATCH 035/129] avml: use OpenSSL from Nixpkgs --- pkgs/by-name/av/avml/package.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/av/avml/package.nix b/pkgs/by-name/av/avml/package.nix index 6ae9f4378ec6..f556430666dc 100644 --- a/pkgs/by-name/av/avml/package.nix +++ b/pkgs/by-name/av/avml/package.nix @@ -2,7 +2,8 @@ lib, fetchFromGitHub, rustPlatform, - perl, + pkg-config, + openssl, testers, avml, nix-update-script, @@ -21,7 +22,12 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-gcpjrxnQDyO92OW6LZVc4x73TmTtQoaEYhmGmqhz8ng="; - nativeBuildInputs = [ perl ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ openssl ]; + + env = { + OPENSSL_NO_VENDOR = true; + }; passthru.tests.version = testers.testVersion { package = avml; }; From 7824706368a469b63848f25d12664bc18e39b84a Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 5 Sep 2024 15:49:09 +0200 Subject: [PATCH 036/129] rover: use OpenSSL from Nixpkgs --- pkgs/development/tools/rover/default.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rover/default.nix b/pkgs/development/tools/rover/default.nix index 92b5339fdfe9..978935595fec 100644 --- a/pkgs/development/tools/rover/default.nix +++ b/pkgs/development/tools/rover/default.nix @@ -1,7 +1,8 @@ { lib , fetchFromGitHub -, perl +, pkg-config , rustPlatform +, openssl , darwin , stdenv }: @@ -19,16 +20,22 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-Rf4kRXYW+WAF1rM7o8PmXBLgp/YyA8y/TqbZL22VOqI="; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ + buildInputs = [ + openssl + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.CoreServices darwin.apple_sdk.frameworks.SystemConfiguration ]; nativeBuildInputs = [ - perl + pkg-config ]; + env = { + OPENSSL_NO_VENDOR = true; + }; + # This test checks whether the plugins specified in the plugins json file are # valid by making a network call to the repo that houses their binaries; but, the # build env can't make network calls (impurity) From 335bd898d6e63f1572b4ed9ed3a1fbf0ad416a80 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 5 Sep 2024 15:52:04 +0200 Subject: [PATCH 037/129] deltachat-repl,deltachat-rpc-server: use OpenSSL from Nixpkgs --- pkgs/by-name/de/deltachat-repl/package.nix | 6 ++++-- pkgs/by-name/de/deltachat-rpc-server/package.nix | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/de/deltachat-repl/package.nix b/pkgs/by-name/de/deltachat-repl/package.nix index fe97f891caa7..eedda8a397af 100644 --- a/pkgs/by-name/de/deltachat-repl/package.nix +++ b/pkgs/by-name/de/deltachat-repl/package.nix @@ -1,6 +1,5 @@ { rustPlatform , libdeltachat -, perl , pkg-config }: @@ -10,10 +9,13 @@ rustPlatform.buildRustPackage { inherit (libdeltachat) version src cargoLock buildInputs; nativeBuildInputs = [ - perl pkg-config ]; + env = { + OPENSSL_NO_VENDOR = true; + }; + cargoBuildFlags = [ "--package" "deltachat-repl" ]; doCheck = false; diff --git a/pkgs/by-name/de/deltachat-rpc-server/package.nix b/pkgs/by-name/de/deltachat-rpc-server/package.nix index b7d0dbef2374..1e1e95796771 100644 --- a/pkgs/by-name/de/deltachat-rpc-server/package.nix +++ b/pkgs/by-name/de/deltachat-rpc-server/package.nix @@ -1,6 +1,5 @@ { rustPlatform , libdeltachat -, perl , pkg-config }: @@ -10,10 +9,13 @@ rustPlatform.buildRustPackage { inherit (libdeltachat) version src cargoLock buildInputs; nativeBuildInputs = [ - perl pkg-config ]; + env = { + OPENSSL_NO_VENDOR = true; + }; + cargoBuildFlags = [ "--package" "deltachat-rpc-server" ]; doCheck = false; From bd9cd90d49558b91cbe96f6273f2a0efe008eed0 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 5 Sep 2024 15:59:07 +0200 Subject: [PATCH 038/129] edgedb: use OpenSSL from Nixpkgs --- pkgs/tools/networking/edgedb/default.nix | 27 ++++++++++++++++-------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/networking/edgedb/default.nix b/pkgs/tools/networking/edgedb/default.nix index c5f360cd2505..7d6b31c3090f 100644 --- a/pkgs/tools/networking/edgedb/default.nix +++ b/pkgs/tools/networking/edgedb/default.nix @@ -7,11 +7,11 @@ makeBinaryWrapper, pkg-config, curl, + openssl, Security, CoreServices, libiconv, xz, - perl, substituteAll, # for passthru.tests: edgedb, @@ -19,26 +19,27 @@ }: rustPlatform.buildRustPackage rec { pname = "edgedb"; - version = "5.3.0"; + version = "5.2.3"; src = fetchFromGitHub { owner = "edgedb"; repo = "edgedb-cli"; - rev = "refs/tags/v${version}"; - hash = "sha256-oG3KxORNppQDa84CXjSxM9Z9GDLby+irUbEncyjoJU4="; + rev = "v${version}"; + hash = "sha256-WlXX1ACSZZNV0VBCoZjC1wLDF0qjIdjNJ4rQu6fBGfM="; fetchSubmodules = true; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "edgedb-derive-0.5.2" = "sha256-9vmaMOoZ5VmbJ0/eN0XdE5hrID/BK4IkLnIwucgRr2w="; - "edgeql-parser-0.1.0" = "sha256-WUNiUgfuzbr+zNYgJivalUK5kPSvkVcgp4Zq3pmoa/w="; + "edgedb-derive-0.5.1" = "sha256-ATldvarkp/W5bz55qoMtfTMcueWklyKnrJUHvLKlWh0="; + "edgeql-parser-0.1.0" = "sha256-KPi2M2UEN+p3V/fcmKtb3K9XTLC4vJ5H+yG8ZfD7RBs="; "indexmap-2.0.0-pre" = "sha256-QMOmoUHE1F/sp+NeDpgRGqqacWLHWG02YgZc5vAdXZY="; - "rustyline-8.0.0" = "sha256-CrICwQbHPzS4QdVIEHxt2euX+g+0pFYe84NfMp1daEc="; "rexpect-0.5.0" = "sha256-vstAL/fJWWx7WbmRxNItKpzvgGF3SvJDs5isq9ym/OA="; + "rustyline-8.0.0" = "sha256-CrICwQbHPzS4QdVIEHxt2euX+g+0pFYe84NfMp1daEc="; "serde_str-1.0.0" = "sha256-CMBh5lxdQb2085y0jc/DrV6B8iiXvVO2aoZH/lFFjak="; "scram-0.7.0" = "sha256-QTPxyXBpMXCDkRRJEMYly1GKp90khrwwuMI1eHc2H+Y="; + "test-cert-gen-0.10.0-pre" = "sha256-Hyk4/iw6/SgEI70vPCNNbE9+nQ0pOAM158hncyUbvp8="; "test-utils-0.1.0" = "sha256-FoF/U89Q9E2Dlmpoh+cfDcScmhcsSNut+rE7BECJSJI="; "warp-0.3.6" = "sha256-knDt2aw/PJ0iabhKg+okwwnEzCY+vQVhE7HKCTM6QbE="; }; @@ -47,11 +48,15 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ makeBinaryWrapper pkg-config - perl ]; buildInputs = - [ curl ] + [ + curl + ] + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ + openssl + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices Security @@ -69,6 +74,10 @@ rustPlatform.buildRustPackage rec { }) ]; + env = { + OPENSSL_NO_VENDOR = true; + }; + doCheck = false; passthru.tests.version = testers.testVersion { From 4685040762bf53e004e5e9674435d02fac12915b Mon Sep 17 00:00:00 2001 From: melvyn Date: Sat, 28 Sep 2024 11:29:11 -0400 Subject: [PATCH 039/129] python3Packages.uncompyle6: 3.9.1 -> 3.9.2 --- .../python-modules/uncompyle6/default.nix | 28 ++++++++----------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/pkgs/development/python-modules/uncompyle6/default.nix b/pkgs/development/python-modules/uncompyle6/default.nix index abf225feb5ee..720ff9bba026 100644 --- a/pkgs/development/python-modules/uncompyle6/default.nix +++ b/pkgs/development/python-modules/uncompyle6/default.nix @@ -6,19 +6,19 @@ spark-parser, xdis, nose, - pytest, + pytestCheckHook, hypothesis, six, }: buildPythonPackage rec { pname = "uncompyle6"; - version = "3.9.1"; + version = "3.9.2"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-xFHDjrPFzINOuLip5uCwzzIm5NlNCP0nbdA/6RWO2yc="; + hash = "sha256-b3CYD/4IpksRS2hxgy/QLYbJkDX4l2qPH4Eh2tb8pCU="; }; propagatedBuildInputs = [ @@ -28,25 +28,19 @@ buildPythonPackage rec { nativeCheckInputs = [ nose - pytest + pytestCheckHook hypothesis six ]; - # Tests attempt to decompile bytecode of the python version - # that is running the tests - this does not work for versions - # above 3.8, but they decompile older bytecode fine + # No tests are provided for versions past 3.8, + # as the project only targets bytecode of versions <= 3.8 doCheck = pythonOlder "3.9"; - # six import errors (yet it is supplied...) - checkPhase = '' - runHook preCheck - pytest ./pytest --ignore=pytest/test_function_call.py - runHook postCheck - ''; - meta = with lib; { - description = "Python cross-version byte-code deparser"; - homepage = "https://github.com/rocky/python-uncompyle6/"; - license = licenses.gpl3; + meta = { + description = "A bytecode decompiler for Python versions 3.8 and below"; + homepage = "https://github.com/rocky/python-uncompyle6"; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ melvyn2 ]; }; } From f6c3b3e8c94114801864f337c43cf94d45c4ad11 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 28 Sep 2024 10:28:09 +0000 Subject: [PATCH 040/129] twm: 0.10.2 -> 0.11.0, move to pkgs/by-name --- .../twm/default.nix => by-name/tw/twm/package.nix} | 10 +++++----- pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 5 insertions(+), 9 deletions(-) rename pkgs/{tools/misc/twm/default.nix => by-name/tw/twm/package.nix} (84%) diff --git a/pkgs/tools/misc/twm/default.nix b/pkgs/by-name/tw/twm/package.nix similarity index 84% rename from pkgs/tools/misc/twm/default.nix rename to pkgs/by-name/tw/twm/package.nix index 3625ceef80a9..20e1d9290e44 100644 --- a/pkgs/tools/misc/twm/default.nix +++ b/pkgs/by-name/tw/twm/package.nix @@ -1,29 +1,29 @@ { lib +, darwin , fetchFromGitHub , stdenv , rustPlatform , openssl , pkg-config -, Security , nix-update-script , installShellFiles }: rustPlatform.buildRustPackage rec { pname = "twm"; - version = "0.10.2"; + version = "0.11.0"; src = fetchFromGitHub { owner = "vinnymeller"; repo = "twm"; rev = "refs/tags/v${version}"; - hash = "sha256-qOOEeaxae7nYbvNzl3BEZkdjO69lgtGrrLS5Q7akN9U="; + hash = "sha256-SiwLqUq/gC8Tr31jjblLc9YP4yBi9HL38W83kgh7eJI="; }; - cargoHash = "sha256-gJ5go9V8c97pQZICUD1ksLJhOyJXyVXAWssH3fhrRVQ="; + cargoHash = "sha256-BjQ7dDXHzX+O/V328TTwl9wGtpOq+NjOMRiZwb9O7ZU="; nativeBuildInputs = [ pkg-config installShellFiles ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; + buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ]; postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd twm \ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 04534695cc86..cbbc7be7c0fa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13198,10 +13198,6 @@ with pkgs; ttylog = callPackage ../tools/misc/ttylog { }; - twm = callPackage ../tools/misc/twm { - inherit (darwin.apple_sdk.frameworks) Security; - }; - ipbt = callPackage ../tools/misc/ipbt { }; tuckr = callPackage ../applications/misc/tuckr { }; From 4bd55f26ca28ef3afda2b5e5f491adce997c5c27 Mon Sep 17 00:00:00 2001 From: melvyn Date: Fri, 27 Sep 2024 19:51:49 -0400 Subject: [PATCH 041/129] python3Packages.djangosaml2: init at 1.9.3 --- .../python-modules/djangosaml2/default.nix | 54 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 56 insertions(+) create mode 100644 pkgs/development/python-modules/djangosaml2/default.nix diff --git a/pkgs/development/python-modules/djangosaml2/default.nix b/pkgs/development/python-modules/djangosaml2/default.nix new file mode 100644 index 000000000000..ff484907e69f --- /dev/null +++ b/pkgs/development/python-modules/djangosaml2/default.nix @@ -0,0 +1,54 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + defusedxml, + django, + pysaml2, + pythonOlder, + setuptools, +}: + +buildPythonPackage rec { + pname = "djangosaml2"; + version = "1.9.3"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "IdentityPython"; + repo = "djangosaml2"; + rev = "refs/tags/v${version}"; + hash = "sha256-rbmEJuG2mgozpCFOXZUJFxv8v52IRQeaeAKfeUDACeU="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + django + defusedxml + pysaml2 + ]; + + # Falsely complains that 'defusedxml>=0.4.1 not satisfied by version 0.8.0rc2' + pythonRelaxDeps = [ "defusedxml" ]; + + pythonImportsCheck = [ "djangosaml2" ]; + + checkPhase = '' + runHook preCheck + + python tests/run_tests.py + + runHook postCheck + ''; + + meta = { + description = "Django SAML2 Service Provider based on pySAML2"; + homepage = "https://github.com/IdentityPython/djangosaml2"; + changelog = "https://github.com/IdentityPython/djangosaml2/blob/v${version}/CHANGES"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ melvyn2 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5f4c18055d16..2042869e6b0b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3512,6 +3512,8 @@ self: super: with self; { django-reversion = callPackage ../development/python-modules/django-reversion { }; + djangosaml2 = callPackage ../development/python-modules/djangosaml2 { }; + django-sekizai = callPackage ../development/python-modules/django-sekizai { }; django-sesame = callPackage ../development/python-modules/django-sesame { }; From d3b5dc8da1cc30772ac50d17e0b605444a7ff6ee Mon Sep 17 00:00:00 2001 From: melvyn Date: Wed, 3 Jul 2024 22:38:48 -0700 Subject: [PATCH 042/129] nixos/seafile: add persistent user, configurable storage path, gc service --- nixos/modules/services/networking/seafile.nix | 109 ++++++++++++++++-- 1 file changed, 101 insertions(+), 8 deletions(-) diff --git a/nixos/modules/services/networking/seafile.nix b/nixos/modules/services/networking/seafile.nix index 486bc145cd5d..e50829634d19 100644 --- a/nixos/modules/services/networking/seafile.nix +++ b/nixos/modules/services/networking/seafile.nix @@ -29,8 +29,8 @@ let seafRoot = "/var/lib/seafile"; # hardcode it due to dynamicuser ccnetDir = "${seafRoot}/ccnet"; - dataDir = "${seafRoot}/data"; seahubDir = "${seafRoot}/seahub"; + defaultUser = "seafile"; in { @@ -118,12 +118,40 @@ in type = types.str; description = '' Seafile Seahub Admin Account initial password. - Should be change via Seahub web front-end. + Should be changed via Seahub web front-end. ''; }; seafilePackage = mkPackageOption pkgs "seafile-server" { }; + user = mkOption { + type = types.str; + default = defaultUser; + description = "User account under which seafile runs."; + }; + + group = mkOption { + type = types.str; + default = defaultUser; + description = "Group under which seafile runs."; + }; + + dataDir = mkOption { + type = types.nullOr types.path; + default = null; + defaultText = "${seafRoot}/data"; + description = "Path in which to store user data"; + }; + + gcDates = mkOption { + type = types.listOf types.str; + default = [ ]; + example = [ "Sun 03:00:00" ]; + description = '' + When to run garbage collection on stored data blocks. + ''; + }; + seahubExtraConf = mkOption { default = ""; type = types.lines; @@ -143,6 +171,17 @@ in environment.etc."seafile/seafile.conf".source = seafileConf; environment.etc."seafile/seahub_settings.py".source = seahubSettings; + users.users = lib.optionalAttrs (cfg.user == defaultUser) { + "${defaultUser}" = { + group = cfg.group; + isSystemUser = true; + }; + }; + + users.groups = lib.optionalAttrs (cfg.group == defaultUser) { + "${defaultUser}" = {}; + }; + systemd.targets.seafile = { wantedBy = [ "multi-user.target" ]; description = "Seafile components"; @@ -154,6 +193,8 @@ in ProtectHome = true; PrivateUsers = true; PrivateDevices = true; + PrivateTmp = true; + ProtectSystem = "strict"; ProtectClock = true; ProtectHostname = true; ProtectProc = "invisible"; @@ -162,30 +203,35 @@ in ProtectKernelLogs = true; ProtectControlGroups = true; RestrictNamespaces = true; + RemoveIPC = true; LockPersonality = true; RestrictRealtime = true; RestrictSUIDSGID = true; + NoNewPrivileges = true; MemoryDenyWriteExecute = true; SystemCallArchitectures = "native"; RestrictAddressFamilies = [ "AF_UNIX" "AF_INET" ]; }; + dataDir = if (!builtins.isNull cfg.dataDir) then cfg.dataDir else "${seafRoot}/data"; + optionalDataDir = lib.lists.optional (!builtins.isNull cfg.dataDir) cfg.dataDir; in { seaf-server = { description = "Seafile server"; partOf = [ "seafile.target" ]; after = [ "network.target" ]; + unitConfig.RequiresMountsFor = optionalDataDir; wantedBy = [ "seafile.target" ]; restartTriggers = [ ccnetConf seafileConf ]; path = [ pkgs.sqlite ]; serviceConfig = securityOptions // { - User = "seafile"; - Group = "seafile"; - DynamicUser = true; + User = cfg.user; + Group = cfg.group; StateDirectory = "seafile"; RuntimeDirectory = "seafile"; LogsDirectory = "seafile"; ConfigurationDirectory = "seafile"; + ReadWritePaths = optionalDataDir; ExecStart = '' ${cfg.seafilePackage}/bin/seaf-server \ --foreground \ @@ -237,6 +283,7 @@ in partOf = [ "seafile.target" ]; after = [ "network.target" "seaf-server.service" ]; requires = [ "seaf-server.service" ]; + unitConfig.RequiresMountsFor = optionalDataDir; restartTriggers = [ seahubSettings ]; environment = { PYTHONPATH = "${pkgs.seahub.pythonPath}:${pkgs.seahub}/thirdpart:${pkgs.seahub}"; @@ -248,13 +295,13 @@ in SEAHUB_LOG_DIR = "/var/log/seafile"; }; serviceConfig = securityOptions // { - User = "seafile"; - Group = "seafile"; - DynamicUser = true; + User = cfg.user; + Group = cfg.group; RuntimeDirectory = "seahub"; StateDirectory = "seafile"; LogsDirectory = "seafile"; ConfigurationDirectory = "seafile"; + ReadWritePaths = optionalDataDir; ExecStart = '' ${pkgs.seahub.python.pkgs.gunicorn}/bin/gunicorn seahub.wsgi:application \ --name seahub \ @@ -293,6 +340,52 @@ in fi ''; }; + + seaf-gc = { + description = "Seafile storage garbage collection"; + conflicts = [ "seaf-server.service" "seahub.service" ]; + after = [ "seaf-server.service" "seahub.service" ]; + unitConfig.RequiresMountsFor = optionalDataDir; + onSuccess = [ "seaf-server.service" "seahub.service" ]; + onFailure = [ "seaf-server.service" "seahub.service" ]; + startAt = cfg.gcDates; + serviceConfig = securityOptions // { + User = cfg.user; + Group = cfg.group; + StateDirectory = "seafile"; + RuntimeDirectory = "seafile"; + LogsDirectory = "seafile"; + ConfigurationDirectory = "seafile"; + ReadWritePaths = optionalDataDir; + Type = "oneshot"; + }; + script = '' + if [ ! -f "${seafRoot}/server-setup" ]; then + echo "Server not setup yet, GC not needed" >&2 + exit + fi + + # checking for pending upgrades + installedMajor=$(cat "${seafRoot}/server-setup" | cut -d"-" -f1 | cut -d"." -f1) + installedMinor=$(cat "${seafRoot}/server-setup" | cut -d"-" -f1 | cut -d"." -f2) + pkgMajor=$(echo "${cfg.seafilePackage.version}" | cut -d"." -f1) + pkgMinor=$(echo "${cfg.seafilePackage.version}" | cut -d"." -f2) + + if [[ $installedMajor != $pkgMajor || $installedMinor != $pkgMinor ]]; then + echo "Server not upgraded yet" >&2 + exit + fi + + # Clean up user-deleted blocks and libraries + ${cfg.seafilePackage}/bin/seafserv-gc \ + -F /etc/seafile \ + -c ${ccnetDir} \ + -d ${dataDir} \ + --rm-fs + ''; + }; }; }; + + meta.maintainers = with maintainers; [ greizgh schmittlauch ]; } From e6e65f022cec8774c55e4baebff93469eb55d8fa Mon Sep 17 00:00:00 2001 From: melvyn Date: Fri, 27 Sep 2024 19:56:11 -0400 Subject: [PATCH 043/129] seafile-server: 10.0.1 -> 11.0.12 --- .../se}/seafile-server/libevhtp.nix | 14 +++- .../se/seafile-server/package.nix} | 75 +++++++++++-------- pkgs/top-level/all-packages.nix | 2 - 3 files changed, 57 insertions(+), 34 deletions(-) rename pkgs/{servers => by-name/se}/seafile-server/libevhtp.nix (80%) rename pkgs/{servers/seafile-server/default.nix => by-name/se/seafile-server/package.nix} (57%) diff --git a/pkgs/servers/seafile-server/libevhtp.nix b/pkgs/by-name/se/seafile-server/libevhtp.nix similarity index 80% rename from pkgs/servers/seafile-server/libevhtp.nix rename to pkgs/by-name/se/seafile-server/libevhtp.nix index 97cdc0804faa..8eb1b3e22ff5 100644 --- a/pkgs/servers/seafile-server/libevhtp.nix +++ b/pkgs/by-name/se/seafile-server/libevhtp.nix @@ -1,4 +1,10 @@ -{ stdenv, lib, fetchFromGitHub, cmake, libevent }: +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + libevent, +}: stdenv.mkDerivation rec { pname = "libevhtp"; @@ -24,6 +30,10 @@ stdenv.mkDerivation rec { description = "Create extremely-fast and secure embedded HTTP servers with ease"; homepage = "https://github.com/criticalstack/libevhtp"; license = licenses.bsd3; - maintainers = with maintainers; [ greizgh schmittlauch ]; + maintainers = with maintainers; [ + greizgh + schmittlauch + melvyn2 + ]; }; } diff --git a/pkgs/servers/seafile-server/default.nix b/pkgs/by-name/se/seafile-server/package.nix similarity index 57% rename from pkgs/servers/seafile-server/default.nix rename to pkgs/by-name/se/seafile-server/package.nix index 109484c467b4..f9510c3c5fb6 100644 --- a/pkgs/servers/seafile-server/default.nix +++ b/pkgs/by-name/se/seafile-server/package.nix @@ -1,50 +1,61 @@ -{ stdenv -, lib -, fetchFromGitHub -, pkg-config -, python3 -, autoreconfHook -, libuuid -, sqlite -, glib -, libevent -, libsearpc -, openssl -, fuse -, libarchive -, libjwt -, curl -, which -, vala -, cmake -, oniguruma -, nixosTests +{ + stdenv, + lib, + fetchFromGitHub, + pkg-config, + python3, + autoreconfHook, + libuuid, + libmysqlclient, + sqlite, + glib, + libevent, + libsearpc, + openssl, + fuse, + libarchive, + libjwt, + curl, + which, + vala, + cmake, + oniguruma, + nixosTests, }: let # seafile-server relies on a specific version of libevhtp. # It contains non upstreamed patches and is forked off an outdated version. libevhtp = import ./libevhtp.nix { - inherit stdenv lib fetchFromGitHub cmake libevent; + inherit + stdenv + lib + fetchFromGitHub + cmake + libevent + ; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "seafile-server"; - version = "10.0.1"; + version = "11.0.12"; src = fetchFromGitHub { owner = "haiwen"; repo = "seafile-server"; - rev = "db09baec1b88fc131bf4453a808ab63a3fc714c9"; # using a fixed revision because upstream may re-tag releases :/ - sha256 = "sha256-a5vtJcbnaYzq6/3xmhbWk23BZ+Wil/Tb/q22ML4bDqs="; + rev = "5e6c0974e6abe5d92b8ba1db41c6ddbc1029f2d5"; # using a fixed revision because upstream may re-tag releases :/ + hash = "sha256-BVa4QZiHPkqRB5FvDlCSbEVxdnyxVy2KuCDb2orRMuI="; }; - nativeBuildInputs = [ autoreconfHook pkg-config ]; + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; buildInputs = [ libuuid + libmysqlclient sqlite - openssl glib libsearpc libevent @@ -52,7 +63,6 @@ stdenv.mkDerivation rec { fuse libarchive libjwt - curl which vala libevhtp @@ -73,6 +83,11 @@ stdenv.mkDerivation rec { homepage = "https://github.com/haiwen/seafile-server"; license = licenses.agpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ greizgh schmittlauch ]; + maintainers = with maintainers; [ + greizgh + schmittlauch + melvyn2 + ]; + mainProgram = "seaf-server"; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b79143c50a5f..d639820fd492 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -38250,8 +38250,6 @@ with pkgs; sct = callPackage ../tools/X11/sct { }; - seafile-server = callPackage ../servers/seafile-server { }; - seafile-shared = callPackage ../misc/seafile-shared { }; ser2net = callPackage ../servers/ser2net { }; From 90e07d3e559b80434d0875ce6f0474393f58bdad Mon Sep 17 00:00:00 2001 From: melvyn Date: Fri, 27 Sep 2024 19:57:15 -0400 Subject: [PATCH 044/129] seahub: 10.0.1 -> 11.0.12 --- .../se/seahub/package.nix} | 64 +++++++++---------- pkgs/top-level/all-packages.nix | 2 - 2 files changed, 30 insertions(+), 36 deletions(-) rename pkgs/{applications/networking/seahub/default.nix => by-name/se/seahub/package.nix} (55%) diff --git a/pkgs/applications/networking/seahub/default.nix b/pkgs/by-name/se/seahub/package.nix similarity index 55% rename from pkgs/applications/networking/seahub/default.nix rename to pkgs/by-name/se/seahub/package.nix index 604ba4772710..be69d643abb1 100644 --- a/pkgs/applications/networking/seahub/default.nix +++ b/pkgs/by-name/se/seahub/package.nix @@ -1,47 +1,30 @@ -{ lib -, fetchFromGitHub -, fetchpatch -, python3 -, makeWrapper -, nixosTests +{ + lib, + fetchFromGitHub, + python3, + makeWrapper, + nixosTests, + seafile-server, }: -let - python = python3.override { - self = python; - packageOverrides = self: super: { - django = super.django_3; - }; - }; -in -python.pkgs.buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "seahub"; - version = "10.0.1"; + version = "11.0.12"; pyproject = false; src = fetchFromGitHub { owner = "haiwen"; repo = "seahub"; - rev = "e8c02236c0eaca6dde009872745f089da4b77e6e"; # using a fixed revision because upstream may re-tag releases :/ - sha256 = "sha256-7JXWKEFqCsC+ZByhvyP8AmDpajT3hpgyYDNUqc3wXyg="; + rev = "d998361dd890cac3f6d6ebec3af47a589e0332bc"; # using a fixed revision because upstream may re-tag releases :/ + hash = "sha256-n56sRZ9TVb37JA0+12ZoF2Mt7dADjaYk7V0PmdBY0EU="; }; - patches = [ - (fetchpatch { - # PIL update fix - url = "https://patch-diff.githubusercontent.com/raw/haiwen/seahub/pull/5570.patch"; - sha256 = "sha256-7V2aRlacJ7Qhdi9k4Bs+t/Emx+EAM/NNCI+K40bMwLA="; - }) - ]; - dontBuild = true; doCheck = false; # disabled because it requires a ccnet environment - nativeBuildInputs = [ - makeWrapper - ]; + nativeBuildInputs = [ makeWrapper ]; - propagatedBuildInputs = with python.pkgs; [ + propagatedBuildInputs = with python3.pkgs; [ django future django-compressor @@ -50,6 +33,7 @@ python.pkgs.buildPythonApplication rec { django-simple-captcha django-picklefield django-formtools + djangosaml2 mysqlclient pillow python-dateutil @@ -60,14 +44,21 @@ python.pkgs.buildPythonApplication rec { chardet pyjwt pycryptodome + pyopenssl + python-ldap qrcode pysearpc - seaserv gunicorn markdown bleach + + (seafile-server.override { inherit python3; }) ]; + postPatch = '' + substituteInPlace seahub/settings.py --replace-fail "SEAFILE_VERSION = '6.3.3'" "SEAFILE_VERSION = '${version}'" + ''; + installPhase = '' cp -dr --no-preserve='ownership' . $out/ wrapProgram $out/manage.py \ @@ -75,18 +66,23 @@ python.pkgs.buildPythonApplication rec { ''; passthru = { - inherit python; - pythonPath = python.pkgs.makePythonPath propagatedBuildInputs; + inherit python3; + pythonPath = "${python3.pkgs.makePythonPath propagatedBuildInputs}:${seafile-server}/${python3.sitePackages}"; tests = { inherit (nixosTests) seafile; }; + inherit seafile-server; }; meta = with lib; { description = "Web end of seafile server"; homepage = "https://github.com/haiwen/seahub"; license = licenses.asl20; - maintainers = with maintainers; [ greizgh schmittlauch ]; + maintainers = with maintainers; [ + greizgh + schmittlauch + melvyn2 + ]; platforms = platforms.linux; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d639820fd492..021b4c9e3abf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32654,8 +32654,6 @@ with pkgs; seafile-client = libsForQt5.callPackage ../applications/networking/seafile-client { }; - seahub = callPackage ../applications/networking/seahub { }; - seatd = callPackage ../applications/misc/seatd { }; secrets-extractor = callPackage ../tools/security/secrets-extractor { }; From 073099d0f7a1fe42490ba95f7295f78434004197 Mon Sep 17 00:00:00 2001 From: melvyn Date: Fri, 27 Sep 2024 19:58:34 -0400 Subject: [PATCH 045/129] nixos/seafile: add persistent user, configurable storage path, gc service --- .../manual/release-notes/rl-2411.section.md | 10 + nixos/modules/services/networking/seafile.nix | 383 ++++++++++++------ nixos/tests/seafile.nix | 3 +- pkgs/by-name/se/seahub/package.nix | 4 +- 4 files changed, 284 insertions(+), 116 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index f9a5846c1f38..a62387cb6e56 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -529,6 +529,16 @@ - The kubelet configuration file can now be amended with arbitrary additional content using the `services.kubernetes.kubelet.extraConfig` option. +- The `services.seafile` module was updated to major version 11. + - As part of this upgrade, the database backend will be migrated to MySQL. + This process should be automatic, but in case of a botched migration, + old sqlite files are not removed and can be used to manually migrate the database. + - Additionally, the updated CSRF protection may prevent some users from logging in. + Specific origin addresses can be whitelisted using the `services.seafile.seahubExtraConf` option + (e.g. `services.seafile.seahubExtraConf = ''CSRF_TRUSTED_ORIGINS = ["https://example.com"]'';`). + Note that first solution of the [official FAQ answer](https://cloud.seatable.io/dtable/external-links/7b976c85f504491cbe8e/?tid=0000&vid=0000&row-id=BQhH-2HSQs68Nq2EW91DBA) + is not allowed by the `services.nginx` module's config-checker. + - To facilitate dependency injection, the `imgui` package now builds a static archive using vcpkg' CMake rules. The derivation now installs "impl" headers selectively instead of by a wildcard. Use `imgui.src` if you just want to access the unpacked sources. diff --git a/nixos/modules/services/networking/seafile.nix b/nixos/modules/services/networking/seafile.nix index e50829634d19..356bcfe04419 100644 --- a/nixos/modules/services/networking/seafile.nix +++ b/nixos/modules/services/networking/seafile.nix @@ -1,19 +1,42 @@ -{ config, lib, pkgs, ... }: -with lib; +{ + config, + lib, + pkgs, + ... +}: let cfg = config.services.seafile; settingsFormat = pkgs.formats.ini { }; - ccnetConf = settingsFormat.generate "ccnet.conf" cfg.ccnetSettings; + ccnetConf = settingsFormat.generate "ccnet.conf" ( + lib.attrsets.recursiveUpdate { + Database = { + ENGINE = "mysql"; + UNIX_SOCKET = "/var/run/mysqld/mysqld.sock"; + DB = "ccnet_db"; + CONNECTION_CHARSET = "utf8"; + }; + } cfg.ccnetSettings + ); - seafileConf = settingsFormat.generate "seafile.conf" cfg.seafileSettings; + seafileConf = settingsFormat.generate "seafile.conf" ( + lib.attrsets.recursiveUpdate { + database = { + type = "mysql"; + unix_socket = "/var/run/mysqld/mysqld.sock"; + db_name = "seafile_db"; + connection_charset = "utf8"; + }; + } cfg.seafileSettings + ); seahubSettings = pkgs.writeText "seahub_settings.py" '' FILE_SERVER_ROOT = '${cfg.ccnetSettings.General.SERVICE_URL}/seafhttp' DATABASES = { 'default': { - 'ENGINE': 'django.db.backends.sqlite3', - 'NAME': '${seahubDir}/seahub.db', + 'ENGINE': 'django.db.backends.mysql', + 'NAME' : 'seahub_db', + 'HOST' : '/var/run/mysqld/mysqld.sock', } } MEDIA_ROOT = '${seahubDir}/media/' @@ -21,13 +44,15 @@ let SERVICE_URL = '${cfg.ccnetSettings.General.SERVICE_URL}' + CSRF_TRUSTED_ORIGINS = ["${cfg.ccnetSettings.General.SERVICE_URL}"] + with open('${seafRoot}/.seahubSecret') as f: SECRET_KEY = f.readline().rstrip() ${cfg.seahubExtraConf} ''; - seafRoot = "/var/lib/seafile"; # hardcode it due to dynamicuser + seafRoot = "/var/lib/seafile"; ccnetDir = "${seafRoot}/ccnet"; seahubDir = "${seafRoot}/seahub"; defaultUser = "seafile"; @@ -37,7 +62,7 @@ in ###### Interface - options.services.seafile = { + options.services.seafile = with lib; { enable = mkEnableOption "Seafile server"; ccnetSettings = mkOption { @@ -47,7 +72,7 @@ in options = { General = { SERVICE_URL = mkOption { - type = types.str; + type = types.singleLineStr; example = "https://www.example.com"; description = '' Seahub public URL. @@ -78,11 +103,17 @@ in ''; }; host = mkOption { - type = types.str; - default = "127.0.0.1"; - example = "0.0.0.0"; + type = types.singleLineStr; + default = "ipv4:127.0.0.1"; + example = "unix:/run/seafile/server.sock"; description = '' - The binding address used by seafile fileserver. + The bind address used by seafile fileserver. + + The addr can be defined as one of the following: + - ipv6: for binding to an IPv6 address. + - unix: for binding to a unix named socket + - ipv4: for binding to an ipv4 address + Otherwise the addr is assumed to be ipv4. ''; }; }; @@ -96,6 +127,19 @@ in ''; }; + seahubAddress = mkOption { + type = types.singleLineStr; + default = "unix:/run/seahub/gunicorn.sock"; + example = "[::1]:8083"; + description = '' + Which address to bind the seahub server to, of the form: + - HOST + - HOST:PORT + - unix:PATH. + IPv6 HOSTs must be wrapped in brackets. + ''; + }; + workers = mkOption { type = types.int; default = 4; @@ -107,7 +151,7 @@ in adminEmail = mkOption { example = "john@example.com"; - type = types.str; + type = types.singleLineStr; description = '' Seafile Seahub Admin Account Email. ''; @@ -115,45 +159,79 @@ in initialAdminPassword = mkOption { example = "someStrongPass"; - type = types.str; + type = types.singleLineStr; description = '' Seafile Seahub Admin Account initial password. Should be changed via Seahub web front-end. ''; }; - seafilePackage = mkPackageOption pkgs "seafile-server" { }; + seahubPackage = mkPackageOption pkgs "seahub" { }; user = mkOption { - type = types.str; + type = types.singleLineStr; default = defaultUser; description = "User account under which seafile runs."; }; group = mkOption { - type = types.str; + type = types.singleLineStr; default = defaultUser; description = "Group under which seafile runs."; }; dataDir = mkOption { - type = types.nullOr types.path; - default = null; - defaultText = "${seafRoot}/data"; + type = types.path; + default = "${seafRoot}/data"; description = "Path in which to store user data"; }; - gcDates = mkOption { - type = types.listOf types.str; - default = [ ]; - example = [ "Sun 03:00:00" ]; - description = '' - When to run garbage collection on stored data blocks. - ''; + gc = { + enable = mkEnableOption "automatic garbage collection on stored data blocks"; + + dates = mkOption { + type = types.listOf types.singleLineStr; + default = [ "Sun 03:00:00" ]; + description = '' + When to run garbage collection on stored data blocks. + The time format is described in {manpage}`systemd.time(7)`. + ''; + }; + + randomizedDelaySec = mkOption { + default = "0"; + type = types.singleLineStr; + example = "45min"; + description = '' + Add a randomized delay before each garbage collection. + The delay will be chosen between zero and this value. + This value must be a time span in the format specified by + {manpage}`systemd.time(7)` + ''; + }; + + persistent = mkOption { + default = true; + type = types.bool; + example = false; + description = '' + Takes a boolean argument. If true, the time when the service + unit was last triggered is stored on disk. When the timer is + activated, the service unit is triggered immediately if it + would have been triggered at least once during the time when + the timer was inactive. Such triggering is nonetheless + subject to the delay imposed by RandomizedDelaySec=. This is + useful to catch up on missed runs of the service when the + system was powered down. + ''; + }; }; seahubExtraConf = mkOption { default = ""; + example = '' + CSRF_TRUSTED_ORIGINS = ["https://example.com"] + ''; type = types.lines; description = '' Extra config to append to `seahub_settings.py` file. @@ -165,7 +243,26 @@ in ###### Implementation - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { + services.mysql = { + enable = true; + package = lib.mkDefault pkgs.mariadb; + ensureDatabases = [ + "ccnet_db" + "seafile_db" + "seahub_db" + ]; + ensureUsers = [ + { + name = cfg.user; + ensurePermissions = { + "ccnet_db.*" = "ALL PRIVILEGES"; + "seafile_db.*" = "ALL PRIVILEGES"; + "seahub_db.*" = "ALL PRIVILEGES"; + }; + } + ]; + }; environment.etc."seafile/ccnet.conf".source = ccnetConf; environment.etc."seafile/seafile.conf".source = seafileConf; @@ -178,9 +275,7 @@ in }; }; - users.groups = lib.optionalAttrs (cfg.group == defaultUser) { - "${defaultUser}" = {}; - }; + users.groups = lib.optionalAttrs (cfg.group == defaultUser) { "${defaultUser}" = { }; }; systemd.targets.seafile = { wantedBy = [ "multi-user.target" ]; @@ -189,7 +284,7 @@ in systemd.services = let - securityOptions = { + serviceOptions = { ProtectHome = true; PrivateUsers = true; PrivateDevices = true; @@ -210,34 +305,42 @@ in NoNewPrivileges = true; MemoryDenyWriteExecute = true; SystemCallArchitectures = "native"; - RestrictAddressFamilies = [ "AF_UNIX" "AF_INET" ]; + RestrictAddressFamilies = [ + "AF_UNIX" + "AF_INET" + ]; + + User = cfg.user; + Group = cfg.group; + StateDirectory = "seafile"; + RuntimeDirectory = "seafile"; + LogsDirectory = "seafile"; + ConfigurationDirectory = "seafile"; + ReadWritePaths = lib.lists.optional (cfg.dataDir != "${seafRoot}/data") cfg.dataDir; }; - dataDir = if (!builtins.isNull cfg.dataDir) then cfg.dataDir else "${seafRoot}/data"; - optionalDataDir = lib.lists.optional (!builtins.isNull cfg.dataDir) cfg.dataDir; in { seaf-server = { description = "Seafile server"; partOf = [ "seafile.target" ]; - after = [ "network.target" ]; - unitConfig.RequiresMountsFor = optionalDataDir; + unitConfig.RequiresMountsFor = lib.lists.optional (cfg.dataDir != "${seafRoot}/data") cfg.dataDir; + requires = [ "mysql.service" ]; + after = [ + "network.target" + "mysql.service" + ]; wantedBy = [ "seafile.target" ]; - restartTriggers = [ ccnetConf seafileConf ]; - path = [ pkgs.sqlite ]; - serviceConfig = securityOptions // { - User = cfg.user; - Group = cfg.group; - StateDirectory = "seafile"; - RuntimeDirectory = "seafile"; - LogsDirectory = "seafile"; - ConfigurationDirectory = "seafile"; - ReadWritePaths = optionalDataDir; + restartTriggers = [ + ccnetConf + seafileConf + ]; + serviceConfig = serviceOptions // { ExecStart = '' - ${cfg.seafilePackage}/bin/seaf-server \ + ${lib.getExe cfg.seahubPackage.seafile-server} \ --foreground \ -F /etc/seafile \ -c ${ccnetDir} \ - -d ${dataDir} \ + -d ${cfg.dataDir} \ -l /var/log/seafile/server.log \ -P /run/seafile/server.pid \ -p /run/seafile @@ -245,118 +348,162 @@ in }; preStart = '' if [ ! -f "${seafRoot}/server-setup" ]; then - mkdir -p ${dataDir}/library-template - mkdir -p ${ccnetDir}/{GroupMgr,misc,OrgMgr,PeerMgr} - sqlite3 ${ccnetDir}/GroupMgr/groupmgr.db ".read ${cfg.seafilePackage}/share/seafile/sql/sqlite/groupmgr.sql" - sqlite3 ${ccnetDir}/misc/config.db ".read ${cfg.seafilePackage}/share/seafile/sql/sqlite/config.sql" - sqlite3 ${ccnetDir}/OrgMgr/orgmgr.db ".read ${cfg.seafilePackage}/share/seafile/sql/sqlite/org.sql" - sqlite3 ${ccnetDir}/PeerMgr/usermgr.db ".read ${cfg.seafilePackage}/share/seafile/sql/sqlite/user.sql" - sqlite3 ${dataDir}/seafile.db ".read ${cfg.seafilePackage}/share/seafile/sql/sqlite/seafile.sql" - echo "${cfg.seafilePackage.version}-sqlite" > "${seafRoot}"/server-setup + mkdir -p ${cfg.dataDir}/library-template + # Load schema on first install + ${pkgs.mariadb.client}/bin/mysql --database=ccnet_db < ${cfg.seahubPackage.seafile-server}/share/seafile/sql/mysql/ccnet.sql + ${pkgs.mariadb.client}/bin/mysql --database=seafile_db < ${cfg.seahubPackage.seafile-server}/share/seafile/sql/mysql/seafile.sql + echo "${cfg.seahubPackage.seafile-server.version}-mysql" > "${seafRoot}"/server-setup + echo Loaded MySQL schemas for first install fi # checking for upgrades and handling them installedMajor=$(cat "${seafRoot}/server-setup" | cut -d"-" -f1 | cut -d"." -f1) installedMinor=$(cat "${seafRoot}/server-setup" | cut -d"-" -f1 | cut -d"." -f2) - pkgMajor=$(echo "${cfg.seafilePackage.version}" | cut -d"." -f1) - pkgMinor=$(echo "${cfg.seafilePackage.version}" | cut -d"." -f2) + pkgMajor=$(echo "${cfg.seahubPackage.seafile-server.version}" | cut -d"." -f1) + pkgMinor=$(echo "${cfg.seahubPackage.seafile-server.version}" | cut -d"." -f2) if [[ $installedMajor == $pkgMajor && $installedMinor == $pkgMinor ]]; then : - elif [[ $installedMajor == 8 && $installedMinor == 0 && $pkgMajor == 9 && $pkgMinor == 0 ]]; then - # Upgrade from 8.0 to 9.0 - sqlite3 ${dataDir}/seafile.db ".read ${pkgs.seahub}/scripts/upgrade/sql/9.0.0/sqlite3/seafile.sql" - echo "${cfg.seafilePackage.version}-sqlite" > "${seafRoot}"/server-setup - elif [[ $installedMajor == 9 && $installedMinor == 0 && $pkgMajor == 10 && $pkgMinor == 0 ]]; then - # Upgrade from 9.0 to 10.0 - sqlite3 ${dataDir}/seafile.db ".read ${pkgs.seahub}/scripts/upgrade/sql/10.0.0/sqlite3/seafile.sql" - echo "${cfg.seafilePackage.version}-sqlite" > "${seafRoot}"/server-setup + elif [[ $installedMajor == 10 && $installedMinor == 0 && $pkgMajor == 11 && $pkgMinor == 0 ]]; then + # Upgrade from 10.0 to 11.0: migrate to mysql + echo Migrating from version 10 to 11 + + # From https://github.com/haiwen/seahub/blob/e12f941bfef7191795d8c72a7d339c01062964b2/scripts/sqlite2mysql.sh + + echo Migrating ccnet database to MySQL + ${lib.getExe pkgs.sqlite} ${ccnetDir}/PeerMgr/usermgr.db ".dump" | \ + ${lib.getExe cfg.seahubPackage.python3} ${cfg.seahubPackage}/scripts/sqlite2mysql.py > ${ccnetDir}/ccnet.sql + ${lib.getExe pkgs.sqlite} ${ccnetDir}/GroupMgr/groupmgr.db ".dump" | \ + ${lib.getExe cfg.seahubPackage.python3} ${cfg.seahubPackage}/scripts/sqlite2mysql.py >> ${ccnetDir}/ccnet.sql + sed 's/ctime INTEGER/ctime BIGINT/g' -i ${ccnetDir}/ccnet.sql + sed 's/email TEXT, role TEXT/email VARCHAR(255), role TEXT/g' -i ${ccnetDir}/ccnet.sql + ${pkgs.mariadb.client}/bin/mysql --database=ccnet_db < ${ccnetDir}/ccnet.sql + + echo Migrating seafile database to MySQL + ${lib.getExe pkgs.sqlite} ${cfg.dataDir}/seafile.db ".dump" | \ + ${lib.getExe cfg.seahubPackage.python3} ${cfg.seahubPackage}/scripts/sqlite2mysql.py > ${cfg.dataDir}/seafile.sql + sed 's/owner_id TEXT/owner_id VARCHAR(255)/g' -i ${cfg.dataDir}/seafile.sql + sed 's/user_name TEXT/user_name VARCHAR(255)/g' -i ${cfg.dataDir}/seafile.sql + ${pkgs.mariadb.client}/bin/mysql --database=seafile_db < ${cfg.dataDir}/seafile.sql + + echo Migrating seahub database to MySQL + echo 'SET FOREIGN_KEY_CHECKS=0;' > ${seahubDir}/seahub.sql + ${lib.getExe pkgs.sqlite} ${seahubDir}/seahub.db ".dump" | \ + ${lib.getExe cfg.seahubPackage.python3} ${cfg.seahubPackage}/scripts/sqlite2mysql.py >> ${seahubDir}/seahub.sql + sed 's/`permission` , `reporter` text NOT NULL/`permission` longtext NOT NULL/g' -i ${seahubDir}/seahub.sql + sed 's/varchar(256) NOT NULL UNIQUE/varchar(255) NOT NULL UNIQUE/g' -i ${seahubDir}/seahub.sql + sed 's/, UNIQUE (`user_email`, `contact_email`)//g' -i ${seahubDir}/seahub.sql + sed '/INSERT INTO `base_dirfileslastmodifiedinfo`/d' -i ${seahubDir}/seahub.sql + sed '/INSERT INTO `notifications_usernotification`/d' -i ${seahubDir}/seahub.sql + sed 's/DEFERRABLE INITIALLY DEFERRED//g' -i ${seahubDir}/seahub.sql + ${pkgs.mariadb.client}/bin/mysql --database=seahub_db < ${seahubDir}/seahub.sql + + echo "${cfg.seahubPackage.seafile-server.version}-mysql" > "${seafRoot}"/server-setup + echo Migration complete else - echo "Unsupported upgrade" >&2 + echo "Unsupported upgrade: $installedMajor.$installedMinor to $pkgMajor.$pkgMinor" >&2 exit 1 fi ''; + + # Fix unix socket permissions + postStart = ( + lib.strings.optionalString (lib.strings.hasPrefix "unix:" cfg.seafileSettings.fileserver.host) '' + while [[ ! -S "${lib.strings.removePrefix "unix:" cfg.seafileSettings.fileserver.host}" ]]; do + sleep 1 + done + chmod 666 "${lib.strings.removePrefix "unix:" cfg.seafileSettings.fileserver.host}" + '' + ); }; seahub = { description = "Seafile Server Web Frontend"; wantedBy = [ "seafile.target" ]; partOf = [ "seafile.target" ]; - after = [ "network.target" "seaf-server.service" ]; - requires = [ "seaf-server.service" ]; - unitConfig.RequiresMountsFor = optionalDataDir; + unitConfig.RequiresMountsFor = lib.lists.optional (cfg.dataDir != "${seafRoot}/data") cfg.dataDir; + requires = [ + "mysql.service" + "seaf-server.service" + ]; + after = [ + "network.target" + "mysql.service" + "seaf-server.service" + ]; restartTriggers = [ seahubSettings ]; environment = { - PYTHONPATH = "${pkgs.seahub.pythonPath}:${pkgs.seahub}/thirdpart:${pkgs.seahub}"; + PYTHONPATH = "${cfg.seahubPackage.pythonPath}:${cfg.seahubPackage}/thirdpart:${cfg.seahubPackage}"; DJANGO_SETTINGS_MODULE = "seahub.settings"; CCNET_CONF_DIR = ccnetDir; - SEAFILE_CONF_DIR = dataDir; + SEAFILE_CONF_DIR = cfg.dataDir; SEAFILE_CENTRAL_CONF_DIR = "/etc/seafile"; SEAFILE_RPC_PIPE_PATH = "/run/seafile"; SEAHUB_LOG_DIR = "/var/log/seafile"; }; - serviceConfig = securityOptions // { - User = cfg.user; - Group = cfg.group; + serviceConfig = serviceOptions // { RuntimeDirectory = "seahub"; - StateDirectory = "seafile"; - LogsDirectory = "seafile"; - ConfigurationDirectory = "seafile"; - ReadWritePaths = optionalDataDir; ExecStart = '' - ${pkgs.seahub.python.pkgs.gunicorn}/bin/gunicorn seahub.wsgi:application \ + ${lib.getExe cfg.seahubPackage.python3.pkgs.gunicorn} seahub.wsgi:application \ --name seahub \ --workers ${toString cfg.workers} \ --log-level=info \ --preload \ --timeout=1200 \ --limit-request-line=8190 \ - --bind unix:/run/seahub/gunicorn.sock + --bind ${cfg.seahubAddress} ''; }; preStart = '' mkdir -p ${seahubDir}/media # Link all media except avatars - for m in `find ${pkgs.seahub}/media/ -maxdepth 1 -not -name "avatars"`; do + for m in `find ${cfg.seahubPackage}/media/ -maxdepth 1 -not -name "avatars"`; do ln -sf $m ${seahubDir}/media/ done if [ ! -e "${seafRoot}/.seahubSecret" ]; then - ${pkgs.seahub.python}/bin/python ${pkgs.seahub}/tools/secret_key_generator.py > ${seafRoot}/.seahubSecret - chmod 400 ${seafRoot}/.seahubSecret + ( + umask 377 && + ${lib.getExe cfg.seahubPackage.python3} ${cfg.seahubPackage}/tools/secret_key_generator.py > ${seafRoot}/.seahubSecret + ) fi if [ ! -f "${seafRoot}/seahub-setup" ]; then # avatars directory should be writable - install -D -t ${seahubDir}/media/avatars/ ${pkgs.seahub}/media/avatars/default.png - install -D -t ${seahubDir}/media/avatars/groups ${pkgs.seahub}/media/avatars/groups/default.png + install -D -t ${seahubDir}/media/avatars/ ${cfg.seahubPackage}/media/avatars/default.png + install -D -t ${seahubDir}/media/avatars/groups ${cfg.seahubPackage}/media/avatars/groups/default.png # init database - ${pkgs.seahub}/manage.py migrate + ${cfg.seahubPackage}/manage.py migrate # create admin account - ${pkgs.expect}/bin/expect -c 'spawn ${pkgs.seahub}/manage.py createsuperuser --email=${cfg.adminEmail}; expect "Password: "; send "${cfg.initialAdminPassword}\r"; expect "Password (again): "; send "${cfg.initialAdminPassword}\r"; expect "Superuser created successfully."' - echo "${pkgs.seahub.version}-sqlite" > "${seafRoot}/seahub-setup" + ${lib.getExe pkgs.expect} -c 'spawn ${cfg.seahubPackage}/manage.py createsuperuser --email=${cfg.adminEmail}; expect "Password: "; send "${cfg.initialAdminPassword}\r"; expect "Password (again): "; send "${cfg.initialAdminPassword}\r"; expect "Superuser created successfully."' + echo "${cfg.seahubPackage.version}-mysql" > "${seafRoot}/seahub-setup" fi if [ $(cat "${seafRoot}/seahub-setup" | cut -d"-" -f1) != "${pkgs.seahub.version}" ]; then - # update database - ${pkgs.seahub}/manage.py migrate - echo "${pkgs.seahub.version}-sqlite" > "${seafRoot}/seahub-setup" + # run django migrations + ${cfg.seahubPackage}/manage.py migrate + echo "${cfg.seahubPackage.version}-mysql" > "${seafRoot}/seahub-setup" fi ''; }; seaf-gc = { description = "Seafile storage garbage collection"; - conflicts = [ "seaf-server.service" "seahub.service" ]; - after = [ "seaf-server.service" "seahub.service" ]; - unitConfig.RequiresMountsFor = optionalDataDir; - onSuccess = [ "seaf-server.service" "seahub.service" ]; - onFailure = [ "seaf-server.service" "seahub.service" ]; - startAt = cfg.gcDates; - serviceConfig = securityOptions // { - User = cfg.user; - Group = cfg.group; - StateDirectory = "seafile"; - RuntimeDirectory = "seafile"; - LogsDirectory = "seafile"; - ConfigurationDirectory = "seafile"; - ReadWritePaths = optionalDataDir; + conflicts = [ + "seaf-server.service" + "seahub.service" + ]; + after = [ + "seaf-server.service" + "seahub.service" + ]; + unitConfig.RequiresMountsFor = lib.lists.optional (cfg.dataDir != "${seafRoot}/data") cfg.dataDir; + onSuccess = [ + "seaf-server.service" + "seahub.service" + ]; + onFailure = [ + "seaf-server.service" + "seahub.service" + ]; + startAt = lib.lists.optionals cfg.gc.enable cfg.gc.dates; + serviceConfig = serviceOptions // { Type = "oneshot"; }; script = '' @@ -368,8 +515,8 @@ in # checking for pending upgrades installedMajor=$(cat "${seafRoot}/server-setup" | cut -d"-" -f1 | cut -d"." -f1) installedMinor=$(cat "${seafRoot}/server-setup" | cut -d"-" -f1 | cut -d"." -f2) - pkgMajor=$(echo "${cfg.seafilePackage.version}" | cut -d"." -f1) - pkgMinor=$(echo "${cfg.seafilePackage.version}" | cut -d"." -f2) + pkgMajor=$(echo "${cfg.seahubPackage.seafile-server.version}" | cut -d"." -f1) + pkgMinor=$(echo "${cfg.seahubPackage.seafile-server.version}" | cut -d"." -f2) if [[ $installedMajor != $pkgMajor || $installedMinor != $pkgMinor ]]; then echo "Server not upgraded yet" >&2 @@ -377,15 +524,25 @@ in fi # Clean up user-deleted blocks and libraries - ${cfg.seafilePackage}/bin/seafserv-gc \ + ${cfg.seahubPackage.seafile-server}/bin/seafserv-gc \ -F /etc/seafile \ -c ${ccnetDir} \ - -d ${dataDir} \ + -d ${cfg.dataDir} \ --rm-fs ''; }; }; + + systemd.timers.seaf-gc = lib.mkIf cfg.gc.enable { + timerConfig = { + randomizedDelaySec = cfg.gc.randomizedDelaySec; + Persistent = cfg.gc.persistent; + }; + }; }; - meta.maintainers = with maintainers; [ greizgh schmittlauch ]; + meta.maintainers = with lib.maintainers; [ + greizgh + schmittlauch + ]; } diff --git a/nixos/tests/seafile.nix b/nixos/tests/seafile.nix index 78e735f4fed7..7784d5fddaed 100644 --- a/nixos/tests/seafile.nix +++ b/nixos/tests/seafile.nix @@ -14,6 +14,7 @@ import ./make-test-python.nix ({ pkgs, ... }: services.seafile = { enable = true; ccnetSettings.General.SERVICE_URL = "http://server"; + seafileSettings.fileserver.host = "unix:/run/seafile/server.sock"; adminEmail = "admin@example.com"; initialAdminPassword = "seafile_password"; }; @@ -22,7 +23,7 @@ import ./make-test-python.nix ({ pkgs, ... }: virtualHosts."server" = { locations."/".proxyPass = "http://unix:/run/seahub/gunicorn.sock"; locations."/seafhttp" = { - proxyPass = "http://127.0.0.1:8082"; + proxyPass = "http://unix:/run/seafile/server.sock"; extraConfig = '' rewrite ^/seafhttp(.*)$ $1 break; client_max_body_size 0; diff --git a/pkgs/by-name/se/seahub/package.nix b/pkgs/by-name/se/seahub/package.nix index be69d643abb1..b1df123cd814 100644 --- a/pkgs/by-name/se/seahub/package.nix +++ b/pkgs/by-name/se/seahub/package.nix @@ -52,7 +52,7 @@ python3.pkgs.buildPythonApplication rec { markdown bleach - (seafile-server.override { inherit python3; }) + (python3.pkgs.toPythonModule (seafile-server.override { inherit python3; })) ]; postPatch = '' @@ -67,7 +67,7 @@ python3.pkgs.buildPythonApplication rec { passthru = { inherit python3; - pythonPath = "${python3.pkgs.makePythonPath propagatedBuildInputs}:${seafile-server}/${python3.sitePackages}"; + pythonPath = python3.pkgs.makePythonPath propagatedBuildInputs; tests = { inherit (nixosTests) seafile; }; From 2095eae5ce6909d25c4593b356c20ee47faa198b Mon Sep 17 00:00:00 2001 From: Matthew Toohey Date: Sat, 28 Sep 2024 20:29:14 -0400 Subject: [PATCH 046/129] fan2go: 0.8.1 -> 0.9.0 --- pkgs/os-specific/linux/fan2go/default.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/fan2go/default.nix b/pkgs/os-specific/linux/fan2go/default.nix index edd44842eed9..296bfea58069 100644 --- a/pkgs/os-specific/linux/fan2go/default.nix +++ b/pkgs/os-specific/linux/fan2go/default.nix @@ -1,21 +1,26 @@ -{ buildGoModule, fetchFromGitHub, lib, lm_sensors }: +{ buildGo123Module, fetchFromGitHub, lib, lm_sensors }: -buildGoModule rec { +buildGo123Module rec { pname = "fan2go"; - version = "0.8.1"; + version = "0.9.0"; src = fetchFromGitHub { owner = "markusressel"; repo = pname; rev = version; - hash = "sha256-w2Qwu3ZmBkoA86xa7V6pnIBAbfG9mtkAHePkQjefRW8="; + hash = "sha256-eSHeHBzDvzsDAck0zexwR8drasisvlQNTeowv92E2uc="; }; - vendorHash = "sha256-6OEdl7ie0dTjXrG//Fvcg4ZyTW/mhrUievDljY2zi/4="; + vendorHash = "sha256-ad0e/cxbcU/KfPDOdD46KdCcvns83dgGDAyLLQiGyiA="; postConfigure = '' substituteInPlace vendor/github.com/md14454/gosensors/gosensors.go \ - --replace '"/etc/sensors3.conf"' '"${lm_sensors}/etc/sensors3.conf"' + --replace-fail '"/etc/sensors3.conf"' '"${lm_sensors}/etc/sensors3.conf"' + + # Uses /usr/bin/echo, and even if we patch that, it refuses to execute any + # binary without being able to confirm that it's owned by root, which isn't + # possible under the sandbox. + rm internal/fans/cmd_test.go ''; CGO_CFLAGS = "-I ${lm_sensors}/include"; From 7455c80a5f97a5fa9c4449a6c64c053232f6eca4 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Sat, 28 Sep 2024 18:22:07 +0800 Subject: [PATCH 047/129] uwc: 1.0.5 -> 1.0.7 and fetch from GitHub --- pkgs/tools/text/uwc/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/text/uwc/default.nix b/pkgs/tools/text/uwc/default.nix index 42777accb826..8919456d4d46 100644 --- a/pkgs/tools/text/uwc/default.nix +++ b/pkgs/tools/text/uwc/default.nix @@ -1,24 +1,24 @@ -{ rustPlatform, lib, fetchFromGitLab }: +{ rustPlatform, lib, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "uwc"; - version = "1.0.5"; + version = "1.0.7"; - src = fetchFromGitLab { + src = fetchFromGitHub { owner = "dead10ck"; - repo = pname; - rev = "v${version}"; - hash = "sha256-x2mijB1GkxdraFroG1+PiBzWKPjsaAeoDt0HFL2v93I="; + repo = "uwc"; + rev = "refs/tags/v${version}"; + hash = "sha256-Qv8vMjCMhpVxkJyH1uTsFXu2waO8oaLPuoBETaWOUqI="; }; - cargoHash = "sha256-0IvOaQaXfdEz5tlXh5gTbnZG9QZSWDVHGOqYq8aWOIc="; + cargoHash = "sha256-20brxqYAvgBxbOQ7KOFviXxmFrSHDXNV/0lcks7x3a8="; doCheck = true; meta = with lib; { description = "Like wc, but unicode-aware, and with per-line mode"; mainProgram = "uwc"; - homepage = "https://gitlab.com/dead10ck/uwc"; + homepage = "https://github.com/dead10ck/uwc"; license = licenses.mit; maintainers = with maintainers; [ ShamrockLee ]; }; From 935b96082f8ebb3a349bc2e08c10bd0a6aa12a0a Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Sat, 28 Sep 2024 18:28:13 +0800 Subject: [PATCH 048/129] uwc: disable tests The test failures seem to be caused by the upstream. --- pkgs/tools/text/uwc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/text/uwc/default.nix b/pkgs/tools/text/uwc/default.nix index 8919456d4d46..db6868f161d1 100644 --- a/pkgs/tools/text/uwc/default.nix +++ b/pkgs/tools/text/uwc/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-20brxqYAvgBxbOQ7KOFviXxmFrSHDXNV/0lcks7x3a8="; - doCheck = true; + doCheck = false; meta = with lib; { description = "Like wc, but unicode-aware, and with per-line mode"; From 30547aa2693e77a48e8fb840cf670067185e8563 Mon Sep 17 00:00:00 2001 From: kraanzu Date: Sun, 29 Sep 2024 10:42:54 +0530 Subject: [PATCH 049/129] dooit: fix textual version --- pkgs/by-name/do/dooit/package.nix | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/do/dooit/package.nix b/pkgs/by-name/do/dooit/package.nix index b55e7481e559..2a08cdf26e9f 100644 --- a/pkgs/by-name/do/dooit/package.nix +++ b/pkgs/by-name/do/dooit/package.nix @@ -24,7 +24,6 @@ python3.pkgs.buildPythonApplication rec { build-system = with python3.pkgs; [ poetry-core ]; pythonRelaxDeps = [ - "textual" "tzlocal" ]; @@ -33,7 +32,21 @@ python3.pkgs.buildPythonApplication rec { pyperclip python-dateutil pyyaml - textual + (textual.overridePythonAttrs (oldAttrs: { + version = "0.47.1"; + src = fetchFromGitHub { + owner = "Textualize"; + repo = "textual"; + rev = "refs/tags/v0.47.1"; + hash = "sha256-RFaZKQ+0o6ZvfZxx95a1FjSHVJ0VOIAfzkdxYQXYBKU="; + }; + disabledTests = [ + "test_tracked_slugs" + "test_textual_env_var" + "test_register_language" + "test_register_language_existing_language" + ]; + })) tzlocal ]; From aa04240ed0f07be0012043969a17605fd4dac0cb Mon Sep 17 00:00:00 2001 From: kraanzu Date: Sun, 29 Sep 2024 11:41:16 +0530 Subject: [PATCH 050/129] maintainers: add kraanzu --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 37055b35e8f8..3f2af9bd93d6 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -11374,6 +11374,12 @@ githubId = 787421; name = "Kevin Quick"; }; + kraanzu = { + name = "Murli Tawari"; + email = "kraanzu@gmail.com"; + github = "kraanzu"; + githubId = 97718086; + }; kradalby = { name = "Kristoffer Dalby"; email = "kristoffer@dalby.cc"; From bc01328c5754e59bbe88e6c8996a4464229a7910 Mon Sep 17 00:00:00 2001 From: kraanzu Date: Sun, 29 Sep 2024 11:41:25 +0530 Subject: [PATCH 051/129] dooit: add maintainer kraanzu --- pkgs/by-name/do/dooit/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/do/dooit/package.nix b/pkgs/by-name/do/dooit/package.nix index b55e7481e559..6e7fb8be5d70 100644 --- a/pkgs/by-name/do/dooit/package.nix +++ b/pkgs/by-name/do/dooit/package.nix @@ -57,6 +57,7 @@ python3.pkgs.buildPythonApplication rec { maintainers = with maintainers; [ khaneliman wesleyjrz + kraanzu ]; mainProgram = "dooit"; }; From 6b2c497f83fce0f341ed2cbbc7307d0b37653522 Mon Sep 17 00:00:00 2001 From: Mikael Fangel <34864484+MikaelFangel@users.noreply.github.com> Date: Sun, 29 Sep 2024 11:15:20 +0200 Subject: [PATCH 052/129] vscode-extensions.asvetliakov.vscode-neovim: 1.18.11 -> 1.18.12 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 137454efd694..d594d38a52f0 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -406,8 +406,8 @@ let mktplcRef = { name = "vscode-neovim"; publisher = "asvetliakov"; - version = "1.18.11"; - hash = "sha256-j1igEItS4TT1WxSxK3tFG29McTTo8ojEs6TJShGZiGI="; + version = "1.18.12"; + hash = "sha256-3Nmk0MFIMFYQHrRyZ7ioFk9KfHSk0CSF7FwNaEJbsyg="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/asvetliakov.vscode-neovim/changelog"; From d179a5e5ba4edac2b7d891020f324475947977c3 Mon Sep 17 00:00:00 2001 From: phaer Date: Sun, 29 Sep 2024 13:32:32 +0200 Subject: [PATCH 053/129] healthchecks: 3.4 -> 3.6 --- nixos/tests/web-apps/healthchecks.nix | 2 +- pkgs/servers/web-apps/healthchecks/default.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/tests/web-apps/healthchecks.nix b/nixos/tests/web-apps/healthchecks.nix index 41c40cd5dd8d..cb81c8b73651 100644 --- a/nixos/tests/web-apps/healthchecks.nix +++ b/nixos/tests/web-apps/healthchecks.nix @@ -24,7 +24,7 @@ import ../make-test-python.nix ({ lib, pkgs, ... }: { with subtest("Home screen loads"): machine.succeed( - "curl -sSfL http://localhost:8000 | grep 'Sign In'" + "curl -sSfL http://localhost:8000 | grep '<title>Log In'" ) with subtest("Setting SITE_NAME via freeform option works"): diff --git a/pkgs/servers/web-apps/healthchecks/default.nix b/pkgs/servers/web-apps/healthchecks/default.nix index 5436555cd28a..5f366a255a0f 100644 --- a/pkgs/servers/web-apps/healthchecks/default.nix +++ b/pkgs/servers/web-apps/healthchecks/default.nix @@ -14,14 +14,14 @@ let in py.pkgs.buildPythonApplication rec { pname = "healthchecks"; - version = "3.4"; + version = "3.6"; format = "other"; src = fetchFromGitHub { owner = "healthchecks"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-hiuw7XfCDy+9fzuQMaeN9+XsENeBI1RNXy8IM1HIFhI="; + sha256 = "sha256-aKt9L3ZgZ8HffcNNJaR+hAI38raWuLp2q/6+rvkl2pM="; }; propagatedBuildInputs = with py.pkgs; [ From bb89119ec78ac7db5e2577e4b5591da140bcc789 Mon Sep 17 00:00:00 2001 From: leiserfg <leiserfg@gmail.com> Date: Sun, 29 Sep 2024 15:21:03 +0200 Subject: [PATCH 054/129] kitty: 0.36.1 -> 0.36.4 --- .../terminal-emulators/kitty/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/terminal-emulators/kitty/default.nix b/pkgs/applications/terminal-emulators/kitty/default.nix index cf5614d399a5..0459fd9c0169 100644 --- a/pkgs/applications/terminal-emulators/kitty/default.nix +++ b/pkgs/applications/terminal-emulators/kitty/default.nix @@ -25,28 +25,28 @@ , zsh , fish , nixosTests -, go -, buildGoModule +, go_1_23 +, buildGo123Module , nix-update-script }: with python3Packages; buildPythonApplication rec { pname = "kitty"; - version = "0.36.1"; + version = "0.36.4"; format = "other"; src = fetchFromGitHub { owner = "kovidgoyal"; repo = "kitty"; rev = "refs/tags/v${version}"; - hash = "sha256-7+MxxgQQlAje7klfJvvEWe8CfxyN0oTGQJ/QOORFUsY="; + hash = "sha256-nN0y2VKK5UNaozpHQNPN7AYkto9z6rJNpYRJhvLPtVQ="; }; - goModules = (buildGoModule { + goModules = (buildGo123Module { pname = "kitty-go-modules"; inherit src version; - vendorHash = "sha256-YN4sSdDNDIVgtcykg60H0bZEryRHJJfZ5rXWUMYXGr4="; + vendorHash = "sha256-8hsQH7OdsxeVG6pomuxdmTXNmQYBROoUUxoC10LeLFo="; }).goModules; buildInputs = [ @@ -82,7 +82,7 @@ buildPythonApplication rec { sphinx-copybutton sphinxext-opengraph sphinx-inline-tabs - go + go_1_23 fontconfig ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ imagemagick From 2a5132e9926129f24ec3b375f1347a0329abc78c Mon Sep 17 00:00:00 2001 From: Colin <colin@uninsane.org> Date: Sun, 29 Sep 2024 15:03:30 +0000 Subject: [PATCH 055/129] syshud: 0-unstable-2024-08-27 -> 0-unstable-2024-09-26 --- pkgs/by-name/sy/syshud/package.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sy/syshud/package.nix b/pkgs/by-name/sy/syshud/package.nix index 05229a47cbcf..e8989bcf47b1 100644 --- a/pkgs/by-name/sy/syshud/package.nix +++ b/pkgs/by-name/sy/syshud/package.nix @@ -2,8 +2,10 @@ lib, stdenv, fetchFromGitHub, + glibmm, gtk4-layer-shell, gtkmm4, + libevdev, nix-update-script, pkg-config, wireplumber, @@ -12,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "syshud"; - version = "0-unstable-2024-08-27"; + version = "0-unstable-2024-09-26"; src = fetchFromGitHub { owner = "System64fumo"; repo = "syshud"; - rev = "aa2c153f6aa15962c6b97a77dbe8c45708155fe0"; - hash = "sha256-SBpufr37K6LC4yc9ircUEBrzuRCKmJzD3C17N34qNGk="; + rev = "0b6e4958d8ea66b54bc67f0b5aa005fa3eaa4f6f"; + hash = "sha256-cyE7ZxesAmnepW7kI6b9Gp7R/v+yG2//EQAj4/X6c+c="; }; postPatch = '' @@ -32,8 +34,10 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ + glibmm gtk4-layer-shell gtkmm4 + libevdev wireplumber ]; From 05c82673cae335c0c881f13a99e0a3bf8bec9a53 Mon Sep 17 00:00:00 2001 From: Ben Gamari <ben@smart-cactus.org> Date: Thu, 22 Aug 2024 18:31:33 -0400 Subject: [PATCH 056/129] scopehal-apps: init at unstable-2024-08-22 Co-Authored-By: Hans Baier <foss@hans-baier.de> --- pkgs/by-name/sc/scopehal-apps/package.nix | 79 +++++++++++++++++++++++ 1 file changed, 79 insertions(+) create mode 100644 pkgs/by-name/sc/scopehal-apps/package.nix diff --git a/pkgs/by-name/sc/scopehal-apps/package.nix b/pkgs/by-name/sc/scopehal-apps/package.nix new file mode 100644 index 000000000000..9b13dcf52be5 --- /dev/null +++ b/pkgs/by-name/sc/scopehal-apps/package.nix @@ -0,0 +1,79 @@ +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + pkg-config, + gtkmm3, + cairomm, + yaml-cpp, + glfw, + libtirpc, + liblxi, + libsigcxx, + glew, + zstd, + wrapGAppsHook4, + shaderc, + vulkan-headers, + vulkan-loader, + vulkan-tools, + glslang, + spirv-tools, + ffts, +}: + +stdenv.mkDerivation rec { + pname = "scopehal-apps"; + version = "0-unstable-2024-09-16"; + + src = fetchFromGitHub { + owner = "ngscopeclient"; + repo = "scopehal-apps"; + rev = "d2a1a2f17e9398a3f60c99483dd2f6dbc2e62efc"; + hash = "sha256-FQoaTuL6mEqnH8oNXwHpDcOEAPGExqj6lhrUhZ9VAQ4="; + fetchSubmodules = true; + }; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + pkg-config + shaderc + spirv-tools + wrapGAppsHook4 + ]; + + buildInputs = [ + cairomm + ffts + glew + glfw + glslang + gtkmm3 + liblxi + libsigcxx + libtirpc + vulkan-headers + vulkan-loader + vulkan-tools + yaml-cpp + zstd + ]; + + # Targets InitializeSearchPaths + postPatch = '' + substituteInPlace lib/scopehal/scopehal.cpp \ + --replace-fail '"/share/' '"/../share/' + ''; + + meta = { + description = "Advanced test & measurement remote control and analysis suite"; + homepage = "https://www.ngscopeclient.org/"; + license = lib.licenses.bsd3; + mainProgram = "ngscopeclient"; + maintainers = with lib.maintainers; [ bgamari ]; + platforms = lib.platforms.linux; + }; +} From f020b7ac7a11132e027ba400165f1ba55e882a54 Mon Sep 17 00:00:00 2001 From: kolaente <k@knt.li> Date: Sun, 29 Sep 2024 17:12:55 +0200 Subject: [PATCH 057/129] vikunja: 0.24.3 -> 0.24.4 --- pkgs/by-name/vi/vikunja/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/vi/vikunja/package.nix b/pkgs/by-name/vi/vikunja/package.nix index ec8fe41756d4..a62595242c3e 100644 --- a/pkgs/by-name/vi/vikunja/package.nix +++ b/pkgs/by-name/vi/vikunja/package.nix @@ -1,12 +1,12 @@ { lib, fetchFromGitHub, stdenv, nodejs, pnpm, buildGoModule, mage, writeShellScriptBin, nixosTests }: let - version = "0.24.3"; + version = "0.24.4"; src = fetchFromGitHub { owner = "go-vikunja"; repo = "vikunja"; rev = "v${version}"; - hash = "sha256-UT2afhjEangilvflmxxahj7pEiJUWxqUL1Eni1JvuRI="; + hash = "sha256-h3Jz28HYQYZC+oWGXNeKv2iNsrU0gbBRfWgOvuKijtw="; }; frontend = stdenv.mkDerivation (finalAttrs: { @@ -17,7 +17,7 @@ let pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src sourceRoot; - hash = "sha256-QUhq1wc+vHCfY2wC0aikAMHmy8I/TOawMX659eqlm3I="; + hash = "sha256-pp4AZnoI7gON/meZalfXmaliKR/wSjkj9GTX3My678s="; }; nativeBuildInputs = [ From 9de4b9989715dc901cf2fd7c69ae70e2646dc9f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliv=C3=A9r=20Falvai?= <ofalvai@gmail.com> Date: Sun, 29 Sep 2024 21:37:58 +0200 Subject: [PATCH 058/129] exhaustive: 0.10.0 -> 0.12.0 --- pkgs/development/tools/exhaustive/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/exhaustive/default.nix b/pkgs/development/tools/exhaustive/default.nix index 078d886b0973..0356306bc0c2 100644 --- a/pkgs/development/tools/exhaustive/default.nix +++ b/pkgs/development/tools/exhaustive/default.nix @@ -1,23 +1,28 @@ { lib , buildGoModule , fetchFromGitHub +, nix-update-script }: buildGoModule rec { pname = "exhaustive"; - version = "0.10.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "nishanths"; repo = "exhaustive"; rev = "v${version}"; - hash = "sha256-vMoFIyZcAdObeQD5bGcQHlGpJv/a8yl/2HUVc8aDiIA="; + hash = "sha256-OLIdtKzCqnBkzdUSIl+UlENeMl3zrBE47pLWPg+6qXw="; }; - vendorHash = "sha256-i3Cgefe4krvH99N233IeEWkVt9AhdzROkJ5JBeTIaAs="; + vendorHash = "sha256-DyN2z6+lA/163k6TTQZ+ypm9s2EV93zvSo/yKQZXvCg="; ldflags = [ "-s" "-w" ]; + passthru = { + updateScript = nix-update-script { }; + }; + meta = with lib; { description = "Check exhaustiveness of switch statements of enum-like constants in Go code"; mainProgram = "exhaustive"; From cacd1aa4e6fcc2855370d8ea4023d416eca09dcd Mon Sep 17 00:00:00 2001 From: TudbuT <forge-public@mail.tudbut.de> Date: Sun, 29 Sep 2024 21:51:39 +0200 Subject: [PATCH 059/129] spl: 0.3.2 -> 0.4.0 --- pkgs/by-name/sp/spl/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sp/spl/package.nix b/pkgs/by-name/sp/spl/package.nix index 60204b378ae4..c3e517d86291 100644 --- a/pkgs/by-name/sp/spl/package.nix +++ b/pkgs/by-name/sp/spl/package.nix @@ -5,14 +5,14 @@ }: rustPlatform.buildRustPackage rec { pname = "spl"; - version = "0.3.2"; + version = "0.4.0"; src = fetchgit { url = "https://git.tudbut.de/tudbut/spl"; rev = "v${version}"; - hash = "sha256-thTKM07EtgAVvjpIx8pVssTmN0jPK/OrPYhRfwp7T+U="; + hash = "sha256-/WjrQeE3zI71pvCil2yE9ZMaWkmyRG/tNmZ+XFF0nYw="; }; - cargoHash = "sha256-7MYwWA3F7uJewmBRR0iQD4iXJZokHqIt9Q9dMoj6JVs="; + cargoHash = "sha256-8xv7tXVklJDewnHqoRIMefsNWTD28+5WyV5ZI9imOh0="; meta = { description = "Simple, concise, concatenative scripting language"; From 18e87bbcd8cb29dc64563677f014f2ef61e6e911 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" <ryantm-bot@ryantm.com> Date: Mon, 30 Sep 2024 01:11:58 +0000 Subject: [PATCH 060/129] trealla: 2.56.15 -> 2.56.19 --- pkgs/by-name/tr/trealla/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/tr/trealla/package.nix b/pkgs/by-name/tr/trealla/package.nix index 288b89a04ae6..e6d66c9c020c 100644 --- a/pkgs/by-name/tr/trealla/package.nix +++ b/pkgs/by-name/tr/trealla/package.nix @@ -23,13 +23,13 @@ assert lib.elem lineEditingLibrary [ ]; stdenv.mkDerivation (finalAttrs: { pname = "trealla"; - version = "2.56.15"; + version = "2.56.19"; src = fetchFromGitHub { owner = "trealla-prolog"; repo = "trealla"; rev = "v${finalAttrs.version}"; - hash = "sha256-PpFZvUyRBOhQuXvnMnaqYgrxPh4owWpv9Y8SHEIu9ck="; + hash = "sha256-B2IJU/dtPNUfDC3lFvS4J0zHf1hceoX9YEbyxVYgMt0="; }; postPatch = '' From 0d65cdb64bd38d37b45343cc4287684ae3b633ec Mon Sep 17 00:00:00 2001 From: Alexis Hildebrandt <afh@surryhill.net> Date: Mon, 23 Sep 2024 18:35:18 +0200 Subject: [PATCH 061/129] newsboat: migrate to pkgs/by-name --- .../newsboat/default.nix => by-name/ne/newsboat/package.nix} | 4 ++-- pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) rename pkgs/{applications/networking/feedreaders/newsboat/default.nix => by-name/ne/newsboat/package.nix} (91%) diff --git a/pkgs/applications/networking/feedreaders/newsboat/default.nix b/pkgs/by-name/ne/newsboat/package.nix similarity index 91% rename from pkgs/applications/networking/feedreaders/newsboat/default.nix rename to pkgs/by-name/ne/newsboat/package.nix index 144634d60d03..46c7e7c21684 100644 --- a/pkgs/applications/networking/feedreaders/newsboat/default.nix +++ b/pkgs/by-name/ne/newsboat/package.nix @@ -1,5 +1,5 @@ { lib, stdenv, rustPlatform, fetchFromGitHub, stfl, sqlite, curl, gettext, pkg-config, libxml2, json_c, ncurses -, asciidoctor, libiconv, Security, Foundation, makeWrapper, nix-update-script }: +, darwin, asciidoctor, libiconv, makeWrapper, nix-update-script }: rustPlatform.buildRustPackage rec { pname = "newsboat"; @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ makeWrapper ncurses ]; buildInputs = [ stfl sqlite curl libxml2 json_c ncurses ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security Foundation libiconv gettext ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ Security Foundation libiconv gettext ]); postBuild = '' make -j $NIX_BUILD_CORES prefix="$out" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3cba16c1aa9f..418074450c7b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10408,10 +10408,6 @@ with pkgs; nm-tray = libsForQt5.callPackage ../tools/networking/networkmanager/tray.nix { }; - newsboat = callPackage ../applications/networking/feedreaders/newsboat { - inherit (darwin.apple_sdk.frameworks) Security Foundation; - }; - grocy = callPackage ../servers/grocy { }; inherit (callPackages ../servers/nextcloud {}) From f079da8702ea59ba308286fec041f4296c4e394d Mon Sep 17 00:00:00 2001 From: Alexis Hildebrandt <afh@surryhill.net> Date: Mon, 23 Sep 2024 18:36:58 +0200 Subject: [PATCH 062/129] newsboat: reformat unix nixfmt-rfc-style --- pkgs/by-name/ne/newsboat/package.nix | 81 +++++++++++++++++++++++----- 1 file changed, 67 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/ne/newsboat/package.nix b/pkgs/by-name/ne/newsboat/package.nix index 46c7e7c21684..fcdcc8d4cc36 100644 --- a/pkgs/by-name/ne/newsboat/package.nix +++ b/pkgs/by-name/ne/newsboat/package.nix @@ -1,5 +1,22 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, stfl, sqlite, curl, gettext, pkg-config, libxml2, json_c, ncurses -, darwin, asciidoctor, libiconv, makeWrapper, nix-update-script }: +{ + lib, + stdenv, + rustPlatform, + fetchFromGitHub, + stfl, + sqlite, + curl, + gettext, + pkg-config, + libxml2, + json_c, + ncurses, + darwin, + asciidoctor, + libiconv, + makeWrapper, + nix-update-script, +}: rustPlatform.buildRustPackage rec { pname = "newsboat"; @@ -21,14 +38,35 @@ rustPlatform.buildRustPackage rec { --replace "ncurses5.4" "ncurses" ''; - nativeBuildInputs = [ - pkg-config - asciidoctor - gettext - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ makeWrapper ncurses ]; + nativeBuildInputs = + [ + pkg-config + asciidoctor + gettext + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + makeWrapper + ncurses + ]; - buildInputs = [ stfl sqlite curl libxml2 json_c ncurses ] - ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ Security Foundation libiconv gettext ]); + buildInputs = + [ + stfl + sqlite + curl + libxml2 + json_c + ncurses + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin ( + with darwin.apple_sdk.frameworks; + [ + Security + Foundation + libiconv + gettext + ] + ); postBuild = '' make -j $NIX_BUILD_CORES prefix="$out" @@ -47,6 +85,7 @@ rustPlatform.buildRustPackage rec { make -j $NIX_BUILD_CORES test ''; +<<<<<<< HEAD postInstall = '' make -j $NIX_BUILD_CORES prefix="$out" install '' + lib.optionalString stdenv.hostPlatform.isDarwin '' @@ -54,18 +93,32 @@ rustPlatform.buildRustPackage rec { wrapProgram "$prog" --prefix DYLD_LIBRARY_PATH : "${stfl}/lib" done ''; +======= + postInstall = + '' + make -j $NIX_BUILD_CORES prefix="$out" install + '' + + lib.optionalString stdenv.isDarwin '' + for prog in $out/bin/*; do + wrapProgram "$prog" --prefix DYLD_LIBRARY_PATH : "${stfl}/lib" + done + ''; +>>>>>>> f6bae49a470c (newsboat: reformat unix nixfmt-rfc-style) passthru = { updateScript = nix-update-script { }; }; meta = { - homepage = "https://newsboat.org/"; - changelog = "https://github.com/newsboat/newsboat/blob/${src.rev}/CHANGELOG.md"; + homepage = "https://newsboat.org/"; + changelog = "https://github.com/newsboat/newsboat/blob/${src.rev}/CHANGELOG.md"; description = "Fork of Newsbeuter, an RSS/Atom feed reader for the text console"; - maintainers = with lib.maintainers; [ dotlambda nicknovitski ]; - license = lib.licenses.mit; - platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ + dotlambda + nicknovitski + ]; + license = lib.licenses.mit; + platforms = lib.platforms.unix; mainProgram = "newsboat"; }; } From f2da14933fe5c29a332d4dfd0e345981169e7b2c Mon Sep 17 00:00:00 2001 From: Alexis Hildebrandt <afh@surryhill.net> Date: Mon, 23 Sep 2024 18:44:38 +0200 Subject: [PATCH 063/129] newsboat: 2.36 -> 2.37 --- pkgs/by-name/ne/newsboat/package.nix | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/ne/newsboat/package.nix b/pkgs/by-name/ne/newsboat/package.nix index fcdcc8d4cc36..5c6bfcfd8852 100644 --- a/pkgs/by-name/ne/newsboat/package.nix +++ b/pkgs/by-name/ne/newsboat/package.nix @@ -20,16 +20,16 @@ rustPlatform.buildRustPackage rec { pname = "newsboat"; - version = "2.36"; + version = "2.37"; src = fetchFromGitHub { owner = "newsboat"; repo = "newsboat"; rev = "r${version}"; - hash = "sha256-RnDnyRAZ71aE5st5wUcUKjFFGY288oFpiyDXAno15MQ="; + hash = "sha256-RNvzGGvicujqkRWVHBwnlROuhpH5XqPNWmx6q7n4g+U="; }; - cargoHash = "sha256-0z3G8j0Qk0HEDUKA7fmjFfNW956rRtzKO+0ltNQR4es="; + cargoHash = "sha256-EBA+ucegXr3YtU2K7bhwli8O+knnugMMUuSksDuaY9E="; # TODO: Check if that's still needed postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' @@ -85,25 +85,15 @@ rustPlatform.buildRustPackage rec { make -j $NIX_BUILD_CORES test ''; -<<<<<<< HEAD - postInstall = '' - make -j $NIX_BUILD_CORES prefix="$out" install - '' + lib.optionalString stdenv.hostPlatform.isDarwin '' - for prog in $out/bin/*; do - wrapProgram "$prog" --prefix DYLD_LIBRARY_PATH : "${stfl}/lib" - done - ''; -======= postInstall = '' make -j $NIX_BUILD_CORES prefix="$out" install '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' for prog in $out/bin/*; do wrapProgram "$prog" --prefix DYLD_LIBRARY_PATH : "${stfl}/lib" done ''; ->>>>>>> f6bae49a470c (newsboat: reformat unix nixfmt-rfc-style) passthru = { updateScript = nix-update-script { }; From 0a0e5200f454a3ebb0f5151c09d8be00e5dd9eb5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" <ryantm-bot@ryantm.com> Date: Mon, 30 Sep 2024 03:23:56 +0000 Subject: [PATCH 064/129] twilio-cli: 5.22.1 -> 5.22.2 --- pkgs/development/tools/twilio-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/twilio-cli/default.nix b/pkgs/development/tools/twilio-cli/default.nix index defdf1ed92b4..810403d53fab 100644 --- a/pkgs/development/tools/twilio-cli/default.nix +++ b/pkgs/development/tools/twilio-cli/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "twilio-cli"; - version = "5.22.1"; + version = "5.22.2"; src = fetchzip { url = "https://twilio-cli-prod.s3.amazonaws.com/twilio-v${finalAttrs.version}/twilio-v${finalAttrs.version}.tar.gz"; - hash = "sha256-PxAc9sC44HBcm3Zv5dsN35cTZWfSYP0F46PFZ48xhrw="; + hash = "sha256-tC0FF6UfMCxhZRQD1ebOo3fFA1M0d5IbzFzJHUfHwBg="; }; buildInputs = [ nodejs-slim ]; From 9e9213e2ef54c44c72a84d403cbedea8b360ec53 Mon Sep 17 00:00:00 2001 From: Herschenglime <herschenglime@gmail.com> Date: Sun, 29 Sep 2024 01:33:37 -0400 Subject: [PATCH 065/129] maintainers: add herschenglime This commit adds myself as a maintainer to the gnome-pomodoro package in addition to adding myself to the overall list. --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 5431ce9a489d..2349433d82b9 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8454,6 +8454,11 @@ githubId = 15121114; name = "Tom Herbers"; }; + herschenglime = { + github = "Herschenglime"; + githubId = 69494718; + name = "Herschenglime"; + }; hexa = { email = "hexa@darmstadt.ccc.de"; matrix = "@hexa:lossy.network"; From 768456183c5d9d1d5c089b4c57c73587132b7897 Mon Sep 17 00:00:00 2001 From: Herschenglime <herschenglime@gmail.com> Date: Mon, 23 Sep 2024 23:36:05 -0400 Subject: [PATCH 066/129] gnome-pomodoro: 0.24.1 -> 0.26.0 Compile schemas manually to follow Nix conventions. The gnome.post_install(glib_compile_schemas: true) param tries to compile schemas in `<prefix>/<datadir>/glib-2.0/schemas`, which is not compatible with the Nix way of handling gsettings schemas. This commit patches that option out and manually adds a compilation step to the preFixup hook, which fixes the issue and results in a fully working local install of the program. --- .../gn/gnome-pomodoro/fix-schema-path.patch | 35 +++--------- pkgs/by-name/gn/gnome-pomodoro/package.nix | 57 +++++++++++-------- 2 files changed, 41 insertions(+), 51 deletions(-) diff --git a/pkgs/by-name/gn/gnome-pomodoro/fix-schema-path.patch b/pkgs/by-name/gn/gnome-pomodoro/fix-schema-path.patch index 0750d01f8675..b7e6dfaa327b 100644 --- a/pkgs/by-name/gn/gnome-pomodoro/fix-schema-path.patch +++ b/pkgs/by-name/gn/gnome-pomodoro/fix-schema-path.patch @@ -1,29 +1,3 @@ -diff --git a/data/meson.build b/data/meson.build -index 5e4ce69..982b3c9 100644 ---- a/data/meson.build -+++ b/data/meson.build -@@ -31,7 +31,7 @@ i18n.merge_file( - - install_data( - 'org.gnome.pomodoro.gschema.xml', -- install_dir: get_option('datadir') / 'glib-2.0' / 'schemas', -+ install_dir: gschema_dir, - ) - - subdir('icons') -diff --git a/meson-post-install.sh b/meson-post-install.sh -index bf4013a..c87fba4 100644 ---- a/meson-post-install.sh -+++ b/meson-post-install.sh -@@ -7,7 +7,7 @@ datadir="${prefix}/$1" - # want/need us to do the below - if [ -z "${DESTDIR}" ]; then - echo "Compiling GSchema..." -- glib-compile-schemas "${datadir}/glib-2.0/schemas" -+ glib-compile-schemas "${datadir}/gsettings-schemas/@pname@-@version@/glib-2.0/schemas" - - echo "Updating icon cache..." - gtk-update-icon-cache -f -t "${datadir}/icons/hicolor" diff --git a/meson.build b/meson.build index 09857a1..a07d27c 100644 --- a/meson.build @@ -38,3 +12,12 @@ index 09857a1..a07d27c 100644 plugin_libdir = get_option('prefix') / get_option('libdir') / meson.project_name() / 'plugins' extension_dir = get_option('prefix') / get_option('datadir') / 'gnome-shell' / 'extensions' / 'pomodoro@arun.codito.in' +@@ -134,7 +135,7 @@ + subdir('tests') + + gnome.post_install( +- glib_compile_schemas: true, ++ glib_compile_schemas: false, + gtk_update_icon_cache: true, + update_desktop_database: true, + ) diff --git a/pkgs/by-name/gn/gnome-pomodoro/package.nix b/pkgs/by-name/gn/gnome-pomodoro/package.nix index f9e6bc7e9765..e163c3a7fa1a 100644 --- a/pkgs/by-name/gn/gnome-pomodoro/package.nix +++ b/pkgs/by-name/gn/gnome-pomodoro/package.nix @@ -1,36 +1,36 @@ -{ lib -, stdenv -, fetchFromGitHub -, substituteAll -, meson -, ninja -, pkg-config -, wrapGAppsHook3 -, desktop-file-utils -, libcanberra -, gst_all_1 -, vala -, gtk3 -, gom -, sqlite -, libxml2 -, glib -, gobject-introspection -, json-glib -, libpeas -, gsettings-desktop-schemas -, gettext +{ + lib, + stdenv, + fetchFromGitHub, + substituteAll, + meson, + ninja, + pkg-config, + wrapGAppsHook3, + desktop-file-utils, + libcanberra, + gst_all_1, + vala, + gtk3, + gom, + sqlite, + libxml2, + glib, + gobject-introspection, + json-glib, + libpeas, + gsettings-desktop-schemas, + gettext, }: - stdenv.mkDerivation rec { pname = "gnome-pomodoro"; - version = "0.24.1"; + version = "0.26.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - hash = "sha256-Ml3znMz1Q9593rMgfAST8k9QglxMG9ocFD7W8kaFWCw="; + hash = "sha256-icyS/K6H90/DWYvqJ7f7XXTTuIwLea3k+vDDEBYil6o="; }; patches = [ @@ -42,6 +42,13 @@ stdenv.mkDerivation rec { }) ]; + # Manually compile schemas for package since meson option + # gnome.post_install(glib_compile_schemas) used by package tries to compile in + # the wrong dir. + preFixup = '' + glib-compile-schemas ${glib.makeSchemaPath "$out" "${pname}-${version}"} + ''; + nativeBuildInputs = [ meson ninja From 5792062b63862271dbe880408ff091e69358086e Mon Sep 17 00:00:00 2001 From: Tristan Ross <tristan.ross@midstall.com> Date: Sun, 29 Sep 2024 21:19:05 -0700 Subject: [PATCH 067/129] llvmPackages_git: 20.0.0-git-2024-09-22 -> 20.0.0-git-2024-09-29 --- pkgs/development/compilers/llvm/common/default.nix | 13 +------------ pkgs/development/compilers/llvm/default.nix | 6 +++--- 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/pkgs/development/compilers/llvm/common/default.nix b/pkgs/development/compilers/llvm/common/default.nix index 38d081b62d5a..d5f7f0a8405a 100644 --- a/pkgs/development/compilers/llvm/common/default.nix +++ b/pkgs/development/compilers/llvm/common/default.nix @@ -478,18 +478,7 @@ let stripLen = 1; hash = "sha256-fqw5gTSEOGs3kAguR4tINFG7Xja1RAje+q67HJt2nGg="; }) - ] - ++ - lib.optional (lib.versions.major metadata.release_version == "20") - # Fix for vt_gen, remove during next git bump - # https://github.com/llvm/llvm-project/pull/109817 - ( - fetchpatch { - url = "https://github.com/llvm/llvm-project/commit/cace9869775a185793122f845d81a5ff46f15728.patch"; - stripLen = 1; - hash = "sha256-lt1iQfNIc3ot1+6J7d7dbqULwT0MyLIwR2EZB7RfPp4="; - } - ); + ]; pollyPatches = [ (metadata.getVersionFile "llvm/gnu-install-dirs-polly.patch") ] ++ lib.optional (lib.versionAtLeast metadata.release_version "15") diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix index 94c7d66556ed..813c4d44fcb8 100644 --- a/pkgs/development/compilers/llvm/default.nix +++ b/pkgs/development/compilers/llvm/default.nix @@ -30,9 +30,9 @@ let "18.1.8".officialRelease.sha256 = "sha256-iiZKMRo/WxJaBXct9GdAcAT3cz9d9pnAcO1mmR6oPNE="; "19.1.0".officialRelease.sha256 = "sha256-/Ano8LwpGmW3C1ovJyvY3WIfliVkQi130f70WazwzGc="; "20.0.0-git".gitRelease = { - rev = "81c3499531c3fe03827bd8bc890e3a16db9e4c3c"; - rev-version = "20.0.0-unstable-2024-09-22"; - sha256 = "sha256-mQZhQ0qfWs4NmL62H3wNwG28iARUasWh9m8zMCNkRis="; + rev = "64f2bff12b8ac40c79004ffacf46a5294600d219"; + rev-version = "20.0.0-unstable-2024-09-29"; + sha256 = "sha256-BUlnks9rFjvKRIy7lWhOJQKKNVTewBiCFDbgyRBvuEw="; }; } // llvmVersions; From fff2a7d3ef04f34f5d024c3165d17cbdccbd615b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" <ryantm-bot@ryantm.com> Date: Mon, 30 Sep 2024 07:33:41 +0000 Subject: [PATCH 068/129] gancio: 1.19.1 -> 1.19.4 --- pkgs/by-name/ga/gancio/package.json | 2 +- pkgs/by-name/ga/gancio/package.nix | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ga/gancio/package.json b/pkgs/by-name/ga/gancio/package.json index ba0d7d42ed28..fcc48351ed9e 100644 --- a/pkgs/by-name/ga/gancio/package.json +++ b/pkgs/by-name/ga/gancio/package.json @@ -1,6 +1,6 @@ { "name": "gancio", - "version": "1.19.1", + "version": "1.19.4", "description": "A shared agenda for local communities", "author": "lesion", "scripts": { diff --git a/pkgs/by-name/ga/gancio/package.nix b/pkgs/by-name/ga/gancio/package.nix index 67f163dc3444..d0b4dfff9f19 100644 --- a/pkgs/by-name/ga/gancio/package.nix +++ b/pkgs/by-name/ga/gancio/package.nix @@ -12,19 +12,19 @@ }: mkYarnPackage rec { inherit (nodePackages) nodejs; - version = "1.19.1"; + version = "1.19.4"; src = fetchFromGitLab { domain = "framagit.org"; owner = "les"; repo = "gancio"; rev = "v${version}"; - hash = "sha256-V63cnyPY9todiA4V/9aENEBOfO0g0bJZBjsOfTY1O0c="; + hash = "sha256-x8s7eBVmHCY3kAjHjACotCncvZq6OBiLPJGF6hvfawE="; }; offlineCache = fetchYarnDeps { yarnLock = src + "/yarn.lock"; - hash = "sha256-ONPvBvT3zf8IVkIEOmiQgcjI7zPCFwDuQfo+fOvDGzM="; + hash = "sha256-LXeAyxZSZOm6GxRuJb5rlHTlQpYa1fdKSENVjwLY4tU="; }; packageJSON = ./package.json; From 76fa4651ee7326a89fd1773d3d053029b5cf3dde Mon Sep 17 00:00:00 2001 From: aleksana <me@aleksana.moe> Date: Mon, 30 Sep 2024 15:58:15 +0800 Subject: [PATCH 069/129] gnome-pomodoro: add herschenglime to maintainers --- pkgs/by-name/gn/gnome-pomodoro/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/gn/gnome-pomodoro/package.nix b/pkgs/by-name/gn/gnome-pomodoro/package.nix index e163c3a7fa1a..6c7ee5e23431 100644 --- a/pkgs/by-name/gn/gnome-pomodoro/package.nix +++ b/pkgs/by-name/gn/gnome-pomodoro/package.nix @@ -83,7 +83,10 @@ stdenv.mkDerivation rec { This GNOME utility helps to manage time according to Pomodoro Technique. It intends to improve productivity and focus by taking short breaks. ''; - maintainers = with maintainers; [ aleksana ]; + maintainers = with maintainers; [ + aleksana + herschenglime + ]; license = licenses.gpl3Plus; platforms = platforms.linux; }; From b1ecd48774d081c17a8d3b3a9898a52c95b4bbfe Mon Sep 17 00:00:00 2001 From: isabel <isabel@isabelroses.com> Date: Mon, 30 Sep 2024 09:27:18 +0100 Subject: [PATCH 070/129] gotestsum: move to by-name --- .../gotestsum/default.nix => by-name/go/gotestsum/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{development/tools/gotestsum/default.nix => by-name/go/gotestsum/package.nix} (100%) diff --git a/pkgs/development/tools/gotestsum/default.nix b/pkgs/by-name/go/gotestsum/package.nix similarity index 100% rename from pkgs/development/tools/gotestsum/default.nix rename to pkgs/by-name/go/gotestsum/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b79143c50a5f..112662a4b5d5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26423,8 +26423,6 @@ with pkgs; gotests = callPackage ../development/tools/gotests { }; - gotestsum = callPackage ../development/tools/gotestsum { }; - gqlgenc = callPackage ../development/tools/gqlgenc { }; impl = callPackage ../development/tools/impl { }; From cad7ec6da2c9b34d45f6900770233230850926c2 Mon Sep 17 00:00:00 2001 From: isabel <isabel@isabelroses.com> Date: Mon, 30 Sep 2024 09:41:18 +0100 Subject: [PATCH 071/129] gotestsum: 1.11.0 -> 1.12.0-unstable-2024-09-17 --- pkgs/by-name/go/gotestsum/package.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/go/gotestsum/package.nix b/pkgs/by-name/go/gotestsum/package.nix index 5bb515592e57..810fe5438fe8 100644 --- a/pkgs/by-name/go/gotestsum/package.nix +++ b/pkgs/by-name/go/gotestsum/package.nix @@ -4,20 +4,22 @@ buildGoModule, }: let - version = "1.11.0"; + version = "1.12.0"; in buildGoModule { pname = "gotestsum"; - inherit version; + + # move back to stable releases when build is successful + version = "${version}-unstable-2024-09-17"; src = fetchFromGitHub { owner = "gotestyourself"; repo = "gotestsum"; - rev = "v${version}"; - hash = "sha256-Sq0ejnX7AJoPf3deBge8PMOq1NlMbw+Ljn145C5MQ+s="; + rev = "2f61a73f997821b2e5a1823496e8362630e213f9"; + hash = "sha256-5zgchATcpoM4g5Mxex9wYanzrR0Pie9GYqx48toORkM="; }; - vendorHash = "sha256-zUqa6xlDV12ZV4N6+EZ7fLPsL8U+GB7boQ0qG9egvm0="; + vendorHash = "sha256-DR4AyEhgD71hFFEAnPfSxaWYFFV7FlPugZBHUjDynEE="; doCheck = false; From 72c61109bb25121c093cb61696d5fa6c543e9658 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich <slyich@gmail.com> Date: Mon, 30 Sep 2024 09:50:28 +0100 Subject: [PATCH 072/129] dtc: 1.7.0 -> 1.7.1 Changes: https://github.com/dgibson/dtc/releases/tag/v1.7.1 --- pkgs/development/compilers/dtc/default.nix | 57 +--------------------- 1 file changed, 2 insertions(+), 55 deletions(-) diff --git a/pkgs/development/compilers/dtc/default.nix b/pkgs/development/compilers/dtc/default.nix index 5fbf929d5e52..ed35bec87c06 100644 --- a/pkgs/development/compilers/dtc/default.nix +++ b/pkgs/development/compilers/dtc/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchzip -, fetchpatch , meson , ninja , flex @@ -16,59 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "dtc"; - version = "1.7.0"; + version = "1.7.1"; src = fetchzip { url = "https://git.kernel.org/pub/scm/utils/dtc/dtc.git/snapshot/dtc-v${finalAttrs.version}.tar.gz"; - sha256 = "sha256-FMh3VvlY3fUK8fbd0M+aCmlUrmG9YegiOOQ7MOByffc="; + hash = "sha256-Zl2bOGDJIe/bhMFNsy969JYCYqtXTOzgb+bbOlKqOco="; }; - # Big pile of backports. - # FIXME: remove all of these after next upstream release. - patches = let - fetchUpstreamPatch = { rev, hash }: fetchpatch { - name = "dtc-${rev}.patch"; - url = "https://git.kernel.org/pub/scm/utils/dtc/dtc.git/patch/?id=${rev}"; - inherit hash; - }; - in [ - # meson: Fix cell overflow tests when running from meson - (fetchUpstreamPatch { - rev = "32174a66efa4ad19fc6a2a6422e4af2ae4f055cb"; - hash = "sha256-C7OzwY0zq+2CV3SB5unI7Ill2M3deF7FXeQE3B/Kx2s="; - }) - - # Use #ifdef NO_VALGRIND - (fetchUpstreamPatch { - rev = "41821821101ad8a9f83746b96b163e5bcbdbe804"; - hash = "sha256-7QEFDtap2DWbUGqtyT/RgJZJFldKB8oSubKiCtLZ0w4="; - }) - - # dtc: Fix linker options so it also works in Darwin - (fetchUpstreamPatch { - rev = "71a8b8ef0adf01af4c78c739e04533a35c1dc89c"; - hash = "sha256-uLXL0Sjcn+bnMuF+A6PjUW1Rq6uNg1dQl58zbeYpP/U="; - }) - - # meson: allow disabling tests - (fetchUpstreamPatch { - rev = "bdc5c8793a13abb8846d115b7923df87605d05bd"; - hash = "sha256-cO4f/jJX/pQL7kk4jpKUhsCVESW2ZuWaTr7z3BuvVkw="; - }) - - # meson: fix installation with meson-python - (fetchUpstreamPatch { - rev = "3fbfdd08afd2a7a25b27433f6f5678c0fe694721"; - hash = "sha256-skK8m1s4xkK6x9AqzxiEK+1uMEmS27dBI1CdEXNFTfU="; - }) - - # pylibfdt: fix get_mem_rsv for newer Python versions - (fetchUpstreamPatch { - rev = "822123856980f84562406cc7bd1d4d6c2b8bc184"; - hash = "sha256-IJpRgP3pP8Eewx2PNKxhXZdsnomz2AR6oOsun50qAms="; - }) - ]; - env.SETUPTOOLS_SCM_PRETEND_VERSION = finalAttrs.version; nativeBuildInputs = [ @@ -88,12 +41,6 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' patchShebangs setup.py - - # meson.build: bump version to 1.7.0 - substituteInPlace libfdt/meson.build \ - --replace "version: '1.6.0'," "version: '${finalAttrs.version}'," - substituteInPlace meson.build \ - --replace "version: '1.6.0'," "version: '${finalAttrs.version}'," ''; # Required for installation of Python library and is innocuous otherwise. From 3a0d86412351ad50a34dcef5cf2be21d8e1060f7 Mon Sep 17 00:00:00 2001 From: Doron Behar <doron.behar@gmail.com> Date: Tue, 17 Sep 2024 22:21:20 +0300 Subject: [PATCH 073/129] doc/by-name: explain motivation for transition when custom args are used --- pkgs/by-name/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/README.md b/pkgs/by-name/README.md index 61496fcfc48d..b337c8c78301 100644 --- a/pkgs/by-name/README.md +++ b/pkgs/by-name/README.md @@ -92,7 +92,7 @@ though this is not required and must not be expected. Note that definitions in `all-packages.nix` with custom arguments should not be removed. That is a backwards-incompatible change because it changes the `.override` interface. -Such packages may still be moved to `pkgs/by-name` however, while keeping the definition in `all-packages.nix`. +Such packages may still be moved to `pkgs/by-name` however, in order to avoid the slightly superficial choice of directory / category in which the `default.nix` file was placed, but please keep the definition in `all-packages.nix` using `callPackage`. See also [changing implicit attribute defaults](#changing-implicit-attribute-defaults). ## Limitations From 52b55691c1c4a3af302b8ee30d6b24aa5c33fd3c Mon Sep 17 00:00:00 2001 From: Doron Behar <doron.behar@gmail.com> Date: Tue, 17 Sep 2024 22:28:33 +0300 Subject: [PATCH 074/129] doc/by-name: explain better `callPackage` and `xWithY=x.override` transition --- pkgs/by-name/README.md | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/README.md b/pkgs/by-name/README.md index b337c8c78301..5eb121b4f3f0 100644 --- a/pkgs/by-name/README.md +++ b/pkgs/by-name/README.md @@ -90,11 +90,29 @@ if package maintainers would like to use this feature, they are welcome to migra To lessen PR traffic, they're encouraged to also perform some more general maintenance on the package in the same PR, though this is not required and must not be expected. -Note that definitions in `all-packages.nix` with custom arguments should not be removed. +Note that `callPackage` definitions in `all-packages.nix` with custom arguments should not be removed. That is a backwards-incompatible change because it changes the `.override` interface. Such packages may still be moved to `pkgs/by-name` however, in order to avoid the slightly superficial choice of directory / category in which the `default.nix` file was placed, but please keep the definition in `all-packages.nix` using `callPackage`. See also [changing implicit attribute defaults](#changing-implicit-attribute-defaults). +Definitions like the following however, _can_ be transitioned: + +```nix +# all-packages.nix +fooWithBaz = foo.override { + bar = baz; +}; +# turned into pkgs/by-name/fo/fooWithBaz/package.nix with: +{ + foo, + baz, +}: + +foo.override { + bar = baz; +} +``` + ## Limitations There's some limitations as to which packages can be defined using this structure: From c50e93897fb04c1980249ddbcbd7f9654663f711 Mon Sep 17 00:00:00 2001 From: Doron Behar <doron.behar@gmail.com> Date: Tue, 17 Sep 2024 16:20:59 +0300 Subject: [PATCH 075/129] lammps-mpi: move to pkgs/by-name --- pkgs/by-name/la/lammps-mpi/package.nix | 13 +++++++++++++ pkgs/top-level/all-packages.nix | 6 ------ 2 files changed, 13 insertions(+), 6 deletions(-) create mode 100644 pkgs/by-name/la/lammps-mpi/package.nix diff --git a/pkgs/by-name/la/lammps-mpi/package.nix b/pkgs/by-name/la/lammps-mpi/package.nix new file mode 100644 index 000000000000..1ac2e6a8bcb2 --- /dev/null +++ b/pkgs/by-name/la/lammps-mpi/package.nix @@ -0,0 +1,13 @@ +{ + lammps, + mpi, + lowPrio, +}: + +lowPrio ( + lammps.override { + extraBuildInputs = [ + mpi + ]; + } +) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ea232b362614..1638670bdea0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -36556,12 +36556,6 @@ with pkgs; dl-poly-classic-mpi = callPackage ../applications/science/molecular-dynamics/dl-poly-classic { }; - lammps-mpi = lowPrio (lammps.override { - extraBuildInputs = [ - mpi - ]; - }); - gromacs = callPackage ../applications/science/molecular-dynamics/gromacs { singlePrec = true; fftw = fftwSinglePrec; From 441009585be84f85ec6c1d06c18384675d7d25a0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" <ryantm-bot@ryantm.com> Date: Mon, 30 Sep 2024 09:13:03 +0000 Subject: [PATCH 076/129] python312Packages.marimo: 0.8.20 -> 0.8.22 --- pkgs/development/python-modules/marimo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/marimo/default.nix b/pkgs/development/python-modules/marimo/default.nix index 3ce73a1b1212..1a7405994e44 100644 --- a/pkgs/development/python-modules/marimo/default.nix +++ b/pkgs/development/python-modules/marimo/default.nix @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "marimo"; - version = "0.8.20"; + version = "0.8.22"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-sLGGNNhrtzxmJXe7E83gKU+e16yAutV6TqXZ9mriRdk="; + hash = "sha256-JSWsL0GIO+6DZAWnGej6LL3aApIjlIEyyEl0WEOh9Io="; }; build-system = [ setuptools ]; From 67c59aecc4bab4e79d90dea06816aeebb07abaeb Mon Sep 17 00:00:00 2001 From: Gaetan Lepage <gaetan@glepage.com> Date: Sun, 8 Sep 2024 12:24:34 +0200 Subject: [PATCH 077/129] python312Packages.hf-transfer: init at 0.1.8 --- .../python-modules/hf-transfer/default.nix | 68 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 70 insertions(+) create mode 100644 pkgs/development/python-modules/hf-transfer/default.nix diff --git a/pkgs/development/python-modules/hf-transfer/default.nix b/pkgs/development/python-modules/hf-transfer/default.nix new file mode 100644 index 000000000000..6a526c59be7d --- /dev/null +++ b/pkgs/development/python-modules/hf-transfer/default.nix @@ -0,0 +1,68 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + cargo, + pkg-config, + rustPlatform, + rustc, + + # buildInputs + openssl, + stdenv, + darwin, + libiconv, +}: + +buildPythonPackage rec { + pname = "hf-transfer"; + version = "0.1.8"; + pyproject = true; + + src = fetchFromGitHub { + owner = "huggingface"; + repo = "hf_transfer"; + rev = "refs/tags/v${version}"; + hash = "sha256-Uh8q14OeN0fYsywYyNrH8C3wq/qRjQKEAIufi/a5RXA="; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + hash = "sha256-I4APdz1r2KJ8pTfKAg8g240wYy8gtMlHwmBye4796Tk="; + }; + + build-system = [ + cargo + pkg-config + rustPlatform.cargoSetupHook + rustPlatform.maturinBuildHook + rustc + ]; + + buildInputs = + [ + openssl + ] + ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + darwin.apple_sdk.frameworks.SystemConfiguration + libiconv + ]; + + pythonImportsCheck = [ "hf_transfer" ]; + + env = { + OPENSSL_NO_VENDOR = true; + }; + + meta = { + description = "High speed download python library"; + homepage = "https://github.com/huggingface/hf_transfer"; + changelog = "https://github.com/huggingface/hf_transfer/releases/tag/v${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ GaetanLepage ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2830dfafe4b7..ea1389f948b7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5642,6 +5642,8 @@ self: super: with self; { hfst = callPackage ../development/python-modules/hfst { }; + hf-transfer = callPackage ../development/python-modules/hf-transfer { }; + hg-commitsigs = callPackage ../development/python-modules/hg-commitsigs { }; hg-evolve = callPackage ../development/python-modules/hg-evolve { }; From 63952d1b438688cce3ca4ae3b16be5a295120927 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" <ryantm-bot@ryantm.com> Date: Mon, 30 Sep 2024 10:07:51 +0000 Subject: [PATCH 078/129] gnote: 46.1 -> 47.0 --- pkgs/applications/office/gnote/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/gnote/default.nix b/pkgs/applications/office/gnote/default.nix index beb68aaa4666..935645a05f2d 100644 --- a/pkgs/applications/office/gnote/default.nix +++ b/pkgs/applications/office/gnote/default.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { pname = "gnote"; - version = "46.1"; + version = "47.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-47v3A6WPgI3Fd9WiVsF3wYkHC5KPS9WSltDA3SXz2pk="; + hash = "sha256-vrNcreIMYOQxVRbyCsfr7p37wrgPAHy+2LxaUlIuRC4="; }; buildInputs = [ From b4857bb6e1c6570dc68f5cd91b6c51d6551426c2 Mon Sep 17 00:00:00 2001 From: Christian Bergschneider <christian.bergschneider@gmx.de> Date: Mon, 30 Sep 2024 10:45:05 +0000 Subject: [PATCH 079/129] hyprnotify: 0.7.0 -> 0.8.0 --- pkgs/by-name/hy/hyprnotify/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/hy/hyprnotify/package.nix b/pkgs/by-name/hy/hyprnotify/package.nix index 3289d6fd0cac..1be9b8b114cf 100644 --- a/pkgs/by-name/hy/hyprnotify/package.nix +++ b/pkgs/by-name/hy/hyprnotify/package.nix @@ -8,20 +8,20 @@ buildGoModule rec { pname = "hyprnotify"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "codelif"; repo = "hyprnotify"; rev = "v${version}"; - hash = "sha256-dL+W+iMwRNw9042bs2XUFPMCCqIvDENXOMzhcLh+RL4="; + hash = "sha256-+vBOHXaCWEoQ/Lk9VwP55XqlhSzSS9hoVg4FQOj8dIU="; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ alsa-lib ]; - vendorHash = "sha256-AZDtaiSNq7em876Q9f+YeDxboqVwA8IE9dDM6zggFXs="; + vendorHash = "sha256-2BuWJ57jELtfj7SGr+dLdC2KFc5sD2bC8MgjUHaIXUs="; meta = { description = "DBus Implementation of Freedesktop Notification spec for 'hyprctl notify'"; From 994582bd5d0049d4d43f7d90798a0f0c48d2ffab Mon Sep 17 00:00:00 2001 From: "Florian S." <florian@florianstroeger.com> Date: Wed, 18 Sep 2024 14:24:42 +0200 Subject: [PATCH 080/129] kubecolor: add shell completion support --- .../networking/cluster/kubecolor/default.nix | 22 ++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/cluster/kubecolor/default.nix b/pkgs/applications/networking/cluster/kubecolor/default.nix index 458837486b74..f51d0a8a6af1 100644 --- a/pkgs/applications/networking/cluster/kubecolor/default.nix +++ b/pkgs/applications/networking/cluster/kubecolor/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub, kubectl, installShellFiles }: buildGoModule rec { pname = "kubecolor"; @@ -19,6 +19,26 @@ buildGoModule rec { "." ]; + nativeBuildInputs = [ installShellFiles ]; + + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + # kubecolor re-uses the completions of kubectl for its own executable + + installShellCompletion --cmd kubecolor \ + --bash <(${lib.getExe kubectl} completion bash) \ + --fish <(${lib.getExe kubectl} completion fish) \ + --zsh <(${lib.getExe kubectl} completion zsh) + + # https://kubecolor.github.io/setup/shells/bash/ + echo 'complete -o default -F __start_kubectl kubecolor' >> $out/share/bash-completion/completions/kubecolor.bash + + # https://kubecolor.github.io/setup/shells/fish/ + echo -e 'function kubecolor --wraps kubectl\n command kubecolor $argv\nend' >> $out/share/fish/vendor_completions.d/kubecolor.fish + + # https://kubecolor.github.io/setup/shells/zsh/ + echo 'compdef kubecolor=kubectl' >> $out/share/zsh/site-functions/_kubecolor + ''; + meta = with lib; { description = "Colorizes kubectl output"; mainProgram = "kubecolor"; From 7e2b975d955bc1d25de7ee6dc17b916fff012735 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel <guilhem.saurel@laas.fr> Date: Mon, 30 Sep 2024 13:14:29 +0200 Subject: [PATCH 081/129] python3Packages.cxxheaderparser: 1.3.4 -> 1.4.0 --- pkgs/development/python-modules/cxxheaderparser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cxxheaderparser/default.nix b/pkgs/development/python-modules/cxxheaderparser/default.nix index ba53da3679a2..e423e8ebd5c1 100644 --- a/pkgs/development/python-modules/cxxheaderparser/default.nix +++ b/pkgs/development/python-modules/cxxheaderparser/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "cxxheaderparser"; - version = "1.3.4"; + version = "1.4.0"; pyproject = true; src = fetchFromGitHub { owner = "robotpy"; repo = "cxxheaderparser"; rev = version; - hash = "sha256-Cyo+18mH1p5Zy4dWP3mjZRIkZZOyb61ABedk/amDi0g="; + hash = "sha256-Gf7O1jFICLUcN0z4WYQmh7co2AxdzJY+tdXzu/AdG/g="; }; postPatch = '' From 4223e7177a6b8b1e48e23b8cc9d10732827dc4da Mon Sep 17 00:00:00 2001 From: Guilhem Saurel <guilhem.saurel@laas.fr> Date: Mon, 30 Sep 2024 13:14:57 +0200 Subject: [PATCH 082/129] python3Packages.cxxheaderparser: set platforms --- pkgs/development/python-modules/cxxheaderparser/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/cxxheaderparser/default.nix b/pkgs/development/python-modules/cxxheaderparser/default.nix index e423e8ebd5c1..2d6a079f1d60 100644 --- a/pkgs/development/python-modules/cxxheaderparser/default.nix +++ b/pkgs/development/python-modules/cxxheaderparser/default.nix @@ -35,5 +35,6 @@ buildPythonPackage rec { homepage = "https://github.com/robotpy/cxxheaderparser"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ nim65s ]; + platforms = lib.platforms.unix; }; } From 5f2d97c7e958faca38aabcafa670d5ac52096f94 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" <ryantm-bot@ryantm.com> Date: Mon, 30 Sep 2024 11:42:37 +0000 Subject: [PATCH 083/129] php81Extensions.blackfire: 1.92.22 -> 1.92.23 --- .../tools/misc/blackfire/php-probe.nix | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/pkgs/development/tools/misc/blackfire/php-probe.nix b/pkgs/development/tools/misc/blackfire/php-probe.nix index c5b5aae3b96e..6ba14d325048 100644 --- a/pkgs/development/tools/misc/blackfire/php-probe.nix +++ b/pkgs/development/tools/misc/blackfire/php-probe.nix @@ -15,47 +15,47 @@ let phpMajor = lib.versions.majorMinor php.version; inherit (stdenv.hostPlatform) system; - version = "1.92.22"; + version = "1.92.23"; hashes = { "x86_64-linux" = { system = "amd64"; hash = { - "8.1" = "sha256-MWAKoshKC+hW8ldRLfYQIcMwpSHvW+hV9dRMvZ4rqcU="; - "8.2" = "sha256-xAdECbxuaV5PxG+X7+o2p5pOEG9lgRLuOTp46k5I4RM="; - "8.3" = "sha256-4vCLpSy4kJ4qwOSonSFvlevCfNMxjIU6AUswm0uG59o="; + "8.1" = "sha256-/aWW1QY2NVsoMLTv1HOxx+ujhkCx4i+FWcwt9zdfPKI="; + "8.2" = "sha256-VYHxvpFxLBCDHwWQH0HO+3CEiN4zcry7jLn/3KzvENU="; + "8.3" = "sha256-vDJCDCF/COlmqdZVinIK9FUXTS5BiDpjUchabjrlpnA="; }; }; "i686-linux" = { system = "i386"; hash = { - "8.1" = "sha256-fvXv3Yn3FXBO4EIgb/5LI3jJxV5HA2Q2JCNy14bA8eU="; - "8.2" = "sha256-0m2ze1e09IUGjTpxbyTOchQBBMa86cpiMrAImiXrAZ0="; - "8.3" = "sha256-nhVP4/Ls71MxPN6Ko1bDG8PSHkHQt+vC08EbP0WAL8g="; + "8.1" = "sha256-CsxaRbLg9j3djLPMbbsrduLXQTp4KJuWPecHWBMWIcA="; + "8.2" = "sha256-oy1FQ+1wSORHOUidQ8fNEXHMX5bLhLYyZ8mQLzKJh+0="; + "8.3" = "sha256-TnEYofVT6vsO3AnpsDvwiqz0LeuFkLGS1befnlSFfT4="; }; }; "aarch64-linux" = { system = "arm64"; hash = { - "8.1" = "sha256-pvzKVvtpBh+nwppqSqxSsR989mWzwyAHtwIdDjWx08o="; - "8.2" = "sha256-O6RhO/PY2C4GubYl/jcTzpWeiUKSGy8Np4/KrlMsE1Y="; - "8.3" = "sha256-3sfjwXq980oRV8u+IAamyYKDp2UMREFaynigz/dpyXE="; + "8.1" = "sha256-znvHYCaI08KWVwht83+fv74IY8hotXnww8eJLj/+5us="; + "8.2" = "sha256-Da9/wqFLnSE8GUzB4NrqbIAJ81deTgCpAGOgecIX40A="; + "8.3" = "sha256-Pii1cVwceg+BIbtQ1PhfuqAc60R3gt2o2iel7Zxs7l0="; }; }; "aarch64-darwin" = { system = "arm64"; hash = { - "8.1" = "sha256-peZmwxzQ2NCKkq5qSraIb4pnnJDwcRkCyGW8qeBSGRk="; - "8.2" = "sha256-MvF7S+VITEnsJSLz3xEy927zIR6TN+p3nRGQFjKqtu8="; - "8.3" = "sha256-sUlD8cPk7emJPtz4en6AcFxs/7NUjxUMkqf/Qs3INIA="; + "8.1" = "sha256-y40O5YGZJxzZtF03h6cdxvXkWO51bJmykUTlnDZlhzI="; + "8.2" = "sha256-CRy/G84NFguOZhCDwYWtj3r0rjJarBXvWxS+QkHKzoA="; + "8.3" = "sha256-vr05O/MtS6UeD078aUZusmORutTysO711f2+H7gcaMU="; }; }; "x86_64-darwin" = { system = "amd64"; hash = { - "8.1" = "sha256-kMftb/fC9uyMZyjP4jmtYLM+xEhFqP7umQ5FLvR9vAo="; - "8.2" = "sha256-W8LXYz8KzWlzdpyqmo7XQmkzuyfXO0BZSkiBIlfi18g="; - "8.3" = "sha256-a/Q7avEJr/we5GF2NxTZywpsal5AkAGxEABMPCgy2LM="; + "8.1" = "sha256-f4YZEfNDC3PM4vUcLJaUj5kRG/dVjIl5+QyBXBIOYps="; + "8.2" = "sha256-QpfucP0u8+OTPqcB9lrYjg7L7qpLFtyA6Jo+00havRA="; + "8.3" = "sha256-PBxklii6kseqOcGum/bqTfsK0nPUCEn6pje8WYXuGOM="; }; }; }; From 86bccaf226920015e249b9076420ef8b3c07d305 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" <ryantm-bot@ryantm.com> Date: Sun, 22 Sep 2024 17:29:06 +0000 Subject: [PATCH 084/129] ox: 0.3.0 -> 0.6.1 --- pkgs/applications/editors/ox/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/ox/default.nix b/pkgs/applications/editors/ox/default.nix index dd213f846073..c752c62f120a 100644 --- a/pkgs/applications/editors/ox/default.nix +++ b/pkgs/applications/editors/ox/default.nix @@ -1,17 +1,19 @@ -{ lib, fetchFromGitHub, rustPlatform }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, darwin }: rustPlatform.buildRustPackage rec { pname = "ox"; - version = "0.3.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "curlpipe"; repo = pname; rev = version; - hash = "sha256-g5M/d6pts4Y17CpWJAsWFL5KCq1YFaACJq6n6BQw7mo="; + hash = "sha256-37o8Ak+8LPeGny7JBLc2STpRjfWBCwOrRyP3HJbD25o="; }; - cargoHash = "sha256-6+W/guijsb9+ip1cvke8JLVa4h1nU2zQJCrLv64vsa0="; + cargoHash = "sha256-c7XhMYfhMCxyidZJemnu5f9KwQmPmbun6mrI3v2EpZ4="; + + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit ]; meta = with lib; { description = "Independent Rust text editor that runs in your terminal"; From 9020d82c70759706968b39571c71103a1347f073 Mon Sep 17 00:00:00 2001 From: Ali Rizvi <perm-iterate-0b@icloud.com> Date: Mon, 30 Sep 2024 08:07:42 -0400 Subject: [PATCH 085/129] nixos/wayland: add gtk portal by default --- nixos/modules/programs/wayland/cardboard.nix | 2 +- nixos/modules/programs/wayland/hyprland.nix | 2 +- nixos/modules/programs/wayland/labwc.nix | 2 +- nixos/modules/programs/wayland/miracle-wm.nix | 3 ++- nixos/modules/programs/wayland/river.nix | 2 +- nixos/modules/programs/wayland/sway.nix | 2 +- nixos/modules/programs/wayland/wayfire.nix | 2 +- nixos/modules/programs/wayland/wayland-session.nix | 5 +++++ 8 files changed, 13 insertions(+), 7 deletions(-) diff --git a/nixos/modules/programs/wayland/cardboard.nix b/nixos/modules/programs/wayland/cardboard.nix index 5a25b5359c24..96089bdf94ed 100644 --- a/nixos/modules/programs/wayland/cardboard.nix +++ b/nixos/modules/programs/wayland/cardboard.nix @@ -19,6 +19,6 @@ in # To make a cardboard session available for certain DMs like SDDM services.displayManager.sessionPackages = [ cfg.package ]; } - (import ./wayland-session.nix { inherit lib; }) + (import ./wayland-session.nix { inherit lib pkgs; }) ]); } diff --git a/nixos/modules/programs/wayland/hyprland.nix b/nixos/modules/programs/wayland/hyprland.nix index f8b70af40600..6e69c1730e57 100644 --- a/nixos/modules/programs/wayland/hyprland.nix +++ b/nixos/modules/programs/wayland/hyprland.nix @@ -70,7 +70,7 @@ in } (import ./wayland-session.nix { - inherit lib; + inherit lib pkgs; enableXWayland = cfg.xwayland.enable; enableWlrPortal = lib.mkDefault false; # Hyprland has its own portal, wlr is not needed }) diff --git a/nixos/modules/programs/wayland/labwc.nix b/nixos/modules/programs/wayland/labwc.nix index 4c74b45bb4a3..c09ab8240d9f 100644 --- a/nixos/modules/programs/wayland/labwc.nix +++ b/nixos/modules/programs/wayland/labwc.nix @@ -20,6 +20,6 @@ in # To make a labwc session available for certain DMs like SDDM services.displayManager.sessionPackages = [ cfg.package ]; } - (import ./wayland-session.nix { inherit lib; }) + (import ./wayland-session.nix { inherit lib pkgs; }) ]); } diff --git a/nixos/modules/programs/wayland/miracle-wm.nix b/nixos/modules/programs/wayland/miracle-wm.nix index e20b62acb462..3cee538c8997 100644 --- a/nixos/modules/programs/wayland/miracle-wm.nix +++ b/nixos/modules/programs/wayland/miracle-wm.nix @@ -30,11 +30,12 @@ in } (import ./wayland-session.nix { - inherit lib; + inherit lib pkgs; # Hardcoded path in Mir, not really possible to disable enableXWayland = true; # No portal support yet: https://github.com/mattkae/miracle-wm/issues/164 enableWlrPortal = false; + enableGtkPortal = false; }) ] ); diff --git a/nixos/modules/programs/wayland/river.nix b/nixos/modules/programs/wayland/river.nix index da793a9ff344..6391f00e2f62 100644 --- a/nixos/modules/programs/wayland/river.nix +++ b/nixos/modules/programs/wayland/river.nix @@ -56,7 +56,7 @@ in } (import ./wayland-session.nix { - inherit lib; + inherit lib pkgs; enableXWayland = cfg.xwayland.enable; }) ]); diff --git a/nixos/modules/programs/wayland/sway.nix b/nixos/modules/programs/wayland/sway.nix index 27c32ce42dc5..7c5f49ce6d79 100644 --- a/nixos/modules/programs/wayland/sway.nix +++ b/nixos/modules/programs/wayland/sway.nix @@ -148,7 +148,7 @@ in } (import ./wayland-session.nix { - inherit lib; + inherit lib pkgs; enableXWayland = cfg.xwayland.enable; }) ]); diff --git a/nixos/modules/programs/wayland/wayfire.nix b/nixos/modules/programs/wayland/wayfire.nix index 726300ce5381..1c3950bff47d 100644 --- a/nixos/modules/programs/wayland/wayfire.nix +++ b/nixos/modules/programs/wayland/wayfire.nix @@ -63,7 +63,7 @@ in }; } (import ./wayland-session.nix { - inherit lib; + inherit lib pkgs; enableXWayland = cfg.xwayland.enable; }) ] diff --git a/nixos/modules/programs/wayland/wayland-session.nix b/nixos/modules/programs/wayland/wayland-session.nix index b3d6cc368b20..1f5dc413d377 100644 --- a/nixos/modules/programs/wayland/wayland-session.nix +++ b/nixos/modules/programs/wayland/wayland-session.nix @@ -1,7 +1,9 @@ { lib, + pkgs, enableXWayland ? true, enableWlrPortal ? true, + enableGtkPortal ? true, }: { @@ -18,6 +20,9 @@ services.graphical-desktop.enable = true; xdg.portal.wlr.enable = enableWlrPortal; + xdg.portal.extraPortals = lib.mkIf enableGtkPortal [ + pkgs.xdg-desktop-portal-gtk + ]; # Window manager only sessions (unlike DEs) don't handle XDG # autostart files, so force them to run the service From a9b6a73c8355b43543fa60c64f3ab5eee119c5b0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" <ryantm-bot@ryantm.com> Date: Mon, 30 Sep 2024 14:37:08 +0000 Subject: [PATCH 086/129] warp-terminal: 0.2024.09.17.08.02.stable_01 -> 0.2024.09.24.08.02.stable_01 --- pkgs/by-name/wa/warp-terminal/versions.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/wa/warp-terminal/versions.json b/pkgs/by-name/wa/warp-terminal/versions.json index e9b8cf958607..73a360b88f05 100644 --- a/pkgs/by-name/wa/warp-terminal/versions.json +++ b/pkgs/by-name/wa/warp-terminal/versions.json @@ -1,14 +1,14 @@ { "darwin": { - "hash": "sha256-qaJP+du/jaI8zZPRZnM7K1DnC2GOzdZzs5JmKWj6OLQ=", - "version": "0.2024.09.17.08.02.stable_01" + "hash": "sha256-zbnOkld+6UnSeMfvc6P6qZ474KaHcx1Qzyr4HCWsv98=", + "version": "0.2024.09.24.08.02.stable_01" }, "linux_x86_64": { - "hash": "sha256-l51KJoEOXGokgnDb9pz5LVhgBN7B1eipsFA9J+QpQzM=", - "version": "0.2024.09.17.08.02.stable_01" + "hash": "sha256-SeTzKFsY+p0oJFTmBEmj64tOPS7BlBLtYdoIJ9jmTD0=", + "version": "0.2024.09.24.08.02.stable_01" }, "linux_aarch64": { - "hash": "sha256-zyiDYhxYG+JmiSdB7JBJ+H7yaIIvXaDlpslfa3TTsfI=", - "version": "0.2024.09.17.08.02.stable_01" + "hash": "sha256-lAiu20udBEJhu29vqiS8vYauuu0fcX1LlvqEqYN5WXU=", + "version": "0.2024.09.24.08.02.stable_01" } } From b34ef42813acda7f2d3230ada2fe132ba3f43cb4 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage <gaetan@glepage.com> Date: Mon, 30 Sep 2024 16:58:18 +0200 Subject: [PATCH 087/129] python312Packages.chex: 0.1.86 -> 0.1.87 Diff: https://github.com/deepmind/chex/compare/refs/tags/v0.1.86...v0.1.87 Changelog: https://github.com/google-deepmind/chex/releases/tag/v0.1.87 --- .../python-modules/chex/default.nix | 27 ++++++++++--------- 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/chex/default.nix b/pkgs/development/python-modules/chex/default.nix index 803c352c7154..3f52a6ac3311 100644 --- a/pkgs/development/python-modules/chex/default.nix +++ b/pkgs/development/python-modules/chex/default.nix @@ -1,40 +1,43 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, + + # build-system setuptools, + + # dependencies absl-py, - cloudpickle, - dm-tree, jax, jaxlib, numpy, - pytestCheckHook, toolz, typing-extensions, + + # tests + cloudpickle, + dm-tree, + pytestCheckHook, }: buildPythonPackage rec { pname = "chex"; - version = "0.1.86"; + version = "0.1.87"; pyproject = true; - disabled = pythonOlder "3.9"; - src = fetchFromGitHub { owner = "deepmind"; repo = "chex"; rev = "refs/tags/v${version}"; - hash = "sha256-Z5Ns4fG5pC99I4xdGjDMKX6YZpTtd1y0TWcIOtr7dug="; + hash = "sha256-TPh7XLWHk0y/VLXxHLANUiDmfveHPeMLks9QKf16doo="; }; build-system = [ setuptools ]; dependencies = [ absl-py - jaxlib jax + jaxlib numpy toolz typing-extensions @@ -48,11 +51,11 @@ buildPythonPackage rec { pytestCheckHook ]; - meta = with lib; { + meta = { description = "Chex is a library of utilities for helping to write reliable JAX code"; homepage = "https://github.com/deepmind/chex"; changelog = "https://github.com/google-deepmind/chex/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ ndl ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ ndl ]; }; } From aed1142d79b080aa7ace6c458ae88a986275561e Mon Sep 17 00:00:00 2001 From: Artturin <Artturin@artturin.com> Date: Mon, 30 Sep 2024 18:01:28 +0300 Subject: [PATCH 088/129] lib.systems.examples: Fix deprecated attr `For android 'sdkVer' has been renamed to 'androidSdkVersion'` While doing the above rename I forgot to consider if there were still darwin platforms in `lib.systems.examples` using `sdkVer` These still fail eval, but that happened before the renaming too. `error: Unsupported sdk: 14.3` --- lib/systems/examples.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix index 971f6b87364b..5059f6e0c838 100644 --- a/lib/systems/examples.nix +++ b/lib/systems/examples.nix @@ -256,7 +256,7 @@ rec { iphone64 = { config = "aarch64-apple-ios"; # config = "aarch64-apple-darwin14"; - sdkVer = "14.3"; + darwinSdkVersion = "14.3"; xcodeVer = "12.3"; xcodePlatform = "iPhoneOS"; useiOSPrebuilt = true; @@ -265,7 +265,7 @@ rec { iphone32 = { config = "armv7a-apple-ios"; # config = "arm-apple-darwin10"; - sdkVer = "14.3"; + darwinSdkVersion = "14.3"; xcodeVer = "12.3"; xcodePlatform = "iPhoneOS"; useiOSPrebuilt = true; @@ -274,7 +274,7 @@ rec { iphone64-simulator = { config = "x86_64-apple-ios"; # config = "x86_64-apple-darwin14"; - sdkVer = "14.3"; + darwinSdkVersion = "14.3"; xcodeVer = "12.3"; xcodePlatform = "iPhoneSimulator"; darwinPlatform = "ios-simulator"; @@ -284,7 +284,7 @@ rec { iphone32-simulator = { config = "i686-apple-ios"; # config = "i386-apple-darwin11"; - sdkVer = "14.3"; + darwinSdkVersion = "14.3"; xcodeVer = "12.3"; xcodePlatform = "iPhoneSimulator"; darwinPlatform = "ios-simulator"; From 83b1350904d3f4756d56efb95eab25b3adfb7946 Mon Sep 17 00:00:00 2001 From: pinage404 <pinage404@gmail.com> Date: Mon, 30 Sep 2024 13:55:09 +0200 Subject: [PATCH 089/129] nixos/open-webui: fix opensearch When [adding Open WebUI as search engine in Firefox](https://docs.openwebui.com/tutorials/integrations/browser-search-engine/#for-firefox) it always links to `http://localhost:3000` instead of the configured port It is because [the response use `WEBUI_URL` environment variable](https://github.com/open-webui/open-webui/blob/1d225dd804575af9ae5981528dfdce695f7f7040/backend/open_webui/main.py#L2370) which [is set by default to `http://localhost:3000`](https://github.com/open-webui/open-webui/blob/1d225dd804575af9ae5981528dfdce695f7f7040/backend/open_webui/env.py#L106) --- nixos/modules/services/misc/open-webui.nix | 1 + nixos/tests/open-webui.nix | 14 ++++++++++++++ 2 files changed, 15 insertions(+) diff --git a/nixos/modules/services/misc/open-webui.nix b/nixos/modules/services/misc/open-webui.nix index abe27ccdbcf7..fd6fa64b9e19 100644 --- a/nixos/modules/services/misc/open-webui.nix +++ b/nixos/modules/services/misc/open-webui.nix @@ -93,6 +93,7 @@ in DATA_DIR = "."; HF_HOME = "."; SENTENCE_TRANSFORMERS_HOME = "."; + WEBUI_URL = "http://localhost:${toString cfg.port}"; } // cfg.environment; serviceConfig = { diff --git a/nixos/tests/open-webui.nix b/nixos/tests/open-webui.nix index faf4dae671d0..27f913dbffd5 100644 --- a/nixos/tests/open-webui.nix +++ b/nixos/tests/open-webui.nix @@ -31,6 +31,7 @@ in testScript = '' import json + import xml.etree.ElementTree as xml machine.start() @@ -45,5 +46,18 @@ in # Check that the name was overridden via the environmentFile option. assert webui_config["name"] == "${webuiName} (Open WebUI)" + + webui_opensearch_xml = machine.succeed("curl http://127.0.0.1:${mainPort}/opensearch.xml") + webui_opensearch = xml.fromstring(webui_opensearch_xml) + + webui_opensearch_url = webui_opensearch.find( + ".//{http://a9.com/-/spec/opensearch/1.1/}Url" + ) + assert ( + webui_opensearch_url is not None + ), f"no url tag found in {webui_opensearch_xml}" + assert ( + webui_opensearch_url.get("template") == "http://localhost:8080/?q={searchTerms}" + ), "opensearch url doesn't match the configured port" ''; } From f51c991c4e4fff5b4e235fe275daee02dc809b11 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage <gaetan@glepage.com> Date: Mon, 30 Sep 2024 17:28:42 +0200 Subject: [PATCH 090/129] python312Packages.mktestdocs: 0.2.1 -> 0.2.3 Diff: https://github.com/koaning/mktestdocs/compare/refs/tags/0.2.1...0.2.3 Changelog: https://github.com/koaning/mktestdocs/releases/tag/0.2.3 --- pkgs/development/python-modules/mktestdocs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mktestdocs/default.nix b/pkgs/development/python-modules/mktestdocs/default.nix index 94ecadee5fcb..f1a1b654bf12 100644 --- a/pkgs/development/python-modules/mktestdocs/default.nix +++ b/pkgs/development/python-modules/mktestdocs/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "mktestdocs"; - version = "0.2.1"; + version = "0.2.3"; pyproject = true; src = fetchFromGitHub { owner = "koaning"; repo = "mktestdocs"; rev = "refs/tags/${version}"; - hash = "sha256-snlt6SDiDYr04b2b2NgBC/1IBffpei034vFx3fnYUOc="; + hash = "sha256-egLlgq0lQOk0cPBly01zQ0rkl7D7Rf/bZ4en5oG+wlE="; }; build-system = [ setuptools ]; From 0bd382c5c8a9f0bbe65b98733307d364626eb5ff Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Mon, 30 Sep 2024 17:33:11 +0200 Subject: [PATCH 091/129] dnglab: fix hash mismatch --- pkgs/tools/graphics/dnglab/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/dnglab/default.nix b/pkgs/tools/graphics/dnglab/default.nix index ebcced6e2e23..3d9ffbeba2ef 100644 --- a/pkgs/tools/graphics/dnglab/default.nix +++ b/pkgs/tools/graphics/dnglab/default.nix @@ -8,9 +8,13 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "dnglab"; - repo = pname; + repo = "dnglab"; rev = "v${version}"; - sha256 = "sha256-EJ0uWc3pp7ixRxDIdTIVVaT2ph3P2IvuK+ecBSB5HYw="; + # darwin/linux hash mismatch + postFetch = '' + rm -rf "$out"/rawler/data/testdata/cameras/Canon/{"EOS REBEL T7i","EOS Rebel T7i"} + ''; + hash = "sha256-k0tKNtVDzE5vVi/953aEQihh+5BsVneqauTr9WRFFrY="; }; cargoHash = "sha256-6qJFNfgWh3i1CpuM/QdLksVAFz4XIV8uT5oz5BZ3U30="; From c3d1c9cdf550c1fe3442d007810fd502ea5d3801 Mon Sep 17 00:00:00 2001 From: midchildan <git@midchildan.org> Date: Wed, 8 Nov 2023 03:42:25 +0900 Subject: [PATCH 092/129] skkDictionaries: replace skk-dicts --- .../manual/release-notes/rl-2411.section.md | 6 + pkgs/development/libraries/libskk/default.nix | 6 +- pkgs/tools/inputmethods/fcitx5/fcitx5-skk.nix | 4 +- .../ibus-engines/ibus-kkc/default.nix | 6 +- .../inputmethods/skk/skk-dicts/default.nix | 269 +++++++++++++----- pkgs/tools/text/cmigemo/default.nix | 4 +- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 +- 8 files changed, 215 insertions(+), 83 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index bce2805f74d4..54b669dfaedf 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -297,6 +297,12 @@ - `tests.overriding` has its `passthru.tests` restructured as an attribute set instead of a list, making individual tests accessible by their names. +- Package `skk-dict` was split into multiple packages under `skkDictionaries`. + If in doubt, try `skkDictionaries.l`. As part of this change, the dictionaries + were moved from `$out/share` to `$out/share/skk`. Also, the dictionaries won't + be converted to UTF-8 unless the `useUtf8` package option is enabled. UTF-8 + converted dictionaries will have the .utf8 suffix appended to its filename. + - `vaultwarden` lost the capability to bind to privileged ports. If you rely on this behavior, override the systemd unit to allow `CAP_NET_BIND_SERVICE` in your local configuration. diff --git a/pkgs/development/libraries/libskk/default.nix b/pkgs/development/libraries/libskk/default.nix index 8256f0525bbc..88b1991c5473 100644 --- a/pkgs/development/libraries/libskk/default.nix +++ b/pkgs/development/libraries/libskk/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, libtool, gettext, pkg-config, vala, gnome-common, gobject-introspection, - libgee, json-glib, skk-dicts, libxkbcommon }: + libgee, json-glib, skkDictionaries, libxkbcommon }: stdenv.mkDerivation rec { pname = "libskk"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "0y279pcgs3jrsi9vzx086xhz9jbz23dqqijp4agygc9ackp9sxy5"; }; - buildInputs = [ skk-dicts libxkbcommon ]; + buildInputs = [ libxkbcommon ]; nativeBuildInputs = [ vala gnome-common gobject-introspection libtool gettext pkg-config ]; propagatedBuildInputs = [ libgee json-glib ]; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { preInstall = '' dictDir=$out/share/skk mkdir -p $dictDir - ln -s ${skk-dicts}/share/SKK-JISYO.L $dictDir/ + ln -s ${skkDictionaries.l}/share/skk/SKK-JISYO.L $dictDir/ ''; enableParallelBuilding = true; diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-skk.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-skk.nix index 6254073c8f35..ae43cd73e510 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-skk.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-skk.nix @@ -9,7 +9,7 @@ , fcitx5-qt , libskk , qtbase -, skk-dicts +, skkDictionaries , enableQt ? false }: @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ (lib.cmakeBool "ENABLE_QT" enableQt) (lib.cmakeBool "USE_QT6" (lib.versions.major qtbase.version == "6")) - "-DSKK_DEFAULT_PATH=${skk-dicts}/share/SKK-JISYO.L" + "-DSKK_DEFAULT_PATH=${skkDictionaries.l}/share/skk/SKK-JISYO.L" ]; dontWrapQtApps = true; diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-kkc/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-kkc/default.nix index fc5bd3d33be3..db57869f8538 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-kkc/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-kkc/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl , vala, intltool, pkg-config -, libkkc, ibus, skk-dicts +, libkkc, ibus, skkDictionaries , gtk3 }: @@ -17,10 +17,10 @@ stdenv.mkDerivation rec { vala intltool pkg-config ]; - buildInputs = [ libkkc ibus skk-dicts gtk3 ]; + buildInputs = [ libkkc ibus gtk3 ]; postInstall = '' - ln -s ${skk-dicts}/share $out/share/skk + ln -s ${skkDictionaries.l}/share/skk $out/share/skk ''; meta = with lib; { diff --git a/pkgs/tools/inputmethods/skk/skk-dicts/default.nix b/pkgs/tools/inputmethods/skk/skk-dicts/default.nix index 7b224cb7d285..d1b6fe0bdce2 100644 --- a/pkgs/tools/inputmethods/skk/skk-dicts/default.nix +++ b/pkgs/tools/inputmethods/skk/skk-dicts/default.nix @@ -1,77 +1,202 @@ -{ lib, stdenv, fetchurl, iconv, skktools }: +{ lib +, stdenvNoCC +, fetchFromGitHub +, nix-update-script +, nkf +, skktools +, useUtf8 ? false +}: let - # kana to kanji - small = fetchurl { - url = "https://raw.githubusercontent.com/skk-dev/dict/8b35d07a7d2044d48b063d2774d9f9d00bb7cb48/SKK-JISYO.S"; - sha256 = "11cjrc8m99hj4xpl2nvzxanlswpapi92vmgk9d6yimdz0jidb6cq"; - }; - medium = fetchurl { - url = "https://raw.githubusercontent.com/skk-dev/dict/8b35d07a7d2044d48b063d2774d9f9d00bb7cb48/SKK-JISYO.M"; - sha256 = "0pwjp9qjmn9sq6zc0k6632l7dc2dbjn45585ibckvvl9iwfqqxdp"; - }; - large = fetchurl { - url = "https://raw.githubusercontent.com/skk-dev/dict/8b35d07a7d2044d48b063d2774d9f9d00bb7cb48/SKK-JISYO.L"; - sha256 = "0ps0a7sbkryd6hxvphq14i7g5wci4gvr0vraac8ia2ww67a2xbyc"; - }; + suffix = lib.optionalString useUtf8 ".utf8"; - # english to japanese - edict = fetchurl { - url = "https://raw.githubusercontent.com/skk-dev/dict/8b35d07a7d2044d48b063d2774d9f9d00bb7cb48/SKK-JISYO.edict"; - sha256 = "1vrwnq0vvjn61nijbln6wfinqg93802d2a8d4ad82n692v83b1li"; - }; - # misc - assoc = fetchurl { - url = "https://raw.githubusercontent.com/skk-dev/dict/8b35d07a7d2044d48b063d2774d9f9d00bb7cb48/SKK-JISYO.assoc"; - sha256 = "1smcbyv6srrhnpl7ic9nqds9nz3g2dgqngmhzkrdlwmvcpvakp1v"; - }; + mkDictNameValue = + { name + , description + , license # it's written in the beginning of each file + , files ? [ "SKK-JISYO.${name}" ] + }: { + name = lib.toLower (builtins.replaceStrings [ "." ] [ "_" ] name); + value = stdenvNoCC.mkDerivation { + pname = "skk-jisyo-" + lib.toLower name; + version = "0-unstable-2024-08-28"; + + src = fetchFromGitHub { + owner = "skk-dev"; + repo = "dict"; + rev = "4eb91a3bbfef70bde940668ec60f3beae291e971"; + sha256 = "sha256-sWz85Q6Bu2WoKsckSp5SlcuPUQN2mcq+BHMqNXQ/aho="; + }; + + nativeBuildInputs = lib.optionals useUtf8 [ nkf ]; + + strictDeps = true; + + buildPhase = '' + runHook preBuild + '' + lib.concatMapStrings + (file: '' + nkf -w ${file} \ + | LC_ALL=C sed 's/coding: [^ ]\{1,\}/coding: utf-8/' \ + > ${file + suffix} + '') + (lib.optionals useUtf8 (map lib.escapeShellArg files)) + '' + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + '' + lib.concatMapStrings + (file: '' + install -Dm644 \ + ${lib.escapeShellArg file} \ + $out/share/skk/${lib.escapeShellArg (baseNameOf file)} + '') + (map (file: file + suffix) files) + '' + runHook postInstall + ''; + + doInstallCheck = true; + installCheckPhase = '' + emptydict=': 0 candidates$' + ${skktools}/bin/skkdic-count /dev/null | grep "$emptydict" + ${skktools}/bin/skkdic-count $out/share/skk/* | grep -v "$emptydict" + ''; + + passthru.updateScript = nix-update-script { + extraArgs = ["--version" "branch"]; + }; + + meta = with lib; { + inherit description license; + longDescription = '' + This package provides a kana-to-kanji conversion dictionary for the + SKK Japanese input method. + ''; + homepage = "https://github.com/skk-dev/dict"; + maintainers = with maintainers; [ yuriaisaka ]; + platforms = platforms.all; + }; + }; + }; in - -stdenv.mkDerivation { - pname = "skk-dicts-unstable"; - version = "2020-03-24"; - srcs = [ small medium large edict assoc ]; - nativeBuildInputs = [ iconv skktools ]; - - strictDeps = true; - - dontUnpack = true; - - installPhase = '' - function dictname() { - src=$1 - name=$(basename $src) # remove dir name - dict=$(echo $name | cut -b34-) # remove sha256 prefix - echo $dict - } - mkdir -p $out/share - - for src in $srcs; do - dst=$out/share/$(dictname $src) - echo ";;; -*- coding: utf-8 -*-" > $dst # libskk requires this on the first line - iconv -f EUC-JP -t UTF-8 $src | skkdic-expr2 >> $dst - done - - # combine .L .edict and .assoc for convenience - dst=$out/share/SKK-JISYO.combined - echo ";;; -*- coding: utf-8 -*-" > $dst - skkdic-expr2 \ - $out/share/$(dictname ${large}) + \ - $out/share/$(dictname ${edict}) + \ - $out/share/$(dictname ${assoc}) >> $dst - ''; - - enableParallelBuilding = true; - - meta = with lib; { - description = "Collection of standard SKK dictionaries"; - longDescription = '' - This package provides a collection of standard kana-to-kanji - dictionaries for the SKK Japanese input method. +lib.listToAttrs (map mkDictNameValue [ + { + name = "L"; + description = "The standard SKK dictionary"; + license = lib.licenses.gpl2Plus; + } + { + name = "S"; + description = "Small SKK dictionary"; + license = lib.licenses.gpl2Plus; + } + { + name = "M"; + description = "Medium sized SKK dictionary"; + license = lib.licenses.gpl2Plus; + } + { + name = "ML"; + description = "Medium to large sized SKK dictionary"; + license = lib.licenses.gpl2Plus; + } + { + name = "jinmei"; + description = "SKK dictionary for names"; + license = lib.licenses.gpl2Plus; + } + { + name = "fullname"; + description = "SKK dictionary for celebrities"; + license = lib.licenses.gpl2Plus; + } + { + name = "geo"; + description = "SKK dictionary for locations"; + license = lib.licenses.gpl2Plus; + } + { + name = "propernoun"; + description = "SKK dictionary for proper nouns"; + license = lib.licenses.gpl2Plus; + } + { + name = "station"; + description = "SKK dictionary for stations"; + license = lib.licenses.gpl2Plus; + } + { + name = "law"; + description = "SKK dictionary for legal terms"; + license = lib.licenses.gpl2Plus; + } + { + name = "okinawa"; + description = "SKK dictionary for the Okinawan language"; + license = lib.licenses.publicDomain; + } + { + name = "china_taiwan"; + description = "SKK dictionary for Chinese & Taiwanese locations"; + license = lib.licenses.gpl2Plus; + } + { + name = "assoc"; + description = "SKK dictionary for abbreviated input"; + license = lib.licenses.gpl2Plus; + } + { + name = "edict"; + description = "SKK dictionary for English to Japanese translation"; + license = lib.licenses.cc-by-sa-30; + } + { + name = "zipcode"; + description = "SKK dictionary for Japanese zipcodes"; + files = [ "zipcode/SKK-JISYO.zipcode" "zipcode/SKK-JISYO.office.zipcode" ]; + license = lib.licenses.publicDomain; + } + { + name = "JIS2"; + description = "SKK dictionary for JIS level 2 kanjis"; + license = lib.licenses.gpl2Plus; + } + { + name = "JIS3_4"; + description = "SKK dictionary for JIS level 3 and 4 kanjis"; + license = lib.licenses.gpl2Plus; + } + { + name = "JIS2004"; + description = '' + A complementary SKK dictionary for JIS3_4 with JIS X 0213:2004 additions" ''; - homepage = "https://github.com/skk-dev/dict"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ yuriaisaka ]; - platforms = platforms.all; - }; -} + license = lib.licenses.gpl2Plus; + } + { + name = "itaiji"; + description = "SKK dictionary for variant kanjis"; + license = lib.licenses.publicDomain; + } + { + name = "itaiji.JIS3_4"; + description = "SKK dictionary for JIS level 3 and 4 variant kanjis"; + license = lib.licenses.gpl2Plus; + } + { + name = "mazegaki"; + description = "SKK dictionary for mazegaki"; + license = lib.licenses.gpl2Plus; + } + { + name = "emoji"; + description = "SKK dictionary for emojis"; + license = lib.licenses.unicode-dfs-2016; + } + { + name = "pinyin"; + description = "SKK dictionary for pinyin to simplified Chinese input"; + license = lib.licenses.gpl1Plus; + } +]) diff --git a/pkgs/tools/text/cmigemo/default.nix b/pkgs/tools/text/cmigemo/default.nix index b7b08a762736..74f5a5100d27 100644 --- a/pkgs/tools/text/cmigemo/default.nix +++ b/pkgs/tools/text/cmigemo/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub , iconv, nkf, perl, which -, skk-dicts +, skkDictionaries }: stdenv.mkDerivation { @@ -17,7 +17,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ iconv nkf perl which ]; postUnpack = '' - cp ${skk-dicts}/share/SKK-JISYO.L source/dict/ + cp ${skkDictionaries.l}/share/skk/SKK-JISYO.L source/dict/ ''; patches = [ ./no-http-tool-check.patch ]; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index e5d2e936717d..a851a06b97b5 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1449,6 +1449,7 @@ mapAliases { shipyard = jumppad; # Added 2023-06-06 signumone-ks = throw "signumone-ks has been removed from nixpkgs because the developers stopped offering the binaries"; # Added 2023-08-17 simplenote = throw "'simplenote' has been removed because it is no longer maintained and insecure"; # Added 2023-10-09 + skk-dicts = throw "'skk-dicts' has been split into multiple packages under 'skkDictionaries'"; # Added 2023-11-08 sky = throw "'sky' has been removed because its upstream website disappeared"; # Added 2024-07-21 SkypeExport = skypeexport; # Added 2024-06-12 slack-dark = slack; # Added 2020-03-27 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d51f46347610..76d6fb2ac284 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6502,7 +6502,7 @@ with pkgs; netplan = callPackage ../tools/admin/netplan { }; skktools = callPackage ../tools/inputmethods/skk/skktools { }; - skk-dicts = callPackage ../tools/inputmethods/skk/skk-dicts { }; + skkDictionaries = callPackages ../tools/inputmethods/skk/skk-dicts { }; libkkc-data = callPackage ../data/misc/libkkc-data { }; From 7720f1a3f39e297a72c1bbf5b3574a088b0f6e58 Mon Sep 17 00:00:00 2001 From: midchildan <git@midchildan.org> Date: Wed, 8 Nov 2023 03:44:48 +0900 Subject: [PATCH 093/129] skkDictionaries: add midchildan as maintainer --- pkgs/tools/inputmethods/skk/skk-dicts/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/inputmethods/skk/skk-dicts/default.nix b/pkgs/tools/inputmethods/skk/skk-dicts/default.nix index d1b6fe0bdce2..9b2dd3c182dd 100644 --- a/pkgs/tools/inputmethods/skk/skk-dicts/default.nix +++ b/pkgs/tools/inputmethods/skk/skk-dicts/default.nix @@ -74,7 +74,7 @@ let SKK Japanese input method. ''; homepage = "https://github.com/skk-dev/dict"; - maintainers = with maintainers; [ yuriaisaka ]; + maintainers = with maintainers; [ yuriaisaka midchildan ]; platforms = platforms.all; }; }; From 2f15b523d9b9a9d7e9e303830ce9aca572f43234 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=97=8D+85CD?= <50108258+kwaa@users.noreply.github.com> Date: Tue, 1 Oct 2024 00:33:38 +0800 Subject: [PATCH 094/129] nixos/hatsu: init module --- .../manual/release-notes/rl-2411.section.md | 2 + nixos/modules/module-list.nix | 1 + nixos/modules/services/web-apps/hatsu.md | 23 +++++ nixos/modules/services/web-apps/hatsu.nix | 97 +++++++++++++++++++ 4 files changed, 123 insertions(+) create mode 100644 nixos/modules/services/web-apps/hatsu.md create mode 100644 nixos/modules/services/web-apps/hatsu.nix diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index f9a5846c1f38..3ae95691c2db 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -84,6 +84,8 @@ alos create normal users and change passwords. Available as [services.userborn](#opt-services.userborn.enable) +- [Hatsu](https://github.com/importantimport/hatsu), a self-hosted bridge that interacts with Fediverse on behalf of your static site. Available as [services.hatsu](options.html#opt-services.hatsu). + - [Flood](https://flood.js.org/), a beautiful WebUI for various torrent clients. Available as [services.flood](options.html#opt-services.flood). - [Firefly-iii Data Importer](https://github.com/firefly-iii/data-importer), a data importer for Firefly-III. Available as [services.firefly-iii-data-importer](options.html#opt-services.firefly-iii-data-importer) diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 7f6fa1c8e73b..7e17841d2a65 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1424,6 +1424,7 @@ ./services/web-apps/goatcounter.nix ./services/web-apps/guacamole-client.nix ./services/web-apps/guacamole-server.nix + ./services/web-apps/hatsu.nix ./services/web-apps/healthchecks.nix ./services/web-apps/hedgedoc.nix ./services/web-apps/hledger-web.nix diff --git a/nixos/modules/services/web-apps/hatsu.md b/nixos/modules/services/web-apps/hatsu.md new file mode 100644 index 000000000000..e2c61d00f121 --- /dev/null +++ b/nixos/modules/services/web-apps/hatsu.md @@ -0,0 +1,23 @@ +# Hatsu {#module-services-hatsu} + +[Hatsu](https://github.com/importantimport/hatsu) is an fully-automated ActivityPub bridge for static sites. + +## Quickstart {#module-services-hatsu-quickstart} + +the minimum configuration to start hatsu server would look like this: + +```nix +{ + services.hatsu = { + enable = true; + settings = { + HATSU_DOMAIN = "hatsu.local"; + HATSU_PRIMARY_ACCOUNT = "example.com"; + }; + }; +} +``` + +this will start the hatsu server on port 3939 and save the database in `/var/lib/hatsu/hatsu.sqlite3`. + +Please refer to the [Hatsu Documentation](https://hatsu.cli.rs) for additional configuration options. diff --git a/nixos/modules/services/web-apps/hatsu.nix b/nixos/modules/services/web-apps/hatsu.nix new file mode 100644 index 000000000000..093ae150cfdc --- /dev/null +++ b/nixos/modules/services/web-apps/hatsu.nix @@ -0,0 +1,97 @@ +{ + lib, + pkgs, + config, + ... +}: +let + cfg = config.services.hatsu; +in +{ + meta.doc = ./hatsu.md; + meta.maintainers = with lib.maintainers; [ kwaa ]; + + options.services.hatsu = { + enable = lib.mkEnableOption "Self-hosted and fully-automated ActivityPub bridge for static sites"; + + package = lib.mkPackageOption pkgs "hatsu" { }; + + settings = lib.mkOption { + type = lib.types.submodule { + freeformType = + with lib.types; + attrsOf ( + nullOr (oneOf [ + bool + int + port + str + ]) + ); + + options = { + HATSU_DATABASE_URL = lib.mkOption { + type = lib.types.str; + default = "sqlite:///var/lib/hatsu/hatsu.sqlite?mode=rwc"; + example = "postgres://username:password@host/database"; + description = "Database URL."; + }; + + HATSU_DOMAIN = lib.mkOption { + type = lib.types.str; + description = "The domain name of your instance (eg 'hatsu.local')."; + }; + + HATSU_LISTEN_HOST = lib.mkOption { + type = lib.types.str; + default = "127.0.0.1"; + description = "Host where hatsu should listen for incoming requests."; + }; + + HATSU_LISTEN_PORT = lib.mkOption { + type = lib.types.port; + apply = toString; + default = 3939; + description = "Port where hatsu should listen for incoming requests."; + }; + + HATSU_PRIMARY_ACCOUNT = lib.mkOption { + type = lib.types.str; + description = "The primary account of your instance (eg 'example.com')."; + }; + }; + }; + + default = { }; + + description = '' + Configuration for Hatsu, see + <link xlink:href="https://hatsu.cli.rs/admins/environments.html"/> + for supported values. + ''; + }; + }; + + config = lib.mkIf cfg.enable { + systemd.services.hatsu = { + environment = cfg.settings; + + description = "Hatsu server"; + documentation = [ "https://hatsu.cli.rs/" ]; + + after = [ "network-online.target" ]; + wants = [ "network-online.target" ]; + + wantedBy = [ "multi-user.target" ]; + + serviceConfig = { + DynamicUser = true; + ExecStart = "${lib.getExe cfg.package}"; + Restart = "on-failure"; + StateDirectory = "hatsu"; + Type = "simple"; + WorkingDirectory = "%S/hatsu"; + }; + }; + }; +} From 7ba674b0761ed70a74015bbbfc44d49ba4209526 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliv=C3=A9r=20Falvai?= <ofalvai@gmail.com> Date: Mon, 30 Sep 2024 18:54:39 +0200 Subject: [PATCH 095/129] roxctl: fix hash --- pkgs/applications/networking/cluster/roxctl/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/cluster/roxctl/default.nix b/pkgs/applications/networking/cluster/roxctl/default.nix index 15ad3c94c755..95156944b8c7 100644 --- a/pkgs/applications/networking/cluster/roxctl/default.nix +++ b/pkgs/applications/networking/cluster/roxctl/default.nix @@ -8,7 +8,7 @@ buildGoModule rec { owner = "stackrox"; repo = "stackrox"; rev = version; - sha256 = "sha256-dJtqUYH6TUEb3IMSzVg3NBi1UYGvUPDQUaQ9h19a3NY="; + sha256 = "sha256-H6pgPo2/RIpYnNOxP6PgIZhij1I45bm9DVkV2sNcW3A="; }; vendorHash = "sha256-qDSi1Jk6erSCwPiLubdVlqOT6PQygMQghS8leieJ78s="; From c2b4a5dc17fdb60b6920c08c218248a6cd6e3bef Mon Sep 17 00:00:00 2001 From: midchildan <git@midchildan.org> Date: Tue, 1 Oct 2024 01:49:57 +0900 Subject: [PATCH 096/129] mikutter: remove This package was broken and had no maintainers. --- .../manual/release-notes/rl-2411.section.md | 2 + .../instant-messengers/mikutter/default.nix | 159 ------- .../instant-messengers/mikutter/deps/Gemfile | 39 -- .../mikutter/deps/Gemfile.lock | 101 ----- .../mikutter/deps/gemset.nix | 410 ------------------ .../mikutter/deps/plugin/gtk/Gemfile | 4 - .../deps/plugin/image_file_cache/Gemfile | 1 - .../deps/plugin/photo_support/Gemfile | 4 - .../mikutter/deps/plugin/uitranslator/Gemfile | 5 - .../mikutter/test_plugin.rb | 10 - .../instant-messengers/mikutter/update.sh | 51 --- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 13 files changed, 3 insertions(+), 786 deletions(-) delete mode 100644 pkgs/applications/networking/instant-messengers/mikutter/default.nix delete mode 100644 pkgs/applications/networking/instant-messengers/mikutter/deps/Gemfile delete mode 100644 pkgs/applications/networking/instant-messengers/mikutter/deps/Gemfile.lock delete mode 100644 pkgs/applications/networking/instant-messengers/mikutter/deps/gemset.nix delete mode 100644 pkgs/applications/networking/instant-messengers/mikutter/deps/plugin/gtk/Gemfile delete mode 100644 pkgs/applications/networking/instant-messengers/mikutter/deps/plugin/image_file_cache/Gemfile delete mode 100644 pkgs/applications/networking/instant-messengers/mikutter/deps/plugin/photo_support/Gemfile delete mode 100644 pkgs/applications/networking/instant-messengers/mikutter/deps/plugin/uitranslator/Gemfile delete mode 100644 pkgs/applications/networking/instant-messengers/mikutter/test_plugin.rb delete mode 100755 pkgs/applications/networking/instant-messengers/mikutter/update.sh diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index bce2805f74d4..eb3aa5a43472 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -548,6 +548,8 @@ - `security.pam.u2f` now follows RFC42. All module options are now settable through the freeform `.settings`. +- Mikutter was removed because the package was broken and had no maintainers. + - Gollum was upgraded to major version 6. Read their [migration notes](https://github.com/gollum/gollum/wiki/6.0-Release-Notes). - The hooks `yarnConfigHook` and `yarnBuildHook` were added. These should replace `yarn2nix.mkYarnPackage` and other `yarn2nix` related tools. The motivation to get rid of `yarn2nix` tools is the fact that they are too complex and hard to maintain, and they rely upon too much Nix evaluation which is problematic if import-from-derivation is not allowed (see more details at [#296856](https://github.com/NixOS/nixpkgs/issues/296856). The transition from `mkYarnPackage` to `yarn{Config,Build}Hook` is tracked at [#324246](https://github.com/NixOS/nixpkgs/issues/324246). diff --git a/pkgs/applications/networking/instant-messengers/mikutter/default.nix b/pkgs/applications/networking/instant-messengers/mikutter/default.nix deleted file mode 100644 index eeb5f582f25c..000000000000 --- a/pkgs/applications/networking/instant-messengers/mikutter/default.nix +++ /dev/null @@ -1,159 +0,0 @@ -{ lib -, stdenv -, fetchurl -, bundlerEnv -, alsa-utils -, atk -, copyDesktopItems -, gobject-introspection -, gtk2 -, ruby -, libicns -, libnotify -, makeDesktopItem -, which -, wrapGAppsHook3 -, writeText -}: - -let - # NOTE: $out may have different values depending on context - mikutterPaths = rec { - optPrefixDir = "$out/opt/mikutter"; - appPrefixDir = "$out/Applications/mikutter.app/Contents"; - appBinDir = "${appPrefixDir}/MacOS"; - appResourceDir = "${appPrefixDir}/Resources"; - iconPath = "${optPrefixDir}/core/skin/data/icon.png"; - }; - - gems = bundlerEnv { - name = "mikutter-gems"; # leave the version out to enable package reuse - gemdir = ./deps; - groups = [ "default" "plugin" ]; - inherit ruby; - - # Avoid the following error: - # > `<module:Moneta>': uninitialized constant Moneta::Builder (NameError) - # - # Related: - # https://github.com/NixOS/nixpkgs/pull/76510 - # https://github.com/NixOS/nixpkgs/pull/76765 - # https://github.com/NixOS/nixpkgs/issues/83442 - # https://github.com/NixOS/nixpkgs/issues/106545 - copyGemFiles = true; - }; - - mkDesktopItem = { description }: - makeDesktopItem { - name = "mikutter"; - desktopName = "mikutter"; - exec = "mikutter"; - icon = "mikutter"; - categories = [ "Network" ]; - comment = description; - keywords = [ "Mastodon" ]; - }; - - mkInfoPlist = { version }: - writeText "Info.plist" (lib.generators.toPlist { } { - CFBundleName = "mikutter"; - CFBundleDisplayName = "mikutter"; - CFBundleExecutable = "mikutter"; - CFBundleIconFile = "mikutter"; - CFBundleIdentifier = "net.hachune.mikutter"; - CFBundleInfoDictionaryVersion = "6.0"; - CFBundlePackageType = "APPL"; - CFBundleVersion = version; - CFBundleShortVersionString = version; - }); - - inherit (gems) wrappedRuby; -in -with mikutterPaths; stdenv.mkDerivation rec { - pname = "mikutter"; - version = "4.1.4"; - - src = fetchurl { - url = "https://mikutter.hachune.net/bin/mikutter-${version}.tar.gz"; - sha256 = "05253nz4i1lmnq6czj48qdab2ny4vx2mznj6nsn2l1m2z6zqkwk3"; - }; - - nativeBuildInputs = [ copyDesktopItems wrapGAppsHook3 gobject-introspection ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ libicns ]; - buildInputs = [ - atk - gtk2 - libnotify - which # some plugins use it at runtime - wrappedRuby - ] ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-utils ]; - - scriptPath = lib.makeBinPath ( - [ wrappedRuby libnotify which ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-utils ] - ); - - postUnpack = '' - rm -rf vendor - ''; - - installPhase = '' - runHook preInstall - - mkdir -p $out/bin ${optPrefixDir} - - install -Dm644 README $out/share/doc/mikutter/README - install -Dm644 LICENSE $out/share/doc/mikutter/LICENSE - rm -r README LICENSE deployment - - cp -r . ${optPrefixDir} - - gappsWrapperArgsHook # FIXME: currently runs at preFixup - wrapGApp ${optPrefixDir}/mikutter.rb \ - --prefix PATH : "${scriptPath}" \ - --set DISABLE_BUNDLER_SETUP 1 - mv ${optPrefixDir}/mikutter.rb $out/bin/mikutter - - install -Dm644 ${iconPath} $out/share/icons/hicolor/256x256/apps/mikutter.png - - runHook postInstall - ''; - - postInstall = - let - infoPlist = mkInfoPlist { inherit version; }; - in - lib.optionalString stdenv.hostPlatform.isDarwin '' - mkdir -p ${appBinDir} ${appResourceDir} - install -Dm644 ${infoPlist} ${appPrefixDir}/Info.plist - ln -s $out/bin/mikutter ${appBinDir}/mikutter - png2icns ${appResourceDir}/mikutter.icns ${iconPath} - ''; - - installCheckPhase = '' - runHook preInstallCheck - - testDir="$(mktemp -d)" - install -Dm644 ${./test_plugin.rb} "$testDir/plugin/test_plugin/test_plugin.rb" - - $out/bin/mikutter --confroot="$testDir" --plugin=test_plugin --debug - - runHook postInstallCheck - ''; - - desktopItems = [ - (mkDesktopItem { inherit (meta) description; }) - ]; - - doInstallCheck = true; - dontWrapGApps = true; # the target is placed outside of bin/ - - passthru.updateScript = [ ./update.sh version (toString ./.) ]; - - meta = with lib; { - description = "An extensible Mastodon client"; - homepage = "https://mikutter.hachune.net"; - platforms = ruby.meta.platforms; - license = licenses.mit; - }; -} diff --git a/pkgs/applications/networking/instant-messengers/mikutter/deps/Gemfile b/pkgs/applications/networking/instant-messengers/mikutter/deps/Gemfile deleted file mode 100644 index fbe6a2f29c5d..000000000000 --- a/pkgs/applications/networking/instant-messengers/mikutter/deps/Gemfile +++ /dev/null @@ -1,39 +0,0 @@ -alias __source_distinct__ source -def source(url) - @loaded ||= {} - unless @loaded[url] - @loaded[url] = true - __source_distinct__(url) end end - -source 'https://rubygems.org' - -ruby '>= 2.5.0' - -group :default do - gem 'addressable','>= 2.7.0', '< 2.8' - gem 'delayer','>= 1.1.2', '< 2.0' - gem 'delayer-deferred','>= 2.2.0', '< 3.0' - gem 'diva','>= 1.0.2', '< 2.0' - gem 'memoist','>= 0.16.2', '< 0.17' - gem 'oauth','>= 0.5.4' - gem 'pluggaloid','>= 1.5.0', '< 2.0' - gem 'typed-array','>= 0.1.2', '< 0.2' -end - -group :test do - gem 'test-unit','>= 3.3.4', '< 4.0' - gem 'rake','>= 13.0.1' - gem 'mocha','>= 1.11.1' - gem 'webmock','>= 3.7.6' - gem 'ruby-prof','>= 1.1.0' -end - - -group :plugin do - Dir.glob(File.expand_path(File.join(__dir__, 'plugin/*/Gemfile'))){ |path| - eval File.open(path).read - } - Dir.glob(File.join(File.expand_path(ENV['MIKUTTER_CONFROOT'] || '~/.mikutter'), 'plugin/*/Gemfile')){ |path| - eval File.open(path).read - } -end diff --git a/pkgs/applications/networking/instant-messengers/mikutter/deps/Gemfile.lock b/pkgs/applications/networking/instant-messengers/mikutter/deps/Gemfile.lock deleted file mode 100644 index 92568056d52a..000000000000 --- a/pkgs/applications/networking/instant-messengers/mikutter/deps/Gemfile.lock +++ /dev/null @@ -1,101 +0,0 @@ -GEM - remote: https://rubygems.org/ - specs: - addressable (2.7.0) - public_suffix (>= 2.0.2, < 5.0) - atk (3.4.1) - glib2 (= 3.4.1) - cairo (1.17.5) - native-package-installer (>= 1.0.3) - pkg-config (>= 1.2.2) - red-colors - cairo-gobject (3.4.1) - cairo (>= 1.16.2) - glib2 (= 3.4.1) - crack (0.4.5) - rexml - delayer (1.2.0) - delayer-deferred (2.2.0) - delayer (>= 1.1.2, < 2.0) - diva (1.0.2) - addressable (>= 2.5.2, < 2.8) - gdk_pixbuf2 (3.4.1) - gio2 (= 3.4.1) - gettext (3.3.7) - locale (>= 2.0.5) - text (>= 1.3.0) - gio2 (3.4.1) - gobject-introspection (= 3.4.1) - glib2 (3.4.1) - native-package-installer (>= 1.0.3) - pkg-config (>= 1.3.5) - gobject-introspection (3.4.1) - glib2 (= 3.4.1) - gtk2 (3.4.1) - atk (= 3.4.1) - gdk_pixbuf2 (= 3.4.1) - pango (= 3.4.1) - hashdiff (1.0.1) - httpclient (2.8.3) - instance_storage (1.0.0) - locale (2.1.3) - memoist (0.16.2) - mini_portile2 (2.5.0) - mocha (1.12.0) - moneta (1.4.1) - native-package-installer (1.1.1) - nokogiri (1.11.3) - mini_portile2 (~> 2.5.0) - racc (~> 1.4) - oauth (0.5.6) - pango (3.4.1) - cairo-gobject (= 3.4.1) - gobject-introspection (= 3.4.1) - pkg-config (1.4.6) - pluggaloid (1.5.0) - delayer (>= 1.1.0, < 2.0) - instance_storage (>= 1.0.0, < 2.0.0) - power_assert (2.0.0) - public_suffix (4.0.6) - racc (1.5.2) - rake (13.0.3) - red-colors (0.1.1) - rexml (3.2.5) - ruby-prof (1.4.3) - test-unit (3.4.0) - power_assert - text (1.3.1) - typed-array (0.1.2) - webmock (3.12.2) - addressable (>= 2.3.6) - crack (>= 0.3.2) - hashdiff (>= 0.4.0, < 2.0.0) - -PLATFORMS - ruby - -DEPENDENCIES - addressable (>= 2.7.0, < 2.8) - delayer (>= 1.1.2, < 2.0) - delayer-deferred (>= 2.2.0, < 3.0) - diva (>= 1.0.2, < 2.0) - gettext (>= 3.3.5, < 3.4) - gtk2 (= 3.4.1) - httpclient - memoist (>= 0.16.2, < 0.17) - mocha (>= 1.11.1) - moneta - nokogiri - oauth (>= 0.5.4) - pluggaloid (>= 1.5.0, < 2.0) - rake (>= 13.0.1) - ruby-prof (>= 1.1.0) - test-unit (>= 3.3.4, < 4.0) - typed-array (>= 0.1.2, < 0.2) - webmock (>= 3.7.6) - -RUBY VERSION - ruby 2.6.6p146 - -BUNDLED WITH - 2.1.4 diff --git a/pkgs/applications/networking/instant-messengers/mikutter/deps/gemset.nix b/pkgs/applications/networking/instant-messengers/mikutter/deps/gemset.nix deleted file mode 100644 index b45a36c6fec0..000000000000 --- a/pkgs/applications/networking/instant-messengers/mikutter/deps/gemset.nix +++ /dev/null @@ -1,410 +0,0 @@ -{ - addressable = { - dependencies = ["public_suffix"]; - groups = ["default" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1fvchp2rhp2rmigx7qglf69xvjqvzq7x0g49naliw29r2bz656sy"; - type = "gem"; - }; - version = "2.7.0"; - }; - atk = { - dependencies = ["glib2"]; - groups = ["default" "plugin"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0a8q9a1f6x4gy55p8cf52a22bnpjgn18ad9n959x0f4gybbhs948"; - type = "gem"; - }; - version = "3.4.1"; - }; - cairo = { - dependencies = ["native-package-installer" "pkg-config" "red-colors"]; - groups = ["default" "plugin"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0vbj9szp2xbnxqan8hppip8vm9fxpcmpx745y5fvg2scdh9f0p7s"; - type = "gem"; - }; - version = "1.17.5"; - }; - cairo-gobject = { - dependencies = ["cairo" "glib2"]; - groups = ["default" "plugin"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0gkxdfslcvrwrs48giilji3bgxd5bwijwq33p9h00r10jzfg2028"; - type = "gem"; - }; - version = "3.4.1"; - }; - crack = { - dependencies = ["rexml"]; - groups = ["default" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1cr1kfpw3vkhysvkk3wg7c54m75kd68mbm9rs5azdjdq57xid13r"; - type = "gem"; - }; - version = "0.4.5"; - }; - delayer = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0iqf4i18i8rk3x7qgvkhbiqskf0xzdf733fjimrq6xkag2mq60bl"; - type = "gem"; - }; - version = "1.2.0"; - }; - delayer-deferred = { - dependencies = ["delayer"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0i2das3ncssacpqdgaf4as77vrxm7jfiizaja884fqv4rzv6s2sv"; - type = "gem"; - }; - version = "2.2.0"; - }; - diva = { - dependencies = ["addressable"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "05wl4wg57vvng4nrp4lzjq148v908xzq092kq93phwvyxs7jnw2g"; - type = "gem"; - }; - version = "1.0.2"; - }; - gdk_pixbuf2 = { - dependencies = ["gio2"]; - groups = ["default" "plugin"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0194gzn0kialfh0j7crllvp808r64sg6dh297x69b0av21ar5pam"; - type = "gem"; - }; - version = "3.4.1"; - }; - gettext = { - dependencies = ["locale" "text"]; - groups = ["default" "plugin"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1fqlwq7i8ck1fjyhn19q3skvgrbz44q7gq51mlr0qym5rkj5f6rn"; - type = "gem"; - }; - version = "3.3.7"; - }; - gio2 = { - dependencies = ["gobject-introspection"]; - groups = ["default" "plugin"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1l3jpgbdvb55xhcmpkcqgwx5068dfyi8kijfvzhbqh96ng0p1m7g"; - type = "gem"; - }; - version = "3.4.1"; - }; - glib2 = { - dependencies = ["native-package-installer" "pkg-config"]; - groups = ["default" "plugin"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "18clyn0fp0h5alnkf9i2bqd6wvl78h468pdbzs1csqnba8vw4q1c"; - type = "gem"; - }; - version = "3.4.1"; - }; - gobject-introspection = { - dependencies = ["glib2"]; - groups = ["default" "plugin"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1a3x8qiisbax3x0izj8l5w66r53ba5ma53ax2jhdbhbvaxx3d02n"; - type = "gem"; - }; - version = "3.4.1"; - }; - gtk2 = { - dependencies = ["atk" "gdk_pixbuf2" "pango"]; - groups = ["plugin"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "17az8g0n1yzz90kdbjg2hpabi04qccda7v6lin76bs637ivfg2md"; - type = "gem"; - }; - version = "3.4.1"; - }; - hashdiff = { - groups = ["default" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1nynpl0xbj0nphqx1qlmyggq58ms1phf5i03hk64wcc0a17x1m1c"; - type = "gem"; - }; - version = "1.0.1"; - }; - httpclient = { - groups = ["plugin"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "19mxmvghp7ki3klsxwrlwr431li7hm1lczhhj8z4qihl2acy8l99"; - type = "gem"; - }; - version = "2.8.3"; - }; - instance_storage = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "08nf5fhq9dckq9lmaklxydq0hrlfi7phk66gr3bggxg45zd687pl"; - type = "gem"; - }; - version = "1.0.0"; - }; - locale = { - groups = ["default" "plugin"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0997465kxvpxm92fiwc2b16l49mngk7b68g5k35ify0m3q0yxpdn"; - type = "gem"; - }; - version = "2.1.3"; - }; - memoist = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0i9wpzix3sjhf6d9zw60dm4371iq8kyz7ckh2qapan2vyaim6b55"; - type = "gem"; - }; - version = "0.16.2"; - }; - mini_portile2 = { - groups = ["default" "plugin"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1hdbpmamx8js53yk3h8cqy12kgv6ca06k0c9n3pxh6b6cjfs19x7"; - type = "gem"; - }; - version = "2.5.0"; - }; - mocha = { - groups = ["test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "05yw6rwgjppq116jgqfg4pv4bql3ci4r2fmmg0m2c3sqib1bq41a"; - type = "gem"; - }; - version = "1.12.0"; - }; - moneta = { - groups = ["plugin"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0z25b4yysvnf2hi9jxnsiv3fvnicnzr2m70ci231av5093jfknc6"; - type = "gem"; - }; - version = "1.4.1"; - }; - native-package-installer = { - groups = ["default" "plugin"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1ww1mq41q7rda975byjmq5dk8k13v8dawvm33370pbkrymd8syp8"; - type = "gem"; - }; - version = "1.1.1"; - }; - nokogiri = { - dependencies = ["mini_portile2" "racc"]; - groups = ["plugin"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "19d78mdg2lbz9jb4ph6nk783c9jbsdm8rnllwhga6pd53xffp6x0"; - type = "gem"; - }; - version = "1.11.3"; - }; - oauth = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1zwd6v39yqfdrpg1p3d9jvzs9ljg55ana2p06m0l7qn5w0lgx1a0"; - type = "gem"; - }; - version = "0.5.6"; - }; - pango = { - dependencies = ["cairo-gobject" "gobject-introspection"]; - groups = ["default" "plugin"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1d0cn50qgpifrcv8qx72wi6l9xalw3ryngbfmm9xpg9vx5rl1qbp"; - type = "gem"; - }; - version = "3.4.1"; - }; - pkg-config = { - groups = ["default" "plugin"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1mjjy1grxr64znkffxsvprcckbrrnm40b6gbllnbm7jxslbr3gjl"; - type = "gem"; - }; - version = "1.4.6"; - }; - pluggaloid = { - dependencies = ["delayer" "instance_storage"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0m3f940lf1bg01jin22by7hg9hs43y995isgcyqb6vbvlv51zj11"; - type = "gem"; - }; - version = "1.5.0"; - }; - power_assert = { - groups = ["default" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "172qfmzwxdf82bmwgcb13hnz9i3p6i2s2nijxnx6r63kn3drjppr"; - type = "gem"; - }; - version = "2.0.0"; - }; - public_suffix = { - groups = ["default" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1xqcgkl7bwws1qrlnmxgh8g4g9m10vg60bhlw40fplninb3ng6d9"; - type = "gem"; - }; - version = "4.0.6"; - }; - racc = { - groups = ["default" "plugin"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "178k7r0xn689spviqzhvazzvxfq6fyjldxb3ywjbgipbfi4s8j1g"; - type = "gem"; - }; - version = "1.5.2"; - }; - rake = { - groups = ["test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1iik52mf9ky4cgs38fp2m8r6skdkq1yz23vh18lk95fhbcxb6a67"; - type = "gem"; - }; - version = "13.0.3"; - }; - red-colors = { - groups = ["default" "plugin"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0ar2k7zvhr1215jx5di29hkg5h1798f1gypmq6v0sy9v35w6ijca"; - type = "gem"; - }; - version = "0.1.1"; - }; - rexml = { - groups = ["default" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53"; - type = "gem"; - }; - version = "3.2.5"; - }; - ruby-prof = { - groups = ["test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1r3xalp91l07m0cwllcxjzg6nkviiqnxkcbgg5qnzsdji6rgy65m"; - type = "gem"; - }; - version = "1.4.3"; - }; - test-unit = { - dependencies = ["power_assert"]; - groups = ["test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1h0c323zfn4hdida4g58h8wnlh4kax438gyxlw20dd78kcp01i8m"; - type = "gem"; - }; - version = "3.4.0"; - }; - text = { - groups = ["default" "plugin"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1x6kkmsr49y3rnrin91rv8mpc3dhrf3ql08kbccw8yffq61brfrg"; - type = "gem"; - }; - version = "1.3.1"; - }; - typed-array = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0qlv2rnkin9rwkgjx3k5qvc17m0m7jf5cdirw3wxbjnw5kga27w9"; - type = "gem"; - }; - version = "0.1.2"; - }; - webmock = { - dependencies = ["addressable" "crack" "hashdiff"]; - groups = ["test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "038igpmkpmn0nw0k7s4db8x88af1nwcy7wzh9m9c9q4p74h7rii0"; - type = "gem"; - }; - version = "3.12.2"; - }; -} diff --git a/pkgs/applications/networking/instant-messengers/mikutter/deps/plugin/gtk/Gemfile b/pkgs/applications/networking/instant-messengers/mikutter/deps/plugin/gtk/Gemfile deleted file mode 100644 index 3306c29e3cbf..000000000000 --- a/pkgs/applications/networking/instant-messengers/mikutter/deps/plugin/gtk/Gemfile +++ /dev/null @@ -1,4 +0,0 @@ -source 'https://rubygems.org' - -gem 'gtk2', '3.4.1' - diff --git a/pkgs/applications/networking/instant-messengers/mikutter/deps/plugin/image_file_cache/Gemfile b/pkgs/applications/networking/instant-messengers/mikutter/deps/plugin/image_file_cache/Gemfile deleted file mode 100644 index f86005fef078..000000000000 --- a/pkgs/applications/networking/instant-messengers/mikutter/deps/plugin/image_file_cache/Gemfile +++ /dev/null @@ -1 +0,0 @@ -gem 'moneta' diff --git a/pkgs/applications/networking/instant-messengers/mikutter/deps/plugin/photo_support/Gemfile b/pkgs/applications/networking/instant-messengers/mikutter/deps/plugin/photo_support/Gemfile deleted file mode 100644 index 66016eee9c46..000000000000 --- a/pkgs/applications/networking/instant-messengers/mikutter/deps/plugin/photo_support/Gemfile +++ /dev/null @@ -1,4 +0,0 @@ -source 'https://rubygems.org' - -gem 'nokogiri' -gem 'httpclient' diff --git a/pkgs/applications/networking/instant-messengers/mikutter/deps/plugin/uitranslator/Gemfile b/pkgs/applications/networking/instant-messengers/mikutter/deps/plugin/uitranslator/Gemfile deleted file mode 100644 index 08b4831dfc66..000000000000 --- a/pkgs/applications/networking/instant-messengers/mikutter/deps/plugin/uitranslator/Gemfile +++ /dev/null @@ -1,5 +0,0 @@ -source 'https://rubygems.org' - -group :default do - gem 'gettext', '>= 3.3.5', '< 3.4' -end diff --git a/pkgs/applications/networking/instant-messengers/mikutter/test_plugin.rb b/pkgs/applications/networking/instant-messengers/mikutter/test_plugin.rb deleted file mode 100644 index b19c15cd304f..000000000000 --- a/pkgs/applications/networking/instant-messengers/mikutter/test_plugin.rb +++ /dev/null @@ -1,10 +0,0 @@ -# Tests mikutter's event system. - -Plugin.create(:test_plugin) do - require 'logger' - Delayer.new do - log = Logger.new(STDOUT) - log.info("loaded test_plugin") - exit - end -end diff --git a/pkgs/applications/networking/instant-messengers/mikutter/update.sh b/pkgs/applications/networking/instant-messengers/mikutter/update.sh deleted file mode 100755 index 142fd8ca9424..000000000000 --- a/pkgs/applications/networking/instant-messengers/mikutter/update.sh +++ /dev/null @@ -1,51 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p bundler bundix curl jq common-updater-scripts -# shellcheck shell=bash - -set -euo pipefail - -main() { - local currentVer="$1" - local scriptDir="$2" - local latestVer - local srcDir - - if [[ -z "$UPDATE_NIX_ATTR_PATH" ]]; then - echo "[ERROR] Please run the following instead:" >&2 - echo >&2 - echo " % nix-shell maintainers/scripts/update.nix --argstr path mikutter" >&2 - exit 1 - fi - - latestVer="$(queryLatestVersion)" - if [[ "$currentVer" == "$latestVer" ]]; then - echo "[INFO] mikutter is already up to date" >&2 - exit - fi - - update-source-version "$UPDATE_NIX_ATTR_PATH" "$latestVer" - - cd "$scriptDir" - - rm -rf deps - mkdir deps - cd deps - - srcDir="$(nix-build ../../../../../.. --no-out-link -A mikutter.src)" - tar xvf "$srcDir" --strip-components=1 - find . -not -name Gemfile -exec rm {} \; - find . -type d -exec rmdir -p --ignore-fail-on-non-empty {} \; || true - - bundle lock - bundix -} - -queryLatestVersion() { - curl -sS 'https://mikutter.hachune.net/download.json?count=1' \ - | jq -r '.[].version_string' \ - | head -n1 -} - -main "$@" - -# vim:set ft=bash: diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index e5d2e936717d..a24730771cf1 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1005,6 +1005,7 @@ mapAliases { microsoft_gsl = microsoft-gsl; # Added 2023-05-26 MIDIVisualizer = midivisualizer; # Added 2024-06-12 migraphx = throw "'migraphx' has been replaced with 'rocmPackages.migraphx'"; # Added 2023-10-08 + mikutter = throw "'mikutter' has been removed because the package was broken and had no maintainers"; # Added 2024-10-01 minishift = throw "'minishift' has been removed as it was discontinued upstream. Use 'crc' to setup a microshift cluster instead"; # Added 2023-12-30 miopen = throw "'miopen' has been replaced with 'rocmPackages.miopen'"; # Added 2023-10-08 miopengemm = throw "'miopengemm' has been replaced with 'rocmPackages_5.miopengemm'"; # Added 2023-10-08 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d51f46347610..578a7a3613a4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10082,8 +10082,6 @@ with pkgs; midisheetmusic = callPackage ../applications/audio/midisheetmusic { }; - mikutter = callPackage ../applications/networking/instant-messengers/mikutter { }; - mimeo = callPackage ../tools/misc/mimeo { }; mimetic = callPackage ../development/libraries/mimetic { }; From 44dd304227338c03b45b1d1067ca83ce380a408c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliv=C3=A9r=20Falvai?= <ofalvai@gmail.com> Date: Mon, 30 Sep 2024 19:11:32 +0200 Subject: [PATCH 097/129] zoraxy: mark as Linux-only https://github.com/tobychui/zoraxy/tree/main/src/mod/ganserv has Linux and Windows-specific implementations, but no Darwin --- pkgs/by-name/zo/zoraxy/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/zo/zoraxy/package.nix b/pkgs/by-name/zo/zoraxy/package.nix index b81d03125182..46afd4e170b1 100644 --- a/pkgs/by-name/zo/zoraxy/package.nix +++ b/pkgs/by-name/zo/zoraxy/package.nix @@ -38,5 +38,6 @@ buildGoModule rec { license = lib.licenses.agpl3Only; maintainers = [ lib.maintainers.luftmensch-luftmensch ]; mainProgram = "zoraxy"; + platforms = lib.platforms.linux; }; } From 4772ab4bc114e19f2e4e88b150622eb4aab92983 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliv=C3=A9r=20Falvai?= <ofalvai@gmail.com> Date: Mon, 30 Sep 2024 19:27:49 +0200 Subject: [PATCH 098/129] roadrunner: fix postInstall phase --- pkgs/servers/roadrunner/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/roadrunner/default.nix b/pkgs/servers/roadrunner/default.nix index 531dfb9b7ee5..bfe716b5aa51 100644 --- a/pkgs/servers/roadrunner/default.nix +++ b/pkgs/servers/roadrunner/default.nix @@ -30,8 +30,8 @@ buildGoModule rec { postInstall = '' installShellCompletion --cmd rr \ --bash <($out/bin/rr completion bash) \ - --zsh <($out/bin/rr zsh) \ - --fish <($out/bin/rr fish) + --zsh <($out/bin/rr completion zsh) \ + --fish <($out/bin/rr completion fish) ''; postPatch = '' From fdedf708d17d684b2e8f437d81be732e87129d93 Mon Sep 17 00:00:00 2001 From: Bruno Bigras <bigras.bruno@gmail.com> Date: Mon, 30 Sep 2024 13:12:54 -0400 Subject: [PATCH 099/129] spotube: 3.8.1 -> 3.8.2 --- pkgs/by-name/sp/spotube/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sp/spotube/package.nix b/pkgs/by-name/sp/spotube/package.nix index 89b6a84b5174..bdadcf424ee8 100644 --- a/pkgs/by-name/sp/spotube/package.nix +++ b/pkgs/by-name/sp/spotube/package.nix @@ -22,7 +22,7 @@ let pname = "spotube"; - version = "3.8.1"; + version = "3.8.2"; meta = { description = "Open source, cross-platform Spotify client compatible across multiple platforms"; @@ -56,7 +56,7 @@ let src = fetchArtifact { filename = "Spotube-macos-universal.dmg"; - hash = "sha256-NbKFvg50n/GByVU6/vNLmTTV9bhIhl3AxlwAcG60KVY="; + hash = "sha256-2nqWHQDxJ0PcwTiLAa8YZffqwsdnepMpXvpqRPX5JxM="; }; sourceRoot = "."; @@ -80,7 +80,7 @@ let src = fetchArtifact { filename = "Spotube-linux-x86_64.deb"; - hash = "sha256-R/yHXx29T/7NNc1L1AmevzXp1k98qnmvOEd3cfSlJuA="; + hash = "sha256-kDPNWbspmORClVMH91Lt3dLVsRwGxiBtB49CHSHxQxI="; }; nativeBuildInputs = [ From e47c457a91676ab347093ff1bffd4194f36e3731 Mon Sep 17 00:00:00 2001 From: huantian <davidtianli@gmail.com> Date: Mon, 30 Sep 2024 10:48:18 -0700 Subject: [PATCH 100/129] python3Packages.aw-core: 0.5.16 -> 0.5.17 --- pkgs/development/python-modules/aw-core/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/aw-core/default.nix b/pkgs/development/python-modules/aw-core/default.nix index 84b13c6f100d..591c862597d5 100644 --- a/pkgs/development/python-modules/aw-core/default.nix +++ b/pkgs/development/python-modules/aw-core/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "aw-core"; - version = "0.5.16"; + version = "0.5.17"; format = "pyproject"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "ActivityWatch"; repo = "aw-core"; rev = "v${version}"; - sha256 = "sha256-7xT7bOGzH5G4WpgNo8pDyiQqX0dWNLNHpgssozUa9kQ="; + sha256 = "sha256-bKxf+fqm+6V3JgDluKVpqq5hRL3Z+x8SHMRQmNe8vUA="; }; disabled = pythonOlder "3.8"; @@ -51,7 +51,6 @@ buildPythonPackage rec { pythonRelaxDeps = [ "platformdirs" - "iso8601" ]; nativeCheckInputs = [ pytestCheckHook ]; @@ -65,11 +64,11 @@ buildPythonPackage rec { passthru.updateScript = gitUpdater { rev-prefix = "v"; }; - meta = with lib; { + meta = { description = "Core library for ActivityWatch"; mainProgram = "aw-cli"; homepage = "https://github.com/ActivityWatch/aw-core"; - maintainers = with maintainers; [ huantian ]; - license = licenses.mpl20; + maintainers = with lib.maintainers; [ huantian ]; + license = lib.licenses.mpl20; }; } From 2a780460b85ca0898ed8060820ab268051447051 Mon Sep 17 00:00:00 2001 From: jacekpoz <jacekpoz@proton.me> Date: Mon, 30 Sep 2024 20:43:34 +0200 Subject: [PATCH 101/129] libbassmix: init at 2.4.12 --- .../development/libraries/audio/libbass/default.nix | 13 +++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 14 insertions(+) diff --git a/pkgs/development/libraries/audio/libbass/default.nix b/pkgs/development/libraries/audio/libbass/default.nix index 21febc10467c..2f44827af95f 100644 --- a/pkgs/development/libraries/audio/libbass/default.nix +++ b/pkgs/development/libraries/audio/libbass/default.nix @@ -34,6 +34,19 @@ let url = "https://web.archive.org/web/20240926184106/https://www.un4seen.com/files/z/0/bass_fx24-linux.zip"; hash = "sha256-Hul2ELwnaDV8TDRMDXoFisle31GATDkf3PdkR2K9QTs="; }; + + bassmix = { + h = "bassmix.h"; + version = "2.4.12"; + so = { + i686_linux = "libs/x86/libbassmix.so"; + x86_64-linux = "libs/x86_64/libbassmix.so"; + armv7l-linux = "libs/armhf/libbassmix.so"; + aarch64-linux = "libs/aarch64/libbassmix.so"; + }; + url = "https://web.archive.org/web/20240930183631/https://www.un4seen.com/files/bassmix24-linux.zip"; + hash = "sha256-oxxBhsjeLvUodg2SOMDH4wUy5na3nxLTqYkB+iXbOgA="; + }; }; dropBass = name: bass: stdenv.mkDerivation { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 288564a842f7..76508cc4bacc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20760,6 +20760,7 @@ with pkgs; libbass = (callPackage ../development/libraries/audio/libbass { }).bass; libbass_fx = (callPackage ../development/libraries/audio/libbass { }).bass_fx; + libbassmix = (callPackage ../development/libraries/audio/libbass { }).bassmix; libbde = callPackage ../development/libraries/libbde { }; From ef593972ffdd7384cd97523e09807a701aa204c2 Mon Sep 17 00:00:00 2001 From: Ali Caglayan <alizter@gmail.com> Date: Sat, 28 Sep 2024 00:34:35 +0100 Subject: [PATCH 102/129] coqPackages.HoTT: 8.19 -> 8.20 Signed-off-by: Ali Caglayan <alizter@gmail.com> <!-- ps-id: 92474861-7551-4ab8-a321-d0de1738c5e8 --> --- pkgs/development/coq-modules/HoTT/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/coq-modules/HoTT/default.nix b/pkgs/development/coq-modules/HoTT/default.nix index 6bc8ad9bb180..8652520b4a40 100644 --- a/pkgs/development/coq-modules/HoTT/default.nix +++ b/pkgs/development/coq-modules/HoTT/default.nix @@ -6,7 +6,7 @@ mkCoqDerivation { owner = "HoTT"; inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ - { case = range "8.14" "8.19"; out = coq.coq-version; } + { case = range "8.14" "8.20"; out = coq.coq-version; } ] null; releaseRev = v: "V${v}"; release."8.14".sha256 = "sha256-7kXk2pmYsTNodHA+Qts3BoMsewvzmCbYvxw9Sgwyvq0="; @@ -15,6 +15,7 @@ mkCoqDerivation { release."8.17".sha256 = "sha256-GjTUpzL9UzJm4C2ilCaYEufLG3hcj7rJPc5Op+OMal8="; release."8.18".sha256 = "sha256-URoUoQOsG0432wg9i6pTRomWQZ+ewutq2+V29TBrVzc="; release."8.19".sha256 = "sha256-igG3mhR6uPXV+SCtPH9PBw/eAtTFFry6HPT5ypWj3tQ="; + release."8.20".sha256 = "sha256-XHAvomi0of11j4x5gpTgD5Mw53eF1FpnCyBvdbV3g6I="; # versions of HoTT for Coq 8.17 and onwards will use dune # opam-name = if lib.versions.isLe "8.17" coq.coq-version then "coq-hott" else null; From 485b5c4e6ef107f82f7bd6fd906405ab9a3539e3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" <ryantm-bot@ryantm.com> Date: Mon, 30 Sep 2024 19:41:18 +0000 Subject: [PATCH 103/129] cnspec: 11.23.0 -> 11.23.1 --- pkgs/tools/security/cnspec/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/cnspec/default.nix b/pkgs/tools/security/cnspec/default.nix index 2d34dc01646c..33e34485d168 100644 --- a/pkgs/tools/security/cnspec/default.nix +++ b/pkgs/tools/security/cnspec/default.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "cnspec"; - version = "11.23.0"; + version = "11.23.1"; src = fetchFromGitHub { owner = "mondoohq"; repo = "cnspec"; rev = "refs/tags/v${version}"; - hash = "sha256-oZCKNsbDdsqlh763/T23+A03Qt8f/XyC8MItMah+U3w="; + hash = "sha256-ZOfAkoRjxM3CFNIPye7thW6wxfGbS2EeeVHW6tnv2v4="; }; proxyVendor = true; - vendorHash = "sha256-QqK527y4W+B7jhRoOkpt9QRyERA6Tn4Dwaq+gzN3k4U="; + vendorHash = "sha256-xYhzM3j3zwkX4YLS5V1bScl+dP9N9/XZUHR77CI2sSY="; subPackages = [ "apps/cnspec" ]; From a01bc8533afa79d32df6e3078c9c334b7a134c92 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" <ryantm-bot@ryantm.com> Date: Mon, 30 Sep 2024 20:44:37 +0000 Subject: [PATCH 104/129] n8n: 1.60.1 -> 1.61.0 --- pkgs/by-name/n8/n8n/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/n8/n8n/package.nix b/pkgs/by-name/n8/n8n/package.nix index 0a57d8818d15..48081b49f2f6 100644 --- a/pkgs/by-name/n8/n8n/package.nix +++ b/pkgs/by-name/n8/n8n/package.nix @@ -18,18 +18,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "n8n"; - version = "1.60.1"; + version = "1.61.0"; src = fetchFromGitHub { owner = "n8n-io"; repo = "n8n"; rev = "n8n@${finalAttrs.version}"; - hash = "sha256-G//+9Mucm/yH8XlA8/OO09lg9mKlo1S+Pyfmsp5MQhk="; + hash = "sha256-9hIwpid/uly7wUcrBgLkSw+Aah8OQ66MgrMQbs/5v1Y="; }; pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-61xRNwJUFQrj7aw/+SqMABb8W+sJsVZ6aTgU9N7ssDo="; + hash = "sha256-OUZpPXXGWW7ceWxpHqjQolCr+OVeVO4DgRwsU8VvgWo="; }; nativeBuildInputs = [ From 0d1f8619a385175132648b5dc98242288cf7345e Mon Sep 17 00:00:00 2001 From: lunik1 <13547699+lunik1@users.noreply.github.com> Date: Mon, 30 Sep 2024 22:04:14 +0100 Subject: [PATCH 105/129] mpvScripts.quality-menu: 4.1.1 -> 4.1.2 (#345108) Diff: https://github.com/christoph-heinrich/mpv-quality-menu/compare/v4.1.1...v4.1.2 --- pkgs/applications/video/mpv/scripts/quality-menu.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/mpv/scripts/quality-menu.nix b/pkgs/applications/video/mpv/scripts/quality-menu.nix index 36e5024b6aa8..ec384c9ad4ed 100644 --- a/pkgs/applications/video/mpv/scripts/quality-menu.nix +++ b/pkgs/applications/video/mpv/scripts/quality-menu.nix @@ -8,13 +8,13 @@ buildLua rec { pname = "mpv-quality-menu"; - version = "4.1.1"; + version = "4.1.2"; src = fetchFromGitHub { owner = "christoph-heinrich"; repo = "mpv-quality-menu"; rev = "v${version}"; - hash = "sha256-yrcTxqpLnOI1Tq3khhflO3wzhyeTPuvKifyH5/P57Ns="; + hash = "sha256-W7N8H+kq/bhF917TutyilfT8FBbWmbSFUrHd8a8k5Jg="; }; passthru.updateScript = gitUpdater { rev-prefix = "v"; }; From a9fe4d6d8ccde780e872ed1446f3746498152663 Mon Sep 17 00:00:00 2001 From: oxalica <oxalicc@pm.me> Date: Mon, 30 Sep 2024 03:02:27 -0400 Subject: [PATCH 106/129] lib.systems: fix rustTarget for WASI The corresponding Rust target name is "wasm32-wasip?", not "wasm32-unknown-wasi". --- lib/systems/default.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/lib/systems/default.nix b/lib/systems/default.nix index 40125c429781..901912ed4a50 100644 --- a/lib/systems/default.nix +++ b/lib/systems/default.nix @@ -384,8 +384,17 @@ let }.${cpu.name} or cpu.name; vendor_ = final.rust.platform.vendor; # TODO: deprecate args.rustc in favour of args.rust after 23.05 is EOL. - in args.rust.rustcTarget or args.rustc.config - or "${cpu_}-${vendor_}-${kernel.name}${optionalString (abi.name != "unknown") "-${abi.name}"}"; + in + args.rust.rustcTarget or + args.rustc.config or ( + # Rust uses `wasm32-wasip?` rather than `wasm32-unknown-wasi`. + # We cannot know which subversion does the user want, and + # currently use WASI 0.1 as default for compatibility. Custom + # users can set `rust.rustcTarget` to override it. + if final.isWasi + then "${cpu_}-wasip1" + else "${cpu_}-${vendor_}-${kernel.name}${optionalString (abi.name != "unknown") "-${abi.name}"}" + ); # The name of the rust target if it is standard, or the json file # containing the custom target spec. From c5b0b6d29cdac3faa0d594ac9876916ec5e84d92 Mon Sep 17 00:00:00 2001 From: Winter <winter@winter.cafe> Date: Mon, 30 Sep 2024 17:48:38 -0400 Subject: [PATCH 107/129] mpv: fix build on darwin --- .../video/mpv/0001-fix-darwin-build.patch | 19 +++++++++++++++++++ pkgs/applications/video/mpv/default.nix | 7 +++++++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/applications/video/mpv/0001-fix-darwin-build.patch diff --git a/pkgs/applications/video/mpv/0001-fix-darwin-build.patch b/pkgs/applications/video/mpv/0001-fix-darwin-build.patch new file mode 100644 index 000000000000..2b6085ed3c9f --- /dev/null +++ b/pkgs/applications/video/mpv/0001-fix-darwin-build.patch @@ -0,0 +1,19 @@ +diff --git a/osdep/mac/input_helper.swift b/osdep/mac/input_helper.swift +index 0acec6bd40..0ec5837864 100644 +--- a/osdep/mac/input_helper.swift ++++ b/osdep/mac/input_helper.swift +@@ -18,6 +18,14 @@ + import Cocoa + import Carbon.HIToolbox + ++extension NSCondition { ++ fileprivate func withLock<T>(_ body: () throws -> T) rethrows -> T { ++ self.lock() ++ defer { self.unlock() } ++ return try body() ++ } ++} ++ + class InputHelper: NSObject { + var option: OptionHelper? + var lock = NSCondition() diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 20601537d373..d1f44b09b16d 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -151,6 +151,11 @@ stdenv'.mkDerivation (finalAttrs: { hash = "sha256-BOGh+QBTO7hrHohh+RqjSF8eHQH8jVBPjG/k4eyFaaM="; }; + patches = [ + # Fix build with Darwin SDK 11 + ./0001-fix-darwin-build.patch + ]; + postPatch = lib.concatStringsSep "\n" [ # Don't reference compile time dependencies or create a build outputs cycle # between out and dev @@ -308,6 +313,8 @@ stdenv'.mkDerivation (finalAttrs: { pushd ../TOOLS cp mpv_identify.sh umpv $out/bin/ popd + '' + + lib.optionalString stdenv.hostPlatform.isLinux '' pushd $out/share/applications sed -e '/Icon=/ ! s|mpv|umpv|g; s|^Exec=.*|Exec=umpv %U|' \ From 727527cfe8b08d7c4b4ac2a68afdb3c1b4df7dbf Mon Sep 17 00:00:00 2001 From: lzszt <github@lzszt.info> Date: Tue, 1 Oct 2024 01:08:27 +0200 Subject: [PATCH 108/129] vscode-extensions.gitlab-workflow: 5.6.0 -> 5.13.0 (#345458) Update vscode extension gitlab-workflow to latest version 5.13.0 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 70d38a11917e..c70054e69434 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -2119,8 +2119,8 @@ let mktplcRef = { name = "gitlab-workflow"; publisher = "gitlab"; - version = "5.6.0"; - hash = "sha256-K4oCMQBH5jrt61f/C3DDZC61RuDvOApnPEF3AsOrE20="; + version = "5.13.0"; + hash = "sha256-A9QFW6Vk+g0pJfpXmZdUWJ/+WJBFXG79NXpCBuTjjok="; }; meta = { description = "GitLab extension for Visual Studio Code"; From e4efc386131d7b34cc99a6f0ce99d9b3fde8c195 Mon Sep 17 00:00:00 2001 From: seth <getchoo@tuta.io> Date: Sat, 17 Aug 2024 17:47:37 -0400 Subject: [PATCH 109/129] cargo-tauri: migrate to by-name --- .../default.nix => by-name/ca/cargo-tauri/package.nix} | 0 pkgs/top-level/all-packages.nix | 1 - 2 files changed, 1 deletion(-) rename pkgs/{development/tools/rust/cargo-tauri/default.nix => by-name/ca/cargo-tauri/package.nix} (100%) diff --git a/pkgs/development/tools/rust/cargo-tauri/default.nix b/pkgs/by-name/ca/cargo-tauri/package.nix similarity index 100% rename from pkgs/development/tools/rust/cargo-tauri/default.nix rename to pkgs/by-name/ca/cargo-tauri/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f80f2ded90e5..f6dd8f09a047 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15799,7 +15799,6 @@ with pkgs; cargo-ui = callPackage ../development/tools/rust/cargo-ui { }; cargo-unused-features = callPackage ../development/tools/rust/cargo-unused-features { }; - cargo-tauri = callPackage ../development/tools/rust/cargo-tauri { }; cargo-mobile2 = callPackage ../development/tools/rust/cargo-mobile2 { }; cargo-valgrind = callPackage ../development/tools/rust/cargo-valgrind { }; From 4a78651ed94220ef7835b848460cb0c96e857a46 Mon Sep 17 00:00:00 2001 From: seth <getchoo@tuta.io> Date: Sat, 17 Aug 2024 18:09:48 -0400 Subject: [PATCH 110/129] cargo-tauri: refactor Specifically: - Tighten dependencies by only listing what's needed to build - Better sorting things - Adding `meta.changelog` --- pkgs/by-name/ca/cargo-tauri/package.nix | 34 ++++++++++++------------- 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/pkgs/by-name/ca/cargo-tauri/package.nix b/pkgs/by-name/ca/cargo-tauri/package.nix index 7ae69fa55283..4ea5b5562d94 100644 --- a/pkgs/by-name/ca/cargo-tauri/package.nix +++ b/pkgs/by-name/ca/cargo-tauri/package.nix @@ -3,19 +3,14 @@ stdenv, rustPlatform, fetchFromGitHub, + darwin, + gtk3, + libsoup, openssl, pkg-config, - glibc, - libsoup, - cairo, - gtk3, webkitgtk, - darwin, }: -let - inherit (darwin.apple_sdk.frameworks) CoreServices Security SystemConfiguration; -in rustPlatform.buildRustPackage rec { pname = "tauri"; version = "1.7.1-unstable-2024-08-16"; @@ -33,26 +28,28 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-VXg/dAhwPTSrLwJm8HNzAi/sVF9RqgpHIF3PZe1LjSA="; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - glibc - libsoup - cairo gtk3 + libsoup webkitgtk ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - CoreServices - Security - SystemConfiguration - ]; - nativeBuildInputs = [ pkg-config ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin ( + with darwin.apple_sdk.frameworks; + [ + CoreServices + Security + SystemConfiguration + ] + ); meta = { description = "Build smaller, faster, and more secure desktop applications with a web frontend"; - mainProgram = "cargo-tauri"; homepage = "https://tauri.app/"; + changelog = "https://github.com/tauri-apps/tauri/releases/tag/tauri-v${version}"; license = with lib.licenses; [ asl20 # or mit @@ -61,5 +58,6 @@ rustPlatform.buildRustPackage rec { dit7ya happysalada ]; + mainProgram = "cargo-tauri"; }; } From c1c013bd3b83578321c32bb3d747c15138c28c2a Mon Sep 17 00:00:00 2001 From: seth <getchoo@tuta.io> Date: Sat, 17 Aug 2024 18:12:57 -0400 Subject: [PATCH 111/129] cargo-tauri: add getchoo as a maintainer --- pkgs/by-name/ca/cargo-tauri/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/ca/cargo-tauri/package.nix b/pkgs/by-name/ca/cargo-tauri/package.nix index 4ea5b5562d94..7e0302ee030f 100644 --- a/pkgs/by-name/ca/cargo-tauri/package.nix +++ b/pkgs/by-name/ca/cargo-tauri/package.nix @@ -56,6 +56,7 @@ rustPlatform.buildRustPackage rec { ]; maintainers = with lib.maintainers; [ dit7ya + getchoo happysalada ]; mainProgram = "cargo-tauri"; From b833d6a1d3ec777e22b3c1e8cb53a998eb2751fe Mon Sep 17 00:00:00 2001 From: seth <getchoo@tuta.io> Date: Sat, 17 Aug 2024 19:11:41 -0400 Subject: [PATCH 112/129] cargo-tauri.hook: init --- pkgs/by-name/ca/cargo-tauri/hook.nix | 56 +++++++++++++ pkgs/by-name/ca/cargo-tauri/hook.sh | 101 ++++++++++++++++++++++++ pkgs/by-name/ca/cargo-tauri/package.nix | 6 ++ 3 files changed, 163 insertions(+) create mode 100644 pkgs/by-name/ca/cargo-tauri/hook.nix create mode 100644 pkgs/by-name/ca/cargo-tauri/hook.sh diff --git a/pkgs/by-name/ca/cargo-tauri/hook.nix b/pkgs/by-name/ca/cargo-tauri/hook.nix new file mode 100644 index 000000000000..a1fbdd3024f7 --- /dev/null +++ b/pkgs/by-name/ca/cargo-tauri/hook.nix @@ -0,0 +1,56 @@ +{ + lib, + stdenv, + makeSetupHook, + cargo, + cargo-tauri, + rust, + # The subdirectory of `target/` from which to copy the build artifacts + targetSubdirectory ? stdenv.hostPlatform.rust.cargoShortTarget, +}: + +let + kernelName = stdenv.hostPlatform.parsed.kernel.name; +in +makeSetupHook { + name = "tauri-hook"; + + propagatedBuildInputs = [ + cargo + cargo-tauri + ]; + + substitutions = { + inherit targetSubdirectory; + inherit (rust.envVars) rustHostPlatformSpec setEnv; + + # A map of the bundles used for Tauri's different supported platforms + # https://github.com/tauri-apps/tauri/blob/23a912bb84d7c6088301e1ffc59adfa8a799beab/README.md#platforms + defaultTauriBundleType = + { + darwin = "app"; + linux = "deb"; + } + .${kernelName} or (throw "${kernelName} is not supported by cargo-tauri.hook"); + + # $targetDir is the path to the build artifacts (i.e., `./target/release`) + installScript = + { + darwin = '' + mkdir $out + mv "$targetDir"/bundle/macos $out/Applications + ''; + + linux = '' + mv "$targetDir"/bundle/deb/*/data/usr $out + ''; + } + .${kernelName} or (throw "${kernelName} is not supported by cargo-tauri.hook"); + }; + + meta = { + inherit (cargo-tauri.meta) maintainers broken; + # Platforms that Tauri supports bundles for + platforms = lib.platforms.darwin ++ lib.platforms.linux; + }; +} ./hook.sh diff --git a/pkgs/by-name/ca/cargo-tauri/hook.sh b/pkgs/by-name/ca/cargo-tauri/hook.sh new file mode 100644 index 000000000000..adfa24b515b8 --- /dev/null +++ b/pkgs/by-name/ca/cargo-tauri/hook.sh @@ -0,0 +1,101 @@ +# shellcheck shell=bash disable=SC2034,SC2154,SC2164 + +# We replace these +export dontCargoBuild=true +export dontCargoInstall=true + +tauriBuildHook() { + echo "Executing tauriBuildHook" + + runHook preBuild + + ## The following is lifted from rustPlatform.cargoBuildHook + ## As we're replacing it, we should also be respecting its options. + + # Account for running outside of mkRustPackage where this may not be set + cargoBuildType="${cargoBuildType:-release}" + + # Let stdenv handle stripping, for consistency and to not break + # separateDebugInfo. + export "CARGO_PROFILE_${cargoBuildType@U}_STRIP"=false + + if [ -n "${buildAndTestSubdir-}" ]; then + # ensure the output doesn't end up in the subdirectory + CARGO_TARGET_DIR="$(pwd)/target" + export CARGO_TARGET_DIR + + # Tauri doesn't respect $CARGO_TARGET_DIR, but does respect the cargo + # argument...but that doesn't respect `--target`, so we have to use the + # config file + # https://github.com/tauri-apps/tauri/issues/10190 + printf '\nbuild.target-dir = "%s"' "$CARGO_TARGET_DIR" >>config.toml + + pushd "${buildAndTestSubdir}" + fi + + local cargoFlagsArray=( + "-j" "$NIX_BUILD_CORES" + "--target" "@rustHostPlatformSpec@" + "--offline" + ) + local tauriFlagsArray=( + "--bundles" "${tauriBundleType:-@defaultTauriBundleType@}" + "--target" "@rustHostPlatformSpec@" + ) + + if [ "${cargoBuildType}" != "debug" ]; then + cargoFlagsArray+=("--profile" "${cargoBuildType}") + fi + + if [ -n "${cargoBuildNoDefaultFeatures-}" ]; then + cargoFlagsArray+=("--no-default-features") + fi + + if [ -n "${cargoBuildFeatures-}" ]; then + cargoFlagsArray+=("--features=$(concatStringsSep "," cargoBuildFeatures)") + fi + + concatTo cargoFlagsArray cargoBuildFlags + + if [ "${cargoBuildType:-}" == "debug" ]; then + tauriFlagsArray+=("--debug") + fi + + concatTo tauriFlagsArray tauriBuildFlags + + echoCmd 'cargo-tauri.hook cargoFlags' "${cargoFlagsArray[@]}" + echoCmd 'cargo-tauri.hook tauriFlags' "${tauriFlagsArray[@]}" + + @setEnv@ cargo tauri build "${tauriFlagsArray[@]}" -- "${cargoFlagsArray[@]}" + + if [ -n "${buildAndTestSubdir-}" ]; then + popd + fi + + runHook postBuild + + echo "Finished tauriBuildHook" +} + +tauriInstallHook() { + echo "Executing tauriInstallHook" + + runHook preInstall + + # Use a nice variable for our target directory in the following script + targetDir=target/@targetSubdirectory@/$cargoBuildType + + @installScript@ + + runHook postInstall + + echo "Finished tauriInstallHook" +} + +if [ -z "${dontTauriBuild:-}" ] && [ -z "${buildPhase:-}" ]; then + buildPhase=tauriBuildHook +fi + +if [ -z "${dontTauriInstall:-}" ] && [ -z "${installPhase:-}" ]; then + installPhase=tauriInstallHook +fi diff --git a/pkgs/by-name/ca/cargo-tauri/package.nix b/pkgs/by-name/ca/cargo-tauri/package.nix index 7e0302ee030f..da9cc02f4316 100644 --- a/pkgs/by-name/ca/cargo-tauri/package.nix +++ b/pkgs/by-name/ca/cargo-tauri/package.nix @@ -1,6 +1,7 @@ { lib, stdenv, + callPackage, rustPlatform, fetchFromGitHub, darwin, @@ -46,6 +47,11 @@ rustPlatform.buildRustPackage rec { ] ); + passthru = { + # See ./doc/hooks/tauri.section.md + hook = callPackage ./hook.nix { }; + }; + meta = { description = "Build smaller, faster, and more secure desktop applications with a web frontend"; homepage = "https://tauri.app/"; From f70fb77ea1875a09d4641a296932671e65a03cd7 Mon Sep 17 00:00:00 2001 From: seth <getchoo@tuta.io> Date: Sat, 17 Aug 2024 19:31:20 -0400 Subject: [PATCH 113/129] cargo-tauri: add test for setup hooks --- pkgs/by-name/ca/cargo-tauri/package.nix | 4 + pkgs/by-name/ca/cargo-tauri/test-app.nix | 60 + .../ca/cargo-tauri/update-time-crate.patch | 1378 +++++++++++++++++ 3 files changed, 1442 insertions(+) create mode 100644 pkgs/by-name/ca/cargo-tauri/test-app.nix create mode 100644 pkgs/by-name/ca/cargo-tauri/update-time-crate.patch diff --git a/pkgs/by-name/ca/cargo-tauri/package.nix b/pkgs/by-name/ca/cargo-tauri/package.nix index da9cc02f4316..867dff3b7c4f 100644 --- a/pkgs/by-name/ca/cargo-tauri/package.nix +++ b/pkgs/by-name/ca/cargo-tauri/package.nix @@ -50,6 +50,10 @@ rustPlatform.buildRustPackage rec { passthru = { # See ./doc/hooks/tauri.section.md hook = callPackage ./hook.nix { }; + + tests = { + setupHooks = callPackage ./test-app.nix { }; + }; }; meta = { diff --git a/pkgs/by-name/ca/cargo-tauri/test-app.nix b/pkgs/by-name/ca/cargo-tauri/test-app.nix new file mode 100644 index 000000000000..d9304e38910d --- /dev/null +++ b/pkgs/by-name/ca/cargo-tauri/test-app.nix @@ -0,0 +1,60 @@ +{ + lib, + stdenv, + rustPlatform, + cargo-tauri, + darwin, + glib-networking, + libsoup, + openssl, + pkg-config, + webkitgtk, + wrapGAppsHook3, +}: + +rustPlatform.buildRustPackage rec { + pname = "test-app"; + inherit (cargo-tauri) version src; + + # Basic example provided by upstream + sourceRoot = "${src.name}/examples/workspace"; + + cargoPatches = [ + # https://github.com/NixOS/nixpkgs/issues/332957 + ./update-time-crate.patch + ]; + + cargoHash = "sha256-ull9BWzeKsnMi4wcH67FnKFzTjqEdiRlM3f+EKIPvvU="; + + nativeBuildInputs = [ + cargo-tauri.hook + + pkg-config + wrapGAppsHook3 + ]; + + buildInputs = + [ openssl ] + ++ lib.optionals stdenv.isLinux [ + glib-networking + libsoup + webkitgtk + ] + ++ lib.optionals stdenv.isDarwin ( + with darwin.apple_sdk.frameworks; + [ + AppKit + CoreServices + Security + WebKit + ] + ); + + # No one should be actually running this, so lets save some time + buildType = "debug"; + doCheck = false; + + meta = { + inherit (cargo-tauri.hook.meta) platforms; + }; +} diff --git a/pkgs/by-name/ca/cargo-tauri/update-time-crate.patch b/pkgs/by-name/ca/cargo-tauri/update-time-crate.patch new file mode 100644 index 000000000000..6f27242a60cd --- /dev/null +++ b/pkgs/by-name/ca/cargo-tauri/update-time-crate.patch @@ -0,0 +1,1378 @@ +diff --git a/Cargo.lock b/Cargo.lock +index b0b153f67..dd801d616 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -32,6 +32,21 @@ dependencies = [ + "alloc-no-stdlib", + ] + ++[[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 = "anyhow" + version = "1.0.68" +@@ -87,9 +102,15 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" + + [[package]] + name = "base64" +-version = "0.20.0" ++version = "0.21.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" ++ ++[[package]] ++name = "base64" ++version = "0.22.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "0ea22880d78093b0cbe17c89f64a7d457941e65759157ec6cb31a31d652b05e5" ++checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" + + [[package]] + name = "bitflags" +@@ -114,9 +135,9 @@ dependencies = [ + + [[package]] + name = "brotli" +-version = "3.3.4" ++version = "6.0.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a1a0b1dbcc8ae29329621f8d4f0d835787c1c38bb1401979b49d13b0b305ff68" ++checksum = "74f7971dbd9326d58187408ab83117d8ac1bb9c17b085fdacd1cf2f598719b6b" + dependencies = [ + "alloc-no-stdlib", + "alloc-stdlib", +@@ -125,9 +146,9 @@ dependencies = [ + + [[package]] + name = "brotli-decompressor" +-version = "2.3.4" ++version = "4.0.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4b6561fd3f895a11e8f72af2cb7d22e08366bebc2b6b57f7744c4bda27034744" ++checksum = "9a45bd2e4095a8b518033b128020dd4a55aab1c0a381ba4404a472630f4bc362" + dependencies = [ + "alloc-no-stdlib", + "alloc-stdlib", +@@ -143,6 +164,12 @@ dependencies = [ + "serde", + ] + ++[[package]] ++name = "bumpalo" ++version = "3.16.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" ++ + [[package]] + name = "bytemuck" + version = "1.12.3" +@@ -187,19 +214,22 @@ dependencies = [ + + [[package]] + name = "cargo_toml" +-version = "0.14.0" ++version = "0.15.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "0f1204fe51a1e56042b8ec31d6407547ecd18f596b66f470dadb9abd9be9c843" ++checksum = "599aa35200ffff8f04c1925aa1acc92fa2e08874379ef42e210a80e527e60838" + dependencies = [ + "serde", +- "toml", ++ "toml 0.7.8", + ] + + [[package]] + name = "cc" +-version = "1.0.78" ++version = "1.1.18" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a20104e2335ce8a659d6dd92a51a767a0c062599c73b343fd152cb401e828c3d" ++checksum = "b62ac837cdb5cb22e10a256099b4fc502b1dfe560cb282963a974d7abd80e476" ++dependencies = [ ++ "shlex", ++] + + [[package]] + name = "cesu8" +@@ -242,6 +272,19 @@ version = "1.0.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + ++[[package]] ++name = "chrono" ++version = "0.4.38" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" ++dependencies = [ ++ "android-tzdata", ++ "iana-time-zone", ++ "num-traits", ++ "serde", ++ "windows-targets", ++] ++ + [[package]] + name = "cocoa" + version = "0.24.1" +@@ -401,7 +444,7 @@ dependencies = [ + "proc-macro2", + "quote", + "smallvec", +- "syn", ++ "syn 1.0.107", + ] + + [[package]] +@@ -411,17 +454,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "dfae75de57f2b2e85e8768c3ea840fd159c8f33e2b6522c7835b7abac81be16e" + dependencies = [ + "quote", +- "syn", ++ "syn 1.0.107", + ] + + [[package]] + name = "ctor" +-version = "0.1.26" ++version = "0.2.8" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096" ++checksum = "edb49164822f3ee45b17acd4a208cfc1251410cf0cad9a833234c9890774dd9f" + dependencies = [ + "quote", +- "syn", ++ "syn 2.0.77", + ] + + [[package]] +@@ -432,9 +475,9 @@ checksum = "b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35" + + [[package]] + name = "darling" +-version = "0.13.4" ++version = "0.20.10" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a01d95850c592940db9b8194bc39f4bc0e89dee5c4265e4b1807c34a9aba453c" ++checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" + dependencies = [ + "darling_core", + "darling_macro", +@@ -442,27 +485,37 @@ dependencies = [ + + [[package]] + name = "darling_core" +-version = "0.13.4" ++version = "0.20.10" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610" ++checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" + dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim", +- "syn", ++ "syn 2.0.77", + ] + + [[package]] + name = "darling_macro" +-version = "0.13.4" ++version = "0.20.10" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835" ++checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" + dependencies = [ + "darling_core", + "quote", +- "syn", ++ "syn 2.0.77", ++] ++ ++[[package]] ++name = "deranged" ++version = "0.3.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" ++dependencies = [ ++ "powerfmt", ++ "serde", + ] + + [[package]] +@@ -475,7 +528,7 @@ dependencies = [ + "proc-macro2", + "quote", + "rustc_version 0.4.0", +- "syn", ++ "syn 1.0.107", + ] + + [[package]] +@@ -551,6 +604,12 @@ dependencies = [ + "cfg-if", + ] + ++[[package]] ++name = "equivalent" ++version = "1.0.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" ++ + [[package]] + name = "fastrand" + version = "1.8.0" +@@ -592,6 +651,15 @@ dependencies = [ + "miniz_oxide", + ] + ++[[package]] ++name = "fluent-uri" ++version = "0.1.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "17c704e9dbe1ddd863da1e6ff3567795087b1eb201ce80d8fa81162e1516500d" ++dependencies = [ ++ "bitflags", ++] ++ + [[package]] + name = "fnv" + version = "1.0.7" +@@ -672,7 +740,7 @@ checksum = "bdfb8ce053d86b91919aad980c220b1fb8401a9394410e1c289ed7e66b61835d" + dependencies = [ + "proc-macro2", + "quote", +- "syn", ++ "syn 1.0.107", + ] + + [[package]] +@@ -883,7 +951,7 @@ dependencies = [ + "proc-macro-error", + "proc-macro2", + "quote", +- "syn", ++ "syn 1.0.107", + ] + + [[package]] +@@ -978,7 +1046,7 @@ dependencies = [ + "proc-macro-error", + "proc-macro2", + "quote", +- "syn", ++ "syn 1.0.107", + ] + + [[package]] +@@ -987,6 +1055,12 @@ version = "0.12.3" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + ++[[package]] ++name = "hashbrown" ++version = "0.14.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" ++ + [[package]] + name = "heck" + version = "0.3.3" +@@ -1002,6 +1076,12 @@ version = "0.4.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" + ++[[package]] ++name = "heck" ++version = "0.5.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" ++ + [[package]] + name = "hermit-abi" + version = "0.2.6" +@@ -1011,18 +1091,24 @@ dependencies = [ + "libc", + ] + ++[[package]] ++name = "hex" ++version = "0.4.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" ++ + [[package]] + name = "html5ever" +-version = "0.25.2" ++version = "0.26.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e5c13fb08e5d4dfc151ee5e88bae63f7773d61852f3bdc73c9f4b9e1bde03148" ++checksum = "bea68cab48b8459f17cf1c944c67ddc572d272d9f2b274140f223ecb1da4a3b7" + dependencies = [ + "log", + "mac", + "markup5ever", + "proc-macro2", + "quote", +- "syn", ++ "syn 1.0.107", + ] + + [[package]] +@@ -1042,6 +1128,29 @@ version = "0.1.5" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "21dec9db110f5f872ed9699c3ecf50cf16f423502706ba5c72462e28d3157573" + ++[[package]] ++name = "iana-time-zone" ++version = "0.1.60" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" ++dependencies = [ ++ "android_system_properties", ++ "core-foundation-sys", ++ "iana-time-zone-haiku", ++ "js-sys", ++ "wasm-bindgen", ++ "windows-core", ++] ++ ++[[package]] ++name = "iana-time-zone-haiku" ++version = "0.1.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" ++dependencies = [ ++ "cc", ++] ++ + [[package]] + name = "ico" + version = "0.3.0" +@@ -1106,14 +1215,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" + dependencies = [ + "autocfg", +- "hashbrown", ++ "hashbrown 0.12.3", ++ "serde", ++] ++ ++[[package]] ++name = "indexmap" ++version = "2.5.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5" ++dependencies = [ ++ "equivalent", ++ "hashbrown 0.14.5", ++ "serde", + ] + + [[package]] + name = "infer" +-version = "0.12.0" ++version = "0.13.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a898e4b7951673fce96614ce5751d13c40fc5674bc2d759288e46c3ab62598b3" ++checksum = "f551f8c3a39f68f986517db0d1759de85881894fdc7db798bd2a9df9cb04b7fc" + dependencies = [ + "cfb", + ] +@@ -1182,26 +1303,47 @@ version = "0.3.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" + ++[[package]] ++name = "js-sys" ++version = "0.3.70" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" ++dependencies = [ ++ "wasm-bindgen", ++] ++ + [[package]] + name = "json-patch" +-version = "0.3.0" ++version = "2.0.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e712e62827c382a77b87f590532febb1f8b2fdbc3eefa1ee37fe7281687075ef" ++checksum = "5b1fb8864823fad91877e6caea0baca82e49e8db50f8e5c9f9a453e27d3330fc" + dependencies = [ ++ "jsonptr", + "serde", + "serde_json", + "thiserror", +- "treediff", + ] + + [[package]] +-name = "kuchiki" +-version = "0.8.1" ++name = "jsonptr" ++version = "0.4.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1c6e529149475ca0b2820835d3dce8fcc41c6b943ca608d32f35b449255e4627" ++dependencies = [ ++ "fluent-uri", ++ "serde", ++ "serde_json", ++] ++ ++[[package]] ++name = "kuchikiki" ++version = "0.8.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "1ea8e9c6e031377cff82ee3001dc8026cdf431ed4e2e6b51f98ab8c73484a358" ++checksum = "f29e4755b7b995046f510a7520c42b2fed58b77bd94d5a87a8eb43d2fd126da8" + dependencies = [ + "cssparser", + "html5ever", ++ "indexmap 1.9.2", + "matches", + "selectors", + ] +@@ -1278,13 +1420,13 @@ dependencies = [ + + [[package]] + name = "markup5ever" +-version = "0.10.1" ++version = "0.11.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a24f40fb03852d1cdd84330cddcaf98e9ec08a7b7768e952fad3b4cf048ec8fd" ++checksum = "7a2629bb1404f3d34c2e921f21fd34ba00b206124c81f65c50b43b6aaefeb016" + dependencies = [ + "log", +- "phf 0.8.0", +- "phf_codegen", ++ "phf 0.10.1", ++ "phf_codegen 0.10.0", + "string_cache", + "string_cache_codegen", + "tendril", +@@ -1379,6 +1521,12 @@ dependencies = [ + "winapi", + ] + ++[[package]] ++name = "num-conv" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" ++ + [[package]] + name = "num-integer" + version = "0.1.45" +@@ -1437,7 +1585,7 @@ dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", +- "syn", ++ "syn 1.0.107", + ] + + [[package]] +@@ -1561,9 +1709,17 @@ version = "0.10.1" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259" + dependencies = [ +- "phf_macros 0.10.0", + "phf_shared 0.10.0", +- "proc-macro-hack", ++] ++ ++[[package]] ++name = "phf" ++version = "0.11.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" ++dependencies = [ ++ "phf_macros 0.11.2", ++ "phf_shared 0.11.2", + ] + + [[package]] +@@ -1576,6 +1732,16 @@ dependencies = [ + "phf_shared 0.8.0", + ] + ++[[package]] ++name = "phf_codegen" ++version = "0.10.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4fb1c3a8bc4dd4e5cfce29b44ffc14bedd2ee294559a294e2a4d4c9e9a6a13cd" ++dependencies = [ ++ "phf_generator 0.10.0", ++ "phf_shared 0.10.0", ++] ++ + [[package]] + name = "phf_generator" + version = "0.8.0" +@@ -1596,6 +1762,16 @@ dependencies = [ + "rand 0.8.5", + ] + ++[[package]] ++name = "phf_generator" ++version = "0.11.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" ++dependencies = [ ++ "phf_shared 0.11.2", ++ "rand 0.8.5", ++] ++ + [[package]] + name = "phf_macros" + version = "0.8.0" +@@ -1607,21 +1783,20 @@ dependencies = [ + "proc-macro-hack", + "proc-macro2", + "quote", +- "syn", ++ "syn 1.0.107", + ] + + [[package]] + name = "phf_macros" +-version = "0.10.0" ++version = "0.11.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "58fdf3184dd560f160dd73922bea2d5cd6e8f064bf4b13110abd81b03697b4e0" ++checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b" + dependencies = [ +- "phf_generator 0.10.0", +- "phf_shared 0.10.0", +- "proc-macro-hack", ++ "phf_generator 0.11.2", ++ "phf_shared 0.11.2", + "proc-macro2", + "quote", +- "syn", ++ "syn 2.0.77", + ] + + [[package]] +@@ -1642,6 +1817,15 @@ dependencies = [ + "siphasher", + ] + ++[[package]] ++name = "phf_shared" ++version = "0.11.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" ++dependencies = [ ++ "siphasher", ++] ++ + [[package]] + name = "pin-project-lite" + version = "0.2.9" +@@ -1667,7 +1851,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "5329b8f106a176ab0dce4aae5da86bfcb139bb74fb00882859e03745011f3635" + dependencies = [ + "base64 0.13.1", +- "indexmap", ++ "indexmap 1.9.2", + "line-wrap", + "quick-xml", + "serde", +@@ -1686,6 +1870,12 @@ dependencies = [ + "miniz_oxide", + ] + ++[[package]] ++name = "powerfmt" ++version = "0.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" ++ + [[package]] + name = "ppv-lite86" + version = "0.2.17" +@@ -1706,7 +1896,7 @@ checksum = "eda0fc3b0fb7c975631757e14d9049da17374063edb6ebbcbc54d880d4fe94e9" + dependencies = [ + "once_cell", + "thiserror", +- "toml", ++ "toml 0.5.10", + ] + + [[package]] +@@ -1718,7 +1908,7 @@ dependencies = [ + "proc-macro-error-attr", + "proc-macro2", + "quote", +- "syn", ++ "syn 1.0.107", + "version_check", + ] + +@@ -1741,9 +1931,9 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" + + [[package]] + name = "proc-macro2" +-version = "1.0.50" ++version = "1.0.86" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "6ef7d57beacfaf2d8aee5937dab7b7f28de3cb8b1828479bb5de2a7106f2bae2" ++checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" + dependencies = [ + "unicode-ident", + ] +@@ -1759,9 +1949,9 @@ dependencies = [ + + [[package]] + name = "quote" +-version = "1.0.23" ++version = "1.0.37" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b" ++checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" + dependencies = [ + "proc-macro2", + ] +@@ -1981,7 +2171,7 @@ dependencies = [ + "log", + "matches", + "phf 0.8.0", +- "phf_codegen", ++ "phf_codegen 0.8.0", + "precomputed-hash", + "servo_arc", + "smallvec", +@@ -2017,31 +2207,33 @@ dependencies = [ + + [[package]] + name = "serde" +-version = "1.0.152" ++version = "1.0.210" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb" ++checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" + dependencies = [ + "serde_derive", + ] + + [[package]] + name = "serde_derive" +-version = "1.0.152" ++version = "1.0.210" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e" ++checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" + dependencies = [ + "proc-macro2", + "quote", +- "syn", ++ "syn 2.0.77", + ] + + [[package]] + name = "serde_json" +-version = "1.0.91" ++version = "1.0.128" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "877c235533714907a8c2464236f5c4b2a17262ef1bd71f38f35ea592c8da6883" ++checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" + dependencies = [ ++ "indexmap 2.5.0", + "itoa 1.0.5", ++ "memchr", + "ryu", + "serde", + ] +@@ -2054,36 +2246,53 @@ checksum = "9a5ec9fa74a20ebbe5d9ac23dac1fc96ba0ecfe9f50f2843b52e537b10fbcb4e" + dependencies = [ + "proc-macro2", + "quote", +- "syn", ++ "syn 1.0.107", ++] ++ ++[[package]] ++name = "serde_spanned" ++version = "0.6.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d" ++dependencies = [ ++ "serde", + ] + + [[package]] + name = "serde_with" +-version = "1.14.0" ++version = "3.9.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "678b5a069e50bf00ecd22d0cd8ddf7c236f68581b03db652061ed5eb13a312ff" ++checksum = "69cecfa94848272156ea67b2b1a53f20fc7bc638c4a46d2f8abde08f05f4b857" + dependencies = [ ++ "base64 0.22.1", ++ "chrono", ++ "hex", ++ "indexmap 1.9.2", ++ "indexmap 2.5.0", + "serde", ++ "serde_derive", ++ "serde_json", + "serde_with_macros", ++ "time", + ] + + [[package]] + name = "serde_with_macros" +-version = "1.5.2" ++version = "3.9.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e182d6ec6f05393cc0e5ed1bf81ad6db3a8feedf8ee515ecdd369809bcce8082" ++checksum = "a8fee4991ef4f274617a51ad4af30519438dacb2f56ac773b08a1922ff743350" + dependencies = [ + "darling", + "proc-macro2", + "quote", +- "syn", ++ "syn 2.0.77", + ] + + [[package]] + name = "serialize-to-javascript" +-version = "0.1.1" ++version = "0.1.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c9823f2d3b6a81d98228151fdeaf848206a7855a7a042bbf9bf870449a66cafb" ++checksum = "04f3666a07a197cdb77cdf306c32be9b7f598d7060d50cfd4d5aa04bfd92f6c5" + dependencies = [ + "serde", + "serde_json", +@@ -2092,13 +2301,13 @@ dependencies = [ + + [[package]] + name = "serialize-to-javascript-impl" +-version = "0.1.1" ++version = "0.1.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "74064874e9f6a15f04c1f3cb627902d0e6b410abbf36668afa873c61889f1763" ++checksum = "772ee033c0916d670af7860b6e1ef7d658a4629a6d0b4c8c3e67f09b3765b75d" + dependencies = [ + "proc-macro2", + "quote", +- "syn", ++ "syn 2.0.77", + ] + + [[package]] +@@ -2131,6 +2340,12 @@ dependencies = [ + "lazy_static", + ] + ++[[package]] ++name = "shlex" ++version = "1.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" ++ + [[package]] + name = "siphasher" + version = "0.3.10" +@@ -2223,9 +2438,9 @@ dependencies = [ + + [[package]] + name = "strsim" +-version = "0.10.0" ++version = "0.11.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" ++checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + + [[package]] + name = "syn" +@@ -2238,6 +2453,17 @@ dependencies = [ + "unicode-ident", + ] + ++[[package]] ++name = "syn" ++version = "2.0.77" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "unicode-ident", ++] ++ + [[package]] + name = "system-deps" + version = "5.0.0" +@@ -2247,7 +2473,7 @@ dependencies = [ + "cfg-expr 0.9.1", + "heck 0.3.3", + "pkg-config", +- "toml", ++ "toml 0.5.10", + "version-compare 0.0.11", + ] + +@@ -2260,7 +2486,7 @@ dependencies = [ + "cfg-expr 0.11.0", + "heck 0.4.0", + "pkg-config", +- "toml", ++ "toml 0.5.10", + "version-compare 0.1.1", + ] + +@@ -2318,7 +2544,7 @@ checksum = "3b6fcd8245d45a39ffc8715183d92ae242750eb57b285eb3bcd63dfd512afd09" + dependencies = [ + "proc-macro2", + "quote", +- "syn", ++ "syn 1.0.107", + ] + + [[package]] +@@ -2334,19 +2560,21 @@ dependencies = [ + + [[package]] + name = "tauri" +-version = "1.2.4" ++version = "1.7.1" + dependencies = [ + "anyhow", + "cocoa", + "dirs-next", ++ "dunce", + "embed_plist", + "encoding_rs", + "flate2", + "futures-util", ++ "getrandom 0.2.8", + "glib", + "glob", + "gtk", +- "heck 0.4.0", ++ "heck 0.5.0", + "http", + "ignore", + "objc", +@@ -2377,24 +2605,26 @@ dependencies = [ + + [[package]] + name = "tauri-build" +-version = "1.2.1" ++version = "1.5.3" + dependencies = [ + "anyhow", + "cargo_toml", +- "heck 0.4.0", ++ "dirs-next", ++ "heck 0.5.0", + "json-patch", + "semver 1.0.16", + "serde", + "serde_json", + "tauri-utils", + "tauri-winres", ++ "walkdir", + ] + + [[package]] + name = "tauri-codegen" +-version = "1.2.1" ++version = "1.4.4" + dependencies = [ +- "base64 0.20.0", ++ "base64 0.21.7", + "brotli", + "ico", + "json-patch", +@@ -2415,19 +2645,19 @@ dependencies = [ + + [[package]] + name = "tauri-macros" +-version = "1.2.1" ++version = "1.4.5" + dependencies = [ +- "heck 0.4.0", ++ "heck 0.5.0", + "proc-macro2", + "quote", +- "syn", ++ "syn 1.0.107", + "tauri-codegen", + "tauri-utils", + ] + + [[package]] + name = "tauri-runtime" +-version = "0.12.1" ++version = "0.14.4" + dependencies = [ + "gtk", + "http", +@@ -2446,7 +2676,7 @@ dependencies = [ + + [[package]] + name = "tauri-runtime-wry" +-version = "0.12.2" ++version = "0.14.9" + dependencies = [ + "cocoa", + "gtk", +@@ -2464,18 +2694,20 @@ dependencies = [ + + [[package]] + name = "tauri-utils" +-version = "1.2.1" ++version = "1.6.0" + dependencies = [ + "brotli", + "ctor", ++ "dunce", + "glob", +- "heck 0.4.0", ++ "heck 0.5.0", + "html5ever", + "infer", + "json-patch", +- "kuchiki", ++ "kuchikiki", ++ "log", + "memchr", +- "phf 0.10.1", ++ "phf 0.11.2", + "proc-macro2", + "quote", + "semver 1.0.16", +@@ -2485,7 +2717,7 @@ dependencies = [ + "thiserror", + "url", + "walkdir", +- "windows", ++ "windows-version", + ] + + [[package]] +@@ -2494,7 +2726,7 @@ version = "0.1.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "1b7a78dc04f75fb5ab815e66ac561c81e92a968a40f29e7c21afd152d694fad8" + dependencies = [ +- "toml", ++ "toml 0.5.10", + "version_check", + ] + +@@ -2531,22 +2763,22 @@ checksum = "8eaa81235c7058867fa8c0e7314f33dcce9c215f535d1913822a2b3f5e289f3c" + + [[package]] + name = "thiserror" +-version = "1.0.38" ++version = "1.0.63" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0" ++checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" + dependencies = [ + "thiserror-impl", + ] + + [[package]] + name = "thiserror-impl" +-version = "1.0.38" ++version = "1.0.63" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f" ++checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" + dependencies = [ + "proc-macro2", + "quote", +- "syn", ++ "syn 2.0.77", + ] + + [[package]] +@@ -2560,11 +2792,14 @@ dependencies = [ + + [[package]] + name = "time" +-version = "0.3.17" ++version = "0.3.36" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a561bf4617eebd33bca6434b988f39ed798e527f51a1e797d0ee4f61c0a38376" ++checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" + dependencies = [ ++ "deranged", + "itoa 1.0.5", ++ "num-conv", ++ "powerfmt", + "serde", + "time-core", + "time-macros", +@@ -2572,16 +2807,17 @@ dependencies = [ + + [[package]] + name = "time-core" +-version = "0.1.0" ++version = "0.1.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" ++checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + + [[package]] + name = "time-macros" +-version = "0.2.6" ++version = "0.2.18" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d967f99f534ca7e495c575c62638eebc2898a8c84c119b89e250477bc4ba16b2" ++checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" + dependencies = [ ++ "num-conv", + "time-core", + ] + +@@ -2623,6 +2859,40 @@ dependencies = [ + "serde", + ] + ++[[package]] ++name = "toml" ++version = "0.7.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" ++dependencies = [ ++ "serde", ++ "serde_spanned", ++ "toml_datetime", ++ "toml_edit", ++] ++ ++[[package]] ++name = "toml_datetime" ++version = "0.6.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" ++dependencies = [ ++ "serde", ++] ++ ++[[package]] ++name = "toml_edit" ++version = "0.19.15" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" ++dependencies = [ ++ "indexmap 2.5.0", ++ "serde", ++ "serde_spanned", ++ "toml_datetime", ++ "winnow", ++] ++ + [[package]] + name = "tracing" + version = "0.1.37" +@@ -2643,7 +2913,7 @@ checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a" + dependencies = [ + "proc-macro2", + "quote", +- "syn", ++ "syn 1.0.107", + ] + + [[package]] +@@ -2685,15 +2955,6 @@ dependencies = [ + "tracing-log", + ] + +-[[package]] +-name = "treediff" +-version = "4.0.2" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "52984d277bdf2a751072b5df30ec0377febdb02f7696d64c2d7d54630bac4303" +-dependencies = [ +- "serde_json", +-] +- + [[package]] + name = "typenum" + version = "1.16.0" +@@ -2807,6 +3068,61 @@ 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.93" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" ++dependencies = [ ++ "cfg-if", ++ "once_cell", ++ "wasm-bindgen-macro", ++] ++ ++[[package]] ++name = "wasm-bindgen-backend" ++version = "0.2.93" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" ++dependencies = [ ++ "bumpalo", ++ "log", ++ "once_cell", ++ "proc-macro2", ++ "quote", ++ "syn 2.0.77", ++ "wasm-bindgen-shared", ++] ++ ++[[package]] ++name = "wasm-bindgen-macro" ++version = "0.2.93" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" ++dependencies = [ ++ "quote", ++ "wasm-bindgen-macro-support", ++] ++ ++[[package]] ++name = "wasm-bindgen-macro-support" ++version = "0.2.93" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn 2.0.77", ++ "wasm-bindgen-backend", ++ "wasm-bindgen-shared", ++] ++ ++[[package]] ++name = "wasm-bindgen-shared" ++version = "0.2.93" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" ++ + [[package]] + name = "webkit2gtk" + version = "0.18.2" +@@ -2874,7 +3190,7 @@ checksum = "eaebe196c01691db62e9e4ca52c5ef1e4fd837dcae27dae3ada599b5a8fd05ac" + dependencies = [ + "proc-macro2", + "quote", +- "syn", ++ "syn 1.0.107", + ] + + [[package]] +@@ -2947,13 +3263,22 @@ dependencies = [ + "windows-tokens", + ] + ++[[package]] ++name = "windows-core" ++version = "0.52.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" ++dependencies = [ ++ "windows-targets", ++] ++ + [[package]] + name = "windows-implement" + version = "0.39.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "ba01f98f509cb5dc05f4e5fc95e535f78260f15fea8fe1a8abdd08f774f1cee7" + dependencies = [ +- "syn", ++ "syn 1.0.107", + "windows-tokens", + ] + +@@ -2969,27 +3294,58 @@ 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.1", + "windows_aarch64_msvc 0.42.1", + "windows_i686_gnu 0.42.1", + "windows_i686_msvc 0.42.1", + "windows_x86_64_gnu 0.42.1", +- "windows_x86_64_gnullvm", ++ "windows_x86_64_gnullvm 0.42.1", + "windows_x86_64_msvc 0.42.1", + ] + ++[[package]] ++name = "windows-targets" ++version = "0.52.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" ++dependencies = [ ++ "windows_aarch64_gnullvm 0.52.6", ++ "windows_aarch64_msvc 0.52.6", ++ "windows_i686_gnu 0.52.6", ++ "windows_i686_gnullvm", ++ "windows_i686_msvc 0.52.6", ++ "windows_x86_64_gnu 0.52.6", ++ "windows_x86_64_gnullvm 0.52.6", ++ "windows_x86_64_msvc 0.52.6", ++] ++ + [[package]] + name = "windows-tokens" + version = "0.39.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "f838de2fe15fe6bac988e74b798f26499a8b21a9d97edec321e79b28d1d7f597" + ++[[package]] ++name = "windows-version" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6998aa457c9ba8ff2fb9f13e9d2a930dabcea28f1d0ab94d687d8b3654844515" ++dependencies = [ ++ "windows-targets", ++] ++ + [[package]] + name = "windows_aarch64_gnullvm" + version = "0.42.1" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608" + ++[[package]] ++name = "windows_aarch64_gnullvm" ++version = "0.52.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" ++ + [[package]] + name = "windows_aarch64_msvc" + version = "0.39.0" +@@ -3002,6 +3358,12 @@ version = "0.42.1" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7" + ++[[package]] ++name = "windows_aarch64_msvc" ++version = "0.52.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" ++ + [[package]] + name = "windows_i686_gnu" + version = "0.39.0" +@@ -3014,6 +3376,18 @@ version = "0.42.1" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640" + ++[[package]] ++name = "windows_i686_gnu" ++version = "0.52.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" ++ ++[[package]] ++name = "windows_i686_gnullvm" ++version = "0.52.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" ++ + [[package]] + name = "windows_i686_msvc" + version = "0.39.0" +@@ -3026,6 +3400,12 @@ version = "0.42.1" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605" + ++[[package]] ++name = "windows_i686_msvc" ++version = "0.52.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" ++ + [[package]] + name = "windows_x86_64_gnu" + version = "0.39.0" +@@ -3038,12 +3418,24 @@ version = "0.42.1" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45" + ++[[package]] ++name = "windows_x86_64_gnu" ++version = "0.52.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" ++ + [[package]] + name = "windows_x86_64_gnullvm" + version = "0.42.1" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463" + ++[[package]] ++name = "windows_x86_64_gnullvm" ++version = "0.52.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" ++ + [[package]] + name = "windows_x86_64_msvc" + version = "0.39.0" +@@ -3056,11 +3448,26 @@ version = "0.42.1" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd" + ++[[package]] ++name = "windows_x86_64_msvc" ++version = "0.52.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" ++ ++[[package]] ++name = "winnow" ++version = "0.5.40" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" ++dependencies = [ ++ "memchr", ++] ++ + [[package]] + name = "wry" +-version = "0.24.1" ++version = "0.24.11" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "1c846dc4dda988e959869dd0802cd27417c9696e584593e49178aeee28890d25" ++checksum = "c55c80b12287eb1ff7c365fc2f7a5037cb6181bd44c9fce81c8d1cf7605ffad6" + dependencies = [ + "base64 0.13.1", + "block", +@@ -3074,7 +3481,7 @@ dependencies = [ + "gtk", + "html5ever", + "http", +- "kuchiki", ++ "kuchikiki", + "libc", + "log", + "objc", From ec696bd85de1089bd70c103e1b1b308ec1c0c584 Mon Sep 17 00:00:00 2001 From: seth <getchoo@tuta.io> Date: Sun, 18 Aug 2024 05:37:12 -0400 Subject: [PATCH 114/129] doc: init tauri hook section --- doc/hooks/index.md | 1 + doc/hooks/tauri.section.md | 108 +++++++++++++++++++++++++++++++++++++ 2 files changed, 109 insertions(+) create mode 100644 doc/hooks/tauri.section.md diff --git a/doc/hooks/index.md b/doc/hooks/index.md index 0d6fcd27f276..e96deb81bd4e 100644 --- a/doc/hooks/index.md +++ b/doc/hooks/index.md @@ -30,6 +30,7 @@ postgresql-test-hook.section.md premake.section.md python.section.md scons.section.md +tauri.section.md tetex-tex-live.section.md unzip.section.md validatePkgConfig.section.md diff --git a/doc/hooks/tauri.section.md b/doc/hooks/tauri.section.md new file mode 100644 index 000000000000..1f468950580a --- /dev/null +++ b/doc/hooks/tauri.section.md @@ -0,0 +1,108 @@ +# cargo-tauri.hook {#tauri-hook} + +[Tauri](https://tauri.app/) is a framework for building smaller, faster, and +more secure desktop applications with a web frontend. + +In Nixpkgs, `cargo-tauri.hook` overrides the default build and install phases. + +## Example code snippet {#tauri-hook-example-code-snippet} + +```nix +{ + lib, + stdenv, + rustPlatform, + fetchNpmDeps, + cargo-tauri, + darwin, + glib-networking, + libsoup, + nodejs, + npmHooks, + openssl, + pkg-config, + webkitgtk, + wrapGAppsHook3, +}: + +rustPlatform.buildRustPackage rec { + # . . . + + cargoHash = "..."; + + # Assuming our app's frontend uses `npm` as a package manager + npmDeps = fetchNpmDeps { + name = "${pname}-npm-deps-${version}"; + inherit src; + hash = "..."; + }; + + nativeBuildInputs = [ + # Pull in our main hook + cargo-tauri.hook + + # Setup npm + nodejs + npmHooks.npmConfigHook + + # Make sure we can find our libraries + pkg-config + wrapGAppsHook3 + ]; + + buildInputs = + [ openssl ] + ++ lib.optionals stdenv.isLinux [ + glib-networking # Most Tauri apps need networking + libsoup + webkitgtk + ] + ++ lib.optionals stdenv.isDarwin ( + with darwin.apple_sdk.frameworks; + [ + AppKit + CoreServices + Security + WebKit + ] + ); + + # Set our Tauri source directory + cargoRoot = "src-tauri"; + # And make sure we build there too + buildAndTestSubdir = cargoRoot; + + # . . . +} +``` + +## Variables controlling cargo-tauri {#tauri-hook-variables-controlling} + +### Tauri Exclusive Variables {#tauri-hook-exclusive-variables} + +#### `tauriBuildFlags` {#tauri-build-flags} + +Controls the flags passed to `cargo tauri build`. + +#### `tauriBundleType` {#tauri-bundle-type} + +The [bundle type](https://tauri.app/v1/guides/building/) to build. + +#### `dontTauriBuild` {#dont-tauri-build} + +Disables using `tauriBuildHook`. + +#### `dontTauriInstall` {#dont-tauri-install} + +Disables using `tauriInstallPostBuildHook` and `tauriInstallHook`. + +### Honored Variables {#tauri-hook-honored-variables} + +Along with those found in [](#compiling-rust-applications-with-cargo), the +following variables used by `cargoBuildHook` and `cargoInstallHook` are honored +by the cargo-tauri setup hook. + +- `buildAndTestSubdir` +- `cargoBuildType` +- `cargoBuildNoDefaultFeatures` +- `cargoBuildFeatures` From 5b5c9540a59481239cbfed1051e717a85527ee52 Mon Sep 17 00:00:00 2001 From: seth <getchoo@tuta.io> Date: Sun, 18 Aug 2024 05:48:10 -0400 Subject: [PATCH 115/129] modrinth-app: use cargo-tauri.hook --- .../mo/modrinth-app-unwrapped/package.nix | 31 ++----------------- 1 file changed, 3 insertions(+), 28 deletions(-) diff --git a/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix b/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix index ca32e25fb03a..c53296c3b027 100644 --- a/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix +++ b/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix @@ -76,7 +76,7 @@ rustPlatform.buildRustPackage { }); nativeBuildInputs = [ - cargo-tauri + cargo-tauri.hook desktop-file-utils pnpm_8 nodejs @@ -100,14 +100,6 @@ rustPlatform.buildRustPackage { ); env = { - tauriBundle = - { - Linux = "deb"; - Darwin = "app"; - } - .${stdenv.hostPlatform.uname.system} - or (builtins.throw "No tauri bundle available for ${stdenv.hostPlatform.uname.system}!"); - ESBUILD_BINARY_PATH = lib.getExe ( esbuild.override { buildGoModule = args: buildGoModule (args // rec { @@ -137,26 +129,12 @@ rustPlatform.buildRustPackage { popd ''; - buildPhase = '' - runHook preBuild - - cargo tauri build --bundles "$tauriBundle" - - runHook postBuild - ''; - - installPhase = - '' - runHook preInstall - '' - + lib.optionalString stdenv.hostPlatform.isDarwin '' - mkdir -p "$out"/bin - cp -r target/release/bundle/macos "$out"/Applications + postInstall = + lib.optionalString stdenv.hostPlatform.isDarwin '' mv "$out"/Applications/Modrinth\ App.app/Contents/MacOS/Modrinth\ App "$out"/bin/modrinth-app ln -s "$out"/bin/modrinth-app "$out"/Applications/Modrinth\ App.app/Contents/MacOS/Modrinth\ App '' + lib.optionalString stdenv.hostPlatform.isLinux '' - cp -r target/release/bundle/"$tauriBundle"/*/data/usr "$out" desktop-file-edit \ --set-comment "Modrinth's game launcher" \ --set-key="StartupNotify" --set-value="true" \ @@ -164,9 +142,6 @@ rustPlatform.buildRustPackage { --set-key="Keywords" --set-value="game;minecraft;mc;" \ --set-key="StartupWMClass" --set-value="ModrinthApp" \ $out/share/applications/modrinth-app.desktop - '' - + '' - runHook postInstall ''; passthru = { From 154d776f51e2afffaf78a6e79d4ed0fce9fab878 Mon Sep 17 00:00:00 2001 From: seth <getchoo@tuta.io> Date: Sun, 18 Aug 2024 05:52:52 -0400 Subject: [PATCH 116/129] cinny-desktop: use cargo-tauri.hook --- pkgs/by-name/ci/cinny-desktop/package.nix | 41 ++++++----------------- 1 file changed, 10 insertions(+), 31 deletions(-) diff --git a/pkgs/by-name/ci/cinny-desktop/package.nix b/pkgs/by-name/ci/cinny-desktop/package.nix index f85aedc8e447..77fdf99d197b 100644 --- a/pkgs/by-name/ci/cinny-desktop/package.nix +++ b/pkgs/by-name/ci/cinny-desktop/package.nix @@ -3,11 +3,10 @@ stdenv, darwin, fetchFromGitHub, - rust, rustPlatform, cargo-tauri, cinny, - copyDesktopItems, + desktop-file-utils, wrapGAppsHook3, pkg-config, openssl, @@ -16,7 +15,6 @@ glib-networking, libayatana-appindicator, webkitgtk, - makeDesktopItem, }: rustPlatform.buildRustPackage rec { @@ -58,27 +56,22 @@ rustPlatform.buildRustPackage rec { --replace "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1" ''; - postBuild = lib.optionalString stdenv.hostPlatform.isDarwin '' - cargo tauri build --bundles app --target "${rust.envVars.rustHostPlatform}" - ''; - postInstall = - lib.optionalString stdenv.hostPlatform.isLinux '' - install -DT icons/128x128@2x.png $out/share/icons/hicolor/256x256@2/apps/cinny.png - install -DT icons/128x128.png $out/share/icons/hicolor/128x128/apps/cinny.png - install -DT icons/32x32.png $out/share/icons/hicolor/32x32/apps/cinny.png - '' - + lib.optionalString stdenv.hostPlatform.isDarwin '' - mkdir -p "$out/Applications/" - cp -r "target/${rust.envVars.rustHostPlatform}/release/bundle/macos/Cinny.app" "$out/Applications/" + lib.optionalString stdenv.hostPlatform.isDarwin '' ln -sf "$out/Applications/Cinny.app/Contents/MacOS/Cinny" "$out/bin/cinny" + '' + + lib.optionalString stdenv.hostPlatform.isLinux '' + desktop-file-edit \ + --set-comment "Yet another matrix client for desktop" \ + --set-key="Categories" --set-value="Network;InstantMessaging;" \ + $out/share/applications/cinny.desktop ''; nativeBuildInputs = [ - copyDesktopItems wrapGAppsHook3 pkg-config - cargo-tauri + cargo-tauri.hook + desktop-file-utils ]; buildInputs = @@ -97,20 +90,6 @@ rustPlatform.buildRustPackage rec { darwin.apple_sdk.frameworks.WebKit ]; - desktopItems = lib.optionals stdenv.hostPlatform.isLinux [ - (makeDesktopItem { - name = "cinny"; - exec = "cinny"; - icon = "cinny"; - desktopName = "Cinny"; - comment = meta.description; - categories = [ - "Network" - "InstantMessaging" - ]; - }) - ]; - meta = { description = "Yet another matrix client for desktop"; homepage = "https://github.com/cinnyapp/cinny-desktop"; From 43256320c550ba38a5082a3e98dc602f25b3df4e Mon Sep 17 00:00:00 2001 From: seth <getchoo@tuta.io> Date: Sun, 18 Aug 2024 05:56:15 -0400 Subject: [PATCH 117/129] gitbutler: use cargo-tauri.hook --- pkgs/by-name/gi/gitbutler/package.nix | 49 ++++++++++----------------- 1 file changed, 17 insertions(+), 32 deletions(-) diff --git a/pkgs/by-name/gi/gitbutler/package.nix b/pkgs/by-name/gi/gitbutler/package.nix index 21fe0bb3096b..68679cfcfea4 100644 --- a/pkgs/by-name/gi/gitbutler/package.nix +++ b/pkgs/by-name/gi/gitbutler/package.nix @@ -18,10 +18,12 @@ libsoup, moreutils, openssl, + rust, webkitgtk, nix-update-script, cacert, }: + rustPlatform.buildRustPackage rec { pname = "gitbutler"; version = "0.12.16"; @@ -33,11 +35,10 @@ rustPlatform.buildRustPackage rec { hash = "sha256-L4PVaNb3blpLIcyA7XLc71qwUPUADclxvbOkq1Jc1no="; }; - # deactivate the upstream updater in tauri configuration - # TODO: use `tauri build`'s `--config` flag with the release configuration instead of manually merging - # them. it doesn't seem to like using paths currently, even though it should. + # deactivate the upstream updater in tauri configuration & set the version postPatch = '' - jq --slurp ".[0] * .[1] | .tauri.updater.active = false" crates/gitbutler-tauri/tauri.conf{,.release}.json | sponge crates/gitbutler-tauri/tauri.conf.json + tauri_conf="crates/gitbutler-tauri/tauri.conf.release.json" + jq '.package.version = "${version}" | .tauri.updater.active = false' "$tauri_conf" | sponge "$tauri_conf" ''; cargoLock = { @@ -54,7 +55,7 @@ rustPlatform.buildRustPackage rec { }; nativeBuildInputs = [ - cargo-tauri + cargo-tauri.hook desktop-file-utils jq moreutils @@ -82,7 +83,15 @@ rustPlatform.buildRustPackage rec { ] ); + # extended release configuration + tauriBuildFlags = [ "--config crates/gitbutler-tauri/tauri.conf.release.json" ]; + env = { + # make sure `crates/gitbutler-tauri/inject-git-binaries.sh` can find our + # target dir + # https://github.com/gitbutlerapp/gitbutler/blob/56b64d778042d0e93fa362f808c35a7f095ab1d1/crates/gitbutler-tauri/inject-git-binaries.sh#L10C10-L10C26 + TRIPLE_OVERRIDE = rust.envVars.rustHostPlatformSpec; + # `pnpm`'s `fetchDeps` and `configHook` uses a specific version of pnpm, not upstream's COREPACK_ENABLE_STRICT = 0; @@ -95,14 +104,6 @@ rustPlatform.buildRustPackage rec { # we also need to have `tracing` support in `tokio` for `console-subscriber` RUSTFLAGS = "--cfg tokio_unstable"; - tauriBundle = - { - Linux = "deb"; - Darwin = "app"; - } - .${stdenv.hostPlatform.uname.system} - or (throw "No tauri bundle available for ${stdenv.hostPlatform.uname.system}"); - ESBUILD_BINARY_PATH = lib.getExe ( esbuild.override { buildGoModule = @@ -128,39 +129,23 @@ rustPlatform.buildRustPackage rec { OPENSSL_NO_VENDOR = true; }; - buildPhase = '' - runHook preBuild - + preBuild = '' pushd packages/ui pnpm package popd - - cargo tauri build --bundles "$tauriBundle" - - runHook postBuild ''; - installPhase = - '' - runHook preInstall - '' - + lib.optionalString stdenv.hostPlatform.isDarwin '' - mkdir -p $out/bin - cp -r target/release/bundle/macos $out/Applications + postInstall = + lib.optionalString stdenv.hostPlatform.isDarwin '' mv $out/Applications/GitButler.app/Contents/MacOS/GitButler $out/bin/git-butler ln -s $out/bin/git-butler $out/Applications/GitButler.app/Contents/MacOS/GitButler '' + lib.optionalString stdenv.hostPlatform.isLinux '' - cp -r target/release/bundle/"$tauriBundle"/*/data/usr $out - desktop-file-edit \ --set-comment "A Git client for simultaneous branches on top of your existing workflow." \ --set-key="Keywords" --set-value="git;" \ --set-key="StartupWMClass" --set-value="GitButler" \ $out/share/applications/git-butler.desktop - '' - + '' - runHook postInstall ''; # the `gitbutler-git` crate's checks do not support release mode From 686cff417a98d9e4c30a042cd0a1219717140e46 Mon Sep 17 00:00:00 2001 From: seth <getchoo@tuta.io> Date: Sun, 18 Aug 2024 05:57:01 -0400 Subject: [PATCH 118/129] pot: use cargo-tauri.hook --- pkgs/by-name/po/pot/package.nix | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/pkgs/by-name/po/pot/package.nix b/pkgs/by-name/po/pot/package.nix index daf547cf47e5..72f6dd5e2889 100644 --- a/pkgs/by-name/po/pot/package.nix +++ b/pkgs/by-name/po/pot/package.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: { rustPlatform.cargoSetupHook cargo rustc - cargo-tauri + cargo-tauri.hook nodejs pnpm.configHook wrapGAppsHook3 @@ -101,15 +101,6 @@ stdenv.mkDerivation (finalAttrs: { chmod +w .. ''; - preBuild = '' - # Use cargo-tauri from nixpkgs instead of pnpm tauri from npm - cargo tauri build -b deb - ''; - - preInstall = '' - mv target/release/bundle/deb/*/data/usr/ $out - ''; - meta = with lib; { description = "Cross-platform translation software"; mainProgram = "pot"; From 4f589591492b3c38988b2b9f1787d4787de4fddd Mon Sep 17 00:00:00 2001 From: seth <getchoo@tuta.io> Date: Sun, 18 Aug 2024 06:00:57 -0400 Subject: [PATCH 119/129] surrealist: use cargo-tauri.hook --- pkgs/by-name/su/surrealist/0001-Cargo.patch | 12 ++-- pkgs/by-name/su/surrealist/package.nix | 63 +++++---------------- 2 files changed, 19 insertions(+), 56 deletions(-) diff --git a/pkgs/by-name/su/surrealist/0001-Cargo.patch b/pkgs/by-name/su/surrealist/0001-Cargo.patch index 46ed9c272028..9b175cc9a50e 100644 --- a/pkgs/by-name/su/surrealist/0001-Cargo.patch +++ b/pkgs/by-name/su/surrealist/0001-Cargo.patch @@ -1,7 +1,7 @@ -diff --git a/Cargo.lock b/Cargo.lock +diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index 55f480a8..a69f9ed9 100644 ---- a/Cargo.lock -+++ b/Cargo.lock +--- a/src-tauri/Cargo.lock ++++ b/src-tauri/Cargo.lock @@ -1839,6 +1839,22 @@ dependencies = [ "tower-service", ] @@ -133,10 +133,10 @@ index 55f480a8..a69f9ed9 100644 [[package]] name = "tokio-rustls" version = "0.25.0" -diff --git a/Cargo.toml b/Cargo.toml +diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index 3e3ab7ee..b6612f95 100644 ---- a/Cargo.toml -+++ b/Cargo.toml +--- a/src-tauri/Cargo.toml ++++ b/src-tauri/Cargo.toml @@ -28,6 +28,8 @@ time = { version = "0.3", default-features = false} log = "^0.4" url = "2" diff --git a/pkgs/by-name/su/surrealist/package.nix b/pkgs/by-name/su/surrealist/package.nix index ae8b0b7c76ef..849294960b47 100644 --- a/pkgs/by-name/su/surrealist/package.nix +++ b/pkgs/by-name/su/surrealist/package.nix @@ -18,12 +18,10 @@ , rustc , rustPlatform , stdenv -, stdenvNoCC , webkitgtk_4_1 }: let - cargo-tauri_2 = let version = "2.0.0-rc.3"; src = fetchFromGitHub { @@ -68,8 +66,6 @@ in stdenv.mkDerivation (finalAttrs: { hash = "sha256-jOjOdrVOcGPenFW5mkkXKA64C6c+/f9KzlvtUmw6vXc="; }; - sourceRoot = "${finalAttrs.src.name}/src-tauri"; - # HACK: A dependency (surrealist -> tauri -> **reqwest**) contains hyper-tls # as an actually optional dependency. It ends up in the `Cargo.lock` file of # tauri, but not in the one of surrealist. We apply a patch to `Cargo.toml` @@ -80,47 +76,25 @@ in stdenv.mkDerivation (finalAttrs: { ./0001-Cargo.patch ]; - ui = stdenvNoCC.mkDerivation { - inherit (finalAttrs) src version; - pname = "${finalAttrs.pname}-ui"; - - pnpmDeps = pnpm.fetchDeps { - inherit (finalAttrs) pname version src; - hash = "sha256-zGs1MWJ8TEFuHOoekCNIKQo2PBnp95xLz+R8mzeJXh8="; - }; - - ESBUILD_BINARY_PATH = lib.getExe esbuild_21-5; - - nativeBuildInputs = [ nodejs pnpm.configHook ]; - - buildPhase = '' - runHook preBuild - - pnpm build:desktop - - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - cp -r dist $out - - runHook postInstall - ''; - }; - cargoDeps = rustPlatform.fetchCargoTarball { - inherit (finalAttrs) patches src sourceRoot; + inherit (finalAttrs) patches src; + sourceRoot = finalAttrs.cargoRoot; name = "${finalAttrs.pname}-${finalAttrs.version}"; hash = "sha256-LtQS0kH+2P4odV7BJYiH6T51+iZHAM9W9mV96rNfNWs="; }; + pnpmDeps = pnpm.fetchDeps { + inherit (finalAttrs) pname version src; + hash = "sha256-zGs1MWJ8TEFuHOoekCNIKQo2PBnp95xLz+R8mzeJXh8="; + }; + nativeBuildInputs = [ cargo - cargo-tauri_2 + (cargo-tauri.hook.override { cargo-tauri = cargo-tauri_2; }) gobject-introspection makeBinaryWrapper + nodejs + pnpm.configHook pkg-config rustc rustPlatform.cargoSetupHook @@ -136,23 +110,12 @@ in stdenv.mkDerivation (finalAttrs: { ]; env = { + ESBUILD_BINARY_PATH = lib.getExe esbuild_21-5; OPENSSL_NO_VENDOR = 1; }; - postPatch = '' - substituteInPlace ./tauri.conf.json \ - --replace-fail '"frontendDist": "../dist",' '"frontendDist": "${finalAttrs.ui}",' \ - --replace-fail '"beforeBuildCommand": "pnpm build:desktop",' '"beforeBuildCommand": "",' - ''; - - postBuild = '' - cargo tauri build --bundles deb - ''; - - postInstall = '' - install -Dm555 target/release/bundle/deb/Surrealist_${finalAttrs.version}_*/data/usr/bin/surrealist -t $out/bin - cp -r target/release/bundle/deb/Surrealist_${finalAttrs.version}_*/data/usr/share $out - ''; + cargoRoot = "src-tauri"; + buildAndTestSubdir = finalAttrs.cargoRoot; postFixup = '' wrapProgram "$out/bin/surrealist" \ From 83edf5a626499b3d777401ebac2058463d6b143b Mon Sep 17 00:00:00 2001 From: seth <getchoo@tuta.io> Date: Sun, 18 Aug 2024 06:02:12 -0400 Subject: [PATCH 120/129] kiwitalk: use cargo-tauri.hook --- pkgs/by-name/ki/kiwitalk/package.nix | 32 +++++++--------------------- 1 file changed, 8 insertions(+), 24 deletions(-) diff --git a/pkgs/by-name/ki/kiwitalk/package.nix b/pkgs/by-name/ki/kiwitalk/package.nix index efc9c55337d3..b700b198bc37 100644 --- a/pkgs/by-name/ki/kiwitalk/package.nix +++ b/pkgs/by-name/ki/kiwitalk/package.nix @@ -1,16 +1,15 @@ { lib , fetchFromGitHub -, copyDesktopItems , stdenv , rustc , rustPlatform , cargo , cargo-tauri +, desktop-file-utils , openssl , libayatana-appindicator , webkitgtk , pkg-config -, makeDesktopItem , pnpm , nodejs }: @@ -49,10 +48,10 @@ stdenv.mkDerivation (finalAttrs: { rustPlatform.cargoSetupHook cargo rustc - cargo-tauri + cargo-tauri.hook + desktop-file-utils nodejs pnpm.configHook - copyDesktopItems pkg-config ]; @@ -62,28 +61,13 @@ stdenv.mkDerivation (finalAttrs: { webkitgtk ]; - preBuild = '' - cargo tauri build -b deb + postInstall = lib.optionalString stdenv.isLinux '' + desktop-file-edit \ + --set-comment "An UNOFFICIAL cross-platform KakaoTalk client" \ + --set-key="Categories" --set-value="Network;InstantMessaging;" \ + $out/share/applications/kiwi-talk.desktop ''; - preInstall = '' - mv target/release/bundle/deb/*/data/usr/ $out - # delete the generated desktop entry - rm -r $out/share/applications - ''; - - desktopItems = [ - (makeDesktopItem { - name = "KiwiTalk"; - exec = "kiwi-talk"; - icon = "kiwi-talk"; - desktopName = "KiwiTalk"; - comment = "An UNOFFICIAL cross-platform KakaoTalk client"; - categories = [ "Network" "InstantMessaging" ]; - terminal = false; - }) - ]; - meta = with lib; { description = "UNOFFICIAL cross-platform KakaoTalk client written in TypeScript & Rust (SolidJS, tauri)"; homepage = "https://github.com/KiwiTalk/KiwiTalk"; From 328e517888f2b56f05f93a11c74b4cabda8107c4 Mon Sep 17 00:00:00 2001 From: seth <getchoo@tuta.io> Date: Sun, 18 Aug 2024 06:07:41 -0400 Subject: [PATCH 121/129] insulator2: use cargo-tauri.hook & yarnConfigHook --- pkgs/applications/misc/insulator2/default.nix | 35 +++++++------------ 1 file changed, 13 insertions(+), 22 deletions(-) diff --git a/pkgs/applications/misc/insulator2/default.nix b/pkgs/applications/misc/insulator2/default.nix index b69a3c7fe88d..2fb8b15e3e94 100644 --- a/pkgs/applications/misc/insulator2/default.nix +++ b/pkgs/applications/misc/insulator2/default.nix @@ -1,5 +1,4 @@ { lib -, cmake , dbus , fetchFromGitHub , fetchYarnDeps @@ -13,12 +12,14 @@ , cyrus_sasl , stdenv , fixup_yarn_lock -, yarn +, yarnConfigHook , nodejs-slim , cargo-tauri , cargo , rustPlatform , rustc +, jq +, moreutils }: stdenv.mkDerivation rec { @@ -32,6 +33,11 @@ stdenv.mkDerivation rec { hash = "sha256-Bi9GCQr7yox5Plc7o0svRKYi1XoK/HDGj1VbW1z4jac="; }; + # Yarn *really* wants us to use corepack if this is set + postPatch = '' + jq 'del(.packageManager)' package.json | sponge package.json + ''; + yarnOfflineCache = fetchYarnDeps { yarnLock = "${src}/yarn.lock"; hash = "sha256-ih5NSOvYje981SkVfPHm/u2sS1B36kgxpfe9LmQaxdo="; @@ -47,37 +53,22 @@ stdenv.mkDerivation rec { }; }; - configurePhase = '' - export HOME=$(mktemp -d) - yarn config --offline set yarn-offline-mirror ${yarnOfflineCache} - fixup_yarn_lock yarn.lock - yarn install --offline --frozen-lockfile --ignore-scripts --no-progress --non-interactive - patchShebangs node_modules/ - yarn run postinstall --offline - ''; - - preBuild = '' - yarn tauri build -b deb - ''; - cargoRoot = "backend/"; - - preInstall = '' - mv backend/target/release/bundle/deb/*/data/usr/ "$out" - ''; + buildAndTestDir = cargoRoot; nativeBuildInputs = [ - cmake pkg-config perl rustPlatform.cargoSetupHook cargo rustc - cargo-tauri + cargo-tauri.hook fixup_yarn_lock - yarn + yarnConfigHook nodejs-slim cyrus_sasl + jq + moreutils # for sponge ]; buildInputs = [ From 0539d522be2f1a50d0fdfb147eb012c967d4165c Mon Sep 17 00:00:00 2001 From: seth <getchoo@tuta.io> Date: Mon, 19 Aug 2024 03:38:38 -0400 Subject: [PATCH 122/129] doc/release-notes: add section on `cargo-tauri.hook` --- nixos/doc/manual/release-notes/rl-2411.section.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index 06ac7a60e2ba..38274583d540 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -591,6 +591,9 @@ - The arguments from [](#opt-services.postgresql.initdbArgs) now get shell-escaped. +- `cargo-tauri.hook` was introduced to help users build [Tauri](https://tauri.app/) projects. It is meant to be used alongside + `rustPlatform.buildRustPackage` and Node hooks such as `npmConfigHook`, `pnpm.configHook`, and the new `yarnConfig` + - Support for *runner registration tokens* has been [deprecated](https://gitlab.com/gitlab-org/gitlab/-/issues/380872) in `gitlab-runner` 15.6 and is expected to be removed in `gitlab-runner` 18.0. Configuration of existing runners should be changed to using *runner authentication tokens* by configuring From a678b77f9b17d2e24d496489e8a93ae55afe734c Mon Sep 17 00:00:00 2001 From: seth <getchoo@tuta.io> Date: Thu, 26 Sep 2024 21:10:11 -0400 Subject: [PATCH 123/129] en-croissant: use cargo-tauri.hook --- pkgs/by-name/en/en-croissant/package.nix | 29 +----------------------- 1 file changed, 1 insertion(+), 28 deletions(-) diff --git a/pkgs/by-name/en/en-croissant/package.nix b/pkgs/by-name/en/en-croissant/package.nix index 72019cbcb9c9..81489925d19f 100644 --- a/pkgs/by-name/en/en-croissant/package.nix +++ b/pkgs/by-name/en/en-croissant/package.nix @@ -56,7 +56,7 @@ buildRustPackage rec { [ pnpm_9.configHook nodejs - cargo-tauri + cargo-tauri.hook pkg-config ] ++ lib.optionals stdenv.hostPlatform.isLinux [ wrapGAppsHook3 ] @@ -77,35 +77,8 @@ buildRustPackage rec { darwin.apple_sdk_11_0.frameworks.WebKit ]; - # remove once cargo-tauri.hook becomes available - # https://github.com/NixOS/nixpkgs/pull/335751 - buildPhase = '' - runHook preBuild - - cargo tauri build --bundles ${if stdenv.hostPlatform.isDarwin then "app" else "deb"} - - runHook postBuild - ''; - doCheck = false; # many scoring tests fail - # remove once cargo-tauri.hook becomes available - installPhase = '' - runHook preInstall - - ${lib.optionalString stdenv.hostPlatform.isDarwin '' - mkdir -p "$out"/Applications - cp -r src-tauri/target/release/bundle/macos/* "$out"/Applications - ''} - - ${lib.optionalString stdenv.hostPlatform.isLinux '' - mkdir -p "$out" - cp -r src-tauri/target/release/bundle/deb/*/data/usr/* "$out" - ''} - - runHook postInstall - ''; - postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' makeWrapper "$out"/Applications/en-croissant.app/Contents/MacOS/en-croissant $out/bin/en-croissant ''; From 26b1cefb0c84c0145d512e366e37bf18dfb042f1 Mon Sep 17 00:00:00 2001 From: seth <getchoo@tuta.io> Date: Thu, 26 Sep 2024 21:12:34 -0400 Subject: [PATCH 124/129] mouse-actions-gui: use cargo-tauri.hook --- pkgs/by-name/mo/mouse-actions-gui/package.nix | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/pkgs/by-name/mo/mouse-actions-gui/package.nix b/pkgs/by-name/mo/mouse-actions-gui/package.nix index 80f845038582..01478b8015b1 100644 --- a/pkgs/by-name/mo/mouse-actions-gui/package.nix +++ b/pkgs/by-name/mo/mouse-actions-gui/package.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { rustPlatform.cargoSetupHook cargo rustc - cargo-tauri + cargo-tauri.hook pkg-config wrapGAppsHook3 ]; @@ -62,6 +62,7 @@ stdenv.mkDerivation (finalAttrs: { }; cargoRoot = "src-tauri"; + buildAndTestSubdir = finalAttrs.cargoRoot; cargoDeps = rustPlatform.fetchCargoTarball { inherit (finalAttrs) pname version src; @@ -69,19 +70,8 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-H8TMpYFJWp227jPA5H2ZhSqTMiT/U6pT6eLyjibuoLU="; }; - buildPhase = '' - runHook preBuild - cargo-tauri build -b deb - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - + postInstall = '' install -Dm644 ${./80-mouse-actions.rules} $out/etc/udev/rules.d/80-mouse-actions.rules - cp -r src-tauri/target/release/bundle/deb/*/data/usr/* $out - - runHook postInstall ''; meta = { From ecf486145ff0dd2ae9c8915ffcb2d2a94a55185d Mon Sep 17 00:00:00 2001 From: Winter <winter@winter.cafe> Date: Mon, 30 Sep 2024 21:55:51 -0400 Subject: [PATCH 125/129] gonic: fix tests in darwin sandbox --- pkgs/servers/gonic/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/servers/gonic/default.nix b/pkgs/servers/gonic/default.nix index d23e130375de..a0ec78a5b36a 100644 --- a/pkgs/servers/gonic/default.nix +++ b/pkgs/servers/gonic/default.nix @@ -50,6 +50,9 @@ buildGoModule rec { tests.gonic = nixosTests.gonic; }; + # tests require it + __darwinAllowLocalNetworking = true; + meta = { homepage = "https://github.com/sentriz/gonic"; description = "Music streaming server / subsonic server API implementation"; From 8d6134b231ec3507aba9c0e50101b15a77bbeacd Mon Sep 17 00:00:00 2001 From: Winter <winter@winter.cafe> Date: Mon, 30 Sep 2024 22:04:09 -0400 Subject: [PATCH 126/129] gonic: don't use substituteStream --replace --- pkgs/servers/gonic/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/gonic/default.nix b/pkgs/servers/gonic/default.nix index a0ec78a5b36a..c09c58f0b269 100644 --- a/pkgs/servers/gonic/default.nix +++ b/pkgs/servers/gonic/default.nix @@ -30,18 +30,18 @@ buildGoModule rec { postPatch = lib.optionalString transcodingSupport '' substituteInPlace \ transcode/transcode.go \ - --replace \ + --replace-fail \ '`ffmpeg' \ '`${lib.getBin ffmpeg}/bin/ffmpeg' '' + '' substituteInPlace \ jukebox/jukebox.go \ - --replace \ + --replace-fail \ '"mpv"' \ '"${lib.getBin mpv}/bin/mpv"' '' + '' substituteInPlace server/ctrlsubsonic/testdata/test* \ - --replace \ + --replace-quiet \ '"audio/flac"' \ '"audio/x-flac"' ''; From 966526bda1af9579ae9424c0d20e7e126713d654 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" <ryantm-bot@ryantm.com> Date: Tue, 1 Oct 2024 02:07:01 +0000 Subject: [PATCH 127/129] jawiki-all-titles-in-ns0: 0-unstable-2024-09-11 -> 0-unstable-2024-10-01 --- pkgs/by-name/ja/jawiki-all-titles-in-ns0/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ja/jawiki-all-titles-in-ns0/package.nix b/pkgs/by-name/ja/jawiki-all-titles-in-ns0/package.nix index 3c79b955f99c..5f64b12e5ab3 100644 --- a/pkgs/by-name/ja/jawiki-all-titles-in-ns0/package.nix +++ b/pkgs/by-name/ja/jawiki-all-titles-in-ns0/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation { pname = "jawiki-all-titles-in-ns0"; - version = "0-unstable-2024-09-11"; + version = "0-unstable-2024-10-01"; src = fetchFromGitHub { owner = "musjj"; repo = "jawiki-archive"; - rev = "d205f63665e351ea853edc72157f14daa22a227f"; - hash = "sha256-Jj2vH8UMhgSzWv+RnOipnVNSdeOF6jttcLN/kVYa4D4="; + rev = "1e26e5efa36eea5322f55b178a5c4d5a5439feb9"; + hash = "sha256-8jzsECzrrcHeMvV2K89WagSiCXHjEDEfUwLDanVVuas="; }; installPhase = '' From 100c948cdd053d7ab8e5559ebf9baf80603883e5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" <ryantm-bot@ryantm.com> Date: Tue, 1 Oct 2024 02:07:27 +0000 Subject: [PATCH 128/129] jp-zip-codes: 0-unstable-2024-09-01 -> 0-unstable-2024-10-01 --- pkgs/by-name/jp/jp-zip-codes/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/jp/jp-zip-codes/package.nix b/pkgs/by-name/jp/jp-zip-codes/package.nix index bec361fb6579..adf99b7ab1cd 100644 --- a/pkgs/by-name/jp/jp-zip-codes/package.nix +++ b/pkgs/by-name/jp/jp-zip-codes/package.nix @@ -7,15 +7,15 @@ stdenvNoCC.mkDerivation { pname = "jp-zip-code"; - version = "0-unstable-2024-09-01"; + version = "0-unstable-2024-10-01"; # This package uses a mirror as the source because the # original provider uses the same URL for updated content. src = fetchFromGitHub { owner = "musjj"; repo = "jp-zip-codes"; - rev = "995d7cce9ae68a31efe4b5882137dd67ac26f7ff"; - hash = "sha256-VnzczwIbYPUpWpWLMm2TYGqiDxzZaDDKs7xh4F3xA0E="; + rev = "94ddc993224a6e2c65480f9109564f7f68125665"; + hash = "sha256-/2f/HXxrxKc6dv5E67S59xIpdJUkh0fX0lyTuo2y1N4="; }; installPhase = '' From b23eda1624f87d91530b265ce0af4aa00a08ed3a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" <ryantm-bot@ryantm.com> Date: Tue, 1 Oct 2024 02:09:40 +0000 Subject: [PATCH 129/129] mozcdic-ut-jawiki: 0-unstable-2024-09-21 -> 0-unstable-2024-09-27 --- pkgs/by-name/mo/mozcdic-ut-jawiki/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mo/mozcdic-ut-jawiki/package.nix b/pkgs/by-name/mo/mozcdic-ut-jawiki/package.nix index f65a5d10a00f..e7ab1d99a11c 100644 --- a/pkgs/by-name/mo/mozcdic-ut-jawiki/package.nix +++ b/pkgs/by-name/mo/mozcdic-ut-jawiki/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation { pname = "mozcdic-ut-jawiki"; - version = "0-unstable-2024-09-21"; + version = "0-unstable-2024-09-27"; src = fetchFromGitHub { owner = "utuhiro78"; repo = "mozcdic-ut-jawiki"; - rev = "c7bec6a8df7a3f893646bb8c017033499a8350be"; - hash = "sha256-fjIOGT3SYKLtL31QfZVNT4vKMNuHy1YAKFVjf82BWMQ="; + rev = "773cc08e71c4daa3c06fc577853f715a2bb4d9aa"; + hash = "sha256-TDZvB8/ZrUtkAbCr3vMfyFfhQ4v5SYWEqPNjuGB1Ve4="; }; installPhase = ''