From caacc20216aac6653295c2ae1eef3b432a5d96f6 Mon Sep 17 00:00:00 2001 From: Anomalocaridid <29845794+Anomalocaridid@users.noreply.github.com> Date: Mon, 10 Jun 2024 20:44:33 -0400 Subject: [PATCH 001/300] fishPlugins.plugin-sudope: init at 0-unstable-2021-04-11 --- pkgs/shells/fish/plugins/default.nix | 2 ++ pkgs/shells/fish/plugins/plugin-sudope.nix | 26 ++++++++++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/shells/fish/plugins/plugin-sudope.nix diff --git a/pkgs/shells/fish/plugins/default.nix b/pkgs/shells/fish/plugins/default.nix index 36a5a59e4398..485faa1c89b1 100644 --- a/pkgs/shells/fish/plugins/default.nix +++ b/pkgs/shells/fish/plugins/default.nix @@ -50,6 +50,8 @@ lib.makeScope newScope (self: with self; { plugin-git = callPackage ./plugin-git.nix { }; + plugin-sudope = callPackage ./plugin-sudope.nix { }; + puffer = callPackage ./puffer.nix { }; pure = callPackage ./pure.nix { }; diff --git a/pkgs/shells/fish/plugins/plugin-sudope.nix b/pkgs/shells/fish/plugins/plugin-sudope.nix new file mode 100644 index 000000000000..e24f6ae15050 --- /dev/null +++ b/pkgs/shells/fish/plugins/plugin-sudope.nix @@ -0,0 +1,26 @@ +{ + lib, + buildFishPlugin, + fetchFromGitHub, + unstableGitUpdater, +}: +buildFishPlugin { + pname = "plugin-sudope"; + version = "0-unstable-2021-04-11"; + + src = fetchFromGitHub { + owner = "oh-my-fish"; + repo = "plugin-sudope"; + rev = "83919a692bc1194aa322f3627c859fecace5f496"; + hash = "sha256-pD4rNuqg6TG22L9m8425CO2iqcYm8JaAEXIVa0H/v/U="; + }; + + passthru.updateScript = unstableGitUpdater { }; + + meta = { + description = "Fish plugin to quickly put 'sudo' in your command"; + homepage = "https://github.com/oh-my-fish/plugin-sudope"; + license = lib.licenses.isc; + maintainers = with lib.maintainers; [ anomalocaris ]; + }; +} From b85717adbea78ac456643c89a1ecd3a7629df121 Mon Sep 17 00:00:00 2001 From: Anomalocaridid <29845794+Anomalocaridid@users.noreply.github.com> Date: Mon, 10 Jun 2024 17:50:14 -0400 Subject: [PATCH 002/300] fishPlugins.fish-bd: init at 1.3.3 --- pkgs/shells/fish/plugins/default.nix | 2 ++ pkgs/shells/fish/plugins/fish-bd.nix | 26 ++++++++++++++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/shells/fish/plugins/fish-bd.nix diff --git a/pkgs/shells/fish/plugins/default.nix b/pkgs/shells/fish/plugins/default.nix index 36a5a59e4398..300a3dde076a 100644 --- a/pkgs/shells/fish/plugins/default.nix +++ b/pkgs/shells/fish/plugins/default.nix @@ -21,6 +21,8 @@ lib.makeScope newScope (self: with self; { fifc = callPackage ./fifc.nix { }; + fish-bd = callPackage ./fish-bd.nix { }; + # Fishtape 2.x and 3.x aren't compatible, # but both versions are used in the tests of different other plugins. fishtape = callPackage ./fishtape.nix { }; diff --git a/pkgs/shells/fish/plugins/fish-bd.nix b/pkgs/shells/fish/plugins/fish-bd.nix new file mode 100644 index 000000000000..154fc6213389 --- /dev/null +++ b/pkgs/shells/fish/plugins/fish-bd.nix @@ -0,0 +1,26 @@ +{ + lib, + buildFishPlugin, + fetchFromGitHub, + gitUpdater, +}: +buildFishPlugin rec { + pname = "fish-bd"; + version = "1.3.3"; + + src = fetchFromGitHub { + owner = "0rax"; + repo = "fish-bd"; + rev = "v${version}"; + hash = "sha256-GeWjoakXa0t2TsMC/wpLEmsSVGhHFhBVK3v9eyQdzv0="; + }; + + passthru.updateScript = gitUpdater { rev-prefix = "v"; }; + + meta = { + description = "Fish plugin to quickly go back to a parent directory up in your current working directory tree"; + homepage = "https://github.com/0rax/fish-bd"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ anomalocaris ]; + }; +} From 2d07b69bf0ed5708768824ca07ed3da0ddff671e Mon Sep 17 00:00:00 2001 From: Noah Gitsham Date: Mon, 26 Aug 2024 23:07:30 +0100 Subject: [PATCH 003/300] 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 72429bfb0a2047a0ee0e3b8c0b816cb305b015c4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 27 Aug 2024 01:59:24 +0000 Subject: [PATCH 004/300] python312Packages.blobfile: 2.1.0 -> 3.0.0 --- pkgs/development/python-modules/blobfile/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/blobfile/default.nix b/pkgs/development/python-modules/blobfile/default.nix index 3e4c1dc7da63..9208381cc9e4 100644 --- a/pkgs/development/python-modules/blobfile/default.nix +++ b/pkgs/development/python-modules/blobfile/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "blobfile"; - version = "2.1.0"; + version = "3.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "christopher-hesse"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-VBh1JMP+8FEqD0uXpxA5RRMFH9XIUb4FUgsPq3vZWHM="; + hash = "sha256-/v48rLvlN4lsfWKJvXRNuIO6jdsCgRcSPlJzdOfl3xk="; }; propagatedBuildInputs = [ From 9faaa27620c96e7e3e4384341b7f1d8c1b0c0abd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 27 Aug 2024 19:31:39 +0000 Subject: [PATCH 005/300] 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 006/300] 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 0cf9d699790b8b03f319b85b5a2bb552f1c23776 Mon Sep 17 00:00:00 2001 From: whonore Date: Mon, 9 Sep 2024 15:49:16 -0700 Subject: [PATCH 007/300] dafny: 4.7.0 -> 4.8.0 --- .../science/logic/dafny/default.nix | 4 +- .../applications/science/logic/dafny/deps.nix | 347 +++++++++--------- 2 files changed, 172 insertions(+), 179 deletions(-) diff --git a/pkgs/applications/science/logic/dafny/default.nix b/pkgs/applications/science/logic/dafny/default.nix index 93ae5c92b32f..3f97765e6c18 100644 --- a/pkgs/applications/science/logic/dafny/default.nix +++ b/pkgs/applications/science/logic/dafny/default.nix @@ -8,13 +8,13 @@ buildDotnetModule rec { pname = "Dafny"; - version = "4.7.0"; + version = "4.8.0"; src = fetchFromGitHub { owner = "dafny-lang"; repo = "dafny"; rev = "v${version}"; - hash = "sha256-XoSk08TVv17YyuTsRJ25e6bwSwKIF2+HjF5nFaul8+M="; + hash = "sha256-x/fX4o+R72Pl02u1Zsr80Rh/4Wb/aKw90fhAGmsfFUI="; }; postPatch = diff --git a/pkgs/applications/science/logic/dafny/deps.nix b/pkgs/applications/science/logic/dafny/deps.nix index 0c96fca4ec53..95924b788dc9 100644 --- a/pkgs/applications/science/logic/dafny/deps.nix +++ b/pkgs/applications/science/logic/dafny/deps.nix @@ -2,181 +2,174 @@ # Please dont edit it manually, your changes might get overwritten! { fetchNuGet }: [ - (fetchNuGet { pname = "Boogie"; version = "3.1.3"; sha256 = "0xzc7s0rjb8dhdkdf71g6pdsnyhbl534xpwd8gbx6g16a87iqx6i"; }) - (fetchNuGet { pname = "Boogie.AbstractInterpretation"; version = "3.1.6"; sha256 = "1c6z13dz0sbkmk4ay64aihy7s7xlfdvhpcknxhw1m1b0yly5qj6b"; }) - (fetchNuGet { pname = "Boogie.BaseTypes"; version = "3.1.6"; sha256 = "1hxcpc45f32g3jpaw7mg6k9qsppcb3p20wxv4d4dc3nz0r52lrmr"; }) - (fetchNuGet { pname = "Boogie.CodeContractsExtender"; version = "3.1.6"; sha256 = "1qk7w7c40fpkvvarbgi1bkdcxpn12r0lqngpwwjw8i7nk84ni5gl"; }) - (fetchNuGet { pname = "Boogie.Concurrency"; version = "3.1.6"; sha256 = "11981gfa0n4s214yilnxqhh1clr4l78iqlws6gv01z1n6rxgbyla"; }) - (fetchNuGet { pname = "Boogie.Core"; version = "3.1.6"; sha256 = "0sgj6i1hvp90g2zfqs1aly500xnv3fq9d4cfgii5kpza8vgm7w4g"; }) - (fetchNuGet { pname = "Boogie.ExecutionEngine"; version = "3.1.6"; sha256 = "08vxxwcnkykcngihkp0bvfwkgwxb3nnqjp5f1vz4bnw708xs0ydg"; }) - (fetchNuGet { pname = "Boogie.Graph"; version = "3.1.6"; sha256 = "0fzj65pnky8i83jj2h9nszij25a46z68fy2sm3pxwlg678nmx2jz"; }) - (fetchNuGet { pname = "Boogie.Houdini"; version = "3.1.6"; sha256 = "0lfljb9brnr79hp1f0ff6fcy51ml66pjj102jk4pqpmsjwvcjx43"; }) - (fetchNuGet { pname = "Boogie.Model"; version = "3.1.6"; sha256 = "0546b27mxv97v7qilb1carbwip0q7sz9zz7sxizpww6yc3j8w8if"; }) - (fetchNuGet { pname = "Boogie.Provers.LeanAuto"; version = "3.1.6"; sha256 = "1x1f35g0kxzhxvw4icmbvkik16py47j6h04gj0ckwbny9qmglaby"; }) - (fetchNuGet { pname = "Boogie.Provers.SMTLib"; version = "3.1.6"; sha256 = "0mqlpwfxgv9dd773254rrbgbjb5mpa3xkvlq32ml752h36j8m2r9"; }) - (fetchNuGet { pname = "Boogie.VCExpr"; version = "3.1.6"; sha256 = "0p7axpjn4qg191bs7b33zf9l336bdznvxp3305z2ssnkakjx247h"; }) - (fetchNuGet { pname = "Boogie.VCGeneration"; version = "3.1.6"; sha256 = "05z2lr92hbllikv65gh7m3i879fnn6pjn2acf133sijx9b1jixdb"; }) - (fetchNuGet { pname = "CocoR"; version = "2014.12.24"; sha256 = "0ps8h7aawkcc1910qnh13llzb01pvgsjmg862pxp0p4wca2dn7a2"; }) - (fetchNuGet { pname = "JetBrains.Annotations"; version = "2021.1.0"; sha256 = "07pnhxxlgx8spmwmakz37nmbvgyb6yjrbrhad5rrn6y767z5r1gb"; }) - (fetchNuGet { pname = "MediatR"; version = "8.1.0"; sha256 = "0cqx7yfh998xhsfk5pr6229lcjcs1jxxyqz7dwskc9jddl6a2akp"; }) - (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "1.1.1"; sha256 = "0a1ahssqds2ympr7s4xcxv5y8jgxs7ahd6ah6fbgglj4rki1f1vw"; }) - (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "6.0.0"; sha256 = "15gqy2m14fdlvy1g59207h5kisznm355kbw010gy19vh47z8gpz3"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.0.0"; sha256 = "0bbl0jpqywqmzz2gagld1p2gvdfldjfjmm25hil9wj2nq1zc4di8"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "3.7.0"; sha256 = "0882492nx6x68b0pkh3q5xaawz0b2l5x35r40722ignyjnvjydph"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "3.7.0"; sha256 = "0adw6rcag8wxydzyiyhls2mxaqkay5qlz25z1fxrlv5qnchqn0n5"; }) - (fetchNuGet { pname = "Microsoft.DotNet.PlatformAbstractions"; version = "2.0.4"; sha256 = "1fdzln4im9hb55agzwchbfgm3vmngigmbpci5j89b0gqcxixmv8j"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "2.0.0"; sha256 = "0yssxq9di5h6xw2cayp5hj3l9b2p0jw9wcjz73rwk4586spac9s9"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "5.0.0"; sha256 = "01m9vzlq0vg0lhckj2dimwq42niwny8g3lm13c9a401hlyg90z1p"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "2.0.0"; sha256 = "1ilz2yrgg9rbjyhn6a5zh9pr51nmh11z7sixb4p7vivgydj9gxwf"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "5.0.0"; sha256 = "0fqxkc9pjxkqylsdf26s9q21ciyk56h1w33pz3v1v4wcv8yv1v6k"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "2.0.0"; sha256 = "1prvdbma6r18n5agbhhabv6g357p1j70gq4m9g0vs859kf44nrgc"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.CommandLine"; version = "5.0.0"; sha256 = "084hnz5l0vr15ay23rksqipslqnz3pp30w9hsirpx1iqdm5688mc"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.FileExtensions"; version = "5.0.0"; sha256 = "1wq229r3xcmm9wh9sqdpvmfv4qpbp2zms9x6xk7g7sbb8h32hnz3"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Json"; version = "5.0.0"; sha256 = "0hq5i483bjbvprp1la9l3si82x1ydxbvkpfc7r3s7zgxg957fyp9"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "2.0.0"; sha256 = "018izzgykaqcliwarijapgki9kp2c560qv8qsxdjywr7byws5apq"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "5.0.0"; sha256 = "15sdwcyzz0qlybwbdq854bn3jk6kx7awx28gs864c4shhbqkppj4"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "2.0.0"; sha256 = "1pwrfh9b72k9rq6mb2jab5qhhi225d5rjalzkapiayggmygc8nhz"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "5.0.0"; sha256 = "17cz6s80va0ch0a6nqa1wbbbp3p8sqxb96lj4qcw67ivkp2yxiyj"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; version = "2.0.4"; sha256 = "041i1vlcibpzgalxxzdk81g5pgmqvmz2g61k0rqa2sky0wpvijx9"; }) - (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Abstractions"; version = "5.0.0"; sha256 = "01ahgd0b2z2zycrr2lcsq2cl59fn04bh51hdwdp9dcsdkpvnasj1"; }) - (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Physical"; version = "5.0.0"; sha256 = "00vii8148a6pk12l9jl0rhjp7apil5q5qcy7v1smnv17lj4p8szd"; }) - (fetchNuGet { pname = "Microsoft.Extensions.FileSystemGlobbing"; version = "5.0.0"; sha256 = "0lm6n9vbyjh0l17qcc2y9qwn1cns3dyjmkvbxjp0g9sll32kjpmb"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "2.0.0"; sha256 = "1jkwjcq1ld9znz1haazk8ili2g4pzfdp6i7r7rki4hg3jcadn386"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "5.0.0"; sha256 = "1qa1l18q2jh9azya8gv1p8anzcdirjzd9dxxisb4911i9m1648i3"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "5.0.0"; sha256 = "1yza38675dbv1qqnnhqm23alv2bbaqxp0pb7zinjmw8j2mr5r6wc"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "2.0.0"; sha256 = "0g4zadlg73f507krilhaaa7h0jdga216syrzjlyf5fdk25gxmjqh"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "5.0.0"; sha256 = "1rdmgpg770x8qwaaa6ryc27zh93p697fcyvn5vkxp0wimlhqkbay"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Options.ConfigurationExtensions"; version = "2.0.0"; sha256 = "1isc3rjbzz60f7wbmgcwslx5d10hm5hisnk7v54vfi2bz7132gll"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "2.0.0"; sha256 = "1xppr5jbny04slyjgngxjdm0maxdh47vq481ps944d7jrfs0p3mb"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "5.0.0"; sha256 = "0swqcknyh87ns82w539z1mvy804pfwhgzs97cr3nwqk6g5s42gd6"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; }) - (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.Platforms"; version = "3.0.0"; sha256 = "1bk8r4r3ihmi6322jmcag14jmw11mjqys202azqjzglcx59pxh51"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1"; sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.Extensions.TrxLogger"; version = "17.9.0"; sha256 = "0wn38vj9i4gjw5zsl4wcivpqrmp1h5n6m1zxcfwj7yjn9hf45rz9"; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.9.0"; sha256 = "1kgsl9w9fganbm9wvlkqgk0ag9hfi58z88rkfybc6kvg78bx89ca"; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.9.0"; sha256 = "19ffh31a1jxzn8j69m1vnk5hyfz3dbxmflq77b8x82zybiilh5nl"; }) - (fetchNuGet { pname = "Microsoft.VisualStudio.Threading"; version = "16.7.56"; sha256 = "13x0xrsjxd86clf9cjjwmpzlyp8pkrf13riya7igs8zy93zw2qap"; }) - (fetchNuGet { pname = "Microsoft.VisualStudio.Threading.Analyzers"; version = "16.7.56"; sha256 = "04v9df0k7bsc0rzgkw4mnvi43pdrh42vk6xdcwn9m6im33m0nnz2"; }) - (fetchNuGet { pname = "Microsoft.VisualStudio.Validation"; version = "15.5.31"; sha256 = "1ah99rn922qa0sd2k3h64m324f2r32pw8cn4cfihgvwx4qdrpmgw"; }) - (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; }) - (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "4.6.0"; sha256 = "0i4y782yrqqyx85pg597m20gm0v126w0j9ddk5z7xb3crx4z9f2s"; }) - (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "6.0.0"; sha256 = "0c6pcj088g1yd1vs529q3ybgsd2vjlk5y1ic6dkmbhvrp5jibl9p"; }) - (fetchNuGet { pname = "Nerdbank.Streams"; version = "2.6.81"; sha256 = "06wihcaga8537ibh0mkj28m720m6vzkqk562zkynhca85nd236yi"; }) - (fetchNuGet { pname = "Newtonsoft.Json"; version = "11.0.2"; sha256 = "1784xi44f4k8v1fr696hsccmwpy94bz7kixxqlri98zhcxn406b2"; }) - (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; }) - (fetchNuGet { pname = "OmniSharp.Extensions.JsonRpc"; version = "0.19.5"; sha256 = "0ilcv3cxcvjkd8ngiydi69pzll07rhqdv5nq9yjnhyj142ynw2cb"; }) - (fetchNuGet { pname = "OmniSharp.Extensions.JsonRpc.Generators"; version = "0.19.5"; sha256 = "1mac4yx29ld8fyirg7n0vqn81hzdvcrl8w0l9w5xhnnm6bcd42v8"; }) - (fetchNuGet { pname = "OmniSharp.Extensions.LanguageProtocol"; version = "0.19.5"; sha256 = "1clgrbw6dlh46iiiqhavwh15xqar41az352mb5r4ln8ql3wnmk1i"; }) - (fetchNuGet { pname = "OmniSharp.Extensions.LanguageServer"; version = "0.19.5"; sha256 = "0cvxmc0r4ajnaah7lsppik61qickq7i0df4jwqaj6c6axiizhqlm"; }) - (fetchNuGet { pname = "OmniSharp.Extensions.LanguageServer.Shared"; version = "0.19.5"; sha256 = "0cczmmsmn3pj74wpasgfhjay1a817sd0zgzgqvvnckxxzq3n463h"; }) - (fetchNuGet { pname = "RangeTree"; version = "3.0.1"; sha256 = "19si88v2r0rc7kai1avwhigcvh3x3c916vrvqlyb59sn4f27pbm2"; }) - (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; }) - (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn"; }) - (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.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "0lqhgqi0i8194ryqq6v2gqx0fb86db2gqknbm0aq31wb378j7ip8"; }) - (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.0.0"; sha256 = "1ppk69xk59ggacj9n7g6fyxvzmk1g5p4fkijm0d7xqfkig98qrkf"; }) - (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.Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0y61k9zbxhdi0glg154v30kkq7f8646nif8lnnxbvkjpakggd5id"; }) - (fetchNuGet { pname = "runtime.unix.System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5"; }) - (fetchNuGet { pname = "runtime.unix.System.IO.FileSystem"; version = "4.3.0"; sha256 = "14nbkhvs7sji5r1saj2x8daz82rnf9kx28d3v2qss34qbr32dzix"; }) - (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 = "Serilog"; version = "2.12.0"; sha256 = "0lqxpc96qcjkv9pr1rln7mi4y7n7jdi4vb36c2fv3845w1vswgr4"; }) - (fetchNuGet { pname = "Serilog.Extensions.Logging"; version = "3.0.1"; sha256 = "069qy7dm5nxb372ij112ppa6m99b4iaimj3sji74m659fwrcrl9a"; }) - (fetchNuGet { pname = "Serilog.Settings.Configuration"; version = "3.1.0"; sha256 = "1cj5am4n073331gbfm2ylqb9cadl4q3ppzgwmm5c8m1drxpiwkb5"; }) - (fetchNuGet { pname = "Serilog.Sinks.Debug"; version = "2.0.0"; sha256 = "1i7j870l47gan3gpnnlzkccn5lbm7518cnkp25a3g5gp9l0dbwpw"; }) - (fetchNuGet { pname = "Serilog.Sinks.File"; version = "5.0.0"; sha256 = "097rngmgcrdfy7jy8j7dq3xaq2qky8ijwg0ws6bfv5lx0f3vvb0q"; }) - (fetchNuGet { pname = "System.AppContext"; version = "4.1.0"; sha256 = "0fv3cma1jp4vgj7a8hqc9n7hr1f1kjp541s6z0q1r6nazb4iz9mz"; }) - (fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; }) - (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) - (fetchNuGet { pname = "System.Collections.Immutable"; version = "1.7.0"; sha256 = "1gik4sn9jsi1wcy1pyyp0r4sn2g17cwrsh24b2d52vif8p2h24zx"; }) - (fetchNuGet { pname = "System.Collections.Immutable"; version = "1.7.1"; sha256 = "1nh4nlxfc7lbnbl86wwk1a3jwl6myz5j6hvgh5sp4krim9901hsq"; }) - (fetchNuGet { pname = "System.CommandLine"; version = "2.0.0-beta4.22272.1"; sha256 = "1iy5hwwgvx911g3yq65p4zsgpy08w4qz9j3h0igcf7yci44vw8yd"; }) - (fetchNuGet { pname = "System.Configuration.ConfigurationManager"; version = "6.0.0"; sha256 = "0sqapr697jbb4ljkq46msg0xx1qpmc31ivva6llyz2wzq3mpmxbw"; }) - (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; }) - (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; }) - (fetchNuGet { pname = "System.Drawing.Common"; version = "6.0.0"; sha256 = "02n8rzm58dac2np8b3xw8ychbvylja4nh6938l5k2fhyn40imlgz"; }) - (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.0.11"; sha256 = "1pla2dx8gkidf7xkciig6nifdsb494axjvzvann8g2lp3dbqasm9"; }) - (fetchNuGet { pname = "System.Globalization"; version = "4.0.11"; sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; }) - (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; }) - (fetchNuGet { pname = "System.IO"; version = "4.1.0"; sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; }) - (fetchNuGet { pname = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; }) - (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.0.1"; sha256 = "0kgfpw6w4djqra3w5crrg8xivbanh1w9dh3qapb28q060wb9flp1"; }) - (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.3.0"; sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; }) - (fetchNuGet { pname = "System.IO.Pipelines"; version = "4.7.3"; sha256 = "0djp59x56klidi04xx8p5jc1nchv5zvd1d59diphqxwvgny3aawy"; }) - (fetchNuGet { pname = "System.Linq"; version = "4.1.0"; sha256 = "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5"; }) - (fetchNuGet { pname = "System.Linq.Async"; version = "6.0.1"; sha256 = "10ira8hmv0i54yp9ggrrdm1c06j538sijfjpn1kmnh9j2xk5yzmq"; }) - (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.1.0"; sha256 = "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg"; }) - (fetchNuGet { pname = "System.Memory"; version = "4.5.4"; sha256 = "14gbbs22mcxwggn0fcfs1b062521azb9fbb7c113x0mq6dzq9h6y"; }) - (fetchNuGet { pname = "System.Net.WebSockets"; version = "4.3.0"; sha256 = "1gfj800078kggcgl0xyl00a6y5k4wwh2k2qm69rjy22wbmq7fy4p"; }) - (fetchNuGet { pname = "System.ObjectModel"; version = "4.0.12"; sha256 = "1sybkfi60a4588xn34nd9a58png36i0xr4y4v4kqpg8wlvy5krrj"; }) - (fetchNuGet { pname = "System.Private.Uri"; version = "4.3.0"; sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"; }) - (fetchNuGet { pname = "System.Reactive"; version = "4.4.1"; sha256 = "0gx8jh3hny2y5kijz5k9pxiqw481d013787c04zlhps21ygklw4a"; }) - (fetchNuGet { pname = "System.Reflection"; version = "4.1.0"; sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9"; }) - (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; }) - (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.0.1"; sha256 = "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp"; }) - (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.0.1"; sha256 = "1pcd2ig6bg144y10w7yxgc9d22r7c7ww7qn1frdfwgxr24j9wvv0"; }) - (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.0.1"; sha256 = "1s4b043zdbx9k39lfhvsk68msv1nxbidhkq6nbm27q7sf8xcsnxr"; }) - (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.0.1"; sha256 = "0m7wqwq0zqq9gbpiqvgk3sr92cbrw7cp3xn53xvw7zj6rz6fdirn"; }) - (fetchNuGet { pname = "System.Reflection.Metadata"; version = "1.6.0"; sha256 = "1wdbavrrkajy7qbdblpbpbalbdl48q3h34cchz24gvdgyrlf15r4"; }) - (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.0.1"; sha256 = "1bangaabhsl4k9fg8khn83wm6yial8ik1sza7401621jc6jrym28"; }) - (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; }) - (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.1.0"; sha256 = "1bjli8a7sc7jlxqgcagl9nh8axzfl11f4ld3rjqsyxc516iijij7"; }) - (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.0.1"; sha256 = "0b4i7mncaf8cnai85jv3wnw6hps140cxz8vylv2bik6wyzgvz7bi"; }) - (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; }) - (fetchNuGet { pname = "System.Runtime"; version = "4.1.0"; sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; }) - (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; }) - (fetchNuGet { pname = "System.Runtime.Caching"; version = "6.0.0"; sha256 = "0wh98a77cby4i3h2mar241k01105x661kh03vlyd399shxkfk60a"; }) - (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.4.0"; sha256 = "0a6ahgi5b148sl5qyfpyw383p3cb4yrkm802k29fsi4mxkiwir29"; }) - (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.7.0"; sha256 = "16r6sn4czfjk8qhnz7bnqlyiaaszr0ihinb7mq9zzr1wba257r54"; }) - (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.7.1"; sha256 = "119br3pd85lq8zcgh4f60jzmv1g976q1kdgi3hvqdlhfbw6siz2j"; }) - (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.1.0"; sha256 = "0rw4rm4vsm3h3szxp9iijc3ksyviwsv6f63dng3vhqyg4vjdkc2z"; }) - (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; }) - (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.0.1"; sha256 = "1g0zrdi5508v49pfm3iii2hn6nm00bgvfpjq1zxknfjrxxa20r4g"; }) - (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; }) - (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.1.0"; sha256 = "01kxqppx3dr3b6b286xafqilv4s2n0gqvfgzfd4z943ga9i81is1"; }) - (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; }) - (fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.0.0"; sha256 = "0glmvarf3jz5xh22iy3w9v3wyragcm4hfdr17v90vs7vcrm7fgp6"; }) - (fetchNuGet { pname = "System.Runtime.Numerics"; version = "4.3.0"; sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"; }) - (fetchNuGet { pname = "System.Security.AccessControl"; version = "4.6.0"; sha256 = "1wl1dyghi0qhpap1vgfhg2ybdyyhy9vc2a7dpm1xb30vfgmlkjmf"; }) - (fetchNuGet { pname = "System.Security.AccessControl"; version = "6.0.0"; sha256 = "0a678bzj8yxxiffyzy60z2w1nczzpi8v97igr4ip3byd2q89dv58"; }) - (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "6.0.0"; sha256 = "05kd3a8w7658hjxq9vvszxip30a479fjmfq4bq1r95nrsvs4hbss"; }) - (fetchNuGet { pname = "System.Security.Permissions"; version = "6.0.0"; sha256 = "0jsl4xdrkqi11iwmisi1r2f2qn5pbvl79mzq877gndw6ans2zhzw"; }) - (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.6.0"; sha256 = "1jmfzfz1n8hp63s5lja5xxpzkinbp6g59l3km9h8avjiisdrg5wm"; }) - (fetchNuGet { pname = "System.Text.Encoding"; version = "4.0.11"; sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; }) - (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.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; }) - (fetchNuGet { pname = "System.Threading"; version = "4.0.11"; sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; }) - (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; }) - (fetchNuGet { pname = "System.Threading.Channels"; version = "4.7.1"; sha256 = "038fyrriypwzsj5fwgnkw79hm5ya0x63r724yizgahbxf512chr2"; }) - (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.0.11"; sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5"; }) - (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; }) - (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.3"; sha256 = "0g7r6hm572ax8v28axrdxz1gnsblg6kszq17g51pj14a5rn2af7i"; }) - (fetchNuGet { pname = "System.Windows.Extensions"; version = "6.0.0"; sha256 = "1wy9pq9vn1bqg5qnv53iqrbx04yzdmjw4x5yyi09y3459vaa1sip"; }) - (fetchNuGet { pname = "Tomlyn"; version = "0.16.2"; sha256 = "1i928q6a7l65mk7wj2vvfclyvxamdjxg4dbj3g6g95inrfgvidah"; }) + (fetchNuGet { pname = "Boogie"; version = "3.1.3"; hash = "sha256-0XQcD1ImPNPXQ43fTkahC3qr2zUvHNdmgw0tmYE+7Hc="; }) + (fetchNuGet { pname = "Boogie.AbstractInterpretation"; version = "3.2.3"; hash = "sha256-SwJ5D3tOU+qcyQdNITIM15ujMEC++aXHOsUSovWbsC4="; }) + (fetchNuGet { pname = "Boogie.BaseTypes"; version = "3.2.3"; hash = "sha256-cIUdpGGjMKn70Z0nD8rvva8UbFSoLDUrBprC+TMG/EA="; }) + (fetchNuGet { pname = "Boogie.CodeContractsExtender"; version = "3.2.3"; hash = "sha256-L+phJ66oHNINliPkabU3vO4Vl9Lkv+nug+DWC8VmFlc="; }) + (fetchNuGet { pname = "Boogie.Concurrency"; version = "3.2.3"; hash = "sha256-w+5B+uyfKCf8j8hP0G/SSPUd2lT2T8A4Lkg0tsxniBg="; }) + (fetchNuGet { pname = "Boogie.Core"; version = "3.2.3"; hash = "sha256-qqoeLAdpRRaTISdgxyE3iFqhrmezxISaE5bm02rXVyE="; }) + (fetchNuGet { pname = "Boogie.ExecutionEngine"; version = "3.2.3"; hash = "sha256-8EKwiBnoMFGxeK2+IuG5p6BtnPlR0CCekXi4PBFLEbU="; }) + (fetchNuGet { pname = "Boogie.Graph"; version = "3.2.3"; hash = "sha256-7XjrCHSnvEL7eMmma2vKA7r8YGJe8Oo4E8U9Wja/al0="; }) + (fetchNuGet { pname = "Boogie.Houdini"; version = "3.2.3"; hash = "sha256-g7i0yF/89IWXElTi0onOgvPaesqlPGl3qINMCePHGA8="; }) + (fetchNuGet { pname = "Boogie.Model"; version = "3.2.3"; hash = "sha256-gRMZQQFMjQEQasg3A3iZ9/0KUWCxAoUPiHPZHbWXUs4="; }) + (fetchNuGet { pname = "Boogie.Provers.LeanAuto"; version = "3.2.3"; hash = "sha256-kMLvTTnvKWjggSby7D4jkaRmdvvOum0ZlfM6yU2760Q="; }) + (fetchNuGet { pname = "Boogie.Provers.SMTLib"; version = "3.2.3"; hash = "sha256-SCfEJCRueTE66ZZbHX8FHpD50SrBDQne8725uiKjbvM="; }) + (fetchNuGet { pname = "Boogie.VCExpr"; version = "3.2.3"; hash = "sha256-U6Rc5P0dUtNZ1IGDBU4hggwreVxSZqu6cZSKcWLpq/o="; }) + (fetchNuGet { pname = "Boogie.VCGeneration"; version = "3.2.3"; hash = "sha256-snbFiueD508B1GLqIC8cQdT9jW2jkRyhmYxPTlfnyrQ="; }) + (fetchNuGet { pname = "CocoR"; version = "2014.12.25"; hash = "sha256-qxTcnqh7jziriMHwos5/YArRYUG2+3nNoYYmFyPo8E0="; }) + (fetchNuGet { pname = "JetBrains.Annotations"; version = "2021.1.0"; hash = "sha256-64Vc/jHHG5tzaQrmlaU3y7+9qj3jT1V5vRr1R3uH9h4="; }) + (fetchNuGet { pname = "MediatR"; version = "8.1.0"; hash = "sha256-dyqhDG1NJjY1b+dj37sMmklGkxAm3zKdhh2lBJ0/HTM="; }) + (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "1.1.1"; hash = "sha256-fAcX4sxE0veWM1CZBtXR/Unky+6sE33yrV7ohrWGKig="; }) + (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "6.0.0"; hash = "sha256-49+H/iFwp+AfCICvWcqo9us4CzxApPKC37Q5Eqrw+JU="; }) + (fetchNuGet { pname = "Microsoft.DotNet.PlatformAbstractions"; version = "2.0.4"; hash = "sha256-Eu3aY2f4gZWQLJHdVV98tu5Rn1uQ8f9UKQumGomlv7k="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "2.0.0"; hash = "sha256-SSemrjaokMnzOF8ynrgEV6xEh4TlesUE7waW2BLuWns="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "5.0.0"; hash = "sha256-N3yQnqcwAKISG6HS8ZC3PFpBMK+xCTkZpOBtgOnfqQY="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "2.0.0"; hash = "sha256-jveXZPNvx30uWT3q80OA1YaSb4K/KGOhlyun97IXn8Y="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "5.0.0"; hash = "sha256-0+ywPdqMkx32+HcMHqAp00cWBE7aCNc09Xh2eRObHTs="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "2.0.0"; hash = "sha256-7GVLiJupIL3BS5XgB44M95TxzF4KwvVUsShko+pqO98="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.CommandLine"; version = "5.0.0"; hash = "sha256-rCJkSm04hn5z1DBxMO4d32Kqb8R65iG8KiFvQMu3kCA="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.FileExtensions"; version = "5.0.0"; hash = "sha256-41soBkRr6fPO7KYnXb+462KyXd23YZ0gT7WyPnISAvM="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Json"; version = "5.0.0"; hash = "sha256-6Xp3Snr9/aNHPszduVdvPnSBoh40KRpuvnvJNRCJBUM="; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "2.0.0"; hash = "sha256-+KqiuV8ncy9b1xhtDExh4s4U57tKxqx4pAyr6d//EQU="; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "5.0.0"; hash = "sha256-RN478YJQE0YM0g+JztXp00w57CIF4bb48hSD/z3jTZc="; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "2.0.0"; hash = "sha256-H1rEnq/veRWvmp8qmUsrQkQIcVlKilUNzmmKsxJ0md8="; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "5.0.0"; hash = "sha256-0sfuxZ07HsMZJpKatDrW6I671uJBYWsUgAyoDZA2n50="; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; version = "2.0.4"; hash = "sha256-qcu4Lwd+aqFwBjOYJ37duL5bXkCz/d6pev+uyOgOMRA="; }) + (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Abstractions"; version = "5.0.0"; hash = "sha256-QWpl951Ns5Zu4w2GAhcB1qVCmcCaUZEz8198sUB7UAU="; }) + (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Physical"; version = "5.0.0"; hash = "sha256-7Wt0iaQnbFt12MczXHCh8apzJcyAykRFmNcoRAKKcQM="; }) + (fetchNuGet { pname = "Microsoft.Extensions.FileSystemGlobbing"; version = "5.0.0"; hash = "sha256-q145xaBUpweu7GvPKn0b2rJgOU5eMIZPoABKv3ayplI="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "2.0.0"; hash = "sha256-Bg3bFJPjQRJnPvlEc5v7lzwRaUTzKwXDtz81GjCTfMo="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "5.0.0"; hash = "sha256-IyJiQk0xhESWjr231L7MsbFvFbphP6T8VwlKgVGgQeE="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "5.0.0"; hash = "sha256-jJtcchUS8Spt/GddcDtWa4lN1RAVQ2sxDnu1cgwa6vs="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "2.0.0"; hash = "sha256-EMvaXxGzueI8lT97bYJQr0kAj1IK0pjnAcWN82hTnzw="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "5.0.0"; hash = "sha256-Xq2JIa2Rg9vnLnZ75k4ydyT4j2A+G6UUx6iDc959teU="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Options.ConfigurationExtensions"; version = "2.0.0"; hash = "sha256-lD4xwvlLRLdJ2WdaHWGpEIRWOtWcvbr4ccD8v2QeTMc="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "2.0.0"; hash = "sha256-q44LtMvyNEKSvgERvA+BrasKapP92Sc91QR4u2TJ9/Y="; }) + (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "5.0.0"; hash = "sha256-pj1BdHlmYm5HZifp/yB3lwDkdw0/jcIF0vYg6O1kmGs="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; hash = "sha256-mZotlGZqtrqDSoBrZhsxFe6fuOv5/BIo0w2Z2x0zVAU="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; hash = "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "3.0.0"; hash = "sha256-ocB+U+mMvi/xVwII7bGsIfAqSXiKVSnEMLHCODLJaK4="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1"; hash = "sha256-lxxw/Gy32xHi0fLgFWNj4YTFBSBkjx5l6ucmbTyf7V4="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; hash = "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ="; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.Extensions.TrxLogger"; version = "17.9.0"; hash = "sha256-6edCHExW+iO5Y/2HamyB4daM746ME6p/4fKRmORGw3I="; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.9.0"; hash = "sha256-iiXUFzpvT8OWdzMj9FGJDqanwHx40s1TXVY9l3ii+s0="; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.9.0"; hash = "sha256-1BZIY1z+C9TROgdTV/tq4zsPy7Q71GQksr/LoMKAzqU="; }) + (fetchNuGet { pname = "Microsoft.VisualStudio.Threading"; version = "16.7.56"; hash = "sha256-V2HB/0j+I/3iUT7mEVyeF11P/61cSpYcZQa1LnXuoI8="; }) + (fetchNuGet { pname = "Microsoft.VisualStudio.Threading.Analyzers"; version = "16.7.56"; hash = "sha256-4lsL6hg1mposZ62buQWBud1B4raV8Pl+BkyvM4FraRM="; }) + (fetchNuGet { pname = "Microsoft.VisualStudio.Validation"; version = "15.5.31"; hash = "sha256-/NWbGyad7wejY8QyxK8YWTgiRiUGjimaBgoLkWxOCao="; }) + (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; hash = "sha256-mBNDmPXNTW54XLnPAUwBRvkIORFM7/j0D0I2SyQPDEg="; }) + (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "4.6.0"; hash = "sha256-Wrj0Sc9srH5+ma0lCbgRYYP6gKgnlXcL6h7j7AU6nkQ="; }) + (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "6.0.0"; hash = "sha256-N9EVZbl5w1VnMywGXyaVWzT9lh84iaJ3aD48hIBk1zA="; }) + (fetchNuGet { pname = "Nerdbank.Streams"; version = "2.6.81"; hash = "sha256-0Zshmi1IMWj9/MKUieffpgJxKhJyVgBXPKMg9RSDkRs="; }) + (fetchNuGet { pname = "Newtonsoft.Json"; version = "11.0.2"; hash = "sha256-YhlAbGfwoxQzxb3Hef4iyV9eGdPQJJNd2GgSR0jsBJ0="; }) + (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; hash = "sha256-K2tSVW4n4beRPzPu3rlVaBEMdGvWSv/3Q1fxaDh4Mjo="; }) + (fetchNuGet { pname = "OmniSharp.Extensions.JsonRpc"; version = "0.19.5"; hash = "sha256-iwluvSBBemilT9iW3TDMB1D6bzKx+fgsalNu1tnYjEY="; }) + (fetchNuGet { pname = "OmniSharp.Extensions.JsonRpc.Generators"; version = "0.19.5"; hash = "sha256-aAvS2DLVWtgLTxRwRDPb7cOALN7Anpejd6jRJLonTNU="; }) + (fetchNuGet { pname = "OmniSharp.Extensions.LanguageProtocol"; version = "0.19.5"; hash = "sha256-Mcxq+aAYWUpyWVWU8VUgWeFeAuRbQRxjNATSZvjKj7I="; }) + (fetchNuGet { pname = "OmniSharp.Extensions.LanguageServer"; version = "0.19.5"; hash = "sha256-lWL4Y+zKMCMV5pK4BuLBk0UczIz3anqgUlYqkgGrfTM="; }) + (fetchNuGet { pname = "OmniSharp.Extensions.LanguageServer.Shared"; version = "0.19.5"; hash = "sha256-cBhiB/69T2b3xu+/D5o+AanglYTuaXU5OfIOW3WtnzE="; }) + (fetchNuGet { pname = "RangeTree"; version = "3.0.1"; hash = "sha256-oq57hCNWp7I8xTtvExIbfcDNXoR8qxDVPCyDLDZCUac="; }) + (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; hash = "sha256-4PGZqyWhZ6/HCTF2KddDsbmTTjxs2oW79YfkberDZS8="; }) + (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tracing"; version = "4.3.0"; hash = "sha256-dsmTLGvt8HqRkDWP8iKVXJCS+akAzENGXKPV18W2RgI="; }) + (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.Text.Encoding.Extensions"; version = "4.3.0"; hash = "sha256-6MYj0RmLh4EVqMtO/MRqBi0HOn5iG4x9JimgCCJ+EFM="; }) + (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.0.0"; hash = "sha256-bmaM0ovT4X4aqDJOR255Yda/u3fmHZskU++lMnsy894="; }) + (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.Microsoft.Win32.Primitives"; version = "4.3.0"; hash = "sha256-LZb23lRXzr26tRS5aA0xyB08JxiblPDoA7HBvn6awXg="; }) + (fetchNuGet { pname = "runtime.unix.System.Diagnostics.Debug"; version = "4.3.0"; hash = "sha256-ReoazscfbGH+R6s6jkg5sIEHWNEvjEoHtIsMbpc7+tI="; }) + (fetchNuGet { pname = "runtime.unix.System.IO.FileSystem"; version = "4.3.0"; hash = "sha256-Pf4mRl6YDK2x2KMh0WdyNgv0VUNdSKVDLlHqozecy5I="; }) + (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 = "Serilog"; version = "2.12.0"; hash = "sha256-JD+ud+CFoLGdYGasTWKTxx5PYj2W5pBv2lMybBK7HVM="; }) + (fetchNuGet { pname = "Serilog.Extensions.Logging"; version = "3.0.1"; hash = "sha256-KtHMMnepmEpOlHrIGlUkK6Vq1L0iBBnFGavbUtvxOBk="; }) + (fetchNuGet { pname = "Serilog.Settings.Configuration"; version = "3.1.0"; hash = "sha256-ZU0eb88tVMRKrfz9ewcmtCmWFqZeVLdeGGMcYElVRbI="; }) + (fetchNuGet { pname = "Serilog.Sinks.Debug"; version = "2.0.0"; hash = "sha256-/PLVAE33lTdUEXdahkI5ddFiGZufWnvfsOodQsFB8sQ="; }) + (fetchNuGet { pname = "Serilog.Sinks.File"; version = "5.0.0"; hash = "sha256-GKy9hwOdlu2W0Rw8LiPyEwus+sDtSOTl8a5l9uqz+SQ="; }) + (fetchNuGet { pname = "System.AppContext"; version = "4.1.0"; hash = "sha256-v6YfyfrKmhww+EYHUq6cwYUMj00MQ6SOfJtcGVRlYzs="; }) + (fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; hash = "sha256-XqZWb4Kd04960h4U9seivjKseGA/YEIpdplfHYHQ9jk="; }) + (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; hash = "sha256-afY7VUtD6w/5mYqrce8kQrvDIfS2GXDINDh73IjxJKc="; }) + (fetchNuGet { pname = "System.Collections.Immutable"; version = "1.7.0"; hash = "sha256-/RMBxUUublGaWERAnTk74QmrSQbX+xs84yFqmawmM74="; }) + (fetchNuGet { pname = "System.Collections.Immutable"; version = "1.7.1"; hash = "sha256-WMMAUqoxT3J1gW9DI8v31VAuhwqTc4Posose5jq1BNo="; }) + (fetchNuGet { pname = "System.CommandLine"; version = "2.0.0-beta4.22272.1"; hash = "sha256-zSO+CYnMH8deBHDI9DHhCPj79Ce3GOzHCyH1/TiHxcc="; }) + (fetchNuGet { pname = "System.Configuration.ConfigurationManager"; version = "6.0.0"; hash = "sha256-fPV668Cfi+8pNWrvGAarF4fewdPVEDwlJWvJk0y+Cms="; }) + (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; hash = "sha256-fkA79SjPbSeiEcrbbUsb70u9B7wqbsdM9s1LnoKj0gM="; }) + (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.3.0"; hash = "sha256-hCETZpHHGVhPYvb4C0fh4zs+8zv4GPoixagkLZjpa9Q="; }) + (fetchNuGet { pname = "System.Drawing.Common"; version = "6.0.0"; hash = "sha256-/9EaAbEeOjELRSMZaImS1O8FmUe8j4WuFUw1VOrPyAo="; }) + (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.0.11"; hash = "sha256-qWqFVxuXioesVftv2RVJZOnmojUvRjb7cS3Oh3oTit4="; }) + (fetchNuGet { pname = "System.Globalization"; version = "4.0.11"; hash = "sha256-rbSgc2PIEc2c2rN6LK3qCREAX3DqA2Nq1WcLrZYsDBw="; }) + (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; hash = "sha256-caL0pRmFSEsaoeZeWN5BTQtGrAtaQPwFi8YOZPZG5rI="; }) + (fetchNuGet { pname = "System.IO"; version = "4.1.0"; hash = "sha256-V6oyQFwWb8NvGxAwvzWnhPxy9dKOfj/XBM3tEC5aHrw="; }) + (fetchNuGet { pname = "System.IO"; version = "4.3.0"; hash = "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY="; }) + (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.0.1"; hash = "sha256-4VKXFgcGYCTWVXjAlniAVq0dO3o5s8KHylg2wg2/7k0="; }) + (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.3.0"; hash = "sha256-LMnfg8Vwavs9cMnq9nNH8IWtAtSfk0/Fy4s4Rt9r1kg="; }) + (fetchNuGet { pname = "System.IO.Pipelines"; version = "4.7.3"; hash = "sha256-nis1vH2bdwxvbKm00PYvGzIbmCwX9U5AbJFOU3oqVzY="; }) + (fetchNuGet { pname = "System.Linq"; version = "4.1.0"; hash = "sha256-ZQpFtYw5N1F1aX0jUK3Tw+XvM5tnlnshkTCNtfVA794="; }) + (fetchNuGet { pname = "System.Linq.Async"; version = "6.0.1"; hash = "sha256-uH5fZhcyQVtnsFc6GTUaRRrAQm05v5euJyWCXSFSOYI="; }) + (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.1.0"; hash = "sha256-7zqB+FXgkvhtlBzpcZyd81xczWP0D3uWssyAGw3t7b4="; }) + (fetchNuGet { pname = "System.Net.WebSockets"; version = "4.3.0"; hash = "sha256-l3h3cF1cCC9zMhWLKSDnZBZvFADUd0Afe2+iAwBA0r0="; }) + (fetchNuGet { pname = "System.ObjectModel"; version = "4.0.12"; hash = "sha256-MudZ/KYcvYsn2cST3EE049mLikrNkmE7QoUoYKKby+s="; }) + (fetchNuGet { pname = "System.Private.Uri"; version = "4.3.0"; hash = "sha256-fVfgcoP4AVN1E5wHZbKBIOPYZ/xBeSIdsNF+bdukIRM="; }) + (fetchNuGet { pname = "System.Reactive"; version = "4.4.1"; hash = "sha256-inA6nw9CX0g/AeygMwJoARGOY79pli/jLF54CweUqD8="; }) + (fetchNuGet { pname = "System.Reflection"; version = "4.1.0"; hash = "sha256-idZHGH2Yl/hha1CM4VzLhsaR8Ljo/rV7TYe7mwRJSMs="; }) + (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; hash = "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY="; }) + (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.0.1"; hash = "sha256-F1MvYoQWHCY89/O4JBwswogitqVvKuVfILFqA7dmuHk="; }) + (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.0.1"; hash = "sha256-YG+eJBG5P+5adsHiw/lhJwvREnvdHw6CJyS8ZV4Ujd0="; }) + (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.0.1"; hash = "sha256-uVvNOnL64CPqsgZP2OLqNmxdkZl6Q0fTmKmv9gcBi+g="; }) + (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.0.1"; hash = "sha256-NsfmzM9G/sN3H8X2cdnheTGRsh7zbRzvegnjDzDH/FQ="; }) + (fetchNuGet { pname = "System.Reflection.Metadata"; version = "1.6.0"; hash = "sha256-JJfgaPav7UfEh4yRAQdGhLZF1brr0tUWPl6qmfNWq/E="; }) + (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.0.1"; hash = "sha256-SFSfpWEyCBMAOerrMCOiKnpT+UAWTvRcmoRquJR6Vq0="; }) + (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; hash = "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM="; }) + (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.1.0"; hash = "sha256-R0YZowmFda+xzKNR4kKg7neFoE30KfZwp/IwfRSKVK4="; }) + (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.0.1"; hash = "sha256-cZ2/3/fczLjEpn6j3xkgQV9ouOVjy4Kisgw5xWw9kSw="; }) + (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; hash = "sha256-idiOD93xbbrbwwSnD4mORA9RYi/D/U48eRUsn/WnWGo="; }) + (fetchNuGet { pname = "System.Runtime"; version = "4.1.0"; hash = "sha256-FViNGM/4oWtlP6w0JC0vJU+k9efLKZ+yaXrnEeabDQo="; }) + (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; hash = "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg="; }) + (fetchNuGet { pname = "System.Runtime.Caching"; version = "6.0.0"; hash = "sha256-CpjpZoc6pdE83QPAGYzpBYQAZiAiqyrgiMQvdo5CCXI="; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.4.0"; hash = "sha256-SeTI4+yVRO2SmAKgOrMni4070OD+Oo8L1YiEVeKDyig="; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.7.1"; hash = "sha256-UvyoDV8O0oY3HPG1GbA56YVdvwTGEfjYR5gW1O7IK4U="; }) + (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.1.0"; hash = "sha256-X7DZ5CbPY7jHs20YZ7bmcXs9B5Mxptu/HnBUvUnNhGc="; }) + (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; hash = "sha256-wLDHmozr84v1W2zYCWYxxj0FR0JDYHSVRaRuDm0bd/o="; }) + (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.0.1"; hash = "sha256-j2QgVO9ZOjv7D1het98CoFpjoYgxjupuIhuBUmLLH7w="; }) + (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; hash = "sha256-KJ5aXoGpB56Y6+iepBkdpx/AfaJDAitx4vrkLqR7gms="; }) + (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.1.0"; hash = "sha256-QceAYlJvkPRJc/+5jR+wQpNNI3aqGySWWSO30e/FfQY="; }) + (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; hash = "sha256-8sDH+WUJfCR+7e4nfpftj/+lstEiZixWUBueR2zmHgI="; }) + (fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.0.0"; hash = "sha256-5j53amb76A3SPiE3B0llT2XPx058+CgE7OXL4bLalT4="; }) + (fetchNuGet { pname = "System.Runtime.Numerics"; version = "4.3.0"; hash = "sha256-P5jHCgMbgFMYiONvzmaKFeOqcAIDPu/U8bOVrNPYKqc="; }) + (fetchNuGet { pname = "System.Security.AccessControl"; version = "4.6.0"; hash = "sha256-rspJ63MbjNVDve0owXby0Pu2vHjQvR2uuhCDCJ9vgfI="; }) + (fetchNuGet { pname = "System.Security.AccessControl"; version = "6.0.0"; hash = "sha256-qOyWEBbNr3EjyS+etFG8/zMbuPjA+O+di717JP9Cxyg="; }) + (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "6.0.0"; hash = "sha256-Wi9I9NbZlpQDXgS7Kl06RIFxY/9674S7hKiYw5EabRY="; }) + (fetchNuGet { pname = "System.Security.Permissions"; version = "6.0.0"; hash = "sha256-/MMvtFWGN/vOQfjXdOhet1gsnMgh6lh5DCHimVsnVEs="; }) + (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.6.0"; hash = "sha256-lZeXm45RboVgqnPQVJ65y8b5b+9FSVr0MBciG777rso="; }) + (fetchNuGet { pname = "System.Text.Encoding"; version = "4.0.11"; hash = "sha256-PEailOvG05CVgPTyKLtpAgRydlSHmtd5K0Y8GSHY2Lc="; }) + (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; hash = "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg="; }) + (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; hash = "sha256-vufHXg8QAKxHlujPHHcrtGwAqFmsCD6HKjfDAiHyAYc="; }) + (fetchNuGet { pname = "System.Threading"; version = "4.0.11"; hash = "sha256-mob1Zv3qLQhQ1/xOLXZmYqpniNUMCfn02n8ZkaAhqac="; }) + (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; hash = "sha256-ZDQ3dR4pzVwmaqBg4hacZaVenQ/3yAF/uV7BXZXjiWc="; }) + (fetchNuGet { pname = "System.Threading.Channels"; version = "4.7.1"; hash = "sha256-IkMmQnF9QfV+9EScPEwHypcK0+HTPu6K1J9fH3P2Dg0="; }) + (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.0.11"; hash = "sha256-5SLxzFg1df6bTm2t09xeI01wa5qQglqUwwJNlQPJIVs="; }) + (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; hash = "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w="; }) + (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.3"; hash = "sha256-8TglbC6KBHlDeSfgr6d5dGn7wu8td4XERl2JUyo0+Tw="; }) + (fetchNuGet { pname = "System.Windows.Extensions"; version = "6.0.0"; hash = "sha256-N+qg1E6FDJ9A9L50wmVt3xPQV8ZxlG1xeXgFuxO+yfM="; }) + (fetchNuGet { pname = "Tomlyn"; version = "0.16.2"; hash = "sha256-ULW4n8s2lvTMG3I18rpsVfXtKXN7C8nPrMXQowxGIsU="; }) ] From 30a4e6db2a30994ce66c45599370b98eaed25f33 Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Thu, 22 Aug 2024 18:32:14 -0400 Subject: [PATCH 008/300] 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 48276abd93a8843748ae21e935785b1c53378cb9 Mon Sep 17 00:00:00 2001 From: Moritz Hedtke Date: Tue, 17 Sep 2024 12:37:00 +0200 Subject: [PATCH 009/300] maintainers: add mohe2015 --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 74569537259e..b62fa756b1f6 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -13990,6 +13990,12 @@ githubId = 754512; name = "Mogria"; }; + mohe2015 = { + name = "Moritz Hedtke"; + email = "Moritz.Hedtke@t-online.de"; + github = "mohe2015"; + githubId = 13287984; + }; momeemt = { name = "Mutsuha Asada"; email = "me@momee.mt"; From b5aefcd40a4c5a0db8275e72fd18018a9d94b77b Mon Sep 17 00:00:00 2001 From: nicoo Date: Sun, 15 Sep 2024 21:47:29 +0000 Subject: [PATCH 010/300] fetchgx: support `hash` attribute --- pkgs/build-support/fetchgx/default.nix | 45 +++++++++++++------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/pkgs/build-support/fetchgx/default.nix b/pkgs/build-support/fetchgx/default.nix index 93f60c0a9cac..5726e7d4e9f1 100644 --- a/pkgs/build-support/fetchgx/default.nix +++ b/pkgs/build-support/fetchgx/default.nix @@ -1,30 +1,31 @@ -{ stdenvNoCC, gx, gx-go, go, cacert }: +{ lib, stdenvNoCC, gx, gx-go, go, cacert }: -{ name, src, sha256 }: +lib.fetchers.withNormalizedHash { } ( + { name, src, outputHash, outputHashAlgo }: -stdenvNoCC.mkDerivation { - name = "${name}-gxdeps"; - inherit src; + stdenvNoCC.mkDerivation { + name = "${name}-gxdeps"; + inherit src; - nativeBuildInputs = [ cacert go gx gx-go ]; + nativeBuildInputs = [ cacert go gx gx-go ]; - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = sha256; + inherit outputHash outputHashAlgo; + outputHashMode = "recursive"; - dontConfigure = true; - doCheck = false; - doInstallCheck = false; + dontConfigure = true; + doCheck = false; + doInstallCheck = false; - buildPhase = '' - export GOPATH=$(pwd)/vendor - mkdir -p vendor - gx install - ''; + buildPhase = '' + export GOPATH=$(pwd)/vendor + mkdir -p vendor + gx install + ''; - installPhase = '' - mv vendor $out - ''; + installPhase = '' + mv vendor $out + ''; - preferLocalBuild = true; -} + preferLocalBuild = true; + } +) From 1ccd5ba5405b90482518e9f76b6cecba850c3be3 Mon Sep 17 00:00:00 2001 From: nicoo Date: Sun, 15 Sep 2024 21:52:34 +0000 Subject: [PATCH 011/300] fetchs3: support `hash` attribute --- pkgs/build-support/fetchs3/default.nix | 61 +++++++++++++------------- 1 file changed, 31 insertions(+), 30 deletions(-) diff --git a/pkgs/build-support/fetchs3/default.nix b/pkgs/build-support/fetchs3/default.nix index acad0749b663..1dd6945a5cb5 100644 --- a/pkgs/build-support/fetchs3/default.nix +++ b/pkgs/build-support/fetchs3/default.nix @@ -1,36 +1,37 @@ { lib, runCommand, awscli }: +lib.fetchers.withNormalizedHash { } ( + { s3url + , name ? builtins.baseNameOf s3url + , outputHash + , outputHashAlgo + , region ? "us-east-1" + , credentials ? null # Default to looking at local EC2 metadata service + , recursiveHash ? false + , postFetch ? null + }: -{ s3url -, name ? builtins.baseNameOf s3url -, sha256 -, region ? "us-east-1" -, credentials ? null # Default to looking at local EC2 metadata service -, recursiveHash ? false -, postFetch ? null -}: + let + mkCredentials = { access_key_id, secret_access_key, session_token ? null }: { + AWS_ACCESS_KEY_ID = access_key_id; + AWS_SECRET_ACCESS_KEY = secret_access_key; + AWS_SESSION_TOKEN = session_token; + }; -let - mkCredentials = { access_key_id, secret_access_key, session_token ? null }: { - AWS_ACCESS_KEY_ID = access_key_id; - AWS_SECRET_ACCESS_KEY = secret_access_key; - AWS_SESSION_TOKEN = session_token; - }; + credentialAttrs = lib.optionalAttrs (credentials != null) (mkCredentials credentials); + in runCommand name ({ + nativeBuildInputs = [ awscli ]; - credentialAttrs = lib.optionalAttrs (credentials != null) (mkCredentials credentials); -in runCommand name ({ - nativeBuildInputs = [ awscli ]; + inherit outputHash outputHashAlgo; + outputHashMode = if recursiveHash then "recursive" else "flat"; - outputHashAlgo = "sha256"; - outputHash = sha256; - outputHashMode = if recursiveHash then "recursive" else "flat"; + preferLocalBuild = true; - preferLocalBuild = true; - - AWS_DEFAULT_REGION = region; -} // credentialAttrs) (if postFetch != null then '' - downloadedFile="$(mktemp)" - aws s3 cp ${s3url} $downloadedFile - ${postFetch} -'' else '' - aws s3 cp ${s3url} $out -'') + AWS_DEFAULT_REGION = region; + } // credentialAttrs) (if postFetch != null then '' + downloadedFile="$(mktemp)" + aws s3 cp ${s3url} $downloadedFile + ${postFetch} + '' else '' + aws s3 cp ${s3url} $out + '') +) From fb8a85e2bb111e587211be819efa275854b2a6b2 Mon Sep 17 00:00:00 2001 From: nicoo Date: Sun, 15 Sep 2024 21:55:21 +0000 Subject: [PATCH 012/300] fetchbzr: support `hash` attribute --- pkgs/build-support/fetchbzr/default.nix | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/pkgs/build-support/fetchbzr/default.nix b/pkgs/build-support/fetchbzr/default.nix index b7db9e9274da..1f6f0f2a788e 100644 --- a/pkgs/build-support/fetchbzr/default.nix +++ b/pkgs/build-support/fetchbzr/default.nix @@ -1,15 +1,16 @@ -{ stdenvNoCC, breezy }: -{ url, rev, sha256 }: +{ lib, stdenvNoCC, breezy }: +lib.fetchers.withNormalizedHash { } ( + { url, rev, outputHash, outputHashAlgo }: -stdenvNoCC.mkDerivation { - name = "bzr-export"; + stdenvNoCC.mkDerivation { + name = "bzr-export"; - builder = ./builder.sh; - nativeBuildInputs = [ breezy ]; + builder = ./builder.sh; + nativeBuildInputs = [ breezy ]; - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = sha256; + inherit outputHash outputHashAlgo; + outputHashMode = "recursive"; - inherit url rev; -} + inherit url rev; + } +) From 07d3b14ce251db9c4c9ee59e72c489003f67df17 Mon Sep 17 00:00:00 2001 From: nicoo Date: Tue, 17 Sep 2024 06:52:57 +0000 Subject: [PATCH 013/300] nix-prefetch-bzr: emit SRI hashes by default --- pkgs/build-support/fetchbzr/nix-prefetch-bzr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/fetchbzr/nix-prefetch-bzr b/pkgs/build-support/fetchbzr/nix-prefetch-bzr index dbe8a7ef8013..184f2485ce57 100755 --- a/pkgs/build-support/fetchbzr/nix-prefetch-bzr +++ b/pkgs/build-support/fetchbzr/nix-prefetch-bzr @@ -9,7 +9,7 @@ if test -z "$hashType"; then hashType=sha256 fi if test -z "$hashFormat"; then - hashFormat=--base32 + hashFormat=--sri fi if test -z "$url"; then From a7013f2fc3520ba5f082576be22d1da14f240376 Mon Sep 17 00:00:00 2001 From: nicoo Date: Sun, 15 Sep 2024 21:56:35 +0000 Subject: [PATCH 014/300] =?UTF-8?q?gweled:=20`sha256`=20=E2=86=92=20`hash`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/games/gweled/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/gweled/default.nix b/pkgs/games/gweled/default.nix index 1add66074204..f76085b77ddf 100644 --- a/pkgs/games/gweled/default.nix +++ b/pkgs/games/gweled/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchbzr { url = "lp:gweled"; rev = "108"; - sha256 = "sha256-rM4dgbYfSrVqZwi+xzKuEtmtjK3HVvqeutmni1vleLo="; + hash = "sha256-rM4dgbYfSrVqZwi+xzKuEtmtjK3HVvqeutmni1vleLo="; }; doCheck = false; From ef232d59ac5fc448714898783ff17603177a9c68 Mon Sep 17 00:00:00 2001 From: nicoo Date: Sun, 15 Sep 2024 22:02:31 +0000 Subject: [PATCH 015/300] fetchcvs: support `hash` attribute --- pkgs/build-support/fetchcvs/default.nix | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/pkgs/build-support/fetchcvs/default.nix b/pkgs/build-support/fetchcvs/default.nix index 43a10c3aa552..94bbc69bba65 100644 --- a/pkgs/build-support/fetchcvs/default.nix +++ b/pkgs/build-support/fetchcvs/default.nix @@ -6,17 +6,18 @@ {stdenvNoCC, cvs, openssh, lib}: lib.makeOverridable ( -{cvsRoot, module, tag ? null, date ? null, sha256}: + lib.fetchers.withNormalizedHash { } ( + {cvsRoot, module, tag ? null, date ? null, outputHash, outputHashAlgo}: -stdenvNoCC.mkDerivation { - name = "cvs-export"; - builder = ./builder.sh; - nativeBuildInputs = [cvs openssh]; + stdenvNoCC.mkDerivation { + name = "cvs-export"; + builder = ./builder.sh; + nativeBuildInputs = [cvs openssh]; - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = sha256; + inherit outputHash outputHashAlgo; + outputHashMode = "recursive"; - inherit cvsRoot module sha256 tag date; -} + inherit cvsRoot module tag date; + } + ) ) From 3f7f5df38ab417d031632228fc3a7eb67d27905c Mon Sep 17 00:00:00 2001 From: nicoo Date: Tue, 17 Sep 2024 06:54:57 +0000 Subject: [PATCH 016/300] nix-prefetch-cvs: emit SRI hashes by default --- pkgs/build-support/fetchcvs/nix-prefetch-cvs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/fetchcvs/nix-prefetch-cvs b/pkgs/build-support/fetchcvs/nix-prefetch-cvs index b6a169f8b531..4438f44026f2 100755 --- a/pkgs/build-support/fetchcvs/nix-prefetch-cvs +++ b/pkgs/build-support/fetchcvs/nix-prefetch-cvs @@ -59,7 +59,7 @@ if test -z "$finalPath"; then (cd "$tmpPath" && cvs -f -z0 -d $cvsRoot export "${args[*]}" -d cvs-export $module >&2) # Compute the hash. - hash=$(nix-hash --type $hashType $hashFormat $tmpFile) + hash=$(nix-hash --type $hashType ${hashFormat:-"--sri"} $tmpFile) if ! test -n "$QUIET"; then echo "hash is $hash" >&2; fi # Add the downloaded file to the Nix store. From 54209fcd9e50adfb7be203dd790e206dd8a11123 Mon Sep 17 00:00:00 2001 From: nicoo Date: Sun, 15 Sep 2024 22:13:29 +0000 Subject: [PATCH 017/300] fetchmtn: support `hash` attribute --- pkgs/build-support/fetchmtn/default.nix | 33 ++++++++++++------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/pkgs/build-support/fetchmtn/default.nix b/pkgs/build-support/fetchmtn/default.nix index 4aa134242aa7..de208b92193f 100644 --- a/pkgs/build-support/fetchmtn/default.nix +++ b/pkgs/build-support/fetchmtn/default.nix @@ -1,25 +1,24 @@ # You can specify some extra mirrors and a cache DB via options {lib, stdenvNoCC, monotone, defaultDBMirrors ? [], cacheDB ? "./mtn-checkout.db"}: -# dbs is a list of strings -# each is an url for sync -# selector is mtn selector, like h:org.example.branch -# -{name ? "mtn-checkout", dbs ? [], sha256 -, selector ? "h:" + branch, branch}: +lib.fetchers.withNormalizedHash { } ( + # dbs is a list of strings, each is an url for sync + # selector is mtn selector, like h:org.example.branch + {name ? "mtn-checkout", dbs ? [] + , outputHash, outputHashAlgo + , selector ? "h:" + branch, branch}: -stdenvNoCC.mkDerivation { - builder = ./builder.sh; - nativeBuildInputs = [monotone]; + stdenvNoCC.mkDerivation { + builder = ./builder.sh; + nativeBuildInputs = [monotone]; - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = sha256; + inherit outputHash outputHashAlgo; + outputHashMode = "recursive"; - dbs = defaultDBMirrors ++ dbs; - inherit branch cacheDB name selector; + dbs = defaultDBMirrors ++ dbs; + inherit branch cacheDB name selector; - impureEnvVars = lib.fetchers.proxyImpureEnvVars; - -} + impureEnvVars = lib.fetchers.proxyImpureEnvVars; + } +) From 8af38be358c39fc4413303539d41d9a652aaba58 Mon Sep 17 00:00:00 2001 From: nicoo Date: Sun, 15 Sep 2024 22:19:11 +0000 Subject: [PATCH 018/300] =?UTF-8?q?netbsd:=20`sha256`=20=E2=86=92=20`hash`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/os-specific/bsd/netbsd/pkgs/source.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/source.nix b/pkgs/os-specific/bsd/netbsd/pkgs/source.nix index 432de84ffb3e..47f200090ca4 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/source.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/source.nix @@ -8,5 +8,5 @@ fetchcvs { cvsRoot = ":pserver:anoncvs@anoncvs.NetBSD.org:/cvsroot"; module = "src"; tag = "netbsd-${lib.replaceStrings [ "." ] [ "-" ] version}-RELEASE"; - sha256 = "sha256-+onT/ajWayaKALucaZBqoiEkvBBI400Fs2OCtMf/bYU="; + hash = "sha256-+onT/ajWayaKALucaZBqoiEkvBBI400Fs2OCtMf/bYU="; } From 4b8644b7a69821f5e0bd07ba6350087a3b08dcb3 Mon Sep 17 00:00:00 2001 From: nicoo Date: Sun, 15 Sep 2024 22:24:10 +0000 Subject: [PATCH 019/300] fetchdarcs: support `hash` attribute --- pkgs/build-support/fetchdarcs/default.nix | 30 ++++++++++++----------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/pkgs/build-support/fetchdarcs/default.nix b/pkgs/build-support/fetchdarcs/default.nix index 6073efec2815..320b201f2853 100644 --- a/pkgs/build-support/fetchdarcs/default.nix +++ b/pkgs/build-support/fetchdarcs/default.nix @@ -1,21 +1,23 @@ {stdenvNoCC, darcs, cacert, lib}: lib.makeOverridable ( -{ url -, rev ? null -, context ? null -, sha256 ? "" -, name ? "fetchdarcs" -}: + lib.fetchers.withNormalizedHash { } ( + { url + , rev ? null + , context ? null + , outputHash ? lib.fakeHash + , outputHashAlgo ? null + , name ? "fetchdarcs" + }: -stdenvNoCC.mkDerivation { - builder = ./builder.sh; - nativeBuildInputs = [cacert darcs]; + stdenvNoCC.mkDerivation { + builder = ./builder.sh; + nativeBuildInputs = [cacert darcs]; - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = sha256; + inherit outputHash outputHashAlgo; + outputHashMode = "recursive"; - inherit url rev context name; -} + inherit url rev context name; + } + ) ) From f723aa0f6620154e1d6f42588ed983e8aa4d9eac Mon Sep 17 00:00:00 2001 From: nicoo Date: Sun, 15 Sep 2024 22:28:44 +0000 Subject: [PATCH 020/300] fetchpijul: minor simplification --- pkgs/build-support/fetchpijul/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/fetchpijul/default.nix b/pkgs/build-support/fetchpijul/default.nix index fd41cfa55355..3aef7c035e72 100644 --- a/pkgs/build-support/fetchpijul/default.nix +++ b/pkgs/build-support/fetchpijul/default.nix @@ -45,12 +45,12 @@ else runHook postFixup ''; - outputHashAlgo = if hash != "" then null else "sha256"; + outputHashAlgo = null; outputHashMode = "recursive"; outputHash = if hash != "" then hash else - lib.fakeSha256; + lib.fakeHash; inherit url change state channel; From c3691d772d954f14e8a93256faaaff0d3348af8f Mon Sep 17 00:00:00 2001 From: nicoo Date: Sun, 15 Sep 2024 22:32:42 +0000 Subject: [PATCH 021/300] fetchfossil: simplify and check that multiple hashes were not passed in --- pkgs/build-support/fetchfossil/default.nix | 47 +++++++++------------- 1 file changed, 20 insertions(+), 27 deletions(-) diff --git a/pkgs/build-support/fetchfossil/default.nix b/pkgs/build-support/fetchfossil/default.nix index 3f3bf69db047..d0fc4cdea703 100644 --- a/pkgs/build-support/fetchfossil/default.nix +++ b/pkgs/build-support/fetchfossil/default.nix @@ -1,33 +1,26 @@ {stdenv, lib, fossil, cacert}: -{ name ? null -, url -, rev -, sha256 ? "" -, hash ? "" -}: +lib.fetchers.withNormalizedHash { } ( + { name ? null + , url + , rev + , outputHash ? lib.fakeHash + , outputHashAlgo ? null + }: -if hash != "" && sha256 != "" then - throw "Only one of sha256 or hash can be set" -else -stdenv.mkDerivation { - name = "fossil-archive" + (lib.optionalString (name != null) "-${name}"); - builder = ./builder.sh; - nativeBuildInputs = [fossil cacert]; + stdenv.mkDerivation { + name = "fossil-archive" + (lib.optionalString (name != null) "-${name}"); + builder = ./builder.sh; + nativeBuildInputs = [fossil cacert]; - # Envvar docs are hard to find. A link for the future: - # https://www.fossil-scm.org/index.html/doc/trunk/www/env-opts.md - impureEnvVars = [ "http_proxy" ]; + # Envvar docs are hard to find. A link for the future: + # https://www.fossil-scm.org/index.html/doc/trunk/www/env-opts.md + impureEnvVars = [ "http_proxy" ]; - outputHashAlgo = if hash != "" then null else "sha256"; - outputHashMode = "recursive"; - outputHash = if hash != "" then - hash - else if sha256 != "" then - sha256 - else - lib.fakeSha256; + inherit outputHash outputHashAlgo; + outputHashMode = "recursive"; - inherit url rev; - preferLocalBuild = true; -} + inherit url rev; + preferLocalBuild = true; + } +) From a8c21f4c11e922da13b34f15cb2515fb5317c242 Mon Sep 17 00:00:00 2001 From: nicoo Date: Sun, 15 Sep 2024 22:34:02 +0000 Subject: [PATCH 022/300] =?UTF-8?q?althttpd:=20`sha256`=20=E2=86=92=20`has?= =?UTF-8?q?h`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/servers/althttpd/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/althttpd/default.nix b/pkgs/servers/althttpd/default.nix index 70c2fbcaa323..229082d6c1a3 100644 --- a/pkgs/servers/althttpd/default.nix +++ b/pkgs/servers/althttpd/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchfossil { url = "https://sqlite.org/althttpd/"; rev = "c0bdc68e6c56ef25"; - sha256 = "sha256-VoDR5MlVlvar9wYA0kUhvDQVjxDwsZlqrNR3u4Tqw5c="; + hash = "sha256-VoDR5MlVlvar9wYA0kUhvDQVjxDwsZlqrNR3u4Tqw5c="; }; buildInputs = [ openssl ]; From 30361c578fb4ece9def77ed5f6f2083f58a80e54 Mon Sep 17 00:00:00 2001 From: nicoo Date: Sun, 15 Sep 2024 22:36:54 +0000 Subject: [PATCH 023/300] fetchsvnssh: support `hash` attribute --- pkgs/build-support/fetchsvnssh/default.nix | 28 ++++++++++++---------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/pkgs/build-support/fetchsvnssh/default.nix b/pkgs/build-support/fetchsvnssh/default.nix index ef72de61fe21..e798044e2ea1 100644 --- a/pkgs/build-support/fetchsvnssh/default.nix +++ b/pkgs/build-support/fetchsvnssh/default.nix @@ -1,17 +1,19 @@ -{stdenvNoCC, subversion, sshSupport ? true, openssh ? null, expect}: -{username, password, url, rev ? "HEAD", sha256 ? ""}: +{lib, stdenvNoCC, subversion, sshSupport ? true, openssh ? null, expect}: +{username, password +, url, rev ? "HEAD" +, outputHash ? lib.fakeHash, outputHashAlgo ? null}: +lib.fetchers.withNormalizedHash { } ( + stdenvNoCC.mkDerivation { + name = "svn-export-ssh"; + builder = ./builder.sh; + nativeBuildInputs = [subversion expect]; -stdenvNoCC.mkDerivation { - name = "svn-export-ssh"; - builder = ./builder.sh; - nativeBuildInputs = [subversion expect]; + inherit outputHash outputHashAlgo; + outputHashMode = "recursive"; - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = sha256; + sshSubversion = ./sshsubversion.exp; - sshSubversion = ./sshsubversion.exp; - - inherit username password url rev sshSupport openssh; -} + inherit username password url rev sshSupport openssh; + } +) From 7c19bb37a30e1601543b104f78ef6079a465e2c3 Mon Sep 17 00:00:00 2001 From: nicoo Date: Mon, 16 Sep 2024 18:13:39 +0000 Subject: [PATCH 024/300] fetchipfs: simplify, error-out when given multiple hashes Also dropped the `md5` attribute, as `stdenv.mkDerivation` rejects MD5 since last year (87c22100a6892b864ff94476f2965a793d8e4282) --- pkgs/build-support/fetchipfs/default.nix | 76 ++++++++++-------------- pkgs/top-level/all-packages.nix | 4 +- 2 files changed, 32 insertions(+), 48 deletions(-) diff --git a/pkgs/build-support/fetchipfs/default.nix b/pkgs/build-support/fetchipfs/default.nix index 0cbb094d6003..da94200206ba 100644 --- a/pkgs/build-support/fetchipfs/default.nix +++ b/pkgs/build-support/fetchipfs/default.nix @@ -1,50 +1,36 @@ -{ stdenv +{ lib +, stdenv , curl }: +lib.fetchers.withNormalizedHash { hashTypes = [ "sha1" "sha256" "sha512" ]; } ( + { ipfs + , url ? "" + , curlOpts ? "" + , outputHash + , outputHashAlgo + , meta ? {} + , port ? "8080" + , postFetch ? "" + , preferLocalBuild ? true + }: + stdenv.mkDerivation { + name = ipfs; + builder = ./builder.sh; + nativeBuildInputs = [ curl ]; -{ ipfs -, url ? "" -, curlOpts ? "" -, outputHash ? "" -, outputHashAlgo ? "" -, md5 ? "" -, sha1 ? "" -, sha256 ? "" -, sha512 ? "" -, meta ? {} -, port ? "8080" -, postFetch ? "" -, preferLocalBuild ? true -}: + # New-style output content requirements. + inherit outputHash outputHashAlgo; + outputHashMode = "recursive"; -let + inherit curlOpts + postFetch + ipfs + url + port + meta; - hasHash = (outputHash != "" && outputHashAlgo != "") - || md5 != "" || sha1 != "" || sha256 != "" || sha512 != ""; - -in - -if (!hasHash) then throw "Specify sha for fetchipfs fixed-output derivation" else stdenv.mkDerivation { - name = ipfs; - builder = ./builder.sh; - nativeBuildInputs = [ curl ]; - - # New-style output content requirements. - outputHashAlgo = if outputHashAlgo != "" then outputHashAlgo else - if sha512 != "" then "sha512" else if sha256 != "" then "sha256" else if sha1 != "" then "sha1" else "md5"; - outputHash = if outputHash != "" then outputHash else - if sha512 != "" then sha512 else if sha256 != "" then sha256 else if sha1 != "" then sha1 else md5; - - outputHashMode = "recursive"; - - inherit curlOpts - postFetch - ipfs - url - port - meta; - - # Doing the download on a remote machine just duplicates network - # traffic, so don't do that. - inherit preferLocalBuild; -} + # Doing the download on a remote machine just duplicates network + # traffic, so don't do that. + inherit preferLocalBuild; + } +) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9f5a5ece5be8..8c78ce887896 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1141,9 +1141,7 @@ with pkgs; fetchRepoProject = callPackage ../build-support/fetchrepoproject { }; - fetchipfs = import ../build-support/fetchipfs { - inherit curl stdenv; - }; + fetchipfs = callPackage ../build-support/fetchipfs { }; fetchit = callPackage ../applications/networking/cluster/fetchit { }; From d74187c8b4c768ee202406e2b4acaeb8b5263cf7 Mon Sep 17 00:00:00 2001 From: Chris Dombroski Date: Tue, 17 Sep 2024 17:24:30 -0400 Subject: [PATCH 025/300] 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 e4fc65e079fcf2ea3d98ecde971912a7898ebc79 Mon Sep 17 00:00:00 2001 From: Matt Moriarity Date: Wed, 18 Sep 2024 17:04:48 -0600 Subject: [PATCH 026/300] nixos/garage: reformat --- nixos/modules/services/web-servers/garage.nix | 52 ++++++++++++++----- 1 file changed, 40 insertions(+), 12 deletions(-) diff --git a/nixos/modules/services/web-servers/garage.nix b/nixos/modules/services/web-servers/garage.nix index 7cf71ff6ff06..8a547a8f430c 100644 --- a/nixos/modules/services/web-servers/garage.nix +++ b/nixos/modules/services/web-servers/garage.nix @@ -1,4 +1,9 @@ -{ config, lib, pkgs, ... }: +{ + config, + lib, + pkgs, + ... +}: with lib; @@ -20,7 +25,9 @@ in type = types.attrsOf types.str; description = "Extra environment variables to pass to the Garage server."; default = { }; - example = { RUST_BACKTRACE = "yes"; }; + example = { + RUST_BACKTRACE = "yes"; + }; }; environmentFile = mkOption { @@ -30,7 +37,13 @@ in }; logLevel = mkOption { - type = types.enum ([ "error" "warn" "info" "debug" "trace" ]); + type = types.enum ([ + "error" + "warn" + "info" + "debug" + "trace" + ]); default = "info"; example = "debug"; description = "Garage log level, see for examples."; @@ -49,10 +62,12 @@ in data_dir = mkOption { default = "/var/lib/garage/data"; - example = [ { - path = "/var/lib/garage/data"; - capacity = "2T"; - } ]; + example = [ + { + path = "/var/lib/garage/data"; + capacity = "2T"; + } + ]; type = with types; either path (listOf attrs); description = '' The directory in which Garage will store the data blocks of objects. This folder can be placed on an HDD. @@ -83,7 +98,9 @@ in # These assertions can be removed in NixOS 24.11, when all users have been # warned once. { - assertion = (cfg.settings ? replication_factor || cfg.settings ? replication_mode) || lib.versionOlder cfg.package.version "1.0.0"; + assertion = + (cfg.settings ? replication_factor || cfg.settings ? replication_mode) + || lib.versionOlder cfg.package.version "1.0.0"; message = '' Garage 1.0.0 requires an explicit replication factor to be set. Please set replication_factor to 1 explicitly to preserve the previous behavior. @@ -129,14 +146,25 @@ in systemd.services.garage = { description = "Garage Object Storage (S3 compatible)"; - after = [ "network.target" "network-online.target" ]; - wants = [ "network.target" "network-online.target" ]; + after = [ + "network.target" + "network-online.target" + ]; + wants = [ + "network.target" + "network-online.target" + ]; wantedBy = [ "multi-user.target" ]; - restartTriggers = [ configFile ] ++ (lib.optional (cfg.environmentFile != null) cfg.environmentFile); + restartTriggers = [ + configFile + ] ++ (lib.optional (cfg.environmentFile != null) cfg.environmentFile); serviceConfig = { ExecStart = "${cfg.package}/bin/garage server"; - StateDirectory = mkIf (hasPrefix "/var/lib/garage" cfg.settings.data_dir || hasPrefix "/var/lib/garage" cfg.settings.metadata_dir) "garage"; + StateDirectory = mkIf ( + hasPrefix "/var/lib/garage" cfg.settings.data_dir + || hasPrefix "/var/lib/garage" cfg.settings.metadata_dir + ) "garage"; DynamicUser = lib.mkDefault true; ProtectHome = true; NoNewPrivileges = true; From cb905a5649281058c61c0f0835222cd6bc7bc0fc Mon Sep 17 00:00:00 2001 From: Matt Moriarity Date: Wed, 18 Sep 2024 17:06:56 -0600 Subject: [PATCH 027/300] nixos/garage: add mjm as maintainer --- nixos/modules/services/web-servers/garage.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/web-servers/garage.nix b/nixos/modules/services/web-servers/garage.nix index 8a547a8f430c..757479259fd8 100644 --- a/nixos/modules/services/web-servers/garage.nix +++ b/nixos/modules/services/web-servers/garage.nix @@ -15,7 +15,7 @@ in { meta = { doc = ./garage.md; - maintainers = [ ]; + maintainers = [ maintainers.mjm ]; }; options.services.garage = { From 4d3d3e46fec7e9d12c8c01893818f238bfd3a8d9 Mon Sep 17 00:00:00 2001 From: Matt Moriarity Date: Wed, 18 Sep 2024 17:17:34 -0600 Subject: [PATCH 028/300] nixos/garage: fix StateDirectory check to work with multiple data_dirs --- nixos/modules/services/web-servers/garage.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/web-servers/garage.nix b/nixos/modules/services/web-servers/garage.nix index 757479259fd8..05c92b1a387b 100644 --- a/nixos/modules/services/web-servers/garage.nix +++ b/nixos/modules/services/web-servers/garage.nix @@ -11,6 +11,13 @@ let cfg = config.services.garage; toml = pkgs.formats.toml { }; configFile = toml.generate "garage.toml" cfg.settings; + + anyHasPrefix = + prefix: strOrList: + if isString strOrList then + hasPrefix prefix strOrList + else + any ({ path, ... }: hasPrefix prefix path) strOrList; in { meta = { @@ -162,7 +169,7 @@ in ExecStart = "${cfg.package}/bin/garage server"; StateDirectory = mkIf ( - hasPrefix "/var/lib/garage" cfg.settings.data_dir + anyHasPrefix "/var/lib/garage" cfg.settings.data_dir || hasPrefix "/var/lib/garage" cfg.settings.metadata_dir ) "garage"; DynamicUser = lib.mkDefault true; From af068bf63a91abf1cb490e7557591c3ca0141d0d Mon Sep 17 00:00:00 2001 From: scraptux Date: Thu, 19 Sep 2024 19:41:42 +0200 Subject: [PATCH 029/300] maintainers: add scraptux --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index a220b39e1d40..b056bfe8d0e6 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -18740,6 +18740,12 @@ githubId = 11320; name = "Sergiu Ivanov"; }; + scraptux = { + email = "git@thomasjasny.de"; + github = "scraptux"; + githubId = 12714892; + name = "Thomas Jasny"; + }; screendriver = { email = "nix@echooff.de"; github = "screendriver"; From 650a1f2f8be80125e51c2ce904257b8c4b9a6d77 Mon Sep 17 00:00:00 2001 From: scraptux Date: Thu, 19 Sep 2024 19:42:23 +0200 Subject: [PATCH 030/300] vscode-extensions.sas.sas-lsp: init at 1.10.2 --- .../editors/vscode/extensions/default.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 3d58a59a61c4..af1984183520 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -4166,6 +4166,23 @@ let }; }; + sas.sas-lsp = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "sas-lsp"; + publisher = "SAS"; + version = "1.10.2"; + hash = "sha256-mf0q80UX4FxqHAHJBQlhkF/nqvTnfgTR8GuYBoWSswU="; + }; + meta = { + changelog = "https://marketplace.visualstudio.com/items/SAS.sas-lsp/changelog"; + description = "Official SAS Language Extension"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=SAS.sas-lsp"; + homepage = "https://github.com/sassoftware/vscode-sas-extension"; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.scraptux ]; + }; + }; + scala-lang.scala = buildVscodeMarketplaceExtension { mktplcRef = { name = "scala"; From f373abe60b11bf83c48a7fa84fc9f2c5c8d5151e Mon Sep 17 00:00:00 2001 From: Alexander Heldt Date: Thu, 19 Sep 2024 21:15:39 +0200 Subject: [PATCH 031/300] 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 d0542fe3cdc451328e917ee2b40ca776425e0cbc Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Fri, 20 Sep 2024 12:47:13 +0200 Subject: [PATCH 032/300] flake.nix: Add doc comments --- flake.nix | 82 ++++++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 72 insertions(+), 10 deletions(-) diff --git a/flake.nix b/flake.nix index bb7d0d5d4de3..7b7bbe00120f 100644 --- a/flake.nix +++ b/flake.nix @@ -16,10 +16,44 @@ }); in { + /** + `nixpkgs.lib` is a combination of the [Nixpkgs library](https://nixos.org/manual/nixpkgs/unstable/#id-1.4), and other attributes + that are _not_ part of the Nixpkgs library, but part of the Nixpkgs flake: + + - `lib.nixosSystem` for creating a NixOS system configuration + + - `lib.nixos` for other NixOS-provided functionality, such as [`runTest`](https://nixos.org/manual/nixos/unstable/#sec-call-nixos-test-outside-nixos) + */ lib = lib.extend (final: prev: { + /** + Other NixOS-provided functionality, such as [`runTest`](https://nixos.org/manual/nixos/unstable/#sec-call-nixos-test-outside-nixos). + See also `lib.nixosSystem`. + */ nixos = import ./nixos/lib { lib = final; }; + /** + Create a NixOS system configuration. + + Example: + + lib.nixosSystem { + modules = [ ./configuration.nix ]; + } + + Inputs: + + - `modules` (list of paths or inline modules): The NixOS modules to include in the system configuration. + + - `specialArgs` (attribute set): Extra arguments to pass to all modules, that are available in `imports` but can not be extended or overridden by the `modules`. + + - `modulesLocation` (path): A default location for modules that aren't passed by path, used for error messages. + + Legacy inputs: + + - `system`: Legacy alias for `nixpkgs.hostPlatform`, but this is already set in the generated `hardware-configuration.nix`, included by `configuration.nix`. + - `pkgs`: Legacy alias for `nixpkgs.pkgs`; use `nixpkgs.pkgs` and `nixosModules.readOnlyPkgs` instead. + */ nixosSystem = args: import ./nixos/lib/eval-config.nix ( { @@ -78,28 +112,56 @@ }; devShells = forAllSystems (system: { + /** A shell to get tooling for Nixpkgs development. See nixpkgs/shell.nix. */ default = import ./shell.nix { inherit system; }; }); - # The "legacy" in `legacyPackages` doesn't imply that the packages exposed - # through this attribute are "legacy" packages. Instead, `legacyPackages` - # is used here as a substitute attribute name for `packages`. The problem - # with `packages` is that it makes operations like `nix flake show - # nixpkgs` unusably slow due to the sheer number of packages the Nix CLI - # needs to evaluate. But when the Nix CLI sees a `legacyPackages` - # attribute it displays `omitted` instead of evaluating all packages, - # which keeps `nix flake show` on Nixpkgs reasonably fast, though less - # information rich. + /** + A nested structure of [packages](https://nix.dev/manual/nix/latest/glossary#package-attribute-set) and other values. + + The "legacy" in `legacyPackages` doesn't imply that the packages exposed + through this attribute are "legacy" packages. Instead, `legacyPackages` + is used here as a substitute attribute name for `packages`. The problem + with `packages` is that it makes operations like `nix flake show + nixpkgs` unusably slow due to the sheer number of packages the Nix CLI + needs to evaluate. But when the Nix CLI sees a `legacyPackages` + attribute it displays `omitted` instead of evaluating all packages, + which keeps `nix flake show` on Nixpkgs reasonably fast, though less + information rich. + + The reason why finding the tree structure of `legacyPackages` is slow, + is that for each attribute in the tree, it is necessary to check whether + the attribute value is a package or a package set that needs further + evaluation. Evaluating the attribute value tends to require a significant + amount of computation, even considering lazy evaluation. + */ legacyPackages = forAllSystems (system: (import ./. { inherit system; }).extend (final: prev: { lib = prev.lib.extend libVersionInfoOverlay; }) ); + /** + Optional modules that can be imported into a NixOS configuration. + + Example: + + # flake.nix + outputs = { nixpkgs, ... }: { + nixosConfigurations = { + foo = nixpkgs.lib.nixosSystem { + modules = [ + ./foo/configuration.nix + nixpkgs.nixosModules.notDetected + ]; + }; + }; + }; + */ nixosModules = { notDetected = ./nixos/modules/installer/scan/not-detected.nix; - /* + /** Make the `nixpkgs.*` configuration read-only. Guarantees that `pkgs` is the way you initialize it. From 342a47f9bcbdf636158bf7fed22f9d94af1189d9 Mon Sep 17 00:00:00 2001 From: Tom Herbers Date: Sat, 21 Sep 2024 02:08:33 +0200 Subject: [PATCH 033/300] 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 27fe8596dc73d031deb06f57dc8dbb3b76ac168d Mon Sep 17 00:00:00 2001 From: Leonardo Taglialegne Date: Sun, 22 Sep 2024 11:18:34 +0200 Subject: [PATCH 034/300] Lamdera 1.3.0 --- .../compilers/elm/packages/lamdera/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/elm/packages/lamdera/default.nix b/pkgs/development/compilers/elm/packages/lamdera/default.nix index 79101092e788..bf9d6df0fe17 100644 --- a/pkgs/development/compilers/elm/packages/lamdera/default.nix +++ b/pkgs/development/compilers/elm/packages/lamdera/default.nix @@ -8,16 +8,16 @@ let arch = if stdenv.isAarch64 then "arm64" else "x86_64"; hashes = { - "x86_64-linux" = "a51d5b9a011c54b0001ff3273cee027774686e233adadb20b1978d2cabfe32a6"; - "aarch64-linux" = "8904ce928f60e06df1f06b3af5ee5eb320c388922aa38b698d823df1d73e8e49"; - "x86_64-darwin" = "b4d1bb5ddc3503862750e5b241f74c22dc013792bc4f410dd914a5216e20ed2f"; - "aarch64-darwin" = "6d20e384dae90bb994c3f1e866c964124c7e8a51e9e08bad0e90a2b560bb5a18"; + "x86_64-linux" = "1v596zi4zmx88r4axrp7pmci3w9c6f1kz4izrbj65c7ch6wwa7f2"; + "aarch64-linux" = "0xf6lqm9xgph8q95h6smq6dzn5549nfsnayny5nyvm56nbmv5iw9"; + "x86_64-darwin" = "0kijrjfbr7hn469x67yya6ndfwj901m54gd96sq3yiay0jvmapga"; + "aarch64-darwin" = "1iigsd4ac0cbb1q2g02zxjxpcma6yyd7ms72ri8g2vq8i90zys9n"; }; in stdenv.mkDerivation rec { pname = "lamdera"; - version = "1.2.1"; + version = "1.3.0"; src = fetchurl { url = "https://static.lamdera.com/bin/lamdera-${version}-${os}-${arch}"; From 341442bd7eda3dda19607f9fa232f3474c45f47d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 22 Sep 2024 13:08:34 +0000 Subject: [PATCH 035/300] esbuild: 0.23.1 -> 0.24.0 --- pkgs/development/tools/esbuild/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/esbuild/default.nix b/pkgs/development/tools/esbuild/default.nix index 98f3a4f221e6..a7720470f489 100644 --- a/pkgs/development/tools/esbuild/default.nix +++ b/pkgs/development/tools/esbuild/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "esbuild"; - version = "0.23.1"; + version = "0.24.0"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; rev = "v${version}"; - hash = "sha256-2E5FkUnU/8tf+eDd+KIEcc0HlnpYYn5QMPq/w2sa914="; + hash = "sha256-czQJqLz6rRgyh9usuhDTmgwMC6oL5UzpwNFQ3PKpKck="; }; vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; From 2831842ad1b114397907eb2ab7aad652f1df1d2b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 22 Sep 2024 13:18:03 +0000 Subject: [PATCH 036/300] jotdown: 0.5.0 -> 0.6.0 --- pkgs/tools/text/jotdown/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/jotdown/default.nix b/pkgs/tools/text/jotdown/default.nix index e3c38dc2b2fe..e0469e25bf88 100644 --- a/pkgs/tools/text/jotdown/default.nix +++ b/pkgs/tools/text/jotdown/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "jotdown"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "hellux"; repo = "jotdown"; rev = version; - hash = "sha256-lJnHdywxKf3CWgSB91MqQreyUhKArpT2lqQqSIpgnUY="; + hash = "sha256-67foqp8i5JqvtKeq8gibFhd59V8Nf8wkaINe2gd5Huk="; }; - cargoHash = "sha256-ESwo1J5OCJbmlZoTOPaeNIqRCTMAJtgkhrR0bcRqQwk="; + cargoHash = "sha256-ckcjd8ZiJxfKEkpfGvTSKv3ReWn3lIK+/fBnj/kk2F0="; meta = with lib; { description = "Minimal Djot CLI"; From 1f42ffa2b4ae9f2b8e088443ac39b29937f8636f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 23 Sep 2024 01:22:02 +0000 Subject: [PATCH 037/300] lact: 0.5.5 -> 0.5.6 --- pkgs/tools/system/lact/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/lact/default.nix b/pkgs/tools/system/lact/default.nix index c8b00995dc5b..ed6a4db40ffa 100644 --- a/pkgs/tools/system/lact/default.nix +++ b/pkgs/tools/system/lact/default.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "lact"; - version = "0.5.5"; + version = "0.5.6"; src = fetchFromGitHub { owner = "ilya-zlobintsev"; repo = "LACT"; rev = "v${version}"; - hash = "sha256-ehJYUZ4Bdttqzs3/SSvhJRzPO7CPbeP8ormXQ7NUzXI="; + hash = "sha256-iz6Pl+A7Y/Ljot3QH2GaopgtfuYLpTLSq6uSprQ2EEU="; }; - cargoHash = "sha256-jG1DfFwpmSSVMu3zKpxg25uTrELcD43bkGbcZI2NOzk="; + cargoHash = "sha256-uoMkz+0Jr07GpMRUKuJvrTTSAGdhLf35q/8but1fwIk="; nativeBuildInputs = [ blueprint-compiler From ada79bfff2aad6f4c09e14efeecfdbd1a4e767e4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 23 Sep 2024 03:39:13 +0000 Subject: [PATCH 038/300] plasticity: 24.2.0 -> 24.2.3 --- pkgs/by-name/pl/plasticity/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pl/plasticity/package.nix b/pkgs/by-name/pl/plasticity/package.nix index 08e4020ca72e..33387121b984 100644 --- a/pkgs/by-name/pl/plasticity/package.nix +++ b/pkgs/by-name/pl/plasticity/package.nix @@ -33,11 +33,11 @@ }: stdenv.mkDerivation rec { pname = "plasticity"; - version = "24.2.0"; + version = "24.2.3"; src = fetchurl { url = "https://github.com/nkallen/plasticity/releases/download/v${version}/Plasticity-${version}-1.x86_64.rpm"; - hash = "sha256-3dHS7chTgoD35AV/q8DHIYl43KbCsoFYEqSQHXm05tg="; + hash = "sha256-iiVh4k5r5PXN1/VJZcropTMu36N2B/ECq2L5e59QxJY="; }; passthru.updateScript = ./update.sh; From 557846c520706940dc520fe5d5ef7bb25beafb32 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 23 Sep 2024 06:59:04 +0000 Subject: [PATCH 039/300] elasticmq-server-bin: 1.6.7 -> 1.6.8 --- pkgs/servers/elasticmq-server-bin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/elasticmq-server-bin/default.nix b/pkgs/servers/elasticmq-server-bin/default.nix index f1e8da820509..8ff5350acbe6 100644 --- a/pkgs/servers/elasticmq-server-bin/default.nix +++ b/pkgs/servers/elasticmq-server-bin/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "elasticmq-server"; - version = "1.6.7"; + version = "1.6.8"; src = fetchurl { url = "https://s3-eu-west-1.amazonaws.com/softwaremill-public/elasticmq-server-${finalAttrs.version}.jar"; - sha256 = "sha256-JSMxJBdYpYcBo/9wLY7QuQMEGlRF3hdVzVH2VMNT5b4="; + sha256 = "sha256-t0aLUJYuKi19N4iPMvw72OLgIc1steqnUQbi0xF6rv4="; }; # don't do anything? From 5d3c605f5fa44f3e1d877402e5cd925a41d196ee Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 23 Sep 2024 06:59:18 +0000 Subject: [PATCH 040/300] openjph: 0.15.0 -> 0.17.0 --- pkgs/by-name/op/openjph/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/op/openjph/package.nix b/pkgs/by-name/op/openjph/package.nix index 5fcebb7af663..8e8538e1cc4f 100644 --- a/pkgs/by-name/op/openjph/package.nix +++ b/pkgs/by-name/op/openjph/package.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "openjph"; - version = "0.15.0"; + version = "0.17.0"; src = fetchFromGitHub { owner = "aous72"; repo = "openjph"; rev = finalAttrs.version; - hash = "sha256-v4rqBTS6rk5fgDQqvqPwFAYxLNxtsRhZuQsj+y3sE3o="; + hash = "sha256-ljvdCrvKL3slVGqX97Ui65/6Doyucf2kdUEw6NWW9og="; }; nativeBuildInputs = [ cmake validatePkgConfig ]; 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 041/300] 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 4fc7228b7291d47e1be49b5598ade922b9e48378 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 23 Sep 2024 14:24:51 +0000 Subject: [PATCH 042/300] ibus-engines.table-others: 1.3.17 -> 1.3.18 --- .../inputmethods/ibus-engines/ibus-table-others/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix index c997c20c8d26..833892b79926 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ibus-table-others"; - version = "1.3.17"; + version = "1.3.18"; src = fetchurl { url = "https://github.com/moebiuscurve/ibus-table-others/releases/download/${version}/${pname}-${version}.tar.gz"; - hash = "sha256-7//axHjQ1LgLpeWR4MTI8efLURm4Umj4JV3G33Y0m0g="; + hash = "sha256-4ZM5WZPh6Y5M50KDS+86j00v4pWTRdcdVYh4DcEYXAA="; }; nativeBuildInputs = [ pkg-config python3 ]; From ded7972d72649c85bf157fbac126a0ccde432c50 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 23 Sep 2024 14:25:54 +0000 Subject: [PATCH 043/300] imsprog: 1.4.3 -> 1.4.4 --- pkgs/by-name/im/imsprog/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/im/imsprog/package.nix b/pkgs/by-name/im/imsprog/package.nix index a8042eaef1fa..113281f5702e 100644 --- a/pkgs/by-name/im/imsprog/package.nix +++ b/pkgs/by-name/im/imsprog/package.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "imsprog"; - version = "1.4.3"; + version = "1.4.4"; src = fetchFromGitHub { owner = "bigbigmdm"; repo = "IMSProg"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-FAvGGxw7qDuucAbyaq9gDhMvHL9mJCQApRzzQ7Kh0c8="; + hash = "sha256-dhBg0f7pIbBS8IiUXd1UlAxgGrv6HapzooXafkHIEK8="; }; strictDeps = true; From e89d03cef325b41d5b5e1778447fffd594de468b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 23 Sep 2024 18:15:53 +0000 Subject: [PATCH 044/300] vtm: 0.9.99.09 -> 0.9.99.13 --- pkgs/tools/misc/vtm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/vtm/default.nix b/pkgs/tools/misc/vtm/default.nix index 4a3f75792d4a..cddabd79db23 100644 --- a/pkgs/tools/misc/vtm/default.nix +++ b/pkgs/tools/misc/vtm/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "vtm"; - version = "0.9.99.09"; + version = "0.9.99.13"; src = fetchFromGitHub { owner = "netxs-group"; repo = "vtm"; rev = "v${finalAttrs.version}"; - hash = "sha256-Ddnj2atJZ4uJqa/UCRfKowJDZbhnQBTgkFZvc4778gc="; + hash = "sha256-IXxbEwwwqqy5zepdJULlIsrz2csnpGXQhBzbc5AW7II="; }; nativeBuildInputs = [ From e123625aa94e98f5aadec07ba854762a99991bc1 Mon Sep 17 00:00:00 2001 From: Matthias Thym Date: Mon, 23 Sep 2024 21:38:06 +0200 Subject: [PATCH 045/300] 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 390728afda76f68029c3082fd441936e01d49872 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 23 Sep 2024 19:59:49 +0000 Subject: [PATCH 046/300] crd2pulumi: 1.5.0 -> 1.5.2 --- pkgs/development/tools/crd2pulumi/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/crd2pulumi/default.nix b/pkgs/development/tools/crd2pulumi/default.nix index 7f49978543c2..66ab82d17594 100644 --- a/pkgs/development/tools/crd2pulumi/default.nix +++ b/pkgs/development/tools/crd2pulumi/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "crd2pulumi"; - version = "1.5.0"; + version = "1.5.2"; src = fetchFromGitHub { owner = "pulumi"; repo = "crd2pulumi"; rev = "v${version}"; - sha256 = "sha256-DuTGsa8udtnYuWCqGZTXyELZsAse8EF2xiVcXl/SE3M="; + sha256 = "sha256-wIg14U3CNuO7PbhOkaZMfzXhjnMWiddQKiDzgD493iY="; }; - vendorHash = "sha256-pdrFG0vArpbPlXtgGulTLBvWttVps6vVZFn67tay2Gg="; + vendorHash = "sha256-tSQuyGo4YaqKp5C9V/tEobc/4+x5ExPbV3Y4nd8D8jE="; ldflags = [ "-s" "-w" "-X github.com/pulumi/crd2pulumi/gen.Version=${src.rev}" ]; From 07f17240f7ee86af5c39e5be5757a3c8353eb467 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 23 Sep 2024 21:18:17 +0000 Subject: [PATCH 047/300] firebase-tools: 13.17.0 -> 13.18.0 --- pkgs/development/tools/firebase-tools/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/firebase-tools/default.nix b/pkgs/development/tools/firebase-tools/default.nix index 8222c1df9ea4..c31b1995a2c4 100644 --- a/pkgs/development/tools/firebase-tools/default.nix +++ b/pkgs/development/tools/firebase-tools/default.nix @@ -8,16 +8,16 @@ buildNpmPackage rec { pname = "firebase-tools"; - version = "13.17.0"; + version = "13.18.0"; src = fetchFromGitHub { owner = "firebase"; repo = "firebase-tools"; rev = "v${version}"; - hash = "sha256-Tf01j8t4zCrUDWB8+5DkJ+74OBJLD23FlI+4QlWCjLw="; + hash = "sha256-Tis5bF1rVuvjSuMeoa5ayyuZXdwolkNL3Ct+IWeYOKc="; }; - npmDepsHash = "sha256-Ghi4H7BPTQhpnI0UZWBVC9OX4F6NFlbXrtSxA5U4omg="; + npmDepsHash = "sha256-mQYetHLbxr3Jegz01BfFVdzcLuz46zcNVqXjjxdKM/E="; postPatch = '' ln -s npm-shrinkwrap.json package-lock.json From 76f1ad84c833a96091313739edee2d85a972c6cc Mon Sep 17 00:00:00 2001 From: Luflosi Date: Mon, 23 Sep 2024 23:19:17 +0200 Subject: [PATCH 048/300] 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 b4a69dcb47db8026496ef128a2962dd17996f67f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 23 Sep 2024 23:58:59 +0200 Subject: [PATCH 049/300] thunderbird: expose icu patch in passthru to be used by betterbird --- .../mailreaders/thunderbird/packages.nix | 28 +++++++++++-------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index 6b13616ee1a5..ba06acddadf0 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -1,6 +1,17 @@ -{ stdenv, lib, buildMozillaMach, callPackage, fetchurl, fetchpatch, nixosTests, icu73, fetchpatch2, config }: +{ stdenv, lib, buildMozillaMach, callPackage, fetchurl, icu73, fetchpatch2, config }: let + icu73' = icu73.overrideAttrs (attrs: { + # standardize vtzone output + # Work around ICU-22132 https://unicode-org.atlassian.net/browse/ICU-22132 + # https://bugzilla.mozilla.org/show_bug.cgi?id=1790071 + patches = attrs.patches ++ [(fetchpatch2 { + url = "https://hg.mozilla.org/mozilla-central/raw-file/fb8582f80c558000436922fb37572adcd4efeafc/intl/icu-patches/bug-1790071-ICU-22132-standardize-vtzone-output.diff"; + stripLen = 3; + hash = "sha256-MGNnWix+kDNtLuACrrONDNcFxzjlUcLhesxwVZFzPAM="; + })]; + }); + common = { version, sha512, updateScript }: (buildMozillaMach rec { pname = "thunderbird"; inherit version updateScript; @@ -16,6 +27,10 @@ let ./no-buildconfig.patch ]; + extraPassthru = { + icu73 = icu73'; + }; + meta = with lib; { changelog = "https://www.thunderbird.net/en-US/thunderbird/${version}/releasenotes/"; description = "Full-featured e-mail client"; @@ -34,16 +49,7 @@ let pgoSupport = false; # console.warn: feeds: "downloadFeed: network connection unavailable" - icu73 = icu73.overrideAttrs (attrs: { - # standardize vtzone output - # Work around ICU-22132 https://unicode-org.atlassian.net/browse/ICU-22132 - # https://bugzilla.mozilla.org/show_bug.cgi?id=1790071 - patches = attrs.patches ++ [(fetchpatch2 { - url = "https://hg.mozilla.org/mozilla-central/raw-file/fb8582f80c558000436922fb37572adcd4efeafc/intl/icu-patches/bug-1790071-ICU-22132-standardize-vtzone-output.diff"; - stripLen = 3; - hash = "sha256-MGNnWix+kDNtLuACrrONDNcFxzjlUcLhesxwVZFzPAM="; - })]; - }); + icu73 = icu73'; }; in rec { From febd2e6c309275008c946c73d758398c84137844 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 23 Sep 2024 23:59:16 +0200 Subject: [PATCH 050/300] betterbird: apply icu patch from thunderbird --- pkgs/applications/networking/mailreaders/betterbird/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/networking/mailreaders/betterbird/default.nix b/pkgs/applications/networking/mailreaders/betterbird/default.nix index b479a01d0d4c..38ff368ad5fd 100644 --- a/pkgs/applications/networking/mailreaders/betterbird/default.nix +++ b/pkgs/applications/networking/mailreaders/betterbird/default.nix @@ -112,6 +112,8 @@ in ((buildMozillaMach { webrtcSupport = false; pgoSupport = false; # console.warn: feeds: "downloadFeed: network connection unavailable" + + inherit (thunderbird-unwrapped.passthru) icu73; }).overrideAttrs (oldAttrs: { postInstall = oldAttrs.postInstall or "" + '' mv $out/lib/thunderbird/* $out/lib/betterbird From aef3e2c8cced2f98c1210c5db18a932c96f7b01b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 23 Sep 2024 22:27:43 +0000 Subject: [PATCH 051/300] codeium: 1.16.11 -> 1.16.18 --- pkgs/by-name/co/codeium/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/co/codeium/package.nix b/pkgs/by-name/co/codeium/package.nix index 679050b5cc8a..dc5f78ac5a74 100644 --- a/pkgs/by-name/co/codeium/package.nix +++ b/pkgs/by-name/co/codeium/package.nix @@ -13,10 +13,10 @@ let }.${system} or throwSystem; hash = { - x86_64-linux = "sha256-xOP9NOcuBRrX998jF4dTpUtS9jPux4jHu057sPPjGWA="; - aarch64-linux = "sha256-RVy/k1nUbT0MGIuSnEJZqGM+kQhBEUSD/D2uk5ZmYzs="; - x86_64-darwin = "sha256-MtUAO6xvSDcLokjmW1CAOC8+3pTMFy1yteKmb/WUpGs="; - aarch64-darwin = "sha256-OZf74uvuka4S8JKYcGM1f8T2RrdTxelLMmx74Ee83ek="; + x86_64-linux = "sha256-/m+t4abPgVWeGpfDkPm5DGCIXm1LoM5znHfES9lotAo="; + aarch64-linux = "sha256-0kR799yuxSFmyedJ14f5/EqOiFHs9cWjeJKvDIpIRl0="; + x86_64-darwin = "sha256-7Go5qZVAe2UHn547HZG4fmh84iF2r15+0IIlJK72Fqg="; + aarch64-darwin = "sha256-fe4GrgLRr66Qmme3p0X5BEwvKZhqG1aiE8xs5A1Dt6E="; }.${system} or throwSystem; bin = "$out/bin/codeium_language_server"; @@ -24,7 +24,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "codeium"; - version = "1.16.11"; + version = "1.16.18"; src = fetchurl { name = "${finalAttrs.pname}-${finalAttrs.version}.gz"; url = "https://github.com/Exafunction/codeium/releases/download/language-server-v${finalAttrs.version}/language_server_${plat}.gz"; From 994311dad765d6facd2ca734364f8d25b162e1fa Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 24 Sep 2024 01:56:28 +0200 Subject: [PATCH 052/300] esphome: 2024.9.0 -> 2024.9.1 https://github.com/esphome/esphome/releases/tag/2024.9.1 --- pkgs/tools/misc/esphome/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/tools/misc/esphome/default.nix index 54664196d2c3..8574b984ed4f 100644 --- a/pkgs/tools/misc/esphome/default.nix +++ b/pkgs/tools/misc/esphome/default.nix @@ -21,14 +21,14 @@ let in python.pkgs.buildPythonApplication rec { pname = "esphome"; - version = "2024.9.0"; + version = "2024.9.1"; pyproject = true; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-K28H2kbfiebJfW31CF3M+Vi823wFPWNk6qLPlSaljkk="; + hash = "sha256-EEc4aT4zFhltAzX/HxOTRF+sIqqCzy0WsVMq0aNQi40="; }; nativeBuildInputs = with python.pkgs; [ From 58fe27c67d773e6d46ef3aa3a3f4eb2c9155b026 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 24 Sep 2024 01:12:08 +0000 Subject: [PATCH 053/300] mov-cli: 4.4.12 -> 4.4.14 --- pkgs/by-name/mo/mov-cli/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mo/mov-cli/package.nix b/pkgs/by-name/mo/mov-cli/package.nix index 91c0c13f4382..2b3cb8daf083 100644 --- a/pkgs/by-name/mo/mov-cli/package.nix +++ b/pkgs/by-name/mo/mov-cli/package.nix @@ -8,7 +8,7 @@ let pname = "mov-cli"; - version = "4.4.12"; + version = "4.4.14"; in python3.pkgs.buildPythonPackage { inherit pname version; @@ -18,7 +18,7 @@ python3.pkgs.buildPythonPackage { owner = "mov-cli"; repo = "mov-cli"; rev = "refs/tags/${version}"; - hash = "sha256-S8IB2TRmzoSKKeTKhESWstPPbSIL8LwqV5Y2+9F0KMo="; + hash = "sha256-c8Su215d3Lix2ft+J9zypLkolKFvO+HBFvXDibiCS14="; }; propagatedBuildInputs = with python3.pkgs; [ From 52fd714a84706f6a751e565a0009802e8bfa73e1 Mon Sep 17 00:00:00 2001 From: Michael Hoang Date: Fri, 20 Sep 2024 17:16:31 +0700 Subject: [PATCH 054/300] 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 607be34fdd8c3393ef2fcbafccfa3f0d0613aea9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 24 Sep 2024 02:40:54 +0000 Subject: [PATCH 055/300] delve: 1.23.0 -> 1.23.1 --- pkgs/development/tools/delve/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/delve/default.nix b/pkgs/development/tools/delve/default.nix index 4552539bb76e..00956effcdbb 100644 --- a/pkgs/development/tools/delve/default.nix +++ b/pkgs/development/tools/delve/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "delve"; - version = "1.23.0"; + version = "1.23.1"; src = fetchFromGitHub { owner = "go-delve"; repo = "delve"; rev = "v${version}"; - hash = "sha256-LtrPcYyuobHq6O3/vBKLTOMZfpYL7P3mtGfVqCMV9iM="; + hash = "sha256-+qC5fFBuQchz1dMP5AezWkkD2anZshN1wIteKce0Ecw="; }; vendorHash = null; From 193cfe48d476ede39aa3399cf25263fbc1894639 Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Sun, 22 Sep 2024 22:01:26 +0200 Subject: [PATCH 056/300] 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 057/300] 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 058/300] 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 059/300] 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 060/300] 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 061/300] 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 5d5f6bf693cd34617e8935aecf1d23cae564cab4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 25 Sep 2024 15:49:32 +0000 Subject: [PATCH 062/300] python312Packages.pysmb: 1.2.9.1 -> 1.2.10 --- pkgs/development/python-modules/pysmb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pysmb/default.nix b/pkgs/development/python-modules/pysmb/default.nix index 5a2733c30205..69023a4db8e5 100644 --- a/pkgs/development/python-modules/pysmb/default.nix +++ b/pkgs/development/python-modules/pysmb/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pysmb"; - version = "1.2.9.1"; + version = "1.2.10"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "miketeo"; repo = "pysmb"; rev = "refs/tags/pysmb-${version}"; - hash = "sha256-psV6fYymE6k2YqxOvFM2s7JTG51fI5pSqmkZnvfmprw="; + hash = "sha256-Zid6KGNr7BBuyHaxdXkhRC/Ug93HmVXKMtreFf+M7OE="; }; propagatedBuildInputs = [ From 051f75f1a9de50a16c2c26e62fb6edc2511ddbfe Mon Sep 17 00:00:00 2001 From: Ryan Omasta Date: Wed, 25 Sep 2024 11:38:22 -0600 Subject: [PATCH 063/300] veracrypt: 1.26.7 -> 1.26.14, move to pkgs/by-name --- .../ve}/veracrypt/fix-paths.patch | 0 .../ve/veracrypt/package.nix} | 22 +++++++++---------- pkgs/top-level/all-packages.nix | 4 ---- 3 files changed, 11 insertions(+), 15 deletions(-) rename pkgs/{applications/misc => by-name/ve}/veracrypt/fix-paths.patch (100%) rename pkgs/{applications/misc/veracrypt/default.nix => by-name/ve/veracrypt/package.nix} (68%) diff --git a/pkgs/applications/misc/veracrypt/fix-paths.patch b/pkgs/by-name/ve/veracrypt/fix-paths.patch similarity index 100% rename from pkgs/applications/misc/veracrypt/fix-paths.patch rename to pkgs/by-name/ve/veracrypt/fix-paths.patch diff --git a/pkgs/applications/misc/veracrypt/default.nix b/pkgs/by-name/ve/veracrypt/package.nix similarity index 68% rename from pkgs/applications/misc/veracrypt/default.nix rename to pkgs/by-name/ve/veracrypt/package.nix index a7b0eed9037b..8e54871fbef1 100644 --- a/pkgs/applications/misc/veracrypt/default.nix +++ b/pkgs/by-name/ve/veracrypt/package.nix @@ -5,7 +5,7 @@ , makeself , yasm , fuse -, wxGTK +, wxGTK32 , lvm2 , substituteAll , e2fsprogs @@ -16,13 +16,13 @@ , wrapGAppsHook3 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "veracrypt"; - version = "1.26.7"; + version = "1.26.14"; src = fetchurl { - url = "https://launchpad.net/${pname}/trunk/${lib.toLower version}/+download/VeraCrypt_${version}_Source.tar.bz2"; - sha256 = "sha256-920nsYJBTg1P2ba1n76iiyXbb6afK7z/ouwmmxqGX2U="; + url = "https://launchpad.net/veracrypt/trunk/${lib.toLower finalAttrs.version}/+download/VeraCrypt_${finalAttrs.version}_Source.tar.bz2"; + hash = "sha256-2oetZxTXF+vdwlJww4txiVAcKvlxjupkp64bwKPMruE="; }; patches = [ @@ -40,16 +40,16 @@ stdenv.mkDerivation rec { sourceRoot = "src"; nativeBuildInputs = [ makeself pkg-config yasm wrapGAppsHook3 ]; - buildInputs = [ fuse lvm2 wxGTK pcsclite ]; + buildInputs = [ fuse lvm2 wxGTK32 pcsclite ]; enableParallelBuilding = true; installPhase = '' - install -Dm 755 Main/${pname} "$out/bin/${pname}" - install -Dm 444 Resources/Icons/VeraCrypt-256x256.xpm "$out/share/pixmaps/${pname}.xpm" - install -Dm 444 License.txt -t "$out/share/doc/${pname}/" + install -Dm 755 Main/veracrypt "$out/bin/veracrypt" + install -Dm 444 Resources/Icons/VeraCrypt-256x256.xpm "$out/share/pixmaps/veracrypt.xpm" + install -Dm 444 License.txt -t "$out/share/doc/veracrypt/" install -d $out/share/applications - substitute Setup/Linux/${pname}.desktop $out/share/applications/${pname}.desktop \ + substitute Setup/Linux/veracrypt.desktop $out/share/applications/veracrypt.desktop \ --replace "Exec=/usr/bin/veracrypt" "Exec=$out/bin/veracrypt" \ --replace "Icon=veracrypt" "Icon=veracrypt.xpm" ''; @@ -61,4 +61,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ dsferruzza ]; platforms = platforms.linux; }; -} +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bca02a560764..5fe67c47924e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13885,10 +13885,6 @@ with pkgs; hitch = callPackage ../servers/hitch { }; - veracrypt = callPackage ../applications/misc/veracrypt { - wxGTK = wxGTK32; - }; - veryfasttree = callPackage ../applications/science/biology/veryfasttree { }; viceroy = callPackage ../development/tools/viceroy { From 202021faf6417a8da47b534538e9e753ddbdd8ac Mon Sep 17 00:00:00 2001 From: Ryan Omasta Date: Wed, 25 Sep 2024 11:41:20 -0600 Subject: [PATCH 064/300] veracrypt: format using nixfmt-rfc-style --- pkgs/by-name/ve/veracrypt/package.nix | 52 +++++++++++++++++---------- 1 file changed, 33 insertions(+), 19 deletions(-) diff --git a/pkgs/by-name/ve/veracrypt/package.nix b/pkgs/by-name/ve/veracrypt/package.nix index 8e54871fbef1..87b1d5a9025e 100644 --- a/pkgs/by-name/ve/veracrypt/package.nix +++ b/pkgs/by-name/ve/veracrypt/package.nix @@ -1,19 +1,20 @@ -{ lib -, stdenv -, fetchurl -, pkg-config -, makeself -, yasm -, fuse -, wxGTK32 -, lvm2 -, substituteAll -, e2fsprogs -, exfat -, ntfs3g -, btrfs-progs -, pcsclite -, wrapGAppsHook3 +{ + lib, + stdenv, + fetchurl, + pkg-config, + makeself, + yasm, + fuse, + wxGTK32, + lvm2, + substituteAll, + e2fsprogs, + exfat, + ntfs3g, + btrfs-progs, + pcsclite, + wrapGAppsHook3, }: stdenv.mkDerivation (finalAttrs: { @@ -39,8 +40,18 @@ stdenv.mkDerivation (finalAttrs: { sourceRoot = "src"; - nativeBuildInputs = [ makeself pkg-config yasm wrapGAppsHook3 ]; - buildInputs = [ fuse lvm2 wxGTK32 pcsclite ]; + nativeBuildInputs = [ + makeself + pkg-config + yasm + wrapGAppsHook3 + ]; + buildInputs = [ + fuse + lvm2 + wxGTK32 + pcsclite + ]; enableParallelBuilding = true; @@ -57,7 +68,10 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Free Open-Source filesystem on-the-fly encryption"; homepage = "https://www.veracrypt.fr/"; - license = with licenses; [ asl20 /* and */ unfree /* TrueCrypt License version 3.0 */ ]; + license = with licenses; [ + asl20 # and + unfree # TrueCrypt License version 3.0 + ]; maintainers = with maintainers; [ dsferruzza ]; platforms = platforms.linux; }; From ef7956291fd5ca30f7d5fdf66c1012e7ff1efb4b Mon Sep 17 00:00:00 2001 From: Ryan Omasta Date: Wed, 25 Sep 2024 11:42:24 -0600 Subject: [PATCH 065/300] veracrypt: remove `with lib;`, add myself as maintainer --- pkgs/by-name/ve/veracrypt/package.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ve/veracrypt/package.nix b/pkgs/by-name/ve/veracrypt/package.nix index 87b1d5a9025e..192ef1832726 100644 --- a/pkgs/by-name/ve/veracrypt/package.nix +++ b/pkgs/by-name/ve/veracrypt/package.nix @@ -65,14 +65,17 @@ stdenv.mkDerivation (finalAttrs: { --replace "Icon=veracrypt" "Icon=veracrypt.xpm" ''; - meta = with lib; { + meta = { description = "Free Open-Source filesystem on-the-fly encryption"; homepage = "https://www.veracrypt.fr/"; - license = with licenses; [ + license = with lib.licenses; [ asl20 # and unfree # TrueCrypt License version 3.0 ]; - maintainers = with maintainers; [ dsferruzza ]; - platforms = platforms.linux; + maintainers = with lib.maintainers; [ + dsferruzza + ryand56 + ]; + platforms = lib.platforms.linux; }; }) From 49fd638a47bca86a5258ccb0d207cef9a47474b5 Mon Sep 17 00:00:00 2001 From: Gaute Ravndal Date: Wed, 25 Sep 2024 22:16:24 +0200 Subject: [PATCH 066/300] 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 8e2b735ee0db2816961d73878dabab4663501394 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 26 Sep 2024 07:06:42 +0200 Subject: [PATCH 067/300] =?UTF-8?q?alt-ergo:=202.5.4=20=E2=86=92=202.6.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ocamlPackages.dolmen: 0.9 → 0.10 --- .../science/logic/alt-ergo/default.nix | 18 ++++++++++++++---- .../ocaml-modules/dolmen/default.nix | 7 ++++--- pkgs/development/ocaml-modules/dolmen/loop.nix | 5 +++++ 3 files changed, 23 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/science/logic/alt-ergo/default.nix b/pkgs/applications/science/logic/alt-ergo/default.nix index 73dcd6596008..56a68127d477 100644 --- a/pkgs/applications/science/logic/alt-ergo/default.nix +++ b/pkgs/applications/science/logic/alt-ergo/default.nix @@ -2,11 +2,11 @@ let pname = "alt-ergo"; - version = "2.5.4"; + version = "2.6.0"; src = fetchurl { url = "https://github.com/OCamlPro/alt-ergo/releases/download/v${version}/alt-ergo-${version}.tbz"; - hash = "sha256-AsHok5i62vqJ5hK8XRiD8hM6JQaFv3dMxZAcVYEim6w="; + hash = "sha256-EmkxGvJSeKRmiSuoeMyIi6WfF39T3QPxKixiOwP8834="; }; in @@ -14,7 +14,17 @@ let alt-ergo-lib = ocamlPackages.buildDunePackage rec { pname = "alt-ergo-lib"; inherit version src; buildInputs = with ocamlPackages; [ ppx_blob ]; - propagatedBuildInputs = with ocamlPackages; [ camlzip dolmen_loop dune-build-info fmt ocplib-simplex seq stdlib-shims zarith ]; + propagatedBuildInputs = with ocamlPackages; [ + camlzip + dolmen_loop + dune-build-info + fmt + ocplib-simplex + ppx_deriving + seq + stdlib-shims + zarith + ]; }; in let alt-ergo-parsers = ocamlPackages.buildDunePackage rec { @@ -29,7 +39,7 @@ ocamlPackages.buildDunePackage { inherit pname version src; nativeBuildInputs = [ ocamlPackages.menhir ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.sigtool ]; - buildInputs = [ alt-ergo-parsers ] ++ (with ocamlPackages; [ cmdliner dune-site ]); + buildInputs = [ alt-ergo-parsers ] ++ (with ocamlPackages; [ cmdliner dune-site ppxlib ]); meta = { description = "High-performance theorem prover and SMT solver"; diff --git a/pkgs/development/ocaml-modules/dolmen/default.nix b/pkgs/development/ocaml-modules/dolmen/default.nix index fede56388a77..ccecc8a33f76 100644 --- a/pkgs/development/ocaml-modules/dolmen/default.nix +++ b/pkgs/development/ocaml-modules/dolmen/default.nix @@ -1,22 +1,23 @@ { lib, fetchurl, buildDunePackage , menhir, menhirLib , fmt +, hmap , qcheck }: buildDunePackage rec { pname = "dolmen"; - version = "0.9"; + version = "0.10"; minimalOCamlVersion = "4.08"; src = fetchurl { url = "https://github.com/Gbury/dolmen/releases/download/v${version}/dolmen-${version}.tbz"; - hash = "sha256-AD21OFS6zDoz+lXtac95gXwQNppPfGvpRK8dzDZXigo="; + hash = "sha256-xchfd+OSTzeOjYLxZu7+QTG04EG/nN7KRnQQ8zxx+mE="; }; nativeBuildInputs = [ menhir ]; - propagatedBuildInputs = [ menhirLib fmt ]; + propagatedBuildInputs = [ menhirLib fmt hmap ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/dolmen/loop.nix b/pkgs/development/ocaml-modules/dolmen/loop.nix index 19349bcb6e6a..572c161edc49 100644 --- a/pkgs/development/ocaml-modules/dolmen/loop.nix +++ b/pkgs/development/ocaml-modules/dolmen/loop.nix @@ -1,6 +1,7 @@ { buildDunePackage, dolmen, dolmen_type , gen , pp_loc +, mdx }: buildDunePackage { @@ -9,6 +10,10 @@ buildDunePackage { propagatedBuildInputs = [ dolmen dolmen_type gen pp_loc ]; + doCheck = true; + nativeCheckInputs = [ mdx.bin ]; + checkInputs = [ mdx ]; + meta = dolmen.meta // { description = "Tool library for automated deduction tools"; }; From 9bd83ec263c44d9619325e99a7e33f256868dc24 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Thu, 26 Sep 2024 15:48:23 +0200 Subject: [PATCH 068/300] gren: init at 0.4.5 --- pkgs/by-name/gr/gren/generated-package.nix | 101 +++++++++++++++++++++ pkgs/by-name/gr/gren/package.nix | 21 +++++ pkgs/by-name/gr/gren/update.sh | 22 +++++ 3 files changed, 144 insertions(+) create mode 100644 pkgs/by-name/gr/gren/generated-package.nix create mode 100644 pkgs/by-name/gr/gren/package.nix create mode 100755 pkgs/by-name/gr/gren/update.sh diff --git a/pkgs/by-name/gr/gren/generated-package.nix b/pkgs/by-name/gr/gren/generated-package.nix new file mode 100644 index 000000000000..5fb245debbf9 --- /dev/null +++ b/pkgs/by-name/gr/gren/generated-package.nix @@ -0,0 +1,101 @@ +# This file has been autogenerated with cabal2nix. +# Update via ./update.sh +{ + mkDerivation, + ansi-terminal, + ansi-wl-pprint, + base, + base64-bytestring, + binary, + bytestring, + containers, + directory, + edit-distance, + fetchgit, + filelock, + filepath, + ghc-prim, + haskeline, + hspec, + hspec-discover, + indexed-traversable, + lib, + mtl, + prettyprint-avh4, + process, + raw-strings-qq, + scientific, + text, + time, + utf8-string, + vector, +}: +mkDerivation { + pname = "gren"; + version = "0.4.5"; + src = fetchgit { + url = "https://github.com/gren-lang/compiler.git"; + sha256 = "0hbxzn14m9y7sqwk347yj7hblwmj5fyzmy7kjqc8zjd63gmrkdh8"; + rev = "0efe25e3f48663a36eec525d2df0d957f53c9b4e"; + fetchSubmodules = true; + }; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + ansi-terminal + ansi-wl-pprint + base + base64-bytestring + binary + bytestring + containers + directory + edit-distance + filelock + filepath + ghc-prim + haskeline + indexed-traversable + mtl + prettyprint-avh4 + process + raw-strings-qq + scientific + text + time + utf8-string + vector + ]; + testHaskellDepends = [ + ansi-terminal + ansi-wl-pprint + base + base64-bytestring + binary + bytestring + containers + directory + edit-distance + filelock + filepath + ghc-prim + haskeline + hspec + indexed-traversable + mtl + prettyprint-avh4 + process + raw-strings-qq + scientific + text + time + utf8-string + vector + ]; + testToolDepends = [ hspec-discover ]; + jailbreak = true; + homepage = "https://gren-lang.org"; + description = "The `gren` command line interface"; + license = lib.licenses.bsd3; + mainProgram = "gren"; +} diff --git a/pkgs/by-name/gr/gren/package.nix b/pkgs/by-name/gr/gren/package.nix new file mode 100644 index 000000000000..aea0293fe2ea --- /dev/null +++ b/pkgs/by-name/gr/gren/package.nix @@ -0,0 +1,21 @@ +{ + lib, + haskell, + haskellPackages, +}: + +let + inherit (haskell.lib.compose) overrideCabal; + + raw-pkg = (haskellPackages.callPackage ./generated-package.nix { }).overrideScope ( + final: prev: { + ansi-wl-pprint = final.ansi-wl-pprint_0_6_9; + } + ); + + overrides = { + maintainers = with lib.maintainers; [ tomasajt ]; + passthru.updateScript = ./update.sh; + }; +in +overrideCabal overrides raw-pkg diff --git a/pkgs/by-name/gr/gren/update.sh b/pkgs/by-name/gr/gren/update.sh new file mode 100755 index 000000000000..1b697ecb88dd --- /dev/null +++ b/pkgs/by-name/gr/gren/update.sh @@ -0,0 +1,22 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p cabal2nix curl jq nixfmt-rfc-style + +set -euo pipefail + +# This is the directory of this update.sh script. +script_dir="$(dirname "${BASH_SOURCE[0]}")" +derivation_file="${script_dir}/generated-package.nix" +latest_version="$(curl --silent 'https://api.github.com/repos/gren-lang/compiler/releases/latest' | jq --raw-output '.tag_name')" + +echo "Updating gren to version ${latest_version}." +echo "Running cabal2nix and outputting to ${derivation_file}..." + +cat > "${derivation_file}" << EOF +# This file has been autogenerated with cabal2nix. +# Update via ./update.sh +EOF + +cabal2nix 'https://github.com/gren-lang/compiler.git' --revision "${latest_version}" --jailbreak >> "${derivation_file}" +nixfmt "${derivation_file}" + +echo 'Finished.' From 6f1d170fe6c7d605e8331a002970e8e473962b1d Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 29 Aug 2024 13:06:25 +0200 Subject: [PATCH 069/300] alt-ergo: split into multiple outputs --- pkgs/applications/science/logic/alt-ergo/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/science/logic/alt-ergo/default.nix b/pkgs/applications/science/logic/alt-ergo/default.nix index 56a68127d477..2f58141c3281 100644 --- a/pkgs/applications/science/logic/alt-ergo/default.nix +++ b/pkgs/applications/science/logic/alt-ergo/default.nix @@ -39,7 +39,17 @@ ocamlPackages.buildDunePackage { inherit pname version src; nativeBuildInputs = [ ocamlPackages.menhir ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.sigtool ]; - buildInputs = [ alt-ergo-parsers ] ++ (with ocamlPackages; [ cmdliner dune-site ppxlib ]); + propagatedBuildInputs = [ alt-ergo-parsers ] ++ (with ocamlPackages; [ cmdliner dune-site ppxlib ]); + + outputs = [ "bin" "out" ]; + + installPhase = '' + runHook preInstall + dune install --prefix $bin ${pname} + mkdir -p $out/lib/ocaml/${ocamlPackages.ocaml.version}/site-lib + mv $bin/lib/alt-ergo $out/lib/ocaml/${ocamlPackages.ocaml.version}/site-lib/ + runHook postInstall + ''; meta = { description = "High-performance theorem prover and SMT solver"; From 9139415648b1d46fcf5df2620d4479a042057953 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 26 Sep 2024 18:07:08 +0200 Subject: [PATCH 070/300] =?UTF-8?q?ocamlPackages.lsp:=201.18.0=20=E2=86=92?= =?UTF-8?q?=201.19.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/linol/default.nix | 8 +++++++- pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix | 9 ++++++++- pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix | 4 +++- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/linol/default.nix b/pkgs/development/ocaml-modules/linol/default.nix index dc7ee4835801..97630cc3db93 100644 --- a/pkgs/development/ocaml-modules/linol/default.nix +++ b/pkgs/development/ocaml-modules/linol/default.nix @@ -12,7 +12,13 @@ rec { hash = "sha256-MwEisPJdzZN1VRnssotvExNMYOQdffS+Y2B8ZSUDVfo="; }; - propagatedBuildInputs = [ yojson logs lsp ppx_yojson_conv_lib trace ]; + propagatedBuildInputs = [ + yojson + logs + (lsp.override { version = "1.18.0"; }) + ppx_yojson_conv_lib + trace + ]; meta = with lib; { description = "LSP server library"; diff --git a/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix b/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix index 6ad8420fc134..1a2a97d21f2b 100644 --- a/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix +++ b/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix @@ -8,7 +8,9 @@ , lib , ocaml , version ? - if lib.versionAtLeast ocaml.version "4.14" then + if lib.versionAtLeast ocaml.version "5.02" then + "1.19.0" + else if lib.versionAtLeast ocaml.version "4.14" then "1.18.0" else if lib.versionAtLeast ocaml.version "4.13" then "1.10.5" @@ -19,6 +21,11 @@ }: let params = { + "1.19.0" = { + name = "lsp"; + minimalOCamlVersion = "5.02"; + sha256 = "sha256-54PZ8af4nOG/TJFIqjSiKDaL0Um7zKQ96AtFkiHe5ew="; + }; "1.18.0" = { name = "lsp"; minimalOCamlVersion = "4.14"; diff --git a/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix b/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix index c77d1ed40453..b22561666b34 100644 --- a/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix +++ b/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix @@ -22,7 +22,9 @@ , ocamlformat-rpc-lib , ocaml , version ? - if lib.versionAtLeast ocaml.version "4.14" then + if lib.versionAtLeast ocaml.version "5.02" then + "1.19.0" + else if lib.versionAtLeast ocaml.version "4.14" then "1.18.0" else if lib.versionAtLeast ocaml.version "4.13" then "1.10.5" From 65eea0383988286f43dc2bf8450fdd5d09021707 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Thu, 26 Sep 2024 18:31:39 +0200 Subject: [PATCH 071/300] 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 7301f5b7d27c1ded589dfd743e071f42e1b89cfe Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 26 Sep 2024 21:05:36 +0200 Subject: [PATCH 072/300] hpcg: cleanup, add runHooks to InstallPhase --- pkgs/tools/misc/hpcg/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/hpcg/default.nix b/pkgs/tools/misc/hpcg/default.nix index 3ae5e7e1404a..705b095b1d80 100644 --- a/pkgs/tools/misc/hpcg/default.nix +++ b/pkgs/tools/misc/hpcg/default.nix @@ -9,19 +9,23 @@ stdenv.mkDerivation rec { sha256 = "197lw2nwmzsmfsbvgvi8z7kj69n374kgfzzp8pkmk7mp2vkk991k"; }; - dontConfigure = true; - - enableParallelBuilding = true; - buildInputs = [ mpi ]; makeFlags = [ "arch=Linux_MPI" ]; + enableParallelBuilding = true; + + dontConfigure = true; + installPhase = '' + runHook preInstall + mkdir -p $out/bin $out/share/hpcg cp bin/xhpcg $out/bin cp bin/hpcg.dat $out/share/hpcg + + runHook postInstall ''; meta = with lib; { From 21377a28765e05791188e72810aa672a695851d4 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 26 Sep 2024 21:18:51 +0200 Subject: [PATCH 073/300] hpcg: move to pkgs/by-name --- .../misc/hpcg/default.nix => by-name/hp/hpcg/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/misc/hpcg/default.nix => by-name/hp/hpcg/package.nix} (100%) diff --git a/pkgs/tools/misc/hpcg/default.nix b/pkgs/by-name/hp/hpcg/package.nix similarity index 100% rename from pkgs/tools/misc/hpcg/default.nix rename to pkgs/by-name/hp/hpcg/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 36909331c849..b37faed71576 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30180,8 +30180,6 @@ with pkgs; hpack = haskell.lib.compose.justStaticExecutables haskellPackages.hpack; - hpcg = callPackage ../tools/misc/hpcg { }; - hpl = callPackage ../tools/misc/hpl { }; hpmyroom = libsForQt5.callPackage ../applications/networking/hpmyroom { }; From 077fedc902d0bb0d64f27ed278faa598289025b8 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 26 Sep 2024 22:32:41 +0200 Subject: [PATCH 074/300] hpcg: apply nixfmt --- pkgs/by-name/hp/hpcg/package.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/hp/hpcg/package.nix b/pkgs/by-name/hp/hpcg/package.nix index 705b095b1d80..7a02f5adad8f 100644 --- a/pkgs/by-name/hp/hpcg/package.nix +++ b/pkgs/by-name/hp/hpcg/package.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, fetchurl, mpi } : +{ + lib, + stdenv, + fetchurl, + mpi, +}: stdenv.mkDerivation rec { pname = "hpcg"; @@ -37,4 +42,3 @@ stdenv.mkDerivation rec { mainProgram = "xhpcg"; }; } - From 70a662d45b8d21a080a486a29db5665eaf1af8e4 Mon Sep 17 00:00:00 2001 From: Samuel Rounce Date: Sat, 21 Sep 2024 22:44:46 +0100 Subject: [PATCH 075/300] =?UTF-8?q?freecad:=200.21.2=20=E2=86=92=201.0rc1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../0001-NIXOS-don-t-ignore-PYTHONPATH.patch | 57 +++++++++---------- .../0002-FreeCad-OndselSolver-pkgconfig.patch | 7 +++ pkgs/by-name/fr/freecad/package.nix | 20 +++++-- 3 files changed, 49 insertions(+), 35 deletions(-) create mode 100644 pkgs/by-name/fr/freecad/0002-FreeCad-OndselSolver-pkgconfig.patch diff --git a/pkgs/by-name/fr/freecad/0001-NIXOS-don-t-ignore-PYTHONPATH.patch b/pkgs/by-name/fr/freecad/0001-NIXOS-don-t-ignore-PYTHONPATH.patch index 27e5fb81b8d0..185d6effa25e 100644 --- a/pkgs/by-name/fr/freecad/0001-NIXOS-don-t-ignore-PYTHONPATH.patch +++ b/pkgs/by-name/fr/freecad/0001-NIXOS-don-t-ignore-PYTHONPATH.patch @@ -1,44 +1,43 @@ -From c4f452ef6ae083ed21095313582f6d1bd775cbf3 Mon Sep 17 00:00:00 2001 -From: Andreas Rammhold -Date: Thu, 2 Nov 2023 17:32:07 +0100 -Subject: [PATCH] NIXOS: don't ignore PYTHONPATH +commit c534a831c2f7186ebabe4e17f1e1df6d11ebff89 +Author: Samuel Rounce +Date: Thu Sep 5 22:17:21 2024 +0100 -On NixOS or rather within nixpkgs we provide the runtime Python -packages via the PYTHONPATH environment variable. FreeCAD tries its -best to ignore Python environment variables that are being inherited -from the environment. For Python versions >=3.11 it also tries to -initialize the interpreter config without any environmental data. We -have to initialize the configuration *with* the information from the -environment for our packaging to work. - -Upstream has purposely isolated the environments AFAIK and thus -shouldn't accept this patch (as is). What they might accept (once -support for older Python versions has been dropped) is removing the -PYTHONPATH specific putenv calls. + [PATCH] NIXOS: don't ignore PYTHONPATH + + On NixOS or rather within nixpkgs we provide the runtime Python + packages via the PYTHONPATH environment variable. FreeCAD tries its + best to ignore Python environment variables that are being inherited + from the environment. For Python versions >=3.11 it also tries to + initialize the interpreter config without any environmental data. We + have to initialize the configuration *with* the information from the + environment for our packaging to work. + + Upstream has purposely isolated the environments AFAIK and thus + shouldn't accept this patch (as is). What they might accept (once + support for older Python versions has been dropped) is removing the + PYTHONPATH specific putenv calls. --- - src/Base/Interpreter.cpp | 2 +- + src/Base/Interpreter.cpp | 1 + src/Main/MainGui.cpp | 3 --- - 2 files changed, 1 insertion(+), 4 deletions(-) + 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/Base/Interpreter.cpp b/src/Base/Interpreter.cpp -index 52c47168af..9966bd0013 100644 +index 2bdc54ccff..ee4f7fc070 100644 --- a/src/Base/Interpreter.cpp +++ b/src/Base/Interpreter.cpp -@@ -554,7 +554,9 @@ void initInterpreter(int argc,char *argv[]) - { - PyStatus status; +@@ -593,6 +593,7 @@ void initInterpreter(int argc, char* argv[]) PyConfig config; PyConfig_InitIsolatedConfig(&config); -+ config.isolated = 0; + config.isolated = 0; + config.use_environment = 1; + config.user_site_directory = 1; status = PyConfig_SetBytesArgv(&config, argc, argv); - if (PyStatus_Exception(status)) { diff --git a/src/Main/MainGui.cpp b/src/Main/MainGui.cpp -index 48ae847ef4..28813df383 100644 +index 36087cffd6..89d49d2cc6 100644 --- a/src/Main/MainGui.cpp +++ b/src/Main/MainGui.cpp -@@ -112,17 +112,14 @@ int main( int argc, char ** argv ) +@@ -114,10 +114,8 @@ int main(int argc, char** argv) // See https://forum.freecad.org/viewtopic.php?f=18&t=20600 // See Gui::Application::runApplication() putenv("LC_NUMERIC=C"); @@ -49,13 +48,11 @@ index 48ae847ef4..28813df383 100644 #elif defined(__MINGW32__) const char* mingw_prefix = getenv("MINGW_PREFIX"); const char* py_home = getenv("PYTHONHOME"); - if (!py_home && mingw_prefix) +@@ -125,7 +123,6 @@ int main(int argc, char** argv) _putenv_s("PYTHONHOME", mingw_prefix); + } #else - _putenv("PYTHONPATH="); // https://forum.freecad.org/viewtopic.php?f=4&t=18288 // https://forum.freecad.org/viewtopic.php?f=3&t=20515 const char* fc_py_home = getenv("FC_PYTHONHOME"); --- -2.42.0 - diff --git a/pkgs/by-name/fr/freecad/0002-FreeCad-OndselSolver-pkgconfig.patch b/pkgs/by-name/fr/freecad/0002-FreeCad-OndselSolver-pkgconfig.patch new file mode 100644 index 000000000000..194220ec6e14 --- /dev/null +++ b/pkgs/by-name/fr/freecad/0002-FreeCad-OndselSolver-pkgconfig.patch @@ -0,0 +1,7 @@ +--- a/src/3rdParty/OndselSolver/OndselSolver.pc.in ++++ b/src/3rdParty/OndselSolver/OndselSolver.pc.in +@@ -3,2 +3,2 @@ +-libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@ +-includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ ++libdir=@CMAKE_INSTALL_LIBDIR@ ++includedir=@CMAKE_INSTALL_INCLUDEDIR@ diff --git a/pkgs/by-name/fr/freecad/package.nix b/pkgs/by-name/fr/freecad/package.nix index fda823b66744..03d38273de28 100644 --- a/pkgs/by-name/fr/freecad/package.nix +++ b/pkgs/by-name/fr/freecad/package.nix @@ -9,12 +9,12 @@ , gfortran , gts , hdf5 -, libGLU -, libXmu , libf2c +, libGLU , libredwg , libsForQt5 , libspnav +, libXmu , medfile , mpi , ninja @@ -29,6 +29,7 @@ , vtk , wrapGAppsHook3 , xercesc +, yaml-cpp , zlib , withWayland ? false }: @@ -50,6 +51,7 @@ let matplotlib pivy ply + pybind11 pycollada pyside2 pyside2-tools @@ -61,13 +63,14 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "freecad"; - version = "0.21.2"; + version = "1.0rc1"; src = fetchFromGitHub { owner = "FreeCAD"; repo = "FreeCAD"; rev = finalAttrs.version; - hash = "sha256-OX4s9rbGsAhH7tLJkUJYyq2A2vCdkq/73iqYo9adogs="; + hash = "sha256-CQWLYGgcz/up1SVc2V7nOX0deGBSEEs2RwbA7pr5kc4="; + fetchSubmodules = true; }; nativeBuildInputs = [ @@ -100,6 +103,7 @@ stdenv.mkDerivation (finalAttrs: { opencascade-occt pivy ply # for openSCAD file support + pybind11 pycollada pyside2 pyside2-tools @@ -116,6 +120,7 @@ stdenv.mkDerivation (finalAttrs: { swig vtk xercesc + yaml-cpp zlib ] ++ lib.optionals spaceNavSupport [ @@ -125,12 +130,17 @@ stdenv.mkDerivation (finalAttrs: { patches = [ ./0001-NIXOS-don-t-ignore-PYTHONPATH.patch + ./0002-FreeCad-OndselSolver-pkgconfig.patch ]; cmakeFlags = [ "-Wno-dev" # turns off warnings which otherwise makes it hard to see what is going on "-DBUILD_FLAT_MESH:BOOL=ON" "-DBUILD_QT5=ON" + "-DBUILD_DRAWING=ON" + "-DBUILD_FLAT_MESH:BOOL=ON" + "-DINSTALL_TO_SITEPACKAGES=OFF" + "-DFREECAD_USE_PYBIND11=ON" "-DSHIBOKEN_INCLUDE_DIR=${shiboken2}/include" "-DSHIBOKEN_LIBRARY=Shiboken2::libshiboken" ( @@ -201,7 +211,7 @@ stdenv.mkDerivation (finalAttrs: { right at home with FreeCAD. ''; license = lib.licenses.lgpl2Plus; - maintainers = with lib.maintainers; [ gebner AndersonTorres ]; + maintainers = with lib.maintainers; [ gebner AndersonTorres srounce ]; platforms = lib.platforms.linux; }; }) From 935e1d72db7458183ca4936a128f4ae947ae9a9a Mon Sep 17 00:00:00 2001 From: Samuel Rounce Date: Fri, 27 Sep 2024 03:43:12 +0100 Subject: [PATCH 076/300] =?UTF-8?q?freecad:=201.0rc1=20=E2=86=92=201.0rc2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/by-name/fr/freecad/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fr/freecad/package.nix b/pkgs/by-name/fr/freecad/package.nix index 03d38273de28..adb558c7e406 100644 --- a/pkgs/by-name/fr/freecad/package.nix +++ b/pkgs/by-name/fr/freecad/package.nix @@ -63,13 +63,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "freecad"; - version = "1.0rc1"; + version = "1.0rc2"; src = fetchFromGitHub { owner = "FreeCAD"; repo = "FreeCAD"; rev = finalAttrs.version; - hash = "sha256-CQWLYGgcz/up1SVc2V7nOX0deGBSEEs2RwbA7pr5kc4="; + hash = "sha256-kPmfx/C1fCYwBqh6ZOKZAVNVR9m3VryPmBKu3ksDD5E="; fetchSubmodules = true; }; From 01525c4d9795e4f036f296163fe3aed834c91b6d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 27 Sep 2024 06:11:15 +0000 Subject: [PATCH 077/300] outline: 0.79.0 -> 0.80.2 --- pkgs/servers/web-apps/outline/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/web-apps/outline/default.nix b/pkgs/servers/web-apps/outline/default.nix index 872a87674793..721df17cf193 100644 --- a/pkgs/servers/web-apps/outline/default.nix +++ b/pkgs/servers/web-apps/outline/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "outline"; - version = "0.79.0"; + version = "0.80.2"; src = fetchFromGitHub { owner = "outline"; repo = "outline"; rev = "v${version}"; - hash = "sha256-uu0HlQ3LaVBjSharROKv+mS8/qONV5qND/5kMTsaGeQ="; + hash = "sha256-kmi6H2vdzg7ftUOrzs2b5e9n1bSFHiQ0wk6Q6T/lDdk="; }; nativeBuildInputs = [ makeWrapper prefetch-yarn-deps fixup-yarn-lock ]; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { yarnOfflineCache = fetchYarnDeps { yarnLock = "${src}/yarn.lock"; - hash = "sha256-S2vKYVIFsSlPqFbpLhBH9S43Invo3hsNLvfLX98922Y="; + hash = "sha256-Ibgn/J2OCP2F0hbPQi35uGAOfoZ2D5HD/E85oOTr6G0="; }; configurePhase = '' 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 078/300] 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 21ba7effdca5353799f884ee0cc56be47af57973 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Wed, 11 Sep 2024 17:38:00 +0800 Subject: [PATCH 079/300] dwlb: init at 0-unstable-2024-05-16 --- pkgs/by-name/dw/dwlb/package.nix | 51 ++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 pkgs/by-name/dw/dwlb/package.nix diff --git a/pkgs/by-name/dw/dwlb/package.nix b/pkgs/by-name/dw/dwlb/package.nix new file mode 100644 index 000000000000..c01e1f5dad41 --- /dev/null +++ b/pkgs/by-name/dw/dwlb/package.nix @@ -0,0 +1,51 @@ +{ + stdenv, + lib, + fetchFromGitHub, + pkg-config, + wayland-scanner, + wayland-protocols, + unstableGitUpdater, + pixman, + fcft, + wayland, +}: + +stdenv.mkDerivation { + pname = "dwlb"; + version = "0-unstable-2024-05-16"; + + src = fetchFromGitHub { + owner = "kolunmi"; + repo = "dwlb"; + rev = "0daa1c1fdd82c4d790e477bf171e23ca2fdfa0cb"; + hash = "sha256-Bu20IqRwBP1WRBgbcEQU4Q2BZ2FBnVaySOTsCn0iSSE="; + }; + + nativeBuildInputs = [ + pkg-config + ]; + + env = { + PREFIX = placeholder "out"; + }; + + buildInputs = [ + wayland-scanner + wayland-protocols + pixman + fcft + wayland + ]; + + passthru.updateScript = unstableGitUpdater { }; + + meta = { + description = "Fast, feature-complete bar for dwl"; + homepage = "https://github.com/kolunmi/dwlb"; + license = lib.licenses.gpl3Plus; + mainProgram = "dwlb"; + maintainers = with lib.maintainers; [ bot-wxt1221 ]; + platforms = wayland.meta.platforms; + }; +} From 6358d98704567a129314f700f1a35724c3358a0f Mon Sep 17 00:00:00 2001 From: Mirko Lenz Date: Fri, 27 Sep 2024 11:00:05 +0200 Subject: [PATCH 080/300] 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 1962209f7653968826702d8c4d1ec4c7671a92d6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 27 Sep 2024 15:00:10 +0200 Subject: [PATCH 081/300] nss_latest: 3.104 -> 3.105 https://groups.google.com/a/mozilla.org/g/dev-tech-crypto/c/vh2mZemCg4E --- pkgs/development/libraries/nss/latest.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/nss/latest.nix b/pkgs/development/libraries/nss/latest.nix index b2d040232374..143bb32a5677 100644 --- a/pkgs/development/libraries/nss/latest.nix +++ b/pkgs/development/libraries/nss/latest.nix @@ -5,6 +5,6 @@ # Example: nix-shell ./maintainers/scripts/update.nix --argstr package cacert import ./generic.nix { - version = "3.104"; - hash = "sha256-TEGEKocapU5OTqx69n8nrn/X3SZr49d1alHM73UnDJw="; + version = "3.105"; + hash = "sha256-Nfd7u0sdGqUCznnUxEJQFs+QuRSb+b7rZrcvKryimOQ="; } From 70be41ae3f950fe0a570ead53326e23dd5ebf66c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 27 Sep 2024 16:13:57 +0200 Subject: [PATCH 082/300] python312Packages.django-bootstrap4: 24.3 -> 24.4 https://github.com/zostera/django-bootstrap4/blob/refs/tags/v24.4/CHANGELOG.md --- .../django-bootstrap4/default.nix | 24 +++++++++++-------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/django-bootstrap4/default.nix b/pkgs/development/python-modules/django-bootstrap4/default.nix index e34ce0f4b624..7aa95c471777 100644 --- a/pkgs/development/python-modules/django-bootstrap4/default.nix +++ b/pkgs/development/python-modules/django-bootstrap4/default.nix @@ -15,35 +15,39 @@ # tests python, + pytest-django, + pytestCheckHook, }: buildPythonPackage rec { pname = "django-bootstrap4"; - version = "24.3"; - format = "pyproject"; + version = "24.4"; + pyproject = true; src = fetchFromGitHub { owner = "zostera"; repo = "django-bootstrap4"; rev = "refs/tags/v${version}"; - hash = "sha256-sZY/0f1PbYQu9fN65H6H7xLvsdE9AXK0cMt9TyAKuUw="; + hash = "sha256-9URZ+10GVX171Zht49UQEDkVOZ7LfOtUvapLydzNAlk="; }; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm ]; - propagatedBuildInputs = [ beautifulsoup4 ]; + dependencies = [ beautifulsoup4 ]; pythonImportsCheck = [ "bootstrap4" ]; - nativeCheckInputs = [ (django.override { withGdal = true; }) ]; + nativeCheckInputs = [ + (django.override { withGdal = true; }) + pytest-django + pytestCheckHook + ]; - checkPhase = '' - runHook preCheck - ${python.interpreter} manage.py test -v1 --noinput - runHook postCheck + preCheck = '' + export DJANGO_SETTINGS_MODULE=tests.app.settings ''; meta = with lib; { From a2054f705bebb757a7bc1b5156eab063f7398117 Mon Sep 17 00:00:00 2001 From: Alex Platz Date: Mon, 23 Sep 2024 11:34:41 -0700 Subject: [PATCH 083/300] 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 6dc52fe9a07686d456b39f8296fc57278f586185 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 27 Sep 2024 23:31:57 +0200 Subject: [PATCH 084/300] uwsgi: 2.0.26 -> 2.0.27 https://github.com/unbit/uwsgi/compare/2.0.26...2.0.27 --- pkgs/servers/uwsgi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/uwsgi/default.nix b/pkgs/servers/uwsgi/default.nix index 7d0729ee4621..7f9ecbab67d3 100644 --- a/pkgs/servers/uwsgi/default.nix +++ b/pkgs/servers/uwsgi/default.nix @@ -71,13 +71,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "uwsgi"; - version = "2.0.26"; + version = "2.0.27"; src = fetchFromGitHub { owner = "unbit"; repo = "uwsgi"; rev = finalAttrs.version; - hash = "sha256-3nmmVNNDvQ1RzaD5BQFrScHHnmUtMwjo3wodEGIJCvI="; + hash = "sha256-GOI92fwTfO/XAvNUHJMX6BtGFSVVOPWa1Jjw/UCJGi4="; }; patches = [ From 6474ec11bc438f7966cd112af847c03b6756e686 Mon Sep 17 00:00:00 2001 From: Gary Guo Date: Fri, 27 Sep 2024 22:43:02 +0100 Subject: [PATCH 085/300] 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 086/300] 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 7ab9765219bfa618cf1ee9106b79e99be1cfc707 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 28 Sep 2024 02:06:37 +0200 Subject: [PATCH 087/300] python312Packages.openai-whisper: 20231117 -> 20240927 https://github.com/openai/whisper/blob/v20240927/CHANGELOG.md --- pkgs/development/python-modules/openai-whisper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/openai-whisper/default.nix b/pkgs/development/python-modules/openai-whisper/default.nix index 06d4a1f55d9a..03c76d909a87 100644 --- a/pkgs/development/python-modules/openai-whisper/default.nix +++ b/pkgs/development/python-modules/openai-whisper/default.nix @@ -27,14 +27,14 @@ buildPythonPackage rec { pname = "whisper"; - version = "20231117"; + version = "20240927"; pyproject = true; src = fetchFromGitHub { owner = "openai"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-MJ1XjB/GuYUiECCuuHS0NWHvvs+ko0oTvLuDI7zLNiY="; + hash = "sha256-tdBLvsfQpoTO0mhV0Ggb+dnJjpIPUNZM7fXODlv/HCA="; }; patches = [ From 55a77e199391e2358cce831cb6e2cc5fe1f344f1 Mon Sep 17 00:00:00 2001 From: LuoChen Date: Sat, 28 Sep 2024 08:22:32 +0800 Subject: [PATCH 088/300] 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 089/300] 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 090/300] 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 091/300] 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 092/300] 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 c7ad3a761946476f2a7045ded7dc3885b3ebc9f9 Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Sat, 28 Sep 2024 12:57:58 +0300 Subject: [PATCH 093/300] gallery-dl: 1.27.4 -> 1.27.5 Changelog: https://github.com/mikf/gallery-dl/releases/tag/v1.27.5 Diff: https://github.com/mikf/gallery-dl/compare/v1.27.4...v1.27.5 --- pkgs/applications/misc/gallery-dl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/gallery-dl/default.nix b/pkgs/applications/misc/gallery-dl/default.nix index 3c0b631ed0a1..b235cabde998 100644 --- a/pkgs/applications/misc/gallery-dl/default.nix +++ b/pkgs/applications/misc/gallery-dl/default.nix @@ -10,13 +10,13 @@ buildPythonApplication rec { pname = "gallery-dl"; - version = "1.27.4"; + version = "1.27.5"; format = "setuptools"; src = fetchPypi { inherit version; pname = "gallery_dl"; - hash = "sha256-28y5sU9onPHIqlTIYzIQ+J2KElJocbuwKQN/E50JGI8="; + hash = "sha256-q/byWRvbzrV6KjPIDjJJWl0fkrluGEcvrISPKz8SJ+4="; }; propagatedBuildInputs = [ From ddbc429f152020afef41b3530e7f27e6f792a12c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 28 Sep 2024 11:24:22 +0000 Subject: [PATCH 094/300] 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 1b3e725693353175f3f8751fe15a5fabb5a595c8 Mon Sep 17 00:00:00 2001 From: Moritz Hedtke Date: Tue, 17 Sep 2024 12:43:27 +0200 Subject: [PATCH 095/300] verapdf: init at 1.26.2 Co-authored-by: kilianar --- pkgs/by-name/ve/verapdf/package.nix | 80 +++++++++++++++++++ .../ve/verapdf/stable-maven-plugins.patch | 42 ++++++++++ 2 files changed, 122 insertions(+) create mode 100644 pkgs/by-name/ve/verapdf/package.nix create mode 100644 pkgs/by-name/ve/verapdf/stable-maven-plugins.patch diff --git a/pkgs/by-name/ve/verapdf/package.nix b/pkgs/by-name/ve/verapdf/package.nix new file mode 100644 index 000000000000..1b772e74ed94 --- /dev/null +++ b/pkgs/by-name/ve/verapdf/package.nix @@ -0,0 +1,80 @@ +{ + lib, + fetchFromGitHub, + maven, + makeWrapper, + stripJavaArchivesHook, + makeDesktopItem, + copyDesktopItems, + jre, +}: +maven.buildMavenPackage rec { + pname = "verapdf"; + version = "1.26.2"; + + mvnParameters = "-pl '!installer' -Dverapdf.timestamp=1980-01-01T00:00:02Z -Dproject.build.outputTimestamp=1980-01-01T00:00:02Z"; + + src = fetchFromGitHub { + owner = "veraPDF"; + repo = "veraPDF-apps"; + rev = "v${version}"; + hash = "sha256-bWj4dX1qRQ2zzfF9GfskvMnrNU9pKC738Zllx6JsFww="; + }; + + patches = [ ./stable-maven-plugins.patch ]; + + mvnHash = "sha256-sVuzd4TUmrfvqhtiZL1L4obOF1DihMANbZNIy/LKyfw="; + + nativeBuildInputs = [ + makeWrapper + stripJavaArchivesHook + copyDesktopItems + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin $out/share + + install -Dm644 greenfield-apps/target/greenfield-apps-${lib.versions.majorMinor version}.0.jar $out/share/verapdf.jar + + makeWrapper ${jre}/bin/java $out/bin/verapdf-gui --add-flags "-jar $out/share/verapdf.jar" + makeWrapper ${jre}/bin/java $out/bin/verapdf --add-flags "-cp $out/share/verapdf.jar org.verapdf.apps.GreenfieldCliWrapper" + + install -Dm644 gui/src/main/resources/org/verapdf/gui/images/icon.png $out/share/icons/hicolor/256x256/apps/verapdf.png + + runHook postInstall + ''; + + desktopItems = [ + (makeDesktopItem { + name = "veraPDF"; + comment = meta.description; + desktopName = "veraPDF"; + genericName = "PDF/A Conformance Checker"; + exec = "verapdf-gui"; + icon = "verapdf"; + categories = [ + "Development" + "Utility" + ]; + keywords = [ "PDF" ]; + mimeTypes = [ "application/pdf" ]; + }) + ]; + + meta = { + description = "Command line and GUI industry supported PDF/A and PDF/UA Validation"; + homepage = "https://github.com/veraPDF/veraPDF-apps"; + license = [ + lib.licenses.gpl3Plus + # or + lib.licenses.mpl20 + ]; + mainProgram = "verapdf-gui"; + maintainers = [ + lib.maintainers.mohe2015 + lib.maintainers.kilianar + ]; + }; +} diff --git a/pkgs/by-name/ve/verapdf/stable-maven-plugins.patch b/pkgs/by-name/ve/verapdf/stable-maven-plugins.patch new file mode 100644 index 000000000000..77257b5f2dfb --- /dev/null +++ b/pkgs/by-name/ve/verapdf/stable-maven-plugins.patch @@ -0,0 +1,42 @@ +diff --git a/pom.xml b/pom.xml +index 015dca6..1557d54 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -125,6 +125,37 @@ + + + ++ ++ org.apache.maven.plugins ++ maven-enforcer-plugin ++ 3.5.0 ++ ++ ++ enforce-plugin-versions ++ ++ enforce ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ org.apache.maven.plugins ++ maven-install-plugin ++ 3.1.3 ++ ++ ++ ++ org.apache.maven.plugins ++ maven-jar-plugin ++ 3.4.2 ++ ++ + + org.apache.maven.plugins + maven-compiler-plugin From c2fb683ac8e68c5eb97ee5dcfd07b0cf11f65fc9 Mon Sep 17 00:00:00 2001 From: "Iztok Fister Jr." Date: Sat, 28 Sep 2024 14:37:37 +0200 Subject: [PATCH 096/300] 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 8bab23b22dc269b32713690718ff2e92d22fa3b7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 28 Sep 2024 14:32:51 +0000 Subject: [PATCH 097/300] simplex-chat-desktop: 6.0.4 -> 6.0.5 --- pkgs/by-name/si/simplex-chat-desktop/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/si/simplex-chat-desktop/package.nix b/pkgs/by-name/si/simplex-chat-desktop/package.nix index f022aa0142c1..38df48bb1704 100644 --- a/pkgs/by-name/si/simplex-chat-desktop/package.nix +++ b/pkgs/by-name/si/simplex-chat-desktop/package.nix @@ -6,11 +6,11 @@ let pname = "simplex-chat-desktop"; - version = "6.0.4"; + version = "6.0.5"; src = fetchurl { url = "https://github.com/simplex-chat/simplex-chat/releases/download/v${version}/simplex-desktop-x86_64.AppImage"; - hash = "sha256-yDymJ44NIqDg5++WV5rcbOAR4gEWZpwNDClJkFMe9Ns="; + hash = "sha256-z40Udd3+GWd4JSVNsqwFUm3GcbfNre+lFR/UP1+msyo="; }; appimageContents = appimageTools.extract { From bb12bc9c790d731fd48508108fcb881385685745 Mon Sep 17 00:00:00 2001 From: melvyn Date: Sat, 28 Sep 2024 11:28:31 -0400 Subject: [PATCH 098/300] 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 099/300] 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 100/300] 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 101/300] 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 102/300] 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 103/300] 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 104/300] 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 105/300] 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 106/300] 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 107/300] 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 108/300] 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 109/300] 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 3f03d48cd36cbfe568ad408bbd3ab4a0ce86c916 Mon Sep 17 00:00:00 2001 From: Ryan Omasta Date: Sat, 28 Sep 2024 16:03:34 -0600 Subject: [PATCH 110/300] veracrypt: 1.26.14 -> 1.26.15 --- pkgs/by-name/ve/veracrypt/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ve/veracrypt/package.nix b/pkgs/by-name/ve/veracrypt/package.nix index 192ef1832726..fc41522a4b20 100644 --- a/pkgs/by-name/ve/veracrypt/package.nix +++ b/pkgs/by-name/ve/veracrypt/package.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "veracrypt"; - version = "1.26.14"; + version = "1.26.15"; src = fetchurl { - url = "https://launchpad.net/veracrypt/trunk/${lib.toLower finalAttrs.version}/+download/VeraCrypt_${finalAttrs.version}_Source.tar.bz2"; - hash = "sha256-2oetZxTXF+vdwlJww4txiVAcKvlxjupkp64bwKPMruE="; + url = "https://launchpad.net/veracrypt/trunk/${finalAttrs.version}/+download/VeraCrypt_${finalAttrs.version}_Source.tar.bz2"; + hash = "sha256-upcCUDDiG5sjMbfrCJcBFjwyr0t+BFNfM1uvjXSnSRY="; }; patches = [ @@ -61,8 +61,8 @@ stdenv.mkDerivation (finalAttrs: { install -Dm 444 License.txt -t "$out/share/doc/veracrypt/" install -d $out/share/applications substitute Setup/Linux/veracrypt.desktop $out/share/applications/veracrypt.desktop \ - --replace "Exec=/usr/bin/veracrypt" "Exec=$out/bin/veracrypt" \ - --replace "Icon=veracrypt" "Icon=veracrypt.xpm" + --replace-fail "Exec=/usr/bin/veracrypt" "Exec=$out/bin/veracrypt" \ + --replace-fail "Icon=veracrypt" "Icon=veracrypt.xpm" ''; meta = { From 073099d0f7a1fe42490ba95f7295f78434004197 Mon Sep 17 00:00:00 2001 From: melvyn Date: Fri, 27 Sep 2024 19:58:34 -0400 Subject: [PATCH 111/300] 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 112/300] 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 39b9817d5efa5ce0d618e9eb480cf94915f5f864 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 29 Sep 2024 01:01:07 +0000 Subject: [PATCH 113/300] buildkite-cli: 2.0.0 -> 3.1.0 --- .../tools/continuous-integration/buildkite-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/buildkite-cli/default.nix b/pkgs/development/tools/continuous-integration/buildkite-cli/default.nix index dd81126d68fd..f59f783231eb 100644 --- a/pkgs/development/tools/continuous-integration/buildkite-cli/default.nix +++ b/pkgs/development/tools/continuous-integration/buildkite-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "buildkite-cli"; - version = "2.0.0"; + version = "3.1.0"; src = fetchFromGitHub { owner = "buildkite"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-4MUgyUKyycsreAMVtyKJFpQOHvI6JJSn7TUZtbQANyc="; + sha256 = "sha256-fidE4MSZS53Odv5tlNPFJEhcb8JTmILVRNmcVF9Z9Oc="; }; - vendorHash = "sha256-3x7yJenJ2BHdqVPaBaqfFVeOSJZ/VRNF/TTfSsw+2os="; + vendorHash = "sha256-stxsMJPBUclLlmR88c7OwAhsw9dhyBIhStuxLVu00bo="; doCheck = false; From 7455c80a5f97a5fa9c4449a6c64c053232f6eca4 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Sat, 28 Sep 2024 18:22:07 +0800 Subject: [PATCH 114/300] 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 115/300] 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 25f4610b3eec8f2dd61f653c734f64ca96e1b828 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sun, 29 Sep 2024 14:02:33 +0900 Subject: [PATCH 116/300] python312Packages.pysmb: switch to pypa builder --- pkgs/development/python-modules/pysmb/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pysmb/default.nix b/pkgs/development/python-modules/pysmb/default.nix index 69023a4db8e5..d58336d0019c 100644 --- a/pkgs/development/python-modules/pysmb/default.nix +++ b/pkgs/development/python-modules/pysmb/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + setuptools, pyasn1, pythonOlder, tqdm, @@ -10,7 +11,7 @@ buildPythonPackage rec { pname = "pysmb"; version = "1.2.10"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +22,9 @@ buildPythonPackage rec { hash = "sha256-Zid6KGNr7BBuyHaxdXkhRC/Ug93HmVXKMtreFf+M7OE="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ pyasn1 tqdm ]; From 30547aa2693e77a48e8fb840cf670067185e8563 Mon Sep 17 00:00:00 2001 From: kraanzu Date: Sun, 29 Sep 2024 10:42:54 +0530 Subject: [PATCH 117/300] 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 118/300] 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 119/300] 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 ca6795545c1682a2e12bf12dea0216ce6b77239a Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 29 Sep 2024 10:17:01 +0300 Subject: [PATCH 120/300] gmt: modernize Nixfmt; Use `finalAttrs:` pattern; don't use `with lib;` in meta; Switch to fetchFromGitHub, for better automatic updates, with hash instead of sha256. --- pkgs/applications/gis/gmt/default.nix | 130 +++++++++++++++++--------- 1 file changed, 84 insertions(+), 46 deletions(-) diff --git a/pkgs/applications/gis/gmt/default.nix b/pkgs/applications/gis/gmt/default.nix index 092d1cb431d6..ec70ab02b1da 100644 --- a/pkgs/applications/gis/gmt/default.nix +++ b/pkgs/applications/gis/gmt/default.nix @@ -1,59 +1,97 @@ -{ lib, stdenv, fetchurl, cmake, curl, Accelerate, CoreGraphics, CoreVideo -, fftwSinglePrec, netcdf, pcre, gdal, blas, lapack, glibc, ghostscript, dcw-gmt -, gshhg-gmt }: +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + curl, + Accelerate, + CoreGraphics, + CoreVideo, + fftwSinglePrec, + netcdf, + pcre, + gdal, + blas, + lapack, + glibc, + ghostscript, + dcw-gmt, + gshhg-gmt, +}: -/* The onus is on the user to also install: - - ffmpeg for webm or mp4 output - - graphicsmagick for gif output +/* + The onus is on the user to also install: + - ffmpeg for webm or mp4 output + - graphicsmagick for gif output */ -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gmt"; version = "6.4.0"; - src = fetchurl { - url = "https://github.com/GenericMappingTools/gmt/releases/download/${version}/gmt-${version}-src.tar.gz"; - sha256 = "sha256-0mfAx9b7MMnqfgKe8n2tsm/9e5LLS0cD+aO6Do85Ohs="; + src = fetchFromGitHub { + owner = "GenericMappingTools"; + repo = "gmt"; + rev = "refs/tags/${finalAttrs.version}"; + hash = "sha256-rRNEo7dGkmgrkhNCBacyfBYrl7zHnE0KMWQHT0Ekbo0="; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ + cmake + ]; - buildInputs = [ curl gdal netcdf pcre dcw-gmt gshhg-gmt ] - ++ (if stdenv.hostPlatform.isDarwin then [ - Accelerate - CoreGraphics - CoreVideo - ] else [ - glibc - fftwSinglePrec - blas - lapack - ]); + buildInputs = + [ + curl + gdal + netcdf + pcre + dcw-gmt + gshhg-gmt + ] + ++ ( + if stdenv.hostPlatform.isDarwin then + [ + Accelerate + CoreGraphics + CoreVideo + ] + else + [ + glibc + fftwSinglePrec + blas + lapack + ] + ); - propagatedBuildInputs = [ ghostscript ]; + propagatedBuildInputs = [ + ghostscript + ]; - cmakeFlags = [ - "-DGMT_DOCDIR=share/doc/gmt" - "-DGMT_MANDIR=share/man" - "-DGMT_LIBDIR=lib" - "-DCOPY_GSHHG:BOOL=FALSE" - "-DGSHHG_ROOT=${gshhg-gmt.out}/share/gshhg-gmt" - "-DCOPY_DCW:BOOL=FALSE" - "-DDCW_ROOT=${dcw-gmt.out}/share/dcw-gmt" - "-DGDAL_ROOT=${gdal.out}" - "-DNETCDF_ROOT=${netcdf.out}" - "-DPCRE_ROOT=${pcre.out}" - "-DGMT_INSTALL_TRADITIONAL_FOLDERNAMES:BOOL=FALSE" - "-DGMT_ENABLE_OPENMP:BOOL=TRUE" - "-DGMT_INSTALL_MODULE_LINKS:BOOL=FALSE" - "-DLICENSE_RESTRICTED=LGPL" # "GPL" and "no" also valid - ] ++ (with stdenv; - lib.optionals (!isDarwin) [ + cmakeFlags = + [ + "-DGMT_DOCDIR=share/doc/gmt" + "-DGMT_MANDIR=share/man" + "-DGMT_LIBDIR=lib" + "-DCOPY_GSHHG:BOOL=FALSE" + "-DGSHHG_ROOT=${gshhg-gmt.out}/share/gshhg-gmt" + "-DCOPY_DCW:BOOL=FALSE" + "-DDCW_ROOT=${dcw-gmt.out}/share/dcw-gmt" + "-DGDAL_ROOT=${gdal.out}" + "-DNETCDF_ROOT=${netcdf.out}" + "-DPCRE_ROOT=${pcre.out}" + "-DGMT_INSTALL_TRADITIONAL_FOLDERNAMES:BOOL=FALSE" + "-DGMT_ENABLE_OPENMP:BOOL=TRUE" + "-DGMT_INSTALL_MODULE_LINKS:BOOL=FALSE" + "-DLICENSE_RESTRICTED=LGPL" # "GPL" and "no" also valid + ] + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ "-DFFTW3_ROOT=${fftwSinglePrec.dev}" "-DLAPACK_LIBRARY=${lapack}/lib/liblapack.so" "-DBLAS_LIBRARY=${blas}/lib/libblas.so" - ]); + ]; - meta = with lib; { + meta = { homepage = "https://www.generic-mapping-tools.org"; description = "Tools for manipulating geographic and cartesian data sets"; longDescription = '' @@ -65,9 +103,9 @@ stdenv.mkDerivation rec { transformations and includes supporting data such as coastlines, rivers, and political boundaries and optionally country polygons. ''; - platforms = [ "x86_64-linux" "x86_64-darwin" ]; - license = licenses.lgpl3Plus; - maintainers = with maintainers; [ tviti ]; + platforms = lib.platforms.unix; + license = lib.licenses.lgpl3Plus; + maintainers = with lib.maintainers; [ tviti ]; }; -} +}) From b1f7700933ca3848548b1b460e9a3a3064e5db3f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 29 Sep 2024 07:44:20 +0000 Subject: [PATCH 121/300] python312Packages.treq: 23.11.0 -> 24.9.1 --- pkgs/development/python-modules/treq/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/treq/default.nix b/pkgs/development/python-modules/treq/default.nix index 1d2a9b15374c..aa313179af97 100644 --- a/pkgs/development/python-modules/treq/default.nix +++ b/pkgs/development/python-modules/treq/default.nix @@ -19,12 +19,12 @@ buildPythonPackage rec { pname = "treq"; - version = "23.11.0"; + version = "24.9.1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-CRT/kp/RYyzhZ5cjUmD4vBnSD/fEWcHeq9ZbjGjL6sU="; + hash = "sha256-Fdp/xATz5O1Z0Kvl+O70lm+rvmGAOaKiO8fBUwXO/qg="; }; nativeBuildInputs = [ 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 122/300] 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 123/300] 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 c0f95a993b45ee3a67be9d9b78b20c410812677a Mon Sep 17 00:00:00 2001 From: Terje Larsen <terlar@gmail.com> Date: Sun, 29 Sep 2024 13:44:37 +0200 Subject: [PATCH 124/300] google-cloud-sdk: 492.0.0 -> 494.0.0 --- .../admin/google-cloud-sdk/components.json | 326 +++++++++--------- pkgs/tools/admin/google-cloud-sdk/data.nix | 22 +- 2 files changed, 174 insertions(+), 174 deletions(-) diff --git a/pkgs/tools/admin/google-cloud-sdk/components.json b/pkgs/tools/admin/google-cloud-sdk/components.json index ce7b7672b0ec..185679e3ae36 100644 --- a/pkgs/tools/admin/google-cloud-sdk/components.json +++ b/pkgs/tools/admin/google-cloud-sdk/components.json @@ -5,7 +5,7 @@ "checksum": "5a65179c291bc480696ca323d2f8c4874985458303eff8f233e16cdca4e88e6f", "contents_checksum": "038c999c7a7d70d5133eab7dc5868c4c3d0358431dad250f9833306af63016c8", "size": 800, - "source": "components/google-cloud-sdk-alpha-20240906153039.tar.gz", + "source": "components/google-cloud-sdk-alpha-20240920144119.tar.gz", "type": "tar" }, "dependencies": [ @@ -23,8 +23,8 @@ "platform": {}, "platform_required": false, "version": { - "build_number": 20240906153039, - "version_string": "2024.09.06" + "build_number": 20240920144119, + "version_string": "2024.09.20" } }, { @@ -266,15 +266,15 @@ "platform_required": false, "version": { "build_number": 0, - "version_string": "0.2.52" + "version_string": "0.2.53" } }, { "data": { - "checksum": "b1dff49fd8a5270c26f1e86f53d802dd0f2a9523b22dd7a51d23739cc1702820", - "contents_checksum": "f8a87d4f50dd802ec2d3894b09db6ea3278bc609f3f6a280ca27d65a311b6ce3", - "size": 70632402, - "source": "components/google-cloud-sdk-anthoscli-darwin-arm-20240712142834.tar.gz", + "checksum": "02ba5e29a9e189fca93b60abd88a313aafb7fc7cbaa569edf39f45060df104d5", + "contents_checksum": "08db596fe3b62c4b42bc84c1fe5f5ef6b7a0cf6dabc8d81630a127ecad620bfd", + "size": 70611092, + "source": "components/google-cloud-sdk-anthoscli-darwin-arm-20240920144119.tar.gz", "type": "tar" }, "dependencies": [ @@ -299,16 +299,16 @@ }, "platform_required": false, "version": { - "build_number": 20240712142834, - "version_string": "0.2.52" + "build_number": 20240920144119, + "version_string": "0.2.53" } }, { "data": { - "checksum": "ebf7083c6bbb2d84bc09c6b715d21bb06420b216ff52e91062266e9dcede1f0c", - "contents_checksum": "1335273de68c0184e0a2215e8dff6f2a601dc745baee6b00df8b296ead9bbb45", - "size": 74268845, - "source": "components/google-cloud-sdk-anthoscli-darwin-x86-20240712142834.tar.gz", + "checksum": "7d08629fc687492f832a0266c5e11b28ee51e2f6a69a58b7a94880fea48d7a54", + "contents_checksum": "be3d18f74bbc516c3f74add8fb3d319fe04568c07252b44717e5d78599a2e9ff", + "size": 74259971, + "source": "components/google-cloud-sdk-anthoscli-darwin-x86-20240920144119.tar.gz", "type": "tar" }, "dependencies": [ @@ -333,16 +333,16 @@ }, "platform_required": false, "version": { - "build_number": 20240712142834, - "version_string": "0.2.52" + "build_number": 20240920144119, + "version_string": "0.2.53" } }, { "data": { - "checksum": "95cd26d9e914a9005476c95f79da7eda04bf9c7756a2e68f1e78a66c16546e3b", - "contents_checksum": "1335273de68c0184e0a2215e8dff6f2a601dc745baee6b00df8b296ead9bbb45", - "size": 74268848, - "source": "components/google-cloud-sdk-anthoscli-darwin-x86_64-20240712142834.tar.gz", + "checksum": "bc4cb34c070cc2e9cea01a859aca3b2468ff78c697f6a6cd425c1b3ab4fe793e", + "contents_checksum": "be3d18f74bbc516c3f74add8fb3d319fe04568c07252b44717e5d78599a2e9ff", + "size": 74259974, + "source": "components/google-cloud-sdk-anthoscli-darwin-x86_64-20240920144119.tar.gz", "type": "tar" }, "dependencies": [ @@ -367,16 +367,16 @@ }, "platform_required": false, "version": { - "build_number": 20240712142834, - "version_string": "0.2.52" + "build_number": 20240920144119, + "version_string": "0.2.53" } }, { "data": { - "checksum": "298acae5cd9f3f5f95ef15b43b92b604cb17efdf0f712f39aad805f28a17c36f", - "contents_checksum": "22fb27fa7110f719b143ef1e19fac7638567a6d7d48a909be7dd1a08badaa12f", - "size": 67808715, - "source": "components/google-cloud-sdk-anthoscli-linux-arm-20240712142834.tar.gz", + "checksum": "ca197aefd6e3b8f943ffce8a36b8bcf4e9f1d77569f2f5893f09242ddbefa2cc", + "contents_checksum": "7bb06f592f4b2adc5de37c4c7fa665a8056d22e141a1e9337ec0e6a14afd1a26", + "size": 67805442, + "source": "components/google-cloud-sdk-anthoscli-linux-arm-20240920144119.tar.gz", "type": "tar" }, "dependencies": [ @@ -401,16 +401,16 @@ }, "platform_required": false, "version": { - "build_number": 20240712142834, - "version_string": "0.2.52" + "build_number": 20240920144119, + "version_string": "0.2.53" } }, { "data": { - "checksum": "1bb549e7745fbb6c422a66a69de83a4100548ef289415fbb80bf3424a27f0a5c", - "contents_checksum": "a5cf333202e0e3dacd64388c7604752c539f484159e83fff46026990b4b466b5", - "size": 65492449, - "source": "components/google-cloud-sdk-anthoscli-linux-x86-20240712142834.tar.gz", + "checksum": "219bbf4fc039fc02db00cdc71d3ff84bcd8558d7ec131911a166938b6db8b90c", + "contents_checksum": "de4c26da762b91f1e970e6afb26bd97f77c616f69ac92992279df1b2c3e5ae93", + "size": 65477613, + "source": "components/google-cloud-sdk-anthoscli-linux-x86-20240920144119.tar.gz", "type": "tar" }, "dependencies": [ @@ -435,16 +435,16 @@ }, "platform_required": false, "version": { - "build_number": 20240712142834, - "version_string": "0.2.52" + "build_number": 20240920144119, + "version_string": "0.2.53" } }, { "data": { - "checksum": "69a107eef662d4ef0930a51bca72b585e4314f7f962cb54987cc072d87ff6891", - "contents_checksum": "878c7420eb7909d6c7073182f6ec1b96ea2adc6995d4a90e2e47634dd4c629d9", - "size": 72509283, - "source": "components/google-cloud-sdk-anthoscli-linux-x86_64-20240712142834.tar.gz", + "checksum": "000bc1ace0a08fc738db3af6b8fc6b21b18ce7a08a70c6965885f8836f90b970", + "contents_checksum": "440b7e164aad403e6685b3e9dd2a1ea5419b012bc207a7f5383c7653d218656a", + "size": 72514534, + "source": "components/google-cloud-sdk-anthoscli-linux-x86_64-20240920144119.tar.gz", "type": "tar" }, "dependencies": [ @@ -469,16 +469,16 @@ }, "platform_required": false, "version": { - "build_number": 20240712142834, - "version_string": "0.2.52" + "build_number": 20240920144119, + "version_string": "0.2.53" } }, { "data": { - "checksum": "7e7147b4ec408e9cd8142bd0d6eac6b89b2bc545aa8421f67eaed7e8b8a1e9f2", - "contents_checksum": "c8a284c543bc838e22ac0b9762c6e1a559db867025305f38974f818ef0c44c2f", - "size": 67415658, - "source": "components/google-cloud-sdk-anthoscli-windows-x86-20240712142834.tar.gz", + "checksum": "1b474596746104c3ce64677c4009bd6d67f50ee02c5622653fe399360bfd7016", + "contents_checksum": "c01fd4068732ef6856262c08039b2e95c2ff0280e5b9110f0ea1b6a868071298", + "size": 67406191, + "source": "components/google-cloud-sdk-anthoscli-windows-x86-20240920144119.tar.gz", "type": "tar" }, "dependencies": [ @@ -503,16 +503,16 @@ }, "platform_required": false, "version": { - "build_number": 20240712142834, - "version_string": "0.2.52" + "build_number": 20240920144119, + "version_string": "0.2.53" } }, { "data": { - "checksum": "f42e9bb1e16ea90787d639b08cd05a7e750b19cf9849d99aefe09d0808d2445c", - "contents_checksum": "031e4309260adf22c8cff1ad368c280186117c0906539b8180b642f9ffc0fa18", - "size": 73148423, - "source": "components/google-cloud-sdk-anthoscli-windows-x86_64-20240712142834.tar.gz", + "checksum": "77c7fbc4f81d1ddc09222243de8b017c69a05d2c6a1079d294d6b00709072329", + "contents_checksum": "86c3cea0534e1a2e7747ee09cc7ef9641b1897add71ae9537ce447e05e166f05", + "size": 73144414, + "source": "components/google-cloud-sdk-anthoscli-windows-x86_64-20240920144119.tar.gz", "type": "tar" }, "dependencies": [ @@ -537,8 +537,8 @@ }, "platform_required": false, "version": { - "build_number": 20240712142834, - "version_string": "0.2.52" + "build_number": 20240920144119, + "version_string": "0.2.53" } }, { @@ -1050,10 +1050,10 @@ }, { "data": { - "checksum": "55d136d6b2f08b31a70183e5b80cd5b408d200aee316e87402b50eae2251c15d", - "contents_checksum": "ee286f0c07a3b33f0193a5ba439375f221c5d42190df5f5e17333d6b60ae3f1b", - "size": 134048645, - "source": "components/google-cloud-sdk-app-engine-java-20240712142834.tar.gz", + "checksum": "956e282b412d0f80a2f11484196f6279f6e1450f423c510c2ea0f814b625cec4", + "contents_checksum": "99df1fb3e1e7dffd61f23d19906c176df4fc64204cefa186168a82707ba3f774", + "size": 134269609, + "source": "components/google-cloud-sdk-app-engine-java-20240920144119.tar.gz", "type": "tar" }, "dependencies": [ @@ -1072,8 +1072,8 @@ "platform": {}, "platform_required": false, "version": { - "build_number": 20240712142834, - "version_string": "2.0.29" + "build_number": 20240920144119, + "version_string": "2.0.30" } }, { @@ -1377,7 +1377,7 @@ "checksum": "707d412854a14450b4fddee199d258e75946fe51b44eb2980c8cd7e274c15760", "contents_checksum": "0b4e9d8e6394dc841aece07ca4da91920a460cbd7ec22495be4a2b4f46635b4d", "size": 797, - "source": "components/google-cloud-sdk-beta-20240906153039.tar.gz", + "source": "components/google-cloud-sdk-beta-20240920144119.tar.gz", "type": "tar" }, "dependencies": [ @@ -1395,8 +1395,8 @@ "platform": {}, "platform_required": false, "version": { - "build_number": 20240906153039, - "version_string": "2024.09.06" + "build_number": 20240920144119, + "version_string": "2024.09.20" } }, { @@ -1440,10 +1440,10 @@ }, { "data": { - "checksum": "61389b1bb5534dc7386d30df5ab3a1050cbe3a8c9deda0edb40a1d5985439049", - "contents_checksum": "3a7f40f835b1b713a96f5b6c404eae20c7c90d794aae8a92713fd5b59a3c778e", - "size": 7344145, - "source": "components/google-cloud-sdk-bigtable-darwin-arm-20240329151455.tar.gz", + "checksum": "398f3ca68cd59d46e5166dfd8f9f4224d73a1d4588024d06a2fc5e509eede161", + "contents_checksum": "749271d55d4110d9ce71cf9bb04bcc247b60086f9d2e3abf9ff9cb2b12788e82", + "size": 7696648, + "source": "components/google-cloud-sdk-bigtable-darwin-arm-20240920144119.tar.gz", "type": "tar" }, "dependencies": [ @@ -1469,7 +1469,7 @@ }, "platform_required": false, "version": { - "build_number": 20240329151455, + "build_number": 20240920144119, "version_string": "" } }, @@ -1510,10 +1510,10 @@ }, { "data": { - "checksum": "1d719de1aa61fb4837d221502e4113b2f786671e1139852275d69dc77d02e494", - "contents_checksum": "747c8a308249abd684ad2bc8bb9c3b34ed5092da0825b2887188c7f65385c81a", - "size": 7656241, - "source": "components/google-cloud-sdk-bigtable-darwin-x86_64-20240329151455.tar.gz", + "checksum": "e2dc76d943395989b50785ecee54aa261ddba5ba8d17a24c504385978271f333", + "contents_checksum": "d2e568fbf5c4af408f146fab0ffe80cc40dd634d358a47e4bf2c720942abf4c9", + "size": 8019559, + "source": "components/google-cloud-sdk-bigtable-darwin-x86_64-20240920144119.tar.gz", "type": "tar" }, "dependencies": [ @@ -1539,16 +1539,16 @@ }, "platform_required": false, "version": { - "build_number": 20240329151455, + "build_number": 20240920144119, "version_string": "" } }, { "data": { - "checksum": "573c369501c73a684744007a9fc23ca29d8a81fa6c1dd18bed18c659ed406711", - "contents_checksum": "5abcfae3e7a061c532d3b4acbb6659d98cc4a7077e21ae4859e4d83d9c07e84f", - "size": 7210539, - "source": "components/google-cloud-sdk-bigtable-linux-arm-20240329151455.tar.gz", + "checksum": "54830749a50061c2d123d35bb0f075a6208ac71e03bd0d6dd05b10e16526d250", + "contents_checksum": "bb3932e57f44ff1a98b8a7176a5b368b2f55cd4a7c679eb32353b85685cdaac0", + "size": 7583487, + "source": "components/google-cloud-sdk-bigtable-linux-arm-20240920144119.tar.gz", "type": "tar" }, "dependencies": [ @@ -1574,16 +1574,16 @@ }, "platform_required": false, "version": { - "build_number": 20240329151455, + "build_number": 20240920144119, "version_string": "" } }, { "data": { - "checksum": "987ee97fb43e647db218c80cb9c3381477072aa494292db4d108e23f298e8926", - "contents_checksum": "da67b3b932497c895d74221dd3f670374abeda9b18ea32e225b733e69dc87cdc", - "size": 7374147, - "source": "components/google-cloud-sdk-bigtable-linux-x86-20240329151455.tar.gz", + "checksum": "ea0c309db700a32cc18c89a5fd6887e5f777277af47451f9d4df6bff7fcf0383", + "contents_checksum": "2af9f0ab5704080cc63d2779451b3b24fcd20d8cfa8a8b3d9dd6d1ac06521c97", + "size": 7763548, + "source": "components/google-cloud-sdk-bigtable-linux-x86-20240920144119.tar.gz", "type": "tar" }, "dependencies": [ @@ -1609,16 +1609,16 @@ }, "platform_required": false, "version": { - "build_number": 20240329151455, + "build_number": 20240920144119, "version_string": "" } }, { "data": { - "checksum": "a21817f2aae3ea9580a34f3f169a81baf289cbbd0a3b93455252c326654fe8b2", - "contents_checksum": "3ac22e1972afab99190324f7b9363fe9454ae845beba9eb3750d6240f40f5ee4", - "size": 7668508, - "source": "components/google-cloud-sdk-bigtable-linux-x86_64-20240329151455.tar.gz", + "checksum": "d3dfa87cd2f12cbf7358065764158ca981d6afe650de78a3077fc7e348c8f2c8", + "contents_checksum": "938cbad478a98442d3de281f957655e8fb45a0d39e2c3ace74b88551b03e52ae", + "size": 8045299, + "source": "components/google-cloud-sdk-bigtable-linux-x86_64-20240920144119.tar.gz", "type": "tar" }, "dependencies": [ @@ -1644,16 +1644,16 @@ }, "platform_required": false, "version": { - "build_number": 20240329151455, + "build_number": 20240920144119, "version_string": "" } }, { "data": { - "checksum": "44b0bfe67b3e19db8acf4bb144f465509afe1fc25ad9c8dfee18a70c1202d3a3", - "contents_checksum": "2fdcda84a5bdb706895ffc4333597c2dbf48cf4fd52048174ece638e2d63348a", - "size": 7568622, - "source": "components/google-cloud-sdk-bigtable-windows-x86-20240329151455.tar.gz", + "checksum": "1cb1211ce675026d3e604928e409766044e287eb7e6a068e57aa24c4ee8fce50", + "contents_checksum": "14c9f33ec53c466dac584027302b9825f09f915876d91d613f769f22816e0022", + "size": 7960310, + "source": "components/google-cloud-sdk-bigtable-windows-x86-20240920144119.tar.gz", "type": "tar" }, "dependencies": [ @@ -1679,16 +1679,16 @@ }, "platform_required": false, "version": { - "build_number": 20240329151455, + "build_number": 20240920144119, "version_string": "" } }, { "data": { - "checksum": "36f5c9f98188e968cd53fe4545b3f8cb01dc2dfe2bda5c1f607ac384f358f329", - "contents_checksum": "cae59bae355fc9b8ff8fc37296d3885a9944d85b0ba84a4c2e9985380db488e6", - "size": 7841324, - "source": "components/google-cloud-sdk-bigtable-windows-x86_64-20240329151455.tar.gz", + "checksum": "09ef13cc7900d20431ab4f825c41c7ef6eb6685f7d6acef773c50b501d60cade", + "contents_checksum": "a0c28f60f50833a79c8c0b034e14921f9fa73780151df7a82eb586cece71a6ad", + "size": 8213154, + "source": "components/google-cloud-sdk-bigtable-windows-x86_64-20240920144119.tar.gz", "type": "tar" }, "dependencies": [ @@ -1714,7 +1714,7 @@ }, "platform_required": false, "version": { - "build_number": 20240329151455, + "build_number": 20240920144119, "version_string": "" } }, @@ -1874,10 +1874,10 @@ }, { "data": { - "checksum": "abfd98bebfbc56c467215ded622ab9ad41e5c5f66b9a00c9c857d08d0880ce40", - "contents_checksum": "01f79ef8ab21aca5ee4c57fe2fe8fc7588c87d99842dc1259114fe000659fc91", - "size": 77768547, - "source": "components/google-cloud-sdk-bundled-python3-unix-linux-x86_64-20240806142304.tar.gz", + "checksum": "48d35279879c7bc29aafa03983ebcea20971974b8e30656dd95eef527384b5ab", + "contents_checksum": "aa88f2a24033468ef86f8f1267b8f1240b2660570367787a8dd02270071004af", + "size": 78001783, + "source": "components/google-cloud-sdk-bundled-python3-unix-linux-x86_64-20240920144119.tar.gz", "type": "tar" }, "dependencies": [ @@ -1903,7 +1903,7 @@ }, "platform_required": false, "version": { - "build_number": 20240806142304, + "build_number": 20240920144119, "version_string": "3.11.9" } }, @@ -2449,10 +2449,10 @@ }, { "data": { - "checksum": "708013ee1eb1fc34fc1b33e8b562e7c276e95749685050f347af0002d96be9ef", - "contents_checksum": "c26bdf735c3b31bec987291b9716851c02326e1ce5d425f2bdf78bc675dc1955", - "size": 48564778, - "source": "components/google-cloud-sdk-cloud-firestore-emulator-20240816183020.tar.gz", + "checksum": "8b4dbc1cb4a0d1217f8283a3057d4ba704fcbe11ba7f2b12dc1c13edb87e2e22", + "contents_checksum": "428a9740ee97cc9b8baad30a8ad5271fe2ee46a78f42c60f91e238dd7315c289", + "size": 49222535, + "source": "components/google-cloud-sdk-cloud-firestore-emulator-20240913204132.tar.gz", "type": "tar" }, "dependencies": [ @@ -2470,8 +2470,8 @@ "platform": {}, "platform_required": false, "version": { - "build_number": 20240816183020, - "version_string": "1.19.8" + "build_number": 20240913204132, + "version_string": "1.19.9" } }, { @@ -3497,10 +3497,10 @@ }, { "data": { - "checksum": "c6f0d392c3c760bb03ce0d47f88011ec19f77e319319f6b9e468d92aa9be0b50", - "contents_checksum": "fd08abc11ea832085782f21f3e16a6aae190c0f899bd05dff8b127feb96005a9", - "size": 20816315, - "source": "components/google-cloud-sdk-core-20240906153039.tar.gz", + "checksum": "07eb73d0e08d63d8c2715df13dcae10561dc8062727f74c65fc698be73ed9442", + "contents_checksum": "64887e7f351f00ed95cd5a9d2be9aa72e8ceff4a8f617d626e9bc2e8c0238223", + "size": 21004306, + "source": "components/google-cloud-sdk-core-20240920144119.tar.gz", "type": "tar" }, "dependencies": [ @@ -3522,8 +3522,8 @@ "platform": {}, "platform_required": false, "version": { - "build_number": 20240906153039, - "version_string": "2024.09.06" + "build_number": 20240920144119, + "version_string": "2024.09.20" } }, { @@ -3902,15 +3902,15 @@ "platform_required": false, "version": { "build_number": 0, - "version_string": "0.3.2" + "version_string": "0.3.3" } }, { "data": { - "checksum": "a3e8f5c45ac19bd3430201339c07f2f6dc21296702375c2381ecf5c8d3e88279", - "contents_checksum": "22e8de82f1f0cb7a6db65e095c15017866869cac0f1d5556c146c92b1c49acb9", - "size": 8680702, - "source": "components/google-cloud-sdk-enterprise-certificate-proxy-darwin-arm-20231208151900.tar.gz", + "checksum": "d08bffeb4cc07f510132c943dd3c4da5d05ad4348b1b79cc2f13ce77c1a43294", + "contents_checksum": "8369d34ed10b49fa49096488b8e9fde343efdeac8ec9662843ceac9a2c72a049", + "size": 7538571, + "source": "components/google-cloud-sdk-enterprise-certificate-proxy-darwin-arm-20240913204132.tar.gz", "type": "tar" }, "dependencies": [ @@ -3935,16 +3935,16 @@ }, "platform_required": false, "version": { - "build_number": 20231208151900, - "version_string": "0.3.2" + "build_number": 20240913204132, + "version_string": "0.3.3" } }, { "data": { - "checksum": "301757a2839dce01a6435ed4b0dfd05616f9a3c8aeba4624362b48f115e5b97a", - "contents_checksum": "6d407b55892613efd363344f855292ddda8fdbe81f549f318264480dc167b25a", - "size": 9536921, - "source": "components/google-cloud-sdk-enterprise-certificate-proxy-darwin-x86_64-20231208151900.tar.gz", + "checksum": "1f2be11ed0d87cfb5377dec7c78a8b48fd211ab1827b43f523c7ac33d6de0b61", + "contents_checksum": "27fde9fc542d86f9eb256bc92e8a511c6896e8a419cd9ec089ea2ddc900bd2bd", + "size": 8300582, + "source": "components/google-cloud-sdk-enterprise-certificate-proxy-darwin-x86_64-20240913204132.tar.gz", "type": "tar" }, "dependencies": [ @@ -3969,16 +3969,16 @@ }, "platform_required": false, "version": { - "build_number": 20231208151900, - "version_string": "0.3.2" + "build_number": 20240913204132, + "version_string": "0.3.3" } }, { "data": { - "checksum": "620e7f1598535dba84e52085cf12275e6e2264b281d7d43d71d4079ad0daab7e", - "contents_checksum": "1ccff0b7259285d34269926c6038535561cc6d24c0a5c40e3f1b49c7748c9808", - "size": 9012612, - "source": "components/google-cloud-sdk-enterprise-certificate-proxy-linux-x86_64-20231208151900.tar.gz", + "checksum": "755dd461d4e781fdde01f9045583b6693828b40711dd4f063943e4a9db2c0ece", + "contents_checksum": "e8c8acf997eab9a5298037798725fe486a70bd49a395d61e229e2f41c1f80036", + "size": 9024735, + "source": "components/google-cloud-sdk-enterprise-certificate-proxy-linux-x86_64-20240913204132.tar.gz", "type": "tar" }, "dependencies": [ @@ -4003,16 +4003,16 @@ }, "platform_required": false, "version": { - "build_number": 20231208151900, - "version_string": "0.3.2" + "build_number": 20240913204132, + "version_string": "0.3.3" } }, { "data": { - "checksum": "d49562e0fac17a4ac3c4e30d7c7056320a69ebc157a6c3f3e744f5731bb16f92", - "contents_checksum": "bfa2c0f4ea80fb6e3299b6fb7554565213c39ed7b01140020f8ae00c260d09e1", - "size": 6801316, - "source": "components/google-cloud-sdk-enterprise-certificate-proxy-windows-x86_64-20231208151900.tar.gz", + "checksum": "ff4456a198f652f5b4340a94091d64930b5ed3df5adbd90a0633024d2860c07a", + "contents_checksum": "16f3c53cf04b266326ce4d64d084ab395d57e3718bb42d1b21d897e0e729bdf7", + "size": 6782214, + "source": "components/google-cloud-sdk-enterprise-certificate-proxy-windows-x86_64-20240913204132.tar.gz", "type": "tar" }, "dependencies": [ @@ -4037,8 +4037,8 @@ }, "platform_required": false, "version": { - "build_number": 20231208151900, - "version_string": "0.3.2" + "build_number": 20240913204132, + "version_string": "0.3.3" } }, { @@ -4338,10 +4338,10 @@ }, { "data": { - "checksum": "97b7d739d37f7189c1630cccd1567aa9ce2f429a469b96178fbda7bce0972704", - "contents_checksum": "cbf91e06fc39d3cd7df3cf5ed31a77c84a3eb2ba6eb5ae9dcc34aacc8f5d0cd0", - "size": 17424388, - "source": "components/google-cloud-sdk-gcloud-deps-20240806142304.tar.gz", + "checksum": "16131516bb7f7e9c94903abeb19dfb116973b72bb5ae24a1512d232ed7ea58b6", + "contents_checksum": "f6b086b59576ff9652483408d3d1bec083f6e3ee98a5e126b48197dda4427380", + "size": 17425755, + "source": "components/google-cloud-sdk-gcloud-deps-20240920144119.tar.gz", "type": "tar" }, "dependencies": [ @@ -4365,8 +4365,8 @@ "platform": {}, "platform_required": false, "version": { - "build_number": 20240806142304, - "version_string": "2024.08.06" + "build_number": 20240920144119, + "version_string": "2024.09.20" } }, { @@ -4609,10 +4609,10 @@ }, { "data": { - "checksum": "f2d1e365ef5004a9e099f63b863ef4bf99e48b5d1b3c5ae8f10dfe3525642c8d", - "contents_checksum": "6d327392f385c820f2f937c0a1b1da6649fd9c7cadd9c43540b4e4668cc41fd5", - "size": 7235706, - "source": "components/google-cloud-sdk-gcloud-man-pages-nix-20240906153039.tar.gz", + "checksum": "55688439aa278229175c18395d14689411c34b088360a2543071ba483cb4cb6c", + "contents_checksum": "f18edf3862382326c32e28f898871617775de59c3aa0e73383d5bad4e18cae5f", + "size": 7283267, + "source": "components/google-cloud-sdk-gcloud-man-pages-nix-20240920144119.tar.gz", "type": "tar" }, "dependencies": [ @@ -4638,7 +4638,7 @@ }, "platform_required": false, "version": { - "build_number": 20240906153039, + "build_number": 20240920144119, "version_string": "" } }, @@ -6439,10 +6439,10 @@ }, { "data": { - "checksum": "93cf97d2cc5a48abbcb1716204408a7484ed8f6bd91505931893529a5b6a36f3", - "contents_checksum": "43417665b73406183120cc305950ab0dcf288ac116d1421b0e804fda66ca114b", - "size": 401984136, - "source": "components/google-cloud-sdk-managed-flink-client-20240906153039.tar.gz", + "checksum": "a90c53d83dfe10216d0aaa6ba234d028eee0fa6959ef8e0fb4c432b358b52ef3", + "contents_checksum": "c37e9989bc839d2ca0714d1c78a19832f22b57c999f4c9afcc08a52cb472e833", + "size": 401984160, + "source": "components/google-cloud-sdk-managed-flink-client-20240913204132.tar.gz", "type": "tar" }, "dependencies": [ @@ -6460,8 +6460,8 @@ "platform": {}, "platform_required": false, "version": { - "build_number": 20240906153039, - "version_string": "0.5.0" + "build_number": 20240913204132, + "version_string": "0.5.1" } }, { @@ -7608,10 +7608,10 @@ }, { "data": { - "checksum": "93cc6bf1d627b67ea9afc82965a3680b978a8589ac9403112b190ff367de185d", - "contents_checksum": "b7a09d5ef025bd69f43cd7986f578e8481f46a50f25b80fd4b7e6ce7b7c039e5", - "size": 58125954, - "source": "components/google-cloud-sdk-tests-20240906153039.tar.gz", + "checksum": "a4bb42ec496f935b19acf4e5e4b48260dcf428c6909cd4a2c948cfd763c0e0e6", + "contents_checksum": "8814c920e3ceee53b2dd6dc5e3d727e519273bf2a58663c11e51fb48e53fc23d", + "size": 58197479, + "source": "components/google-cloud-sdk-tests-20240920144119.tar.gz", "type": "tar" }, "dependencies": [ @@ -7629,8 +7629,8 @@ "platform": {}, "platform_required": false, "version": { - "build_number": 20240906153039, - "version_string": "2024.09.06" + "build_number": 20240920144119, + "version_string": "2024.09.20" } } ], @@ -7649,11 +7649,11 @@ ], "post_processing_command": "components post-process", "release_notes_url": "RELEASE_NOTES", - "revision": 20240906153039, + "revision": 20240920144119, "schema_version": { "no_update": false, "url": "https://dl.google.com/dl/cloudsdk/channels/rapid/google-cloud-sdk.tar.gz", "version": 3 }, - "version": "492.0.0" + "version": "494.0.0" } diff --git a/pkgs/tools/admin/google-cloud-sdk/data.nix b/pkgs/tools/admin/google-cloud-sdk/data.nix index 3dd28394e0ba..428685fa4347 100644 --- a/pkgs/tools/admin/google-cloud-sdk/data.nix +++ b/pkgs/tools/admin/google-cloud-sdk/data.nix @@ -1,32 +1,32 @@ # DO NOT EDIT! This file is generated automatically by update.sh { }: { - version = "492.0.0"; + version = "494.0.0"; googleCloudSdkPkgs = { x86_64-linux = { - url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-492.0.0-linux-x86_64.tar.gz"; - sha256 = "00vdmq7j67b6wdkz17wbh06lfzdq9yw4532p5jygbbg469smi8av"; + url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-494.0.0-linux-x86_64.tar.gz"; + sha256 = "0liyi2r1zgzjkfyjdfs5q7gjv31q2invxxh6j8bw8q2khy0varyp"; }; x86_64-darwin = { - url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-492.0.0-darwin-x86_64.tar.gz"; - sha256 = "0hg24ffqcwy3xg7wjjgg6y00djwcb46866msach9s2q419cvz2z0"; + url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-494.0.0-darwin-x86_64.tar.gz"; + sha256 = "0dpy85b3c2rd3ndwaczxdm4kdjdx1hz7xwva590j2jbabrx0shqz"; }; aarch64-linux = { - url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-492.0.0-linux-arm.tar.gz"; - sha256 = "11ygy5qjx81nxlkgkyxwcd1z0ippkrshdxg7bfjgpw9c17zx3mp0"; + url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-494.0.0-linux-arm.tar.gz"; + sha256 = "0nzb1wzcqds72s5fam9wzzq8y2bs247ihkv8lib4i2652ampxfp8"; }; aarch64-darwin = { - url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-492.0.0-darwin-arm.tar.gz"; - sha256 = "0y1f7bg0ji0vvaik7dlyhkqlgix89xj96dhsps51hal6m92dibpb"; + url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-494.0.0-darwin-arm.tar.gz"; + sha256 = "026qgsah4nhr17kh1gb2ldwi8far38ai8lq0c274vkq4h7pfxjir"; }; i686-linux = { - url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-492.0.0-linux-x86.tar.gz"; - sha256 = "1f7fbfzyq8ycsn1whvrrncq7gycv4aswhgca8f8d1bpjcmcshs2n"; + url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-494.0.0-linux-x86.tar.gz"; + sha256 = "1nyx7ikarb8c08p4nshdyv0qj0rs0d1hhhpxrc96cmwp76jvhg0n"; }; }; } From dba66f574552a4b80a561f6b65ce64bb3a2bcd02 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" <ryantm-bot@ryantm.com> Date: Sun, 29 Sep 2024 12:03:41 +0000 Subject: [PATCH 125/300] vivaldi: 6.9.3447.46 -> 6.9.3447.48 --- pkgs/applications/networking/browsers/vivaldi/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index 6e6299fb556b..d0a27d825211 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -24,7 +24,7 @@ let vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi"; in stdenv.mkDerivation rec { pname = "vivaldi"; - version = "6.9.3447.46"; + version = "6.9.3447.48"; suffix = { aarch64-linux = "arm64"; @@ -34,8 +34,8 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}-1_${suffix}.deb"; hash = { - aarch64-linux = "sha256-r0u7u5R0lMI65zsTxIU0y5A+swJYLAj42ptJWVvFdxs="; - x86_64-linux = "sha256-hIdgyh6c+SbeeT6uY1aN7OCPY+U2GGX6V7eHdwgyuzc="; + aarch64-linux = "sha256-pl6vZwIPqfYi/nO/PDEwUyi4CdVP9ciTAbVg0d+DX1w="; + x86_64-linux = "sha256-mhJCCYXP9eyA8YquSZsnm5o04VmY5NRwVM5vKqbdkZs="; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; From 7d8f1572d1d400100b75076c5c9e9924a0c88f92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io> Date: Sun, 29 Sep 2024 14:03:30 +0200 Subject: [PATCH 126/300] nixos: enable fstrim by default The majority of users these days will install NixOS on SSD/NVME based storage. Enabling fstrim ensures that the TRIM operation on this type of storage is run at least once a week. This will improve performance and life time of said devices. This also works in virtual machines as formats such as qcow2 or vmdk support TRIM. Ubuntu has a similar systemd timer also for quite a while enabled by default. Enabling this service will not increase the dependency closure as util-linux is already part of the base system. In case only filesystems that are not supported by fstrim are used, the overhead is negelible as fstrim run in less than a second once a week. --- nixos/modules/services/misc/fstrim.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/fstrim.nix b/nixos/modules/services/misc/fstrim.nix index 8ead4a645f7c..f22505841fa3 100644 --- a/nixos/modules/services/misc/fstrim.nix +++ b/nixos/modules/services/misc/fstrim.nix @@ -8,7 +8,9 @@ in { options = { services.fstrim = { - enable = lib.mkEnableOption "periodic SSD TRIM of mounted partitions in background"; + enable = (lib.mkEnableOption "periodic SSD TRIM of mounted partitions in background" // { + default = true; + }); interval = lib.mkOption { type = lib.types.str; From 9d9980f1bb1a22f22736880765182eb1c7267c54 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" <ryantm-bot@ryantm.com> Date: Sun, 29 Sep 2024 13:09:34 +0000 Subject: [PATCH 127/300] resolve-march-native: 5.0.2 -> 5.1.0 --- pkgs/development/tools/resolve-march-native/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/resolve-march-native/default.nix b/pkgs/development/tools/resolve-march-native/default.nix index a5db33e712ab..312d0d11c50c 100644 --- a/pkgs/development/tools/resolve-march-native/default.nix +++ b/pkgs/development/tools/resolve-march-native/default.nix @@ -6,13 +6,13 @@ python3Packages.buildPythonApplication rec { pname = "resolve-march-native"; - version = "5.0.2"; + version = "5.1.0"; src = fetchFromGitHub { owner = "hartwork"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-fkiEWZvg/h8Gn0TL3Ov8aq2cAG5VncUTrVcUTRNOx+Y="; + hash = "sha256-02d7ip5E/vkOMkkeHOx1m7FdpurXT9O6HdwrygNPHdY="; }; # NB: The tool uses gcc at runtime to resolve the -march=native flags From 17c1e538d39309802b777b72743be70042d7409e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" <ryantm-bot@ryantm.com> Date: Sun, 29 Sep 2024 13:09:48 +0000 Subject: [PATCH 128/300] xdg-desktop-portal-hyprland: 1.3.5 -> 1.3.6 --- .../hyprwm/xdg-desktop-portal-hyprland/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix b/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix index 47b131ba6180..ef479589d59b 100644 --- a/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix +++ b/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix @@ -27,13 +27,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "xdg-desktop-portal-hyprland"; - version = "1.3.5"; + version = "1.3.6"; src = fetchFromGitHub { owner = "hyprwm"; repo = "xdg-desktop-portal-hyprland"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-xTqnMoJsEojuvqJLuM+U7EZ7q71efaj3pbvjutq4TXc="; + hash = "sha256-1DGktDtSWIJpnDbVoj/qpvJSH5zg6JbOfuh6xqZMap0="; }; depsBuildBuild = [ From 4a5d67962714f98472fc8ac77de24c7cc6fc5079 Mon Sep 17 00:00:00 2001 From: redyf <mateusalvespereira7@gmail.com> Date: Sun, 29 Sep 2024 10:13:33 -0300 Subject: [PATCH 129/300] lunar-client: 3.2.17 -> 3.2.18 --- pkgs/by-name/lu/lunar-client/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/lu/lunar-client/package.nix b/pkgs/by-name/lu/lunar-client/package.nix index f10a4f3ea603..476f3bb48b59 100644 --- a/pkgs/by-name/lu/lunar-client/package.nix +++ b/pkgs/by-name/lu/lunar-client/package.nix @@ -6,11 +6,11 @@ appimageTools.wrapType2 rec { pname = "lunarclient"; - version = "3.2.17"; + version = "3.2.18"; src = fetchurl { url = "https://launcherupdates.lunarclientcdn.com/Lunar%20Client-${version}.AppImage"; - hash = "sha512-hzW7khHfWEYPtzMmedy/dXqKh7LPniqI7/0F1FtBtrlDnEIEQUq/7VUcygsVTBI6kuj8vTG5+PYcLez+cYAjqg=="; + hash = "sha512-gIkxplIDtbJSxWM4EXzXSy1G8c8x3jWWvqzGSM140Wu5pcSrVYf+QSMAPrzgBwQD7wUHdBuW92BA2X+/9Q1TmA="; }; nativeBuildInputs = [ makeWrapper ]; 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 130/300] 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 2501529a79b527c08a909737c8c1f88e8a945a0a Mon Sep 17 00:00:00 2001 From: Nick Cao <nickcao@nichi.co> Date: Sun, 29 Sep 2024 09:54:52 -0400 Subject: [PATCH 131/300] vulkan-validation-layers: fix cross compilation, set strictDeps --- .../tools/vulkan-validation-layers/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/vulkan-validation-layers/default.nix b/pkgs/development/tools/vulkan-validation-layers/default.nix index d5de37245c21..c5331ea2475f 100644 --- a/pkgs/development/tools/vulkan-validation-layers/default.nix +++ b/pkgs/development/tools/vulkan-validation-layers/default.nix @@ -33,6 +33,8 @@ stdenv.mkDerivation rec { hash = "sha256-FMzQpc7mwZGib544w0Dx6LeGi64cercm5oUW45raasc="; }; + strictDeps = true; + nativeBuildInputs = [ cmake pkg-config @@ -40,12 +42,15 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + glslang libX11 libXau libXdmcp libXrandr libffi libxcb + robin-hood-hashing + spirv-headers spirv-tools vulkan-headers vulkan-utility-libraries @@ -53,11 +58,7 @@ stdenv.mkDerivation rec { ]; cmakeFlags = [ - "-DGLSLANG_INSTALL_DIR=${glslang}" - "-DSPIRV_HEADERS_INSTALL_DIR=${spirv-headers}" - "-DROBIN_HOOD_HASHING_INSTALL_DIR=${robin-hood-hashing}" "-DBUILD_LAYER_SUPPORT_FILES=ON" - "-DPKG_CONFIG_EXECUTABLE=${pkg-config}/bin/pkg-config" # Hide dev warnings that are useless for packaging "-Wno-dev" ]; 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 132/300] 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 133/300] 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 d4a3b76cc4cecf39c20813199ec521414c58973e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" <ryantm-bot@ryantm.com> Date: Sun, 29 Sep 2024 16:14:51 +0000 Subject: [PATCH 134/300] typesense: 27.0 -> 27.1 --- pkgs/servers/search/typesense/sources.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/search/typesense/sources.json b/pkgs/servers/search/typesense/sources.json index f1b01a738bd5..501ba02d98c7 100644 --- a/pkgs/servers/search/typesense/sources.json +++ b/pkgs/servers/search/typesense/sources.json @@ -1,21 +1,21 @@ { - "version": "27.0", + "version": "27.1", "platforms": { "aarch64-linux": { "arch": "linux-arm64", - "hash": "sha256-6o4pF1ACE0+qlbR/MrhnT+nfBwYuffb4yme64/hjPwU=" + "hash": "sha256-5NJWbL+IQLXV5P4j9a4k7U3Khnw9B9FWG5YpkPPa5d4=" }, "x86_64-linux": { "arch": "linux-amd64", - "hash": "sha256-0ZS/G88+dRXpPHeRBO3rh1r45GOMMWmmiOEYm05VASE=" + "hash": "sha256-63k/yh0nFGJy4+d20KIqrHC9Z5brjhjfkcsxzsFG1Vo=" }, "x86_64-darwin": { "arch": "darwin-amd64", - "hash": "sha256-3KhYxxWZJOz7XWm0chvHj2q6fNGVasVIQv+UiZRx3E4=" + "hash": "sha256-a8p4/+dCOyx2/slhynWJg6MswMiR9YP01ZrrjkfAheE=" }, "aarch64-darwin": { "arch": "darwin-arm64", - "hash": "sha256-6u9U9Vww2m+R3pwG6whvKgrcsckqBoK5DfutGkQpiqI=" + "hash": "sha256-70ePCpMvON7T3kbeeRmkqQgJzEgNNE0W7VpcapzLF34=" } } } From 7bb5e997fe923b619b3c56b4dd1d264bea74457d Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy <sikmir@disroot.org> Date: Sun, 29 Sep 2024 20:22:17 +0400 Subject: [PATCH 135/300] =?UTF-8?q?python312Packages.pyogrio:=200.9.0=20?= =?UTF-8?q?=E2=86=92=200.10.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/python-modules/pyogrio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pyogrio/default.nix b/pkgs/development/python-modules/pyogrio/default.nix index 63f798d21d85..ec66d35900d9 100644 --- a/pkgs/development/python-modules/pyogrio/default.nix +++ b/pkgs/development/python-modules/pyogrio/default.nix @@ -17,15 +17,15 @@ buildPythonPackage rec { pname = "pyogrio"; - version = "0.9.0"; + version = "0.10.0"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "geopandas"; repo = "pyogrio"; rev = "v${version}"; - hash = "sha256-HC7+dDehDwEIDQnCMYrsC1jE78AyfHqEhfOZLYSzTIw="; + hash = "sha256-AyKBktZWzUxD1HKKp89gQ97c4WPB5PkXnkFqN+RHx7c="; }; postPatch = '' From d924b523e0bb70e7f4e07cdc431a3d30f4ac419d Mon Sep 17 00:00:00 2001 From: aleksana <me@aleksana.moe> Date: Mon, 30 Sep 2024 00:29:34 +0800 Subject: [PATCH 136/300] golex: init at 1.1.0 --- pkgs/by-name/go/golex/package.nix | 36 +++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 pkgs/by-name/go/golex/package.nix diff --git a/pkgs/by-name/go/golex/package.nix b/pkgs/by-name/go/golex/package.nix new file mode 100644 index 000000000000..99884d4d2d02 --- /dev/null +++ b/pkgs/by-name/go/golex/package.nix @@ -0,0 +1,36 @@ +{ + lib, + buildGoModule, + fetchFromGitLab, + fetchpatch2, +}: + +buildGoModule rec { + pname = "golex"; + version = "1.1.0"; + + src = fetchFromGitLab { + owner = "cznic"; + repo = "golex"; + rev = "v${version}"; + hash = "sha256-0Z2oE00vGnH2BBNmKAjRhy//fEbT5AQ+CKLIUr+NPwY="; + }; + + patches = [ + # fix a unicode mismatch to make test pass + (fetchpatch2 { + url = "https://gitlab.com/cznic/golex/-/commit/a735a3b62b5fb36a715ba4e280270f9ca91c5e59.patch"; + hash = "sha256-Q/Vyh91IwL3ConWpJU0akslkaVhHTkBmrMbmDVU3Txs="; + }) + ]; + + vendorHash = "sha256-Ig4cxZepvmI1EH0j2fuQ33jHOLWfS40UE+A4UHdo8oE="; + + meta = { + description = "Lex/flex like utility rendering .l formated data to Go source code"; + homepage = "https://pkg.go.dev/modernc.org/golex"; + license = lib.licenses.bsd3; + mainProgram = "golex"; + maintainers = with lib.maintainers; [ aleksana ]; + }; +} From eac660eb4b5103cb89ea773b5fd907965401ef73 Mon Sep 17 00:00:00 2001 From: Doron Behar <doron.behar@gmail.com> Date: Sun, 29 Sep 2024 10:25:18 +0300 Subject: [PATCH 137/300] gmt: fix build by overriding netcdf --- pkgs/applications/gis/gmt/default.nix | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/gis/gmt/default.nix b/pkgs/applications/gis/gmt/default.nix index ec70ab02b1da..b33efefaefc1 100644 --- a/pkgs/applications/gis/gmt/default.nix +++ b/pkgs/applications/gis/gmt/default.nix @@ -9,6 +9,7 @@ CoreVideo, fftwSinglePrec, netcdf, + libxml2, pcre, gdal, blas, @@ -25,7 +26,15 @@ - graphicsmagick for gif output */ -stdenv.mkDerivation (finalAttrs: { +let + # Certainly not an ideal situation, See: + # https://github.com/NixOS/nixpkgs/pull/340707#issuecomment-2361894717 + netcdf' = netcdf.override { + libxml2 = libxml2.override { + enableHttp = true; + }; + }; +in stdenv.mkDerivation (finalAttrs: { pname = "gmt"; version = "6.4.0"; src = fetchFromGitHub { @@ -43,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { [ curl gdal - netcdf + netcdf' pcre dcw-gmt gshhg-gmt @@ -78,7 +87,7 @@ stdenv.mkDerivation (finalAttrs: { "-DCOPY_DCW:BOOL=FALSE" "-DDCW_ROOT=${dcw-gmt.out}/share/dcw-gmt" "-DGDAL_ROOT=${gdal.out}" - "-DNETCDF_ROOT=${netcdf.out}" + "-DNETCDF_ROOT=${netcdf'.out}" "-DPCRE_ROOT=${pcre.out}" "-DGMT_INSTALL_TRADITIONAL_FOLDERNAMES:BOOL=FALSE" "-DGMT_ENABLE_OPENMP:BOOL=TRUE" From 6889e8eeeec391ad7c0c2d08a04a474d62ba050f Mon Sep 17 00:00:00 2001 From: Doron Behar <doron.behar@gmail.com> Date: Sun, 29 Sep 2024 10:25:31 +0300 Subject: [PATCH 138/300] gmt: 6.4.0 -> 6.5.0 Diff: https://github.com/GenericMappingTools/gmt/compare/refs/tags/6.4.0...6.5.0 --- pkgs/applications/gis/gmt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/gis/gmt/default.nix b/pkgs/applications/gis/gmt/default.nix index b33efefaefc1..2aff73095635 100644 --- a/pkgs/applications/gis/gmt/default.nix +++ b/pkgs/applications/gis/gmt/default.nix @@ -36,12 +36,12 @@ let }; in stdenv.mkDerivation (finalAttrs: { pname = "gmt"; - version = "6.4.0"; + version = "6.5.0"; src = fetchFromGitHub { owner = "GenericMappingTools"; repo = "gmt"; rev = "refs/tags/${finalAttrs.version}"; - hash = "sha256-rRNEo7dGkmgrkhNCBacyfBYrl7zHnE0KMWQHT0Ekbo0="; + hash = "sha256-KKIYhljCtk9t9CuvTLsSGvUkUwazWTm9ymBB3wLwSoI="; }; nativeBuildInputs = [ From eccfe1c0ad400df7a7eb50aae7b7d8953900a050 Mon Sep 17 00:00:00 2001 From: Doron Behar <doron.behar@gmail.com> Date: Sun, 29 Sep 2024 10:36:03 +0300 Subject: [PATCH 139/300] gmt: let it find libraries automatically --- pkgs/applications/gis/gmt/default.nix | 8 -------- 1 file changed, 8 deletions(-) diff --git a/pkgs/applications/gis/gmt/default.nix b/pkgs/applications/gis/gmt/default.nix index 2aff73095635..9eb1bde4266d 100644 --- a/pkgs/applications/gis/gmt/default.nix +++ b/pkgs/applications/gis/gmt/default.nix @@ -86,18 +86,10 @@ in stdenv.mkDerivation (finalAttrs: { "-DGSHHG_ROOT=${gshhg-gmt.out}/share/gshhg-gmt" "-DCOPY_DCW:BOOL=FALSE" "-DDCW_ROOT=${dcw-gmt.out}/share/dcw-gmt" - "-DGDAL_ROOT=${gdal.out}" - "-DNETCDF_ROOT=${netcdf'.out}" - "-DPCRE_ROOT=${pcre.out}" "-DGMT_INSTALL_TRADITIONAL_FOLDERNAMES:BOOL=FALSE" "-DGMT_ENABLE_OPENMP:BOOL=TRUE" "-DGMT_INSTALL_MODULE_LINKS:BOOL=FALSE" "-DLICENSE_RESTRICTED=LGPL" # "GPL" and "no" also valid - ] - ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ - "-DFFTW3_ROOT=${fftwSinglePrec.dev}" - "-DLAPACK_LIBRARY=${lapack}/lib/liblapack.so" - "-DBLAS_LIBRARY=${blas}/lib/libblas.so" ]; meta = { From f0d7b6b8e96c777b6b7823e8cfe85a76082f1cb8 Mon Sep 17 00:00:00 2001 From: Nick Cao <nickcao@nichi.co> Date: Sun, 29 Sep 2024 09:46:31 -0400 Subject: [PATCH 140/300] xmlrpc_c: 1.51.07 -> 1.59.03, enable parallel building --- pkgs/development/libraries/xmlrpc-c/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/xmlrpc-c/default.nix b/pkgs/development/libraries/xmlrpc-c/default.nix index af73a81fcb20..04dea6f59fce 100644 --- a/pkgs/development/libraries/xmlrpc-c/default.nix +++ b/pkgs/development/libraries/xmlrpc-c/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "xmlrpc-c"; - version = "1.51.07"; + version = "1.59.03"; src = fetchurl { url = "mirror://sourceforge/xmlrpc-c/${pname}-${version}.tgz"; - sha256 = "sha256-hNIK4z+SdYL4IdYcC5GUrvvx15JFkKE/qdpa4WmK3tk="; + hash = "sha256-vbcdtCqwvlFZFVWIXRFoKwRMEDTUoylkAb+SHsCyM/4="; }; buildInputs = [ curl libxml2 ]; @@ -20,7 +20,10 @@ stdenv.mkDerivation rec { (cd tools/xmlrpc && make && make install) ''; - hardeningDisable = [ "format" ]; + enableParallelBuilding = true; + + # ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration] + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=implicit-function-declaration"; meta = with lib; { description = "Lightweight RPC library based on XML and HTTP"; From daf41d07f9d3130c6bee63c9e694e77e3666e338 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" <ryantm-bot@ryantm.com> Date: Sun, 29 Sep 2024 18:01:26 +0000 Subject: [PATCH 141/300] python312Packages.eigenpy: 3.9.1 -> 3.10.0 --- pkgs/development/python-modules/eigenpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/eigenpy/default.nix b/pkgs/development/python-modules/eigenpy/default.nix index e45b5424a4b0..d1844d34baed 100644 --- a/pkgs/development/python-modules/eigenpy/default.nix +++ b/pkgs/development/python-modules/eigenpy/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "eigenpy"; - version = "3.9.1"; + version = "3.10.0"; pyproject = false; # Built with cmake src = fetchFromGitHub { owner = "stack-of-tasks"; repo = "eigenpy"; rev = "refs/tags/v${version}"; - hash = "sha256-nRslQMnVaVN7S20RuJDp+e9p+oMhsR03EjHYpvkuBYk="; + hash = "sha256-ac667pEKXcbLLzCVGKYpyCQO805qhCEf8dCnC4QwxBs="; }; outputs = [ From 1acaef2804466e9fb0d6024c1796fd026827565d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" <ryantm-bot@ryantm.com> Date: Sun, 29 Sep 2024 18:01:47 +0000 Subject: [PATCH 142/300] python312Packages.qdrant-client: 1.11.2 -> 1.11.3 --- pkgs/development/python-modules/qdrant-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/qdrant-client/default.nix b/pkgs/development/python-modules/qdrant-client/default.nix index d54ac47473a5..9755d531adc4 100644 --- a/pkgs/development/python-modules/qdrant-client/default.nix +++ b/pkgs/development/python-modules/qdrant-client/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "qdrant-client"; - version = "1.11.2"; + version = "1.11.3"; pyproject = true; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "qdrant"; repo = "qdrant-client"; rev = "refs/tags/v${version}"; - hash = "sha256-DVyaBQ8r52H9q2NNDsplfPxoxwZeK3pHNfnyw9a9hvw="; + hash = "sha256-1tBlWwD2GaphwupWUWRYwYrqGV9cTfG4k1L9N5mub/Q="; }; build-system = [ poetry-core ]; From ca4018ebff1d6cdd7cbb59c631920333cffcb443 Mon Sep 17 00:00:00 2001 From: Xaver106 <xaver10610@gmail.com> Date: Sun, 29 Sep 2024 20:29:48 +0200 Subject: [PATCH 143/300] nextcloud-client: 1.14.0 -> 1.14.1 --- pkgs/applications/networking/nextcloud-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix index 4fd9c7d7dec1..29f044536981 100644 --- a/pkgs/applications/networking/nextcloud-client/default.nix +++ b/pkgs/applications/networking/nextcloud-client/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { pname = "nextcloud-client"; - version = "3.14.0"; + version = "3.14.1"; outputs = [ "out" "dev" ]; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { owner = "nextcloud-releases"; repo = "desktop"; rev = "refs/tags/v${version}"; - hash = "sha256-/jRD0swNs59xugsXLbesGcTtyGdc/y/iwiDVoErW+d4="; + hash = "sha256-bUqHegW38NQJn4TnEQt9wRJFqR6fbLpvQvmWF3akekc="; }; patches = [ From cc4b9ba546101741c3a54d6921788ddc48e1c200 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" <ryantm-bot@ryantm.com> Date: Sun, 29 Sep 2024 18:49:06 +0000 Subject: [PATCH 144/300] papermc: 1.21.1-85 -> 1.21.1-110 --- pkgs/games/papermc/versions.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/papermc/versions.json b/pkgs/games/papermc/versions.json index 7e10420a2a0b..a8efe02630e0 100644 --- a/pkgs/games/papermc/versions.json +++ b/pkgs/games/papermc/versions.json @@ -60,7 +60,7 @@ "version": "1.21-130" }, "1.21.1": { - "hash": "sha256-mHaYzF79Pxv27qZxcRzcnSKGuaaEybATQJo+pAHoyJk=", - "version": "1.21.1-85" + "hash": "sha256-1oKvRB00bfdJZ7uVsUabv9EAFiT2YwEsLXetQ3BrVvA=", + "version": "1.21.1-110" } } From 11d1f8776c7b9e34b0e21516b2cdbf6c7a8a0e3c Mon Sep 17 00:00:00 2001 From: Maximilian Bosch <maximilian@mbosch.me> Date: Sun, 29 Sep 2024 20:43:30 +0200 Subject: [PATCH 145/300] nixos/postgresql: escape initdbArgs It doesn't look correct that this isn't the case already. --- nixos/doc/manual/release-notes/rl-2411.section.md | 2 ++ nixos/modules/services/databases/postgresql.md | 4 ++-- nixos/modules/services/databases/postgresql.nix | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index 6f2dd011eaf0..bce2805f74d4 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -569,6 +569,8 @@ - `restic` module now has an option for inhibiting system sleep while backups are running, defaulting to off (not inhibiting sleep), available as [`services.restic.backups.<name>.inhibitsSleep`](#opt-services.restic.backups._name_.inhibitsSleep). +- The arguments from [](#opt-services.postgresql.initdbArgs) now get shell-escaped. + - 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 diff --git a/nixos/modules/services/databases/postgresql.md b/nixos/modules/services/databases/postgresql.md index 0de1d82b4f03..5108f040e968 100644 --- a/nixos/modules/services/databases/postgresql.md +++ b/nixos/modules/services/databases/postgresql.md @@ -187,7 +187,7 @@ $ nix-instantiate --eval -A postgresql_13.psqlSchema ``` For an upgrade, a script like this can be used to simplify the process: ```nix -{ config, pkgs, ... }: +{ config, lib, pkgs, ... }: { environment.systemPackages = [ (let @@ -211,7 +211,7 @@ For an upgrade, a script like this can be used to simplify the process: install -d -m 0700 -o postgres -g postgres "$NEWDATA" cd "$NEWDATA" - sudo -u postgres $NEWBIN/initdb -D "$NEWDATA" ${builtins.concatStringsSep " " cfg.initdbArgs} + sudo -u postgres $NEWBIN/initdb -D "$NEWDATA" ${lib.escapeShellArgs cfg.initdbArgs} sudo -u postgres $NEWBIN/pg_upgrade \ --old-datadir "$OLDDATA" --new-datadir "$NEWDATA" \ diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix index 55b3dd282ec4..ceaccde813a0 100644 --- a/nixos/modules/services/databases/postgresql.nix +++ b/nixos/modules/services/databases/postgresql.nix @@ -7,6 +7,7 @@ let concatStringsSep const elem + escapeShellArgs filterAttrs isString literalExpression @@ -545,7 +546,7 @@ in rm -f ${cfg.dataDir}/*.conf # Initialise the database. - initdb -U ${cfg.superUser} ${concatStringsSep " " cfg.initdbArgs} + initdb -U ${cfg.superUser} ${escapeShellArgs cfg.initdbArgs} # See postStart! touch "${cfg.dataDir}/.first_startup" From ebc36a9dee03716949e97a6310a21199a8e6e9a0 Mon Sep 17 00:00:00 2001 From: Augustin Trancart <augustin.trancart@gmail.com> Date: Sat, 28 Sep 2024 22:41:05 +0200 Subject: [PATCH 146/300] python312Packages.pygmt: unbreak on Darwin --- pkgs/development/python-modules/pygmt/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/pygmt/default.nix b/pkgs/development/python-modules/pygmt/default.nix index 852690233304..a5850801030e 100644 --- a/pkgs/development/python-modules/pygmt/default.nix +++ b/pkgs/development/python-modules/pygmt/default.nix @@ -67,8 +67,6 @@ buildPythonPackage rec { homepage = "https://github.com/GenericMappingTools/pygmt"; license = licenses.bsd3; changelog = "https://github.com/GenericMappingTools/pygmt/releases/tag/v${version}"; - # pygmt.exceptions.GMTCLibNotFoundError: Error loading the GMT shared library '/nix/store/r3xnnqgl89vrnq0kzxx0bmjwzks45mz8-gmt-6.1.1/lib/libgmt.dylib' - broken = stdenv.hostPlatform.isDarwin; maintainers = with maintainers; [ sikmir ]; }; } From dce718aa83a51aef01310366b101e367de9f8bf4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliv=C3=A9r=20Falvai?= <ofalvai@gmail.com> Date: Sun, 29 Sep 2024 21:34:47 +0200 Subject: [PATCH 147/300] cloudlens: fix darwin build --- pkgs/by-name/cl/cloudlens/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/cl/cloudlens/package.nix b/pkgs/by-name/cl/cloudlens/package.nix index 9fbda0466749..677b9acf0051 100644 --- a/pkgs/by-name/cl/cloudlens/package.nix +++ b/pkgs/by-name/cl/cloudlens/package.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , autoPatchelfHook , xclip -, +, stdenv }: buildGoModule rec { @@ -27,7 +27,7 @@ buildGoModule rec { "-X=github.com/one2nc/cloudlens/cmd.date=1970-01-01T00:00:00Z" ]; - nativeBuildInputs = [ autoPatchelfHook ]; + nativeBuildInputs = lib.optional stdenv.hostPlatform.isLinux autoPatchelfHook; buildInputs = [ xclip ]; 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 148/300] 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 c25213a9bd2387e4e870a3e6e94be4e02a9cb9a5 Mon Sep 17 00:00:00 2001 From: h7x4 <h7x4@nani.wtf> Date: Sun, 29 Sep 2024 21:40:39 +0200 Subject: [PATCH 149/300] nixos/bluemap: move to `web-apps` --- nixos/modules/module-list.nix | 2 +- nixos/modules/services/{web-servers => web-apps}/bluemap.nix | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename nixos/modules/services/{web-servers => web-apps}/bluemap.nix (100%) diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index ad54da561659..f840524ebb31 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1385,6 +1385,7 @@ ./services/web-apps/atlassian/crowd.nix ./services/web-apps/atlassian/jira.nix ./services/web-apps/audiobookshelf.nix + ./services/web-apps/bluemap.nix ./services/web-apps/bookstack.nix ./services/web-apps/c2fmzq-server.nix ./services/web-apps/calibre-web.nix @@ -1516,7 +1517,6 @@ ./services/web-apps/zitadel.nix ./services/web-servers/agate.nix ./services/web-servers/apache-httpd/default.nix - ./services/web-servers/bluemap.nix ./services/web-servers/caddy/default.nix ./services/web-servers/darkhttpd.nix ./services/web-servers/fcgiwrap.nix diff --git a/nixos/modules/services/web-servers/bluemap.nix b/nixos/modules/services/web-apps/bluemap.nix similarity index 100% rename from nixos/modules/services/web-servers/bluemap.nix rename to nixos/modules/services/web-apps/bluemap.nix From 03a6842b0e6864fd5bfd99021d37a96fac185c95 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" <ryantm-bot@ryantm.com> Date: Sun, 29 Sep 2024 20:08:42 +0000 Subject: [PATCH 150/300] sbt-extras: 2024-09-13 -> 2024-09-28 --- .../development/tools/build-managers/sbt-extras/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/build-managers/sbt-extras/default.nix b/pkgs/development/tools/build-managers/sbt-extras/default.nix index 3241ea2aee8e..385cfc5c087a 100644 --- a/pkgs/development/tools/build-managers/sbt-extras/default.nix +++ b/pkgs/development/tools/build-managers/sbt-extras/default.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { pname = "sbt-extras"; - rev = "0b24c960935ffefc0ac7340137f81f0a7ed4d623"; - version = "2024-09-13"; + rev = "408f74841b90169a7f674955389212e2d02f7f4d"; + version = "2024-09-28"; src = fetchFromGitHub { owner = "paulp"; repo = "sbt-extras"; inherit rev; - sha256 = "4jYlpBq7l5vypbm/6kHHxAWXyJTuZ2n9/ij59yy9CNQ="; + sha256 = "2iXNs2Ks54Gj6T6PR5AtWrmR9uUxgFScAfek2v+qdTo="; }; dontBuild = true; From 2729ae7590ff7a47ec06aed86f5c9803713dc536 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" <ryantm-bot@ryantm.com> Date: Sun, 29 Sep 2024 20:41:16 +0000 Subject: [PATCH 151/300] heptabase: 1.39.0 -> 1.40.0 --- pkgs/by-name/he/heptabase/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/he/heptabase/package.nix b/pkgs/by-name/he/heptabase/package.nix index 160f4d767d90..8614e8b152bf 100644 --- a/pkgs/by-name/he/heptabase/package.nix +++ b/pkgs/by-name/he/heptabase/package.nix @@ -5,10 +5,10 @@ }: let pname = "heptabase"; - version = "1.39.0"; + version = "1.40.0"; src = fetchurl { url = "https://github.com/heptameta/project-meta/releases/download/v${version}/Heptabase-${version}.AppImage"; - hash = "sha256-/uRPxmMTBr2ZkkY/Sp0FHI76ttoDDO7pID6fFckvUY8="; + hash = "sha256-EnGn3N8dJ7bx60eY8u1LxgQaLkU/RR+ANEG817XfaS0="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; From f95b3605e0d2d1cd0734b1c7dfb7c18c05909a1c Mon Sep 17 00:00:00 2001 From: Alyssa Ross <hi@alyssa.is> Date: Sun, 29 Sep 2024 22:57:14 +0200 Subject: [PATCH 152/300] linux-pam.meta.homepage: update Old one redirects here. --- pkgs/os-specific/linux/pam/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/pam/default.nix b/pkgs/os-specific/linux/pam/default.nix index b460348a105d..9e97071bbc7c 100644 --- a/pkgs/os-specific/linux/pam/default.nix +++ b/pkgs/os-specific/linux/pam/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "http://www.linux-pam.org/"; + homepage = "https://github.com/linux-pam/linux-pam"; description = "Pluggable Authentication Modules, a flexible mechanism for authenticating user"; platforms = platforms.linux; license = licenses.bsd3; From a3e3aa258345b39da49f9cd662e8af36654fe755 Mon Sep 17 00:00:00 2001 From: nartsisss <nartsiss@proton.me> Date: Mon, 30 Sep 2024 00:21:34 +0300 Subject: [PATCH 153/300] rainfrog: 0.2.5 -> 0.2.6 --- pkgs/by-name/ra/rainfrog/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ra/rainfrog/package.nix b/pkgs/by-name/ra/rainfrog/package.nix index 5babac7991de..2152374e1452 100644 --- a/pkgs/by-name/ra/rainfrog/package.nix +++ b/pkgs/by-name/ra/rainfrog/package.nix @@ -7,7 +7,7 @@ stdenv, }: let - version = "0.2.5"; + version = "0.2.6"; in rustPlatform.buildRustPackage { inherit version; @@ -17,10 +17,10 @@ rustPlatform.buildRustPackage { owner = "achristmascarl"; repo = "rainfrog"; rev = "refs/tags/v${version}"; - hash = "sha256-+jjVowyyjM344LRDl+xFPxQ7qfjIMOMVzFiDgUHBMKw="; + hash = "sha256-yY4F5Aw+duXknESjl6hoOUV3er84DkTtIBoX3humWxA="; }; - cargoHash = "sha256-0Wtsquus63fwaP7YUi/QelCJGU2cH1RWAYQWY9YbfMw="; + cargoHash = "sha256-QMZUReWrOS0P+hxsV5c/eJxnwYX977+4oI7MPfz4dgg="; buildInputs = lib.optionals stdenv.isDarwin ( with darwin.apple_sdk.frameworks; From 951665ca4f935cc3983bc86e6b9bb57fc3aa245a Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Mon, 23 Sep 2024 00:25:24 +0200 Subject: [PATCH 154/300] paru: 2.0.3 -> 2.0.4 --- pkgs/by-name/pa/paru/Cargo.lock | 2593 ------------------------- pkgs/by-name/pa/paru/cargo-lock.patch | 35 + pkgs/by-name/pa/paru/package.nix | 34 +- 3 files changed, 47 insertions(+), 2615 deletions(-) delete mode 100644 pkgs/by-name/pa/paru/Cargo.lock create mode 100644 pkgs/by-name/pa/paru/cargo-lock.patch diff --git a/pkgs/by-name/pa/paru/Cargo.lock b/pkgs/by-name/pa/paru/Cargo.lock deleted file mode 100644 index 21d35fc90c51..000000000000 --- a/pkgs/by-name/pa/paru/Cargo.lock +++ /dev/null @@ -1,2593 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "addr2line" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" -dependencies = [ - "gimli", -] - -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - -[[package]] -name = "ahash" -version = "0.8.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" -dependencies = [ - "cfg-if", - "getrandom", - "once_cell", - "version_check", - "zerocopy", -] - -[[package]] -name = "aho-corasick" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" -dependencies = [ - "memchr", -] - -[[package]] -name = "alpm" -version = "3.0.4" -source = "git+https://github.com/archlinux/alpm.rs?rev=306342#306342efc6f24739c92de64c432f962a22891e63" -dependencies = [ - "alpm-sys", - "bitflags 2.4.2", -] - -[[package]] -name = "alpm-sys" -version = "3.0.0" -source = "git+https://github.com/archlinux/alpm.rs?rev=306342#306342efc6f24739c92de64c432f962a22891e63" -dependencies = [ - "bindgen", - "pkg-config", -] - -[[package]] -name = "alpm-utils" -version = "3.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1a65e48b9a950d1297b865a436733d496b6cdd966133a02fdadc6127dfe37e7" -dependencies = [ - "alpm", - "pacmanconf", -] - -[[package]] -name = "android-tzdata" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" - -[[package]] -name = "android_system_properties" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" -dependencies = [ - "libc", -] - -[[package]] -name = "ansi_term" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" -dependencies = [ - "winapi", -] - -[[package]] -name = "anstream" -version = "0.6.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb" -dependencies = [ - "anstyle", - "anstyle-parse", - "anstyle-query", - "anstyle-wincon", - "colorchoice", - "utf8parse", -] - -[[package]] -name = "anstyle" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" - -[[package]] -name = "anstyle-parse" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" -dependencies = [ - "utf8parse", -] - -[[package]] -name = "anstyle-query" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" -dependencies = [ - "windows-sys 0.52.0", -] - -[[package]] -name = "anstyle-wincon" -version = "3.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" -dependencies = [ - "anstyle", - "windows-sys 0.52.0", -] - -[[package]] -name = "anyhow" -version = "1.0.81" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247" -dependencies = [ - "backtrace", -] - -[[package]] -name = "async-compression" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a116f46a969224200a0a97f29cfd4c50e7534e4b4826bd23ea2c3c533039c82c" -dependencies = [ - "flate2", - "futures-core", - "memchr", - "pin-project-lite", - "tokio", -] - -[[package]] -name = "async-trait" -version = "0.1.77" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.52", -] - -[[package]] -name = "aur-depends" -version = "3.0.0" -source = "git+https://github.com/Morganamilo/aur-depends?rev=30c2c1#30c2c15019f8dd80e803c9deefce3279079806af" -dependencies = [ - "alpm", - "alpm-utils", - "bitflags 2.4.2", - "log", - "raur", - "srcinfo", -] - -[[package]] -name = "aur-fetch" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3a34f46003cfac97808c0200c3338152275029ffc59e296611eef27de61074e" -dependencies = [ - "crossbeam", - "log", - "url", -] - -[[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.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" -dependencies = [ - "addr2line", - "cc", - "cfg-if", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", -] - -[[package]] -name = "base64" -version = "0.21.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" - -[[package]] -name = "bindgen" -version = "0.66.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2b84e06fc203107bfbad243f4aba2af864eb7db3b1cf46ea0a023b0b433d2a7" -dependencies = [ - "bitflags 2.4.2", - "cexpr", - "clang-sys", - "lazy_static", - "lazycell", - "peeking_take_while", - "proc-macro2", - "quote", - "regex", - "rustc-hash", - "shlex", - "syn 2.0.52", -] - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "bitflags" -version = "2.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" - -[[package]] -name = "block" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" - -[[package]] -name = "bstr" -version = "1.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706" -dependencies = [ - "memchr", - "serde", -] - -[[package]] -name = "bumpalo" -version = "3.15.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa" - -[[package]] -name = "byteorder" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" - -[[package]] -name = "bytes" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" - -[[package]] -name = "cc" -version = "1.0.90" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5" - -[[package]] -name = "cexpr" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" -dependencies = [ - "nom", -] - -[[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.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eaf5903dcbc0a39312feb77df2ff4c76387d591b9fc7b04a238dcf8bb62639a" -dependencies = [ - "android-tzdata", - "iana-time-zone", - "num-traits", - "windows-targets 0.52.4", -] - -[[package]] -name = "cini" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8628d1f5b9a7b1196ce1aa660e3ba7e2559d350649cbe94993519c127df667f2" - -[[package]] -name = "clang-sys" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67523a3b4be3ce1989d607a828d036249522dd9c1c8de7f4dd2dae43a37369d1" -dependencies = [ - "glob", - "libc", - "libloading", -] - -[[package]] -name = "colorchoice" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" - -[[package]] -name = "console" -version = "0.15.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb" -dependencies = [ - "encode_unicode", - "lazy_static", - "libc", - "unicode-width", - "windows-sys 0.52.0", -] - -[[package]] -name = "core-foundation" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "core-foundation-sys" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" - -[[package]] -name = "crc32fast" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "crossbeam" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1137cd7e7fc0fb5d3c5a8678be38ec56e819125d8d7907411fe24ccb943faca8" -dependencies = [ - "crossbeam-channel", - "crossbeam-deque", - "crossbeam-epoch", - "crossbeam-queue", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-channel" -version = "0.5.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95" -dependencies = [ - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-deque" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" -dependencies = [ - "crossbeam-epoch", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-epoch" -version = "0.9.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" -dependencies = [ - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-queue" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35" -dependencies = [ - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" - -[[package]] -name = "cssparser" -version = "0.31.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b3df4f93e5fbbe73ec01ec8d3f68bba73107993a5b1e7519273c32db9b0d5be" -dependencies = [ - "cssparser-macros", - "dtoa-short", - "itoa", - "phf 0.11.2", - "smallvec", -] - -[[package]] -name = "cssparser-macros" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331" -dependencies = [ - "quote", - "syn 2.0.52", -] - -[[package]] -name = "derive_more" -version = "0.99.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "dirs" -version = "5.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" -dependencies = [ - "dirs-sys", -] - -[[package]] -name = "dirs-sys" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" -dependencies = [ - "libc", - "option-ext", - "redox_users", - "windows-sys 0.48.0", -] - -[[package]] -name = "dtoa" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcbb2bf8e87535c23f7a8a321e364ce21462d0ff10cb6407820e8e96dfff6653" - -[[package]] -name = "dtoa-short" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbaceec3c6e4211c79e7b1800fb9680527106beb2f9c51904a3210c03a448c74" -dependencies = [ - "dtoa", -] - -[[package]] -name = "ego-tree" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a68a4904193147e0a8dec3314640e6db742afd5f6e634f428a6af230d9b3591" - -[[package]] -name = "either" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" - -[[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.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "env_filter" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a009aa4810eb158359dda09d0c87378e4bbb89b5a801f016885a4707ba24f7ea" -dependencies = [ - "log", - "regex", -] - -[[package]] -name = "env_logger" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b35839ba51819680ba087cd351788c9a3c476841207e0b8cee0b04722343b9" -dependencies = [ - "anstream", - "anstyle", - "env_filter", - "humantime", - "log", -] - -[[package]] -name = "equivalent" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" - -[[package]] -name = "errno" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "fastrand" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" - -[[package]] -name = "flate2" -version = "1.0.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" -dependencies = [ - "crc32fast", - "miniz_oxide", -] - -[[package]] -name = "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.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" -dependencies = [ - "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.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" -dependencies = [ - "futures-channel", - "futures-core", - "futures-executor", - "futures-io", - "futures-sink", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-channel" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" -dependencies = [ - "futures-core", - "futures-sink", -] - -[[package]] -name = "futures-core" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" - -[[package]] -name = "futures-executor" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" -dependencies = [ - "futures-core", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-io" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" - -[[package]] -name = "futures-macro" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.52", -] - -[[package]] -name = "futures-sink" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" - -[[package]] -name = "futures-task" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" - -[[package]] -name = "futures-util" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" -dependencies = [ - "futures-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 = "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.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" -dependencies = [ - "cfg-if", - "libc", - "wasi", -] - -[[package]] -name = "gettext-rs" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e49ea8a8fad198aaa1f9655a2524b64b70eb06b2f3ff37da407566c93054f364" -dependencies = [ - "gettext-sys", - "locale_config", -] - -[[package]] -name = "gettext-sys" -version = "0.21.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c63ce2e00f56a206778276704bbe38564c8695249fdc8f354b4ef71c57c3839d" -dependencies = [ - "cc", - "temp-dir", -] - -[[package]] -name = "gimli" -version = "0.28.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" - -[[package]] -name = "glob" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" - -[[package]] -name = "globset" -version = "0.4.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1" -dependencies = [ - "aho-corasick", - "bstr", - "log", - "regex-automata", - "regex-syntax", -] - -[[package]] -name = "h2" -version = "0.3.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb2c4422095b67ee78da96fbb51a4cc413b3b25883c7717ff7ca1ab31022c9c9" -dependencies = [ - "bytes", - "fnv", - "futures-core", - "futures-sink", - "futures-util", - "http", - "indexmap", - "slab", - "tokio", - "tokio-util", - "tracing", -] - -[[package]] -name = "hashbrown" -version = "0.14.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" - -[[package]] -name = "hermit-abi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" - -[[package]] -name = "html5ever" -version = "0.26.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bea68cab48b8459f17cf1c944c67ddc572d272d9f2b274140f223ecb1da4a3b7" -dependencies = [ - "log", - "mac", - "markup5ever", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "htmlescape" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9025058dae765dee5070ec375f591e2ba14638c63feff74f13805a72e523163" - -[[package]] -name = "http" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" -dependencies = [ - "bytes", - "fnv", - "itoa", -] - -[[package]] -name = "http-body" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" -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.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" - -[[package]] -name = "humantime" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" - -[[package]] -name = "hyper" -version = "0.14.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" -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-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 = "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 = "idna" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "indexmap" -version = "2.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b0b929d511467233429c45a44ac1dcaa21ba0f5ba11e4879e6ed28ddb4f9df4" -dependencies = [ - "equivalent", - "hashbrown", -] - -[[package]] -name = "indicatif" -version = "0.17.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "763a5a8f45087d6bcea4222e7b72c291a054edf80e4ef6efd2a4979878c7bea3" -dependencies = [ - "console", - "instant", - "number_prefix", - "portable-atomic", - "unicode-width", -] - -[[package]] -name = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "ipnet" -version = "2.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" - -[[package]] -name = "itoa" -version = "1.0.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" - -[[package]] -name = "js-sys" -version = "0.3.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" -dependencies = [ - "wasm-bindgen", -] - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] -name = "lazycell" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" - -[[package]] -name = "libc" -version = "0.2.153" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" - -[[package]] -name = "libloading" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" -dependencies = [ - "cfg-if", - "windows-targets 0.52.4", -] - -[[package]] -name = "libredox" -version = "0.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" -dependencies = [ - "bitflags 2.4.2", - "libc", - "redox_syscall", -] - -[[package]] -name = "linux-raw-sys" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" - -[[package]] -name = "locale_config" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d2c35b16f4483f6c26f0e4e9550717a2f6575bcd6f12a53ff0c490a94a6934" -dependencies = [ - "lazy_static", - "objc", - "objc-foundation", - "regex", - "winapi", -] - -[[package]] -name = "lock_api" -version = "0.4.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" -dependencies = [ - "autocfg", - "scopeguard", -] - -[[package]] -name = "log" -version = "0.4.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" - -[[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.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a2629bb1404f3d34c2e921f21fd34ba00b206124c81f65c50b43b6aaefeb016" -dependencies = [ - "log", - "phf 0.10.1", - "phf_codegen", - "string_cache", - "string_cache_codegen", - "tendril", -] - -[[package]] -name = "memchr" -version = "2.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" - -[[package]] -name = "mime" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" - -[[package]] -name = "minimal-lexical" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" - -[[package]] -name = "miniz_oxide" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" -dependencies = [ - "adler", -] - -[[package]] -name = "mio" -version = "0.8.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" -dependencies = [ - "libc", - "wasi", - "windows-sys 0.48.0", -] - -[[package]] -name = "native-tls" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" -dependencies = [ - "lazy_static", - "libc", - "log", - "openssl", - "openssl-probe", - "openssl-sys", - "schannel", - "security-framework", - "security-framework-sys", - "tempfile", -] - -[[package]] -name = "new_debug_unreachable" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54" - -[[package]] -name = "nix" -version = "0.28.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" -dependencies = [ - "bitflags 2.4.2", - "cfg-if", - "cfg_aliases", - "libc", -] - -[[package]] -name = "nom" -version = "7.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" -dependencies = [ - "memchr", - "minimal-lexical", -] - -[[package]] -name = "num-traits" -version = "0.2.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" -dependencies = [ - "autocfg", -] - -[[package]] -name = "num_cpus" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" -dependencies = [ - "hermit-abi", - "libc", -] - -[[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", -] - -[[package]] -name = "objc-foundation" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9" -dependencies = [ - "block", - "objc", - "objc_id", -] - -[[package]] -name = "objc_id" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b" -dependencies = [ - "objc", -] - -[[package]] -name = "object" -version = "0.32.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" -dependencies = [ - "memchr", -] - -[[package]] -name = "once_cell" -version = "1.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" - -[[package]] -name = "openssl" -version = "0.10.64" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" -dependencies = [ - "bitflags 2.4.2", - "cfg-if", - "foreign-types", - "libc", - "once_cell", - "openssl-macros", - "openssl-sys", -] - -[[package]] -name = "openssl-macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.52", -] - -[[package]] -name = "openssl-probe" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" - -[[package]] -name = "openssl-sys" -version = "0.9.101" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dda2b0f344e78efc2facf7d195d098df0dd72151b26ab98da807afc26c198dff" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "option-ext" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" - -[[package]] -name = "pacmanconf" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31d9811f947c6ffc56eeafb789dfad44a7ea7cc383ac3bc6c9b23cd27100bbb1" -dependencies = [ - "cini", -] - -[[package]] -name = "parking_lot" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" -dependencies = [ - "lock_api", - "parking_lot_core", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall", - "smallvec", - "windows-targets 0.48.5", -] - -[[package]] -name = "paru" -version = "2.0.3" -dependencies = [ - "alpm", - "alpm-utils", - "ansi_term", - "anyhow", - "async-trait", - "aur-depends", - "aur-fetch", - "bitflags 2.4.2", - "chrono", - "cini", - "dirs", - "env_logger", - "futures", - "globset", - "htmlescape", - "indicatif", - "log", - "nix", - "once_cell", - "pacmanconf", - "raur", - "regex", - "reqwest", - "rss", - "scraper", - "serde", - "serde_json", - "signal-hook", - "smart-default", - "srcinfo", - "tempfile", - "terminal_size", - "tokio", - "toml", - "tr", - "unicode-width", - "url", -] - -[[package]] -name = "peeking_take_while" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" - -[[package]] -name = "percent-encoding" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" - -[[package]] -name = "phf" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259" -dependencies = [ - "phf_shared 0.10.0", -] - -[[package]] -name = "phf" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" -dependencies = [ - "phf_macros", - "phf_shared 0.11.2", -] - -[[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.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6" -dependencies = [ - "phf_shared 0.10.0", - "rand", -] - -[[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", -] - -[[package]] -name = "phf_macros" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b" -dependencies = [ - "phf_generator 0.11.2", - "phf_shared 0.11.2", - "proc-macro2", - "quote", - "syn 2.0.52", -] - -[[package]] -name = "phf_shared" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" -dependencies = [ - "siphasher", -] - -[[package]] -name = "phf_shared" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" -dependencies = [ - "siphasher", -] - -[[package]] -name = "pin-project-lite" -version = "0.2.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" - -[[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.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" - -[[package]] -name = "portable-atomic" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" - -[[package]] -name = "ppv-lite86" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" - -[[package]] -name = "precomputed-hash" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" - -[[package]] -name = "proc-macro2" -version = "1.0.79" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "quick-xml" -version = "0.30.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eff6510e86862b57b210fd8cbe8ed3f0d7d600b9c2863cd4549a2e033c66e956" -dependencies = [ - "encoding_rs", - "memchr", -] - -[[package]] -name = "quote" -version = "1.0.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "rand" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" -dependencies = [ - "libc", - "rand_chacha", - "rand_core", -] - -[[package]] -name = "rand_chacha" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" -dependencies = [ - "ppv-lite86", - "rand_core", -] - -[[package]] -name = "rand_core" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" -dependencies = [ - "getrandom", -] - -[[package]] -name = "raur" -version = "7.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dafb3f375eedbb68b8c57a79cb220171ad1b716196fa35d4ab059f5fda21cc17" -dependencies = [ - "async-trait", - "reqwest", - "serde", - "serde_derive", -] - -[[package]] -name = "redox_syscall" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "redox_users" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" -dependencies = [ - "getrandom", - "libredox", - "thiserror", -] - -[[package]] -name = "regex" -version = "1.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" -dependencies = [ - "aho-corasick", - "memchr", - "regex-automata", - "regex-syntax", -] - -[[package]] -name = "regex-automata" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" - -[[package]] -name = "reqwest" -version = "0.11.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78bf93c4af7a8bb7d879d51cebe797356ff10ae8516ace542b5182d9dcac10b2" -dependencies = [ - "async-compression", - "base64", - "bytes", - "encoding_rs", - "futures-core", - "futures-util", - "h2", - "http", - "http-body", - "hyper", - "hyper-tls", - "ipnet", - "js-sys", - "log", - "mime", - "native-tls", - "once_cell", - "percent-encoding", - "pin-project-lite", - "rustls-pemfile", - "serde", - "serde_json", - "serde_urlencoded", - "sync_wrapper", - "system-configuration", - "tokio", - "tokio-native-tls", - "tokio-socks", - "tokio-util", - "tower-service", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "winreg", -] - -[[package]] -name = "rss" -version = "2.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7b2c77eb4450d7d5f98df52c381cd6c4e19b75dad9209a9530b85a44510219a" -dependencies = [ - "quick-xml", -] - -[[package]] -name = "rustc-demangle" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" - -[[package]] -name = "rustc-hash" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" - -[[package]] -name = "rustix" -version = "0.38.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" -dependencies = [ - "bitflags 2.4.2", - "errno", - "libc", - "linux-raw-sys", - "windows-sys 0.52.0", -] - -[[package]] -name = "rustls-pemfile" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" -dependencies = [ - "base64", -] - -[[package]] -name = "ryu" -version = "1.0.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" - -[[package]] -name = "schannel" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" -dependencies = [ - "windows-sys 0.52.0", -] - -[[package]] -name = "scopeguard" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" - -[[package]] -name = "scraper" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b80b33679ff7a0ea53d37f3b39de77ea0c75b12c5805ac43ec0c33b3051af1b" -dependencies = [ - "ahash", - "cssparser", - "ego-tree", - "getopts", - "html5ever", - "once_cell", - "selectors", - "tendril", -] - -[[package]] -name = "security-framework" -version = "2.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" -dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "core-foundation-sys", - "libc", - "security-framework-sys", -] - -[[package]] -name = "security-framework-sys" -version = "2.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "selectors" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eb30575f3638fc8f6815f448d50cb1a2e255b0897985c8c59f4d37b72a07b06" -dependencies = [ - "bitflags 2.4.2", - "cssparser", - "derive_more", - "fxhash", - "log", - "new_debug_unreachable", - "phf 0.10.1", - "phf_codegen", - "precomputed-hash", - "servo_arc", - "smallvec", -] - -[[package]] -name = "serde" -version = "1.0.197" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.197" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.52", -] - -[[package]] -name = "serde_json" -version = "1.0.114" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0" -dependencies = [ - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "serde_spanned" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" -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 = "servo_arc" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d036d71a959e00c77a63538b90a6c2390969f9772b096ea837205c6bd0491a44" -dependencies = [ - "stable_deref_trait", -] - -[[package]] -name = "shlex" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" - -[[package]] -name = "signal-hook" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801" -dependencies = [ - "libc", - "signal-hook-registry", -] - -[[package]] -name = "signal-hook-registry" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" -dependencies = [ - "libc", -] - -[[package]] -name = "siphasher" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" - -[[package]] -name = "slab" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" -dependencies = [ - "autocfg", -] - -[[package]] -name = "smallvec" -version = "1.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" - -[[package]] -name = "smart-default" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0eb01866308440fc64d6c44d9e86c5cc17adfe33c4d6eed55da9145044d0ffc1" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.52", -] - -[[package]] -name = "socket2" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "srcinfo" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ceaee0d48949e3aa5365945de3e467e797b30b4f8636c2e580121a293fd77519" - -[[package]] -name = "stable_deref_trait" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" - -[[package]] -name = "string_cache" -version = "0.8.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b" -dependencies = [ - "new_debug_unreachable", - "once_cell", - "parking_lot", - "phf_shared 0.10.0", - "precomputed-hash", - "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 = "syn" -version = "1.0.109" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "syn" -version = "2.0.52" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b699d15b36d1f02c3e7c69f8ffef53de37aefae075d8488d4ba1a7788d574a07" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "sync_wrapper" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" - -[[package]] -name = "system-configuration" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" -dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "system-configuration-sys", -] - -[[package]] -name = "system-configuration-sys" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "temp-dir" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd16aa9ffe15fe021c6ee3766772132c6e98dfa395a167e16864f61a9cfb71d6" - -[[package]] -name = "tempfile" -version = "3.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" -dependencies = [ - "cfg-if", - "fastrand", - "rustix", - "windows-sys 0.52.0", -] - -[[package]] -name = "tendril" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d24a120c5fc464a3458240ee02c299ebcb9d67b5249c8848b09d639dca8d7bb0" -dependencies = [ - "futf", - "mac", - "utf-8", -] - -[[package]] -name = "terminal_size" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7" -dependencies = [ - "rustix", - "windows-sys 0.48.0", -] - -[[package]] -name = "thiserror" -version = "1.0.58" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.58" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.52", -] - -[[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.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" - -[[package]] -name = "tokio" -version = "1.36.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931" -dependencies = [ - "backtrace", - "bytes", - "libc", - "mio", - "num_cpus", - "pin-project-lite", - "signal-hook-registry", - "socket2", - "tokio-macros", - "windows-sys 0.48.0", -] - -[[package]] -name = "tokio-macros" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.52", -] - -[[package]] -name = "tokio-native-tls" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" -dependencies = [ - "native-tls", - "tokio", -] - -[[package]] -name = "tokio-socks" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51165dfa029d2a65969413a6cc96f354b86b464498702f174a4efa13608fd8c0" -dependencies = [ - "either", - "futures-util", - "thiserror", - "tokio", -] - -[[package]] -name = "tokio-util" -version = "0.7.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" -dependencies = [ - "bytes", - "futures-core", - "futures-sink", - "pin-project-lite", - "tokio", - "tracing", -] - -[[package]] -name = "toml" -version = "0.8.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af06656561d28735e9c1cd63dfd57132c8155426aa6af24f36a00a351f88c48e" -dependencies = [ - "indexmap", - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit", -] - -[[package]] -name = "toml_datetime" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" -dependencies = [ - "serde", -] - -[[package]] -name = "toml_edit" -version = "0.22.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18769cd1cec395d70860ceb4d932812a0b4d06b1a4bb336745a4d21b9496e992" -dependencies = [ - "indexmap", - "serde", - "serde_spanned", - "toml_datetime", - "winnow", -] - -[[package]] -name = "tower-service" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" - -[[package]] -name = "tr" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21111d9e56891e526f1acf8edc6d69a8a0434240319419d33911c182f1897a76" -dependencies = [ - "gettext-rs", - "lazy_static", -] - -[[package]] -name = "tracing" -version = "0.1.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" -dependencies = [ - "pin-project-lite", - "tracing-core", -] - -[[package]] -name = "tracing-core" -version = "0.1.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" -dependencies = [ - "once_cell", -] - -[[package]] -name = "try-lock" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" - -[[package]] -name = "unicode-bidi" -version = "0.3.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" - -[[package]] -name = "unicode-ident" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" - -[[package]] -name = "unicode-normalization" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" -dependencies = [ - "tinyvec", -] - -[[package]] -name = "unicode-width" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" - -[[package]] -name = "url" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" -dependencies = [ - "form_urlencoded", - "idna", - "percent-encoding", -] - -[[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.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" - -[[package]] -name = "vcpkg" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "want" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" -dependencies = [ - "try-lock", -] - -[[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - -[[package]] -name = "wasm-bindgen" -version = "0.2.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" -dependencies = [ - "cfg-if", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" -dependencies = [ - "bumpalo", - "log", - "once_cell", - "proc-macro2", - "quote", - "syn 2.0.52", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-futures" -version = "0.4.42" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" -dependencies = [ - "cfg-if", - "js-sys", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.52", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.92" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" - -[[package]] -name = "web-sys" -version = "0.3.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "windows-core" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" -dependencies = [ - "windows-targets 0.52.4", -] - -[[package]] -name = "windows-sys" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" -dependencies = [ - "windows-targets 0.48.5", -] - -[[package]] -name = "windows-sys" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" -dependencies = [ - "windows-targets 0.52.4", -] - -[[package]] -name = "windows-targets" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" -dependencies = [ - "windows_aarch64_gnullvm 0.48.5", - "windows_aarch64_msvc 0.48.5", - "windows_i686_gnu 0.48.5", - "windows_i686_msvc 0.48.5", - "windows_x86_64_gnu 0.48.5", - "windows_x86_64_gnullvm 0.48.5", - "windows_x86_64_msvc 0.48.5", -] - -[[package]] -name = "windows-targets" -version = "0.52.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" -dependencies = [ - "windows_aarch64_gnullvm 0.52.4", - "windows_aarch64_msvc 0.52.4", - "windows_i686_gnu 0.52.4", - "windows_i686_msvc 0.52.4", - "windows_x86_64_gnu 0.52.4", - "windows_x86_64_gnullvm 0.52.4", - "windows_x86_64_msvc 0.52.4", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.52.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.52.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" - -[[package]] -name = "windows_i686_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" - -[[package]] -name = "windows_i686_gnu" -version = "0.52.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" - -[[package]] -name = "windows_i686_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" - -[[package]] -name = "windows_i686_msvc" -version = "0.52.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.52.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.52.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.52.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" - -[[package]] -name = "winnow" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dffa400e67ed5a4dd237983829e66475f0a4a26938c4b04c21baede6262215b8" -dependencies = [ - "memchr", -] - -[[package]] -name = "winreg" -version = "0.50.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" -dependencies = [ - "cfg-if", - "windows-sys 0.48.0", -] - -[[package]] -name = "zerocopy" -version = "0.7.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" -dependencies = [ - "zerocopy-derive", -] - -[[package]] -name = "zerocopy-derive" -version = "0.7.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.52", -] diff --git a/pkgs/by-name/pa/paru/cargo-lock.patch b/pkgs/by-name/pa/paru/cargo-lock.patch new file mode 100644 index 000000000000..5f95bdd9272a --- /dev/null +++ b/pkgs/by-name/pa/paru/cargo-lock.patch @@ -0,0 +1,35 @@ +diff --git a/Cargo.lock b/Cargo.lock +index 404b5cd..bba31c1 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -2613,13 +2613,3 @@ dependencies = [ + "quote", + "syn", + ] +- +-[[patch.unused]] +-name = "alpm" +-version = "3.0.4" +-source = "git+https://github.com/archlinux/alpm.rs?rev=306342#306342efc6f24739c92de64c432f962a22891e63" +- +-[[patch.unused]] +-name = "aur-depends" +-version = "3.0.0" +-source = "git+https://github.com/Morganamilo/aur-depends?rev=30c2c1#30c2c15019f8dd80e803c9deefce3279079806af" +diff --git a/Cargo.toml b/Cargo.toml +index 020c5c2..f74e9d1 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -70,12 +70,3 @@ static = ["alpm/static"] + mock = ["async-trait"] + mock_chroot = ["mock"] + #default = ["git", "generate"] +- +-[patch.crates-io] +-#alpm = { path = "../alpm.rs/alpm" } +-#alpm-utils = { path = "../alpm.rs/alpm-utils" } +-alpm = { git = "https://github.com/archlinux/alpm.rs", rev = "306342" } +-#alpm-utils = { git = "https://github.com/archlinux/alpm.rs", rev = "8da396" } +-#aur-depends = { path = "../aur-depends" } +-aur-depends = { git = "https://github.com/Morganamilo/aur-depends", rev = "30c2c1"} +-#aur-fetch = { path = "../aur-fetch" } diff --git a/pkgs/by-name/pa/paru/package.nix b/pkgs/by-name/pa/paru/package.nix index d961826d1247..03441cf1ac62 100644 --- a/pkgs/by-name/pa/paru/package.nix +++ b/pkgs/by-name/pa/paru/package.nix @@ -11,34 +11,22 @@ stdenv, }: -let - # only libalpm v14.x.x is supported - pacman_6 = pacman.overrideAttrs (previousAttrs: { - version = "6.1.0"; - src = previousAttrs.src.overrideAttrs { - outputHash = "sha256-uHBq1A//YSqFATlyqjC5ZgmvPkNKqp7sVew+nbmLH78="; - }; - hardeningDisable = [ "fortify3" ]; - }); -in rustPlatform.buildRustPackage rec { pname = "paru"; - version = "2.0.3"; + version = "2.0.4"; src = fetchFromGitHub { owner = "Morganamilo"; repo = "paru"; rev = "v${version}"; - hash = "sha256-0+N1WkjHd2DREoS1pImXXvlJ3wXoXEBxFBtupjXqyP8="; + hash = "sha256-VFIeDsIuPbWGf+vio5i8qGUBB+spP/7SwYwmQkMjtL8="; }; - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "alpm-3.0.4" = "sha256-cfIOCUyb+kDAT3Bn50oKuJzIyMyeFyOPBFQMkAgMocI="; - "aur-depends-3.0.0" = "sha256-Z/vCd4g3ic29vC0DXFHTT167xFAXYxzO2YQc0XQOerE="; - }; - }; + cargoPatches = [ + ./cargo-lock.patch + ]; + + cargoHash = "sha256-z8hYZu/3RV99hOTpnv4ExgXymhzuITDcGjJhcHLWcH8="; nativeBuildInputs = [ gettext @@ -50,11 +38,13 @@ rustPlatform.buildRustPackage rec { buildInputs = [ libarchive openssl - pacman_6 + pacman ]; - # https://aur.archlinux.org/packages/paru#comment-961914 - buildFeatures = lib.optionals stdenv.hostPlatform.isAarch64 [ "generate" ]; + # https://github.com/Morganamilo/paru/issues/1154#issuecomment-2002357898 + buildFeatures = lib.optionals stdenv.hostPlatform.isAarch64 [ + "generate" + ]; postBuild = '' sh ./scripts/mkmo locale/ From 5d981c05758713e020105421fd06c57d3f8a43c6 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage <gaetan@glepage.com> Date: Sun, 29 Sep 2024 23:43:03 +0200 Subject: [PATCH 155/300] python312Packages.ale-py: 0.10.0 -> 0.10.1 Diff: https://github.com/Farama-Foundation/Arcade-Learning-Environment/compare/refs/tags/v0.10.0...v0.10.1 Changelog: https://github.com/Farama-Foundation/Arcade-Learning-Environment/releases/tag/v0.10.1 --- pkgs/development/python-modules/ale-py/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ale-py/default.nix b/pkgs/development/python-modules/ale-py/default.nix index 031813101079..852a94ed3ada 100644 --- a/pkgs/development/python-modules/ale-py/default.nix +++ b/pkgs/development/python-modules/ale-py/default.nix @@ -30,14 +30,14 @@ buildPythonPackage rec { pname = "ale-py"; - version = "0.10.0"; + version = "0.10.1"; pyproject = true; src = fetchFromGitHub { owner = "Farama-Foundation"; repo = "Arcade-Learning-Environment"; rev = "refs/tags/v${version}"; - hash = "sha256-tdxO5eixI2swezhkeSMqeVgdiaa/VmNdwhZYURSzadw="; + hash = "sha256-MDMCYnyLZYbQXwyr5VuPeVEop825nD++yQ7hhsW4BX8="; }; build-system = [ From 143b30a1532a37e4b6856f0fdebb507fdbc441bc Mon Sep 17 00:00:00 2001 From: Gaetan Lepage <gaetan@glepage.com> Date: Sun, 29 Sep 2024 23:56:06 +0200 Subject: [PATCH 156/300] python312Packages.arviz: 0.19.0 -> 0.20.0 Diff: https://github.com/arviz-devs/arviz/compare/refs/tags/v0.19.0...v0.20.0 Changelog: https://github.com/arviz-devs/arviz/blob/v0.20.0/CHANGELOG.md --- pkgs/development/python-modules/arviz/default.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/arviz/default.nix b/pkgs/development/python-modules/arviz/default.nix index 754ea282e83a..0406894c8b05 100644 --- a/pkgs/development/python-modules/arviz/default.nix +++ b/pkgs/development/python-modules/arviz/default.nix @@ -2,7 +2,6 @@ lib, stdenv, buildPythonPackage, - pythonOlder, fetchFromGitHub, # build-system @@ -10,7 +9,6 @@ setuptools, # dependencies - dm-tree, h5netcdf, matplotlib, numpy, @@ -40,16 +38,14 @@ buildPythonPackage rec { pname = "arviz"; - version = "0.19.0"; + version = "0.20.0"; pyproject = true; - disabled = pythonOlder "3.10"; - src = fetchFromGitHub { owner = "arviz-devs"; repo = "arviz"; rev = "refs/tags/v${version}"; - hash = "sha256-fwDCl1KWClIOBWIL/ETw3hJUyHdpVpLnRmZoZXL3QXI="; + hash = "sha256-6toqOGwk8YbatfiDCTEG4r0z3zZAA8zcNVZJqqssYrY="; }; build-system = [ @@ -58,7 +54,6 @@ buildPythonPackage rec { ]; dependencies = [ - dm-tree h5netcdf matplotlib numpy From 63306af816bc75c40d783fed2a948ea45fb18b20 Mon Sep 17 00:00:00 2001 From: Fabian Affolter <mail@fabian-affolter.ch> Date: Tue, 24 Sep 2024 22:06:04 +0200 Subject: [PATCH 157/300] python312Packages.py-ocsf-models: init at 0.1.1 OCSF models in Python using Pydantic https://github.com/prowler-cloud/py-ocsf-models --- .../python-modules/py-ocsf-models/default.nix | 51 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 53 insertions(+) create mode 100644 pkgs/development/python-modules/py-ocsf-models/default.nix diff --git a/pkgs/development/python-modules/py-ocsf-models/default.nix b/pkgs/development/python-modules/py-ocsf-models/default.nix new file mode 100644 index 000000000000..b98f5228ec06 --- /dev/null +++ b/pkgs/development/python-modules/py-ocsf-models/default.nix @@ -0,0 +1,51 @@ +{ + lib, + buildPythonPackage, + cryptography, + email-validator, + fetchFromGitHub, + poetry-core, + pydantic, + pytestCheckHook, + pythonOlder, +}: + +buildPythonPackage rec { + pname = "py-ocsf-models"; + version = "0.1.1"; + pyproject = true; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "prowler-cloud"; + repo = "py-ocsf-models"; + rev = "refs/tags/${version}"; + hash = "sha256-NGhlMBNoa8V3vo/z6OBAWqNCSlTyUutiyrTcCe1KF+4="; + }; + + pythonRelaxDeps = true; + + build-system = [ poetry-core ]; + + dependencies = [ + cryptography + email-validator + pydantic + ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + # Tests are outdated + doCheck = false; + + pythonImportsCheck = [ "py_ocsf_models" ]; + + meta = { + description = "OCSF models in Python using Pydantic"; + homepage = "https://github.com/prowler-cloud/py-ocsf-models"; + changelog = "https://github.com/prowler-cloud/py-ocsf-models/releases/tag/${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 09fbd6fd81de..e3eceed3df54 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9119,6 +9119,8 @@ self: super: with self; { py-machineid = callPackage ../development/python-modules/py-machineid { }; + py-ocsf-models = callPackage ../development/python-modules/py-ocsf-models { }; + py-opensonic = callPackage ../development/python-modules/py-opensonic { }; py-radix-sr = callPackage ../development/python-modules/py-radix-sr { }; From 6300fc82bea0c920b02fbdf47749ebc7cf1e9c7c Mon Sep 17 00:00:00 2001 From: Gaetan Lepage <gaetan@glepage.com> Date: Mon, 30 Sep 2024 00:10:21 +0200 Subject: [PATCH 158/300] python312Packages.dask: 2024.9.0 -> 2024.9.1 Diff: https://github.com/dask/dask/compare/refs/tags/2024.9.0...2024.9.1 Changelog: https://docs.dask.org/en/latest/changelog.html --- pkgs/development/python-modules/dask/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix index d26caf858cd0..e47ced4264ab 100644 --- a/pkgs/development/python-modules/dask/default.nix +++ b/pkgs/development/python-modules/dask/default.nix @@ -39,14 +39,14 @@ let self = buildPythonPackage rec { pname = "dask"; - version = "2024.9.0"; + version = "2024.9.1"; pyproject = true; src = fetchFromGitHub { owner = "dask"; repo = "dask"; rev = "refs/tags/${version}"; - hash = "sha256-CaTxhYT2diFOBylLH36iIR1ooWzi2e/RNOnvc11DtDY="; + hash = "sha256-lbWV6qgLQ8itJsnz7ojrgfrO12+AwNe1/DJvxBo5A+Q="; }; build-system = [ setuptools ]; From f460d5b97290055462544b0e252f593e7f4cfc82 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage <gaetan@glepage.com> Date: Mon, 30 Sep 2024 00:10:28 +0200 Subject: [PATCH 159/300] python312Packages.distributed: 2024.9.0 -> 2024.9.1 Diff: https://github.com/dask/distributed/compare/refs/tags/2024.9.0...2024.9.1 Changelog: https://github.com/dask/distributed/releases/tag/2024.9.1 --- pkgs/development/python-modules/distributed/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/distributed/default.nix b/pkgs/development/python-modules/distributed/default.nix index 4df88aaf493d..063d30ca405f 100644 --- a/pkgs/development/python-modules/distributed/default.nix +++ b/pkgs/development/python-modules/distributed/default.nix @@ -28,14 +28,14 @@ buildPythonPackage rec { pname = "distributed"; - version = "2024.9.0"; + version = "2024.9.1"; pyproject = true; src = fetchFromGitHub { owner = "dask"; repo = "distributed"; rev = "refs/tags/${version}"; - hash = "sha256-jzifqTGHAto+7LExUs0kSd8852EfELEL8acSElXlEx0="; + hash = "sha256-UDfa59o+3RVN3QppoUamScdcH8XGOB+KAxArI5w7x6M="; }; postPatch = '' From d35e33b2b2ca4999067173e59d0139857526f32d Mon Sep 17 00:00:00 2001 From: Gaetan Lepage <gaetan@glepage.com> Date: Mon, 30 Sep 2024 00:10:36 +0200 Subject: [PATCH 160/300] python312Packages.dask-expr: 1.1.14 -> 1.1.15 Diff: https://github.com/dask/dask-expr/compare/refs/tags/v1.1.14...v1.1.15 --- pkgs/development/python-modules/dask-expr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dask-expr/default.nix b/pkgs/development/python-modules/dask-expr/default.nix index b7130a40ceb9..4e9de770a193 100644 --- a/pkgs/development/python-modules/dask-expr/default.nix +++ b/pkgs/development/python-modules/dask-expr/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "dask-expr"; - version = "1.1.14"; + version = "1.1.15"; pyproject = true; src = fetchFromGitHub { owner = "dask"; repo = "dask-expr"; rev = "refs/tags/v${version}"; - hash = "sha256-yDNkIATN6AuGzcxTwAQyaQaDQ48v45hTC2fUqEThl/g="; + hash = "sha256-b5nY3srMADzYZ0GYCeyUfxhJLm7E4dTbM7qrsCR9d7A="; }; postPatch = '' From f5b83b899129c605b014bc84b14a43d841431774 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage <gaetan@glepage.com> Date: Mon, 30 Sep 2024 00:26:43 +0200 Subject: [PATCH 161/300] python312Packages.corner: disable flaky tests --- pkgs/development/python-modules/corner/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/corner/default.nix b/pkgs/development/python-modules/corner/default.nix index 68446453e200..853ba5111922 100644 --- a/pkgs/development/python-modules/corner/default.nix +++ b/pkgs/development/python-modules/corner/default.nix @@ -79,13 +79,18 @@ buildPythonPackage rec { "test_extended_overplotting" "test_hist_bin_factor" "test_labels" + "test_levels2" "test_lowNfilled" "test_no_fill_contours" + "test_overplot" "test_overplot_log" "test_pandas" "test_quantiles" "test_range_fig_arg" + "test_reverse" "test_reverse_overplotting" + "test_reverse_truths" + "test_smooth1" "test_tight" "test_title_quantiles" "test_title_quantiles_default" From acec05505d2dcb51ef7a8026d226d601ca5b1d8c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" <ryantm-bot@ryantm.com> Date: Sun, 29 Sep 2024 22:37:37 +0000 Subject: [PATCH 162/300] octavePackages.signal: 1.4.5 -> 1.4.6 --- pkgs/development/octave-modules/signal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/octave-modules/signal/default.nix b/pkgs/development/octave-modules/signal/default.nix index 0c4c2d9c6e23..1693d8360628 100644 --- a/pkgs/development/octave-modules/signal/default.nix +++ b/pkgs/development/octave-modules/signal/default.nix @@ -6,11 +6,11 @@ buildOctavePackage rec { pname = "signal"; - version = "1.4.5"; + version = "1.4.6"; src = fetchurl { url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz"; - sha256 = "sha256-VVreL/gPcRiQk5XDNAXwoXpPvNIrxtL7nD9/Rf72SOc="; + sha256 = "sha256-lO74/qeMiWCfjd9tX/i/wuDauTK0P4bOkRR0pYtcce4="; }; requiredOctavePackages = [ From fdf1280a9240545fbdb481447c6f9f4f537c7d28 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" <ryantm-bot@ryantm.com> Date: Sun, 29 Sep 2024 22:57:18 +0000 Subject: [PATCH 163/300] flyctl: 0.3.6 -> 0.3.10 --- pkgs/development/web/flyctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index 2fba60c53549..95b5e7551393 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "flyctl"; - version = "0.3.6"; + version = "0.3.10"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - hash = "sha256-Wj9omHywqXYEaap4w4C6wtwRs0QyKx4kp+QAkmK07fE="; + hash = "sha256-xg26di6ceko6QUVciy1BLNC7hMEf4I1HRHmRCrdd4vc="; }; - vendorHash = "sha256-Z9qbrFctUv6F8374qyJ7Fw4HU/7BIhEfHfrwoFUXM4Q="; + vendorHash = "sha256-N/evH8AiTHzO2fXJM3j4vIfSvAuiCc2IWpVcuRU7zlY="; subPackages = [ "." ]; From 2a6f48769c9766c862e72f50eb2dd9ab78c224f0 Mon Sep 17 00:00:00 2001 From: Adam Stephens <adam@valkor.net> Date: Sun, 29 Sep 2024 19:08:48 -0400 Subject: [PATCH 164/300] miniflux: add updateScript --- pkgs/servers/miniflux/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/miniflux/default.nix b/pkgs/servers/miniflux/default.nix index 9e0e854435c8..8590cce0b5ff 100644 --- a/pkgs/servers/miniflux/default.nix +++ b/pkgs/servers/miniflux/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub, fetchpatch2, installShellFiles, nixosTests }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles, nixosTests, nix-update-script }: buildGoModule rec { pname = "miniflux"; @@ -26,7 +26,10 @@ buildGoModule rec { installManPage miniflux.1 ''; - passthru.tests = nixosTests.miniflux; + passthru = { + tests = nixosTests.miniflux; + updateScript = nix-update-script { }; + }; meta = with lib; { description = "Minimalist and opinionated feed reader"; From 1ff2dee679c55363ecec39392136f07cc6dca893 Mon Sep 17 00:00:00 2001 From: Adam Stephens <adam@valkor.net> Date: Sun, 29 Sep 2024 19:11:07 -0400 Subject: [PATCH 165/300] miniflux: 2.2.0 -> 2.2.1 https://miniflux.app/releases/2.2.1.html --- pkgs/servers/miniflux/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/miniflux/default.nix b/pkgs/servers/miniflux/default.nix index 8590cce0b5ff..c3e590e80fd4 100644 --- a/pkgs/servers/miniflux/default.nix +++ b/pkgs/servers/miniflux/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "miniflux"; - version = "2.2.0"; + version = "2.2.1"; src = fetchFromGitHub { owner = "miniflux"; repo = "v2"; rev = "refs/tags/${version}"; - hash = "sha256-JE0sHxmvLGvbgOqH5f7OONAvP93dJLWLAbgTnlNHGHE="; + hash = "sha256-b4slACQl+3vDsioULVKscBhS8LvTxCUPDnO7GlT46CM="; }; - vendorHash = "sha256-Y5FcKmvYMN9Q9/VpP8IWclFXt7gl61UiyPJ+Rdmlito="; + vendorHash = "sha256-PL5tc6MQRHloc3Dfw+FpWdqrXErFPjEb8RNPmHr7jSk="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f5254a83b0fb..821fff842acc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25050,7 +25050,9 @@ with pkgs; azuredatastudio = callPackage ../applications/misc/azuredatastudio { }; - miniflux = callPackage ../servers/miniflux { }; + miniflux = callPackage ../servers/miniflux { + buildGoModule = buildGo123Module; + }; inherit (callPackage ../servers/mir { }) mir From d7f0cdec396ef119fe287bf653f64c7f50f80d47 Mon Sep 17 00:00:00 2001 From: Adam Stephens <adam@valkor.net> Date: Sun, 29 Sep 2024 19:13:02 -0400 Subject: [PATCH 166/300] miniflux: move to by-name --- .../miniflux/default.nix => by-name/mi/miniflux/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/{servers/miniflux/default.nix => by-name/mi/miniflux/package.nix} (100%) diff --git a/pkgs/servers/miniflux/default.nix b/pkgs/by-name/mi/miniflux/package.nix similarity index 100% rename from pkgs/servers/miniflux/default.nix rename to pkgs/by-name/mi/miniflux/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 821fff842acc..87ebacfe0869 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25050,7 +25050,7 @@ with pkgs; azuredatastudio = callPackage ../applications/misc/azuredatastudio { }; - miniflux = callPackage ../servers/miniflux { + miniflux = callPackage ../by-name/mi/miniflux/package.nix { buildGoModule = buildGo123Module; }; From e08b1081c9c1899777bf5ccf806b873765c753f2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter <mail@fabian-affolter.ch> Date: Mon, 30 Sep 2024 01:45:58 +0200 Subject: [PATCH 167/300] python312Packages.aiovlc: 0.5.0 -> 0.6.0 Diff: https://github.com/MartinHjelmare/aiovlc/compare/refs/tags/v0.5.0...v0.6.0 Changelog: https://github.com/MartinHjelmare/aiovlc/blob/v0.6.0/CHANGELOG.md --- pkgs/development/python-modules/aiovlc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiovlc/default.nix b/pkgs/development/python-modules/aiovlc/default.nix index 329cfee05257..cfebe114b4ce 100644 --- a/pkgs/development/python-modules/aiovlc/default.nix +++ b/pkgs/development/python-modules/aiovlc/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "aiovlc"; - version = "0.5.0"; + version = "0.6.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "MartinHjelmare"; repo = "aiovlc"; rev = "refs/tags/v${version}"; - hash = "sha256-F66HGfbsve/jYyUEapUTVtLxaEIW63r3eNNk7mXOx5Y="; + hash = "sha256-2YG/m/z2xHUep2VJuCQs4+gGHUolj/u3kycpYZmUyBs="; }; build-system = [ poetry-core ]; From ff903a01fd1f9f050680d7bba7e3e56b0c4a50f1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" <ryantm-bot@ryantm.com> Date: Sun, 29 Sep 2024 23:47:34 +0000 Subject: [PATCH 168/300] albert: 0.26.3 -> 0.26.4 --- pkgs/by-name/al/albert/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/al/albert/package.nix b/pkgs/by-name/al/albert/package.nix index cde9f01547c0..3e9196aa8df0 100644 --- a/pkgs/by-name/al/albert/package.nix +++ b/pkgs/by-name/al/albert/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "albert"; - version = "0.26.3"; + version = "0.26.4"; src = fetchFromGitHub { owner = "albertlauncher"; repo = "albert"; rev = "v${finalAttrs.version}"; - hash = "sha256-f5dTGthT8rGPjW41BaPtQlf8C10TUBmIzkhsCTgNeg4="; + hash = "sha256-MEpBZV1Fxoq24eT1hgyrp33qcaLqmQ+aAP974Yn8d2g="; fetchSubmodules = true; }; From 15f168528abc70128bbb61f3ab0eec83d80deb57 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" <ryantm-bot@ryantm.com> Date: Sun, 29 Sep 2024 23:48:11 +0000 Subject: [PATCH 169/300] bruno: 1.29.1 -> 1.30.1 --- pkgs/by-name/br/bruno/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/br/bruno/package.nix b/pkgs/by-name/br/bruno/package.nix index 6b271c571e07..f84548760979 100644 --- a/pkgs/by-name/br/bruno/package.nix +++ b/pkgs/by-name/br/bruno/package.nix @@ -26,13 +26,13 @@ let in buildNpmPackage' rec { pname = "bruno"; - version = "1.29.1"; + version = "1.30.1"; src = fetchFromGitHub { owner = "usebruno"; repo = "bruno"; rev = "v${version}"; - hash = "sha256-UXxMHTunsKXXt0NX5fuyzQbtp4AUzLXnFHqe8Is6Cmc="; + hash = "sha256-9dH79ytqkZcdgUMbTa32VHKr2dHiNsJu6GawDtRsJx0="; postFetch = '' ${lib.getExe npm-lockfile-fix} $out/package-lock.json From e4f84e3e6cdf15e92638697cae5fdefeb6363110 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" <ryantm-bot@ryantm.com> Date: Mon, 30 Sep 2024 00:27:00 +0000 Subject: [PATCH 170/300] gleam: 1.5.0 -> 1.5.1 --- pkgs/development/compilers/gleam/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/gleam/default.nix b/pkgs/development/compilers/gleam/default.nix index 279136ac60e2..650e46ff51b1 100644 --- a/pkgs/development/compilers/gleam/default.nix +++ b/pkgs/development/compilers/gleam/default.nix @@ -12,13 +12,13 @@ rustPlatform.buildRustPackage rec { pname = "gleam"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "gleam-lang"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-buMnbBg+/vHXzbBuMPuV8AfdUmYA9J6WTXP7Oqrdo34="; + hash = "sha256-4/NDZGq62M0tdWerIkmoYS0WHC06AV8c9vlo/6FhsAo="; }; nativeBuildInputs = [ git pkg-config ]; @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security SystemConfiguration ]; - cargoHash = "sha256-0Vtf9UXLPW5HuqNIAGNyqIXCMTITdG7PuFdw4H4v6a4="; + cargoHash = "sha256-B8tCVkubP04gAHKQC0idR5AjpVHG/kCXvPCfwKCuaSo="; passthru.updateScript = nix-update-script { }; From c04f7ccc59590582a46312a388972318e0aa082b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" <ryantm-bot@ryantm.com> Date: Mon, 30 Sep 2024 00:35:33 +0000 Subject: [PATCH 171/300] glance: 0.6.1 -> 0.6.2 --- pkgs/by-name/gl/glance/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gl/glance/package.nix b/pkgs/by-name/gl/glance/package.nix index 0b1419c8f331..fe4aa35a56d3 100644 --- a/pkgs/by-name/gl/glance/package.nix +++ b/pkgs/by-name/gl/glance/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "glance"; - version = "0.6.1"; + version = "0.6.2"; src = fetchFromGitHub { owner = "glanceapp"; repo = "glance"; rev = "v${version}"; - hash = "sha256-neoRuduQOC3DHeIy/sh1BWUwcwXPGQIgZRWQcL7gzlk="; + hash = "sha256-A2EFIDwJbIzRDAxFKW7znZFYKYpqOMEixUG0yUDx7zc="; }; vendorHash = "sha256-BLWaYiWcLX+/DW7Zzp6/Mtw5uVxIVtfubB895hrZ+08="; From ec50ae00b1ba4dc9f3f324cd8ada96bd261e1e5c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" <ryantm-bot@ryantm.com> Date: Mon, 30 Sep 2024 00:54:16 +0000 Subject: [PATCH 172/300] picom-pijulius: 8.2-unstable-2024-09-14 -> 8.2-unstable-2024-09-27 --- pkgs/by-name/pi/picom-pijulius/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pi/picom-pijulius/package.nix b/pkgs/by-name/pi/picom-pijulius/package.nix index 6cb67fe25999..686e9c371bb9 100644 --- a/pkgs/by-name/pi/picom-pijulius/package.nix +++ b/pkgs/by-name/pi/picom-pijulius/package.nix @@ -9,13 +9,13 @@ }: picom.overrideAttrs (previousAttrs: { pname = "picom-pijulius"; - version = "8.2-unstable-2024-09-14"; + version = "8.2-unstable-2024-09-27"; src = fetchFromGitHub { owner = "pijulius"; repo = "picom"; - rev = "0c46ea546d9c507e744612e80b25ef5dfa531855"; - hash = "sha256-g/RknjZh5O2/3Plk1w8QnNywWZXZaABfunBY6XyixnA="; + rev = "d1d5a32d9ac125e1db1c2235834060fd0535b262"; + hash = "sha256-1ycxVHaWpqGD1GuWQ8dpKrbmSSSQS8CoaY56wM18bWk="; }; buildInputs = (previousAttrs.buildInputs or [ ]) ++ [ pcre ]; From c8da361b085e741c790f7ac2f65f9b6b60d007fa Mon Sep 17 00:00:00 2001 From: Malo Bourgon <mbourgon@gmail.com> Date: Sun, 29 Sep 2024 18:01:16 -0700 Subject: [PATCH 173/300] signalbackup-tools: 20240924-2 -> 20240929 Diff: https://github.com/bepaald/signalbackup-tools/compare/20240924-2...20240929 --- .../instant-messengers/signalbackup-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix index c35ad2d2eef1..8cd6bed359fa 100644 --- a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix +++ b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "signalbackup-tools"; - version = "20240924-2"; + version = "20240929"; src = fetchFromGitHub { owner = "bepaald"; repo = "signalbackup-tools"; rev = version; - hash = "sha256-YnblQjZpKsnphbaRQ6FyHhssnns7U5VoNe/r3goQ0g8="; + hash = "sha256-OXn/RMc2v099S8/atQTYz1YwSH0sD7o7ZImlrBmUlSE="; }; nativeBuildInputs = [ 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 174/300] 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 fafa8272c22caa0efa4000726af1deea4700c376 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" <ryantm-bot@ryantm.com> Date: Mon, 30 Sep 2024 01:39:58 +0000 Subject: [PATCH 175/300] roddhjav-apparmor-rules: 0-unstable-2024-09-19 -> 0-unstable-2024-09-27 --- pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix b/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix index 93c4fab10a9c..dcc5606ea4ea 100644 --- a/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix +++ b/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation { pname = "roddhjav-apparmor-rules"; - version = "0-unstable-2024-09-19"; + version = "0-unstable-2024-09-27"; src = fetchFromGitHub { owner = "roddhjav"; repo = "apparmor.d"; - rev = "7a3a1f7725d07cbd7d969bba2649f31d330d1e40"; - hash = "sha256-6P3dNNcPGPux/Epr0vIrEEl7To399UzJfb4Uq8MT5p4="; + rev = "a8c18f9b9418ac42922eee1e31b1e3c9f791c1dc"; + hash = "sha256-LUHU6Buh+91b99pF7d8jqmAoYD1EmkKzsAOxiP7w3So="; }; dontConfigure = true; From 5dcb4ae9fd8663b5244536c2be76a30b991a3512 Mon Sep 17 00:00:00 2001 From: Bryan Gardiner <bog@khumba.net> Date: Sat, 21 Sep 2024 10:29:11 -0700 Subject: [PATCH 176/300] nvd: 0.2.3 -> 0.2.4, switch source repository to Sourcehut nvd will be moving from Gitlab to Sourcehut shortly, and the old repository will be archived and removed. --- pkgs/tools/package-management/nvd/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/package-management/nvd/default.nix b/pkgs/tools/package-management/nvd/default.nix index 8f33b4a5fbfa..22fba65b7297 100644 --- a/pkgs/tools/package-management/nvd/default.nix +++ b/pkgs/tools/package-management/nvd/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitLab +{ fetchFromSourcehut , installShellFiles , lib , python3 @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "nvd"; - version = "0.2.3"; + version = "0.2.4"; - src = fetchFromGitLab { - owner = "khumba"; + src = fetchFromSourcehut { + owner = "~khumba"; repo = "nvd"; - rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-TmaXsyJLRkmIN9D77jOXd8fLj7kYPCBLg0AHIImAtgA="; + rev = "v${finalAttrs.version}"; + hash = "sha256-3Fb6MDz4z41at3XpjLVng8NBwUJn/N7QBgU6Cbh0w98="; }; buildInputs = [ @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Nix/NixOS package version diff tool"; - homepage = "https://gitlab.com/khumba/nvd"; + homepage = "https://khumba.net/projects/nvd"; license = lib.licenses.asl20; mainProgram = "nvd"; maintainers = with lib.maintainers; [ khumba ]; 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 177/300] 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 178/300] 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 ca09d7f2521a653eed3931c4b3c3c5f9168f12bc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" <ryantm-bot@ryantm.com> Date: Mon, 30 Sep 2024 02:51:45 +0000 Subject: [PATCH 179/300] mdcat: 2.4.0 -> 2.5.0 --- pkgs/tools/text/mdcat/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/mdcat/default.nix b/pkgs/tools/text/mdcat/default.nix index d21a9db65683..7a4c40f92946 100644 --- a/pkgs/tools/text/mdcat/default.nix +++ b/pkgs/tools/text/mdcat/default.nix @@ -13,20 +13,20 @@ rustPlatform.buildRustPackage rec { pname = "mdcat"; - version = "2.4.0"; + version = "2.5.0"; src = fetchFromGitHub { owner = "swsnr"; repo = "mdcat"; rev = "mdcat-${version}"; - hash = "sha256-3iaj4bMm9nVDwd8kqBzPdpaAavxb19NwfvSX3oCihRA="; + hash = "sha256-Y0tWhqRGrjex/yKWmRu4+hSRM9/vchsYyx26x/HBuRw="; }; nativeBuildInputs = [ pkg-config asciidoctor installShellFiles ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security SystemConfiguration ]; - cargoHash = "sha256-KEJOpQ9Y832M0IUrm6u7SYWTH8/blDfu0kubS2GMuRE="; + cargoHash = "sha256-f2YmrmRlQTCBTzG7DWJVldP/lOhl2iCnhnOLHx1QJDc="; nativeCheckInputs = [ ansi2html ]; # Skip tests that use the network and that include files. From f3a67ca61b2c25dcce930afbbb267581b60eda81 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" <ryantm-bot@ryantm.com> Date: Mon, 30 Sep 2024 03:05:02 +0000 Subject: [PATCH 180/300] microsoft-edge: 129.0.2792.52 -> 129.0.2792.65 --- .../networking/browsers/microsoft-edge/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/browsers/microsoft-edge/default.nix b/pkgs/applications/networking/browsers/microsoft-edge/default.nix index 7c903058c234..5721c6e616b9 100644 --- a/pkgs/applications/networking/browsers/microsoft-edge/default.nix +++ b/pkgs/applications/networking/browsers/microsoft-edge/default.nix @@ -1,20 +1,20 @@ { beta = import ./browser.nix { channel = "beta"; - version = "129.0.2792.52"; + version = "130.0.2849.5"; revision = "1"; - hash = "sha256-KurkG/OxoKOcBcFXj9xhQVSidc2L6bzrDY8c2OmSQro="; + hash = "sha256-chvB84+zu6/xgRHyUk33aicc44QJLxxdOOu0ngqmsFM="; }; dev = import ./browser.nix { channel = "dev"; - version = "130.0.2835.2"; + version = "130.0.2849.1"; revision = "1"; - hash = "sha256-szxMnqw7tUvASsxsYacrQ3StofUJHBWHIhF3EfGIVAs="; + hash = "sha256-JObqtaaUR6J4rZ90WWw7Ku5Ntl/QBWHo23T7Ohu5p1s="; }; stable = import ./browser.nix { channel = "stable"; - version = "129.0.2792.52"; + version = "129.0.2792.65"; revision = "1"; - hash = "sha256-tiq6PwDrH8ZctfyDza9W3WOsj7NArv4XyMPGWU7fW7A="; + hash = "sha256-xuCtHptE2CG4aiY7gu2sWW3Km4qfB0E/L/PBACIaKOc="; }; } From e6d4785ec0c2a9716f1383fcabff64ff86798d20 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" <ryantm-bot@ryantm.com> Date: Mon, 30 Sep 2024 03:08:11 +0000 Subject: [PATCH 181/300] githooks: 3.0.3 -> 3.0.4 --- pkgs/by-name/gi/githooks/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gi/githooks/package.nix b/pkgs/by-name/gi/githooks/package.nix index d5a0b78f494f..54acd5292923 100644 --- a/pkgs/by-name/gi/githooks/package.nix +++ b/pkgs/by-name/gi/githooks/package.nix @@ -9,13 +9,13 @@ }: buildGoModule rec { pname = "githooks"; - version = "3.0.3"; + version = "3.0.4"; src = fetchFromGitHub { owner = "gabyx"; repo = "githooks"; rev = "v${version}"; - hash = "sha256-9IsE9XGeMgOPPEyBvGLZaZKyz5HjnugiELP76+alFmU="; + hash = "sha256-pTSC8ruNiPzQO1C6j+G+WFX3pz/mWPukuWkKUSYdfHw="; }; modRoot = "./githooks"; 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 182/300] 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 65a629f03747f9d14d8497f52c66a5443415f35f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" <ryantm-bot@ryantm.com> Date: Mon, 30 Sep 2024 03:21:06 +0000 Subject: [PATCH 183/300] mob: 5.2.0 -> 5.3.1 --- pkgs/applications/misc/mob/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/mob/default.nix b/pkgs/applications/misc/mob/default.nix index 90c1683edeea..d09a02a17252 100644 --- a/pkgs/applications/misc/mob/default.nix +++ b/pkgs/applications/misc/mob/default.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "mob"; - version = "5.2.0"; + version = "5.3.1"; src = fetchFromGitHub { owner = "remotemobprogramming"; repo = "mob"; rev = "v${version}"; - hash = "sha256-LktA7GMOWAl12PRLgX8VTyYZ00sh6AHsgw9NdyjAJ64="; + hash = "sha256-+zNlxIvIvPyz0vA9IPaMzP8wfEXwNyRcvp45ohzoxQQ="; }; vendorHash = null; 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 184/300] 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 543781083afffe71d6250862eb494c244355fa11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de> Date: Sat, 28 Sep 2024 22:35:45 -0700 Subject: [PATCH 185/300] treewide: replace passthru.optional-dependencies with optional-dependencies --- .../file-managers/browsr/default.nix | 4 +- pkgs/applications/misc/dbx/default.nix | 2 +- pkgs/applications/misc/meerk40t/default.nix | 4 +- .../as/asciinema-automation/package.nix | 2 +- pkgs/by-name/co/comic-mandown/package.nix | 4 +- .../ho/homeassistant-satellite/package.nix | 2 +- pkgs/by-name/ji/jinja2-cli/package.nix | 4 +- pkgs/by-name/of/offat/package.nix | 2 +- pkgs/by-name/po/poethepoet/package.nix | 2 +- pkgs/by-name/st/strictdoc/package.nix | 2 +- pkgs/by-name/wy/wyoming-satellite/package.nix | 2 +- .../python-modules/acquire/default.nix | 4 +- .../python-modules/adb-shell/default.nix | 4 +- .../python-modules/aiobotocore/default.nix | 2 +- .../python-modules/aiocoap/default.nix | 2 +- .../python-modules/aioftp/default.nix | 4 +- .../python-modules/aiojobs/default.nix | 4 +- .../python-modules/aiomisc/default.nix | 4 +- .../python-modules/aioprometheus/default.nix | 4 +- .../python-modules/alpha-vantage/default.nix | 4 +- .../python-modules/androidtv/default.nix | 4 +- .../python-modules/angr/default.nix | 2 +- .../python-modules/anthropic/default.nix | 2 +- .../python-modules/anyio/default.nix | 4 +- .../python-modules/apischema/default.nix | 4 +- .../python-modules/apispec/default.nix | 4 +- .../arabic-reshaper/default.nix | 2 +- .../python-modules/argilla/default.nix | 4 +- .../argparse-manpage/default.nix | 2 +- .../python-modules/aria2p/default.nix | 4 +- .../python-modules/avwx-engine/default.nix | 4 +- .../python-modules/awswrangler/default.nix | 2 +- .../python-modules/azure-core/default.nix | 4 +- .../azure-storage-file-share/default.nix | 2 +- .../azure-storage-queue/default.nix | 2 +- .../python-modules/base2048/default.nix | 2 +- .../bc-detect-secrets/default.nix | 4 +- .../python-modules/beautifulsoup4/default.nix | 4 +- .../python-modules/betterproto/default.nix | 4 +- .../bimmer-connected/default.nix | 4 +- .../python-modules/black/default.nix | 4 +- .../python-modules/bleach/default.nix | 2 +- .../python-modules/bonsai/default.nix | 2 +- .../python-modules/boto3-stubs/default.nix | 2 +- .../python-modules/boto3/default.nix | 2 +- .../python-modules/botocore/default.nix | 2 +- .../python-modules/breezy/default.nix | 17 ++-- .../python-modules/btchip-python/default.nix | 2 +- .../python-modules/bugsnag/default.nix | 2 +- .../python-modules/bytewax/default.nix | 4 +- .../python-modules/cachecontrol/default.nix | 4 +- .../camel-converter/default.nix | 4 +- .../python-modules/canals/default.nix | 4 +- .../python-modules/canmatrix/default.nix | 4 +- .../python-modules/cantools/default.nix | 4 +- .../python-modules/cartopy/default.nix | 4 +- .../python-modules/cashews/default.nix | 2 +- .../cassandra-driver/default.nix | 4 +- .../python-modules/celery/default.nix | 4 +- .../python-modules/certomancer/default.nix | 4 +- .../python-modules/channels-redis/default.nix | 2 +- .../python-modules/cherrypy/default.nix | 2 +- .../python-modules/clarifai/default.nix | 2 +- .../python-modules/clevercsv/default.nix | 4 +- .../python-modules/cli-helpers/default.nix | 4 +- .../clickhouse-connect/default.nix | 16 ++-- .../python-modules/cloudpathlib/default.nix | 2 +- .../python-modules/cmdstanpy/default.nix | 4 +- .../coinmetrics-api-client/default.nix | 8 +- .../python-modules/compressai/default.nix | 2 +- .../python-modules/configargparse/default.nix | 4 +- .../confluent-kafka/default.nix | 4 +- .../python-modules/connexion/default.nix | 4 +- .../python-modules/construct/default.nix | 4 +- .../python-modules/corner/default.nix | 4 +- .../cyclonedx-python-lib/default.nix | 4 +- .../dask-gateway-server/default.nix | 2 +- .../python-modules/databases/default.nix | 2 +- .../dataclass-wizard/default.nix | 4 +- .../python-modules/dataproperty/default.nix | 2 +- .../python-modules/dateparser/default.nix | 4 +- .../python-modules/debuglater/default.nix | 4 +- .../python-modules/deepdiff/default.nix | 4 +- .../python-modules/defcon/default.nix | 2 +- .../python-modules/demoji/default.nix | 2 +- .../dependency-injector/default.nix | 10 +- .../python-modules/detectron2/default.nix | 2 +- .../python-modules/diffusers/default.nix | 4 +- .../python-modules/diofant/default.nix | 2 +- .../python-modules/discum/default.nix | 2 +- .../python-modules/dissect-btrfs/default.nix | 2 +- .../dissect-cobaltstrike/default.nix | 4 +- .../dissect-hypervisor/default.nix | 2 +- .../dissect-squashfs/default.nix | 2 +- .../python-modules/dissect-target/default.nix | 10 +- .../python-modules/dj-rest-auth/default.nix | 4 +- .../python-modules/django-allauth/default.nix | 4 +- .../django-import-export/default.nix | 4 +- .../python-modules/django-markup/default.nix | 4 +- .../django-modelcluster/default.nix | 4 +- .../python-modules/django-redis/default.nix | 4 +- .../django-storages/default.nix | 4 +- .../python-modules/django-stubs/default.nix | 4 +- .../python-modules/django-tables2/default.nix | 4 +- .../django-two-factor-auth/default.nix | 2 +- pkgs/development/python-modules/django/4.nix | 4 +- .../djangorestframework-simplejwt/default.nix | 2 +- .../djangorestframework-stubs/default.nix | 4 +- .../python-modules/dm-sonnet/default.nix | 2 +- .../python-modules/dns-lexicon/default.nix | 4 +- .../python-modules/dnspython/default.nix | 4 +- .../python-modules/dparse/default.nix | 4 +- .../draftjs-exporter/default.nix | 4 +- .../python-modules/dramatiq/default.nix | 2 +- .../python-modules/drawsvg/default.nix | 2 +- .../python-modules/dsnap/default.nix | 4 +- .../python-modules/dvc-render/default.nix | 4 +- .../python-modules/dvc/default.nix | 10 +- .../python-modules/dvclive/default.nix | 2 +- .../python-modules/edalize/default.nix | 4 +- .../python-modules/elasticsearch/default.nix | 2 +- .../python-modules/elasticsearch8/default.nix | 2 +- .../python-modules/esig/default.nix | 2 +- .../essentials-openapi/default.nix | 2 +- .../python-modules/eth-hash/default.nix | 6 +- .../python-modules/eth-keys/default.nix | 4 +- .../python-modules/etils/default.nix | 4 +- .../python-modules/exchangelib/default.nix | 2 +- .../python-modules/explorerscript/default.nix | 4 +- .../python-modules/fakeredis/default.nix | 2 +- .../python-modules/fastparquet/default.nix | 2 +- .../python-modules/fido2/default.nix | 2 +- .../firebase-messaging/default.nix | 4 +- .../python-modules/fixtures/default.nix | 4 +- .../flask-jwt-extended/default.nix | 4 +- .../flask-marshmallow/default.nix | 4 +- .../flask-mongoengine/default.nix | 2 +- .../python-modules/flask-wtf/default.nix | 2 +- .../python-modules/flask/default.nix | 4 +- .../python-modules/flax/default.nix | 2 +- .../python-modules/flow-record/default.nix | 4 +- .../python-modules/foolscap/default.nix | 4 +- .../fritzconnection/default.nix | 2 +- .../python-modules/fschat/default.nix | 2 +- .../python-modules/fsspec/default.nix | 2 +- .../python-modules/fugashi/default.nix | 4 +- .../python-modules/fvcore/default.nix | 2 +- .../gardena-bluetooth/default.nix | 2 +- .../python-modules/githubkit/default.nix | 4 +- .../google-api-core/default.nix | 2 +- .../python-modules/google-auth/default.nix | 8 +- .../google-cloud-bigquery-storage/default.nix | 2 +- .../google-cloud-bigquery/default.nix | 4 +- .../google-cloud-bigtable/default.nix | 2 +- .../google-cloud-core/default.nix | 4 +- .../google-cloud-pubsub/default.nix | 2 +- .../google-cloud-spanner/default.nix | 2 +- .../google-cloud-storage/default.nix | 2 +- .../google-resumable-media/default.nix | 4 +- .../python-modules/gotailwind/default.nix | 2 +- .../python-modules/gradio/default.nix | 4 +- .../python-modules/griffe/default.nix | 2 +- .../python-modules/hap-python/default.nix | 4 +- .../python-modules/haystack-ai/default.nix | 2 +- .../python-modules/highdicom/default.nix | 4 +- .../hikari-lightbulb/default.nix | 2 +- .../python-modules/hikari/default.nix | 2 +- .../python-modules/hishel/default.nix | 4 +- .../python-modules/htmldate/default.nix | 2 +- .../python-modules/httpbin/default.nix | 2 +- .../python-modules/httpcore/default.nix | 4 +- .../python-modules/httpx-socks/default.nix | 2 +- .../python-modules/httpx/default.nix | 4 +- .../python-modules/ibis-framework/default.nix | 96 +++++++++---------- .../python-modules/igraph/default.nix | 4 +- .../imbalanced-learn/default.nix | 2 +- .../influxdb-client/default.nix | 2 +- .../python-modules/intake/default.nix | 4 +- .../python-modules/iopath/default.nix | 2 +- .../python-modules/jinja2/default.nix | 4 +- .../python-modules/jira/default.nix | 2 +- .../python-modules/jsonargparse/default.nix | 2 +- .../python-modules/jsonschema/default.nix | 2 +- .../python-modules/jupyter-events/default.nix | 4 +- .../kafka-python-ng/default.nix | 4 +- .../python-modules/layoutparser/default.nix | 2 +- .../python-modules/librosa/default.nix | 4 +- .../python-modules/lightgbm/default.nix | 2 +- .../python-modules/line-profiler/default.nix | 4 +- .../python-modules/litellm/default.nix | 2 +- .../python-modules/llmx/default.nix | 2 +- .../python-modules/logbook/default.nix | 4 +- .../python-modules/magic-wormhole/default.nix | 4 +- .../python-modules/mako/default.nix | 4 +- .../python-modules/mandown/default.nix | 2 +- .../python-modules/manifest-ml/default.nix | 4 +- .../python-modules/markdown-it-py/default.nix | 4 +- .../python-modules/markdown2/default.nix | 6 +- .../python-modules/mashumaro/default.nix | 4 +- .../python-modules/mastodon-py/default.nix | 4 +- .../python-modules/matplotx/default.nix | 4 +- .../python-modules/mayim/default.nix | 4 +- .../python-modules/meshtastic/default.nix | 4 +- .../python-modules/mip/default.nix | 2 +- .../mkdocs-material/default.nix | 2 +- .../python-modules/mkdocs/default.nix | 4 +- .../python-modules/mne-python/default.nix | 4 +- .../python-modules/mocket/default.nix | 4 +- .../moderngl-window/default.nix | 2 +- .../python-modules/molecule/plugins.nix | 2 +- .../python-modules/moviepy/default.nix | 4 +- .../python-modules/mpd2/default.nix | 4 +- .../python-modules/mpmath/default.nix | 2 +- .../python-modules/mrjob/default.nix | 4 +- .../python-modules/nats-py/default.nix | 2 +- .../python-modules/ndindex/default.nix | 4 +- .../python-modules/neo4j/default.nix | 2 +- .../python-modules/netutils/default.nix | 2 +- .../python-modules/networkx/default.nix | 2 +- .../python-modules/nibabel/default.nix | 4 +- .../python-modules/nibe/default.nix | 2 +- .../python-modules/norfair/default.nix | 2 +- .../python-modules/nose2/default.nix | 4 +- .../python-modules/numcodecs/default.nix | 2 +- .../python-modules/oauthenticator/default.nix | 4 +- .../python-modules/oauthlib/default.nix | 4 +- .../python-modules/objgraph/default.nix | 2 +- .../python-modules/ome-zarr/default.nix | 2 +- .../python-modules/openai/default.nix | 2 +- .../python-modules/openant/default.nix | 2 +- .../python-modules/opencontainers/default.nix | 4 +- .../python-modules/opensearch-py/default.nix | 4 +- .../default.nix | 4 +- .../default.nix | 2 +- .../python-modules/optuna/default.nix | 4 +- .../python-modules/ormar/default.nix | 4 +- .../python-modules/pandas/default.nix | 4 +- .../python-modules/papermill/default.nix | 18 ++-- .../python-modules/paramiko/default.nix | 6 +- .../python-modules/partd/default.nix | 2 +- .../python-modules/passlib/default.nix | 14 +-- .../python-modules/pettingzoo/default.nix | 2 +- .../python-modules/photutils/default.nix | 2 +- .../python-modules/pins/default.nix | 4 +- .../python-modules/pipdeptree/default.nix | 4 +- .../playwrightcapture/default.nix | 2 +- .../python-modules/podman/default.nix | 2 +- .../python-modules/prance/default.nix | 4 +- .../prometheus-async/default.nix | 2 +- .../python-modules/prophet/default.nix | 2 +- .../python-modules/psycopg/default.nix | 6 +- .../pure-python-adb/default.nix | 4 +- .../pyTelegramBotAPI/default.nix | 4 +- .../python-modules/pycyphal/default.nix | 4 +- .../development/python-modules/pydantic/1.nix | 4 +- .../python-modules/pydeck/default.nix | 4 +- .../python-modules/pydocstyle/default.nix | 4 +- .../python-modules/pydrive2/default.nix | 2 +- .../python-modules/pydruid/default.nix | 14 ++- .../python-modules/pyftpdlib/default.nix | 2 +- .../python-modules/pygal/default.nix | 4 +- .../python-modules/pygls/default.nix | 2 +- .../python-modules/pykoplenti/default.nix | 2 +- .../python-modules/pylint-django/default.nix | 2 +- .../pylutron-caseta/default.nix | 2 +- .../python-modules/pymatgen/default.nix | 4 +- .../python-modules/pymodbus/default.nix | 4 +- .../python-modules/pymysensors/default.nix | 2 +- .../python-modules/pypsrp/default.nix | 2 +- .../pyreqwest-impersonate/default.nix | 2 +- .../python-modules/pysaml2/default.nix | 2 +- .../python-modules/pyscaffold/default.nix | 2 +- .../pyscaffoldext-cookiecutter/default.nix | 2 +- .../default.nix | 2 +- .../pyscaffoldext-django/default.nix | 2 +- .../pyscaffoldext-dsproject/default.nix | 2 +- .../pyscaffoldext-markdown/default.nix | 2 +- .../pyscaffoldext-travis/default.nix | 2 +- .../python-modules/pyspark/default.nix | 2 +- .../python-modules/pyspnego/default.nix | 2 +- .../python-modules/pytablewriter/default.nix | 4 +- .../pytest-benchmark/default.nix | 4 +- .../python-modules/pytest-jupyter/default.nix | 4 +- .../pytest-regressions/default.nix | 2 +- pkgs/development/python-modules/pytest/7.nix | 2 +- .../python-modules/pytest/default.nix | 2 +- .../python-modules/python-barcode/default.nix | 4 +- .../python-benedict/default.nix | 4 +- .../python-modules/python-box/default.nix | 4 +- .../python-modules/python-can/default.nix | 4 +- .../python-engineio/default.nix | 2 +- .../python-modules/python-jose/default.nix | 4 +- .../python-modules/python-kasa/default.nix | 2 +- .../python-modules/python-libnmap/default.nix | 2 +- .../python-openstackclient/default.nix | 37 +++---- .../python-modules/python-slugify/default.nix | 2 +- .../python-socketio/default.nix | 4 +- .../python-modules/python-stdnum/default.nix | 2 +- .../python-u2flib-server/default.nix | 4 +- .../python-modules/pythonfinder/default.nix | 4 +- .../python-modules/pytoolconfig/default.nix | 6 +- .../python-modules/pytradfri/default.nix | 4 +- .../python-modules/pyutil/default.nix | 4 +- .../python-modules/pyvisa-py/default.nix | 2 +- .../python-modules/pyvmomi/default.nix | 2 +- .../python-modules/pywavefront/default.nix | 2 +- .../python-modules/qdrant-client/default.nix | 2 +- .../python-modules/qpsolvers/default.nix | 6 +- .../python-modules/qrcode/default.nix | 4 +- .../python-modules/qutip/default.nix | 4 +- .../python-modules/radon/default.nix | 2 +- .../python-modules/rapidfuzz/default.nix | 2 +- .../python-modules/rasterio/default.nix | 2 +- .../python-modules/raven/default.nix | 2 +- .../python-modules/rdflib/default.nix | 4 +- .../python-modules/reconplogger/default.nix | 2 +- .../python-modules/redis/default.nix | 2 +- .../python-modules/relatorio/default.nix | 4 +- .../reportlab-qrcode/default.nix | 2 +- .../python-modules/reptor/default.nix | 4 +- .../python-modules/requests-cache/default.nix | 4 +- .../requests-credssp/default.nix | 2 +- .../python-modules/rich/default.nix | 2 +- .../ripe-atlas-sagan/default.nix | 2 +- .../python-modules/s3transfer/default.nix | 2 +- .../python-modules/sagemaker/default.nix | 2 +- .../python-modules/samsungctl/default.nix | 2 +- .../python-modules/samsungtvws/default.nix | 4 +- .../python-modules/sanic/default.nix | 4 +- .../python-modules/schema-salad/default.nix | 4 +- .../python-modules/scikit-image/default.nix | 2 +- .../scim2-filter-parser/default.nix | 4 +- .../python-modules/seaborn/default.nix | 2 +- .../python-modules/seabreeze/default.nix | 4 +- .../python-modules/seasonal/default.nix | 4 +- .../securesystemslib/default.nix | 4 +- .../python-modules/sentry-sdk/1.nix | 2 +- .../python-modules/sfrbox-api/default.nix | 4 +- .../python-modules/shap/default.nix | 2 +- .../python-modules/simpful/default.nix | 4 +- .../skytemple-files/default.nix | 4 +- .../python-modules/slack-bolt/default.nix | 4 +- .../social-auth-core/default.nix | 4 +- .../spatialmath-python/default.nix | 2 +- .../sphinxext-opengraph/default.nix | 4 +- .../python-modules/splinter/default.nix | 4 +- .../sqlalchemy-utils/default.nix | 4 +- .../python-modules/sqlalchemy/1_4.nix | 2 +- .../python-modules/sqlalchemy/default.nix | 2 +- .../python-modules/static3/default.nix | 4 +- .../python-modules/stm32loader/default.nix | 4 +- .../strawberry-graphql/default.nix | 4 +- .../python-modules/sunpy/default.nix | 12 +-- .../python-modules/superqt/default.nix | 2 +- .../python-modules/tablib/default.nix | 2 +- .../python-modules/tabulate/default.nix | 4 +- .../python-modules/telegraph/default.nix | 2 +- .../default.nix | 2 +- .../tree-sitter-html/default.nix | 2 +- .../tree-sitter-javascript/default.nix | 2 +- .../tree-sitter-json/default.nix | 2 +- .../tree-sitter-python/default.nix | 2 +- .../tree-sitter-rust/default.nix | 2 +- .../trino-python-client/default.nix | 4 +- .../python-modules/troposphere/default.nix | 2 +- .../python-modules/twisted/default.nix | 46 ++++----- .../python-modules/txtai/default.nix | 2 +- .../python-modules/typed-settings/default.nix | 4 +- .../python-modules/typepy/default.nix | 4 +- .../types-aiobotocore/default.nix | 2 +- .../python-modules/ubelt/default.nix | 2 +- .../python-modules/ufmt/default.nix | 4 +- .../python-modules/ufolib2/default.nix | 4 +- .../python-modules/umap-learn/default.nix | 2 +- .../python-modules/unrpa/default.nix | 2 +- .../python-modules/unstructured/default.nix | 2 +- .../python-modules/urllib3/default.nix | 4 +- .../python-modules/urwid/default.nix | 4 +- .../python-modules/uvicorn/default.nix | 2 +- .../python-modules/vega/default.nix | 2 +- .../python-modules/versioneer/default.nix | 2 +- .../python-modules/visions/default.nix | 4 +- .../python-modules/vivisect/default.nix | 4 +- .../python-modules/volvooncall/default.nix | 4 +- .../python-modules/w1thermsensor/default.nix | 4 +- .../python-modules/watchdog/default.nix | 4 +- .../python-modules/watermark/default.nix | 4 +- .../python-modules/web3/default.nix | 2 +- .../python-modules/webdav4/default.nix | 4 +- .../python-modules/weconnect/default.nix | 2 +- .../python-modules/werkzeug/default.nix | 4 +- .../python-modules/willow/default.nix | 4 +- .../python-modules/wktutils/default.nix | 2 +- .../python-modules/wled/default.nix | 2 +- .../python-modules/wtforms/default.nix | 4 +- .../python-modules/wyoming/default.nix | 2 +- .../python-modules/xsdata/default.nix | 10 +- .../python-modules/yfinance/default.nix | 2 +- .../python-modules/zeep/default.nix | 4 +- pkgs/servers/matrix-synapse/default.nix | 4 +- pkgs/servers/mautrix-googlechat/default.nix | 8 +- pkgs/tools/audio/shaq/default.nix | 2 +- pkgs/tools/backup/borgmatic/default.nix | 4 +- pkgs/tools/security/amoco/default.nix | 2 +- pkgs/top-level/all-packages.nix | 2 +- 405 files changed, 751 insertions(+), 769 deletions(-) diff --git a/pkgs/applications/file-managers/browsr/default.nix b/pkgs/applications/file-managers/browsr/default.nix index d007bb5792af..435577aa567b 100644 --- a/pkgs/applications/file-managers/browsr/default.nix +++ b/pkgs/applications/file-managers/browsr/default.nix @@ -32,9 +32,9 @@ python3.pkgs.buildPythonApplication rec { rich-pixels textual textual-universal-directorytree - ] ++ lib.attrVals extras passthru.optional-dependencies; + ] ++ lib.attrVals extras optional-dependencies; - passthru.optional-dependencies = with python3.pkgs; { + optional-dependencies = with python3.pkgs; { all = [ pyarrow textual-universal-directorytree.optional-dependencies.remote diff --git a/pkgs/applications/misc/dbx/default.nix b/pkgs/applications/misc/dbx/default.nix index 294bc33a0ba7..f3f340943441 100644 --- a/pkgs/applications/misc/dbx/default.nix +++ b/pkgs/applications/misc/dbx/default.nix @@ -52,7 +52,7 @@ python.pkgs.buildPythonApplication rec { watchdog ]; - passthru.optional-dependencies = with python3.pkgs; { + optional-dependencies = with python3.pkgs; { aws = [ boto3 ]; azure = [ azure-storage-blob diff --git a/pkgs/applications/misc/meerk40t/default.nix b/pkgs/applications/misc/meerk40t/default.nix index e0a3921824de..18b4b0b9d2b2 100644 --- a/pkgs/applications/misc/meerk40t/default.nix +++ b/pkgs/applications/misc/meerk40t/default.nix @@ -36,9 +36,9 @@ python3Packages.buildPythonApplication rec { setuptools wxpython ] - ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ++ lib.flatten (lib.attrValues optional-dependencies); - passthru.optional-dependencies = with python3Packages; { + optional-dependencies = with python3Packages; { cam = [ opencv4 ]; diff --git a/pkgs/by-name/as/asciinema-automation/package.nix b/pkgs/by-name/as/asciinema-automation/package.nix index 339ec370a96f..975659da7cdc 100644 --- a/pkgs/by-name/as/asciinema-automation/package.nix +++ b/pkgs/by-name/as/asciinema-automation/package.nix @@ -26,7 +26,7 @@ python3.pkgs.buildPythonApplication rec { pexpect ]; - passthru.optional-dependencies = with python3.pkgs; { + optional-dependencies = with python3.pkgs; { dev = [ mypy pytest diff --git a/pkgs/by-name/co/comic-mandown/package.nix b/pkgs/by-name/co/comic-mandown/package.nix index 15b81cc5e83e..90f2ef215500 100644 --- a/pkgs/by-name/co/comic-mandown/package.nix +++ b/pkgs/by-name/co/comic-mandown/package.nix @@ -4,8 +4,8 @@ , withGUI ? true }: let - mandown' = python3Packages.mandown.overrideAttrs (prev: { - propagatedBuildInputs = prev.propagatedBuildInputs ++ lib.optionals withGUI prev.passthru.optional-dependencies.gui; + mandown' = python3Packages.mandown.overridePythonAttrs (prev: { + propagatedBuildInputs = prev.propagatedBuildInputs ++ lib.optionals withGUI prev.optional-dependencies.gui; }); mandownApp = python3Packages.toPythonApplication mandown'; in diff --git a/pkgs/by-name/ho/homeassistant-satellite/package.nix b/pkgs/by-name/ho/homeassistant-satellite/package.nix index cf69238d8af5..40a489aa68de 100644 --- a/pkgs/by-name/ho/homeassistant-satellite/package.nix +++ b/pkgs/by-name/ho/homeassistant-satellite/package.nix @@ -27,7 +27,7 @@ python3.pkgs.buildPythonApplication rec { aiohttp ]; - passthru.optional-dependencies = { + optional-dependencies = { pulseaudio = with python3.pkgs; [ pasimple pulsectl diff --git a/pkgs/by-name/ji/jinja2-cli/package.nix b/pkgs/by-name/ji/jinja2-cli/package.nix index 921d668952cd..fb322d161e00 100644 --- a/pkgs/by-name/ji/jinja2-cli/package.nix +++ b/pkgs/by-name/ji/jinja2-cli/package.nix @@ -27,11 +27,11 @@ python3.pkgs.buildPythonApplication rec { propagatedBuildInputs = with python3.pkgs; [ jinja2 - ] ++ lib.attrVals extras passthru.optional-dependencies; + ] ++ lib.attrVals extras optional-dependencies; pythonImportsCheck = [ "jinja2cli" ]; - passthru.optional-dependencies = with python3.pkgs; { + optional-dependencies = with python3.pkgs; { hjson = [ hjson ]; json5 = [ json5 ]; toml = [ toml ]; diff --git a/pkgs/by-name/of/offat/package.nix b/pkgs/by-name/of/offat/package.nix index 7fafe3d817ae..46bbba00f771 100644 --- a/pkgs/by-name/of/offat/package.nix +++ b/pkgs/by-name/of/offat/package.nix @@ -33,7 +33,7 @@ python3.pkgs.buildPythonApplication rec { tenacity ]; - passthru.optional-dependencies = { + optional-dependencies = { api = with python3.pkgs; [ fastapi uvicorn diff --git a/pkgs/by-name/po/poethepoet/package.nix b/pkgs/by-name/po/poethepoet/package.nix index 7760d53e9312..8179b9c7e7d0 100644 --- a/pkgs/by-name/po/poethepoet/package.nix +++ b/pkgs/by-name/po/poethepoet/package.nix @@ -24,7 +24,7 @@ python3.pkgs.buildPythonApplication rec { tomli ]; - passthru.optional-dependencies = with python3.pkgs; { + optional-dependencies = with python3.pkgs; { poetry_plugin = [ poetry ]; diff --git a/pkgs/by-name/st/strictdoc/package.nix b/pkgs/by-name/st/strictdoc/package.nix index e543f6ed5017..49475a7f46a8 100644 --- a/pkgs/by-name/st/strictdoc/package.nix +++ b/pkgs/by-name/st/strictdoc/package.nix @@ -45,7 +45,7 @@ python3.pkgs.buildPythonApplication rec { xlsxwriter ]; - passthru.optional-dependencies = with python3.pkgs; { + optional-dependencies = with python3.pkgs; { development = [ invoke tox diff --git a/pkgs/by-name/wy/wyoming-satellite/package.nix b/pkgs/by-name/wy/wyoming-satellite/package.nix index f23a5864b452..bfd0e49f6f71 100644 --- a/pkgs/by-name/wy/wyoming-satellite/package.nix +++ b/pkgs/by-name/wy/wyoming-satellite/package.nix @@ -30,7 +30,7 @@ python3Packages.buildPythonApplication rec { zeroconf ]; - passthru.optional-dependencies = { + optional-dependencies = { silerovad = with python3Packages; [ pysilero-vad ]; diff --git a/pkgs/development/python-modules/acquire/default.nix b/pkgs/development/python-modules/acquire/default.nix index ca5f1c39a608..2157e0fc7b20 100644 --- a/pkgs/development/python-modules/acquire/default.nix +++ b/pkgs/development/python-modules/acquire/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { dissect-target ]; - passthru.optional-dependencies = { + optional-dependencies = { full = [ dissect-target minio @@ -52,7 +52,7 @@ buildPythonPackage rec { ] ++ dissect-target.optional-dependencies.full; }; - nativeCheckInputs = [ pytestCheckHook ] ++ passthru.optional-dependencies.full; + nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.full; pythonImportsCheck = [ "acquire" ]; diff --git a/pkgs/development/python-modules/adb-shell/default.nix b/pkgs/development/python-modules/adb-shell/default.nix index a7347c080d78..b37440c51c8b 100644 --- a/pkgs/development/python-modules/adb-shell/default.nix +++ b/pkgs/development/python-modules/adb-shell/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { rsa ]; - passthru.optional-dependencies = { + optional-dependencies = { async = [ aiofiles async-timeout @@ -46,7 +46,7 @@ buildPythonPackage rec { mock pycryptodome pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "adb_shell" ]; diff --git a/pkgs/development/python-modules/aiobotocore/default.nix b/pkgs/development/python-modules/aiobotocore/default.nix index 75fa1cc5b5dc..40a5adfd3c23 100644 --- a/pkgs/development/python-modules/aiobotocore/default.nix +++ b/pkgs/development/python-modules/aiobotocore/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { wrapt ]; - passthru.optional-dependencies = { + optional-dependencies = { awscli = [ awscli ]; boto3 = [ boto3 ]; }; diff --git a/pkgs/development/python-modules/aiocoap/default.nix b/pkgs/development/python-modules/aiocoap/default.nix index 51a73cc4ecbf..00592ed89516 100644 --- a/pkgs/development/python-modules/aiocoap/default.nix +++ b/pkgs/development/python-modules/aiocoap/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { build-system = [ setuptools ]; - passthru.optional-dependencies = { + optional-dependencies = { oscore = [ cbor2 cryptography diff --git a/pkgs/development/python-modules/aioftp/default.nix b/pkgs/development/python-modules/aioftp/default.nix index ee0429bacb46..a926f96b8d12 100644 --- a/pkgs/development/python-modules/aioftp/default.nix +++ b/pkgs/development/python-modules/aioftp/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ siosocks ]; - passthru.optional-dependencies = { + optional-dependencies = { socks = [ siosocks ]; }; @@ -42,7 +42,7 @@ buildPythonPackage rec { pytest-asyncio pytestCheckHook trustme - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ # uses 127.0.0.2, which macos doesn't like diff --git a/pkgs/development/python-modules/aiojobs/default.nix b/pkgs/development/python-modules/aiojobs/default.nix index 437e5a3ce0ce..8ee952feb39f 100644 --- a/pkgs/development/python-modules/aiojobs/default.nix +++ b/pkgs/development/python-modules/aiojobs/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { propagatedBuildInputs = lib.optionals (pythonOlder "3.11") [ async-timeout ]; - passthru.optional-dependencies = { + optional-dependencies = { aiohttp = [ aiohttp ]; }; @@ -45,7 +45,7 @@ buildPythonPackage rec { pytestCheckHook pytest-aiohttp pytest-cov-stub - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "aiojobs" ]; diff --git a/pkgs/development/python-modules/aiomisc/default.nix b/pkgs/development/python-modules/aiomisc/default.nix index 59412173e977..a9dabfd3ee2a 100644 --- a/pkgs/development/python-modules/aiomisc/default.nix +++ b/pkgs/development/python-modules/aiomisc/default.nix @@ -45,9 +45,9 @@ buildPythonPackage rec { fastapi pytestCheckHook setproctitle - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); - passthru.optional-dependencies = { + optional-dependencies = { aiohttp = [ aiohttp ]; #asgi = [ aiohttp-asgi ]; cron = [ croniter ]; diff --git a/pkgs/development/python-modules/aioprometheus/default.nix b/pkgs/development/python-modules/aioprometheus/default.nix index 0c74e4a6ac25..2dc49ae5b1f8 100644 --- a/pkgs/development/python-modules/aioprometheus/default.nix +++ b/pkgs/development/python-modules/aioprometheus/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { quantile-python ]; - passthru.optional-dependencies = { + optional-dependencies = { aiohttp = [ aiohttp ]; starlette = [ starlette ]; quart = [ quart ]; @@ -46,7 +46,7 @@ buildPythonPackage rec { httpx fastapi uvicorn - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "aioprometheus" ]; diff --git a/pkgs/development/python-modules/alpha-vantage/default.nix b/pkgs/development/python-modules/alpha-vantage/default.nix index 3e39efa7d384..7830701eabee 100644 --- a/pkgs/development/python-modules/alpha-vantage/default.nix +++ b/pkgs/development/python-modules/alpha-vantage/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { requests ]; - passthru.optional-dependencies = { + optional-dependencies = { pandas = [ pandas ]; @@ -49,7 +49,7 @@ buildPythonPackage rec { aioresponses requests-mock pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); # Starting with 3.0.0 most tests require an API key doCheck = false; diff --git a/pkgs/development/python-modules/androidtv/default.nix b/pkgs/development/python-modules/androidtv/default.nix index 799306fa30f0..c277a6e28993 100644 --- a/pkgs/development/python-modules/androidtv/default.nix +++ b/pkgs/development/python-modules/androidtv/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pure-python-adb ]; - passthru.optional-dependencies = { + optional-dependencies = { async = [ aiofiles ]; inherit (adb-shell.optional-dependencies) usb; }; @@ -39,7 +39,7 @@ buildPythonPackage rec { nativeCheckInputs = [ mock pytestCheckHook - ] ++ passthru.optional-dependencies.async ++ passthru.optional-dependencies.usb; + ] ++ optional-dependencies.async ++ optional-dependencies.usb; disabledTests = [ # Requires git but fails anyway diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index 15663d0e790f..d382cc49c987 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -91,7 +91,7 @@ buildPythonPackage rec { unique-log-filter ]; - passthru.optional-dependencies = { + optional-dependencies = { AngrDB = [ sqlalchemy ]; }; diff --git a/pkgs/development/python-modules/anthropic/default.nix b/pkgs/development/python-modules/anthropic/default.nix index 014b1feaa0f6..3ae9c38314c4 100644 --- a/pkgs/development/python-modules/anthropic/default.nix +++ b/pkgs/development/python-modules/anthropic/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { typing-extensions ]; - passthru.optional-dependencies = { + optional-dependencies = { vertex = [ google-auth ]; }; diff --git a/pkgs/development/python-modules/anyio/default.nix b/pkgs/development/python-modules/anyio/default.nix index 23f249bfcad2..d2655fa2a1e1 100644 --- a/pkgs/development/python-modules/anyio/default.nix +++ b/pkgs/development/python-modules/anyio/default.nix @@ -56,7 +56,7 @@ buildPythonPackage rec { typing-extensions ]; - passthru.optional-dependencies = { + optional-dependencies = { trio = [ trio ]; }; @@ -69,7 +69,7 @@ buildPythonPackage rec { pytestCheckHook trustme uvloop - ] ++ passthru.optional-dependencies.trio; + ] ++ optional-dependencies.trio; pytestFlagsArray = [ "-W" diff --git a/pkgs/development/python-modules/apischema/default.nix b/pkgs/development/python-modules/apischema/default.nix index 1034d1d02160..632489d7cce9 100644 --- a/pkgs/development/python-modules/apischema/default.nix +++ b/pkgs/development/python-modules/apischema/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { hash = "sha256-omw6znk09r2SigPfaVrtA6dd8KeSfjaPgGfK12ty23g="; }; - passthru.optional-dependencies = { + optional-dependencies = { graphql = [ graphql-core ]; }; nativeCheckInputs = [ pytest-asyncio pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "apischema" ]; diff --git a/pkgs/development/python-modules/apispec/default.nix b/pkgs/development/python-modules/apispec/default.nix index 2ca9be416c8f..9c487d1dd6f3 100644 --- a/pkgs/development/python-modules/apispec/default.nix +++ b/pkgs/development/python-modules/apispec/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ packaging ]; - passthru.optional-dependencies = { + optional-dependencies = { marshmallow = [ marshmallow ]; yaml = [ pyyaml ]; validation = [ @@ -41,7 +41,7 @@ buildPythonPackage rec { nativeCheckInputs = [ mock pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "apispec" ]; diff --git a/pkgs/development/python-modules/arabic-reshaper/default.nix b/pkgs/development/python-modules/arabic-reshaper/default.nix index 36c9aaf01395..6e1610e6f0cd 100644 --- a/pkgs/development/python-modules/arabic-reshaper/default.nix +++ b/pkgs/development/python-modules/arabic-reshaper/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { hash = "sha256-ucSC5aTvpnlAVQcT0afVecnoN3hIZKtzUhEQ6Qg0jQM="; }; - passthru.optional-dependencies = { + optional-dependencies = { with-fonttools = [ fonttools ]; }; diff --git a/pkgs/development/python-modules/argilla/default.nix b/pkgs/development/python-modules/argilla/default.nix index 50ea4cbb74f8..c767e7ca3eed 100644 --- a/pkgs/development/python-modules/argilla/default.nix +++ b/pkgs/development/python-modules/argilla/default.nix @@ -106,7 +106,7 @@ buildPythonPackage rec { typer ]; - passthru.optional-dependencies = { + optional-dependencies = { server = [ aiofiles @@ -178,7 +178,7 @@ buildPythonPackage rec { pytest-mock pytest-asyncio factory-boy - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); disabledTestPaths = [ "tests/server/datasets/test_dao.py" ]; diff --git a/pkgs/development/python-modules/argparse-manpage/default.nix b/pkgs/development/python-modules/argparse-manpage/default.nix index 77bd37acd6f6..e3423a8c56e3 100644 --- a/pkgs/development/python-modules/argparse-manpage/default.nix +++ b/pkgs/development/python-modules/argparse-manpage/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "argparse_manpage" ]; - passthru.optional-dependencies = { + optional-dependencies = { setuptools = [ setuptools ]; }; diff --git a/pkgs/development/python-modules/aria2p/default.nix b/pkgs/development/python-modules/aria2p/default.nix index 132f467e0499..b2ac4e967398 100644 --- a/pkgs/development/python-modules/aria2p/default.nix +++ b/pkgs/development/python-modules/aria2p/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { websocket-client ]; - passthru.optional-dependencies = { + optional-dependencies = { tui = [ asciimatics pyperclip @@ -64,7 +64,7 @@ buildPythonPackage rec { responses psutil uvicorn - ] ++ passthru.optional-dependencies.tui; + ] ++ optional-dependencies.tui; disabledTests = [ # require a running display server diff --git a/pkgs/development/python-modules/avwx-engine/default.nix b/pkgs/development/python-modules/avwx-engine/default.nix index af6162dc9263..808530221781 100644 --- a/pkgs/development/python-modules/avwx-engine/default.nix +++ b/pkgs/development/python-modules/avwx-engine/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { xmltodict ]; - passthru.optional-dependencies = { + optional-dependencies = { all = [ numpy rapidfuzz @@ -61,7 +61,7 @@ buildPythonPackage rec { pytest-cov-stub pytestCheckHook time-machine - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "avwx" ]; diff --git a/pkgs/development/python-modules/awswrangler/default.nix b/pkgs/development/python-modules/awswrangler/default.nix index 3f770c272c55..5ef6e53e6743 100644 --- a/pkgs/development/python-modules/awswrangler/default.nix +++ b/pkgs/development/python-modules/awswrangler/default.nix @@ -57,7 +57,7 @@ buildPythonPackage rec { requests-aws4auth ]; - passthru.optional-dependencies = { + optional-dependencies = { sqlserver = [ pyodbc ]; sparql = [ sparqlwrapper ]; }; diff --git a/pkgs/development/python-modules/azure-core/default.nix b/pkgs/development/python-modules/azure-core/default.nix index a9cdf1ac4e99..14fa56f4958d 100644 --- a/pkgs/development/python-modules/azure-core/default.nix +++ b/pkgs/development/python-modules/azure-core/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { typing-extensions ]; - passthru.optional-dependencies = { + optional-dependencies = { aio = [ aiohttp ]; }; @@ -54,7 +54,7 @@ buildPythonPackage rec { pytest-asyncio pytestCheckHook trio - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); # test server needs to be available preCheck = '' diff --git a/pkgs/development/python-modules/azure-storage-file-share/default.nix b/pkgs/development/python-modules/azure-storage-file-share/default.nix index 377b77975b84..5169b9a73366 100644 --- a/pkgs/development/python-modules/azure-storage-file-share/default.nix +++ b/pkgs/development/python-modules/azure-storage-file-share/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { typing-extensions ]; - passthru.optional-dependencies = { + optional-dependencies = { aio = [ azure-core ] ++ azure-core.optional-dependencies.aio; }; diff --git a/pkgs/development/python-modules/azure-storage-queue/default.nix b/pkgs/development/python-modules/azure-storage-queue/default.nix index 86f757e0ab44..dbeb4286bbfe 100644 --- a/pkgs/development/python-modules/azure-storage-queue/default.nix +++ b/pkgs/development/python-modules/azure-storage-queue/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { typing-extensions ]; - passthru.optional-dependencies = { + optional-dependencies = { aio = [ azure-core ] ++ azure-core.optional-dependencies.aio; }; diff --git a/pkgs/development/python-modules/base2048/default.nix b/pkgs/development/python-modules/base2048/default.nix index 4a760c5b6f19..9deaf973f793 100644 --- a/pkgs/development/python-modules/base2048/default.nix +++ b/pkgs/development/python-modules/base2048/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; - passthru.optional-dependencies = { + optional-dependencies = { fuzz = [ frelatage ]; }; diff --git a/pkgs/development/python-modules/bc-detect-secrets/default.nix b/pkgs/development/python-modules/bc-detect-secrets/default.nix index f392cdfbbc7a..3a0884103c7b 100644 --- a/pkgs/development/python-modules/bc-detect-secrets/default.nix +++ b/pkgs/development/python-modules/bc-detect-secrets/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { unidiff ]; - passthru.optional-dependencies = { + optional-dependencies = { word_list = [ pyahocorasick ]; gibberish = [ gibberish-detector ]; }; @@ -47,7 +47,7 @@ buildPythonPackage rec { pkgs.gitMinimal pytestCheckHook responses - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); preCheck = '' export HOME=$(mktemp -d); diff --git a/pkgs/development/python-modules/beautifulsoup4/default.nix b/pkgs/development/python-modules/beautifulsoup4/default.nix index 4ebcfd4128df..764f91ec409e 100644 --- a/pkgs/development/python-modules/beautifulsoup4/default.nix +++ b/pkgs/development/python-modules/beautifulsoup4/default.nix @@ -47,14 +47,14 @@ buildPythonPackage rec { soupsieve ]; - passthru.optional-dependencies = { + optional-dependencies = { html5lib = [ html5lib ]; lxml = [ lxml ]; }; nativeCheckInputs = [ pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "bs4" ]; diff --git a/pkgs/development/python-modules/betterproto/default.nix b/pkgs/development/python-modules/betterproto/default.nix index 5f42d46b1e58..ab36e1dda562 100644 --- a/pkgs/development/python-modules/betterproto/default.nix +++ b/pkgs/development/python-modules/betterproto/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { typing-extensions ]; - passthru.optional-dependencies.compiler = [ + optional-dependencies.compiler = [ black jinja2 isort @@ -54,7 +54,7 @@ buildPythonPackage rec { pytest-mock pytest7CheckHook tomlkit - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "betterproto" ]; diff --git a/pkgs/development/python-modules/bimmer-connected/default.nix b/pkgs/development/python-modules/bimmer-connected/default.nix index ef3ecbd638d4..da526eeba18d 100644 --- a/pkgs/development/python-modules/bimmer-connected/default.nix +++ b/pkgs/development/python-modules/bimmer-connected/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { pyjwt ]; - passthru.optional-dependencies = { + optional-dependencies = { china = [ pillow ]; }; @@ -57,7 +57,7 @@ buildPythonPackage rec { pytestCheckHook respx time-machine - ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); disabledTests = [ # presumably regressed in pytest-asyncio 0.23.0 diff --git a/pkgs/development/python-modules/black/default.nix b/pkgs/development/python-modules/black/default.nix index de9a6d9d48b6..f2648124c05c 100644 --- a/pkgs/development/python-modules/black/default.nix +++ b/pkgs/development/python-modules/black/default.nix @@ -54,7 +54,7 @@ buildPythonPackage rec { typing-extensions ]; - passthru.optional-dependencies = { + optional-dependencies = { colorama = [ colorama ]; d = [ aiohttp ]; uvloop = [ uvloop ]; @@ -71,7 +71,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook parameterized - ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); pytestFlagsArray = [ "-W" diff --git a/pkgs/development/python-modules/bleach/default.nix b/pkgs/development/python-modules/bleach/default.nix index 00fcd0bf9125..5adbde446d95 100644 --- a/pkgs/development/python-modules/bleach/default.nix +++ b/pkgs/development/python-modules/bleach/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { webencodings ]; - passthru.optional-dependencies = { + optional-dependencies = { css = [ tinycss2 ]; }; diff --git a/pkgs/development/python-modules/bonsai/default.nix b/pkgs/development/python-modules/bonsai/default.nix index 0f2c5f180f05..ad14127686ce 100644 --- a/pkgs/development/python-modules/bonsai/default.nix +++ b/pkgs/development/python-modules/bonsai/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { openldap ]; - passthru.optional-dependencies = { + optional-dependencies = { gevent = [ gevent ]; tornado = [ tornado ]; trio = [ trio ]; diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix index d5c4c1f37efc..fae0b5ff4fd3 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -378,7 +378,7 @@ buildPythonPackage rec { typing-extensions ]; - passthru.optional-dependencies = { + optional-dependencies = { accessanalyzer = [ mypy-boto3-accessanalyzer ]; account = [ mypy-boto3-account ]; acm = [ mypy-boto3-acm ]; diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix index f6998d6400a2..f1d9105c5f76 100644 --- a/pkgs/development/python-modules/boto3/default.nix +++ b/pkgs/development/python-modules/boto3/default.nix @@ -49,7 +49,7 @@ buildPythonPackage rec { "tests/integration" ]; - passthru.optional-dependencies = { + optional-dependencies = { crt = [ botocore.optional-dependencies.crt ]; }; diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix index 68a1ae7c68dc..dd08f7215a11 100644 --- a/pkgs/development/python-modules/botocore/default.nix +++ b/pkgs/development/python-modules/botocore/default.nix @@ -51,7 +51,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "botocore" ]; - passthru.optional-dependencies = { + optional-dependencies = { crt = [ awscrt ]; }; diff --git a/pkgs/development/python-modules/breezy/default.nix b/pkgs/development/python-modules/breezy/default.nix index b6316ad036e7..759af9e47b87 100644 --- a/pkgs/development/python-modules/breezy/default.nix +++ b/pkgs/development/python-modules/breezy/default.nix @@ -71,9 +71,15 @@ buildPythonPackage rec { tzlocal urllib3 ] - ++ passthru.optional-dependencies.launchpad - ++ passthru.optional-dependencies.fastimport - ++ passthru.optional-dependencies.github; + ++ optional-dependencies.launchpad + ++ optional-dependencies.fastimport + ++ optional-dependencies.github; + + optional-dependencies = { + launchpad = [ launchpadlib ]; + fastimport = [ fastimport ]; + github = [ pygithub ]; + }; nativeCheckInputs = [ testtools ]; @@ -107,11 +113,6 @@ buildPythonPackage rec { package = breezy; command = "HOME=$TMPDIR brz --version"; }; - optional-dependencies = { - launchpad = [ launchpadlib ]; - fastimport = [ fastimport ]; - github = [ pygithub ]; - }; }; meta = with lib; { diff --git a/pkgs/development/python-modules/btchip-python/default.nix b/pkgs/development/python-modules/btchip-python/default.nix index 66c22bafac3e..a15708b79394 100644 --- a/pkgs/development/python-modules/btchip-python/default.nix +++ b/pkgs/development/python-modules/btchip-python/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { ecdsa ]; - passthru.optional-dependencies.smartcard = [ pyscard ]; + optional-dependencies.smartcard = [ pyscard ]; # tests requires hardware doCheck = false; diff --git a/pkgs/development/python-modules/bugsnag/default.nix b/pkgs/development/python-modules/bugsnag/default.nix index bfb6f582dd3a..dd609be90c49 100644 --- a/pkgs/development/python-modules/bugsnag/default.nix +++ b/pkgs/development/python-modules/bugsnag/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ webob ]; - passthru.optional-dependencies = { + optional-dependencies = { flask = [ blinker flask diff --git a/pkgs/development/python-modules/bytewax/default.nix b/pkgs/development/python-modules/bytewax/default.nix index 36c1efc4266c..d7fe5f9a00ec 100644 --- a/pkgs/development/python-modules/bytewax/default.nix +++ b/pkgs/development/python-modules/bytewax/default.nix @@ -74,7 +74,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ jsonpickle ]; - passthru.optional-dependencies = { + optional-dependencies = { kafka = [ confluent-kafka ]; }; @@ -85,7 +85,7 @@ buildPythonPackage rec { checkInputs = [ myst-docutils pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); disabledTestPaths = [ # dependens on an old myst-docutils version diff --git a/pkgs/development/python-modules/cachecontrol/default.nix b/pkgs/development/python-modules/cachecontrol/default.nix index fe81e6742449..1f749cfb3132 100644 --- a/pkgs/development/python-modules/cachecontrol/default.nix +++ b/pkgs/development/python-modules/cachecontrol/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { requests ]; - passthru.optional-dependencies = { + optional-dependencies = { filecache = [ filelock ]; redis = [ redis ]; }; @@ -46,7 +46,7 @@ buildPythonPackage rec { mock pytestCheckHook requests - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "cachecontrol" ]; diff --git a/pkgs/development/python-modules/camel-converter/default.nix b/pkgs/development/python-modules/camel-converter/default.nix index 5837ef4d0c7c..79ab007d2245 100644 --- a/pkgs/development/python-modules/camel-converter/default.nix +++ b/pkgs/development/python-modules/camel-converter/default.nix @@ -25,14 +25,14 @@ buildPythonPackage rec { build-system = [ hatchling ]; - passthru.optional-dependencies = { + optional-dependencies = { pydantic = [ pydantic ]; }; nativeCheckInputs = [ pytestCheckHook pytest-cov-stub - ] ++ passthru.optional-dependencies.pydantic; + ] ++ optional-dependencies.pydantic; pythonImportsCheck = [ "camel_converter" ]; diff --git a/pkgs/development/python-modules/canals/default.nix b/pkgs/development/python-modules/canals/default.nix index 938a6279e002..a57300a77b84 100644 --- a/pkgs/development/python-modules/canals/default.nix +++ b/pkgs/development/python-modules/canals/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { typing-extensions ]; - passthru.optional-dependencies = { + optional-dependencies = { docs = [ mkdocs-material mkdocs-mermaid2-plugin @@ -45,7 +45,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); disabledTestPaths = [ # Test requires internet connection to mermaid.ink diff --git a/pkgs/development/python-modules/canmatrix/default.nix b/pkgs/development/python-modules/canmatrix/default.nix index 634eec1da39d..42f9c1757a93 100644 --- a/pkgs/development/python-modules/canmatrix/default.nix +++ b/pkgs/development/python-modules/canmatrix/default.nix @@ -49,7 +49,7 @@ buildPythonPackage rec { six ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; - passthru.optional-dependencies = { + optional-dependencies = { arxml = [ lxml ]; fibex = [ lxml ]; kcd = [ lxml ]; @@ -65,7 +65,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pytestFlagsArray = [ # long_envvar_name_imports requires stable key value pair ordering diff --git a/pkgs/development/python-modules/cantools/default.nix b/pkgs/development/python-modules/cantools/default.nix index a2a65df02e91..4e4dff898424 100644 --- a/pkgs/development/python-modules/cantools/default.nix +++ b/pkgs/development/python-modules/cantools/default.nix @@ -42,12 +42,12 @@ buildPythonPackage rec { textparser ]; - passthru.optional-dependencies.plot = [ matplotlib ]; + optional-dependencies.plot = [ matplotlib ]; nativeCheckInputs = [ parameterized pytestCheckHook - ] ++ passthru.optional-dependencies.plot; + ] ++ optional-dependencies.plot; pythonImportsCheck = [ "cantools" ]; diff --git a/pkgs/development/python-modules/cartopy/default.nix b/pkgs/development/python-modules/cartopy/default.nix index dbd7659ab81e..5f7659b61346 100644 --- a/pkgs/development/python-modules/cartopy/default.nix +++ b/pkgs/development/python-modules/cartopy/default.nix @@ -65,7 +65,7 @@ buildPythonPackage rec { shapely ]; - passthru.optional-dependencies = { + optional-dependencies = { ows = [ owslib pillow @@ -80,7 +80,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest-mpl pytestCheckHook - ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); preCheck = '' export FONTCONFIG_FILE=${fontconfig.out}/etc/fonts/fonts.conf diff --git a/pkgs/development/python-modules/cashews/default.nix b/pkgs/development/python-modules/cashews/default.nix index d5f0801c358f..af6f0a3d0cef 100644 --- a/pkgs/development/python-modules/cashews/default.nix +++ b/pkgs/development/python-modules/cashews/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { build-system = [ setuptools ]; - passthru.optional-dependencies = { + optional-dependencies = { dill = [ dill ]; diskcache = [ diskcache ]; redis = [ redis ]; diff --git a/pkgs/development/python-modules/cassandra-driver/default.nix b/pkgs/development/python-modules/cassandra-driver/default.nix index 0f03b20e196d..b72fd7d8a525 100644 --- a/pkgs/development/python-modules/cassandra-driver/default.nix +++ b/pkgs/development/python-modules/cassandra-driver/default.nix @@ -78,7 +78,7 @@ buildPythonPackage rec { pytz pyyaml sure - ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); # This is used to determine the version of cython that can be used CASS_DRIVER_ALLOWED_CYTHON_VERSION = cython.version; @@ -127,7 +127,7 @@ buildPythonPackage rec { "test_nts_token_performance" ]; - passthru.optional-dependencies = { + optional-dependencies = { cle = [ cryptography ]; eventlet = [ eventlet ]; gevent = [ gevent ]; diff --git a/pkgs/development/python-modules/celery/default.nix b/pkgs/development/python-modules/celery/default.nix index 99854b9d772e..1ab0ee43a711 100644 --- a/pkgs/development/python-modules/celery/default.nix +++ b/pkgs/development/python-modules/celery/default.nix @@ -55,7 +55,7 @@ buildPythonPackage rec { vine ]; - passthru.optional-dependencies = { + optional-dependencies = { gcs = [ google-cloud-storage ]; mongodb = [ pymongo ]; msgpack = [ msgpack ]; @@ -71,7 +71,7 @@ buildPythonPackage rec { pytest-timeout pytest-xdist pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); disabledTestPaths = [ # test_eventlet touches network diff --git a/pkgs/development/python-modules/certomancer/default.nix b/pkgs/development/python-modules/certomancer/default.nix index e9311df36e82..b04866a54607 100644 --- a/pkgs/development/python-modules/certomancer/default.nix +++ b/pkgs/development/python-modules/certomancer/default.nix @@ -57,7 +57,7 @@ buildPythonPackage rec { tzlocal ]; - passthru.optional-dependencies = { + optional-dependencies = { requests-mocker = [ requests-mock ]; web-api = [ jinja2 @@ -73,7 +73,7 @@ buildPythonPackage rec { pytestCheckHook pytz requests - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); disabledTests = [ # pyhanko_certvalidator.errors.DisallowedAlgorithmError diff --git a/pkgs/development/python-modules/channels-redis/default.nix b/pkgs/development/python-modules/channels-redis/default.nix index 73538fcdce4c..e6743a93bf68 100644 --- a/pkgs/development/python-modules/channels-redis/default.nix +++ b/pkgs/development/python-modules/channels-redis/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { msgpack ]; - passthru.optional-dependencies = { + optional-dependencies = { cryptography = [ cryptography ]; }; diff --git a/pkgs/development/python-modules/cherrypy/default.nix b/pkgs/development/python-modules/cherrypy/default.nix index c9a63cc21505..7f3bd134f29f 100644 --- a/pkgs/development/python-modules/cherrypy/default.nix +++ b/pkgs/development/python-modules/cherrypy/default.nix @@ -111,7 +111,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "cherrypy" ]; - passthru.optional-dependencies = { + optional-dependencies = { json = [ simplejson ]; memcached_session = [ python-memcached ]; routes_dispatcher = [ routes ]; diff --git a/pkgs/development/python-modules/clarifai/default.nix b/pkgs/development/python-modules/clarifai/default.nix index 6b39d48513d6..68dfea58f94f 100644 --- a/pkgs/development/python-modules/clarifai/default.nix +++ b/pkgs/development/python-modules/clarifai/default.nix @@ -52,7 +52,7 @@ buildPythonPackage rec { tritonclient ]; - passthru.optional-dependencies = { + optional-dependencies = { all = [ pycocotools ]; }; diff --git a/pkgs/development/python-modules/clevercsv/default.nix b/pkgs/development/python-modules/clevercsv/default.nix index eb9c003c913f..91372bca1be7 100644 --- a/pkgs/development/python-modules/clevercsv/default.nix +++ b/pkgs/development/python-modules/clevercsv/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { packaging ]; - passthru.optional-dependencies = { + optional-dependencies = { full = [ faust-cchardet pandas @@ -46,7 +46,7 @@ buildPythonPackage rec { ]; }; - nativeCheckInputs = [ pytestCheckHook ] ++ passthru.optional-dependencies.full; + nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.full; pythonImportsCheck = [ "clevercsv" diff --git a/pkgs/development/python-modules/cli-helpers/default.nix b/pkgs/development/python-modules/cli-helpers/default.nix index 1d1e2c741b6c..e043ff31da29 100644 --- a/pkgs/development/python-modules/cli-helpers/default.nix +++ b/pkgs/development/python-modules/cli-helpers/default.nix @@ -28,14 +28,14 @@ buildPythonPackage rec { tabulate ] ++ tabulate.optional-dependencies.widechars; - passthru.optional-dependencies = { + optional-dependencies = { styles = [ pygments ]; }; nativeCheckInputs = [ pytestCheckHook mock - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); meta = with lib; { description = "Python helpers for common CLI tasks"; diff --git a/pkgs/development/python-modules/clickhouse-connect/default.nix b/pkgs/development/python-modules/clickhouse-connect/default.nix index d5300b5499a8..4640b71cee04 100644 --- a/pkgs/development/python-modules/clickhouse-connect/default.nix +++ b/pkgs/development/python-modules/clickhouse-connect/default.nix @@ -53,7 +53,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook pytest-dotenv - ] ++ passthru.optional-dependencies.sqlalchemy ++ passthru.optional-dependencies.numpy; + ] ++ optional-dependencies.sqlalchemy ++ optional-dependencies.numpy; # these tests require a running clickhouse instance disabledTestPaths = [ @@ -68,14 +68,12 @@ buildPythonPackage rec { "clickhouse_connect.driverc.npconv" ]; - passthru = { - optional-dependencies = { - sqlalchemy = [ sqlalchemy ]; - numpy = [ numpy ]; - pandas = [ pandas ]; - arrow = [ pyarrow ]; - orjson = [ orjson ]; - }; + optional-dependencies = { + sqlalchemy = [ sqlalchemy ]; + numpy = [ numpy ]; + pandas = [ pandas ]; + arrow = [ pyarrow ]; + orjson = [ orjson ]; }; meta = with lib; { diff --git a/pkgs/development/python-modules/cloudpathlib/default.nix b/pkgs/development/python-modules/cloudpathlib/default.nix index 3689a9d0dab4..8c642edda242 100644 --- a/pkgs/development/python-modules/cloudpathlib/default.nix +++ b/pkgs/development/python-modules/cloudpathlib/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { typing-extensions ]; - passthru.optional-dependencies = { + optional-dependencies = { all = [ cloudpathlib ]; azure = [ azure-storage-blob ]; gs = [ google-cloud-storage ]; diff --git a/pkgs/development/python-modules/cmdstanpy/default.nix b/pkgs/development/python-modules/cmdstanpy/default.nix index ead29ecbb939..6fcf618bafef 100644 --- a/pkgs/development/python-modules/cmdstanpy/default.nix +++ b/pkgs/development/python-modules/cmdstanpy/default.nix @@ -49,7 +49,7 @@ buildPythonPackage rec { stanio ]; - passthru.optional-dependencies = { + optional-dependencies = { all = [ xarray ]; }; @@ -59,7 +59,7 @@ buildPythonPackage rec { export HOME=$(mktemp -d) ''; - nativeCheckInputs = [ pytestCheckHook ] ++ passthru.optional-dependencies.all; + nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.all; disabledTestPaths = [ # No need to test these when using Nix diff --git a/pkgs/development/python-modules/coinmetrics-api-client/default.nix b/pkgs/development/python-modules/coinmetrics-api-client/default.nix index 26272d385cb7..81294e45b9fb 100644 --- a/pkgs/development/python-modules/coinmetrics-api-client/default.nix +++ b/pkgs/development/python-modules/coinmetrics-api-client/default.nix @@ -48,14 +48,12 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook pytest-mock - ] ++ passthru.optional-dependencies.pandas; + ] ++ optional-dependencies.pandas; pythonImportsCheck = [ "coinmetrics.api_client" ]; - passthru = { - optional-dependencies = { - pandas = [ pandas ]; - }; + optional-dependencies = { + pandas = [ pandas ]; }; meta = with lib; { diff --git a/pkgs/development/python-modules/compressai/default.nix b/pkgs/development/python-modules/compressai/default.nix index 4848df28167f..517a33d8aa66 100644 --- a/pkgs/development/python-modules/compressai/default.nix +++ b/pkgs/development/python-modules/compressai/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { torchvision ]; - passthru.optional-dependencies = { + optional-dependencies = { tutorials = [ ipywidgets jupyter diff --git a/pkgs/development/python-modules/configargparse/default.nix b/pkgs/development/python-modules/configargparse/default.nix index 59f89df05231..9a1cdb8798d4 100644 --- a/pkgs/development/python-modules/configargparse/default.nix +++ b/pkgs/development/python-modules/configargparse/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { hash = "sha256-m77MY0IZ1AJkd4/Y7ltApvdF9y17Lgn92WZPYTCU9tA="; }; - passthru.optional-dependencies = { + optional-dependencies = { yaml = [ pyyaml ]; }; nativeCheckInputs = [ pytestCheckHook mock - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "configargparse" ]; diff --git a/pkgs/development/python-modules/confluent-kafka/default.nix b/pkgs/development/python-modules/confluent-kafka/default.nix index 95cf2c7bf0b6..b0098ded880c 100644 --- a/pkgs/development/python-modules/confluent-kafka/default.nix +++ b/pkgs/development/python-modules/confluent-kafka/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests ]; - passthru.optional-dependencies = { + optional-dependencies = { avro = [ avro fastavro @@ -49,7 +49,7 @@ buildPythonPackage rec { pyflakes pytestCheckHook requests-mock - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "confluent_kafka" ]; diff --git a/pkgs/development/python-modules/connexion/default.nix b/pkgs/development/python-modules/connexion/default.nix index 0e599c2945c3..a43fccb0170e 100644 --- a/pkgs/development/python-modules/connexion/default.nix +++ b/pkgs/development/python-modules/connexion/default.nix @@ -62,7 +62,7 @@ buildPythonPackage rec { werkzeug ]; - passthru.optional-dependencies = { + optional-dependencies = { flask = [ a2wsgi flask @@ -75,7 +75,7 @@ buildPythonPackage rec { pytest-aiohttp pytestCheckHook testfixtures - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "connexion" ]; diff --git a/pkgs/development/python-modules/construct/default.nix b/pkgs/development/python-modules/construct/default.nix index daad048634b3..b0fdf8d7c326 100644 --- a/pkgs/development/python-modules/construct/default.nix +++ b/pkgs/development/python-modules/construct/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { lz4 ]; - passthru.optional-dependencies = { + optional-dependencies = { extras = [ arrow cloudpickle @@ -47,7 +47,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "construct" ]; diff --git a/pkgs/development/python-modules/corner/default.nix b/pkgs/development/python-modules/corner/default.nix index 68446453e200..dd37d140240d 100644 --- a/pkgs/development/python-modules/corner/default.nix +++ b/pkgs/development/python-modules/corner/default.nix @@ -47,7 +47,7 @@ buildPythonPackage rec { dependencies = [ matplotlib ]; - passthru.optional-dependencies = { + optional-dependencies = { arviz = [ arviz ]; docs = [ arviz @@ -66,7 +66,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "corner" ]; - nativeCheckInputs = [ pytestCheckHook ] ++ corner.passthru.optional-dependencies.test; + nativeCheckInputs = [ pytestCheckHook ] ++ corner.optional-dependencies.test; # matplotlib.testing.exceptions.ImageComparisonFailure: images not close disabledTests = [ diff --git a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix index 09689a844751..f895557a32b3 100644 --- a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix +++ b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix @@ -52,7 +52,7 @@ buildPythonPackage rec { types-toml ]; - passthru.optional-dependencies = { + optional-dependencies = { validation = [ jsonschema lxml @@ -69,7 +69,7 @@ buildPythonPackage rec { ddt pytestCheckHook xmldiff - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "cyclonedx" ]; diff --git a/pkgs/development/python-modules/dask-gateway-server/default.nix b/pkgs/development/python-modules/dask-gateway-server/default.nix index 8935e536996a..f1aa0dbc6fb3 100644 --- a/pkgs/development/python-modules/dask-gateway-server/default.nix +++ b/pkgs/development/python-modules/dask-gateway-server/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { traitlets ]; - passthru.optional-dependencies = { + optional-dependencies = { kerberos = [ pykerberos ]; jobqueue = [ sqlalchemy ]; local = [ sqlalchemy ]; diff --git a/pkgs/development/python-modules/databases/default.nix b/pkgs/development/python-modules/databases/default.nix index 33fd15cded4b..55f3489a0144 100644 --- a/pkgs/development/python-modules/databases/default.nix +++ b/pkgs/development/python-modules/databases/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ sqlalchemy ]; - passthru.optional-dependencies = { + optional-dependencies = { postgresql = [ asyncpg ]; asyncpg = [ asyncpg ]; aiopg = [ aiopg ]; diff --git a/pkgs/development/python-modules/dataclass-wizard/default.nix b/pkgs/development/python-modules/dataclass-wizard/default.nix index 39f0f0aa39fa..2a063482fe17 100644 --- a/pkgs/development/python-modules/dataclass-wizard/default.nix +++ b/pkgs/development/python-modules/dataclass-wizard/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ ] ++ lib.optionals (pythonOlder "3.9") [ typing-extensions ]; - passthru.optional-dependencies = { + optional-dependencies = { timedelta = [ pytimeparse ]; yaml = [ pyyaml ]; }; @@ -33,7 +33,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook pytest-mock - ] ++ passthru.optional-dependencies.timedelta ++ passthru.optional-dependencies.yaml; + ] ++ optional-dependencies.timedelta ++ optional-dependencies.yaml; disabledTests = [ ] diff --git a/pkgs/development/python-modules/dataproperty/default.nix b/pkgs/development/python-modules/dataproperty/default.nix index b82fa0900fbb..f988112c533f 100644 --- a/pkgs/development/python-modules/dataproperty/default.nix +++ b/pkgs/development/python-modules/dataproperty/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { tcolorpy ] ++ typepy.optional-dependencies.datetime; - passthru.optional-dependencies = { + optional-dependencies = { logging = [ loguru ]; }; diff --git a/pkgs/development/python-modules/dateparser/default.nix b/pkgs/development/python-modules/dateparser/default.nix index 3f1fec78aeb3..e87f6d2a72c6 100644 --- a/pkgs/development/python-modules/dateparser/default.nix +++ b/pkgs/development/python-modules/dateparser/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { tzlocal ]; - passthru.optional-dependencies = { + optional-dependencies = { calendars = [ hijri-converter convertdate @@ -60,7 +60,7 @@ buildPythonPackage rec { parsel requests ruamel-yaml - ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); preCheck = '' export HOME="$TEMPDIR" diff --git a/pkgs/development/python-modules/debuglater/default.nix b/pkgs/development/python-modules/debuglater/default.nix index 503dc862497b..fcb0b4f1f945 100644 --- a/pkgs/development/python-modules/debuglater/default.nix +++ b/pkgs/development/python-modules/debuglater/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ colorama ]; - passthru.optional-dependencies = { + optional-dependencies = { all = [ dill ]; }; @@ -34,7 +34,7 @@ buildPythonPackage rec { numpy pandas pytestCheckHook - ] ++ passthru.optional-dependencies.all; + ] ++ optional-dependencies.all; pythonImportsCheck = [ "debuglater" ]; diff --git a/pkgs/development/python-modules/deepdiff/default.nix b/pkgs/development/python-modules/deepdiff/default.nix index af4500ffd580..ff583a572018 100644 --- a/pkgs/development/python-modules/deepdiff/default.nix +++ b/pkgs/development/python-modules/deepdiff/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { orjson ]; - passthru.optional-dependencies = { + optional-dependencies = { cli = [ clevercsv click @@ -56,7 +56,7 @@ buildPythonPackage rec { pytestCheckHook python-dateutil tomli-w - ] ++ passthru.optional-dependencies.cli; + ] ++ optional-dependencies.cli; disabledTests = [ # not compatible with pydantic 2.x diff --git a/pkgs/development/python-modules/defcon/default.nix b/pkgs/development/python-modules/defcon/default.nix index 309b02d14fa1..4e2c4d9b75e2 100644 --- a/pkgs/development/python-modules/defcon/default.nix +++ b/pkgs/development/python-modules/defcon/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "defcon" ]; - passthru.optional-dependencies = { + optional-dependencies = { pens = [ fontpens ]; lxml = [ fonttools ] ++ fonttools.optional-dependencies.lxml; }; diff --git a/pkgs/development/python-modules/demoji/default.nix b/pkgs/development/python-modules/demoji/default.nix index 4538f6c9c8be..b63b2c12a1c0 100644 --- a/pkgs/development/python-modules/demoji/default.nix +++ b/pkgs/development/python-modules/demoji/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { build-system = [ setuptools ]; - passthru.optional-dependencies = { + optional-dependencies = { ujson = [ ujson ]; }; diff --git a/pkgs/development/python-modules/dependency-injector/default.nix b/pkgs/development/python-modules/dependency-injector/default.nix index be655a971dd4..5980eaff54db 100644 --- a/pkgs/development/python-modules/dependency-injector/default.nix +++ b/pkgs/development/python-modules/dependency-injector/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six ]; - passthru.optional-dependencies = { + optional-dependencies = { aiohttp = [ aiohttp ]; pydantic = [ pydantic ]; flask = [ flask ]; @@ -50,10 +50,10 @@ buildPythonPackage rec { pytestCheckHook scipy ] - ++ passthru.optional-dependencies.aiohttp - ++ passthru.optional-dependencies.pydantic - ++ passthru.optional-dependencies.yaml - ++ passthru.optional-dependencies.flask; + ++ optional-dependencies.aiohttp + ++ optional-dependencies.pydantic + ++ optional-dependencies.yaml + ++ optional-dependencies.flask; pythonImportsCheck = [ "dependency_injector" ]; diff --git a/pkgs/development/python-modules/detectron2/default.nix b/pkgs/development/python-modules/detectron2/default.nix index 95506510e214..42b8f0a6f43c 100644 --- a/pkgs/development/python-modules/detectron2/default.nix +++ b/pkgs/development/python-modules/detectron2/default.nix @@ -99,7 +99,7 @@ buildPythonPackage { pydot # no idea why this is not in their setup.py ]; - passthru.optional-dependencies = optional-dependencies; + optional-dependencies = optional-dependencies; nativeCheckInputs = [ av diff --git a/pkgs/development/python-modules/diffusers/default.nix b/pkgs/development/python-modules/diffusers/default.nix index ee540ee7e9c8..e7e736927ea0 100644 --- a/pkgs/development/python-modules/diffusers/default.nix +++ b/pkgs/development/python-modules/diffusers/default.nix @@ -65,7 +65,7 @@ buildPythonPackage rec { safetensors ]; - passthru.optional-dependencies = { + optional-dependencies = { flax = [ flax jax @@ -102,7 +102,7 @@ buildPythonPackage rec { sentencepiece torchsde transformers - ] ++ passthru.optional-dependencies.torch; + ] ++ optional-dependencies.torch; preCheck = let diff --git a/pkgs/development/python-modules/diofant/default.nix b/pkgs/development/python-modules/diofant/default.nix index 9fa09e0df070..03566cf27dc1 100644 --- a/pkgs/development/python-modules/diofant/default.nix +++ b/pkgs/development/python-modules/diofant/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ mpmath ]; - passthru.optional-dependencies = { + optional-dependencies = { exports = [ cython numpy diff --git a/pkgs/development/python-modules/discum/default.nix b/pkgs/development/python-modules/discum/default.nix index ffa8b9957993..50254162ff06 100644 --- a/pkgs/development/python-modules/discum/default.nix +++ b/pkgs/development/python-modules/discum/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { websocket-client ]; - passthru.optional-dependencies = { + optional-dependencies = { ra = [ pycryptodome pypng diff --git a/pkgs/development/python-modules/dissect-btrfs/default.nix b/pkgs/development/python-modules/dissect-btrfs/default.nix index ef7f8fdd9f4a..e854feb88a2f 100644 --- a/pkgs/development/python-modules/dissect-btrfs/default.nix +++ b/pkgs/development/python-modules/dissect-btrfs/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { dissect-util ]; - passthru.optional-dependencies = { + optional-dependencies = { full = [ python-lzo zstandard diff --git a/pkgs/development/python-modules/dissect-cobaltstrike/default.nix b/pkgs/development/python-modules/dissect-cobaltstrike/default.nix index 973cd01a7aa4..0795b7aaee8e 100644 --- a/pkgs/development/python-modules/dissect-cobaltstrike/default.nix +++ b/pkgs/development/python-modules/dissect-cobaltstrike/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { lark ]; - passthru.optional-dependencies = { + optional-dependencies = { c2 = [ flow-record httpx @@ -68,7 +68,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest-httpserver pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "dissect.cobaltstrike" ]; diff --git a/pkgs/development/python-modules/dissect-hypervisor/default.nix b/pkgs/development/python-modules/dissect-hypervisor/default.nix index 26cf663c5ae2..4a1cb39782d3 100644 --- a/pkgs/development/python-modules/dissect-hypervisor/default.nix +++ b/pkgs/development/python-modules/dissect-hypervisor/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { dissect-util ]; - passthru.optional-dependencies = { + optional-dependencies = { full = [ pycryptodome rich diff --git a/pkgs/development/python-modules/dissect-squashfs/default.nix b/pkgs/development/python-modules/dissect-squashfs/default.nix index 88f7f3ab8467..a85b51abcf19 100644 --- a/pkgs/development/python-modules/dissect-squashfs/default.nix +++ b/pkgs/development/python-modules/dissect-squashfs/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { dissect-util ]; - passthru.optional-dependencies = { + optional-dependencies = { full = [ lz4 python-lzo diff --git a/pkgs/development/python-modules/dissect-target/default.nix b/pkgs/development/python-modules/dissect-target/default.nix index d2c632a1f564..409f8444c33d 100644 --- a/pkgs/development/python-modules/dissect-target/default.nix +++ b/pkgs/development/python-modules/dissect-target/default.nix @@ -80,7 +80,7 @@ buildPythonPackage rec { structlog ]; - passthru.optional-dependencies = { + optional-dependencies = { full = [ asn1crypto dissect-btrfs @@ -102,12 +102,12 @@ buildPythonPackage rec { yara-python zstandard ] ++ lib.optionals (pythonOlder "3.11") [ tomli ]; - yara = [ yara-python ] ++ passthru.optional-dependencies.full; - smb = [ impacket ] ++ passthru.optional-dependencies.full; - mqtt = [ paho-mqtt ] ++ passthru.optional-dependencies.full; + yara = [ yara-python ] ++ optional-dependencies.full; + smb = [ impacket ] ++ optional-dependencies.full; + mqtt = [ paho-mqtt ] ++ optional-dependencies.full; }; - nativeCheckInputs = [ pytestCheckHook ] ++ passthru.optional-dependencies.full; + nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.full; pythonImportsCheck = [ "dissect.target" ]; diff --git a/pkgs/development/python-modules/dj-rest-auth/default.nix b/pkgs/development/python-modules/dj-rest-auth/default.nix index 1f0ac3747c87..9dddc459a3cc 100644 --- a/pkgs/development/python-modules/dj-rest-auth/default.nix +++ b/pkgs/development/python-modules/dj-rest-auth/default.nix @@ -40,13 +40,13 @@ buildPythonPackage rec { dependencies = [ djangorestframework ]; - passthru.optional-dependencies.with_social = [ django-allauth ]; + optional-dependencies.with_social = [ django-allauth ]; nativeCheckInputs = [ djangorestframework-simplejwt responses unittest-xml-reporting - ] ++ passthru.optional-dependencies.with_social; + ] ++ optional-dependencies.with_social; preCheck = '' # Test connects to graph.facebook.com diff --git a/pkgs/development/python-modules/django-allauth/default.nix b/pkgs/development/python-modules/django-allauth/default.nix index fb7eb5ffac84..4b75865cf326 100644 --- a/pkgs/development/python-modules/django-allauth/default.nix +++ b/pkgs/development/python-modules/django-allauth/default.nix @@ -60,7 +60,7 @@ buildPythonPackage rec { preBuild = "${python.interpreter} -m django compilemessages"; - passthru.optional-dependencies = { + optional-dependencies = { saml = [ python3-saml ]; mfa = [ qrcode ]; }; @@ -71,7 +71,7 @@ buildPythonPackage rec { pillow pytestCheckHook pytest-django - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); disabledTests = [ # Tests require network access diff --git a/pkgs/development/python-modules/django-import-export/default.nix b/pkgs/development/python-modules/django-import-export/default.nix index 52f1ff4d5b4c..d2d65daa6689 100644 --- a/pkgs/development/python-modules/django-import-export/default.nix +++ b/pkgs/development/python-modules/django-import-export/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { tablib ]; - passthru.optional-dependencies = { + optional-dependencies = { all = [ tablib ] ++ tablib.optional-dependencies.all; cli = [ tablib ] ++ tablib.optional-dependencies.cli; ods = [ tablib ] ++ tablib.optional-dependencies.ods; @@ -52,7 +52,7 @@ buildPythonPackage rec { chardet psycopg2 pytz - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); checkPhase = '' runHook preCheck diff --git a/pkgs/development/python-modules/django-markup/default.nix b/pkgs/development/python-modules/django-markup/default.nix index dce53f40ad93..61ce9fd91cec 100644 --- a/pkgs/development/python-modules/django-markup/default.nix +++ b/pkgs/development/python-modules/django-markup/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { dependencies = [ django ]; - passthru.optional-dependencies = { + optional-dependencies = { all_filter_dependencies = [ bleach docutils @@ -63,7 +63,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest-django pytestCheckHook - ] ++ passthru.optional-dependencies.all_filter_dependencies; + ] ++ optional-dependencies.all_filter_dependencies; preCheck = '' export DJANGO_SETTINGS_MODULE=django_markup.tests diff --git a/pkgs/development/python-modules/django-modelcluster/default.nix b/pkgs/development/python-modules/django-modelcluster/default.nix index a7efa70261fb..acb7fd370429 100644 --- a/pkgs/development/python-modules/django-modelcluster/default.nix +++ b/pkgs/development/python-modules/django-modelcluster/default.nix @@ -35,14 +35,14 @@ buildPythonPackage rec { pytz ]; - passthru.optional-dependencies.taggit = [ django-taggit ]; + optional-dependencies.taggit = [ django-taggit ]; env.DJANGO_SETTINGS_MODULE = "tests.settings"; nativeCheckInputs = [ pytest-django pytestCheckHook - ] ++ passthru.optional-dependencies.taggit; + ] ++ optional-dependencies.taggit; # https://github.com/wagtail/django-modelcluster/issues/173 disabledTests = lib.optionals (lib.versionAtLeast django.version "4.2") [ diff --git a/pkgs/development/python-modules/django-redis/default.nix b/pkgs/development/python-modules/django-redis/default.nix index eefb715e1708..94249cebd94c 100644 --- a/pkgs/development/python-modules/django-redis/default.nix +++ b/pkgs/development/python-modules/django-redis/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { redis ]; - passthru.optional-dependencies = { + optional-dependencies = { hiredis = [ redis ] ++ redis.optional-dependencies.hiredis; }; @@ -67,7 +67,7 @@ buildPythonPackage rec { pytest-django pytest-mock pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pytestFlagsArray = [ "-W" diff --git a/pkgs/development/python-modules/django-storages/default.nix b/pkgs/development/python-modules/django-storages/default.nix index 84378ee311a8..1014efc09e65 100644 --- a/pkgs/development/python-modules/django-storages/default.nix +++ b/pkgs/development/python-modules/django-storages/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ django ]; - passthru.optional-dependencies = { + optional-dependencies = { azure = [ azure-storage-blob ]; boto3 = [ boto3 ]; dropbox = [ dropbox ]; @@ -50,7 +50,7 @@ buildPythonPackage rec { moto pytestCheckHook rsa - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "storages" ]; diff --git a/pkgs/development/python-modules/django-stubs/default.nix b/pkgs/development/python-modules/django-stubs/default.nix index 0bdd73e77488..198e782fde3e 100644 --- a/pkgs/development/python-modules/django-stubs/default.nix +++ b/pkgs/development/python-modules/django-stubs/default.nix @@ -37,13 +37,13 @@ buildPythonPackage rec { typing-extensions ] ++ lib.optionals (pythonOlder "3.11") [ tomli ]; - passthru.optional-dependencies = { + optional-dependencies = { compatible-mypy = [ mypy ]; }; nativeCheckInputs = [ pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "django-stubs" ]; diff --git a/pkgs/development/python-modules/django-tables2/default.nix b/pkgs/development/python-modules/django-tables2/default.nix index cb1f2307d527..b5692c1d0f6d 100644 --- a/pkgs/development/python-modules/django-tables2/default.nix +++ b/pkgs/development/python-modules/django-tables2/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ django ]; - passthru.optional-dependencies = { + optional-dependencies = { tablib = [ tablib ] ++ tablib.optional-dependencies.xls ++ tablib.optional-dependencies.yaml; }; @@ -53,7 +53,7 @@ buildPythonPackage rec { pyyaml pytest-django pytestCheckHook - ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); disabledTestPaths = [ # requires django-filters diff --git a/pkgs/development/python-modules/django-two-factor-auth/default.nix b/pkgs/development/python-modules/django-two-factor-auth/default.nix index 718d2206700b..1a35580d19e5 100644 --- a/pkgs/development/python-modules/django-two-factor-auth/default.nix +++ b/pkgs/development/python-modules/django-two-factor-auth/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { qrcode ]; - passthru.optional-dependencies = { + optional-dependencies = { call = [ twilio ]; sms = [ twilio ]; webauthn = [ diff --git a/pkgs/development/python-modules/django/4.nix b/pkgs/development/python-modules/django/4.nix index 2d7bb6ce9dde..3e79caf80134 100644 --- a/pkgs/development/python-modules/django/4.nix +++ b/pkgs/development/python-modules/django/4.nix @@ -94,7 +94,7 @@ buildPythonPackage rec { sqlparse ]; - passthru.optional-dependencies = { + optional-dependencies = { argon2 = [ argon2-cffi ]; bcrypt = [ bcrypt ]; }; @@ -116,7 +116,7 @@ buildPythonPackage rec { selenium tblib tzdata - ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); doCheck = !stdenv.hostPlatform.isDarwin; diff --git a/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix b/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix index abf6c29ed81b..dc91ad35fa03 100644 --- a/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix +++ b/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pyjwt ]; - passthru.optional-dependencies = { + optional-dependencies = { python-jose = [ python-jose ]; crypto = [ cryptography ]; }; diff --git a/pkgs/development/python-modules/djangorestframework-stubs/default.nix b/pkgs/development/python-modules/djangorestframework-stubs/default.nix index 19e771ebbeec..826bb862248c 100644 --- a/pkgs/development/python-modules/djangorestframework-stubs/default.nix +++ b/pkgs/development/python-modules/djangorestframework-stubs/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { typing-extensions ]; - passthru.optional-dependencies = { + optional-dependencies = { compatible-mypy = [ mypy ] ++ django-stubs.optional-dependencies.compatible-mypy; coreapi = [ coreapi ]; markdown = [ types-markdown ]; @@ -51,7 +51,7 @@ buildPythonPackage rec { py pytest-mypy-plugins pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); # Upstream recommends mypy > 1.7 which we don't have yet, thus all testsare failing with 3.14.5 and below doCheck = false; diff --git a/pkgs/development/python-modules/dm-sonnet/default.nix b/pkgs/development/python-modules/dm-sonnet/default.nix index 7290b31b7f37..06b01a447843 100644 --- a/pkgs/development/python-modules/dm-sonnet/default.nix +++ b/pkgs/development/python-modules/dm-sonnet/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { wrapt ] ++ etils.optional-dependencies.epath; - passthru.optional-dependencies = { + optional-dependencies = { tensorflow = [ tensorflow ]; }; diff --git a/pkgs/development/python-modules/dns-lexicon/default.nix b/pkgs/development/python-modules/dns-lexicon/default.nix index 225a04ee5342..89f98539f7a4 100644 --- a/pkgs/development/python-modules/dns-lexicon/default.nix +++ b/pkgs/development/python-modules/dns-lexicon/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { tldextract ] ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ]; - passthru.optional-dependencies = { + optional-dependencies = { route53 = [ boto3 ]; localzone = [ localzone ]; softlayer = [ softlayer ]; @@ -66,7 +66,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook pytest-vcr - ] ++ passthru.optional-dependencies.full; + ] ++ optional-dependencies.full; pytestFlagsArray = [ "tests/" ]; diff --git a/pkgs/development/python-modules/dnspython/default.nix b/pkgs/development/python-modules/dnspython/default.nix index 56098c6250c5..d1d0d61398de 100644 --- a/pkgs/development/python-modules/dnspython/default.nix +++ b/pkgs/development/python-modules/dnspython/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { nativeBuildInputs = [ hatchling ]; - passthru.optional-dependencies = { + optional-dependencies = { DOH = [ httpx h2 @@ -53,7 +53,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - checkInputs = [ cacert ] ++ passthru.optional-dependencies.DNSSEC; + checkInputs = [ cacert ] ++ optional-dependencies.DNSSEC; disabledTests = [ # dns.exception.SyntaxError: protocol not found diff --git a/pkgs/development/python-modules/dparse/default.nix b/pkgs/development/python-modules/dparse/default.nix index 59a19b30caeb..cbe4b8518763 100644 --- a/pkgs/development/python-modules/dparse/default.nix +++ b/pkgs/development/python-modules/dparse/default.nix @@ -35,14 +35,14 @@ buildPythonPackage rec { propagatedBuildInputs = [ packaging ] ++ lib.optionals (pythonOlder "3.11") [ tomli ]; - passthru.optional-dependencies = { + optional-dependencies = { # FIXME pipenv = [ pipenv ]; conda = [ pyyaml ]; }; nativeCheckInputs = [ pytestCheckHook - ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); pythonImportsCheck = [ "dparse" ]; diff --git a/pkgs/development/python-modules/draftjs-exporter/default.nix b/pkgs/development/python-modules/draftjs-exporter/default.nix index 29205e3d5dd4..0573af0c60a3 100644 --- a/pkgs/development/python-modules/draftjs-exporter/default.nix +++ b/pkgs/development/python-modules/draftjs-exporter/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { sha256 = "sha256-4MmCVRx350p6N9XqTZSo8ROI/OJ0s4aKSYH9+Oxgvf4="; }; - passthru.optional-dependencies = { + optional-dependencies = { lxml = [ lxml ]; html5lib = [ beautifulsoup4 @@ -28,7 +28,7 @@ buildPythonPackage rec { ]; }; - checkInputs = passthru.optional-dependencies.lxml ++ passthru.optional-dependencies.html5lib; + checkInputs = optional-dependencies.lxml ++ optional-dependencies.html5lib; checkPhase = '' # 2 tests in this file randomly fail because they depend on the order of diff --git a/pkgs/development/python-modules/dramatiq/default.nix b/pkgs/development/python-modules/dramatiq/default.nix index 9eec4bba08fb..b02da84182f7 100644 --- a/pkgs/development/python-modules/dramatiq/default.nix +++ b/pkgs/development/python-modules/dramatiq/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ prometheus-client ]; - passthru.optional-dependencies = { + optional-dependencies = { all = [ gevent pika diff --git a/pkgs/development/python-modules/drawsvg/default.nix b/pkgs/development/python-modules/drawsvg/default.nix index 8feb1a1151ea..d6df1c87a2dc 100644 --- a/pkgs/development/python-modules/drawsvg/default.nix +++ b/pkgs/development/python-modules/drawsvg/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { build-system = [ setuptools ]; - passthru.optional-dependencies = { + optional-dependencies = { all = [ numpy imageio diff --git a/pkgs/development/python-modules/dsnap/default.nix b/pkgs/development/python-modules/dsnap/default.nix index f14636df0654..1908de7692e8 100644 --- a/pkgs/development/python-modules/dsnap/default.nix +++ b/pkgs/development/python-modules/dsnap/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { urllib3 ]; - passthru.optional-dependencies = { + optional-dependencies = { cli = [ typer ]; scannerd = [ aws-sam-cli @@ -55,7 +55,7 @@ buildPythonPackage rec { moto mypy-boto3-ebs pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); # https://github.com/RhinoSecurityLabs/dsnap/issues/26 # ImportError: cannot import name 'mock_iam' from 'moto' diff --git a/pkgs/development/python-modules/dvc-render/default.nix b/pkgs/development/python-modules/dvc-render/default.nix index f4df5623013d..749abe71e0bc 100644 --- a/pkgs/development/python-modules/dvc-render/default.nix +++ b/pkgs/development/python-modules/dvc-render/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { build-system = [ setuptools-scm ]; - passthru.optional-dependencies = { + optional-dependencies = { table = [ flatten-dict tabulate @@ -46,7 +46,7 @@ buildPythonPackage rec { pytestCheckHook pytest-mock pytest-test-utils - ] ++ passthru.optional-dependencies.table ++ passthru.optional-dependencies.markdown; + ] ++ optional-dependencies.table ++ optional-dependencies.markdown; disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [ "tests/test_vega.py" ]; diff --git a/pkgs/development/python-modules/dvc/default.nix b/pkgs/development/python-modules/dvc/default.nix index 284de4ad026b..ee197c22044c 100644 --- a/pkgs/development/python-modules/dvc/default.nix +++ b/pkgs/development/python-modules/dvc/default.nix @@ -124,14 +124,14 @@ buildPythonPackage rec { voluptuous zc-lockfile ] - ++ lib.optionals enableGoogle passthru.optional-dependencies.gs - ++ lib.optionals enableAWS passthru.optional-dependencies.s3 - ++ lib.optionals enableAzure passthru.optional-dependencies.azure - ++ lib.optionals enableSSH passthru.optional-dependencies.ssh + ++ lib.optionals enableGoogle optional-dependencies.gs + ++ lib.optionals enableAWS optional-dependencies.s3 + ++ lib.optionals enableAzure optional-dependencies.azure + ++ lib.optionals enableSSH optional-dependencies.ssh ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ] ++ lib.optionals (pythonOlder "3.9") [ importlib-resources ]; - passthru.optional-dependencies = { + optional-dependencies = { azure = [ dvc-azure ]; gdrive = [ dvc-gdrive ]; gs = [ dvc-gs ]; diff --git a/pkgs/development/python-modules/dvclive/default.nix b/pkgs/development/python-modules/dvclive/default.nix index 7973a0e76967..6124823fce59 100644 --- a/pkgs/development/python-modules/dvclive/default.nix +++ b/pkgs/development/python-modules/dvclive/default.nix @@ -59,7 +59,7 @@ buildPythonPackage rec { pynvml ]; - passthru.optional-dependencies = { + optional-dependencies = { all = [ jsonargparse lightgbm diff --git a/pkgs/development/python-modules/edalize/default.nix b/pkgs/development/python-modules/edalize/default.nix index e710689aaa26..25af1e1e6ded 100644 --- a/pkgs/development/python-modules/edalize/default.nix +++ b/pkgs/development/python-modules/edalize/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ jinja2 ]; - passthru.optional-dependencies = { + optional-dependencies = { reporting = [ pandas pyparsing @@ -52,7 +52,7 @@ buildPythonPackage rec { pytestCheckHook which yosys - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "edalize" ]; diff --git a/pkgs/development/python-modules/elasticsearch/default.nix b/pkgs/development/python-modules/elasticsearch/default.nix index 562d66e9bc2a..68621f96c151 100644 --- a/pkgs/development/python-modules/elasticsearch/default.nix +++ b/pkgs/development/python-modules/elasticsearch/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { certifi ]; - passthru.optional-dependencies = { + optional-dependencies = { requests = [ requests ]; async = [ aiohttp ]; }; diff --git a/pkgs/development/python-modules/elasticsearch8/default.nix b/pkgs/development/python-modules/elasticsearch8/default.nix index 3d3594ae4b34..3428dfbff8b6 100644 --- a/pkgs/development/python-modules/elasticsearch8/default.nix +++ b/pkgs/development/python-modules/elasticsearch8/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { dependencies = [ elastic-transport ]; - passthru.optional-dependencies = { + optional-dependencies = { async = [ aiohttp ]; requests = [ requests ]; orjson = [ orjson ]; diff --git a/pkgs/development/python-modules/esig/default.nix b/pkgs/development/python-modules/esig/default.nix index 68af34c82e3a..ba89418c0b69 100644 --- a/pkgs/development/python-modules/esig/default.nix +++ b/pkgs/development/python-modules/esig/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ numpy ]; - passthru.optional-dependencies = { + optional-dependencies = { iisignature = [ iisignature ]; }; diff --git a/pkgs/development/python-modules/essentials-openapi/default.nix b/pkgs/development/python-modules/essentials-openapi/default.nix index 7438c2ef6e98..b6cc24262073 100644 --- a/pkgs/development/python-modules/essentials-openapi/default.nix +++ b/pkgs/development/python-modules/essentials-openapi/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { markupsafe ]; - passthru.optional-dependencies = { + optional-dependencies = { full = [ click jinja2 diff --git a/pkgs/development/python-modules/eth-hash/default.nix b/pkgs/development/python-modules/eth-hash/default.nix index c53e052b76fc..241a4260e43a 100644 --- a/pkgs/development/python-modules/eth-hash/default.nix +++ b/pkgs/development/python-modules/eth-hash/default.nix @@ -24,11 +24,11 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest ] - ++ passthru.optional-dependencies.pycryptodome + ++ optional-dependencies.pycryptodome # eth-hash can use either safe-pysha3 or pycryptodome; # safe-pysha3 requires Python 3.9+ while pycryptodome does not. # https://github.com/ethereum/eth-hash/issues/46#issuecomment-1314029211 - ++ lib.optional (pythonAtLeast "3.9") passthru.optional-dependencies.pysha3; + ++ lib.optional (pythonAtLeast "3.9") optional-dependencies.pysha3; checkPhase = '' @@ -38,7 +38,7 @@ buildPythonPackage rec { pytest tests/backends/pysha3/ ''; - passthru.optional-dependencies = { + optional-dependencies = { pycryptodome = [ pycryptodome ]; pysha3 = [ safe-pysha3 ]; }; diff --git a/pkgs/development/python-modules/eth-keys/default.nix b/pkgs/development/python-modules/eth-keys/default.nix index 964f4f08326d..c64470a2c485 100644 --- a/pkgs/development/python-modules/eth-keys/default.nix +++ b/pkgs/development/python-modules/eth-keys/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { pyasn1 pytestCheckHook ] - ++ passthru.optional-dependencies.coincurve + ++ optional-dependencies.coincurve ++ lib.optional (!isPyPy) eth-hash.optional-dependencies.pysha3 ++ lib.optional isPyPy eth-hash.optional-dependencies.pycryptodome; @@ -63,7 +63,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "eth_keys" ]; - passthru.optional-dependencies = { + optional-dependencies = { coincurve = [ coincurve ]; }; diff --git a/pkgs/development/python-modules/etils/default.nix b/pkgs/development/python-modules/etils/default.nix index a78831b4aedf..0f925eadb23a 100644 --- a/pkgs/development/python-modules/etils/default.nix +++ b/pkgs/development/python-modules/etils/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { nativeBuildInputs = [ flit-core ]; - passthru.optional-dependencies = rec { + optional-dependencies = rec { array-types = enp; eapp = [ absl-py # FIXME package simple-parsing @@ -91,7 +91,7 @@ buildPythonPackage rec { pytest-xdist pytestCheckHook yapf - ] ++ passthru.optional-dependencies.all; + ] ++ optional-dependencies.all; disabledTests = [ "test_public_access" # requires network access diff --git a/pkgs/development/python-modules/exchangelib/default.nix b/pkgs/development/python-modules/exchangelib/default.nix index 5be910888a8e..0f6e58d0cb2c 100644 --- a/pkgs/development/python-modules/exchangelib/default.nix +++ b/pkgs/development/python-modules/exchangelib/default.nix @@ -61,7 +61,7 @@ buildPythonPackage rec { tzlocal ] ++ lib.optionals (pythonOlder "3.9") [ backports-zoneinfo ]; - passthru.optional-dependencies = { + optional-dependencies = { complete = [ requests-gssapi # requests-negotiate-sspi diff --git a/pkgs/development/python-modules/explorerscript/default.nix b/pkgs/development/python-modules/explorerscript/default.nix index 391881204e29..0d4a31376f32 100644 --- a/pkgs/development/python-modules/explorerscript/default.nix +++ b/pkgs/development/python-modules/explorerscript/default.nix @@ -47,9 +47,9 @@ buildPythonPackage rec { igraph ]; - passthru.optional-dependencies.pygments = [ pygments ]; + optional-dependencies.pygments = [ pygments ]; - nativeCheckInputs = [ pytestCheckHook ] ++ passthru.optional-dependencies.pygments; + nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.pygments; pythonImportsCheck = [ "explorerscript" ]; diff --git a/pkgs/development/python-modules/fakeredis/default.nix b/pkgs/development/python-modules/fakeredis/default.nix index fa62b1754893..4aa0af9aa8db 100644 --- a/pkgs/development/python-modules/fakeredis/default.nix +++ b/pkgs/development/python-modules/fakeredis/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { pytestCheckHook ]; - passthru.optional-dependencies = { + optional-dependencies = { lua = [ lupa ]; json = [ jsonpath-ng ]; bf = [ pyprobables ]; diff --git a/pkgs/development/python-modules/fastparquet/default.nix b/pkgs/development/python-modules/fastparquet/default.nix index 4add91da0926..5beafcea7a1c 100644 --- a/pkgs/development/python-modules/fastparquet/default.nix +++ b/pkgs/development/python-modules/fastparquet/default.nix @@ -58,7 +58,7 @@ buildPythonPackage rec { pandas ]; - passthru.optional-dependencies = { + optional-dependencies = { lzo = [ python-lzo ]; }; diff --git a/pkgs/development/python-modules/fido2/default.nix b/pkgs/development/python-modules/fido2/default.nix index 8b5a06c4a1fc..0dd47d31ed70 100644 --- a/pkgs/development/python-modules/fido2/default.nix +++ b/pkgs/development/python-modules/fido2/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { dependencies = [ cryptography ]; - passthru.optional-dependencies = { + optional-dependencies = { pcsc = [ pyscard ]; }; diff --git a/pkgs/development/python-modules/firebase-messaging/default.nix b/pkgs/development/python-modules/firebase-messaging/default.nix index 0d6118e44c4e..15c39a634980 100644 --- a/pkgs/development/python-modules/firebase-messaging/default.nix +++ b/pkgs/development/python-modules/firebase-messaging/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry-core sphinxHook - ] ++ passthru.optional-dependencies.docs; + ] ++ optional-dependencies.docs; propagatedBuildInputs = [ aiohttp @@ -52,7 +52,7 @@ buildPythonPackage rec { protobuf ]; - passthru.optional-dependencies = { + optional-dependencies = { docs = [ sphinx sphinx-autodoc-typehints diff --git a/pkgs/development/python-modules/fixtures/default.nix b/pkgs/development/python-modules/fixtures/default.nix index a14f24cb8e5f..ca122ad9c7db 100644 --- a/pkgs/development/python-modules/fixtures/default.nix +++ b/pkgs/development/python-modules/fixtures/default.nix @@ -26,14 +26,14 @@ buildPythonPackage rec { propagatedBuildInputs = [ pbr ]; - passthru.optional-dependencies = { + optional-dependencies = { streams = [ testtools ]; }; nativeCheckInputs = [ mock pytestCheckHook - ] ++ passthru.optional-dependencies.streams; + ] ++ optional-dependencies.streams; meta = { description = "Reusable state for writing clean tests and more"; diff --git a/pkgs/development/python-modules/flask-jwt-extended/default.nix b/pkgs/development/python-modules/flask-jwt-extended/default.nix index d05524e905fb..00c986235587 100644 --- a/pkgs/development/python-modules/flask-jwt-extended/default.nix +++ b/pkgs/development/python-modules/flask-jwt-extended/default.nix @@ -31,11 +31,11 @@ buildPythonPackage rec { werkzeug ]; - passthru.optional-dependencies.asymmetric_crypto = [ cryptography ]; + optional-dependencies.asymmetric_crypto = [ cryptography ]; nativeCheckInputs = [ pytestCheckHook - ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); pythonImportsCheck = [ "flask_jwt_extended" ]; diff --git a/pkgs/development/python-modules/flask-marshmallow/default.nix b/pkgs/development/python-modules/flask-marshmallow/default.nix index 69ad443789ed..6c256c496835 100644 --- a/pkgs/development/python-modules/flask-marshmallow/default.nix +++ b/pkgs/development/python-modules/flask-marshmallow/default.nix @@ -32,14 +32,14 @@ buildPythonPackage rec { marshmallow ]; - passthru.optional-dependencies = { + optional-dependencies = { sqlalchemy = [ flask-sqlalchemy marshmallow-sqlalchemy ]; }; - nativeCheckInputs = [ pytestCheckHook ] ++ passthru.optional-dependencies.sqlalchemy; + nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.sqlalchemy; pythonImportsCheck = [ "flask_marshmallow" ]; diff --git a/pkgs/development/python-modules/flask-mongoengine/default.nix b/pkgs/development/python-modules/flask-mongoengine/default.nix index 65ba830e9103..8fa9a2333561 100644 --- a/pkgs/development/python-modules/flask-mongoengine/default.nix +++ b/pkgs/development/python-modules/flask-mongoengine/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { mongoengine ] ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ]; - passthru.optional-dependencies = { + optional-dependencies = { wtf = [ flask-wtf wtforms diff --git a/pkgs/development/python-modules/flask-wtf/default.nix b/pkgs/development/python-modules/flask-wtf/default.nix index 487c2c997b8e..09fa23575fa4 100644 --- a/pkgs/development/python-modules/flask-wtf/default.nix +++ b/pkgs/development/python-modules/flask-wtf/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { wtforms ]; - passthru.optional-dependencies = { + optional-dependencies = { email = [ email-validator ]; }; diff --git a/pkgs/development/python-modules/flask/default.nix b/pkgs/development/python-modules/flask/default.nix index d8effec2045e..850dba14f28e 100644 --- a/pkgs/development/python-modules/flask/default.nix +++ b/pkgs/development/python-modules/flask/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { werkzeug ] ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ]; - passthru.optional-dependencies = { + optional-dependencies = { async = [ asgiref ]; dotenv = [ python-dotenv ]; }; @@ -58,7 +58,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ] ++ lib.optionals (pythonOlder "3.11") [ greenlet ] - ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ++ lib.flatten (builtins.attrValues optional-dependencies); passthru.tests = { inherit diff --git a/pkgs/development/python-modules/flax/default.nix b/pkgs/development/python-modules/flax/default.nix index 098e6cf28e6b..4f93bd4f8ea5 100644 --- a/pkgs/development/python-modules/flax/default.nix +++ b/pkgs/development/python-modules/flax/default.nix @@ -60,7 +60,7 @@ buildPythonPackage rec { typing-extensions ]; - passthru.optional-dependencies = { + optional-dependencies = { all = [ matplotlib ]; }; diff --git a/pkgs/development/python-modules/flow-record/default.nix b/pkgs/development/python-modules/flow-record/default.nix index d9c61a791615..b92660587549 100644 --- a/pkgs/development/python-modules/flow-record/default.nix +++ b/pkgs/development/python-modules/flow-record/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { dependencies = [ msgpack ]; - passthru.optional-dependencies = { + optional-dependencies = { compression = [ lz4 zstandard @@ -45,7 +45,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest7CheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "flow.record" ]; diff --git a/pkgs/development/python-modules/foolscap/default.nix b/pkgs/development/python-modules/foolscap/default.nix index a5f3eb9c60b1..3cf3b2beb1b8 100644 --- a/pkgs/development/python-modules/foolscap/default.nix +++ b/pkgs/development/python-modules/foolscap/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { pyopenssl ] ++ twisted.optional-dependencies.tls; - passthru.optional-dependencies = { + optional-dependencies = { i2p = [ txi2p-tahoe ]; tor = [ txtorcon ]; }; @@ -50,7 +50,7 @@ buildPythonPackage rec { nativeCheckInputs = [ mock pytestCheckHook - ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); pythonImportsCheck = [ "foolscap" ]; diff --git a/pkgs/development/python-modules/fritzconnection/default.nix b/pkgs/development/python-modules/fritzconnection/default.nix index 4ed60bd8a704..9e49e8c420c8 100644 --- a/pkgs/development/python-modules/fritzconnection/default.nix +++ b/pkgs/development/python-modules/fritzconnection/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests ]; - passthru.optional-dependencies = { + optional-dependencies = { qr = [ segno ]; }; diff --git a/pkgs/development/python-modules/fschat/default.nix b/pkgs/development/python-modules/fschat/default.nix index d086073f1a4d..d86fd4d91062 100644 --- a/pkgs/development/python-modules/fschat/default.nix +++ b/pkgs/development/python-modules/fschat/default.nix @@ -63,7 +63,7 @@ buildPythonPackage { # ] ++ markdown2.optional-dependencies.all; ]; - passthru.optional-dependencies = { + optional-dependencies = { llm_judge = [ anthropic openai diff --git a/pkgs/development/python-modules/fsspec/default.nix b/pkgs/development/python-modules/fsspec/default.nix index 832920986a39..741755247223 100644 --- a/pkgs/development/python-modules/fsspec/default.nix +++ b/pkgs/development/python-modules/fsspec/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { tqdm ]; - passthru.optional-dependencies = { + optional-dependencies = { entrypoints = [ ]; abfs = [ adlfs ]; adl = [ adlfs ]; diff --git a/pkgs/development/python-modules/fugashi/default.nix b/pkgs/development/python-modules/fugashi/default.nix index 99c0853b461c..ab617d626473 100644 --- a/pkgs/development/python-modules/fugashi/default.nix +++ b/pkgs/development/python-modules/fugashi/default.nix @@ -34,9 +34,9 @@ buildPythonPackage rec { nativeCheckInputs = [ ipadic pytestCheckHook - ] ++ passthru.optional-dependencies.unidic-lite; + ] ++ optional-dependencies.unidic-lite; - passthru.optional-dependencies = { + optional-dependencies = { unidic-lite = [ unidic-lite ]; unidic = [ unidic ]; }; diff --git a/pkgs/development/python-modules/fvcore/default.nix b/pkgs/development/python-modules/fvcore/default.nix index 6d00d662b055..a3f359bad457 100644 --- a/pkgs/development/python-modules/fvcore/default.nix +++ b/pkgs/development/python-modules/fvcore/default.nix @@ -52,7 +52,7 @@ buildPythonPackage { pythonImportsCheck = [ "fvcore" ]; - passthru.optional-dependencies = optional-dependencies; + optional-dependencies = optional-dependencies; meta = with lib; { description = "Collection of common code that's shared among different research projects in FAIR computer vision team"; diff --git a/pkgs/development/python-modules/gardena-bluetooth/default.nix b/pkgs/development/python-modules/gardena-bluetooth/default.nix index 38ad47244f22..45cbdea0d546 100644 --- a/pkgs/development/python-modules/gardena-bluetooth/default.nix +++ b/pkgs/development/python-modules/gardena-bluetooth/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { tzlocal ]; - passthru.optional-dependencies = { + optional-dependencies = { cli = [ asyncclick ]; }; diff --git a/pkgs/development/python-modules/githubkit/default.nix b/pkgs/development/python-modules/githubkit/default.nix index d27a9e672da2..b09f27514727 100644 --- a/pkgs/development/python-modules/githubkit/default.nix +++ b/pkgs/development/python-modules/githubkit/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { typing-extensions ]; - passthru.optional-dependencies = { + optional-dependencies = { all = [ anyio pyjwt @@ -59,7 +59,7 @@ buildPythonPackage rec { pytestCheckHook pytest-cov-stub pytest-xdist - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "githubkit" ]; diff --git a/pkgs/development/python-modules/google-api-core/default.nix b/pkgs/development/python-modules/google-api-core/default.nix index ccfeaa3debac..8d9083115fd5 100644 --- a/pkgs/development/python-modules/google-api-core/default.nix +++ b/pkgs/development/python-modules/google-api-core/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { requests ]; - passthru.optional-dependencies = { + optional-dependencies = { grpc = [ grpcio grpcio-status diff --git a/pkgs/development/python-modules/google-auth/default.nix b/pkgs/development/python-modules/google-auth/default.nix index 30ea8208ff8e..ea25b7f2a6b6 100644 --- a/pkgs/development/python-modules/google-auth/default.nix +++ b/pkgs/development/python-modules/google-auth/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { rsa ]; - passthru.optional-dependencies = { + optional-dependencies = { aiohttp = [ aiohttp requests @@ -75,9 +75,9 @@ buildPythonPackage rec { pytestCheckHook responses ] - ++ passthru.optional-dependencies.aiohttp - ++ passthru.optional-dependencies.enterprise_cert - ++ passthru.optional-dependencies.reauth; + ++ optional-dependencies.aiohttp + ++ optional-dependencies.enterprise_cert + ++ optional-dependencies.reauth; pythonImportsCheck = [ "google.auth" diff --git a/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix b/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix index 4eae86bbbf46..22389251e06c 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { protobuf ] ++ google-api-core.optional-dependencies.grpc; - passthru.optional-dependencies = { + optional-dependencies = { fastavro = [ fastavro ]; pandas = [ pandas ]; pyarrow = [ pyarrow ]; diff --git a/pkgs/development/python-modules/google-cloud-bigquery/default.nix b/pkgs/development/python-modules/google-cloud-bigquery/default.nix index d9ea0eba51ba..5451d1857a65 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery/default.nix @@ -54,7 +54,7 @@ buildPythonPackage rec { python-dateutil ] ++ google-api-core.optional-dependencies.grpc; - passthru.optional-dependencies = { + optional-dependencies = { bqstorage = [ google-cloud-bigquery-storage grpcio @@ -78,7 +78,7 @@ buildPythonPackage rec { google-cloud-storage pytestCheckHook pytest-xdist - ] ++ passthru.optional-dependencies.pandas ++ passthru.optional-dependencies.ipython; + ] ++ optional-dependencies.pandas ++ optional-dependencies.ipython; # prevent google directory from shadowing google imports preCheck = '' diff --git a/pkgs/development/python-modules/google-cloud-bigtable/default.nix b/pkgs/development/python-modules/google-cloud-bigtable/default.nix index 91896114390e..fe8e5f496360 100644 --- a/pkgs/development/python-modules/google-cloud-bigtable/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigtable/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { protobuf ] ++ google-api-core.optional-dependencies.grpc; - passthru.optional-dependencies = { + optional-dependencies = { libcst = [ libcst ]; }; diff --git a/pkgs/development/python-modules/google-cloud-core/default.nix b/pkgs/development/python-modules/google-cloud-core/default.nix index bd5fbf7ee044..e0b052ba2fb0 100644 --- a/pkgs/development/python-modules/google-cloud-core/default.nix +++ b/pkgs/development/python-modules/google-cloud-core/default.nix @@ -27,14 +27,14 @@ buildPythonPackage rec { google-api-core ]; - passthru.optional-dependencies = { + optional-dependencies = { grpc = [ grpcio ]; }; nativeCheckInputs = [ mock pytestCheckHook - ] ++ passthru.optional-dependencies.grpc; + ] ++ optional-dependencies.grpc; # prevent google directory from shadowing google imports preCheck = '' diff --git a/pkgs/development/python-modules/google-cloud-pubsub/default.nix b/pkgs/development/python-modules/google-cloud-pubsub/default.nix index a564a85d45d6..dae730accaa8 100644 --- a/pkgs/development/python-modules/google-cloud-pubsub/default.nix +++ b/pkgs/development/python-modules/google-cloud-pubsub/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { protobuf ] ++ google-api-core.optional-dependencies.grpc; - passthru.optional-dependencies = { + optional-dependencies = { libcst = [ libcst ]; }; diff --git a/pkgs/development/python-modules/google-cloud-spanner/default.nix b/pkgs/development/python-modules/google-cloud-spanner/default.nix index 14527a19a43a..da4dbf120eb1 100644 --- a/pkgs/development/python-modules/google-cloud-spanner/default.nix +++ b/pkgs/development/python-modules/google-cloud-spanner/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { sqlparse ] ++ google-api-core.optional-dependencies.grpc; - passthru.optional-dependencies = { + optional-dependencies = { libcst = [ libcst ]; }; diff --git a/pkgs/development/python-modules/google-cloud-storage/default.nix b/pkgs/development/python-modules/google-cloud-storage/default.nix index 4a5081468f9c..d5a4d97cf7ce 100644 --- a/pkgs/development/python-modules/google-cloud-storage/default.nix +++ b/pkgs/development/python-modules/google-cloud-storage/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { requests ]; - passthru.optional-dependencies = { + optional-dependencies = { protobuf = [ protobuf ]; }; diff --git a/pkgs/development/python-modules/google-resumable-media/default.nix b/pkgs/development/python-modules/google-resumable-media/default.nix index 504987669e7e..bf55a48543a2 100644 --- a/pkgs/development/python-modules/google-resumable-media/default.nix +++ b/pkgs/development/python-modules/google-resumable-media/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { google-crc32c ]; - passthru.optional-dependencies = { + optional-dependencies = { requests = [ requests ]; aiohttp = [ aiohttp ]; }; @@ -40,7 +40,7 @@ buildPythonPackage rec { mock pytest-asyncio pytestCheckHook - ] ++ passthru.optional-dependencies.requests; + ] ++ optional-dependencies.requests; preCheck = '' # prevent shadowing imports diff --git a/pkgs/development/python-modules/gotailwind/default.nix b/pkgs/development/python-modules/gotailwind/default.nix index 8593c49ddc11..a3a640841d4a 100644 --- a/pkgs/development/python-modules/gotailwind/default.nix +++ b/pkgs/development/python-modules/gotailwind/default.nix @@ -51,7 +51,7 @@ buildPythonPackage rec { zeroconf ]; - passthru.optional-dependencies = { + optional-dependencies = { cli = [ typer ]; }; diff --git a/pkgs/development/python-modules/gradio/default.nix b/pkgs/development/python-modules/gradio/default.nix index 68d0da3d5660..2e59cce67546 100644 --- a/pkgs/development/python-modules/gradio/default.nix +++ b/pkgs/development/python-modules/gradio/default.nix @@ -127,7 +127,7 @@ buildPythonPackage rec { tomlkit ]; - passthru.optional-dependencies.oauth = [ + optional-dependencies.oauth = [ authlib itsdangerous ]; @@ -151,7 +151,7 @@ buildPythonPackage rec { # mock calls to `shutil.which(...)` (writeShellScriptBin "npm" "false") - ] ++ passthru.optional-dependencies.oauth ++ pydantic.optional-dependencies.email; + ] ++ optional-dependencies.oauth ++ pydantic.optional-dependencies.email; # Add a pytest hook skipping tests that access network, marking them as "Expected fail" (xfail). # We additionally xfail FileNotFoundError, since the gradio devs often fail to upload test assets to pypi. diff --git a/pkgs/development/python-modules/griffe/default.nix b/pkgs/development/python-modules/griffe/default.nix index ddb9195df7f8..79708b5673c0 100644 --- a/pkgs/development/python-modules/griffe/default.nix +++ b/pkgs/development/python-modules/griffe/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { pytestCheckHook ]; - passthru.optional-dependencies = { + optional-dependencies = { async = [ aiofiles ]; }; diff --git a/pkgs/development/python-modules/hap-python/default.nix b/pkgs/development/python-modules/hap-python/default.nix index 97b5c1f480e3..8c7ae2b3bc2c 100644 --- a/pkgs/development/python-modules/hap-python/default.nix +++ b/pkgs/development/python-modules/hap-python/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { zeroconf ]; - passthru.optional-dependencies.QRCode = [ + optional-dependencies.QRCode = [ base36 pyqrcode ]; @@ -48,7 +48,7 @@ buildPythonPackage rec { pytest-asyncio pytest-timeout pytestCheckHook - ] ++ passthru.optional-dependencies.QRCode; + ] ++ optional-dependencies.QRCode; disabledTestPaths = [ # Disable tests requiring network access diff --git a/pkgs/development/python-modules/haystack-ai/default.nix b/pkgs/development/python-modules/haystack-ai/default.nix index 65227f54d5ab..0d8aaa732636 100644 --- a/pkgs/development/python-modules/haystack-ai/default.nix +++ b/pkgs/development/python-modules/haystack-ai/default.nix @@ -138,7 +138,7 @@ buildPythonPackage rec { env.HOME = "$(mktemp -d)"; - passthru.optional-dependencies = { + optional-dependencies = { # all = [ # farm-haystack # ]; diff --git a/pkgs/development/python-modules/highdicom/default.nix b/pkgs/development/python-modules/highdicom/default.nix index 25148892a0b4..646ba22abda5 100644 --- a/pkgs/development/python-modules/highdicom/default.nix +++ b/pkgs/development/python-modules/highdicom/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { pydicom ]; - passthru.optional-dependencies = { + optional-dependencies = { libjpeg = [ pylibjpeg pylibjpeg-libjpeg @@ -49,7 +49,7 @@ buildPythonPackage rec { ]; }; - nativeCheckInputs = [ pytestCheckHook ] ++ passthru.optional-dependencies.libjpeg; + nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.libjpeg; preCheck = '' export HOME=$TMP/test-home mkdir -p $HOME/.pydicom/ diff --git a/pkgs/development/python-modules/hikari-lightbulb/default.nix b/pkgs/development/python-modules/hikari-lightbulb/default.nix index 9fb3952ce0a7..a87c5fb7c2d4 100644 --- a/pkgs/development/python-modules/hikari-lightbulb/default.nix +++ b/pkgs/development/python-modules/hikari-lightbulb/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ hikari ]; - passthru.optional-dependencies = { + optional-dependencies = { crontrigger = [ croniter ]; }; diff --git a/pkgs/development/python-modules/hikari/default.nix b/pkgs/development/python-modules/hikari/default.nix index dbc853b926aa..709b9cde7f49 100644 --- a/pkgs/development/python-modules/hikari/default.nix +++ b/pkgs/development/python-modules/hikari/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { pythonRelaxDeps = true; - passthru.optional-dependencies = { + optional-dependencies = { server = [ pynacl ]; }; diff --git a/pkgs/development/python-modules/hishel/default.nix b/pkgs/development/python-modules/hishel/default.nix index e86b6382a83f..200719f880dd 100644 --- a/pkgs/development/python-modules/hishel/default.nix +++ b/pkgs/development/python-modules/hishel/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { dependencies = [ httpx ]; - passthru.optional-dependencies = { + optional-dependencies = { redis = [ redis ]; s3 = [ boto3 ]; sqlite = [ anysqlite ]; @@ -49,7 +49,7 @@ buildPythonPackage rec { pytest-asyncio pytestCheckHook trio - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "hishel" ]; diff --git a/pkgs/development/python-modules/htmldate/default.nix b/pkgs/development/python-modules/htmldate/default.nix index 3f504f7729b6..adfeb0b7949e 100644 --- a/pkgs/development/python-modules/htmldate/default.nix +++ b/pkgs/development/python-modules/htmldate/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { urllib3 ]; - passthru.optional-dependencies = { + optional-dependencies = { speed = [ faust-cchardet diff --git a/pkgs/development/python-modules/httpbin/default.nix b/pkgs/development/python-modules/httpbin/default.nix index 4b670b4c17bd..ef9fe211f55c 100644 --- a/pkgs/development/python-modules/httpbin/default.nix +++ b/pkgs/development/python-modules/httpbin/default.nix @@ -49,7 +49,7 @@ buildPythonPackage rec { werkzeug ]; - passthru.optional-dependencies = { + optional-dependencies = { mainapp = [ gunicorn gevent diff --git a/pkgs/development/python-modules/httpcore/default.nix b/pkgs/development/python-modules/httpcore/default.nix index b1d64e6526be..979fe3b3ef51 100644 --- a/pkgs/development/python-modules/httpcore/default.nix +++ b/pkgs/development/python-modules/httpcore/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { h11 ]; - passthru.optional-dependencies = { + optional-dependencies = { asyncio = [ anyio ]; http2 = [ h2 ]; socks = [ socksio ]; @@ -59,7 +59,7 @@ buildPythonPackage rec { pytest-httpbin pytest-trio pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "httpcore" ]; diff --git a/pkgs/development/python-modules/httpx-socks/default.nix b/pkgs/development/python-modules/httpx-socks/default.nix index 64049235003a..97d65fafa3f2 100644 --- a/pkgs/development/python-modules/httpx-socks/default.nix +++ b/pkgs/development/python-modules/httpx-socks/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { python-socks ]; - passthru.optional-dependencies = { + optional-dependencies = { asyncio = [ async-timeout ]; trio = [ trio ]; }; diff --git a/pkgs/development/python-modules/httpx/default.nix b/pkgs/development/python-modules/httpx/default.nix index eb91fa3fce1e..0a32af68bab9 100644 --- a/pkgs/development/python-modules/httpx/default.nix +++ b/pkgs/development/python-modules/httpx/default.nix @@ -56,7 +56,7 @@ buildPythonPackage rec { sniffio ]; - passthru.optional-dependencies = { + optional-dependencies = { http2 = [ h2 ]; socks = [ socksio ]; brotli = if isPyPy then [ brotlicffi ] else [ brotli ]; @@ -78,7 +78,7 @@ buildPythonPackage rec { pytest-trio trustme uvicorn - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); # testsuite wants to find installed packages for testing entrypoint preCheck = '' diff --git a/pkgs/development/python-modules/ibis-framework/default.nix b/pkgs/development/python-modules/ibis-framework/default.nix index abaabb11f1bb..7631a36d3785 100644 --- a/pkgs/development/python-modules/ibis-framework/default.nix +++ b/pkgs/development/python-modules/ibis-framework/default.nix @@ -125,7 +125,7 @@ buildPythonPackage rec { pytest-snapshot pytest-timeout pytest-xdist - ] ++ lib.concatMap (name: passthru.optional-dependencies.${name}) testBackends; + ] ++ lib.concatMap (name: optional-dependencies.${name}) testBackends; pytestFlagsArray = [ "--dist=loadgroup" @@ -167,54 +167,52 @@ buildPythonPackage rec { pythonImportsCheck = [ "ibis" ] ++ map (backend: "ibis.backends.${backend}") testBackends; - passthru = { - optional-dependencies = { - bigquery = [ - db-dtypes - google-cloud-bigquery - google-cloud-bigquery-storage - pydata-google-auth - ]; - clickhouse = [ clickhouse-connect ]; - dask = [ - dask - regex - packaging - ]; - datafusion = [ datafusion ]; - druid = [ pydruid ]; - duckdb = [ duckdb ]; - flink = [ ]; - geospatial = [ - geopandas - shapely - ]; - mssql = [ pyodbc ]; - mysql = [ pymysql ]; - oracle = [ - oracledb - packaging - ]; - pandas = [ - regex - packaging - ]; - polars = [ - polars - packaging - ]; - postgres = [ psycopg2 ]; - pyspark = [ - pyspark - packaging - ]; - snowflake = [ snowflake-connector-python ]; - sqlite = [ regex ]; - trino = [ trino-python-client ]; - visualization = [ graphviz ]; - decompiler = [ black ]; - examples = [ pins ] ++ pins.optional-dependencies.gcs; - }; + optional-dependencies = { + bigquery = [ + db-dtypes + google-cloud-bigquery + google-cloud-bigquery-storage + pydata-google-auth + ]; + clickhouse = [ clickhouse-connect ]; + dask = [ + dask + regex + packaging + ]; + datafusion = [ datafusion ]; + druid = [ pydruid ]; + duckdb = [ duckdb ]; + flink = [ ]; + geospatial = [ + geopandas + shapely + ]; + mssql = [ pyodbc ]; + mysql = [ pymysql ]; + oracle = [ + oracledb + packaging + ]; + pandas = [ + regex + packaging + ]; + polars = [ + polars + packaging + ]; + postgres = [ psycopg2 ]; + pyspark = [ + pyspark + packaging + ]; + snowflake = [ snowflake-connector-python ]; + sqlite = [ regex ]; + trino = [ trino-python-client ]; + visualization = [ graphviz ]; + decompiler = [ black ]; + examples = [ pins ] ++ pins.optional-dependencies.gcs; }; meta = with lib; { diff --git a/pkgs/development/python-modules/igraph/default.nix b/pkgs/development/python-modules/igraph/default.nix index 3f13cf77b729..48983a575805 100644 --- a/pkgs/development/python-modules/igraph/default.nix +++ b/pkgs/development/python-modules/igraph/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { dependencies = [ texttable ]; - passthru.optional-dependencies = { + optional-dependencies = { cairo = [ cairocffi ]; matplotlib = [ matplotlib ]; plotly = [ plotly ]; @@ -58,7 +58,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); disabledTests = [ "testAuthorityScore" diff --git a/pkgs/development/python-modules/imbalanced-learn/default.nix b/pkgs/development/python-modules/imbalanced-learn/default.nix index e3bdcc2a059e..f3ba05708749 100644 --- a/pkgs/development/python-modules/imbalanced-learn/default.nix +++ b/pkgs/development/python-modules/imbalanced-learn/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { threadpoolctl ]; - passthru.optional-dependencies = { + optional-dependencies = { optional = [ keras pandas diff --git a/pkgs/development/python-modules/influxdb-client/default.nix b/pkgs/development/python-modules/influxdb-client/default.nix index 0bf65299a561..9360f6d78010 100644 --- a/pkgs/development/python-modules/influxdb-client/default.nix +++ b/pkgs/development/python-modules/influxdb-client/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { urllib3 ]; - passthru.optional-dependencies = { + optional-dependencies = { async = [ aiocsv aiohttp diff --git a/pkgs/development/python-modules/intake/default.nix b/pkgs/development/python-modules/intake/default.nix index ba078d1f90c3..7ee914aca70f 100644 --- a/pkgs/development/python-modules/intake/default.nix +++ b/pkgs/development/python-modules/intake/default.nix @@ -59,9 +59,9 @@ buildPythonPackage rec { nativeCheckInputs = [ intake-parquet pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); - passthru.optional-dependencies = { + optional-dependencies = { server = [ msgpack python-snappy diff --git a/pkgs/development/python-modules/iopath/default.nix b/pkgs/development/python-modules/iopath/default.nix index 53159f5a8457..66ea7ae87f2e 100644 --- a/pkgs/development/python-modules/iopath/default.nix +++ b/pkgs/development/python-modules/iopath/default.nix @@ -52,7 +52,7 @@ buildPythonPackage { pythonImportsCheck = [ "iopath" ]; - passthru.optional-dependencies = { + optional-dependencies = { aws = [ boto3 ]; }; diff --git a/pkgs/development/python-modules/jinja2/default.nix b/pkgs/development/python-modules/jinja2/default.nix index ee1d27671b5d..995f436a8242 100644 --- a/pkgs/development/python-modules/jinja2/default.nix +++ b/pkgs/development/python-modules/jinja2/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ markupsafe ]; - passthru.optional-dependencies = { + optional-dependencies = { i18n = [ babel ]; }; @@ -43,7 +43,7 @@ buildPythonPackage rec { # See https://github.com/pallets/jinja/issues/1158 doCheck = !stdenv.hostPlatform.is32bit; - nativeCheckInputs = [ pytestCheckHook ] ++ passthru.optional-dependencies.i18n; + nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.i18n; disabledTests = lib.optionals (pythonAtLeast "3.13") [ # https://github.com/pallets/jinja/issues/1900 diff --git a/pkgs/development/python-modules/jira/default.nix b/pkgs/development/python-modules/jira/default.nix index 2e2ff91c8b0a..dae3210280e3 100644 --- a/pkgs/development/python-modules/jira/default.nix +++ b/pkgs/development/python-modules/jira/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { typing-extensions ]; - passthru.optional-dependencies = { + optional-dependencies = { cli = [ ipython keyring diff --git a/pkgs/development/python-modules/jsonargparse/default.nix b/pkgs/development/python-modules/jsonargparse/default.nix index 4ee82d9af57b..762e7f892b0a 100644 --- a/pkgs/development/python-modules/jsonargparse/default.nix +++ b/pkgs/development/python-modules/jsonargparse/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { dependencies = [ pyyaml ]; - passthru.optional-dependencies = { + optional-dependencies = { all = [ argcomplete fsspec diff --git a/pkgs/development/python-modules/jsonschema/default.nix b/pkgs/development/python-modules/jsonschema/default.nix index b0db522f61e9..cc0adcaffc16 100644 --- a/pkgs/development/python-modules/jsonschema/default.nix +++ b/pkgs/development/python-modules/jsonschema/default.nix @@ -61,7 +61,7 @@ buildPythonPackage rec { pkgutil-resolve-name ]; - passthru.optional-dependencies = { + optional-dependencies = { format = [ fqdn idna diff --git a/pkgs/development/python-modules/jupyter-events/default.nix b/pkgs/development/python-modules/jupyter-events/default.nix index 66de5a91ff5f..6a5431fd1abf 100644 --- a/pkgs/development/python-modules/jupyter-events/default.nix +++ b/pkgs/development/python-modules/jupyter-events/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { traitlets ] ++ jsonschema.optional-dependencies.format-nongpl; - passthru.optional-dependencies = { + optional-dependencies = { cli = [ click rich @@ -59,7 +59,7 @@ buildPythonPackage rec { pytest-asyncio pytest-console-scripts pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); preCheck = '' export PATH="$out/bin:$PATH" diff --git a/pkgs/development/python-modules/kafka-python-ng/default.nix b/pkgs/development/python-modules/kafka-python-ng/default.nix index 4e3997d5ed1f..79d253cacc8e 100644 --- a/pkgs/development/python-modules/kafka-python-ng/default.nix +++ b/pkgs/development/python-modules/kafka-python-ng/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { build-system = [ setuptools-scm ]; - passthru.optional-dependencies = { + optional-dependencies = { crc32c = [ crc32c ]; lz4 = [ lz4 ]; snappy = [ python-snappy ]; @@ -44,7 +44,7 @@ buildPythonPackage rec { pytest-mock pytestCheckHook xxhash - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); meta = { changelog = "https://github.com/wbarnha/kafka-python-ng/releases/tag/v${version}"; diff --git a/pkgs/development/python-modules/layoutparser/default.nix b/pkgs/development/python-modules/layoutparser/default.nix index 3b6b8165aea2..6e3e795de0ab 100644 --- a/pkgs/development/python-modules/layoutparser/default.nix +++ b/pkgs/development/python-modules/layoutparser/default.nix @@ -96,7 +96,7 @@ buildPythonPackage { "tests_deps/test_only_paddledetection.py" # requires paddlepaddle not yet packaged ]; - passthru.optional-dependencies = optional-dependencies; + optional-dependencies = optional-dependencies; meta = with lib; { description = "Unified toolkit for Deep Learning Based Document Image Analysis"; diff --git a/pkgs/development/python-modules/librosa/default.nix b/pkgs/development/python-modules/librosa/default.nix index fa0c17487d33..2c9e2447e33c 100644 --- a/pkgs/development/python-modules/librosa/default.nix +++ b/pkgs/development/python-modules/librosa/default.nix @@ -78,7 +78,7 @@ buildPythonPackage rec { typing-extensions ]; - passthru.optional-dependencies.matplotlib = [ matplotlib ]; + optional-dependencies.matplotlib = [ matplotlib ]; # check that import works, this allows to capture errors like https://github.com/librosa/librosa/issues/1160 pythonImportsCheck = [ "librosa" ]; @@ -90,7 +90,7 @@ buildPythonPackage rec { pytestCheckHook resampy samplerate - ] ++ passthru.optional-dependencies.matplotlib; + ] ++ optional-dependencies.matplotlib; preCheck = '' export HOME=$TMPDIR diff --git a/pkgs/development/python-modules/lightgbm/default.nix b/pkgs/development/python-modules/lightgbm/default.nix index 5c52a7350741..231b9e5c258c 100644 --- a/pkgs/development/python-modules/lightgbm/default.nix +++ b/pkgs/development/python-modules/lightgbm/default.nix @@ -84,7 +84,7 @@ buildPythonPackage rec { export HOME=$(mktemp -d) ''; - passthru.optional-dependencies = { + optional-dependencies = { arrow = [ cffi pyarrow diff --git a/pkgs/development/python-modules/line-profiler/default.nix b/pkgs/development/python-modules/line-profiler/default.nix index 0873eff17d0f..dce3a93374e0 100644 --- a/pkgs/development/python-modules/line-profiler/default.nix +++ b/pkgs/development/python-modules/line-profiler/default.nix @@ -31,14 +31,14 @@ buildPythonPackage rec { scikit-build ]; - passthru.optional-dependencies = { + optional-dependencies = { ipython = [ ipython ]; }; nativeCheckInputs = [ pytestCheckHook ubelt - ] ++ passthru.optional-dependencies.ipython; + ] ++ optional-dependencies.ipython; dontUseCmakeConfigure = true; diff --git a/pkgs/development/python-modules/litellm/default.nix b/pkgs/development/python-modules/litellm/default.nix index decda0e7425b..8b19dd4915a0 100644 --- a/pkgs/development/python-modules/litellm/default.nix +++ b/pkgs/development/python-modules/litellm/default.nix @@ -65,7 +65,7 @@ buildPythonPackage rec { tokenizers ]; - passthru.optional-dependencies = { + optional-dependencies = { proxy = [ apscheduler backoff diff --git a/pkgs/development/python-modules/llmx/default.nix b/pkgs/development/python-modules/llmx/default.nix index d5ddcfdaec42..aa1b526782da 100644 --- a/pkgs/development/python-modules/llmx/default.nix +++ b/pkgs/development/python-modules/llmx/default.nix @@ -47,7 +47,7 @@ buildPythonPackage rec { pyyaml ]; - passthru.optional-dependencies = { + optional-dependencies = { web = [ fastapi uvicorn diff --git a/pkgs/development/python-modules/logbook/default.nix b/pkgs/development/python-modules/logbook/default.nix index 62a00fa1c8fa..5750985977a3 100644 --- a/pkgs/development/python-modules/logbook/default.nix +++ b/pkgs/development/python-modules/logbook/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { setuptools ]; - passthru.optional-dependencies = { + optional-dependencies = { execnet = [ execnet ]; sqlalchemy = [ sqlalchemy ]; redis = [ redis ]; @@ -52,7 +52,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); # Some of the tests use localhost networking. __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/magic-wormhole/default.nix b/pkgs/development/python-modules/magic-wormhole/default.nix index 0e6b95276c93..81cd8589605b 100644 --- a/pkgs/development/python-modules/magic-wormhole/default.nix +++ b/pkgs/development/python-modules/magic-wormhole/default.nix @@ -78,7 +78,7 @@ buildPythonPackage rec { zipstream-ng ] ++ autobahn.optional-dependencies.twisted ++ twisted.optional-dependencies.tls; - passthru.optional-dependencies = { + optional-dependencies = { dilation = [ noiseprotocol ]; }; @@ -91,7 +91,7 @@ buildPythonPackage rec { mock pytestCheckHook ] - ++ passthru.optional-dependencies.dilation + ++ optional-dependencies.dilation ++ lib.optionals stdenv.hostPlatform.isDarwin [ unixtools.locale ]; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/mako/default.nix b/pkgs/development/python-modules/mako/default.nix index 5e58f90b58d8..0735cf8f2c9e 100644 --- a/pkgs/development/python-modules/mako/default.nix +++ b/pkgs/development/python-modules/mako/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ markupsafe ]; - passthru.optional-dependencies = { + optional-dependencies = { babel = [ babel ]; lingua = [ lingua ]; }; @@ -48,7 +48,7 @@ buildPythonPackage rec { chameleon mock pytestCheckHook - ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); disabledTests = lib.optionals isPyPy [ diff --git a/pkgs/development/python-modules/mandown/default.nix b/pkgs/development/python-modules/mandown/default.nix index 942643cc457c..17c8b691b4a8 100644 --- a/pkgs/development/python-modules/mandown/default.nix +++ b/pkgs/development/python-modules/mandown/default.nix @@ -52,7 +52,7 @@ buildPythonPackage rec { typer ]; - passthru.optional-dependencies = { + optional-dependencies = { gui = [ pyside6 ]; updateScript = nix-update-script { }; }; diff --git a/pkgs/development/python-modules/manifest-ml/default.nix b/pkgs/development/python-modules/manifest-ml/default.nix index 7eeec2a60fee..80d80d51f934 100644 --- a/pkgs/development/python-modules/manifest-ml/default.nix +++ b/pkgs/development/python-modules/manifest-ml/default.nix @@ -60,7 +60,7 @@ buildPythonPackage rec { xxhash ]; - passthru.optional-dependencies = { + optional-dependencies = { api = [ accelerate # deepspeed @@ -84,7 +84,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); preCheck = '' export HOME=$TMPDIR diff --git a/pkgs/development/python-modules/markdown-it-py/default.nix b/pkgs/development/python-modules/markdown-it-py/default.nix index f50f6e8e308c..3f0af08d192a 100644 --- a/pkgs/development/python-modules/markdown-it-py/default.nix +++ b/pkgs/development/python-modules/markdown-it-py/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest-regressions pytestCheckHook - ] ++ passthru.optional-dependencies.linkify; + ] ++ optional-dependencies.linkify; # disable and remove benchmark tests preCheck = '' @@ -60,7 +60,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "markdown_it" ]; - passthru.optional-dependencies = { + optional-dependencies = { compare = [ commonmark markdown diff --git a/pkgs/development/python-modules/markdown2/default.nix b/pkgs/development/python-modules/markdown2/default.nix index 77f5fe0fc656..25412d4c0009 100644 --- a/pkgs/development/python-modules/markdown2/default.nix +++ b/pkgs/development/python-modules/markdown2/default.nix @@ -35,12 +35,10 @@ buildPythonPackage rec { runHook postCheck ''; - passthru.optional-dependencies = { + optional-dependencies = { code_syntax_highlighting = [ pygments ]; wavedrom = [ wavedrom ]; - all = lib.flatten ( - lib.attrValues (lib.filterAttrs (n: v: n != "all") passthru.optional-dependencies) - ); + all = lib.flatten (lib.attrValues (lib.filterAttrs (n: v: n != "all") optional-dependencies)); }; meta = with lib; { diff --git a/pkgs/development/python-modules/mashumaro/default.nix b/pkgs/development/python-modules/mashumaro/default.nix index 153eb0298fce..0cab2ca8dd70 100644 --- a/pkgs/development/python-modules/mashumaro/default.nix +++ b/pkgs/development/python-modules/mashumaro/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ typing-extensions ]; - passthru.optional-dependencies = { + optional-dependencies = { orjson = [ orjson ]; msgpack = [ msgpack ]; yaml = [ pyyaml ]; @@ -46,7 +46,7 @@ buildPythonPackage rec { pendulum pytest-mock pytestCheckHook - ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); pythonImportsCheck = [ "mashumaro" ]; diff --git a/pkgs/development/python-modules/mastodon-py/default.nix b/pkgs/development/python-modules/mastodon-py/default.nix index b8b93bc84eaa..e8c80177cbf5 100644 --- a/pkgs/development/python-modules/mastodon-py/default.nix +++ b/pkgs/development/python-modules/mastodon-py/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { six ]; - passthru.optional-dependencies = { + optional-dependencies = { blurhash = [ blurhash ]; webpush = [ http-ece @@ -58,7 +58,7 @@ buildPythonPackage rec { pytest-vcr requests-mock setuptools - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); disabledTests = [ "test_notifications_dismiss_pre_2_9_2" diff --git a/pkgs/development/python-modules/matplotx/default.nix b/pkgs/development/python-modules/matplotx/default.nix index 8baa52efcf4d..17bf869e874a 100644 --- a/pkgs/development/python-modules/matplotx/default.nix +++ b/pkgs/development/python-modules/matplotx/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { numpy ]; - passthru.optional-dependencies = { + optional-dependencies = { all = [ networkx pypng @@ -47,7 +47,7 @@ buildPythonPackage rec { # Not sure of the details, but we can avoid it by changing the matplotlib backend during testing. env.MPLBACKEND = lib.optionalString stdenv.hostPlatform.isDarwin "Agg"; - nativeCheckInputs = [ pytestCheckHook ] ++ passthru.optional-dependencies.all; + nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.all; disabledTestPaths = [ "tests/test_spy.py" # Requires meshzoo (non-free) and pytest-codeblocks (not packaged) diff --git a/pkgs/development/python-modules/mayim/default.nix b/pkgs/development/python-modules/mayim/default.nix index 49d4a23c80e1..44630b5121e4 100644 --- a/pkgs/development/python-modules/mayim/default.nix +++ b/pkgs/development/python-modules/mayim/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { wheel ]; - passthru.optional-dependencies = { + optional-dependencies = { postgres = [ psycopg ] ++ psycopg.optional-dependencies.pool; mysql = [ asyncmy ]; sqlite = [ aiosqlite ]; @@ -45,7 +45,7 @@ buildPythonPackage rec { pytest-asyncio pytest-cov-stub ] - ++ (with passthru.optional-dependencies; [ + ++ (with optional-dependencies; [ postgres mysql sqlite diff --git a/pkgs/development/python-modules/meshtastic/default.nix b/pkgs/development/python-modules/meshtastic/default.nix index eb83f1c17165..66b054d86b0c 100644 --- a/pkgs/development/python-modules/meshtastic/default.nix +++ b/pkgs/development/python-modules/meshtastic/default.nix @@ -75,7 +75,7 @@ buildPythonPackage rec { webencodings ]; - passthru.optional-dependencies = { + optional-dependencies = { tunnel = [ pytap2 ]; }; @@ -84,7 +84,7 @@ buildPythonPackage rec { hypothesis pytestCheckHook riden - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); preCheck = '' export PATH="$PATH:$out/bin"; diff --git a/pkgs/development/python-modules/mip/default.nix b/pkgs/development/python-modules/mip/default.nix index 63f2eeb59d72..a2c6e80e3f16 100644 --- a/pkgs/development/python-modules/mip/default.nix +++ b/pkgs/development/python-modules/mip/default.nix @@ -79,7 +79,7 @@ buildPythonPackage rec { # Tests that rely on Gurobi are activated only when Gurobi support is enabled disabledTests = lib.optional (!gurobiSupport) "gurobi"; - passthru.optional-dependencies = { + optional-dependencies = { inherit gurobipy numpy; }; diff --git a/pkgs/development/python-modules/mkdocs-material/default.nix b/pkgs/development/python-modules/mkdocs-material/default.nix index 45b009ad9293..5c263b0c5e2c 100644 --- a/pkgs/development/python-modules/mkdocs-material/default.nix +++ b/pkgs/development/python-modules/mkdocs-material/default.nix @@ -61,7 +61,7 @@ buildPythonPackage rec { requests ]; - passthru.optional-dependencies = { + optional-dependencies = { recommended = [ mkdocs-minify-plugin mkdocs-redirects diff --git a/pkgs/development/python-modules/mkdocs/default.nix b/pkgs/development/python-modules/mkdocs/default.nix index 654991775885..da196135439b 100644 --- a/pkgs/development/python-modules/mkdocs/default.nix +++ b/pkgs/development/python-modules/mkdocs/default.nix @@ -66,14 +66,14 @@ buildPythonPackage rec { watchdog ] ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ]; - passthru.optional-dependencies = { + optional-dependencies = { i18n = [ babel ] ++ lib.optionals (pythonAtLeast "3.12") [ setuptools ]; }; nativeCheckInputs = [ unittestCheckHook mock - ] ++ passthru.optional-dependencies.i18n; + ] ++ optional-dependencies.i18n; unittestFlagsArray = [ "-v" diff --git a/pkgs/development/python-modules/mne-python/default.nix b/pkgs/development/python-modules/mne-python/default.nix index 460d128f5a9e..8b4b66ce4fca 100644 --- a/pkgs/development/python-modules/mne-python/default.nix +++ b/pkgs/development/python-modules/mne-python/default.nix @@ -57,7 +57,7 @@ buildPythonPackage rec { lazy-loader ]; - passthru.optional-dependencies.hdf5 = [ + optional-dependencies.hdf5 = [ h5io pymatreader ]; @@ -65,7 +65,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook pytest-timeout - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); preCheck = '' export HOME=$(mktemp -d) diff --git a/pkgs/development/python-modules/mocket/default.nix b/pkgs/development/python-modules/mocket/default.nix index 1df4cc1eef21..eef43dc79fd8 100644 --- a/pkgs/development/python-modules/mocket/default.nix +++ b/pkgs/development/python-modules/mocket/default.nix @@ -53,7 +53,7 @@ buildPythonPackage rec { urllib3 ]; - passthru.optional-dependencies = { + optional-dependencies = { pook = [ pook ]; speedups = [ xxhash ]; }; @@ -72,7 +72,7 @@ buildPythonPackage rec { sure ] ++ lib.optionals (pythonOlder "3.12") [ aiohttp ] - ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ++ lib.flatten (builtins.attrValues optional-dependencies); preCheck = lib.optionalString stdenv.hostPlatform.isLinux '' ${redis-server}/bin/redis-server & diff --git a/pkgs/development/python-modules/moderngl-window/default.nix b/pkgs/development/python-modules/moderngl-window/default.nix index 5539d053a065..073c99026b9a 100644 --- a/pkgs/development/python-modules/moderngl-window/default.nix +++ b/pkgs/development/python-modules/moderngl-window/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { pyrr ]; - passthru.optional-dependencies = { + optional-dependencies = { trimesh = [ trimesh scipy diff --git a/pkgs/development/python-modules/molecule/plugins.nix b/pkgs/development/python-modules/molecule/plugins.nix index b87c3b121b54..3d98ecd03980 100644 --- a/pkgs/development/python-modules/molecule/plugins.nix +++ b/pkgs/development/python-modules/molecule/plugins.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { setuptools-scm ]; - passthru.optional-dependencies = { + optional-dependencies = { docker = [ docker ]; vagrant = [ python-vagrant ]; }; diff --git a/pkgs/development/python-modules/moviepy/default.nix b/pkgs/development/python-modules/moviepy/default.nix index 1c9e917b60ab..74fadd5d2e49 100644 --- a/pkgs/development/python-modules/moviepy/default.nix +++ b/pkgs/development/python-modules/moviepy/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { tqdm ]; - passthru.optional-dependencies = { + optional-dependencies = { optionals = [ matplotlib scikit-image @@ -62,7 +62,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "moviepy" ]; diff --git a/pkgs/development/python-modules/mpd2/default.nix b/pkgs/development/python-modules/mpd2/default.nix index 3f8b44f5dcf7..7ca19c597c16 100644 --- a/pkgs/development/python-modules/mpd2/default.nix +++ b/pkgs/development/python-modules/mpd2/default.nix @@ -22,11 +22,11 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools ]; - passthru.optional-dependencies = { + optional-dependencies = { twisted = [ twisted ]; }; - nativeCheckInputs = [ unittestCheckHook ] ++ passthru.optional-dependencies.twisted; + nativeCheckInputs = [ unittestCheckHook ] ++ optional-dependencies.twisted; meta = with lib; { changelog = "https://github.com/Mic92/python-mpd2/blob/v${version}/doc/changes.rst"; diff --git a/pkgs/development/python-modules/mpmath/default.nix b/pkgs/development/python-modules/mpmath/default.nix index 6f0f289e853b..308b57376dce 100644 --- a/pkgs/development/python-modules/mpmath/default.nix +++ b/pkgs/development/python-modules/mpmath/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools ]; - passthru.optional-dependencies = { + optional-dependencies = { gmpy = lib.optionals (!isPyPy) [ gmpy2 ]; }; diff --git a/pkgs/development/python-modules/mrjob/default.nix b/pkgs/development/python-modules/mrjob/default.nix index 669fee8887fb..35af2272ff58 100644 --- a/pkgs/development/python-modules/mrjob/default.nix +++ b/pkgs/development/python-modules/mrjob/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pyyaml ]; - passthru.optional-dependencies = { + optional-dependencies = { aws = [ boto3 botocore @@ -60,7 +60,7 @@ buildPythonPackage rec { pyspark unittestCheckHook warcio - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); unittestFlagsArray = [ "-v" ]; diff --git a/pkgs/development/python-modules/nats-py/default.nix b/pkgs/development/python-modules/nats-py/default.nix index 4a28fc2c57bd..ffd604f6daec 100644 --- a/pkgs/development/python-modules/nats-py/default.nix +++ b/pkgs/development/python-modules/nats-py/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { dependencies = [ ed25519 ]; - passthru.optional-dependencies = { + optional-dependencies = { aiohttp = [ aiohttp ]; nkeys = [ nkeys ]; # fast_parse = [ diff --git a/pkgs/development/python-modules/ndindex/default.nix b/pkgs/development/python-modules/ndindex/default.nix index 5bd31f3042a1..dc03557da251 100644 --- a/pkgs/development/python-modules/ndindex/default.nix +++ b/pkgs/development/python-modules/ndindex/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { --replace "--flakes" "" ''; - passthru.optional-dependencies.arrays = [ numpy ]; + optional-dependencies.arrays = [ numpy ]; pythonImportsCheck = [ "ndindex" ]; @@ -42,7 +42,7 @@ buildPythonPackage rec { hypothesis pytest-cov-stub pytestCheckHook - ] ++ passthru.optional-dependencies.arrays; + ] ++ optional-dependencies.arrays; meta = with lib; { description = ""; diff --git a/pkgs/development/python-modules/neo4j/default.nix b/pkgs/development/python-modules/neo4j/default.nix index a9ff53af77ff..4e36e2dc37ec 100644 --- a/pkgs/development/python-modules/neo4j/default.nix +++ b/pkgs/development/python-modules/neo4j/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { tomlkit ]; - passthru.optional-dependencies = { + optional-dependencies = { numpy = [ numpy ]; pandas = [ numpy diff --git a/pkgs/development/python-modules/netutils/default.nix b/pkgs/development/python-modules/netutils/default.nix index 04ab642d75d6..f1c1a4f383a0 100644 --- a/pkgs/development/python-modules/netutils/default.nix +++ b/pkgs/development/python-modules/netutils/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { dependencies = [ jsonschema ]; - passthru.optional-dependencies.optionals = [ + optional-dependencies.optionals = [ jsonschema napalm ]; diff --git a/pkgs/development/python-modules/networkx/default.nix b/pkgs/development/python-modules/networkx/default.nix index eb3051d8e14b..46ba43afb139 100644 --- a/pkgs/development/python-modules/networkx/default.nix +++ b/pkgs/development/python-modules/networkx/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools ]; - passthru.optional-dependencies = { + optional-dependencies = { default = [ numpy scipy diff --git a/pkgs/development/python-modules/nibabel/default.nix b/pkgs/development/python-modules/nibabel/default.nix index 1fb80ed06f34..c0a51cd1dd39 100644 --- a/pkgs/development/python-modules/nibabel/default.nix +++ b/pkgs/development/python-modules/nibabel/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { packaging ] ++ lib.optionals (pythonOlder "3.9") [ importlib-resources ]; - passthru.optional-dependencies = rec { + optional-dependencies = rec { all = dicom ++ dicomfs ++ minc2 ++ spm ++ zstd; dicom = [ pydicom ]; dicomfs = [ pillow ] ++ dicom; @@ -59,7 +59,7 @@ buildPythonPackage rec { pytest-httpserver pytest-xdist pytest7CheckHook - ] ++ passthru.optional-dependencies.all; + ] ++ optional-dependencies.all; preCheck = '' export PATH=$out/bin:$PATH diff --git a/pkgs/development/python-modules/nibe/default.nix b/pkgs/development/python-modules/nibe/default.nix index c08da4abe517..cba7bfe4b69a 100644 --- a/pkgs/development/python-modules/nibe/default.nix +++ b/pkgs/development/python-modules/nibe/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { tenacity ]; - passthru.optional-dependencies = { + optional-dependencies = { convert = [ pandas python-slugify diff --git a/pkgs/development/python-modules/norfair/default.nix b/pkgs/development/python-modules/norfair/default.nix index c3c50cd13334..24376e28863f 100644 --- a/pkgs/development/python-modules/norfair/default.nix +++ b/pkgs/development/python-modules/norfair/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { scipy ]; - passthru.optional-dependencies = { + optional-dependencies = { metrics = [ motmetrics ]; video = [ opencv4 ]; }; diff --git a/pkgs/development/python-modules/nose2/default.nix b/pkgs/development/python-modules/nose2/default.nix index b2a65a5648ef..cbf66277951b 100644 --- a/pkgs/development/python-modules/nose2/default.nix +++ b/pkgs/development/python-modules/nose2/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools ]; - passthru.optional-dependencies = { + optional-dependencies = { coverage = [ coverage ]; }; @@ -38,7 +38,7 @@ buildPythonPackage rec { nativeCheckInputs = [ unittestCheckHook - ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); meta = with lib; { changelog = "https://github.com/nose-devs/nose2/blob/${version}/docs/changelog.rst"; diff --git a/pkgs/development/python-modules/numcodecs/default.nix b/pkgs/development/python-modules/numcodecs/default.nix index 23f49c77ad43..7f04ae4bf414 100644 --- a/pkgs/development/python-modules/numcodecs/default.nix +++ b/pkgs/development/python-modules/numcodecs/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ numpy ]; - passthru.optional-dependencies = { + optional-dependencies = { msgpack = [ msgpack ]; # zfpy = [ zfpy ]; }; diff --git a/pkgs/development/python-modules/oauthenticator/default.nix b/pkgs/development/python-modules/oauthenticator/default.nix index e87edd391028..c971467d17a1 100644 --- a/pkgs/development/python-modules/oauthenticator/default.nix +++ b/pkgs/development/python-modules/oauthenticator/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { traitlets ]; - passthru.optional-dependencies = { + optional-dependencies = { googlegroups = [ google-api-python-client google-auth-oauthlib @@ -57,7 +57,7 @@ buildPythonPackage rec { pytest-cov-stub pytestCheckHook requests-mock - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); disabledTests = [ # Tests are outdated, https://github.com/jupyterhub/oauthenticator/issues/432 diff --git a/pkgs/development/python-modules/oauthlib/default.nix b/pkgs/development/python-modules/oauthlib/default.nix index 84fc4a2627b8..fbbc8a6a1ad9 100644 --- a/pkgs/development/python-modules/oauthlib/default.nix +++ b/pkgs/development/python-modules/oauthlib/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools ]; - passthru.optional-dependencies = { + optional-dependencies = { rsa = [ cryptography ]; signedtoken = [ cryptography @@ -45,7 +45,7 @@ buildPythonPackage rec { nativeCheckInputs = [ mock pytestCheckHook - ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); disabledTests = [ # https://github.com/oauthlib/oauthlib/issues/877 diff --git a/pkgs/development/python-modules/objgraph/default.nix b/pkgs/development/python-modules/objgraph/default.nix index 231c14e4ceff..bdd104518852 100644 --- a/pkgs/development/python-modules/objgraph/default.nix +++ b/pkgs/development/python-modules/objgraph/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { setuptools ]; - passthru.optional-dependencies = { + optional-dependencies = { ipython = [ graphviz ]; }; diff --git a/pkgs/development/python-modules/ome-zarr/default.nix b/pkgs/development/python-modules/ome-zarr/default.nix index 297d35fb0deb..ae082ec7d857 100644 --- a/pkgs/development/python-modules/ome-zarr/default.nix +++ b/pkgs/development/python-modules/ome-zarr/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { requests scikit-image toolz - ] ++ fsspec.passthru.optional-dependencies.s3; + ] ++ fsspec.optional-dependencies.s3; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/openai/default.nix b/pkgs/development/python-modules/openai/default.nix index e879bec83842..c75fb5f416c9 100644 --- a/pkgs/development/python-modules/openai/default.nix +++ b/pkgs/development/python-modules/openai/default.nix @@ -63,7 +63,7 @@ buildPythonPackage rec { typing-extensions ] ++ lib.optionals (pythonOlder "3.8") [ cached-property ]; - passthru.optional-dependencies = { + optional-dependencies = { datalib = [ numpy pandas diff --git a/pkgs/development/python-modules/openant/default.nix b/pkgs/development/python-modules/openant/default.nix index a4a54e9a879d..34ccb51cd7d0 100644 --- a/pkgs/development/python-modules/openant/default.nix +++ b/pkgs/development/python-modules/openant/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pyusb ]; - passthru.optional-dependencies = { + optional-dependencies = { serial = [ pyserial ]; influx = [ influxdb-client ]; }; diff --git a/pkgs/development/python-modules/opencontainers/default.nix b/pkgs/development/python-modules/opencontainers/default.nix index b5672a5590f2..c3dbd0e1bfde 100644 --- a/pkgs/development/python-modules/opencontainers/default.nix +++ b/pkgs/development/python-modules/opencontainers/default.nix @@ -20,11 +20,11 @@ buildPythonPackage rec { sed -i "/pytest-runner/d" setup.py ''; - passthru.optional-dependencies.reggie = [ requests ]; + optional-dependencies.reggie = [ requests ]; pythonImportsCheck = [ "opencontainers" ]; - nativeCheckInputs = [ pytestCheckHook ] ++ passthru.optional-dependencies.reggie; + nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.reggie; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/opensearch-py/default.nix b/pkgs/development/python-modules/opensearch-py/default.nix index c20daff074c8..0914a8ca6701 100644 --- a/pkgs/development/python-modules/opensearch-py/default.nix +++ b/pkgs/development/python-modules/opensearch-py/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { events ]; - passthru.optional-dependencies.async = [ aiohttp ]; + optional-dependencies.async = [ aiohttp ]; nativeCheckInputs = [ botocore @@ -60,7 +60,7 @@ buildPythonPackage rec { pytestCheckHook pyyaml pytz - ] ++ passthru.optional-dependencies.async; + ] ++ optional-dependencies.async; disabledTestPaths = [ # require network diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation-django/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation-django/default.nix index 5a85e42a04d3..a8b14f1cfd2c 100644 --- a/pkgs/development/python-modules/opentelemetry-instrumentation-django/default.nix +++ b/pkgs/development/python-modules/opentelemetry-instrumentation-django/default.nix @@ -33,14 +33,14 @@ buildPythonPackage rec { opentelemetry-util-http ]; - passthru.optional-dependencies = { + optional-dependencies = { asgi = [ opentelemetry-instrumentation-asgi ]; }; nativeCheckInputs = [ opentelemetry-test-utils pytestCheckHook - ] ++ passthru.optional-dependencies.asgi; + ] ++ optional-dependencies.asgi; pythonImportsCheck = [ "opentelemetry.instrumentation.django" ]; diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation-grpc/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation-grpc/default.nix index 26bde1eaae5e..9716dbc767c2 100644 --- a/pkgs/development/python-modules/opentelemetry-instrumentation-grpc/default.nix +++ b/pkgs/development/python-modules/opentelemetry-instrumentation-grpc/default.nix @@ -42,7 +42,7 @@ buildPythonPackage { wrapt ]; - passthru.optional-dependencies = { + optional-dependencies = { instruments = [ grpcio ]; }; diff --git a/pkgs/development/python-modules/optuna/default.nix b/pkgs/development/python-modules/optuna/default.nix index dfdca6fe6d94..9109242d7f27 100644 --- a/pkgs/development/python-modules/optuna/default.nix +++ b/pkgs/development/python-modules/optuna/default.nix @@ -71,7 +71,7 @@ buildPythonPackage rec { pyyaml ]; - passthru.optional-dependencies = { + optional-dependencies = { integration = [ botorch catboost @@ -115,7 +115,7 @@ buildPythonPackage rec { pytest-xdist pytestCheckHook scipy - ] ++ fakeredis.optional-dependencies.lua ++ passthru.optional-dependencies.optional; + ] ++ fakeredis.optional-dependencies.lua ++ optional-dependencies.optional; pytestFlagsArray = [ "-m 'not integration'" ]; diff --git a/pkgs/development/python-modules/ormar/default.nix b/pkgs/development/python-modules/ormar/default.nix index a2ef75c52bb1..bb65573eee64 100644 --- a/pkgs/development/python-modules/ormar/default.nix +++ b/pkgs/development/python-modules/ormar/default.nix @@ -62,7 +62,7 @@ buildPythonPackage rec { importlib-metadata ]; - passthru.optional-dependencies = { + optional-dependencies = { postgresql = [ asyncpg ]; postgres = [ asyncpg ]; aiopg = [ aiopg ]; @@ -89,7 +89,7 @@ buildPythonPackage rec { httpx nest-asyncio pytest-asyncio - ] ++ passthru.optional-dependencies.all; + ] ++ optional-dependencies.all; disabledTestPaths = [ "benchmarks/test_benchmark_*.py" ]; diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix index 83103314bd83..abf91dc56aae 100644 --- a/pkgs/development/python-modules/pandas/default.nix +++ b/pkgs/development/python-modules/pandas/default.nix @@ -108,7 +108,7 @@ let tzdata ]; - passthru.optional-dependencies = + optional-dependencies = let extras = { aws = [ s3fs ]; @@ -183,7 +183,7 @@ let pytest-xdist pytestCheckHook ] - ++ lib.flatten (lib.attrValues passthru.optional-dependencies) + ++ lib.flatten (lib.attrValues optional-dependencies) ++ lib.optionals (stdenv.hostPlatform.isLinux) [ # for locale executable glibc diff --git a/pkgs/development/python-modules/papermill/default.nix b/pkgs/development/python-modules/papermill/default.nix index 3c310b72b28b..bf81409491ce 100644 --- a/pkgs/development/python-modules/papermill/default.nix +++ b/pkgs/development/python-modules/papermill/default.nix @@ -57,7 +57,7 @@ buildPythonPackage rec { ansicolors ] ++ lib.optionals (pythonAtLeast "3.12") [ aiohttp ]; - passthru.optional-dependencies = { + optional-dependencies = { azure = [ azure-datalake-store azure-identity @@ -69,16 +69,12 @@ buildPythonPackage rec { s3 = [ boto3 ]; }; - nativeCheckInputs = - [ - ipykernel - moto - pytest-mock - pytestCheckHook - ] - ++ passthru.optional-dependencies.azure - ++ passthru.optional-dependencies.s3 - ++ passthru.optional-dependencies.gcs; + nativeCheckInputs = [ + ipykernel + moto + pytest-mock + pytestCheckHook + ] ++ optional-dependencies.azure ++ optional-dependencies.s3 ++ optional-dependencies.gcs; preCheck = '' export HOME=$(mktemp -d) diff --git a/pkgs/development/python-modules/paramiko/default.nix b/pkgs/development/python-modules/paramiko/default.nix index 248dc1f51318..8903d65550e7 100644 --- a/pkgs/development/python-modules/paramiko/default.nix +++ b/pkgs/development/python-modules/paramiko/default.nix @@ -44,9 +44,9 @@ buildPythonPackage rec { cryptography pyasn1 six - ] ++ passthru.optional-dependencies.ed25519; # remove on 3.0 update + ] ++ optional-dependencies.ed25519; # remove on 3.0 update - passthru.optional-dependencies = { + optional-dependencies = { gssapi = [ pyasn1 gssapi @@ -62,7 +62,7 @@ buildPythonPackage rec { icecream mock pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); disabledTestPaths = [ # disable tests that require pytest-relaxed, which is broken diff --git a/pkgs/development/python-modules/partd/default.nix b/pkgs/development/python-modules/partd/default.nix index 0dd614644d2d..ac75974739b2 100644 --- a/pkgs/development/python-modules/partd/default.nix +++ b/pkgs/development/python-modules/partd/default.nix @@ -51,7 +51,7 @@ buildPythonPackage rec { toolz ]; - passthru.optional-dependencies = { + optional-dependencies = { complete = [ blosc2 numpy diff --git a/pkgs/development/python-modules/passlib/default.nix b/pkgs/development/python-modules/passlib/default.nix index 29d1b111e921..ee1eaa064505 100644 --- a/pkgs/development/python-modules/passlib/default.nix +++ b/pkgs/development/python-modules/passlib/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { hash = "sha256-3v1Q9ytlxUAqssVzgwppeOXyAq0NmEeTyN3ixBUuvgQ"; }; - passthru.optional-dependencies = { + optional-dependencies = { argon2 = [ argon2-cffi ]; bcrypt = [ bcrypt ]; totp = [ cryptography ]; @@ -35,14 +35,10 @@ buildPythonPackage rec { "version = getattr(getattr(_bcrypt, '__about__', _bcrypt), '__version__', '<unknown>')" ''; - nativeCheckInputs = - [ - pytestCheckHook - pytest-xdist - ] - ++ passthru.optional-dependencies.argon2 - ++ passthru.optional-dependencies.bcrypt - ++ passthru.optional-dependencies.totp; + nativeCheckInputs = [ + pytestCheckHook + pytest-xdist + ] ++ optional-dependencies.argon2 ++ optional-dependencies.bcrypt ++ optional-dependencies.totp; pythonImportsCheck = [ "passlib" ]; diff --git a/pkgs/development/python-modules/pettingzoo/default.nix b/pkgs/development/python-modules/pettingzoo/default.nix index 9bb487e85630..e2e562f0d0f1 100644 --- a/pkgs/development/python-modules/pettingzoo/default.nix +++ b/pkgs/development/python-modules/pettingzoo/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { numpy ]; - passthru.optional-dependencies = { + optional-dependencies = { all = [ chess # multi-agent-ale-py diff --git a/pkgs/development/python-modules/photutils/default.nix b/pkgs/development/python-modules/photutils/default.nix index 68c5148f7eb4..9f736b9ca2e1 100644 --- a/pkgs/development/python-modules/photutils/default.nix +++ b/pkgs/development/python-modules/photutils/default.nix @@ -57,7 +57,7 @@ buildPythonPackage rec { numpy ]; - passthru.optional-dependencies = { + optional-dependencies = { all = [ bottleneck gwcs diff --git a/pkgs/development/python-modules/pins/default.nix b/pkgs/development/python-modules/pins/default.nix index 30f9c503c34b..34d224669b3c 100644 --- a/pkgs/development/python-modules/pins/default.nix +++ b/pkgs/development/python-modules/pins/default.nix @@ -59,7 +59,7 @@ buildPythonPackage rec { xxhash ]; - passthru.optional-dependencies = { + optional-dependencies = { aws = [ s3fs ]; azure = [ adlfs ]; gcs = [ gcsfs ]; @@ -71,7 +71,7 @@ buildPythonPackage rec { pytest-cases pytest-parallel pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "pins" ]; diff --git a/pkgs/development/python-modules/pipdeptree/default.nix b/pkgs/development/python-modules/pipdeptree/default.nix index 2ba2d47cae9e..5b7e66f6916c 100644 --- a/pkgs/development/python-modules/pipdeptree/default.nix +++ b/pkgs/development/python-modules/pipdeptree/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { packaging ]; - passthru.optional-dependencies = { + optional-dependencies = { graphviz = [ graphviz ]; }; @@ -47,7 +47,7 @@ buildPythonPackage rec { pytest-mock pytestCheckHook virtualenv - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "pipdeptree" ]; diff --git a/pkgs/development/python-modules/playwrightcapture/default.nix b/pkgs/development/python-modules/playwrightcapture/default.nix index 8717bfa11759..e35e94376e31 100644 --- a/pkgs/development/python-modules/playwrightcapture/default.nix +++ b/pkgs/development/python-modules/playwrightcapture/default.nix @@ -61,7 +61,7 @@ buildPythonPackage rec { w3lib ]; - passthru.optional-dependencies = { + optional-dependencies = { recaptcha = [ speechrecognition pydub diff --git a/pkgs/development/python-modules/podman/default.nix b/pkgs/development/python-modules/podman/default.nix index 11f3a62535b4..14525a16d8d8 100644 --- a/pkgs/development/python-modules/podman/default.nix +++ b/pkgs/development/python-modules/podman/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { urllib3 ] ++ lib.optionals (pythonOlder "3.11") [ tomli ]; - passthru.optional-dependencies = { + optional-dependencies = { progress_bar = [ rich ]; }; diff --git a/pkgs/development/python-modules/prance/default.nix b/pkgs/development/python-modules/prance/default.nix index 0017582e25cc..131928baba25 100644 --- a/pkgs/development/python-modules/prance/default.nix +++ b/pkgs/development/python-modules/prance/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { six ]; - passthru.optional-dependencies = { + optional-dependencies = { cli = [ click ]; flex = [ flex ]; icu = [ pyicu ]; @@ -54,7 +54,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest-cov-stub pytestCheckHook - ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); # Disable tests that require network disabledTestPaths = [ "tests/test_convert.py" ]; diff --git a/pkgs/development/python-modules/prometheus-async/default.nix b/pkgs/development/python-modules/prometheus-async/default.nix index 95d2277697d6..22627f161fa2 100644 --- a/pkgs/development/python-modules/prometheus-async/default.nix +++ b/pkgs/development/python-modules/prometheus-async/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { wrapt ]; - passthru.optional-dependencies = { + optional-dependencies = { aiohttp = [ aiohttp ]; diff --git a/pkgs/development/python-modules/prophet/default.nix b/pkgs/development/python-modules/prophet/default.nix index 8f33fc7aa808..4ccfdb7fc726 100644 --- a/pkgs/development/python-modules/prophet/default.nix +++ b/pkgs/development/python-modules/prophet/default.nix @@ -49,7 +49,7 @@ buildPythonPackage rec { importlib-resources ]; - passthru.optional-dependencies.parallel = [ + optional-dependencies.parallel = [ dask distributed ] ++ dask.optional-dependencies.dataframe; diff --git a/pkgs/development/python-modules/psycopg/default.nix b/pkgs/development/python-modules/psycopg/default.nix index aaaf362eab3a..bc55c2d697bc 100644 --- a/pkgs/development/python-modules/psycopg/default.nix +++ b/pkgs/development/python-modules/psycopg/default.nix @@ -161,7 +161,7 @@ buildPythonPackage rec { "psycopg_pool" ]; - passthru.optional-dependencies = { + optional-dependencies = { c = [ psycopg-c ]; pool = [ psycopg-pool ]; }; @@ -175,8 +175,8 @@ buildPythonPackage rec { postgresql ] ++ lib.optional (stdenv.hostPlatform.isLinux) postgresqlTestHook - ++ passthru.optional-dependencies.c - ++ passthru.optional-dependencies.pool; + ++ optional-dependencies.c + ++ optional-dependencies.pool; env = { postgresqlEnableTCP = 1; diff --git a/pkgs/development/python-modules/pure-python-adb/default.nix b/pkgs/development/python-modules/pure-python-adb/default.nix index 39ca6addf008..9b861f821a4a 100644 --- a/pkgs/development/python-modules/pure-python-adb/default.nix +++ b/pkgs/development/python-modules/pure-python-adb/default.nix @@ -19,13 +19,13 @@ buildPythonPackage rec { sha256 = "0kdr7w2fhgjpcf1k3l6an9im583iqkr6v8hb4q1zw30nh3bqkk0f"; }; - passthru.optional-dependencies = { + optional-dependencies = { async = [ aiofiles ]; }; doCheck = pythonOlder "3.10"; # all tests result in RuntimeError on 3.10 - nativeCheckInputs = [ pytestCheckHook ] ++ passthru.optional-dependencies.async; + nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.async; pythonImportsCheck = [ "ppadb.client" ] ++ lib.optionals doCheck [ "ppadb.client_async" ]; diff --git a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix index efbd9d96f429..77d33a7d9b79 100644 --- a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix +++ b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { build-system = [ hatchling ]; - passthru.optional-dependencies = { + optional-dependencies = { json = [ ujson ]; PIL = [ pillow ]; redis = [ redis ]; @@ -50,7 +50,7 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook requests - ] ++ passthru.optional-dependencies.watchdog ++ passthru.optional-dependencies.aiohttp; + ] ++ optional-dependencies.watchdog ++ optional-dependencies.aiohttp; pythonImportsCheck = [ "telebot" ]; diff --git a/pkgs/development/python-modules/pycyphal/default.nix b/pkgs/development/python-modules/pycyphal/default.nix index 698a9e20595a..5dc9dec21247 100644 --- a/pkgs/development/python-modules/pycyphal/default.nix +++ b/pkgs/development/python-modules/pycyphal/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { nunavut ]; - passthru.optional-dependencies = { + optional-dependencies = { transport-can-pythoncan = [ python-can ] ++ python-can.optional-dependencies.serial; transport-serial = [ cobs @@ -45,7 +45,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook pytest-asyncio - ] ++ builtins.foldl' (x: y: x ++ y) [ ] (builtins.attrValues passthru.optional-dependencies); + ] ++ builtins.foldl' (x: y: x ++ y) [ ] (builtins.attrValues optional-dependencies); preCheck = '' export HOME=$TMPDIR diff --git a/pkgs/development/python-modules/pydantic/1.nix b/pkgs/development/python-modules/pydantic/1.nix index 2b268d2bf543..cfd0df8c7603 100644 --- a/pkgs/development/python-modules/pydantic/1.nix +++ b/pkgs/development/python-modules/pydantic/1.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ typing-extensions ]; - passthru.optional-dependencies = { + optional-dependencies = { dotenv = [ python-dotenv ]; email = [ email-validator ]; }; @@ -45,7 +45,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest-mock pytest7CheckHook - ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); pytestFlagsArray = [ # https://github.com/pydantic/pydantic/issues/4817 diff --git a/pkgs/development/python-modules/pydeck/default.nix b/pkgs/development/python-modules/pydeck/default.nix index e0c77c5a2ce1..51cb247a5179 100644 --- a/pkgs/development/python-modules/pydeck/default.nix +++ b/pkgs/development/python-modules/pydeck/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { numpy ]; - passthru.optional-dependencies = { + optional-dependencies = { carto = [ # pydeck-carto ]; @@ -61,7 +61,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook pandas - ] ++ passthru.optional-dependencies.jupyter; + ] ++ optional-dependencies.jupyter; # tries to start a jupyter server disabledTests = [ "test_nbconvert" ]; diff --git a/pkgs/development/python-modules/pydocstyle/default.nix b/pkgs/development/python-modules/pydocstyle/default.nix index 8e53cf086501..47abe284a867 100644 --- a/pkgs/development/python-modules/pydocstyle/default.nix +++ b/pkgs/development/python-modules/pydocstyle/default.nix @@ -42,9 +42,9 @@ buildPythonPackage rec { propagatedBuildInputs = [ snowballstemmer ] ++ lib.optionals (pythonOlder "3.11") [ tomli ]; - passthru.optional-dependencies.toml = [ tomli ]; + optional-dependencies.toml = [ tomli ]; - nativeCheckInputs = [ pytestCheckHook ] ++ passthru.optional-dependencies.toml; + nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.toml; disabledTestPaths = [ "src/tests/test_integration.py" # runs pip install diff --git a/pkgs/development/python-modules/pydrive2/default.nix b/pkgs/development/python-modules/pydrive2/default.nix index f96380877ecc..a360b48083ea 100644 --- a/pkgs/development/python-modules/pydrive2/default.nix +++ b/pkgs/development/python-modules/pydrive2/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { pyyaml ]; - passthru.optional-dependencies = { + optional-dependencies = { fsspec = [ appdirs fsspec diff --git a/pkgs/development/python-modules/pydruid/default.nix b/pkgs/development/python-modules/pydruid/default.nix index 69ba702507b0..37838c6fed9d 100644 --- a/pkgs/development/python-modules/pydruid/default.nix +++ b/pkgs/development/python-modules/pydruid/default.nix @@ -41,17 +41,15 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook pycurl - ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); pythonImportsCheck = [ "pydruid" ]; - passthru = { - optional-dependencies = { - pandas = [ pandas ]; - async = [ tornado ]; - sqlalchemy = [ sqlalchemy ]; - # druid has a `cli` extra, but it doesn't work with nixpkgs pygments - }; + optional-dependencies = { + pandas = [ pandas ]; + async = [ tornado ]; + sqlalchemy = [ sqlalchemy ]; + # druid has a `cli` extra, but it doesn't work with nixpkgs pygments }; meta = with lib; { diff --git a/pkgs/development/python-modules/pyftpdlib/default.nix b/pkgs/development/python-modules/pyftpdlib/default.nix index efe1c179777b..24ec863842f2 100644 --- a/pkgs/development/python-modules/pyftpdlib/default.nix +++ b/pkgs/development/python-modules/pyftpdlib/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { dependencies = [ pysendfile ]; - passthru.optional-dependencies = { + optional-dependencies = { ssl = [ pyopenssl ]; }; diff --git a/pkgs/development/python-modules/pygal/default.nix b/pkgs/development/python-modules/pygal/default.nix index c16eae5e8e51..7f7c72eb518d 100644 --- a/pkgs/development/python-modules/pygal/default.nix +++ b/pkgs/development/python-modules/pygal/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ importlib-metadata ]; - passthru.optional-dependencies = { + optional-dependencies = { lxml = [ lxml ]; png = [ cairosvg ]; }; @@ -45,7 +45,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pyquery pytestCheckHook - ] ++ passthru.optional-dependencies.png; + ] ++ optional-dependencies.png; preCheck = '' # necessary on darwin to pass the testsuite diff --git a/pkgs/development/python-modules/pygls/default.nix b/pkgs/development/python-modules/pygls/default.nix index 8128de3769b9..48791db6a275 100644 --- a/pkgs/development/python-modules/pygls/default.nix +++ b/pkgs/development/python-modules/pygls/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { typeguard ]; - passthru.optional-dependencies = { + optional-dependencies = { ws = [ websockets ]; }; diff --git a/pkgs/development/python-modules/pykoplenti/default.nix b/pkgs/development/python-modules/pykoplenti/default.nix index a4f605692c5f..cbca76c7467d 100644 --- a/pkgs/development/python-modules/pykoplenti/default.nix +++ b/pkgs/development/python-modules/pykoplenti/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { pydantic ]; - passthru.optional-dependencies = { + optional-dependencies = { CLI = [ click prompt-toolkit diff --git a/pkgs/development/python-modules/pylint-django/default.nix b/pkgs/development/python-modules/pylint-django/default.nix index cac67ca5051a..5cf7838dea18 100644 --- a/pkgs/development/python-modules/pylint-django/default.nix +++ b/pkgs/development/python-modules/pylint-django/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pylint-plugin-utils ]; - passthru.optional-dependencies = { + optional-dependencies = { with_django = [ django ]; }; diff --git a/pkgs/development/python-modules/pylutron-caseta/default.nix b/pkgs/development/python-modules/pylutron-caseta/default.nix index 2bd1368ffb02..94bae7f24eb5 100644 --- a/pkgs/development/python-modules/pylutron-caseta/default.nix +++ b/pkgs/development/python-modules/pylutron-caseta/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ cryptography ] ++ lib.optionals (pythonOlder "3.11") [ async-timeout ]; - passthru.optional-dependencies = { + optional-dependencies = { cli = [ click xdg diff --git a/pkgs/development/python-modules/pymatgen/default.nix b/pkgs/development/python-modules/pymatgen/default.nix index 005a65b63169..303d7680e8d3 100644 --- a/pkgs/development/python-modules/pymatgen/default.nix +++ b/pkgs/development/python-modules/pymatgen/default.nix @@ -69,7 +69,7 @@ buildPythonPackage rec { uncertainties ]; - passthru.optional-dependencies = { + optional-dependencies = { ase = [ ase ]; joblib = [ joblib ]; seekpath = [ seekpath ]; @@ -78,7 +78,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook pytest-xdist - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); preCheck = '' # ensure tests can find these diff --git a/pkgs/development/python-modules/pymodbus/default.nix b/pkgs/development/python-modules/pymodbus/default.nix index 38411beca94b..bb0fb022d2ef 100644 --- a/pkgs/development/python-modules/pymodbus/default.nix +++ b/pkgs/development/python-modules/pymodbus/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { build-system = [ setuptools ]; - passthru.optional-dependencies = { + optional-dependencies = { repl = [ aiohttp typer @@ -57,7 +57,7 @@ buildPythonPackage rec { redis sqlalchemy twisted - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); preCheck = '' pushd test diff --git a/pkgs/development/python-modules/pymysensors/default.nix b/pkgs/development/python-modules/pymysensors/default.nix index df42f2a4cc37..9178399610b3 100644 --- a/pkgs/development/python-modules/pymysensors/default.nix +++ b/pkgs/development/python-modules/pymysensors/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { voluptuous ]; - passthru.optional-dependencies = { + optional-dependencies = { mqtt-client = [ paho-mqtt ]; }; diff --git a/pkgs/development/python-modules/pypsrp/default.nix b/pkgs/development/python-modules/pypsrp/default.nix index faddf2906f5f..286b8a2ad902 100644 --- a/pkgs/development/python-modules/pypsrp/default.nix +++ b/pkgs/development/python-modules/pypsrp/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { xmldiff ]; - passthru.optional-dependencies = { + optional-dependencies = { credssp = [ requests-credssp ]; kerberos = pyspnego.optional-dependencies.kerberos; named_pipe = [ psutil ]; diff --git a/pkgs/development/python-modules/pyreqwest-impersonate/default.nix b/pkgs/development/python-modules/pyreqwest-impersonate/default.nix index 8d9406666fe7..33e5958430d1 100644 --- a/pkgs/development/python-modules/pyreqwest-impersonate/default.nix +++ b/pkgs/development/python-modules/pyreqwest-impersonate/default.nix @@ -51,7 +51,7 @@ buildPythonPackage rec { env.BORING_BSSL_PATH = boringssl-wrapper; - passthru.optional-dependencies = { + optional-dependencies = { dev = [ pytest ]; }; diff --git a/pkgs/development/python-modules/pysaml2/default.nix b/pkgs/development/python-modules/pysaml2/default.nix index 51ed8f0cc31f..621f70399296 100644 --- a/pkgs/development/python-modules/pysaml2/default.nix +++ b/pkgs/development/python-modules/pysaml2/default.nix @@ -66,7 +66,7 @@ buildPythonPackage rec { xmlschema ]; - passthru.optional-dependencies = { + optional-dependencies = { s2repoze = [ paste repoze-who diff --git a/pkgs/development/python-modules/pyscaffold/default.nix b/pkgs/development/python-modules/pyscaffold/default.nix index 7b3bc447ef48..6e738b07d3dc 100644 --- a/pkgs/development/python-modules/pyscaffold/default.nix +++ b/pkgs/development/python-modules/pyscaffold/default.nix @@ -62,7 +62,7 @@ buildPythonPackage rec { tomlkit ]; - passthru.optional-dependencies = { + optional-dependencies = { all = [ pre-commit pyscaffoldext-cookiecutter diff --git a/pkgs/development/python-modules/pyscaffoldext-cookiecutter/default.nix b/pkgs/development/python-modules/pyscaffoldext-cookiecutter/default.nix index bcc4ed68bfdd..a34bf93334e9 100644 --- a/pkgs/development/python-modules/pyscaffoldext-cookiecutter/default.nix +++ b/pkgs/development/python-modules/pyscaffoldext-cookiecutter/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { pyscaffold ]; - passthru.optional-dependencies = { + optional-dependencies = { testing = [ configupdater pre-commit diff --git a/pkgs/development/python-modules/pyscaffoldext-custom-extension/default.nix b/pkgs/development/python-modules/pyscaffoldext-custom-extension/default.nix index f487b25c9eea..ee4bc3aa728b 100644 --- a/pkgs/development/python-modules/pyscaffoldext-custom-extension/default.nix +++ b/pkgs/development/python-modules/pyscaffoldext-custom-extension/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { pyscaffold ]; - passthru.optional-dependencies = { + optional-dependencies = { testing = [ configupdater pre-commit diff --git a/pkgs/development/python-modules/pyscaffoldext-django/default.nix b/pkgs/development/python-modules/pyscaffoldext-django/default.nix index c85e01e09925..e0e9ca4cf69f 100644 --- a/pkgs/development/python-modules/pyscaffoldext-django/default.nix +++ b/pkgs/development/python-modules/pyscaffoldext-django/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { pyscaffold ]; - passthru.optional-dependencies = { + optional-dependencies = { testing = [ configupdater pre-commit diff --git a/pkgs/development/python-modules/pyscaffoldext-dsproject/default.nix b/pkgs/development/python-modules/pyscaffoldext-dsproject/default.nix index 5f2cd21069fe..9763ba8ace95 100644 --- a/pkgs/development/python-modules/pyscaffoldext-dsproject/default.nix +++ b/pkgs/development/python-modules/pyscaffoldext-dsproject/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { pyscaffoldext-markdown ]; - passthru.optional-dependencies = { + optional-dependencies = { testing = [ configupdater pre-commit diff --git a/pkgs/development/python-modules/pyscaffoldext-markdown/default.nix b/pkgs/development/python-modules/pyscaffoldext-markdown/default.nix index 82b25bac417c..4d6157ed4d99 100644 --- a/pkgs/development/python-modules/pyscaffoldext-markdown/default.nix +++ b/pkgs/development/python-modules/pyscaffoldext-markdown/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { wheel ]; - passthru.optional-dependencies = { + optional-dependencies = { testing = [ configupdater pre-commit diff --git a/pkgs/development/python-modules/pyscaffoldext-travis/default.nix b/pkgs/development/python-modules/pyscaffoldext-travis/default.nix index 46d27e7480b4..6c08f6c23adc 100644 --- a/pkgs/development/python-modules/pyscaffoldext-travis/default.nix +++ b/pkgs/development/python-modules/pyscaffoldext-travis/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { pyscaffold ]; - passthru.optional-dependencies = { + optional-dependencies = { testing = [ configupdater pre-commit diff --git a/pkgs/development/python-modules/pyspark/default.nix b/pkgs/development/python-modules/pyspark/default.nix index 7ffcf52bea8a..93078d91dad9 100644 --- a/pkgs/development/python-modules/pyspark/default.nix +++ b/pkgs/development/python-modules/pyspark/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ py4j ]; - passthru.optional-dependencies = { + optional-dependencies = { ml = [ numpy ]; mllib = [ numpy ]; sql = [ diff --git a/pkgs/development/python-modules/pyspnego/default.nix b/pkgs/development/python-modules/pyspnego/default.nix index 992318ff0667..401ccbe27097 100644 --- a/pkgs/development/python-modules/pyspnego/default.nix +++ b/pkgs/development/python-modules/pyspnego/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ cryptography ]; - passthru.optional-dependencies = { + optional-dependencies = { kerberos = [ gssapi krb5 diff --git a/pkgs/development/python-modules/pytablewriter/default.nix b/pkgs/development/python-modules/pytablewriter/default.nix index 1b074f1b8584..d7996053a7b4 100644 --- a/pkgs/development/python-modules/pytablewriter/default.nix +++ b/pkgs/development/python-modules/pytablewriter/default.nix @@ -47,7 +47,7 @@ buildPythonPackage rec { typepy ]; - passthru.optional-dependencies = { + optional-dependencies = { all = [ dominate elasticsearch @@ -84,7 +84,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "pathvalidate" ]; diff --git a/pkgs/development/python-modules/pytest-benchmark/default.nix b/pkgs/development/python-modules/pytest-benchmark/default.nix index 70dc1d0f7fb1..585092787483 100644 --- a/pkgs/development/python-modules/pytest-benchmark/default.nix +++ b/pkgs/development/python-modules/pytest-benchmark/default.nix @@ -55,7 +55,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ py-cpuinfo ]; - passthru.optional-dependencies = { + optional-dependencies = { aspect = [ aspectlib ]; histogram = [ pygal ]; elasticsearch = [ elasticsearch ]; @@ -70,7 +70,7 @@ buildPythonPackage rec { mercurial pytestCheckHook pytest-xdist - ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); pytestFlagsArray = [ "-W" diff --git a/pkgs/development/python-modules/pytest-jupyter/default.nix b/pkgs/development/python-modules/pytest-jupyter/default.nix index 36e45343a308..560f17f02592 100644 --- a/pkgs/development/python-modules/pytest-jupyter/default.nix +++ b/pkgs/development/python-modules/pytest-jupyter/default.nix @@ -40,7 +40,7 @@ let propagatedBuildInputs = [ jupyter-core ]; - passthru.optional-dependencies = { + optional-dependencies = { client = [ jupyter-client nbformat @@ -59,7 +59,7 @@ let nativeCheckInputs = [ pytest-timeout pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); passthru.tests = { check = self.overridePythonAttrs (_: { diff --git a/pkgs/development/python-modules/pytest-regressions/default.nix b/pkgs/development/python-modules/pytest-regressions/default.nix index 5e47e2e1c6d5..bb1584aa162e 100644 --- a/pkgs/development/python-modules/pytest-regressions/default.nix +++ b/pkgs/development/python-modules/pytest-regressions/default.nix @@ -51,7 +51,7 @@ buildPythonPackage rec { "pytest_regressions.plugin" ]; - passthru.optional-dependencies = { + optional-dependencies = { dataframe = [ pandas numpy diff --git a/pkgs/development/python-modules/pytest/7.nix b/pkgs/development/python-modules/pytest/7.nix index 8ca33b158e5c..b00e988d2e97 100644 --- a/pkgs/development/python-modules/pytest/7.nix +++ b/pkgs/development/python-modules/pytest/7.nix @@ -60,7 +60,7 @@ let tomli ]; - passthru.optional-dependencies = { + optional-dependencies = { testing = [ argcomplete attrs diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix index fc5ca9c2a37b..4d1b33f2cbe3 100644 --- a/pkgs/development/python-modules/pytest/default.nix +++ b/pkgs/development/python-modules/pytest/default.nix @@ -58,7 +58,7 @@ buildPythonPackage rec { tomli ]; - passthru.optional-dependencies = { + optional-dependencies = { testing = [ argcomplete attrs diff --git a/pkgs/development/python-modules/python-barcode/default.nix b/pkgs/development/python-modules/python-barcode/default.nix index 214e074ffd7a..432a910b95c6 100644 --- a/pkgs/development/python-modules/python-barcode/default.nix +++ b/pkgs/development/python-modules/python-barcode/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ setuptools-scm ]; - passthru.optional-dependencies = { + optional-dependencies = { images = [ pillow ]; }; @@ -33,7 +33,7 @@ buildPythonPackage rec { --replace "--no-cov-on-fail" "" ''; - nativeCheckInputs = [ pytestCheckHook ] ++ passthru.optional-dependencies.images; + nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.images; pythonImportsCheck = [ "barcode" ]; diff --git a/pkgs/development/python-modules/python-benedict/default.nix b/pkgs/development/python-modules/python-benedict/default.nix index 055a993ca013..3bdb639be493 100644 --- a/pkgs/development/python-modules/python-benedict/default.nix +++ b/pkgs/development/python-modules/python-benedict/default.nix @@ -49,7 +49,7 @@ buildPythonPackage rec { requests ]; - passthru.optional-dependencies = { + optional-dependencies = { all = [ beautifulsoup4 boto3 @@ -95,7 +95,7 @@ buildPythonPackage rec { orjson pytestCheckHook python-decouple - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); disabledTests = [ # Tests require network access diff --git a/pkgs/development/python-modules/python-box/default.nix b/pkgs/development/python-modules/python-box/default.nix index 97885c27a952..2ab21191104c 100644 --- a/pkgs/development/python-modules/python-box/default.nix +++ b/pkgs/development/python-modules/python-box/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { setuptools ]; - passthru.optional-dependencies = { + optional-dependencies = { all = [ msgpack ruamel-yaml @@ -47,7 +47,7 @@ buildPythonPackage rec { msgpack = [ msgpack ]; }; - nativeCheckInputs = [ pytestCheckHook ] ++ passthru.optional-dependencies.all; + nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.all; pythonImportsCheck = [ "box" ]; diff --git a/pkgs/development/python-modules/python-can/default.nix b/pkgs/development/python-modules/python-can/default.nix index 8224de600ae8..019fd93c4a00 100644 --- a/pkgs/development/python-modules/python-can/default.nix +++ b/pkgs/development/python-modules/python-can/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { wrapt ]; - passthru.optional-dependencies = { + optional-dependencies = { serial = [ pyserial ]; seeedstudio = [ pyserial ]; pcan = [ uptime ]; @@ -58,7 +58,7 @@ buildPythonPackage rec { parameterized pytest-timeout pytestCheckHook - ] ++ passthru.optional-dependencies.serial; + ] ++ optional-dependencies.serial; disabledTestPaths = [ # We don't support all interfaces diff --git a/pkgs/development/python-modules/python-engineio/default.nix b/pkgs/development/python-modules/python-engineio/default.nix index 6a534a249f1f..28bf7840a30b 100644 --- a/pkgs/development/python-modules/python-engineio/default.nix +++ b/pkgs/development/python-modules/python-engineio/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { dependencies = [ simple-websocket ]; - passthru.optional-dependencies = { + optional-dependencies = { client = [ requests websocket-client diff --git a/pkgs/development/python-modules/python-jose/default.nix b/pkgs/development/python-modules/python-jose/default.nix index 449fec2d7d07..037b352ccc7e 100644 --- a/pkgs/development/python-modules/python-jose/default.nix +++ b/pkgs/development/python-modules/python-jose/default.nix @@ -59,7 +59,7 @@ buildPythonPackage rec { rsa ]; - passthru.optional-dependencies = { + optional-dependencies = { cryptography = [ cryptography ]; pycrypto = [ pycrypto ]; pycryptodome = [ pycryptodome ]; @@ -69,7 +69,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); disabledTests = [ # https://github.com/mpdavis/python-jose/issues/348 diff --git a/pkgs/development/python-modules/python-kasa/default.nix b/pkgs/development/python-modules/python-kasa/default.nix index b5d389bced40..dcb2a96f671a 100644 --- a/pkgs/development/python-modules/python-kasa/default.nix +++ b/pkgs/development/python-modules/python-kasa/default.nix @@ -52,7 +52,7 @@ buildPythonPackage rec { voluptuous ]; - passthru.optional-dependencies = { + optional-dependencies = { shell = [ ptpython rich diff --git a/pkgs/development/python-modules/python-libnmap/default.nix b/pkgs/development/python-modules/python-libnmap/default.nix index 3e3937051aaf..464716040693 100644 --- a/pkgs/development/python-modules/python-libnmap/default.nix +++ b/pkgs/development/python-modules/python-libnmap/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { hash = "sha256-cI8wdOvTmRy2cxLBkJn7vXRBRvewDMNl/tkIiRGhZJ8="; }; - passthru.optional-dependencies = { + optional-dependencies = { defusedxml = [ defusedxml ]; }; diff --git a/pkgs/development/python-modules/python-openstackclient/default.nix b/pkgs/development/python-modules/python-openstackclient/default.nix index c82331304a0f..3fa1de5b4e21 100644 --- a/pkgs/development/python-modules/python-openstackclient/default.nix +++ b/pkgs/development/python-modules/python-openstackclient/default.nix @@ -72,25 +72,26 @@ buildPythonPackage rec { pythonImportsCheck = [ "openstackclient" ]; + optional-dependencies = { + # See https://github.com/openstack/python-openstackclient/blob/master/doc/source/contributor/plugins.rst + cli-plugins = [ + osc-placement + python-aodhclient + python-barbicanclient + python-designateclient + python-heatclient + python-ironicclient + python-magnumclient + python-manilaclient + python-mistralclient + python-neutronclient + python-watcherclient + python-zaqarclient + python-zunclient + ]; + }; + passthru = { - optional-dependencies = { - # See https://github.com/openstack/python-openstackclient/blob/master/doc/source/contributor/plugins.rst - cli-plugins = [ - osc-placement - python-aodhclient - python-barbicanclient - python-designateclient - python-heatclient - python-ironicclient - python-magnumclient - python-manilaclient - python-mistralclient - python-neutronclient - python-watcherclient - python-zaqarclient - python-zunclient - ]; - }; tests.version = testers.testVersion { package = python-openstackclient; command = "openstack --version"; diff --git a/pkgs/development/python-modules/python-slugify/default.nix b/pkgs/development/python-modules/python-slugify/default.nix index c640a7287325..142e5883cf8a 100644 --- a/pkgs/development/python-modules/python-slugify/default.nix +++ b/pkgs/development/python-modules/python-slugify/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ text-unidecode ]; - passthru.optional-dependencies = { + optional-dependencies = { unidecode = [ unidecode ]; }; diff --git a/pkgs/development/python-modules/python-socketio/default.nix b/pkgs/development/python-modules/python-socketio/default.nix index 9ecfd72e38de..c59201a466cd 100644 --- a/pkgs/development/python-modules/python-socketio/default.nix +++ b/pkgs/development/python-modules/python-socketio/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { python-engineio ]; - passthru.optional-dependencies = { + optional-dependencies = { client = [ requests websocket-client @@ -58,7 +58,7 @@ buildPythonPackage rec { pytestCheckHook uvicorn simple-websocket - ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); pythonImportsCheck = [ "socketio" ]; diff --git a/pkgs/development/python-modules/python-stdnum/default.nix b/pkgs/development/python-modules/python-stdnum/default.nix index 2a2b5d714dee..15647160b525 100644 --- a/pkgs/development/python-modules/python-stdnum/default.nix +++ b/pkgs/development/python-modules/python-stdnum/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - passthru.optional-dependencies = { + optional-dependencies = { SOAP = [ zeep ]; }; diff --git a/pkgs/development/python-modules/python-u2flib-server/default.nix b/pkgs/development/python-modules/python-u2flib-server/default.nix index e1b44777dfee..fa93cb83fce8 100644 --- a/pkgs/development/python-modules/python-u2flib-server/default.nix +++ b/pkgs/development/python-modules/python-u2flib-server/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { six ]; - passthru.optional-dependencies = { + optional-dependencies = { u2f_server = [ webob ]; }; @@ -42,7 +42,7 @@ buildPythonPackage rec { "u2flib_server.u2f" ]; - nativeCheckInputs = [ pytestCheckHook ] ++ passthru.optional-dependencies.u2f_server; + nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.u2f_server; meta = with lib; { description = "Python based U2F server library"; diff --git a/pkgs/development/python-modules/pythonfinder/default.nix b/pkgs/development/python-modules/pythonfinder/default.nix index 1261da097fe0..3af465ba2de1 100644 --- a/pkgs/development/python-modules/pythonfinder/default.nix +++ b/pkgs/development/python-modules/pythonfinder/default.nix @@ -34,14 +34,14 @@ buildPythonPackage rec { propagatedBuildInputs = [ packaging ] ++ lib.optionals (pythonOlder "3.8") [ cached-property ]; - passthru.optional-dependencies = { + optional-dependencies = { cli = [ click ]; }; nativeCheckInputs = [ pytest-timeout pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "pythonfinder" ]; diff --git a/pkgs/development/python-modules/pytoolconfig/default.nix b/pkgs/development/python-modules/pytoolconfig/default.nix index bec278f08e6f..563d1e4d2ecd 100644 --- a/pkgs/development/python-modules/pytoolconfig/default.nix +++ b/pkgs/development/python-modules/pytoolconfig/default.nix @@ -46,11 +46,11 @@ buildPythonPackage rec { sphinx-autodoc-typehints sphinx-rtd-theme sphinxHook - ] ++ passthru.optional-dependencies.doc; + ] ++ optional-dependencies.doc; propagatedBuildInputs = [ packaging ] ++ lib.optionals (pythonOlder "3.11") [ tomli ]; - passthru.optional-dependencies = { + optional-dependencies = { validation = [ pydantic ]; global = [ platformdirs ]; doc = [ @@ -63,7 +63,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); meta = with lib; { description = "Python tool configuration"; diff --git a/pkgs/development/python-modules/pytradfri/default.nix b/pkgs/development/python-modules/pytradfri/default.nix index 9e710823127a..8227ac484641 100644 --- a/pkgs/development/python-modules/pytradfri/default.nix +++ b/pkgs/development/python-modules/pytradfri/default.nix @@ -25,14 +25,14 @@ buildPythonPackage rec { propagatedBuildInputs = [ pydantic ]; - passthru.optional-dependencies = { + optional-dependencies = { async = [ aiocoap dtlssocket ]; }; - nativeCheckInputs = [ pytestCheckHook ] ++ passthru.optional-dependencies.async; + nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.async; pythonImportsCheck = [ "pytradfri" ]; diff --git a/pkgs/development/python-modules/pyutil/default.nix b/pkgs/development/python-modules/pyutil/default.nix index a98538cc43ea..6c079b11712f 100644 --- a/pkgs/development/python-modules/pyutil/default.nix +++ b/pkgs/development/python-modules/pyutil/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { versioneer ]; - passthru.optional-dependencies = { + optional-dependencies = { jsonutil = [ simplejson ]; # Module not available # randcookie = [ @@ -46,7 +46,7 @@ buildPythonPackage rec { mock twisted pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "pyutil" ]; diff --git a/pkgs/development/python-modules/pyvisa-py/default.nix b/pkgs/development/python-modules/pyvisa-py/default.nix index 4a2b39a87ab2..aec66ed08f4a 100644 --- a/pkgs/development/python-modules/pyvisa-py/default.nix +++ b/pkgs/development/python-modules/pyvisa-py/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { typing-extensions ]; - passthru.optional-dependencies = { + optional-dependencies = { gpib-ctypes = [ gpib-ctypes ]; serial = [ pyserial ]; usb = [ pyusb ]; diff --git a/pkgs/development/python-modules/pyvmomi/default.nix b/pkgs/development/python-modules/pyvmomi/default.nix index 16260ed5de0a..80a8f5832a10 100644 --- a/pkgs/development/python-modules/pyvmomi/default.nix +++ b/pkgs/development/python-modules/pyvmomi/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { six ]; - passthru.optional-dependencies = { + optional-dependencies = { sso = [ lxml pyopenssl diff --git a/pkgs/development/python-modules/pywavefront/default.nix b/pkgs/development/python-modules/pywavefront/default.nix index 534b5647c046..676f2aaab661 100644 --- a/pkgs/development/python-modules/pywavefront/default.nix +++ b/pkgs/development/python-modules/pywavefront/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools ]; - passthru.optional-dependencies.visualization = [ pyglet ]; + optional-dependencies.visualization = [ pyglet ]; nativeCheckInputs = [ pytestCheckHook diff --git a/pkgs/development/python-modules/qdrant-client/default.nix b/pkgs/development/python-modules/qdrant-client/default.nix index d54ac47473a5..e9af53b3036b 100644 --- a/pkgs/development/python-modules/qdrant-client/default.nix +++ b/pkgs/development/python-modules/qdrant-client/default.nix @@ -52,7 +52,7 @@ buildPythonPackage rec { # Tests require network access doCheck = false; - passthru.optional-dependencies = { + optional-dependencies = { fastembed = [ fastembed ]; }; diff --git a/pkgs/development/python-modules/qpsolvers/default.nix b/pkgs/development/python-modules/qpsolvers/default.nix index 468099e7b59e..8298dab5e623 100644 --- a/pkgs/development/python-modules/qpsolvers/default.nix +++ b/pkgs/development/python-modules/qpsolvers/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { scipy ]; - passthru.optional-dependencies = { + optional-dependencies = { # FIXME commented out solvers have not been packaged yet clarabel = [ clarabel ]; cvxopt = [ cvxopt ]; @@ -55,7 +55,7 @@ buildPythonPackage rec { quadprog = [ quadprog ]; scs = [ scs ]; open_source_solvers = - with passthru.optional-dependencies; + with optional-dependencies; lib.flatten [ clarabel cvxopt @@ -68,7 +68,7 @@ buildPythonPackage rec { ]; }; - nativeCheckInputs = [ unittestCheckHook ] ++ passthru.optional-dependencies.open_source_solvers; + nativeCheckInputs = [ unittestCheckHook ] ++ optional-dependencies.open_source_solvers; meta = with lib; { changelog = "https://github.com/qpsolvers/qpsolvers/blob/${src.rev}/CHANGELOG.md"; diff --git a/pkgs/development/python-modules/qrcode/default.nix b/pkgs/development/python-modules/qrcode/default.nix index 2c7df77b33a1..e14d4ab416fc 100644 --- a/pkgs/development/python-modules/qrcode/default.nix +++ b/pkgs/development/python-modules/qrcode/default.nix @@ -32,12 +32,12 @@ buildPythonPackage rec { setuptools ]; - passthru.optional-dependencies.pil = [ pillow ]; + optional-dependencies.pil = [ pillow ]; nativeCheckInputs = [ mock pytestCheckHook - ] ++ passthru.optional-dependencies.pil; + ] ++ optional-dependencies.pil; passthru.tests = { version = testers.testVersion { diff --git a/pkgs/development/python-modules/qutip/default.nix b/pkgs/development/python-modules/qutip/default.nix index 8cc5ccba6c30..12b6c1b9e9d9 100644 --- a/pkgs/development/python-modules/qutip/default.nix +++ b/pkgs/development/python-modules/qutip/default.nix @@ -47,7 +47,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook pytest-rerunfailures - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); # QuTiP tries to access the home directory to create an rc file for us. # We need to go to another directory to run the tests from there. @@ -68,7 +68,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "qutip" ]; - passthru.optional-dependencies = { + optional-dependencies = { graphics = [ matplotlib ]; ipython = [ ipython ]; semidefinite = [ diff --git a/pkgs/development/python-modules/radon/default.nix b/pkgs/development/python-modules/radon/default.nix index 5d494b4c2996..007368986c82 100644 --- a/pkgs/development/python-modules/radon/default.nix +++ b/pkgs/development/python-modules/radon/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { colorama ]; - passthru.optional-dependencies = { + optional-dependencies = { toml = [ tomli ]; }; diff --git a/pkgs/development/python-modules/rapidfuzz/default.nix b/pkgs/development/python-modules/rapidfuzz/default.nix index 64246e6835ee..36bf7fdfc6af 100644 --- a/pkgs/development/python-modules/rapidfuzz/default.nix +++ b/pkgs/development/python-modules/rapidfuzz/default.nix @@ -60,7 +60,7 @@ buildPythonPackage rec { export CMAKE_ARGS="-DCMAKE_CXX_COMPILER_AR=$AR -DCMAKE_CXX_COMPILER_RANLIB=$RANLIB" ''; - passthru.optional-dependencies = { + optional-dependencies = { full = [ numpy ]; }; diff --git a/pkgs/development/python-modules/rasterio/default.nix b/pkgs/development/python-modules/rasterio/default.nix index 3365f12c1bc3..40033924bfda 100644 --- a/pkgs/development/python-modules/rasterio/default.nix +++ b/pkgs/development/python-modules/rasterio/default.nix @@ -73,7 +73,7 @@ buildPythonPackage rec { snuggs ]; - passthru.optional-dependencies = { + optional-dependencies = { ipython = [ ipython ]; plot = [ matplotlib ]; s3 = [ boto3 ]; diff --git a/pkgs/development/python-modules/raven/default.nix b/pkgs/development/python-modules/raven/default.nix index 88727591db83..ac4f03faaa78 100644 --- a/pkgs/development/python-modules/raven/default.nix +++ b/pkgs/development/python-modules/raven/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "raven" ]; - passthru.optional-dependencies = { + optional-dependencies = { flask = [ blinker flask diff --git a/pkgs/development/python-modules/rdflib/default.nix b/pkgs/development/python-modules/rdflib/default.nix index 17bf74863a74..f6a5ded15e74 100644 --- a/pkgs/development/python-modules/rdflib/default.nix +++ b/pkgs/development/python-modules/rdflib/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { pyparsing ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; - passthru.optional-dependencies = { + optional-dependencies = { html = [ html5lib ]; networkx = [ networkx ]; }; @@ -63,7 +63,7 @@ buildPythonPackage rec { # Failed: DID NOT WARN. No warnings of type (<class 'UserWarning'>,) were emitted. pytest7CheckHook setuptools - ] ++ passthru.optional-dependencies.networkx ++ passthru.optional-dependencies.html; + ] ++ optional-dependencies.networkx ++ optional-dependencies.html; pytestFlagsArray = [ # requires network access diff --git a/pkgs/development/python-modules/reconplogger/default.nix b/pkgs/development/python-modules/reconplogger/default.nix index 6b1800c7052b..0881bc5c3c05 100644 --- a/pkgs/development/python-modules/reconplogger/default.nix +++ b/pkgs/development/python-modules/reconplogger/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { pyyaml ]; - passthru.optional-dependencies = { + optional-dependencies = { all = [ flask requests diff --git a/pkgs/development/python-modules/redis/default.nix b/pkgs/development/python-modules/redis/default.nix index a55e5b293bb4..8cee5fa57311 100644 --- a/pkgs/development/python-modules/redis/default.nix +++ b/pkgs/development/python-modules/redis/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { typing-extensions ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; - passthru.optional-dependencies = { + optional-dependencies = { hiredis = [ hiredis ]; ocsp = [ cryptography diff --git a/pkgs/development/python-modules/relatorio/default.nix b/pkgs/development/python-modules/relatorio/default.nix index 458633c1a36a..1a45c719e061 100644 --- a/pkgs/development/python-modules/relatorio/default.nix +++ b/pkgs/development/python-modules/relatorio/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { lxml ]; - passthru.optional-dependencies = { + optional-dependencies = { chart = [ # pycha pyyaml @@ -36,7 +36,7 @@ buildPythonPackage rec { fodt = [ python-magic ]; }; - nativeCheckInputs = [ pytestCheckHook ] ++ passthru.optional-dependencies.fodt; + nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.fodt; pythonImportsCheck = [ "relatorio" ]; diff --git a/pkgs/development/python-modules/reportlab-qrcode/default.nix b/pkgs/development/python-modules/reportlab-qrcode/default.nix index b540fd219caf..67d69ef8cf0f 100644 --- a/pkgs/development/python-modules/reportlab-qrcode/default.nix +++ b/pkgs/development/python-modules/reportlab-qrcode/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { reportlab ]; - passthru.optional-dependencies = { + optional-dependencies = { testing = [ pillow pytest diff --git a/pkgs/development/python-modules/reptor/default.nix b/pkgs/development/python-modules/reptor/default.nix index 09a1c303c520..aad655cc13e7 100644 --- a/pkgs/development/python-modules/reptor/default.nix +++ b/pkgs/development/python-modules/reptor/default.nix @@ -69,14 +69,14 @@ buildPythonPackage rec { xmltodict ]; - passthru.optional-dependencies = { + optional-dependencies = { ghostwriter = [ gql ] ++ gql.optional-dependencies.aiohttp; translate = [ deepl ]; }; nativeCheckInputs = [ pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); preCheck = '' export HOME=$(mktemp -d) diff --git a/pkgs/development/python-modules/requests-cache/default.nix b/pkgs/development/python-modules/requests-cache/default.nix index 3df15dd5ca4e..aa8b918ca8c1 100644 --- a/pkgs/development/python-modules/requests-cache/default.nix +++ b/pkgs/development/python-modules/requests-cache/default.nix @@ -55,7 +55,7 @@ buildPythonPackage rec { url-normalize ]; - passthru.optional-dependencies = { + optional-dependencies = { dynamodb = [ boto3 botocore @@ -79,7 +79,7 @@ buildPythonPackage rec { tenacity time-machine timeout-decorator - ] ++ passthru.optional-dependencies.json ++ passthru.optional-dependencies.security; + ] ++ optional-dependencies.json ++ optional-dependencies.security; preCheck = '' export HOME=$(mktemp -d); diff --git a/pkgs/development/python-modules/requests-credssp/default.nix b/pkgs/development/python-modules/requests-credssp/default.nix index f6be7b9908f2..428b4ac18777 100644 --- a/pkgs/development/python-modules/requests-credssp/default.nix +++ b/pkgs/development/python-modules/requests-credssp/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - passthru.optional-dependencies = { + optional-dependencies = { kerberos = pyspnego.optional-dependencies.kerberos; }; diff --git a/pkgs/development/python-modules/rich/default.nix b/pkgs/development/python-modules/rich/default.nix index e32427b7b1e4..c9c29a1287be 100644 --- a/pkgs/development/python-modules/rich/default.nix +++ b/pkgs/development/python-modules/rich/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { pygments ] ++ lib.optionals (pythonOlder "3.9") [ typing-extensions ]; - passthru.optional-dependencies = { + optional-dependencies = { jupyter = [ ipywidgets ]; }; diff --git a/pkgs/development/python-modules/ripe-atlas-sagan/default.nix b/pkgs/development/python-modules/ripe-atlas-sagan/default.nix index c6d36a7b8849..014f651e18c3 100644 --- a/pkgs/development/python-modules/ripe-atlas-sagan/default.nix +++ b/pkgs/development/python-modules/ripe-atlas-sagan/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pytz ]; - passthru.optional-dependencies = { + optional-dependencies = { fast = [ ujson ]; }; diff --git a/pkgs/development/python-modules/s3transfer/default.nix b/pkgs/development/python-modules/s3transfer/default.nix index d245c6b0b964..3ac85beed894 100644 --- a/pkgs/development/python-modules/s3transfer/default.nix +++ b/pkgs/development/python-modules/s3transfer/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "s3transfer" ]; - passthru.optional-dependencies = { + optional-dependencies = { crt = [ botocore.optional-dependencies.crt ]; }; diff --git a/pkgs/development/python-modules/sagemaker/default.nix b/pkgs/development/python-modules/sagemaker/default.nix index 23906dc2d9a3..7dfe98f36a55 100644 --- a/pkgs/development/python-modules/sagemaker/default.nix +++ b/pkgs/development/python-modules/sagemaker/default.nix @@ -97,7 +97,7 @@ buildPythonPackage rec { "sagemaker.lineage.visualizer" ]; - passthru.optional-dependencies = { + optional-dependencies = { local = [ urllib3 docker diff --git a/pkgs/development/python-modules/samsungctl/default.nix b/pkgs/development/python-modules/samsungctl/default.nix index c139a1d1a4c6..43ed26ace4e2 100644 --- a/pkgs/development/python-modules/samsungctl/default.nix +++ b/pkgs/development/python-modules/samsungctl/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "0ipz3fd65rqkxlb02sql0awc3vnslrwb2pfrsnpfnf8bfgxpbh9g"; }; - passthru.optional-dependencies = { + optional-dependencies = { websocket = [ websocket-client ]; # interactive_ui requires curses package }; diff --git a/pkgs/development/python-modules/samsungtvws/default.nix b/pkgs/development/python-modules/samsungtvws/default.nix index 7111961f9224..3a99d9c89165 100644 --- a/pkgs/development/python-modules/samsungtvws/default.nix +++ b/pkgs/development/python-modules/samsungtvws/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { websocket-client ]; - passthru.optional-dependencies = { + optional-dependencies = { async = [ aiohttp websockets @@ -55,7 +55,7 @@ buildPythonPackage rec { aioresponses pytest-asyncio pytestCheckHook - ] ++ passthru.optional-dependencies.async ++ passthru.optional-dependencies.encrypted; + ] ++ optional-dependencies.async ++ optional-dependencies.encrypted; pythonImportsCheck = [ "samsungtvws" ]; diff --git a/pkgs/development/python-modules/sanic/default.nix b/pkgs/development/python-modules/sanic/default.nix index 6979926cd7c9..05cdff616166 100644 --- a/pkgs/development/python-modules/sanic/default.nix +++ b/pkgs/development/python-modules/sanic/default.nix @@ -55,7 +55,7 @@ buildPythonPackage rec { websockets ]; - passthru.optional-dependencies = { + optional-dependencies = { ext = [ # TODO: sanic-ext ]; @@ -69,7 +69,7 @@ buildPythonPackage rec { pytestCheckHook sanic-testing uvicorn - ] ++ passthru.optional-dependencies.http3; + ] ++ optional-dependencies.http3; inherit doCheck; diff --git a/pkgs/development/python-modules/schema-salad/default.nix b/pkgs/development/python-modules/schema-salad/default.nix index 6e3b6e3d5ed6..e90abc94768c 100644 --- a/pkgs/development/python-modules/schema-salad/default.nix +++ b/pkgs/development/python-modules/schema-salad/default.nix @@ -62,7 +62,7 @@ buildPythonPackage rec { hash = "sha256-fke75FCCn23LAMJ5bDWJpuBR6E9XIpjmzzXSbjqpxn8="; } ) ]; - nativeCheckInputs = [ pytestCheckHook ] ++ passthru.optional-dependencies.pycodegen; + nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.pycodegen; preCheck = '' rm tox.ini @@ -80,7 +80,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "schema_salad" ]; - passthru.optional-dependencies = { + optional-dependencies = { pycodegen = [ black ]; }; diff --git a/pkgs/development/python-modules/scikit-image/default.nix b/pkgs/development/python-modules/scikit-image/default.nix index 3c0743354787..6eb9bc428949 100644 --- a/pkgs/development/python-modules/scikit-image/default.nix +++ b/pkgs/development/python-modules/scikit-image/default.nix @@ -77,7 +77,7 @@ let tifffile ]; - passthru.optional-dependencies = { + optional-dependencies = { data = [ pooch ]; optional = [ astropy diff --git a/pkgs/development/python-modules/scim2-filter-parser/default.nix b/pkgs/development/python-modules/scim2-filter-parser/default.nix index 4ea0d1a6c7d5..2ddf98697185 100644 --- a/pkgs/development/python-modules/scim2-filter-parser/default.nix +++ b/pkgs/development/python-modules/scim2-filter-parser/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ sly ]; - passthru.optional-dependencies = { + optional-dependencies = { django-query = [ django ]; }; @@ -49,7 +49,7 @@ buildPythonPackage rec { nativeCheckInputs = [ mock pytestCheckHook - ] ++ passthru.optional-dependencies.django-query; + ] ++ optional-dependencies.django-query; meta = with lib; { description = "Customizable parser/transpiler for SCIM2.0 filters"; diff --git a/pkgs/development/python-modules/seaborn/default.nix b/pkgs/development/python-modules/seaborn/default.nix index 16e9d1b98078..74987d59dcc4 100644 --- a/pkgs/development/python-modules/seaborn/default.nix +++ b/pkgs/development/python-modules/seaborn/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { pandas ]; - passthru.optional-dependencies = { + optional-dependencies = { stats = [ scipy statsmodels diff --git a/pkgs/development/python-modules/seabreeze/default.nix b/pkgs/development/python-modules/seabreeze/default.nix index 7bb81e8006eb..8ea5a67932fe 100644 --- a/pkgs/development/python-modules/seabreeze/default.nix +++ b/pkgs/development/python-modules/seabreeze/default.nix @@ -63,7 +63,7 @@ buildPythonPackage rec { libusb-compat-0_1 ]; - passthru.optional-dependencies = { + optional-dependencies = { pyseabreeze = [ pyusb ]; }; @@ -77,7 +77,7 @@ buildPythonPackage rec { pytestCheckHook mock zipp - ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); disabledTests = [ "TestHardware" ]; diff --git a/pkgs/development/python-modules/seasonal/default.nix b/pkgs/development/python-modules/seasonal/default.nix index f6aa8d2e3646..cef289ff5c8e 100644 --- a/pkgs/development/python-modules/seasonal/default.nix +++ b/pkgs/development/python-modules/seasonal/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { scipy ]; - passthru.optional-dependencies = { + optional-dependencies = { csv = [ pandas ]; plot = [ matplotlib ]; }; @@ -51,7 +51,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); meta = with lib; { description = "Robustly estimate trend and periodicity in a timeseries"; diff --git a/pkgs/development/python-modules/securesystemslib/default.nix b/pkgs/development/python-modules/securesystemslib/default.nix index 21cff0dc498e..62fb78f35653 100644 --- a/pkgs/development/python-modules/securesystemslib/default.nix +++ b/pkgs/development/python-modules/securesystemslib/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { nativeBuildInputs = [ hatchling ]; - passthru.optional-dependencies = { + optional-dependencies = { PySPX = [ pyspx ]; awskms = [ boto3 @@ -70,7 +70,7 @@ buildPythonPackage rec { nativeCheckInputs = [ ed25519 pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "securesystemslib" ]; diff --git a/pkgs/development/python-modules/sentry-sdk/1.nix b/pkgs/development/python-modules/sentry-sdk/1.nix index db47e03c017d..c09abf95944c 100644 --- a/pkgs/development/python-modules/sentry-sdk/1.nix +++ b/pkgs/development/python-modules/sentry-sdk/1.nix @@ -58,7 +58,7 @@ buildPythonPackage rec { urllib3 ]; - passthru.optional-dependencies = { + optional-dependencies = { aiohttp = [ aiohttp ]; beam = [ apache-beam ]; bottle = [ bottle ]; diff --git a/pkgs/development/python-modules/sfrbox-api/default.nix b/pkgs/development/python-modules/sfrbox-api/default.nix index 4764b5ff573f..d68d4485a095 100644 --- a/pkgs/development/python-modules/sfrbox-api/default.nix +++ b/pkgs/development/python-modules/sfrbox-api/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { httpx ]; - passthru.optional-dependencies = { + optional-dependencies = { cli = [ click ]; }; @@ -47,7 +47,7 @@ buildPythonPackage rec { pytest-asyncio pytestCheckHook respx - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "sfrbox_api" ]; diff --git a/pkgs/development/python-modules/shap/default.nix b/pkgs/development/python-modules/shap/default.nix index 25246028a514..e2b3deaa9230 100644 --- a/pkgs/development/python-modules/shap/default.nix +++ b/pkgs/development/python-modules/shap/default.nix @@ -60,7 +60,7 @@ buildPythonPackage rec { tqdm ]; - passthru.optional-dependencies = { + optional-dependencies = { plots = [ matplotlib ipython diff --git a/pkgs/development/python-modules/simpful/default.nix b/pkgs/development/python-modules/simpful/default.nix index 2759c829246e..731d9299fc2c 100644 --- a/pkgs/development/python-modules/simpful/default.nix +++ b/pkgs/development/python-modules/simpful/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { requests ]; - passthru.optional-dependencies = { + optional-dependencies = { plotting = [ matplotlib seaborn @@ -44,7 +44,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "simpful" ]; diff --git a/pkgs/development/python-modules/skytemple-files/default.nix b/pkgs/development/python-modules/skytemple-files/default.nix index 240c0a65d805..57551e9e6740 100644 --- a/pkgs/development/python-modules/skytemple-files/default.nix +++ b/pkgs/development/python-modules/skytemple-files/default.nix @@ -72,7 +72,7 @@ buildPythonPackage rec { range-typed-integers ]; - passthru.optional-dependencies = { + optional-dependencies = { spritecollab = [ aiohttp gql @@ -85,7 +85,7 @@ buildPythonPackage rec { pytestCheckHook parameterized xmldiff - ] ++ passthru.optional-dependencies.spritecollab; + ] ++ optional-dependencies.spritecollab; pytestFlagsArray = [ "test/" ]; disabledTestPaths = [ "test/skytemple_files_test/common/spritecollab/sc_online_test.py" diff --git a/pkgs/development/python-modules/slack-bolt/default.nix b/pkgs/development/python-modules/slack-bolt/default.nix index 7eeb546c5d5d..ace86514b22a 100644 --- a/pkgs/development/python-modules/slack-bolt/default.nix +++ b/pkgs/development/python-modules/slack-bolt/default.nix @@ -63,7 +63,7 @@ buildPythonPackage rec { dependencies = [ slack-sdk ]; - passthru.optional-dependencies = { + optional-dependencies = { async = [ aiohttp websockets @@ -94,7 +94,7 @@ buildPythonPackage rec { docker pytest-asyncio pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); preCheck = '' export HOME="$(mktemp -d)" diff --git a/pkgs/development/python-modules/social-auth-core/default.nix b/pkgs/development/python-modules/social-auth-core/default.nix index 7f9091b46f43..b2641bed1e7f 100644 --- a/pkgs/development/python-modules/social-auth-core/default.nix +++ b/pkgs/development/python-modules/social-auth-core/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { requests-oauthlib ]; - passthru.optional-dependencies = { + optional-dependencies = { openidconnect = [ python-jose ]; saml = [ lxml @@ -56,7 +56,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook httpretty - ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); # Disable checking the code coverage prePatch = '' diff --git a/pkgs/development/python-modules/spatialmath-python/default.nix b/pkgs/development/python-modules/spatialmath-python/default.nix index f889c325ac2e..259383492a25 100644 --- a/pkgs/development/python-modules/spatialmath-python/default.nix +++ b/pkgs/development/python-modules/spatialmath-python/default.nix @@ -47,7 +47,7 @@ buildPythonPackage rec { typing-extensions ]; - passthru.optional-dependencies = { + optional-dependencies = { dev = [ coverage flake8 diff --git a/pkgs/development/python-modules/sphinxext-opengraph/default.nix b/pkgs/development/python-modules/sphinxext-opengraph/default.nix index 2740b83afbb4..7cfc6b174a3a 100644 --- a/pkgs/development/python-modules/sphinxext-opengraph/default.nix +++ b/pkgs/development/python-modules/sphinxext-opengraph/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools-scm ]; - passthru.optional-dependencies = { + optional-dependencies = { social_cards_generation = [ matplotlib ]; }; @@ -35,7 +35,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook beautifulsoup4 - ] ++ passthru.optional-dependencies.social_cards_generation; + ] ++ optional-dependencies.social_cards_generation; pythonImportsCheck = [ "sphinxext.opengraph" ]; diff --git a/pkgs/development/python-modules/splinter/default.nix b/pkgs/development/python-modules/splinter/default.nix index c85096167742..c8ce42bc7351 100644 --- a/pkgs/development/python-modules/splinter/default.nix +++ b/pkgs/development/python-modules/splinter/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ urllib3 ]; - passthru.optional-dependencies = { + optional-dependencies = { "zope.testbrowser" = [ zope-testbrowser lxml @@ -54,7 +54,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); disabledTests = [ # driver is present and fails with a different error during loading diff --git a/pkgs/development/python-modules/sqlalchemy-utils/default.nix b/pkgs/development/python-modules/sqlalchemy-utils/default.nix index e4865cd091af..1cf2d9418e98 100644 --- a/pkgs/development/python-modules/sqlalchemy-utils/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-utils/default.nix @@ -51,7 +51,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ sqlalchemy ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; - passthru.optional-dependencies = { + optional-dependencies = { babel = [ babel ]; arrow = [ arrow ]; pendulum = [ pendulum ]; @@ -78,7 +78,7 @@ buildPythonPackage rec { pymysql pyodbc ] - ++ lib.flatten (builtins.attrValues passthru.optional-dependencies) + ++ lib.flatten (builtins.attrValues optional-dependencies) ++ lib.optionals (pythonOlder "3.12") [ # requires distutils, which were removed in 3.12 psycopg2cffi diff --git a/pkgs/development/python-modules/sqlalchemy/1_4.nix b/pkgs/development/python-modules/sqlalchemy/1_4.nix index b741a7710c56..2384a4f0c056 100644 --- a/pkgs/development/python-modules/sqlalchemy/1_4.nix +++ b/pkgs/development/python-modules/sqlalchemy/1_4.nix @@ -54,7 +54,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ greenlet ]; - passthru.optional-dependencies = lib.fix (self: { + optional-dependencies = lib.fix (self: { asyncio = [ greenlet ]; mypy = [ mypy ]; mssql = [ pyodbc ]; diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix index 426be56eea9d..efd9f7a3af46 100644 --- a/pkgs/development/python-modules/sqlalchemy/default.nix +++ b/pkgs/development/python-modules/sqlalchemy/default.nix @@ -67,7 +67,7 @@ buildPythonPackage rec { typing-extensions ]; - passthru.optional-dependencies = lib.fix (self: { + optional-dependencies = lib.fix (self: { asyncio = [ greenlet ]; mypy = [ mypy ]; mssql = [ pyodbc ]; diff --git a/pkgs/development/python-modules/static3/default.nix b/pkgs/development/python-modules/static3/default.nix index 050fb2119dae..13a41618feb3 100644 --- a/pkgs/development/python-modules/static3/default.nix +++ b/pkgs/development/python-modules/static3/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { --replace ", 'pytest-cov'" "" ''; - passthru.optional-dependencies = { + optional-dependencies = { KidMagic = [ # TODO: kid ]; @@ -40,7 +40,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook webtest - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); meta = with lib; { changelog = "https://github.com/rmohr/static3/releases/tag/v${version}"; diff --git a/pkgs/development/python-modules/stm32loader/default.nix b/pkgs/development/python-modules/stm32loader/default.nix index 4fab0c1b3077..b27d221d75f4 100644 --- a/pkgs/development/python-modules/stm32loader/default.nix +++ b/pkgs/development/python-modules/stm32loader/default.nix @@ -44,13 +44,13 @@ buildPythonPackage rec { pyserial ]; - passthru.optional-dependencies = { + optional-dependencies = { hex = [ intelhex ]; }; nativeCheckInputs = [ pytestCheckHook - ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); pytestFlagsArray = [ "tests/unit" ]; diff --git a/pkgs/development/python-modules/strawberry-graphql/default.nix b/pkgs/development/python-modules/strawberry-graphql/default.nix index 1e3a816d6572..95fd2c9161b9 100644 --- a/pkgs/development/python-modules/strawberry-graphql/default.nix +++ b/pkgs/development/python-modules/strawberry-graphql/default.nix @@ -78,7 +78,7 @@ buildPythonPackage rec { typing-extensions ]; - passthru.optional-dependencies = { + optional-dependencies = { aiohttp = [ aiohttp pytest-aiohttp @@ -146,7 +146,7 @@ buildPythonPackage rec { pytest-snapshot pytestCheckHook sanic-testing - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "strawberry" ]; diff --git a/pkgs/development/python-modules/sunpy/default.nix b/pkgs/development/python-modules/sunpy/default.nix index 34cec394a104..8c4688807d26 100644 --- a/pkgs/development/python-modules/sunpy/default.nix +++ b/pkgs/development/python-modules/sunpy/default.nix @@ -54,7 +54,7 @@ buildPythonPackage rec { parfive ]; - passthru.optional-dependencies = { + optional-dependencies = { asdf = [ asdf # asdf-astropy @@ -91,11 +91,11 @@ buildPythonPackage rec { pytest-mock pytestCheckHook ] - ++ passthru.optional-dependencies.asdf - ++ passthru.optional-dependencies.database - ++ passthru.optional-dependencies.image - ++ passthru.optional-dependencies.net - ++ passthru.optional-dependencies.timeseries; + ++ optional-dependencies.asdf + ++ optional-dependencies.database + ++ optional-dependencies.image + ++ optional-dependencies.net + ++ optional-dependencies.timeseries; postPatch = '' substituteInPlace setup.cfg \ diff --git a/pkgs/development/python-modules/superqt/default.nix b/pkgs/development/python-modules/superqt/default.nix index c2fbba840684..713f688a4c17 100644 --- a/pkgs/development/python-modules/superqt/default.nix +++ b/pkgs/development/python-modules/superqt/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { typing-extensions ]; - passthru.optional-dependencies = { + optional-dependencies = { quantity = [ pint ]; pyside2 = [ pyside2 ]; pyside6 = [ pyside6 ]; diff --git a/pkgs/development/python-modules/tablib/default.nix b/pkgs/development/python-modules/tablib/default.nix index 443b83ce7810..bd1ed07849ed 100644 --- a/pkgs/development/python-modules/tablib/default.nix +++ b/pkgs/development/python-modules/tablib/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools-scm ]; - passthru.optional-dependencies = { + optional-dependencies = { all = [ markuppy odfpy diff --git a/pkgs/development/python-modules/tabulate/default.nix b/pkgs/development/python-modules/tabulate/default.nix index c781a453397a..d0c635cc919c 100644 --- a/pkgs/development/python-modules/tabulate/default.nix +++ b/pkgs/development/python-modules/tabulate/default.nix @@ -26,13 +26,13 @@ buildPythonPackage rec { setuptools-scm ]; - passthru.optional-dependencies = { + optional-dependencies = { widechars = [ wcwidth ]; }; nativeCheckInputs = [ pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); meta = { description = "Pretty-print tabular data"; diff --git a/pkgs/development/python-modules/telegraph/default.nix b/pkgs/development/python-modules/telegraph/default.nix index 387c7034bb82..80a4d12c7b16 100644 --- a/pkgs/development/python-modules/telegraph/default.nix +++ b/pkgs/development/python-modules/telegraph/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests ]; - passthru.optional-dependencies = { + optional-dependencies = { aio = [ httpx ]; }; diff --git a/pkgs/development/python-modules/textual-universal-directorytree/default.nix b/pkgs/development/python-modules/textual-universal-directorytree/default.nix index 20429de6f810..9da4e1e82ee7 100644 --- a/pkgs/development/python-modules/textual-universal-directorytree/default.nix +++ b/pkgs/development/python-modules/textual-universal-directorytree/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { universal-pathlib ]; - passthru.optional-dependencies = { + optional-dependencies = { remote = [ adlfs aiohttp diff --git a/pkgs/development/python-modules/tree-sitter-html/default.nix b/pkgs/development/python-modules/tree-sitter-html/default.nix index 361f53b29bb6..4c5060294231 100644 --- a/pkgs/development/python-modules/tree-sitter-html/default.nix +++ b/pkgs/development/python-modules/tree-sitter-html/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { setuptools ]; - passthru.optional-dependencies = { + optional-dependencies = { core = [ tree-sitter ]; diff --git a/pkgs/development/python-modules/tree-sitter-javascript/default.nix b/pkgs/development/python-modules/tree-sitter-javascript/default.nix index f6a8782f1406..39766ce588f7 100644 --- a/pkgs/development/python-modules/tree-sitter-javascript/default.nix +++ b/pkgs/development/python-modules/tree-sitter-javascript/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { setuptools ]; - passthru.optional-dependencies = { + optional-dependencies = { core = [ tree-sitter ]; diff --git a/pkgs/development/python-modules/tree-sitter-json/default.nix b/pkgs/development/python-modules/tree-sitter-json/default.nix index 45557bd5e2ea..0e6cd37f8b87 100644 --- a/pkgs/development/python-modules/tree-sitter-json/default.nix +++ b/pkgs/development/python-modules/tree-sitter-json/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { setuptools ]; - passthru.optional-dependencies = { + optional-dependencies = { core = [ tree-sitter ]; diff --git a/pkgs/development/python-modules/tree-sitter-python/default.nix b/pkgs/development/python-modules/tree-sitter-python/default.nix index 399fcb0afc18..4ca4ec1d7b81 100644 --- a/pkgs/development/python-modules/tree-sitter-python/default.nix +++ b/pkgs/development/python-modules/tree-sitter-python/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { setuptools ]; - passthru.optional-dependencies = { + optional-dependencies = { core = [ tree-sitter ]; diff --git a/pkgs/development/python-modules/tree-sitter-rust/default.nix b/pkgs/development/python-modules/tree-sitter-rust/default.nix index c532127dcd14..526d1907a0a6 100644 --- a/pkgs/development/python-modules/tree-sitter-rust/default.nix +++ b/pkgs/development/python-modules/tree-sitter-rust/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { setuptools ]; - passthru.optional-dependencies = { + optional-dependencies = { core = [ tree-sitter ]; diff --git a/pkgs/development/python-modules/trino-python-client/default.nix b/pkgs/development/python-modules/trino-python-client/default.nix index a75171f6957f..b76dba2b7692 100644 --- a/pkgs/development/python-modules/trino-python-client/default.nix +++ b/pkgs/development/python-modules/trino-python-client/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { tzlocal ]; - passthru.optional-dependencies = lib.fix (self: { + optional-dependencies = lib.fix (self: { kerberos = [ requests-kerberos ]; sqlalchemy = [ sqlalchemy ]; external-authentication-token-cache = [ keyring ]; @@ -47,7 +47,7 @@ buildPythonPackage rec { nativeCheckInputs = [ httpretty pytestCheckHook - ] ++ passthru.optional-dependencies.all; + ] ++ optional-dependencies.all; pythonImportsCheck = [ "trino" ]; diff --git a/pkgs/development/python-modules/troposphere/default.nix b/pkgs/development/python-modules/troposphere/default.nix index 7cfac7521cf9..ce40ef338b11 100644 --- a/pkgs/development/python-modules/troposphere/default.nix +++ b/pkgs/development/python-modules/troposphere/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { unittestCheckHook ]; - passthru.optional-dependencies = { + optional-dependencies = { policy = [ awacs ]; }; diff --git a/pkgs/development/python-modules/twisted/default.nix b/pkgs/development/python-modules/twisted/default.nix index 100a7d42d201..cc72a5e86697 100644 --- a/pkgs/development/python-modules/twisted/default.nix +++ b/pkgs/development/python-modules/twisted/default.nix @@ -171,13 +171,13 @@ buildPythonPackage rec { hypothesis pyhamcrest ] - ++ passthru.optional-dependencies.conch - ++ passthru.optional-dependencies.http2 - ++ passthru.optional-dependencies.serial + ++ optional-dependencies.conch + ++ optional-dependencies.http2 + ++ optional-dependencies.serial # not supported on aarch64-darwin: https://github.com/pyca/pyopenssl/issues/873 ++ lib.optionals ( !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) - ) passthru.optional-dependencies.tls; + ) optional-dependencies.tls; checkPhase = '' export SOURCE_DATE_EPOCH=315532800 @@ -186,26 +186,26 @@ buildPythonPackage rec { ${python.interpreter} -m twisted.trial -j1 twisted ''; - passthru = { - optional-dependencies = { - conch = [ - appdirs - bcrypt - cryptography - pyasn1 - ]; - http2 = [ - h2 - priority - ]; - serial = [ pyserial ]; - tls = [ - idna - pyopenssl - service-identity - ]; - }; + optional-dependencies = { + conch = [ + appdirs + bcrypt + cryptography + pyasn1 + ]; + http2 = [ + h2 + priority + ]; + serial = [ pyserial ]; + tls = [ + idna + pyopenssl + service-identity + ]; + }; + passthru = { tests = { inherit cassandra-driver diff --git a/pkgs/development/python-modules/txtai/default.nix b/pkgs/development/python-modules/txtai/default.nix index c9be16e2eba4..7b08166e1d56 100644 --- a/pkgs/development/python-modules/txtai/default.nix +++ b/pkgs/development/python-modules/txtai/default.nix @@ -174,7 +174,7 @@ buildPythonPackage { regex ]; - passthru.optional-dependencies = optional-dependencies; + optional-dependencies = optional-dependencies; pythonImportsCheck = [ "txtai" ]; diff --git a/pkgs/development/python-modules/typed-settings/default.nix b/pkgs/development/python-modules/typed-settings/default.nix index a39f18bad504..4b3015922146 100644 --- a/pkgs/development/python-modules/typed-settings/default.nix +++ b/pkgs/development/python-modules/typed-settings/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { dependencies = lib.optionals (pythonOlder "3.11") [ tomli ]; - passthru.optional-dependencies = { + optional-dependencies = { all = [ attrs cattrs @@ -57,7 +57,7 @@ buildPythonPackage rec { hypothesis pytestCheckHook typing-extensions - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pytestFlagsArray = [ "tests" ]; diff --git a/pkgs/development/python-modules/typepy/default.nix b/pkgs/development/python-modules/typepy/default.nix index 91e01efa2019..0de0eea1ca8e 100644 --- a/pkgs/development/python-modules/typepy/default.nix +++ b/pkgs/development/python-modules/typepy/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ mbstrdecoder ]; - passthru.optional-dependencies = { + optional-dependencies = { datetime = [ python-dateutil pytz @@ -38,7 +38,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook tcolorpy - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "typepy" ]; diff --git a/pkgs/development/python-modules/types-aiobotocore/default.nix b/pkgs/development/python-modules/types-aiobotocore/default.nix index a91d608c77fc..29fffba265bc 100644 --- a/pkgs/development/python-modules/types-aiobotocore/default.nix +++ b/pkgs/development/python-modules/types-aiobotocore/default.nix @@ -380,7 +380,7 @@ buildPythonPackage rec { typing-extensions ]; - passthru.optional-dependencies = { + optional-dependencies = { accessanalyzer = [ types-aiobotocore-accessanalyzer ]; account = [ types-aiobotocore-account ]; acm = [ types-aiobotocore-acm ]; diff --git a/pkgs/development/python-modules/ubelt/default.nix b/pkgs/development/python-modules/ubelt/default.nix index ae9c6b2a648d..11491426bd09 100644 --- a/pkgs/development/python-modules/ubelt/default.nix +++ b/pkgs/development/python-modules/ubelt/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { wheel ]; - passthru.optional-dependencies = { + optional-dependencies = { optional = [ numpy python-dateutil diff --git a/pkgs/development/python-modules/ufmt/default.nix b/pkgs/development/python-modules/ufmt/default.nix index d8e349261418..e18b8062f1ff 100644 --- a/pkgs/development/python-modules/ufmt/default.nix +++ b/pkgs/development/python-modules/ufmt/default.nix @@ -44,14 +44,14 @@ buildPythonPackage rec { usort ]; - passthru.optional-dependencies = { + optional-dependencies = { lsp = [ pygls ]; ruff = [ ruff-api ]; }; nativeCheckInputs = [ unittestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "ufmt" ]; diff --git a/pkgs/development/python-modules/ufolib2/default.nix b/pkgs/development/python-modules/ufolib2/default.nix index 6eaac11f17f0..201413ed9b9d 100644 --- a/pkgs/development/python-modules/ufolib2/default.nix +++ b/pkgs/development/python-modules/ufolib2/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { fonttools ] ++ fonttools.optional-dependencies.ufo; - passthru.optional-dependencies = { + optional-dependencies = { lxml = [ lxml ]; converters = [ cattrs ]; json = [ @@ -47,7 +47,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "ufoLib2" ]; diff --git a/pkgs/development/python-modules/umap-learn/default.nix b/pkgs/development/python-modules/umap-learn/default.nix index 8a6f51bded2a..9fbe57c250e9 100644 --- a/pkgs/development/python-modules/umap-learn/default.nix +++ b/pkgs/development/python-modules/umap-learn/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { tqdm ]; - passthru.optional-dependencies = rec { + optional-dependencies = rec { plot = [ bokeh colorcet diff --git a/pkgs/development/python-modules/unrpa/default.nix b/pkgs/development/python-modules/unrpa/default.nix index c64443ff6661..b806af03a2c1 100644 --- a/pkgs/development/python-modules/unrpa/default.nix +++ b/pkgs/development/python-modules/unrpa/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "0yl4qdwp3in170ks98qnldqz3r2iyzil5g1775ccg98qkh95s724"; }; - passthru.optional-dependencies = { + optional-dependencies = { ZiX = [ uncompyle6 ]; }; diff --git a/pkgs/development/python-modules/unstructured/default.nix b/pkgs/development/python-modules/unstructured/default.nix index afa02b447739..dc0b24644733 100644 --- a/pkgs/development/python-modules/unstructured/default.nix +++ b/pkgs/development/python-modules/unstructured/default.nix @@ -143,7 +143,7 @@ buildPythonPackage { grpcio ]; - passthru.optional-dependencies = optional-dependencies; + optional-dependencies = optional-dependencies; meta = with lib; { description = "Open source libraries and APIs to build custom preprocessing pipelines for labeling, training, or production machine learning pipelines"; diff --git a/pkgs/development/python-modules/urllib3/default.nix b/pkgs/development/python-modules/urllib3/default.nix index 1bffd501e763..3fae3b0b70f0 100644 --- a/pkgs/development/python-modules/urllib3/default.nix +++ b/pkgs/development/python-modules/urllib3/default.nix @@ -34,7 +34,7 @@ let nativeBuildInputs = [ hatchling ]; - passthru.optional-dependencies = { + optional-dependencies = { brotli = if isPyPy then [ brotlicffi ] else [ brotli ]; socks = [ pysocks ]; }; @@ -47,7 +47,7 @@ let trustme ] ++ lib.optionals (pythonOlder "3.9") [ backports-zoneinfo ] - ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ++ lib.flatten (builtins.attrValues optional-dependencies); # Tests in urllib3 are mostly timeout-based instead of event-based and # are therefore inherently flaky. On your own machine, the tests will diff --git a/pkgs/development/python-modules/urwid/default.nix b/pkgs/development/python-modules/urwid/default.nix index 7c2024af44d8..f11af5836ca8 100644 --- a/pkgs/development/python-modules/urwid/default.nix +++ b/pkgs/development/python-modules/urwid/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { wcwidth ]; - passthru.optional-dependencies = { + optional-dependencies = { glib = [ pygobject3 ]; tornado = [ tornado ]; trio = [ @@ -62,7 +62,7 @@ buildPythonPackage rec { nativeCheckInputs = [ glibcLocales pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); env.LC_ALL = "en_US.UTF8"; diff --git a/pkgs/development/python-modules/uvicorn/default.nix b/pkgs/development/python-modules/uvicorn/default.nix index 48bd9e9ef85e..f81acc469a3d 100644 --- a/pkgs/development/python-modules/uvicorn/default.nix +++ b/pkgs/development/python-modules/uvicorn/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { h11 ] ++ lib.optionals (pythonOlder "3.11") [ typing-extensions ]; - passthru.optional-dependencies.standard = [ + optional-dependencies.standard = [ httptools python-dotenv pyyaml diff --git a/pkgs/development/python-modules/vega/default.nix b/pkgs/development/python-modules/vega/default.nix index d7fbe2cabaa2..1acb25ddf809 100644 --- a/pkgs/development/python-modules/vega/default.nix +++ b/pkgs/development/python-modules/vega/default.nix @@ -49,7 +49,7 @@ buildPythonPackage rec { pandas ]; - passthru.optional-dependencies = { + optional-dependencies = { widget = [ ipywidgets ]; jupyterlab = [ jupyterlab ]; }; diff --git a/pkgs/development/python-modules/versioneer/default.nix b/pkgs/development/python-modules/versioneer/default.nix index d98aa5ab71d1..613859ff61e0 100644 --- a/pkgs/development/python-modules/versioneer/default.nix +++ b/pkgs/development/python-modules/versioneer/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools ] ++ lib.optionals (pythonOlder "3.11") [ tomli ]; - passthru.optional-dependencies = { + optional-dependencies = { toml = lib.optionals (pythonOlder "3.11") [ tomli ]; }; diff --git a/pkgs/development/python-modules/visions/default.nix b/pkgs/development/python-modules/visions/default.nix index 6d3da09118f9..f79a34ce58c9 100644 --- a/pkgs/development/python-modules/visions/default.nix +++ b/pkgs/development/python-modules/visions/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { pandas ]; - passthru.optional-dependencies = { + optional-dependencies = { type-geometry = [ shapely ]; type-image-path = [ imagehash pillow ]; plotting = [ matplotlib pydot pygraphviz ]; @@ -50,7 +50,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); disabledTestPaths = [ # requires running Apache Spark: diff --git a/pkgs/development/python-modules/vivisect/default.nix b/pkgs/development/python-modules/vivisect/default.nix index ef939cbdca6e..e99a473b48a6 100644 --- a/pkgs/development/python-modules/vivisect/default.nix +++ b/pkgs/development/python-modules/vivisect/default.nix @@ -42,9 +42,9 @@ buildPythonPackage rec { cxxfilt msgpack pycparser - ] ++ lib.optionals (withGui) passthru.optional-dependencies.gui; + ] ++ lib.optionals (withGui) optional-dependencies.gui; - passthru.optional-dependencies.gui = [ + optional-dependencies.gui = [ pyqt5 pyqtwebengine ]; diff --git a/pkgs/development/python-modules/volvooncall/default.nix b/pkgs/development/python-modules/volvooncall/default.nix index 23677ab4ec4f..c61971b587f4 100644 --- a/pkgs/development/python-modules/volvooncall/default.nix +++ b/pkgs/development/python-modules/volvooncall/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp ]; - passthru.optional-dependencies = { + optional-dependencies = { console = [ certifi docopt @@ -55,7 +55,7 @@ buildPythonPackage rec { mock pytest-asyncio pytestCheckHook - ] ++ passthru.optional-dependencies.mqtt; + ] ++ optional-dependencies.mqtt; pythonImportsCheck = [ "volvooncall" ]; diff --git a/pkgs/development/python-modules/w1thermsensor/default.nix b/pkgs/development/python-modules/w1thermsensor/default.nix index eca3bdd9302e..af8854ce96ec 100644 --- a/pkgs/development/python-modules/w1thermsensor/default.nix +++ b/pkgs/development/python-modules/w1thermsensor/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ click ]; - passthru.optional-dependencies = { + optional-dependencies = { async = [ aiofiles ]; }; @@ -46,7 +46,7 @@ buildPythonPackage rec { pytestCheckHook ] ++ lib.optionals (pythonOlder "3.11") [ tomli ] - ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "w1thermsensor" ]; diff --git a/pkgs/development/python-modules/watchdog/default.nix b/pkgs/development/python-modules/watchdog/default.nix index 10184cfef7dd..e68d2acbf130 100644 --- a/pkgs/development/python-modules/watchdog/default.nix +++ b/pkgs/development/python-modules/watchdog/default.nix @@ -32,14 +32,14 @@ buildPythonPackage rec { buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; - passthru.optional-dependencies.watchmedo = [ pyyaml ]; + optional-dependencies.watchmedo = [ pyyaml ]; nativeCheckInputs = [ eventlet flaky pytest-timeout pytestCheckHook - ] ++ passthru.optional-dependencies.watchmedo; + ] ++ optional-dependencies.watchmedo; postPatch = '' substituteInPlace setup.cfg \ diff --git a/pkgs/development/python-modules/watermark/default.nix b/pkgs/development/python-modules/watermark/default.nix index 3af49dd8d38d..5eefa67895c5 100644 --- a/pkgs/development/python-modules/watermark/default.nix +++ b/pkgs/development/python-modules/watermark/default.nix @@ -31,13 +31,13 @@ buildPythonPackage rec { importlib-metadata ]; - passthru.optional-dependencies = { + optional-dependencies = { gpu = [ py3nvml ]; }; nativeCheckInputs = [ pytestCheckHook - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "watermark" ]; diff --git a/pkgs/development/python-modules/web3/default.nix b/pkgs/development/python-modules/web3/default.nix index 49415d090f5c..08fc850f9e50 100644 --- a/pkgs/development/python-modules/web3/default.nix +++ b/pkgs/development/python-modules/web3/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { }; # Note: to reflect the extra_requires in main/setup.py. - passthru.optional-dependencies = { + optional-dependencies = { ipfs = [ ipfshttpclient ]; }; diff --git a/pkgs/development/python-modules/webdav4/default.nix b/pkgs/development/python-modules/webdav4/default.nix index 9a6459fa375e..ce0d6d58b61f 100644 --- a/pkgs/development/python-modules/webdav4/default.nix +++ b/pkgs/development/python-modules/webdav4/default.nix @@ -47,9 +47,9 @@ buildPythonPackage rec { pytestCheckHook pytest-cov-stub wsgidav - ] ++ passthru.optional-dependencies.fsspec; + ] ++ optional-dependencies.fsspec; - passthru.optional-dependencies = { + optional-dependencies = { fsspec = [ fsspec ]; http2 = [ httpx.optional-dependencies.http2 ]; all = [ diff --git a/pkgs/development/python-modules/weconnect/default.nix b/pkgs/development/python-modules/weconnect/default.nix index 171622cf10b2..109457308110 100644 --- a/pkgs/development/python-modules/weconnect/default.nix +++ b/pkgs/development/python-modules/weconnect/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { requests ]; - passthru.optional-dependencies = { + optional-dependencies = { Images = [ ascii-magic pillow diff --git a/pkgs/development/python-modules/werkzeug/default.nix b/pkgs/development/python-modules/werkzeug/default.nix index be6cd79b788a..ebd1983a0c7f 100644 --- a/pkgs/development/python-modules/werkzeug/default.nix +++ b/pkgs/development/python-modules/werkzeug/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ markupsafe ]; - passthru.optional-dependencies = { + optional-dependencies = { watchdog = lib.optionals (!stdenv.hostPlatform.isDarwin) [ # watchdog requires macos-sdk 10.13 watchdog @@ -59,7 +59,7 @@ buildPythonPackage rec { pytestCheckHook ] ++ lib.optionals (pythonOlder "3.11") [ greenlet ] - ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "werkzeug" ]; diff --git a/pkgs/development/python-modules/willow/default.nix b/pkgs/development/python-modules/willow/default.nix index f2ab1675d043..83b446947683 100644 --- a/pkgs/development/python-modules/willow/default.nix +++ b/pkgs/development/python-modules/willow/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { defusedxml ]; - passthru.optional-dependencies = { + optional-dependencies = { heif = [ pillow-heif ]; }; @@ -52,7 +52,7 @@ buildPythonPackage rec { pytestCheckHook pillow wand - ] ++ passthru.optional-dependencies.heif; + ] ++ optional-dependencies.heif; meta = with lib; { description = "Python image library that sits on top of Pillow, Wand and OpenCV"; diff --git a/pkgs/development/python-modules/wktutils/default.nix b/pkgs/development/python-modules/wktutils/default.nix index 23529f04a356..de011db9a56d 100644 --- a/pkgs/development/python-modules/wktutils/default.nix +++ b/pkgs/development/python-modules/wktutils/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { shapely ]; - passthru.optional-dependencies = { + optional-dependencies = { extras = [ requests scikit-learn diff --git a/pkgs/development/python-modules/wled/default.nix b/pkgs/development/python-modules/wled/default.nix index 00e3c9e24412..196397ab7f1d 100644 --- a/pkgs/development/python-modules/wled/default.nix +++ b/pkgs/development/python-modules/wled/default.nix @@ -52,7 +52,7 @@ buildPythonPackage rec { yarl ]; - passthru.optional-dependencies = { + optional-dependencies = { cli = [ typer zeroconf diff --git a/pkgs/development/python-modules/wtforms/default.nix b/pkgs/development/python-modules/wtforms/default.nix index 4712aefbed07..99cd521f6c5c 100644 --- a/pkgs/development/python-modules/wtforms/default.nix +++ b/pkgs/development/python-modules/wtforms/default.nix @@ -41,13 +41,13 @@ buildPythonPackage rec { propagatedBuildInputs = [ markupsafe ]; - passthru.optional-dependencies = { + optional-dependencies = { email = [ email-validator ]; }; nativeCheckInputs = [ pytestCheckHook - ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues optional-dependencies); pythonImportsCheck = [ "wtforms" ]; diff --git a/pkgs/development/python-modules/wyoming/default.nix b/pkgs/development/python-modules/wyoming/default.nix index bc1eb85ab3ba..3c63c6a73916 100644 --- a/pkgs/development/python-modules/wyoming/default.nix +++ b/pkgs/development/python-modules/wyoming/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools ]; - passthru.optional-dependencies = { + optional-dependencies = { zeroconf = [ zeroconf ]; }; diff --git a/pkgs/development/python-modules/xsdata/default.nix b/pkgs/development/python-modules/xsdata/default.nix index 387eefcd14bf..96c32ac9349a 100644 --- a/pkgs/development/python-modules/xsdata/default.nix +++ b/pkgs/development/python-modules/xsdata/default.nix @@ -47,7 +47,7 @@ buildPythonPackage rec { dependencies = [ typing-extensions ]; - passthru.optional-dependencies = { + optional-dependencies = { cli = [ click click-default-group @@ -59,11 +59,9 @@ buildPythonPackage rec { soap = [ requests ]; }; - nativeCheckInputs = - [ pytestCheckHook ] - ++ passthru.optional-dependencies.cli - ++ passthru.optional-dependencies.lxml - ++ passthru.optional-dependencies.soap; + nativeCheckInputs = [ + pytestCheckHook + ] ++ optional-dependencies.cli ++ optional-dependencies.lxml ++ optional-dependencies.soap; disabledTestPaths = [ "tests/integration/benchmarks" ]; diff --git a/pkgs/development/python-modules/yfinance/default.nix b/pkgs/development/python-modules/yfinance/default.nix index d9c3041c038c..4fae5aaf31d2 100644 --- a/pkgs/development/python-modules/yfinance/default.nix +++ b/pkgs/development/python-modules/yfinance/default.nix @@ -52,7 +52,7 @@ buildPythonPackage rec { requests ]; - passthru.optional-dependencies = { + optional-dependencies = { nospam = [ requests-cache requests-ratelimiter diff --git a/pkgs/development/python-modules/zeep/default.nix b/pkgs/development/python-modules/zeep/default.nix index d5965d455f6e..67bee46658f6 100644 --- a/pkgs/development/python-modules/zeep/default.nix +++ b/pkgs/development/python-modules/zeep/default.nix @@ -51,7 +51,7 @@ buildPythonPackage rec { requests-toolbelt ]; - passthru.optional-dependencies = { + optional-dependencies = { async_require = [ httpx ]; xmlsec_require = [ xmlsec ]; }; @@ -68,7 +68,7 @@ buildPythonPackage rec { pytest-httpx pytestCheckHook requests-mock - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues optional-dependencies); disabledTests = [ # Failed: External connections not allowed during tests. diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 0e80af5a21ef..9ab74c0ea850 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -96,7 +96,7 @@ python3.pkgs.buildPythonApplication rec { ] ++ twisted.optional-dependencies.tls; - passthru.optional-dependencies = with python3.pkgs; { + optional-dependencies = with python3.pkgs; { postgres = if isPyPy then [ psycopg2cffi ] else [ @@ -138,7 +138,7 @@ python3.pkgs.buildPythonApplication rec { mock parameterized ]) - ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + ++ lib.flatten (lib.attrValues optional-dependencies); doCheck = !stdenv.hostPlatform.isDarwin; diff --git a/pkgs/servers/mautrix-googlechat/default.nix b/pkgs/servers/mautrix-googlechat/default.nix index 811fa2e92d9b..a352b5ab8e87 100644 --- a/pkgs/servers/mautrix-googlechat/default.nix +++ b/pkgs/servers/mautrix-googlechat/default.nix @@ -32,7 +32,7 @@ install -D mautrix_googlechat/example-config.yaml $out/$baseConfigPath ''; - passthru.optional-dependencies = with python3.pkgs; { + optional-dependencies = with python3.pkgs; { e2be = [ python-olm pycryptodome @@ -56,9 +56,9 @@ python-magic protobuf (mautrix.override { withOlm = enableE2be; }) - ] ++ lib.optionals enableE2be passthru.optional-dependencies.e2be - ++ lib.optionals enableMetrics passthru.optional-dependencies.metrics - ++ lib.optionals enableSqlite passthru.optional-dependencies.sqlite; + ] ++ lib.optionals enableE2be optional-dependencies.e2be + ++ lib.optionals enableMetrics optional-dependencies.metrics + ++ lib.optionals enableSqlite optional-dependencies.sqlite; doCheck = false; diff --git a/pkgs/tools/audio/shaq/default.nix b/pkgs/tools/audio/shaq/default.nix index f7270a73557b..d615a95219cb 100644 --- a/pkgs/tools/audio/shaq/default.nix +++ b/pkgs/tools/audio/shaq/default.nix @@ -27,7 +27,7 @@ python3.pkgs.buildPythonApplication rec { shazamio ]; - passthru.optional-dependencies = with python3.pkgs; { + optional-dependencies = with python3.pkgs; { dev = [ build shaq diff --git a/pkgs/tools/backup/borgmatic/default.nix b/pkgs/tools/backup/borgmatic/default.nix index 4aa4d649398c..8a55cef2b9d2 100644 --- a/pkgs/tools/backup/borgmatic/default.nix +++ b/pkgs/tools/backup/borgmatic/default.nix @@ -21,7 +21,7 @@ python3Packages.buildPythonApplication rec { hash = "sha256-WYs7wiwZ1TvTdeUpWv7FbREXWfdGcYRarP4FXFOfp0Y="; }; - nativeCheckInputs = with python3Packages; [ flexmock pytestCheckHook pytest-cov ] ++ passthru.optional-dependencies.apprise; + nativeCheckInputs = with python3Packages; [ flexmock pytestCheckHook pytest-cov ] ++ optional-dependencies.apprise; # - test_borgmatic_version_matches_news_version # The file NEWS not available on the pypi source, and this test is useless @@ -41,7 +41,7 @@ python3Packages.buildPythonApplication rec { setuptools ]; - passthru.optional-dependencies = { + optional-dependencies = { apprise = [ python3Packages.apprise ]; }; diff --git a/pkgs/tools/security/amoco/default.nix b/pkgs/tools/security/amoco/default.nix index d3c687bcc8ee..ff9fcc7efe63 100644 --- a/pkgs/tools/security/amoco/default.nix +++ b/pkgs/tools/security/amoco/default.nix @@ -28,7 +28,7 @@ python3.pkgs.buildPythonApplication rec { traitlets ]; - passthru.optional-dependencies = { + optional-dependencies = { app = with python3.pkgs; [ # ccrawl ipython diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b79143c50a5f..d218f7f42fdb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22599,7 +22599,7 @@ with pkgs; openstackclient = with python311Packages; toPythonApplication python-openstackclient; openstackclient-full = openstackclient.overridePythonAttrs (oldAttrs: { - dependencies = oldAttrs.dependencies ++ oldAttrs.passthru.optional-dependencies.cli-plugins; + dependencies = oldAttrs.dependencies ++ oldAttrs.optional-dependencies.cli-plugins; }); barbicanclient = with python311Packages; toPythonApplication python-barbicanclient; glanceclient = with python311Packages; toPythonApplication python-glanceclient; From fcc1b52f56595eb63bc22deb3858bad716c99d2e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" <ryantm-bot@ryantm.com> Date: Mon, 30 Sep 2024 03:55:42 +0000 Subject: [PATCH 186/300] dracula-theme: 4.0.0-unstable-2024-09-07 -> 4.0.0-unstable-2024-09-24 --- pkgs/data/themes/dracula-theme/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/themes/dracula-theme/default.nix b/pkgs/data/themes/dracula-theme/default.nix index 9fef14edb33f..29d3e6a2cda2 100644 --- a/pkgs/data/themes/dracula-theme/default.nix +++ b/pkgs/data/themes/dracula-theme/default.nix @@ -2,7 +2,7 @@ let themeName = "Dracula"; - version = "4.0.0-unstable-2024-09-07"; + version = "4.0.0-unstable-2024-09-24"; in stdenvNoCC.mkDerivation { pname = "dracula-theme"; @@ -11,8 +11,8 @@ stdenvNoCC.mkDerivation { src = fetchFromGitHub { owner = "dracula"; repo = "gtk"; - rev = "19e0dcb5d821df8948a96fef8be551f463fcf0d2"; - hash = "sha256-WfpoGEs2ki84HwE53Fh8CFiybJXZhaiP7m0sfx9Z1X4="; + rev = "f2d2ea560a83ebdef6734b70dd9683272b47894d"; + hash = "sha256-/xgvlcMC4AHITy15dVHhdTIeu1mcA6Luhdanpr1as4Q="; }; propagatedUserEnvPkgs = [ 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 187/300] 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 188/300] 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 b87c518e5c52d890fd404ba75ce66594088a680b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" <ryantm-bot@ryantm.com> Date: Mon, 30 Sep 2024 04:51:05 +0000 Subject: [PATCH 189/300] vencord: 1.10.2 -> 1.10.3 --- pkgs/by-name/ve/vencord/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ve/vencord/package.nix b/pkgs/by-name/ve/vencord/package.nix index 1f5d35a365d9..14f219d8bd0e 100644 --- a/pkgs/by-name/ve/vencord/package.nix +++ b/pkgs/by-name/ve/vencord/package.nix @@ -14,13 +14,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "vencord"; - version = "1.10.2"; + version = "1.10.3"; src = fetchFromGitHub { owner = "Vendicated"; repo = "Vencord"; rev = "v${finalAttrs.version}"; - hash = "sha256-rLdUEdAvYy8SDgKWUanZgmMnJ6Dg2dO5tTpGTwlQCrU="; + hash = "sha256-PgQz6CNr5wkycSZ/M2saS3VtUQlC2rIolnCJlVPrxo8="; }; pnpmDeps = pnpm.fetchDeps { From c48691642f42f43639642c8c6ac82beee2aef03b Mon Sep 17 00:00:00 2001 From: Vincent Laporte <Vincent.Laporte@gmail.com> Date: Tue, 24 Sep 2024 20:33:32 +0200 Subject: [PATCH 190/300] ocamlPackages.eio-ssl: init at 0.3.0 --- .../ocaml-modules/eio-ssl/default.nix | 24 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/ocaml-modules/eio-ssl/default.nix diff --git a/pkgs/development/ocaml-modules/eio-ssl/default.nix b/pkgs/development/ocaml-modules/eio-ssl/default.nix new file mode 100644 index 000000000000..087a667d4e2d --- /dev/null +++ b/pkgs/development/ocaml-modules/eio-ssl/default.nix @@ -0,0 +1,24 @@ +{ lib +, buildDunePackage +, fetchurl +, eio +, ssl +}: + +buildDunePackage rec { + pname = "eio-ssl"; + version = "0.3.0"; + + src = fetchurl { + url = "https://github.com/anmonteiro/eio-ssl/releases/download/${version}/eio-ssl-${version}.tbz"; + hash = "sha256-m4CiUQtXVSMfLthbDsAftpiOsr24I5IGiU1vv7Rz8go="; + }; + + propagatedBuildInputs = [ eio ssl ]; + + meta = { + homepage = "https://github.com/anmonteiro/eio-ssl"; + description = "OpenSSL binding to EIO"; + license = lib.licenses.lgpl21; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index f40b306ee364..61429ca4bfaf 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -444,6 +444,8 @@ let eio_main = callPackage ../development/ocaml-modules/eio/main.nix { }; eio_posix = callPackage ../development/ocaml-modules/eio/posix.nix { }; + eio-ssl = callPackage ../development/ocaml-modules/eio-ssl { }; + either = callPackage ../development/ocaml-modules/either { }; elina = callPackage ../development/ocaml-modules/elina { }; From 7e69dfd3c0c4ce81613a6a3b28f31ac03b31a464 Mon Sep 17 00:00:00 2001 From: Vincent Laporte <Vincent.Laporte@gmail.com> Date: Tue, 24 Sep 2024 20:33:39 +0200 Subject: [PATCH 191/300] ocamlPackages.httpun: init at 0.2.0 --- .../ocaml-modules/httpun/default.nix | 22 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/development/ocaml-modules/httpun/default.nix diff --git a/pkgs/development/ocaml-modules/httpun/default.nix b/pkgs/development/ocaml-modules/httpun/default.nix new file mode 100644 index 000000000000..f45ffe5eca2e --- /dev/null +++ b/pkgs/development/ocaml-modules/httpun/default.nix @@ -0,0 +1,22 @@ +{ buildDunePackage +, httpun-types +, angstrom +, bigstringaf +, faraday +, alcotest +}: + +buildDunePackage { + pname = "httpun"; + + inherit (httpun-types) src version; + + propagatedBuildInputs = [ angstrom bigstringaf faraday httpun-types ]; + + doCheck = true; + checkInputs = [ alcotest ]; + + meta = httpun-types.meta // { + description = "A high-performance, memory-efficient, and scalable HTTP library for OCaml"; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 61429ca4bfaf..c3c71efa41e0 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -691,6 +691,8 @@ let httpaf-lwt-unix = callPackage ../development/ocaml-modules/httpaf/lwt-unix.nix { }; + httpun = callPackage ../development/ocaml-modules/httpun { }; + httpun-types = callPackage ../development/ocaml-modules/httpun/types.nix { }; hxd = callPackage ../development/ocaml-modules/hxd { }; From e2be410cefbe56df3199b4632da37999e415f384 Mon Sep 17 00:00:00 2001 From: Vincent Laporte <Vincent.Laporte@gmail.com> Date: Tue, 24 Sep 2024 20:33:44 +0200 Subject: [PATCH 192/300] ocamlPackages.httpun-eio: init at 0.2.0 --- pkgs/development/ocaml-modules/httpun/eio.nix | 16 ++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/development/ocaml-modules/httpun/eio.nix diff --git a/pkgs/development/ocaml-modules/httpun/eio.nix b/pkgs/development/ocaml-modules/httpun/eio.nix new file mode 100644 index 000000000000..1b3160d699f1 --- /dev/null +++ b/pkgs/development/ocaml-modules/httpun/eio.nix @@ -0,0 +1,16 @@ +{ buildDunePackage +, httpun +, gluten-eio +}: + +buildDunePackage { + pname = "httpun-eio"; + + inherit (httpun) src version; + + propagatedBuildInputs = [ gluten-eio httpun ]; + + meta = httpun.meta // { + description = "EIO support for httpun"; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index c3c71efa41e0..4f98f1ff6963 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -693,6 +693,8 @@ let httpun = callPackage ../development/ocaml-modules/httpun { }; + httpun-eio = callPackage ../development/ocaml-modules/httpun/eio.nix { }; + httpun-types = callPackage ../development/ocaml-modules/httpun/types.nix { }; hxd = callPackage ../development/ocaml-modules/hxd { }; From 75a60571b46a58093203ccf830186df71ded6ad6 Mon Sep 17 00:00:00 2001 From: Vincent Laporte <Vincent.Laporte@gmail.com> Date: Tue, 24 Sep 2024 20:33:48 +0200 Subject: [PATCH 193/300] ocamlPackages.httpun-ws: init at 0.2.0 --- .../ocaml-modules/httpun-ws/default.nix | 40 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 + 2 files changed, 42 insertions(+) create mode 100644 pkgs/development/ocaml-modules/httpun-ws/default.nix diff --git a/pkgs/development/ocaml-modules/httpun-ws/default.nix b/pkgs/development/ocaml-modules/httpun-ws/default.nix new file mode 100644 index 000000000000..89ac696301b3 --- /dev/null +++ b/pkgs/development/ocaml-modules/httpun-ws/default.nix @@ -0,0 +1,40 @@ +{ lib +, fetchurl +, buildDunePackage +, angstrom +, base64 +, bigstringaf +, faraday +, gluten +, httpun +, alcotest +}: + +buildDunePackage rec { + pname = "httpun-ws"; + version = "0.2.0"; + + src = fetchurl { + url = "https://github.com/anmonteiro/httpun-ws/releases/download/${version}/httpun-ws-${version}.tbz"; + hash = "sha256-6uDNLg61tPyctthitxFqbw/IUDsuQ5BGvw5vTLLCl/0="; + }; + + propagatedBuildInputs = [ + angstrom + base64 + bigstringaf + faraday + gluten + httpun + ]; + + doCheck = true; + checkInputs = [ alcotest ]; + + meta = { + description = "Websocket implementation for httpun"; + license = lib.licenses.bsd3; + homepage = "https://github.com/anmonteiro/httpun-ws"; + maintainers = [ lib.maintainers.vbgl ]; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 4f98f1ff6963..152270cf5fab 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -697,6 +697,8 @@ let httpun-types = callPackage ../development/ocaml-modules/httpun/types.nix { }; + httpun-ws = callPackage ../development/ocaml-modules/httpun-ws { }; + hxd = callPackage ../development/ocaml-modules/hxd { }; ### I ### From 57617c48efde1cc0039fddea206f3eedb0e10ea3 Mon Sep 17 00:00:00 2001 From: Vincent Laporte <Vincent.Laporte@gmail.com> Date: Tue, 24 Sep 2024 20:33:52 +0200 Subject: [PATCH 194/300] ocamlPackages.h2-eio: init at 0.13.0 --- pkgs/development/ocaml-modules/h2/eio.nix | 18 ++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 20 insertions(+) create mode 100644 pkgs/development/ocaml-modules/h2/eio.nix diff --git a/pkgs/development/ocaml-modules/h2/eio.nix b/pkgs/development/ocaml-modules/h2/eio.nix new file mode 100644 index 000000000000..0beb6f3e086e --- /dev/null +++ b/pkgs/development/ocaml-modules/h2/eio.nix @@ -0,0 +1,18 @@ +{ buildDunePackage +, h2 +, eio +, gluten-eio +}: + +buildDunePackage { + pname = "h2-eio"; + + inherit (h2) src version; + + propagatedBuildInputs = [ eio gluten-eio h2 ]; + + meta = h2.meta // { + description = "EIO support for h2"; + }; +} + diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 152270cf5fab..3cbb1dc8a4bc 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -660,6 +660,8 @@ let h2 = callPackage ../development/ocaml-modules/h2 { }; + h2-eio = callPackage ../development/ocaml-modules/h2/eio.nix { }; + hack_parallel = callPackage ../development/ocaml-modules/hack_parallel { }; hacl-star = callPackage ../development/ocaml-modules/hacl-star { }; From d31bb1e0761e9fd7215558eff3ed2e5db55306df Mon Sep 17 00:00:00 2001 From: Vincent Laporte <Vincent.Laporte@gmail.com> Date: Tue, 24 Sep 2024 20:33:56 +0200 Subject: [PATCH 195/300] =?UTF-8?q?piaf:=200.1.0=20=E2=86=92=200.2.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ocaml-modules/piaf/default.nix | 59 ++++++++++--------- 1 file changed, 32 insertions(+), 27 deletions(-) diff --git a/pkgs/development/ocaml-modules/piaf/default.nix b/pkgs/development/ocaml-modules/piaf/default.nix index 991764336657..9c2e481b76e4 100644 --- a/pkgs/development/ocaml-modules/piaf/default.nix +++ b/pkgs/development/ocaml-modules/piaf/default.nix @@ -1,52 +1,57 @@ -{ alcotest-lwt +{ alcotest , buildDunePackage -, ocaml -, bigarray-compat -, dune-site , fetchurl -, gluten-lwt-unix +, eio-ssl +, faraday +, h2-eio +, httpun-eio +, httpun-ws +, ipaddr +, ke , lib , logs , magic-mime -, mrmime -, psq -, rresult +, pecu +, prettym +, unstrctrd , uri +, uutf +, dune-site +, eio_main }: -lib.throwIf (lib.versionAtLeast ocaml.version "5.0") - "piaf is not available for OCaml ${ocaml.version}" - buildDunePackage rec { pname = "piaf"; - version = "0.1.0"; + version = "0.2.0"; src = fetchurl { url = "https://github.com/anmonteiro/piaf/releases/download/${version}/piaf-${version}.tbz"; - hash = "sha256-AMO+ptGox33Bi7u/H0SaeCU88XORrRU3UbLof3EwcmU="; + hash = "sha256-B/qQCaUvrqrm2GEW51AH9SebGFx7x8laq5RV8hBzcPs="; }; - postPatch = '' - substituteInPlace ./vendor/dune --replace "mrmime.prettym" "prettym" - ''; - propagatedBuildInputs = [ - bigarray-compat + eio-ssl + faraday + h2-eio + httpun-eio + httpun-ws + ipaddr logs magic-mime - mrmime - psq - rresult + pecu + prettym + unstrctrd uri - gluten-lwt-unix + uutf ]; - nativeCheckInputs = [ - alcotest-lwt - dune-site - ]; - # Check fails with OpenSSL 3 + # Some test cases fail doCheck = false; + checkInputs = [ + alcotest + dune-site + eio_main + ]; meta = { description = "HTTP library with HTTP/2 support written entirely in OCaml"; From 4915d1cb8aa1107e4a42de9f2905c6951511fbac Mon Sep 17 00:00:00 2001 From: Gaetan Lepage <gaetan@glepage.com> Date: Wed, 10 Jul 2024 12:05:41 +0200 Subject: [PATCH 196/300] python312Packages.lineax: init at 0.0.6 --- .../python-modules/lineax/default.nix | 66 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 68 insertions(+) create mode 100644 pkgs/development/python-modules/lineax/default.nix diff --git a/pkgs/development/python-modules/lineax/default.nix b/pkgs/development/python-modules/lineax/default.nix new file mode 100644 index 000000000000..8f547bc1d9d7 --- /dev/null +++ b/pkgs/development/python-modules/lineax/default.nix @@ -0,0 +1,66 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + hatchling, + + # dependencies + equinox, + jax, + jaxtyping, + typing-extensions, + + # tests + beartype, + pytest, + python, +}: + +buildPythonPackage rec { + pname = "lineax"; + version = "0.0.6"; + pyproject = true; + + src = fetchFromGitHub { + owner = "patrick-kidger"; + repo = "lineax"; + rev = "refs/tags/v${version}"; + hash = "sha256-rM3H+q75F98eEIJkEszWgxD5C5vGK5RlYtVv8GD/VC0="; + }; + + build-system = [ hatchling ]; + + dependencies = [ + equinox + jax + jaxtyping + typing-extensions + ]; + + pythonImportsCheck = [ "lineax" ]; + + nativeCheckInputs = [ + beartype + pytest + ]; + + # Intentionaly not using pytest directly as it leads to JAX out-of-memory'ing + # https://github.com/patrick-kidger/lineax/blob/1909d190c1963d5f2d991508c1b2714f2266048b/tests/README.md + checkPhase = '' + runHook preCheck + + ${python.interpreter} -m tests + + runHook postCheck + ''; + + meta = { + description = "Linear solvers in JAX and Equinox"; + homepage = "https://github.com/patrick-kidger/lineax"; + changelog = "https://github.com/patrick-kidger/lineax/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 0938e8a34301..7168fe5f4d0a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7226,6 +7226,8 @@ self: super: with self; { linear-operator = callPackage ../development/python-modules/linear-operator { }; + lineax = callPackage ../development/python-modules/lineax { }; + linecache2 = callPackage ../development/python-modules/linecache2 { }; lineedit = callPackage ../development/python-modules/lineedit { }; From 06e05929e99ff0101a217bca05c426582b72bcaf Mon Sep 17 00:00:00 2001 From: Gaetan Lepage <gaetan@glepage.com> Date: Wed, 10 Jul 2024 15:49:26 +0200 Subject: [PATCH 197/300] python312Packages.optimistix: init at 0.0.8 --- .../python-modules/optimistix/default.nix | 63 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 65 insertions(+) create mode 100644 pkgs/development/python-modules/optimistix/default.nix diff --git a/pkgs/development/python-modules/optimistix/default.nix b/pkgs/development/python-modules/optimistix/default.nix new file mode 100644 index 000000000000..a7cb8b7c5e7e --- /dev/null +++ b/pkgs/development/python-modules/optimistix/default.nix @@ -0,0 +1,63 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + hatchling, + + # dependencies + equinox, + jax, + jaxtyping, + lineax, + typing-extensions, + + # checks + beartype, + jaxlib, + optax, + pytestCheckHook, + pytest-xdist, +}: + +buildPythonPackage rec { + pname = "optimistix"; + version = "0.0.8"; + pyproject = true; + + src = fetchFromGitHub { + owner = "patrick-kidger"; + repo = "optimistix"; + rev = "refs/tags/v${version}"; + hash = "sha256-0ehNApiBoiAb8LFBW81ZCRPsjTVQG8zRTVSAp7oHF8w="; + }; + + build-system = [ hatchling ]; + + dependencies = [ + equinox + jax + jaxtyping + lineax + typing-extensions + ]; + + pythonImportsCheck = [ "optimistix" ]; + + nativeCheckInputs = [ + beartype + jaxlib + optax + pytestCheckHook + pytest-xdist + ]; + + meta = { + description = "Nonlinear optimisation (root-finding, least squares, ...) in JAX+Equinox"; + homepage = "https://github.com/patrick-kidger/optimistix"; + changelog = "https://github.com/patrick-kidger/optimistix/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 7168fe5f4d0a..6a2dbc777c08 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9410,6 +9410,8 @@ self: super: with self; { optax = callPackage ../development/python-modules/optax { }; + optimistix = callPackage ../development/python-modules/optimistix { }; + optimum = callPackage ../development/python-modules/optimum { }; optree = callPackage ../development/python-modules/optree { }; From 5f2d2636703aa1e0a51e837c89328e7afff176c8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter <mail@fabian-affolter.ch> Date: Mon, 30 Sep 2024 08:01:18 +0200 Subject: [PATCH 198/300] python312Packages.asteval: 1.0.4 -> 1.0.5 Diff: https://github.com/lmfit/asteval/compare/refs/tags/1.0.4...1.0.5 Changelog: https://github.com/lmfit/asteval/releases/tag/1.0.5 --- pkgs/development/python-modules/asteval/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/asteval/default.nix b/pkgs/development/python-modules/asteval/default.nix index 43872ff90ed3..5ec7d2b59b64 100644 --- a/pkgs/development/python-modules/asteval/default.nix +++ b/pkgs/development/python-modules/asteval/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "asteval"; - version = "1.0.4"; + version = "1.0.5"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "lmfit"; repo = "asteval"; rev = "refs/tags/${version}"; - hash = "sha256-rq8qZqTtnKyVclX5R+yRouLz1FySRgc7DMN9W9UBkyI="; + hash = "sha256-PRmTbP3zRnkCxdeb45LBz5m/Ymoi4lq2poKuG9Esg9g="; }; postPatch = '' From 83067a57fb90e6bc9f645dddecc40330663578c3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter <mail@fabian-affolter.ch> Date: Mon, 30 Sep 2024 08:06:08 +0200 Subject: [PATCH 199/300] python312Packages.meshtastic: 2.5.0 -> 2.5.1 Diff: https://github.com/meshtastic/Meshtastic-python/compare/refs/tags/2.5.0...2.5.1 Changelog: https://github.com/meshtastic/python/releases/tag/2.5.1 --- pkgs/development/python-modules/meshtastic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/meshtastic/default.nix b/pkgs/development/python-modules/meshtastic/default.nix index eb83f1c17165..6f8b5d293e98 100644 --- a/pkgs/development/python-modules/meshtastic/default.nix +++ b/pkgs/development/python-modules/meshtastic/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { pname = "meshtastic"; - version = "2.5.0"; + version = "2.5.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -42,7 +42,7 @@ buildPythonPackage rec { owner = "meshtastic"; repo = "Meshtastic-python"; rev = "refs/tags/${version}"; - hash = "sha256-f2nMbX2qCOwI5N6VunVSFncrEVpYMpc5o7hEZ0sg7rU="; + hash = "sha256-LyWb7BWwRi0Q/dOZkFu/FwOBIqR2mPr3c8/mpsqw/ec="; }; pythonRelaxDeps = [ From a90fbaa21cc51204bde4c993e34bfe1f9de2478c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" <ryantm-bot@ryantm.com> Date: Mon, 30 Sep 2024 06:07:27 +0000 Subject: [PATCH 200/300] ghauri: 1.3.7 -> 1.3.8 --- pkgs/tools/security/ghauri/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/ghauri/default.nix b/pkgs/tools/security/ghauri/default.nix index 9021b4102966..4141690085e7 100644 --- a/pkgs/tools/security/ghauri/default.nix +++ b/pkgs/tools/security/ghauri/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "ghauri"; - version = "1.3.7"; + version = "1.3.8"; pyproject = true; src = fetchFromGitHub { owner = "r0oth3x49"; repo = "ghauri"; rev = "refs/tags/${version}"; - hash = "sha256-uGRhp77HmLmWMJFyhJoEjwdIR84Wcwv554g9Hi6yW4c="; + hash = "sha256-GEUuQMtp8XO32uOIILWiMfngPXx/3vCKk+YbA0E13rg="; }; build-system = with python3.pkgs; [ From 794bec4609bf82743ad30b8b848dd15b28e2b2a1 Mon Sep 17 00:00:00 2001 From: Doron Behar <doron.behar@gmail.com> Date: Tue, 17 Sep 2024 15:47:35 +0300 Subject: [PATCH 201/300] python312Packages.lammps: disable tests if GPU package is enabled --- pkgs/development/python-modules/lammps/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/lammps/default.nix b/pkgs/development/python-modules/lammps/default.nix index b9e0f45402d0..1267792855b0 100644 --- a/pkgs/development/python-modules/lammps/default.nix +++ b/pkgs/development/python-modules/lammps/default.nix @@ -12,8 +12,11 @@ buildPythonPackage { inherit (lammps) pname version src; env = { + # Needed for tests inherit LAMMPS_SHARED_LIB; }; + # Don't perform checks if GPU is enabled - because libcuda.so cannot be opened in the sandbox + doCheck = if lammps.passthru.packages ? GPU then !lammps.passthru.packages.GPU else true; preConfigure = '' cd python # Upstream assumes that the shared library is located in the same directory From b9d665c1fcdff407ee5ae59b4de8c9dda89ec50b Mon Sep 17 00:00:00 2001 From: Doron Behar <doron.behar@gmail.com> Date: Tue, 17 Sep 2024 16:08:11 +0300 Subject: [PATCH 202/300] lammps: use PYTHON package by default Makes this warning by PyLammps go away: > WARNING: run thermo data not captured since PYTHON LAMMPS package is not enabled --- .../science/molecular-dynamics/lammps/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/science/molecular-dynamics/lammps/default.nix b/pkgs/applications/science/molecular-dynamics/lammps/default.nix index 40529487b655..bd88387a1ce8 100644 --- a/pkgs/applications/science/molecular-dynamics/lammps/default.nix +++ b/pkgs/applications/science/molecular-dynamics/lammps/default.nix @@ -6,6 +6,7 @@ , fftw , blas , lapack +, python3 , cmake , autoAddDriverRunpath , pkg-config @@ -36,6 +37,7 @@ ML-SNAP = true; SRD = true; REAXFF = true; + PYTHON = true; } # Extra cmakeFlags to add as "-D${attr}=${value}" , extraCmakeFlags ? {} @@ -87,7 +89,7 @@ stdenv.mkDerivation (finalAttrs: { blas lapack gzip - ] ++ extraBuildInputs + ] ++ lib.optionals packages.PYTHON [ python3 ] ++ extraBuildInputs ; postInstall = '' From 6ccf3b79a39a4f6fca8cd4a2de8d1fa7915c2aea Mon Sep 17 00:00:00 2001 From: Doron Behar <doron.behar@gmail.com> Date: Tue, 17 Sep 2024 16:18:13 +0300 Subject: [PATCH 203/300] lammps: nixfmt-rfc-style --- .../molecular-dynamics/lammps/default.nix | 108 +++++++++--------- 1 file changed, 54 insertions(+), 54 deletions(-) diff --git a/pkgs/applications/science/molecular-dynamics/lammps/default.nix b/pkgs/applications/science/molecular-dynamics/lammps/default.nix index bd88387a1ce8..2a511cc75949 100644 --- a/pkgs/applications/science/molecular-dynamics/lammps/default.nix +++ b/pkgs/applications/science/molecular-dynamics/lammps/default.nix @@ -1,48 +1,49 @@ -{ lib -, stdenv -, fetchFromGitHub -, libpng -, gzip -, fftw -, blas -, lapack -, python3 -, cmake -, autoAddDriverRunpath -, pkg-config -# Available list of packages can be found near here: -# -# - https://github.com/lammps/lammps/blob/develop/cmake/CMakeLists.txt#L222 -# - https://docs.lammps.org/Build_extras.html -, packages ? { - ASPHERE = true; - BODY = true; - CLASS2 = true; - COLLOID = true; - COMPRESS = true; - CORESHELL = true; - DIPOLE = true; - GRANULAR = true; - KSPACE = true; - MANYBODY = true; - MC = true; - MISC = true; - MOLECULE = true; - OPT = true; - PERI = true; - QEQ = true; - REPLICA = true; - RIGID = true; - SHOCK = true; - ML-SNAP = true; - SRD = true; - REAXFF = true; - PYTHON = true; -} -# Extra cmakeFlags to add as "-D${attr}=${value}" -, extraCmakeFlags ? {} -# Extra `buildInputs` - meant for packages that require more inputs -, extraBuildInputs ? [] +{ + lib, + stdenv, + fetchFromGitHub, + libpng, + gzip, + fftw, + blas, + lapack, + python3, + cmake, + autoAddDriverRunpath, + pkg-config, + # Available list of packages can be found near here: + # + # - https://github.com/lammps/lammps/blob/develop/cmake/CMakeLists.txt#L222 + # - https://docs.lammps.org/Build_extras.html + packages ? { + ASPHERE = true; + BODY = true; + CLASS2 = true; + COLLOID = true; + COMPRESS = true; + CORESHELL = true; + DIPOLE = true; + GRANULAR = true; + KSPACE = true; + MANYBODY = true; + MC = true; + MISC = true; + MOLECULE = true; + OPT = true; + PERI = true; + QEQ = true; + REPLICA = true; + RIGID = true; + SHOCK = true; + ML-SNAP = true; + SRD = true; + REAXFF = true; + PYTHON = true; + }, + # Extra cmakeFlags to add as "-D${attr}=${value}" + extraCmakeFlags ? { }, + # Extra `buildInputs` - meant for packages that require more inputs + extraBuildInputs ? [ ], }: stdenv.mkDerivation (finalAttrs: { @@ -76,12 +77,12 @@ stdenv.mkDerivation (finalAttrs: { inherit extraCmakeFlags; inherit extraBuildInputs; }; - cmakeFlags = [ - (lib.cmakeBool "BUILD_SHARED_LIBS" true) - ] - ++ (lib.mapAttrsToList (n: v: lib.cmakeBool "PKG_${n}" v) packages) - ++ (lib.mapAttrsToList (n: v: "-D${n}=${v}") extraCmakeFlags) - ; + cmakeFlags = + [ + (lib.cmakeBool "BUILD_SHARED_LIBS" true) + ] + ++ (lib.mapAttrsToList (n: v: lib.cmakeBool "PKG_${n}" v) packages) + ++ (lib.mapAttrsToList (n: v: "-D${n}=${v}") extraCmakeFlags); buildInputs = [ fftw @@ -89,8 +90,7 @@ stdenv.mkDerivation (finalAttrs: { blas lapack gzip - ] ++ lib.optionals packages.PYTHON [ python3 ] ++ extraBuildInputs - ; + ] ++ lib.optionals packages.PYTHON [ python3 ] ++ extraBuildInputs; postInstall = '' # For backwards compatibility @@ -110,7 +110,7 @@ stdenv.mkDerivation (finalAttrs: { National Laboratories, a US Department of Energy facility, with funding from the DOE. It is an open-source code, distributed freely under the terms of the GNU Public License (GPL). - ''; + ''; homepage = "https://www.lammps.org"; license = lib.licenses.gpl2Only; platforms = lib.platforms.linux; From 4c7de259dc93d5453e37886293197775c1753402 Mon Sep 17 00:00:00 2001 From: Doron Behar <doron.behar@gmail.com> Date: Tue, 17 Sep 2024 16:20:09 +0300 Subject: [PATCH 204/300] lammps: move to pkgs/by-name --- .../lammps/default.nix => by-name/la/lammps/package.nix} | 0 pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 4 deletions(-) rename pkgs/{applications/science/molecular-dynamics/lammps/default.nix => by-name/la/lammps/package.nix} (100%) diff --git a/pkgs/applications/science/molecular-dynamics/lammps/default.nix b/pkgs/by-name/la/lammps/package.nix similarity index 100% rename from pkgs/applications/science/molecular-dynamics/lammps/default.nix rename to pkgs/by-name/la/lammps/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3cba16c1aa9f..ea232b362614 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -36556,10 +36556,6 @@ with pkgs; dl-poly-classic-mpi = callPackage ../applications/science/molecular-dynamics/dl-poly-classic { }; - lammps = callPackage ../applications/science/molecular-dynamics/lammps { - fftw = fftw; - }; - lammps-mpi = lowPrio (lammps.override { extraBuildInputs = [ mpi From 16e30024a017195d12209fa24d95c5caea687820 Mon Sep 17 00:00:00 2001 From: Fabian Affolter <mail@fabian-affolter.ch> Date: Mon, 30 Sep 2024 08:10:37 +0200 Subject: [PATCH 205/300] python312Packages.oracledb: 2.3.0 -> 2.4.1 Changelog: https://github.com/oracle/python-oracledb/blob/v2.4.1/doc/src/release_notes.rst --- pkgs/development/python-modules/oracledb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/oracledb/default.nix b/pkgs/development/python-modules/oracledb/default.nix index cac6da956644..65006e4753fe 100644 --- a/pkgs/development/python-modules/oracledb/default.nix +++ b/pkgs/development/python-modules/oracledb/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "oracledb"; - version = "2.3.0"; + version = "2.4.1"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ubDE7CgLEAY+Z4m+0j3cJDWumFaevmTguaJweAuRA9U="; + hash = "sha256-vVl2vvDkZuD50bn2Ux+1uBcdyFNHF8ywSybmgLbHVx0="; }; build-system = [ From df01f30848311809e7b46fa6e530713bbe7d1651 Mon Sep 17 00:00:00 2001 From: Fabian Affolter <mail@fabian-affolter.ch> Date: Mon, 30 Sep 2024 08:12:10 +0200 Subject: [PATCH 206/300] python312Packages.tencentcloud-sdk-python: 3.0.1242 -> 3.0.1243 Diff: https://github.com/TencentCloud/tencentcloud-sdk-python/compare/refs/tags/3.0.1242...3.0.1243 Changelog: https://github.com/TencentCloud/tencentcloud-sdk-python/blob/3.0.1243/CHANGELOG.md --- .../python-modules/tencentcloud-sdk-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index 9c459e9f9e3e..7f6e3baf786f 100644 --- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix +++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tencentcloud-sdk-python"; - version = "3.0.1242"; + version = "3.0.1243"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; rev = "refs/tags/${version}"; - hash = "sha256-fKwT8QmBBZMk+I2D/4Bgbg2EY2Fco1UrypibY025/VU="; + hash = "sha256-Lsd+edE6Oqi+implGkNlzmIDW1TseN0/zsba1gFuAjU="; }; build-system = [ setuptools ]; From 6d8d0380edf70db9616d1f9297e7129e9b53772b Mon Sep 17 00:00:00 2001 From: Vincent Laporte <Vincent.Laporte@gmail.com> Date: Mon, 30 Sep 2024 08:00:18 +0200 Subject: [PATCH 207/300] =?UTF-8?q?vscode-extensions.chenglou92.rescript-v?= =?UTF-8?q?scode:=201.54.0=20=E2=86=92=201.58.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../chenglou92.rescript-vscode/default.nix | 4 ++-- .../rescript-editor-analysis.nix | 12 ++++-------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/default.nix b/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/default.nix index 686ff8652a45..508d2ce2c5a4 100644 --- a/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/default.nix +++ b/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/default.nix @@ -5,7 +5,7 @@ callPackage, }: let - version = "1.54.0"; + version = "1.58.0"; rescript-editor-analysis = callPackage ./rescript-editor-analysis.nix { inherit version; }; arch = if stdenv.hostPlatform.isLinux then @@ -21,7 +21,7 @@ vscode-utils.buildVscodeMarketplaceExtension rec { name = "rescript-vscode"; publisher = "chenglou92"; inherit version; - hash = "sha256-c7TJED5YpHRwn7Ooq8sG+N99b7tH6TOgeC9TTYdb4JA="; + hash = "sha256-EuEBbtdCaS4l8ykkxyLLMjEnUMs0IsXoc994a8Pw1Ws="; }; postPatch = '' rm -r ${analysisDir} diff --git a/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/rescript-editor-analysis.nix b/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/rescript-editor-analysis.nix index 7b2452a814bf..b4763dc417a1 100644 --- a/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/rescript-editor-analysis.nix +++ b/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/rescript-editor-analysis.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { owner = "rescript-lang"; repo = "rescript-vscode"; rev = version; - hash = "sha256-+Ht8qWwxtFWHFMiV/aoZIs2S3SxkOWgdwSKN+akp/LU="; + hash = "sha256-v+qCVge57wvA97mtzbxAX9Fvi7ruo6ZyIC14O8uWl9Y="; }; nativeBuildInputs = [ @@ -25,16 +25,12 @@ stdenv.mkDerivation { ocamlPackages.cppo ]; - # Skip testing phases because they need to download and install node modules - postPatch = '' - cd analysis - substituteInPlace Makefile \ - --replace "build: build-analysis-binary build-reanalyze build-tests" "build: build-analysis-binary" \ - --replace "test: test-analysis-binary test-reanalyze" "test: test-analysis-binary" + buildPhase = '' + dune build -p analysis ''; installPhase = '' - install -D -m0555 rescript-editor-analysis.exe $out/bin/rescript-editor-analysis.exe + install -D -m0555 _build/default/analysis/bin/main.exe $out/bin/rescript-editor-analysis.exe ''; meta = { From 3b209662e091278f03a9b93081a94dc42beedd26 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage <gaetan@glepage.com> Date: Mon, 30 Sep 2024 08:30:12 +0200 Subject: [PATCH 208/300] tinymist: 0.11.20 -> 0.11.22 Diff: https://github.com/Myriad-Dreamin/tinymist/compare/refs/tags/v0.11.20...0.11.22 Changelog: https://github.com/Myriad-Dreamin/tinymist/blob/refs/tags/v0.11.22/CHANGELOG.md --- .../myriad-dreamin.tinymist/default.nix | 2 +- pkgs/by-name/ti/tinymist/Cargo.lock | 861 +++++++++++------- pkgs/by-name/ti/tinymist/package.nix | 10 +- 3 files changed, 532 insertions(+), 341 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix b/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix index fc359311b4fe..17cd91ea752e 100644 --- a/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix +++ b/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix @@ -11,7 +11,7 @@ vscode-utils.buildVscodeMarketplaceExtension { name = "tinymist"; publisher = "myriad-dreamin"; inherit (tinymist) version; - hash = "sha256-m5wq1F2sjiBacdyTFtLoqrJ/B6nwoaUjiNbc+zfpJoU="; + hash = "sha256-XkpoSf2UO3OoEMMpXBMkY1peQPR/4QoQ4LrY81IsHT0="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ti/tinymist/Cargo.lock b/pkgs/by-name/ti/tinymist/Cargo.lock index 36656d2cf59d..48f3ee316831 100644 --- a/pkgs/by-name/ti/tinymist/Cargo.lock +++ b/pkgs/by-name/ti/tinymist/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "addr2line" -version = "0.22.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" +checksum = "f5fb1d8e4442bd405fdfd1dacb42792696b0cf9cb15882e5d097b742a676d375" dependencies = [ "gimli", ] @@ -17,6 +17,12 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +[[package]] +name = "adler2" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" + [[package]] name = "ahash" version = "0.7.8" @@ -81,9 +87,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.14" +version = "0.6.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b" +checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526" dependencies = [ "anstyle", "anstyle-parse", @@ -96,33 +102,33 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.7" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b" +checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" [[package]] name = "anstyle-parse" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4" +checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad186efb764318d35165f1758e7dcef3b10628e26d41a44bc5550652e6804391" +checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a" dependencies = [ "windows-sys 0.52.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.3" +version = "3.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19" +checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8" dependencies = [ "anstyle", "windows-sys 0.52.0", @@ -130,9 +136,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.86" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" +checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" [[package]] name = "approx" @@ -145,11 +151,10 @@ dependencies = [ [[package]] name = "archery" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8967cd1cc9e9e1954f644e14fbd6042fe9a37da96c52a67e44a2ac18261f8561" +checksum = "eae2ed21cd55021f05707a807a5fc85695dafb98832921f6cfa06db67ca5b869" dependencies = [ - "static_assertions", "triomphe", ] @@ -161,9 +166,9 @@ checksum = "7d902e3d592a523def97af8f317b08ce16b7ab854c1985a0c671e6f15cebc236" [[package]] name = "arrayref" -version = "0.3.7" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" +checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb" [[package]] name = "arrayvec" @@ -173,21 +178,27 @@ checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" [[package]] name = "arrayvec" -version = "0.7.4" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" +checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" [[package]] name = "async-trait" -version = "0.1.81" +version = "0.1.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" +checksum = "a27b8a3a6e1a44fa4c8baf1f653e4172e81486d4941f2237e20dc2d0cf4ddff1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.77", ] +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + [[package]] name = "autocfg" version = "1.3.0" @@ -202,17 +213,17 @@ checksum = "7b7e4c2464d97fe331d41de9d5db0def0a96f4d823b8b32a2efd503578988973" [[package]] name = "backtrace" -version = "0.3.73" +version = "0.3.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" +checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a" dependencies = [ "addr2line", - "cc", "cfg-if", "libc", - "miniz_oxide", + "miniz_oxide 0.8.0", "object", "rustc-demangle", + "windows-targets 0.52.6", ] [[package]] @@ -302,9 +313,9 @@ dependencies = [ [[package]] name = "bstr" -version = "1.9.1" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706" +checksum = "40723b8fb387abc38f4f4a37c09073622e41dd12327033091ef8950659e6dc0c" dependencies = [ "memchr", "serde", @@ -346,9 +357,9 @@ dependencies = [ [[package]] name = "bytemuck" -version = "1.16.1" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b236fc92302c97ed75b38da1f4917b5cdda4984745740f153a5d3059e48d725e" +checksum = "94bbb0ad554ad961ddc5da507a12a29b14e4ae5bda06b19f575a3e6079d2e2ae" [[package]] name = "byteorder" @@ -358,15 +369,15 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.6.0" +version = "1.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" +checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3" [[package]] name = "camino" -version = "1.1.7" +version = "1.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0ec6b951b160caa93cc0c7b209e5a3bff7aae9062213451ac99493cd844c239" +checksum = "8b96ec4966b5813e2c0507c1f86115c8c5abaadc3980879c3424042a02fd1ad3" dependencies = [ "serde", ] @@ -396,9 +407,12 @@ dependencies = [ [[package]] name = "cc" -version = "1.1.0" +version = "1.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaff6f8ce506b9773fa786672d63fc7a191ffea1be33f72bbd4aeacefca9ffc8" +checksum = "07b1695e2c7e8fc85310cde85aeaab7e3097f593c91d209d3f9df76c928100f0" +dependencies = [ + "shlex", +] [[package]] name = "cfg-if" @@ -478,9 +492,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.9" +version = "4.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64acc1846d54c1fe936a78dc189c34e28d3f5afc348403f28ecf53660b9b8462" +checksum = "b0956a43b323ac1afaffc053ed5c4b7c1f1800bacd1683c353aabbb752515dd3" dependencies = [ "clap_builder", "clap_derive", @@ -488,9 +502,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.9" +version = "4.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fb8393d67ba2e7bfaf28a23458e4e2b543cc73a99595511eb207fdb8aede942" +checksum = "4d72166dd41634086d5803a47eb71ae740e61d84709c36f3c34110173db3961b" dependencies = [ "anstream", "anstyle", @@ -503,18 +517,28 @@ dependencies = [ [[package]] name = "clap_complete" -version = "4.5.8" +version = "4.5.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b4be9c4c4b1f30b78d8a750e0822b6a6102d97e62061c583a6c1dea2dfb33ae" +checksum = "8937760c3f4c60871870b8c3ee5f9b30771f792a7045c48bcbba999d7d6b3b8e" dependencies = [ "clap", ] [[package]] name = "clap_complete_fig" -version = "4.5.1" +version = "4.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb4bc503cddc1cd320736fb555d6598309ad07c2ddeaa23891a10ffb759ee612" +checksum = "d494102c8ff3951810c72baf96910b980fb065ca5d3101243e6a8dc19747c86b" +dependencies = [ + "clap", + "clap_complete", +] + +[[package]] +name = "clap_complete_nushell" +version = "4.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fe32110e006bccf720f8c9af3fee1ba7db290c724eab61544e1d3295be3a40e" dependencies = [ "clap", "clap_complete", @@ -522,27 +546,27 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.8" +version = "4.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bac35c6dafb060fd4d275d9a4ffae97917c13a6327903a8be2153cd964f7085" +checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab" dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.77", ] [[package]] name = "clap_lex" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b82cf0babdbd58558212896d1a4272303a57bdb245c2bf1147185fb45640e70" +checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97" [[package]] name = "clap_mangen" -version = "0.2.22" +version = "0.2.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f50dde5bc0c853d6248de457e5eb6e5a674a54b93810a34ded88d882ca1fe2de" +checksum = "f17415fd4dfbea46e3274fcd8d368284519b358654772afb700dc2e8d2b24eeb" dependencies = [ "clap", "roff", @@ -572,9 +596,9 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" [[package]] name = "colorchoice" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422" +checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0" [[package]] name = "comemo" @@ -606,7 +630,7 @@ checksum = "54af6ac68ada2d161fa9cc1ab52676228e340866d094d6542107e74b82acc095" dependencies = [ "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.77", ] [[package]] @@ -617,7 +641,7 @@ checksum = "c8936e42f9b4f5bdfaf23700609ac1f11cb03ad4c1ec128a4ee4fd0903e228db" dependencies = [ "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.77", ] [[package]] @@ -644,9 +668,9 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.6" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "core_maths" @@ -659,9 +683,9 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.12" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" +checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0" dependencies = [ "libc", ] @@ -776,7 +800,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.70", + "syn 2.0.77", ] [[package]] @@ -787,7 +811,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core", "quote", - "syn 2.0.70", + "syn 2.0.77", ] [[package]] @@ -901,7 +925,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.77", ] [[package]] @@ -940,6 +964,12 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ef1a6892d9eef45c8fa6b9e0086428a2cca8491aca8f787c534a3d6d0bcb3ced" +[[package]] +name = "embedded-io" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edd0f118536f44f5ccd48bcb8b111bdc3de888b58c74639dfb034a357d0f206d" + [[package]] name = "ena" version = "0.14.3" @@ -987,14 +1017,14 @@ checksum = "0d28318a75d4aead5c4db25382e8ef717932d0346600cacae6357eb5941bc5ff" dependencies = [ "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.77", ] [[package]] name = "env_filter" -version = "0.1.0" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a009aa4810eb158359dda09d0c87378e4bbb89b5a801f016885a4707ba24f7ea" +checksum = "4f2c92ceda6ceec50f43169f9ee8424fe2db276791afde7b2cd8bc084cb376ab" dependencies = [ "log", "regex", @@ -1002,9 +1032,9 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.11.3" +version = "0.11.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b35839ba51819680ba087cd351788c9a3c476841207e0b8cee0b04722343b9" +checksum = "e13fa619b91fb2381732789fc5de83b45675e882f66623b7d8cb4f643017018d" dependencies = [ "anstream", "anstyle", @@ -1047,9 +1077,9 @@ checksum = "dd2e7510819d6fbf51a5545c8f922716ecfb14df168a3242f7d33e0239efe6a1" [[package]] name = "fastrand" -version = "2.1.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" +checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" [[package]] name = "fdeflate" @@ -1062,24 +1092,24 @@ dependencies = [ [[package]] name = "filetime" -version = "0.2.23" +version = "0.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" +checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.4.1", - "windows-sys 0.52.0", + "libredox", + "windows-sys 0.59.0", ] [[package]] name = "flate2" -version = "1.0.30" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" +checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253" dependencies = [ "crc32fast", - "miniz_oxide", + "miniz_oxide 0.8.0", ] [[package]] @@ -1096,11 +1126,11 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fontconfig-parser" -version = "0.5.6" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a595cb550439a117696039dfc69830492058211b771a2a165379f2a1a53d84d" +checksum = "c1fcfcd44ca6e90c921fee9fa665d530b21ef1327a4c1a6c5250ea44b776ada7" dependencies = [ - "roxmltree", + "roxmltree 0.20.0", ] [[package]] @@ -1212,7 +1242,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.77", ] [[package]] @@ -1297,9 +1327,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.29.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" +checksum = "32085ea23f3234fc7846555e85283ba4de91e21016dc0455a16286d87a292d64" [[package]] name = "globmatch" @@ -1314,9 +1344,9 @@ dependencies = [ [[package]] name = "globset" -version = "0.4.14" +version = "0.4.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1" +checksum = "15f1ce686646e7f1e19bf7d5533fe443a45dbfb990e00629110797578b42fb19" dependencies = [ "aho-corasick", "bstr", @@ -1337,7 +1367,26 @@ dependencies = [ "futures-sink", "futures-util", "http 0.2.12", - "indexmap 2.2.6", + "indexmap 2.5.0", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "h2" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "524e8ac6999421f49a846c2d4411f337e53497d8ec55d67753beffa43c5d9205" +dependencies = [ + "atomic-waker", + "bytes", + "fnv", + "futures-core", + "futures-sink", + "http 1.1.0", + "indexmap 2.5.0", "slab", "tokio", "tokio-util", @@ -1391,7 +1440,7 @@ dependencies = [ "biblatex", "ciborium", "citationberg", - "indexmap 2.2.6", + "indexmap 2.5.0", "numerals", "paste", "serde", @@ -1421,6 +1470,12 @@ version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" +[[package]] +name = "hermit-abi" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc" + [[package]] name = "hex" version = "0.4.3" @@ -1460,6 +1515,29 @@ dependencies = [ "pin-project-lite", ] +[[package]] +name = "http-body" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" +dependencies = [ + "bytes", + "http 1.1.0", +] + +[[package]] +name = "http-body-util" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" +dependencies = [ + "bytes", + "futures-util", + "http 1.1.0", + "http-body 1.0.1", + "pin-project-lite", +] + [[package]] name = "httparse" version = "1.9.4" @@ -1488,9 +1566,9 @@ dependencies = [ "futures-channel", "futures-core", "futures-util", - "h2", + "h2 0.3.26", "http 0.2.12", - "http-body", + "http-body 0.4.6", "httparse", "httpdate", "itoa", @@ -1502,6 +1580,27 @@ dependencies = [ "want", ] +[[package]] +name = "hyper" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "h2 0.4.6", + "http 1.1.0", + "http-body 1.0.1", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "smallvec", + "tokio", + "want", +] + [[package]] name = "hyper-rustls" version = "0.24.2" @@ -1510,7 +1609,7 @@ checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" dependencies = [ "futures-util", "http 0.2.12", - "hyper", + "hyper 0.14.30", "rustls", "tokio", "tokio-rustls", @@ -1523,12 +1622,42 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" dependencies = [ "bytes", - "hyper", + "hyper 0.14.30", "native-tls", "tokio", "tokio-native-tls", ] +[[package]] +name = "hyper-tungstenite" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69ce21dae6ce6e5f336a444d846e592faf42c5c28f70a5c8ff67893cbcb304d3" +dependencies = [ + "http-body-util", + "hyper 1.4.1", + "hyper-util", + "pin-project-lite", + "tokio", + "tokio-tungstenite", + "tungstenite", +] + +[[package]] +name = "hyper-util" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da62f120a8a37763efb0cf8fdf264b884c7b8b9ac8660b900c8661030c00e6ba" +dependencies = [ + "bytes", + "futures-util", + "http 1.1.0", + "http-body 1.0.1", + "hyper 1.4.1", + "pin-project-lite", + "tokio", +] + [[package]] name = "hypher" version = "0.1.5" @@ -1537,9 +1666,9 @@ checksum = "3b24ad5637230df201ab1034d593f1d09bf7f2a9274f2e8897638078579f4265" [[package]] name = "iana-time-zone" -version = "0.1.60" +version = "0.1.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" +checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -1680,7 +1809,7 @@ checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.77", ] [[package]] @@ -1762,9 +1891,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.2.6" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" +checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5" dependencies = [ "equivalent", "hashbrown 0.14.5", @@ -1799,9 +1928,9 @@ dependencies = [ [[package]] name = "insta" -version = "1.39.0" +version = "1.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "810ae6042d48e2c9e9215043563a58a80b877bc863228a74cf10c49d4620a6f5" +checksum = "6593a41c7a73841868772495db7dc1e8ecab43bb5c0b6da2059246c4b506ab60" dependencies = [ "console", "globset", @@ -1822,9 +1951,9 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.9.0" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" +checksum = "187674a687eed5fe42285b40c6291f9a01517d415fad1c3cbc6a9f778af7fcd4" [[package]] name = "is-docker" @@ -1837,11 +1966,11 @@ dependencies = [ [[package]] name = "is-terminal" -version = "0.4.12" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b" +checksum = "261f68e344040fbd0edea105bef17c66edf46f984ddb1115b775ce31be948f4b" dependencies = [ - "hermit-abi", + "hermit-abi 0.4.0", "libc", "windows-sys 0.52.0", ] @@ -1858,9 +1987,9 @@ dependencies = [ [[package]] name = "is_terminal_polyfill" -version = "1.70.0" +version = "1.70.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800" +checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" [[package]] name = "itertools" @@ -1894,9 +2023,9 @@ checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0" [[package]] name = "js-sys" -version = "0.3.69" +version = "0.3.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" +checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" dependencies = [ "wasm-bindgen", ] @@ -1936,7 +2065,7 @@ version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd85a5776cd9500c2e2059c8c76c3b01528566b7fcbaf8098b55a33fc298849b" dependencies = [ - "arrayvec 0.7.4", + "arrayvec 0.7.6", ] [[package]] @@ -1947,9 +2076,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "libc" -version = "0.2.155" +version = "0.2.158" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" +checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" [[package]] name = "libm" @@ -1965,6 +2094,7 @@ checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ "bitflags 2.6.0", "libc", + "redox_syscall", ] [[package]] @@ -2016,9 +2146,9 @@ checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "lsp-server" -version = "0.7.6" +version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "248f65b78f6db5d8e1b1604b4098a28b43d21a8eb1deeca22b1c421b276c7095" +checksum = "550446e84739dcaf6d48a4a093973850669e13e8a34d8f8d64851041be267cd9" dependencies = [ "crossbeam-channel", "log", @@ -2047,9 +2177,9 @@ checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "memmap2" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322" +checksum = "fd3f7eed9d3848f8b98834af67102b720745c4ec028fcd0aa0239277e7de374f" dependencies = [ "libc", ] @@ -2080,6 +2210,15 @@ dependencies = [ "simd-adler32", ] +[[package]] +name = "miniz_oxide" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" +dependencies = [ + "adler2", +] + [[package]] name = "mintex" version = "0.1.3" @@ -2098,6 +2237,18 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "mio" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" +dependencies = [ + "hermit-abi 0.3.9", + "libc", + "wasi", + "windows-sys 0.52.0", +] + [[package]] name = "mutate_once" version = "0.1.1" @@ -2141,7 +2292,7 @@ dependencies = [ "kqueue", "libc", "log", - "mio", + "mio 0.8.11", "walkdir", "windows-sys 0.48.0", ] @@ -2180,16 +2331,6 @@ dependencies = [ "autocfg", ] -[[package]] -name = "num_cpus" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" -dependencies = [ - "hermit-abi", - "libc", -] - [[package]] name = "num_threads" version = "0.1.7" @@ -2207,9 +2348,9 @@ checksum = "e25be21376a772d15f97ae789845340a9651d3c4246ff5ebb6a2b35f9c37bd31" [[package]] name = "object" -version = "0.36.1" +version = "0.36.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "081b846d1d56ddfc18fdf1a922e4f6e07a11768ea1b92dec44e42b72712ccfce" +checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a" dependencies = [ "memchr", ] @@ -2233,9 +2374,9 @@ dependencies = [ [[package]] name = "openssl" -version = "0.10.64" +version = "0.10.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" +checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1" dependencies = [ "bitflags 2.6.0", "cfg-if", @@ -2254,7 +2395,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.77", ] [[package]] @@ -2265,9 +2406,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.102" +version = "0.9.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2" +checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6" dependencies = [ "cc", "libc", @@ -2302,7 +2443,7 @@ dependencies = [ "by_address", "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.77", ] [[package]] @@ -2323,7 +2464,7 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.5.2", + "redox_syscall", "smallvec", "windows-targets 0.52.6", ] @@ -2394,7 +2535,7 @@ dependencies = [ "phf_shared", "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.77", ] [[package]] @@ -2446,7 +2587,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42cf17e9a1800f5f396bc67d193dc9411b59012a5876445ef450d449881e1016" dependencies = [ "base64 0.22.1", - "indexmap 2.2.6", + "indexmap 2.5.0", "quick-xml 0.32.0", "serde", "time", @@ -2462,23 +2603,24 @@ dependencies = [ "crc32fast", "fdeflate", "flate2", - "miniz_oxide", + "miniz_oxide 0.7.4", ] [[package]] name = "portable-atomic" -version = "1.6.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" +checksum = "d30538d42559de6b034bc76fd6dd4c38961b1ee5c6c56e3808c50128fdbc22ce" [[package]] name = "postcard" -version = "1.0.8" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a55c51ee6c0db07e68448e336cf8ea4131a620edefebf9893e759b2d793420f8" +checksum = "5f7f0a8d620d71c457dd1d47df76bb18960378da56af4527aaa10f515eee732e" dependencies = [ "cobs", - "embedded-io", + "embedded-io 0.4.0", + "embedded-io 0.6.1", "serde", ] @@ -2490,9 +2632,12 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" [[package]] name = "ppv-lite86" -version = "0.2.17" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" +dependencies = [ + "zerocopy", +] [[package]] name = "pretty" @@ -2530,9 +2675,9 @@ dependencies = [ [[package]] name = "psm" -version = "0.1.21" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5787f7cda34e3033a72192c018bc5883100330f362ef279a8cbccfce8bb4e874" +checksum = "aa37f80ca58604976033fae9515a8a2989fc13797d953f7c04fb8fa36a11f205" dependencies = [ "cc", ] @@ -2584,9 +2729,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.36" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" dependencies = [ "proc-macro2", ] @@ -2649,27 +2794,18 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.4.1" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "redox_syscall" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd" +checksum = "0884ad60e090bf1345b93da0a5de8923c93884cd03f40dfcfddd3b4bee661853" dependencies = [ "bitflags 2.6.0", ] [[package]] name = "redox_users" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" +checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" dependencies = [ "getrandom", "libredox", @@ -2712,7 +2848,7 @@ dependencies = [ "ecow 0.2.2", "futures", "fxhash", - "indexmap 2.2.6", + "indexmap 2.5.0", "log", "nohash-hasher", "notify", @@ -2776,7 +2912,7 @@ version = "0.5.0-rc7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6ea592d6cfc00420d0719170a6c0dd71580b1cea6682a5f543b3b683991ec3f6" dependencies = [ - "indexmap 2.2.6", + "indexmap 2.5.0", "log", "nohash-hasher", "parking_lot", @@ -2815,9 +2951,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.5" +version = "1.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" +checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" dependencies = [ "aho-corasick", "memchr", @@ -2862,10 +2998,10 @@ dependencies = [ "encoding_rs", "futures-core", "futures-util", - "h2", + "h2 0.3.26", "http 0.2.12", - "http-body", - "hyper", + "http-body 0.4.6", + "hyper 0.14.30", "hyper-rustls", "hyper-tls", "ipnet", @@ -2915,9 +3051,9 @@ dependencies = [ [[package]] name = "rgb" -version = "0.8.44" +version = "0.8.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1aee83dc281d5a3200d37b299acd13b81066ea126a7f16f0eae70fc9aed241d9" +checksum = "57397d16646700483b67d2dd6511d79318f9d057fdbd21a4066aeac8b41d310a" dependencies = [ "bytemuck", ] @@ -2939,9 +3075,9 @@ dependencies = [ [[package]] name = "rkyv" -version = "0.7.44" +version = "0.7.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cba464629b3394fc4dbc6f940ff8f5b4ff5c7aef40f29166fd4ad12acbc99c0" +checksum = "9008cd6385b9e161d8229e1f6549dd23c3d022f132a2ea37ac3a10ac4935779b" dependencies = [ "bitvec", "bytecheck", @@ -2957,9 +3093,9 @@ dependencies = [ [[package]] name = "rkyv_derive" -version = "0.7.44" +version = "0.7.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7dddfff8de25e6f62b9d64e6e432bf1c6736c57d20323e15ee10435fbda7c65" +checksum = "503d1d27590a2b0a3a4ca4c94755aa2875657196ecbf401a42eff41d7de532c0" dependencies = [ "proc-macro2", "quote", @@ -2968,9 +3104,9 @@ dependencies = [ [[package]] name = "roff" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b833d8d034ea094b1ea68aa6d5c740e0d04bad9d16568d08ba6f76823a114316" +checksum = "88f8660c1ff60292143c98d08fc6e2f654d722db50410e3f3797d40baaf9d8f3" [[package]] name = "roxmltree" @@ -2978,6 +3114,12 @@ version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3cd14fd5e3b777a7422cca79358c57a8f6e3a703d9ac187448d0daf220c2407f" +[[package]] +name = "roxmltree" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c20b6793b5c2fa6553b250154b78d6d0db37e72700ae35fad9387a46f487c97" + [[package]] name = "rpds" version = "1.1.0" @@ -3030,18 +3172,18 @@ checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152" [[package]] name = "rustc_version" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" dependencies = [ "semver", ] [[package]] name = "rustix" -version = "0.38.34" +version = "0.38.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" +checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811" dependencies = [ "bitflags 2.6.0", "errno", @@ -3120,11 +3262,11 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" +checksum = "e9aaafd5a2b6e3d657ff009d82fbd630b6bd54dd4eb06f21693925cdf80f9b8b" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -3151,9 +3293,9 @@ checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" [[package]] name = "security-framework" -version = "2.11.0" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0" +checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" dependencies = [ "bitflags 2.6.0", "core-foundation", @@ -3164,9 +3306,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.11.0" +version = "2.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7" +checksum = "ea4a292869320c0272d7bc55a5a6aafaff59b4f63404a003887b679a2e05b4b6" dependencies = [ "core-foundation-sys", "libc", @@ -3183,31 +3325,32 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.204" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" +checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.204" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" +checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.77", ] [[package]] name = "serde_json" -version = "1.0.120" +version = "1.0.128" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5" +checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" dependencies = [ "itoa", + "memchr", "ryu", "serde", ] @@ -3220,14 +3363,14 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.77", ] [[package]] name = "serde_spanned" -version = "0.6.6" +version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" +checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d" dependencies = [ "serde", ] @@ -3246,15 +3389,15 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.8.3" +version = "3.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e73139bc5ec2d45e6c5fd85be5a46949c1c39a4c18e56915f5eb4c12f975e377" +checksum = "69cecfa94848272156ea67b2b1a53f20fc7bc638c4a46d2f8abde08f05f4b857" dependencies = [ "base64 0.22.1", "chrono", "hex", "indexmap 1.9.3", - "indexmap 2.2.6", + "indexmap 2.5.0", "serde", "serde_derive", "serde_json", @@ -3264,14 +3407,14 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.8.3" +version = "3.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b80d3d6b56b64335c0180e5ffde23b3c5e08c14c585b51a15bd0e95393f46703" +checksum = "a8fee4991ef4f274617a51ad4af30519438dacb2f56ac773b08a1922ff743350" dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.77", ] [[package]] @@ -3280,7 +3423,7 @@ version = "0.9.34+deprecated" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" dependencies = [ - "indexmap 2.2.6", + "indexmap 2.5.0", "itoa", "ryu", "serde", @@ -3309,6 +3452,12 @@ dependencies = [ "digest", ] +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + [[package]] name = "signal-hook-registry" version = "1.4.2" @@ -3332,9 +3481,9 @@ checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a" [[package]] name = "similar" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa42c91313f1d05da9b26f267f931cf178d4aba455b4c4622dd7355eb80c6640" +checksum = "1de1d4f81173b03af4c0cbed3c898f6bff5b870e4a7f5d6f4057d62a7a4b686e" [[package]] name = "simplecss" @@ -3405,23 +3554,17 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] name = "stacker" -version = "0.1.15" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c886bd4480155fd3ef527d45e9ac8dd7118a898a46530b7b94c3e21866259fce" +checksum = "799c883d55abdb5e98af1a7b3f23b9b6de8ecada0ecac058672d7635eb48ca7b" dependencies = [ "cc", "cfg-if", "libc", "psm", - "winapi", + "windows-sys 0.59.0", ] -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - [[package]] name = "strict-num" version = "0.1.1" @@ -3465,7 +3608,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.70", + "syn 2.0.77", ] [[package]] @@ -3478,7 +3621,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.70", + "syn 2.0.77", ] [[package]] @@ -3494,7 +3637,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ba36b330062be8497fd96597227a757b621b86c4d24d164b06e4522b52b3693e" dependencies = [ "image", - "miniz_oxide", + "miniz_oxide 0.7.4", "once_cell", "pdf-writer", "resvg", @@ -3525,9 +3668,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.70" +version = "2.0.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f0209b68b3613b093e0ec905354eccaedcfe83b8cb37cbdeae64026c3064c16" +checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" dependencies = [ "proc-macro2", "quote", @@ -3536,7 +3679,7 @@ dependencies = [ [[package]] name = "sync-lsp" -version = "0.11.20" +version = "0.11.22" dependencies = [ "anyhow", "clap", @@ -3568,7 +3711,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.77", ] [[package]] @@ -3633,14 +3776,15 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.10.1" +version = "3.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" dependencies = [ "cfg-if", "fastrand", + "once_cell", "rustix", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -3675,7 +3819,7 @@ dependencies = [ [[package]] name = "tests" -version = "0.11.20" +version = "0.11.22" dependencies = [ "insta", "lsp-server", @@ -3687,22 +3831,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.61" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" +checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.61" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" +checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.77", ] [[package]] @@ -3751,7 +3895,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "83d13394d44dae3207b52a326c0c85a8bf87f1541f23b0d143811088497b09ab" dependencies = [ "arrayref", - "arrayvec 0.7.4", + "arrayvec 0.7.6", "bytemuck", "cfg-if", "log", @@ -3772,7 +3916,7 @@ dependencies = [ [[package]] name = "tinymist" -version = "0.11.20" +version = "0.11.22" dependencies = [ "anyhow", "async-trait", @@ -3783,6 +3927,7 @@ dependencies = [ "clap_builder", "clap_complete", "clap_complete_fig", + "clap_complete_nushell", "clap_mangen", "codespan-reporting", "comemo 0.4.0", @@ -3791,7 +3936,10 @@ dependencies = [ "dirs", "env_logger", "futures", - "hyper", + "http-body-util", + "hyper 1.4.1", + "hyper-tungstenite", + "hyper-util", "itertools 0.13.0", "log", "lsp-server", @@ -3800,7 +3948,6 @@ dependencies = [ "open", "parking_lot", "paste", - "pin-project-lite", "rayon", "reflexo", "reflexo-typst", @@ -3809,15 +3956,13 @@ dependencies = [ "serde_json", "serde_yaml", "sync-lsp", - "tinymist-assets 0.11.20 (registry+https://github.com/rust-lang/crates.io-index)", + "tinymist-assets 0.11.22 (registry+https://github.com/rust-lang/crates.io-index)", "tinymist-query", "tinymist-render", "tinymist-world", "tokio", "tokio-util", - "toml 0.8.14", - "tower-layer", - "tower-service", + "toml 0.8.19", "typlite", "typst", "typst-ansi-hl", @@ -3825,6 +3970,7 @@ dependencies = [ "typst-pdf", "typst-preview", "typst-render", + "typst-shim", "typst-svg", "typst-timing", "typstfmt_lib", @@ -3835,20 +3981,38 @@ dependencies = [ ] [[package]] -name = "tinymist-assets" -version = "0.11.20" +name = "tinymist-analysis" +version = "0.11.22" +dependencies = [ + "base64 0.22.1", + "comemo 0.4.0", + "ecow 0.2.2", + "insta", + "log", + "regex", + "tinymist-world", + "toml 0.8.19", + "typst", + "typst-svg", + "typst-syntax 0.11.1", +] [[package]] name = "tinymist-assets" -version = "0.11.20" +version = "0.11.22" + +[[package]] +name = "tinymist-assets" +version = "0.11.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31caeaeb5d57c7ecd5f5e64aa77504f169f930c534822ba9fd12681866a686e9" +checksum = "133e31d88d00f03791f99009c4102a14b2b1a7474e8179ca7e2e42806c7134ef" [[package]] name = "tinymist-query" -version = "0.11.20" +version = "0.11.22" dependencies = [ "anyhow", + "base64 0.22.1", "biblatex", "chrono", "comemo 0.4.0", @@ -3859,7 +4023,7 @@ dependencies = [ "hashbrown 0.14.5", "hex", "if_chain", - "indexmap 2.2.6", + "indexmap 2.5.0", "insta", "itertools 0.13.0", "log", @@ -3880,11 +4044,15 @@ dependencies = [ "sha2", "siphasher 1.0.1", "strum 0.26.3", - "toml 0.8.14", + "tinymist-analysis", + "tinymist-world", + "toml 0.8.19", "triomphe", "ttf-parser", + "typlite", "typst", "typst-assets", + "typst-shim", "unscanny", "walkdir", "yaml-rust2", @@ -3892,7 +4060,7 @@ dependencies = [ [[package]] name = "tinymist-render" -version = "0.11.20" +version = "0.11.22" dependencies = [ "base64 0.22.1", "log", @@ -3903,17 +4071,22 @@ dependencies = [ [[package]] name = "tinymist-world" -version = "0.11.20" +version = "0.11.22" dependencies = [ "anyhow", "chrono", "clap", "comemo 0.4.0", + "dirs", + "flate2", "log", + "parking_lot", "reflexo-typst", + "reqwest", "serde", "serde_json", - "tinymist-assets 0.11.20 (registry+https://github.com/rust-lang/crates.io-index)", + "tar", + "tinymist-assets 0.11.22 (registry+https://github.com/rust-lang/crates.io-index)", "typst-assets", ] @@ -3945,32 +4118,31 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.38.0" +version = "1.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a" +checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" dependencies = [ "backtrace", "bytes", "libc", - "mio", - "num_cpus", + "mio 1.0.2", "parking_lot", "pin-project-lite", "signal-hook-registry", "socket2", "tokio-macros", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "tokio-macros" -version = "2.3.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" +checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.77", ] [[package]] @@ -3995,9 +4167,9 @@ dependencies = [ [[package]] name = "tokio-tungstenite" -version = "0.21.0" +version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c83b561d025642014097b66e6c1bb422783339e0909e4429cde4749d1990bc38" +checksum = "c6989540ced10490aaf14e6bad2e3d33728a2813310a0c71d1574304c49631cd" dependencies = [ "futures-util", "log", @@ -4007,9 +4179,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.11" +version = "0.7.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" +checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a" dependencies = [ "bytes", "futures-core", @@ -4033,21 +4205,21 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.14" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335" +checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.15", + "toml_edit 0.22.21", ] [[package]] name = "toml_datetime" -version = "0.6.6" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" +checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" dependencies = [ "serde", ] @@ -4058,7 +4230,7 @@ version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.2.6", + "indexmap 2.5.0", "serde", "serde_spanned", "toml_datetime", @@ -4067,28 +4239,22 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.15" +version = "0.22.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d59a3a72298453f564e2b111fa896f8d07fabb36f51f06d7e875fc5e0b5a3ef1" +checksum = "3b072cee73c449a636ffd6f32bd8de3a9f7119139aff882f44943ce2986dc5cf" dependencies = [ - "indexmap 2.2.6", + "indexmap 2.5.0", "serde", "serde_spanned", "toml_datetime", - "winnow 0.6.13", + "winnow 0.6.18", ] -[[package]] -name = "tower-layer" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" - [[package]] name = "tower-service" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" +checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" [[package]] name = "tracing" @@ -4109,7 +4275,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.77", ] [[package]] @@ -4141,9 +4307,9 @@ checksum = "17f77d76d837a7830fe1d4f12b7b4ba4192c1888001c7164257e4bc6d21d96b4" [[package]] name = "tungstenite" -version = "0.21.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ef1a641ea34f399a848dea702823bbecfb4c486f911735368f1f137cb8257e1" +checksum = "6e2e2ce1e47ed2994fd43b04c8f618008d4cabdd5ee34027cf14f9d918edd9c8" dependencies = [ "byteorder", "bytes", @@ -4154,7 +4320,6 @@ dependencies = [ "rand", "sha1", "thiserror", - "url", "utf-8", ] @@ -4183,14 +4348,14 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "typlite" -version = "0.11.20" +version = "0.11.22" dependencies = [ "base64 0.22.1", "comemo 0.4.0", "ecow 0.2.2", "insta", "regex", - "tinymist-query", + "tinymist-analysis", "tinymist-world", "typst", "typst-svg", @@ -4202,6 +4367,7 @@ name = "typlite-cli" version = "0.0.0" dependencies = [ "clap", + "ecow 0.2.2", "tinymist-world", "typlite", ] @@ -4228,7 +4394,7 @@ dependencies = [ "icu_segmenter", "if_chain", "image", - "indexmap 2.2.6", + "indexmap 2.5.0", "kamadak-exif", "kurbo", "lipsum", @@ -4241,7 +4407,7 @@ dependencies = [ "qcms", "rayon", "regex", - "roxmltree", + "roxmltree 0.19.0", "rustybuzz", "serde", "serde_json", @@ -4251,7 +4417,7 @@ dependencies = [ "stacker", "syntect", "time", - "toml 0.8.14", + "toml 0.8.19", "ttf-parser", "two-face", "typed-arena", @@ -4296,7 +4462,7 @@ dependencies = [ "heck 0.4.1", "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.77", ] [[package]] @@ -4309,7 +4475,7 @@ dependencies = [ "comemo 0.4.0", "ecow 0.2.2", "image", - "miniz_oxide", + "miniz_oxide 0.7.4", "once_cell", "pdf-writer", "subsetter", @@ -4326,22 +4492,21 @@ dependencies = [ [[package]] name = "typst-preview" -version = "0.11.20" +version = "0.11.22" dependencies = [ "clap", "comemo 0.4.0", "env_logger", "futures", - "indexmap 2.2.6", + "indexmap 2.5.0", "log", "once_cell", "reflexo-typst", "reflexo-vec2svg", "serde", "serde_json", - "tinymist-assets 0.11.20 (registry+https://github.com/rust-lang/crates.io-index)", + "tinymist-assets 0.11.22 (registry+https://github.com/rust-lang/crates.io-index)", "tokio", - "tokio-tungstenite", "typst", "typst-assets", ] @@ -4357,7 +4522,7 @@ dependencies = [ "image", "pixglyph", "resvg", - "roxmltree", + "roxmltree 0.19.0", "tiny-skia", "ttf-parser", "typst", @@ -4366,6 +4531,15 @@ dependencies = [ "usvg", ] +[[package]] +name = "typst-shim" +version = "0.11.22" +dependencies = [ + "cfg-if", + "typst", + "typst-syntax 0.11.1", +] + [[package]] name = "typst-svg" version = "0.11.1" @@ -4443,9 +4617,9 @@ dependencies = [ [[package]] name = "typstyle" -version = "0.11.32" +version = "0.11.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f3e79e77aac4d80934811be14abd1e2b0e7d3b4059653e24b841ab1ac5bae0" +checksum = "4c430c527e8048f19522448613e95da687ed64fb0a3b78969f0643e6e99a95ef" dependencies = [ "anyhow", "itertools 0.13.0", @@ -4502,9 +4676,9 @@ checksum = "cc2520efa644f8268dce4dcd3050eaa7fc044fca03961e9998ac7e2e92b77cf1" [[package]] name = "unicode-ident" -version = "1.0.12" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" +checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" [[package]] name = "unicode-math-class" @@ -4514,30 +4688,30 @@ checksum = "7d246cf599d5fae3c8d56e04b20eb519adb89a8af8d0b0fbcded369aa3647d65" [[package]] name = "unicode-normalization" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" +checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956" dependencies = [ "tinyvec", ] [[package]] name = "unicode-properties" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4259d9d4425d9f0661581b804cb85fe66a4c631cadd8f490d1c13a35d5d9291" +checksum = "52ea75f83c0137a9b98608359a5f1af8144876eb67bcb1ce837368e906a9f524" [[package]] name = "unicode-script" -version = "0.5.6" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad8d71f5726e5f285a935e9fe8edfd53f0491eb6e9a5774097fdabee7cd8c9cd" +checksum = "9fb421b350c9aff471779e262955939f565ec18b86c15364e6bdf0d662ca7c1f" [[package]] name = "unicode-segmentation" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" +checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" [[package]] name = "unicode-vo" @@ -4547,9 +4721,9 @@ checksum = "b1d386ff53b415b7fe27b50bb44679e2cc4660272694b7b6f3326d8480823a94" [[package]] name = "unicode-width" -version = "0.1.13" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" +checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" [[package]] name = "unsafe-libyaml" @@ -4607,7 +4781,7 @@ dependencies = [ "imagesize", "kurbo", "log", - "roxmltree", + "roxmltree 0.19.0", "simplecss", "siphasher 0.3.11", "svgtypes", @@ -4688,9 +4862,9 @@ dependencies = [ [[package]] name = "version_check" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" [[package]] name = "walkdir" @@ -4719,34 +4893,35 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" +checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" dependencies = [ "cfg-if", + "once_cell", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" +checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.77", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.42" +version = "0.4.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" +checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed" dependencies = [ "cfg-if", "js-sys", @@ -4756,9 +4931,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" +checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -4766,22 +4941,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" +checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" dependencies = [ "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.77", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" +checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" [[package]] name = "wasmi" @@ -4825,9 +5000,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.69" +version = "0.3.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" +checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0" dependencies = [ "js-sys", "wasm-bindgen", @@ -4863,11 +5038,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" +checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -4903,6 +5078,15 @@ dependencies = [ "windows-targets 0.52.6", ] +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", +] + [[package]] name = "windows-targets" version = "0.48.5" @@ -5035,9 +5219,9 @@ dependencies = [ [[package]] name = "winnow" -version = "0.6.13" +version = "0.6.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59b5e5f6c299a3c7890b876a2a587f3115162487e704907d9b6cd29473052ba1" +checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f" dependencies = [ "memchr", ] @@ -5136,7 +5320,7 @@ checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95" dependencies = [ "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.77", "synstructure", ] @@ -5146,6 +5330,7 @@ version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" dependencies = [ + "byteorder", "zerocopy-derive", ] @@ -5157,7 +5342,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.77", ] [[package]] @@ -5177,7 +5362,7 @@ checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.77", "synstructure", ] @@ -5213,5 +5398,5 @@ checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.77", ] diff --git a/pkgs/by-name/ti/tinymist/package.nix b/pkgs/by-name/ti/tinymist/package.nix index 53d749a50acb..5b7c64811f34 100644 --- a/pkgs/by-name/ti/tinymist/package.nix +++ b/pkgs/by-name/ti/tinymist/package.nix @@ -18,13 +18,13 @@ rustPlatform.buildRustPackage rec { pname = "tinymist"; # Please update the corresponding vscode extension when updating # this derivation. - version = "0.11.20"; + version = "0.11.22"; src = fetchFromGitHub { owner = "Myriad-Dreamin"; repo = "tinymist"; rev = "refs/tags/v${version}"; - hash = "sha256-wmXFMLLMjMFRuWX9AFk+gJz/4t0+DiOBrvcTx+LQ+tI="; + hash = "sha256-CQt6ptVwx86rYmXSgQ962fJupRQidLRFXU6yYkWasR0="; }; cargoLock = { @@ -53,9 +53,15 @@ rustPlatform.buildRustPackage rec { checkFlags = [ "--skip=e2e" + # Fails because of missing `creation_timestamp` field # https://github.com/NixOS/nixpkgs/pull/328756#issuecomment-2241322796 "--skip=test_config_update" + + # Require internet access + "--skip=docs::tests::cetz" + "--skip=docs::tests::tidy" + "--skip=docs::tests::touying" ]; passthru = { From 262ec3431851a9863cde562fbad5b6a91e3e1e8e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" <ryantm-bot@ryantm.com> Date: Mon, 30 Sep 2024 07:05:05 +0000 Subject: [PATCH 209/300] iosevka: 31.6.1 -> 31.7.1 --- pkgs/data/fonts/iosevka/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/fonts/iosevka/default.nix b/pkgs/data/fonts/iosevka/default.nix index 7f7979c5bec5..d0ccf32ce32c 100644 --- a/pkgs/data/fonts/iosevka/default.nix +++ b/pkgs/data/fonts/iosevka/default.nix @@ -55,16 +55,16 @@ assert (extraParameters != null) -> set != null; buildNpmPackage rec { pname = "Iosevka${toString set}"; - version = "31.6.1"; + version = "31.7.1"; src = fetchFromGitHub { owner = "be5invis"; repo = "iosevka"; rev = "v${version}"; - hash = "sha256-pulOJ3mJqfonoQPmk6VtdWLhFVeoBjANVi0S9fN9N7c="; + hash = "sha256-yio+ZJ+hgybgEUfxXt/xk3ahM5lollKGJC0821vi9e0="; }; - npmDepsHash = "sha256-3GEWJLiWDZcjUU1yms0h0mm4eH4Ov20WVSHZN1OB5bA="; + npmDepsHash = "sha256-gtBQdeX7hkactPSq609DMoc8rY2AHfg2nkpj26ZV88A="; nativeBuildInputs = [ remarshal From 3881e06a538c57c2a013caa356b6d9beb45380f2 Mon Sep 17 00:00:00 2001 From: Simon Hauser <simon.hauser@helsinki-systems.de> Date: Mon, 30 Sep 2024 09:24:52 +0200 Subject: [PATCH 210/300] libsbml: 5.20.2 -> 5.20.4 and add python support (#344137) Changelog: https://github.com/sbmlteam/libsbml/releases/tag/v5.20.4 --- pkgs/by-name/li/libsbml/package.nix | 30 ++++++++++++++--------------- pkgs/top-level/python-packages.nix | 4 ++++ 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/pkgs/by-name/li/libsbml/package.nix b/pkgs/by-name/li/libsbml/package.nix index 513e72f322bc..9fbb674f5d62 100644 --- a/pkgs/by-name/li/libsbml/package.nix +++ b/pkgs/by-name/li/libsbml/package.nix @@ -2,43 +2,35 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, cmake, pkg-config, bzip2, libxml2, swig, + python ? null, + withPython ? false, }: stdenv.mkDerivation (attrs: { pname = "libsbml"; - version = "5.20.2"; + version = "5.20.4"; src = fetchFromGitHub { owner = "sbmlteam"; repo = "libsbml"; rev = "v${attrs.version}"; - hash = "sha256-8JT2r0zuf61VewtZaOAccaOUmDlQPnllA0fXE9rT5X8="; + hash = "sha256-qWTN033YU4iWzt+mXQaP5W/6IF5nebF4PwNVkyL8wTg="; }; - patches = [ - # This should be in next release, remember to remove fetchpatch - (fetchpatch { # https://github.com/sbmlteam/libsbml/pull/358 - name = "fix-xmlerror-conversion.patch"; - url = "https://github.com/sbmlteam/libsbml/commit/de2f77ee6766fe933a1472200f5e08e7c5ba6f8c.patch"; - hash = "sha256-uirG6XJ+w0hqBUEAGDnzhHoVtJVRdN1eqBYeneKMBao="; - }) - ]; - nativeBuildInputs = [ cmake pkg-config swig - ]; + ] ++ lib.optional withPython python.pkgs.pythonImportsCheckHook; buildInputs = [ bzip2.dev libxml2 - ]; + ] ++ lib.optional withPython python; # libSBML doesn't always make use of pkg-config cmakeFlags = [ @@ -46,13 +38,19 @@ stdenv.mkDerivation (attrs: { "-DLIBXML_LIBRARY=${lib.getLib libxml2}/lib/libxml2${stdenv.hostPlatform.extensions.sharedLibrary}" "-DPKG_CONFIG_EXECUTABLE=${lib.getBin pkg-config}/bin/pkg-config" "-DSWIG_EXECUTABLE=${lib.getBin swig}/bin/swig" - ]; + ] ++ lib.optional withPython "-DWITH_PYTHON=ON"; + + postInstall = lib.optional withPython '' + mv $out/${python.sitePackages}/libsbml/libsbml.py $out/${python.sitePackages}/libsbml/__init__.py + ''; + + pythonImportsCheck = [ "libsbml" ]; meta = with lib; { description = "Library for manipulating Systems Biology Markup Language (SBML)"; homepage = "https://github.com/sbmlteam/libsbml"; license = licenses.lgpl21Only; - maintainers = [maintainers.kupac]; + maintainers = [ maintainers.kupac ]; platforms = platforms.all; }; }) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6a22ba955f59..567c5866bc37 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7132,6 +7132,10 @@ self: super: with self; { libsavitar = callPackage ../development/python-modules/libsavitar { }; + libsbml = toPythonModule (pkgs.libsbml.override { + withPython = true; + inherit (self) python; + }); libsixel = callPackage ../development/python-modules/libsixel { inherit (pkgs) libsixel; 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 211/300] 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 802c33e246dba701714621e5fb4b9e6e20dce7fa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" <ryantm-bot@ryantm.com> Date: Mon, 30 Sep 2024 07:33:46 +0000 Subject: [PATCH 212/300] python312Packages.langfuse: 2.50.2 -> 2.51.2 --- pkgs/development/python-modules/langfuse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/langfuse/default.nix b/pkgs/development/python-modules/langfuse/default.nix index cd7ac3a36cc5..6a434fb0cb00 100644 --- a/pkgs/development/python-modules/langfuse/default.nix +++ b/pkgs/development/python-modules/langfuse/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "langfuse"; - version = "2.50.2"; + version = "2.51.2"; pyproject = true; src = fetchFromGitHub { owner = "langfuse"; repo = "langfuse-python"; rev = "refs/tags/v${version}"; - hash = "sha256-CKydYXcwWB4fnomPBdOLTwRBLBtxqoNHdP2RBzcrjpk="; + hash = "sha256-MaTR7hEE+Ed9pCXJ2JSxzLAJ0O0SnN3M3b5/7tdmQBw="; }; build-system = [ poetry-core ]; From 15b33c77b278bc2165623beff85b300d1da74033 Mon Sep 17 00:00:00 2001 From: oo-infty <oo-infty@outlook.com> Date: Mon, 30 Sep 2024 15:31:52 +0800 Subject: [PATCH 213/300] maintainers: rename oo-infty to oosquare --- maintainers/maintainer-list.nix | 12 ++++++------ pkgs/by-name/fc/fcitx5-fluent/package.nix | 2 +- pkgs/by-name/lx/lx-music-desktop/package.nix | 2 +- pkgs/by-name/ug/ugm/package.nix | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index d357ba059999..20ed8057bb1b 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -15749,12 +15749,6 @@ github = "ony"; githubId = 11265; }; - oo-infty = { - name = "Justin Chen"; - email = "oo-infty@outlook.com"; - github = "oo-infty"; - githubId = 42143810; - }; ooliver1 = { name = "Oliver Wilkes"; email = "oliverwilkes2006@icloud.com"; @@ -15762,6 +15756,12 @@ githubId = 34910574; keys = [ { fingerprint = "D055 8A23 3947 B7A0 F966 B07F 0B41 0348 9833 7273"; } ]; }; + oosquare = { + name = "Justin Chen"; + email = "oosquare@outlook.com"; + github = "oosquare"; + githubId = 42143810; + }; opeik = { email = "sandro@stikic.com"; github = "opeik"; diff --git a/pkgs/by-name/fc/fcitx5-fluent/package.nix b/pkgs/by-name/fc/fcitx5-fluent/package.nix index 532469bc69d6..ab1c46e10f0b 100644 --- a/pkgs/by-name/fc/fcitx5-fluent/package.nix +++ b/pkgs/by-name/fc/fcitx5-fluent/package.nix @@ -33,6 +33,6 @@ stdenvNoCC.mkDerivation { homepage = "https://github.com/Reverier-Xu/Fluent-fcitx5"; license = licenses.mpl20; platforms = platforms.all; - maintainers = with maintainers; [ oo-infty ]; + maintainers = with maintainers; [ oosquare ]; }; } diff --git a/pkgs/by-name/lx/lx-music-desktop/package.nix b/pkgs/by-name/lx/lx-music-desktop/package.nix index 08d4967d8342..ea066fc7ba3d 100644 --- a/pkgs/by-name/lx/lx-music-desktop/package.nix +++ b/pkgs/by-name/lx/lx-music-desktop/package.nix @@ -83,6 +83,6 @@ stdenv.mkDerivation { platforms = [ "x86_64-linux" "aarch64-linux" "armv7l-linux" ]; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; mainProgram = "lx-music-desktop"; - maintainers = with maintainers; [ oo-infty ]; + maintainers = with maintainers; [ oosquare ]; }; } diff --git a/pkgs/by-name/ug/ugm/package.nix b/pkgs/by-name/ug/ugm/package.nix index 4a5825219b96..df62946c4452 100644 --- a/pkgs/by-name/ug/ugm/package.nix +++ b/pkgs/by-name/ug/ugm/package.nix @@ -35,6 +35,6 @@ buildGoModule rec { license = licenses.mit; mainProgram = "ugm"; platforms = platforms.linux; - maintainers = with maintainers; [ oo-infty ]; + maintainers = with maintainers; [ oosquare ]; }; } 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 214/300] 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 dfcde7121636fe8bd7f03fff31d9119d4bfbb5a8 Mon Sep 17 00:00:00 2001 From: Philipp Schuster <phip1611@gmail.com> Date: Mon, 30 Sep 2024 08:40:27 +0200 Subject: [PATCH 215/300] strace: set enableParallelBuilding = true This reduces the build time from 55s to 25s on my modern 16-core machine. The main motivation for this step is that I apply a custom patch onto strace in my NixOS configuration and the build time is longer than necessary. The debian package definition shows [0] that strace can be reliably build using multiple makefile jobs. [0] https://github.com/strace/strace/commit/0c56f62207d81713f9ce7705e865b75f921e6a1b --- pkgs/development/tools/misc/strace/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix index 167768a27e36..f0f0eb7113c4 100644 --- a/pkgs/development/tools/misc/strace/default.nix +++ b/pkgs/development/tools/misc/strace/default.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation rec { depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ perl ]; + enableParallelBuilding = true; + # libunwind for -k. # On RISC-V platforms, LLVM's libunwind implementation is unsupported by strace. # The build will silently fall back and -k will not work on RISC-V. 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 216/300] 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 217/300] 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 218/300] 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 219/300] 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 220/300] 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 cb805349a7a12ac1096f4b470cdfe0d122d2ffb1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" <ryantm-bot@ryantm.com> Date: Mon, 30 Sep 2024 09:25:47 +0000 Subject: [PATCH 221/300] renode-dts2repl: 0-unstable-2024-09-20 -> 0-unstable-2024-09-27 --- pkgs/by-name/re/renode-dts2repl/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/re/renode-dts2repl/package.nix b/pkgs/by-name/re/renode-dts2repl/package.nix index 0ec4f7765b88..5e81fa72b270 100644 --- a/pkgs/by-name/re/renode-dts2repl/package.nix +++ b/pkgs/by-name/re/renode-dts2repl/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication { pname = "renode-dts2repl"; - version = "0-unstable-2024-09-20"; + version = "0-unstable-2024-09-27"; pyproject = true; src = fetchFromGitHub { owner = "antmicro"; repo = "dts2repl"; - rev = "b54beb5568509ed8dce6a43efa02a600e271a32f"; - hash = "sha256-behdFayLes2Hr12KZ472jzTnELHMWRp3D5h6ZxLtqic="; + rev = "9963f8eb0ef9d356b2d1bfa031c2e136ce4a5509"; + hash = "sha256-RrKnLSBCtXUfdC9PNXddIAFFBbT39ZYxJJqYwKHYLP0="; }; nativeBuildInputs = [ 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 222/300] 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 223/300] 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 88c017a5f17c105c8380d63808e2d2d8b133c73b Mon Sep 17 00:00:00 2001 From: Maximilian Bosch <maximilian@mbosch.me> Date: Mon, 30 Sep 2024 12:17:56 +0200 Subject: [PATCH 224/300] doggo: 1.0.4 -> 1.0.5 ChangeLog: https://github.com/mr-karan/doggo/releases/tag/v1.0.5 --- pkgs/by-name/do/doggo/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/do/doggo/package.nix b/pkgs/by-name/do/doggo/package.nix index cf8c3ae36228..08f65a5a40c8 100644 --- a/pkgs/by-name/do/doggo/package.nix +++ b/pkgs/by-name/do/doggo/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "doggo"; - version = "1.0.4"; + version = "1.0.5"; src = fetchFromGitHub { owner = "mr-karan"; repo = "doggo"; rev = "v${version}"; - hash = "sha256-SD/BcJxoc5Oi8+nAs+CWBEcbgtaohykNlZ14jJvEWew="; + hash = "sha256-SbTwVvE699MCgfUXifnJ1oMNN8TdLg8P03Xx5hrQxF8="; }; - vendorHash = "sha256-JIc6/G1hMf8+oIe4OMc+b0th5MCgi5Mwp3AxW4OD1lg="; + vendorHash = "sha256-44gBPMr6gKaRaq7W69K7OBTVXvsz9pSEL1eOKYd4fT8="; nativeBuildInputs = [ installShellFiles ]; subPackages = [ "cmd/doggo" ]; @@ -43,6 +43,6 @@ buildGoModule rec { It outputs information in a neat concise manner and supports protocols like DoH, DoT, DoQ, and DNSCrypt as well ''; license = licenses.gpl3Only; - maintainers = with maintainers; [ georgesalkhouri ]; + maintainers = with maintainers; [ georgesalkhouri ma27 ]; }; } From 441ac0c553d85dcd8a19f08c82c06436a74e6f65 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage <gaetan@glepage.com> Date: Mon, 30 Sep 2024 08:05:39 +0200 Subject: [PATCH 225/300] python312Packages.inference-gym: init at 0.0.4 --- .../python-modules/inference-gym/default.nix | 31 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/python-modules/inference-gym/default.nix diff --git a/pkgs/development/python-modules/inference-gym/default.nix b/pkgs/development/python-modules/inference-gym/default.nix new file mode 100644 index 000000000000..dd1a854b92c9 --- /dev/null +++ b/pkgs/development/python-modules/inference-gym/default.nix @@ -0,0 +1,31 @@ +{ + lib, + buildPythonPackage, + fetchPypi, +}: + +buildPythonPackage rec { + pname = "inference-gym"; + version = "0.0.4"; + format = "wheel"; + + src = fetchPypi { + inherit format version; + pname = "inference_gym"; + dist = "py3"; + python = "py3"; + hash = "sha256-bpi/IB8PuLPIKoTjmBeVl/4XGvE/yyG8WYxNqNcruvE="; + }; + + pythonImportsCheck = [ "inference_gym" ]; + + # The package does not ship any test. + doCheck = false; + + meta = { + description = "Place to exercise inference methods to help make them faster, leaner and more robust"; + homepage = "https://github.com/tensorflow/probability/tree/main/spinoffs/inference_gym"; + 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..6fde19518629 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6071,6 +6071,8 @@ self: super: with self; { inequality = callPackage ../development/python-modules/inequality { }; + inference-gym = callPackage ../development/python-modules/inference-gym { }; + infinity = callPackage ../development/python-modules/infinity { }; inflect = callPackage ../development/python-modules/inflect { }; From 73187eaa33b2c7d1169f7c8f157c4f2f85b3c673 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage <gaetan@glepage.com> Date: Mon, 30 Sep 2024 07:52:09 +0200 Subject: [PATCH 226/300] python312Packages.oryx: init at 0.2.7 --- .../python-modules/oryx/default.nix | 53 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 55 insertions(+) create mode 100644 pkgs/development/python-modules/oryx/default.nix diff --git a/pkgs/development/python-modules/oryx/default.nix b/pkgs/development/python-modules/oryx/default.nix new file mode 100644 index 000000000000..fdf4780a801d --- /dev/null +++ b/pkgs/development/python-modules/oryx/default.nix @@ -0,0 +1,53 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + poetry-core, + + # dependencies + jax, + jaxlib, + tensorflow-probability, + + # tests + inference-gym, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "oryx"; + version = "0.2.7"; + pyproject = true; + + src = fetchFromGitHub { + owner = "jax-ml"; + repo = "oryx"; + rev = "refs/tags/v${version}"; + hash = "sha256-1n7ogGuFNAeOyXWe0/pAouhg2+aA3MXxlCcsrfqRTdU="; + }; + + build-system = [ poetry-core ]; + + dependencies = [ + jax + jaxlib + tensorflow-probability + ]; + + pythonImportsCheck = [ "oryx" ]; + + nativeCheckInputs = [ + inference-gym + pytestCheckHook + ]; + + meta = { + description = "Library for probabilistic programming and deep learning built on top of Jax"; + homepage = "https://github.com/jax-ml/oryx"; + changelog = "https://github.com/jax-ml/oryx/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 6fde19518629..a27af127a4b3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9462,6 +9462,8 @@ self: super: with self; { orvibo = callPackage ../development/python-modules/orvibo { }; + oryx = callPackage ../development/python-modules/oryx { }; + os-client-config = callPackage ../development/python-modules/os-client-config { }; os-service-types = callPackage ../development/python-modules/os-service-types { }; From a872b1feaae1f3acab0e21d6fe85997b198e7748 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" <ryantm-bot@ryantm.com> Date: Mon, 30 Sep 2024 10:33:11 +0000 Subject: [PATCH 227/300] mycelium: 0.5.4 -> 0.5.5 --- pkgs/by-name/my/mycelium/Cargo.lock | 165 ++++++++++++++++----------- pkgs/by-name/my/mycelium/package.nix | 4 +- 2 files changed, 99 insertions(+), 70 deletions(-) diff --git a/pkgs/by-name/my/mycelium/Cargo.lock b/pkgs/by-name/my/mycelium/Cargo.lock index 6aac9ba0f592..fda202d245c1 100644 --- a/pkgs/by-name/my/mycelium/Cargo.lock +++ b/pkgs/by-name/my/mycelium/Cargo.lock @@ -170,9 +170,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "axum" -version = "0.7.5" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a6c9af12842a67734c9a2e355436e5d03b22383ed60cf13cd0c18fbfe3dcbcf" +checksum = "8f43644eed690f5374f1af436ecd6aea01cd201f6fbdf0178adaf6907afb2cec" dependencies = [ "async-trait", "axum-core", @@ -196,16 +196,16 @@ dependencies = [ "serde_urlencoded", "sync_wrapper 1.0.1", "tokio", - "tower", + "tower 0.5.1", "tower-layer", "tower-service", ] [[package]] name = "axum-core" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a15c63fd72d41492dc4f497196f5da1fb04fb7529e631d73630d1b491e47a2e3" +checksum = "5e6b8ba012a258d63c9adfa28b9ddcf66149da6f986c5b5452e629d5ee64bf00" dependencies = [ "async-trait", "bytes", @@ -216,7 +216,7 @@ dependencies = [ "mime", "pin-project-lite", "rustversion", - "sync_wrapper 0.1.2", + "sync_wrapper 1.0.1", "tower-layer", "tower-service", ] @@ -425,9 +425,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.16" +version = "4.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed6719fffa43d0d87e5fd8caeab59be1554fb028cd30edc88fc4369b17971019" +checksum = "b0956a43b323ac1afaffc053ed5c4b7c1f1800bacd1683c353aabbb752515dd3" dependencies = [ "clap_builder", "clap_derive", @@ -435,9 +435,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.15" +version = "4.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "216aec2b177652e3846684cbfe25c9964d18ec45234f0f5da5157b207ed1aab6" +checksum = "4d72166dd41634086d5803a47eb71ae740e61d84709c36f3c34110173db3961b" dependencies = [ "anstream", "anstyle", @@ -447,9 +447,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.13" +version = "4.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0" +checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab" dependencies = [ "heck", "proc-macro2", @@ -727,19 +727,20 @@ dependencies = [ [[package]] name = "etherparse" -version = "0.15.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21696e6dfe1057a166a042c6d27b89a46aad2ee1003e6e1e03c49d54fd3270d7" +checksum = "b8d8a704b617484e9d867a0423cd45f7577f008c4068e2e33378f8d3860a6d73" dependencies = [ "arrayvec", ] [[package]] name = "faster-hex" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2a2b11eda1d40935b26cf18f6833c526845ae8c41e58d09af6adeb6f0269183" +checksum = "7223ae2d2f179b803433d9c830478527e92b8117eab39460edae7f1614d9fb73" dependencies = [ + "heapless", "serde", ] @@ -928,6 +929,15 @@ dependencies = [ "tracing", ] +[[package]] +name = "hash32" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47d60b12902ba28e2730cd37e95b8c9223af2808df9e902d4df49588d1470606" +dependencies = [ + "byteorder", +] + [[package]] name = "hashbrown" version = "0.12.3" @@ -949,6 +959,16 @@ version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" +[[package]] +name = "heapless" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bfb9eb618601c89945a70e254898da93b13be0388091d42117462b265bb3fad" +dependencies = [ + "hash32", + "stable_deref_trait", +] + [[package]] name = "heck" version = "0.5.0" @@ -1049,7 +1069,7 @@ dependencies = [ "pin-project-lite", "socket2", "tokio", - "tower", + "tower 0.4.13", "tower-service", "tracing", ] @@ -1097,9 +1117,9 @@ checksum = "8e537132deb99c0eb4b752f0346b6a836200eaaa3516dd7e5514b63930a09e5d" [[package]] name = "ipnet" -version = "2.9.0" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" +checksum = "187674a687eed5fe42285b40c6291f9a01517d415fad1c3cbc6a9f778af7fcd4" [[package]] name = "is-terminal" @@ -1242,12 +1262,6 @@ version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" -[[package]] -name = "memalloc" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df39d232f5c40b0891c10216992c2f250c054105cb1e56f0fc9032db6203ecc1" - [[package]] name = "memchr" version = "2.7.2" @@ -1298,7 +1312,7 @@ dependencies = [ [[package]] name = "mycelium" -version = "0.5.4" +version = "0.5.5" dependencies = [ "aes-gcm", "arc-swap", @@ -1333,7 +1347,7 @@ dependencies = [ [[package]] name = "mycelium-api" -version = "0.5.4" +version = "0.5.5" dependencies = [ "axum", "base64 0.22.1", @@ -1346,7 +1360,7 @@ dependencies = [ [[package]] name = "mycelium-cli" -version = "0.5.4" +version = "0.5.5" dependencies = [ "base64 0.22.1", "byte-unit", @@ -1363,7 +1377,7 @@ dependencies = [ [[package]] name = "mycelium-metrics" -version = "0.5.4" +version = "0.5.5" dependencies = [ "axum", "mycelium", @@ -1374,7 +1388,7 @@ dependencies = [ [[package]] name = "myceliumd" -version = "0.5.4" +version = "0.5.5" dependencies = [ "base64 0.22.1", "byte-unit", @@ -1398,13 +1412,13 @@ dependencies = [ [[package]] name = "netdev" -version = "0.30.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7516ad2c46cc25da098ed7d6b9a0cbe9e1fbffbd04b1596148b95f2841179c83" +checksum = "f901362e84cd407be6f8cd9d3a46bccf09136b095792785401ea7d283c79b91d" dependencies = [ "dlopen2", + "ipnet", "libc", - "memalloc", "netlink-packet-core", "netlink-packet-route 0.17.1", "netlink-sys", @@ -1871,15 +1885,15 @@ dependencies = [ [[package]] name = "quinn" -version = "0.11.3" +version = "0.11.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b22d8e7369034b9a7132bc2008cac12f2013c8132b45e0554e6e20e2617f2156" +checksum = "8c7c5fdde3cdae7203427dc4f0a68fe0ed09833edc525a03456b153b79828684" dependencies = [ "bytes", "pin-project-lite", "quinn-proto", "quinn-udp", - "rustc-hash 2.0.0", + "rustc-hash", "rustls", "socket2", "thiserror", @@ -1889,14 +1903,14 @@ dependencies = [ [[package]] name = "quinn-proto" -version = "0.11.2" +version = "0.11.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e974563a4b1c2206bbc61191ca4da9c22e4308b4c455e8906751cc7828393f08" +checksum = "fadfaed2cd7f389d0161bb73eeb07b7b78f8691047a6f3e73caaeae55310a4a6" dependencies = [ "bytes", "rand", "ring", - "rustc-hash 1.2.0", + "rustc-hash", "rustls", "slab", "thiserror", @@ -2189,12 +2203,6 @@ version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" -[[package]] -name = "rustc-hash" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3450ed37fe9609abb6bc3b8891b6e078404e4c53c7332350e2e15126a95229bf" - [[package]] name = "rustc-hash" version = "2.0.0" @@ -2225,9 +2233,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.12" +version = "0.23.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044" +checksum = "f2dabaac7466917e566adb06783a81ca48944c6898a1b08b9374106dd671f4c8" dependencies = [ "once_cell", "ring", @@ -2245,9 +2253,9 @@ checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d" [[package]] name = "rustls-webpki" -version = "0.102.6" +version = "0.102.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e6b52d4fda176fd835fdc55a835d4a89b8499cad995885a21149d5ad62f852e" +checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9" dependencies = [ "ring", "rustls-pki-types", @@ -2292,18 +2300,18 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.208" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cff085d2cb684faa248efb494c39b68e522822ac0de72ccf08109abde717cfb2" +checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.208" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24008e81ff7613ed8e5ba0cfaf24e2c2f1e5b8a0495711e44fcd4882fca62bcf" +checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" dependencies = [ "proc-macro2", "quote", @@ -2312,9 +2320,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.125" +version = "1.0.128" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83c8e735a073ccf5be70aa8066aa984eaf2fa000db6c8d0100ae605b366d31ed" +checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" dependencies = [ "itoa", "memchr", @@ -2425,6 +2433,12 @@ version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" +[[package]] +name = "stable_deref_trait" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" + [[package]] name = "strsim" version = "0.11.1" @@ -2611,9 +2625,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.39.3" +version = "1.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9babc99b9923bfa4804bd74722ff02c0381021eafa4db9949217e3be8e84fff5" +checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" dependencies = [ "backtrace", "bytes", @@ -2639,9 +2653,9 @@ dependencies = [ [[package]] name = "tokio-stream" -version = "0.1.15" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" +checksum = "4f4e6ce100d0eb49a2734f8c0812bcd324cf357d21810932c5df6b96ef2b86f1" dependencies = [ "futures-core", "pin-project-lite", @@ -2651,9 +2665,9 @@ dependencies = [ [[package]] name = "tokio-tun" -version = "0.11.5" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68f5381752d5832fc811f89d54fc334951aa435022f494190ba7151661f206df" +checksum = "fde69666e881ea060a36a0f39442beb843e2204beeeb2062fdfaa183add47013" dependencies = [ "libc", "nix 0.29.0", @@ -2663,9 +2677,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.11" +version = "0.7.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" +checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a" dependencies = [ "bytes", "futures-core", @@ -2735,16 +2749,31 @@ dependencies = [ ] [[package]] -name = "tower-layer" -version = "0.3.2" +name = "tower" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" +checksum = "2873938d487c3cfb9aed7546dc9f2711d867c9f90c46b889989a2cb84eba6b4f" +dependencies = [ + "futures-core", + "futures-util", + "pin-project-lite", + "sync_wrapper 0.1.2", + "tokio", + "tower-layer", + "tower-service", +] + +[[package]] +name = "tower-layer" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" [[package]] name = "tower-service" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" +checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" [[package]] name = "tracing" diff --git a/pkgs/by-name/my/mycelium/package.nix b/pkgs/by-name/my/mycelium/package.nix index 2669ff84d923..10118b45c390 100644 --- a/pkgs/by-name/my/mycelium/package.nix +++ b/pkgs/by-name/my/mycelium/package.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { pname = "mycelium"; - version = "0.5.4"; + version = "0.5.5"; sourceRoot = "${src.name}/myceliumd"; @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { owner = "threefoldtech"; repo = "mycelium"; rev = "v${version}"; - hash = "sha256-sWpy6Q7Lh0AOzWKMsb/NQ6oFcxOKXB/To9+PFmcjSks="; + hash = "sha256-IfWS7U52pviRL8oySOjBYCogwqUqoMLmvtHFSjWghHg="; }; cargoLock = { 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 228/300] 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 229/300] 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 a8e9909ddef265d91f8c91bc76245598eb0c7078 Mon Sep 17 00:00:00 2001 From: Fabian Affolter <mail@fabian-affolter.ch> Date: Mon, 30 Sep 2024 13:11:48 +0200 Subject: [PATCH 230/300] python312Packages.tplink-omada-client: 1.4.2 -> 1.4.3 Changelog: https://github.com/MarkGodwin/tplink-omada-api/releases/tag/release%2Fv1.4.3 --- .../python-modules/tplink-omada-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tplink-omada-client/default.nix b/pkgs/development/python-modules/tplink-omada-client/default.nix index 60cf57c14f29..7edc33b88e5b 100644 --- a/pkgs/development/python-modules/tplink-omada-client/default.nix +++ b/pkgs/development/python-modules/tplink-omada-client/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tplink-omada-client"; - version = "1.4.2"; + version = "1.4.3"; pyproject = true; disabled = pythonOlder "3.9"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "tplink_omada_client"; inherit version; - hash = "sha256-Dt1F7mCuRrzEk3NDVfxScSLrK0omHQFMWhYrrwc+Pq0="; + hash = "sha256-REzjeZs2Ddhw2TLD4Vp75XT2iLaxxzDK/F3UmrC1deo="; }; build-system = [ hatchling ]; 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 231/300] 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 232/300] 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 2dabc4fce1f92a94f4791be129e4f61ab0128614 Mon Sep 17 00:00:00 2001 From: Martin Weinelt <hexa@darmstadt.ccc.de> Date: Mon, 30 Sep 2024 13:24:08 +0200 Subject: [PATCH 233/300] nixos/logrotate: reorder setuid syscall group Relevant parts of @setuid are in @privileged, so we need to flip the order around, to grant @setuid in spite of denying @privileged. --- nixos/modules/services/logging/logrotate.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/logging/logrotate.nix b/nixos/modules/services/logging/logrotate.nix index 8584563d881d..412a19eadd11 100644 --- a/nixos/modules/services/logging/logrotate.nix +++ b/nixos/modules/services/logging/logrotate.nix @@ -285,9 +285,9 @@ in RestrictSUIDSGID = false; # can create sgid directories SystemCallArchitectures = "native"; SystemCallFilter = [ - "@system-service @setuid" + "@system-service" "~@privileged @resources" - "@chown" + "@chown @setuid" ]; UMask = "0027"; } // lib.optionalAttrs (!cfg.allowNetworking) { From b470814a55ab237d6121338eb1d71aacf3841f3d Mon Sep 17 00:00:00 2001 From: Gaetan Lepage <gaetan@glepage.com> Date: Sat, 28 Sep 2024 01:56:00 +0200 Subject: [PATCH 234/300] python312Packages.zpp, zpp: init at 1.1.0 --- pkgs/by-name/zp/zpp/package.nix | 3 ++ .../python-modules/zpp/default.nix | 35 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 3 files changed, 40 insertions(+) create mode 100644 pkgs/by-name/zp/zpp/package.nix create mode 100644 pkgs/development/python-modules/zpp/default.nix diff --git a/pkgs/by-name/zp/zpp/package.nix b/pkgs/by-name/zp/zpp/package.nix new file mode 100644 index 000000000000..abf58bc12fca --- /dev/null +++ b/pkgs/by-name/zp/zpp/package.nix @@ -0,0 +1,3 @@ +{ python3Packages }: + +python3Packages.toPythonApplication python3Packages.zpp diff --git a/pkgs/development/python-modules/zpp/default.nix b/pkgs/development/python-modules/zpp/default.nix new file mode 100644 index 000000000000..c30a60fa6466 --- /dev/null +++ b/pkgs/development/python-modules/zpp/default.nix @@ -0,0 +1,35 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + testers, + zpp, +}: +buildPythonPackage rec { + pname = "zpp"; + version = "1.1.0"; + + pyproject = true; + + src = fetchFromGitHub { + owner = "jbigot"; + repo = "zpp"; + rev = "refs/tags/${version}"; + hash = "sha256-Jvh80TfOonZ57lb+4PulVOUKi9Y74nplIcrPzlUPw3M="; + }; + + build-system = [ setuptools ]; + + passthru = { + tests.version = testers.testVersion { package = zpp; }; + }; + + meta = { + description = "The 'Z' pre-processor, the last preprocessor you'll ever need"; + homepage = "https://github.com/jbigot/zpp"; + license = lib.licenses.mit; + mainProgram = "zpp"; + maintainers = with lib.maintainers; [ GaetanLepage ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a27af127a4b3..a5aa74d6df42 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -17922,6 +17922,8 @@ self: super: with self; { inherit (pkgs) zopfli; }; + zpp = callPackage ../development/python-modules/zpp { }; + zstandard = callPackage ../development/python-modules/zstandard { }; zstd = callPackage ../development/python-modules/zstd { From f0ab2015ba9fd9b8217f2f260ffc35168babd43f Mon Sep 17 00:00:00 2001 From: Gaetan Lepage <gaetan@glepage.com> Date: Sat, 28 Sep 2024 02:09:09 +0200 Subject: [PATCH 235/300] pdi: init at 1.7.1 Co-authored-by: theabm <andres_bermeo@outlook.com> --- pkgs/by-name/pd/pdi/package.nix | 88 +++++++++++++++++++++++++++++++++ 1 file changed, 88 insertions(+) create mode 100644 pkgs/by-name/pd/pdi/package.nix diff --git a/pkgs/by-name/pd/pdi/package.nix b/pkgs/by-name/pd/pdi/package.nix new file mode 100644 index 000000000000..7159af6a03ae --- /dev/null +++ b/pkgs/by-name/pd/pdi/package.nix @@ -0,0 +1,88 @@ +{ + lib, + stdenv, + fetchFromGitHub, + + # nativeBuildInputs + python3, + cmake, + gfortran, + pkg-config, + hdf5-mpi, + zpp, + + # buildInputs + gbenchmark, + libyaml, + mpi, + spdlog, + + # passthru + nix-update-script, + testers, + pdi, +}: +let + python = python3.withPackages ( + p: with p; [ + distutils + setuptools + ] + ); +in +stdenv.mkDerivation rec { + pname = "pdi"; + version = "1.7.1"; + + src = fetchFromGitHub { + owner = "pdidev"; + repo = "pdi"; + rev = "refs/tags/${version}-gh"; + hash = "sha256-VTbXsUUJb/6zNyn4QXNHajgzzgjSwdW/d+bTSDcpRaE="; + }; + + # Current hdf5 version in nixpkgs is 1.14.4.3 which is 4 numbers long and doesn't match the 3 number regex. :') + # Patch it to make it match a 4 number-long version. + postPatch = '' + substituteInPlace plugins/decl_hdf5/cmake/FindHDF5.cmake \ + --replace-fail '"H5_VERSION[ \t]+\"([0-9]+\\.[0-9]+\\.[0-9]+)' '"H5_VERSION[ \t]+\"([0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+)' + ''; + + nativeBuildInputs = [ + cmake + gfortran + pkg-config + python + hdf5-mpi + zpp + ]; + + buildInputs = [ + gbenchmark + hdf5-mpi + libyaml + mpi + spdlog + ]; + + cmakeFlags = [ + # Force using nix gbenchmark instead of vendored version + "-DUSE_benchmark=SYSTEM" + ]; + + passthru = { + updateScript = nix-update-script { }; + tests.version = testers.testVersion { + package = pdi; + command = "pdirun"; + }; + }; + + meta = { + description = "PDI supports loose coupling of simulation codes with data handling libraries"; + homepage = "https://pdi.dev/master/"; + license = lib.licenses.bsd3; + mainProgram = "pdirun"; + maintainers = with lib.maintainers; [ GaetanLepage ]; + }; +} From 4ca03e3a11a5348d8057750aafa62e76ab1bd568 Mon Sep 17 00:00:00 2001 From: Martin Weinelt <hexa@darmstadt.ccc.de> Date: Mon, 30 Sep 2024 13:30:38 +0200 Subject: [PATCH 236/300] nixos/logrotate: allow sending signal to arbitrary processes Various postrotate scripts send e.g. SIGHUP to processes, to have them reload their config or reopen their logfile. --- nixos/modules/services/logging/logrotate.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/logging/logrotate.nix b/nixos/modules/services/logging/logrotate.nix index 412a19eadd11..1c161e167be8 100644 --- a/nixos/modules/services/logging/logrotate.nix +++ b/nixos/modules/services/logging/logrotate.nix @@ -261,6 +261,7 @@ in CapabilityBoundingSet = [ "CAP_CHOWN" "CAP_DAC_OVERRIDE" + "CAP_KILL" "CAP_SETUID" "CAP_SETGID" ]; 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 237/300] 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 12703cb03c729ed7b6ab0c0dae7e048cc14ea07e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" <ryantm-bot@ryantm.com> Date: Mon, 30 Sep 2024 11:53:49 +0000 Subject: [PATCH 238/300] riffdiff: 3.3.0 -> 3.3.1 --- pkgs/tools/text/riffdiff/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/riffdiff/default.nix b/pkgs/tools/text/riffdiff/default.nix index 6dcf1d84af14..6d8c4cd28c0b 100644 --- a/pkgs/tools/text/riffdiff/default.nix +++ b/pkgs/tools/text/riffdiff/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "riffdiff"; - version = "3.3.0"; + version = "3.3.1"; src = fetchFromGitHub { owner = "walles"; repo = "riff"; rev = version; - hash = "sha256-Vbze2WSrZOboLFcsnRYbfsWz6gbMEszDWEMQUNZAzLY="; + hash = "sha256-V+YR0j0Dpmsc2psXb/sb/Rp4Eu8/uuBAkmYTPOfkC+g="; }; - cargoHash = "sha256-/R2RSsNRpCI/LTXlF0UtdIjWrBDJaEOASTeAtyNwS0M="; + cargoHash = "sha256-/xUMfORiZVj5RmDweLCDdD6MkgzCIsTdiYpyO3CDT+M="; meta = with lib; { description = "Diff filter highlighting which line parts have changed"; From 7816a35ee7d8b980bd106c3a340baa0ea9739ff2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 Sep 2024 11:58:38 +0000 Subject: [PATCH 239/300] build(deps): bump cachix/install-nix-action from 27 to 29 Bumps [cachix/install-nix-action](https://github.com/cachix/install-nix-action) from 27 to 29. - [Release notes](https://github.com/cachix/install-nix-action/releases) - [Commits](https://github.com/cachix/install-nix-action/compare/ba0dd844c9180cbf77aa72a116d6fbc515d0e87b...9f70348d77d0422624097c4b7a75563948901306) --- updated-dependencies: - dependency-name: cachix/install-nix-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> --- .github/workflows/basic-eval.yml | 2 +- .github/workflows/check-maintainers-sorted.yaml | 2 +- .github/workflows/check-nix-format.yml | 2 +- .github/workflows/check-nixf-tidy.yml | 2 +- .github/workflows/check-shell.yml | 4 ++-- .github/workflows/editorconfig.yml | 2 +- .github/workflows/manual-nixos.yml | 2 +- .github/workflows/manual-nixpkgs.yml | 2 +- .github/workflows/nix-parse.yml | 2 +- .github/workflows/nixpkgs-vet.yml | 2 +- .github/workflows/update-terraform-providers.yml | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/basic-eval.yml b/.github/workflows/basic-eval.yml index fc7df3a1aa8d..b07daabad5d4 100644 --- a/.github/workflows/basic-eval.yml +++ b/.github/workflows/basic-eval.yml @@ -20,7 +20,7 @@ jobs: # we don't limit this action to only NixOS repo since the checks are cheap and useful developer feedback steps: - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - - uses: cachix/install-nix-action@ba0dd844c9180cbf77aa72a116d6fbc515d0e87b # v27 + - uses: cachix/install-nix-action@9f70348d77d0422624097c4b7a75563948901306 # v29 - uses: cachix/cachix-action@ad2ddac53f961de1989924296a1f236fcfbaa4fc # v15 with: # This cache is for the nixpkgs repo checks and should not be trusted or used elsewhere. diff --git a/.github/workflows/check-maintainers-sorted.yaml b/.github/workflows/check-maintainers-sorted.yaml index f9e744a6a0c5..284cee5330d7 100644 --- a/.github/workflows/check-maintainers-sorted.yaml +++ b/.github/workflows/check-maintainers-sorted.yaml @@ -21,7 +21,7 @@ jobs: sparse-checkout: | lib maintainers - - uses: cachix/install-nix-action@ba0dd844c9180cbf77aa72a116d6fbc515d0e87b # v27 + - uses: cachix/install-nix-action@9f70348d77d0422624097c4b7a75563948901306 # v29 with: # explicitly enable sandbox extra_nix_config: sandbox = true diff --git a/.github/workflows/check-nix-format.yml b/.github/workflows/check-nix-format.yml index bcf0627ee22c..a0a081caaca6 100644 --- a/.github/workflows/check-nix-format.yml +++ b/.github/workflows/check-nix-format.yml @@ -38,7 +38,7 @@ jobs: # This should not be a URL, because it would allow PRs to run arbitrary code in CI! rev=$(jq -r .rev ci/pinned-nixpkgs.json) echo "url=https://github.com/NixOS/nixpkgs/archive/$rev.tar.gz" >> "$GITHUB_ENV" - - uses: cachix/install-nix-action@ba0dd844c9180cbf77aa72a116d6fbc515d0e87b # v27 + - uses: cachix/install-nix-action@9f70348d77d0422624097c4b7a75563948901306 # v29 with: # explicitly enable sandbox extra_nix_config: sandbox = true diff --git a/.github/workflows/check-nixf-tidy.yml b/.github/workflows/check-nixf-tidy.yml index a3f37d8131c8..da6917282705 100644 --- a/.github/workflows/check-nixf-tidy.yml +++ b/.github/workflows/check-nixf-tidy.yml @@ -32,7 +32,7 @@ jobs: # This should not be a URL, because it would allow PRs to run arbitrary code in CI! rev=$(jq -r .rev ci/pinned-nixpkgs.json) echo "url=https://github.com/NixOS/nixpkgs/archive/$rev.tar.gz" >> "$GITHUB_ENV" - - uses: cachix/install-nix-action@ba0dd844c9180cbf77aa72a116d6fbc515d0e87b # v27 + - uses: cachix/install-nix-action@9f70348d77d0422624097c4b7a75563948901306 # v29 with: # explicitly enable sandbox extra_nix_config: sandbox = true diff --git a/.github/workflows/check-shell.yml b/.github/workflows/check-shell.yml index 0ecc3b0c7baf..0959184fe45f 100644 --- a/.github/workflows/check-shell.yml +++ b/.github/workflows/check-shell.yml @@ -14,7 +14,7 @@ jobs: with: # pull_request_target checks out the base branch by default ref: refs/pull/${{ github.event.pull_request.number }}/merge - - uses: cachix/install-nix-action@ba0dd844c9180cbf77aa72a116d6fbc515d0e87b # v27 + - uses: cachix/install-nix-action@9f70348d77d0422624097c4b7a75563948901306 # v29 - name: Build shell run: nix-build shell.nix @@ -26,6 +26,6 @@ jobs: with: # pull_request_target checks out the base branch by default ref: refs/pull/${{ github.event.pull_request.number }}/merge - - uses: cachix/install-nix-action@ba0dd844c9180cbf77aa72a116d6fbc515d0e87b # v27 + - uses: cachix/install-nix-action@9f70348d77d0422624097c4b7a75563948901306 # v29 - name: Build shell run: nix-build shell.nix diff --git a/.github/workflows/editorconfig.yml b/.github/workflows/editorconfig.yml index 26530f30f468..2fc83feff77a 100644 --- a/.github/workflows/editorconfig.yml +++ b/.github/workflows/editorconfig.yml @@ -29,7 +29,7 @@ jobs: with: # pull_request_target checks out the base branch by default ref: refs/pull/${{ github.event.pull_request.number }}/merge - - uses: cachix/install-nix-action@ba0dd844c9180cbf77aa72a116d6fbc515d0e87b # v27 + - uses: cachix/install-nix-action@9f70348d77d0422624097c4b7a75563948901306 # v29 with: # nixpkgs commit is pinned so that it doesn't break # editorconfig-checker 2.4.0 diff --git a/.github/workflows/manual-nixos.yml b/.github/workflows/manual-nixos.yml index 002d44c8797d..c8be2404eb55 100644 --- a/.github/workflows/manual-nixos.yml +++ b/.github/workflows/manual-nixos.yml @@ -19,7 +19,7 @@ jobs: with: # pull_request_target checks out the base branch by default ref: refs/pull/${{ github.event.pull_request.number }}/merge - - uses: cachix/install-nix-action@ba0dd844c9180cbf77aa72a116d6fbc515d0e87b # v27 + - uses: cachix/install-nix-action@9f70348d77d0422624097c4b7a75563948901306 # v29 with: # explicitly enable sandbox extra_nix_config: sandbox = true diff --git a/.github/workflows/manual-nixpkgs.yml b/.github/workflows/manual-nixpkgs.yml index 00e84854495a..d2a4888f0363 100644 --- a/.github/workflows/manual-nixpkgs.yml +++ b/.github/workflows/manual-nixpkgs.yml @@ -21,7 +21,7 @@ jobs: with: # pull_request_target checks out the base branch by default ref: refs/pull/${{ github.event.pull_request.number }}/merge - - uses: cachix/install-nix-action@ba0dd844c9180cbf77aa72a116d6fbc515d0e87b # v27 + - uses: cachix/install-nix-action@9f70348d77d0422624097c4b7a75563948901306 # v29 with: # explicitly enable sandbox extra_nix_config: sandbox = true diff --git a/.github/workflows/nix-parse.yml b/.github/workflows/nix-parse.yml index 7f55322d85e6..e0793231c73c 100644 --- a/.github/workflows/nix-parse.yml +++ b/.github/workflows/nix-parse.yml @@ -30,7 +30,7 @@ jobs: # pull_request_target checks out the base branch by default ref: refs/pull/${{ github.event.pull_request.number }}/merge if: ${{ env.CHANGED_FILES && env.CHANGED_FILES != '' }} - - uses: cachix/install-nix-action@ba0dd844c9180cbf77aa72a116d6fbc515d0e87b # v27 + - uses: cachix/install-nix-action@9f70348d77d0422624097c4b7a75563948901306 # v29 with: nix_path: nixpkgs=channel:nixpkgs-unstable - name: Parse all changed or added nix files diff --git a/.github/workflows/nixpkgs-vet.yml b/.github/workflows/nixpkgs-vet.yml index 4f244b94feff..badfa851103d 100644 --- a/.github/workflows/nixpkgs-vet.yml +++ b/.github/workflows/nixpkgs-vet.yml @@ -85,7 +85,7 @@ jobs: base=$(mktemp -d) git worktree add "$base" "$(git rev-parse HEAD^1)" echo "base=$base" >> "$GITHUB_ENV" - - uses: cachix/install-nix-action@ba0dd844c9180cbf77aa72a116d6fbc515d0e87b # v27 + - uses: cachix/install-nix-action@9f70348d77d0422624097c4b7a75563948901306 # v29 if: env.mergedSha - name: Fetching the pinned tool if: env.mergedSha diff --git a/.github/workflows/update-terraform-providers.yml b/.github/workflows/update-terraform-providers.yml index 99762a2269e2..4accaf24a6a2 100644 --- a/.github/workflows/update-terraform-providers.yml +++ b/.github/workflows/update-terraform-providers.yml @@ -17,7 +17,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - - uses: cachix/install-nix-action@ba0dd844c9180cbf77aa72a116d6fbc515d0e87b # v27 + - uses: cachix/install-nix-action@9f70348d77d0422624097c4b7a75563948901306 # v29 with: nix_path: nixpkgs=channel:nixpkgs-unstable - name: setup From b93144cbc0c1f3a9351ed25dd89b1f2798ff7a6d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 Sep 2024 12:02:46 +0000 Subject: [PATCH 240/300] build(deps): bump actions/checkout from 4.1.7 to 4.2.0 Bumps [actions/checkout](https://github.com/actions/checkout) from 4.1.7 to 4.2.0. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/692973e3d937129bcbf40652eb9f2f61becf3332...d632683dd7b4114ad314bca15554477dd762a938) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> --- .github/workflows/backport.yml | 2 +- .github/workflows/basic-eval.yml | 2 +- .github/workflows/check-cherry-picks.yml | 2 +- .github/workflows/check-maintainers-sorted.yaml | 2 +- .github/workflows/check-nix-format.yml | 2 +- .github/workflows/check-nixf-tidy.yml | 2 +- .github/workflows/check-shell.yml | 4 ++-- .github/workflows/editorconfig.yml | 2 +- .github/workflows/manual-nixos.yml | 2 +- .github/workflows/manual-nixpkgs.yml | 2 +- .github/workflows/nix-parse.yml | 2 +- .github/workflows/nixpkgs-vet.yml | 2 +- .github/workflows/periodic-merge-24h.yml | 2 +- .github/workflows/periodic-merge-6h.yml | 2 +- .github/workflows/update-terraform-providers.yml | 2 +- 15 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml index 49ab3fefb64d..dba5f9bcf319 100644 --- a/.github/workflows/backport.yml +++ b/.github/workflows/backport.yml @@ -20,7 +20,7 @@ jobs: if: github.repository_owner == 'NixOS' && github.event.pull_request.merged == true && (github.event_name != 'labeled' || startsWith('backport', github.event.label.name)) runs-on: ubuntu-latest steps: - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 with: ref: ${{ github.event.pull_request.head.sha }} - name: Create backport PRs diff --git a/.github/workflows/basic-eval.yml b/.github/workflows/basic-eval.yml index b07daabad5d4..05e8f34c4c87 100644 --- a/.github/workflows/basic-eval.yml +++ b/.github/workflows/basic-eval.yml @@ -19,7 +19,7 @@ jobs: runs-on: ubuntu-latest # we don't limit this action to only NixOS repo since the checks are cheap and useful developer feedback steps: - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 - uses: cachix/install-nix-action@9f70348d77d0422624097c4b7a75563948901306 # v29 - uses: cachix/cachix-action@ad2ddac53f961de1989924296a1f236fcfbaa4fc # v15 with: diff --git a/.github/workflows/check-cherry-picks.yml b/.github/workflows/check-cherry-picks.yml index 15fc04034612..7e2758344571 100644 --- a/.github/workflows/check-cherry-picks.yml +++ b/.github/workflows/check-cherry-picks.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest if: github.repository_owner == 'NixOS' steps: - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 with: fetch-depth: 0 filter: blob:none diff --git a/.github/workflows/check-maintainers-sorted.yaml b/.github/workflows/check-maintainers-sorted.yaml index 284cee5330d7..fa67090fef65 100644 --- a/.github/workflows/check-maintainers-sorted.yaml +++ b/.github/workflows/check-maintainers-sorted.yaml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-latest if: github.repository_owner == 'NixOS' steps: - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 with: # pull_request_target checks out the base branch by default ref: refs/pull/${{ github.event.pull_request.number }}/merge diff --git a/.github/workflows/check-nix-format.yml b/.github/workflows/check-nix-format.yml index a0a081caaca6..b4acf86e248e 100644 --- a/.github/workflows/check-nix-format.yml +++ b/.github/workflows/check-nix-format.yml @@ -18,7 +18,7 @@ jobs: runs-on: ubuntu-latest if: "!contains(github.event.pull_request.title, '[skip treewide]')" steps: - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 with: # pull_request_target checks out the base branch by default ref: refs/pull/${{ github.event.pull_request.number }}/merge diff --git a/.github/workflows/check-nixf-tidy.yml b/.github/workflows/check-nixf-tidy.yml index da6917282705..f003ba81f1f7 100644 --- a/.github/workflows/check-nixf-tidy.yml +++ b/.github/workflows/check-nixf-tidy.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest if: "!contains(github.event.pull_request.title, '[skip treewide]')" steps: - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 with: # pull_request_target checks out the base branch by default ref: refs/pull/${{ github.event.pull_request.number }}/merge diff --git a/.github/workflows/check-shell.yml b/.github/workflows/check-shell.yml index 0959184fe45f..6ed60df98e95 100644 --- a/.github/workflows/check-shell.yml +++ b/.github/workflows/check-shell.yml @@ -10,7 +10,7 @@ jobs: name: shell-check-x86_64-linux runs-on: ubuntu-latest steps: - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 with: # pull_request_target checks out the base branch by default ref: refs/pull/${{ github.event.pull_request.number }}/merge @@ -22,7 +22,7 @@ jobs: name: shell-check-aarch64-darwin runs-on: macos-latest steps: - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 with: # pull_request_target checks out the base branch by default ref: refs/pull/${{ github.event.pull_request.number }}/merge diff --git a/.github/workflows/editorconfig.yml b/.github/workflows/editorconfig.yml index 2fc83feff77a..7d11370973fc 100644 --- a/.github/workflows/editorconfig.yml +++ b/.github/workflows/editorconfig.yml @@ -25,7 +25,7 @@ jobs: - name: print list of changed files run: | cat "$HOME/changed_files" - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 with: # pull_request_target checks out the base branch by default ref: refs/pull/${{ github.event.pull_request.number }}/merge diff --git a/.github/workflows/manual-nixos.yml b/.github/workflows/manual-nixos.yml index c8be2404eb55..d7a3bd664eb8 100644 --- a/.github/workflows/manual-nixos.yml +++ b/.github/workflows/manual-nixos.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-latest if: github.repository_owner == 'NixOS' steps: - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 with: # pull_request_target checks out the base branch by default ref: refs/pull/${{ github.event.pull_request.number }}/merge diff --git a/.github/workflows/manual-nixpkgs.yml b/.github/workflows/manual-nixpkgs.yml index d2a4888f0363..c7a1891ff0fe 100644 --- a/.github/workflows/manual-nixpkgs.yml +++ b/.github/workflows/manual-nixpkgs.yml @@ -17,7 +17,7 @@ jobs: runs-on: ubuntu-latest if: github.repository_owner == 'NixOS' steps: - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 with: # pull_request_target checks out the base branch by default ref: refs/pull/${{ github.event.pull_request.number }}/merge diff --git a/.github/workflows/nix-parse.yml b/.github/workflows/nix-parse.yml index e0793231c73c..bfafcacfdc08 100644 --- a/.github/workflows/nix-parse.yml +++ b/.github/workflows/nix-parse.yml @@ -25,7 +25,7 @@ jobs: if [[ -s "$HOME/changed_files" ]]; then echo "CHANGED_FILES=$HOME/changed_files" > "$GITHUB_ENV" fi - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 with: # pull_request_target checks out the base branch by default ref: refs/pull/${{ github.event.pull_request.number }}/merge diff --git a/.github/workflows/nixpkgs-vet.yml b/.github/workflows/nixpkgs-vet.yml index badfa851103d..807715fc65a0 100644 --- a/.github/workflows/nixpkgs-vet.yml +++ b/.github/workflows/nixpkgs-vet.yml @@ -72,7 +72,7 @@ jobs: else echo "The PR cannot be merged, it has a merge conflict, skipping the rest.." fi - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 if: env.mergedSha with: # pull_request_target checks out the base branch by default diff --git a/.github/workflows/periodic-merge-24h.yml b/.github/workflows/periodic-merge-24h.yml index 519d90c442d9..6101101ac47d 100644 --- a/.github/workflows/periodic-merge-24h.yml +++ b/.github/workflows/periodic-merge-24h.yml @@ -41,7 +41,7 @@ jobs: into: staging-24.05 name: ${{ matrix.pairs.from }} → ${{ matrix.pairs.into }} steps: - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 - name: ${{ matrix.pairs.from }} → ${{ matrix.pairs.into }} uses: devmasx/merge-branch@854d3ac71ed1e9deb668e0074781b81fdd6e771f # 1.4.0 diff --git a/.github/workflows/periodic-merge-6h.yml b/.github/workflows/periodic-merge-6h.yml index ed2a8a79e361..946ab30fe318 100644 --- a/.github/workflows/periodic-merge-6h.yml +++ b/.github/workflows/periodic-merge-6h.yml @@ -39,7 +39,7 @@ jobs: into: staging name: ${{ matrix.pairs.from }} → ${{ matrix.pairs.into }} steps: - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 - name: ${{ matrix.pairs.from }} → ${{ matrix.pairs.into }} uses: devmasx/merge-branch@854d3ac71ed1e9deb668e0074781b81fdd6e771f # 1.4.0 diff --git a/.github/workflows/update-terraform-providers.yml b/.github/workflows/update-terraform-providers.yml index 4accaf24a6a2..9d4f129fead9 100644 --- a/.github/workflows/update-terraform-providers.yml +++ b/.github/workflows/update-terraform-providers.yml @@ -16,7 +16,7 @@ jobs: if: github.repository_owner == 'NixOS' && github.ref == 'refs/heads/master' # ensure workflow_dispatch only runs on master runs-on: ubuntu-latest steps: - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 - uses: cachix/install-nix-action@9f70348d77d0422624097c4b7a75563948901306 # v29 with: nix_path: nixpkgs=channel:nixpkgs-unstable From fb7950b962e2a3637bc97e4dbed6870ddca806d5 Mon Sep 17 00:00:00 2001 From: Kerstin Humm <kerstin@erictapen.name> Date: Mon, 30 Sep 2024 14:11:44 +0200 Subject: [PATCH 241/300] mastodon: 4.2.12 -> 4.2.13 Changelog: https://github.com/mastodon/mastodon/releases/tag/v4.2.13 --- pkgs/servers/mastodon/gemset.nix | 55 +++++++++++++------------------- pkgs/servers/mastodon/source.nix | 4 +-- 2 files changed, 24 insertions(+), 35 deletions(-) diff --git a/pkgs/servers/mastodon/gemset.nix b/pkgs/servers/mastodon/gemset.nix index d6e73054a717..20be6e58e3d8 100644 --- a/pkgs/servers/mastodon/gemset.nix +++ b/pkgs/servers/mastodon/gemset.nix @@ -610,10 +610,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qh1b14jwbbj242klkyz5fc7npd4j0mvndz62gajhvl1l3wd7zc2"; + sha256 = "0chwfdq2a6kbj6xz9l6zrdfnyghnh32si82la1dnpa5h75ir5anl"; type = "gem"; }; - version = "1.2.3"; + version = "1.3.4"; }; connection_pool = { groups = ["default" "test"]; @@ -895,10 +895,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1d2z4ky2v15dpcz672i2p7lb2nc793dasq3yq3660h2az53kss9v"; + sha256 = "0r6zylqjfv0xhdxvldr0kgmnglm57nm506pcm6085f0xqa68cvnj"; type = "gem"; }; - version = "1.2.7"; + version = "1.2.11"; }; excon = { groups = ["default"]; @@ -1144,10 +1144,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1cm2lrvhrpqq19hbdsxf4lq2nkb2qdldbdxh3gvi15l62dlb5zqq"; + sha256 = "0s4qhq3mjl0gak5wl20w9d5jhq069mk1393dkj76s8i2pvkqb578"; type = "gem"; }; - version = "1.8.1"; + version = "1.11.1"; }; fuubar = { dependencies = ["rspec-core" "ruby-progressbar"]; @@ -1881,10 +1881,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vz1ychq2fhfqjgqdrx8bqkaxg5dzcgwnah00m57ydylczfy8pwk"; + sha256 = "15gysw8rassqgdq3kwgl4mhqmrgh7nk2qvrcqp4ijyqazgywn6gq"; type = "gem"; }; - version = "1.16.6"; + version = "1.16.7"; }; nsa = { dependencies = ["activesupport" "concurrent-ruby" "sidekiq" "statsd-ruby"]; @@ -1913,10 +1913,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15xjsxis357np7dy1lak39x1n8g8wxljb08wplw5i4gxi743zr7j"; + sha256 = "1km0wqx9pj609jidvrqfsvzbzfgdnlpdnv7i7xfqm3wb55vk5w6y"; type = "gem"; }; - version = "2.1.1"; + version = "2.1.2"; }; omniauth-cas = { dependencies = ["addressable" "nokogiri" "omniauth"]; @@ -1948,10 +1948,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01k9rkg97npcgm8r4x3ja8y20hsg4zy0dcjpzafx148q4yxbg74n"; + sha256 = "05idjrc01nmmqz4g7kv16xd9yfzzvyibxzfrxk8rcwd1p0zgsxnb"; type = "gem"; }; - version = "2.1.0"; + version = "2.1.2"; }; omniauth_openid_connect = { dependencies = ["omniauth" "openid_connect"]; @@ -2127,10 +2127,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0i2vaww6qcazj0ywva1plmjnj6rk23b01szswc5jhcq7s2cikd1y"; + sha256 = "0gml1rixrfb0naciq3mrnqkpcvm9ahgps1c04hzxh4b801f69914"; type = "gem"; }; - version = "6.4.2"; + version = "6.4.3"; }; pundit = { dependencies = ["activesupport"]; @@ -2158,10 +2158,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01b9662zd2x9bp4rdjfid07h09zxj7kvn7f5fghbqhzc625ap1dp"; + sha256 = "0byn0c9nkahsl93y9ln5bysq4j31q8xkf2ws42swighxd4lnjzsa"; type = "gem"; }; - version = "1.7.3"; + version = "1.8.1"; }; rack = { groups = ["default" "development" "pam_authentication" "production" "test"]; @@ -2212,10 +2212,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1a12m1mv8dc0g90fs1myvis8vsgr427k1arg1q4a9qlfw6fqyhis"; + sha256 = "1kpm67az1wxlg76h620in2r7agfyhv177ps268j5ggsanzddzih8"; type = "gem"; }; - version = "3.0.5"; + version = "3.0.6"; }; rack-proxy = { dependencies = ["rack"]; @@ -2435,15 +2435,14 @@ version = "3.1.0"; }; rexml = { - dependencies = ["strscan"]; groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0gccz5lixnddazvhksmj7l7hjwzjra2kz3qfyrzl2bz1q9h80bzh"; + sha256 = "09shc1dvg88c4yx83d4c9wf26z838nlapa3cmlq8iqdci39a98v2"; type = "gem"; }; - version = "3.3.5"; + version = "3.3.7"; }; rotp = { groups = ["default"]; @@ -2674,10 +2673,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18vnbzin5ypxrgcs9lllg7x311b69dyrdw2w1pwz84438hmxm79s"; + sha256 = "1adq06m684gnpjp6qyb8shgj8jjy2npcfg7y6mg2ab9ilfdq6684"; type = "gem"; }; - version = "1.15.0"; + version = "1.17.0"; }; ruby2_keywords = { groups = ["default"]; @@ -2946,16 +2945,6 @@ }; version = "0.8.0"; }; - strscan = { - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0mamrl7pxacbc79ny5hzmakc9grbjysm3yy6119ppgsg44fsif01"; - type = "gem"; - }; - version = "3.1.0"; - }; swd = { dependencies = ["activesupport" "attr_required" "httpclient"]; groups = ["default"]; diff --git a/pkgs/servers/mastodon/source.nix b/pkgs/servers/mastodon/source.nix index 0b2fd5b57e09..dccf253ea938 100644 --- a/pkgs/servers/mastodon/source.nix +++ b/pkgs/servers/mastodon/source.nix @@ -1,7 +1,7 @@ # This file was generated by pkgs.mastodon.updateScript. { fetchFromGitHub, applyPatches, patches ? [] }: let - version = "4.2.12"; + version = "4.2.13"; in ( applyPatches { @@ -9,7 +9,7 @@ in owner = "mastodon"; repo = "mastodon"; rev = "v${version}"; - hash = "sha256-q+j7zHJrIUOumJfk4w5BVu7eTUa1AjI5ho8XoOA2uJU="; + hash = "sha256-+HGu02fjYJ1x6Tk9AdqmFN7JHk3UnlvCdiQ/5yMu69M="; }; patches = patches ++ []; }) // { From 4121a101281e4a9829e1629cf45b3bbe87200ae4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com> Date: Mon, 30 Sep 2024 14:35:29 +0200 Subject: [PATCH 242/300] ktailctl: 0.18.0 -> 0.18.1 Changelog: https://github.com/f-koehler/KTailctl/releases/tag/v0.18.1 --- pkgs/applications/networking/ktailctl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/ktailctl/default.nix b/pkgs/applications/networking/ktailctl/default.nix index ae8e63b0da2f..5c691e239d21 100644 --- a/pkgs/applications/networking/ktailctl/default.nix +++ b/pkgs/applications/networking/ktailctl/default.nix @@ -23,13 +23,13 @@ }: let - version = "0.18.0"; + version = "0.18.1"; src = fetchFromGitHub { owner = "f-koehler"; repo = "KTailctl"; rev = "v${version}"; - hash = "sha256-tZnwn94qZyQ8JAC6Y1dDTmc7Cob+kMZnEaP7+EytbH8="; + hash = "sha256-hlpxim4Vm/C37ts+Q/t9swCejKEE97R1QlP+Y2jNWoM="; }; goDeps = (buildGo123Module { From 999a78cb08ce73b3dad6ca7eea673826193b83ee Mon Sep 17 00:00:00 2001 From: "R. Ryantm" <ryantm-bot@ryantm.com> Date: Mon, 30 Sep 2024 12:45:57 +0000 Subject: [PATCH 243/300] python312Packages.langsmith: 0.1.125 -> 0.1.129 --- pkgs/development/python-modules/langsmith/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/langsmith/default.nix b/pkgs/development/python-modules/langsmith/default.nix index 5ce0f9c33367..2a9d8446fb55 100644 --- a/pkgs/development/python-modules/langsmith/default.nix +++ b/pkgs/development/python-modules/langsmith/default.nix @@ -27,14 +27,14 @@ buildPythonPackage rec { pname = "langsmith"; - version = "0.1.125"; + version = "0.1.129"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langsmith-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-0/ych7iP7G75R2kGaXzsxSy4jRYCvxeqd8aBq4QhRgI="; + hash = "sha256-GIWDGr6zd/YaSgcSrIw0a1Ul9RxdmtJBMTEbGapudtw="; }; sourceRoot = "${src.name}/python"; From 320dac95fb09a0d1863fabb4b5ab1ecad7da1731 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" <ryantm-bot@ryantm.com> Date: Fri, 27 Sep 2024 12:57:47 +0000 Subject: [PATCH 244/300] envio: 0.5.1 -> 0.6.1 --- pkgs/by-name/en/envio/package.nix | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/en/envio/package.nix b/pkgs/by-name/en/envio/package.nix index b1037be41ac7..adbd6607eee5 100644 --- a/pkgs/by-name/en/envio/package.nix +++ b/pkgs/by-name/en/envio/package.nix @@ -13,29 +13,22 @@ let in rustPlatform.buildRustPackage rec { pname = "envio"; - version = "0.5.1"; + version = "0.6.1"; src = fetchFromGitHub { owner = "envio-cli"; repo = "envio"; rev = "v${version}"; - hash = "sha256-KhjHd+1IeKdASeYP2rPtyTmtkPcBbaruylmOwTPtFgo="; + hash = "sha256-je0DBoBIayFK//Aija5bnO/2z+hxNWgVkwOgxMyq5s4="; }; - cargoHash = "sha256-qmJUARwsGln07RAX1Ab0cNDgJq7NkezuT0tZsyd48Mw="; + cargoHash = "sha256-L7GgPocj32zAfR27dgKK7/OM106cATdCqufSvG3MFYQ="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libgpg-error gpgme ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; - # Remove postPatch when updating to the next envio release - # For details see https://github.com/envio-cli/envio/pull/31 - postPatch = '' - substituteInPlace build.rs\ - --replace 'fn get_version() -> String {' 'fn get_version() -> String { return "${version}".to_string();' - ''; - meta = with lib; { homepage = "https://envio-cli.github.io/home"; changelog = "https://github.com/envio-cli/envio/blob/${version}/CHANGELOG.md"; From 61e7e2e9659097f26ab7e056c3b7373c3f38506a Mon Sep 17 00:00:00 2001 From: Alexis Hildebrandt <afh@surryhill.net> Date: Sun, 29 Sep 2024 17:08:56 +0200 Subject: [PATCH 245/300] envio: add manpage, reformat using nixfmt-rfc-style --- pkgs/by-name/en/envio/package.nix | 45 ++++++++++++++++++++----------- 1 file changed, 30 insertions(+), 15 deletions(-) diff --git a/pkgs/by-name/en/envio/package.nix b/pkgs/by-name/en/envio/package.nix index adbd6607eee5..c723ba7dc996 100644 --- a/pkgs/by-name/en/envio/package.nix +++ b/pkgs/by-name/en/envio/package.nix @@ -1,11 +1,14 @@ -{ lib -, stdenv -, fetchFromGitHub -, darwin -, gpgme -, libgpg-error -, pkg-config -, rustPlatform +{ + lib, + stdenv, + fetchFromGitHub, + fetchpatch, + installShellFiles, + darwin, + gpgme, + libgpg-error, + pkg-config, + rustPlatform, }: let @@ -24,14 +27,23 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-L7GgPocj32zAfR27dgKK7/OM106cATdCqufSvG3MFYQ="; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ + pkg-config + installShellFiles + ]; - buildInputs = [ libgpg-error gpgme ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; + buildInputs = [ + libgpg-error + gpgme + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; + + postInstall = '' + installManPage man/*.1 + ''; meta = with lib; { - homepage = "https://envio-cli.github.io/home"; - changelog = "https://github.com/envio-cli/envio/blob/${version}/CHANGELOG.md"; + homepage = "https://envio-cli.github.io/home"; + changelog = "https://github.com/envio-cli/envio/blob/${version}/CHANGELOG.md"; description = "Modern and secure CLI tool for managing environment variables"; mainProgram = "envio"; longDescription = '' @@ -40,8 +52,11 @@ rustPlatform.buildRustPackage rec { switch between different configurations and apply them to their current environment. ''; - license = with licenses; [ mit asl20 ]; - platforms = platforms.unix; + license = with licenses; [ + mit + asl20 + ]; + platforms = platforms.unix; maintainers = with maintainers; [ afh ]; }; } 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 246/300] 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 fa9f5ff086a7b9cba09803bc38a9d260ea8ca559 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" <ryantm-bot@ryantm.com> Date: Sun, 29 Sep 2024 20:36:13 +0000 Subject: [PATCH 247/300] oelint-adv: 6.0.0 -> 6.1.0, fetch source from github, enable tests --- pkgs/by-name/oe/oelint-adv/package.nix | 56 ++++++++++++++++++-------- 1 file changed, 40 insertions(+), 16 deletions(-) diff --git a/pkgs/by-name/oe/oelint-adv/package.nix b/pkgs/by-name/oe/oelint-adv/package.nix index 572bca21f63e..4d23cd3a611c 100644 --- a/pkgs/by-name/oe/oelint-adv/package.nix +++ b/pkgs/by-name/oe/oelint-adv/package.nix @@ -1,21 +1,27 @@ -{ lib -, nix-update-script -, python3 -, fetchPypi +{ + lib, + nix-update-script, + python3Packages, + fetchFromGitHub, }: -python3.pkgs.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "oelint-adv"; - version = "6.0.0"; - format = "setuptools"; + version = "6.1.0"; + pyproject = true; - src = fetchPypi { - inherit version; - pname = "oelint_adv"; - hash = "sha256-tN+DHLj/sey8CipQT5nnwym0JkiIkR8WJg2jKys+4Yk="; + src = fetchFromGitHub { + owner = "priv-kweihmann"; + repo = "oelint-adv"; + rev = "refs/tags/${version}"; + hash = "sha256-bDttjeHcIK90W7zPrKNAS4B1L9mibaRjQdnUAU2N8as="; }; - propagatedBuildInputs = with python3.pkgs; [ + build-system = with python3Packages; [ + setuptools + ]; + + dependencies = with python3Packages; [ anytree argcomplete colorama @@ -23,14 +29,32 @@ python3.pkgs.buildPythonApplication rec { urllib3 ]; - pythonRelaxDeps = [ "urllib3" ]; + nativeCheckInputs = with python3Packages; [ + pytest-cov-stub + pytest-forked + pytest-xdist + pytestCheckHook + ]; + + disabledTests = [ + # requires network access + "TestClassOelintVarsHomepagePing" + ]; + + pythonRelaxDeps = [ "argcomplete" ]; + pythonImportsCheck = [ "oelint_adv" ]; - # Fail to run inside the code the build. - doCheck = false; - passthru.updateScript = nix-update-script { }; + postPatch = '' + substituteInPlace setup.cfg \ + --replace-fail "--random-order-bucket=global" "" \ + --replace-fail "--random-order" "" \ + --replace-fail "--force-sugar" "" \ + --replace-fail "--old-summary" "" + ''; + meta = with lib; { description = "Advanced bitbake-recipe linter"; mainProgram = "oelint-adv"; From b47b572e215325aa16f007e00857808298be5d0e Mon Sep 17 00:00:00 2001 From: Martin Weinelt <hexa@darmstadt.ccc.de> Date: Mon, 30 Sep 2024 15:50:13 +0200 Subject: [PATCH 248/300] nixos/freeradius: fix group assignment for radius user --- nixos/modules/services/networking/freeradius.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/freeradius.nix b/nixos/modules/services/networking/freeradius.nix index 19e5b0af1c9d..d747219b29cb 100644 --- a/nixos/modules/services/networking/freeradius.nix +++ b/nixos/modules/services/networking/freeradius.nix @@ -74,7 +74,7 @@ in /*uid = config.ids.uids.radius;*/ description = "Radius daemon user"; isSystemUser = true; - groups = "radius"; + group = "radius"; }; groups.radius = {}; }; 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 249/300] 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 250/300] 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 5dad232a986458775fc3e03debc5e5781faf1d76 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" <ryantm-bot@ryantm.com> Date: Mon, 30 Sep 2024 14:37:18 +0000 Subject: [PATCH 251/300] melonDS: 0.9.5-unstable-2024-09-18 -> 0.9.5-unstable-2024-09-29 --- pkgs/by-name/me/melonDS/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/me/melonDS/package.nix b/pkgs/by-name/me/melonDS/package.nix index e6d1f3928842..d08bd3c5af83 100644 --- a/pkgs/by-name/me/melonDS/package.nix +++ b/pkgs/by-name/me/melonDS/package.nix @@ -27,13 +27,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "melonDS"; - version = "0.9.5-unstable-2024-09-18"; + version = "0.9.5-unstable-2024-09-29"; src = fetchFromGitHub { owner = "melonDS-emu"; repo = "melonDS"; - rev = "2179ca2a417e356f23a09cd88707b20c1bcaf66f"; - hash = "sha256-93KbpRlVVZc8JoaZiVLKOsTezLqY2Y7J2bFL7RkCcxM="; + rev = "e9446fa9dc3ba64c22f8e5bb611ad394b5729eda"; + hash = "sha256-0YNF9NPKaaKzC3d8cXG4Od3AUc1zxVtuB5u2Q8ruwr0="; }; nativeBuildInputs = [ From 2f863c5cf1903c55ffbcb5a39e9e2e5b25d1317a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" <ryantm-bot@ryantm.com> Date: Mon, 30 Sep 2024 14:37:45 +0000 Subject: [PATCH 252/300] siyuan: 3.1.6 -> 3.1.8 --- pkgs/by-name/si/siyuan/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/si/siyuan/package.nix b/pkgs/by-name/si/siyuan/package.nix index 4d098a873694..888707fcf63d 100644 --- a/pkgs/by-name/si/siyuan/package.nix +++ b/pkgs/by-name/si/siyuan/package.nix @@ -35,20 +35,20 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "siyuan"; - version = "3.1.6"; + version = "3.1.8"; src = fetchFromGitHub { owner = "siyuan-note"; repo = "siyuan"; rev = "v${finalAttrs.version}"; - hash = "sha256-xGxZ6xu8R/JoW4X+drEv943y1jah4ZijHB+RNN6hxig="; + hash = "sha256-0sV3r3ETW/FeLJZQrkE95oqKeUKKiNA3vpOBPtHzeE8="; }; kernel = buildGo123Module { name = "${finalAttrs.pname}-${finalAttrs.version}-kernel"; inherit (finalAttrs) src; sourceRoot = "${finalAttrs.src.name}/kernel"; - vendorHash = "sha256-I57T4/J0pL8/GISi22H1lpE1gkduNXdINvuo+F3YnAs="; + vendorHash = "sha256-hxXCq03wxVLONaztZVqLjlqQ/fZNlV2iDF5JIayb5YY="; patches = [ (substituteAll { @@ -90,7 +90,7 @@ stdenv.mkDerivation (finalAttrs: { src sourceRoot ; - hash = "sha256-3PdmCbaZZjnTCSpBcvG7nP+zTGamoY/ZXjay7c8Zx5w="; + hash = "sha256-g6O6YE1irE3Hy+Xu7MeH97Oc4bq32IDnfP1VLSiF/U4="; }; sourceRoot = "${finalAttrs.src.name}/app"; 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 253/300] 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 5e8d28572a313515bc65ff11e4f642c9f72107f0 Mon Sep 17 00:00:00 2001 From: K900 <me@0upti.me> Date: Mon, 30 Sep 2024 18:03:42 +0300 Subject: [PATCH 254/300] linux_testing: 6.11-rc7 -> 6.12-rc1 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 2eb28ea42025..3e7b76ea97d1 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -1,7 +1,7 @@ { "testing": { - "version": "6.11-rc7", - "hash": "sha256:17c8vwvra042mib1s60nqqai0s7qc0qkvrf0j7ziqmy2llq8cbxy" + "version": "6.12-rc1", + "hash": "sha256:16zwvjcvgndvr0izx0qs2k7v85nvxwlx6j7y2yrdl3shalsdlmx2" }, "6.1": { "version": "6.1.111", From 30c52da8a124c7396d3f60ccdaf5ed0ad7250ef3 Mon Sep 17 00:00:00 2001 From: K900 <me@0upti.me> Date: Mon, 30 Sep 2024 18:03:47 +0300 Subject: [PATCH 255/300] linux_6_11: 6.11 -> 6.11.1 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 3e7b76ea97d1..5c156358839a 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -28,7 +28,7 @@ "hash": "sha256:15ihkbsj0idwzbvhynjm3kcnkk0alf3xipip8ngib1f1z13a0kgv" }, "6.11": { - "version": "6.11", - "hash": "sha256:0bnbvadm4wvnwzcq319gsgl03ijvvljn7mj8qw87ihpb4p0cdljm" + "version": "6.11.1", + "hash": "sha256:0ggfg3f8nkcgs2pg7y5ccfrcjzj7j7x4n41g59gzbsp1nirj6dra" } } From 8fa87fa112a0897411c3cbb859dac9c5c82cccf0 Mon Sep 17 00:00:00 2001 From: K900 <me@0upti.me> Date: Mon, 30 Sep 2024 18:03:55 +0300 Subject: [PATCH 256/300] linux_6_10: 6.10.11 -> 6.10.12 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 5c156358839a..dfbab081b08d 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -24,8 +24,8 @@ "hash": "sha256:1f5l6y7abscm01dr740fzvq8r756ar854n0i299smm4rhcsap48m" }, "6.10": { - "version": "6.10.11", - "hash": "sha256:15ihkbsj0idwzbvhynjm3kcnkk0alf3xipip8ngib1f1z13a0kgv" + "version": "6.10.12", + "hash": "sha256:1kvkwgnq5gsdqarrdg32qjrbq1dggxp1x2yy2zpsjsaq5y2mhj2j" }, "6.11": { "version": "6.11.1", From 20380379dba41ba46a4a597b7afd74f5560acea6 Mon Sep 17 00:00:00 2001 From: K900 <me@0upti.me> Date: Mon, 30 Sep 2024 18:04:00 +0300 Subject: [PATCH 257/300] linux_6_6: 6.6.52 -> 6.6.53 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index dfbab081b08d..4bd8aab489c8 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -20,8 +20,8 @@ "hash": "sha256:0axkwfhvq3w2072xjqww476qa3rjglxyqmf72mlp9b5ymswil8kp" }, "6.6": { - "version": "6.6.52", - "hash": "sha256:1f5l6y7abscm01dr740fzvq8r756ar854n0i299smm4rhcsap48m" + "version": "6.6.53", + "hash": "sha256:0yfpyiz57wz9rkwif6n3k2n87waw46ad0h7h0pwhnar53cfihp98" }, "6.10": { "version": "6.10.12", From 7df132ae3e345ab8d41452e514e4548b1571b475 Mon Sep 17 00:00:00 2001 From: K900 <me@0upti.me> Date: Mon, 30 Sep 2024 18:04:04 +0300 Subject: [PATCH 258/300] linux_6_1: 6.1.111 -> 6.1.112 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 4bd8aab489c8..356135e46214 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -4,8 +4,8 @@ "hash": "sha256:16zwvjcvgndvr0izx0qs2k7v85nvxwlx6j7y2yrdl3shalsdlmx2" }, "6.1": { - "version": "6.1.111", - "hash": "sha256:1c7d49kppv8xgqlsrfm1286mnvz8vcnbqqh6zgfca2s13px9hwn4" + "version": "6.1.112", + "hash": "sha256:094z3wfcxqx2rbi072i5frshpy6rdvk39aahwm9nc07vc8sxxn4b" }, "5.15": { "version": "5.15.167", From 6290efed1503c0fe7095e612aded8a9476368a40 Mon Sep 17 00:00:00 2001 From: K900 <me@0upti.me> Date: Mon, 30 Sep 2024 18:04:29 +0300 Subject: [PATCH 259/300] linux-rt_5_10: 5.10.224-rt116 -> 5.10.225-rt117 --- pkgs/os-specific/linux/kernel/linux-rt-5.10.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix index e11651d82493..257754d218ec 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "5.10.224-rt116"; # updated by ./update-rt.sh + version = "5.10.225-rt117"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -18,14 +18,14 @@ in buildLinux (args // { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; - sha256 = "06nivms93yjbddv3gl88m7bdrr0676nm3p12iqvsdfr4fg39kc0r"; + sha256 = "0770757ildcc0cs6alnb5cspg6ysg2wqly9z5q1vjf3mh0xbzmw5"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "0d7dcbpn0b0nqmcr35z2f5gsknn4hmqsr01n6j35amzv9fd45iwl"; + sha256 = "1c14gm4wzcbkhzgdm5lwq1as9is784yra7bc226bz3bqs3h7vmw2"; }; }; in [ rt-patch ] ++ kernelPatches; From 6c12dc70050611ec8d50343245d541336226c5c8 Mon Sep 17 00:00:00 2001 From: K900 <me@0upti.me> Date: Mon, 30 Sep 2024 18:05:53 +0300 Subject: [PATCH 260/300] linux-rt_6_1: 6.1.108-rt40 -> 6.1.111-rt42 --- pkgs/os-specific/linux/kernel/linux-rt-6.1.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-rt-6.1.nix b/pkgs/os-specific/linux/kernel/linux-rt-6.1.nix index efa9fcc0fb29..29a40809d0fc 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-6.1.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-6.1.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "6.1.108-rt40"; # updated by ./update-rt.sh + version = "6.1.111-rt42"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -19,14 +19,14 @@ in buildLinux (args // { src = fetchurl { url = "mirror://kernel/linux/kernel/v6.x/linux-${kversion}.tar.xz"; - sha256 = "18lcd2b7ffwzqwqnmb948r7z95470bh7jiqps5nil8hfl24lwkiz"; + sha256 = "1c7d49kppv8xgqlsrfm1286mnvz8vcnbqqh6zgfca2s13px9hwn4"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "1ki0rn2cp3jkfna60sjlf2qn77fwpy0l2hdjk3i5xpmavir4mhdj"; + sha256 = "16yb962fkkvgppbx8glp5ph3h1jl2q1b4m2s8gsf3k9i9yim7v5c"; }; }; in [ rt-patch ] ++ kernelPatches; From 0ea0c2a7c6619b15e0dd9247bdd1d0cd62f28382 Mon Sep 17 00:00:00 2001 From: K900 <me@0upti.me> Date: Mon, 30 Sep 2024 18:06:31 +0300 Subject: [PATCH 261/300] linux-rt_6_6: 6.6.49-rt41 -> 6.6.52-rt43 --- pkgs/os-specific/linux/kernel/linux-rt-6.6.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-rt-6.6.nix b/pkgs/os-specific/linux/kernel/linux-rt-6.6.nix index b8e4608bd2ff..c27ae8cf120a 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-6.6.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-6.6.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "6.6.49-rt41"; # updated by ./update-rt.sh + version = "6.6.52-rt43"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -19,14 +19,14 @@ in buildLinux (args // { src = fetchurl { url = "mirror://kernel/linux/kernel/v6.x/linux-${kversion}.tar.xz"; - sha256 = "1dyk5pr5g8s5ia7f1vnkid4jghi81pxvwlgn9rmw2n88nz1dlmic"; + sha256 = "1f5l6y7abscm01dr740fzvq8r756ar854n0i299smm4rhcsap48m"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "0aajxiwawk624y1r36l818m1ikgcl8szl6sapj70dcv95z9ach4i"; + sha256 = "0g33n9idc3lhbj5z637zm3bgqh601a05cl1s8ji8zbnfh971jcgh"; }; }; in [ rt-patch ] ++ kernelPatches; From 318ad2b8cea18e036fd0c9bee66680cf095db4ec Mon Sep 17 00:00:00 2001 From: Artemis Tosini <me@artem.ist> Date: Mon, 30 Sep 2024 15:12:31 +0000 Subject: [PATCH 262/300] ryujinx: Include more necessary libraries Ryujinx uses the Avalonia UI framework, which imports various X11 libraries. When they aren't found, some features such as context menus do not work. This was not found earlier because Avalonia does not throw an error or even warn when the libraries are not found, it just silently breaks. --- pkgs/by-name/ry/ryujinx/package.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/by-name/ry/ryujinx/package.nix b/pkgs/by-name/ry/ryujinx/package.nix index 6954ac3f839e..035ac0a0b7ad 100644 --- a/pkgs/by-name/ry/ryujinx/package.nix +++ b/pkgs/by-name/ry/ryujinx/package.nix @@ -12,6 +12,12 @@ , vulkan-loader , glew , libGL +, libICE +, libSM +, libXcursor +, libXext +, libXi +, libXrandr , udev , SDL2 , SDL2_mixer @@ -49,6 +55,12 @@ buildDotnetModule rec { # Avalonia UI glew + libICE + libSM + libXcursor + libXext + libXi + libXrandr # Headless executable libGL 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 263/300] 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 264/300] 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 265/300] 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 266/300] 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 88746a794398da15142f91d42c829a4336616596 Mon Sep 17 00:00:00 2001 From: K900 <me@0upti.me> Date: Mon, 30 Sep 2024 18:28:46 +0300 Subject: [PATCH 267/300] linux/common-config: update for 6.12 - refactor Rust checks to prepare for enablement - enable DRM panic QR codes when Rust is enabled - enable I2C_DESIGNWARE_CORE explicitly for all the Bay Trail things - enable all the zram backends because they're separate options now and basically free - enable the new and returning module compression related options - enable scx and NFS local IO --- .../linux/kernel/common-config.nix | 38 +++++++++++++++---- 1 file changed, 30 insertions(+), 8 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index d3226b767076..0b3da3f22f71 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -29,6 +29,13 @@ let (stdenv.hostPlatform.isPower && stdenv.hostPlatform.is64bit) || (stdenv.hostPlatform.isMips && stdenv.hostPlatform.is64bit)); + forceRust = features.rust or false; + kernelSupportsRust = lib.versionAtLeast version "6.7"; + + # Currently not enabling Rust by default, as upstream requires rustc 1.81 + defaultRust = false; + withRust = (forceRust || defaultRust) && kernelSupportsRust; + options = { debug = { @@ -134,6 +141,7 @@ let # Required to bring up some Bay Trail devices properly I2C = yes; + I2C_DESIGNWARE_CORE = yes; I2C_DESIGNWARE_PLATFORM = yes; PMIC_OPREGION = whenAtLeast "5.10" yes; INTEL_SOC_PMIC = whenAtLeast "5.10" yes; @@ -484,14 +492,16 @@ let DRM_VC4_HDMI_CEC = yes; }; - # Enables Rust support in the Linux kernel. This is currently not enabled by default, because it occasionally requires - # patching the Linux kernel for the specific Rust toolchain in nixpkgs. These patches usually take a bit - # of time to appear and this would hold up Linux kernel and Rust toolchain updates. - # - # Once Rust in the kernel has more users, we can reconsider enabling it by default. - rust = lib.optionalAttrs ((features.rust or false) && lib.versionAtLeast version "6.7") { + # Enable Rust and features that depend on it + rust = lib.optionalAttrs withRust { RUST = yes; - GCC_PLUGINS = no; + + # These don't technically require Rust but we probably want to get some more testing + # on the whole DRM panic setup before shipping it by default. + DRM_PANIC = whenAtLeast "6.12" yes; + DRM_PANIC_SCREEN = whenAtLeast "6.12" (freeform "kmsg"); + + DRM_PANIC_SCREEN_QR_CODE = whenAtLeast "6.12" yes; }; sound = { @@ -628,6 +638,7 @@ let NFS_V4_1 = yes; # NFSv4.1 client support NFS_V4_2 = yes; NFS_V4_SECURITY_LABEL = yes; + NFS_LOCALIO = whenAtLeast "6.12" yes; CIFS_XATTR = yes; CIFS_POSIX = option yes; @@ -895,6 +906,12 @@ let ZRAM = module; ZRAM_WRITEBACK = option yes; ZRAM_MULTI_COMP = whenAtLeast "6.2" yes; + ZRAM_BACKEND_842 = whenAtLeast "6.12" yes; + ZRAM_BACKEND_DEFLATE = whenAtLeast "6.12" yes; + ZRAM_BACKEND_LZ4 = whenAtLeast "6.12" yes; + ZRAM_BACKEND_LZ4HC = whenAtLeast "6.12" yes; + ZRAM_BACKEND_LZO = whenAtLeast "6.12" yes; + ZRAM_BACKEND_ZSTD = whenAtLeast "6.12" yes; ZRAM_DEF_COMP_ZSTD = whenAtLeast "5.11" yes; ZSWAP = option yes; ZSWAP_COMPRESSOR_DEFAULT_ZSTD = whenAtLeast "5.7" (lib.mkOptionDefault yes); @@ -973,7 +990,11 @@ let THRUSTMASTER_FF = yes; ZEROPLUS_FF = yes; - MODULE_COMPRESS = whenOlder "5.13" yes; + MODULE_COMPRESS = lib.mkMerge [ + (whenOlder "5.13" yes) + (whenAtLeast "6.12" yes) + ]; + MODULE_COMPRESS_ALL = whenAtLeast "6.12" yes; MODULE_COMPRESS_XZ = yes; SYSVIPC = yes; # System-V IPC @@ -1179,6 +1200,7 @@ let LIRC = yes; SCHED_CORE = whenAtLeast "5.14" yes; + SCHED_CLASS_EXT = whenAtLeast "6.12" yes; LRU_GEN = whenAtLeast "6.1" yes; LRU_GEN_ENABLED = whenAtLeast "6.1" yes; From 3b957cfd41cbd0dc4a7f9e924b5ea67417d55513 Mon Sep 17 00:00:00 2001 From: Anomalocaridid <29845794+Anomalocaridid@users.noreply.github.com> Date: Mon, 10 Jun 2024 21:14:31 -0400 Subject: [PATCH 268/300] fishPlugins.fish-you-should-use: init at 0-unstable-2022-02-13 --- pkgs/shells/fish/plugins/default.nix | 2 ++ .../fish/plugins/fish-you-should-use.nix | 26 +++++++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/shells/fish/plugins/fish-you-should-use.nix diff --git a/pkgs/shells/fish/plugins/default.nix b/pkgs/shells/fish/plugins/default.nix index 36a5a59e4398..6efb5029121b 100644 --- a/pkgs/shells/fish/plugins/default.nix +++ b/pkgs/shells/fish/plugins/default.nix @@ -26,6 +26,8 @@ lib.makeScope newScope (self: with self; { fishtape = callPackage ./fishtape.nix { }; fishtape_3 = callPackage ./fishtape_3.nix { }; + fish-you-should-use = callPackage ./fish-you-should-use.nix { }; + foreign-env = callPackage ./foreign-env { }; forgit = callPackage ./forgit.nix { }; diff --git a/pkgs/shells/fish/plugins/fish-you-should-use.nix b/pkgs/shells/fish/plugins/fish-you-should-use.nix new file mode 100644 index 000000000000..96c2e07447f3 --- /dev/null +++ b/pkgs/shells/fish/plugins/fish-you-should-use.nix @@ -0,0 +1,26 @@ +{ + lib, + buildFishPlugin, + fetchFromGitHub, + unstableGitUpdater, +}: +buildFishPlugin { + pname = "fish-you-should-use"; + version = "0-unstable-2022-02-13"; + + src = fetchFromGitHub { + owner = "paysonwallach"; + repo = "fish-you-should-use"; + rev = "a332823512c0b51e71516ebb8341db0528c87926"; + hash = "sha256-MmGDFTgxEFgHdX95OjH3jKsVG1hdwo6bRht+Lvvqe5Y="; + }; + + passthru.updateScript = unstableGitUpdater { }; + + meta = { + description = "Fish plugin that reminds you to use your aliases"; + homepage = "https://github.com/paysonwallach/fish-you-should-use"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ anomalocaris ]; + }; +} 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 269/300] 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 270/300] 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 271/300] 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 dea1e380d9d975a4c0fe5a4b20d24bc3eae6a613 Mon Sep 17 00:00:00 2001 From: pcboy <david.hagege@gmail.com> Date: Mon, 23 Sep 2024 21:36:21 +0900 Subject: [PATCH 272/300] harlequin: init at 1.24.1 --- pkgs/by-name/ha/harlequin/package.nix | 79 +++++++++++++++++++ .../harlequin-bigquery/default.nix | 43 ++++++++++ .../harlequin-postgres/default.nix | 42 ++++++++++ .../python-modules/sqlfmt/default.nix | 66 ++++++++++++++++ .../textual-fastdatatable/default.nix | 51 ++++++++++++ .../textual-textarea/default.nix | 40 ++++++++++ pkgs/top-level/python-packages.nix | 10 +++ 7 files changed, 331 insertions(+) create mode 100644 pkgs/by-name/ha/harlequin/package.nix create mode 100644 pkgs/development/python-modules/harlequin-bigquery/default.nix create mode 100644 pkgs/development/python-modules/harlequin-postgres/default.nix create mode 100644 pkgs/development/python-modules/sqlfmt/default.nix create mode 100644 pkgs/development/python-modules/textual-fastdatatable/default.nix create mode 100644 pkgs/development/python-modules/textual-textarea/default.nix diff --git a/pkgs/by-name/ha/harlequin/package.nix b/pkgs/by-name/ha/harlequin/package.nix new file mode 100644 index 000000000000..17ce48993e95 --- /dev/null +++ b/pkgs/by-name/ha/harlequin/package.nix @@ -0,0 +1,79 @@ +{ + lib, + python3Packages, + fetchFromGitHub, + harlequin, + testers, + nix-update-script, + versionCheckHook, + withPostgresAdapter ? true, + withBigQueryAdapter ? true, +}: +python3Packages.buildPythonApplication rec { + pname = "harlequin"; + version = "1.24.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "tconbeer"; + repo = "harlequin"; + rev = "refs/tags/v${version}"; + hash = "sha256-3Rb47zkWsC6RJhk1btQc/kwxpFFWVnxY2PJooHB7IzQ="; + }; + + build-system = with python3Packages; [ + poetry-core + ]; + + dependencies = + with python3Packages; + [ + textual + textual-fastdatatable + textual-textarea + click + rich-click + duckdb + sqlfmt + platformdirs + importlib-metadata + tomlkit + questionary + numpy + packaging + ] + ++ lib.optionals withPostgresAdapter [ harlequin-postgres ] + ++ lib.optionals withBigQueryAdapter [ harlequin-bigquery ]; + + pythonRelaxDeps = [ + "textual" + ]; + + pythonImportsCheck = [ + "harlequin" + "harlequin_duckdb" + "harlequin_sqlite" + "harlequin_vscode" + ]; + + passthru = { + updateScript = nix-update-script { }; + tests.version = testers.testVersion { + package = harlequin; + }; + }; + + nativeCheckInputs = [ + versionCheckHook + ]; + + meta = { + description = "The SQL IDE for Your Terminal"; + homepage = "https://harlequin.sh"; + mainProgram = "harlequin"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pcboy ]; + platforms = lib.platforms.unix; + changelog = "https://github.com/tconbeer/harlequin/releases/tag/v${version}"; + }; +} diff --git a/pkgs/development/python-modules/harlequin-bigquery/default.nix b/pkgs/development/python-modules/harlequin-bigquery/default.nix new file mode 100644 index 000000000000..e43e00a4b3b2 --- /dev/null +++ b/pkgs/development/python-modules/harlequin-bigquery/default.nix @@ -0,0 +1,43 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + poetry-core, + google-cloud-bigquery, + google-cloud-bigquery-storage, +}: + +buildPythonPackage rec { + pname = "harlequin-bigquery"; + version = "1.0.2"; + pyproject = true; + + src = fetchPypi { + pname = "harlequin_bigquery"; + inherit version; + hash = "sha256-uIPYhK4R6N7pqsKY2GozkG76WI+gru2unsK5BxO4+/Y="; + }; + + build-system = [ + poetry-core + ]; + + dependencies = [ + google-cloud-bigquery + google-cloud-bigquery-storage + ]; + + # To prevent circular dependency + # as harlequin-bigquery requires harlequin which requires harlequin-bigquery + doCheck = false; + pythonRemoveDeps = [ + "harlequin" + ]; + + meta = { + description = "A Harlequin adapter for Google BigQuery"; + homepage = "https://pypi.org/project/harlequin-bigquery/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pcboy ]; + }; +} diff --git a/pkgs/development/python-modules/harlequin-postgres/default.nix b/pkgs/development/python-modules/harlequin-postgres/default.nix new file mode 100644 index 000000000000..65ec22fb04aa --- /dev/null +++ b/pkgs/development/python-modules/harlequin-postgres/default.nix @@ -0,0 +1,42 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + poetry-core, + psycopg, +}: + +buildPythonPackage rec { + pname = "harlequin-postgres"; + version = "0.4.0"; + pyproject = true; + + src = fetchPypi { + pname = "harlequin_postgres"; + inherit version; + hash = "sha256-1y8S3z6ZTt+PZg75aB/bKnEPdAtqjZ2IqyBtUBk8IFA="; + }; + + build-system = [ + poetry-core + ]; + + dependencies = [ + psycopg + psycopg.pool + ]; + + # To prevent circular dependency + # as harlequin-postgres requires harlequin which requires harlequin-postgres + doCheck = false; + pythonRemoveDeps = [ + "harlequin" + ]; + + meta = { + description = "A Harlequin adapter for Postgres"; + homepage = "https://pypi.org/project/harlequin-postgres/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pcboy ]; + }; +} diff --git a/pkgs/development/python-modules/sqlfmt/default.nix b/pkgs/development/python-modules/sqlfmt/default.nix new file mode 100644 index 000000000000..37f23ca89ee7 --- /dev/null +++ b/pkgs/development/python-modules/sqlfmt/default.nix @@ -0,0 +1,66 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + fetchFromGitHub, + importlib-metadata, + black, + poetry-core, + click, + jinja2, + platformdirs, + tomli, + tqdm, + gitpython, +}: + +buildPythonPackage rec { + pname = "sqlfmt"; + version = "0.23.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "tconbeer"; + repo = "sqlfmt"; + rev = "refs/tags/v${version}"; + hash = "sha256-g2ycfpsBFMh16pYVzCmde0mhQhhvAhH25i3LJTcG7Ac="; + }; + + build-system = [ + poetry-core + ]; + + dependencies = [ + click + importlib-metadata + jinja2 + platformdirs + tomli + tqdm + ]; + + optional-dependencies = { + jinjafmt = [ + black + ]; + sqlfmt_primer = [ + gitpython + ]; + }; + + pythonRelaxDeps = [ + "platformdirs" + ]; + + pythonImportsCheck = [ + "sqlfmt" + ]; + + meta = { + description = "Sqlfmt formats your dbt SQL files so you don't have to"; + homepage = "https://github.com/tconbeer/sqlfmt"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ pcboy ]; + mainProgram = "sqlfmt"; + }; +} diff --git a/pkgs/development/python-modules/textual-fastdatatable/default.nix b/pkgs/development/python-modules/textual-fastdatatable/default.nix new file mode 100644 index 000000000000..16d5418a2736 --- /dev/null +++ b/pkgs/development/python-modules/textual-fastdatatable/default.nix @@ -0,0 +1,51 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + poetry-core, + pyarrow, + pytz, + textual, + tzdata, + polars, +}: + +buildPythonPackage rec { + pname = "textual-fastdatatable"; + version = "0.9.0"; + pyproject = true; + + src = fetchPypi { + pname = "textual_fastdatatable"; + inherit version; + hash = "sha256-AS3SiwetCHkCMu8H81xbp5QvN/2GCvMlWgU4qZKvBRU="; + }; + + build-system = [ + poetry-core + ]; + + dependencies = [ + pyarrow + pytz + textual + tzdata + ]; + + optional-dependencies = { + polars = [ + polars + ]; + }; + + pythonImportsCheck = [ + "textual_fastdatatable" + ]; + + meta = { + description = "A performance-focused reimplementation of Textual's DataTable widget, with a pluggable data storage backend"; + homepage = "https://pypi.org/project/textual-fastdatatable/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pcboy ]; + }; +} diff --git a/pkgs/development/python-modules/textual-textarea/default.nix b/pkgs/development/python-modules/textual-textarea/default.nix new file mode 100644 index 000000000000..74293ee3c2e4 --- /dev/null +++ b/pkgs/development/python-modules/textual-textarea/default.nix @@ -0,0 +1,40 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + poetry-core, + pyperclip, + textual, +}: + +buildPythonPackage rec { + pname = "textual-textarea"; + version = "0.14.2"; + pyproject = true; + + src = fetchPypi { + pname = "textual_textarea"; + inherit version; + hash = "sha256-AJU7BBoev6pBrLhvbfF4I7l+E8YnO5jCD5OIsNf6NW0="; + }; + + build-system = [ + poetry-core + ]; + + dependencies = [ + pyperclip + textual + ]; + + pythonImportsCheck = [ + "textual_textarea" + ]; + + meta = { + description = "A text area (multi-line input) with syntax highlighting for Textual"; + homepage = "https://pypi.org/project/textual-textarea/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pcboy ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a5aa74d6df42..846865f5269e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5562,6 +5562,10 @@ self: super: with self; { hap-python = callPackage ../development/python-modules/hap-python { }; + harlequin-bigquery = callPackage ../development/python-modules/harlequin-bigquery { }; + + harlequin-postgres = callPackage ../development/python-modules/harlequin-postgres { }; + hass-client = callPackage ../development/python-modules/hass-client { }; hass-nabucasa = callPackage ../development/python-modules/hass-nabucasa { }; @@ -14856,6 +14860,8 @@ self: super: with self; { sqlbag = callPackage ../development/python-modules/sqlbag { }; + sqlfmt = callPackage ../development/python-modules/sqlfmt { }; + sqlglot = callPackage ../development/python-modules/sqlglot { }; sqlite-anyio = callPackage ../development/python-modules/sqlite-anyio { }; @@ -15451,10 +15457,14 @@ self: super: with self; { textual-dev = callPackage ../development/python-modules/textual-dev { }; + textual-fastdatatable = callPackage ../development/python-modules/textual-fastdatatable { }; + textual-slider = callPackage ../development/python-modules/textual-slider { }; textual-universal-directorytree = callPackage ../development/python-modules/textual-universal-directorytree { }; + textual-textarea = callPackage ../development/python-modules/textual-textarea { }; + testbook = callPackage ../development/python-modules/testbook { }; testing-common-database = callPackage ../development/python-modules/testing-common-database { }; 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 273/300] 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 274/300] 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 275/300] 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 276/300] 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 a2ed02c4c25b8c597f2f2865ebfba6585626d31b Mon Sep 17 00:00:00 2001 From: Martin Weinelt <hexa@darmstadt.ccc.de> Date: Mon, 30 Sep 2024 19:41:04 +0200 Subject: [PATCH 277/300] cpython: add python team as maintainers --- pkgs/development/interpreters/python/cpython/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index bb3dba534b79..6d4bd47ba294 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -686,5 +686,6 @@ in with passthru; stdenv.mkDerivation (finalAttrs: { pkgConfigModules = [ "python3" ]; platforms = platforms.linux ++ platforms.darwin ++ platforms.windows ++ platforms.freebsd; mainProgram = executable; + maintainers = lib.teams.python.members; }; }) 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 278/300] 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 279/300] 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 280/300] 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 281/300] 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 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 282/300] 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 283/300] 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 727527cfe8b08d7c4b4ac2a68afdb3c1b4df7dbf Mon Sep 17 00:00:00 2001 From: lzszt <github@lzszt.info> Date: Tue, 1 Oct 2024 01:08:27 +0200 Subject: [PATCH 284/300] 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 285/300] 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 286/300] 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 287/300] 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 288/300] 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 289/300] 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 290/300] 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 291/300] 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 292/300] 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 293/300] 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 294/300] 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 295/300] 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 296/300] 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 297/300] 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 298/300] 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 299/300] 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 300/300] 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 = {