diff options
Diffstat (limited to 'nixpkgs/pkgs/development')
601 files changed, 8002 insertions, 9721 deletions
diff --git a/nixpkgs/pkgs/development/beam-modules/build-mix.nix b/nixpkgs/pkgs/development/beam-modules/build-mix.nix index 081d4988bace..f74da7b7827d 100644 --- a/nixpkgs/pkgs/development/beam-modules/build-mix.nix +++ b/nixpkgs/pkgs/development/beam-modules/build-mix.nix @@ -12,6 +12,9 @@ , meta ? { } , enableDebugInfo ? false , mixEnv ? "prod" +# A config directory that is considered for all the dependencies of an app, typically in $src/config/ +# This was initially added, as some of Mobilizon's dependencies need to access the config at build time. +, appConfigPath ? null , ... }@attrs: @@ -28,6 +31,7 @@ let MIX_ENV = mixEnv; MIX_DEBUG = if enableDebugInfo then 1 else 0; HEX_OFFLINE = 1; + LC_ALL = "C.UTF-8"; # add to ERL_LIBS so other modules can find at runtime. # http://erlang.org/doc/man/code.html#code-path @@ -45,6 +49,14 @@ let runHook preConfigure ${./mix-configure-hook.sh} + ${lib.optionalString (!isNull appConfigPath) + # Due to https://hexdocs.pm/elixir/main/Config.html the config directory + # of a library seems to be not considered, as config is always + # application specific. So we can safely delete it. + '' + rm -rf config + cp -r ${appConfigPath} config + ''} runHook postConfigure ''; diff --git a/nixpkgs/pkgs/development/beam-modules/elixir-ls/default.nix b/nixpkgs/pkgs/development/beam-modules/elixir-ls/default.nix index 037aba684819..949331f2fe48 100644 --- a/nixpkgs/pkgs/development/beam-modules/elixir-ls/default.nix +++ b/nixpkgs/pkgs/development/beam-modules/elixir-ls/default.nix @@ -4,12 +4,12 @@ let pname = "elixir-ls"; - version = "0.15.1"; + version = "0.16.0"; src = fetchFromGitHub { owner = "elixir-lsp"; repo = "elixir-ls"; rev = "v${version}"; - hash = "sha256-bWR5wKOVE9qPQyFjiaBumsWwG7vv9pFCVvXO4N8a3HA="; + hash = "sha256-tEKwM5o3uXJ0cLY5USnQJ+HOGTSv6NDJvq+F/iqFEWs="; fetchSubmodules = true; }; in @@ -21,7 +21,7 @@ mixRelease { mixFodDeps = fetchMixDeps { pname = "mix-deps-${pname}"; inherit src version elixir; - hash = "sha256-7AE6RUD7DLo5uTxPMiUDm9MIBYcrNatrIuILK9jinNk="; + hash = "sha256-jpjqMIQ9fS4nkkKWZ80Mx5vULm5bvnNHy52ZQcR0y8c="; }; # elixir-ls is an umbrella app @@ -70,6 +70,7 @@ mixRelease { ''; license = licenses.asl20; platforms = platforms.unix; + mainProgram = "elixir-ls"; maintainers = teams.beam.members; }; passthru.updateScript = nix-update-script { }; diff --git a/nixpkgs/pkgs/development/beam-modules/mix-release.nix b/nixpkgs/pkgs/development/beam-modules/mix-release.nix index 1d40da27ecba..0f070cce7ad3 100644 --- a/nixpkgs/pkgs/development/beam-modules/mix-release.nix +++ b/nixpkgs/pkgs/development/beam-modules/mix-release.nix @@ -50,6 +50,7 @@ stdenv.mkDerivation (overridable // { # some older dependencies still use rebar MIX_REBAR = "${rebar}/bin/rebar"; MIX_REBAR3 = "${rebar3}/bin/rebar3"; + LC_ALL = "C.UTF-8"; postUnpack = '' export HEX_HOME="$TEMPDIR/hex" diff --git a/nixpkgs/pkgs/development/compilers/chez/default.nix b/nixpkgs/pkgs/development/compilers/chez/default.nix index b27bc4682ab6..5385baf8da82 100644 --- a/nixpkgs/pkgs/development/compilers/chez/default.nix +++ b/nixpkgs/pkgs/development/compilers/chez/default.nix @@ -1,18 +1,15 @@ -{ lib, stdenv, fetchFromGitHub +{ lib, stdenv, fetchurl , coreutils, cctools , ncurses, libiconv, libX11, libuuid }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "chez-scheme"; - version = "9.5.8a"; + version = "9.6.2"; - src = fetchFromGitHub { - owner = "cisco"; - repo = "ChezScheme"; - rev = "refs/tags/v${version}"; - sha256 = "sha256-d8DgHATZzZbOYODHFKTqg4oWg/wja8jQgcCVpj8j6yQ="; - fetchSubmodules = true; + src = fetchurl { + url = "https://github.com/cisco/ChezScheme/releases/download/v${finalAttrs.version}/csv${finalAttrs.version}.tar.gz"; + hash = "sha256-cUaVeJ4brTUY5s1fvIroIE92ED1a0roFo/HAY+stXQI="; }; nativeBuildInputs = lib.optional stdenv.isDarwin cctools; @@ -62,7 +59,7 @@ stdenv.mkDerivation rec { ** Clean up some of the examples from the build output. */ postInstall = '' - rm -rf $out/lib/csv${version}/examples + rm -rf $out/lib/csv${finalAttrs.version}/examples ''; setupHook = ./setup-hook.sh; @@ -75,4 +72,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; badPlatforms = [ "aarch64-linux" "aarch64-darwin" ]; }; -} +}) diff --git a/nixpkgs/pkgs/development/compilers/circt/default.nix b/nixpkgs/pkgs/development/compilers/circt/default.nix index 77482b048a8d..1f58859f8a4e 100644 --- a/nixpkgs/pkgs/development/compilers/circt/default.nix +++ b/nixpkgs/pkgs/development/compilers/circt/default.nix @@ -13,12 +13,12 @@ let in stdenv.mkDerivation rec { pname = "circt"; - version = "1.52.0"; + version = "1.53.0"; src = fetchFromGitHub { owner = "llvm"; repo = "circt"; rev = "firtool-${version}"; - sha256 = "sha256-ol8inyUrKezv+lhDIq2DhP4LHNJLhZylRbtIfoVAMYk="; + sha256 = "sha256-F3pGXZC4jSG9TV2sc5G9bQtKMY6xcPknwO0fqQ6uBoA="; fetchSubmodules = true; }; diff --git a/nixpkgs/pkgs/development/compilers/coffeescript/default.nix b/nixpkgs/pkgs/development/compilers/coffeescript/default.nix new file mode 100644 index 000000000000..5245a25bba88 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/coffeescript/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildNpmPackage +, fetchFromGitHub +}: + +buildNpmPackage rec { + pname = "coffeescript"; + version = "2.7.0"; + + src = fetchFromGitHub { + owner = "jashkenas"; + repo = "coffeescript"; + rev = version; + hash = "sha256-vr46LKICX61rFPCkZ3G+8gJykg+MO43YRJnZGM3RoY0="; + }; + + npmDepsHash = "sha256-mCm31OwI3wjq8taKRQuEj4+IWVZO9Z5KuIDBf39lYoQ="; + + env = { + PUPPETEER_SKIP_DOWNLOAD = true; + }; + + dontNpmBuild = true; + + meta = { + description = "A little language that compiles into JavaScript"; + homepage = "https://github.com/jashkenas/coffeescript"; + license = lib.licenses.mit; + mainProgram = "coffee"; + maintainers = with lib.maintainers; [ cdmistman ]; + }; +} diff --git a/nixpkgs/pkgs/development/compilers/dotnet/versions/6.0.nix b/nixpkgs/pkgs/development/compilers/dotnet/versions/6.0.nix index 30cffb04d644..2d26a843a9fe 100644 --- a/nixpkgs/pkgs/development/compilers/dotnet/versions/6.0.nix +++ b/nixpkgs/pkgs/development/compilers/dotnet/versions/6.0.nix @@ -3,177 +3,177 @@ # v6.0 (active) { aspnetcore_6_0 = buildAspNetCore { - version = "6.0.20"; + version = "6.0.21"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/972dc929-4c16-4456-a7c8-64014f80678d/a3b62252f98a0d7e0c0a9a01ede18776/aspnetcore-runtime-6.0.20-linux-x64.tar.gz"; - sha512 = "891bad6a52a7bcd5afa2a784fe68044d282f6d53fedab4bde6dff8d7d2138a484e947f7a6be156094324b37e9d7e07e87a67622bcf2ea197c2924389edd1d185"; + url = "https://download.visualstudio.microsoft.com/download/pr/56d44b17-03c2-4d9e-bdbc-a598ca34fc01/8fcc1e19dfd3c86b09beb68460db6e85/aspnetcore-runtime-6.0.21-linux-x64.tar.gz"; + sha512 = "3a74b52e340653822ad5120ec87e00e4bc0217e8ce71020ad9c4a0903b87d221b538c3841949be2ca129a45f8105def0ea5152e44e7cef8858958ae04fa0dd65"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/a8a1a993-ddd9-4bcd-8386-d9defcf0fd29/4b471f72c8253fa1462ea923d0fe39a2/aspnetcore-runtime-6.0.20-linux-arm64.tar.gz"; - sha512 = "83b1825c80cabfa5bbbd8c3e69b3525fa5cebef773957f96fee9319d60285155817973a176d47348c9b22bff5af24044f0f06b59229c067ce8adad4f3d4123de"; + url = "https://download.visualstudio.microsoft.com/download/pr/1f8d7d02-581b-42f8-b74a-bf523099ab5c/29da812824f1a8cdfbe452aa5bc0ebc3/aspnetcore-runtime-6.0.21-linux-arm64.tar.gz"; + sha512 = "3d39f458831c2e2167c06eb85205a764e9aa497ccc26cb19968f03cb3102daaafde391a707f08c3010bff95cfc0e9586ea97c0fe7d8ef885b4aae009748591c8"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/5fe2084e-1538-4193-9eb6-54b0f8470574/258915bac675b1dea6aa0b5435f64981/aspnetcore-runtime-6.0.20-osx-x64.tar.gz"; - sha512 = "5f6efea102c20805430815228070461216d8c5b928d090ec9d6d245eecbe23298920d1834276a0ce77bba524a14c83d97464580c72660bf3a2367a02f1872e31"; + url = "https://download.visualstudio.microsoft.com/download/pr/4eece21f-af5c-4bdd-8e5b-5e300f0cbc6d/5290c217803341cb2a51628e8ea0dd9e/aspnetcore-runtime-6.0.21-osx-x64.tar.gz"; + sha512 = "b7d604bc11224b32960f11ed2332cfe5cd595655dad5c2cae1fba40e73ec637f9f6e4246659296d90f544d7aa7c5248b0c7999cf82b4a325acef7368416c1dde"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/14d8afd0-2635-4f3c-96fa-63edccafe16f/317d19d4f625bdae211d428ab880a331/aspnetcore-runtime-6.0.20-osx-arm64.tar.gz"; - sha512 = "fbc4033b79a651923dc205b923ef6c9ef048c862113ebcaeb8fa6388827245039369e261e89ac371e895c538aa78fdfc07a5a1c1cbc41713f54a15bdc0ffdf5d"; + url = "https://download.visualstudio.microsoft.com/download/pr/a6bf9946-7321-452d-8dfb-120ea0911a6a/9d77b20bb6802d0e8a4cdeda58fddaee/aspnetcore-runtime-6.0.21-osx-arm64.tar.gz"; + sha512 = "bd1cf2252d61ab88e39d7cf6e7b57168363f599de7e2aafafa9f2373976c97653e83cbfff5d1708276b6503f8a21f60af8c8601835c4d6e0b603b3c4bb90902f"; }; }; }; runtime_6_0 = buildNetRuntime { - version = "6.0.20"; + version = "6.0.21"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/26b4797f-d3f2-40c7-8f4a-91120ab87469/4677c3c4e3ee7919836c3a5336e04509/dotnet-runtime-6.0.20-linux-x64.tar.gz"; - sha512 = "3688d7170a59015c36d6a5532db67bc22eff66b3eb0a7fc28e1f425791e27a5f467bc7dc593d7f455d72d08c7d27bfcc92b3c8bd30ec3c7c583a8aa82b5afbac"; + url = "https://download.visualstudio.microsoft.com/download/pr/25fc0412-b2ff-4868-9920-c087b8a75c55/a95292a725fc37c909c4432c74ecdb43/dotnet-runtime-6.0.21-linux-x64.tar.gz"; + sha512 = "9b1573f7a42d6c918447b226fda4173b7db891a7290b51ce36cf1c1583f05643a3dda8a13780b5996caa2af36719a910377e71149f538a6fa30c624b8926e0cd"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/f45ea605-cd0d-446b-9d79-b9c033c10c11/ba7fd32581bb5f448abdd317d8d55b3f/dotnet-runtime-6.0.20-linux-arm64.tar.gz"; - sha512 = "bf9cd8b13ebe15bbe41d4f3229cc902c3de2eb4f0008f4b239f3d0ec5aa01254adb8a98742c0e32e98f4ba95923611ed9f54963225b462a829c184301bc98ef1"; + url = "https://download.visualstudio.microsoft.com/download/pr/934fe9da-efb0-47e4-8db2-4d2153c7fe0c/e382d2a3169ac6a8288f09c9077868c3/dotnet-runtime-6.0.21-linux-arm64.tar.gz"; + sha512 = "f34e1319ded1e1115ceb63eab16a4ac7096e36e3236f8117f61ec9f0e19dd50adb473e1213a1018abfaedc4da57519b85058e7b14187a33e0b91e79af4dabf63"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/810c2cf6-c3a3-4f35-91f4-facf1ac24ef1/3ecedc1a0888b571d272c0dd64080c52/dotnet-runtime-6.0.20-osx-x64.tar.gz"; - sha512 = "f21cb044df7d1f57ad45b7ed65893a103cd6fe15b78ed3865380044207136d42deddde29872458e70fae9c8e7f254dd032f7539b4b9820995a075d92b907d49f"; + url = "https://download.visualstudio.microsoft.com/download/pr/af927c74-8c04-4aac-9597-3b56902a812a/47139a25bbc5e58b24fff42f6af0da7c/dotnet-runtime-6.0.21-osx-x64.tar.gz"; + sha512 = "f34a597910eccb84eec683f75f3ea8b6bdfc33a81388face050e33df679863465c905c0c99cdbfc54b3eb2b2a58733f7185a18234e562b1af5c925fa44dcb84c"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/0f3ecdea-c85c-423b-ab55-d97061a3d9f0/b01dd205c4d6ffdb6266e4540c82621d/dotnet-runtime-6.0.20-osx-arm64.tar.gz"; - sha512 = "27297a16bf1eec0e5a4154d8575b66008227a595cdd77277ae9796a53522b143ff51e063a7aa53a6c57717061cb2e5836c314ee43eeb86d465341fcdf834d773"; + url = "https://download.visualstudio.microsoft.com/download/pr/4c3bd8fc-abdb-458d-a675-aac97584babb/35b8a258af87daac35bab7db1af0ff9b/dotnet-runtime-6.0.21-osx-arm64.tar.gz"; + sha512 = "e5a853ee04890e0466489fc46e3cfb8c665aeaacda8646b6958337cb16aeb0edbcf6d4131d31510b12852262fdb466f4d9352e0818a7ecb7e00e4e3a5e5755e1"; }; }; }; sdk_6_0 = buildNetSdk { - version = "6.0.412"; + version = "6.0.413"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/62181759-93ce-4512-8de1-92de74a6ba3f/f83ea41c3161f301d3584598f9c31801/dotnet-sdk-6.0.412-linux-x64.tar.gz"; - sha512 = "ee97aa5258e05aecadc66e844fa8eef97d51e5035492999b974cc8272e4db1a862a1f88a925f38be9e95c71d2e961b56459dcd614475895df608945c8057c311"; + url = "https://download.visualstudio.microsoft.com/download/pr/8eed69b0-0f3a-4d43-a47d-37dd67ece54d/0f2a9e86ff24fbd7bbc129b2c18851fe/dotnet-sdk-6.0.413-linux-x64.tar.gz"; + sha512 = "ee0a77d54e6d4917be7310ff0abb3bad5525bfb4beb1db0c215e65f64eb46511f5f12d6c7ff465a1d4ab38577e6a1950fde479ee94839c50e627020328a702de"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/daff8399-d60f-4bde-97bb-c6e350c03e90/5eeb0b21bf1ad11b5f5a7b4ac217c381/dotnet-sdk-6.0.412-linux-arm64.tar.gz"; - sha512 = "669c19665f657de00fda41e5ffff8d80395618dc1cc7d6ec50cd06668b135b5fcca193919172c65394210b7c060eae146fd6d8d57deed889ca8fafddca66d06d"; + url = "https://download.visualstudio.microsoft.com/download/pr/82132239-803b-4800-971e-ded613cc280a/67d0025a0a54566657c3e6dfeb90253e/dotnet-sdk-6.0.413-linux-arm64.tar.gz"; + sha512 = "7f05a9774d79e694da5a6115d9916abf87a65e40bd6bdaa5dca1f705795436bc8e764242f7045207386a86732ef5519f60bdb516a3860e4860bca7ee91a21759"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/094020b2-7fcd-45aa-a122-42ad85b25d15/969de8f0d024a5bee5260271e097519b/dotnet-sdk-6.0.412-osx-x64.tar.gz"; - sha512 = "0aa713780c4b7f4e0ea72a0813715883f57174f04386b85f3a6dda1a66d9cf6d24c76cd1e0fc0a0991b80b7868b39c719d5b98254e4f683b6bc89a9b4043be9c"; + url = "https://download.visualstudio.microsoft.com/download/pr/398d17e1-bdee-419a-b50e-e0a1841c8a3c/2e8177e8c2c46af1f34094369f2219be/dotnet-sdk-6.0.413-osx-x64.tar.gz"; + sha512 = "605b28135dbc8c34f257ea1d10d02edb16569957e554ecc49c2a9fbb4200960b2fe21a06f2b770a9907fa915ebef0e6260704cc9e05a81af931f10dce7f46165"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/6a6555e3-06ff-4124-aad5-497a2940398b/47bda2f1324f867ae0da2099c5702769/dotnet-sdk-6.0.412-osx-arm64.tar.gz"; - sha512 = "3086e027b94ab8bc5b27e2dfaa7d16484efa2f6a7c1e291f420313021b3e6f65a5208de4b0d86271c3b83d05d784f29e231176dc6f5ba04e567336b7d7b7b871"; + url = "https://download.visualstudio.microsoft.com/download/pr/6152c11b-e65d-4b60-8fc0-3c506a6199d2/c9f1ce3f1fc5bc6fa758fac505845232/dotnet-sdk-6.0.413-osx-arm64.tar.gz"; + sha512 = "e3a24cdcb80b2e283cd93ebb0af4ad891ecb5f2002d56b82a379d5d99b934a58f5ae60d07d21052360f525692fcf7bfde0c678c5d7f9908101fdd2096bea4458"; }; }; packages = { fetchNuGet }: [ - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "6.0.20"; sha256 = "1jncn2n75vrhsmh22f5ij5rhdr2ninnz0z8clsi3pmk8ba2jzgsh"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "6.0.20"; sha256 = "1ssakq877f2wn51di8v64b3ij0izyr5glc37i238y9jm6l84kpyg"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "6.0.20"; sha256 = "0a6d269chp0126sx2igjhsrn7x6q03n5qwhwk7fy6ci1jddrk960"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "6.0.20"; sha256 = "13b3yr8y54g5ypnsrr7870csbnl9avwa7r6gk7553sjab255rar4"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.20"; sha256 = "1js58646f4233g6a9lkwwwhg0kb2x3r60a66lbzapk253x00fnrm"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "6.0.20"; sha256 = "1cwn0dkwk2wvddfraqh28yqy3p5cyrnfkprilgy3bqbnq82mfdxj"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm"; version = "6.0.20"; sha256 = "1paf9f3kmprw09nh1garni8rswcq7cs5m1ib6hkrkqccdis4hfy8"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "6.0.20"; sha256 = "1zr589pkivak83gjd7f15rc9g4whxmywjj1xyymbbaz46ain89gy"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "6.0.20"; sha256 = "0azf6q99aplbca8p2ijf9ccwrigz9r2aaplczj8byi0jd5dgya1m"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "6.0.20"; sha256 = "134a4yszz8gvba2zm8lrds39qfxrf42mziy4niihd4r9n44ksrdn"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "6.0.20"; sha256 = "0ijdgv1yczfppra6p770vf48vjgmrmcjxfnphah8rrlidssja1dj"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "6.0.20"; sha256 = "0k4ivzwbj67n4rr56fmi4jh2y3kdjhbgc376gk0ld50qwpghczxh"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "6.0.20"; sha256 = "1yiq9ihh71d8zlfsdf9xdnapzilxiyk987z9ld7w605sq6b45719"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "6.0.20"; sha256 = "039hs39abf1ngrgw1ali8pgzqqpwl6aiq7hqig85gj6phy5l8wbk"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "6.0.20"; sha256 = "0xivyv70kzpj4pc4ln1rk48bm9z9zy3bck1m4vg161rrd58ry16a"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "6.0.20"; sha256 = "06a211fjm9i9ipgh7y6fsp2si41mdr8hp5wpsvd083ybyyfsy32z"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "6.0.20"; sha256 = "00vz5r4l5p78fkvlglvhhvx80qlv5szzdz9scf0qm8hf1v01wivi"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "6.0.20"; sha256 = "1g0x96f8i8hiflzpb20h9wkn784zzlvd0413y8xlxgf187hj20yn"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "6.0.20"; sha256 = "11sdzb1lrpmmfbd14b3may8d1n8smm1rmfsqamp7bni408j16cfc"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm"; version = "6.0.20"; sha256 = "0w69cfyww088v29bs6diy9jq0sl6bpiaildvq6rayl9vwid71qpi"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "6.0.20"; sha256 = "1bi8bmil8wc42lp5b7a44c70mazycgxn2ag02r3r4wradwawfrmw"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "6.0.20"; sha256 = "1c3qz6h1w5wfpl52ys7s29kj338n3wy7w5sn9ghdz5x5vgflah9l"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "6.0.20"; sha256 = "1zzpj7czk28xip45i3fhhlh3ar0hh3ldar34c6w2vp4psvbdkm40"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "6.0.20"; sha256 = "06yzy9spp8d9pz7jihsrcx4rq3n9rcq2j0gq23yhfzp9iip2986b"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "6.0.20"; sha256 = "0bs2hxyjyhnzvcgx4lplwlvlk7rr5lk0xbncbn8in74pvvjw44qn"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "6.0.20"; sha256 = "0ra55v67748rr0acd22vgg2b31wmkaaghiifi26vwnrhihky9gma"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "6.0.20"; sha256 = "1mjj0bfm57anpywknshx8hc1z4xdinjxrxv3zim295w3dpz46y36"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.20"; sha256 = "1rqniyhv0i9zim6plbmrhcd9ykwabm5cm7p3mddxr8cgybm1vyfg"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "6.0.20"; sha256 = "0wdqbzma9fc5sh74a3mcxlrby33qz2hs47kb5c9834qvbjf38fcz"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm"; version = "6.0.20"; sha256 = "1q5bk01briqlp5bzvkvrq978dzb52np2sp8lv67wjdm7xcbpnfjz"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "6.0.20"; sha256 = "1zmsd13dd7vzwxqiznffvk99jqc3fdq3l382ixbr440a006splcr"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "6.0.20"; sha256 = "1s1girqjlrkz2kqijasmbpfh2fngqiz2i3424i7k9snrzjgnn6ml"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "6.0.20"; sha256 = "0vmlhgywjhb8k6gi1624fk3q21gy5gsnjxl4f4w8lmaf22zkllvb"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetAppHost"; version = "6.0.20"; sha256 = "04p7m6csfjqgndi81hpg51gr8pgzqqscnqwgrkkj7nas2ffdxlfd"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHost"; version = "6.0.20"; sha256 = "0ky38wy91pprdhbvxp64hz2fmf4kkchw9ldk0i68dnwg190lkjqk"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.20"; sha256 = "1vs4jirn78v65fn97zx4vz4msq2zrlmiiinh7zl0dpyn0dp68br7"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "6.0.20"; sha256 = "157z5liy55z3h3qvg9kkmapnldbw7v6qamxdfbk89l3dh7r3m5hw"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.20"; sha256 = "11yv6flr0l49rfa222p35dqv3qbc5jbf7yf28q3x09kv0x2571dn"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.20"; sha256 = "0nc1mbdk3kafgqayq4zmq0gb5ff0hd9bbn660haadmncn8j44njm"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.20"; sha256 = "1xzk2kpmps01srj0zyllfc8m65y2l27gpqcmvkh2llkv881kbdfm"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.20"; sha256 = "0qxiv3a7cgga8xnsq8xkvm5qy1spvgwsk57lm54wc6jyhc13fp2j"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "6.0.20"; sha256 = "14xfisjj5yrqcvy84f30jzvmchp2513afg633bq26irbcy6ilslc"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; version = "6.0.20"; sha256 = "0zdm7bd1z90hn1rvz2k8vwxrzgl7lirmxx4k2ih0gjyp5yz8pkjp"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.20"; sha256 = "18icvgf5avz03qv26ivnmn01fmz345lls0lzgl8n3qr93v40bjf7"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.20"; sha256 = "00i7adsd6inpgxlr69xgvhsb7sg9g5sscwdmq46z0dp47s1vphli"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.20"; sha256 = "1wf0fgz84n6ag81ry4mydkwdzjrsxsfy7rix73hl8ihfy5f2jhci"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.20"; sha256 = "0aq5yii9i52i70nkgzm4sb2gcv8i3lw61wl3wbws3lak2van75nh"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.20"; sha256 = "0glzhxnd4fjf9qjn6knj9gw8j9svxf265sb3qxyl5wnwyqx7rfdx"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.20"; sha256 = "0ygdldk7xaa12y3y1mrid8v0045j7d2r9gg509m04r2xvan7rhj8"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.20"; sha256 = "18nmnsh51pslli999g99d52ivsld67nq8kqxccylwj9qmj6cs218"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.20"; sha256 = "14iz67jr1xrshb5vqph3wk5ngnx4a6ingcv868fb98gx13r7wfc8"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.20"; sha256 = "00khxrlvfy49s5yxn5611vs24lqhmclzks3pf6wy51rw0fy540q2"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.20"; sha256 = "00ws9fi2b5wy3jly5pxmgxcjkfmjixmy0m4lw4vp9h4rb8q6prja"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.20"; sha256 = "1lp4km2sxjb791srirywf11nyj69654i2s4x4jadbp1kb2r7hp18"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.20"; sha256 = "1hbxd5nyzngynqvj7n0css7xca7kra5zrdz1g40wvz7hgdacd7j3"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.20"; sha256 = "0s3g5610m1asz410pp57rlkbcdnsf6rpr9mp8lz34la34w19gkpw"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.20"; sha256 = "0d509bdgmpjnkxz0gnbssdvdq3rs05k6frs8wpjzm6i5469pxjch"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.20"; sha256 = "1ilbsss1w9940wf2jqfgkirf5hn1lqw0p4hpd68r9yryai2s2wnx"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.20"; sha256 = "16sc3gfc3dd0mh86xh3qg00lbdz3yq7f7iyan33rl01z6ljkb3w8"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.20"; sha256 = "0vd3dh0k192r5wf6k11p44sywjkgg4yag3a14y0v8f3lnxm7zqfm"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.20"; sha256 = "0qdxvknp6ns263r2gvd5iprcdcjvzcwdn2xlkhyy9ihhszkciv3h"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.20"; sha256 = "08pjmzx8qlknq7dci8m5xlldm3jxcj28zlwjs295951zqifzdajb"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.20"; sha256 = "17ygzmbcsj1xv5dx63rxb0rvn0laakng7asx0nxsa5pgx28isqdx"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.20"; sha256 = "0vw0wk0j5alk4ffnp9960cdca2gmlvh9dj553nfxdmnil4vpj7wq"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.20"; sha256 = "0k68kxzr0y113rasi0br3jh2f7qjvay61yk6hyizwiz7hikmg12l"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetAppHost"; version = "6.0.20"; sha256 = "0kdb86h8adc5alsfbh7mii69yc1iyn2k21wf2j90izk8g63qdzsb"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHost"; version = "6.0.20"; sha256 = "19327qki08nnvvpqd1lkvisy2wrpcaj3v8d3qq10hyyf21in1ly7"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.20"; sha256 = "1b8wsdkhpkkm046v9yj23x3jdqygs64bzi9vjslbxg69h6andf2j"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.20"; sha256 = "0b0w27az1c97ailrjzdwlpzy7255nmq326gic51vp3p5a05pasrj"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.20"; sha256 = "18r7k5m6j7xpz4d0cnk74b0alxcgz6v2nz08zdkz1f473s6hdkvl"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.20"; sha256 = "1hi2kg5ka1biczyvg0pk7rvbfb08z5nib7yd18yxzjs7i7hb385j"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.20"; sha256 = "1w53abjj2cv39lgc8h4xwf42593cjhiah7vmfi4fc6iyl6q91qg3"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.20"; sha256 = "185vk80j81vckacp0hangng9r2rcw884nirwyvi4p1v0jk66i9g9"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "6.0.20"; sha256 = "1d01hrwkvf9a64lmv293xf829imghmy4g59s6lkh2dcg96m7byba"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; version = "6.0.20"; sha256 = "082zbwg2z2p6fgqy0svd6iahawn1riiqdn4dn63zs6zvjwwc26wg"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.20"; sha256 = "16zmi46nkhld8lq1hm5kqndwm0l0w94g352mzammyvrpwsn0wyhn"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.20"; sha256 = "1i9ghy6hvslnh53xdk0xwiq0j92cjim2nyaw3asrqk7rkcynsxz0"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Composite"; version = "6.0.20"; sha256 = "1xh5yqlpwhv1xwng93kw7v345dsmlwpg651zmi1mj95l3qd0p9km"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "6.0.20"; sha256 = "0r8s132mgx3283gf1xsg5m4fhc5yy6rkzmii56g52wxpl4si0i50"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "6.0.20"; sha256 = "1m8gi6nfy0x5ha2cja7f37237ybb6hd81dcspsb0shmbgag141ab"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "6.0.20"; sha256 = "0n4fkn7g1zknyalzs9vf3z6x19vrw594qxk1pnianw6db39c9qf1"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "6.0.20"; sha256 = "1nzpshl551sbmpdz8im2rvr8spi0rvdqb2js1kd1988qx2x2jwiz"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "6.0.20"; sha256 = "00jnmbljs3qhb03d16hh5pqy9na9lij77kgb1wa982lmb80hj7np"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm"; version = "6.0.20"; sha256 = "0c33yyrzfl3p1db7vvd287g7pq3zk14cq1hc8ggpkfr3z3kih8lm"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64"; version = "6.0.20"; sha256 = "0fggkfpr591pk5867q01qhijhmj4wks04a77fldjv4iv8azlsn8p"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"; version = "6.0.20"; sha256 = "08fa4s35c08rkj4nk7y2k9flliajvw20i2z7fp4a9dbpsjvkaj9a"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64"; version = "6.0.20"; sha256 = "149l8qsjms1zk20xazy6ggcnyhvlbp3rd03lhipd28787jy69d3m"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"; version = "6.0.20"; sha256 = "1wj9piipky41s5z7zwi76ksf8snzk8z9q4vdbl146kkcnaxrkrkm"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64"; version = "6.0.20"; sha256 = "19vxwiakqlp299fj62f2ijh8hv67vlk9iz1dg876gvvp06k9mkyg"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; version = "6.0.20"; sha256 = "1mb4kl2jlk6zsavl979j4z2xmml8kjxnnp3gfmv6rynk7b9m5cwg"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; version = "6.0.20"; sha256 = "1nz5krmsx7l087gsfpfsmrbwvjjw8qsmb8wcwn5aynljfl4jq7pz"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "6.0.20"; sha256 = "0k9i48w2lh2shfxz0w0qh19yd6y9qg05izhmqb89zpr7m5sccp5v"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost"; version = "6.0.20"; sha256 = "1xvrmb12fdcrd64bqrs111x170p712aazaqdspbbn5v3j1nbzal4"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.20"; sha256 = "0dp54dk7x8zwcgsydfmgn462ynl1809avmn6s22brip0iy7wrz5g"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.20"; sha256 = "05h8bg0655scv6crqkygc9iac5vf18cfa2slm52bcsvfvic8ad6n"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.20"; sha256 = "0yli4v5nxxizxfz24vk504bvjhngcvvk1ab3jcdirrg9z8pcp73j"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.20"; sha256 = "07indvjgrygh674k50k4isjpr3171h06hfxz2gy99bw3fm0y8lm0"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.20"; sha256 = "1qzzxdps0h7dpzz3ks43wzqvb9sqhbrdywzi883ipy7zwndl1avw"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.20"; sha256 = "08hfm9xjj6rl1c7zvcxfwsc8qb0d9l66l5j48k311apdc4jjsgg4"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; version = "6.0.20"; sha256 = "0nz759z6sgmrq29vjr2y04brfjmddr4ga7l5vrsv1k16vf39g3fq"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; version = "6.0.20"; sha256 = "02wqksvir4r22785w1rrnd4aqjav7asz8wji9v3955acrnhdg81g"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; version = "6.0.20"; sha256 = "07gsm1p1ccb3f1vc4n024ilz9hc7qnqxj6mwk3k8jbvw228nwi89"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; version = "6.0.20"; sha256 = "1p74mcsbq92cbbd5i83clxigcmmhi825q7izpzsypdpd46v73hmv"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; version = "6.0.20"; sha256 = "13pya2yy68r247fc4r3dbkq2hwaq5909n8v47cr7bvz07mk8isnb"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "6.0.20"; sha256 = "1xidixl08nys9jzi17w5f89kq9wiwc135ddcbnhpfyhllhrn03kc"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; version = "6.0.20"; sha256 = "0ypcdzhr3v48iy6c3z6vhi2yfl7rzp85p0smq2pn625c1v1xgmgh"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; version = "6.0.20"; sha256 = "0py3ydy5pbxzvgi2lmkgcm1f15p6kikcym0hmlaj58ag796b1kff"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "6.0.21"; sha256 = "012bssj7v9g9zg0k3zj29h9221shy579xn2zzjpxniwlgrvjalkn"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "6.0.21"; sha256 = "0sq67slr4fqq0g9nv0bqbf8jv0fyjlf29c2xgqids67gq22k7cak"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "6.0.21"; sha256 = "01zs924jfnkz77y50r9pwx0mklvf67c6r765vy154d2ffrqj8dws"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "6.0.21"; sha256 = "1hcinwd9wz9lm4rg9lacic4810khmq8g53vfhn9fpm0cx7v0scqp"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.21"; sha256 = "109g3x9djfpjb9fkwyjn6rg151n7n01iyh3q8yd0wl178blwzs4b"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "6.0.21"; sha256 = "1f3jqi9zd913grq1bk53np7zdirjj0rhq7s4pip9bgdn7yihmc3g"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm"; version = "6.0.21"; sha256 = "1x5v12gfssja2hlxv1wnv7s2cc28mrm06g4wsc2jgg01fgs58qi5"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "6.0.21"; sha256 = "0rafj2750hw54wj2y67cnq1d8ji419x3cc83i9x3py0i2bxfs20d"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "6.0.21"; sha256 = "1mrjv4rkgfwk0c30wsqdy259lqyrlzpymrl7i0gzsg89wvz77jid"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "6.0.21"; sha256 = "1yqxjnxlipm4camw59k1rizw11hfgz3rvxdi8saqk2vfc2rzh1pl"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "6.0.21"; sha256 = "054d7nmajgxq65ksv99k8swhr18yzwvb7gzkryg4n2msp6akgsbk"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "6.0.21"; sha256 = "0i6wf3kivl8lqrbq9lwnlwhnng2md415yg4wxnyyqz4a2mrj38qa"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "6.0.21"; sha256 = "0bc5zf1zyzi9cdrnpcr9li658pj2lv9b7fbcfavrmp22jlk81z1c"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "6.0.21"; sha256 = "1p1jgcxs4231fi5vzdibrp2vnxxnzh56f3my9fp8kcn7zp2pzp5n"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "6.0.21"; sha256 = "0c3xm07zyglb38g3kqfza92zkpjsg7k7mxr3hq3jwxbfzspxxv6f"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "6.0.21"; sha256 = "09vnwfwwwa0agb2i88ya8bdwlryjz5p4jrpc7qn0dx3dwzbpkxq2"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "6.0.21"; sha256 = "17rbp1hb1yl3vw27yqa5zbrfmgnxd2p49hg6qswwc4rlb3zfrjkl"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "6.0.21"; sha256 = "1mqkdv56qycp1l7bza9rvzaghvd8rm3z863s6w73i21f3y0xnixa"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "6.0.21"; sha256 = "0grfr8v5j5g77smqpysqxr6glrw3d13gqj241pynzih5j6v0rz51"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm"; version = "6.0.21"; sha256 = "0ssq95ymx7rg4b85hrxb1vfkdq8c41f464w029f1k9c21dd06ra7"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "6.0.21"; sha256 = "1f7n63argwj3vw1y36pb8nj93ami8j1ff4ibp7h19555j96dnpwp"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "6.0.21"; sha256 = "1qr5pkjgy1z4asa2mmkc0fzycmg4a60zy5ib3f3hpdq7416k838q"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "6.0.21"; sha256 = "18dsq2n8sxwxmg3rblj5wgm6c3cvdmdll31lbwknbwjdp20c543h"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "6.0.21"; sha256 = "1q7na94z30hd3xam802izb3mi9nl5l6s4akah5a62jqjxrjb76l4"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "6.0.21"; sha256 = "1widhp61a7qxnjgjqavqi0d7z36drjkvi2g0r39y2sbk0a9hwsml"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "6.0.21"; sha256 = "1cwq84i6xd4h2ddl4yjzd6pbf3cm3g2kids0xkgjcafx3qjiqg4b"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "6.0.21"; sha256 = "0pgc2rzsr1ag8hk1g75w1sm3p0qabr7fddckfsfk4sk54gwdr14k"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.21"; sha256 = "13f65051h35hbvrz2g26vsvi9c1fbrc1hkjsxvx2ys7s1qddddqw"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "6.0.21"; sha256 = "0y9dwb9fpycff0jh3c7gqmz9vrbg52p1bs4d437b73sfl7yj6s0x"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm"; version = "6.0.21"; sha256 = "1hww6k853nk8i620d9gmldbaj9ylawwqhzcjfmzpkmpj1hij80jd"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "6.0.21"; sha256 = "0ihsszn9s3dsk31rr4qvh3kvlf3dwrzcb0s91dblcgi40gyczqb3"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "6.0.21"; sha256 = "1vj58wmhy6rib7y87qg44brvaqqmgnhy69w1icjq2dw0xki5gkcr"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "6.0.21"; sha256 = "1dk61kz88mhss6x83za34xm0q5nrfv4pdp0mvjqsf448g7c3ndiy"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetAppHost"; version = "6.0.21"; sha256 = "0rfa7lrhkslws7j31h51bii9y0bghiq8ar6drljyi45hzmp046rd"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHost"; version = "6.0.21"; sha256 = "1pq884vc9hs34giwbj2awzbc3z168hv201871ivbj8scaxnbga5h"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.21"; sha256 = "0cm5h80dix7ca16bhxsnm63jvcxi52iy76v0dlzbnpr8f85i4368"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "6.0.21"; sha256 = "0i1qgjwk7ghl1ajdyynl334ncv51nr774fk9xdsylz0qid7nk3qq"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.21"; sha256 = "1x75lhjwpcvh1qrfkzv20blr8kvjpjs79zwn7i39m4dns39bfqyh"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.21"; sha256 = "1a6r36g6sgx64faahgysm21za6hjnk62bp445xb8jxd35vbzqk2s"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.21"; sha256 = "160hyyawl7zz5kwlzwhk6lh5hsnjzsx4h1vkiixg201y24dknim0"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.21"; sha256 = "07b1f5iafhbgmvyxbfbax14wwyyrph89wfbq5bigsibg0j2275nk"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "6.0.21"; sha256 = "1585phixq77p44w7kiq3ynf8shfimkgh0raq6shpbp3pv6ayw2ji"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; version = "6.0.21"; sha256 = "1ql6kbnav8g9gfc6pv347pcxf853n3q70r2w6l889zizidgvhwpn"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.21"; sha256 = "0zai12wv98sxm51axg474c393p8z22dml8pxl9680hf8z0idi1zh"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.21"; sha256 = "1lf3g9m60kzrysrsbbys9nwf5vy089lkdrpaix4wb8v7qz35z7bf"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.21"; sha256 = "0k9xy7hz3rxcgg0n4jzgbsg7gwah2xz48i2zzy8msqffp46d7gja"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.21"; sha256 = "0bci8z2p4akkf74cyd9x7x2kbyjxr3cik3yyajzc6v6p3pda2cmy"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.21"; sha256 = "1s1cpfj86yl7y7009zvpyjxadyji4pvbjvfmzi1abgyqrq570gba"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.21"; sha256 = "113jyq5ag1qsdxxzz2wk8frnzhybycmqzd945i5lz63hpsm64vmr"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.21"; sha256 = "1jrwjddqb0sqz3n1lsv3inx5119dcjkj4hsarbzj32l81zi6id85"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.21"; sha256 = "13df176z04p6byf0msjyfw9rwmvicbnidrznvdg9njvdni3yxrk2"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.21"; sha256 = "0nyxxqzsgfp3p8mcw258big603fmkqn8xxwgngz9ywbcz2vgm57w"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.21"; sha256 = "0nf3wm66hr4f35dbfvg4qy5wbvc15maiw1dicwzwj4p6w2yxl5hx"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.21"; sha256 = "1rqsms2wm64cwcvc644z3vrs0jfb0gf1my781mshp7cp95z466z9"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.21"; sha256 = "1rga4gy7yna1rdkvbc07hm107kvmygkpwrdbrwbqlw1z4rvg8qs5"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.21"; sha256 = "08msw4lbklmz0yy749fljmiwh3na5zkmjgihcyg19wi8b5rcqi4c"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.21"; sha256 = "1vbz73aj4f9a4if9mckj7rjqfqk0bgwnwj77vlx6rshcc8fsngwp"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.21"; sha256 = "0134c4xzbh3g5ags2ahxrjkwmicmybvyjnl18y06f77r4bnh81gp"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.21"; sha256 = "0ck919lw68xh4x6klqzsc8hshn65ykb9nd4jpk17r7crmxj8jk4n"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.21"; sha256 = "0rz5rn84irzf2k03dcp5qghhmgi9sji6a5l9l2hdjjr8j8pq9dw4"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.21"; sha256 = "1vv0paimjpc3bacv5cz39y4gd5cpc9k9863iil8crmm2rkiy611i"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.21"; sha256 = "1x42nrh4bjf7q2m193dziks543g72cyf4gfylhsyd397kp940sh5"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.21"; sha256 = "0sqxzfirdmaj2r6nc1yc83qb1sbgsl1r0qcjidrwi7dlc5zamrvd"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.21"; sha256 = "0jffm6yxn78l14x7j53hl9729s9vyyv604w8zdk9npdf8sgaxiwm"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.21"; sha256 = "14hbzh401vmfsngvnmc4c1g8hv41h0za0kh8g6ya3lsfylmzdr06"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetAppHost"; version = "6.0.21"; sha256 = "120qv0z7jhiplabsqal1ldriillqbbyk0qfrc51yrfp5p7ycc8sl"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHost"; version = "6.0.21"; sha256 = "066fn8ncybkfpfssrr0pg0adhrskknn5agqf3bd0fdhwg45k3gh7"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.21"; sha256 = "1bsax9akfrxkj7nyx20hnw98028y3fbawq9k728ldpf8znsk3j0a"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.21"; sha256 = "0pl4yskax24y75mfd6rkwa9cahyv0a1h1836yr7nb3dks6a9npf0"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.21"; sha256 = "1dq1dq27fi4jacrq86xdwfwx49y7mgxxaaqz00na3afaaya2c2xv"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.21"; sha256 = "1k5ajk31rr9bgy9rrlj67czlqpbj5n5iycmf1hvg7knczaraihss"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.21"; sha256 = "1qa1hhbmlb4brnbrx0g3ap9b7ss1f9ddmigjsxgh9z20i0y8pybz"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.21"; sha256 = "01cfpcbds831w51k9ajwbbca6nj05f5cgqswjv5h5hiz85w23yc7"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "6.0.21"; sha256 = "08yx4m92fd9sxmfx4r2i1qma9m5jf7rvf35kqv1g6r4pplvm3pzz"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; version = "6.0.21"; sha256 = "0kgh9wnx4h6vv9jnbpyzfn8ra2vrzcrza6h44vy4qxbcaavfrqgw"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.21"; sha256 = "05cp30bkyfxiqfx6v1nr8rc08jc9br22n0klf1y1xxvnb5xh9c49"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.21"; sha256 = "01gcn5dh86rjybl1g972id3p5zwiisb6ba9w6bmzybh5pbp2a3sm"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Composite"; version = "6.0.21"; sha256 = "0yhx9gdilrlpzzm5s97y248kr3qw26nmc4b9qzqix1diyln52z2i"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "6.0.21"; sha256 = "1krvn76iq6y89k8vyxvrvb1x098j4bmf12va32hn9iidkyr656zj"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "6.0.21"; sha256 = "122nl7llv198m8fih940icjkapk8jxd32ih19cck9cb0bkk0zcqc"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "6.0.21"; sha256 = "0agjdrz2qy3qmc6r23bnqa4k8fj1kffzb7bibw7yhbz3xvvyxd9k"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "6.0.21"; sha256 = "11x18rqwis4459mqgdqhwzmqjbj0h87dpypn6cnxqp38x683zcwv"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "6.0.21"; sha256 = "113p8mql4lfz9cdbfhn1ahd53kwc3d240m1l3z9nlmlbajz9y9xa"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm"; version = "6.0.21"; sha256 = "1b52v5rn5i989vlg92r3magxsq6svmvap409g5f9yks3v8cwndp9"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64"; version = "6.0.21"; sha256 = "1mhrrdc6vvvv7qq1qlkfx6w34zzlxv77jlyz5qznhpdklfhdh9f8"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"; version = "6.0.21"; sha256 = "0r19id7qy44lm4xlxi5ycn0msxpab5wga94iy5s3sch6vh66r53z"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64"; version = "6.0.21"; sha256 = "1hwf4scm9s0ml477r4iilw8z7q69g87d15hq7v75dglpacikm4mp"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"; version = "6.0.21"; sha256 = "1mf7axx2qw0g9sgiqy302287jz6ir9lxw14qd2hafqy83hryzl81"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64"; version = "6.0.21"; sha256 = "11krayn5c82yicw2xkl2y0yhmjvdi5zc6383lsiv6zr1imk0iy6c"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; version = "6.0.21"; sha256 = "1ljzi3vrx0lbhvp02d1fm3hws06phqgrsav1yg6hwk9abp2q44p6"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; version = "6.0.21"; sha256 = "11vjprx73v65khddghqh7r5x5zij04w9yjr9njhhi6x3zb42q0cd"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "6.0.21"; sha256 = "1rcsk1j7n1r5i57gr8q60wbc9wdkz09y2w1dl02pi7w5pf8a3j1g"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost"; version = "6.0.21"; sha256 = "06fhwpf5hrz8w4fjsb8hqzlpmc24jmggvp7fk10vvp4gy4jqc7ja"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.21"; sha256 = "1xa6c30whip8m40m208y2za9b854fhwgl9jhzigny431f15nsf56"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.21"; sha256 = "19zmawr6zihk6al746gmrw4sgjf5hkl3n5baaj0h3h177vprh7yx"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.21"; sha256 = "1pxycv7ssawlqsh192qsg40z3q3c1a4jqpwillng3kjq54j0kqac"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.21"; sha256 = "1swcj7v4ryk6sk6nil7g4nzd1zfss470ic7cgxkwpzlnb720rbiw"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.21"; sha256 = "12chbi12vnvsfw2yrm4pj8hnba66cq6y83fwzjxpidca4disl34v"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.21"; sha256 = "0q36jbmhwrpvrnbpckq7qaipwg82ic9gb02xgjizh18cpnr9xkgv"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; version = "6.0.21"; sha256 = "0j1f59qa7bc5lnrya39qbwsb9q9w6rvbhlzkjyal8k6cjdvlcwhy"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; version = "6.0.21"; sha256 = "1aq51kbaa6hz21qy0hxflqrdkp8fdj4x9xwqnrl9vg7zmqzjd9yk"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; version = "6.0.21"; sha256 = "0za904fcz2ckhnbqabavd6gm7pifl7ap9jzxakk11f9ym98d8ls1"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; version = "6.0.21"; sha256 = "0y25m7mc0nnwik9f30i9iwhw5rdhaacamiy51w15jz6dilm7m4m3"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; version = "6.0.21"; sha256 = "0qanqrbrpzjippga0awcp815052z2al1nrgf7sa2f91325b2yjx6"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "6.0.21"; sha256 = "1ivymplxwvb78mc2m1v14p4gj2l8lpbrk90j1aq5ipqkikh7r0bc"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; version = "6.0.21"; sha256 = "1g4mf424mw3rww3rmybmzap1p9bhi0anmz6khd8ynprigshchccp"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; version = "6.0.21"; sha256 = "1nv9ynkblg1d77gplnpvyvbnym2jc9l7rdfgi24hwmw5w9fxdv99"; }) ]; }; } diff --git a/nixpkgs/pkgs/development/compilers/dotnet/versions/7.0.nix b/nixpkgs/pkgs/development/compilers/dotnet/versions/7.0.nix index ca35bdef1a4a..0e839f606ea6 100644 --- a/nixpkgs/pkgs/development/compilers/dotnet/versions/7.0.nix +++ b/nixpkgs/pkgs/development/compilers/dotnet/versions/7.0.nix @@ -3,184 +3,184 @@ # v7.0 (active) { aspnetcore_7_0 = buildAspNetCore { - version = "7.0.9"; + version = "7.0.10"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/c1348fca-4ef4-46bc-9f6e-04f2315e0d3e/50fe6b7c2df482cdc880b66bd46834c7/aspnetcore-runtime-7.0.9-linux-x64.tar.gz"; - sha512 = "aabf4fa5ca726dc52774e5d644800ef7477815b22a982b7a2752dec6569186aabca93d5386e195e7ead377144601a786ae6a5d76ff28435bdabfad495cfe554b"; + url = "https://download.visualstudio.microsoft.com/download/pr/08af0433-9ec3-4604-9d1c-85e3922a4524/396b340b4ee38765d7462e2fc61a5e3c/aspnetcore-runtime-7.0.10-linux-x64.tar.gz"; + sha512 = "580fdda88824bde6b2d5c09eb009fef64e89705a8aa096dc71338a549969842dff8d9f6d4bb4651e60b38e44ed0910ec18982a062b471ace18c2e22348de11ab"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/9aca092c-f9c0-48d7-a01f-3c1c2eaac903/01b345ddecc7a90d5c99d016fa5180a6/aspnetcore-runtime-7.0.9-linux-arm64.tar.gz"; - sha512 = "447ebbd115b8d38eeba70f531010832db535cf3a17404491f552e99a5a59c8c63525640694a6753d27e9a7ed5bf1064998491c1983361c1c37b152b01a3b8f8a"; + url = "https://download.visualstudio.microsoft.com/download/pr/712946ec-0b43-436c-abfb-3abab81f6cad/c83ba8df4dab39957ffa5e93604f0b32/aspnetcore-runtime-7.0.10-linux-arm64.tar.gz"; + sha512 = "83d3fc657328f127ea8881844dda2f91fa03f2157f5c76acda64cd091e430fa7d812b3984b803ac624b171f18a5eab3c7b5791a02baa68eddcaf7498709f982d"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/7e6cb756-70e3-4974-b96c-dc9b9d138306/9b0ea50c629660a565db33e74a69fe8c/aspnetcore-runtime-7.0.9-osx-x64.tar.gz"; - sha512 = "b2cf51cff120abda9b5ae213e294f73debd620bc8f3e6b12e1bb628df31457a5bb8c6dbb12cb1dcec24a2c04edd5ebe807d6761f6095e7a90441f1930acb8185"; + url = "https://download.visualstudio.microsoft.com/download/pr/d10c9d59-a624-4175-9069-4a13fcf9a1c4/427bb8da02c7907bc2f3115144c1515f/aspnetcore-runtime-7.0.10-osx-x64.tar.gz"; + sha512 = "1f1fbfb0851d62538aa6feacb5c38c14289e7b2d19be62c0e240da6d3c9336f3223eaa2f3e64559e6d8f599a33d9f8dd3d138998386ee9532854139b3275812a"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/f967c09c-7a90-4da9-b933-926ed7870b16/0e5fbf15f170ceaee7e3d1865b856a99/aspnetcore-runtime-7.0.9-osx-arm64.tar.gz"; - sha512 = "fbe725a764b765f9954ae771b3d043d6d1a53e53149d0b4c89a4138793d9471f2924f68a5b8e1c107d9faa07946f2ac00584ded9b179ed8d40cf230ac7d34750"; + url = "https://download.visualstudio.microsoft.com/download/pr/516a672c-9216-4592-be66-a628a166b583/fec0aa593bc700a5f5d3860abf1a4af8/aspnetcore-runtime-7.0.10-osx-arm64.tar.gz"; + sha512 = "95c987c38b80b1083016ff360c957ac4cbc2aad406f87095f7350704de8b9a23ae060e551166c396cadeb54f39f176d5a1bbf77704edaf0c0a308d87ca29b838"; }; }; }; runtime_7_0 = buildNetRuntime { - version = "7.0.9"; + version = "7.0.10"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/ecc0d5e3-61f5-49b1-ac1f-3b46956e1139/1ec7760b1697363667623f22a16c67b5/dotnet-runtime-7.0.9-linux-x64.tar.gz"; - sha512 = "09552e5ae6ac014dadf17545ff0a30ab32921075a31fb33e7be148c13078e30d097f592ffa1b8d306563aaa3f6302e40c5c0ba815c1473bbd5d72e3bef55d91e"; + url = "https://download.visualstudio.microsoft.com/download/pr/e9cd1834-1370-4458-98f6-d0d035dcd41e/6d2ca4b900398e717287ad0e75eb9a3e/dotnet-runtime-7.0.10-linux-x64.tar.gz"; + sha512 = "f15b6bf0ef0ce48901880bd89a5fa4b3ae6f6614ab416b23451567844448f2510cf5beeeef6c2ac33400ea013cda7b6d2a4477e7aa0f36461b94741161424c3e"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/f693db81-adb6-4481-862a-887993824572/9bd6d12296a5b07d8b4b0190afab4152/dotnet-runtime-7.0.9-linux-arm64.tar.gz"; - sha512 = "271396af3adf881a4c5c8c28a812f9a0a30e11497bb0c9cec12bee4d726ed9151b2d35eb9146b5938611ab60ccc249d5ce5c870f721f791d19a3b08545dbfa97"; + url = "https://download.visualstudio.microsoft.com/download/pr/023e4544-e6f6-4d2a-ab91-ff63eff97db5/26c02c09fe3a5d57248caa0a0d9e8254/dotnet-runtime-7.0.10-linux-arm64.tar.gz"; + sha512 = "e90b68b272d5db7cf8665bf052fb0300d50a69818d70675442dc891654d140f7f84527b849860589bf152de1d00aa55dc15ee32f5678d46ea0069210fd002b03"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/f12bda3f-cef0-4d22-8ffe-89f553b0e5ed/a0ff4b2aeae50d5192e0e6f47075345b/dotnet-runtime-7.0.9-osx-x64.tar.gz"; - sha512 = "104e724bcec68fd77e8f07b71ed364cbcb40394c9ca0d8ef52e1eaab867b579f06ed7b0b203a50bad3df45634d52b6be60829d87a48c1800467f242879f8884e"; + url = "https://download.visualstudio.microsoft.com/download/pr/b6caa3ca-cb18-4891-b188-aa661741ec01/5df34b59b10e79714bac97cfdd6e86db/dotnet-runtime-7.0.10-osx-x64.tar.gz"; + sha512 = "6b992fbbc673d5005f2412839c632f772f6576c9ff95d44afaca478a79597601b306e1f1c496836549474a2c35238943ba27eef5749b1a2bbdd8f36553ad145d"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/20e6ef57-7686-4115-b7e6-ac561dcbf4fa/e2bf64248953cb06d5bafd6919f48905/dotnet-runtime-7.0.9-osx-arm64.tar.gz"; - sha512 = "1aae7726b89c0398f29bc49fe9cc4c2c3f27f1114d5ab140c998fe74b13caa3eed05cf5ae28eb389f37de2023b35c3bb864be64a2e596bde673e27ce749c53a2"; + url = "https://download.visualstudio.microsoft.com/download/pr/fd4660d9-e747-42b7-abe9-eaedff0356ca/8a6f41f5ee23ed510c442d1350bda8d3/dotnet-runtime-7.0.10-osx-arm64.tar.gz"; + sha512 = "f578e00d5bd144c51e5d71adbd8e0ecc97f7e8ea06263c585785b41ffbb590537f5a18b63a78e45e90e798cd66fa45285059226b1904f4c2d4e2ea40c2c71bbd"; }; }; }; sdk_7_0 = buildNetSdk { - version = "7.0.306"; + version = "7.0.400"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/0be7a87e-3a3f-4500-8301-49ccd6f24887/e9e36f35dbaf6625fec3e18f5c2b613f/dotnet-sdk-7.0.306-linux-x64.tar.gz"; - sha512 = "62df9bca9492b3273830e098e787ec3664243989ac03550534599fc331693553660d3cf8bca655f2d1326070dbb7b20b04743eaba77fa9cc69f6f0fddfdebd06"; + url = "https://download.visualstudio.microsoft.com/download/pr/dbfe6cc7-dd82-4cec-b267-31ed988b1652/c60ab4793c3714be878abcb9aa834b63/dotnet-sdk-7.0.400-linux-x64.tar.gz"; + sha512 = "4cfeedb8e99ffd423da7a99159ee3f31535fd142711941b8206542acb6be26638fbd9a184a5d904084ffdbd8362c83b6b2acf9d193b2cd38bf7f061443439e3c"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/fb648e91-a4b9-4fc1-b6a3-acd293668e75/ccdc8a107bdb8b8f59ae6bb66ebecb6e/dotnet-sdk-7.0.306-linux-arm64.tar.gz"; - sha512 = "1500927cd2b1e048de8ee5339937fd41073a85a82b7a175220a411212d22e4906b4e5e6d29b51d068157d2ecde33238d540508c700793dca8b04b4d1dcd5c89e"; + url = "https://download.visualstudio.microsoft.com/download/pr/16b0b1af-6eab-4f9e-b9a4-9b29f6a1d681/4624e54b61cae05b1025211482f9c5e9/dotnet-sdk-7.0.400-linux-arm64.tar.gz"; + sha512 = "474879abcf40d4a06d54e02997a3fb93dd10c8d5f0dfd5acbf7e1a6f493a6d3421e426431d512b482c62cda92d7cda4eddd8bab80f923d0d2da583edaa8905e8"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/3d615bde-bfce-4ee0-a3b9-73dc4ea5a472/907ac9c03d971c7577ce60932456b3e3/dotnet-sdk-7.0.306-osx-x64.tar.gz"; - sha512 = "1ba293a9e07819aeb646c86f0db8280394c4a2b62f828d57a5ae80416cbafb1649a22e27cb12cc315dec1600cb825be645777d15e2f7c8d858fac3c55d0ed057"; + url = "https://download.visualstudio.microsoft.com/download/pr/1a603c4a-7e79-44ef-8e09-426a2c1c6e60/eb3dea0e50d73fbf28edf88aa8378e38/dotnet-sdk-7.0.400-osx-x64.tar.gz"; + sha512 = "e705c7466c9aa0c1203e0795ced23c6b794285ef60c8f7e1d199a09e596c20180901c2ec9c24483afa6302afb46a6b87ce18533283e2223a2161776f25421f61"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/0e57f35a-00e6-49ab-aa75-7ae6711f0a8e/f28c04285b8bfd3f975731a186e23c23/dotnet-sdk-7.0.306-osx-arm64.tar.gz"; - sha512 = "ac8c0b6e9d2235c8ee639c6c50b2f412f808a16f1616964f6166c7c57d899be2a0d8e83dd6f3010634f8f252da483c5d99cb083703996a99a6b9238cdc2cda6f"; + url = "https://download.visualstudio.microsoft.com/download/pr/3df92af2-c066-403b-ae65-10b7ec879b32/a4a5a807d92510d5b74ee8fef9b2babd/dotnet-sdk-7.0.400-osx-arm64.tar.gz"; + sha512 = "134f764680336481a67ded13af8f9ce9e89e29937c7998d8e6a3695593dd1246b8d9407649f125032a3057c138b9739aef3bf8e3acdf0220224417c2036bf159"; }; }; packages = { fetchNuGet }: [ - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "7.0.9"; sha256 = "09d86p5r8wbv03f89cylkg6czwf71m50fkxmav9qp3p5cscayzql"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "7.0.9"; sha256 = "01nkzvwgrlmgw57llabdgfxqz7jp54a2p3fd83zdlajqmmf54wi5"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "7.0.9"; sha256 = "1z0cbmff7kmv8yg9x9j4jzga689fy4434z8jy8s3vjsvmcj96wmc"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "7.0.9"; sha256 = "0059ldcym4lwrifibhb8qlra2f3ygzb95laxjgxj3jbdh78fy3i8"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "7.0.9"; sha256 = "12wkvz1mwyxv7zcr18bsyfa93p0wjmxqyz26va34xrfws699ip1v"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "7.0.9"; sha256 = "1spnj5n5l0hksrq89blj0xcsp1cnk2dw8n0giqrmq790yssvzn16"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm"; version = "7.0.9"; sha256 = "0paqgqbddlnz6p0q1rmc8rdxhgwhs2gqnhbq8b53c0pn8dv554nz"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "7.0.9"; sha256 = "0zw8bqj770gzk03ddxxh2y69krgxvrxn646878lf0l8ssllbsp5v"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "7.0.9"; sha256 = "0zm2gly0pkm5x0zngcbbz060i2p5xssrb154pnix9xbhpxf9bab7"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "7.0.9"; sha256 = "019fpgx8vminim43x3j4ym0m3fg42r8igw4yhh6ivbfkzyy5jnkb"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "7.0.9"; sha256 = "1vsrymzxfrsa3dvmia9wgvyyz1s8h3n76qwcysa78dqf6lkas77s"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "7.0.9"; sha256 = "19wzv0rwddcnrkz0g10gqya0l1brpajkg1krpcf8br0ly0n6fddi"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "7.0.9"; sha256 = "1l3g7l5xzcw3hpk3mcwsl6g72qfrs0m3blazrngma73z4cj3k9bi"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "7.0.9"; sha256 = "1cl0xj4aafsfsvms4il6nrx8dyfwx0wdykwzrr2azy2yxvymqslr"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "7.0.9"; sha256 = "1ckgzrwi67prsab6zrjjm0zmf6mbk7wzjjg197nnrjfd6sp5dpq2"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "7.0.9"; sha256 = "0ymj65d1fjn7mm5w2myrhrq465xsr1nggnvpmbfr5md9g9zz78h9"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "7.0.9"; sha256 = "0jhcajp4dy3770y5394rapsjl6z7jfdw8c2wnsqdr2cgzwjcjr3s"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "7.0.9"; sha256 = "1rprrl8qbdn9v3j7k2dkh0krmr9bak8k3r5lm9v43f1h85gcicsk"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "7.0.9"; sha256 = "0vgn0gd31xfk4j7a8grnnbn3sc8afbncxzcfykzlrpqmzn61plvm"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm"; version = "7.0.9"; sha256 = "00v7yivfj6vl2w0cxnw03pdqwbqz55ds32nanqmni069466x8aya"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "7.0.9"; sha256 = "139lkp92clq50d3jcpdlv79mx72fi46q7bb9skbgc6svz9d40x4y"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "7.0.9"; sha256 = "0dbwkh60f4sbfxsfzi5kyhc7aiz6f9bx3p0m5h897pp94xz7gqrl"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "7.0.9"; sha256 = "0v6ln2cbh09nsglkcclay9jkxchnlg89qkzxmw2ml353b42an1ca"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "7.0.9"; sha256 = "0kp2zhxq7dhsclb57ah3xw7ahp23n2xx1lxxmqkmw8gqgan99jwf"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "7.0.9"; sha256 = "0d380v98ncgbjzhrd3pf6ff2155rbl173sr686ifs8djl1w86q24"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "7.0.9"; sha256 = "1f1cjqw2wxdykynj2vkxlhqk7kw058219yydyjsgpczrxpdqmcqa"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "7.0.9"; sha256 = "1kd4xdwwck1yjb2j4zwj6xq7b6skbc5x565mpzki8s0x2pncid7s"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "7.0.9"; sha256 = "15fw7ywbn28asnn6d23rl5bljzx6crxq8nj0iv7l24c96l41pi55"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "7.0.9"; sha256 = "0k5iqm0hq9f9nwq9sazld3ada7zx2wypcf5k2ddhrwr53wr3rb2v"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm"; version = "7.0.9"; sha256 = "1nmb8hjln8y061381rii1q0m8ipbip51wciypdgvngzvjsibhsgs"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "7.0.9"; sha256 = "16advlismh4qki0dslnycicy73xlhjm3cv595v8yldrvynam2bdp"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "7.0.9"; sha256 = "1lxn13pvg2zynwnzxriw6izdq778w004m5ijxircn1mhzrziipz9"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "7.0.9"; sha256 = "1659734dxb42pcyjsbdg1r9m13z59qm1kd6c23dpix2dwfn2jnrw"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetAppHost"; version = "7.0.9"; sha256 = "1zyrafkqv54fd03m8pn7gly2svh8lpsfkbf8cr962w56g7m900qd"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHost"; version = "7.0.9"; sha256 = "1zsshmfjm8ivh34qgb6jcmrd5lv9c8lb40k9splg0d3vi9769kdk"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.9"; sha256 = "0lgfaqqjsijvjspz2as5c5wjcgpl38pqyvy016b6bq0pii3008xg"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "7.0.9"; sha256 = "1v1vq51isgmj15x6p9jmilvgh8kv75748ga7ba9d9azjcia6dj18"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.9"; sha256 = "14z8nr5h8aw5090xwd5ll82c9j936fhadf9k0skb8rghkwqlak0n"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.9"; sha256 = "10vkpyfp5v9nv2rcwbi20874a6swqzgzn7w4y5zkx51q9a2r80yb"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.9"; sha256 = "064yry4gplxjsxn46ardi9jzvpmm77b0pgv9izhdlp5jgnxp8hrf"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.9"; sha256 = "1jzasfcy1rmn6vmsm5i96srp04ha6nv4a564p09wam1xjqspm3fc"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "7.0.9"; sha256 = "1gri5l2gbxkbhhjxkzwa4wnyrm522pimpl8ad2nhq2mpa62kmk20"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; version = "7.0.9"; sha256 = "1jimxwgx5b311y1nxchyxg7yabkns6xlhx9sc0ha6nyv9m9bbn4y"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.9"; sha256 = "1ml6kb8m6l64gvf2igh0cqbhgk51n1alqq1zn1hfcg695wm0ldxy"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.9"; sha256 = "17ls7hkmmiagdfrvrh2w089pi24xjyg5w5xbxzwagv65aff0m50z"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.9"; sha256 = "02n69ki00djz3504sfz26akgyk2m0bqd3cmpl3553sh68igqaqnr"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.9"; sha256 = "1cwsl8abvb5bvkciyb29jv0cbc9yr5gbsv4d16q7sifhmhsj7ccj"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.9"; sha256 = "17vfj41qza3l6vslq5zb8d8wj9mn23d3z6g2flb8spdlvvrc23mn"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.9"; sha256 = "0lcx0zwdryw2jzv61jaqhslc3iglg2kc6lcxqs746vhwsqd40fcd"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.9"; sha256 = "1cmjc993gfrxijk4mkfjvhz2zs146353rhg3948gal2r6gdqnqba"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.9"; sha256 = "1pp2fgk7c0gdjqmdxddj0xw99akrqpw8hx1wsj4x6yx5f3p3hgay"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.9"; sha256 = "0p06lmfip9iz934sdvql4iir9ln6n59f0bwwg40i4fldvpfgrf6x"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.9"; sha256 = "1gzfypb84x6wr3rrywr5m1lv0a77wz56vzczb6c5kgad9dgjxnhz"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.9"; sha256 = "062xbr09j64bh8qmq77mhdpkd12b1xn8282xyvbxb9svpgy5q3in"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.9"; sha256 = "1mjvzpsbr8ikbd6417y81bwfn1fa5g4i1hb6yv3spxgl45rpqy7j"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.9"; sha256 = "1fpl01yq1ha0912sr5wj3rwg29q3jknhdaibw92ql8jdmbwp6z1b"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.9"; sha256 = "1zxcy12nbpfhc7a0p3vmi645p79gnqi7g4jjd9ap7rg57b56wd0b"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.9"; sha256 = "15qvi3x575976hs2xqrr0z68mi8v8cpal64sc669njlfprk0rsw5"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.9"; sha256 = "1zr89aaxz4qlqk0fi4xqwv138k54lskwm219iacpkjvci88brc82"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.9"; sha256 = "07dasy4d7bnirkb61mirnjvgvw7l2266wi4bb69vfiq0gzfzbzr7"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.9"; sha256 = "1iiba4mkvhcbf1lc9ydmafxzd75mfxw16d3q4nm3mravf88hga4j"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.9"; sha256 = "1pvrz3gd1p7ihnhfgl1hlhxy6f90238alw4v0gdwcfqbxlnnfvyh"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.9"; sha256 = "1ammp0lxban03aam1i5mhfqh0lpc31d9qpy08i1qzs8dpy0qy8kc"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.9"; sha256 = "1gl2j9n3h0fhx4dpcq3lwvcnx5xirdsjs4vq0jph01zfxsvn9rh5"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.9"; sha256 = "0zkdalcb30dpv0682cdf0ib5hyz8ic4yksp0kj1ybrgj6wmnhgr7"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetAppHost"; version = "7.0.9"; sha256 = "0m0m7cja0s1sza51qz2300c8m4397ii5p5nppm9nvx1cqhhrxyq1"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHost"; version = "7.0.9"; sha256 = "0ds54pnkn9x5nyngdkkymwkg8k0wy3g4jpb098h0hm8pv1pikvz8"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.9"; sha256 = "0p20jsz3h5rssiq6wdf1i0m5fb52y3l2a7d83j5s3fllvf1hpv5m"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.9"; sha256 = "0s6i21a8raazrw4cm4cs1jjxmpqmazrdjsa7xgk8j6r71galml9h"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.9"; sha256 = "1zxkvw32d099pjnkdza7jmfyxs8q9j46qhn3i0g2b01m7rla1nh4"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.9"; sha256 = "1ckx746lmb7m952c27hwrnf4ngzx5zk310rpgdk1v74n767n2l4q"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.9"; sha256 = "0jrh9507aa2m82i7b8i4ws7rx3fpbdlcfgr7qrv6046myipx847x"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.9"; sha256 = "1arfqghv2v13knh95k300vllx3rnb6rjfn8h0k5qyvgcha5dxjhs"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "7.0.9"; sha256 = "1qvr9xd8564bg6zq4qzgjvs1yy6cvpb6k6rbzcrffa0ql6mp5whh"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; version = "7.0.9"; sha256 = "1vnb8719i9j1x3nkl7hc6wrcc0w98xiwj2bhaxxwcxjhnqid2kjv"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.9"; sha256 = "0d9czhxn25322iqmn5lhv9bwnznlcnr1rsvq52y6h3ks4lqbpx6d"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.9"; sha256 = "1k3abndg0gxji09wwvnnbi4d8m3xk51yc2hir08vb064i28x0vwd"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Composite"; version = "7.0.9"; sha256 = "1phh09w8x6i4w15rjrgc74pljaqrrh4cc2g2vaymffx32nbd8b0p"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "7.0.9"; sha256 = "10h6gmf8f600qir9b282d9c3890b1jjkqkiv2h1x899cibx3r4xz"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "7.0.9"; sha256 = "1199dqdkd9q568scprvbjpqqnjh7476vwykjj3wl242ljc9lzv07"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "7.0.9"; sha256 = "06q2r3sfj2g7r564q1ys0ny11dg3qz6nifrby9phijs1pwcrsf7l"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "7.0.9"; sha256 = "1cw4cm7hr4x3niynbxc0z4lwn8lmd78x00vmb1kq52gvy24vnpvz"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "7.0.9"; sha256 = "1jkv8a4apfjq7xjlw7mkap3h1znrmwb7kb175krslp9arldh9lc4"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm"; version = "7.0.9"; sha256 = "128gc9zy607ybhs58hc49lvwg1ddlmz3s6ak4qdibpjzxgaxd444"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64"; version = "7.0.9"; sha256 = "0cgbxm4w10kxdjil8bl04d7py0gbccs5npaxnji0xi45977ajs32"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"; version = "7.0.9"; sha256 = "1vz7a4jk3l1xgihv812y198c0kwgbvl9fh21r32jm363dxrd2lrb"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64"; version = "7.0.9"; sha256 = "05vhl80v3m3jql0r72ba15gd1q4p1zzc709klzr3wv50zsjqpcgp"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"; version = "7.0.9"; sha256 = "1sn6qxc57fr5w9hh9x37v6z0pgwch8hhm5jzjchyflkdj9g60zc6"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64"; version = "7.0.9"; sha256 = "1kxjwrqbrkwyigyynlcl8lip10rmp029qikiifq5mm6j0ifyashr"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; version = "7.0.9"; sha256 = "15h20x40x14grk7d9jacgi3kfrrlkszg5mxf5mcm0ycphp9cq4h7"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; version = "7.0.9"; sha256 = "0x9zkfp3917wwaz20c1x6yp22iv4zj6778l38m9xbhynsjiak33m"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "7.0.9"; sha256 = "025znra1878vbq7ywchjnc2jq1xsqnl3lkij5qacjh13a7zg8jcs"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost"; version = "7.0.9"; sha256 = "1aaxyyg4f7apb5naj8fj72mh3jzh6v0rdmmgjrx467z471y0ccss"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.9"; sha256 = "11gj2kk8h4jpzgs0hyxa1pgsxw29y04q33c3n70bgsnjd6qrrprl"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.9"; sha256 = "0x58n7zl28973w2rbl7zjpwqvfq3vpr639zi78654sj0xjvqgd9f"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.9"; sha256 = "08p00883gf1xinwp36axld678ab039raqj6gbyya0bh8wcybwksz"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.9"; sha256 = "0ck7fqjp6xgnl399lhdp2lqz7zj2awx13dvxbyvql0iv2iyim986"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.9"; sha256 = "1257h215aa87irl6pd64sa1600kmhhdv1l545jlv4x7hm0jqy63p"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.9"; sha256 = "139ccsmjg8bgh7f318h921lv8g4nbhrycj0b3h7r8nxpg484inls"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; version = "7.0.9"; sha256 = "0jg2qnm2wj7bwzgdw656sbvn8radsg9r7nvbsk06w6kn053kpnzs"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; version = "7.0.9"; sha256 = "1d633c6a8qyj5lsv6sjl1yb9j8pinkyv4m6qysffzz1swkzg2fn2"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; version = "7.0.9"; sha256 = "190n60bzlwsrrs1pr79va4qxbh0vj2zshjpw8wa3ypbfgw9nwfqr"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; version = "7.0.9"; sha256 = "0lg0hncd3f79z5rpldk3751q1k08dmn4nyzmg85ivci5xp2glmc4"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; version = "7.0.9"; sha256 = "0ldwqi394i7dancwz46d1g5w7w2d681k0qbb21wnn0l8llairmsz"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "7.0.9"; sha256 = "1s6g2agg0yjzxppzrq06zg53ik3nk40pv2py3r91vvm9as10l0la"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; version = "7.0.9"; sha256 = "1a3yv46jkpakpd35qbnyx0rik1w90wmpbffd2sx919pl77l262kq"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; version = "7.0.9"; sha256 = "1p7rmjsjyginrx6ml3j0pmlvghp6rhi7p2myn6di1lawi4c245sp"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; version = "7.0.9"; sha256 = "0hpbb13459izw1c5qw7lh1sy5fbnmg7n8977jci5far584zbf3im"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler"; version = "7.0.9"; sha256 = "162pjnjp7k5y1xckl0l7h06yv2d65lczwspqfcyy1ix7whx8l5fm"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.9"; sha256 = "0kikz4mgymxdjpg3xwlzwb5b7qdq550qf4rknaik2qklwr2xv7xr"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.9"; sha256 = "0crf80nb3pw4wr83bvsx7f48i63f2l1b2zc18sny4xhqlvbcfick"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.9"; sha256 = "1370mahfnshdy63vlxbyqpbhmv5rby5azfbnyc72xb7zglf9aqcb"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler"; version = "7.0.9"; sha256 = "1v3knzlfb6ik4306lhk5d37pfmpxczl0d4h2flvvzs61ap1jpgh6"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.9"; sha256 = "10a0gk0nqx3p9xjaxlwlx6hkvnjps2dyfih91nf10dw31w40q4h9"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "7.0.10"; sha256 = "089cpjkfwcwn2ifzbv4dspm84drcn3r3ck9mzxbyyz5vnvppbd0d"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "7.0.10"; sha256 = "0jfy3kjb7q8dsm8k3mnm81n08zfsk0ifjj1i40r71yglfsp8xkzd"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "7.0.10"; sha256 = "00lqqp5h2f4kv6l7jy5zs8l9mqjrqziw86kyf4fghldcpb2g7nmk"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "7.0.10"; sha256 = "1hcxbb0s3v510c64i8jz3dmszvyjyisrn4m3qvnlx6cjcfwpgy4i"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "7.0.10"; sha256 = "1g353xlq04fr7vwm6c4xzpi2mr8w544drch3mh8jz3bpb3km1ms1"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "7.0.10"; sha256 = "1mjg5i643dbzkan6bi9b32w1csn24cy7c3zdzn4i2d0jzmfnqzs8"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm"; version = "7.0.10"; sha256 = "1cbhjqzl836qsagc6lb63vgc2qp7kmi5bdhr8p9spm5kgixw905q"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "7.0.10"; sha256 = "00n5024l9nh3pvip7xc4zrqrfj7yfnc5lr3crv4cyzf513cxi13f"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "7.0.10"; sha256 = "086lrqyd3csrczmi2rwn8hfjva11zmxbs56kgz1hlyyy34007bgc"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "7.0.10"; sha256 = "13kj7b7h8pigcgkmzqzcg148bazxw8440lr7srz27prfkhlj4h70"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "7.0.10"; sha256 = "0dvajqgfb4pcsddgsb6adiaai181a4rfw3gii8nlr9alv38mr1bc"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "7.0.10"; sha256 = "0d3fywij0sinnn4qxjyn9b8nvhmw06c3nqk712f9b4qz6wxhlv3m"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "7.0.10"; sha256 = "0gs7qbwwlp91hb35x2jhr0zpigjpib8bhp9gwc4hfprw7f8431b0"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "7.0.10"; sha256 = "19h0cnar01w5f5p50k02z5a1mv4m7ixwaq7dpmb7y4dca56mjx00"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "7.0.10"; sha256 = "130jg9r19dchk8xmxbspcyj8zl3qvikz62ck4bql2biv362alhqn"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "7.0.10"; sha256 = "1mi0xmscdix325hzxmqrv3fjnxfanvby7qpq1a3kkkspaijsrlrv"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "7.0.10"; sha256 = "0c5rwllrvzwybz47r6pibv9r0bxmx9yplxs6ki0zl8gcx0rvxfzq"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "7.0.10"; sha256 = "1nkjw5aw38aah1w750vi5bjvly6c0303nydjfqzwc2ws4c71qdln"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "7.0.10"; sha256 = "04hcs6bq12zqnijp15fwwiqxz447bnsz649h77qvl11hsnqp7k8h"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm"; version = "7.0.10"; sha256 = "0ggk9zlb16pl2126n78lq0j25z8z45wvhb561872mdy8y29hkb6m"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "7.0.10"; sha256 = "1h8wajbb2dz6ms510v8nj9bp5zx9j5vkrs6yv5amyzi4545fd33a"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "7.0.10"; sha256 = "01y8wkqjnl6z5dmaz74iw5vgk6jjs9vd7kap6k547irbiy9svhxm"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "7.0.10"; sha256 = "18cnvbdgzcm2wg361pwsbzymn8n6lsip9gqh52wcjzf9sjwd177h"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "7.0.10"; sha256 = "115g0igv91ysnhsr7pvspma6nyyhjylpppm7aailqn4w3kz1c54f"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "7.0.10"; sha256 = "1q4xfaszjwrrvkrnhagmihlixwqgdk28n5wggn9q6l82md2va4ri"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "7.0.10"; sha256 = "0pw90dlbh9pnry98ryr100fvmxrf1ry6y28zjhvga0ig3ql8yc51"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "7.0.10"; sha256 = "11bd713na563dvp10qm1haj4mr4hdhh1bqg8bimfjcgns858pi96"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "7.0.10"; sha256 = "1ldz6gib1hzpbpkh1j48asyx2w73bw1i6chxg5gy5fvig1syajkc"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "7.0.10"; sha256 = "0salk1da71sqr85kbqzprjjs1zqfrdfq1fy9il4yajhhk6py3ql8"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm"; version = "7.0.10"; sha256 = "02kb83ipvynf3qd5sb4dwcv2rslngb22091fiqr1b5da5vmmjiwa"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "7.0.10"; sha256 = "11v74j7615z1ir59424aifyfgvc096f7lqip6zkdfbbxqrghjj1a"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "7.0.10"; sha256 = "0k4hk176vxf6i8pv9m4564yqc47nav8f1z2fb9br3cw5i1cvzmmg"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "7.0.10"; sha256 = "0fj136zcqaybzbhp599i6g63w1xwshl5241lig2v5njb42k4a1c7"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetAppHost"; version = "7.0.10"; sha256 = "0bwb00hijg1ca597li1i1gsyw5vzmqxjaqypdrybsdrqph0d12fp"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHost"; version = "7.0.10"; sha256 = "17jkfcy29x24kxcf28g89m6mxb33rg5pnhs3ygr7lrg6da9k96xi"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.10"; sha256 = "0fldpcg7n07nqzyhajm361sp5y7j44g1lm4f4rky6ccjsd2jhzx6"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "7.0.10"; sha256 = "10rqr8706y0jgwk0ng5q6v8lssz7yms3fmbzyz8kmm0b0lskwr1w"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.10"; sha256 = "1f8bhw15nsv4z92q4fcyadbdrzw31iribgni5mv8xphjqwms22x3"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.10"; sha256 = "0kkzah9ha1pfjhd7f06vchndnfzw1cbqrqfizfv7y75is9j24d1k"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.10"; sha256 = "0rxgrd0bv8i0asyxxrvsfbg4qsx2zh47jgn7livrprfs1ih0vfc0"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.10"; sha256 = "05hfkilgm5yv2iw05nwqwp0kv1f2pllkw1hwf73fiqxhc5yi4gzn"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "7.0.10"; sha256 = "0x7m0rhslsnqnml5syg98vlrimw5ih7zzgr6c12661i1hcqwpj9h"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; version = "7.0.10"; sha256 = "0l698rpwqpa4k1l6ykb0q86j3r9v1j2kibw9yxynkbr61mrnmhqm"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.10"; sha256 = "0265zsc9fwslcr8197gil0s4xsh6ascrllgnjdpy28v26cki0cc9"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.10"; sha256 = "086xnk6i1a7bxczgxb0g6b9jx7qigkkwdbsfrb99wx9hq7bry8qg"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.10"; sha256 = "14y4j9r12dm86qgmhnr6ff289fdh6nigpcg9lya2avfm57p7qang"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.10"; sha256 = "0f3axfrshdr9gcdwyaf24czwfd7nw8py2z14inyzsp79bw87c3w7"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.10"; sha256 = "0jnxwp6xvc0djcwrmsk8xxicxhl82hd9fvmxy9gxw62gsvfzqavh"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.10"; sha256 = "0b5hxgzzjsqfwzqzf2wzbhwv8yr6s05qxcmjlxy92fvn98ywrymv"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.10"; sha256 = "19v459vdsadly3jgwm8qsa2z2qqspjk9n02k39j46m76a72j60hx"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.10"; sha256 = "1cl22hgj2ig4dq80l84ia9nmmrlq3rmns7mvjy2w9gk35qca2534"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.10"; sha256 = "1hj75k6ar3bznaak0m6hadzkp93q96dnhghzqn5lzniqzbxh4cr5"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.10"; sha256 = "02i2jrdkq01zzlx2j925svlsj2fp9wxpyx3q9cvx2r4n4c9qjv6p"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.10"; sha256 = "0s5i1irjnmp9kmn3wcz7j5ppb39lajm6r1ip90vp5677f20r5i3p"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.10"; sha256 = "08mygly5bppfk1sc6v3ff366796cas6ngz30vb1fhkqvdi5mkxkv"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.10"; sha256 = "0wznldd70f4iybkaar23342xm9nfh3g9lqankbrv1bvy7nbrrl47"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.10"; sha256 = "05bb0h54a3k9fjkwzcj4kky9xfv7li3p7lfp35f7cv1mab21yqhv"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.10"; sha256 = "0pdyf0m2jvxzp4qp6r9sbxxssnrpbcw9vv3yhjqiajg4zv537g8f"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.10"; sha256 = "0a3caj9x9lk942kwr6pr6flxbgrjagnn7h9f5hspsb59q08hya8c"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.10"; sha256 = "0zzppp00mvj6y6jfc5ivz6816ab524q8h9h38r4ggrhlswfdqapx"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.10"; sha256 = "0y9kcx7pd1swjhb4skhhj35g11mi0gcm9hfmy0v1llk3cwap95nl"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.10"; sha256 = "19rn0glqnnip0iybcnk48z1rxb2r1nnpka0cskv3phq1aachyh46"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.10"; sha256 = "1skysk6c4flz9x7q7y3vrnwg2hyq7cap0f86qvvw1bgpsf3iqp85"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.10"; sha256 = "1vyyhwmz9996igq74cbivr27xl4gnxnrpd64zgykrxdmiz7wrrh8"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.10"; sha256 = "112i3pbcp6hbjaisz0qwqkq12hpf2xrhv70l06ifgxz6ndpi91s6"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetAppHost"; version = "7.0.10"; sha256 = "0bq4x765vglp84l0sak1xzzazj4kcgqjb1l30ywqy6rfylb2ppz5"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHost"; version = "7.0.10"; sha256 = "1zpm26zd654jhl1a12dcsq1ml0nc0nl3w9ff3inp5l6da82cd6rz"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.10"; sha256 = "0jxnicdqqkbm32wbyfm7d4c6i522701jagjpl6vsdv9q3i5a44vg"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.10"; sha256 = "1wz04jh2nphs9yvi8zcm0m787wjxgpss3bc8zpmihw17qxwsx9dz"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.10"; sha256 = "1q6k2wa6xknh7v097gl7wx7k1jw6s86fcrl04zxbm4n2s4av59wx"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.10"; sha256 = "15nnv3q2zbqn8jyj3sr97ms31kiwg7660bzdzmch62hagbqggjjj"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.10"; sha256 = "0ajsb8dzidmrhch2j6wdv30c9k79q46lr7zy4v41336423rw867h"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.10"; sha256 = "0dba0d4c2ays2vnk14wd0y2dl72vvqqx99ld2h3ihv38l37idv9z"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "7.0.10"; sha256 = "1467pgxdbm6mnf0nqdcf0sarfcwsp0zdazxbk49lcriid87kiyih"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; version = "7.0.10"; sha256 = "164irrjzcnjzkz0lx5j9hi21mgmp4v4cmb26k961wha68v1z4xcg"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.10"; sha256 = "06bkz36xj5gn3djllbzmzccqagawib988b092gghngibg9fxshlw"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.10"; sha256 = "1s7rjmlvj1j2cy0hd3bvxc8h49vi1vmcm7a00qkv09qdll8varac"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Composite"; version = "7.0.10"; sha256 = "11xczi5f9b52hsi0004wx6f5sj2rc2x5kdh5g3ngg3qj3bcqki8r"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "7.0.10"; sha256 = "06m28k55v8zjxj2jql38c3j2qsmr0ykgrpv5rf7yvb5v83v7l6js"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "7.0.10"; sha256 = "0idli8p2n1xs5d1d31c692bmmxxkxc3rmywhak6y2kq29d5lrd2i"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "7.0.10"; sha256 = "1qr5l2zcv0m9w8xwm2jsk32xzfmszz5v3g6w6px8k5v6cxysaq69"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "7.0.10"; sha256 = "0jm1kmpy5d45svdzn8a29jaxjvw767j338vda2prmnyf2gngikw7"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "7.0.10"; sha256 = "1apbhxqq6xnzs3ag8gflwzymb9g6rs19i1kdbds0pp08hviy7gmp"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm"; version = "7.0.10"; sha256 = "14dj7ybbmks7qdih6l7ph052v1yjx7hk6c3s42vwnccvpg06sj1l"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64"; version = "7.0.10"; sha256 = "16s4c1ix3sqqgdc6f2v0ldlw442l2k1c2ybjhkbsspq6pp9xsshj"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"; version = "7.0.10"; sha256 = "1bms1r0g7acrg7698zws61qswv80n4d79wjxa4r3v6552w4mriwr"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64"; version = "7.0.10"; sha256 = "0yiffw2rcbi9014ngjzqnkp0969gsxnmn9csd921dacrls31fc9h"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"; version = "7.0.10"; sha256 = "16zifcd3c5xwipvfx3lfva6zk45g6119anlmjlybn8p0i6vgdfly"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64"; version = "7.0.10"; sha256 = "0bk0hmys42l5wsk6zvgjcj7aynmdymlvc7fmwmffg3z53i4crz0i"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; version = "7.0.10"; sha256 = "0y3c6nq9i8d5brsx1wm355bhhcs1kha4aln1aa76bqaj2rhh0j76"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; version = "7.0.10"; sha256 = "16z135yy8xlbbxi2kcmxcqa5s2haysc9f0d998xmwvm3lgpxb76q"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "7.0.10"; sha256 = "058vcvc61pidfrpj6zi1hy04ywfrdmczgsrigih23irlhsr7pdh8"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost"; version = "7.0.10"; sha256 = "1hpx1pav1kdlk8asvkskhzqkq47ys0mq8m0bk5vs22ccb9iqkr7m"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.10"; sha256 = "01gigb8p5m85jmp3hc94mb3nmy3bvw0hpjbsls42rxai3v4sx73g"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.10"; sha256 = "1xlzpfzzg4vna9dh75ifli8x5g4jfj6kqkisqx13f0hdzzcj69hx"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.10"; sha256 = "0m4fy8q94ssrsfx3ww9k0rqic9rk8dir7iryrlsbxhqvmp4gwvdh"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.10"; sha256 = "039k2aaaadqr90gpih74mzws8v00ravaz77fy6lp6c37wqqs47sa"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.10"; sha256 = "0zayq28xgj2461h10vrj7mp8qmsffzajj8rr1whkx1kkbw9qb54r"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.10"; sha256 = "01xprbf02jkb50k0r198q12924nya5s60j4v089436yhxy6g48jf"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; version = "7.0.10"; sha256 = "096dcwdj68sma7b9kf0wvpxli3w746hl56i2vjwdhgf83hr3g6k3"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; version = "7.0.10"; sha256 = "1jh5mfjybj2z1wn8pf1fm0bllanlmd8khipz965pgxzwarfv3n43"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; version = "7.0.10"; sha256 = "0rwdz654c4yd20rnk8hqhai4d7v4xybyigs84qyyxk4w0kp2bz1g"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; version = "7.0.10"; sha256 = "0qyqxp46mv695aiq27vvlwjz71mcsavagnlzmfbpn0310y285bnh"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; version = "7.0.10"; sha256 = "0y5b4vrnyxg87v64yypbcbcmj4mqmxvqc4nriqck7ssc022l5rgz"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "7.0.10"; sha256 = "1bw2d400qdk2v969w8rl2y1r0090m8h5bzx1r48mn6lpz6wvs6ld"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; version = "7.0.10"; sha256 = "0rnj3jl6yzpg08aw7802qs5s7bfw1vqx24604aizhkhbscf8f4f3"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; version = "7.0.10"; sha256 = "06cydadly53jaslvaa9q7jzsyc9fqbd68a2av3ncybl1cngawz9i"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; version = "7.0.10"; sha256 = "1kr2ib8kskdp94ckx9bfahwhj6wv48bhck6xy8wgb5d8j8q9mqam"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler"; version = "7.0.10"; sha256 = "1mi8yn7gfv3i01iqgrrsnf7cni1jip13j0b51lrl752pkzv3lynv"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.10"; sha256 = "15ar1vz3wq2pncv964dkcci5mlc1kf2pw8zbyr7ayjyfjhr2nxrj"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.10"; sha256 = "120c4nalbj046bs0q2wg7pxsjgdwazbbjnrs76v0sscwzzaylc01"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.10"; sha256 = "03q8z4lrm538wrsv4isfhzwlxffcngykv45wp58gbg338gxh4ngw"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler"; version = "7.0.10"; sha256 = "1gcqrsindn2avrp4r3lj0bsi4hda0zimmwhicihkh2ykq5xxjyj3"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.10"; sha256 = "1nlkr2yf1rxb0jca5li44br4n95hsmbaxg3wf2nz0iyh4n7b65kw"; }) ]; }; } diff --git a/nixpkgs/pkgs/development/compilers/ecl/16.1.2.nix b/nixpkgs/pkgs/development/compilers/ecl/16.1.2.nix index f2b964370ab0..75055130ada2 100644 --- a/nixpkgs/pkgs/development/compilers/ecl/16.1.2.nix +++ b/nixpkgs/pkgs/development/compilers/ecl/16.1.2.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { # Rebased version of # https://gitlab.com/embeddable-common-lisp/ecl/commit/ac5f011f57a85a38627af154bc3ee7580e7fecd4.patch name = "getcwd.patch"; - url = "https://git.sagemath.org/sage.git/plain/build/pkgs/ecl/patches/16.1.2-getcwd.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; + url = "https://raw.githubusercontent.com/sagemath/sage/07d6c37d18811e2b377a9689790a7c5e24da16ba/build/pkgs/ecl/patches/16.1.2-getcwd.patch"; sha256 = "1fbi8gn7rv8nqff5mpaijsrch3k3z7qc5cn4h1vl8qrr8xwqlqhb"; }) ./ecl-1.16.2-libffi-3.3-abi.patch diff --git a/nixpkgs/pkgs/development/compilers/ecl/default.nix b/nixpkgs/pkgs/development/compilers/ecl/default.nix index 3a7836bbcdd1..bba1b3026362 100644 --- a/nixpkgs/pkgs/development/compilers/ecl/default.nix +++ b/nixpkgs/pkgs/development/compilers/ecl/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { patches = [ # https://gitlab.com/embeddable-common-lisp/ecl/-/merge_requests/1 (fetchpatch { - url = "https://git.sagemath.org/sage.git/plain/build/pkgs/ecl/patches/write_error.patch?h=9.2"; + url = "https://raw.githubusercontent.com/sagemath/sage/9.2/build/pkgs/ecl/patches/write_error.patch"; sha256 = "0hfxacpgn4919hg0mn4wf4m8r7y592r4gw7aqfnva7sckxi6w089"; }) ]; diff --git a/nixpkgs/pkgs/development/compilers/elm/packages/lamdera.nix b/nixpkgs/pkgs/development/compilers/elm/packages/lamdera.nix index 835c565013ee..d9727996e053 100644 --- a/nixpkgs/pkgs/development/compilers/elm/packages/lamdera.nix +++ b/nixpkgs/pkgs/development/compilers/elm/packages/lamdera.nix @@ -7,16 +7,16 @@ let arch = if stdenv.isAarch64 then "arm64" else "x86_64"; hashes = { - "x86_64-linux" = "443a763487366fa960120bfe193441e6bbe86fdb31baeed7dbb17d410dee0522"; - "aarch64-linux" = "f11bec3b094df0c0958a8f1e07af5570199e671a882ad5fe979f1e7e482e986d"; - "x86_64-darwin" = "d05a88d13e240fdbc1bf64bd1a4a9ec4d3d53c95961bb9e338449b856df91853"; - "aarch64-darwin" = "bb105e7aebae3c637b761017c6fb49d9696eba1022f27ec594aac9c2dbffd907"; + "x86_64-linux" = "b13110bacc3f71c2a3e12c52172a821a85cc13243a95249ca18c8beb296c0ce8"; + "aarch64-linux" = "afbc71f0570b86215942d1b4207fe3de0299e6fdfd2e6caac78bf688c81b9bd1"; + "x86_64-darwin" = "50a3df09b02b34e1653beb1507c6de0f332674e088ded7c66af4e5987753304e"; + "aarch64-darwin" = "174a5bfec355361c4f030861405513818be25fd7e4325f7221aa71ebd27475d3"; }; in stdenv.mkDerivation rec { pname = "lamdera"; - version = "1.1.0"; + version = "1.2.0"; src = fetchurl { url = "https://static.lamdera.com/bin/lamdera-${version}-${os}-${arch}"; diff --git a/nixpkgs/pkgs/development/compilers/eql/default.nix b/nixpkgs/pkgs/development/compilers/eql/default.nix deleted file mode 100644 index 044ff1182f2b..000000000000 --- a/nixpkgs/pkgs/development/compilers/eql/default.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ lib, stdenv, fetchgit, qt4, ecl, xorgserver, xkbcomp, xkeyboard_config }: - -stdenv.mkDerivation rec { - version = "unstable-2012-12-10"; - pname = "eql"; - src = fetchgit { - rev = "9097bf98446ee33c07bb155d800395775ce0d9b2"; - url = "https://gitlab.com/eql/eql.git"; - sha256 = "17h23qr7fyr9hvjgiq0yhacmjs43x06vh8978aq42ymcgipxdcww"; - }; - - buildInputs = [ ecl qt4 xorgserver xkbcomp xkeyboard_config ]; - - env.NIX_CFLAGS_COMPILE = "-fPIC"; - - postPatch = '' - sed -re 's@[(]in-home "gui/.command-history"[)]@(concatenate '"'"'string (ext:getenv "HOME") "/.eql-gui-command-history")@' -i gui/gui.lisp - - # cl_def_c_function was renamed to ecl_def_c_function in ECL 20.4.24. - find . -type f -exec sed -e 's/\scl_def_c_function(/ ecl_def_c_function(/' -i {} \; - ''; - - buildPhase = '' - cd src - ecl -shell make-eql-lib.lisp - qmake eql_lib.pro - make - cd .. - - cd src - qmake eql_exe.pro - make - cd .. - cd src - ''; - - installPhase = '' - cd .. - mkdir -p $out/bin $out/lib/eql/ $out/include $out/include/gen $out/lib - cp -r . $out/lib/eql/build-dir - ln -s $out/lib/eql/build-dir/eql $out/bin - ln -s $out/lib/eql/build-dir/src/*.h $out/include - ln -s $out/lib/eql/build-dir/src/gen/*.h $out/include/gen - ln -s $out/lib/eql/build-dir/libeql*.so* $out/lib - ''; - - meta = with lib; { - description = "Embedded Qt Lisp (ECL+Qt)"; - maintainers = with maintainers; [ raskin ]; - platforms = platforms.linux; - license = licenses.mit; - }; - - passthru = { - updateInfo = { - downloadPage = "http://password-taxi.at/EQL"; - method = "fetchgit"; - rev = src.rev; - url = src.url; - hash = src.sha256; - }; - }; -} diff --git a/nixpkgs/pkgs/development/compilers/erg/default.nix b/nixpkgs/pkgs/development/compilers/erg/default.nix index 860461e28b64..1c86e6363ae7 100644 --- a/nixpkgs/pkgs/development/compilers/erg/default.nix +++ b/nixpkgs/pkgs/development/compilers/erg/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "erg"; - version = "0.6.19"; + version = "0.6.20"; src = fetchFromGitHub { owner = "erg-lang"; repo = "erg"; rev = "v${version}"; - hash = "sha256-oA0AXTMEdfItvIZi1ITQ3ZR6JPSg9/1V6oeK2wcRERw="; + hash = "sha256-xu6lbCdXUf5fqGoEGui44tVpVXlSOdfNFTyAurFRsDA="; }; - cargoHash = "sha256-dLMU48/umKHPV6iahazxOYA/eDvFWhzV9xveT2xQ+EE="; + cargoHash = "sha256-pRuruqBXnSkTzEPTyZlX130z5IJPxEqWB2/38B7aCeI="; nativeBuildInputs = [ makeWrapper diff --git a/nixpkgs/pkgs/development/compilers/gcc/common/builder.nix b/nixpkgs/pkgs/development/compilers/gcc/common/builder.nix index 6df4e32ddb76..98525b5e237e 100644 --- a/nixpkgs/pkgs/development/compilers/gcc/common/builder.nix +++ b/nixpkgs/pkgs/development/compilers/gcc/common/builder.nix @@ -219,6 +219,7 @@ originalAttrs: (stdenv.mkDerivation (finalAttrs: originalAttrs // { moveToOutput "''${targetConfig+$targetConfig/}lib/lib*.la" "''${!outputLib}" moveToOutput "''${targetConfig+$targetConfig/}lib/lib*.dylib" "''${!outputLib}" moveToOutput "''${targetConfig+$targetConfig/}lib/lib*.dll.a" "''${!outputLib}" + moveToOutput "''${targetConfig+$targetConfig/}lib/lib*.dll" "''${!outputLib}" moveToOutput "share/gcc-*/python" "''${!outputLib}" if [ -z "$enableShared" ]; then @@ -233,6 +234,8 @@ originalAttrs: (stdenv.mkDerivation (finalAttrs: originalAttrs // { moveToOutput "''${targetConfig+$targetConfig/}lib64/lib*.so*" "''${!outputLib}" moveToOutput "''${targetConfig+$targetConfig/}lib64/lib*.la" "''${!outputLib}" moveToOutput "''${targetConfig+$targetConfig/}lib64/lib*.dylib" "''${!outputLib}" + moveToOutput "''${targetConfig+$targetConfig/}lib64/lib*.dll.a" "''${!outputLib}" + moveToOutput "''${targetConfig+$targetConfig/}lib64/lib*.dll" "''${!outputLib}" for i in "''${!outputLib}/''${targetConfig}"/lib64/*.{la,py}; do substituteInPlace "$i" --replace "$out" "''${!outputLib}" diff --git a/nixpkgs/pkgs/development/compilers/go/1.19.nix b/nixpkgs/pkgs/development/compilers/go/1.19.nix index d123c69319ee..530e2e8e1be0 100644 --- a/nixpkgs/pkgs/development/compilers/go/1.19.nix +++ b/nixpkgs/pkgs/development/compilers/go/1.19.nix @@ -47,11 +47,11 @@ let in stdenv.mkDerivation rec { pname = "go"; - version = "1.19.12"; + version = "1.19.13"; src = fetchurl { url = "https://go.dev/dl/go${version}.src.tar.gz"; - hash = "sha256-7l1Q4Kf9dLobE3y4eWCaqu+YgL9ytdF0IQDjiucrtVc="; + hash = "sha256-zPNrU/sAJKAXNTw92yLB8AvHqAc8aqx5BC2iTuNENNM="; }; strictDeps = true; diff --git a/nixpkgs/pkgs/development/compilers/go/1.21.nix b/nixpkgs/pkgs/development/compilers/go/1.21.nix index d85bcbfa5a3d..56da1bc52dde 100644 --- a/nixpkgs/pkgs/development/compilers/go/1.21.nix +++ b/nixpkgs/pkgs/development/compilers/go/1.21.nix @@ -46,11 +46,11 @@ let in stdenv.mkDerivation rec { pname = "go"; - version = "1.21.0"; + version = "1.21.1"; src = fetchurl { url = "https://go.dev/dl/go${version}.src.tar.gz"; - hash = "sha256-gY1G7ehWgt1VGtN47zek0kcAbxLsWbW3VWAdLOEUNpo="; + hash = "sha256-v6Nr916aHpy725q8+dFwfkeb06B4gKiuNWTK7lcRy5k="; }; strictDeps = true; diff --git a/nixpkgs/pkgs/development/compilers/llvm/10/default.nix b/nixpkgs/pkgs/development/compilers/llvm/10/default.nix index 44791f09e384..c1ea3a86342f 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/10/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/10/default.nix @@ -279,5 +279,6 @@ let inherit llvm_meta targetLlvm; }; }); + noExtend = extensible: lib.attrsets.removeAttrs extensible [ "extend" ]; -in { inherit tools libraries release_version; } // libraries // tools +in { inherit tools libraries release_version; } // (noExtend libraries) // (noExtend tools) diff --git a/nixpkgs/pkgs/development/compilers/llvm/11/default.nix b/nixpkgs/pkgs/development/compilers/llvm/11/default.nix index 2fd510942df9..acb649cdab0b 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/11/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/11/default.nix @@ -294,5 +294,6 @@ let inherit llvm_meta targetLlvm; }; }); + noExtend = extensible: lib.attrsets.removeAttrs extensible [ "extend" ]; -in { inherit tools libraries release_version; } // libraries // tools +in { inherit tools libraries release_version; } // (noExtend libraries) // (noExtend tools) diff --git a/nixpkgs/pkgs/development/compilers/llvm/12/default.nix b/nixpkgs/pkgs/development/compilers/llvm/12/default.nix index d7fa0517815c..e390149f0dad 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/12/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/12/default.nix @@ -294,5 +294,6 @@ let inherit llvm_meta targetLlvm; }; }); + noExtend = extensible: lib.attrsets.removeAttrs extensible [ "extend" ]; -in { inherit tools libraries release_version; } // libraries // tools +in { inherit tools libraries release_version; } // (noExtend libraries) // (noExtend tools) diff --git a/nixpkgs/pkgs/development/compilers/llvm/13/default.nix b/nixpkgs/pkgs/development/compilers/llvm/13/default.nix index 42dfd2551779..0432dcd14316 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/13/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/13/default.nix @@ -316,5 +316,6 @@ let inherit llvm_meta targetLlvm; }; }); + noExtend = extensible: lib.attrsets.removeAttrs extensible [ "extend" ]; -in { inherit tools libraries release_version; } // libraries // tools +in { inherit tools libraries release_version; } // (noExtend libraries) // (noExtend tools) diff --git a/nixpkgs/pkgs/development/compilers/llvm/14/default.nix b/nixpkgs/pkgs/development/compilers/llvm/14/default.nix index 5a7651958027..75a52b609605 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/14/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/14/default.nix @@ -314,5 +314,6 @@ let inherit llvm_meta targetLlvm; }; }); + noExtend = extensible: lib.attrsets.removeAttrs extensible [ "extend" ]; -in { inherit tools libraries release_version; } // libraries // tools +in { inherit tools libraries release_version; } // (noExtend libraries) // (noExtend tools) diff --git a/nixpkgs/pkgs/development/compilers/llvm/15/default.nix b/nixpkgs/pkgs/development/compilers/llvm/15/default.nix index a9fee13d12b0..f244987353b9 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/15/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/15/default.nix @@ -387,5 +387,6 @@ in let inherit llvm_meta targetLlvm; }; }); + noExtend = extensible: lib.attrsets.removeAttrs extensible [ "extend" ]; -in { inherit tools libraries release_version; } // libraries // tools +in { inherit tools libraries release_version; } // (noExtend libraries) // (noExtend tools) diff --git a/nixpkgs/pkgs/development/compilers/llvm/15/libcxx/default.nix b/nixpkgs/pkgs/development/compilers/llvm/15/libcxx/default.nix index cc4e9bc83058..ed5f48e8c38f 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/15/libcxx/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/15/libcxx/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, llvm_meta -, monorepoSrc, runCommand +, monorepoSrc, runCommand, fetchpatch , cmake, ninja, python3, fixDarwinDylibNames, version , cxxabi ? if stdenv.hostPlatform.isFreeBSD then libcxxrt else libcxxabi , libcxxabi, libcxxrt, libunwind @@ -47,6 +47,15 @@ stdenv.mkDerivation rec { patches = [ ./gnu-install-dirs.patch + # See: + # - https://reviews.llvm.org/D133566 + # - https://github.com/NixOS/nixpkgs/issues/214524#issuecomment-1429146432 + # !!! Drop in LLVM 16+ + (fetchpatch { + url = "https://github.com/llvm/llvm-project/commit/57c7bb3ec89565c68f858d316504668f9d214d59.patch"; + hash = "sha256-AaM9A6tQ4YAw7uDqCIV4VaiUyLZv+unwcOqbakwW9/k="; + relative = "libcxx"; + }) ] ++ lib.optionals stdenv.hostPlatform.isMusl [ ../../libcxx-0001-musl-hacks.patch ]; diff --git a/nixpkgs/pkgs/development/compilers/llvm/16/default.nix b/nixpkgs/pkgs/development/compilers/llvm/16/default.nix index d9a363037a92..94d0e7d30b58 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/16/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/16/default.nix @@ -400,5 +400,6 @@ in let inherit llvm_meta targetLlvm; }; }); + noExtend = extensible: lib.attrsets.removeAttrs extensible [ "extend" ]; -in { inherit tools libraries release_version; } // libraries // tools +in { inherit tools libraries release_version; } // (noExtend libraries) // (noExtend tools) diff --git a/nixpkgs/pkgs/development/compilers/llvm/5/default.nix b/nixpkgs/pkgs/development/compilers/llvm/5/default.nix index f81aecb0eebc..70f0d2e11bb6 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/5/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/5/default.nix @@ -135,5 +135,6 @@ let inherit llvm_meta targetLlvm; }; }); + noExtend = extensible: lib.attrsets.removeAttrs extensible [ "extend" ]; -in { inherit tools libraries release_version; } // libraries // tools +in { inherit tools libraries release_version; } // (noExtend libraries) // (noExtend tools) diff --git a/nixpkgs/pkgs/development/compilers/llvm/6/default.nix b/nixpkgs/pkgs/development/compilers/llvm/6/default.nix index 601242439606..3dcc75023f4f 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/6/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/6/default.nix @@ -136,5 +136,6 @@ let inherit llvm_meta targetLlvm; }; }); + noExtend = extensible: lib.attrsets.removeAttrs extensible [ "extend" ]; -in { inherit tools libraries release_version; } // libraries // tools +in { inherit tools libraries release_version; } // (noExtend libraries) // (noExtend tools) diff --git a/nixpkgs/pkgs/development/compilers/llvm/7/default.nix b/nixpkgs/pkgs/development/compilers/llvm/7/default.nix index b9c167a71444..5c20086ce846 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/7/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/7/default.nix @@ -283,5 +283,6 @@ let inherit llvm_meta targetLlvm; }; }); + noExtend = extensible: lib.attrsets.removeAttrs extensible [ "extend" ]; -in { inherit tools libraries release_version; } // libraries // tools +in { inherit tools libraries release_version; } // (noExtend libraries) // (noExtend tools) diff --git a/nixpkgs/pkgs/development/compilers/llvm/8/default.nix b/nixpkgs/pkgs/development/compilers/llvm/8/default.nix index f5bc6c018a80..c24c84754e32 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/8/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/8/default.nix @@ -282,5 +282,6 @@ let inherit llvm_meta targetLlvm; }; }); + noExtend = extensible: lib.attrsets.removeAttrs extensible [ "extend" ]; -in { inherit tools libraries release_version; } // libraries // tools +in { inherit tools libraries release_version; } // (noExtend libraries) // (noExtend tools) diff --git a/nixpkgs/pkgs/development/compilers/llvm/9/default.nix b/nixpkgs/pkgs/development/compilers/llvm/9/default.nix index dfe1dbeb21d8..4ec802a4f289 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/9/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/9/default.nix @@ -282,5 +282,6 @@ let inherit llvm_meta targetLlvm; }; }); + noExtend = extensible: lib.attrsets.removeAttrs extensible [ "extend" ]; -in { inherit tools libraries release_version; } // libraries // tools +in { inherit tools libraries release_version; } // (noExtend libraries) // (noExtend tools) diff --git a/nixpkgs/pkgs/development/compilers/llvm/git/default.nix b/nixpkgs/pkgs/development/compilers/llvm/git/default.nix index 5ec5d35dcec5..04f17d5edab6 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/git/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/git/default.nix @@ -362,5 +362,6 @@ in let inherit llvm_meta targetLlvm; }; }); + noExtend = extensible: lib.attrsets.removeAttrs extensible [ "extend" ]; -in { inherit tools libraries release_version; } // libraries // tools +in { inherit tools libraries release_version; } // (noExtend libraries) // (noExtend tools) diff --git a/nixpkgs/pkgs/development/compilers/rust/1_71.nix b/nixpkgs/pkgs/development/compilers/rust/1_72.nix index 75780b55af81..077d8ac903fd 100644 --- a/nixpkgs/pkgs/development/compilers/rust/1_71.nix +++ b/nixpkgs/pkgs/development/compilers/rust/1_72.nix @@ -19,8 +19,8 @@ } @ args: import ./default.nix { - rustcVersion = "1.71.1"; - rustcSha256 = "sha256-b6kNUNHVKadfbMNJeE3lfX7AuiQZsJvefTNcJb1ORy4="; + rustcVersion = "1.72.0"; + rustcSha256 = "sha256-6p1hu7UddrbqaBFW9p8OBZa1lyLwRBSwHG4QC0tb46E="; llvmSharedForBuild = pkgsBuildBuild.llvmPackages_16.libllvm.override { enableSharedLibraries = true; }; llvmSharedForHost = pkgsBuildHost.llvmPackages_16.libllvm.override { enableSharedLibraries = true; }; @@ -34,25 +34,25 @@ import ./default.nix { # Note: the version MUST be one version prior to the version we're # building - bootstrapVersion = "1.70.0"; + bootstrapVersion = "1.71.1"; # fetch hashes by running `print-hashes.sh ${bootstrapVersion}` bootstrapHashes = { - i686-unknown-linux-gnu = "119dfd4ee3da6c8fc36444dd15a12187e1f9b34ee6792fb75a6a25d09ea7e865"; - x86_64-unknown-linux-gnu = "8499c0b034dd881cd9a880c44021632422a28dc23d7a81ca0a97b04652245982"; - x86_64-unknown-linux-musl = "d97c2ac1d9f17e754fa6b7d48c28531d16278547e3fa47050a01da037ddb6de3"; - arm-unknown-linux-gnueabihf = "ac98b513c31789d0c3201dfe2bbcc81b9437f7e1a15695d09402efec7934c20e"; - armv7-unknown-linux-gnueabihf = "23e6029c2a7363b307af539f0c81f4bb9f0ade12b588658343c8a8cfa41526ae"; - aarch64-unknown-linux-gnu = "3aa012fc4d9d5f17ca30af41f87e1c2aacdac46b51adc5213e7614797c6fd24c"; - aarch64-unknown-linux-musl = "6381de0b55f1741ac322bf1b56701d8aab4e509ff5302043941170f8df34228e"; - x86_64-apple-darwin = "e5819fdbfc7f1a4d5d82cb4c3b7662250748450b45a585433bfb75648bc45547"; - aarch64-apple-darwin = "75cbc356a06c9b2daf6b9249febda0f0c46df2a427f7cc8467c7edbd44636e53"; - powerpc64le-unknown-linux-gnu = "ba8cb5e3078b1bc7c6b27ab53cfa3af14001728db9a047d0bdf29b8f05a4db34"; - riscv64gc-unknown-linux-gnu = "5964f78e5fb30506101a929162a42be6260b887660b71592c5f38466753440c3"; - mips64el-unknown-linux-gnuabi64 = "de5fd0b249fbb95b9b67928ba08d7ec49f18f0ae25cbe1b0ede3c02390d7b93a"; + i686-unknown-linux-gnu = "ea544e213cdf65194d9650df9d521dd2ed63251e2abe89c8123e336dfe580b21"; + x86_64-unknown-linux-gnu = "34778d1cda674990dfc0537bc600066046ae9cb5d65a07809f7e7da31d4689c4"; + x86_64-unknown-linux-musl = "67acc1744293e52f4b49231f3c503e8ad187c477e7b567e27925ec792d946a01"; + arm-unknown-linux-gnueabihf = "4c88b32849132504fce5b93bebf06dd0fa17988340c7fe97afa661e038dfa258"; + armv7-unknown-linux-gnueabihf = "8f8556dbd8b0350364c7dc8fda57549934bf3c26c65498dda5842087f5c90d60"; + aarch64-unknown-linux-gnu = "c7cf230c740a62ea1ca6a4304d955c286aea44e3c6fc960b986a8c2eeea4ec3f"; + aarch64-unknown-linux-musl = "da87f4ca2534886f1006b2e8abb0dda8db231ce82cc67b4857233ad48a21c87c"; + x86_64-apple-darwin = "916056603da88336aba68bbeab49711cc8fdb9cfb46a49b04850c0c09761f58c"; + aarch64-apple-darwin = "f4061b65b31ac75b9b5384c1f518e555f3da23f93bcf64dce252461ee65e9351"; + powerpc64le-unknown-linux-gnu = "bac57066882366e4628d1ed2bbe4ab19c0b373aaf45582c2da9f639f2f6ea537"; + riscv64gc-unknown-linux-gnu = "fcb67647b764669f3b4e61235fbdc0eca287229adf9aed8c41ce20ffaad4a3ea"; + mips64el-unknown-linux-gnuabi64 = "6523efea9cd48c0375bd621460d890c65457a5534fafb2d8b69a37ee1e2a39ed"; }; - selectRustPackage = pkgs: pkgs.rust_1_71; + selectRustPackage = pkgs: pkgs.rust_1_72; rustcPatches = [ ]; } diff --git a/nixpkgs/pkgs/development/compilers/rust/cargo-auditable-cargo-wrapper.nix b/nixpkgs/pkgs/development/compilers/rust/cargo-auditable-cargo-wrapper.nix index cc4aed0262ff..6e982aee01a3 100644 --- a/nixpkgs/pkgs/development/compilers/rust/cargo-auditable-cargo-wrapper.nix +++ b/nixpkgs/pkgs/development/compilers/rust/cargo-auditable-cargo-wrapper.nix @@ -1,7 +1,17 @@ -{ lib, runCommand, makeBinaryWrapper, cargo, cargo-auditable }: +{ lib, runCommand, makeBinaryWrapper, rust-audit-info, cargo, cargo-auditable }: +if cargo-auditable.meta.broken then + cargo +else runCommand "auditable-${cargo.name}" { nativeBuildInputs = [ makeBinaryWrapper ]; + + passthru.tests = runCommand "rust-audit-info-test" { + nativeBuildInputs = [ rust-audit-info ]; + } '' + rust-audit-info ${lib.getBin rust-audit-info}/bin/rust-audit-info > $out + ''; + meta = cargo-auditable.meta // { mainProgram = "cargo"; }; @@ -9,5 +19,6 @@ runCommand "auditable-${cargo.name}" { mkdir -p $out/bin makeWrapper ${cargo}/bin/cargo $out/bin/cargo \ --set CARGO_AUDITABLE_IGNORE_UNSUPPORTED 1 \ - --prefix PATH : ${lib.makeBinPath [ cargo cargo-auditable ]} + --prefix PATH : ${lib.makeBinPath [ cargo cargo-auditable ]} \ + --add-flags auditable '' diff --git a/nixpkgs/pkgs/development/compilers/seexpr/default.nix b/nixpkgs/pkgs/development/compilers/seexpr/default.nix deleted file mode 100644 index 210daae37459..000000000000 --- a/nixpkgs/pkgs/development/compilers/seexpr/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, libpng -, zlib -, qt4 -, bison -, flex -, libGLU -, python3Packages -}: - -stdenv.mkDerivation rec { - pname = "seexpr"; - version = "3.0.1"; - - src = fetchFromGitHub { - owner = "wdas"; - repo = "SeExpr"; - rev = "v${version}"; - sha256 = "sha256-r6mgyb/FGz4KYZOgLDgmIqjO+PSmneD3KUWjymZXtEk="; - }; - - cmakeFlags = [ - "-DENABLE_SSE4=OFF" - # file RPATH_CHANGE could not write new RPATH - "-DCMAKE_SKIP_BUILD_RPATH=ON" - ]; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ libGLU libpng zlib qt4 python3Packages.pyqt4 python3Packages.boost bison flex ]; - - # https://github.com/wdas/SeExpr/issues/106 - postPatch = '' - substituteInPlace src/build/seexpr2.pc.in \ - --replace '$'{prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ - ''; - - meta = with lib; { - description = "Embeddable expression evaluation engine from Disney Animation"; - homepage = "https://wdas.github.io/SeExpr/"; - maintainers = with maintainers; [ hodapp ]; - license = licenses.asl20; - platforms = platforms.linux; - }; -} diff --git a/nixpkgs/pkgs/development/compilers/yosys/plugins/symbiflow.nix b/nixpkgs/pkgs/development/compilers/yosys/plugins/symbiflow.nix index f383efbd44e8..481d2475907c 100644 --- a/nixpkgs/pkgs/development/compilers/yosys/plugins/symbiflow.nix +++ b/nixpkgs/pkgs/development/compilers/yosys/plugins/symbiflow.nix @@ -11,17 +11,16 @@ , capnproto , surelog , antlr4 -, flatbuffers , pkg-config }: let - version = "1.20230425"; + version = "1.20230808"; src = fetchFromGitHub { owner = "chipsalliance"; repo = "yosys-f4pga-plugins"; rev = "v${version}"; - hash = "sha256-KNkmhvpKTby85P88+DqCOOGxIKpzbw5KF9ymqy40pfw="; + hash = "sha256-wksAHLgLjVZE4Vk2QVcJN1mnQ9mxWCZHk55oO99cVJ0="; }; # Supported symbiflow plugins. diff --git a/nixpkgs/pkgs/development/coq-modules/Cheerios/default.nix b/nixpkgs/pkgs/development/coq-modules/Cheerios/default.nix index 1d4c458548ca..cacdacde326f 100644 --- a/nixpkgs/pkgs/development/coq-modules/Cheerios/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/Cheerios/default.nix @@ -5,7 +5,7 @@ mkCoqDerivation { owner = "uwplse"; inherit version; defaultVersion = with lib.versions; lib.switch coq.version [ - { case = range "8.14" "8.17"; out = "20230107"; } + { case = range "8.14" "8.18"; out = "20230107"; } { case = range "8.6" "8.16"; out = "20200201"; } ] null; release."20230107".rev = "bad8ad2476e14df6b5a819b7aaddc27a7c53fb69"; diff --git a/nixpkgs/pkgs/development/coq-modules/CoLoR/default.nix b/nixpkgs/pkgs/development/coq-modules/CoLoR/default.nix index 7c1dac5bc194..e275f8be0d7d 100644 --- a/nixpkgs/pkgs/development/coq-modules/CoLoR/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/CoLoR/default.nix @@ -5,7 +5,7 @@ mkCoqDerivation { owner = "fblanqui"; inherit version; defaultVersion = with lib.versions; lib.switch coq.version [ - {case = range "8.14" "8.17"; out = "1.8.4"; } + {case = range "8.14" "8.18"; out = "1.8.4"; } {case = range "8.12" "8.16"; out = "1.8.2"; } {case = range "8.10" "8.11"; out = "1.7.0"; } {case = range "8.8" "8.9"; out = "1.6.0"; } diff --git a/nixpkgs/pkgs/development/coq-modules/HoTT/default.nix b/nixpkgs/pkgs/development/coq-modules/HoTT/default.nix index 997fecb0d5a0..970591264d73 100644 --- a/nixpkgs/pkgs/development/coq-modules/HoTT/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/HoTT/default.nix @@ -6,19 +6,20 @@ mkCoqDerivation { owner = "HoTT"; inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ - { case = range "8.14" "8.17"; out = coq.coq-version; } + { case = range "8.14" "8.18"; out = coq.coq-version; } ] null; releaseRev = v: "V${v}"; release."8.14".sha256 = "sha256-7kXk2pmYsTNodHA+Qts3BoMsewvzmCbYvxw9Sgwyvq0="; release."8.15".sha256 = "sha256-JfeiRZVnrjn3SQ87y6dj9DWNwCzrkK3HBogeZARUn9g="; release."8.16".sha256 = "sha256-xcEbz4ZQ+U7mb0SEJopaczfoRc2GSgF2BGzUSWI0/HY="; release."8.17".sha256 = "sha256-GjTUpzL9UzJm4C2ilCaYEufLG3hcj7rJPc5Op+OMal8="; + release."8.18".sha256 = "sha256-URoUoQOsG0432wg9i6pTRomWQZ+ewutq2+V29TBrVzc="; # 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; opam-name = "coq-hott"; useDune = lib.versions.isGe "8.17" coq.coq-version; - + patchPhase = '' patchShebangs etc ''; diff --git a/nixpkgs/pkgs/development/coq-modules/InfSeqExt/default.nix b/nixpkgs/pkgs/development/coq-modules/InfSeqExt/default.nix index c5aa8479a7be..ae20898e3ce9 100644 --- a/nixpkgs/pkgs/development/coq-modules/InfSeqExt/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/InfSeqExt/default.nix @@ -5,7 +5,7 @@ mkCoqDerivation { owner = "DistributedComponents"; inherit version; defaultVersion = with lib.versions; lib.switch coq.version [ - { case = range "8.9" "8.17"; out = "20230107"; } + { case = range "8.9" "8.18"; out = "20230107"; } { case = range "8.5" "8.16"; out = "20200131"; } ] null; release."20230107".rev = "601e89ec019501c48c27fcfc14b9a3c70456e408"; diff --git a/nixpkgs/pkgs/development/coq-modules/LibHyps/default.nix b/nixpkgs/pkgs/development/coq-modules/LibHyps/default.nix index ffdc98f75bc7..6da5a45f7ec4 100644 --- a/nixpkgs/pkgs/development/coq-modules/LibHyps/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/LibHyps/default.nix @@ -4,7 +4,7 @@ mkCoqDerivation { pname = "LibHyps"; owner = "Matafou"; inherit version; - defaultVersion = if (lib.versions.range "8.11" "8.17") coq.version then "2.0.4.1" else null; + defaultVersion = if (lib.versions.range "8.11" "8.18") coq.version then "2.0.4.1" else null; release = { "2.0.4.1".sha256 = "09p89701zhrfdmqlpxw3mziw8yylj1w1skb4b0xpbdwd1vsn4k3h"; }; diff --git a/nixpkgs/pkgs/development/coq-modules/StructTact/default.nix b/nixpkgs/pkgs/development/coq-modules/StructTact/default.nix index febf44909f9c..16bc63ff3a74 100644 --- a/nixpkgs/pkgs/development/coq-modules/StructTact/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/StructTact/default.nix @@ -5,7 +5,7 @@ mkCoqDerivation { owner = "uwplse"; inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ - { case = range "8.9" "8.17"; out = "20230107"; } + { case = range "8.9" "8.18"; out = "20230107"; } { case = range "8.6" "8.16"; out = "20210328"; } { case = range "8.5" "8.13"; out = "20181102"; } ] null; diff --git a/nixpkgs/pkgs/development/coq-modules/Verdi/default.nix b/nixpkgs/pkgs/development/coq-modules/Verdi/default.nix index dd6baea5dc17..748f16b2ea8a 100644 --- a/nixpkgs/pkgs/development/coq-modules/Verdi/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/Verdi/default.nix @@ -6,7 +6,7 @@ mkCoqDerivation { owner = "uwplse"; inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ - { case = range "8.9" "8.17"; out = "20230503"; } + { case = range "8.9" "8.18"; out = "20230503"; } { case = range "8.7" "8.16"; out = "20211026"; } { case = range "8.7" "8.14"; out = "20210524"; } { case = range "8.7" "8.13"; out = "20200131"; } diff --git a/nixpkgs/pkgs/development/coq-modules/aac-tactics/default.nix b/nixpkgs/pkgs/development/coq-modules/aac-tactics/default.nix index 731d68487382..1144ca69a55b 100644 --- a/nixpkgs/pkgs/development/coq-modules/aac-tactics/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/aac-tactics/default.nix @@ -5,6 +5,7 @@ mkCoqDerivation { releaseRev = v: "v${v}"; + release."8.18.0".sha256 = "sha256-Vpe79qCyFLOdOtFFvLKR0N+MMpGD661Q01yx4gxRhZo="; release."8.17.0".sha256 = "sha256-c8DtD21QFDZEVyCQc7ScPZEMTmolxlT3+Db3gStofF8="; release."8.16.0".sha256 = "sha256-sE1w8q/60adNF9yMJQO70CEk3D8QUopvgiszdHt5Wsw="; release."8.15.1".sha256 = "sha256:0k2sl3ns897a5ll11bazgpv4ppgi1vmx4n89v2dnxabm5dglyglp"; @@ -22,6 +23,7 @@ mkCoqDerivation { inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ + { case = "8.18"; out = "8.18.0"; } { case = "8.17"; out = "8.17.0"; } { case = "8.16"; out = "8.16.0"; } { case = "8.15"; out = "8.15.1"; } diff --git a/nixpkgs/pkgs/development/coq-modules/addition-chains/default.nix b/nixpkgs/pkgs/development/coq-modules/addition-chains/default.nix index 411a52f9ca46..d7274e661386 100644 --- a/nixpkgs/pkgs/development/coq-modules/addition-chains/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/addition-chains/default.nix @@ -12,7 +12,7 @@ mkCoqDerivation { inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ - { case = range "8.13" "8.17"; out = "0.6"; } + { case = range "8.13" "8.18"; out = "0.6"; } { case = range "8.11" "8.12"; out = "0.4"; } ] null; diff --git a/nixpkgs/pkgs/development/coq-modules/autosubst/default.nix b/nixpkgs/pkgs/development/coq-modules/autosubst/default.nix index 3422ef1ef40f..6f1f89ee6243 100644 --- a/nixpkgs/pkgs/development/coq-modules/autosubst/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/autosubst/default.nix @@ -11,7 +11,7 @@ mkCoqDerivation { inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = range "8.10" "8.13"; out = "1.7"; } - { case = range "8.14" "8.17"; out = "1.8"; } + { case = range "8.14" "8.18"; out = "1.8"; } ] null; propagatedBuildInputs = [ mathcomp-ssreflect ]; diff --git a/nixpkgs/pkgs/development/coq-modules/bignums/default.nix b/nixpkgs/pkgs/development/coq-modules/bignums/default.nix index c459ef2ea5c7..bef63b201f1c 100644 --- a/nixpkgs/pkgs/development/coq-modules/bignums/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/bignums/default.nix @@ -5,10 +5,11 @@ mkCoqDerivation { owner = "coq"; inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ - { case = range "8.13" "8.17"; out = "9.0.0+coq${coq.coq-version}"; } + { case = range "8.13" "8.18"; out = "9.0.0+coq${coq.coq-version}"; } { case = range "8.6" "8.17"; out = "${coq.coq-version}.0"; } ] null; + release."9.0.0+coq8.18".sha256 = "sha256-vLeJ0GNKl4M84Uj2tAwlrxJOSR6VZoJQvdlDhxJRge8="; release."9.0.0+coq8.17".sha256 = "sha256-Mn85LqxJKPDIfpxRef9Uh5POwOKlTQ7jsMVz1wnQwuY="; release."9.0.0+coq8.16".sha256 = "sha256-pwFTl4Unr2ZIirAB3HTtfhL2YN7G/Pg88RX9AhKWXbE="; release."9.0.0+coq8.15".sha256 = "sha256-2oGOANn3XULHNIlyqjZ5ppQTQa2QF1zzf3YjHAd/pjo="; diff --git a/nixpkgs/pkgs/development/coq-modules/ceres/default.nix b/nixpkgs/pkgs/development/coq-modules/ceres/default.nix index 78f76bd1b89f..b8f162207f88 100644 --- a/nixpkgs/pkgs/development/coq-modules/ceres/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/ceres/default.nix @@ -8,7 +8,7 @@ mkCoqDerivation { inherit version; defaultVersion = with lib.versions; lib.switch coq.version [ - { case = range "8.14" "8.17"; out = "0.4.1"; } + { case = range "8.14" "8.18"; out = "0.4.1"; } { case = range "8.8" "8.16"; out = "0.4.0"; } ] null; release."0.4.1".sha256 = "sha256-9vyk8/8IVsqNyhw3WPzl8w3L9Wu7gfaMVa3n2nWjFiA="; diff --git a/nixpkgs/pkgs/development/coq-modules/coq-elpi/default.nix b/nixpkgs/pkgs/development/coq-modules/coq-elpi/default.nix index 9f958e8d1c44..7f7610bf732d 100644 --- a/nixpkgs/pkgs/development/coq-modules/coq-elpi/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/coq-elpi/default.nix @@ -9,6 +9,7 @@ with builtins; with lib; let { case = "8.15"; out = { version = "1.15.0"; };} { case = "8.16"; out = { version = "1.17.0"; };} { case = "8.17"; out = { version = "1.17.0"; };} + { case = "8.18"; out = { version = "1.17.0"; };} ] {} ); in mkCoqDerivation { pname = "elpi"; @@ -16,6 +17,7 @@ in mkCoqDerivation { owner = "LPCIC"; inherit version; defaultVersion = lib.switch coq.coq-version [ + { case = "8.18"; out = "1.19.0"; } { case = "8.17"; out = "1.18.0"; } { case = "8.16"; out = "1.15.6"; } { case = "8.15"; out = "1.14.0"; } @@ -24,6 +26,7 @@ in mkCoqDerivation { { case = "8.12"; out = "1.8.3_8.12"; } { case = "8.11"; out = "1.6.3_8.11"; } ] null; + release."1.19.0".sha256 = "sha256-kGoo61nJxeG/BqV+iQaV3iinwPStND+7+fYMxFkiKrQ="; release."1.18.0".sha256 = "sha256-2fCOlhqi4YkiL5n8SYHuc3pLH+DArf9zuMH7IhpBc2Y="; release."1.17.0".sha256 = "sha256-J8GatRKFU0ekNCG3V5dBI+FXypeHcLgC5QJYGYzFiEM="; release."1.15.6".sha256 = "sha256-qc0q01tW8NVm83801HHOBHe/7H1/F2WGDbKO6nCXfno="; diff --git a/nixpkgs/pkgs/development/coq-modules/coq-ext-lib/default.nix b/nixpkgs/pkgs/development/coq-modules/coq-ext-lib/default.nix index 297beaf950e0..54ef3f8b0f36 100644 --- a/nixpkgs/pkgs/development/coq-modules/coq-ext-lib/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/coq-ext-lib/default.nix @@ -5,7 +5,7 @@ mkCoqDerivation rec { owner = "coq-ext-lib"; inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ - { case = range "8.11" "8.17"; out = "0.11.8"; } + { case = range "8.11" "8.18"; out = "0.11.8"; } { case = range "8.8" "8.16"; out = "0.11.6"; } { case = range "8.8" "8.14"; out = "0.11.4"; } { case = range "8.8" "8.13"; out = "0.11.3"; } diff --git a/nixpkgs/pkgs/development/coq-modules/coq-record-update/default.nix b/nixpkgs/pkgs/development/coq-modules/coq-record-update/default.nix index 3bf079f3a98f..5d1d232821fd 100644 --- a/nixpkgs/pkgs/development/coq-modules/coq-record-update/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/coq-record-update/default.nix @@ -5,7 +5,7 @@ owner = "tchajed"; inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ - { case = range "8.10" "8.17"; out = "0.3.1"; } + { case = range "8.10" "8.18"; out = "0.3.1"; } ] null; release."0.3.1".sha256 = "sha256-DyGxO2tqmYZZluXN6Oy5Tw6fuLMyuyxonj8CCToWKkk="; release."0.3.0".sha256 = "1ffr21dd6hy19gxnvcd4if2450iksvglvkd6q5713fajd72hmc0z"; diff --git a/nixpkgs/pkgs/development/coq-modules/coqeal/default.nix b/nixpkgs/pkgs/development/coq-modules/coqeal/default.nix index c222d78da334..0f1f84dceab9 100644 --- a/nixpkgs/pkgs/development/coq-modules/coqeal/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/coqeal/default.nix @@ -8,7 +8,7 @@ inherit version; defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [ - { cases = [ (range "8.15" "8.17") (isGe "1.15.0") ]; out = "1.1.3"; } + { cases = [ (range "8.15" "8.18") (isGe "1.15.0") ]; out = "1.1.3"; } { cases = [ (range "8.13" "8.17") (isGe "1.13.0") ]; out = "1.1.1"; } { cases = [ (range "8.10" "8.15") (isGe "1.12.0") ]; out = "1.1.0"; } { cases = [ (isGe "8.10") (range "1.11.0" "1.12.0") ]; out = "1.0.5"; } diff --git a/nixpkgs/pkgs/development/coq-modules/coqprime/default.nix b/nixpkgs/pkgs/development/coq-modules/coqprime/default.nix index f84261a15862..af2f56475fd7 100644 --- a/nixpkgs/pkgs/development/coq-modules/coqprime/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/coqprime/default.nix @@ -6,7 +6,7 @@ mkCoqDerivation { owner = "thery"; inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ - { case = range "8.14" "8.17"; out = "8.17"; } + { case = range "8.14" "8.18"; out = "8.17"; } { case = range "8.12" "8.16"; out = "8.15"; } { case = range "8.10" "8.11"; out = "8.10"; } { case = range "8.8" "8.9"; out = "8.8"; } diff --git a/nixpkgs/pkgs/development/coq-modules/coquelicot/default.nix b/nixpkgs/pkgs/development/coq-modules/coquelicot/default.nix index a56a8c6324d8..e09eace71850 100644 --- a/nixpkgs/pkgs/development/coq-modules/coquelicot/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/coquelicot/default.nix @@ -7,7 +7,7 @@ mkCoqDerivation { domain = "gitlab.inria.fr"; inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ - { case = range "8.12" "8.17"; out = "3.4.0"; } + { case = range "8.12" "8.18"; out = "3.4.0"; } { case = range "8.12" "8.17"; out = "3.3.0"; } { case = range "8.8" "8.16"; out = "3.2.0"; } { case = range "8.8" "8.13"; out = "3.1.0"; } diff --git a/nixpkgs/pkgs/development/coq-modules/deriving/default.nix b/nixpkgs/pkgs/development/coq-modules/deriving/default.nix index b13b14a5703c..38151f37261e 100644 --- a/nixpkgs/pkgs/development/coq-modules/deriving/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/deriving/default.nix @@ -8,7 +8,7 @@ mkCoqDerivation { inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ - { case = range "8.11" "8.17"; out = "0.1.1"; } + { case = range "8.11" "8.18"; out = "0.1.1"; } ] null; releaseRev = v: "v${v}"; diff --git a/nixpkgs/pkgs/development/coq-modules/equations/default.nix b/nixpkgs/pkgs/development/coq-modules/equations/default.nix index b574f4c9fb20..6d02db5cea91 100644 --- a/nixpkgs/pkgs/development/coq-modules/equations/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/equations/default.nix @@ -6,6 +6,7 @@ repo = "Coq-Equations"; inherit version; defaultVersion = lib.switch coq.coq-version [ + { case = "8.18"; out = "1.3+8.18"; } { case = "8.17"; out = "1.3+8.17"; } { case = "8.16"; out = "1.3+8.16"; } { case = "8.15"; out = "1.3+8.15"; } @@ -57,6 +58,8 @@ release."1.3+8.16".sha256 = "sha256-zyMGeRObtSGWh7n3WCqesBZL5EgLvKwmnTy09rYpxyE="; release."1.3+8.17".rev = "v1.3-8.17"; release."1.3+8.17".sha256 = "sha256-yNotSIxFkhTg3reZIchGQ7cV9WmTJ7p7hPfKGBiByDw="; + release."1.3+8.18".rev = "v1.3-8.18"; + release."1.3+8.18".sha256 = "sha256-8MZO9vWdr8wlAov0lBTYMnde0RuMyhaiM99zp7Zwfao="; mlPlugin = true; diff --git a/nixpkgs/pkgs/development/coq-modules/extructures/default.nix b/nixpkgs/pkgs/development/coq-modules/extructures/default.nix index e898cecd30bf..7240ffdf0dba 100644 --- a/nixpkgs/pkgs/development/coq-modules/extructures/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/extructures/default.nix @@ -9,7 +9,7 @@ inherit version; defaultVersion = with lib.versions; lib.switch [coq.coq-version ssreflect.version] [ - { cases = [(range "8.11" "8.17") (isGe "1.12.0") ]; out = "0.3.1"; } + { cases = [(range "8.11" "8.18") (isGe "1.12.0") ]; out = "0.3.1"; } { cases = [(range "8.11" "8.14") (isLe "1.12.0") ]; out = "0.3.0"; } { cases = [(range "8.10" "8.12") (isLe "1.12.0") ]; out = "0.2.2"; } ] null; diff --git a/nixpkgs/pkgs/development/coq-modules/fourcolor/default.nix b/nixpkgs/pkgs/development/coq-modules/fourcolor/default.nix index 6548da52b9f7..195b73dea6fe 100644 --- a/nixpkgs/pkgs/development/coq-modules/fourcolor/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/fourcolor/default.nix @@ -9,10 +9,12 @@ mkCoqDerivation { release."1.2.3".sha256 = "sha256-gwKfUa74fIP7j+2eQgnLD7AswjCtOFGHGaIWb4qI0n4="; release."1.2.4".sha256 = "sha256-iSW2O1kuunvOqTolmGGXmsYTxo2MJYCdW3BnEhp6Ksg="; release."1.2.5".sha256 = "sha256-3qOPNCRjGK2UdHGMSqElpIXhAPVCklpeQgZwf9AFals="; + release."1.3.0".sha256 = "sha256-h9pa6vaKT6jCEaIdEdcu0498Ou5kEXtZdb9P7WXK1DQ="; inherit version; defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [ - { cases = [ (isGe "8.11") (isGe "1.12") ]; out = "1.2.5"; } + { cases = [ (isGe "8.16") (isGe "2.0") ]; out = "1.3.0"; } + { cases = [ (isGe "8.11") (range "1.12" "1.17") ]; out = "1.2.5"; } { cases = [ (isGe "8.11") (range "1.11" "1.14") ]; out = "1.2.4"; } { cases = [ (isLe "8.13") (lib.pred.inter (isGe "1.11.0") (isLt "1.13")) ]; out = "1.2.3"; } ] null; diff --git a/nixpkgs/pkgs/development/coq-modules/mathcomp-algebra-tactics/default.nix b/nixpkgs/pkgs/development/coq-modules/mathcomp-algebra-tactics/default.nix index 6e519064b73d..bfdd3e9b6014 100644 --- a/nixpkgs/pkgs/development/coq-modules/mathcomp-algebra-tactics/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/mathcomp-algebra-tactics/default.nix @@ -9,7 +9,7 @@ mkCoqDerivation { defaultVersion = with lib.versions; lib.switch [ coq.coq-version mathcomp-algebra.version ] [ - { cases = [ (range "8.16" "8.17") (isGe "1.15") ]; out = "1.1.1"; } + { cases = [ (range "8.16" "8.18") (isGe "1.15") ]; out = "1.1.1"; } { cases = [ (range "8.13" "8.16") (isGe "1.12") ]; out = "1.0.0"; } ] null; diff --git a/nixpkgs/pkgs/development/coq-modules/mathcomp-bigenough/default.nix b/nixpkgs/pkgs/development/coq-modules/mathcomp-bigenough/default.nix index 97e66705998a..6c85e5f1c94f 100644 --- a/nixpkgs/pkgs/development/coq-modules/mathcomp-bigenough/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/mathcomp-bigenough/default.nix @@ -12,7 +12,7 @@ mkCoqDerivation { }; inherit version; defaultVersion = with lib.versions; lib.switch coq.version [ - { case = range "8.10" "8.17"; out = "1.0.1"; } + { case = range "8.10" "8.18"; out = "1.0.1"; } { case = range "8.5" "8.14"; out = "1.0.0"; } ] null; diff --git a/nixpkgs/pkgs/development/coq-modules/mathcomp-finmap/default.nix b/nixpkgs/pkgs/development/coq-modules/mathcomp-finmap/default.nix index 749fbb70b80f..234d25f909b2 100644 --- a/nixpkgs/pkgs/development/coq-modules/mathcomp-finmap/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/mathcomp-finmap/default.nix @@ -7,8 +7,9 @@ mkCoqDerivation { owner = "math-comp"; inherit version; defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [ - { cases = [ (range "8.13" "8.17") (isGe "1.12") ]; out = "1.5.2"; } - { cases = [ (isGe "8.10") (isGe "1.11") ]; out = "1.5.1"; } + { cases = [ (range "8.16" "8.18") (isGe "2.0") ]; out = "2.0.0"; } + { cases = [ (range "8.13" "8.18") (range "1.12" "1.17") ]; out = "1.5.2"; } + { cases = [ (isGe "8.10") (range "1.11" "1.17") ]; out = "1.5.1"; } { cases = [ (range "8.7" "8.11") "1.11.0" ]; out = "1.5.0"; } { cases = [ (isEq "8.11") (range "1.8" "1.10") ]; out = "1.4.0+coq-8.11"; } { cases = [ (range "8.7" "8.11.0") (range "1.8" "1.10") ]; out = "1.4.0"; } @@ -17,6 +18,7 @@ mkCoqDerivation { { cases = [ (range "8.6" "8.7") (range "1.6.1" "1.7") ]; out = "1.0.0"; } ] null; release = { + "2.0.0".sha256 = "sha256-0Wr1ZUYVuZH74vawO4EZlZ+K3kq+s1xEz/BfzyKj+wk="; "1.5.2".sha256 = "sha256-0KmmSjc2AlUo6BKr9RZ4FjL9wlGISlTGU0X1Eu7l4sw="; "1.5.1".sha256 = "0ryfml4pf1dfya16d8ma80favasmrygvspvb923n06kfw9v986j7"; "1.5.0".sha256 = "0vx9n1fi23592b3hv5p5ycy7mxc8qh1y5q05aksfwbzkk5zjkwnq"; diff --git a/nixpkgs/pkgs/development/coq-modules/mathcomp-tarjan/default.nix b/nixpkgs/pkgs/development/coq-modules/mathcomp-tarjan/default.nix index 19ecfcc384de..146898ca86d9 100644 --- a/nixpkgs/pkgs/development/coq-modules/mathcomp-tarjan/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/mathcomp-tarjan/default.nix @@ -9,9 +9,13 @@ mkCoqDerivation { inherit version; defaultVersion = with lib.versions; - lib.switch [ coq.version mathcomp-ssreflect.version ] [{ - cases = [ (range "8.10" "8.16") (isGe "1.12.0") ]; out = "1.0.0"; - }] null; + lib.switch [ coq.version mathcomp-ssreflect.version ] [ + { cases = [ (range "8.16" "8.18") (isGe "2.0.0") ]; out = "1.0.2"; } + { cases = [ (range "8.12" "8.18") (range "1.12.0" "1.17.0") ]; out = "1.0.1"; } + { cases = [ (range "8.10" "8.16") (range "1.12.0" "1.17.0") ]; out = "1.0.0"; } + ] null; + release."1.0.2".sha256 = "sha256-U20xgA+e9KTRdvILD1cxN6ia+dlA8uBTIbc4QlKz9ss="; + release."1.0.1".sha256 = "sha256-utNjFCAqC5xOuhdyKhfMZkRYJD0xv9Gt6U3ZdQ56mek="; release."1.0.0".sha256 = "sha256:0r459r0makshzwlygw6kd4lpvdjc43b3x5y9aa8x77f2z5gymjq1"; propagatedBuildInputs = [ mathcomp-ssreflect mathcomp-fingroup ]; diff --git a/nixpkgs/pkgs/development/coq-modules/mathcomp-word/default.nix b/nixpkgs/pkgs/development/coq-modules/mathcomp-word/default.nix index 492463596c22..c829870e457b 100644 --- a/nixpkgs/pkgs/development/coq-modules/mathcomp-word/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/mathcomp-word/default.nix @@ -16,7 +16,7 @@ mkCoqDerivation { inherit version; defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [ - { cases = [ (range "8.12" "8.17") (isGe "1.12") ]; out = "2.1"; } + { cases = [ (range "8.12" "8.18") (isGe "1.12") ]; out = "2.1"; } ] null; propagatedBuildInputs = [ mathcomp.algebra mathcomp.ssreflect mathcomp.fingroup ]; diff --git a/nixpkgs/pkgs/development/coq-modules/mathcomp-zify/default.nix b/nixpkgs/pkgs/development/coq-modules/mathcomp-zify/default.nix index 3ea784714653..bbb94420ab46 100644 --- a/nixpkgs/pkgs/development/coq-modules/mathcomp-zify/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/mathcomp-zify/default.nix @@ -9,13 +9,15 @@ mkCoqDerivation rec { defaultVersion = with lib.versions; lib.switch [ coq.coq-version mathcomp-algebra.version ] [ - { cases = [ (range "8.13" "8.17") (isGe "1.12") ]; out = "1.3.0+1.12+8.13"; } - { cases = [ (range "8.13" "8.16") (isGe "1.12") ]; out = "1.1.0+1.12+8.13"; } + { cases = [ (range "8.16" "8.18") (isGe "2.0.0") ]; out = "1.5.0+2.0+8.16"; } + { cases = [ (range "8.13" "8.18") (range "1.12" "1.17.0") ]; out = "1.3.0+1.12+8.13"; } + { cases = [ (range "8.13" "8.16") (range "1.12" "1.17.0") ]; out = "1.1.0+1.12+8.13"; } ] null; release."1.0.0+1.12+8.13".sha256 = "1j533vx6lacr89bj1bf15l1a0s7rvrx4l00wyjv99aczkfbz6h6k"; release."1.1.0+1.12+8.13".sha256 = "1plf4v6q5j7wvmd5gsqlpiy0vwlw6hy5daq2x42gqny23w9mi2pr"; release."1.3.0+1.12+8.13".sha256 = "sha256-ebfY8HatP4te44M6o84DSLpDCkMu4IroPCy+HqzOnTE="; + release."1.5.0+2.0+8.16".sha256 = "sha256-boBYGvXdGFc6aPnjgSZYSoW4kmN5khtNrSV3DUv9DqM="; propagatedBuildInputs = [ mathcomp-algebra mathcomp-ssreflect mathcomp-fingroup ]; diff --git a/nixpkgs/pkgs/development/coq-modules/mathcomp/default.nix b/nixpkgs/pkgs/development/coq-modules/mathcomp/default.nix index 3805089425d1..6adcb3af7d54 100644 --- a/nixpkgs/pkgs/development/coq-modules/mathcomp/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/mathcomp/default.nix @@ -20,8 +20,8 @@ let withDoc = single && (args.withDoc or false); defaultVersion = with versions; lib.switch coq.coq-version [ { case = isGe "8.15"; out = "1.17.0"; } - { case = range "8.16" "8.17"; out = "2.0.0"; } - { case = range "8.13" "8.17"; out = "1.16.0"; } + { case = range "8.16" "8.18"; out = "2.0.0"; } + { case = range "8.13" "8.18"; out = "1.16.0"; } { case = range "8.14" "8.16"; out = "1.15.0"; } { case = range "8.11" "8.15"; out = "1.14.0"; } { case = range "8.11" "8.15"; out = "1.13.0"; } diff --git a/nixpkgs/pkgs/development/coq-modules/metalib/default.nix b/nixpkgs/pkgs/development/coq-modules/metalib/default.nix index 19a36c9692a9..144b95cbebd4 100644 --- a/nixpkgs/pkgs/development/coq-modules/metalib/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/metalib/default.nix @@ -5,7 +5,7 @@ owner = "plclub"; inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ - { case = range "8.14" "8.17"; out = "8.15"; } + { case = range "8.14" "8.18"; out = "8.15"; } { case = range "8.10" "8.13"; out = "8.10"; } ] null; releaseRev = v: "coq${v}"; diff --git a/nixpkgs/pkgs/development/coq-modules/multinomials/default.nix b/nixpkgs/pkgs/development/coq-modules/multinomials/default.nix index 8f7c9d462ea5..b11283e8c587 100644 --- a/nixpkgs/pkgs/development/coq-modules/multinomials/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/multinomials/default.nix @@ -9,8 +9,9 @@ inherit version; defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [ - { cases = [ (isGe "8.15") (isGe "1.15.0") ]; out = "1.6.0"; } - { cases = [ (isGe "8.10") (isGe "1.13.0") ]; out = "1.5.6"; } + { cases = [ (isGe "8.16") (isGe "2.0.0") ]; out = "2.0.0"; } + { cases = [ (isGe "8.15") (range "1.15.0" "1.17.0") ]; out = "1.6.0"; } + { cases = [ (isGe "8.10") (range "1.13.0" "1.17.0") ]; out = "1.5.6"; } { cases = [ (range "8.10" "8.16") (range "1.12.0" "1.15.0") ]; out = "1.5.5"; } { cases = [ (range "8.10" "8.12") "1.12.0" ]; out = "1.5.3"; } { cases = [ (range "8.7" "8.12") "1.11.0" ]; out = "1.5.2"; } @@ -19,6 +20,7 @@ { cases = [ "8.6" (range "1.6" "1.7") ]; out = "1.1"; } ] null; release = { + "2.0.0".sha256 = "sha256-2zWHzMBsO2j8EjN7CgCmKQcku9Be8aVlme0LD5p4ab8="; "1.6.0".sha256 = "sha256-lEM+sjqajIOm1c3lspHqcSIARgMR9RHbTQH4veHLJfU="; "1.5.6".sha256 = "sha256-cMixgc34T9Ic6v+tYmL49QUNpZpPV5ofaNuHqblX6oY="; "1.5.5".sha256 = "sha256-VdXA51vr7DZl/wT/15YYMywdD7Gh91dMP9t7ij47qNQ="; diff --git a/nixpkgs/pkgs/development/coq-modules/paco/default.nix b/nixpkgs/pkgs/development/coq-modules/paco/default.nix index 92a4aa229d92..0d394617aa32 100644 --- a/nixpkgs/pkgs/development/coq-modules/paco/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/paco/default.nix @@ -5,7 +5,7 @@ mkCoqDerivation { owner = "snu-sf"; inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ - { case = range "8.13" "8.17"; out = "4.2.0"; } + { case = range "8.13" "8.18"; out = "4.2.0"; } { case = range "8.12" "8.17"; out = "4.1.2"; } { case = range "8.9" "8.13"; out = "4.1.1"; } { case = range "8.6" "8.13"; out = "4.0.2"; } diff --git a/nixpkgs/pkgs/development/coq-modules/paramcoq/default.nix b/nixpkgs/pkgs/development/coq-modules/paramcoq/default.nix index e6ef7b83c61a..cdb500bc69c3 100644 --- a/nixpkgs/pkgs/development/coq-modules/paramcoq/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/paramcoq/default.nix @@ -4,10 +4,11 @@ mkCoqDerivation { pname = "paramcoq"; inherit version; defaultVersion = with lib.versions; lib.switch coq.version [ - { case = range "8.10" "8.17"; out = "1.1.3+coq${coq.coq-version}"; } + { case = range "8.10" "8.18"; out = "1.1.3+coq${coq.coq-version}"; } { case = range "8.7" "8.13"; out = "1.1.2+coq${coq.coq-version}"; } ] null; displayVersion = { paramcoq = "..."; }; + release."1.1.3+coq8.18".sha256 = "sha256-hNBaj9hB+OzwXsOX+TOXtDLjA5oP4EmEgseLwxFxW+I="; release."1.1.3+coq8.17".sha256 = "sha256-m8QGGuwj1lHzDprf4LHgAuzwfoblxtDIHunHBdpmiuM="; release."1.1.3+coq8.16".sha256 = "sha256-K7/8hXH6DwiW7Gw41sgQF8UDAO3c32xBGWQQapzG8Mo="; release."1.1.3+coq8.15".sha256 = "0sl7ihznwz05d2x2v78w1zd4q55c1sgy06vxasbcls4v2pkw53hl"; diff --git a/nixpkgs/pkgs/development/coq-modules/parsec/default.nix b/nixpkgs/pkgs/development/coq-modules/parsec/default.nix index a2c9ea3dedaa..671b2bef9411 100644 --- a/nixpkgs/pkgs/development/coq-modules/parsec/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/parsec/default.nix @@ -11,7 +11,7 @@ mkCoqDerivation { inherit version; defaultVersion = with lib.versions; lib.switch coq.version [ - { case = range "8.14" "8.17"; out = "0.1.2"; } + { case = range "8.14" "8.18"; out = "0.1.2"; } { case = range "8.12" "8.16"; out = "0.1.1"; } { case = range "8.12" "8.13"; out = "0.1.0"; } ] null; diff --git a/nixpkgs/pkgs/development/coq-modules/reglang/default.nix b/nixpkgs/pkgs/development/coq-modules/reglang/default.nix index 1b2b9572c4b5..2fc26cbfef8f 100644 --- a/nixpkgs/pkgs/development/coq-modules/reglang/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/reglang/default.nix @@ -10,7 +10,7 @@ mkCoqDerivation { inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ - { case = range "8.10" "8.17"; out = "1.1.3"; } + { case = range "8.10" "8.18"; out = "1.1.3"; } ] null; diff --git a/nixpkgs/pkgs/development/coq-modules/semantics/default.nix b/nixpkgs/pkgs/development/coq-modules/semantics/default.nix index 9ed22266bec6..a715ff17a69b 100644 --- a/nixpkgs/pkgs/development/coq-modules/semantics/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/semantics/default.nix @@ -15,7 +15,7 @@ mkCoqDerivation rec { inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ - { case = range "8.10" "8.17"; out = "8.14.0"; } + { case = range "8.10" "8.18"; out = "8.14.0"; } { case = "8.9"; out = "8.9.0"; } { case = "8.8"; out = "8.8.0"; } { case = "8.7"; out = "8.7.0"; } diff --git a/nixpkgs/pkgs/development/coq-modules/simple-io/default.nix b/nixpkgs/pkgs/development/coq-modules/simple-io/default.nix index 642c348281a3..de74e1704536 100644 --- a/nixpkgs/pkgs/development/coq-modules/simple-io/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/simple-io/default.nix @@ -6,7 +6,7 @@ repo = "coq-simple-io"; inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ - { case = range "8.11" "8.17"; out = "1.8.0"; } + { case = range "8.11" "8.18"; out = "1.8.0"; } { case = range "8.7" "8.13"; out = "1.3.0"; } ] null; release."1.8.0".sha256 = "sha256-3ADNeXrBIpYRlfUW+LkLHUWV1w1HFrVc/TZISMuwvRY="; diff --git a/nixpkgs/pkgs/development/coq-modules/topology/default.nix b/nixpkgs/pkgs/development/coq-modules/topology/default.nix index de73fbadbf05..9ffe598156c0 100644 --- a/nixpkgs/pkgs/development/coq-modules/topology/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/topology/default.nix @@ -5,6 +5,7 @@ mkCoqDerivation rec { releaseRev = v: "v${v}"; + release."10.2.0".sha256 = "sha256-xLi3uRQBKL9KiLd4FBnbTPxh8TjdN8IEW/1D7n2B+xY="; release."9.0.0".sha256 = "sha256:03lgy53xg9pmrdd3d8qb4087k5qjnk260655svp6d79x4p2lxr8c"; release."8.12.0".sha256 = "sha256-ypHmHwzwZ6MQPYwuS3QyZmVOEPUCSbO2lhVaA6TypgQ="; release."8.10.0".sha256 = "sha256-mCLF3JYIiO3AEW9yvlcLeF7zN4SjW3LG+Y5vYB0l55A="; @@ -15,6 +16,7 @@ mkCoqDerivation rec { inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ + { case = range "8.12" "8.18"; out = "10.2.0"; } { case = range "8.10" "8.16"; out = "9.0.0"; } { case = "8.9"; out = "8.9.0"; } { case = "8.8"; out = "8.8.0"; } diff --git a/nixpkgs/pkgs/development/coq-modules/trakt/default.nix b/nixpkgs/pkgs/development/coq-modules/trakt/default.nix index e08d7b8d50ca..3cb6c78e6cd3 100644 --- a/nixpkgs/pkgs/development/coq-modules/trakt/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/trakt/default.nix @@ -11,7 +11,7 @@ mkCoqDerivation { inherit version; defaultVersion = with lib.versions; lib.switch [ coq.version ] [ - { cases = [ (range "8.15" "8.17") ]; out = "1.2"; } + { cases = [ (range "8.15" "8.18") ]; out = "1.2"; } { cases = [ (isEq "8.13") ]; out = "1.2+8.13"; } { cases = [ (range "8.13" "8.17") ]; out = "1.1"; } ] null; diff --git a/nixpkgs/pkgs/development/coq-modules/zorns-lemma/default.nix b/nixpkgs/pkgs/development/coq-modules/zorns-lemma/default.nix index 8d57bc885c11..0df19759700c 100644 --- a/nixpkgs/pkgs/development/coq-modules/zorns-lemma/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/zorns-lemma/default.nix @@ -2,9 +2,11 @@ (mkCoqDerivation { pname = "zorns-lemma"; + repo = "topology"; releaseRev = v: "v${v}"; + release."10.2.0".sha256 = "sha256-xLi3uRQBKL9KiLd4FBnbTPxh8TjdN8IEW/1D7n2B+xY="; release."9.0.0".sha256 = "sha256:03lgy53xg9pmrdd3d8qb4087k5qjnk260655svp6d79x4p2lxr8c"; release."8.11.0".sha256 = "sha256-2Hf7YwRcFmP/DqwFtF1p78MCNV50qUWfMVQtZbwKd0k="; release."8.10.0".sha256 = "sha256-qLPLK2ZLJQ4SmJX2ADqFiP4kgHuQFJTeNXkBbjiFS+4="; @@ -16,6 +18,7 @@ inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ + { case = range "8.12" "8.18"; out = "10.2.0"; } { case = range "8.10" "8.16"; out = "9.0.0"; } { case = "8.9"; out = "8.9.0"; } { case = "8.8"; out = "8.8.0"; } diff --git a/nixpkgs/pkgs/development/interpreters/babashka/default.nix b/nixpkgs/pkgs/development/interpreters/babashka/default.nix index 68f3bed2080d..b7d78892103d 100644 --- a/nixpkgs/pkgs/development/interpreters/babashka/default.nix +++ b/nixpkgs/pkgs/development/interpreters/babashka/default.nix @@ -8,11 +8,11 @@ buildGraalvmNativeImage rec { pname = "babashka-unwrapped"; - version = "1.3.181"; + version = "1.3.184"; src = fetchurl { url = "https://github.com/babashka/babashka/releases/download/v${version}/babashka-${version}-standalone.jar"; - sha256 = "sha256-NzchlHRxOCSyUf9U0Jv8h4bgKd2Jwp+LmxIfeV8+8+M="; + sha256 = "sha256-O3pLELYmuuB+Bf1vHTWQ+u7Ymi3qYiMRpCwvEq+GeBQ="; }; graalvmDrv = graalvmCEPackages.graalvm19-ce; diff --git a/nixpkgs/pkgs/development/interpreters/babashka/wrapped.nix b/nixpkgs/pkgs/development/interpreters/babashka/wrapped.nix index 4b77eddab03c..e82e56067ca7 100644 --- a/nixpkgs/pkgs/development/interpreters/babashka/wrapped.nix +++ b/nixpkgs/pkgs/development/interpreters/babashka/wrapped.nix @@ -35,6 +35,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { makeWrapper "${babashka-unwrapped}/bin/bb" "$out/bin/bb" \ --inherit-argv0 \ --set-default DEPS_CLJ_TOOLS_DIR $out/clojure_tools \ + --set-default DEPS_CLJ_TOOLS_VERSION ${clojure.version} \ --set-default JAVA_HOME ${jdkBabashka} '' + diff --git a/nixpkgs/pkgs/development/interpreters/cel-go/default.nix b/nixpkgs/pkgs/development/interpreters/cel-go/default.nix index 613f332ed623..d6ce6c9cc68c 100644 --- a/nixpkgs/pkgs/development/interpreters/cel-go/default.nix +++ b/nixpkgs/pkgs/development/interpreters/cel-go/default.nix @@ -5,18 +5,24 @@ buildGoModule rec { pname = "cel-go"; - version = "0.17.1"; + version = "0.18.0"; src = fetchFromGitHub { owner = "google"; repo = "cel-go"; rev = "v${version}"; - hash = "sha256-qk7jopOr/woWCi5j509K4bdlIybuZZ+UFTmTHEEw9/Y="; + hash = "sha256-+YGRcTlPKTdecMicW4UjupSnuuq5msfGKTP/bwOf7dw="; }; - sourceRoot = "${src.name}/repl"; + modRoot = "repl"; - vendorHash = "sha256-OypSL91/2FVCF3ADNSJH33JxH0+3HxIziwmXHb/vZM4="; + vendorHash = "sha256-RSCZOR++WBoGffCQp114Sa1Dbms2tBa0xceVQ3skwR4="; + + patches = [ + # repl/go.mod and repl/go.sum are outdated + # ran `go mod tidy` in the repl directory + ./go-mod-tidy.patch + ]; subPackages = [ "main" diff --git a/nixpkgs/pkgs/development/interpreters/cel-go/go-mod-tidy.patch b/nixpkgs/pkgs/development/interpreters/cel-go/go-mod-tidy.patch new file mode 100644 index 000000000000..a1f4f06ae834 --- /dev/null +++ b/nixpkgs/pkgs/development/interpreters/cel-go/go-mod-tidy.patch @@ -0,0 +1,52 @@ +--- a/repl/go.mod ++++ b/repl/go.mod +@@ -6,16 +6,16 @@ require ( + github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230321174746-8dcc6526cfb1 + github.com/chzyer/readline v1.5.1 + github.com/google/cel-go v0.14.0 +- google.golang.org/genproto/googleapis/api v0.0.0-20230525234035-dd9d682886f9 +- google.golang.org/protobuf v1.30.0 ++ google.golang.org/genproto/googleapis/api v0.0.0-20230803162519-f966b187b2e5 ++ google.golang.org/protobuf v1.31.0 + ) + + require ( + github.com/stoewer/go-strcase v1.3.0 // indirect + golang.org/x/exp v0.0.0-20230321023759-10a507213a29 // indirect +- golang.org/x/sys v0.7.0 // indirect ++ golang.org/x/sys v0.8.0 // indirect + golang.org/x/text v0.9.0 // indirect +- google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234030-28d5490b6b19 // indirect ++ google.golang.org/genproto/googleapis/rpc v0.0.0-20230803162519-f966b187b2e5 // indirect + ) + + replace github.com/google/cel-go => ../. +--- a/repl/go.sum ++++ b/repl/go.sum +@@ -26,18 +26,18 @@ github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o + golang.org/x/exp v0.0.0-20230321023759-10a507213a29 h1:ooxPy7fPvB4kwsA2h+iBNHkAbp/4JxTSwCmvdjEYmug= + golang.org/x/exp v0.0.0-20230321023759-10a507213a29/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= + golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +-golang.org/x/sys v0.7.0 h1:3jlCCIQZPdOYu1h8BkNvLz8Kgwtae2cagcG/VamtZRU= +-golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= ++golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU= ++golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= + golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE= + golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= + golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +-google.golang.org/genproto/googleapis/api v0.0.0-20230525234035-dd9d682886f9 h1:m8v1xLLLzMe1m5P+gCTF8nJB9epwZQUBERm20Oy1poQ= +-google.golang.org/genproto/googleapis/api v0.0.0-20230525234035-dd9d682886f9/go.mod h1:vHYtlOoi6TsQ3Uk2yxR7NI5z8uoV+3pZtR4jmHIkRig= +-google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234030-28d5490b6b19 h1:0nDDozoAU19Qb2HwhXadU8OcsiO/09cnTqhUtq2MEOM= +-google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234030-28d5490b6b19/go.mod h1:66JfowdXAEgad5O9NnYcsNPLCPZJD++2L9X0PCMODrA= ++google.golang.org/genproto/googleapis/api v0.0.0-20230803162519-f966b187b2e5 h1:nIgk/EEq3/YlnmVVXVnm14rC2oxgs1o0ong4sD/rd44= ++google.golang.org/genproto/googleapis/api v0.0.0-20230803162519-f966b187b2e5/go.mod h1:5DZzOUPCLYL3mNkQ0ms0F3EuUNZ7py1Bqeq6sxzI7/Q= ++google.golang.org/genproto/googleapis/rpc v0.0.0-20230803162519-f966b187b2e5 h1:eSaPbMR4T7WfH9FvABk36NBMacoTUKdWCvV0dx+KfOg= ++google.golang.org/genproto/googleapis/rpc v0.0.0-20230803162519-f966b187b2e5/go.mod h1:zBEcrKX2ZOcEkHWxBPAIvYUWOKKMIhYcmNiUIu2ji3I= + google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= +-google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng= +-google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= ++google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= ++google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= + gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= + gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= + gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= diff --git a/nixpkgs/pkgs/development/interpreters/cyber/default.nix b/nixpkgs/pkgs/development/interpreters/cyber/default.nix index 4d756b152d44..c00bb175dd9e 100644 --- a/nixpkgs/pkgs/development/interpreters/cyber/default.nix +++ b/nixpkgs/pkgs/development/interpreters/cyber/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "cyber"; - version = "unstable-2023-08-24"; + version = "unstable-2023-09-07"; src = fetchFromGitHub { owner = "fubark"; repo = "cyber"; - rev = "be76bc13590285cffa502c3c97470a80ff1f27bd"; - hash = "sha256-DhGp+vHz+FfF9ZGopQshF2t0Q4/yeN7CEpIlPliPBgQ="; + rev = "98022d0b8d266ee4f9d8c524a42abad3ad4134c9"; + hash = "sha256-FEvNSHG/sMB1jBjbBaunGxb6/fSvKhKschFvghsW2Ls="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/interpreters/elixir/1.15.nix b/nixpkgs/pkgs/development/interpreters/elixir/1.15.nix index 6c23d3d326f4..a37c413e8724 100644 --- a/nixpkgs/pkgs/development/interpreters/elixir/1.15.nix +++ b/nixpkgs/pkgs/development/interpreters/elixir/1.15.nix @@ -1,7 +1,7 @@ { mkDerivation }: mkDerivation { - version = "1.15.4"; - sha256 = "sha256-0DrfKQPyFX+zurCIZ6RVj9vm1lHSkJSfhiUaRpa3FFo="; + version = "1.15.5"; + sha256 = "sha256-2M1xen5gwmtOu4ug0XkxYke6h+Bw89JkpQGMDhbtNa0="; # https://hexdocs.pm/elixir/1.15.0/compatibility-and-deprecations.html#compatibility-between-elixir-and-erlang-otp minimumOTPVersion = "24"; escriptPath = "lib/elixir/scripts/generate_app.escript"; diff --git a/nixpkgs/pkgs/development/interpreters/emilua/default.nix b/nixpkgs/pkgs/development/interpreters/emilua/default.nix new file mode 100644 index 000000000000..a938d19736ec --- /dev/null +++ b/nixpkgs/pkgs/development/interpreters/emilua/default.nix @@ -0,0 +1,111 @@ +{ lib +, stdenv +, meson +, ninja +, fetchFromGitHub +, fetchFromGitLab +, re2c +, gperf +, gawk +, xxd +, pkg-config +, boost182 +, fmt +, luajit_openresty +, ncurses +, serd +, sord +, libcap +, liburing +, openssl +, asciidoctor +}: + +let + emilua-http-wrap = fetchFromGitHub { + owner = "BoostGSoC14"; + repo = "boost.http"; + rev = "93ae527c89ffc517862e1f5f54c8a257278f1195"; + name = "emilua-http"; + hash = "sha256-MN29YwkTi0TJ2V+vRI9nUIxvJKsG+j3nT3o0yQB3p0o="; + }; + + trial-protocol-wrap = fetchFromGitHub { + owner = "breese"; + repo = "trial.protocol"; + rev = "79149f604a49b8dfec57857ca28aaf508069b669"; + name = "trial-protocol"; + hash = "sha256-Xd8bX3z9PZWU17N9R95HXdj6qo9at5FBL/+PTVaJgkw="; + }; +in +stdenv.mkDerivation rec { + pname = "emilua"; + version = "0.4.3"; + + src = fetchFromGitLab { + owner = "emilua"; + repo = "emilua"; + rev = "v${version}"; + hash = "sha256-vZITPQ1qUHhw24c0HKdR6VenviOc6JizQQ8w7K94irc="; + }; + + buildInputs = [ + luajit_openresty + boost182 + fmt + ncurses + serd + sord + libcap + liburing + openssl + ]; + + nativeBuildInputs = [ + re2c + gperf + gawk + xxd + pkg-config + asciidoctor + meson + ninja + ]; + + # Meson is no longer able to pick up Boost automatically. + # https://github.com/NixOS/nixpkgs/issues/86131 + env = { + BOOST_INCLUDEDIR = "${lib.getDev boost182}/include"; + BOOST_LIBRARYDIR = "${lib.getLib boost182}/lib"; + }; + + mesonFlags = [ + "-Dversion_suffix=-nixpkgs1" + "-Denable_http=true" + "-Denable_file_io=true" + "-Denable_io_uring=true" + "-Denable_linux_namespaces=true" + "-Denable_tests=true" + "-Denable_manpages=true" + ]; + + postPatch = '' + pushd subprojects + cp -r ${emilua-http-wrap} emilua-http + cp -r ${trial-protocol-wrap} trial-protocol + chmod +w emilua-http trial-protocol + cp "packagefiles/emilua-http/meson.build" "emilua-http/" + cp "packagefiles/trial.protocol/meson.build" "trial-protocol/" + popd + + substituteInPlace src/emilua_gperf.awk --replace '#!/usr/bin/env -S gawk --file' '#!${gawk}/bin/gawk -f' + ''; + + meta = with lib; { + description = "Lua execution engine"; + homepage = "https://emilua.org/"; + license = licenses.boost; + maintainers = with maintainers; [ manipuladordedados ]; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/development/interpreters/expr/default.nix b/nixpkgs/pkgs/development/interpreters/expr/default.nix index bc9145bf3403..a037d306af13 100644 --- a/nixpkgs/pkgs/development/interpreters/expr/default.nix +++ b/nixpkgs/pkgs/development/interpreters/expr/default.nix @@ -5,18 +5,18 @@ buildGoModule rec { pname = "expr"; - version = "1.15.0"; + version = "1.15.1"; src = fetchFromGitHub { owner = "antonmedv"; repo = "expr"; rev = "v${version}"; - hash = "sha256-UZUy2qZQh5vGWVw08ZSJTTy6Obh2dIHkk7p1G+B0du0="; + hash = "sha256-ILa+PG2UU/qgLvcsEoC0rHIeQvKRMUfW60AT6wjApZg="; }; sourceRoot = "${src.name}/repl"; - vendorHash = "sha256-RnrM7L1QppUPBi3sJ4xM/UChFHADEpAA36JaURP7Vo4="; + vendorHash = "sha256-jdf3MPix+nDr2X6se4I8SNMUCd/Ndr9PvJZgJEk+cL4="; ldflags = [ "-s" "-w" ]; diff --git a/nixpkgs/pkgs/development/interpreters/femtolisp/default.nix b/nixpkgs/pkgs/development/interpreters/femtolisp/default.nix index 06a4f635b3a6..ecd3bc1f8fd7 100644 --- a/nixpkgs/pkgs/development/interpreters/femtolisp/default.nix +++ b/nixpkgs/pkgs/development/interpreters/femtolisp/default.nix @@ -36,5 +36,6 @@ stdenv.mkDerivation { maintainers = with lib.maintainers; [ moody ]; broken = stdenv.isDarwin; platforms = lib.platforms.unix; + mainProgram = "flisp"; }; } diff --git a/nixpkgs/pkgs/development/interpreters/luau/default.nix b/nixpkgs/pkgs/development/interpreters/luau/default.nix index 2ae58455f42e..62d1e32cdbf8 100644 --- a/nixpkgs/pkgs/development/interpreters/luau/default.nix +++ b/nixpkgs/pkgs/development/interpreters/luau/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "luau"; - version = "0.592"; + version = "0.593"; src = fetchFromGitHub { owner = "Roblox"; repo = "luau"; rev = version; - hash = "sha256-S0Sr28jPnFBurLlCCj3BzTLh7yvzEPlR0MAUz7cDf1k="; + hash = "sha256-12C/MH0wICnW1GpQ/gBcSNx80noMioMNFolXIsHtEi0="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/interpreters/octave/default.nix b/nixpkgs/pkgs/development/interpreters/octave/default.nix index c2e1454aef9f..b257933e0d63 100644 --- a/nixpkgs/pkgs/development/interpreters/octave/default.nix +++ b/nixpkgs/pkgs/development/interpreters/octave/default.nix @@ -112,12 +112,12 @@ let }; self = mkDerivation rec { - version = "8.2.0"; + version = "8.3.0"; pname = "octave"; src = fetchurl { url = "mirror://gnu/octave/${pname}-${version}.tar.gz"; - sha256 = "sha256-V9F/kYqUDTjKM0ghHhELNNc1oyKofbccF3xGkqSanIQ="; + sha256 = "sha256-K0gRHLZ7MSgX5dHz4XH1utFRK7Bn4WdLnEspKBiVuXo="; }; buildInputs = [ diff --git a/nixpkgs/pkgs/development/interpreters/perl/default.nix b/nixpkgs/pkgs/development/interpreters/perl/default.nix index 201a080309d7..502bd5522346 100644 --- a/nixpkgs/pkgs/development/interpreters/perl/default.nix +++ b/nixpkgs/pkgs/development/interpreters/perl/default.nix @@ -69,13 +69,4 @@ in rec { sha256 = "sha256-IT71gInS8sly6jU1F9xg7DZW8FDcwCdmbhGLUIQj5Rc="; inherit passthruFun; }; - - # the latest Devel version - perldevel = callPackage ./intepreter.nix { - self = perldevel; - perlAttr = "perldevel"; - version = "5.38.0"; - sha256 = "sha256-IT71gInS8sly6jU1F9xg7DZW8FDcwCdmbhGLUIQj5Rc="; - inherit passthruFun; - }; } diff --git a/nixpkgs/pkgs/development/interpreters/php/8.1.nix b/nixpkgs/pkgs/development/interpreters/php/8.1.nix index c05ac442ced6..d5548087f3cd 100644 --- a/nixpkgs/pkgs/development/interpreters/php/8.1.nix +++ b/nixpkgs/pkgs/development/interpreters/php/8.1.nix @@ -2,8 +2,8 @@ let base = callPackage ./generic.nix (_args // { - version = "8.1.22"; - hash = "sha256-mSNU44LGxhjQHtS+Br7qjewxeLFBU99k08jEi4Xp+8I="; + version = "8.1.23"; + hash = "sha256-kppieFF32okt3/ygdLqy8f9XhHOg1K25FcEvXz407Bs="; }); in diff --git a/nixpkgs/pkgs/development/interpreters/php/8.2.nix b/nixpkgs/pkgs/development/interpreters/php/8.2.nix index d80269d4ae7d..f5f553c5eba9 100644 --- a/nixpkgs/pkgs/development/interpreters/php/8.2.nix +++ b/nixpkgs/pkgs/development/interpreters/php/8.2.nix @@ -2,8 +2,8 @@ let base = callPackage ./generic.nix (_args // { - version = "8.2.9"; - hash = "sha256-SEYLmUrn61CWoxD0TRPoZd4XcRBNSlUNUwcr5YpvF2w="; + version = "8.2.10"; + hash = "sha256-zJg06PG2E9dneviEPDZR6YKavKjr/pB5JR0Nhdmgqj4="; }); in diff --git a/nixpkgs/pkgs/development/interpreters/php/generic.nix b/nixpkgs/pkgs/development/interpreters/php/generic.nix index d60d0cdf1fd1..cee1e833f9a6 100644 --- a/nixpkgs/pkgs/development/interpreters/php/generic.nix +++ b/nixpkgs/pkgs/development/interpreters/php/generic.nix @@ -271,8 +271,8 @@ let ./buildconf --copy --force - if test -f $src/genfiles; then - ./genfiles + if [ -f "scripts/dev/genfiles" ]; then + ./scripts/dev/genfiles fi '' + lib.optionalString stdenv.isDarwin '' substituteInPlace configure --replace "-lstdc++" "-lc++" diff --git a/nixpkgs/pkgs/development/interpreters/python/cpython/default.nix b/nixpkgs/pkgs/development/interpreters/python/cpython/default.nix index a491c6c1d619..a1de2a55d986 100644 --- a/nixpkgs/pkgs/development/interpreters/python/cpython/default.nix +++ b/nixpkgs/pkgs/development/interpreters/python/cpython/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch +{ lib, stdenv, fetchurl, fetchpatch, fetchgit , bzip2 , expat , libffi @@ -18,6 +18,7 @@ , self , configd , darwin +, windows , autoreconfHook , autoconf-archive , pkg-config @@ -44,6 +45,9 @@ , static ? stdenv.hostPlatform.isStatic , enableFramework ? false , enableOptimizations ? false +# these dont build for windows +, withGdbm ? !stdenv.hostPlatform.isWindows +, withReadline ? !stdenv.hostPlatform.isWindows # enableNoSemanticInterposition is a subset of the enableOptimizations flag that doesn't harm reproducibility. # clang starts supporting `-fno-sematic-interposition` with version 10 , enableNoSemanticInterposition ? (!stdenv.cc.isClang || (stdenv.cc.isClang && lib.versionAtLeast stdenv.cc.version "10")) @@ -128,12 +132,17 @@ let ]; buildInputs = filter (p: p != null) ([ - zlib bzip2 expat xz libffi libxcrypt gdbm sqlite readline ncurses openssl' ] + zlib bzip2 expat xz libffi libxcrypt ] + ++ optional withGdbm gdbm + ++ [ sqlite ] + ++ optional withReadline readline + ++ [ ncurses openssl' ] ++ optionals x11Support [ tcl tk libX11 xorgproto ] ++ optionals (bluezSupport && stdenv.isLinux) [ bluez ] ++ optionals stdenv.isDarwin [ configd ]) ++ optionals enableFramework [ Cocoa ] + ++ optionals stdenv.hostPlatform.isMinGW [ windows.mingw_w64_pthreads windows.dlfcn ] ++ optionals tzdataSupport [ tzdata ]; # `zoneinfo` module hasDistutilsCxxPatch = !(stdenv.cc.isGNU or false); @@ -160,6 +169,8 @@ let # are not documented, and must be derived from the configure script (see links # below). sysconfigdataHook = with stdenv.hostPlatform; with passthru; let + machdep = if isWindows then "win32" else parsed.kernel.name; # win32 is added by Fedora’s patch + # https://github.com/python/cpython/blob/e488e300f5c01289c10906c2e53a8e43d6de32d8/configure.ac#L428 # The configure script uses "arm" as the CPU name for all 32-bit ARM # variants when cross-compiling, but native builds include the version @@ -176,7 +187,7 @@ let powerpc64 = "ppc64"; powerpc64le = "ppc64le"; }.${parsed.cpu.name} or parsed.cpu.name; - in "${parsed.kernel.name}-${cpu}"; + in "${machdep}-${cpu}"; # https://github.com/python/cpython/blob/e488e300f5c01289c10906c2e53a8e43d6de32d8/configure.ac#L724 multiarchCpu = @@ -205,12 +216,13 @@ let else "gnu"; multiarch = if isDarwin then "darwin" - else "${multiarchCpu}-${parsed.kernel.name}-${pythonAbiName}"; + else if isWindows then "" + else "${multiarchCpu}-${machdep}-${pythonAbiName}"; abiFlags = optionalString isPy37 "m"; # https://github.com/python/cpython/blob/e488e300f5c01289c10906c2e53a8e43d6de32d8/configure.ac#L78 - pythonSysconfigdataName = "_sysconfigdata_${abiFlags}_${parsed.kernel.name}_${multiarch}"; + pythonSysconfigdataName = "_sysconfigdata_${abiFlags}_${machdep}_${multiarch}"; in '' sysconfigdataHook() { if [ "$1" = '${placeholder "out"}' ]; then @@ -222,12 +234,13 @@ let addEnvHooks "$hostOffset" sysconfigdataHook ''; + execSuffix = stdenv.hostPlatform.extensions.executable; in with passthru; stdenv.mkDerivation { pname = "python3"; inherit src version; inherit nativeBuildInputs; - buildInputs = [ bash ] ++ buildInputs; # bash is only for patchShebangs + buildInputs = lib.optionals (!stdenv.hostPlatform.isWindows) [ bash ] ++ buildInputs; # bash is only used for patchShebangs prePatch = optionalString stdenv.isDarwin '' @@ -295,9 +308,19 @@ in with passthru; stdenv.mkDerivation { ] ++ optionals stdenv.hostPlatform.isLoongArch64 [ # https://github.com/python/cpython/issues/90656 ./loongarch-support.patch - ]; + ] ++ optionals (stdenv.hostPlatform.isMinGW) (let + # https://src.fedoraproject.org/rpms/mingw-python3 + mingw-patch = fetchgit { + name = "mingw-python-patches"; + url = "https://src.fedoraproject.org/rpms/mingw-python3.git"; + rev = "45c45833ab9e5480ad0ae00778a05ebf35812ed4"; # for python 3.11.5 at the time of writing. + sha256 = "sha256-KIyNvO6MlYTrmSy9V/DbzXm5OsIuyT/BEpuo7Umm9DI="; + }; + in [ + "${mingw-patch}/*.patch" + ]); - postPatch = '' + postPatch = optionalString (!stdenv.hostPlatform.isWindows) '' substituteInPlace Lib/subprocess.py \ --replace "'/bin/sh'" "'${bash}/bin/sh'" '' + optionalString mimetypesSupport '' @@ -360,8 +383,9 @@ in with passthru; stdenv.mkDerivation { "ac_cv_have_long_long_format=yes" "ac_cv_have_size_t_format=yes" "ac_cv_computed_gotos=yes" - "ac_cv_file__dev_ptmx=yes" - "ac_cv_file__dev_ptc=yes" + # Both fail when building for windows, normally configure checks this by itself but on other platforms this is set to yes always. + "ac_cv_file__dev_ptmx=${if stdenv.hostPlatform.isWindows then "no" else "yes"}" + "ac_cv_file__dev_ptc=${if stdenv.hostPlatform.isWindows then "no" else "yes"}" ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform && pythonAtLeast "3.11") [ "--with-build-python=${pythonForBuildInterpreter}" ] ++ optionals stdenv.hostPlatform.isLinux [ @@ -370,7 +394,8 @@ in with passthru; stdenv.mkDerivation { "ac_cv_func_lchmod=no" ] ++ optionals tzdataSupport [ "--with-tzpath=${tzdata}/share/zoneinfo" - ] ++ optional static "LDFLAGS=-static"; + ] ++ optional static "LDFLAGS=-static" + ++ optional (execSuffix != "") "--with-suffix=${execSuffix}"; preConfigure = optionalString (pythonOlder "3.12") '' for i in /usr /sw /opt /pkg; do # improve purity @@ -438,7 +463,7 @@ in with passthru; stdenv.mkDerivation { # Use Python3 as default python ln -s "$out/bin/idle3" "$out/bin/idle" ln -s "$out/bin/pydoc3" "$out/bin/pydoc" - ln -s "$out/bin/python3" "$out/bin/python" + ln -s "$out/bin/python3${execSuffix}" "$out/bin/python${execSuffix}" ln -s "$out/bin/python3-config" "$out/bin/python-config" ln -s "$out/lib/pkgconfig/python3.pc" "$out/lib/pkgconfig/python.pc" ln -sL "$out/share/man/man1/python3.1.gz" "$out/share/man/man1/python.1.gz" @@ -504,6 +529,14 @@ in with passthru; stdenv.mkDerivation { To use Python with Nix and nixpkgs, have a look at the online documentation: <https://nixos.org/manual/nixpkgs/stable/#python>. EXTERNALLY_MANAGED + '' + optionalString stdenv.hostPlatform.isWindows '' + # Shebang files that link against the build python. Shebang don’t work on windows + rm $out/bin/2to3* + rm $out/bin/idle* + rm $out/bin/pydoc* + + echo linking DLLs for python’s compiled librairies + linkDLLsInfolder $out/lib/python*/lib-dynload/ ''; preFixup = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' @@ -573,7 +606,7 @@ in with passthru; stdenv.mkDerivation { high level dynamic data types. ''; license = licenses.psfl; - platforms = platforms.linux ++ platforms.darwin; + platforms = platforms.linux ++ platforms.darwin ++ platforms.windows; maintainers = with maintainers; [ fridh ]; mainProgram = executable; }; diff --git a/nixpkgs/pkgs/development/interpreters/rakudo/zef.nix b/nixpkgs/pkgs/development/interpreters/rakudo/zef.nix index 103f5c5afa8e..4b0d0388466c 100644 --- a/nixpkgs/pkgs/development/interpreters/rakudo/zef.nix +++ b/nixpkgs/pkgs/development/interpreters/rakudo/zef.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zef"; - version = "0.18.3"; + version = "0.19.1"; src = fetchFromGitHub { owner = "ugexe"; repo = "zef"; rev = "v${version}"; - sha256 = "sha256-/H8wHDMl2lJElsjNcNmTrijIeL1ohOkDzrO7LuOPhi4="; + sha256 = "sha256-tA3BH8YlOHCcbYht2mnZr05vtUfeHn6LGB5Hrylbrpw="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/development/interpreters/spidermonkey/115.nix b/nixpkgs/pkgs/development/interpreters/spidermonkey/115.nix new file mode 100644 index 000000000000..433a16f5da2e --- /dev/null +++ b/nixpkgs/pkgs/development/interpreters/spidermonkey/115.nix @@ -0,0 +1,4 @@ +import ./common.nix { + version = "115.2.0"; + hash = "sha512-3ztO/ZYH6OtJMnF3YMhl6zGsepYkbLQ4UZDDMxbJWV4Hk6HzxF67lnSpuk/OmNg/cbBjvvCe8wfZLRzXjTDYEg=="; +} diff --git a/nixpkgs/pkgs/development/interpreters/spidermonkey/common.nix b/nixpkgs/pkgs/development/interpreters/spidermonkey/common.nix index 244a699fd54b..5beac058eb90 100644 --- a/nixpkgs/pkgs/development/interpreters/spidermonkey/common.nix +++ b/nixpkgs/pkgs/development/interpreters/spidermonkey/common.nix @@ -157,10 +157,13 @@ stdenv.mkDerivation (finalAttrs: rec { export AS=$CC export AC_MACRODIR=$PWD/build/autoconf/ + '' + lib.optionalString (lib.versionAtLeast version "91" && lib.versionOlder version "115") '' pushd js/src sh ../../build/autoconf/autoconf.sh --localdir=$PWD configure.in > configure chmod +x configure popd + '' + lib.optionalString (lib.versionAtLeast version "115") '' + patchShebangs build/cargo-linker '' + '' # We can't build in js/src/, so create a build dir mkdir obj @@ -184,6 +187,7 @@ stdenv.mkDerivation (finalAttrs: rec { homepage = "https://spidermonkey.dev/"; license = licenses.mpl20; # TODO: MPL/GPL/LGPL tri-license for 78. maintainers = with maintainers; [ abbradar lostnet catap ]; + broken = stdenv.isDarwin && versionAtLeast version "115"; # Requires SDK 13.3 (see #242666). platforms = platforms.unix; }; }) diff --git a/nixpkgs/pkgs/development/interpreters/wasmtime/default.nix b/nixpkgs/pkgs/development/interpreters/wasmtime/default.nix index 936caafaffa7..9bc8523d7d4a 100644 --- a/nixpkgs/pkgs/development/interpreters/wasmtime/default.nix +++ b/nixpkgs/pkgs/development/interpreters/wasmtime/default.nix @@ -15,6 +15,10 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-SG/SFskr6ywCtJu2WVWTJC9GUKJJB0fUb+hZUaxag0M="; cargoBuildFlags = [ "--package" "wasmtime-cli" "--package" "wasmtime-c-api" ]; + cargoPatches = [ + # this patch is necessary until cargo-auditable is bumped on the rust platform + ./patches/0001-Use-dep-dependency-due-to-cargo-auditable-limitation.patch + ]; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/development/interpreters/wasmtime/patches/0001-Use-dep-dependency-due-to-cargo-auditable-limitation.patch b/nixpkgs/pkgs/development/interpreters/wasmtime/patches/0001-Use-dep-dependency-due-to-cargo-auditable-limitation.patch new file mode 100644 index 000000000000..03870600e32a --- /dev/null +++ b/nixpkgs/pkgs/development/interpreters/wasmtime/patches/0001-Use-dep-dependency-due-to-cargo-auditable-limitation.patch @@ -0,0 +1,26 @@ +From a59bb5f9deeff156bd7bc9d22bc199e0f902b7dc Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Rafael=20Fern=C3=A1ndez=20L=C3=B3pez?= + <ereslibre@ereslibre.es> +Date: Mon, 4 Sep 2023 15:25:15 +0200 +Subject: [PATCH] Use `dep:` dependency due to `cargo-auditable` limitation + +`cargo-auditable` fails to process the current `Cargo.toml` as it +is (cargo/rustc 1.72.0 is able to process this crate without any +issues). +--- + crates/c-api/Cargo.toml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/crates/c-api/Cargo.toml b/crates/c-api/Cargo.toml +index a464c0dbd..1e793432c 100644 +--- a/crates/c-api/Cargo.toml ++++ b/crates/c-api/Cargo.toml +@@ -37,4 +37,4 @@ default = ['jitdump', 'wat', 'wasi', 'cache', 'parallel-compilation'] + jitdump = ["wasmtime/jitdump"] + cache = ["wasmtime/cache"] + parallel-compilation = ['wasmtime/parallel-compilation'] +-wasi = ['wasi-cap-std-sync', 'wasmtime-wasi', 'cap-std', 'wasi-common'] ++wasi = ['wasi-cap-std-sync', 'wasmtime-wasi', 'dep:cap-std', 'wasi-common'] +-- +2.40.1 + diff --git a/nixpkgs/pkgs/development/libraries/SDL2_mixer/2_0.nix b/nixpkgs/pkgs/development/libraries/SDL2_mixer/2_0.nix index 764a39219980..e75e0c9c5cc0 100644 --- a/nixpkgs/pkgs/development/libraries/SDL2_mixer/2_0.nix +++ b/nixpkgs/pkgs/development/libraries/SDL2_mixer/2_0.nix @@ -1,4 +1,5 @@ { fetchurl +, fetchpatch , lzwolf , SDL2_mixer , timidity @@ -12,6 +13,17 @@ SDL2_mixer.overrideAttrs(oa: rec { sha256 = "0694vsz5bjkcdgfdra6x9fq8vpzrl8m6q96gh58df7065hw5mkxl"; }; + patches = [ + # These patches fix incompatible function pointer conversion errors with clang 16. + (fetchpatch { + url = "https://github.com/libsdl-org/SDL_mixer/commit/4119ec3fe838d38d2433f4432cd18926bda5d093.patch"; + stripLen = 2; + hash = "sha256-Ug1EEZIRcV8+e1MeMsGHuTW7Zn6j4szqujP8IkIq2VM="; + }) + # Based on https://github.com/libsdl-org/SDL_mixer/commit/64ab759111ddb1b033bcce64e1a04e0cba6e498f + ./SDL_mixer-2.0-incompatible-pointer-comparison-fix.patch + ]; + # fix default path to timidity.cfg so MIDI files could be played postPatch = '' substituteInPlace timidity/options.h \ diff --git a/nixpkgs/pkgs/development/libraries/SDL2_mixer/SDL_mixer-2.0-incompatible-pointer-comparison-fix.patch b/nixpkgs/pkgs/development/libraries/SDL2_mixer/SDL_mixer-2.0-incompatible-pointer-comparison-fix.patch new file mode 100644 index 000000000000..76fff3fa63e2 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/SDL2_mixer/SDL_mixer-2.0-incompatible-pointer-comparison-fix.patch @@ -0,0 +1,26 @@ +--- a/music_mpg123.c 2018-10-31 10:59:00.000000000 -0400 ++++ b/music_mpg123.c 2023-09-05 21:31:51.529191521 -0400 +@@ -48,7 +48,11 @@ + int (*mpg123_open_handle)(mpg123_handle *mh, void *iohandle); + const char* (*mpg123_plain_strerror)(int errcode); + void (*mpg123_rates)(const long **list, size_t *number); ++#if (MPG123_API_VERSION >= 45) /* api (but not abi) change as of mpg123-1.26.0 */ ++ int (*mpg123_read)(mpg123_handle *mh, void *outmemory, size_t outmemsize, size_t *done ); ++#else + int (*mpg123_read)(mpg123_handle *mh, unsigned char *outmemory, size_t outmemsize, size_t *done ); ++#endif + int (*mpg123_replace_reader_handle)( mpg123_handle *mh, ssize_t (*r_read) (void *, void *, size_t), off_t (*r_lseek)(void *, off_t, int), void (*cleanup)(void*) ); + off_t (*mpg123_seek)( mpg123_handle *mh, off_t sampleoff, int whence ); + const char* (*mpg123_strerror)(mpg123_handle *mh); +@@ -95,7 +99,11 @@ + FUNCTION_LOADER(mpg123_open_handle, int (*)(mpg123_handle *mh, void *iohandle)) + FUNCTION_LOADER(mpg123_plain_strerror, const char* (*)(int errcode)) + FUNCTION_LOADER(mpg123_rates, void (*)(const long **list, size_t *number)); ++#if (MPG123_API_VERSION >= 45) /* api (but not abi) change as of mpg123-1.26.0 */ ++ FUNCTION_LOADER(mpg123_read, int (*)(mpg123_handle *mh, void *outmemory, size_t outmemsize, size_t *done )) ++#else + FUNCTION_LOADER(mpg123_read, int (*)(mpg123_handle *mh, unsigned char *outmemory, size_t outmemsize, size_t *done )) ++#endif + FUNCTION_LOADER(mpg123_replace_reader_handle, int (*)( mpg123_handle *mh, ssize_t (*r_read) (void *, void *, size_t), off_t (*r_lseek)(void *, off_t, int), void (*cleanup)(void*) )) + FUNCTION_LOADER(mpg123_seek, off_t (*)( mpg123_handle *mh, off_t sampleoff, int whence )) + FUNCTION_LOADER(mpg123_strerror, const char* (*)(mpg123_handle *mh)) diff --git a/nixpkgs/pkgs/development/libraries/aubio/default.nix b/nixpkgs/pkgs/development/libraries/aubio/default.nix index 2e8bdc50ca63..673064db7a5d 100644 --- a/nixpkgs/pkgs/development/libraries/aubio/default.nix +++ b/nixpkgs/pkgs/development/libraries/aubio/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, alsa-lib, fftw, libjack2, libsamplerate -, libsndfile, pkg-config, python3, wafHook +, libsndfile, pkg-config, python3, waf }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1npks71ljc48w6858l9bq30kaf5nph8z0v61jkfb70xb9np850nl"; }; - nativeBuildInputs = [ pkg-config python3 wafHook ]; + nativeBuildInputs = [ pkg-config python3 waf.hook ]; buildInputs = [ alsa-lib fftw libjack2 libsamplerate libsndfile ]; strictDeps = true; diff --git a/nixpkgs/pkgs/development/libraries/audio/lilv/default.nix b/nixpkgs/pkgs/development/libraries/audio/lilv/default.nix index 14b0d4c5e46f..b51a608c9695 100644 --- a/nixpkgs/pkgs/development/libraries/audio/lilv/default.nix +++ b/nixpkgs/pkgs/development/libraries/audio/lilv/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, lv2, pkg-config, python3, serd, sord, sratom, wafHook +{ lib, stdenv, fetchurl, lv2, pkg-config, python3, serd, sord, sratom, waf # test derivations , pipewire @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { patches = [ ./lilv-pkgconfig.patch ]; - nativeBuildInputs = [ pkg-config python3 wafHook ]; + nativeBuildInputs = [ pkg-config python3 waf.hook ]; buildInputs = [ serd sord sratom ]; propagatedBuildInputs = [ lv2 ]; dontAddWafCrossFlags = true; diff --git a/nixpkgs/pkgs/development/libraries/audio/lvtk/default.nix b/nixpkgs/pkgs/development/libraries/audio/lvtk/default.nix index 9822640f8d67..af784d80a3aa 100644 --- a/nixpkgs/pkgs/development/libraries/audio/lvtk/default.nix +++ b/nixpkgs/pkgs/development/libraries/audio/lvtk/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, boost, gtkmm2, lv2, pkg-config, python3, wafHook }: +{ lib, stdenv, fetchFromGitHub, boost, gtkmm2, lv2, pkg-config, python3, waf }: stdenv.mkDerivation rec { pname = "lvtk"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-6IoyhBig3Nvc4Y8F0w8b1up6sn8O2RmoUVaBQ//+Aaw="; }; - nativeBuildInputs = [ pkg-config python3 wafHook ]; + nativeBuildInputs = [ pkg-config python3 waf.hook ]; buildInputs = [ boost gtkmm2 lv2 ]; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/development/libraries/audio/ntk/default.nix b/nixpkgs/pkgs/development/libraries/audio/ntk/default.nix index d101e2a960c6..3b8ecb807aa6 100644 --- a/nixpkgs/pkgs/development/libraries/audio/ntk/default.nix +++ b/nixpkgs/pkgs/development/libraries/audio/ntk/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cairo, libjpeg, libXft, pkg-config, python3, wafHook }: +{ lib, stdenv, fetchFromGitHub, cairo, libjpeg, libXft, pkg-config, python3, waf }: stdenv.mkDerivation rec { pname = "ntk"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-NyEdg6e+9CI9V+TIgdpPyH1ei+Vq8pUxD3wPzWY5fEU="; }; - nativeBuildInputs = [ pkg-config wafHook ]; + nativeBuildInputs = [ pkg-config waf.hook ]; buildInputs = [ cairo libjpeg libXft python3 ]; diff --git a/nixpkgs/pkgs/development/libraries/audio/raul/default.nix b/nixpkgs/pkgs/development/libraries/audio/raul/default.nix index c200d4ab79c5..b8e21e36bba4 100644 --- a/nixpkgs/pkgs/development/libraries/audio/raul/default.nix +++ b/nixpkgs/pkgs/development/libraries/audio/raul/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, boost, gtk2, pkg-config, python3, wafHook }: +{ lib, stdenv, fetchgit, boost, gtk2, pkg-config, python3, waf }: stdenv.mkDerivation rec { pname = "raul"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1z37jb6ghc13b8nv8a8hcg669gl8vh4ni9djvfgga9vcz8rmcg8l"; }; - nativeBuildInputs = [ pkg-config wafHook python3 ]; + nativeBuildInputs = [ pkg-config waf.hook python3 ]; buildInputs = [ boost gtk2 ]; strictDeps = true; diff --git a/nixpkgs/pkgs/development/libraries/audio/suil/default.nix b/nixpkgs/pkgs/development/libraries/audio/suil/default.nix index 3dc3bb5dacdc..f037b61e3bcf 100644 --- a/nixpkgs/pkgs/development/libraries/audio/suil/default.nix +++ b/nixpkgs/pkgs/development/libraries/audio/suil/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, gtk2, lv2, pkg-config, python3, serd, sord, sratom -, wafHook +, waf , withQt5 ? true, qt5 ? null }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0z4v01pjw4wh65x38w6icn28wdwxz13ayl8hvn4p1g9kmamp1z06"; }; - nativeBuildInputs = [ pkg-config wafHook python3 ]; + nativeBuildInputs = [ pkg-config waf.hook python3 ]; buildInputs = [ gtk2 lv2 serd sord sratom ] ++ lib.optionals withQt5 (with qt5; [ qtbase qttools ]); diff --git a/nixpkgs/pkgs/development/libraries/audio/zix/default.nix b/nixpkgs/pkgs/development/libraries/audio/zix/default.nix index dcd0b328a052..44b8812b29e4 100644 --- a/nixpkgs/pkgs/development/libraries/audio/zix/default.nix +++ b/nixpkgs/pkgs/development/libraries/audio/zix/default.nix @@ -35,8 +35,8 @@ stdenv.mkDerivation rec { license = licenses.isc; platforms = platforms.unix; maintainers = with maintainers; [ + fogti yuu - zseri ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/bctoolbox/default.nix b/nixpkgs/pkgs/development/libraries/bctoolbox/default.nix index 97072fc4ad33..f3b138d27487 100644 --- a/nixpkgs/pkgs/development/libraries/bctoolbox/default.nix +++ b/nixpkgs/pkgs/development/libraries/bctoolbox/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { pname = "bctoolbox"; - version = "5.2.16"; + version = "5.2.98"; nativeBuildInputs = [ cmake @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - hash = "sha256-M2apFibqSKp8ojXl82W+vQb7CUxdbWsmw8PLL/ByYuM="; + hash = "sha256-j1vVd9UcwmP3tGGN6NApiMyOql8vYljTqj3CKor1Ckk="; }; # Do not build static libraries diff --git a/nixpkgs/pkgs/development/libraries/belle-sip/default.nix b/nixpkgs/pkgs/development/libraries/belle-sip/default.nix index 72231cf6d3c3..338b0082be5e 100644 --- a/nixpkgs/pkgs/development/libraries/belle-sip/default.nix +++ b/nixpkgs/pkgs/development/libraries/belle-sip/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { pname = "belle-sip"; - version = "5.2.64"; + version = "5.2.98"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "sha256-5GTKunm6q5nTlfsA5vZZ0MCaSiit+JIdWHcb2t+MLEA="; + hash = "sha256-PZnAB+LOlwkiJO0ICqYqn0TgqQY2KdUbgGJRFSzGxdE="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/belr/default.nix b/nixpkgs/pkgs/development/libraries/belr/default.nix index 13d20d36bd5c..7296a9d95275 100644 --- a/nixpkgs/pkgs/development/libraries/belr/default.nix +++ b/nixpkgs/pkgs/development/libraries/belr/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "belr"; - version = "5.1.55"; + version = "5.2.98"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "sha256-0JDwNKqPkzbXqDhgMV+okPMHPFJwmLwLsDrdD55Jcs4="; + hash = "sha256-4keVUAsTs1DAhOfV71VD28I0PEHnyvW95blplY690LY="; }; buildInputs = [ bctoolbox ]; diff --git a/nixpkgs/pkgs/development/libraries/boost/1.83.nix b/nixpkgs/pkgs/development/libraries/boost/1.83.nix new file mode 100644 index 000000000000..df5c5a5bbd31 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/boost/1.83.nix @@ -0,0 +1,14 @@ +{ callPackage, fetchurl, fetchpatch, ... } @ args: + +callPackage ./generic.nix (args // rec { + version = "1.83.0"; + + src = fetchurl { + urls = [ + "mirror://sourceforge/boost/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2" + "https://boostorg.jfrog.io/artifactory/main/release/${version}/source/boost_${builtins.replaceStrings ["."] ["_"] version}.tar.bz2" + ]; + # SHA256 from http://www.boost.org/users/history/version_1_83_0.html + sha256 = "6478edfe2f3305127cffe8caf73ea0176c53769f4bf1585be237eb30798c3b8e"; + }; +}) diff --git a/nixpkgs/pkgs/development/libraries/boost/default.nix b/nixpkgs/pkgs/development/libraries/boost/default.nix index 7a8902bc395d..7f6422515ace 100644 --- a/nixpkgs/pkgs/development/libraries/boost/default.nix +++ b/nixpkgs/pkgs/development/libraries/boost/default.nix @@ -23,4 +23,5 @@ in { boost180 = makeBoost ./1.80.nix; boost181 = makeBoost ./1.81.nix; boost182 = makeBoost ./1.82.nix; + boost183 = makeBoost ./1.83.nix; } diff --git a/nixpkgs/pkgs/development/libraries/boost/generic.nix b/nixpkgs/pkgs/development/libraries/boost/generic.nix index 5de26ef5ce2b..e46c03ed8087 100644 --- a/nixpkgs/pkgs/development/libraries/boost/generic.nix +++ b/nixpkgs/pkgs/development/libraries/boost/generic.nix @@ -113,6 +113,13 @@ stdenv.mkDerivation { relative = "include"; sha256 = "sha256-KlmIbixcds6GyKYt1fx5BxDIrU7msrgDdYo9Va/KJR4="; }) + # Fixes ABI detection + ++ lib.optional (version == "1.83.0") (fetchpatch { + url = "https://github.com/boostorg/context/commit/6fa6d5c50d120e69b2d8a1c0d2256ee933e94b3b.patch"; + stripLen = 1; + extraPrefix = "libs/context/"; + sha256 = "sha256-bCfLL7bD1Rn4Ie/P3X+nIcgTkbXdCX6FW7B9lHsmVW8="; + }) # This fixes another issue regarding ill-formed constant expressions, which is a default error # in clang 16 and will be a hard error in clang 17. ++ lib.optional (lib.versionOlder version "1.80") (fetchpatch { @@ -149,13 +156,11 @@ stdenv.mkDerivation { description = "Collection of C++ libraries"; license = licenses.boost; platforms = platforms.unix ++ platforms.windows; + # boost-context lacks support for the N32 ABI on mips64. The build + # will succeed, but packages depending on boost-context will fail with + # a very cryptic error message. + badPlatforms = [ lib.systems.inspect.patterns.isMips64n32 ]; maintainers = with maintainers; [ hjones2199 ]; - - broken = - # boost-context lacks support for the N32 ABI on mips64. The build - # will succeed, but packages depending on boost-context will fail with - # a very cryptic error message. - stdenv.hostPlatform.isMips64n32; }; passthru = { diff --git a/nixpkgs/pkgs/development/libraries/bzrtp/default.nix b/nixpkgs/pkgs/development/libraries/bzrtp/default.nix index 46ea599cefcc..10cc9b72f77f 100644 --- a/nixpkgs/pkgs/development/libraries/bzrtp/default.nix +++ b/nixpkgs/pkgs/development/libraries/bzrtp/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { pname = "bzrtp"; - version = "5.2.16"; + version = "5.2.98"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -16,18 +16,19 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - hash = "sha256-nrnGmJxAeobejS6zdn5Z/kOFOxyepZcxW/G4nXAt2DY="; + hash = "sha256-p3r8GVhxShTanEI/tS8Dq59I7VKMDX1blz6S236XFqQ="; }; buildInputs = [ bctoolbox sqlite ]; nativeBuildInputs = [ cmake ]; # Do not build static libraries - cmakeFlags = [ "-DENABLE_STATIC=NO" "-DCMAKE_C_FLAGS=-Wno-error=cast-function-type" ]; + cmakeFlags = [ "-DENABLE_STATIC=NO" ]; env.NIX_CFLAGS_COMPILE = toString [ # Needed with GCC 12 "-Wno-error=stringop-overflow" + "-Wno-error=unused-parameter" ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/libraries/cm256cc/default.nix b/nixpkgs/pkgs/development/libraries/cm256cc/default.nix index 4b49bcbbcc99..0e8b03aa7236 100644 --- a/nixpkgs/pkgs/development/libraries/cm256cc/default.nix +++ b/nixpkgs/pkgs/development/libraries/cm256cc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, boost } : +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, boost } : stdenv.mkDerivation rec { pname = "cm256cc"; @@ -11,6 +11,16 @@ stdenv.mkDerivation rec { sha256 = "sha256-T7ZUVVYGdzAialse//MoqWCVNBpbZvzWMAKc0cw7O9k="; }; + patches = [ + # Pull fix pending upstream inclusion for gcc-13 support: + # https://github.com/f4exb/cm256cc/pull/18 + (fetchpatch { + name = "gcc-13.patch"; + url = "https://github.com/f4exb/cm256cc/commit/a7f142bcdae8be1c646d67176ba0ba0f7e8dcd68.patch"; + hash = "sha256-J7bm44sqnGsdPhJxQrE8LDxZ6tkTzLslHQnnKmtgrtM="; + }) + ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ boost ]; diff --git a/nixpkgs/pkgs/development/libraries/discord-gamesdk/default.nix b/nixpkgs/pkgs/development/libraries/discord-gamesdk/default.nix index 513eebe7124f..86e1a70accde 100644 --- a/nixpkgs/pkgs/development/libraries/discord-gamesdk/default.nix +++ b/nixpkgs/pkgs/development/libraries/discord-gamesdk/default.nix @@ -14,9 +14,11 @@ stdenv.mkDerivation rec { stripRoot = false; }; - nativeBuildInputs = [ - autoPatchelfHook - ]; + outputs = [ "out" "dev" ]; + + buildInputs = [ (stdenv.cc.cc.libgcc or null) ]; + + nativeBuildInputs = [ autoPatchelfHook ]; installPhase = let @@ -28,6 +30,8 @@ stdenv.mkDerivation rec { install -Dm555 lib/${processor}/discord_game_sdk${sharedLibrary} $out/lib/discord_game_sdk${sharedLibrary} + install -Dm444 c/discord_game_sdk.h $dev/lib/include/discord_game_sdk.h + runHook postInstall ''; @@ -36,6 +40,7 @@ stdenv.mkDerivation rec { description = "Library to allow other programs to interact with the Discord desktop application"; license = licenses.unfree; maintainers = with maintainers; [ tomodachi94 ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" "x86_64-windows" ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/drogon/default.nix b/nixpkgs/pkgs/development/libraries/drogon/default.nix index 0eca838dfce8..4c2ec82b0f3c 100644 --- a/nixpkgs/pkgs/development/libraries/drogon/default.nix +++ b/nixpkgs/pkgs/development/libraries/drogon/default.nix @@ -7,22 +7,22 @@ , redisSupport ? false, hiredis , mysqlSupport ? false, libmysqlclient, mariadb }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "drogon"; - version = "1.8.3"; + version = "1.8.6"; src = fetchFromGitHub { owner = "drogonframework"; repo = "drogon"; - rev = "v${version}"; - sha256 = "sha256-I3f/8TMGm1G4CFMJJLyiVYso9yTHjeLefS5eaGySvC4="; + rev = "v${finalAttrs.version}"; + sha256 = "sha256-BYZoMesDquXaphZvnf2Vd/RuOC9jsOjZsGNbDmQ3u+c="; fetchSubmodules = true; }; nativeBuildInputs = [ cmake ]; cmakeFlags = [ - "-DBUILD_TESTING=${if doInstallCheck then "ON" else "OFF"}" + "-DBUILD_TESTING=${if finalAttrs.finalPackage.doInstallCheck then "ON" else "OFF"}" "-DBUILD_EXAMPLES=OFF" ]; @@ -43,21 +43,19 @@ stdenv.mkDerivation rec { # this part of the test would normally fail because it attempts to configure a CMake project that uses find_package on itself # this patch makes drogon and trantor visible to the test ./fix_find_package.patch - - # see https://github.com/drogonframework/drogon/issues/1491 - (fetchpatch { - url = "https://github.com/drogonframework/drogon/commit/7d87d7e0b264ce53aa5ee006fb022d3516c9d666.patch"; - sha256 = "sha256-C4zH9oNMfhkaeVNvZuBuzu1v2vNgg/t+YPitbrmHg+Y="; - }) ]; # modifying PATH here makes drogon_ctl visible to the test installCheckPhase = '' - cd .. - PATH=$PATH:$out/bin bash test.sh + ( + cd .. + PATH=$PATH:$out/bin $SHELL test.sh + ) ''; - doInstallCheck = true; + # this excludes you, pkgsStatic (cmake wants to run built binaries + # in the buildPhase) + doInstallCheck = stdenv.buildPlatform == stdenv.hostPlatform; meta = with lib; { homepage = "https://github.com/drogonframework/drogon"; @@ -66,4 +64,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ urlordjames ]; platforms = platforms.all; }; -} +}) diff --git a/nixpkgs/pkgs/development/libraries/dssi/default.nix b/nixpkgs/pkgs/development/libraries/dssi/default.nix index 697ff1a857b3..322c689ba11a 100644 --- a/nixpkgs/pkgs/development/libraries/dssi/default.nix +++ b/nixpkgs/pkgs/development/libraries/dssi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, ladspaH, libjack2, liblo, alsa-lib, qt4, libX11, libsndfile, libSM +{ lib, stdenv, fetchurl, ladspaH, libjack2, liblo, alsa-lib, libX11, libsndfile, libSM , libsamplerate, libtool, autoconf, automake, xorgproto, libICE, pkg-config }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf automake pkg-config ]; buildInputs = - [ ladspaH libjack2 liblo alsa-lib qt4 libX11 libsndfile libSM + [ ladspaH libjack2 liblo alsa-lib libX11 libsndfile libSM libsamplerate libtool xorgproto libICE ]; diff --git a/nixpkgs/pkgs/development/libraries/elementary-cmake-modules/default.nix b/nixpkgs/pkgs/development/libraries/elementary-cmake-modules/default.nix deleted file mode 100644 index 9f340545584f..000000000000 --- a/nixpkgs/pkgs/development/libraries/elementary-cmake-modules/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, cmake, pkg-config }: - -stdenv.mkDerivation { - pname = "elementary-cmake-modules"; - version = "0.1.0"; - - src = fetchFromGitHub { - owner = "elementary"; - repo = "cmake-modules"; - rev = "319ec5336e9f05f3f22b886cc2053ef3d4b6599e"; - sha256 = "191hhvdxyqvh9axzndaqld7vrmv7xkn0czks908zhb2zpjhv9rby"; - }; - - prePatch = '' - substituteInPlace CMakeLists.txt \ - --replace ' ''${CMAKE_ROOT}/Modules' " $out/lib/cmake" - ''; - - propagatedBuildInputs = [ cmake pkg-config ]; - - setupHook = ./setup-hook.sh; - - meta = with lib; { - platforms = platforms.linux ++ platforms.darwin; - homepage = "https://github.com/elementary/cmake-modules"; - license = licenses.gpl3Plus; - maintainers = [ maintainers.samdroid-apps ]; - }; -} diff --git a/nixpkgs/pkgs/development/libraries/elementary-cmake-modules/setup-hook.sh b/nixpkgs/pkgs/development/libraries/elementary-cmake-modules/setup-hook.sh deleted file mode 100644 index 6408ac471577..000000000000 --- a/nixpkgs/pkgs/development/libraries/elementary-cmake-modules/setup-hook.sh +++ /dev/null @@ -1,4 +0,0 @@ -_elementaryCMakeEnvHook() { - cmakeFlagsArray+=(-DCMAKE_MODULE_PATH=@out@/lib/cmake) -} -addEnvHooks "$targetOffset" _elementaryCMakeEnvHook diff --git a/nixpkgs/pkgs/development/libraries/exempi/default.nix b/nixpkgs/pkgs/development/libraries/exempi/default.nix index 54bab95992c0..ac45084a74f9 100644 --- a/nixpkgs/pkgs/development/libraries/exempi/default.nix +++ b/nixpkgs/pkgs/development/libraries/exempi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "exempi"; - version = "2.6.3"; + version = "2.6.4"; src = fetchurl { url = "https://libopenraw.freedesktop.org/download/${pname}-${version}.tar.bz2"; - sha256 = "sha256-sHSdsYqeeM93FzeVSoOM3NsdVBWIi6wbqcr4y6d8ZWw="; + sha256 = "sha256-p1FJyWth45zcsEb9XlbYjP7qtuCPiU4V6//ZlECSv9A="; }; configureFlags = [ diff --git a/nixpkgs/pkgs/development/libraries/exiv2/default.nix b/nixpkgs/pkgs/development/libraries/exiv2/default.nix index d1cd4894f1f5..0c4c339c6390 100644 --- a/nixpkgs/pkgs/development/libraries/exiv2/default.nix +++ b/nixpkgs/pkgs/development/libraries/exiv2/default.nix @@ -88,6 +88,12 @@ stdenv.mkDerivation rec { ''} '' + lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) '' export LC_ALL=C + '' + lib.optionalString stdenv.isAarch32 '' + # these tests are fixed in 0.28, remove when updating to 0.28 + rm -f ../tests/bugfixes/github/test_issue_1503.py + rm -f ../tests/bugfixes/github/test_pr1475_AVIF.py + rm -f ../tests/bugfixes/github/test_pr1475_HEIC.py + rm -f ../tests/bugfixes/github/test_pr1475_HIF.py ''; # With CMake we have to enable samples or there won't be diff --git a/nixpkgs/pkgs/development/libraries/fortify-headers/default.nix b/nixpkgs/pkgs/development/libraries/fortify-headers/default.nix index befead87e6a1..2c24665456b7 100644 --- a/nixpkgs/pkgs/development/libraries/fortify-headers/default.nix +++ b/nixpkgs/pkgs/development/libraries/fortify-headers/default.nix @@ -5,14 +5,14 @@ stdenv.mkDerivation { pname = "fortify-headers"; - version = "1.1alpine1"; + version = "1.1alpine3"; # upstream only accessible via git - unusable during bootstrap, hence # extract from the alpine package src = fetchurl { - url = "https://dl-cdn.alpinelinux.org/alpine/v3.17/main/x86_64/fortify-headers-1.1-r1.apk"; + url = "https://dl-cdn.alpinelinux.org/alpine/v3.18/main/x86_64/fortify-headers-1.1-r3.apk"; name = "fortify-headers.tar.gz"; # ensure it's extracted as a .tar.gz - hash = "sha256-A67NzUv+dldARY+MTaoVnezTg+Es8ZK/b7XOxA6KzpI="; + hash = "sha256-8A8JcKHIBgXpUuIP4zs3Q1yBs5jCGd5F3H2E8UN/S2g="; }; installPhase = '' diff --git a/nixpkgs/pkgs/development/libraries/ganv/default.nix b/nixpkgs/pkgs/development/libraries/ganv/default.nix index d53206ca667b..9818afa9412a 100644 --- a/nixpkgs/pkgs/development/libraries/ganv/default.nix +++ b/nixpkgs/pkgs/development/libraries/ganv/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, graphviz, gtk2, gtkmm2, pkg-config, python3, wafHook }: +{ lib, stdenv, fetchgit, graphviz, gtk2, gtkmm2, pkg-config, python3, waf }: stdenv.mkDerivation rec { pname = "ganv"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "01znnalirbqxpz62fbw2c14c8xn117jc92xv6dhb3hln92k9x37f"; }; - nativeBuildInputs = [ pkg-config wafHook python3 gtk2 ]; + nativeBuildInputs = [ pkg-config waf.hook python3 gtk2 ]; buildInputs = [ graphviz gtkmm2 ]; strictDeps = true; diff --git a/nixpkgs/pkgs/development/libraries/geos/default.nix b/nixpkgs/pkgs/development/libraries/geos/default.nix index 49dc54c20fd5..5c2369cf4410 100644 --- a/nixpkgs/pkgs/development/libraries/geos/default.nix +++ b/nixpkgs/pkgs/development/libraries/geos/default.nix @@ -1,5 +1,6 @@ { lib , fetchurl +, fetchpatch , stdenv , testers , cmake @@ -14,6 +15,16 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-sfB3ZpSBxaPmKv/EnpbrBvKBmHpdNv2rIlIX5bgl5Mw="; }; + patches = [ + # Pull upstream fix of `gcc-13` build failure: + # https://github.com/libgeos/geos/pull/805 + (fetchpatch { + name = "gcc-13.patch"; + url = "https://github.com/libgeos/geos/commit/bea3188be44075034fd349f5bb117c943bdb7fb1.patch"; + hash = "sha256-dQT3Hf9YJchgjon/r46TLIXXbE6C0ZnewyvfYJea4jM="; + }) + ]; + nativeBuildInputs = [ cmake ]; doCheck = true; diff --git a/nixpkgs/pkgs/development/libraries/gf2x/default.nix b/nixpkgs/pkgs/development/libraries/gf2x/default.nix index 5060f1b65c69..70d06c107fd5 100644 --- a/nixpkgs/pkgs/development/libraries/gf2x/default.nix +++ b/nixpkgs/pkgs/development/libraries/gf2x/default.nix @@ -1,6 +1,6 @@ { stdenv , lib -, fetchgit +, fetchFromGitLab , autoreconfHook , buildPackages , optimize ? false # impure hardware optimizations @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "gf2x"; version = "1.3.0"; - # upstream has plans to move to gitlab: - # https://github.com/NixOS/nixpkgs/pull/45299#issuecomment-564477936 - src = fetchgit { - url = "https://scm.gforge.inria.fr/anonscm/git/gf2x/gf2x.git"; - rev = "gf2x-${version}"; + src = fetchFromGitLab { + domain = "gitlab.inria.fr"; + owner = "gf2x"; + repo = pname; + rev = "${pname}-${version}"; sha256 = "04g5jg0i4vz46b4w2dvbmahwzi3k6b8g515mfw7im1inc78s14id"; }; diff --git a/nixpkgs/pkgs/development/libraries/glpk/default.nix b/nixpkgs/pkgs/development/libraries/glpk/default.nix index e8b01d6d2e7d..a78170909caa 100644 --- a/nixpkgs/pkgs/development/libraries/glpk/default.nix +++ b/nixpkgs/pkgs/development/libraries/glpk/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { # https://trac.sagemath.org/ticket/20710#comment:18 (fetchpatch { name = "error_recovery.patch"; - url = "https://git.sagemath.org/sage.git/plain/build/pkgs/glpk/patches/error_recovery.patch?id=d3c1f607e32f964bf0cab877a63767c86fd00266"; + url = "https://raw.githubusercontent.com/sagemath/sage/d3c1f607e32f964bf0cab877a63767c86fd00266/build/pkgs/glpk/patches/error_recovery.patch"; sha256 = "sha256-2hNtUEoGTFt3JgUvLH3tPWnz+DZcXNhjXzS+/V89toA="; }) ]; diff --git a/nixpkgs/pkgs/development/libraries/gmime/3.nix b/nixpkgs/pkgs/development/libraries/gmime/3.nix index e5a70f234872..8f20d756c1f9 100644 --- a/nixpkgs/pkgs/development/libraries/gmime/3.nix +++ b/nixpkgs/pkgs/development/libraries/gmime/3.nix @@ -2,12 +2,12 @@ , vala }: stdenv.mkDerivation rec { - version = "3.2.12"; + version = "3.2.14"; pname = "gmime"; src = fetchurl { # https://github.com/jstedfast/gmime/releases url = "https://github.com/jstedfast/gmime/releases/download/${version}/gmime-${version}.tar.xz"; - sha256 = "sha256-OPm3aBgjQsSExBIobbjVgRaX/4FiQ3wFea3w0G4icFs="; + sha256 = "sha256-pes91nX3LlRci8HNEhB+Sq0ursGQXre0ATzbH75eIxc="; }; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/rs/Cargo.lock b/nixpkgs/pkgs/development/libraries/gstreamer/rs/Cargo.lock index 976126eecb53..6a3ecc43d739 100644 --- a/nixpkgs/pkgs/development/libraries/gstreamer/rs/Cargo.lock +++ b/nixpkgs/pkgs/development/libraries/gstreamer/rs/Cargo.lock @@ -61,21 +61,10 @@ dependencies = [ ] [[package]] -name = "ahash" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" -dependencies = [ - "getrandom", - "once_cell", - "version_check", -] - -[[package]] name = "aho-corasick" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41" +checksum = "86b8f9420f797f2d9e935edf629310eb938a0d839f984e25327f3c7eed22300c" dependencies = [ "memchr", ] @@ -136,9 +125,9 @@ dependencies = [ [[package]] name = "anstyle-wincon" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188" +checksum = "c677ab05e09154296dd37acecd46420c17b9713e8366facafa8fc0885167cf4c" dependencies = [ "anstyle", "windows-sys", @@ -197,7 +186,29 @@ checksum = "0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.26", + "syn 2.0.28", +] + +[[package]] +name = "async-stream" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51" +dependencies = [ + "async-stream-impl", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-stream-impl" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.28", ] [[package]] @@ -208,20 +219,20 @@ checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae" [[package]] name = "async-trait" -version = "0.1.71" +version = "0.1.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a564d521dd56509c4c47480d00b80ee55f7e385ae48db5744c67ad50c92d2ebf" +checksum = "cc6dde6e4ed435a4c1ee4e73592f5ba9da2151af10076cc04858746af9352d09" dependencies = [ "proc-macro2", "quote", - "syn 2.0.26", + "syn 2.0.28", ] [[package]] name = "async-tungstenite" -version = "0.22.2" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce01ac37fdc85f10a43c43bc582cbd566720357011578a935761075f898baf58" +checksum = "a1e9efbe14612da0a19fb983059a0b621e9cf6225d7018ecab4f9988215540dc" dependencies = [ "futures-io", "futures-util", @@ -230,7 +241,7 @@ dependencies = [ "pin-project-lite", "tokio", "tokio-native-tls", - "tungstenite", + "tungstenite 0.20.0", ] [[package]] @@ -274,9 +285,9 @@ dependencies = [ [[package]] name = "aws-config" -version = "0.55.3" +version = "0.56.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcdcf0d683fe9c23d32cf5b53c9918ea0a500375a9fb20109802552658e576c9" +checksum = "de3d533e0263bf453cc80af4c8bcc4d64e2aca293bd16f81633a36f1bf4a97cb" dependencies = [ "aws-credential-types", "aws-http", @@ -290,12 +301,12 @@ dependencies = [ "aws-smithy-types", "aws-types", "bytes", - "fastrand 1.9.0", + "fastrand", "hex", "http", "hyper", "ring", - "time 0.3.20", + "time 0.3.25", "tokio", "tower", "tracing", @@ -304,69 +315,124 @@ dependencies = [ [[package]] name = "aws-credential-types" -version = "0.55.3" +version = "0.56.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fcdb2f7acbc076ff5ad05e7864bdb191ca70a6fd07668dc3a1a8bcd051de5ae" +checksum = "e4834ba01c5ad1ed9740aa222de62190e3c565d11ab7e72cc68314a258994567" dependencies = [ "aws-smithy-async", "aws-smithy-types", - "fastrand 1.9.0", + "fastrand", "tokio", "tracing", "zeroize", ] [[package]] -name = "aws-endpoint" -version = "0.55.3" +name = "aws-http" +version = "0.56.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cce1c41a6cfaa726adee9ebb9a56fcd2bbfd8be49fd8a04c5e20fd968330b04" +checksum = "72badf9de83cc7d66b21b004f09241836823b8302afb25a24708769e576a8d8f" dependencies = [ + "aws-credential-types", "aws-smithy-http", "aws-smithy-types", "aws-types", + "bytes", + "http", + "http-body", + "lazy_static", + "percent-encoding", + "pin-project-lite", + "tracing", +] + +[[package]] +name = "aws-runtime" +version = "0.56.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf832f522111225c02547e1e1c28137e840e4b082399d93a236e4b29193a4667" +dependencies = [ + "aws-credential-types", + "aws-http", + "aws-sigv4", + "aws-smithy-async", + "aws-smithy-eventstream", + "aws-smithy-http", + "aws-smithy-runtime-api", + "aws-smithy-types", + "aws-types", + "fastrand", + "http", + "percent-encoding", + "tracing", + "uuid", +] + +[[package]] +name = "aws-sdk-kinesisvideo" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d12ca8af73af5453ecde2a4cc3df43eb6d623552bd3899692bfc92c6ddd1463" +dependencies = [ + "aws-credential-types", + "aws-http", + "aws-runtime", + "aws-smithy-async", + "aws-smithy-client", + "aws-smithy-http", + "aws-smithy-json", + "aws-smithy-runtime", + "aws-smithy-runtime-api", + "aws-smithy-types", + "aws-types", + "bytes", "http", "regex", + "tokio-stream", "tracing", ] [[package]] -name = "aws-http" -version = "0.55.3" +name = "aws-sdk-kinesisvideosignaling" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aadbc44e7a8f3e71c8b374e03ecd972869eb91dd2bc89ed018954a52ba84bc44" +checksum = "e4d880336d747d5207a74b656d8a229401142598fa36cab9163ac221946d517d" dependencies = [ "aws-credential-types", + "aws-http", + "aws-runtime", + "aws-smithy-async", + "aws-smithy-client", "aws-smithy-http", + "aws-smithy-json", + "aws-smithy-runtime", + "aws-smithy-runtime-api", "aws-smithy-types", "aws-types", "bytes", "http", - "http-body", - "lazy_static", - "percent-encoding", - "pin-project-lite", + "regex", "tracing", ] [[package]] name = "aws-sdk-s3" -version = "0.28.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fba197193cbb4bcb6aad8d99796b2291f36fa89562ded5d4501363055b0de89f" +checksum = "1e30370b61599168d38190ad272bb91842cd81870a6ca035c05dd5726d22832c" dependencies = [ "aws-credential-types", - "aws-endpoint", "aws-http", - "aws-sig-auth", + "aws-runtime", "aws-sigv4", "aws-smithy-async", "aws-smithy-checksums", "aws-smithy-client", "aws-smithy-eventstream", "aws-smithy-http", - "aws-smithy-http-tower", "aws-smithy-json", + "aws-smithy-runtime", + "aws-smithy-runtime-api", "aws-smithy-types", "aws-smithy-xml", "aws-types", @@ -377,96 +443,118 @@ dependencies = [ "percent-encoding", "regex", "tokio-stream", - "tower", "tracing", "url", ] [[package]] name = "aws-sdk-sso" -version = "0.28.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8b812340d86d4a766b2ca73f740dfd47a97c2dff0c06c8517a16d88241957e4" +checksum = "f41bf2c28d32dbb9894a8fcfcb148265d034d3f4a170552a47553a09de890895" dependencies = [ "aws-credential-types", - "aws-endpoint", "aws-http", - "aws-sig-auth", + "aws-runtime", "aws-smithy-async", "aws-smithy-client", "aws-smithy-http", - "aws-smithy-http-tower", "aws-smithy-json", + "aws-smithy-runtime", + "aws-smithy-runtime-api", "aws-smithy-types", "aws-types", "bytes", "http", "regex", "tokio-stream", - "tower", "tracing", ] [[package]] name = "aws-sdk-sts" -version = "0.28.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "265fac131fbfc188e5c3d96652ea90ecc676a934e3174eaaee523c6cec040b3b" +checksum = "79e21aa1a5b0853969a1ef96ccfaa8ff5d57c761549786a4d5f86c1902b2586a" dependencies = [ "aws-credential-types", - "aws-endpoint", "aws-http", - "aws-sig-auth", + "aws-runtime", "aws-smithy-async", "aws-smithy-client", "aws-smithy-http", - "aws-smithy-http-tower", "aws-smithy-json", "aws-smithy-query", + "aws-smithy-runtime", + "aws-smithy-runtime-api", "aws-smithy-types", "aws-smithy-xml", "aws-types", + "http", + "regex", + "tracing", +] + +[[package]] +name = "aws-sdk-transcribestreaming" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12669c64c03c04e207ff14994791a3a508ae4dc55b0b73f31182171d19b04989" +dependencies = [ + "aws-credential-types", + "aws-http", + "aws-runtime", + "aws-sigv4", + "aws-smithy-async", + "aws-smithy-client", + "aws-smithy-eventstream", + "aws-smithy-http", + "aws-smithy-json", + "aws-smithy-runtime", + "aws-smithy-runtime-api", + "aws-smithy-types", + "aws-types", "bytes", "http", + "hyper", "regex", - "tower", "tracing", ] [[package]] -name = "aws-sdk-transcribe" -version = "0.28.0" +name = "aws-sdk-translate" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6b561d56e7989062837c92f3cee6802f1b9cdb81b248bcc47790e38de1b96ab" +checksum = "336147dbb8f9d406dea0bbe5ef057ec4761d4134e7c8eb915db503d7081c6da7" dependencies = [ "aws-credential-types", - "aws-endpoint", "aws-http", - "aws-sig-auth", + "aws-runtime", "aws-smithy-async", "aws-smithy-client", "aws-smithy-http", - "aws-smithy-http-tower", "aws-smithy-json", + "aws-smithy-runtime", + "aws-smithy-runtime-api", "aws-smithy-types", "aws-types", "bytes", + "fastrand", "http", "regex", "tokio-stream", - "tower", "tracing", ] [[package]] name = "aws-sig-auth" -version = "0.55.3" +version = "0.56.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b94acb10af0c879ecd5c7bdf51cda6679a0a4f4643ce630905a77673bfa3c61" +checksum = "d861c220cd86e3d3e84b8fabddd6b7c29fbd8234715ebb71e063a64689d66bc0" dependencies = [ "aws-credential-types", "aws-sigv4", - "aws-smithy-eventstream", + "aws-smithy-async", "aws-smithy-http", "aws-types", "http", @@ -475,9 +563,9 @@ dependencies = [ [[package]] name = "aws-sigv4" -version = "0.55.3" +version = "0.56.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d2ce6f507be68e968a33485ced670111d1cbad161ddbbab1e313c03d37d8f4c" +checksum = "2cb40a93429794065f41f0581734fc56a345f6a38d8e2e3c25c7448d930cd132" dependencies = [ "aws-smithy-eventstream", "aws-smithy-http", @@ -490,15 +578,15 @@ dependencies = [ "percent-encoding", "regex", "sha2", - "time 0.3.20", + "time 0.3.25", "tracing", ] [[package]] name = "aws-smithy-async" -version = "0.55.3" +version = "0.56.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13bda3996044c202d75b91afeb11a9afae9db9a721c6a7a427410018e286b880" +checksum = "6ee6d17d487c8b579423067718b3580c0908d0f01d7461813f94ec4323bad623" dependencies = [ "futures-util", "pin-project-lite", @@ -508,9 +596,9 @@ dependencies = [ [[package]] name = "aws-smithy-checksums" -version = "0.55.3" +version = "0.56.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07ed8b96d95402f3f6b8b57eb4e0e45ee365f78b1a924faf20ff6e97abf1eae6" +checksum = "0d1849fd5916904513fb0862543b36f8faab43c07984dbc476132b7da1aed056" dependencies = [ "aws-smithy-http", "aws-smithy-types", @@ -529,16 +617,16 @@ dependencies = [ [[package]] name = "aws-smithy-client" -version = "0.55.3" +version = "0.56.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a86aa6e21e86c4252ad6a0e3e74da9617295d8d6e374d552be7d3059c41cedd" +checksum = "bdbe0a3ad15283cc5f863a68cb6adc8e256e7c109c43c01bdd09be407219a1e9" dependencies = [ "aws-smithy-async", "aws-smithy-http", "aws-smithy-http-tower", "aws-smithy-types", "bytes", - "fastrand 1.9.0", + "fastrand", "http", "http-body", "hyper", @@ -553,9 +641,9 @@ dependencies = [ [[package]] name = "aws-smithy-eventstream" -version = "0.55.3" +version = "0.56.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "460c8da5110835e3d9a717c61f5556b20d03c32a1dec57f8fc559b360f733bb8" +checksum = "a56afef1aa766f512b4970b4c3150b9bf2df8035939723830df4b30267e2d7cb" dependencies = [ "aws-smithy-types", "bytes", @@ -564,9 +652,9 @@ dependencies = [ [[package]] name = "aws-smithy-http" -version = "0.55.3" +version = "0.56.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b3b693869133551f135e1f2c77cb0b8277d9e3e17feaf2213f735857c4f0d28" +checksum = "34dc313472d727f5ef44fdda93e668ebfe17380c99dee512c403e3ca51863bb9" dependencies = [ "aws-smithy-eventstream", "aws-smithy-types", @@ -587,9 +675,9 @@ dependencies = [ [[package]] name = "aws-smithy-http-tower" -version = "0.55.3" +version = "0.56.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ae4f6c5798a247fac98a867698197d9ac22643596dc3777f0c76b91917616b9" +checksum = "1dd50fca5a4ea4ec3771689ee93bf06b32de02a80af01ed93a8f8a4ed90e8483" dependencies = [ "aws-smithy-http", "aws-smithy-types", @@ -603,50 +691,88 @@ dependencies = [ [[package]] name = "aws-smithy-json" -version = "0.55.3" +version = "0.56.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23f9f42fbfa96d095194a632fbac19f60077748eba536eb0b9fecc28659807f8" +checksum = "3591dd7c2fe01ab8025e4847a0a0f6d0c2b2269714688ffb856f9cf6c6d465cf" dependencies = [ "aws-smithy-types", ] [[package]] name = "aws-smithy-query" -version = "0.55.3" +version = "0.56.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98819eb0b04020a1c791903533b638534ae6c12e2aceda3e6e6fba015608d51d" +checksum = "dbabb1145e65dd57ae72d91a2619d3f5fba40b68a5f40ba009c30571dfd60aff" dependencies = [ "aws-smithy-types", "urlencoding", ] [[package]] +name = "aws-smithy-runtime" +version = "0.56.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3687fb838d4ad1c883b62eb59115bc9fb02c4f308aac49a7df89627067f6eb0d" +dependencies = [ + "aws-smithy-async", + "aws-smithy-client", + "aws-smithy-http", + "aws-smithy-runtime-api", + "aws-smithy-types", + "bytes", + "fastrand", + "http", + "http-body", + "once_cell", + "pin-project-lite", + "pin-utils", + "tokio", + "tracing", +] + +[[package]] +name = "aws-smithy-runtime-api" +version = "0.56.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cfbf1e5c2108b41f5ca607cde40dd5109fecc448f5d30c8e614b61f36dce704" +dependencies = [ + "aws-smithy-async", + "aws-smithy-http", + "aws-smithy-types", + "bytes", + "http", + "tokio", + "tracing", +] + +[[package]] name = "aws-smithy-types" -version = "0.55.3" +version = "0.56.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16a3d0bf4f324f4ef9793b86a1701d9700fbcdbd12a846da45eed104c634c6e8" +checksum = "eed0a94eefd845a2a78677f1b72f02fa75802d38f7f59be675add140279aa8bf" dependencies = [ "base64-simd", "itoa", "num-integer", "ryu", - "time 0.3.20", + "serde", + "time 0.3.25", ] [[package]] name = "aws-smithy-xml" -version = "0.55.3" +version = "0.56.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1b9d12875731bd07e767be7baad95700c3137b56730ec9ddeedb52a5e5ca63b" +checksum = "c88052c812f696143ad7ba729c63535209ff0e0f49e31a6d2b1205208ea6ea79" dependencies = [ "xmlparser", ] [[package]] name = "aws-types" -version = "0.55.3" +version = "0.56.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6dd209616cc8d7bfb82f87811a5c655dc97537f592689b18743bddf5dc5c4829" +checksum = "6bceb8cf724ad057ad7f327d0d256d7147b3eac777b39849a26189e003dc9782" dependencies = [ "aws-credential-types", "aws-smithy-async", @@ -659,20 +785,6 @@ dependencies = [ ] [[package]] -name = "backoff" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b62ddb9cb1ec0a098ad4bbf9344d0713fa193ae1a80af55febcff2627b6a00c1" -dependencies = [ - "futures-core", - "getrandom", - "instant", - "pin-project-lite", - "rand", - "tokio", -] - -[[package]] name = "backtrace" version = "0.3.68" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -706,6 +818,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" [[package]] +name = "base64-serde" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba368df5de76a5bea49aaf0cf1b39ccfbbef176924d1ba5db3e4135216cbe3c7" +dependencies = [ + "base64 0.21.2", + "serde", +] + +[[package]] name = "base64-simd" version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -817,10 +939,10 @@ dependencies = [ [[package]] name = "cairo-rs" -version = "0.17.10" -source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.17#6b109fb807237b5d07aff9a541ca68e9c2191abd" +version = "0.18.1" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.18#854c9b0592fb3a3865caa3e8538a5dda98399c0c" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.3.3", "cairo-sys-rs", "glib", "libc", @@ -830,8 +952,8 @@ dependencies = [ [[package]] name = "cairo-sys-rs" -version = "0.17.10" -source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.17#6b109fb807237b5d07aff9a541ca68e9c2191abd" +version = "0.18.1" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.18#854c9b0592fb3a3865caa3e8538a5dda98399c0c" dependencies = [ "glib-sys", "libc", @@ -852,11 +974,12 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.79" +version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +checksum = "305fe645edc1442a0fa8b6726ba61d422798d37a52e12eaecf4b022ebbb88f01" dependencies = [ "jobserver", + "libc", ] [[package]] @@ -876,10 +999,21 @@ dependencies = [ ] [[package]] +name = "cea708-types" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a23ec736ab2aafb861ef6f22c662cbc18c85e73945f86bd9e936a20be7cc958" +dependencies = [ + "once_cell", + "tracing", + "tracing-subscriber", +] + +[[package]] name = "cfg-expr" -version = "0.15.3" +version = "0.15.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "215c0072ecc28f92eeb0eea38ba63ddfcb65c2828c46311d646f1a3ff5f9841c" +checksum = "b40ccee03b5175c18cde8f37e7d2a33bcef6f8ec8f7cc0d81090d1bb380949c9" dependencies = [ "smallvec", "target-lexicon", @@ -901,6 +1035,7 @@ dependencies = [ "iana-time-zone", "js-sys", "num-traits", + "serde", "time 0.1.45", "wasm-bindgen", "winapi", @@ -917,9 +1052,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.3.16" +version = "4.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74bb1b4028935821b2d6b439bba2e970bdcf740832732437ead910c632e30d7d" +checksum = "c27cdf28c0f604ba3f512b0c9a409f8de8513e4816705deb0498b627e7c3a3fd" dependencies = [ "clap_builder", "clap_derive", @@ -928,9 +1063,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.3.16" +version = "4.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ae467cbb0111869b765e13882a1dbbd6cb52f58203d8b80c44f667d4dd19843" +checksum = "08a9f1ab5e9f01a9b81f202e8562eb9a10de70abf9eaeac1be465c28b75aa4aa" dependencies = [ "anstream", "anstyle", @@ -947,7 +1082,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.26", + "syn 2.0.28", ] [[package]] @@ -1004,7 +1139,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e859cd57d0710d9e06c381b550c06e76992472a8c6d527aecd2fc673dcc231fb" dependencies = [ "percent-encoding", - "time 0.3.20", + "time 0.3.25", "version_check", ] @@ -1021,7 +1156,7 @@ dependencies = [ "serde", "serde_derive", "serde_json", - "time 0.3.20", + "time 0.3.25", "url", ] @@ -1060,25 +1195,10 @@ dependencies = [ ] [[package]] -name = "crc" -version = "3.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86ec7a15cbe22e59248fc7eadb1907dab5ba09372595da4d73dd805ed4417dfe" -dependencies = [ - "crc-catalog", -] - -[[package]] -name = "crc-catalog" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cace84e55f07e7301bae1c519df89cdad8cc3cd868413d3fdbdeca9ff3db484" - -[[package]] name = "crc32c" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dfea2db42e9927a3845fb268a10a72faed6d416065f77873f05e411457c363e" +checksum = "d8f48d60e5b4d2c53d5c2b1d8a58c849a70ae5e5509b08a48d047e3b65714a74" dependencies = [ "rustc_version", ] @@ -1187,6 +1307,63 @@ dependencies = [ ] [[package]] +name = "darling" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e" +dependencies = [ + "darling_core", + "darling_macro", +] + +[[package]] +name = "darling_core" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim", + "syn 2.0.28", +] + +[[package]] +name = "darling_macro" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" +dependencies = [ + "darling_core", + "quote", + "syn 2.0.28", +] + +[[package]] +name = "dash-mpd" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d0c74b03285fe95649f588140b6009dc10bc4f747bd774818ed8e9cc6b5cbb6" +dependencies = [ + "base64 0.21.2", + "base64-serde", + "chrono", + "fs-err", + "iso8601", + "log", + "num-traits", + "quick-xml", + "regex", + "serde", + "serde_with", + "thiserror", + "tokio", + "xattr", +] + +[[package]] name = "dasp_frame" version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1228,6 +1405,15 @@ dependencies = [ ] [[package]] +name = "deranged" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7684a49fb1af197853ef7b2ee694bc1f5b4179556f1e5710e1760c5db6f5e929" +dependencies = [ + "serde", +] + +[[package]] name = "diff" version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1288,9 +1474,9 @@ dependencies = [ [[package]] name = "either" -version = "1.8.1" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" [[package]] name = "encoding_rs" @@ -1334,9 +1520,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" +checksum = "6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f" dependencies = [ "errno-dragonfly", "libc", @@ -1355,15 +1541,6 @@ dependencies = [ [[package]] name = "fastrand" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" -dependencies = [ - "instant", -] - -[[package]] -name = "fastrand" version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" @@ -1382,7 +1559,7 @@ name = "ffv1" version = "0.0.0" source = "git+https://github.com/rust-av/ffv1.git?rev=2afb025a327173ce891954c052e804d0f880368a#2afb025a327173ce891954c052e804d0f880368a" dependencies = [ - "crc 1.8.1", + "crc", "num-traits", "thiserror", ] @@ -1465,6 +1642,12 @@ dependencies = [ ] [[package]] +name = "fs-err" +version = "2.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0845fa252299212f0389d64ba26f34fa32cfe41588355f21ed507c59a0f64541" + +[[package]] name = "fst" version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1526,7 +1709,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.26", + "syn 2.0.28", ] [[package]] @@ -1561,10 +1744,9 @@ dependencies = [ [[package]] name = "gdk-pixbuf" -version = "0.17.10" -source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.17#6b109fb807237b5d07aff9a541ca68e9c2191abd" +version = "0.18.1" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.18#854c9b0592fb3a3865caa3e8538a5dda98399c0c" dependencies = [ - "bitflags 1.3.2", "gdk-pixbuf-sys", "gio", "glib", @@ -1574,8 +1756,8 @@ dependencies = [ [[package]] name = "gdk-pixbuf-sys" -version = "0.17.10" -source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.17#6b109fb807237b5d07aff9a541ca68e9c2191abd" +version = "0.18.1" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.18#854c9b0592fb3a3865caa3e8538a5dda98399c0c" dependencies = [ "gio-sys", "glib-sys", @@ -1586,10 +1768,9 @@ dependencies = [ [[package]] name = "gdk4" -version = "0.6.6" -source = "git+https://github.com/gtk-rs/gtk4-rs?branch=0.6#484447e0f3614466591534783979677fb089a740" +version = "0.7.1" +source = "git+https://github.com/gtk-rs/gtk4-rs?branch=0.7#9cf490a3afcad0a61233d4f65cfc2f5d2d369e9f" dependencies = [ - "bitflags 1.3.2", "cairo-rs", "gdk-pixbuf", "gdk4-sys", @@ -1601,8 +1782,8 @@ dependencies = [ [[package]] name = "gdk4-sys" -version = "0.6.6" -source = "git+https://github.com/gtk-rs/gtk4-rs?branch=0.6#484447e0f3614466591534783979677fb089a740" +version = "0.7.1" +source = "git+https://github.com/gtk-rs/gtk4-rs?branch=0.7#9cf490a3afcad0a61233d4f65cfc2f5d2d369e9f" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", @@ -1617,8 +1798,8 @@ dependencies = [ [[package]] name = "gdk4-wayland" -version = "0.6.6" -source = "git+https://github.com/gtk-rs/gtk4-rs?branch=0.6#484447e0f3614466591534783979677fb089a740" +version = "0.7.1" +source = "git+https://github.com/gtk-rs/gtk4-rs?branch=0.7#9cf490a3afcad0a61233d4f65cfc2f5d2d369e9f" dependencies = [ "gdk4", "gdk4-wayland-sys", @@ -1629,8 +1810,8 @@ dependencies = [ [[package]] name = "gdk4-wayland-sys" -version = "0.6.6" -source = "git+https://github.com/gtk-rs/gtk4-rs?branch=0.6#484447e0f3614466591534783979677fb089a740" +version = "0.7.1" +source = "git+https://github.com/gtk-rs/gtk4-rs?branch=0.7#9cf490a3afcad0a61233d4f65cfc2f5d2d369e9f" dependencies = [ "glib-sys", "libc", @@ -1639,8 +1820,8 @@ dependencies = [ [[package]] name = "gdk4-win32" -version = "0.6.6" -source = "git+https://github.com/gtk-rs/gtk4-rs?branch=0.6#484447e0f3614466591534783979677fb089a740" +version = "0.7.1" +source = "git+https://github.com/gtk-rs/gtk4-rs?branch=0.7#9cf490a3afcad0a61233d4f65cfc2f5d2d369e9f" dependencies = [ "gdk4", "gdk4-win32-sys", @@ -1653,8 +1834,8 @@ dependencies = [ [[package]] name = "gdk4-win32-sys" -version = "0.6.6" -source = "git+https://github.com/gtk-rs/gtk4-rs?branch=0.6#484447e0f3614466591534783979677fb089a740" +version = "0.7.1" +source = "git+https://github.com/gtk-rs/gtk4-rs?branch=0.7#9cf490a3afcad0a61233d4f65cfc2f5d2d369e9f" dependencies = [ "gdk-pixbuf-sys", "gdk4-sys", @@ -1665,8 +1846,8 @@ dependencies = [ [[package]] name = "gdk4-x11" -version = "0.6.6" -source = "git+https://github.com/gtk-rs/gtk4-rs?branch=0.6#484447e0f3614466591534783979677fb089a740" +version = "0.7.1" +source = "git+https://github.com/gtk-rs/gtk4-rs?branch=0.7#9cf490a3afcad0a61233d4f65cfc2f5d2d369e9f" dependencies = [ "gdk4", "gdk4-x11-sys", @@ -1677,8 +1858,8 @@ dependencies = [ [[package]] name = "gdk4-x11-sys" -version = "0.6.6" -source = "git+https://github.com/gtk-rs/gtk4-rs?branch=0.6#484447e0f3614466591534783979677fb089a740" +version = "0.7.1" +source = "git+https://github.com/gtk-rs/gtk4-rs?branch=0.7#9cf490a3afcad0a61233d4f65cfc2f5d2d369e9f" dependencies = [ "gdk4-sys", "glib-sys", @@ -1736,10 +1917,9 @@ checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" [[package]] name = "gio" -version = "0.17.10" -source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.17#6b109fb807237b5d07aff9a541ca68e9c2191abd" +version = "0.18.1" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.18#854c9b0592fb3a3865caa3e8538a5dda98399c0c" dependencies = [ - "bitflags 1.3.2", "futures-channel", "futures-core", "futures-io", @@ -1755,8 +1935,8 @@ dependencies = [ [[package]] name = "gio-sys" -version = "0.17.10" -source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.17#6b109fb807237b5d07aff9a541ca68e9c2191abd" +version = "0.18.1" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.18#854c9b0592fb3a3865caa3e8538a5dda98399c0c" dependencies = [ "glib-sys", "gobject-sys", @@ -1767,10 +1947,10 @@ dependencies = [ [[package]] name = "glib" -version = "0.17.10" -source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.17#6b109fb807237b5d07aff9a541ca68e9c2191abd" +version = "0.18.1" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.18#854c9b0592fb3a3865caa3e8538a5dda98399c0c" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.3.3", "futures-channel", "futures-core", "futures-executor", @@ -1789,22 +1969,21 @@ dependencies = [ [[package]] name = "glib-macros" -version = "0.17.10" -source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.17#6b109fb807237b5d07aff9a541ca68e9c2191abd" +version = "0.18.1" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.18#854c9b0592fb3a3865caa3e8538a5dda98399c0c" dependencies = [ - "anyhow", "heck", "proc-macro-crate", "proc-macro-error", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.28", ] [[package]] name = "glib-sys" -version = "0.17.10" -source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.17#6b109fb807237b5d07aff9a541ca68e9c2191abd" +version = "0.18.1" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.18#854c9b0592fb3a3865caa3e8538a5dda98399c0c" dependencies = [ "libc", "system-deps", @@ -1818,8 +1997,8 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "gobject-sys" -version = "0.17.10" -source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.17#6b109fb807237b5d07aff9a541ca68e9c2191abd" +version = "0.18.1" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.18#854c9b0592fb3a3865caa3e8538a5dda98399c0c" dependencies = [ "glib-sys", "libc", @@ -1828,8 +2007,8 @@ dependencies = [ [[package]] name = "graphene-rs" -version = "0.17.10" -source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.17#6b109fb807237b5d07aff9a541ca68e9c2191abd" +version = "0.18.1" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.18#854c9b0592fb3a3865caa3e8538a5dda98399c0c" dependencies = [ "glib", "graphene-sys", @@ -1838,8 +2017,8 @@ dependencies = [ [[package]] name = "graphene-sys" -version = "0.17.10" -source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.17#6b109fb807237b5d07aff9a541ca68e9c2191abd" +version = "0.18.1" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.18#854c9b0592fb3a3865caa3e8538a5dda98399c0c" dependencies = [ "glib-sys", "libc", @@ -1849,10 +2028,9 @@ dependencies = [ [[package]] name = "gsk4" -version = "0.6.6" -source = "git+https://github.com/gtk-rs/gtk4-rs?branch=0.6#484447e0f3614466591534783979677fb089a740" +version = "0.7.1" +source = "git+https://github.com/gtk-rs/gtk4-rs?branch=0.7#9cf490a3afcad0a61233d4f65cfc2f5d2d369e9f" dependencies = [ - "bitflags 1.3.2", "cairo-rs", "gdk4", "glib", @@ -1864,8 +2042,8 @@ dependencies = [ [[package]] name = "gsk4-sys" -version = "0.6.6" -source = "git+https://github.com/gtk-rs/gtk4-rs?branch=0.6#484447e0f3614466591534783979677fb089a740" +version = "0.7.1" +source = "git+https://github.com/gtk-rs/gtk4-rs?branch=0.7#9cf490a3afcad0a61233d4f65cfc2f5d2d369e9f" dependencies = [ "cairo-sys-rs", "gdk4-sys", @@ -1879,7 +2057,7 @@ dependencies = [ [[package]] name = "gst-plugin-audiofx" -version = "0.10.11" +version = "0.11.0" dependencies = [ "anyhow", "atomic_refcell", @@ -1894,31 +2072,27 @@ dependencies = [ "hrtf", "nnnoiseless", "num-traits", - "once_cell", "rayon", "smallvec", ] [[package]] name = "gst-plugin-aws" -version = "0.10.11" +version = "0.11.0" dependencies = [ - "async-tungstenite", - "atomic_refcell", + "async-stream", "aws-config", "aws-credential-types", "aws-sdk-s3", - "aws-sdk-transcribe", + "aws-sdk-transcribestreaming", + "aws-sdk-translate", "aws-sig-auth", "aws-smithy-http", "aws-smithy-types", "aws-types", - "backoff", "base32", - "byteorder", "bytes", "chrono", - "crc 3.0.1", "env_logger 0.10.0", "futures", "gio", @@ -1928,8 +2102,6 @@ dependencies = [ "gstreamer-base", "gstreamer-check", "http", - "nom", - "once_cell", "percent-encoding", "rand", "serde", @@ -1942,7 +2114,7 @@ dependencies = [ [[package]] name = "gst-plugin-cdg" -version = "0.10.11" +version = "0.11.0" dependencies = [ "cdg", "cdg_renderer", @@ -1953,12 +2125,11 @@ dependencies = [ "gstreamer-video", "image", "muldiv", - "once_cell", ] [[package]] name = "gst-plugin-claxon" -version = "0.10.11" +version = "0.11.0" dependencies = [ "atomic_refcell", "byte-slice-cast", @@ -1972,13 +2143,14 @@ dependencies = [ [[package]] name = "gst-plugin-closedcaption" -version = "0.10.11" +version = "0.11.0" dependencies = [ "anyhow", "atomic_refcell", "byteorder", "cairo-rs", "cc", + "cea708-types", "chrono", "either", "gst-plugin-version-helper", @@ -1987,7 +2159,6 @@ dependencies = [ "gstreamer-check", "gstreamer-video", "nom", - "once_cell", "pango", "pangocairo", "pretty_assertions", @@ -1999,7 +2170,7 @@ dependencies = [ [[package]] name = "gst-plugin-csound" -version = "0.10.11" +version = "0.11.0" dependencies = [ "byte-slice-cast", "csound", @@ -2008,12 +2179,11 @@ dependencies = [ "gstreamer-audio", "gstreamer-base", "gstreamer-check", - "once_cell", ] [[package]] name = "gst-plugin-dav1d" -version = "0.10.11" +version = "0.11.0" dependencies = [ "dav1d", "gst-plugin-version-helper", @@ -2021,12 +2191,11 @@ dependencies = [ "gstreamer-base", "gstreamer-video", "num_cpus", - "once_cell", ] [[package]] name = "gst-plugin-fallbackswitch" -version = "0.10.11" +version = "0.11.0" dependencies = [ "gio", "gst-plugin-gtk4", @@ -2038,13 +2207,12 @@ dependencies = [ "gstreamer-check", "gstreamer-video", "gtk4", - "once_cell", "parking_lot", ] [[package]] name = "gst-plugin-ffv1" -version = "0.10.11" +version = "0.11.0" dependencies = [ "byte-slice-cast", "ffv1", @@ -2052,23 +2220,21 @@ dependencies = [ "gstreamer", "gstreamer-check", "gstreamer-video", - "once_cell", ] [[package]] name = "gst-plugin-file" -version = "0.10.11" +version = "0.11.0" dependencies = [ "gst-plugin-version-helper", "gstreamer", "gstreamer-base", - "once_cell", "url", ] [[package]] name = "gst-plugin-flavors" -version = "0.10.11" +version = "0.11.0" dependencies = [ "byteorder", "flavors", @@ -2079,16 +2245,16 @@ dependencies = [ "muldiv", "nom", "num-rational", - "once_cell", "smallvec", ] [[package]] name = "gst-plugin-fmp4" -version = "0.10.11" +version = "0.11.0" dependencies = [ "anyhow", "chrono", + "dash-mpd", "gst-plugin-version-helper", "gstreamer", "gstreamer-app", @@ -2098,12 +2264,13 @@ dependencies = [ "gstreamer-pbutils", "gstreamer-video", "m3u8-rs", - "once_cell", + "quick-xml", + "serde", ] [[package]] name = "gst-plugin-gif" -version = "0.10.11" +version = "0.11.0" dependencies = [ "atomic_refcell", "gif", @@ -2116,7 +2283,7 @@ dependencies = [ [[package]] name = "gst-plugin-gtk4" -version = "0.10.11" +version = "0.11.0" dependencies = [ "gdk4-wayland", "gdk4-win32", @@ -2130,13 +2297,12 @@ dependencies = [ "gstreamer-gl-x11", "gstreamer-video", "gtk4", - "once_cell", "windows-sys", ] [[package]] name = "gst-plugin-hlssink3" -version = "0.10.11" +version = "0.11.0" dependencies = [ "gio", "glib", @@ -2152,7 +2318,7 @@ dependencies = [ [[package]] name = "gst-plugin-hsv" -version = "0.10.11" +version = "0.11.0" dependencies = [ "byte-slice-cast", "gst-plugin-version-helper", @@ -2162,24 +2328,22 @@ dependencies = [ "gstreamer-check", "gstreamer-video", "num-traits", - "once_cell", ] [[package]] name = "gst-plugin-json" -version = "0.10.11" +version = "0.11.0" dependencies = [ "gst-plugin-version-helper", "gstreamer", "gstreamer-check", - "once_cell", "serde", "serde_json", ] [[package]] name = "gst-plugin-lewton" -version = "0.10.11" +version = "0.11.0" dependencies = [ "atomic_refcell", "byte-slice-cast", @@ -2188,12 +2352,11 @@ dependencies = [ "gstreamer-audio", "gstreamer-check", "lewton", - "once_cell", ] [[package]] name = "gst-plugin-livesync" -version = "0.10.11" +version = "0.11.0" dependencies = [ "gio", "gst-plugin-gtk4", @@ -2204,13 +2367,12 @@ dependencies = [ "gtk4", "muldiv", "num-rational", - "once_cell", "parking_lot", ] [[package]] name = "gst-plugin-mp4" -version = "0.10.11" +version = "0.11.0" dependencies = [ "anyhow", "gst-plugin-version-helper", @@ -2219,14 +2381,13 @@ dependencies = [ "gstreamer-base", "gstreamer-pbutils", "gstreamer-video", - "once_cell", "tempfile", "url", ] [[package]] name = "gst-plugin-ndi" -version = "0.10.11" +version = "0.11.0" dependencies = [ "atomic_refcell", "byte-slice-cast", @@ -2238,12 +2399,11 @@ dependencies = [ "gstreamer-base", "gstreamer-video", "libloading", - "once_cell", ] [[package]] name = "gst-plugin-onvif" -version = "0.10.11" +version = "0.11.0" dependencies = [ "cairo-rs", "chrono", @@ -2252,7 +2412,6 @@ dependencies = [ "gstreamer-base", "gstreamer-rtp", "gstreamer-video", - "once_cell", "pango", "pangocairo", "xmlparser", @@ -2261,7 +2420,7 @@ dependencies = [ [[package]] name = "gst-plugin-png" -version = "0.10.11" +version = "0.11.0" dependencies = [ "gst-plugin-version-helper", "gstreamer", @@ -2274,45 +2433,42 @@ dependencies = [ [[package]] name = "gst-plugin-raptorq" -version = "0.10.11" +version = "0.11.0" dependencies = [ "gst-plugin-version-helper", "gstreamer", "gstreamer-base", "gstreamer-check", "gstreamer-rtp", - "once_cell", "rand", "raptorq", ] [[package]] name = "gst-plugin-rav1e" -version = "0.10.11" +version = "0.11.0" dependencies = [ "atomic_refcell", "gst-plugin-version-helper", "gstreamer", "gstreamer-check", "gstreamer-video", - "once_cell", "rav1e", ] [[package]] name = "gst-plugin-regex" -version = "0.10.11" +version = "0.11.0" dependencies = [ "gst-plugin-version-helper", "gstreamer", "gstreamer-check", - "once_cell", "regex", ] [[package]] name = "gst-plugin-reqwest" -version = "0.10.11" +version = "0.11.0" dependencies = [ "futures", "gst-plugin-version-helper", @@ -2321,7 +2477,6 @@ dependencies = [ "headers", "hyper", "mime", - "once_cell", "reqwest", "tokio", "url", @@ -2329,7 +2484,7 @@ dependencies = [ [[package]] name = "gst-plugin-rtp" -version = "0.10.11" +version = "0.11.0" dependencies = [ "bitstream-io", "chrono", @@ -2337,12 +2492,11 @@ dependencies = [ "gstreamer", "gstreamer-check", "gstreamer-rtp", - "once_cell", ] [[package]] name = "gst-plugin-sodium" -version = "0.10.11" +version = "0.11.0" dependencies = [ "clap", "gst-plugin-version-helper", @@ -2362,7 +2516,7 @@ dependencies = [ [[package]] name = "gst-plugin-spotify" -version = "0.10.11" +version = "0.11.0" dependencies = [ "anyhow", "futures", @@ -2370,35 +2524,32 @@ dependencies = [ "gstreamer", "gstreamer-base", "librespot", - "once_cell", "tokio", "url", ] [[package]] name = "gst-plugin-textahead" -version = "0.10.11" +version = "0.11.0" dependencies = [ "gst-plugin-version-helper", "gstreamer", - "once_cell", ] [[package]] name = "gst-plugin-textwrap" -version = "0.10.11" +version = "0.11.0" dependencies = [ "gst-plugin-version-helper", "gstreamer", "gstreamer-check", "hyphenation", - "once_cell", "textwrap", ] [[package]] name = "gst-plugin-threadshare" -version = "0.10.11" +version = "0.11.0" dependencies = [ "async-task", "cc", @@ -2428,7 +2579,7 @@ dependencies = [ [[package]] name = "gst-plugin-togglerecord" -version = "0.10.11" +version = "0.11.0" dependencies = [ "either", "gio", @@ -2436,27 +2587,26 @@ dependencies = [ "gst-plugin-version-helper", "gstreamer", "gstreamer-audio", + "gstreamer-check", "gstreamer-video", "gtk4", - "once_cell", "parking_lot", ] [[package]] name = "gst-plugin-tracers" -version = "0.10.11" +version = "0.11.0" dependencies = [ "anyhow", "gst-plugin-version-helper", "gstreamer", - "once_cell", "regex", "signal-hook", ] [[package]] name = "gst-plugin-tutorial" -version = "0.10.11" +version = "0.11.0" dependencies = [ "byte-slice-cast", "gst-plugin-version-helper", @@ -2465,12 +2615,11 @@ dependencies = [ "gstreamer-base", "gstreamer-video", "num-traits", - "once_cell", ] [[package]] name = "gst-plugin-uriplaylistbin" -version = "0.10.11" +version = "0.11.0" dependencies = [ "anyhow", "clap", @@ -2478,7 +2627,6 @@ dependencies = [ "gstreamer", "gstreamer-app", "more-asserts", - "once_cell", "thiserror", "url", ] @@ -2492,7 +2640,7 @@ dependencies = [ [[package]] name = "gst-plugin-videofx" -version = "0.10.11" +version = "0.11.0" dependencies = [ "atomic_refcell", "cairo-rs", @@ -2506,31 +2654,40 @@ dependencies = [ "gstreamer-video", "image", "image_hasher", - "once_cell", "rgb", ] [[package]] name = "gst-plugin-webp" -version = "0.10.11" +version = "0.11.0" dependencies = [ "gst-plugin-version-helper", "gstreamer", "gstreamer-check", "gstreamer-video", "libwebp-sys2", - "once_cell", "pretty_assertions", ] [[package]] name = "gst-plugin-webrtc" -version = "0.10.11" +version = "0.11.0" dependencies = [ "anyhow", + "async-recursion", "async-tungstenite", + "aws-config", + "aws-credential-types", + "aws-sdk-kinesisvideo", + "aws-sdk-kinesisvideosignaling", + "aws-sig-auth", + "aws-smithy-http", + "aws-smithy-types", + "aws-types", + "chrono", "clap", - "fastrand 2.0.0", + "data-encoding", + "fastrand", "futures", "gst-plugin-version-helper", "gst-plugin-webrtc-signalling-protocol", @@ -2542,8 +2699,13 @@ dependencies = [ "gstreamer-utils", "gstreamer-video", "gstreamer-webrtc", + "http", "human_bytes", - "once_cell", + "livekit-api", + "livekit-protocol", + "parse_link_header", + "regex", + "reqwest", "serde", "serde_json", "thiserror", @@ -2554,19 +2716,19 @@ dependencies = [ "tracing-log", "tracing-subscriber", "url", + "url-escape", "uuid", ] [[package]] name = "gst-plugin-webrtc-signalling" -version = "0.10.11" +version = "0.11.0" dependencies = [ "anyhow", "async-tungstenite", "clap", "futures", "gst-plugin-webrtc-signalling-protocol", - "once_cell", "pin-project-lite", "serde", "serde_json", @@ -2582,7 +2744,7 @@ dependencies = [ [[package]] name = "gst-plugin-webrtc-signalling-protocol" -version = "0.10.11" +version = "0.11.0" dependencies = [ "serde", "serde_json", @@ -2590,7 +2752,7 @@ dependencies = [ [[package]] name = "gst-plugin-webrtchttp" -version = "0.10.11" +version = "0.11.0" dependencies = [ "async-recursion", "bytes", @@ -2599,7 +2761,6 @@ dependencies = [ "gstreamer", "gstreamer-sdp", "gstreamer-webrtc", - "once_cell", "parse_link_header", "reqwest", "tokio", @@ -2607,21 +2768,20 @@ dependencies = [ [[package]] name = "gstreamer" -version = "0.20.7" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#37edd497cc778a3b70af5073e6383c9a8d9e5891" +version = "0.21.0" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.21#5022d85b8385814669aa797249dce94193eeccc0" dependencies = [ - "bitflags 1.3.2", "cfg-if", "futures-channel", "futures-core", "futures-util", "glib", "gstreamer-sys", + "itertools 0.11.0", "libc", "muldiv", "num-integer", "num-rational", - "once_cell", "option-operations", "paste", "pretty-hex", @@ -2633,10 +2793,9 @@ dependencies = [ [[package]] name = "gstreamer-app" -version = "0.20.7" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#37edd497cc778a3b70af5073e6383c9a8d9e5891" +version = "0.21.0" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.21#5022d85b8385814669aa797249dce94193eeccc0" dependencies = [ - "bitflags 1.3.2", "futures-core", "futures-sink", "glib", @@ -2644,13 +2803,12 @@ dependencies = [ "gstreamer-app-sys", "gstreamer-base", "libc", - "once_cell", ] [[package]] name = "gstreamer-app-sys" -version = "0.20.7" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#37edd497cc778a3b70af5073e6383c9a8d9e5891" +version = "0.21.0" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.21#5022d85b8385814669aa797249dce94193eeccc0" dependencies = [ "glib-sys", "gstreamer-base-sys", @@ -2661,23 +2819,21 @@ dependencies = [ [[package]] name = "gstreamer-audio" -version = "0.20.7" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#37edd497cc778a3b70af5073e6383c9a8d9e5891" +version = "0.21.0" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.21#5022d85b8385814669aa797249dce94193eeccc0" dependencies = [ - "bitflags 1.3.2", "cfg-if", "glib", "gstreamer", "gstreamer-audio-sys", "gstreamer-base", "libc", - "once_cell", ] [[package]] name = "gstreamer-audio-sys" -version = "0.20.7" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#37edd497cc778a3b70af5073e6383c9a8d9e5891" +version = "0.21.0" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.21#5022d85b8385814669aa797249dce94193eeccc0" dependencies = [ "glib-sys", "gobject-sys", @@ -2689,23 +2845,21 @@ dependencies = [ [[package]] name = "gstreamer-base" -version = "0.20.7" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#37edd497cc778a3b70af5073e6383c9a8d9e5891" +version = "0.21.0" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.21#5022d85b8385814669aa797249dce94193eeccc0" dependencies = [ "atomic_refcell", - "bitflags 1.3.2", "cfg-if", "glib", "gstreamer", "gstreamer-base-sys", "libc", - "once_cell", ] [[package]] name = "gstreamer-base-sys" -version = "0.20.7" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#37edd497cc778a3b70af5073e6383c9a8d9e5891" +version = "0.21.0" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.21#5022d85b8385814669aa797249dce94193eeccc0" dependencies = [ "glib-sys", "gobject-sys", @@ -2716,10 +2870,9 @@ dependencies = [ [[package]] name = "gstreamer-check" -version = "0.20.7" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#37edd497cc778a3b70af5073e6383c9a8d9e5891" +version = "0.21.0" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.21#5022d85b8385814669aa797249dce94193eeccc0" dependencies = [ - "bitflags 1.3.2", "glib", "gstreamer", "gstreamer-check-sys", @@ -2727,8 +2880,8 @@ dependencies = [ [[package]] name = "gstreamer-check-sys" -version = "0.20.7" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#37edd497cc778a3b70af5073e6383c9a8d9e5891" +version = "0.21.0" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.21#5022d85b8385814669aa797249dce94193eeccc0" dependencies = [ "glib-sys", "gobject-sys", @@ -2739,23 +2892,21 @@ dependencies = [ [[package]] name = "gstreamer-gl" -version = "0.20.7" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#37edd497cc778a3b70af5073e6383c9a8d9e5891" +version = "0.21.0" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.21#5022d85b8385814669aa797249dce94193eeccc0" dependencies = [ - "bitflags 1.3.2", "glib", "gstreamer", "gstreamer-base", "gstreamer-gl-sys", "gstreamer-video", "libc", - "once_cell", ] [[package]] name = "gstreamer-gl-egl" -version = "0.20.7" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#37edd497cc778a3b70af5073e6383c9a8d9e5891" +version = "0.21.0" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.21#5022d85b8385814669aa797249dce94193eeccc0" dependencies = [ "glib", "gstreamer", @@ -2766,8 +2917,8 @@ dependencies = [ [[package]] name = "gstreamer-gl-egl-sys" -version = "0.20.7" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#37edd497cc778a3b70af5073e6383c9a8d9e5891" +version = "0.21.0" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.21#5022d85b8385814669aa797249dce94193eeccc0" dependencies = [ "glib-sys", "gstreamer-gl-sys", @@ -2777,8 +2928,8 @@ dependencies = [ [[package]] name = "gstreamer-gl-sys" -version = "0.20.7" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#37edd497cc778a3b70af5073e6383c9a8d9e5891" +version = "0.21.0" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.21#5022d85b8385814669aa797249dce94193eeccc0" dependencies = [ "glib-sys", "gobject-sys", @@ -2791,8 +2942,8 @@ dependencies = [ [[package]] name = "gstreamer-gl-wayland" -version = "0.20.7" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#37edd497cc778a3b70af5073e6383c9a8d9e5891" +version = "0.21.0" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.21#5022d85b8385814669aa797249dce94193eeccc0" dependencies = [ "glib", "gstreamer", @@ -2803,8 +2954,8 @@ dependencies = [ [[package]] name = "gstreamer-gl-wayland-sys" -version = "0.20.7" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#37edd497cc778a3b70af5073e6383c9a8d9e5891" +version = "0.21.0" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.21#5022d85b8385814669aa797249dce94193eeccc0" dependencies = [ "glib-sys", "gstreamer-gl-sys", @@ -2814,8 +2965,8 @@ dependencies = [ [[package]] name = "gstreamer-gl-x11" -version = "0.20.7" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#37edd497cc778a3b70af5073e6383c9a8d9e5891" +version = "0.21.0" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.21#5022d85b8385814669aa797249dce94193eeccc0" dependencies = [ "glib", "gstreamer", @@ -2826,8 +2977,8 @@ dependencies = [ [[package]] name = "gstreamer-gl-x11-sys" -version = "0.20.7" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#37edd497cc778a3b70af5073e6383c9a8d9e5891" +version = "0.21.0" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.21#5022d85b8385814669aa797249dce94193eeccc0" dependencies = [ "glib-sys", "gstreamer-gl-sys", @@ -2837,8 +2988,8 @@ dependencies = [ [[package]] name = "gstreamer-net" -version = "0.20.7" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#37edd497cc778a3b70af5073e6383c9a8d9e5891" +version = "0.21.0" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.21#5022d85b8385814669aa797249dce94193eeccc0" dependencies = [ "gio", "glib", @@ -2848,8 +2999,8 @@ dependencies = [ [[package]] name = "gstreamer-net-sys" -version = "0.20.7" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#37edd497cc778a3b70af5073e6383c9a8d9e5891" +version = "0.21.0" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.21#5022d85b8385814669aa797249dce94193eeccc0" dependencies = [ "gio-sys", "glib-sys", @@ -2860,10 +3011,9 @@ dependencies = [ [[package]] name = "gstreamer-pbutils" -version = "0.20.7" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#37edd497cc778a3b70af5073e6383c9a8d9e5891" +version = "0.21.0" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.21#5022d85b8385814669aa797249dce94193eeccc0" dependencies = [ - "bitflags 1.3.2", "glib", "gstreamer", "gstreamer-audio", @@ -2875,8 +3025,8 @@ dependencies = [ [[package]] name = "gstreamer-pbutils-sys" -version = "0.20.7" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#37edd497cc778a3b70af5073e6383c9a8d9e5891" +version = "0.21.0" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.21#5022d85b8385814669aa797249dce94193eeccc0" dependencies = [ "glib-sys", "gobject-sys", @@ -2889,21 +3039,19 @@ dependencies = [ [[package]] name = "gstreamer-rtp" -version = "0.20.7" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#37edd497cc778a3b70af5073e6383c9a8d9e5891" +version = "0.21.0" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.21#5022d85b8385814669aa797249dce94193eeccc0" dependencies = [ - "bitflags 1.3.2", "glib", "gstreamer", "gstreamer-rtp-sys", "libc", - "once_cell", ] [[package]] name = "gstreamer-rtp-sys" -version = "0.20.7" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#37edd497cc778a3b70af5073e6383c9a8d9e5891" +version = "0.21.0" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.21#5022d85b8385814669aa797249dce94193eeccc0" dependencies = [ "glib-sys", "gstreamer-base-sys", @@ -2914,8 +3062,8 @@ dependencies = [ [[package]] name = "gstreamer-sdp" -version = "0.20.7" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#37edd497cc778a3b70af5073e6383c9a8d9e5891" +version = "0.21.0" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.21#5022d85b8385814669aa797249dce94193eeccc0" dependencies = [ "glib", "gstreamer", @@ -2924,8 +3072,8 @@ dependencies = [ [[package]] name = "gstreamer-sdp-sys" -version = "0.20.7" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#37edd497cc778a3b70af5073e6383c9a8d9e5891" +version = "0.21.0" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.21#5022d85b8385814669aa797249dce94193eeccc0" dependencies = [ "glib-sys", "gstreamer-sys", @@ -2935,8 +3083,8 @@ dependencies = [ [[package]] name = "gstreamer-sys" -version = "0.20.7" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#37edd497cc778a3b70af5073e6383c9a8d9e5891" +version = "0.21.0" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.21#5022d85b8385814669aa797249dce94193eeccc0" dependencies = [ "glib-sys", "gobject-sys", @@ -2946,22 +3094,20 @@ dependencies = [ [[package]] name = "gstreamer-utils" -version = "0.20.7" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#37edd497cc778a3b70af5073e6383c9a8d9e5891" +version = "0.21.0" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.21#5022d85b8385814669aa797249dce94193eeccc0" dependencies = [ "gstreamer", "gstreamer-app", "gstreamer-video", - "once_cell", "thiserror", ] [[package]] name = "gstreamer-video" -version = "0.20.7" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#37edd497cc778a3b70af5073e6383c9a8d9e5891" +version = "0.21.0" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.21#5022d85b8385814669aa797249dce94193eeccc0" dependencies = [ - "bitflags 1.3.2", "cfg-if", "futures-channel", "glib", @@ -2969,14 +3115,13 @@ dependencies = [ "gstreamer-base", "gstreamer-video-sys", "libc", - "once_cell", "serde", ] [[package]] name = "gstreamer-video-sys" -version = "0.20.7" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#37edd497cc778a3b70af5073e6383c9a8d9e5891" +version = "0.21.0" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.21#5022d85b8385814669aa797249dce94193eeccc0" dependencies = [ "glib-sys", "gobject-sys", @@ -2988,8 +3133,8 @@ dependencies = [ [[package]] name = "gstreamer-webrtc" -version = "0.20.7" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#37edd497cc778a3b70af5073e6383c9a8d9e5891" +version = "0.21.0" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.21#5022d85b8385814669aa797249dce94193eeccc0" dependencies = [ "glib", "gstreamer", @@ -3000,8 +3145,8 @@ dependencies = [ [[package]] name = "gstreamer-webrtc-sys" -version = "0.20.7" -source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.20#37edd497cc778a3b70af5073e6383c9a8d9e5891" +version = "0.21.0" +source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs?branch=0.21#5022d85b8385814669aa797249dce94193eeccc0" dependencies = [ "glib-sys", "gstreamer-sdp-sys", @@ -3012,10 +3157,9 @@ dependencies = [ [[package]] name = "gtk4" -version = "0.6.6" -source = "git+https://github.com/gtk-rs/gtk4-rs?branch=0.6#484447e0f3614466591534783979677fb089a740" +version = "0.7.1" +source = "git+https://github.com/gtk-rs/gtk4-rs?branch=0.7#9cf490a3afcad0a61233d4f65cfc2f5d2d369e9f" dependencies = [ - "bitflags 1.3.2", "cairo-rs", "field-offset", "futures-channel", @@ -3028,14 +3172,13 @@ dependencies = [ "gtk4-macros", "gtk4-sys", "libc", - "once_cell", "pango", ] [[package]] name = "gtk4-macros" -version = "0.6.6" -source = "git+https://github.com/gtk-rs/gtk4-rs?branch=0.6#484447e0f3614466591534783979677fb089a740" +version = "0.7.1" +source = "git+https://github.com/gtk-rs/gtk4-rs?branch=0.7#9cf490a3afcad0a61233d4f65cfc2f5d2d369e9f" dependencies = [ "anyhow", "proc-macro-crate", @@ -3047,8 +3190,8 @@ dependencies = [ [[package]] name = "gtk4-sys" -version = "0.6.6" -source = "git+https://github.com/gtk-rs/gtk4-rs?branch=0.6#484447e0f3614466591534783979677fb089a740" +version = "0.7.1" +source = "git+https://github.com/gtk-rs/gtk4-rs?branch=0.7#9cf490a3afcad0a61233d4f65cfc2f5d2d369e9f" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", @@ -3087,9 +3230,6 @@ name = "hashbrown" version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" -dependencies = [ - "ahash", -] [[package]] name = "hashbrown" @@ -3277,10 +3417,11 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.23.2" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1788965e61b367cd03a62950836d5cd41560c3577d90e40e0819373194d1661c" +checksum = "8d78e1e73ec14cf7375674f74d7dde185c8206fd9dea6fb6295e8a98098aaa97" dependencies = [ + "futures-util", "http", "hyper", "log", @@ -3350,6 +3491,12 @@ dependencies = [ ] [[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" @@ -3392,9 +3539,9 @@ dependencies = [ [[package]] name = "image" -version = "0.24.6" +version = "0.24.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "527909aa81e20ac3a44803521443a765550f09b5130c2c2fa1ea59c2f8f50a3a" +checksum = "6f3dfdbdd72063086ff443e297b61695500514b1e41095b6fb9a5ab48a70a711" dependencies = [ "bytemuck", "byteorder", @@ -3430,6 +3577,7 @@ checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ "autocfg", "hashbrown 0.12.3", + "serde", ] [[package]] @@ -3440,15 +3588,7 @@ checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" dependencies = [ "equivalent", "hashbrown 0.14.0", -] - -[[package]] -name = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if", + "serde", ] [[package]] @@ -3463,17 +3603,6 @@ dependencies = [ ] [[package]] -name = "io-lifetimes" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" -dependencies = [ - "hermit-abi 0.3.2", - "libc", - "windows-sys", -] - -[[package]] name = "ipnet" version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3486,11 +3615,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ "hermit-abi 0.3.2", - "rustix 0.38.4", + "rustix", "windows-sys", ] [[package]] +name = "iso8601" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "924e5d73ea28f59011fec52a0d12185d496a9b075d360657aed2a5707f701153" +dependencies = [ + "nom", +] + +[[package]] name = "itertools" version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3533,10 +3671,22 @@ dependencies = [ ] [[package]] +name = "jsonwebtoken" +version = "8.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6971da4d9c3aa03c3d8f3ff0f4155b534aad021292003895a469716b2a230378" +dependencies = [ + "base64 0.21.2", + "ring", + "serde", + "serde_json", +] + +[[package]] name = "khronos-egl" -version = "4.1.0" +version = "5.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c2352bd1d0bceb871cb9d40f24360c8133c11d7486b68b5381c1dd1a32015e3" +checksum = "d1382b16c04aeb821453d6215a3c80ba78f24c6595c5aa85653378aabe0c83e3" dependencies = [ "libc", ] @@ -3813,15 +3963,44 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.3.8" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" +checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503" [[package]] -name = "linux-raw-sys" -version = "0.4.3" +name = "livekit-api" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0d4c5d731bb0da7b313c982ee32300e7caf1ee0595c0d1e57d00f43248c0c47" +dependencies = [ + "futures-util", + "jsonwebtoken", + "livekit-protocol", + "log", + "parking_lot", + "prost", + "reqwest", + "serde", + "serde_json", + "sha2", + "thiserror", + "tokio", + "tokio-tungstenite", + "url", +] + +[[package]] +name = "livekit-protocol" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09fc20d2ca12cb9f044c93e3bd6d32d523e6e2ec3db4f7b2939cd99026ecd3f0" +checksum = "81bd731959a8dccc17248499b9952693f593bee4bb79186bf60d180b4097be59" +dependencies = [ + "futures-util", + "parking_lot", + "prost", + "prost-types", + "tokio", +] [[package]] name = "lock_api" @@ -4098,7 +4277,7 @@ checksum = "9e6a0fd4f737c707bd9086cc16c925f294943eb62eb71499e9fd4cf71f8b9f4e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.26", + "syn 2.0.28", ] [[package]] @@ -4126,9 +4305,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" dependencies = [ "autocfg", "libm", @@ -4176,9 +4355,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openssl" -version = "0.10.55" +version = "0.10.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "345df152bc43501c5eb9e4654ff05f794effb78d4efe3d53abc158baddc0703d" +checksum = "729b745ad4a5575dd06a3e1af1414bd330ee561c01b3899eb584baeaa8def17e" dependencies = [ "bitflags 1.3.2", "cfg-if", @@ -4197,7 +4376,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.26", + "syn 2.0.28", ] [[package]] @@ -4208,9 +4387,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.90" +version = "0.9.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374533b0e45f3a7ced10fcaeccca020e66656bc03dac384f852e4e5a7a8104a6" +checksum = "866b5f16f90776b9bb8dc1e1802ac6f0513de3a7a7465867bfbc563dc737faac" dependencies = [ "cc", "libc", @@ -4241,10 +4420,9 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] name = "pango" -version = "0.17.10" -source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.17#6b109fb807237b5d07aff9a541ca68e9c2191abd" +version = "0.18.1" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.18#854c9b0592fb3a3865caa3e8538a5dda98399c0c" dependencies = [ - "bitflags 1.3.2", "gio", "glib", "libc", @@ -4254,8 +4432,8 @@ dependencies = [ [[package]] name = "pango-sys" -version = "0.17.10" -source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.17#6b109fb807237b5d07aff9a541ca68e9c2191abd" +version = "0.18.1" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.18#854c9b0592fb3a3865caa3e8538a5dda98399c0c" dependencies = [ "glib-sys", "gobject-sys", @@ -4265,10 +4443,9 @@ dependencies = [ [[package]] name = "pangocairo" -version = "0.17.10" -source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.17#6b109fb807237b5d07aff9a541ca68e9c2191abd" +version = "0.18.1" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.18#854c9b0592fb3a3865caa3e8538a5dda98399c0c" dependencies = [ - "bitflags 1.3.2", "cairo-rs", "glib", "libc", @@ -4278,8 +4455,8 @@ dependencies = [ [[package]] name = "pangocairo-sys" -version = "0.17.10" -source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.17#6b109fb807237b5d07aff9a541ca68e9c2191abd" +version = "0.18.1" +source = "git+https://github.com/gtk-rs/gtk-rs-core?branch=0.18#854c9b0592fb3a3865caa3e8538a5dda98399c0c" dependencies = [ "cairo-sys-rs", "glib-sys", @@ -4360,29 +4537,29 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "030ad2bc4db10a8944cb0d837f158bdfec4d4a4873ab701a95046770d11f8842" +checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec2e072ecce94ec471b13398d5402c188e76ac03cf74dd1a975161b23a3f6d9c" +checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 2.0.26", + "syn 2.0.28", ] [[package]] name = "pin-project-lite" -version = "0.2.10" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c40d25201921e5ff0c862a505c6557ea88568a4e3ace775ab55e93f2f4f9d57" +checksum = "12cc1b0bf1727a77a54b6654e7b5f1af8604923edc8b81885f8ec92f9e3f0a05" [[package]] name = "pin-utils" @@ -4516,6 +4693,38 @@ dependencies = [ ] [[package]] +name = "prost" +version = "0.11.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd" +dependencies = [ + "bytes", + "prost-derive", +] + +[[package]] +name = "prost-derive" +version = "0.11.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4" +dependencies = [ + "anyhow", + "itertools 0.10.5", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "prost-types" +version = "0.11.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "213622a1460818959ac1181aaeb2dc9c7f63df720db7d788b3e24eacd1983e13" +dependencies = [ + "prost", +] + +[[package]] name = "protobuf" version = "2.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4557,10 +4766,20 @@ dependencies = [ ] [[package]] +name = "quick-xml" +version = "0.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eff6510e86862b57b210fd8cbe8ed3f0d7d600b9c2863cd4549a2e033c66e956" +dependencies = [ + "memchr", + "serde", +] + +[[package]] name = "quote" -version = "1.0.31" +version = "1.0.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fe8a65d69dd0808184ebb5f836ab526bb259db23c657efa38711b1072ee47f0" +checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965" dependencies = [ "proc-macro2", ] @@ -4699,13 +4918,13 @@ dependencies = [ [[package]] name = "regex" -version = "1.9.1" +version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575" +checksum = "81bc1d4caf89fac26a70747fe603c130093b53c773888797a6329091246d651a" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.3.3", + "regex-automata 0.3.6", "regex-syntax 0.7.4", ] @@ -4720,9 +4939,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.3" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39354c10dd07468c2e73926b23bb9c2caca74c5501e38a35da70406f1d923310" +checksum = "fed1ceff11a1dddaee50c9dc8e4938bd106e9d89ae372f192311e7da498e3b69" dependencies = [ "aho-corasick", "memchr", @@ -4894,41 +5113,27 @@ dependencies = [ [[package]] name = "rustix" -version = "0.37.23" +version = "0.38.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06" -dependencies = [ - "bitflags 1.3.2", - "errno", - "io-lifetimes", - "libc", - "linux-raw-sys 0.3.8", - "windows-sys", -] - -[[package]] -name = "rustix" -version = "0.38.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a962918ea88d644592894bc6dc55acc6c0956488adcebbfb6e273506b7fd6e5" +checksum = "172891ebdceb05aa0005f533a6cbfca599ddd7d966f6f5d4d9b2e70478e70399" dependencies = [ "bitflags 2.3.3", "errno", "libc", - "linux-raw-sys 0.4.3", + "linux-raw-sys", "windows-sys", ] [[package]] name = "rustls" -version = "0.20.8" +version = "0.21.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f" +checksum = "1d1feddffcfcc0b33f5c6ce9a29e341e4cd59c3f78e7ee45f4a40c038b1d6cbb" dependencies = [ "log", "ring", + "rustls-webpki", "sct", - "webpki", ] [[package]] @@ -4953,6 +5158,16 @@ dependencies = [ ] [[package]] +name = "rustls-webpki" +version = "0.101.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "261e9e0888cba427c3316e6322805653c9425240b6fd96cee7cb671ab70ab8d0" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] name = "ryu" version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4994,9 +5209,9 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.9.1" +version = "2.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fc758eb7bffce5b308734e9b0c1468893cae9ff70ebf13e7090be8dcbcc83a8" +checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" dependencies = [ "bitflags 1.3.2", "core-foundation", @@ -5007,9 +5222,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.9.0" +version = "2.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f51d0c0d83bec45f16480d0ce0058397a69e48fcdc52d1dc8855fb68acbd31a7" +checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" dependencies = [ "core-foundation-sys", "libc", @@ -5026,9 +5241,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.171" +version = "1.0.183" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30e27d1e4fd7659406c492fd6cfaf2066ba8773de45ca75e855590f856dc34a9" +checksum = "32ac8da02677876d532745a130fc9d8e6edfa81a269b107c5b00829b91d8eb3c" dependencies = [ "serde_derive", ] @@ -5044,20 +5259,20 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.171" +version = "1.0.183" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "389894603bd18c46fa56231694f8d827779c0951a667087194cf9de94ed24682" +checksum = "aafe972d60b0b9bee71a91b92fee2d4fb3c9d7e8f6b179aa99f27203d99a4816" dependencies = [ "proc-macro2", "quote", - "syn 2.0.26", + "syn 2.0.28", ] [[package]] name = "serde_json" -version = "1.0.103" +version = "1.0.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d03b412469450d4404fe8499a268edd7f8b79fecb074b0d812ad64ca21f4031b" +checksum = "076066c5f1078eac5b722a31827a8832fe108bed65dfa75e233c89f8206e976c" dependencies = [ "itoa", "ryu", @@ -5086,6 +5301,35 @@ dependencies = [ ] [[package]] +name = "serde_with" +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1402f54f9a3b9e2efe71c1cea24e648acce55887983553eeb858cf3115acfd49" +dependencies = [ + "base64 0.21.2", + "chrono", + "hex", + "indexmap 1.9.3", + "indexmap 2.0.0", + "serde", + "serde_json", + "serde_with_macros", + "time 0.3.25", +] + +[[package]] +name = "serde_with_macros" +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9197f1ad0e3c173a0222d3c4404fb04c3afe87e962bcb327af73e8301fa203c7" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "syn 2.0.28", +] + +[[package]] name = "sha-1" version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5171,9 +5415,9 @@ checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c" [[package]] name = "simd-adler32" -version = "0.3.5" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "238abfbb77c1915110ad968465608b68e869e0772622c9656714e73e5a1a522f" +checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" [[package]] name = "simd_helpers" @@ -5283,9 +5527,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.26" +version = "2.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45c3457aacde3c65315de5031ec191ce46604304d2446e803d71ade03308d970" +checksum = "04361975b3f5e348b2189d8dc55bc942f278b2d482a6a0365de5bdd62d351567" dependencies = [ "proc-macro2", "quote", @@ -5307,21 +5551,20 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.10" +version = "0.12.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2faeef5759ab89935255b1a4cd98e0baf99d1085e37d36599c625dac49ae8e" +checksum = "9d0e916b1148c8e263850e1ebcbd046f333e0683c724876bb0da63ea4373dc8a" [[package]] name = "tempfile" -version = "3.6.0" +version = "3.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31c0432476357e58790aaa47a8efb0c5138f137343f3b5f23bd36a27e3b0a6d6" +checksum = "dc02fddf48964c42031a0b3fe0428320ecf3a73c401040fc0096f97794310651" dependencies = [ - "autocfg", "cfg-if", - "fastrand 1.9.0", + "fastrand", "redox_syscall 0.3.5", - "rustix 0.37.23", + "rustix", "windows-sys", ] @@ -5347,15 +5590,15 @@ dependencies = [ [[package]] name = "test-with" -version = "0.9.7" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3e3e1275a1442b99772321d4a35e0622f7abc04f6af49bd801c7119645bc9e" +checksum = "5ea821854cf861c2bd28c19253b5b036fa4a6990745897bdb18a511b787c0187" dependencies = [ "proc-macro-error", "proc-macro2", "quote", "regex", - "syn 2.0.26", + "syn 2.0.28", ] [[package]] @@ -5372,22 +5615,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.43" +version = "1.0.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a35fc5b8971143ca348fa6df4f024d4d55264f3468c71ad1c2f365b0a4d58c42" +checksum = "611040a08a0439f8248d1990b111c95baa9c704c805fa1f62104b39655fd7f90" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.43" +version = "1.0.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "463fe12d7993d3b327787537ce8dd4dfa058de32fc2b195ef3cde03dc4771e8f" +checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96" dependencies = [ "proc-macro2", "quote", - "syn 2.0.26", + "syn 2.0.28", ] [[package]] @@ -5424,10 +5667,11 @@ dependencies = [ [[package]] name = "time" -version = "0.3.20" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd0cbfecb4d19b5ea75bb31ad904eb5b9fa13f21079c3b92017ebdf4999a5890" +checksum = "b0fdd63d58b18d663fbdf70e049f00a22c8e42be082203be7f26589213cd75ea" dependencies = [ + "deranged", "itoa", "serde", "time-core", @@ -5436,15 +5680,15 @@ dependencies = [ [[package]] name = "time-core" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" +checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" [[package]] name = "time-macros" -version = "0.2.8" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd80a657e71da814b8e5d60d3374fc6d35045062245d80224748ae522dd76f36" +checksum = "eb71511c991639bb078fd5bf97757e03914361c48100d52878b8e52b46fb92cd" dependencies = [ "time-core", ] @@ -5466,11 +5710,10 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.29.1" +version = "1.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "532826ff75199d5833b9d2c5fe410f29235e25704ee5f0ef599fb51c21f4a4da" +checksum = "2d3ce25f50619af8b0aec2eb23deebe84249e19e2ddd393a6e16e3300a6dadfd" dependencies = [ - "autocfg", "backtrace", "bytes", "libc", @@ -5479,7 +5722,7 @@ dependencies = [ "parking_lot", "pin-project-lite", "signal-hook-registry", - "socket2 0.4.9", + "socket2 0.5.3", "tokio-macros", "windows-sys", ] @@ -5492,7 +5735,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.26", + "syn 2.0.28", ] [[package]] @@ -5507,13 +5750,12 @@ dependencies = [ [[package]] name = "tokio-rustls" -version = "0.23.4" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" +checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" dependencies = [ "rustls", "tokio", - "webpki", ] [[package]] @@ -5528,6 +5770,20 @@ dependencies = [ ] [[package]] +name = "tokio-tungstenite" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec509ac96e9a0c43427c74f003127d953a265737636129424288d27cb5c4b12c" +dependencies = [ + "futures-util", + "log", + "native-tls", + "tokio", + "tokio-native-tls", + "tungstenite 0.19.0", +] + +[[package]] name = "tokio-util" version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5633,7 +5889,7 @@ checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.26", + "syn 2.0.28", ] [[package]] @@ -5712,6 +5968,26 @@ dependencies = [ ] [[package]] +name = "tungstenite" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e862a1c4128df0112ab625f55cd5c934bcb4312ba80b39ae4b4835a3fd58e649" +dependencies = [ + "byteorder", + "bytes", + "data-encoding", + "http", + "httparse", + "log", + "native-tls", + "rand", + "sha1", + "thiserror", + "url", + "utf-8", +] + +[[package]] name = "typenum" version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5731,13 +6007,9 @@ checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" [[package]] name = "unicode-linebreak" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5faade31a542b8b35855fff6e8def199853b2da8da256da52f52f1316ee3137" -dependencies = [ - "hashbrown 0.12.3", - "regex", -] +checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f" [[package]] name = "unicode-normalization" @@ -5772,10 +6044,19 @@ dependencies = [ ] [[package]] +name = "url-escape" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44e0ce4d1246d075ca5abec4b41d33e87a6054d08e2366b63205665e950db218" +dependencies = [ + "percent-encoding", +] + +[[package]] name = "urlencoding" -version = "2.1.2" +version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8db7427f936968176eaa7cdf81b7f98b980b18495ec28f1b5791ac3bfe3eea9" +checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" [[package]] name = "utf-8" @@ -5800,9 +6081,9 @@ dependencies = [ [[package]] name = "v_frame" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bec8189c996a12ac77c50065f9c9f64961e56eb940d0ae1a4ccc7bea238bb4bc" +checksum = "85db69f33d00031c1b07f7292e56317d5aa9475bdbd3d27ef18f3633438a697e" dependencies = [ "cfg-if", "noop_proc_macro", @@ -5916,7 +6197,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.26", + "syn 2.0.28", "wasm-bindgen-shared", ] @@ -5950,7 +6231,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.26", + "syn 2.0.28", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -5972,16 +6253,6 @@ dependencies = [ ] [[package]] -name = "webpki" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] name = "weezl" version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6095,9 +6366,9 @@ checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" [[package]] name = "winnow" -version = "0.5.0" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81fac9742fd1ad1bd9643b991319f72dd031016d44b77039a26977eb667141e7" +checksum = "acaaa1190073b2b101e15083c38ee8ec891b5e05cbee516521e94ec008f61e64" dependencies = [ "memchr", ] @@ -6112,10 +6383,19 @@ dependencies = [ ] [[package]] +name = "xattr" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4686009f71ff3e5c4dbcf1a282d0a44db3f021ba69350cd42086b3e5f1c6985" +dependencies = [ + "libc", +] + +[[package]] name = "xml-rs" -version = "0.8.15" +version = "0.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a56c84a8ccd4258aed21c92f70c0f6dea75356b6892ae27c24139da456f9336" +checksum = "47430998a7b5d499ccee752b41567bc3afc57e1327dc855b1a2aa44ce29b5fa1" [[package]] name = "xmlparser" @@ -6140,9 +6420,9 @@ checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" [[package]] name = "zerocopy" -version = "0.6.1" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "332f188cc1bcf1fe1064b8c58d150f497e697f49774aa846f2dc949d9a25f236" +checksum = "f3b9c234616391070b0b173963ebc65a9195068e7ed3731c6edac2ec45ebe106" dependencies = [ "byteorder", "zerocopy-derive", @@ -6150,13 +6430,13 @@ dependencies = [ [[package]] name = "zerocopy-derive" -version = "0.3.2" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6505e6815af7de1746a08f69c69606bb45695a17149517680f3b2149713b19a3" +checksum = "8f7f3a471f98d0a61c34322fbbfd10c384b07687f680d4119813713f72308d91" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.28", ] [[package]] diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/rs/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/rs/default.nix index c16118926ce8..50c2308d0811 100644 --- a/nixpkgs/pkgs/development/libraries/gstreamer/rs/default.nix +++ b/nixpkgs/pkgs/development/libraries/gstreamer/rs/default.nix @@ -103,7 +103,7 @@ let "threadshare" # tests cannot bind to localhost on darwin "webp" # not supported on darwin (upstream crate issue) ] ++ lib.optionals (!gst-plugins-base.glEnabled) [ - # these require gstreamer-gl which requires darwin sdk bump + # these require gstreamer-gl "gtk4" "livesync" "fallbackswitch" @@ -130,7 +130,7 @@ in stdenv.mkDerivation rec { pname = "gst-plugins-rs"; - version = "0.10.11"; + version = "0.11.0+fixup"; outputs = [ "out" "dev" ]; @@ -139,7 +139,7 @@ stdenv.mkDerivation rec { owner = "gstreamer"; repo = "gst-plugins-rs"; rev = version; - hash = "sha256-oOoUGzbg/ib1pA0T81hxgLlHnTRlNCWH5qZUNAutn8U="; + hash = "sha256-nvDvcY/WyVhcxitcoqgEUT8A1synZqxG2e51ct7Fgss="; # TODO: temporary workaround for case-insensitivity problems with color-name crate - https://github.com/annymosse/color-name/pull/2 postFetch = '' sedSearch="$(cat <<\EOF | sed -ze 's/\n/\\n/g' @@ -164,12 +164,12 @@ stdenv.mkDerivation rec { cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; outputHashes = { - "cairo-rs-0.17.10" = "sha256-g7d1ccSbGIPVMu73mb5QvWVSN8XAB1xLZuWfgdd1cfU="; + "cairo-rs-0.18.1" = "sha256-k+YIAZXxejbxPQqbUU91qbx2AR98gTrseknLHtNZDEE="; "color-name-1.1.0" = "sha256-RfMStbe2wX5qjPARHIFHlSDKjzx8DwJ+RjzyltM5K7A="; "ffv1-0.0.0" = "sha256-af2VD00tMf/hkfvrtGrHTjVJqbl+VVpLaR0Ry+2niJE="; "flavors-0.2.0" = "sha256-zBa0X75lXnASDBam9Kk6w7K7xuH9fP6rmjWZBUB5hxk="; - "gdk4-0.6.6" = "sha256-1WPXxsZJoYEQxVuP/CSpGs2XEZSJD//JJz4Ka2hxXHM="; - "gstreamer-0.20.7" = "sha256-o4o4mPFAZOshNNkCkykjG/b+UtT2z6TNLOEzJsfs+Mk="; + "gdk4-0.7.1" = "sha256-UMGmZivVdvmKRAjIGlj6pjDxwfNJyz8/6C0eYH1OOw4="; + "gstreamer-0.21.0" = "sha256-2uilK8wYG8e59fdL3q+kmixc1zw+EBwqvGs/EgfCGhk="; }; }; diff --git a/nixpkgs/pkgs/development/libraries/hax11/default.nix b/nixpkgs/pkgs/development/libraries/hax11/default.nix new file mode 100644 index 000000000000..20533ff91315 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/hax11/default.nix @@ -0,0 +1,50 @@ +{ lib +, multiStdenv +, fetchFromGitHub +, libX11 +, libXxf86vm +, xorgproto +, unstableGitUpdater +}: + +multiStdenv.mkDerivation (finalAttrs: { + pname = "hax11"; + version = "unstable-2022-12-10"; + + src = fetchFromGitHub { + owner = "CyberShadow"; + repo = "hax11"; + rev = "dce456f2b209f1be18d91064be257b66b69b7d9f"; + hash = "sha256-e3jYvbglQ5Nzoz/B+WEkCw48Tu+i73t+PNq51mjzmjY="; + }; + + outputs = [ "out" "doc" ]; + + buildInputs = [ + libX11 + libXxf86vm + xorgproto + ]; + + installPhase = '' + runHook preInstall + + install -Dm644 lib32/hax11.so -t $out/lib32/ + install -Dm644 lib64/hax11.so -t $out/lib64/ + install -Dm644 README.md -t $doc/share/doc/hax11/ + + runHook postInstall + ''; + + passthru = { + updateScript = unstableGitUpdater { }; + }; + + meta = { + homepage = "https://github.com/CyberShadow/hax11"; + description = "Hackbrary to Hook and Augment X11 protocol calls"; + license = with lib.licenses; [ mit ]; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/nixpkgs/pkgs/development/libraries/httplib/default.nix b/nixpkgs/pkgs/development/libraries/httplib/default.nix index 4315b827b22d..df3c295d4d9a 100644 --- a/nixpkgs/pkgs/development/libraries/httplib/default.nix +++ b/nixpkgs/pkgs/development/libraries/httplib/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "httplib"; - version = "0.13.3"; + version = "0.14.0"; src = fetchFromGitHub { owner = "yhirose"; repo = "cpp-httplib"; rev = "v${version}"; - hash = "sha256-ESaH0+n7ycpOKM+Mnv/UgT16UEx86eFMQDHB3RVmgBw="; + hash = "sha256-NtjgK/8XApEs4iSo9DzyK4Cc/FQJRAEwCwJbD24FP34="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/hunspell/dictionaries.nix b/nixpkgs/pkgs/development/libraries/hunspell/dictionaries.nix index 753c1922e759..91118946a182 100644 --- a/nixpkgs/pkgs/development/libraries/hunspell/dictionaries.nix +++ b/nixpkgs/pkgs/development/libraries/hunspell/dictionaries.nix @@ -915,13 +915,23 @@ rec { license = with lib.licenses; [ gpl2Plus lgpl2Plus mpl10 asl20 cc-by-sa-25 ]; }; - # Portugese + /* PORTUGUESE */ + pt_BR = pt-br; pt-br = mkDictFromLibreOffice { shortName = "pt-br"; dictFileName = "pt_BR"; - shortDescription = "Brazillian Portugese (Brazil)"; + shortDescription = "Portuguese (Brazil)"; readmeFile = "README_pt_BR.txt"; license = with lib.licenses; [ lgpl3 ]; }; + + pt_PT = pt-pt; + pt-pt = mkDictFromLibreOffice { + shortName = "pt-pt"; + dictFileName = "pt_PT"; + shortDescription = "Portuguese (Portugal)"; + readmeFile = "README_pt_PT.txt"; + license = with lib.licenses; [ gpl2 lgpl21 mpl11 ]; + }; } diff --git a/nixpkgs/pkgs/development/libraries/imgui/default.nix b/nixpkgs/pkgs/development/libraries/imgui/default.nix index 4ed5cc06cf0a..ca7a47d36385 100644 --- a/nixpkgs/pkgs/development/libraries/imgui/default.nix +++ b/nixpkgs/pkgs/development/libraries/imgui/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "imgui"; - version = "1.89.8"; + version = "1.89.9"; src = fetchFromGitHub { owner = "ocornut"; repo = "imgui"; rev = "v${version}"; - sha256 = "sha256-pkEm7+ZBYAYgAbMvXhmJyxm6DfyQWkECTXcTHTgfvuo="; + sha256 = "sha256-0k9jKrJUrG9piHNFQaBBY3zgNIKM23ZA879NY+MNYTU="; }; dontBuild = true; diff --git a/nixpkgs/pkgs/development/libraries/java/commons/lang/default.nix b/nixpkgs/pkgs/development/libraries/java/commons/lang/default.nix index b9ccfef8382c..9eca9e3070b2 100644 --- a/nixpkgs/pkgs/development/libraries/java/commons/lang/default.nix +++ b/nixpkgs/pkgs/development/libraries/java/commons/lang/default.nix @@ -1,26 +1,31 @@ -{ lib, stdenv, fetchurl }: +{ lib +, stdenv +, fetchurl +}: -stdenv.mkDerivation rec { - version = "3.12.0"; +stdenv.mkDerivation (finalAttrs: { + version = "3.13.0"; pname = "commons-lang"; src = fetchurl { - url = "mirror://apache/commons/lang/binaries/commons-lang3-${version}-bin.tar.gz"; - sha256 = "sha256-MwEkZd/Lf3kKyjM+CevxBeKl+5XCxjiz33kNPvqQjig="; + url = "mirror://apache/commons/lang/binaries/commons-lang3-${finalAttrs.version}-bin.tar.gz"; + hash = "sha256-yDEbe1wqyfxuJe2DK55YnNLKLh7JcsHAgp2OohWBwWU="; }; installPhase = '' - tar xf ${src} + runHook preInstall + tar xf ${finalAttrs.src} mkdir -p $out/share/java cp *.jar $out/share/java/ + runHook postInstall ''; meta = { - homepage = "https://commons.apache.org/proper/commons-lang"; description = "Provides additional methods to manipulate standard Java library classes"; + homepage = "https://commons.apache.org/proper/commons-lang"; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ copumpkin ]; - sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; - license = lib.licenses.asl20; platforms = with lib.platforms; unix; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; }; -} +}) diff --git a/nixpkgs/pkgs/development/libraries/jellyfin-ffmpeg/default.nix b/nixpkgs/pkgs/development/libraries/jellyfin-ffmpeg/default.nix index d9064ee85d17..a14a220f5199 100644 --- a/nixpkgs/pkgs/development/libraries/jellyfin-ffmpeg/default.nix +++ b/nixpkgs/pkgs/development/libraries/jellyfin-ffmpeg/default.nix @@ -9,13 +9,13 @@ nv-codec-headers-11 = nv-codec-headers-12; }).overrideAttrs (old: rec { pname = "jellyfin-ffmpeg"; - version = "6.0-5"; + version = "6.0-6"; src = fetchFromGitHub { owner = "jellyfin"; repo = "jellyfin-ffmpeg"; rev = "v${version}"; - sha256 = "sha256-pKmR+IVJAaY91KiboCBkwZleMmMFToez1fW+eXyrZjs="; + sha256 = "sha256-jOKVS+BMADS/jIagOnYwxeGTpTMySmGlOHkPD2LJdkA="; }; buildInputs = old.buildInputs ++ [ chromaprint ]; diff --git a/nixpkgs/pkgs/development/libraries/ldb/default.nix b/nixpkgs/pkgs/development/libraries/ldb/default.nix index 95547fb6382a..753dee9e3f0c 100644 --- a/nixpkgs/pkgs/development/libraries/ldb/default.nix +++ b/nixpkgs/pkgs/development/libraries/ldb/default.nix @@ -11,7 +11,7 @@ , docbook-xsl-nons , docbook_xml_dtd_42 , cmocka -, wafHook +, waf , libxcrypt }: @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config python3 - wafHook + waf.hook libxslt docbook-xsl-nons docbook_xml_dtd_42 diff --git a/nixpkgs/pkgs/development/libraries/libblockdev/default.nix b/nixpkgs/pkgs/development/libraries/libblockdev/default.nix index 985151494364..e2bbd8a485d2 100644 --- a/nixpkgs/pkgs/development/libraries/libblockdev/default.nix +++ b/nixpkgs/pkgs/development/libraries/libblockdev/default.nix @@ -31,13 +31,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "libblockdev"; - version = "3.0.2"; + version = "3.0.3"; src = fetchFromGitHub { owner = "storaged-project"; repo = "libblockdev"; rev = "${finalAttrs.version}-1"; - hash = "sha256-tqF96yeBPilF0zQ53RNN7IZ2wVgWQOwbGkvoywN/i+0="; + hash = "sha256-vQ+JHMhfCNb5PALGL9FchRYPHGj+6oQpRfmmGS0ZczI="; }; outputs = [ "out" "dev" "devdoc" ]; diff --git a/nixpkgs/pkgs/development/libraries/libdeltachat/Cargo.lock b/nixpkgs/pkgs/development/libraries/libdeltachat/Cargo.lock index f2528c30384e..1e9b02504bd6 100644 --- a/nixpkgs/pkgs/development/libraries/libdeltachat/Cargo.lock +++ b/nixpkgs/pkgs/development/libraries/libdeltachat/Cargo.lock @@ -221,13 +221,13 @@ dependencies = [ [[package]] name = "async-imap" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da93622739d458dd9a6abc1abf0e38e81965a5824a3b37f9500437c82a8bb572" +checksum = "b538b767cbf9c162a6c5795d4b932bd2c20ba10b5a91a94d2b2b6886c1dce6a8" dependencies = [ "async-channel", "base64 0.21.2", - "byte-pool", + "bytes", "chrono", "futures", "imap-proto", @@ -545,16 +545,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" [[package]] -name = "byte-pool" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2f1b21189f50b5625efa6227cf45e9d4cfdc2e73582df2b879e9689e78a7158" -dependencies = [ - "crossbeam-queue", - "stable_deref_trait", -] - -[[package]] name = "bytemuck" version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -925,16 +915,6 @@ dependencies = [ ] [[package]] -name = "crossbeam-queue" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1cfb3ea8a53f37c40dea2c7bedcbd88bdfae54f5e2175d6ecaff1c988353add" -dependencies = [ - "cfg-if", - "crossbeam-utils", -] - -[[package]] name = "crossbeam-utils" version = "0.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1123,7 +1103,7 @@ dependencies = [ [[package]] name = "deltachat" -version = "1.119.1" +version = "1.121.0" dependencies = [ "ansi_term", "anyhow", @@ -1199,7 +1179,7 @@ dependencies = [ [[package]] name = "deltachat-jsonrpc" -version = "1.119.1" +version = "1.121.0" dependencies = [ "anyhow", "async-channel", @@ -1223,7 +1203,7 @@ dependencies = [ [[package]] name = "deltachat-repl" -version = "1.119.1" +version = "1.121.0" dependencies = [ "ansi_term", "anyhow", @@ -1238,7 +1218,7 @@ dependencies = [ [[package]] name = "deltachat-rpc-server" -version = "1.119.1" +version = "1.121.0" dependencies = [ "anyhow", "deltachat", @@ -1263,7 +1243,7 @@ dependencies = [ [[package]] name = "deltachat_ffi" -version = "1.119.1" +version = "1.121.0" dependencies = [ "anyhow", "deltachat", @@ -4597,12 +4577,6 @@ dependencies = [ ] [[package]] -name = "stable_deref_trait" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" - -[[package]] name = "static_assertions" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" diff --git a/nixpkgs/pkgs/development/libraries/libdeltachat/default.nix b/nixpkgs/pkgs/development/libraries/libdeltachat/default.nix index 96ef2f6cd427..395764d955ec 100644 --- a/nixpkgs/pkgs/development/libraries/libdeltachat/default.nix +++ b/nixpkgs/pkgs/development/libraries/libdeltachat/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "libdeltachat"; - version = "1.119.1"; + version = "1.121.0"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-core-rust"; rev = "v${version}"; - hash = "sha256-LP5h99qldf9QoRDmo581H+sUx1QsD6nOGt1ES3Fr/6E="; + hash = "sha256-QefBchXitDcbn1o7jgmvWdacLT8OP+W/dL32+pYsaEA="; }; patches = [ diff --git a/nixpkgs/pkgs/development/libraries/libfprint/default.nix b/nixpkgs/pkgs/development/libraries/libfprint/default.nix index 457a4bc466a7..41eef399162a 100644 --- a/nixpkgs/pkgs/development/libraries/libfprint/default.nix +++ b/nixpkgs/pkgs/development/libraries/libfprint/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { pname = "libfprint"; - version = "1.94.5"; + version = "1.94.6"; outputs = [ "out" "devdoc" ]; src = fetchFromGitLab { @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { owner = "libfprint"; repo = pname; rev = "v${version}"; - hash = "sha256-+eSvzbXxjemVKMeD8tp/0/tGBjw2EOlmyxb8KfyZKtA="; + hash = "sha256-lDnAXWukBZSo8X6UEVR2nOMeVUi/ahnJgx2cP+vykZ8="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/libraries/libgit2/default.nix b/nixpkgs/pkgs/development/libraries/libgit2/default.nix index 9c04e9b4058f..085c4c79bdc9 100644 --- a/nixpkgs/pkgs/development/libraries/libgit2/default.nix +++ b/nixpkgs/pkgs/development/libraries/libgit2/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , cmake , pkg-config , python3 @@ -20,29 +19,16 @@ stdenv.mkDerivation rec { pname = "libgit2"; - version = "1.7.0"; + version = "1.7.1"; # also check the following packages for updates: python3Packages.pygit2 and libgit2-glib src = fetchFromGitHub { owner = "libgit2"; repo = "libgit2"; rev = "v${version}"; - hash = "sha256-3ZVBGd2T5DQKsDEc5a7pS0yz01+rDCszU9ZK0zxvfyQ="; + hash = "sha256-3W0/i6Pu7I7D1zMQhmEqJVsa7PZpKOqU1+udNENSBvM="; }; - patches = [ - (fetchpatch { - name = "darwin-errSSLNetworkTimeout.patch"; - url = "https://github.com/libgit2/libgit2/commit/3e15292d8863da316a57be23fede04f443460686.patch"; - hash = "sha256-N314YK7osO9L3hCXb+FcMoDM8iBW9Bt8D5O2Szdz7YA="; - }) - (fetchpatch { - name = "missing-git_oidarray.patch"; - url = "https://github.com/libgit2/libgit2/commit/085a169c1d73e02888708652d7772b3bc1f1b28b.diff"; - hash = "sha256-l6q1TLuOloyk0Jqvo5Npv4grU/oxlg+RFLa43qENaLI="; - }) - ]; - cmakeFlags = [ "-DUSE_HTTP_PARSER=system" "-DUSE_SSH=ON" diff --git a/nixpkgs/pkgs/development/libraries/libjreen/default.nix b/nixpkgs/pkgs/development/libraries/libjreen/default.nix deleted file mode 100644 index 5a70e4b01dd8..000000000000 --- a/nixpkgs/pkgs/development/libraries/libjreen/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ lib, stdenv, fetchurl, cmake, qt4, pkg-config, gsasl }: - -stdenv.mkDerivation rec { - pname = "libjreen"; - version = "1.2.0"; - - src = fetchurl { - url = "https://qutim.org/dwnl/73/${pname}-${version}.tar.bz2"; - sha256 = "14nwwk40xx8w6x7yaysgcr0lgzhs7l064f7ikp32s5y9a8mmp582"; - }; - - nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ qt4 gsasl ]; - - meta = { - description = "C++ Jabber library using Qt framework"; - homepage = "https://qutim.org/jreen/"; - license = lib.licenses.gpl2Plus; - platforms = lib.platforms.unix; - }; -} diff --git a/nixpkgs/pkgs/development/libraries/liblinphone/default.nix b/nixpkgs/pkgs/development/libraries/liblinphone/default.nix index c170de14197c..33220f193b59 100644 --- a/nixpkgs/pkgs/development/libraries/liblinphone/default.nix +++ b/nixpkgs/pkgs/development/libraries/liblinphone/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { pname = "liblinphone"; - version = "5.2.17"; + version = "5.2.98"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - hash = "sha256-zxp+jcClfKm+VsylRtydF2rlDCkO+sa9vw8GpwAfKHM="; + hash = "sha256-kQZePMa7MTaSJLEObM8khfSFYLqhlgTcVyKfTPLwKYU="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/libraries/libmbim/default.nix b/nixpkgs/pkgs/development/libraries/libmbim/default.nix index c55b0876ce61..896c8b8fe4ee 100644 --- a/nixpkgs/pkgs/development/libraries/libmbim/default.nix +++ b/nixpkgs/pkgs/development/libraries/libmbim/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitLab +, fetchpatch , meson , ninja , pkg-config @@ -31,6 +32,24 @@ stdenv.mkDerivation rec { hash = "sha256-aaYjvJ2OMTzkUyqWCyHdmsKJ3VGqBmKQzb1DWK/1cPU="; }; + patches = [ + # Intel Mutual Authentication - FCC lock. Part of 1.30, backported to + # openSUSE and Fedora and ChromeOS. + # https://src.fedoraproject.org/rpms/libmbim/blob/rawhide/f/libmbim.spec + (fetchpatch { + url = "https://cgit.freedesktop.org/libmbim/libmbim/patch/?id=910db9cb2b6fde303d3b4720890cf6dc6fc00880"; + hash = "sha256-412sXdWb8WsSexe1scI/C57dwENgNWoREGO1GxSF4hs="; + }) + + # Intel Tools. Allows tracing various commands. Part of 1.30, backported to + # openSUSE, Fedora and ChromeOS. + # https://src.fedoraproject.org/rpms/libmbim/blob/rawhide/f/libmbim.spec + (fetchpatch { + url = "https://cgit.freedesktop.org/libmbim/libmbim/patch/?id=8a6dec6ed11931601e605c9537da9904b3be5bc0"; + hash = "sha256-tU4zkUl5aZJE+g/qbnWprUHe/PmZvqVKB9qecSaUBhk="; + }) + ]; + mesonFlags = [ "-Dudevdir=${placeholder "out"}/lib/udev" (lib.mesonBool "introspection" withIntrospection) diff --git a/nixpkgs/pkgs/development/libraries/libowlevelzs/default.nix b/nixpkgs/pkgs/development/libraries/libowlevelzs/default.nix index e024874eabe8..46c05e6960a0 100644 --- a/nixpkgs/pkgs/development/libraries/libowlevelzs/default.nix +++ b/nixpkgs/pkgs/development/libraries/libowlevelzs/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { version = "0.1.1"; src = fetchFromGitHub { - owner = "zseri"; + owner = "fogti"; repo = "libowlevelzs"; rev = "v${version}"; sha256 = "y/EaMMsmJEmnptfjwiat4FC2+iIKlndC2Wdpop3t7vY="; @@ -19,9 +19,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Zscheile Lowlevel (utility) library"; - homepage = "https://github.com/zseri/libowlevelzs"; + homepage = "https://github.com/fogti/libowlevelzs"; license = licenses.mit; - maintainers = with maintainers; [ zseri ]; + maintainers = [ maintainers.fogti ]; platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/development/libraries/libquotient/default.nix b/nixpkgs/pkgs/development/libraries/libquotient/default.nix index 24661c082ae4..6300ece17127 100644 --- a/nixpkgs/pkgs/development/libraries/libquotient/default.nix +++ b/nixpkgs/pkgs/development/libraries/libquotient/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libquotient"; - version = "0.8.0"; + version = "0.8.1.1"; src = fetchFromGitHub { owner = "quotient-im"; repo = "libQuotient"; rev = version; - hash = "sha256-ecTHiWbsNDIUz+Sadh2pVbDRZFzdMkZXBYSjy1JqZrk="; + hash = "sha256-WNLwO2w8FYy12BeqPuiS0wg3fUMwTxfrIF1QwcjE9yQ="; }; buildInputs = [ olm openssl qtbase qtmultimedia qtkeychain ]; diff --git a/nixpkgs/pkgs/development/libraries/libredwg/default.nix b/nixpkgs/pkgs/development/libraries/libredwg/default.nix index 8a01ace46415..58a701bc15cc 100644 --- a/nixpkgs/pkgs/development/libraries/libredwg/default.nix +++ b/nixpkgs/pkgs/development/libraries/libredwg/default.nix @@ -17,19 +17,19 @@ let in stdenv.mkDerivation rec { pname = "libredwg"; - version = "0.12.5"; + version = "0.12.5.6313"; src = fetchFromGitHub { owner = "LibreDWG"; repo = pname; rev = version; - sha256 = "sha256-s9aiOKSM7+3LJNE+jRrEMcL1QKRWrlTKbwO7oL9VhuE="; + hash = "sha256-TM+cZ7N5PD6UG9cvy0XFa0sNYc3apbAJvEMh3husjRk="; fetchSubmodules = true; }; postPatch = let printVersion = writeShellScript "print-version" '' - echo ${lib.escapeShellArg version} + echo -n ${lib.escapeShellArg version} ''; in '' # avoid git dependency @@ -53,7 +53,8 @@ stdenv.mkDerivation rec { # prevent python tests from running when not building with python configureFlags = lib.optional (!enablePython) "--disable-python"; - doCheck = true; + # example_r13.dxf roundtrip fail: expect 5286, got 5285 entities + doCheck = !(stdenv.isLinux && stdenv.isAarch64); # the "xmlsuite" test requires the libxml2 c library as well as the python module nativeCheckInputs = lib.optionals enablePython [ libxml2 libxml2.dev ]; diff --git a/nixpkgs/pkgs/development/libraries/libsndfile/default.nix b/nixpkgs/pkgs/development/libraries/libsndfile/default.nix index 7c6613873f3a..02dbd633281c 100644 --- a/nixpkgs/pkgs/development/libraries/libsndfile/default.nix +++ b/nixpkgs/pkgs/development/libraries/libsndfile/default.nix @@ -1,6 +1,15 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, autogen, pkg-config, python3 , flac, lame, libmpg123, libogg, libopus, libvorbis , alsa-lib, Carbon, AudioToolbox + +# for passthru.tests +, audacity +, freeswitch +, gst_all_1 +, libsamplerate +, moc +, pipewire +, pulseaudio }: stdenv.mkDerivation rec { @@ -33,6 +42,29 @@ stdenv.mkDerivation rec { # Needed on Darwin. NIX_CFLAGS_LINK = "-logg -lvorbis"; + doCheck = true; + preCheck = '' + patchShebangs tests/test_wrapper.sh tests/pedantic-header-test.sh + + substituteInPlace tests/test_wrapper.sh \ + --replace '/usr/bin/env' "$(type -P env)" + ''; + + passthru.tests = { + inherit + audacity + freeswitch + libsamplerate + moc + pipewire + pulseaudio; + inherit (python3.pkgs) + soundfile + wavefile; + inherit (gst_all_1) gst-plugins-bad; + lame = (lame.override { sndfileFileIOSupport = true; }); + }; + meta = with lib; { description = "A C library for reading and writing files containing sampled sound"; homepage = "https://libsndfile.github.io/libsndfile/"; diff --git a/nixpkgs/pkgs/development/libraries/libuev/default.nix b/nixpkgs/pkgs/development/libraries/libuev/default.nix new file mode 100644 index 000000000000..1ec1590428d3 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libuev/default.nix @@ -0,0 +1,23 @@ +{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook }: + +stdenv.mkDerivation rec { + pname = "libuev"; + version = "2.4.0"; + + src = fetchFromGitHub { + owner = "troglobit"; + repo = "libuev"; + rev = "v${version}"; + hash = "sha256-x6l7CqlZ82kc8shAf2SxgIa4ESu0fTtnOgGz5joVCEY="; + }; + + nativeBuildInputs = [ pkg-config autoreconfHook ]; + + meta = with lib; { + description = "Lightweight event loop library for Linux epoll() family APIs"; + homepage = "https://codedocs.xyz/troglobit/libuev/"; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ vifino ]; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/libunarr/default.nix b/nixpkgs/pkgs/development/libraries/libunarr/default.nix index ccf65e64d293..1feafabfd4df 100644 --- a/nixpkgs/pkgs/development/libraries/libunarr/default.nix +++ b/nixpkgs/pkgs/development/libraries/libunarr/default.nix @@ -1,31 +1,33 @@ -{ lib, stdenv, fetchurl, fetchpatch, cmake }: +{ lib +, stdenv +, fetchurl +, cmake +}: stdenv.mkDerivation rec { pname = "libunarr"; - version = "1.0.1"; + version = "1.1.0"; src = fetchurl { url = "https://github.com/selmf/unarr/releases/download/v${version}/unarr-${version}.tar.xz"; - sha256 = "1db500k6w90qn6qb4j3zcczailmmv81q9lv4bwq516hbncg5p4sl"; + hash = "sha256-5wCnhjoj+GTmaeDTCrUnm1Wt9SsWAbQcPSYM//FNeOA="; }; - nativeBuildInputs = [ cmake ]; - - # https://github.com/selmf/unarr/issues/23 - postPatch = '' - substituteInPlace pkg-config.pc.cmake \ - --replace '$'{prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \ - --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ - '' - # ld: unknown option: --no-undefined - + lib.optionalString stdenv.isDarwin '' + postPatch = lib.optionalString stdenv.isDarwin '' substituteInPlace CMakeLists.txt \ - --replace '-Wl,--no-undefined -Wl,--as-needed' '-Wl,-undefined,error' + --replace "-flto" "" \ + --replace "AppleClang" "Clang" ''; + nativeBuildInputs = [ + cmake + ]; + meta = with lib; { homepage = "https://github.com/selmf/unarr"; description = "A lightweight decompression library with support for rar, tar and zip archives"; license = licenses.lgpl3Plus; + maintainers = with maintainers; [ wegank ]; + platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/libraries/libxcrypt/default.nix b/nixpkgs/pkgs/development/libraries/libxcrypt/default.nix index d45155e80029..067141883977 100644 --- a/nixpkgs/pkgs/development/libraries/libxcrypt/default.nix +++ b/nixpkgs/pkgs/development/libraries/libxcrypt/default.nix @@ -28,6 +28,9 @@ stdenv.mkDerivation (finalAttrs: { "--disable-werror" ]; + # fixes: can't build x86_64-w64-mingw32 shared library unless -no-undefined is specified + makeFlags = lib.optionals stdenv.hostPlatform.isWindows [ "LDFLAGS=-no-undefined"] ; + nativeBuildInputs = [ perl ]; diff --git a/nixpkgs/pkgs/development/libraries/lime/default.nix b/nixpkgs/pkgs/development/libraries/lime/default.nix index dc679b4ba549..0ac3e0f81ecd 100644 --- a/nixpkgs/pkgs/development/libraries/lime/default.nix +++ b/nixpkgs/pkgs/development/libraries/lime/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { pname = "lime"; - version = "5.2.6"; + version = "5.2.98"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "sha256-WQ6AcJpQSvWR5m2edVNji5u6ZiS4QOH45vQN2q+39NU="; + hash = "sha256-LdwXBJpwSA/PoCXL+c1pcX1V2Fq/eR6nNmwBKDM1Vr8="; }; buildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/mediastreamer/default.nix b/nixpkgs/pkgs/development/libraries/mediastreamer/default.nix index 75c8017145da..34082407c21f 100644 --- a/nixpkgs/pkgs/development/libraries/mediastreamer/default.nix +++ b/nixpkgs/pkgs/development/libraries/mediastreamer/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { pname = "mediastreamer2"; - version = "5.2.16"; + version = "5.2.98"; dontWrapQtApps = true; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - hash = "sha256-K4EBZC3zuLKF9Qw4i24f0hYKlOgRM7MR4Ck2ZoTYi6I="; + hash = "sha256-02e1nGSwlhEHwQH6WqBSKBlWQWAYa7lKdZaZ8/0SAxs="; }; patches = [ diff --git a/nixpkgs/pkgs/development/libraries/mongoc/default.nix b/nixpkgs/pkgs/development/libraries/mongoc/default.nix index 0e8e5cb8771f..07a14e862258 100644 --- a/nixpkgs/pkgs/development/libraries/mongoc/default.nix +++ b/nixpkgs/pkgs/development/libraries/mongoc/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "mongoc"; - version = "1.24.2"; + version = "1.24.3"; src = fetchFromGitHub { owner = "mongodb"; repo = "mongo-c-driver"; rev = "refs/tags/${version}"; - hash = "sha256-gey+/DAfAK69f5q568giLNL4R1UqGD6eiImkjyvnZys="; + hash = "sha256-zEIdK994aebLeKe4g6/ByWvaoGNBB0ODXRpczrCEkB8="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/libraries/ndn-cxx/default.nix b/nixpkgs/pkgs/development/libraries/ndn-cxx/default.nix index d7b31426c4f6..7ab607b01f4e 100644 --- a/nixpkgs/pkgs/development/libraries/ndn-cxx/default.nix +++ b/nixpkgs/pkgs/development/libraries/ndn-cxx/default.nix @@ -5,7 +5,7 @@ , pkg-config , python3 , python3Packages -, wafHook +, waf , boost179 , openssl , sqlite @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-nnnxlkYVTSRB6ZcuIUDFol999+amGtqegHXK+06ITK8="; }; - nativeBuildInputs = [ doxygen pkg-config python3 python3Packages.sphinx wafHook ]; + nativeBuildInputs = [ doxygen pkg-config python3 python3Packages.sphinx waf.hook ]; buildInputs = [ boost179 openssl sqlite ]; diff --git a/nixpkgs/pkgs/development/libraries/netcdf/default.nix b/nixpkgs/pkgs/development/libraries/netcdf/default.nix index ed869275c9d2..8fde7050b97a 100644 --- a/nixpkgs/pkgs/development/libraries/netcdf/default.nix +++ b/nixpkgs/pkgs/development/libraries/netcdf/default.nix @@ -16,11 +16,11 @@ let inherit (hdf5) mpiSupport mpi; in stdenv.mkDerivation rec { pname = "netcdf" + lib.optionalString mpiSupport "-mpi"; - version = "4.9.0"; + version = "4.9.2"; src = fetchurl { url = "https://downloads.unidata.ucar.edu/netcdf-c/${version}/netcdf-c-${version}.tar.gz"; - hash = "sha256-TJVgIrecCOXhTu6N9RsTwo5hIcK35/qtwhs3WUlAC0k="; + hash = "sha256-zxG6u725lj8J9VB54LAZ9tA3H1L44SZKW6jp/asabEg="; }; postPatch = '' @@ -30,6 +30,10 @@ in stdenv.mkDerivation rec { for a in ncdap_test/Makefile.am ncdap_test/Makefile.in; do substituteInPlace $a --replace testurl.sh " " done + + # Prevent building the tests from prepending `#!/bin/bash` and wiping out the patched shenbangs. + substituteInPlace nczarr_test/Makefile.in \ + --replace '#!/bin/bash' '${stdenv.shell}' ''; nativeBuildInputs = [ m4 removeReferencesTo ]; @@ -65,7 +69,7 @@ in stdenv.mkDerivation rec { remove-references-to -t ${stdenv.cc} "$(readlink -f $out/lib/libnetcdf.settings)" ''; - doCheck = !(mpiSupport || (stdenv.isDarwin && stdenv.isAarch64)); + doCheck = !mpiSupport; nativeCheckInputs = [ unzip ]; preCheck = '' diff --git a/nixpkgs/pkgs/development/libraries/nghttp3/default.nix b/nixpkgs/pkgs/development/libraries/nghttp3/default.nix index 05b51d73b8d1..a81b43ae790e 100644 --- a/nixpkgs/pkgs/development/libraries/nghttp3/default.nix +++ b/nixpkgs/pkgs/development/libraries/nghttp3/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "nghttp3"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "ngtcp2"; repo = pname; rev = "v${version}"; - hash = "sha256-ypoq+wXBaA5p5ZjRC8SNn9jHcMHHLJZLDLNOFMoua0g="; + hash = "sha256-DqqT8rgGlbV0upe0E37AR8bk3SIsoyCXt8xJzIkz9xc="; }; outputs = [ "out" "dev" "doc" ]; diff --git a/nixpkgs/pkgs/development/libraries/ngtcp2/gnutls.nix b/nixpkgs/pkgs/development/libraries/ngtcp2/gnutls.nix index 05341188be6c..45f7d9d67db3 100644 --- a/nixpkgs/pkgs/development/libraries/ngtcp2/gnutls.nix +++ b/nixpkgs/pkgs/development/libraries/ngtcp2/gnutls.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "ngtcp2"; - version = "0.18.0"; + version = "0.19.1"; src = fetchFromGitHub { owner = "ngtcp2"; repo = "ngtcp2"; rev = "v${version}"; - hash = "sha256-FkiqQZ6xmwU2vkJxmr7k+Va5jIByWayAfUea+2DCFhk="; + hash = "sha256-agiQRy/e5VS+ANxajXYi5huRjQQ2M8eddH/AzmwnHdQ="; }; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/development/libraries/nss/latest.nix b/nixpkgs/pkgs/development/libraries/nss/latest.nix index dfe3b066c878..db0ad2efad5e 100644 --- a/nixpkgs/pkgs/development/libraries/nss/latest.nix +++ b/nixpkgs/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.92"; - hash = "sha256-PbGS1uiCA5rwKufq8yF+0RS7etg0FMZGdyq4Ah4kolQ="; + version = "3.93"; + hash = "sha256-FfVLtyBI6xBfjA6TagS4medMPbmhm7weAKzuKvlHaoo="; } diff --git a/nixpkgs/pkgs/development/libraries/ntrack/default.nix b/nixpkgs/pkgs/development/libraries/ntrack/default.nix deleted file mode 100644 index 3d8f057fc803..000000000000 --- a/nixpkgs/pkgs/development/libraries/ntrack/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib, stdenv, fetchurl, qt4, pkg-config, libnl, python3 }: - -stdenv.mkDerivation rec { - pname = "ntrack"; - version = "016"; - - src = fetchurl { - url = "https://launchpad.net/ntrack/main/${version}/+download/${pname}-${version}.tar.gz"; - sha256 = "037ig5y0mp327m0hh4pnfr3vmsk3wrxgfjy3645q4ws9vdhx807w"; - }; - - buildInputs = [ libnl qt4 ]; - - nativeBuildInputs = [ pkg-config python3 ]; - - # error: ISO C does not support '__FUNCTION__' predefined identifier [-Werror=pedantic] - env.NIX_CFLAGS_COMPILE = "-Wno-error"; - - configureFlags = [ "--without-gobject" "CFLAGS=--std=gnu99" ]; - - # Remove this patch after version 016 - patches = [ ./libnl-fix.patch ]; - - postPatch = '' - sed -e "s@/usr\(/lib/ntrack/modules/\)@$out&@" -i common/ntrack.c - ''; - - meta = with lib; { - description = "Network Connectivity Tracking library for Desktop Applications"; - homepage = "https://launchpad.net/ntrack"; - platforms = platforms.linux; - license = licenses.lgpl3Plus; - }; -} diff --git a/nixpkgs/pkgs/development/libraries/ntrack/libnl-fix.patch b/nixpkgs/pkgs/development/libraries/ntrack/libnl-fix.patch deleted file mode 100644 index 806a0178ec8a..000000000000 --- a/nixpkgs/pkgs/development/libraries/ntrack/libnl-fix.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ./modules/ntrack-libnl.c.orig 2013-12-02 11:31:54.749215448 -0600 -+++ ./modules/ntrack-libnl.c 2013-12-02 11:34:46.597684553 -0600 -@@ -530,7 +530,7 @@ - op_default_route_disappeared ((struct _ntrack_monitor_arch*) self, nl_info); - } else if (nl_info->topmost_route && topmost_route) { - int diff_bits; -- if ((diff_bits = (route_obj_ops.oo_id_attrs | ROUTE_ATTR_OIF -+ if ((diff_bits = (nl_object_get_id_attrs(OBJ_CAST(topmost_route)) | ROUTE_ATTR_OIF - | ROUTE_ATTR_GATEWAY) & - nl_object_diff (OBJ_CAST (nl_info->topmost_route), - OBJ_CAST (topmost_route)))) { diff --git a/nixpkgs/pkgs/development/libraries/odpic/default.nix b/nixpkgs/pkgs/development/libraries/odpic/default.nix index a89f0b2cc101..aee255fd9612 100644 --- a/nixpkgs/pkgs/development/libraries/odpic/default.nix +++ b/nixpkgs/pkgs/development/libraries/odpic/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchFromGitHub, fixDarwinDylibNames, oracle-instantclient, libaio }: let - version = "4.6.1"; + version = "5.0.0"; libPath = lib.makeLibraryPath [ oracle-instantclient.lib ]; -in stdenv.mkDerivation { +in +stdenv.mkDerivation { inherit version; pname = "odpic"; @@ -13,7 +14,7 @@ in stdenv.mkDerivation { owner = "oracle"; repo = "odpi"; rev = "v${version}"; - sha256 = "sha256-3kJI3qRgqrithhGq7lO1r94T/P3SamDgLN13hKzmj5I="; + sha256 = "sha256-ZRkXd7D4weCfP6R7UZD2+saNiNa+XXVhfiWIlxBObmU="; }; nativeBuildInputs = lib.optional stdenv.isDarwin fixDarwinDylibNames; @@ -22,7 +23,7 @@ in stdenv.mkDerivation { ++ lib.optionals stdenv.isLinux [ libaio ]; dontPatchELF = true; - makeFlags = [ "PREFIX=$(out)" "CC=${stdenv.cc.targetPrefix}cc" "LD=${stdenv.cc.targetPrefix}cc"]; + makeFlags = [ "PREFIX=$(out)" "CC=${stdenv.cc.targetPrefix}cc" "LD=${stdenv.cc.targetPrefix}cc" ]; postFixup = '' ${lib.optionalString (stdenv.isLinux) '' @@ -31,14 +32,14 @@ in stdenv.mkDerivation { ${lib.optionalString (stdenv.isDarwin) '' install_name_tool -add_rpath "${libPath}" $out/lib/libodpic${stdenv.hostPlatform.extensions.sharedLibrary} ''} - ''; + ''; meta = with lib; { description = "Oracle ODPI-C library"; homepage = "https://oracle.github.io/odpi/"; - maintainers = with maintainers; [ mkazulak flokli ]; + maintainers = with maintainers; [ mkazulak ]; license = licenses.asl20; platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ]; - hydraPlatforms = []; + hydraPlatforms = [ ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/oracle-instantclient/default.nix b/nixpkgs/pkgs/development/libraries/oracle-instantclient/default.nix index a76a594680f5..87381141d98f 100644 --- a/nixpkgs/pkgs/development/libraries/oracle-instantclient/default.nix +++ b/nixpkgs/pkgs/development/libraries/oracle-instantclient/default.nix @@ -143,7 +143,7 @@ stdenv.mkDerivation { sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.unfree; platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ]; - maintainers = with maintainers; [ flokli dylanmtaylor ]; + maintainers = with maintainers; [ dylanmtaylor ]; hydraPlatforms = [ ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/pipewire/default.nix b/nixpkgs/pkgs/development/libraries/pipewire/default.nix index 941d4da56894..fdc514c286b7 100644 --- a/nixpkgs/pkgs/development/libraries/pipewire/default.nix +++ b/nixpkgs/pkgs/development/libraries/pipewire/default.nix @@ -75,7 +75,7 @@ let self = stdenv.mkDerivation rec { pname = "pipewire"; - version = "0.3.78"; + version = "0.3.79"; outputs = [ "out" @@ -93,7 +93,7 @@ let owner = "pipewire"; repo = "pipewire"; rev = version; - sha256 = "sha256-tiVuab8kugp9ZOKL/m8uZQps/pcrVihwB3rRf6SGuzc="; + sha256 = "sha256-pqs991pMqz3IQE+NUk0VNzZS4ExwfoZqBQDWBSGdWcs="; }; patches = [ diff --git a/nixpkgs/pkgs/development/libraries/ppl/default.nix b/nixpkgs/pkgs/development/libraries/ppl/default.nix index a94cf9e38d0e..c9b456ba831e 100644 --- a/nixpkgs/pkgs/development/libraries/ppl/default.nix +++ b/nixpkgs/pkgs/development/libraries/ppl/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { patches = [(fetchpatch { name = "clang5-support.patch"; - url = "https://git.sagemath.org/sage.git/plain/build/pkgs/ppl/patches/clang5-support.patch?h=9.2"; + url = "https://raw.githubusercontent.com/sagemath/sage/9.2/build/pkgs/ppl/patches/clang5-support.patch"; sha256 = "1zj90hm25pkgvk4jlkfzh18ak9b98217gbidl3731fdccbw6hr87"; })]; diff --git a/nixpkgs/pkgs/development/libraries/prison/default.nix b/nixpkgs/pkgs/development/libraries/prison/default.nix deleted file mode 100644 index 71f8596c646b..000000000000 --- a/nixpkgs/pkgs/development/libraries/prison/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ lib, stdenv, fetchurl, cmake, qrencode, qt4, libdmtx }: - -stdenv.mkDerivation rec { - pname = "prison"; - version = "1.0"; - - src = fetchurl { - url = "mirror://kde/stable/prison/${version}/src/prison-${version}.tar.gz"; - sha256 = "08hkzzda36jpdywjqlyzcvli7cx17h4l9yffzsdnhdd788n28krr"; - }; - - buildInputs = [ qt4 qrencode libdmtx ]; - - nativeBuildInputs = [ cmake ]; - - meta = { - description = "Qt4 library for QR-codes"; - license = lib.licenses.mit; - inherit (qt4.meta) platforms; - }; -} diff --git a/nixpkgs/pkgs/development/libraries/protobuf/3.24.nix b/nixpkgs/pkgs/development/libraries/protobuf/3.24.nix new file mode 100644 index 000000000000..2deb155444ec --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/protobuf/3.24.nix @@ -0,0 +1,6 @@ +{ callPackage, ... } @ args: + +callPackage ./generic-v3-cmake.nix ({ + version = "3.24.2"; + sha256 = "sha256-yVLszyVtsz1CCzeOkioL4O3mWTFKKVBUyOhwDbC5UqE="; +} // args) diff --git a/nixpkgs/pkgs/development/libraries/qimageblitz/default.nix b/nixpkgs/pkgs/development/libraries/qimageblitz/default.nix deleted file mode 100644 index e838eb07201f..000000000000 --- a/nixpkgs/pkgs/development/libraries/qimageblitz/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{lib, stdenv, fetchurl, cmake, qt4}: - -stdenv.mkDerivation rec { - pname = "qimageblitz"; - version = "0.0.4"; - - src = fetchurl { - url = "mirror://sourceforge/qimageblitz/qimageblitz-${version}.tar.bz2"; - sha256 = "0pnaf3qi7rgkxzs2mssmslb3f9ya4cyx09wzwlis3ppyvf72j0p9"; - }; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ qt4 ]; - - patches = [ ./qimageblitz-9999-exec-stack.patch ]; - - meta = { - description = "Graphical effect and filter library for KDE4"; - license = lib.licenses.bsd2; - homepage = "http://qimageblitz.sourceforge.net"; - platforms = lib.platforms.linux; - }; -} diff --git a/nixpkgs/pkgs/development/libraries/qimageblitz/qimageblitz-9999-exec-stack.patch b/nixpkgs/pkgs/development/libraries/qimageblitz/qimageblitz-9999-exec-stack.patch deleted file mode 100644 index 8692c240f7bb..000000000000 --- a/nixpkgs/pkgs/development/libraries/qimageblitz/qimageblitz-9999-exec-stack.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -uar qimageblitz/blitz/asm_scale.S qimageblitz~/blitz/asm_scale.S ---- qimageblitz-orig/blitz/asm_scale.S 2007-10-17 01:17:57.000000000 +0200 -+++ qimageblitz/blitz/asm_scale.S 2007-10-17 01:19:12.000000000 +0200 -@@ -814,3 +814,7 @@ - SIZE(qimageScale_mmx_AARGBA) - - #endif -+#if defined(__linux__) && defined(__ELF__) -+.section .note.GNU-stack,"",%progbits -+#endif -+ diff --git a/nixpkgs/pkgs/development/libraries/qscintilla-qt4/default.nix b/nixpkgs/pkgs/development/libraries/qscintilla-qt4/default.nix deleted file mode 100644 index 23daedd217e2..000000000000 --- a/nixpkgs/pkgs/development/libraries/qscintilla-qt4/default.nix +++ /dev/null @@ -1,67 +0,0 @@ -{ stdenv -, lib -, fetchurl -, unzip -, qt4 -, qmake4Hook -}: - -stdenv.mkDerivation rec { - pname = "qscintilla-qt4"; - version = "2.11.6"; - - src = fetchurl { - url = "https://www.riverbankcomputing.com/static/Downloads/QScintilla/${version}/QScintilla-${version}.tar.gz"; - sha256 = "5zRgV9tH0vs4RGf6/M/LE6oHQTc8XVk7xytVsvDdIKc="; - }; - - sourceRoot = "QScintilla-${version}/Qt4Qt5"; - - buildInputs = [ qt4 ]; - - nativeBuildInputs = [ unzip qmake4Hook ]; - - patches = [ - ./fix-qt4-build.patch - ]; - - # Make sure that libqscintilla2.so is available in $out/lib since it is expected - # by some packages such as sqlitebrowser - postFixup = '' - ln -s $out/lib/libqscintilla2_qt4.so $out/lib/libqscintilla2.so - ''; - - dontWrapQtApps = true; - - postPatch = '' - substituteInPlace qscintilla.pro \ - --replace '$$[QT_INSTALL_LIBS]' $out/lib \ - --replace '$$[QT_INSTALL_HEADERS]' $out/include \ - --replace '$$[QT_INSTALL_TRANSLATIONS]' $out/translations \ - --replace '$$[QT_HOST_DATA]/mkspecs' $out/mkspecs \ - --replace '$$[QT_INSTALL_DATA]/mkspecs' $out/mkspecs \ - --replace '$$[QT_INSTALL_DATA]' $out/share - ''; - - meta = with lib; { - description = "A Qt port of the Scintilla text editing library"; - longDescription = '' - QScintilla is a port to Qt of Neil Hodgson's Scintilla C++ editor - control. - - As well as features found in standard text editing components, - QScintilla includes features especially useful when editing and - debugging source code. These include support for syntax styling, - error indicators, code completion and call tips. The selection - margin can contain markers like those used in debuggers to - indicate breakpoints and the current line. Styling choices are - more open than with many editors, allowing the use of - proportional fonts, bold and italics, multiple foreground and - background colours and multiple fonts. - ''; - homepage = "https://www.riverbankcomputing.com/software/qscintilla/intro"; - license = with licenses; [ gpl3 ]; # and commercial - maintainers = with maintainers; [ peterhoeg ]; - platforms = platforms.linux; - }; -} diff --git a/nixpkgs/pkgs/development/libraries/qscintilla-qt4/fix-qt4-build.patch b/nixpkgs/pkgs/development/libraries/qscintilla-qt4/fix-qt4-build.patch deleted file mode 100644 index 520a55b1ea21..000000000000 --- a/nixpkgs/pkgs/development/libraries/qscintilla-qt4/fix-qt4-build.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -ur QScintilla_gpl-2.11.2/Qt4Qt5/Qsci/qsciscintillabase.h QScintilla_gpl-2.11.2-fix/Qt4Qt5/Qsci/qsciscintillabase.h ---- Qt4Qt5/Qsci/qsciscintillabase.h 2019-06-25 14:49:27.000000000 +0200 -+++ Qt4Qt5-fix/Qsci/qsciscintillabase.h 2019-10-04 10:22:26.337474261 +0200 -@@ -27,6 +27,7 @@ - #include <QByteArray> - #include <QPoint> - #include <QTimer> -+#include <QUrl> - - #include <Qsci/qsciglobal.h> - diff --git a/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/clang-5-darwin.patch b/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/clang-5-darwin.patch deleted file mode 100644 index 7b181f3ad896..000000000000 --- a/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/clang-5-darwin.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/gui/text/qfontengine_coretext.mm b/src/gui/text/qfontengine_coretext.mm -index 204d685..e05179e 100644 ---- a/src/gui/text/qfontengine_coretext.mm -+++ b/src/gui/text/qfontengine_coretext.mm -@@ -886,7 +886,7 @@ void QCoreTextFontEngine::getUnscaledGlyph(glyph_t glyph, QPainterPath *path, gl - - QFixed QCoreTextFontEngine::emSquareSize() const - { -- return QFixed::QFixed(int(CTFontGetUnitsPerEm(ctfont))); -+ return QFixed(int(CTFontGetUnitsPerEm(ctfont))); - } - - QFontEngine *QCoreTextFontEngine::cloneWithSize(qreal pixelSize) const diff --git a/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/default.nix b/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/default.nix deleted file mode 100644 index a8257a36d39d..000000000000 --- a/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ /dev/null @@ -1,239 +0,0 @@ -{ stdenv, lib, fetchurl, fetchpatch, substituteAll -, libXrender, libXinerama, libXcursor, libXv, libXext -, libXfixes, libXrandr, libSM, freetype, fontconfig, zlib, libjpeg, libpng -, libmng, which, libGLU, openssl, dbus, cups, pkg-config -, libtiff, glib, icu, libmysqlclient, postgresql, sqlite, perl, coreutils, libXi -, alsa-lib -, libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms -, gtkStyle ? stdenv.hostPlatform == stdenv.buildPlatform, gtk2, gdk-pixbuf -, gnomeStyle ? false, libgnomeui, GConf, gnome_vfs -, developerBuild ? false -, docs ? false -, examples ? false -, demos ? false -# darwin support -, libobjc, ApplicationServices, OpenGL, Cocoa, AGL, libcxx -}: - -# TODO: -# * move some plugins (e.g., SQL plugins) to dedicated derivations to avoid -# false build-time dependencies - -stdenv.mkDerivation rec { - pname = "qt" + lib.optionalString ( docs && demos && examples && developerBuild ) "-full"; - version = "4.8.7"; - - src = fetchurl { - url = "http://download.qt-project.org/official_releases/qt/" - + "${lib.versions.majorMinor version}/${version}/qt-everywhere-opensource-src-${version}.tar.gz"; - sha256 = "183fca7n7439nlhxyg1z7aky0izgbyll3iwakw4gwivy16aj5272"; - }; - - outputs = [ "out" "dev" ]; - - outputInclude = "out"; - - setOutputFlags = false; - - - prePatch = '' - substituteInPlace configure --replace /bin/pwd pwd - substituteInPlace src/corelib/global/global.pri --replace /bin/ls ${coreutils}/bin/ls - substituteInPlace src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.cpp \ - --replace 'asm volatile' 'asm' - sed -e 's@/\(usr\|opt\)/@/var/empty/@g' -i config.tests/*/*.test -i mkspecs/*/*.conf - '' + lib.optionalString stdenv.isDarwin '' - # remove impure reference to /usr/lib/libstdc++.6.dylib - # there might be more references, but this is the only one I could find - substituteInPlace tools/macdeployqt/tests/tst_deployment_mac.cpp \ - --replace /usr/lib/libstdc++.6.dylib "${stdenv.cc}/lib/libstdc++.6.dylib" - '' + lib.optionalString stdenv.cc.isClang '' - substituteInPlace src/3rdparty/webkit/Source/WebCore/html/HTMLImageElement.cpp \ - --replace 'optionalHeight > 0' 'optionalHeight != NULL' - ''; - - patches = - lib.optionals (stdenv.hostPlatform == stdenv.buildPlatform) [ - ./glib-2.32.patch - ./libressl.patch - ./parallel-configure.patch - ./clang-5-darwin.patch - ./qt-4.8.7-unixmake-darwin.patch - ./kill-legacy-darwin-apis.patch - (substituteAll { - src = ./dlopen-absolute-paths.diff; - cups = if cups != null then lib.getLib cups else null; - icu = icu.out; - libXfixes = libXfixes.out; - glibc = stdenv.cc.libc.out; - }) - (fetchpatch { - name = "fix-medium-font.patch"; - url = "https://salsa.debian.org/qt-kde-team/qt/qt4-x11/raw/" - + "21b342d71c19e6d68b649947f913410fe6129ea4/debian/patches/kubuntu_39_fix_medium_font.diff"; - sha256 = "0bli44chn03c2y70w1n8l7ss4ya0b40jqqav8yxrykayi01yf95j"; - }) - # Patches are no longer available from here, so vendoring it for now. - #(fetchpatch { - # name = "qt4-gcc6.patch"; - # url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/qt4-gcc6.patch?h=packages/qt4&id=ca773a144f5abb244ac4f2749eeee9333cac001f"; - # sha256 = "07lrva7bjh6i40p7b3ml26a2jlznri8bh7y7iyx5zmvb1gfxmj34"; - #}) - ./qt4-gcc6.patch - ./qt4-openssl-1.1.patch - (fetchpatch { - name = "gcc9-foreach.patch"; - url = "https://salsa.debian.org/qt-kde-team/qt/qt4-x11/raw/" - + "0d4a3dd61ccb156dee556c214dbe91c04d44a717/debian/patches/gcc9-qforeach.patch"; - sha256 = "0dzn6qxrgxb75rvck9kmy5gspawdn970wsjw56026dhkih8cp3pg"; - }) - - # Pull upstream fix for gcc-11 support. - (fetchpatch { - name = "gcc11-ptr-cmp.patch"; - url = "https://github.com/qt/qttools/commit/7138c963f9d1258bc1b49cb4d63c3e2b7d0ccfda.patch"; - sha256 = "1a9g05r267c94qpw3ssb6k4lci200vla3vm5hri1nna6xwdsmrhc"; - # "src/" -> "tools/" - stripLen = 2; - extraPrefix = "tools/"; - }) - ] - ++ lib.optional gtkStyle (substituteAll ({ - src = ./dlopen-gtkstyle.diff; - # substituteAll ignores env vars starting with capital letter - gtk = gtk2.out; - } // lib.optionalAttrs gnomeStyle { - gconf = GConf.out; - libgnomeui = libgnomeui.out; - gnome_vfs = gnome_vfs.out; - })) - ++ lib.optional stdenv.isAarch64 (fetchpatch { - url = "https://src.fedoraproject.org/rpms/qt/raw/ecf530486e0fb7fe31bad26805cde61115562b2b/f/qt-aarch64.patch"; - sha256 = "1fbjh78nmafqmj7yk67qwjbhl3f6ylkp6x33b1dqxfw9gld8b3gl"; - }) - ++ lib.optionals stdenv.hostPlatform.isMusl [ - ./qt-musl.patch - ./qt-musl-iconv-no-bom.patch - ./patch-qthread-stacksize.diff - ./qsettings-recursive-global-mutex.patch - ]; - - preConfigure = '' - export LD_LIBRARY_PATH="`pwd`/lib''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" - configureFlags+=" - -docdir $out/share/doc/qt-${version} - -plugindir $out/lib/qt4/plugins - -importdir $out/lib/qt4/imports - -examplesdir $TMPDIR/share/doc/qt-${version}/examples - -demosdir $TMPDIR/share/doc/qt-${version}/demos - -datadir $out/share/qt-${version} - -translationdir $out/share/qt-${version}/translations - --jobs=$NIX_BUILD_CORES - " - unset LD # Makefile uses gcc for linking; setting LD interferes - '' + lib.optionalString stdenv.cc.isClang '' - sed -i 's/QMAKE_CC = gcc/QMAKE_CC = clang/' mkspecs/common/g++-base.conf - sed -i 's/QMAKE_CXX = g++/QMAKE_CXX = clang++/' mkspecs/common/g++-base.conf - '' + lib.optionalString stdenv.hostPlatform.isWindows '' - sed -i -e 's/ g++/ ${stdenv.cc.targetPrefix}g++/' \ - -e 's/ gcc/ ${stdenv.cc.targetPrefix}gcc/' \ - -e 's/ ar/ ${stdenv.cc.targetPrefix}ar/' \ - -e 's/ strip/ ${stdenv.cc.targetPrefix}strip/' \ - -e 's/ windres/ ${stdenv.cc.targetPrefix}windres/' \ - mkspecs/win32-g++/qmake.conf - ''; - - prefixKey = "-prefix "; - - configurePlatforms = []; - configureFlags = let - mk = cond: name: "-${lib.optionalString (!cond) "no-"}${name}"; - platformFlag = - if stdenv.hostPlatform != stdenv.buildPlatform - then "-xplatform" - else "-platform"; - in (if stdenv.hostPlatform != stdenv.buildPlatform then [ - # I've not tried any case other than i686-pc-mingw32. - # -nomake tools: it fails linking some asian language symbols - # -no-svg: it fails to build on mingw64 - "-static" "-release" "-confirm-license" "-opensource" - "-no-opengl" "-no-phonon" - "-no-svg" - "-make" "qmake" "-make" "libs" "-nomake" "tools" - ] else [ - "-v" "-no-separate-debug-info" "-release" "-fast" "-confirm-license" "-opensource" - - (mk (!stdenv.isFreeBSD) "opengl") "-xrender" "-xrandr" "-xinerama" "-xcursor" "-xinput" "-xfixes" "-fontconfig" - "-qdbus" (mk (cups != null) "cups") "-glib" "-dbus-linked" "-openssl-linked" - - "-${if libmysqlclient != null then "plugin" else "no"}-sql-mysql" "-system-sqlite" - - "-exceptions" "-xmlpatterns" - - "-make" "libs" "-make" "tools" "-make" "translations" - "-no-phonon" "-no-webkit" "-no-multimedia" "-audio-backend" - ]) ++ [ - "-${lib.optionalString (!demos) "no"}make" "demos" - "-${lib.optionalString (!examples) "no"}make" "examples" - "-${lib.optionalString (!docs) "no"}make" "docs" - ] ++ lib.optional developerBuild "-developer-build" - ++ lib.optionals stdenv.hostPlatform.isDarwin [ platformFlag "unsupported/macx-clang-libc++" ] - ++ lib.optionals stdenv.hostPlatform.isWindows [ platformFlag "win32-g++-4.6" ]; - - propagatedBuildInputs = - [ libXrender libXrandr libXinerama libXcursor libXext libXfixes libXv libXi - libSM zlib libpng openssl dbus freetype fontconfig glib ] - # Qt doesn't directly need GLU (just GL), but many apps use, it's small and doesn't remain a runtime-dep if not used - ++ lib.optional libGLSupported libGLU; - - # The following libraries are only used in plugins - buildInputs = - [ cups # Qt dlopen's libcups instead of linking to it - postgresql sqlite libjpeg libmng libtiff icu ] - ++ lib.optionals (libmysqlclient != null) [ libmysqlclient ] - ++ lib.optionals gtkStyle [ gtk2 gdk-pixbuf ] - ++ lib.optionals stdenv.isDarwin [ ApplicationServices OpenGL Cocoa AGL libcxx libobjc ]; - - nativeBuildInputs = [ perl pkg-config which ]; - - enableParallelBuilding = true; - - env.NIX_CFLAGS_COMPILE = toString ( - # with gcc7 the warnings blow the log over Hydra's limit - [ "-Wno-expansion-to-defined" "-Wno-unused-local-typedefs" ] - ++ lib.optional stdenv.isLinux "-std=gnu++98" # gnu++ in (Obj)C flags is no good on Darwin - ++ lib.optionals (stdenv.isFreeBSD || stdenv.isDarwin) - [ "-I${glib.dev}/include/glib-2.0" "-I${glib.out}/lib/glib-2.0/include" ] - ++ lib.optional stdenv.isDarwin "-I${lib.getDev libcxx}/include/c++/v1"); - - NIX_LDFLAGS = lib.optionalString (stdenv.isFreeBSD || stdenv.isDarwin) "-lglib-2.0"; - - preBuild = lib.optionalString stdenv.isDarwin '' - # resolve "extra qualification on member" error - sed -i 's/struct ::TabletProximityRec;/struct TabletProximityRec;/' \ - src/gui/kernel/qt_cocoa_helpers_mac_p.h - find . -name "Makefile*" | xargs sed -i 's/^\(LINK[[:space:]]* = clang++\)/\1 ${NIX_LDFLAGS}/' - sed -i 's/^\(LIBS[[:space:]]*=.*$\)/\1 -lobjc/' ./src/corelib/Makefile.Release - ''; - - doCheck = false; # qwebframe test fails with fontconfig errors - - postInstall = '' - rm -rf $out/tests - '' - # I don't know why it does not install qmake - + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' - cp bin/qmake* $out/bin - ''; - - dontStrip = stdenv.hostPlatform != stdenv.buildPlatform; - - meta = { - homepage = "https://qt-project.org/"; - description = "A cross-platform application framework for C++"; - license = lib.licenses.lgpl21Plus; # or gpl3 - maintainers = with lib.maintainers; [ orivej lovek323 sander ]; - platforms = lib.platforms.unix; - badPlatforms = [ "x86_64-darwin" "aarch64-darwin" ]; - }; -} diff --git a/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/dlopen-absolute-paths.diff b/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/dlopen-absolute-paths.diff deleted file mode 100644 index 4c64e9e26e30..000000000000 --- a/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/dlopen-absolute-paths.diff +++ /dev/null @@ -1,74 +0,0 @@ -diff --git a/src/corelib/tools/qlocale_icu.cpp b/src/corelib/tools/qlocale_icu.cpp -index c3e2907..2fac4e1 100644 ---- a/src/corelib/tools/qlocale_icu.cpp -+++ b/src/corelib/tools/qlocale_icu.cpp -@@ -81,7 +81,7 @@ bool qt_initIcu(const QString &localeString) - if (status == NotLoaded) { - - // resolve libicui18n -- QLibrary lib(QLatin1String("icui18n"), QLatin1String(U_ICU_VERSION_SHORT)); -+ QLibrary lib(QLatin1String("@icu@/lib/libicui18n"), QLatin1String(U_ICU_VERSION_SHORT)); - lib.setLoadHints(QLibrary::ImprovedSearchHeuristics); - if (!lib.load()) { - qWarning() << "Unable to load library icui18n" << lib.errorString(); -@@ -111,7 +111,7 @@ bool qt_initIcu(const QString &localeString) - } - - // resolve libicuuc -- QLibrary ucLib(QLatin1String("icuuc"), QLatin1String(U_ICU_VERSION_SHORT)); -+ QLibrary ucLib(QLatin1String("@icu@/lib/libicuuc"), QLatin1String(U_ICU_VERSION_SHORT)); - ucLib.setLoadHints(QLibrary::ImprovedSearchHeuristics); - if (!ucLib.load()) { - qWarning() << "Unable to load library icuuc" << ucLib.errorString(); -diff --git a/src/gui/painting/qcups.cpp b/src/gui/painting/qcups.cpp -index 99ea43f..acdf9c9 100644 ---- a/src/gui/painting/qcups.cpp -+++ b/src/gui/painting/qcups.cpp -@@ -87,7 +87,7 @@ static CupsPrintFile _cupsPrintFile = 0; - - static void resolveCups() - { -- QLibrary cupsLib(QLatin1String("cups"), 2); -+ QLibrary cupsLib(QLatin1String("@cups@/lib/libcups"), 2); - if(cupsLib.load()) { - _cupsGetDests = (CupsGetDests) cupsLib.resolve("cupsGetDests"); - _cupsFreeDests = (CupsFreeDests) cupsLib.resolve("cupsFreeDests"); -diff --git a/src/gui/painting/qprinterinfo_unix.cpp b/src/gui/painting/qprinterinfo_unix.cpp -index 3d15538..f0f5351 100644 ---- a/src/gui/painting/qprinterinfo_unix.cpp -+++ b/src/gui/painting/qprinterinfo_unix.cpp -@@ -454,7 +454,7 @@ int qt_retrieveNisPrinters(QList<QPrinterDescription> *printers) - char *domain; - int err; - -- QLibrary lib(QLatin1String("nsl")); -+ QLibrary lib(QLatin1String("@glibc@/lib/libnsl")); - typedef int (*ypGetDefaultDomain)(char **); - ypGetDefaultDomain _ypGetDefaultDomain = (ypGetDefaultDomain)lib.resolve("yp_get_default_domain"); - typedef int (*ypAll)(const char *, const char *, const struct ypall_callback *); -diff --git a/src/network/kernel/qhostinfo_unix.cpp b/src/network/kernel/qhostinfo_unix.cpp -index 6b42d1e..f88b628 100644 ---- a/src/network/kernel/qhostinfo_unix.cpp -+++ b/src/network/kernel/qhostinfo_unix.cpp -@@ -95,7 +95,7 @@ static res_state_ptr local_res = 0; - static void resolveLibrary() - { - #if !defined(QT_NO_LIBRARY) && !defined(Q_OS_QNX) -- QLibrary lib(QLatin1String("resolv")); -+ QLibrary lib(QLatin1String("@glibc@/lib/libresolv")); - lib.setLoadHints(QLibrary::ImprovedSearchHeuristics); - if (!lib.load()) - return; -diff --git a/src/plugins/platforms/xlib/qxlibstatic.cpp b/src/plugins/platforms/xlib/qxlibstatic.cpp -index f8f3d69..d63c5bc 100644 ---- a/src/plugins/platforms/xlib/qxlibstatic.cpp -+++ b/src/plugins/platforms/xlib/qxlibstatic.cpp -@@ -242,7 +242,7 @@ static void* qt_load_library_runtime(const char *library, int vernum, - } - - # define XFIXES_LOAD_RUNTIME(vernum, symbol, symbol_type) \ -- (symbol_type)qt_load_library_runtime("libXfixes", vernum, 4, #symbol); -+ (symbol_type)qt_load_library_runtime("@libXfixes@/lib/libXfixes", vernum, 4, #symbol); - # define XFIXES_LOAD_V1(symbol) \ - XFIXES_LOAD_RUNTIME(1, symbol, Ptr##symbol) - # define XFIXES_LOAD_V2(symbol) \ diff --git a/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/dlopen-gtkstyle.diff b/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/dlopen-gtkstyle.diff deleted file mode 100644 index a1c9238be1ae..000000000000 --- a/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/dlopen-gtkstyle.diff +++ /dev/null @@ -1,37 +0,0 @@ -diff --git a/src/gui/styles/qgtkstyle_p.cpp b/src/gui/styles/qgtkstyle_p.cpp -index 3b128e6..39434db 100644 ---- a/src/gui/styles/qgtkstyle_p.cpp -+++ b/src/gui/styles/qgtkstyle_p.cpp -@@ -312,7 +312,7 @@ GtkStyle* QGtkStylePrivate::gtkStyle(const QHashableLatin1Literal &path) - void QGtkStylePrivate::resolveGtk() const - { - // enforce the "0" suffix, so we'll open libgtk-x11-2.0.so.0 -- QLibrary libgtk(QLS("gtk-x11-2.0"), 0, 0); -+ QLibrary libgtk(QLS("@gtk@/lib/libgtk-x11-2.0"), 0, 0); - libgtk.setLoadHints(QLibrary::ImprovedSearchHeuristics); - - gtk_init = (Ptr_gtk_init)libgtk.resolve("gtk_init"); -@@ -435,8 +435,8 @@ void QGtkStylePrivate::resolveGtk() const - pango_font_description_get_family = (Ptr_pango_font_description_get_family)libgtk.resolve("pango_font_description_get_family"); - pango_font_description_get_style = (Ptr_pango_font_description_get_style)libgtk.resolve("pango_font_description_get_style"); - -- gnome_icon_lookup_sync = (Ptr_gnome_icon_lookup_sync)QLibrary::resolve(QLS("gnomeui-2"), 0, "gnome_icon_lookup_sync"); -- gnome_vfs_init= (Ptr_gnome_vfs_init)QLibrary::resolve(QLS("gnomevfs-2"), 0, "gnome_vfs_init"); -+ gnome_icon_lookup_sync = (Ptr_gnome_icon_lookup_sync)QLibrary::resolve(QLS("@libgnomeui@/lib/libgnomeui-2"), 0, "gnome_icon_lookup_sync"); -+ gnome_vfs_init= (Ptr_gnome_vfs_init)QLibrary::resolve(QLS("@gnome_vfs@/lib/libgnomevfs-2"), 0, "gnome_vfs_init"); - } - - /* \internal -@@ -608,9 +608,9 @@ void QGtkStylePrivate::cleanupGtkWidgets() - static bool resolveGConf() - { - if (!QGtkStylePrivate::gconf_client_get_default) { -- QGtkStylePrivate::gconf_client_get_default = (Ptr_gconf_client_get_default)QLibrary::resolve(QLS("gconf-2"), 4, "gconf_client_get_default"); -- QGtkStylePrivate::gconf_client_get_string = (Ptr_gconf_client_get_string)QLibrary::resolve(QLS("gconf-2"), 4, "gconf_client_get_string"); -- QGtkStylePrivate::gconf_client_get_bool = (Ptr_gconf_client_get_bool)QLibrary::resolve(QLS("gconf-2"), 4, "gconf_client_get_bool"); -+ QGtkStylePrivate::gconf_client_get_default = (Ptr_gconf_client_get_default)QLibrary::resolve(QLS("@gconf@/lib/libgconf-2"), 4, "gconf_client_get_default"); -+ QGtkStylePrivate::gconf_client_get_string = (Ptr_gconf_client_get_string)QLibrary::resolve(QLS("@gconf@/lib/libgconf-2"), 4, "gconf_client_get_string"); -+ QGtkStylePrivate::gconf_client_get_bool = (Ptr_gconf_client_get_bool)QLibrary::resolve(QLS("@gconf@/lib/libgconf-2"), 4, "gconf_client_get_bool"); - } - return (QGtkStylePrivate::gconf_client_get_default !=0); - } diff --git a/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/glib-2.32.patch b/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/glib-2.32.patch deleted file mode 100644 index 4593c1b4ba8d..000000000000 --- a/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/glib-2.32.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur qt-everywhere-opensource-src-4.8.2-orig/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h qt-everywhere-opensource-src-4.8.2/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h ---- qt-everywhere-opensource-src-4.8.2-orig/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h 2012-04-26 15:46:22.000000000 -0400 -+++ qt-everywhere-opensource-src-4.8.2/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h 2012-07-14 22:47:02.145152876 -0400 -@@ -89,7 +89,7 @@ - #include <pthread.h> - #elif PLATFORM(GTK) - #include <wtf/gtk/GOwnPtr.h> --typedef struct _GMutex GMutex; -+typedef union _GMutex GMutex; - typedef struct _GCond GCond; - #endif - diff --git a/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/kill-legacy-darwin-apis.patch b/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/kill-legacy-darwin-apis.patch deleted file mode 100644 index c1338e98d851..000000000000 --- a/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/kill-legacy-darwin-apis.patch +++ /dev/null @@ -1,330 +0,0 @@ -diff --git a/src/corelib/io/qfilesystemengine_unix.cpp b/src/corelib/io/qfilesystemengine_unix.cpp -index 4a9049b..c0ac9db 100644 ---- a/src/corelib/io/qfilesystemengine_unix.cpp -+++ b/src/corelib/io/qfilesystemengine_unix.cpp -@@ -242,9 +242,8 @@ QFileSystemEntry QFileSystemEngine::canonicalName(const QFileSystemEntry &entry, - #else - char *ret = 0; - # if defined(Q_OS_MAC) && !defined(Q_OS_IOS) -- // When using -mmacosx-version-min=10.4, we get the legacy realpath implementation, -- // which does not work properly with the realpath(X,0) form. See QTBUG-28282. -- if (QSysInfo::MacintoshVersion >= QSysInfo::MV_10_6) { -+ // In Nix-on-Darwin, we don't support ancient macOS anyway, and the deleted branch relies on -+ // a symbol that's been deprecated for years and that our CF doesn't have - ret = (char*)malloc(PATH_MAX + 1); - if (ret && realpath(entry.nativeFilePath().constData(), (char*)ret) == 0) { - const int savedErrno = errno; // errno is checked below, and free() might change it -@@ -252,19 +251,6 @@ QFileSystemEntry QFileSystemEngine::canonicalName(const QFileSystemEntry &entry, - errno = savedErrno; - ret = 0; - } -- } else { -- // on 10.5 we can use FSRef to resolve the file path. -- QString path = QDir::cleanPath(entry.filePath()); -- FSRef fsref; -- if (FSPathMakeRef((const UInt8 *)path.toUtf8().data(), &fsref, 0) == noErr) { -- CFURLRef urlref = CFURLCreateFromFSRef(NULL, &fsref); -- CFStringRef canonicalPath = CFURLCopyFileSystemPath(urlref, kCFURLPOSIXPathStyle); -- QString ret = QCFString::toQString(canonicalPath); -- CFRelease(canonicalPath); -- CFRelease(urlref); -- return QFileSystemEntry(ret); -- } -- } - # else - # if _POSIX_VERSION >= 200801L - ret = realpath(entry.nativeFilePath().constData(), (char*)0); -diff --git a/src/3rdparty/webkit/Source/WebCore/platform/mac/WebCoreNSStringExtras.h b/src/3rdparty/webkit/Source/WebCore/platform/mac/WebCoreNSStringExtras.h -index 3bf7342..b6bcfc0 100644 ---- a/src/3rdparty/webkit/Source/WebCore/platform/mac/WebCoreNSStringExtras.h -+++ b/src/3rdparty/webkit/Source/WebCore/platform/mac/WebCoreNSStringExtras.h -@@ -43,7 +43,6 @@ BOOL stringIsCaseInsensitiveEqualToString(NSString *first, NSString *second); - BOOL hasCaseInsensitiveSuffix(NSString *string, NSString *suffix); - BOOL hasCaseInsensitiveSubstring(NSString *string, NSString *substring); - NSString *filenameByFixingIllegalCharacters(NSString *string); --CFStringEncoding stringEncodingForResource(Handle resource); - - #ifdef __cplusplus - } -diff --git a/src/3rdparty/webkit/Source/WebCore/platform/mac/WebCoreNSStringExtras.mm b/src/3rdparty/webkit/Source/WebCore/platform/mac/WebCoreNSStringExtras.mm -index d6c3f0c..c88ca76 100644 ---- a/src/3rdparty/webkit/Source/WebCore/platform/mac/WebCoreNSStringExtras.mm -+++ b/src/3rdparty/webkit/Source/WebCore/platform/mac/WebCoreNSStringExtras.mm -@@ -68,45 +68,4 @@ BOOL hasCaseInsensitiveSubstring(NSString *string, NSString *substring) - return filename; - } - --CFStringEncoding stringEncodingForResource(Handle resource) --{ -- short resRef = HomeResFile(resource); -- if (ResError() != noErr) -- return NSMacOSRomanStringEncoding; -- -- // Get the FSRef for the current resource file -- FSRef fref; -- OSStatus error = FSGetForkCBInfo(resRef, 0, NULL, NULL, NULL, &fref, NULL); -- if (error != noErr) -- return NSMacOSRomanStringEncoding; -- -- RetainPtr<CFURLRef> url(AdoptCF, CFURLCreateFromFSRef(NULL, &fref)); -- if (!url) -- return NSMacOSRomanStringEncoding; -- -- NSString *path = [(NSURL *)url.get() path]; -- -- // Get the lproj directory name -- path = [path stringByDeletingLastPathComponent]; -- if (!stringIsCaseInsensitiveEqualToString([path pathExtension], @"lproj")) -- return NSMacOSRomanStringEncoding; -- -- NSString *directoryName = [[path stringByDeletingPathExtension] lastPathComponent]; -- RetainPtr<CFStringRef> locale(AdoptCF, CFLocaleCreateCanonicalLocaleIdentifierFromString(NULL, (CFStringRef)directoryName)); -- if (!locale) -- return NSMacOSRomanStringEncoding; -- -- LangCode lang; -- RegionCode region; -- error = LocaleStringToLangAndRegionCodes([(NSString *)locale.get() UTF8String], &lang, ®ion); -- if (error != noErr) -- return NSMacOSRomanStringEncoding; -- -- TextEncoding encoding; -- error = UpgradeScriptInfoToTextEncoding(kTextScriptDontCare, lang, region, NULL, &encoding); -- if (error != noErr) -- return NSMacOSRomanStringEncoding; -- -- return encoding; --} - -diff --git a/src/3rdparty/webkit/Source/WebCore/plugins/mac/PluginPackageMac.cpp b/src/3rdparty/webkit/Source/WebCore/plugins/mac/PluginPackageMac.cpp -index 865ea32..20bda8d 100644 ---- a/src/3rdparty/webkit/Source/WebCore/plugins/mac/PluginPackageMac.cpp -+++ b/src/3rdparty/webkit/Source/WebCore/plugins/mac/PluginPackageMac.cpp -@@ -101,33 +101,6 @@ static WTF::RetainPtr<CFDictionaryRef> readPListFile(CFStringRef fileName, bool - return map; - } - --static Vector<String> stringListFromResourceId(SInt16 id) --{ -- Vector<String> list; -- -- Handle handle = Get1Resource('STR#', id); -- if (!handle) -- return list; -- -- CFStringEncoding encoding = stringEncodingForResource(handle); -- -- unsigned char* p = (unsigned char*)*handle; -- if (!p) -- return list; -- -- SInt16 count = *(SInt16*)p; -- p += sizeof(SInt16); -- -- for (SInt16 i = 0; i < count; ++i) { -- unsigned char length = *p; -- WTF::RetainPtr<CFStringRef> str = CFStringCreateWithPascalString(0, p, encoding); -- list.append(str.get()); -- p += 1 + length; -- } -- -- return list; --} -- - bool PluginPackage::fetchInfo() - { - if (!load()) -@@ -202,36 +175,8 @@ bool PluginPackage::fetchInfo() - m_description = (CFStringRef)CFBundleGetValueForInfoDictionaryKey(m_module, CFSTR("WebPluginDescription")); - - } else { -- int resFile = CFBundleOpenBundleResourceMap(m_module); -- -- UseResFile(resFile); -- -- Vector<String> mimes = stringListFromResourceId(MIMEListStringStringNumber); -- -- if (mimes.size() % 2 != 0) -- return false; -- -- Vector<String> descriptions = stringListFromResourceId(MIMEDescriptionStringNumber); -- if (descriptions.size() != mimes.size() / 2) -- return false; -- -- for (size_t i = 0; i < mimes.size(); i += 2) { -- String mime = mimes[i].lower(); -- Vector<String> extensions; -- mimes[i + 1].lower().split(UChar(','), extensions); -- -- m_mimeToExtensions.set(mime, extensions); -- -- m_mimeToDescriptions.set(mime, descriptions[i / 2]); -- } -- -- Vector<String> names = stringListFromResourceId(PluginNameOrDescriptionStringNumber); -- if (names.size() == 2) { -- m_description = names[0]; -- m_name = names[1]; -- } -- -- CFBundleCloseBundleResourceMap(m_module, resFile); -+ LOG(Plugins, "Nix removed ancient code that relies on long-deprecated functionality that we don't want to support!"); -+ return false; - } - - LOG(Plugins, "PluginPackage::fetchInfo(): Found plug-in '%s'", m_name.utf8().data()); -diff --git a/src/3rdparty/webkit/Source/WebKit2/Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm b/src/3rdparty/webkit/Source/WebKit2/Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm -index b206e48..669d442 100644 ---- a/src/3rdparty/webkit/Source/WebKit2/Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm -+++ b/src/3rdparty/webkit/Source/WebKit2/Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm -@@ -26,7 +26,6 @@ - #import "config.h" - #import "NetscapePluginModule.h" - --#import <WebCore/WebCoreNSStringExtras.h> - #import <wtf/HashSet.h> - - using namespace WebCore; -@@ -196,132 +195,6 @@ static bool getPluginInfoFromPropertyLists(CFBundleRef bundle, PluginInfo& plugi - return true; - } - --class ResourceMap { --public: -- explicit ResourceMap(CFBundleRef bundle) -- : m_bundle(bundle) -- , m_currentResourceFile(CurResFile()) -- , m_bundleResourceMap(CFBundleOpenBundleResourceMap(m_bundle)) -- { -- UseResFile(m_bundleResourceMap); -- } -- -- ~ResourceMap() -- { -- // Close the resource map. -- CFBundleCloseBundleResourceMap(m_bundle, m_bundleResourceMap); -- -- // And restore the old resource. -- UseResFile(m_currentResourceFile); -- } -- -- bool isValid() const { return m_bundleResourceMap != -1; } -- --private: -- CFBundleRef m_bundle; -- ResFileRefNum m_currentResourceFile; -- ResFileRefNum m_bundleResourceMap; --}; -- --static bool getStringListResource(ResID resourceID, Vector<String>& stringList) { -- Handle stringListHandle = Get1Resource('STR#', resourceID); -- if (!stringListHandle || !*stringListHandle) -- return false; -- -- // Get the string list size. -- Size stringListSize = GetHandleSize(stringListHandle); -- if (stringListSize < static_cast<Size>(sizeof(UInt16))) -- return false; -- -- CFStringEncoding stringEncoding = stringEncodingForResource(stringListHandle); -- -- unsigned char* ptr = reinterpret_cast<unsigned char*>(*stringListHandle); -- unsigned char* end = ptr + stringListSize; -- -- // Get the number of strings in the string list. -- UInt16 numStrings = *reinterpret_cast<UInt16*>(ptr); -- ptr += sizeof(UInt16); -- -- for (UInt16 i = 0; i < numStrings; ++i) { -- // We're past the end of the string, bail. -- if (ptr >= end) -- return false; -- -- // Get the string length. -- unsigned char stringLength = *ptr++; -- -- RetainPtr<CFStringRef> cfString(AdoptCF, CFStringCreateWithBytesNoCopy(kCFAllocatorDefault, ptr, stringLength, stringEncoding, false, kCFAllocatorNull)); -- if (!cfString.get()) -- return false; -- -- stringList.append(cfString.get()); -- ptr += stringLength; -- } -- -- if (ptr != end) -- return false; -- -- return true; --} -- --static const ResID PluginNameOrDescriptionStringNumber = 126; --static const ResID MIMEDescriptionStringNumber = 127; --static const ResID MIMEListStringStringNumber = 128; -- --static bool getPluginInfoFromCarbonResources(CFBundleRef bundle, PluginInfo& pluginInfo) --{ -- ResourceMap resourceMap(bundle); -- if (!resourceMap.isValid()) -- return false; -- -- // Get the description and name string list. -- Vector<String> descriptionAndName; -- if (!getStringListResource(PluginNameOrDescriptionStringNumber, descriptionAndName)) -- return false; -- -- // Get the MIME types and extensions string list. This list needs to be a multiple of two. -- Vector<String> mimeTypesAndExtensions; -- if (!getStringListResource(MIMEListStringStringNumber, mimeTypesAndExtensions)) -- return false; -- -- if (mimeTypesAndExtensions.size() % 2) -- return false; -- -- // Now get the MIME type descriptions string list. This string list needs to be the same length as the number of MIME types. -- Vector<String> mimeTypeDescriptions; -- if (!getStringListResource(MIMEDescriptionStringNumber, mimeTypeDescriptions)) -- return false; -- -- // Add all MIME types. -- for (size_t i = 0; i < mimeTypesAndExtensions.size() / 2; ++i) { -- MimeClassInfo mimeClassInfo; -- -- const String& mimeType = mimeTypesAndExtensions[i * 2]; -- String description; -- if (i < mimeTypeDescriptions.size()) -- description = mimeTypeDescriptions[i]; -- -- mimeClassInfo.type = mimeType.lower(); -- mimeClassInfo.desc = description; -- -- Vector<String> extensions; -- mimeTypesAndExtensions[i * 2 + 1].split(',', extensions); -- -- for (size_t i = 0; i < extensions.size(); ++i) -- mimeClassInfo.extensions.append(extensions[i].lower()); -- -- pluginInfo.mimes.append(mimeClassInfo); -- } -- -- // Set the description and name if they exist. -- if (descriptionAndName.size() > 0) -- pluginInfo.desc = descriptionAndName[0]; -- if (descriptionAndName.size() > 1) -- pluginInfo.name = descriptionAndName[1]; -- -- return true; --} -- - bool NetscapePluginModule::getPluginInfo(const String& pluginPath, PluginInfoStore::Plugin& plugin) - { - RetainPtr<CFStringRef> bundlePath(AdoptCF, pluginPath.createCFString()); -@@ -344,8 +217,7 @@ static bool getPluginInfoFromCarbonResources(CFBundleRef bundle, PluginInfo& plu - return false; - - // Check that there's valid info for this plug-in. -- if (!getPluginInfoFromPropertyLists(bundle.get(), plugin.info) && -- !getPluginInfoFromCarbonResources(bundle.get(), plugin.info)) -+ if (!getPluginInfoFromPropertyLists(bundle.get(), plugin.info)) - return false; - - plugin.path = pluginPath; diff --git a/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/libressl.patch b/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/libressl.patch deleted file mode 100644 index 5432610d9dc9..000000000000 --- a/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/libressl.patch +++ /dev/null @@ -1,64 +0,0 @@ -$OpenBSD: patch-src_network_ssl_qsslsocket_openssl_symbols_cpp,v 1.3 2015/09/17 12:24:42 dcoppa Exp $ ---- a/src/network/ssl/qsslsocket_openssl_symbols.cpp Wed Sep 16 13:27:39 2015 -+++ b/src/network/ssl/qsslsocket_openssl_symbols.cpp Wed Sep 16 13:33:06 2015 -@@ -228,13 +228,17 @@ DEFINEFUNC(int, SSL_shutdown, SSL *a, a, return -1, re - #ifndef OPENSSL_NO_SSL2 - DEFINEFUNC(const SSL_METHOD *, SSLv2_client_method, DUMMYARG, DUMMYARG, return 0, return) - #endif -+#ifndef OPENSSL_NO_SSL3 - DEFINEFUNC(const SSL_METHOD *, SSLv3_client_method, DUMMYARG, DUMMYARG, return 0, return) -+#endif - DEFINEFUNC(const SSL_METHOD *, SSLv23_client_method, DUMMYARG, DUMMYARG, return 0, return) - DEFINEFUNC(const SSL_METHOD *, TLSv1_client_method, DUMMYARG, DUMMYARG, return 0, return) - #ifndef OPENSSL_NO_SSL2 - DEFINEFUNC(const SSL_METHOD *, SSLv2_server_method, DUMMYARG, DUMMYARG, return 0, return) - #endif -+#ifndef OPENSSL_NO_SSL3 - DEFINEFUNC(const SSL_METHOD *, SSLv3_server_method, DUMMYARG, DUMMYARG, return 0, return) -+#endif - DEFINEFUNC(const SSL_METHOD *, SSLv23_server_method, DUMMYARG, DUMMYARG, return 0, return) - DEFINEFUNC(const SSL_METHOD *, TLSv1_server_method, DUMMYARG, DUMMYARG, return 0, return) - #else -@@ -822,13 +826,17 @@ bool q_resolveOpenSslSymbols() - #ifndef OPENSSL_NO_SSL2 - RESOLVEFUNC(SSLv2_client_method) - #endif -+#ifndef OPENSSL_NO_SSL3 - RESOLVEFUNC(SSLv3_client_method) -+#endif - RESOLVEFUNC(SSLv23_client_method) - RESOLVEFUNC(TLSv1_client_method) - #ifndef OPENSSL_NO_SSL2 - RESOLVEFUNC(SSLv2_server_method) - #endif -+#ifndef OPENSSL_NO_SSL3 - RESOLVEFUNC(SSLv3_server_method) -+#endif - RESOLVEFUNC(SSLv23_server_method) - RESOLVEFUNC(TLSv1_server_method) - RESOLVEFUNC(X509_NAME_entry_count) ---- a/src/network/ssl/qsslsocket_openssl.cpp Thu May 7 16:14:44 2015 -+++ b/src/network/ssl/qsslsocket_openssl.cpp Wed Sep 16 13:30:03 2015 -@@ -267,15 +267,19 @@ init_context: - #endif - break; - case QSsl::SslV3: -+#ifndef OPENSSL_NO_SSL3 - ctx = q_SSL_CTX_new(client ? q_SSLv3_client_method() : q_SSLv3_server_method()); -+#else -+ ctx = 0; // SSL 3 not supported by the system, but chosen deliberately -> error -+#endif - break; -- case QSsl::SecureProtocols: // SslV2 will be disabled below -- case QSsl::TlsV1SslV3: // SslV2 will be disabled below - case QSsl::AnyProtocol: -- default: - ctx = q_SSL_CTX_new(client ? q_SSLv23_client_method() : q_SSLv23_server_method()); - break; - case QSsl::TlsV1: -+ case QSsl::SecureProtocols: -+ case QSsl::TlsV1SslV3: -+ default: - ctx = q_SSL_CTX_new(client ? q_TLSv1_client_method() : q_TLSv1_server_method()); - break; - } diff --git a/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/parallel-configure.patch b/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/parallel-configure.patch deleted file mode 100644 index b9b9d6d0a683..000000000000 --- a/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/parallel-configure.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/configure -+++ b/configure -@@ -1087,2 +1087,3 @@ fi - #------------------------------------------------------------------------------- -+JOBS= - -@@ -2528,2 +2529,5 @@ while [ "$#" -gt 0 ]; do - ;; -+ jobs) -+ JOBS=-j$VAL -+ ;; - *) -@@ -5072,3 +5076,3 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; - if "$WHICH" makedepend >/dev/null 2>&1 && grep 'depend:' "$mkfile" >/dev/null 2>&1; then -- (cd "$outpath/qmake" && "$MAKE" -f "$mkfile" depend) >/dev/null 2>&1 -+ (cd "$outpath/qmake" && "$MAKE" $JOBS -f "$mkfile" depend) >/dev/null 2>&1 - sed "s,^.*/\([^/]*.o\):,\1:,g" "$mkfile" >"$mkfile.tmp" -@@ -5080,3 +5084,3 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; - QMAKE_BUILD_ERROR=no -- (cd "$outpath/qmake"; "$MAKE") || QMAKE_BUILD_ERROR=yes -+ (cd "$outpath/qmake"; "$MAKE" $JOBS) || QMAKE_BUILD_ERROR=yes - [ '!' -z "$QCONFIG_H" ] && mv -f "$QCONFIG_H" "$QMAKE_QCONFIG_H" #move qmake's qconfig.h to qconfig.h.qmake diff --git a/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/patch-qthread-stacksize.diff b/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/patch-qthread-stacksize.diff deleted file mode 100644 index 53a4c70ac3ae..000000000000 --- a/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/patch-qthread-stacksize.diff +++ /dev/null @@ -1,54 +0,0 @@ ---- a/src/corelib/thread/qthread_unix.cpp.orig 2015-11-23 19:05:40.000000000 +0100 -+++ b/src/corelib/thread/qthread_unix.cpp 2015-11-24 11:22:31.000000000 +0100 -@@ -79,6 +79,7 @@ - #endif - -+#include <sys/resource.h> // getrlimit/setrlimit - #if defined(Q_OS_MAC) - # ifdef qDebug - # define old_qDebug qDebug - # undef qDebug -@@ -649,6 +650,43 @@ - #endif // QT_HAS_THREAD_PRIORITY_SCHEDULING - - -+ if (d->stackSize == 0) { -+ // Fix the default (too small) stack size for threads on OS X, -+ // which also affects the thread pool. -+ // See also: -+ // https://bugreports.qt.io/browse/QTBUG-2568 -+ // This fix can also be found in Chromium: -+ // https://chromium.googlesource.com/chromium/src.git/+/master/base/threading/platform_thread_mac.mm#186 -+ -+ // The Mac OS X default for a pthread stack size is 512kB. -+ // Libc-594.1.4/pthreads/pthread.c's pthread_attr_init uses -+ // DEFAULT_STACK_SIZE for this purpose. -+ // -+ // 512kB isn't quite generous enough for some deeply recursive threads that -+ // otherwise request the default stack size by specifying 0. Here, adopt -+ // glibc's behavior as on Linux, which is to use the current stack size -+ // limit (ulimit -s) as the default stack size. See -+ // glibc-2.11.1/nptl/nptl-init.c's __pthread_initialize_minimal_internal. To -+ // avoid setting the limit below the Mac OS X default or the minimum usable -+ // stack size, these values are also considered. If any of these values -+ // can't be determined, or if stack size is unlimited (ulimit -s unlimited), -+ // stack_size is left at 0 to get the system default. -+ // -+ // Mac OS X normally only applies ulimit -s to the main thread stack. On -+ // contemporary OS X and Linux systems alike, this value is generally 8MB -+ // or in that neighborhood. -+ size_t default_stack_size = 0; -+ struct rlimit stack_rlimit; -+ if (pthread_attr_getstacksize(&attr, &default_stack_size) == 0 && -+ getrlimit(RLIMIT_STACK, &stack_rlimit) == 0 && -+ stack_rlimit.rlim_cur != RLIM_INFINITY) { -+ default_stack_size = -+ std::max(std::max(default_stack_size, -+ static_cast<size_t>(PTHREAD_STACK_MIN)), -+ static_cast<size_t>(stack_rlimit.rlim_cur)); -+ } -+ d->stackSize = default_stack_size; -+ } - if (d->stackSize > 0) { - #if defined(_POSIX_THREAD_ATTR_STACKSIZE) && (_POSIX_THREAD_ATTR_STACKSIZE-0 > 0) - int code = pthread_attr_setstacksize(&attr, d->stackSize); diff --git a/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/qmake-hook.sh b/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/qmake-hook.sh deleted file mode 100644 index b024f52f2046..000000000000 --- a/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/qmake-hook.sh +++ /dev/null @@ -1,21 +0,0 @@ -qmakeConfigurePhase() { - runHook preConfigure - - $QMAKE PREFIX=$out $qmakeFlags - - if ! [[ -v enableParallelBuilding ]]; then - enableParallelBuilding=1 - echo "qmake4Hook: enabled parallel building" - fi - - if ! [[ -v enableParallelInstalling ]]; then - enableParallelInstalling=1 - echo "qmake: enabled parallel installing" - fi - - runHook postConfigure -} - -export QMAKE=@qt4@/bin/qmake - -configurePhase=qmakeConfigurePhase diff --git a/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/qsettings-recursive-global-mutex.patch b/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/qsettings-recursive-global-mutex.patch deleted file mode 100644 index 229123c54f76..000000000000 --- a/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/qsettings-recursive-global-mutex.patch +++ /dev/null @@ -1,17 +0,0 @@ -Calling qsettings before constructing qapplications causes a dead-lock. - -http://sourceforge.net/tracker/?func=detail&aid=3168620&group_id=4932&atid=104932 -http://developer.qt.nokia.com/forums/viewthread/10365 - - ---- ./src/corelib/io/qsettings.cpp.orig -+++ ./src/corelib/io/qsettings.cpp -@@ -122,7 +122,7 @@ - Q_GLOBAL_STATIC(ConfFileCache, unusedCacheFunc) - Q_GLOBAL_STATIC(PathHash, pathHashFunc) - Q_GLOBAL_STATIC(CustomFormatVector, customFormatVectorFunc) --Q_GLOBAL_STATIC(QMutex, globalMutex) -+Q_GLOBAL_STATIC_WITH_ARGS(QMutex, globalMutex, (QMutex::Recursive)) - static QSettings::Format globalDefaultFormat = QSettings::NativeFormat; - - #ifndef Q_OS_WIN diff --git a/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/qt-4.8.7-unixmake-darwin.patch b/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/qt-4.8.7-unixmake-darwin.patch deleted file mode 100644 index 99a36a24fe43..000000000000 --- a/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/qt-4.8.7-unixmake-darwin.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/qmake/generators/unix/unixmake.cpp -+++ b/qmake/generators/unix/unixmake.cpp -@@ -831,7 +831,7 @@ UnixMakefileGenerator::defaultInstall(const QString &t) - else if(project->first("TEMPLATE") == "app" && !project->isEmpty("QMAKE_STRIPFLAGS_APP")) - ret += " " + var("QMAKE_STRIPFLAGS_APP"); - if(bundle) -- ret = " \"" + dst_targ + "/Contents/MacOS/$(QMAKE_TARGET)\""; -+ ret += " \"" + dst_targ + "/Contents/MacOS/$(QMAKE_TARGET)\""; - else - ret += " \"" + dst_targ + "\""; - } diff --git a/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/qt-musl-iconv-no-bom.patch b/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/qt-musl-iconv-no-bom.patch deleted file mode 100644 index 35380ad6714d..000000000000 --- a/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/qt-musl-iconv-no-bom.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- qt-everywhere-opensource-src-4.8.5/src/corelib/codecs/qiconvcodec.cpp.orig -+++ qt-everywhere-opensource-src-4.8.5/src/corelib/codecs/qiconvcodec.cpp -@@ -62,7 +62,7 @@ - #elif defined(Q_OS_AIX) - # define NO_BOM - # define UTF16 "UCS-2" --#elif defined(Q_OS_FREEBSD) || defined(Q_OS_MAC) -+#elif defined(Q_OS_FREEBSD) || defined(Q_OS_MAC) || (defined(Q_OS_LINUX) && !defined(__GLIBC__)) - # define NO_BOM - # if Q_BYTE_ORDER == Q_BIG_ENDIAN - # define UTF16 "UTF-16BE" diff --git a/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/qt-musl.patch b/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/qt-musl.patch deleted file mode 100644 index 90b9ccda08c9..000000000000 --- a/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/qt-musl.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- qt-everywhere-opensource-src-4.8.5/mkspecs/linux-g++/qplatformdefs.h.orig -+++ qt-everywhere-opensource-src-4.8.5/mkspecs/linux-g++/qplatformdefs.h -@@ -86,11 +86,7 @@ - - #undef QT_SOCKLEN_T - --#if defined(__GLIBC__) && (__GLIBC__ >= 2) - #define QT_SOCKLEN_T socklen_t --#else --#define QT_SOCKLEN_T int --#endif - - #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500) - #define QT_SNPRINTF ::snprintf diff --git a/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/qt4-gcc6.patch b/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/qt4-gcc6.patch deleted file mode 100644 index dfd1d8b893b0..000000000000 --- a/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/qt4-gcc6.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- qt-everywhere-opensource-src-4.8.7/configure.gcc6 2016-04-15 07:04:19.430268222 -0500 -+++ qt-everywhere-opensource-src-4.8.7/configure 2016-04-15 07:05:22.157568689 -0500 -@@ -7744,7 +7744,7 @@ - *-g++*) - # Check gcc's version - case "$(${QMAKE_CONF_COMPILER} -dumpversion)" in -- 5*|4*|3.4*) -+ 9*|8*|7*|6*|5*|4*|3.4*) - ;; - 3.3*) - canBuildWebKit="no" -@@ -8060,7 +8060,7 @@ - 3.*) - COMPILER_VERSION="3.*" - ;; -- 5*|4.*) -+ 9*|8*|7*|6*|5*|4.*) - COMPILER_VERSION="4" - ;; - *) ---- qt-everywhere-opensource-src-4.8.7/src/xmlpatterns/api/qcoloroutput_p.h.gcc6 2015-05-07 09:14:48.000000000 -0500 -+++ qt-everywhere-opensource-src-4.8.7/src/xmlpatterns/api/qcoloroutput_p.h 2016-04-15 07:04:19.431268227 -0500 -@@ -70,8 +70,8 @@ - ForegroundShift = 10, - BackgroundShift = 20, - SpecialShift = 20, -- ForegroundMask = ((1 << ForegroundShift) - 1) << ForegroundShift, -- BackgroundMask = ((1 << BackgroundShift) - 1) << BackgroundShift -+ ForegroundMask = 0x1f << ForegroundShift, -+ BackgroundMask = 0x7 << BackgroundShift - }; - - public: diff --git a/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/qt4-openssl-1.1.patch b/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/qt4-openssl-1.1.patch deleted file mode 100644 index 1931ceb0c749..000000000000 --- a/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/qt4-openssl-1.1.patch +++ /dev/null @@ -1,398 +0,0 @@ ---- a/src/network/ssl/qsslcertificate.cpp -+++ b/src/network/ssl/qsslcertificate.cpp -@@ -259,10 +259,10 @@ - QByteArray QSslCertificate::version() const - { - QMutexLocker lock(QMutexPool::globalInstanceGet(d.data())); -- if (d->versionString.isEmpty() && d->x509) -+ if (d->versionString.isEmpty() && d->x509) { - d->versionString = -- QByteArray::number(qlonglong(q_ASN1_INTEGER_get(d->x509->cert_info->version)) + 1); -- -+ QByteArray::number(qlonglong(q_X509_get_version(d->x509)) + 1); -+ } - return d->versionString; - } - -@@ -276,7 +276,7 @@ - { - QMutexLocker lock(QMutexPool::globalInstanceGet(d.data())); - if (d->serialNumberString.isEmpty() && d->x509) { -- ASN1_INTEGER *serialNumber = d->x509->cert_info->serialNumber; -+ ASN1_INTEGER *serialNumber = q_X509_get_serialNumber(d->x509); - // if we cannot convert to a long, just output the hexadecimal number - if (serialNumber->length > 4) { - QByteArray hexString; -@@ -489,24 +489,33 @@ - QSslKey key; - - key.d->type = QSsl::PublicKey; -+#if OPENSSL_VERSION_NUMBER < 0x10100000L - X509_PUBKEY *xkey = d->x509->cert_info->key; -+#else -+ X509_PUBKEY *xkey = q_X509_get_X509_PUBKEY(d->x509); -+#endif - EVP_PKEY *pkey = q_X509_PUBKEY_get(xkey); - Q_ASSERT(pkey); - -- if (q_EVP_PKEY_type(pkey->type) == EVP_PKEY_RSA) { -+ int key_id; -+#if OPENSSL_VERSION_NUMBER < 0x10100000L -+ key_id = q_EVP_PKEY_type(pkey->type); -+#else -+ key_id = q_EVP_PKEY_base_id(pkey); -+#endif -+ if (key_id == EVP_PKEY_RSA) { - key.d->rsa = q_EVP_PKEY_get1_RSA(pkey); - key.d->algorithm = QSsl::Rsa; - key.d->isNull = false; -- } else if (q_EVP_PKEY_type(pkey->type) == EVP_PKEY_DSA) { -+ } else if (key_id == EVP_PKEY_DSA) { - key.d->dsa = q_EVP_PKEY_get1_DSA(pkey); - key.d->algorithm = QSsl::Dsa; - key.d->isNull = false; -- } else if (q_EVP_PKEY_type(pkey->type) == EVP_PKEY_DH) { -+ } else if (key_id == EVP_PKEY_DH) { - // DH unsupported - } else { - // error? - } -- - q_EVP_PKEY_free(pkey); - return key; - } ---- a/src/network/ssl/qsslkey.cpp -+++ b/src/network/ssl/qsslkey.cpp -@@ -321,8 +321,19 @@ - { - if (d->isNull) - return -1; -+#if OPENSSL_VERSION_NUMBER < 0x10100000L - return (d->algorithm == QSsl::Rsa) - ? q_BN_num_bits(d->rsa->n) : q_BN_num_bits(d->dsa->p); -+#else -+ if (d->algorithm == QSsl::Rsa) { -+ return q_RSA_bits(d->rsa); -+ }else{ -+ BIGNUM *p = NULL; -+ q_DSA_get0_pqg(d->dsa, &p, NULL, NULL); -+ return q_BN_num_bits(p); -+ } -+#endif -+ - } - - /*! ---- a/src/network/ssl/qsslsocket_openssl.cpp -+++ b/src/network/ssl/qsslsocket_openssl.cpp -@@ -93,6 +93,7 @@ - bool QSslSocketPrivate::s_loadedCiphersAndCerts = false; - bool QSslSocketPrivate::s_loadRootCertsOnDemand = false; - -+#if OPENSSL_VERSION_NUMBER < 0x10100000L - /* \internal - - From OpenSSL's thread(3) manual page: -@@ -174,6 +175,8 @@ - } - } // extern "C" - -+#endif //OPENSSL_VERSION_NUMBER >= 0x10100000L -+ - QSslSocketBackendPrivate::QSslSocketBackendPrivate() - : ssl(0), - ctx(0), -@@ -222,9 +225,12 @@ - ciph.d->encryptionMethod = descriptionList.at(4).mid(4); - ciph.d->exportable = (descriptionList.size() > 6 && descriptionList.at(6) == QLatin1String("export")); - -+#if OPENSSL_VERSION_NUMBER < 0x10100000L - ciph.d->bits = cipher->strength_bits; - ciph.d->supportedBits = cipher->alg_bits; -- -+#else -+ ciph.d->bits = q_SSL_CIPHER_get_bits(cipher, &ciph.d->supportedBits); -+#endif - } - return ciph; - } -@@ -367,7 +373,7 @@ - // - // See also: QSslContext::fromConfiguration() - if (caCertificate.expiryDate() >= QDateTime::currentDateTime()) { -- q_X509_STORE_add_cert(ctx->cert_store, (X509 *)caCertificate.handle()); -+ q_X509_STORE_add_cert(q_SSL_CTX_get_cert_store(ctx), (X509 *)caCertificate.handle()); - } - } - -@@ -504,8 +510,10 @@ - */ - void QSslSocketPrivate::deinitialize() - { -+#if OPENSSL_VERSION_NUMBER < 0x10100000L - q_CRYPTO_set_id_callback(0); - q_CRYPTO_set_locking_callback(0); -+#endif - } - - /*! -@@ -526,13 +534,17 @@ - return false; - - // Check if the library itself needs to be initialized. -+#if OPENSSL_VERSION_NUMBER < 0x10100000L - QMutexLocker locker(openssl_locks()->initLock()); -+#endif - if (!s_libraryLoaded) { - s_libraryLoaded = true; - - // Initialize OpenSSL. -+#if OPENSSL_VERSION_NUMBER < 0x10100000L - q_CRYPTO_set_id_callback(id_function); - q_CRYPTO_set_locking_callback(locking_function); -+#endif - if (q_SSL_library_init() != 1) - return false; - q_SSL_load_error_strings(); -@@ -571,7 +583,9 @@ - - void QSslSocketPrivate::ensureCiphersAndCertsLoaded() - { -- QMutexLocker locker(openssl_locks()->initLock()); -+#if OPENSSL_VERSION_NUMBER < 0x10100000L -+ QMutexLocker locker(openssl_locks()->initLock()); -+#endif - if (s_loadedCiphersAndCerts) - return; - s_loadedCiphersAndCerts = true; -@@ -663,13 +677,18 @@ - STACK_OF(SSL_CIPHER) *supportedCiphers = q_SSL_get_ciphers(mySsl); - for (int i = 0; i < q_sk_SSL_CIPHER_num(supportedCiphers); ++i) { - if (SSL_CIPHER *cipher = q_sk_SSL_CIPHER_value(supportedCiphers, i)) { -- if (cipher->valid) { -+ -+#if OPENSSL_VERSION_NUMBER < 0x10100000L -+ if (cipher->valid) { -+#endif - QSslCipher ciph = QSslSocketBackendPrivate::QSslCipher_from_SSL_CIPHER(cipher); - if (!ciph.isNull()) { - if (!ciph.name().toLower().startsWith(QLatin1String("adh"))) - ciphers << ciph; - } -+#if OPENSSL_VERSION_NUMBER < 0x10100000L - } -+#endif - } - } - ---- a/src/network/ssl/qsslsocket_openssl_symbols.cpp -+++ b/src/network/ssl/qsslsocket_openssl_symbols.cpp -@@ -290,6 +290,22 @@ - DEFINEFUNC(void, OPENSSL_add_all_algorithms_conf, void, DUMMYARG, return, DUMMYARG) - DEFINEFUNC3(int, SSL_CTX_load_verify_locations, SSL_CTX *ctx, ctx, const char *CAfile, CAfile, const char *CApath, CApath, return 0, return) - DEFINEFUNC(long, SSLeay, void, DUMMYARG, return 0, return) -+DEFINEFUNC(X509_STORE *, SSL_CTX_get_cert_store, const SSL_CTX *ctx, ctx, return 0, return) -+ -+DEFINEFUNC(ASN1_INTEGER *, X509_get_serialNumber, X509 *x, x, return 0, return) -+#if OPENSSL_VERSION_NUMBER >= 0x10100000L -+DEFINEFUNC(int, EVP_PKEY_id, const EVP_PKEY *pkey, pkey, return 0, return) -+DEFINEFUNC(int, EVP_PKEY_base_id, const EVP_PKEY *pkey, pkey, return 0, return) -+DEFINEFUNC2(int, SSL_CIPHER_get_bits, const SSL_CIPHER *cipher, cipher, int *alg_bits, alg_bits, return 0, return) -+DEFINEFUNC2(long, SSL_CTX_set_options, SSL_CTX *ctx, ctx, long options, options, return 0, return) -+DEFINEFUNC(long, X509_get_version, X509 *x, x, return 0, return) -+DEFINEFUNC(X509_PUBKEY *, X509_get_X509_PUBKEY, X509 *x, x, return 0, return) -+DEFINEFUNC(int, RSA_bits, const RSA *rsa, rsa, return 0, return) -+DEFINEFUNC(int, DSA_security_bits, const DSA *dsa, dsa, return 0, return) -+DEFINEFUNC(ASN1_TIME *, X509_get_notAfter, X509 *x, x, return 0, return) -+DEFINEFUNC(ASN1_TIME *, X509_get_notBefore, X509 *x, x, return 0, return) -+DEFINEFUNC4(void, DSA_get0_pqg, const DSA *d, d, BIGNUM **p, p, BIGNUM **q, q, BIGNUM **g, g, return, return) -+#endif - - #ifdef Q_OS_SYMBIAN - #define RESOLVEFUNC(func, ordinal, lib) \ -@@ -801,6 +817,7 @@ - RESOLVEFUNC(SSL_CTX_use_PrivateKey) - RESOLVEFUNC(SSL_CTX_use_RSAPrivateKey) - RESOLVEFUNC(SSL_CTX_use_PrivateKey_file) -+ RESOLVEFUNC(SSL_CTX_get_cert_store) - RESOLVEFUNC(SSL_accept) - RESOLVEFUNC(SSL_clear) - RESOLVEFUNC(SSL_connect) -@@ -823,6 +840,23 @@ - RESOLVEFUNC(SSL_set_connect_state) - RESOLVEFUNC(SSL_shutdown) - RESOLVEFUNC(SSL_write) -+ -+ RESOLVEFUNC(X509_get_serialNumber) -+#if OPENSSL_VERSION_NUMBER >= 0x10100000L -+ RESOLVEFUNC(SSL_CTX_ctrl) -+ RESOLVEFUNC(EVP_PKEY_id) -+ RESOLVEFUNC(EVP_PKEY_base_id) -+ RESOLVEFUNC(SSL_CIPHER_get_bits) -+ RESOLVEFUNC(SSL_CTX_set_options) -+ RESOLVEFUNC(X509_get_version) -+ RESOLVEFUNC(X509_get_X509_PUBKEY) -+ RESOLVEFUNC(RSA_bits) -+ RESOLVEFUNC(DSA_security_bits) -+ RESOLVEFUNC(DSA_get0_pqg) -+ RESOLVEFUNC(X509_get_notAfter) -+ RESOLVEFUNC(X509_get_notBefore) -+#endif -+ - #ifndef OPENSSL_NO_SSL2 - RESOLVEFUNC(SSLv2_client_method) - #endif ---- a/src/network/ssl/qsslsocket_openssl_symbols_p.h -+++ b/src/network/ssl/qsslsocket_openssl_symbols_p.h -@@ -399,7 +399,25 @@ - PEM_ASN1_write_bio((int (*)(void*, unsigned char**))q_i2d_DSAPrivateKey,PEM_STRING_DSA,\ - bp,(char *)x,enc,kstr,klen,cb,u) - #endif -+ -+X509_STORE * q_SSL_CTX_get_cert_store(const SSL_CTX *ctx); -+ASN1_INTEGER * q_X509_get_serialNumber(X509 *x); -+ -+#if OPENSSL_VERSION_NUMBER < 0x10100000L - #define q_SSL_CTX_set_options(ctx,op) q_SSL_CTX_ctrl((ctx),SSL_CTRL_OPTIONS,(op),NULL) -+#define q_X509_get_version(x) X509_get_version(x) -+#else -+int q_EVP_PKEY_id(const EVP_PKEY *pkey); -+int q_EVP_PKEY_base_id(const EVP_PKEY *pkey); -+int q_SSL_CIPHER_get_bits(const SSL_CIPHER *cipher, int *alg_bits); -+long q_SSL_CTX_set_options(SSL_CTX *ctx, long options); -+long q_X509_get_version(X509 *x); -+X509_PUBKEY * q_X509_get_X509_PUBKEY(X509 *x); -+int q_RSA_bits(const RSA *rsa); -+int q_DSA_security_bits(const DSA *dsa); -+void q_DSA_get0_pqg(const DSA *d, BIGNUM **p, BIGNUM **q, BIGNUM **g); -+#endif -+ - #define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_sk_num)(st) - #define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_sk_value)(st, i) - #define q_sk_GENERAL_NAME_num(st) q_SKM_sk_num(GENERAL_NAME, (st)) -@@ -410,8 +428,15 @@ - #define q_sk_SSL_CIPHER_value(st, i) q_SKM_sk_value(SSL_CIPHER, (st), (i)) - #define q_SSL_CTX_add_extra_chain_cert(ctx,x509) \ - q_SSL_CTX_ctrl(ctx,SSL_CTRL_EXTRA_CHAIN_CERT,0,(char *)x509) -+ -+#if OPENSSL_VERSION_NUMBER < 0x10100000L - #define q_X509_get_notAfter(x) X509_get_notAfter(x) - #define q_X509_get_notBefore(x) X509_get_notBefore(x) -+#else -+ASN1_TIME *q_X509_get_notAfter(X509 *x); -+ASN1_TIME *q_X509_get_notBefore(X509 *x); -+#endif -+ - #define q_EVP_PKEY_assign_RSA(pkey,rsa) q_EVP_PKEY_assign((pkey),EVP_PKEY_RSA,\ - (char *)(rsa)) - #define q_EVP_PKEY_assign_DSA(pkey,dsa) q_EVP_PKEY_assign((pkey),EVP_PKEY_DSA,\ ---- qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslcertificate.cpp.omv~ 2017-03-15 02:27:18.143322736 +0100 -+++ qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslcertificate.cpp 2017-03-15 02:29:56.215819741 +0100 -@@ -696,7 +696,7 @@ - unsigned char *data = 0; - int size = q_ASN1_STRING_to_UTF8(&data, q_X509_NAME_ENTRY_get_data(e)); - info[QString::fromUtf8(obj)] = QString::fromUtf8((char*)data, size); -- q_CRYPTO_free(data); -+ q_OPENSSL_free(data); - } - return info; - } ---- qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslkey.cpp.0131~ 2017-03-15 02:22:37.053244125 +0100 -+++ qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslkey.cpp 2017-03-15 02:22:37.055244057 +0100 -@@ -328,7 +328,7 @@ - if (d->algorithm == QSsl::Rsa) { - return q_RSA_bits(d->rsa); - }else{ -- BIGNUM *p = NULL; -+ const BIGNUM *p = NULL; - q_DSA_get0_pqg(d->dsa, &p, NULL, NULL); - return q_BN_num_bits(p); - } ---- qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslsocket_openssl_symbols.cpp.0131~ 2017-03-15 02:22:37.054244091 +0100 -+++ qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslsocket_openssl_symbols.cpp 2017-03-15 02:29:41.155236836 +0100 -@@ -111,16 +111,16 @@ - DEFINEFUNC2(int, ASN1_STRING_to_UTF8, unsigned char **a, a, ASN1_STRING *b, b, return 0, return); - DEFINEFUNC4(long, BIO_ctrl, BIO *a, a, int b, b, long c, c, void *d, d, return -1, return) - DEFINEFUNC(int, BIO_free, BIO *a, a, return 0, return) --DEFINEFUNC(BIO *, BIO_new, BIO_METHOD *a, a, return 0, return) -+DEFINEFUNC(BIO *, BIO_new, const BIO_METHOD *a, a, return 0, return) - DEFINEFUNC2(BIO *, BIO_new_mem_buf, void *a, a, int b, b, return 0, return) - DEFINEFUNC3(int, BIO_read, BIO *a, a, void *b, b, int c, c, return -1, return) --DEFINEFUNC(BIO_METHOD *, BIO_s_mem, void, DUMMYARG, return 0, return) -+DEFINEFUNC(const BIO_METHOD *, BIO_s_mem, void, DUMMYARG, return 0, return) - DEFINEFUNC3(int, BIO_write, BIO *a, a, const void *b, b, int c, c, return -1, return) - DEFINEFUNC(int, BN_num_bits, const BIGNUM *a, a, return 0, return) - DEFINEFUNC(int, CRYPTO_num_locks, DUMMYARG, DUMMYARG, return 0, return) - DEFINEFUNC(void, CRYPTO_set_locking_callback, void (*a)(int, int, const char *, int), a, return, DUMMYARG) - DEFINEFUNC(void, CRYPTO_set_id_callback, unsigned long (*a)(), a, return, DUMMYARG) --DEFINEFUNC(void, CRYPTO_free, void *a, a, return, DUMMYARG) -+DEFINEFUNC(void, OPENSSL_free, void *a, a, return, DUMMYARG) - DEFINEFUNC(void, DSA_free, DSA *a, a, return, DUMMYARG) - #if OPENSSL_VERSION_NUMBER < 0x00908000L - DEFINEFUNC3(X509 *, d2i_X509, X509 **a, a, unsigned char **b, b, long c, c, return 0, return) -@@ -300,7 +300,7 @@ - DEFINEFUNC(int, DSA_security_bits, const DSA *dsa, dsa, return 0, return) - DEFINEFUNC(ASN1_TIME *, X509_get_notAfter, X509 *x, x, return 0, return) - DEFINEFUNC(ASN1_TIME *, X509_get_notBefore, X509 *x, x, return 0, return) --DEFINEFUNC4(void, DSA_get0_pqg, const DSA *d, d, BIGNUM **p, p, BIGNUM **q, q, BIGNUM **g, g, return, return) -+DEFINEFUNC4(void, DSA_get0_pqg, const DSA *d, d, const BIGNUM **p, p, const BIGNUM **q, q, const BIGNUM **g, g, return, return) - #endif - - #ifdef Q_OS_SYMBIAN ---- qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslsocket_openssl_symbols_p.h.0131~ 2017-03-15 02:22:37.054244091 +0100 -+++ qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslsocket_openssl_symbols_p.h 2017-03-15 02:29:50.192986268 +0100 -@@ -59,6 +59,9 @@ - QT_BEGIN_NAMESPACE - - #define DUMMYARG -+#ifndef OPENSSL_NO_SSL2 -+#define OPENSSL_NO_SSL2 1 -+#endif - - #if !defined QT_LINKED_OPENSSL - // **************** Shared declarations ****************** -@@ -207,16 +210,16 @@ - int q_ASN1_STRING_to_UTF8(unsigned char **a, ASN1_STRING *b); - long q_BIO_ctrl(BIO *a, int b, long c, void *d); - int q_BIO_free(BIO *a); --BIO *q_BIO_new(BIO_METHOD *a); -+BIO *q_BIO_new(const BIO_METHOD *a); - BIO *q_BIO_new_mem_buf(void *a, int b); - int q_BIO_read(BIO *a, void *b, int c); --BIO_METHOD *q_BIO_s_mem(); -+const BIO_METHOD *q_BIO_s_mem(); - int q_BIO_write(BIO *a, const void *b, int c); - int q_BN_num_bits(const BIGNUM *a); - int q_CRYPTO_num_locks(); - void q_CRYPTO_set_locking_callback(void (*a)(int, int, const char *, int)); - void q_CRYPTO_set_id_callback(unsigned long (*a)()); --void q_CRYPTO_free(void *a); -+void q_OPENSSL_free(void *a); - void q_DSA_free(DSA *a); - #if OPENSSL_VERSION_NUMBER >= 0x00908000L - // 0.9.8 broke SC and BC by changing this function's signature. -@@ -326,7 +329,6 @@ - void q_SSL_set_connect_state(SSL *a); - int q_SSL_shutdown(SSL *a); - #if OPENSSL_VERSION_NUMBER >= 0x10000000L --const SSL_METHOD *q_SSLv2_client_method(); - const SSL_METHOD *q_SSLv3_client_method(); - const SSL_METHOD *q_SSLv23_client_method(); - const SSL_METHOD *q_TLSv1_client_method(); -@@ -335,7 +337,6 @@ - const SSL_METHOD *q_SSLv23_server_method(); - const SSL_METHOD *q_TLSv1_server_method(); - #else --SSL_METHOD *q_SSLv2_client_method(); - SSL_METHOD *q_SSLv3_client_method(); - SSL_METHOD *q_SSLv23_client_method(); - SSL_METHOD *q_TLSv1_client_method(); -@@ -415,7 +416,7 @@ - X509_PUBKEY * q_X509_get_X509_PUBKEY(X509 *x); - int q_RSA_bits(const RSA *rsa); - int q_DSA_security_bits(const DSA *dsa); --void q_DSA_get0_pqg(const DSA *d, BIGNUM **p, BIGNUM **q, BIGNUM **g); -+void q_DSA_get0_pqg(const DSA *d, const BIGNUM **p, const BIGNUM **q, const BIGNUM **g); - #endif - - #define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_sk_num)(st) diff --git a/nixpkgs/pkgs/development/libraries/qt-6/default.nix b/nixpkgs/pkgs/development/libraries/qt-6/default.nix index 0a4fbe713ec0..d0c298e51926 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/default.nix +++ b/nixpkgs/pkgs/development/libraries/qt-6/default.nix @@ -9,6 +9,7 @@ , libglvnd , darwin , buildPackages +, python3 # options , developerBuild ? false @@ -24,7 +25,7 @@ let addPackages = self: with self; let callPackage = self.newScope ({ - inherit qtModule srcs; + inherit qtModule srcs python3; stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; }); in diff --git a/nixpkgs/pkgs/development/libraries/qt-mobility/default.nix b/nixpkgs/pkgs/development/libraries/qt-mobility/default.nix deleted file mode 100644 index 7807e41b606e..000000000000 --- a/nixpkgs/pkgs/development/libraries/qt-mobility/default.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, qt4, libX11, coreutils, bluez, perl }: -# possible additional dependencies: pulseaudio udev networkmanager immerson qmf - -stdenv.mkDerivation rec { - version = "1.2.0"; - pname = "qt-mobility"; - src = fetchFromGitHub { - owner = "qtproject"; - repo = "qt-mobility"; - rev = "v${version}"; - sha256 = "14713pbscysd6d0b9rgm7gg145jzwvgdn22778pf2v13qzvfmy1i"; - }; - - env.NIX_CFLAGS_COMPILE = "-fpermissive"; - - configurePhase = '' - ./configure -prefix $out - ''; - - # we need to prevent the 'make install' to want to write to ${qt4}! - # according to thiago#qt@freenode these are used for the QML engine - preBuild = '' - for i in connectivity contacts feedback gallery location multimedia organizer publishsubscribe sensors serviceframework systeminfo; do - substituteInPlace plugins/declarative/$i/Makefile --replace "${qt4}/lib/qt4/imports/" "$out/lib/qt4/imports/" - done - ''; - - # Features files (*.prf) are not installed on nixos - # https://bugreports.qt-project.org/browse/QTMOBILITY-1085 - # - features/mobility.prf (/tmp/nix-build-9kh12nhf9cyplfwiws96gz414v6wgl67-qt-mobility-1.2.0.drv-0/qt-mobility-opensource-src-1.2.0) - - patchPhase = '' - # required to make the configure script work - substituteInPlace configure --replace "/bin/pwd" "${coreutils}/bin/pwd" - - # required to make /include generator work - substituteInPlace bin/syncheaders --replace "/usr/bin/perl" "${perl}/bin/perl" - - # required to make the -prefix variable parsing work - substituteInPlace bin/pathhelper --replace "/usr/bin/perl" "${perl}/bin/perl" - ''; - - buildInputs = [ qt4 libX11 bluez perl ]; - - meta = with lib; { - description = "Qt Mobility"; - homepage = "http://qt.nokia.com/products/qt-addons/mobility"; - maintainers = [ maintainers.qknight ]; - platforms = platforms.linux; - license = with licenses; [ bsd3 fdl13Plus gpl3Plus lgpl21Plus ]; - }; -} - - diff --git a/nixpkgs/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix b/nixpkgs/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix deleted file mode 100644 index b91449542958..000000000000 --- a/nixpkgs/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, qmake4Hook , qt4, libX11, libXext }: - -stdenv.mkDerivation rec { - pname = "qtstyleplugin-kvantum-qt4"; - version = "1.0.10"; - - src = fetchFromGitHub { - owner = "tsujan"; - repo = "Kvantum"; - rev = "V${version}"; - hash = "sha256-48Blio8qHLmXSKG0c1tphXSfiwQXs0Xqwxe187nM3Ro="; - }; - - nativeBuildInputs = [ qmake4Hook ]; - buildInputs = [ qt4 libX11 libXext ]; - - sourceRoot = "${src.name}/Kvantum"; - - buildPhase = '' - runHook preBuild - qmake kvantum.pro - make - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - mkdir $TMP/kvantum - make INSTALL_ROOT="$TMP/kvantum" install - mv $TMP/kvantum/usr/ $out - mv $TMP/kvantum/${qt4}/lib $out - runHook postInstall - ''; - - meta = with lib; { - description = "SVG-based Qt4 theme engine"; - homepage = "https://github.com/tsujan/Kvantum"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = [ maintainers.bugworm ]; - }; -} diff --git a/nixpkgs/pkgs/development/libraries/quarto/default.nix b/nixpkgs/pkgs/development/libraries/quarto/default.nix index 4d24206b43ee..e87243fe8ef0 100644 --- a/nixpkgs/pkgs/development/libraries/quarto/default.nix +++ b/nixpkgs/pkgs/development/libraries/quarto/default.nix @@ -4,21 +4,23 @@ , esbuild , deno , fetchurl -, nodePackages +, dart-sass , rWrapper , rPackages , extraRPackages ? [] , makeWrapper +, runCommand , python3 +, quarto , extraPythonPackages ? ps: with ps; [] }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (final: { pname = "quarto"; - version = "1.2.475"; + version = "1.3.450"; src = fetchurl { - url = "https://github.com/quarto-dev/quarto-cli/releases/download/v${version}/quarto-${version}-linux-amd64.tar.gz"; - sha256 = "sha256-oyKjDlTKt2fIzirOqgNRrpuM7buNCG5mmgIztPa28rY="; + url = "https://github.com/quarto-dev/quarto-cli/releases/download/v${final.version}/quarto-${final.version}-linux-amd64.tar.gz"; + sha256 = "sha256-bcj7SzEGfQxsw9P8WkcLrKurPupzwpgIGtxoE3KVwAU="; }; nativeBuildInputs = [ @@ -43,7 +45,7 @@ stdenv.mkDerivation rec { --prefix PATH : ${lib.makeBinPath [ deno ]} \ --prefix QUARTO_PANDOC : ${pandoc}/bin/pandoc \ --prefix QUARTO_ESBUILD : ${esbuild}/bin/esbuild \ - --prefix QUARTO_DART_SASS : ${nodePackages.sass}/bin/sass \ + --prefix QUARTO_DART_SASS : ${dart-sass}/bin/dart-sass \ ${lib.optionalString (rWrapper != null) "--prefix QUARTO_R : ${rWrapper.override { packages = [ rPackages.rmarkdown ] ++ extraRPackages; }}/bin/R"} \ ${lib.optionalString (python3 != null) "--prefix QUARTO_PYTHON : ${python3.withPackages (ps: with ps; [ jupyter ipython ] ++ (extraPythonPackages ps))}/bin/python3"} ''; @@ -61,6 +63,14 @@ stdenv.mkDerivation rec { runHook preInstall ''; + passthru.tests = { + quarto-check = runCommand "quarto-check" {} '' + export HOME="$(mktemp -d)" + ${quarto}/bin/quarto check + touch $out + ''; + }; + meta = with lib; { description = "Open-source scientific and technical publishing system built on Pandoc"; longDescription = '' @@ -74,4 +84,4 @@ stdenv.mkDerivation rec { platforms = [ "x86_64-linux" ]; sourceProvenance = with sourceTypes; [ binaryNativeCode binaryBytecode ]; }; -} +}) diff --git a/nixpkgs/pkgs/development/libraries/qwt/6_qt4.nix b/nixpkgs/pkgs/development/libraries/qwt/6_qt4.nix deleted file mode 100644 index 021fa0ba57d4..000000000000 --- a/nixpkgs/pkgs/development/libraries/qwt/6_qt4.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ lib, stdenv, fetchurl, qt4, qmake4Hook, AGL }: - -stdenv.mkDerivation rec { - pname = "qwt"; - version = "6.1.5"; - - src = fetchurl { - url = "mirror://sourceforge/qwt/qwt-${version}.tar.bz2"; - sha256 = "0hf0mpca248xlqn7xnzkfj8drf19gdyg5syzklvq8pibxiixwxj0"; - }; - - buildInputs = [ - qt4 - ] ++ lib.optionals stdenv.isDarwin [ AGL ]; - - nativeBuildInputs = [ qmake4Hook ]; - - enableParallelBuilding = true; - - postPatch = '' - sed -e "s|QWT_INSTALL_PREFIX.*=.*|QWT_INSTALL_PREFIX = $out|g" -i qwtconfig.pri - ''; - - # qwt.framework output includes a relative reference to itself, which breaks dependents - preFixup = - lib.optionalString stdenv.isDarwin '' - echo "Attempting to repair qwt" - install_name_tool -id "$out/lib/qwt.framework/Versions/6/qwt" "$out/lib/qwt.framework/Versions/6/qwt" - ''; - - qmakeFlags = [ "-after doc.path=$out/share/doc/qwt-${version}" ]; - - meta = with lib; { - description = "Qt widgets for technical applications"; - homepage = "http://qwt.sourceforge.net/"; - # LGPL 2.1 plus a few exceptions (more liberal) - license = lib.licenses.qwt; - platforms = platforms.linux ++ platforms.darwin; - maintainers = [ maintainers.bjornfor ]; - branch = "6"; - }; -} diff --git a/nixpkgs/pkgs/development/libraries/restinio/default.nix b/nixpkgs/pkgs/development/libraries/restinio/default.nix index 01a0ce26b6cd..9472bd0a554e 100644 --- a/nixpkgs/pkgs/development/libraries/restinio/default.nix +++ b/nixpkgs/pkgs/development/libraries/restinio/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "restinio"; - version = "0.6.18"; + version = "0.6.19"; src = fetchurl { url = "https://github.com/Stiffstream/restinio/releases/download/v.${version}/${pname}-${version}.tar.bz2"; - hash = "sha256-4OksmaW6NBpZ8npqLiZGn6zmCB7KxXlU5NKfKmA7Zr8="; + hash = "sha256-fyHuvrlm4XDWq1TpsZiskn1DkJASFzngN8D6O7NnskA="; }; sourceRoot = "."; diff --git a/nixpkgs/pkgs/development/libraries/science/math/rubiks/default.nix b/nixpkgs/pkgs/development/libraries/science/math/rubiks/default.nix index b4b670884989..505457edd64f 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/rubiks/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/rubiks/default.nix @@ -28,19 +28,19 @@ stdenv.mkDerivation rec { # Fix makefiles which use all the variables in all the wrong ways and # hardcode values for some variables. (fetchpatch { - url = "https://git.sagemath.org/sage.git/plain/build/pkgs/rubiks/patches/dietz-cu2-Makefile.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; + url = "https://raw.githubusercontent.com/sagemath/sage/07d6c37d18811e2b377a9689790a7c5e24da16ba/build/pkgs/rubiks/patches/dietz-cu2-Makefile.patch"; sha256 = "1ry3w1mk9q4jqd91zlaa1bdiiplld4hpfjaldbhlmzlgrrc99qmq"; }) (fetchpatch { - url = "https://git.sagemath.org/sage.git/plain/build/pkgs/rubiks/patches/dietz-mcube-Makefile.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; + url = "https://raw.githubusercontent.com/sagemath/sage/07d6c37d18811e2b377a9689790a7c5e24da16ba/build/pkgs/rubiks/patches/dietz-mcube-Makefile.patch"; sha256 = "0zsbh6k3kqdg82fv0kzghr1x7pafisv943gmssqscp107bhg77bz"; }) (fetchpatch { - url = "https://git.sagemath.org/sage.git/plain/build/pkgs/rubiks/patches/dietz-solver-Makefile.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; + url = "https://raw.githubusercontent.com/sagemath/sage/07d6c37d18811e2b377a9689790a7c5e24da16ba/build/pkgs/rubiks/patches/dietz-solver-Makefile.patch"; sha256 = "0vhw70ylnmydgjhwx8jjlb2slccj4pfqn6vzirkyz1wp8apsmfhp"; }) (fetchpatch { - url = "https://git.sagemath.org/sage.git/plain/build/pkgs/rubiks/patches/reid-Makefile.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; + url = "https://raw.githubusercontent.com/sagemath/sage/07d6c37d18811e2b377a9689790a7c5e24da16ba/build/pkgs/rubiks/patches/reid-Makefile.patch"; sha256 = "1r311sn012xs135s0d21qwsig2kld7rdcq19nm0zbnklviid57df"; }) ]; diff --git a/nixpkgs/pkgs/development/libraries/sdbus-cpp/default.nix b/nixpkgs/pkgs/development/libraries/sdbus-cpp/default.nix index 06650fce00ad..40c00dfea88f 100644 --- a/nixpkgs/pkgs/development/libraries/sdbus-cpp/default.nix +++ b/nixpkgs/pkgs/development/libraries/sdbus-cpp/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "sdbus-cpp"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "kistler-group"; repo = "sdbus-cpp"; rev = "v${version}"; - hash = "sha256-EX/XLgqUwIRosLu3Jgtpp42Yt6Tf22Htj9JULoUL7ao="; + hash = "sha256-S/8/I2wmWukpP+RGPxKbuO44wIExzeYZL49IO+KOqg4="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/smokegen/default.nix b/nixpkgs/pkgs/development/libraries/smokegen/default.nix deleted file mode 100644 index 2a93965aeb39..000000000000 --- a/nixpkgs/pkgs/development/libraries/smokegen/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ stdenv, lib, cmake, qt4, fetchzip }: - -stdenv.mkDerivation rec { - pname = "smokegen"; - version = "4.14.3"; - - src = fetchzip { - url = "https://invent.kde.org/unmaintained/${pname}/-/archive/v${version}/${pname}-v${version}.tar.gz"; - hash = "sha256-finsoruPeJZLawIjNUJ25Pq54eaCByfALVraNQJPk7c="; - }; - - strictDeps = true; - nativeBuildInputs = [ cmake qt4 ]; - buildInputs = [ qt4 ]; - - meta = with lib; { - description = "A general purpose C++ parser with a plugin infrastructure"; - homepage = "https://invent.kde.org/unmaintained/smokegen"; - license = licenses.gpl2Only; - platforms = platforms.unix; - maintainers = with maintainers; [ uthar ]; - }; -} diff --git a/nixpkgs/pkgs/development/libraries/smokeqt/default.nix b/nixpkgs/pkgs/development/libraries/smokeqt/default.nix deleted file mode 100644 index 1c427b8abb70..000000000000 --- a/nixpkgs/pkgs/development/libraries/smokeqt/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ stdenv, lib, cmake, qt4, smokegen, fetchzip }: - -stdenv.mkDerivation rec { - pname = "smokeqt"; - version = "4.14.3"; - - src = fetchzip { - url = "https://invent.kde.org/unmaintained/${pname}/-/archive/v${version}/${pname}-v${version}.tar.gz"; - hash = "sha256-8FiEGF8gduVw5I/bi2wExGUWmjIjYEhWpjpXKJGBNMg="; - }; - - strictDeps = true; - nativeBuildInputs = [ cmake smokegen ]; - buildInputs = [ qt4 ]; - - cmakeFlags = [ - "-DCMAKE_CXX_STANDARD=98" - ]; - - meta = with lib; { - description = "Bindings for the Qt libraries"; - homepage = "https://invent.kde.org/unmaintained/smokeqt"; - license = licenses.gpl2Only; - platforms = platforms.unix; - maintainers = with maintainers; [ uthar ]; - }; -} diff --git a/nixpkgs/pkgs/development/libraries/tagparser/default.nix b/nixpkgs/pkgs/development/libraries/tagparser/default.nix index 7f534979c978..c0f6f3fd42b4 100644 --- a/nixpkgs/pkgs/development/libraries/tagparser/default.nix +++ b/nixpkgs/pkgs/development/libraries/tagparser/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "tagparser"; - version = "12.0.0"; + version = "12.1.0"; src = fetchFromGitHub { owner = "Martchus"; repo = "tagparser"; rev = "v${version}"; - hash = "sha256-b6nAVhakQA8oKHP48+1S+4SX6EcI0kxK8uXTZ05cLnQ="; + hash = "sha256-83Xxj1CQsghbAsQ/3GKIYCz9lBNEBvLlx1iOKbszn8A="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/talloc/default.nix b/nixpkgs/pkgs/development/libraries/talloc/default.nix index bfe38fd4719a..5fad3c1c5121 100644 --- a/nixpkgs/pkgs/development/libraries/talloc/default.nix +++ b/nixpkgs/pkgs/development/libraries/talloc/default.nix @@ -8,7 +8,7 @@ , docbook-xsl-nons , docbook_xml_dtd_42 , fixDarwinDylibNames -, wafHook +, waf }: stdenv.mkDerivation rec { @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config python3 - wafHook + waf.hook docbook-xsl-nons docbook_xml_dtd_42 ] ++ lib.optionals stdenv.isDarwin [ diff --git a/nixpkgs/pkgs/development/libraries/tdb/default.nix b/nixpkgs/pkgs/development/libraries/tdb/default.nix index 13f55a2dc52b..562a422f91d6 100644 --- a/nixpkgs/pkgs/development/libraries/tdb/default.nix +++ b/nixpkgs/pkgs/development/libraries/tdb/default.nix @@ -1,7 +1,7 @@ { lib, stdenv , fetchurl , pkg-config -, wafHook +, waf , python3 , readline , libxslt @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ python3 pkg-config - wafHook + waf.hook libxslt docbook-xsl-nons docbook_xml_dtd_45 diff --git a/nixpkgs/pkgs/development/libraries/tevent/default.nix b/nixpkgs/pkgs/development/libraries/tevent/default.nix index bdb6eb21ed42..7d0d40439e4a 100644 --- a/nixpkgs/pkgs/development/libraries/tevent/default.nix +++ b/nixpkgs/pkgs/development/libraries/tevent/default.nix @@ -9,17 +9,17 @@ , docbook-xsl-nons , docbook_xml_dtd_42 , which -, wafHook +, waf , libxcrypt }: stdenv.mkDerivation rec { pname = "tevent"; - version = "0.14.1"; + version = "0.15.0"; src = fetchurl { url = "mirror://samba/tevent/${pname}-${version}.tar.gz"; - sha256 = "sha256-74X8qoD/0jUQNrpLNHYw/vKhrD2pZKfxggRmutA80A0="; + sha256 = "sha256-ZiqfJ3KBvPUGtrwKC6oD5EpiIpUW7jS8xwOguCqkaQU="; }; nativeBuildInputs = [ @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { libxslt docbook-xsl-nons docbook_xml_dtd_42 - wafHook + waf.hook ]; buildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/tpm2-tss/default.nix b/nixpkgs/pkgs/development/libraries/tpm2-tss/default.nix index f637df891354..628f32a91c69 100644 --- a/nixpkgs/pkgs/development/libraries/tpm2-tss/default.nix +++ b/nixpkgs/pkgs/development/libraries/tpm2-tss/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { # TCTI loader relies on dlopen(), this patch prefixes all calls with the output directory ./no-dynamic-loader-path.patch (fetchurl { - name = "skip-test-fapi-fix-provisioning-with template-if-no-certificate-available.patch"; + name = "skip-test-fapi-fix-provisioning-with-template-if-no-certificate-available.patch"; url = "https://github.com/tpm2-software/tpm2-tss/commit/218c0da8d9f675766b1de502a52e23a3aa52648e.patch"; sha256 = "sha256-dnl9ZAknCdmvix2TdQvF0fHoYeWp+jfCTg8Uc7h0voA="; }) diff --git a/nixpkgs/pkgs/development/libraries/tracker-miners/default.nix b/nixpkgs/pkgs/development/libraries/tracker-miners/default.nix index b32df6b026a2..dc849677a584 100644 --- a/nixpkgs/pkgs/development/libraries/tracker-miners/default.nix +++ b/nixpkgs/pkgs/development/libraries/tracker-miners/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchurl +, fetchpatch , asciidoc , docbook-xsl-nons , docbook_xml_dtd_45 @@ -46,13 +47,22 @@ stdenv.mkDerivation rec { pname = "tracker-miners"; - version = "3.5.0"; + version = "3.5.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "F5ZmA9xDKphSa0kFhqSKzX+fWZNfeJXfxRcppGppAaM="; + sha256 = "QPuR+svZRo4m6+zHEdg2Mc2K6TkcYV1o27A8vKsbbGk="; }; + patches = [ + # Use cc.has_header_symbol to check for BTRFS_IOC_INO_LOOKUP + # https://github.com/NixOS/nixpkgs/issues/228639 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/tracker-miners/-/commit/c08fbe0650d4a2ae915a21764f54c02eda9406d5.patch"; + sha256 = "U81+yfg2sUkKl4tKMeB7pXJRNSeIE+2loT3/bvnhoKM="; + }) + ]; + nativeBuildInputs = [ asciidoc docbook-xsl-nons diff --git a/nixpkgs/pkgs/development/libraries/valhalla/default.nix b/nixpkgs/pkgs/development/libraries/valhalla/default.nix index 2d400d73f401..bfd23747db0a 100644 --- a/nixpkgs/pkgs/development/libraries/valhalla/default.nix +++ b/nixpkgs/pkgs/development/libraries/valhalla/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , cmake , pkg-config , boost @@ -29,6 +30,14 @@ stdenv.mkDerivation (finalAttrs: { fetchSubmodules = true; }; + patches = [ + # Fix build + (fetchpatch { + url = "https://github.com/valhalla/valhalla/commit/e4845b68e8ef8de9eabb359b23bf34c879e21f2b.patch"; + hash = "sha256-xCufmXHGj1JxaMwm64JT9FPY+o0+x4glfJSYLdvHI8U="; + }) + ]; + postPatch = '' substituteInPlace src/bindings/python/CMakeLists.txt \ --replace "\''${Python_SITEARCH}" "${placeholder "out"}/${python3.sitePackages}" @@ -44,6 +53,11 @@ stdenv.mkDerivation (finalAttrs: { "-DENABLE_BENCHMARKS=OFF" ]; + env.NIX_CFLAGS_COMPILE = toString [ + # Needed for date submodule with GCC 12 https://github.com/HowardHinnant/date/issues/750 + "-Wno-error=stringop-overflow" + ]; + buildInputs = [ boost curl diff --git a/nixpkgs/pkgs/development/lisp-modules-new-obsolete/packages.nix b/nixpkgs/pkgs/development/lisp-modules-new-obsolete/packages.nix index 244d2f4b5b5f..1c65a369f0e3 100644 --- a/nixpkgs/pkgs/development/lisp-modules-new-obsolete/packages.nix +++ b/nixpkgs/pkgs/development/lisp-modules-new-obsolete/packages.nix @@ -11,9 +11,6 @@ let optionals hasSuffix splitString - remove - optionalString - stringLength ; # Used by builds that would otherwise attempt to write into storeDir. @@ -45,11 +42,6 @@ let # Patches are already applied in `build` patches = []; src = build; - # TODO(kasper): handle this with a setup hook - LD_LIBRARY_PATH = - build.LD_LIBRARY_PATH - + (optionalString (stringLength build.LD_LIBRARY_PATH != 0) ":") - + "${build}"; }); # A little hacky @@ -340,97 +332,5 @@ let }; version = "f19162e76"; }); - - qt = let - rev = "dffff3ee3dbd0686c85c323f579b8bbf4881e60e"; - in build-with-compile-into-pwd rec { - pname = "commonqt"; - version = builtins.substring 0 7 rev; - - src = pkgs.fetchFromGitHub { - inherit rev; - owner = pname; - repo = pname; - hash = "sha256-GAgwT0D9mIkYPTHfCH/KxxIv7b6QGwcxwZE7ehH5xug="; - }; - - buildInputs = [ pkgs.qt4 ]; - nativeBuildInputs = [ pkgs.smokegen pkgs.smokeqt ]; - nativeLibs = [ pkgs.qt4 pkgs.smokegen pkgs.smokeqt ]; - - systems = [ "qt" ]; - - lispLibs = with ql; [ - cffi named-readtables cl-ppcre alexandria - closer-mop iterate trivial-garbage bordeaux-threads - ]; - }; - - qt-libs = build-with-compile-into-pwd { - inherit (ql.qt-libs) pname version src; - patches = [ ./patches/qt-libs-dont-download.patch ]; - prePatch = '' - substituteInPlace systems/*.asd --replace ":qt+libs" ":qt" - echo "LD Path: $LD_LIBRARY_PATH" - ''; - lispLibs = ql.qt-libs.lispLibs ++ [ qt ]; - systems = [ - "qt-libs" - "commonqt" - # "phonon" - # "qimageblitz" - # "qsci" - "qt3support" - "qtcore" - "qtdbus" - "qtdeclarative" - "qtgui" - "qthelp" - "qtnetwork" - "qtopengl" - "qtscript" - "qtsql" - "qtsvg" - "qttest" - "qtuitools" - # "qtwebkit" - "qtxml" - "qtxmlpatterns" - # "qwt" - "smokebase" - ]; }; - commonqt = qt-libs; - qt3support = qt-libs; - qtcore = qt-libs; - qtdbus = qt-libs; - qtdeclarative = qt-libs; - qtgui = qt-libs; - qthelp = qt-libs; - qtnetwork = qt-libs; - qtopengl = qt-libs; - qtscript = qt-libs; - qtsql = qt-libs; - qtsvg = qt-libs; - qttest = qt-libs; - qtuitools = qt-libs; - qtxml = qt-libs; - qtxmlpatterns = qt-libs; - smokebase = qt-libs; - - qtools = build-with-compile-into-pwd { - inherit (ql.qtools) pname version src nativeLibs; - lispLibs = [ qt ] ++ remove ql.qt_plus_libs ql.qtools.lispLibs ++ [ qt-libs ]; - patches = [ ./patches/qtools-use-nix-libs.patch ]; - }; - - magicl = build-with-compile-into-pwd { - inherit (ql.magicl) pname version src lispLibs; - nativeBuildInputs = [ pkgs.gfortran ]; - nativeLibs = [ pkgs.openblas ]; - patches = [ ./patches/magicl-dont-build-fortran-twice.patch ]; - }; - - }; - in packages diff --git a/nixpkgs/pkgs/development/lisp-modules-new-obsolete/patches/qt-libs-dont-download.patch b/nixpkgs/pkgs/development/lisp-modules-new-obsolete/patches/qt-libs-dont-download.patch deleted file mode 100644 index e21a44c2a17d..000000000000 --- a/nixpkgs/pkgs/development/lisp-modules-new-obsolete/patches/qt-libs-dont-download.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- a/qt-libs.asd -+++ b/qt-libs.asd -@@ -17,5 +17,4 @@ - :components ((:file "qt-libs")) - :depends-on (:qt-lib-generator - :cl-ppcre -- :cffi) -- :perform (asdf:load-op :after (op c) (uiop:symbol-call :qt-libs :ensure-standalone-libs))) -+ :cffi)) ---- a/qt-libs.lisp -+++ b/qt-libs.lisp -@@ -94,16 +94,14 @@ - standalone-dir) - - (defun %ensure-lib-loaded (file) -- (let ((file (etypecase file -- (pathname file) -- (string (installed-library-file file)))) -- (name (intern (string-upcase (pathname-name file)))) -- #+sbcl(sb-ext:*muffled-warnings* 'style-warning)) -- (cffi::register-foreign-library -- name `((T ,file)) -- :search-path (to-directory file)) -- (unless (cffi:foreign-library-loaded-p name) -- (cffi:load-foreign-library name)))) -+ (let ((name (make-pathname :name (format nil "lib~a" file) -+ :type #+unix "so" -+ #+darwin "dylib"))) -+ (or (find-if (lambda (lib) -+ (equal (cffi:foreign-library-pathname lib) -+ (namestring name))) -+ (cffi:list-foreign-libraries)) -+ (cffi:load-foreign-library name)))) - - (defun ensure-lib-loaded (file) - (cond ((pathnamep file) \ No newline at end of file diff --git a/nixpkgs/pkgs/development/lisp-modules/packages.nix b/nixpkgs/pkgs/development/lisp-modules/packages.nix index a56dfc2f5e9a..0d665a1bfde7 100644 --- a/nixpkgs/pkgs/development/lisp-modules/packages.nix +++ b/nixpkgs/pkgs/development/lisp-modules/packages.nix @@ -535,88 +535,6 @@ let }); - qt = let - rev = "dffff3ee3dbd0686c85c323f579b8bbf4881e60e"; - in build-with-compile-into-pwd rec { - pname = "commonqt"; - version = builtins.substring 0 7 rev; - src = pkgs.fetchFromGitHub { - inherit rev; - owner = pname; - repo = pname; - hash = "sha256-GAgwT0D9mIkYPTHfCH/KxxIv7b6QGwcxwZE7ehH5xug="; - }; - - buildInputs = [ pkgs.qt4 ]; - nativeBuildInputs = [ pkgs.smokegen pkgs.smokeqt ]; - nativeLibs = [ pkgs.qt4 pkgs.smokegen pkgs.smokeqt ]; - - systems = [ "qt" ]; - - lispLibs = with super; [ - cffi named-readtables cl-ppcre alexandria - closer-mop iterate trivial-garbage bordeaux-threads - ]; - }; - - qt-libs = build-with-compile-into-pwd { - inherit (super.qt-libs) pname version src; - patches = [ ./patches/qt-libs-dont-download.patch ]; - prePatch = '' - substituteInPlace systems/*.asd --replace ":qt+libs" ":qt" - ''; - lispLibs = super.qt-libs.lispLibs ++ [ self.qt ]; - systems = [ - "qt-libs" - "commonqt" - # "phonon" - # "qimageblitz" - # "qsci" - "qt3support" - "qtcore" - "qtdbus" - "qtdeclarative" - "qtgui" - "qthelp" - "qtnetwork" - "qtopengl" - "qtscript" - "qtsql" - "qtsvg" - "qttest" - "qtuitools" - # "qtwebkit" - "qtxml" - "qtxmlpatterns" - # "qwt" - "smokebase" - ]; - }; - - commonqt = self.qt-libs; - qt3support = self.qt-libs; - qtcore = self.qt-libs; - qtdbus = self.qt-libs; - qtdeclarative = self.qt-libs; - qtgui = self.qt-libs; - qthelp = self.qt-libs; - qtnetwork = self.qt-libs; - qtopengl = self.qt-libs; - qtscript = self.qt-libs; - qtsql = self.qt-libs; - qtsvg = self.qt-libs; - qttest = self.qt-libs; - qtuitools = self.qt-libs; - qtxml = self.qt-libs; - qtxmlpatterns = self.qt-libs; - smokebase = self.qt-libs; - - qtools = build-with-compile-into-pwd { - inherit (super.qtools) pname version src nativeLibs; - lispLibs = [ self.qt ] ++ remove super.qt_plus_libs super.qtools.lispLibs ++ [ self.qt-libs ]; - patches = [ ./patches/qtools-use-nix-libs.patch ]; - }; - magicl = build-with-compile-into-pwd { inherit (super.magicl) pname version src lispLibs; nativeBuildInputs = [ pkgs.gfortran ]; diff --git a/nixpkgs/pkgs/development/lisp-modules/patches/qtools-use-nix-libs.patch b/nixpkgs/pkgs/development/lisp-modules/patches/qtools-use-nix-libs.patch deleted file mode 100644 index b380894b04a8..000000000000 --- a/nixpkgs/pkgs/development/lisp-modules/patches/qtools-use-nix-libs.patch +++ /dev/null @@ -1,19 +0,0 @@ -Dont use the qt+libs system for managing Qt dependencies, because Nix provides -them already. -Don't build the deploy.lisp helper file, because Nix also can handle deployment. ---- a/qtools.asd -+++ b/qtools.asd -@@ -33,10 +33,9 @@ - (:file "generate") - (:file "dynamic") - (:file "precompile") -- (:file "deploy") - (:file "fast-call") - (:file "documentation")) -- :depends-on (:qt+libs -+ :depends-on (:qt - :deploy - :cl-ppcre - :closer-mop - -Diff finished. Sun Oct 2 14:38:06 2022 \ No newline at end of file diff --git a/nixpkgs/pkgs/development/misc/brev-cli/default.nix b/nixpkgs/pkgs/development/misc/brev-cli/default.nix index 04e3760f4b7e..836b8ed702f2 100644 --- a/nixpkgs/pkgs/development/misc/brev-cli/default.nix +++ b/nixpkgs/pkgs/development/misc/brev-cli/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "brev-cli"; - version = "0.6.259"; + version = "0.6.261"; src = fetchFromGitHub { owner = "brevdev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ALfWvfyQyMHSkj+6zE/+zpsdRFUr40XQHNOcAXhJFd8="; + sha256 = "sha256-tIkO37NN48le7Q4d0GHfY2ZZcZ12oQ7dFjH5klpFDzU="; }; vendorHash = "sha256-IR/tgqh8rS4uN5jSOcopCutbHCKHSU9icUfRhOgu4t8="; diff --git a/nixpkgs/pkgs/development/mobile/maestro/default.nix b/nixpkgs/pkgs/development/mobile/maestro/default.nix index 11e24b3a2584..2bc34bfcf435 100644 --- a/nixpkgs/pkgs/development/mobile/maestro/default.nix +++ b/nixpkgs/pkgs/development/mobile/maestro/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "maestro"; - version = "1.31.0"; + version = "1.32.0"; src = fetchurl { url = "https://github.com/mobile-dev-inc/maestro/releases/download/cli-${version}/maestro.zip"; - sha256 = "0rgkviyxr0hwm0xhv8mfhdxk3wzhgqhbjpk8wv6c2b68xnwxwxha"; + sha256 = "1bhyg0w6dwgba0ykk898dxs661imcx2s6si3ldwgg01pmxpcsm30"; }; dontUnpack = true; diff --git a/nixpkgs/pkgs/development/mobile/titanium-alloy/default.nix b/nixpkgs/pkgs/development/mobile/titanium-alloy/default.nix new file mode 100644 index 000000000000..bb45289e3f40 --- /dev/null +++ b/nixpkgs/pkgs/development/mobile/titanium-alloy/default.nix @@ -0,0 +1,29 @@ +{ lib +, buildNpmPackage +, fetchFromGitHub +}: + +buildNpmPackage rec { + pname = "alloy"; + version = "2.0.2"; + + src = fetchFromGitHub { + owner = "tidev"; + repo = "alloy"; + rev = version; + hash = "sha256-s1hAbbUy7k/GacBIk8OMD48/1IUcRcpV3LnrCCZim1A="; + }; + + npmDepsHash = "sha256-YNyFrO6+oFluyk3TlUf/0vdHrgTJ3l5DN801wnpBa6s="; + + dontNpmBuild = true; + + meta = { + changelog = "https://github.com/tidev/alloy/blob/${src.rev}/CHANGELOG.md"; + description = "MVC framework for the Appcelerator Titanium SDK"; + homepage = "https://github.com/tidev/alloy"; + license = lib.licenses.asl20; + mainProgram = "alloy"; + maintainers = with lib.maintainers; [ ]; + }; +} diff --git a/nixpkgs/pkgs/development/mobile/titanium/default.nix b/nixpkgs/pkgs/development/mobile/titanium/default.nix new file mode 100644 index 000000000000..0318ceeb18eb --- /dev/null +++ b/nixpkgs/pkgs/development/mobile/titanium/default.nix @@ -0,0 +1,29 @@ +{ lib +, buildNpmPackage +, fetchFromGitHub +}: + +buildNpmPackage rec { + pname = "titanium"; + version = "6.1.1"; + + src = fetchFromGitHub { + owner = "tidev"; + repo = "titanium-cli"; + rev = "v${version}"; + hash = "sha256-eJHf4vbapCaIVk0Xc0sml14jkFCsS/Gv7ftaFakB5rI="; + }; + + npmDepsHash = "sha256-60r+zqUCSDvQgrjg5SGfZiv87AoGx1XcnbW1ki1sbCM="; + + dontNpmBuild = true; + + meta = { + changelog = "https://github.com/tidev/titanium-cli/blob/${src.rev}/CHANGELOG.md"; + description = "Command Line Tool for creating and building Titanium Mobile applications and modules"; + homepage = "https://github.com/tidev/titanium-cli"; + license = lib.licenses.asl20; + mainProgram = "titanium"; + maintainers = with lib.maintainers; [ ]; + }; +} diff --git a/nixpkgs/pkgs/development/mobile/titaniumenv/default.nix b/nixpkgs/pkgs/development/mobile/titaniumenv/default.nix index 151502a5d160..2f1459ef3e04 100644 --- a/nixpkgs/pkgs/development/mobile/titaniumenv/default.nix +++ b/nixpkgs/pkgs/development/mobile/titaniumenv/default.nix @@ -12,8 +12,8 @@ rec { }; buildApp = import ./build-app.nix { - inherit (pkgs) stdenv lib python which file jdk nodejs; - inherit (pkgs.nodePackages) alloy titanium; + inherit (pkgs) stdenv lib python which file jdk nodejs titanium; + alloy = pkgs.titanium-alloy; inherit (androidenv) composeAndroidPackages; inherit (xcodeenv) composeXcodeWrapper; inherit titaniumsdk; diff --git a/nixpkgs/pkgs/development/nim-packages/safeseq/default.nix b/nixpkgs/pkgs/development/nim-packages/safeseq/default.nix new file mode 100644 index 000000000000..d2c8a5dfb846 --- /dev/null +++ b/nixpkgs/pkgs/development/nim-packages/safeseq/default.nix @@ -0,0 +1,21 @@ +{ lib, buildNimPackage, fetchFromGitHub }: +buildNimPackage rec { + pname = "safeseq"; + + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "avahe-kellenberger"; + repo = pname; + rev = "v${version}"; + hash = "sha256-JSz2TPrbl5N8l+YDquad78aJMBsx+Lise27cMQKMdAc="; + }; + + + meta = with lib; + src.meta // { + description = "safeseq library for nim"; + license = [ licenses.gpl2 ]; + maintainers = [ maintainers.marcusramberg ]; + }; +} diff --git a/nixpkgs/pkgs/development/node-packages/aliases.nix b/nixpkgs/pkgs/development/node-packages/aliases.nix index 03bcbc595d1d..2ebe88a96a91 100644 --- a/nixpkgs/pkgs/development/node-packages/aliases.nix +++ b/nixpkgs/pkgs/development/node-packages/aliases.nix @@ -46,6 +46,7 @@ mapAliases { "@maizzle/cli" = pkgs.maizzle; # added 2023-08-17 "@medable/mdctl-cli" = throw "@medable/mdctl-cli was removed because it was broken"; # added 2023-08-21 "@nestjs/cli" = pkgs.nest-cli; # Added 2023-05-06 + alloy = pkgs.titanium-alloy; # added 2023-08-17 antennas = pkgs.antennas; # added 2023-07-30 inherit (pkgs) asar; # added 2023-08-26 balanceofsatoshis = pkgs.balanceofsatoshis; # added 2023-07-31 @@ -57,9 +58,12 @@ mapAliases { castnow = pkgs.castnow; # added 2023-07-30 inherit (pkgs) clean-css-cli; # added 2023-08-18 coc-imselect = throw "coc-imselect was removed because it was broken"; # added 2023-08-21 + coffee-script = pkgs.coffeescript; # added 2023-08-18 inherit (pkgs) configurable-http-proxy; # added 2023-08-19 inherit (pkgs) cordova; # added 2023-08-18 dat = throw "dat was removed because it was broken"; # added 2023-08-21 + inherit (pkgs) degit; # added 2023-08-18 + inherit (pkgs) dockerfile-language-server-nodejs; # added 2023-08-18 eask = pkgs.eask; # added 2023-08-17 inherit (pkgs.elmPackages) elm-test; eslint_d = pkgs.eslint_d; # Added 2023-05-26 @@ -67,8 +71,11 @@ mapAliases { flood = pkgs.flood; # Added 2023-07-25 git-ssb = throw "git-ssb was removed because it was broken"; # added 2023-08-21 glob = pkgs.node-glob; # added 2023-08-18 + inherit (pkgs) gqlint; # added 2023-08-19 inherit (pkgs) graphqurl; # added 2023-08-19 gtop = pkgs.gtop; # added 2023-07-31 + hs-client = pkgs.hsd; # added 2023-08-20 + inherit (pkgs) hsd; # added 2023-08-19 inherit (pkgs) html-minifier; # added 2023-08-19 inherit (pkgs) htmlhint; # added 2023-08-19 hueadm = pkgs.hueadm; # added 2023-07-31 @@ -76,21 +83,29 @@ mapAliases { immich = pkgs.immich-cli; # added 2023-08-19 indium = throw "indium was removed because it was broken"; # added 2023-08-19 ionic = throw "ionic was replaced by @ionic/cli"; # added 2023-08-19 + inherit (pkgs) jake; # added 2023-08-19 inherit (pkgs) javascript-typescript-langserver; # added 2023-08-19 karma = pkgs.karma-runner; # added 2023-07-29 + leetcode-cli = vsc-leetcode-cli; # added 2023-08-31 manta = pkgs.node-manta; # Added 2023-05-06 markdownlint-cli = pkgs.markdownlint-cli; # added 2023-07-29 inherit (pkgs) markdownlint-cli2; # added 2023-08-22 mdctl-cli = self."@medable/mdctl-cli"; # added 2023-08-21 + musescore-downloader = pkgs.dl-librescore; # added 2023-08-19 node-inspector = throw "node-inspector was removed because it was broken"; # added 2023-08-21 inherit (pkgs) npm-check-updates; # added 2023-08-22 + ocaml-language-server = throw "ocaml-language-server was removed because it was abandoned upstream"; # added 2023-09-04 + inherit (pkgs) react-static; # added 2023-08-21 readability-cli = pkgs.readability-cli; # Added 2023-06-12 reveal-md = pkgs.reveal-md; # added 2023-07-31 inherit (pkgs) rtlcss; # added 2023-08-29 s3http = throw "s3http was removed because it was abandoned upstream"; # added 2023-08-18 + inherit (pkgs) snyk; # Added 2023-08-30 + "@squoosh/cli" = throw "@squoosh/cli was removed because it was abandoned upstream"; # added 2023-09-02 ssb-server = throw "ssb-server was removed because it was broken"; # added 2023-08-21 stf = throw "stf was removed because it was broken"; # added 2023-08-21 thelounge = pkgs.thelounge; # Added 2023-05-22 + inherit (pkgs) titanium; # added 2023-08-17 triton = pkgs.triton; # Added 2023-05-06 typescript = pkgs.typescript; # Added 2023-06-21 inherit (pkgs) ungit; # added 2023-08-20 @@ -99,6 +114,7 @@ mapAliases { vue-language-server = self.vls; # added 2023-08-20 inherit (pkgs) web-ext; # added 2023-08-20 inherit (pkgs) write-good; # added 2023-08-20 + inherit (pkgs) yaml-language-server; # added 2023-09-05 inherit (pkgs) yo; # added 2023-08-20 zx = pkgs.zx; # added 2023-08-01 } diff --git a/nixpkgs/pkgs/development/node-packages/main-programs.nix b/nixpkgs/pkgs/development/node-packages/main-programs.nix index abb336280282..ed253a211345 100644 --- a/nixpkgs/pkgs/development/node-packages/main-programs.nix +++ b/nixpkgs/pkgs/development/node-packages/main-programs.nix @@ -4,9 +4,7 @@ "@antfu/ni" = "ni"; "@electron-forge/cli" = "electron-forge"; "@microsoft/rush" = "rush"; - "@squoosh/cli" = "squoosh-cli"; "@webassemblyjs/cli-1.11.1" = "wasm2wast"; - coffee-script = "coffee"; "@withgraphite/graphite-cli" = "gt"; # Packages that provide a single executable. @@ -35,7 +33,6 @@ conventional-changelog-cli = "conventional-changelog"; cpy-cli = "cpy"; diff2html-cli = "diff2html"; - dockerfile-language-server-nodejs = "docker-langserver"; fast-cli = "fast"; fauna-shell = "fauna"; fkill-cli = "fkill"; @@ -47,7 +44,6 @@ grunt-cli = "grunt"; gulp-cli = "gulp"; kaput-cli = "kaput"; - leetcode-cli = "leetcode"; less = "lessc"; localtunnel = "lt"; lua-fmt = "luafmt"; diff --git a/nixpkgs/pkgs/development/node-packages/node-packages.json b/nixpkgs/pkgs/development/node-packages/node-packages.json index af55cfddee18..a95b47b6104f 100644 --- a/nixpkgs/pkgs/development/node-packages/node-packages.json +++ b/nixpkgs/pkgs/development/node-packages/node-packages.json @@ -10,7 +10,6 @@ , "@microsoft/rush" , "@nerdwallet/shepherd" , "@shopify/cli" -, "@squoosh/cli" , "@tailwindcss/aspect-ratio" , "@tailwindcss/forms" , "@tailwindcss/language-server" @@ -25,7 +24,6 @@ , {"@webassemblyjs/wasm-text-gen": "1.11.1"} , {"@webassemblyjs/wast-refmt": "1.11.1"} , "alex" -, "alloy" , "audiosprite" , "autoprefixer" , "auto-changelog" @@ -91,7 +89,6 @@ , "coc-yaml" , "coc-yank" , "code-theme-converter" -, "coffee-script" , "coinmon" , "concurrently" , "conventional-changelog-cli" @@ -101,11 +98,9 @@ , "create-react-native-app" , "cspell" , "csslint" -, "degit" , "dhcp" , "diagnostic-languageserver" , "diff2html-cli" -, "dockerfile-language-server-nodejs" , "dotenv-cli" , "dotenv-vault" , "elasticdump" @@ -141,20 +136,16 @@ , "grunt-cli" , "makam" , "meshcommander" -, "gqlint" , "gulp" , "gulp-cli" , "he" , "http-server" -, "hsd" , "hs-airdrop" -, "hs-client" , "ijavascript" , "inliner" , "imapnotify" , "insect" , "intelephense" -, "jake" , "joplin" , "js-beautify" , "js-yaml" @@ -170,7 +161,6 @@ , "katex" , "keyoxide" , "lcov-result-merger" -, "leetcode-cli" , "vsc-leetcode-cli" , "lerna" , "less" @@ -189,7 +179,6 @@ , "meat" , "mocha" , "multi-file-swagger" -, "musescore-downloader" , "near-cli" , "neovim" , "nijs" @@ -203,7 +192,6 @@ , "npm" , "npm-merge-driver" , "nrm" -, "ocaml-language-server" , "orval" , "parcel-bundler" , "parcel" @@ -233,7 +221,6 @@ , "pyright" , "quicktype" , "react-native-cli" -, "react-static" , "react-tools" , "redoc-cli" , "remod-cli" @@ -248,7 +235,6 @@ , "shout" , "sloc" , "smartdc" -, "snyk" , "socket.io" , "speed-test" , "sql-formatter" @@ -319,7 +305,6 @@ , "thelounge-theme-zenburn-sourcecodepro" , "three" , "tiddlywiki" -, "titanium" , "tsun" , "ts-node" , "ttf2eot" @@ -346,7 +331,6 @@ , "wrangler" , "wring" , "@yaegassy/coc-nginx" -, "yaml-language-server" , "yalc" , "yarn" , "@zwave-js/server" diff --git a/nixpkgs/pkgs/development/node-packages/node-packages.nix b/nixpkgs/pkgs/development/node-packages/node-packages.nix index 35bbb65656a1..89a0652689a6 100644 --- a/nixpkgs/pkgs/development/node-packages/node-packages.nix +++ b/nixpkgs/pkgs/development/node-packages/node-packages.nix @@ -72272,62 +72272,6 @@ in bypassCache = true; reconstructLock = true; }; - "@squoosh/cli" = nodeEnv.buildNodePackage { - name = "_at_squoosh_slash_cli"; - packageName = "@squoosh/cli"; - version = "0.7.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@squoosh/cli/-/cli-0.7.3.tgz"; - sha512 = "mU/iWbVWqLXX+gJJa4RBl5U4LdKYaiD9cmxW7bjyw8EEFAuMXFDGAQcq7hEvUZwoP5Em5s7sjimBPirSBJQ87g=="; - }; - dependencies = [ - sources."@squoosh/lib-0.4.1" - sources."ansi-regex-5.0.1" - sources."ansi-styles-4.3.0" - sources."base64-js-1.5.1" - sources."bl-4.1.0" - sources."buffer-5.7.1" - sources."chalk-4.1.2" - sources."cli-cursor-3.1.0" - sources."cli-spinners-2.9.0" - sources."clone-1.0.4" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."commander-7.2.0" - sources."defaults-1.0.4" - sources."has-flag-4.0.0" - sources."ieee754-1.2.1" - sources."inherits-2.0.4" - sources."is-interactive-1.0.0" - sources."is-unicode-supported-0.1.0" - sources."json5-2.2.3" - sources."kleur-4.1.5" - sources."log-symbols-4.1.0" - sources."mimic-fn-2.1.0" - sources."onetime-5.1.2" - sources."ora-5.4.1" - sources."readable-stream-3.6.2" - sources."restore-cursor-3.1.0" - sources."safe-buffer-5.2.1" - sources."signal-exit-3.0.7" - sources."string_decoder-1.3.0" - sources."strip-ansi-6.0.1" - sources."supports-color-7.2.0" - sources."util-deprecate-1.0.2" - sources."wasm-feature-detect-1.5.1" - sources."wcwidth-1.0.1" - sources."web-streams-polyfill-3.2.1" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "A CLI for Squoosh"; - homepage = "https://github.com/GoogleChromeLabs/squoosh"; - license = "Apache-2.0"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; "@tailwindcss/aspect-ratio" = nodeEnv.buildNodePackage { name = "_at_tailwindcss_slash_aspect-ratio"; packageName = "@tailwindcss/aspect-ratio"; @@ -75436,158 +75380,6 @@ in bypassCache = true; reconstructLock = true; }; - alloy = nodeEnv.buildNodePackage { - name = "alloy"; - packageName = "alloy"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/alloy/-/alloy-2.0.2.tgz"; - sha512 = "FhZLGIKAewqzsJ50H44NU/PTAW2vt00M8dMkO6BFgCH7Z925+8bfcQ9PCBAufynDQXrAR6h7Kd9Im4YXyizbIA=="; - }; - dependencies = [ - sources."@ampproject/remapping-2.2.1" - sources."@babel/code-frame-7.22.10" - sources."@babel/compat-data-7.22.9" - sources."@babel/core-7.22.10" - sources."@babel/generator-7.22.10" - sources."@babel/helper-compilation-targets-7.22.10" - sources."@babel/helper-environment-visitor-7.22.5" - sources."@babel/helper-function-name-7.22.5" - sources."@babel/helper-hoist-variables-7.22.5" - sources."@babel/helper-module-imports-7.22.5" - sources."@babel/helper-module-transforms-7.22.9" - sources."@babel/helper-simple-access-7.22.5" - sources."@babel/helper-split-export-declaration-7.22.6" - sources."@babel/helper-string-parser-7.22.5" - sources."@babel/helper-validator-identifier-7.22.5" - sources."@babel/helper-validator-option-7.22.5" - sources."@babel/helpers-7.22.10" - sources."@babel/highlight-7.22.10" - sources."@babel/parser-7.22.10" - sources."@babel/template-7.22.5" - sources."@babel/traverse-7.22.10" - sources."@babel/types-7.22.10" - sources."@jridgewell/gen-mapping-0.3.3" - sources."@jridgewell/resolve-uri-3.1.1" - sources."@jridgewell/set-array-1.1.2" - sources."@jridgewell/sourcemap-codec-1.4.15" - sources."@jridgewell/trace-mapping-0.3.19" - sources."@xmldom/xmldom-0.8.10" - sources."JSV-4.0.2" - sources."ansi-styles-3.2.1" - sources."array-unique-0.3.2" - sources."async-3.2.4" - sources."balanced-match-1.0.2" - sources."brace-expansion-2.0.1" - sources."browserslist-4.21.10" - sources."caniuse-lite-1.0.30001522" - sources."chalk-2.4.2" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."colors-1.4.0" - sources."commander-8.3.0" - sources."concat-map-0.0.1" - sources."convert-source-map-1.9.0" - sources."debug-4.3.4" - sources."ejs-3.1.6" - sources."electron-to-chromium-1.4.499" - sources."ensure-posix-path-1.1.1" - sources."escalade-3.1.1" - sources."escape-string-regexp-1.0.5" - (sources."filelist-1.0.4" // { - dependencies = [ - sources."minimatch-5.1.6" - ]; - }) - sources."fs-extra-5.0.0" - sources."function-bind-1.1.1" - sources."gensync-1.0.0-beta.2" - (sources."global-modules-0.2.3" // { - dependencies = [ - sources."is-windows-0.2.0" - ]; - }) - sources."global-paths-1.0.0" - (sources."global-prefix-0.1.5" // { - dependencies = [ - sources."is-windows-0.2.0" - ]; - }) - sources."globals-11.12.0" - sources."graceful-fs-4.2.11" - sources."has-1.0.3" - sources."has-color-0.1.7" - sources."has-flag-3.0.0" - sources."homedir-polyfill-1.0.3" - sources."ini-1.3.8" - sources."is-3.3.0" - sources."is-core-module-2.13.0" - sources."is-windows-1.0.2" - sources."isexe-2.0.0" - (sources."jake-10.8.7" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."chalk-4.1.2" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."has-flag-4.0.0" - sources."supports-color-7.2.0" - ]; - }) - sources."js-tokens-4.0.0" - sources."jsesc-2.5.2" - sources."json5-2.2.3" - sources."jsonfile-4.0.0" - sources."jsonlint-1.6.3" - sources."lodash-4.17.21" - sources."lru-cache-5.1.1" - sources."matcher-collection-1.1.2" - (sources."minimatch-3.1.2" // { - dependencies = [ - sources."brace-expansion-1.1.11" - ]; - }) - sources."moment-2.29.1" - sources."ms-2.1.2" - sources."node-releases-2.0.13" - sources."node.extend-2.0.2" - (sources."nomnom-1.8.1" // { - dependencies = [ - sources."ansi-styles-1.0.0" - sources."chalk-0.4.0" - ]; - }) - sources."parse-passwd-1.0.0" - sources."path-parse-1.0.7" - sources."picocolors-1.0.0" - sources."pkginfo-0.4.1" - sources."resolve-1.22.4" - sources."sax-0.5.8" - sources."semver-6.3.1" - sources."source-map-0.7.4" - sources."strip-ansi-0.1.1" - sources."supports-color-5.5.0" - sources."supports-preserve-symlinks-flag-1.0.0" - sources."to-fast-properties-2.0.0" - sources."underscore-1.6.0" - sources."universalify-0.1.2" - sources."update-browserslist-db-1.0.11" - sources."walk-sync-0.3.4" - sources."which-1.3.1" - sources."xml2js-0.2.8" - sources."xml2tss-0.0.5" - sources."yallist-3.1.1" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "TiDev Titanium MVC Framework"; - homepage = "https://github.com/tidev/alloy#readme"; - license = "Apache-2.0"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; audiosprite = nodeEnv.buildNodePackage { name = "audiosprite"; packageName = "audiosprite"; @@ -80311,24 +80103,6 @@ in bypassCache = true; reconstructLock = true; }; - coffee-script = nodeEnv.buildNodePackage { - name = "coffee-script"; - packageName = "coffee-script"; - version = "1.12.7"; - src = fetchurl { - url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.7.tgz"; - sha512 = "fLeEhqwymYat/MpTPUjSKHVYYl0ec2mOyALEMLmzr5i1isuG+6jfI2j2d5oBO3VIzgUXgBVIcOT9uH1TFxBckw=="; - }; - buildInputs = globalBuildInputs; - meta = { - description = "Unfancy JavaScript"; - homepage = "http://coffeescript.org"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; coinmon = nodeEnv.buildNodePackage { name = "coinmon"; packageName = "coinmon"; @@ -81217,24 +80991,6 @@ in bypassCache = true; reconstructLock = true; }; - degit = nodeEnv.buildNodePackage { - name = "degit"; - packageName = "degit"; - version = "2.8.4"; - src = fetchurl { - url = "https://registry.npmjs.org/degit/-/degit-2.8.4.tgz"; - sha512 = "vqYuzmSA5I50J882jd+AbAhQtgK6bdKUJIex1JNfEUPENCgYsxugzKVZlFyMwV4i06MmnV47/Iqi5Io86zf3Ng=="; - }; - buildInputs = globalBuildInputs; - meta = { - description = "Straightforward project scaffolding"; - homepage = "https://github.com/Rich-Harris/degit#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; dhcp = nodeEnv.buildNodePackage { name = "dhcp"; packageName = "dhcp"; @@ -81436,38 +81192,6 @@ in bypassCache = true; reconstructLock = true; }; - dockerfile-language-server-nodejs = nodeEnv.buildNodePackage { - name = "dockerfile-language-server-nodejs"; - packageName = "dockerfile-language-server-nodejs"; - version = "0.10.2"; - src = fetchurl { - url = "https://registry.npmjs.org/dockerfile-language-server-nodejs/-/dockerfile-language-server-nodejs-0.10.2.tgz"; - sha512 = "vLbaeYv4h3XEzrZ9JOhP6bD1eLzbzGzFFF03F3Ofd6kh9PU2aGBS/LVjd/w1omCyNV2LHviFX0ZGHINmWsZYyw=="; - }; - dependencies = [ - sources."dockerfile-ast-0.5.0" - sources."dockerfile-language-service-0.10.2" - sources."dockerfile-utils-0.11.0" - sources."vscode-jsonrpc-8.1.0" - sources."vscode-languageserver-8.1.0" - (sources."vscode-languageserver-protocol-3.17.3" // { - dependencies = [ - sources."vscode-languageserver-types-3.17.3" - ]; - }) - sources."vscode-languageserver-textdocument-1.0.10" - sources."vscode-languageserver-types-3.17.0-next.3" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "A language server for Dockerfiles powered by NodeJS, TypeScript, and VSCode technologies."; - homepage = "https://github.com/rcjsuen/dockerfile-language-server-nodejs#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; dotenv-cli = nodeEnv.buildNodePackage { name = "dotenv-cli"; packageName = "dotenv-cli"; @@ -89960,50 +89684,6 @@ in bypassCache = true; reconstructLock = true; }; - gqlint = nodeEnv.buildNodePackage { - name = "gqlint"; - packageName = "gqlint"; - version = "1.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/gqlint/-/gqlint-1.8.0.tgz"; - sha512 = "X5tNjxscqbH8xHXubB8kY6yGt11krk+RuB6N/zI2B2RdRadzwavBRMAHkIJzp2RpFgliF08UqP/p+spS/aNd5w=="; - }; - dependencies = [ - sources."ansi-regex-2.1.1" - sources."ansi-styles-2.2.1" - sources."babel-code-frame-6.26.0" - sources."chalk-1.1.3" - sources."commander-2.20.3" - sources."encoding-0.1.13" - sources."escape-string-regexp-1.0.5" - sources."esutils-2.0.3" - sources."graphql-14.7.0" - sources."has-ansi-2.0.0" - sources."iconv-lite-0.6.3" - sources."is-stream-1.1.0" - sources."iterall-1.3.0" - sources."js-tokens-3.0.2" - sources."lodash-4.17.21" - sources."node-fetch-1.7.3" - sources."pad-component-0.0.1" - sources."pluralize-5.1.0" - sources."prettier-1.19.1" - sources."safer-buffer-2.1.2" - sources."strip-ansi-3.0.1" - sources."supports-color-2.0.0" - sources."text-table-0.2.0" - sources."wordwrap-1.0.0" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "GraphQL Linter"; - homepage = "https://github.com/happylinks/gqlint#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; gulp = nodeEnv.buildNodePackage { name = "gulp"; packageName = "gulp"; @@ -90929,71 +90609,6 @@ in bypassCache = true; reconstructLock = true; }; - hsd = nodeEnv.buildNodePackage { - name = "hsd"; - packageName = "hsd"; - version = "6.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/hsd/-/hsd-6.0.0.tgz"; - sha512 = "pl57FtFzrzL2jSsiOru/WvHLlhZuwM+wskme/d6S96tpj5kOmp8zJaNsZ9bpXZBIawtrM6+hZvRaNvE4pegbLg=="; - }; - dependencies = [ - sources."bcfg-0.2.1" - (sources."bcrypto-5.4.0" // { - dependencies = [ - sources."bufio-1.0.7" - ]; - }) - sources."bcurl-0.2.0" - sources."bdb-1.4.0" - sources."bdns-0.1.5" - sources."bevent-0.1.5" - sources."bfile-0.2.3" - (sources."bfilter-1.0.5" // { - dependencies = [ - sources."bufio-1.0.7" - ]; - }) - sources."bheep-0.1.5" - sources."binet-0.3.7" - sources."blgr-0.2.0" - sources."blru-0.1.6" - sources."blst-0.1.5" - sources."bmutex-0.1.6" - (sources."bns-0.15.0" // { - dependencies = [ - sources."bufio-1.0.7" - ]; - }) - sources."brq-0.1.8" - sources."bs32-0.1.6" - sources."bsert-0.0.12" - sources."bsock-0.1.9" - sources."bsocks-0.2.6" - sources."btcp-0.1.5" - sources."budp-0.1.6" - sources."buffer-map-0.0.7" - sources."bufio-1.2.0" - sources."bupnp-0.2.6" - sources."bval-0.1.8" - sources."bweb-0.2.0" - sources."goosig-0.10.0" - sources."loady-0.0.5" - sources."mrmr-0.1.10" - sources."n64-0.2.10" - sources."unbound-0.4.3" - sources."urkel-1.0.3" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Cryptocurrency bike-shed"; - homepage = "https://github.com/handshake-org/hsd"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; hs-airdrop = nodeEnv.buildNodePackage { name = "hs-airdrop"; packageName = "hs-airdrop"; @@ -91021,31 +90636,6 @@ in bypassCache = true; reconstructLock = true; }; - hs-client = nodeEnv.buildNodePackage { - name = "hs-client"; - packageName = "hs-client"; - version = "6.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/hs-client/-/hs-client-6.0.0.tgz"; - sha512 = "zjAOSyMeDtzGpOmIg+GPgZ+D/3CHtswSSn0C1CJUcHL3goPr9Tmc5ZpBxQeFkwkAys3RADWPfxiWNcL8nvDCtQ=="; - }; - dependencies = [ - sources."bcfg-0.2.1" - sources."bcurl-0.2.0" - sources."brq-0.1.8" - sources."bsert-0.0.12" - sources."bsock-0.1.9" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "HSD node and wallet client"; - homepage = "https://github.com/handshake-org/hsd"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; ijavascript = nodeEnv.buildNodePackage { name = "ijavascript"; packageName = "ijavascript"; @@ -91730,45 +91320,6 @@ in bypassCache = true; reconstructLock = true; }; - jake = nodeEnv.buildNodePackage { - name = "jake"; - packageName = "jake"; - version = "10.8.7"; - src = fetchurl { - url = "https://registry.npmjs.org/jake/-/jake-10.8.7.tgz"; - sha512 = "ZDi3aP+fG/LchyBzUM804VjddnwfSfsdeYkwt8NcbKRvo4rFkjhs456iLFn3k2ZUWvNe4i48WACDbza8fhq2+w=="; - }; - dependencies = [ - sources."ansi-styles-4.3.0" - sources."async-3.2.4" - sources."balanced-match-1.0.2" - sources."brace-expansion-2.0.1" - sources."chalk-4.1.2" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."concat-map-0.0.1" - (sources."filelist-1.0.4" // { - dependencies = [ - sources."minimatch-5.1.6" - ]; - }) - sources."has-flag-4.0.0" - (sources."minimatch-3.1.2" // { - dependencies = [ - sources."brace-expansion-1.1.11" - ]; - }) - sources."supports-color-7.2.0" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "JavaScript build tool, similar to Make or Rake"; - license = "Apache-2.0"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; joplin = nodeEnv.buildNodePackage { name = "joplin"; packageName = "joplin"; @@ -95039,267 +94590,6 @@ in bypassCache = true; reconstructLock = true; }; - leetcode-cli = nodeEnv.buildNodePackage { - name = "leetcode-cli"; - packageName = "leetcode-cli"; - version = "2.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/leetcode-cli/-/leetcode-cli-2.6.2.tgz"; - sha512 = "wP2yB6yGq+dlXgi8PMNgXS24Sb7rtYRs/WYQ4+zrJ9Oa/7Qp47PbVxuS4Dl62yeEo3OSlT1hovp1SWY6jE7ToQ=="; - }; - dependencies = [ - sources."abab-1.0.4" - sources."acorn-2.7.0" - sources."acorn-globals-1.0.9" - sources."ajv-6.12.6" - sources."ansi-regex-2.1.1" - sources."ansi-styles-3.2.1" - sources."asn1-0.2.6" - sources."assert-plus-1.0.0" - sources."async-1.5.2" - sources."asynckit-0.4.0" - sources."aws-sign2-0.7.0" - sources."aws4-1.12.0" - sources."balanced-match-1.0.2" - sources."bcrypt-pbkdf-1.0.2" - sources."boolbase-1.0.0" - sources."brace-expansion-1.1.11" - sources."camelcase-2.1.1" - sources."caseless-0.12.0" - sources."chalk-2.4.2" - sources."cheerio-0.20.0" - sources."cli-cursor-2.1.0" - sources."cli-spinners-1.3.1" - sources."cliui-3.2.0" - sources."clone-1.0.4" - sources."code-point-at-1.1.0" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."colors-1.4.0" - sources."combined-stream-1.0.8" - sources."concat-map-0.0.1" - sources."core-util-is-1.0.3" - sources."cross-spawn-6.0.5" - sources."css-select-1.2.0" - sources."css-what-2.1.3" - sources."cssom-0.3.8" - sources."cssstyle-0.2.37" - sources."cycle-1.0.3" - sources."dashdash-1.14.1" - sources."decamelize-1.2.0" - sources."deep-equal-0.2.2" - sources."deep-is-0.1.4" - sources."defaults-1.0.4" - sources."delayed-stream-1.0.0" - sources."dom-serializer-0.1.1" - sources."domelementtype-1.3.1" - sources."domhandler-2.3.0" - sources."domutils-1.5.1" - sources."ecc-jsbn-0.1.2" - sources."end-of-stream-1.4.4" - sources."entities-1.1.2" - sources."escape-string-regexp-1.0.5" - sources."escodegen-1.14.3" - sources."esprima-4.0.1" - sources."estraverse-4.3.0" - sources."esutils-2.0.3" - sources."execa-1.0.0" - sources."extend-3.0.2" - sources."extsprintf-1.3.0" - sources."eyes-0.1.8" - sources."fast-deep-equal-3.1.3" - sources."fast-json-stable-stringify-2.1.0" - sources."fast-levenshtein-2.0.6" - sources."find-up-3.0.0" - sources."forever-agent-0.6.1" - sources."form-data-2.3.3" - sources."fs.realpath-1.0.0" - sources."get-caller-file-1.0.3" - sources."get-stream-4.1.0" - sources."getpass-0.1.7" - sources."glob-7.2.3" - sources."har-schema-2.0.0" - sources."har-validator-5.1.5" - sources."has-flag-3.0.0" - sources."he-1.2.0" - (sources."htmlparser2-3.8.3" // { - dependencies = [ - sources."entities-1.0.0" - ]; - }) - sources."http-signature-1.2.0" - sources."i-0.3.7" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - sources."ini-1.3.8" - sources."invert-kv-1.0.0" - sources."is-fullwidth-code-point-1.0.0" - sources."is-stream-1.1.0" - sources."is-typedarray-1.0.0" - sources."isarray-0.0.1" - sources."isexe-2.0.0" - sources."isstream-0.1.2" - sources."jsbn-0.1.1" - sources."jsdom-7.2.2" - sources."json-schema-0.4.0" - sources."json-schema-traverse-0.4.1" - sources."json-stringify-safe-5.0.1" - sources."jsprim-1.4.2" - sources."lcid-1.0.0" - sources."levn-0.3.0" - sources."locate-path-3.0.0" - sources."lodash-4.17.21" - sources."log-symbols-2.2.0" - sources."map-age-cleaner-0.1.3" - (sources."mem-4.3.0" // { - dependencies = [ - sources."mimic-fn-2.1.0" - ]; - }) - sources."mime-db-1.52.0" - sources."mime-types-2.1.35" - sources."mimic-fn-1.2.0" - sources."minimatch-3.1.2" - sources."minimist-0.0.8" - sources."mkdirp-0.5.1" - sources."moment-2.29.4" - sources."mute-stream-0.0.8" - (sources."nconf-0.10.0" // { - dependencies = [ - sources."yargs-3.32.0" - ]; - }) - sources."ncp-1.0.1" - sources."nice-try-1.0.5" - sources."npm-run-path-2.0.2" - sources."nth-check-1.0.2" - sources."number-is-nan-1.0.1" - sources."nwmatcher-1.4.4" - sources."oauth-sign-0.9.0" - sources."once-1.4.0" - sources."onetime-2.0.1" - sources."optionator-0.8.3" - (sources."ora-3.0.0" // { - dependencies = [ - sources."ansi-regex-3.0.1" - sources."strip-ansi-4.0.0" - ]; - }) - sources."os-locale-1.4.0" - sources."p-defer-1.0.0" - sources."p-finally-1.0.0" - sources."p-is-promise-2.1.0" - sources."p-limit-2.3.0" - sources."p-locate-3.0.0" - sources."p-try-2.2.0" - sources."parse5-1.5.1" - sources."path-exists-3.0.0" - sources."path-is-absolute-1.0.1" - sources."path-key-2.0.1" - sources."performance-now-2.1.0" - sources."pkginfo-0.4.1" - sources."prelude-ls-1.1.2" - sources."prompt-1.0.0" - sources."psl-1.9.0" - sources."pump-3.0.0" - sources."punycode-2.3.0" - sources."qs-6.5.3" - sources."read-1.0.7" - sources."readable-stream-1.1.14" - (sources."request-2.88.0" // { - dependencies = [ - sources."punycode-1.4.1" - sources."tough-cookie-2.4.3" - ]; - }) - sources."require-directory-2.1.1" - sources."require-main-filename-1.0.1" - sources."restore-cursor-2.0.0" - sources."revalidator-0.1.8" - sources."rimraf-2.7.1" - sources."safe-buffer-5.2.1" - sources."safer-buffer-2.1.2" - sources."sax-1.2.4" - sources."secure-keys-1.0.0" - sources."semver-5.7.2" - sources."set-blocking-2.0.0" - sources."shebang-command-1.2.0" - sources."shebang-regex-1.0.0" - sources."signal-exit-3.0.7" - sources."source-map-0.6.1" - sources."sshpk-1.17.0" - sources."stack-trace-0.0.10" - sources."string-width-1.0.2" - sources."string_decoder-0.10.31" - sources."strip-ansi-3.0.1" - sources."strip-eof-1.0.0" - sources."supports-color-5.5.0" - sources."symbol-tree-3.2.4" - sources."tough-cookie-2.5.0" - sources."tr46-0.0.3" - sources."tunnel-agent-0.6.0" - sources."tweetnacl-0.14.5" - sources."type-check-0.3.2" - sources."underscore-1.9.1" - sources."uri-js-4.4.1" - (sources."utile-0.3.0" // { - dependencies = [ - sources."async-0.9.2" - ]; - }) - sources."uuid-3.4.0" - (sources."verror-1.10.0" // { - dependencies = [ - sources."core-util-is-1.0.2" - ]; - }) - sources."wcwidth-1.0.1" - sources."webidl-conversions-2.0.1" - sources."whatwg-url-compat-0.6.5" - sources."which-1.3.1" - sources."which-module-2.0.1" - sources."window-size-0.1.4" - (sources."winston-2.1.1" // { - dependencies = [ - sources."async-1.0.0" - sources."colors-1.0.3" - sources."pkginfo-0.3.1" - ]; - }) - sources."word-wrap-1.2.5" - sources."wordwrap-1.0.0" - sources."wrap-ansi-2.1.0" - sources."wrappy-1.0.2" - sources."xml-name-validator-2.0.1" - sources."y18n-3.2.2" - (sources."yargs-12.0.4" // { - dependencies = [ - sources."ansi-regex-3.0.1" - sources."cliui-4.1.0" - sources."invert-kv-2.0.0" - sources."is-fullwidth-code-point-2.0.0" - sources."lcid-2.0.0" - sources."os-locale-3.1.0" - sources."string-width-2.1.1" - sources."strip-ansi-4.0.0" - ]; - }) - (sources."yargs-parser-11.1.1" // { - dependencies = [ - sources."camelcase-5.3.1" - ]; - }) - ]; - buildInputs = globalBuildInputs; - meta = { - description = "A cli tool to enjoy leetcode!"; - homepage = "https://github.com/skygragon/leetcode-cli#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; vsc-leetcode-cli = nodeEnv.buildNodePackage { name = "vsc-leetcode-cli"; packageName = "vsc-leetcode-cli"; @@ -99204,90 +98494,6 @@ in bypassCache = true; reconstructLock = true; }; - musescore-downloader = nodeEnv.buildNodePackage { - name = "musescore-downloader"; - packageName = "musescore-downloader"; - version = "0.26.0"; - src = fetchurl { - url = "https://registry.npmjs.org/musescore-downloader/-/musescore-downloader-0.26.0.tgz"; - sha512 = "AHA5wSaEJLwfEEQDl8kLfin7l4uejXYTzWtn/BgUiyWKw4AbuUK2/xfDmULW2KxUfsK2RoLl0bFtIvdvvm4CNA=="; - }; - dependencies = [ - sources."@librescore/fonts-0.4.1" - sources."@librescore/sf3-0.3.0" - sources."ansi-escapes-4.3.2" - sources."ansi-regex-5.0.1" - sources."ansi-styles-4.3.0" - sources."base64-js-1.5.1" - sources."bl-4.1.0" - sources."buffer-5.7.1" - sources."chalk-4.1.2" - sources."chardet-0.7.0" - sources."cli-cursor-3.1.0" - sources."cli-spinners-2.9.0" - sources."cli-width-3.0.0" - sources."clone-1.0.4" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."defaults-1.0.4" - sources."detect-node-2.1.0" - sources."emoji-regex-8.0.0" - (sources."encoding-0.1.13" // { - dependencies = [ - sources."iconv-lite-0.6.3" - ]; - }) - sources."escape-string-regexp-1.0.5" - sources."external-editor-3.1.0" - sources."figures-3.2.0" - sources."has-flag-4.0.0" - sources."iconv-lite-0.4.24" - sources."ieee754-1.2.1" - sources."inherits-2.0.4" - sources."inquirer-7.3.3" - sources."is-fullwidth-code-point-3.0.0" - sources."is-interactive-1.0.0" - sources."is-unicode-supported-0.1.0" - sources."lodash-4.17.21" - sources."log-symbols-4.1.0" - sources."mimic-fn-2.1.0" - sources."mute-stream-0.0.8" - sources."node-fetch-2.6.13" - sources."onetime-5.1.2" - sources."ora-5.4.1" - sources."os-tmpdir-1.0.2" - sources."readable-stream-3.6.2" - sources."restore-cursor-3.1.0" - sources."run-async-2.4.1" - sources."rxjs-6.6.7" - sources."safe-buffer-5.2.1" - sources."safer-buffer-2.1.2" - sources."signal-exit-3.0.7" - sources."string-width-4.2.3" - sources."string_decoder-1.3.0" - sources."strip-ansi-6.0.1" - sources."supports-color-7.2.0" - sources."through-2.3.8" - sources."tmp-0.0.33" - sources."tr46-0.0.3" - sources."tslib-1.14.1" - sources."type-fest-0.21.3" - sources."util-deprecate-1.0.2" - sources."wcwidth-1.0.1" - sources."webidl-conversions-3.0.1" - sources."webmscore-0.18.0" - sources."whatwg-url-5.0.0" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "download sheet music from musescore.com for free, no login or Musescore Pro required | 免登录、免 Musescore Pro，免费下载 musescore.com 上的曲谱"; - homepage = "https://github.com/Xmader/musescore-downloader#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; near-cli = nodeEnv.buildNodePackage { name = "near-cli"; packageName = "near-cli"; @@ -101392,48 +100598,6 @@ in bypassCache = true; reconstructLock = true; }; - ocaml-language-server = nodeEnv.buildNodePackage { - name = "ocaml-language-server"; - packageName = "ocaml-language-server"; - version = "1.0.35"; - src = fetchurl { - url = "https://registry.npmjs.org/ocaml-language-server/-/ocaml-language-server-1.0.35.tgz"; - sha512 = "9RS7+KyrmFFL2BZLjIBjLToqbDTKDTAoCGrQDm8eYgKie/ep6UnodGuvZgRaM9HOQ8RDzBh4rE3CfGdNsggD4g=="; - }; - dependencies = [ - sources."async-2.6.0" - sources."balanced-match-1.0.2" - sources."brace-expansion-1.1.11" - sources."concat-map-0.0.1" - sources."deepmerge-2.1.0" - sources."fs.realpath-1.0.0" - sources."glob-7.1.2" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - sources."lodash-4.17.5" - sources."lokijs-1.5.3" - sources."minimatch-3.1.2" - sources."once-1.4.0" - sources."path-is-absolute-1.0.1" - sources."pegjs-0.10.0" - sources."vscode-jsonrpc-3.6.0" - sources."vscode-languageclient-4.0.1" - sources."vscode-languageserver-4.0.0" - sources."vscode-languageserver-protocol-3.6.0" - sources."vscode-languageserver-types-3.17.3" - sources."vscode-uri-1.0.3" - sources."wrappy-1.0.2" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "OCaml language server"; - homepage = "https://github.com/freebroccolo/ocaml-language-server"; - license = "Apache-2.0"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; orval = nodeEnv.buildNodePackage { name = "orval"; packageName = "orval"; @@ -106257,1832 +105421,6 @@ in bypassCache = true; reconstructLock = true; }; - react-static = nodeEnv.buildNodePackage { - name = "react-static"; - packageName = "react-static"; - version = "7.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/react-static/-/react-static-7.6.2.tgz"; - sha512 = "JQACM+3GgF1vkUH6E6w1k0Qut6IbcfXjU37shGUWM9tIs3F9e/33saXK4G/uSl1kc8qjI+RekAQs/qyjMlUKlg=="; - }; - dependencies = [ - sources."@ampproject/remapping-2.2.1" - sources."@babel/cli-7.22.10" - sources."@babel/code-frame-7.22.10" - sources."@babel/compat-data-7.22.9" - (sources."@babel/core-7.22.10" // { - dependencies = [ - sources."semver-6.3.1" - ]; - }) - sources."@babel/generator-7.22.10" - sources."@babel/helper-annotate-as-pure-7.22.5" - sources."@babel/helper-builder-binary-assignment-operator-visitor-7.22.10" - (sources."@babel/helper-compilation-targets-7.22.10" // { - dependencies = [ - sources."semver-6.3.1" - ]; - }) - (sources."@babel/helper-create-class-features-plugin-7.22.10" // { - dependencies = [ - sources."semver-6.3.1" - ]; - }) - (sources."@babel/helper-create-regexp-features-plugin-7.22.9" // { - dependencies = [ - sources."semver-6.3.1" - ]; - }) - sources."@babel/helper-define-polyfill-provider-0.4.2" - sources."@babel/helper-environment-visitor-7.22.5" - sources."@babel/helper-function-name-7.22.5" - sources."@babel/helper-hoist-variables-7.22.5" - sources."@babel/helper-member-expression-to-functions-7.22.5" - sources."@babel/helper-module-imports-7.22.5" - sources."@babel/helper-module-transforms-7.22.9" - sources."@babel/helper-optimise-call-expression-7.22.5" - sources."@babel/helper-plugin-utils-7.22.5" - sources."@babel/helper-remap-async-to-generator-7.22.9" - sources."@babel/helper-replace-supers-7.22.9" - sources."@babel/helper-simple-access-7.22.5" - sources."@babel/helper-skip-transparent-expression-wrappers-7.22.5" - sources."@babel/helper-split-export-declaration-7.22.6" - sources."@babel/helper-string-parser-7.22.5" - sources."@babel/helper-validator-identifier-7.22.5" - sources."@babel/helper-validator-option-7.22.5" - sources."@babel/helper-wrap-function-7.22.10" - sources."@babel/helpers-7.22.10" - sources."@babel/highlight-7.22.10" - sources."@babel/parser-7.22.10" - sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.22.5" - sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.22.5" - sources."@babel/plugin-proposal-class-properties-7.18.6" - sources."@babel/plugin-proposal-export-default-from-7.22.5" - sources."@babel/plugin-proposal-optional-chaining-7.21.0" - sources."@babel/plugin-proposal-private-property-in-object-7.21.0-placeholder-for-preset-env.2" - sources."@babel/plugin-syntax-async-generators-7.8.4" - sources."@babel/plugin-syntax-class-properties-7.12.13" - sources."@babel/plugin-syntax-class-static-block-7.14.5" - sources."@babel/plugin-syntax-dynamic-import-7.8.3" - sources."@babel/plugin-syntax-export-default-from-7.22.5" - sources."@babel/plugin-syntax-export-namespace-from-7.8.3" - sources."@babel/plugin-syntax-import-assertions-7.22.5" - sources."@babel/plugin-syntax-import-attributes-7.22.5" - sources."@babel/plugin-syntax-import-meta-7.10.4" - sources."@babel/plugin-syntax-json-strings-7.8.3" - sources."@babel/plugin-syntax-jsx-7.22.5" - sources."@babel/plugin-syntax-logical-assignment-operators-7.10.4" - sources."@babel/plugin-syntax-nullish-coalescing-operator-7.8.3" - sources."@babel/plugin-syntax-numeric-separator-7.10.4" - sources."@babel/plugin-syntax-object-rest-spread-7.8.3" - sources."@babel/plugin-syntax-optional-catch-binding-7.8.3" - sources."@babel/plugin-syntax-optional-chaining-7.8.3" - sources."@babel/plugin-syntax-private-property-in-object-7.14.5" - sources."@babel/plugin-syntax-top-level-await-7.14.5" - sources."@babel/plugin-syntax-unicode-sets-regex-7.18.6" - sources."@babel/plugin-transform-arrow-functions-7.22.5" - sources."@babel/plugin-transform-async-generator-functions-7.22.10" - sources."@babel/plugin-transform-async-to-generator-7.22.5" - sources."@babel/plugin-transform-block-scoped-functions-7.22.5" - sources."@babel/plugin-transform-block-scoping-7.22.10" - sources."@babel/plugin-transform-class-properties-7.22.5" - sources."@babel/plugin-transform-class-static-block-7.22.5" - sources."@babel/plugin-transform-classes-7.22.6" - sources."@babel/plugin-transform-computed-properties-7.22.5" - sources."@babel/plugin-transform-destructuring-7.22.10" - sources."@babel/plugin-transform-dotall-regex-7.22.5" - sources."@babel/plugin-transform-duplicate-keys-7.22.5" - sources."@babel/plugin-transform-dynamic-import-7.22.5" - sources."@babel/plugin-transform-exponentiation-operator-7.22.5" - sources."@babel/plugin-transform-export-namespace-from-7.22.5" - sources."@babel/plugin-transform-for-of-7.22.5" - sources."@babel/plugin-transform-function-name-7.22.5" - sources."@babel/plugin-transform-json-strings-7.22.5" - sources."@babel/plugin-transform-literals-7.22.5" - sources."@babel/plugin-transform-logical-assignment-operators-7.22.5" - sources."@babel/plugin-transform-member-expression-literals-7.22.5" - sources."@babel/plugin-transform-modules-amd-7.22.5" - sources."@babel/plugin-transform-modules-commonjs-7.22.5" - sources."@babel/plugin-transform-modules-systemjs-7.22.5" - sources."@babel/plugin-transform-modules-umd-7.22.5" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.22.5" - sources."@babel/plugin-transform-new-target-7.22.5" - sources."@babel/plugin-transform-nullish-coalescing-operator-7.22.5" - sources."@babel/plugin-transform-numeric-separator-7.22.5" - sources."@babel/plugin-transform-object-rest-spread-7.22.5" - sources."@babel/plugin-transform-object-super-7.22.5" - sources."@babel/plugin-transform-optional-catch-binding-7.22.5" - sources."@babel/plugin-transform-optional-chaining-7.22.10" - sources."@babel/plugin-transform-parameters-7.22.5" - sources."@babel/plugin-transform-private-methods-7.22.5" - sources."@babel/plugin-transform-private-property-in-object-7.22.5" - sources."@babel/plugin-transform-property-literals-7.22.5" - sources."@babel/plugin-transform-react-display-name-7.22.5" - sources."@babel/plugin-transform-react-jsx-7.22.5" - sources."@babel/plugin-transform-react-jsx-development-7.22.5" - sources."@babel/plugin-transform-react-pure-annotations-7.22.5" - sources."@babel/plugin-transform-regenerator-7.22.10" - sources."@babel/plugin-transform-reserved-words-7.22.5" - (sources."@babel/plugin-transform-runtime-7.22.10" // { - dependencies = [ - sources."semver-6.3.1" - ]; - }) - sources."@babel/plugin-transform-shorthand-properties-7.22.5" - sources."@babel/plugin-transform-spread-7.22.5" - sources."@babel/plugin-transform-sticky-regex-7.22.5" - sources."@babel/plugin-transform-template-literals-7.22.5" - sources."@babel/plugin-transform-typeof-symbol-7.22.5" - sources."@babel/plugin-transform-unicode-escapes-7.22.10" - sources."@babel/plugin-transform-unicode-property-regex-7.22.5" - sources."@babel/plugin-transform-unicode-regex-7.22.5" - sources."@babel/plugin-transform-unicode-sets-regex-7.22.5" - (sources."@babel/preset-env-7.22.10" // { - dependencies = [ - sources."semver-6.3.1" - ]; - }) - sources."@babel/preset-modules-0.1.6-no-external-plugins" - sources."@babel/preset-react-7.22.5" - sources."@babel/preset-stage-0-7.8.3" - sources."@babel/register-7.22.5" - sources."@babel/regjsgen-0.8.0" - sources."@babel/runtime-7.22.10" - sources."@babel/template-7.22.5" - sources."@babel/traverse-7.22.10" - sources."@babel/types-7.22.10" - sources."@jridgewell/gen-mapping-0.3.3" - sources."@jridgewell/resolve-uri-3.1.1" - sources."@jridgewell/set-array-1.1.2" - sources."@jridgewell/sourcemap-codec-1.4.15" - sources."@jridgewell/trace-mapping-0.3.19" - sources."@reach/router-1.3.4" - sources."@sindresorhus/is-0.7.0" - sources."@types/glob-7.2.0" - sources."@types/json-schema-7.0.12" - sources."@types/minimatch-5.1.2" - sources."@types/node-20.5.3" - sources."@types/parse-json-4.0.0" - sources."@types/prop-types-15.7.5" - sources."@types/q-1.5.5" - sources."@types/react-17.0.65" - sources."@types/scheduler-0.16.3" - sources."@webassemblyjs/ast-1.9.0" - sources."@webassemblyjs/floating-point-hex-parser-1.9.0" - sources."@webassemblyjs/helper-api-error-1.9.0" - sources."@webassemblyjs/helper-buffer-1.9.0" - sources."@webassemblyjs/helper-code-frame-1.9.0" - sources."@webassemblyjs/helper-fsm-1.9.0" - sources."@webassemblyjs/helper-module-context-1.9.0" - sources."@webassemblyjs/helper-wasm-bytecode-1.9.0" - sources."@webassemblyjs/helper-wasm-section-1.9.0" - sources."@webassemblyjs/ieee754-1.9.0" - sources."@webassemblyjs/leb128-1.9.0" - sources."@webassemblyjs/utf8-1.9.0" - sources."@webassemblyjs/wasm-edit-1.9.0" - sources."@webassemblyjs/wasm-gen-1.9.0" - sources."@webassemblyjs/wasm-opt-1.9.0" - sources."@webassemblyjs/wasm-parser-1.9.0" - sources."@webassemblyjs/wast-parser-1.9.0" - sources."@webassemblyjs/wast-printer-1.9.0" - sources."@xtuc/ieee754-1.2.0" - sources."@xtuc/long-4.2.2" - sources."@zeit/schemas-2.6.0" - sources."accepts-1.3.8" - sources."acorn-6.4.2" - sources."acorn-walk-7.2.0" - sources."after-0.8.2" - sources."ajv-6.12.6" - sources."ajv-errors-1.0.1" - sources."ajv-keywords-3.5.2" - sources."alphanum-sort-1.0.2" - sources."ansi-align-2.0.0" - sources."ansi-colors-3.2.4" - sources."ansi-escapes-3.2.0" - sources."ansi-html-community-0.0.8" - sources."ansi-regex-3.0.1" - sources."ansi-styles-3.2.1" - sources."anymatch-3.1.3" - sources."aproba-1.2.0" - sources."arch-2.2.0" - (sources."archive-type-4.0.0" // { - dependencies = [ - sources."file-type-4.4.0" - ]; - }) - sources."arg-2.0.0" - sources."argparse-1.0.10" - sources."arr-diff-4.0.0" - sources."arr-flatten-1.1.0" - sources."arr-union-3.1.0" - sources."array-buffer-byte-length-1.0.0" - sources."array-flatten-1.1.1" - sources."array-union-1.0.2" - sources."array-uniq-1.0.3" - sources."array-unique-0.3.2" - sources."array.prototype.reduce-1.0.5" - sources."arraybuffer.prototype.slice-1.0.1" - sources."arraybuffer.slice-0.0.7" - (sources."asn1.js-5.4.1" // { - dependencies = [ - sources."bn.js-4.12.0" - ]; - }) - (sources."assert-1.5.0" // { - dependencies = [ - sources."inherits-2.0.1" - sources."util-0.10.3" - ]; - }) - sources."assign-symbols-1.0.0" - sources."async-2.6.4" - sources."async-each-1.0.6" - sources."async-limiter-1.0.1" - sources."atob-2.1.2" - (sources."autoprefixer-9.8.8" // { - dependencies = [ - sources."picocolors-0.2.1" - ]; - }) - sources."available-typed-arrays-1.0.5" - sources."axios-0.21.4" - sources."babel-core-7.0.0-bridge.0" - (sources."babel-loader-8.3.0" // { - dependencies = [ - sources."find-cache-dir-3.3.2" - sources."find-up-4.1.0" - sources."locate-path-5.0.0" - sources."make-dir-3.1.0" - sources."p-locate-4.1.0" - sources."path-exists-4.0.0" - sources."pkg-dir-4.2.0" - sources."semver-6.3.1" - ]; - }) - sources."babel-plugin-macros-2.8.0" - (sources."babel-plugin-polyfill-corejs2-0.4.5" // { - dependencies = [ - sources."semver-6.3.1" - ]; - }) - sources."babel-plugin-polyfill-corejs3-0.8.3" - sources."babel-plugin-polyfill-regenerator-0.5.2" - sources."babel-plugin-transform-react-remove-prop-types-0.4.24" - sources."babel-plugin-universal-import-4.0.2" - (sources."babel-runtime-6.26.0" // { - dependencies = [ - sources."regenerator-runtime-0.11.1" - ]; - }) - sources."backo2-1.0.2" - sources."balanced-match-1.0.2" - (sources."base-0.11.2" // { - dependencies = [ - sources."define-property-1.0.0" - ]; - }) - sources."base64-arraybuffer-0.1.4" - sources."base64-js-1.5.1" - sources."base64id-2.0.0" - sources."batch-0.6.1" - sources."bfj-6.1.2" - sources."big.js-5.2.2" - sources."binary-extensions-2.2.0" - sources."bindings-1.5.0" - sources."bl-1.2.3" - sources."blob-0.0.5" - sources."bluebird-3.7.2" - sources."bn.js-5.2.1" - (sources."body-parser-1.20.1" // { - dependencies = [ - sources."bytes-3.1.2" - sources."debug-2.6.9" - sources."ms-2.0.0" - sources."qs-6.11.0" - ]; - }) - (sources."bonjour-3.5.0" // { - dependencies = [ - sources."array-flatten-2.1.2" - ]; - }) - sources."boolbase-1.0.0" - (sources."boxen-1.3.0" // { - dependencies = [ - sources."camelcase-4.1.0" - ]; - }) - sources."brace-expansion-1.1.11" - sources."braces-3.0.2" - sources."brorand-1.1.0" - sources."browserify-aes-1.2.0" - sources."browserify-cipher-1.0.1" - sources."browserify-des-1.0.2" - sources."browserify-rsa-4.1.0" - (sources."browserify-sign-4.2.1" // { - dependencies = [ - sources."readable-stream-3.6.2" - ]; - }) - sources."browserify-zlib-0.1.4" - sources."browserslist-4.21.10" - sources."buffer-5.7.1" - sources."buffer-alloc-1.2.0" - sources."buffer-alloc-unsafe-1.1.0" - sources."buffer-crc32-0.2.13" - sources."buffer-fill-1.0.0" - sources."buffer-from-1.1.2" - sources."buffer-indexof-1.1.1" - sources."buffer-xor-1.0.3" - sources."bufferutil-4.0.7" - sources."builtin-status-codes-3.0.0" - sources."bytes-3.0.0" - sources."cacache-12.0.4" - sources."cache-base-1.0.1" - (sources."cacheable-request-2.1.4" // { - dependencies = [ - sources."lowercase-keys-1.0.0" - ]; - }) - sources."call-bind-1.0.2" - (sources."caller-callsite-2.0.0" // { - dependencies = [ - sources."callsites-2.0.0" - ]; - }) - sources."caller-path-2.0.0" - sources."callsites-3.1.0" - sources."camel-case-3.0.0" - sources."camelcase-5.3.1" - sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001522" - sources."case-sensitive-paths-webpack-plugin-2.4.0" - sources."caw-2.0.1" - sources."chalk-2.4.2" - sources."chardet-0.7.0" - sources."check-types-8.0.3" - sources."chokidar-3.5.3" - sources."chownr-1.1.4" - sources."chrome-trace-event-1.0.3" - sources."cipher-base-1.0.4" - sources."circular-dependency-plugin-5.2.2" - (sources."class-utils-0.3.6" // { - dependencies = [ - sources."define-property-0.2.5" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" - ]; - }) - sources."clean-css-4.2.4" - sources."cli-boxes-1.0.0" - sources."cli-cursor-2.1.0" - sources."cli-width-2.2.1" - (sources."clipboardy-1.2.3" // { - dependencies = [ - sources."execa-0.8.0" - ]; - }) - (sources."cliui-5.0.0" // { - dependencies = [ - sources."string-width-3.1.0" - ]; - }) - sources."clone-deep-4.0.1" - sources."clone-response-1.0.2" - sources."coa-2.0.2" - sources."collection-visit-1.0.0" - sources."color-3.2.1" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."color-string-1.9.1" - sources."commander-4.1.1" - sources."commondir-1.0.1" - sources."component-bind-1.0.0" - sources."component-emitter-1.2.1" - sources."component-inherit-0.0.3" - sources."compressible-2.0.18" - (sources."compression-1.7.3" // { - dependencies = [ - sources."debug-2.6.9" - sources."ms-2.0.0" - sources."safe-buffer-5.1.2" - ]; - }) - sources."concat-map-0.0.1" - sources."concat-stream-1.6.2" - sources."config-chain-1.1.13" - sources."connect-history-api-fallback-1.6.0" - sources."console-browserify-1.2.0" - sources."constants-browserify-1.0.0" - sources."content-disposition-0.5.4" - sources."content-type-1.0.5" - sources."convert-source-map-1.9.0" - sources."cookie-0.4.2" - sources."cookie-signature-1.0.6" - sources."copy-concurrently-1.0.5" - sources."copy-descriptor-0.1.1" - sources."core-js-2.6.12" - sources."core-js-compat-3.32.1" - sources."core-util-is-1.0.3" - sources."cors-2.8.5" - sources."cosmiconfig-6.0.0" - (sources."create-ecdh-4.0.4" // { - dependencies = [ - sources."bn.js-4.12.0" - ]; - }) - sources."create-hash-1.2.0" - sources."create-hmac-1.1.7" - sources."create-react-context-0.3.0" - (sources."cross-spawn-5.1.0" // { - dependencies = [ - sources."lru-cache-4.1.5" - sources."yallist-2.1.2" - ]; - }) - sources."crypto-browserify-3.12.0" - sources."css-color-names-0.0.4" - sources."css-declaration-sorter-4.0.1" - (sources."css-loader-2.1.1" // { - dependencies = [ - sources."json5-1.0.2" - sources."loader-utils-1.4.2" - sources."postcss-value-parser-3.3.1" - sources."schema-utils-1.0.0" - ]; - }) - sources."css-select-2.1.0" - sources."css-select-base-adapter-0.1.1" - sources."css-tree-1.0.0-alpha.37" - sources."css-what-3.4.2" - sources."cssesc-3.0.0" - (sources."cssnano-4.1.11" // { - dependencies = [ - sources."cosmiconfig-5.2.1" - sources."import-fresh-2.0.0" - sources."parse-json-4.0.0" - sources."resolve-from-3.0.0" - ]; - }) - sources."cssnano-preset-default-4.0.8" - sources."cssnano-util-get-arguments-4.0.0" - sources."cssnano-util-get-match-4.0.0" - sources."cssnano-util-raw-cache-4.0.1" - sources."cssnano-util-same-parent-4.0.1" - (sources."csso-4.2.0" // { - dependencies = [ - sources."css-tree-1.1.3" - sources."mdn-data-2.0.14" - ]; - }) - sources."csstype-3.1.2" - sources."cyclist-1.0.2" - sources."debug-4.3.4" - sources."decamelize-1.2.0" - sources."decode-uri-component-0.2.2" - (sources."decompress-4.2.1" // { - dependencies = [ - (sources."make-dir-1.3.0" // { - dependencies = [ - sources."pify-3.0.0" - ]; - }) - sources."pify-2.3.0" - ]; - }) - sources."decompress-response-3.3.0" - (sources."decompress-tar-4.1.1" // { - dependencies = [ - sources."file-type-5.2.0" - ]; - }) - (sources."decompress-tarbz2-4.1.1" // { - dependencies = [ - sources."file-type-6.2.0" - ]; - }) - (sources."decompress-targz-4.1.1" // { - dependencies = [ - sources."file-type-5.2.0" - ]; - }) - (sources."decompress-unzip-4.0.1" // { - dependencies = [ - sources."file-type-3.9.0" - sources."get-stream-2.3.1" - sources."pify-2.3.0" - ]; - }) - sources."deep-equal-1.1.1" - sources."deep-extend-0.6.0" - (sources."default-gateway-4.2.0" // { - dependencies = [ - sources."cross-spawn-6.0.5" - sources."execa-1.0.0" - sources."get-stream-4.1.0" - sources."pump-3.0.0" - ]; - }) - sources."define-properties-1.2.0" - sources."define-property-2.0.2" - sources."del-4.1.1" - sources."depd-2.0.0" - sources."des.js-1.1.0" - sources."destroy-1.2.0" - sources."detect-node-2.1.0" - (sources."diffie-hellman-5.0.3" // { - dependencies = [ - sources."bn.js-4.12.0" - ]; - }) - sources."dns-equal-1.0.0" - sources."dns-packet-1.3.4" - sources."dns-txt-2.0.2" - sources."dom-converter-0.2.0" - (sources."dom-serializer-0.2.2" // { - dependencies = [ - sources."domelementtype-2.3.0" - ]; - }) - sources."dom-walk-0.1.2" - sources."domain-browser-1.2.0" - sources."domelementtype-1.3.1" - (sources."domhandler-4.3.1" // { - dependencies = [ - sources."domelementtype-2.3.0" - ]; - }) - sources."domutils-1.7.0" - sources."dot-prop-5.3.0" - (sources."download-7.1.0" // { - dependencies = [ - sources."make-dir-1.3.0" - sources."pify-3.0.0" - ]; - }) - sources."download-git-repo-2.0.0" - sources."duplexer-0.1.2" - sources."duplexer3-0.1.5" - sources."duplexify-3.7.1" - sources."ee-first-1.1.1" - sources."ejs-2.7.4" - sources."electron-to-chromium-1.4.499" - (sources."elliptic-6.5.4" // { - dependencies = [ - sources."bn.js-4.12.0" - ]; - }) - sources."emoji-regex-7.0.3" - sources."emojis-list-3.0.0" - sources."encodeurl-1.0.2" - sources."end-of-stream-1.4.4" - (sources."engine.io-3.6.1" // { - dependencies = [ - sources."debug-4.1.1" - ]; - }) - (sources."engine.io-client-3.5.3" // { - dependencies = [ - sources."component-emitter-1.3.0" - sources."debug-3.1.0" - sources."ms-2.0.0" - ]; - }) - sources."engine.io-parser-2.2.1" - (sources."enhanced-resolve-4.5.0" // { - dependencies = [ - sources."memory-fs-0.5.0" - ]; - }) - sources."entities-2.2.0" - sources."errno-0.1.8" - sources."error-ex-1.3.2" - sources."es-abstract-1.22.1" - sources."es-array-method-boxes-properly-1.0.0" - sources."es-set-tostringtag-2.0.1" - sources."es-to-primitive-1.2.1" - sources."escalade-3.1.1" - sources."escape-html-1.0.3" - sources."escape-string-regexp-1.0.5" - sources."eslint-scope-4.0.3" - sources."esprima-4.0.1" - (sources."esrecurse-4.3.0" // { - dependencies = [ - sources."estraverse-5.3.0" - ]; - }) - sources."estraverse-4.3.0" - sources."esutils-2.0.3" - sources."etag-1.8.1" - sources."eventemitter3-4.0.7" - sources."events-3.3.0" - sources."eventsource-2.0.2" - sources."evp_bytestokey-1.0.3" - sources."execa-0.7.0" - (sources."expand-brackets-2.1.4" // { - dependencies = [ - sources."debug-2.6.9" - sources."define-property-0.2.5" - sources."extend-shallow-2.0.1" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" - sources."ms-2.0.0" - ]; - }) - (sources."express-4.18.2" // { - dependencies = [ - sources."cookie-0.5.0" - sources."debug-2.6.9" - sources."ms-2.0.0" - sources."path-to-regexp-0.1.7" - sources."qs-6.11.0" - sources."range-parser-1.2.1" - ]; - }) - sources."ext-list-2.2.2" - sources."ext-name-5.0.0" - (sources."extend-shallow-3.0.2" // { - dependencies = [ - sources."is-extendable-1.0.1" - ]; - }) - sources."external-editor-3.1.0" - (sources."extglob-2.0.4" // { - dependencies = [ - sources."define-property-1.0.0" - sources."extend-shallow-2.0.1" - ]; - }) - (sources."extract-css-chunks-webpack-plugin-4.9.0" // { - dependencies = [ - sources."normalize-url-1.9.1" - sources."prepend-http-1.0.4" - sources."query-string-4.3.4" - sources."schema-utils-1.0.0" - ]; - }) - sources."fast-deep-equal-3.1.3" - sources."fast-json-stable-stringify-2.1.0" - sources."fast-levenshtein-2.0.6" - (sources."fast-url-parser-1.1.3" // { - dependencies = [ - sources."punycode-1.4.1" - ]; - }) - sources."faye-websocket-0.11.4" - sources."fd-slicer-1.1.0" - sources."figgy-pudding-3.5.2" - sources."figures-2.0.0" - (sources."file-loader-3.0.1" // { - dependencies = [ - sources."json5-1.0.2" - sources."loader-utils-1.4.2" - sources."schema-utils-1.0.0" - ]; - }) - sources."file-type-8.1.0" - sources."file-uri-to-path-1.0.0" - sources."filename-reserved-regex-2.0.0" - sources."filenamify-2.1.0" - sources."filesize-3.6.1" - sources."fill-range-7.0.1" - (sources."finalhandler-1.2.0" // { - dependencies = [ - sources."debug-2.6.9" - sources."ms-2.0.0" - ]; - }) - sources."find-cache-dir-2.1.0" - sources."find-up-3.0.0" - sources."flush-write-stream-1.1.1" - sources."follow-redirects-1.15.2" - sources."for-each-0.3.3" - sources."for-in-1.0.2" - sources."forwarded-0.2.0" - sources."fragment-cache-0.2.1" - sources."fresh-0.5.2" - sources."from2-2.3.0" - sources."fs-constants-1.0.0" - sources."fs-extra-7.0.1" - sources."fs-readdir-recursive-1.1.0" - sources."fs-write-stream-atomic-1.0.10" - sources."fs.realpath-1.0.0" - sources."fsevents-2.3.3" - sources."function-bind-1.1.1" - sources."function.prototype.name-1.1.5" - sources."functions-have-names-1.2.3" - sources."gensync-1.0.0-beta.2" - sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.2.1" - sources."get-proxy-2.1.0" - sources."get-stream-3.0.0" - sources."get-symbol-description-1.0.0" - sources."get-value-2.0.6" - sources."git-clone-0.1.0" - sources."git-promise-1.0.0" - sources."glob-7.2.3" - sources."glob-parent-5.1.2" - sources."global-4.4.0" - sources."globals-11.12.0" - sources."globalthis-1.0.3" - (sources."globby-6.1.0" // { - dependencies = [ - sources."pify-2.3.0" - ]; - }) - sources."gopd-1.0.1" - (sources."got-8.3.2" // { - dependencies = [ - sources."pify-3.0.0" - ]; - }) - sources."graceful-fs-4.2.11" - sources."gud-1.0.0" - sources."gunzip-maybe-1.4.2" - sources."gzip-size-5.1.1" - sources."handle-thing-2.0.1" - sources."has-1.0.3" - sources."has-bigints-1.0.2" - (sources."has-binary2-1.0.3" // { - dependencies = [ - sources."isarray-2.0.1" - ]; - }) - sources."has-cors-1.1.0" - sources."has-flag-3.0.0" - sources."has-property-descriptors-1.0.0" - sources."has-proto-1.0.1" - sources."has-symbol-support-x-1.4.2" - sources."has-symbols-1.0.3" - sources."has-to-string-tag-x-1.4.1" - sources."has-tostringtag-1.0.0" - sources."has-value-1.0.0" - (sources."has-values-1.0.0" // { - dependencies = [ - (sources."is-number-3.0.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."kind-of-4.0.0" - ]; - }) - (sources."hash-base-3.1.0" // { - dependencies = [ - sources."readable-stream-3.6.2" - ]; - }) - sources."hash.js-1.1.7" - sources."he-1.2.0" - sources."hex-color-regex-1.1.0" - sources."hmac-drbg-1.0.1" - sources."hoist-non-react-statics-3.3.2" - sources."hoopy-0.1.4" - sources."hpack.js-2.1.6" - sources."hsl-regex-1.0.0" - sources."hsla-regex-1.0.0" - sources."html-entities-1.4.0" - (sources."html-minifier-3.5.21" // { - dependencies = [ - sources."commander-2.17.1" - ]; - }) - (sources."html-webpack-plugin-3.2.0" // { - dependencies = [ - sources."big.js-3.2.0" - sources."emojis-list-2.1.0" - sources."json5-0.5.1" - sources."loader-utils-0.2.17" - ]; - }) - (sources."htmlparser2-6.1.0" // { - dependencies = [ - sources."dom-serializer-1.4.1" - sources."domelementtype-2.3.0" - sources."domutils-2.8.0" - ]; - }) - sources."http-cache-semantics-3.8.1" - sources."http-deceiver-1.2.7" - sources."http-errors-2.0.0" - sources."http-parser-js-0.5.8" - sources."http-proxy-1.18.1" - sources."http-proxy-middleware-0.19.1" - sources."https-browserify-1.0.0" - sources."iconv-lite-0.4.24" - sources."icss-replace-symbols-1.1.0" - sources."icss-utils-4.1.1" - sources."ieee754-1.2.1" - sources."iferr-0.1.5" - sources."import-cwd-2.1.0" - (sources."import-fresh-3.3.0" // { - dependencies = [ - sources."resolve-from-4.0.0" - ]; - }) - (sources."import-from-2.1.0" // { - dependencies = [ - sources."resolve-from-3.0.0" - ]; - }) - sources."import-local-2.0.0" - sources."imurmurhash-0.1.4" - sources."indexes-of-1.0.1" - sources."indexof-0.0.1" - sources."infer-owner-1.0.4" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - sources."ini-1.3.8" - sources."inquirer-6.5.2" - (sources."inquirer-autocomplete-prompt-1.4.0" // { - dependencies = [ - sources."ansi-escapes-4.3.2" - sources."ansi-styles-4.3.0" - sources."chalk-4.1.2" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."figures-3.2.0" - sources."has-flag-4.0.0" - sources."supports-color-7.2.0" - ]; - }) - sources."internal-ip-4.3.0" - sources."internal-slot-1.0.5" - sources."intersection-observer-0.7.0" - sources."into-stream-3.1.0" - sources."invariant-2.2.4" - sources."ip-1.1.8" - sources."ip-regex-2.1.0" - sources."ipaddr.js-1.9.1" - sources."is-absolute-url-2.1.0" - sources."is-accessor-descriptor-1.0.0" - sources."is-arguments-1.1.1" - sources."is-array-buffer-3.0.2" - sources."is-arrayish-0.2.1" - sources."is-bigint-1.0.4" - sources."is-binary-path-2.1.0" - sources."is-boolean-object-1.1.2" - sources."is-buffer-1.1.6" - sources."is-callable-1.2.7" - sources."is-color-stop-1.1.0" - sources."is-core-module-2.13.0" - sources."is-data-descriptor-1.0.0" - sources."is-date-object-1.0.5" - sources."is-deflate-1.0.0" - sources."is-descriptor-1.0.2" - sources."is-directory-0.3.1" - sources."is-extendable-0.1.1" - sources."is-extglob-2.1.1" - sources."is-fullwidth-code-point-2.0.0" - sources."is-glob-4.0.3" - sources."is-gzip-1.0.0" - sources."is-natural-number-4.0.1" - sources."is-negative-zero-2.0.2" - sources."is-number-7.0.0" - sources."is-number-object-1.0.7" - sources."is-obj-2.0.0" - sources."is-object-1.0.2" - sources."is-path-cwd-2.2.0" - sources."is-path-in-cwd-2.1.0" - sources."is-path-inside-2.1.0" - sources."is-plain-obj-1.1.0" - sources."is-plain-object-2.0.4" - sources."is-regex-1.1.4" - sources."is-resolvable-1.1.0" - sources."is-retry-allowed-1.2.0" - sources."is-shared-array-buffer-1.0.2" - sources."is-stream-1.1.0" - sources."is-string-1.0.7" - sources."is-symbol-1.0.4" - sources."is-typed-array-1.1.12" - sources."is-weakref-1.0.2" - sources."is-windows-1.0.2" - sources."is-wsl-1.1.0" - sources."isarray-1.0.0" - sources."isexe-2.0.0" - sources."isobject-3.0.1" - sources."isurl-1.0.0" - sources."js-tokens-4.0.0" - sources."js-yaml-3.14.1" - sources."jsesc-2.5.2" - sources."json-buffer-3.0.0" - sources."json-parse-better-errors-1.0.2" - sources."json-parse-even-better-errors-2.3.1" - sources."json-schema-traverse-0.4.1" - sources."json5-2.2.3" - sources."jsonfile-4.0.0" - sources."keyv-3.0.0" - sources."killable-1.0.1" - sources."kind-of-6.0.3" - sources."last-call-webpack-plugin-3.0.0" - sources."lines-and-columns-1.2.4" - sources."loader-runner-2.4.0" - sources."loader-utils-2.0.4" - sources."locate-path-3.0.0" - sources."lodash-4.17.21" - sources."lodash.debounce-4.0.8" - sources."lodash.memoize-4.1.2" - sources."lodash.uniq-4.5.0" - sources."loglevel-1.8.1" - sources."loose-envify-1.4.0" - sources."lower-case-1.1.4" - sources."lowercase-keys-1.0.1" - sources."lru-cache-5.1.1" - sources."make-dir-2.1.0" - sources."map-cache-0.2.2" - sources."map-visit-1.0.0" - sources."match-sorter-3.1.1" - sources."md5.js-1.3.5" - sources."mdn-data-2.0.4" - sources."media-typer-0.3.0" - sources."memory-fs-0.4.1" - sources."merge-descriptors-1.0.1" - sources."methods-1.1.2" - (sources."micromatch-3.1.10" // { - dependencies = [ - (sources."braces-2.3.2" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) - (sources."fill-range-4.0.0" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) - (sources."is-number-3.0.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."to-regex-range-2.1.1" - ]; - }) - (sources."miller-rabin-4.0.1" // { - dependencies = [ - sources."bn.js-4.12.0" - ]; - }) - sources."mime-2.6.0" - sources."mime-db-1.52.0" - sources."mime-types-2.1.35" - sources."mimic-fn-1.2.0" - sources."mimic-response-1.0.1" - sources."min-document-2.19.0" - sources."minimalistic-assert-1.0.1" - sources."minimalistic-crypto-utils-1.0.1" - sources."minimatch-3.1.2" - sources."minimist-1.2.8" - (sources."mississippi-3.0.0" // { - dependencies = [ - sources."pump-3.0.0" - ]; - }) - (sources."mixin-deep-1.3.2" // { - dependencies = [ - sources."is-extendable-1.0.1" - ]; - }) - sources."mkdirp-0.5.6" - sources."mkdirp-classic-0.5.3" - sources."move-concurrently-1.0.1" - sources."ms-2.1.2" - sources."multicast-dns-6.2.3" - sources."multicast-dns-service-types-1.1.0" - sources."mutation-observer-1.0.3" - sources."mute-stream-0.0.7" - sources."nan-2.17.0" - sources."nanomatch-1.2.13" - sources."negotiator-0.6.3" - sources."neo-async-2.6.2" - sources."nice-try-1.0.5" - sources."no-case-2.3.2" - sources."node-forge-0.10.0" - sources."node-gyp-build-4.6.0" - (sources."node-libs-browser-2.2.1" // { - dependencies = [ - sources."browserify-zlib-0.2.0" - sources."buffer-4.9.2" - sources."pako-1.0.11" - sources."punycode-1.4.1" - ]; - }) - sources."node-releases-2.0.13" - sources."normalize-path-3.0.0" - sources."normalize-range-0.1.2" - (sources."normalize-url-2.0.1" // { - dependencies = [ - sources."sort-keys-2.0.0" - ]; - }) - (sources."npm-conf-1.1.3" // { - dependencies = [ - sources."pify-3.0.0" - ]; - }) - sources."npm-run-path-2.0.2" - sources."nth-check-1.0.2" - sources."num2fraction-1.2.2" - sources."object-assign-4.1.1" - (sources."object-copy-0.1.0" // { - dependencies = [ - sources."define-property-0.2.5" - sources."is-accessor-descriptor-0.1.6" - sources."is-data-descriptor-0.1.4" - (sources."is-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-5.1.0" - ]; - }) - sources."kind-of-3.2.2" - ]; - }) - sources."object-inspect-1.12.3" - sources."object-is-1.1.5" - sources."object-keys-1.1.1" - sources."object-visit-1.0.1" - sources."object.assign-4.1.4" - sources."object.getownpropertydescriptors-2.1.6" - sources."object.pick-1.3.0" - sources."object.values-1.1.6" - sources."obuf-1.1.2" - sources."on-finished-2.4.1" - sources."on-headers-1.0.2" - sources."once-1.4.0" - sources."onetime-2.0.1" - sources."opener-1.5.2" - sources."opn-5.5.0" - sources."optimize-css-assets-webpack-plugin-5.0.8" - sources."os-browserify-0.3.0" - sources."os-tmpdir-1.0.2" - sources."p-cancelable-0.4.1" - sources."p-event-2.3.1" - sources."p-finally-1.0.0" - sources."p-is-promise-1.1.0" - sources."p-limit-2.3.0" - sources."p-locate-3.0.0" - sources."p-map-2.1.0" - sources."p-retry-3.0.1" - sources."p-timeout-2.0.1" - sources."p-try-2.2.0" - sources."pako-0.2.9" - sources."parallel-transform-1.2.0" - sources."param-case-2.1.1" - sources."parent-module-1.0.1" - sources."parse-asn1-5.1.6" - sources."parse-json-5.2.0" - sources."parseqs-0.0.6" - sources."parseuri-0.0.6" - sources."parseurl-1.3.3" - sources."pascalcase-0.1.1" - sources."path-browserify-0.0.1" - sources."path-dirname-1.0.2" - sources."path-exists-3.0.0" - sources."path-is-absolute-1.0.1" - sources."path-is-inside-1.0.2" - sources."path-key-2.0.1" - sources."path-parse-1.0.7" - sources."path-to-regexp-2.2.1" - sources."path-type-4.0.0" - sources."pbkdf2-3.1.2" - sources."peek-stream-1.1.3" - sources."pend-1.2.0" - sources."performance-now-2.1.0" - sources."picocolors-1.0.0" - sources."picomatch-2.3.1" - sources."pify-4.0.1" - sources."pinkie-2.0.4" - sources."pinkie-promise-2.0.1" - sources."pirates-4.0.6" - sources."pkg-dir-3.0.0" - (sources."portfinder-1.0.32" // { - dependencies = [ - sources."debug-3.2.7" - ]; - }) - sources."posix-character-classes-0.1.1" - (sources."postcss-7.0.39" // { - dependencies = [ - sources."picocolors-0.2.1" - ]; - }) - sources."postcss-calc-7.0.5" - (sources."postcss-colormin-4.0.3" // { - dependencies = [ - sources."postcss-value-parser-3.3.1" - ]; - }) - (sources."postcss-convert-values-4.0.1" // { - dependencies = [ - sources."postcss-value-parser-3.3.1" - ]; - }) - sources."postcss-discard-comments-4.0.2" - sources."postcss-discard-duplicates-4.0.2" - sources."postcss-discard-empty-4.0.1" - sources."postcss-discard-overridden-4.0.1" - sources."postcss-flexbugs-fixes-4.2.1" - (sources."postcss-load-config-2.1.2" // { - dependencies = [ - sources."cosmiconfig-5.2.1" - sources."import-fresh-2.0.0" - sources."parse-json-4.0.0" - sources."resolve-from-3.0.0" - ]; - }) - (sources."postcss-loader-3.0.0" // { - dependencies = [ - sources."json5-1.0.2" - sources."loader-utils-1.4.2" - sources."schema-utils-1.0.0" - ]; - }) - (sources."postcss-merge-longhand-4.0.11" // { - dependencies = [ - sources."postcss-value-parser-3.3.1" - ]; - }) - (sources."postcss-merge-rules-4.0.3" // { - dependencies = [ - sources."postcss-selector-parser-3.1.2" - ]; - }) - (sources."postcss-minify-font-values-4.0.2" // { - dependencies = [ - sources."postcss-value-parser-3.3.1" - ]; - }) - (sources."postcss-minify-gradients-4.0.2" // { - dependencies = [ - sources."postcss-value-parser-3.3.1" - ]; - }) - (sources."postcss-minify-params-4.0.2" // { - dependencies = [ - sources."postcss-value-parser-3.3.1" - ]; - }) - (sources."postcss-minify-selectors-4.0.2" // { - dependencies = [ - sources."postcss-selector-parser-3.1.2" - ]; - }) - sources."postcss-modules-extract-imports-2.0.0" - (sources."postcss-modules-local-by-default-2.0.6" // { - dependencies = [ - sources."postcss-value-parser-3.3.1" - ]; - }) - sources."postcss-modules-scope-2.2.0" - sources."postcss-modules-values-2.0.0" - sources."postcss-normalize-charset-4.0.1" - (sources."postcss-normalize-display-values-4.0.2" // { - dependencies = [ - sources."postcss-value-parser-3.3.1" - ]; - }) - (sources."postcss-normalize-positions-4.0.2" // { - dependencies = [ - sources."postcss-value-parser-3.3.1" - ]; - }) - (sources."postcss-normalize-repeat-style-4.0.2" // { - dependencies = [ - sources."postcss-value-parser-3.3.1" - ]; - }) - (sources."postcss-normalize-string-4.0.2" // { - dependencies = [ - sources."postcss-value-parser-3.3.1" - ]; - }) - (sources."postcss-normalize-timing-functions-4.0.2" // { - dependencies = [ - sources."postcss-value-parser-3.3.1" - ]; - }) - (sources."postcss-normalize-unicode-4.0.1" // { - dependencies = [ - sources."postcss-value-parser-3.3.1" - ]; - }) - (sources."postcss-normalize-url-4.0.1" // { - dependencies = [ - sources."normalize-url-3.3.0" - sources."postcss-value-parser-3.3.1" - ]; - }) - (sources."postcss-normalize-whitespace-4.0.2" // { - dependencies = [ - sources."postcss-value-parser-3.3.1" - ]; - }) - (sources."postcss-ordered-values-4.1.2" // { - dependencies = [ - sources."postcss-value-parser-3.3.1" - ]; - }) - sources."postcss-reduce-initial-4.0.3" - (sources."postcss-reduce-transforms-4.0.2" // { - dependencies = [ - sources."postcss-value-parser-3.3.1" - ]; - }) - sources."postcss-selector-parser-6.0.13" - (sources."postcss-svgo-4.0.3" // { - dependencies = [ - sources."postcss-value-parser-3.3.1" - ]; - }) - sources."postcss-unique-selectors-4.0.1" - sources."postcss-value-parser-4.2.0" - sources."prepend-http-2.0.0" - sources."pretty-error-2.1.2" - sources."process-0.11.10" - sources."process-nextick-args-2.0.1" - sources."progress-2.0.3" - sources."promise-inflight-1.0.1" - sources."prop-types-15.8.1" - sources."proto-list-1.2.4" - sources."proxy-addr-2.0.7" - sources."prr-1.0.1" - sources."pseudomap-1.0.2" - (sources."public-encrypt-4.0.3" // { - dependencies = [ - sources."bn.js-4.12.0" - ]; - }) - sources."pump-2.0.1" - sources."pumpify-1.5.1" - sources."punycode-2.3.0" - sources."q-1.5.1" - sources."qs-6.11.2" - sources."query-string-5.1.1" - sources."querystring-es3-0.2.1" - sources."querystringify-2.2.0" - sources."raf-3.4.1" - sources."randombytes-2.1.0" - sources."randomfill-1.0.4" - sources."range-parser-1.2.0" - (sources."raw-body-2.5.1" // { - dependencies = [ - sources."bytes-3.1.2" - ]; - }) - (sources."raw-loader-3.1.0" // { - dependencies = [ - sources."json5-1.0.2" - sources."loader-utils-1.4.2" - ]; - }) - sources."rc-1.2.8" - sources."react-16.14.0" - sources."react-dom-16.14.0" - sources."react-fast-compare-3.2.2" - sources."react-helmet-6.1.0" - (sources."react-hot-loader-4.13.1" // { - dependencies = [ - sources."source-map-0.7.4" - ]; - }) - sources."react-is-16.13.1" - sources."react-lifecycles-compat-3.0.4" - sources."react-side-effect-2.1.2" - sources."react-universal-component-4.5.0" - (sources."readable-stream-2.3.8" // { - dependencies = [ - sources."safe-buffer-5.1.2" - ]; - }) - sources."readdirp-3.6.0" - sources."regenerate-1.4.2" - sources."regenerate-unicode-properties-10.1.0" - sources."regenerator-runtime-0.14.0" - sources."regenerator-transform-0.15.2" - sources."regex-not-1.0.2" - sources."regexp.prototype.flags-1.5.0" - sources."regexpu-core-5.3.2" - sources."registry-auth-token-3.3.2" - sources."registry-url-3.1.0" - (sources."regjsparser-0.9.1" // { - dependencies = [ - sources."jsesc-0.5.0" - ]; - }) - sources."relateurl-0.2.7" - sources."remove-trailing-separator-1.1.0" - (sources."renderkid-2.0.7" // { - dependencies = [ - sources."ansi-regex-2.1.1" - sources."css-select-4.3.0" - sources."css-what-6.1.0" - sources."dom-serializer-1.4.1" - sources."domelementtype-2.3.0" - sources."domutils-2.8.0" - sources."nth-check-2.1.1" - sources."strip-ansi-3.0.1" - ]; - }) - sources."repeat-element-1.1.4" - sources."repeat-string-1.6.1" - sources."require-directory-2.1.1" - sources."require-main-filename-2.0.0" - sources."requires-port-1.0.0" - sources."resolve-1.22.4" - (sources."resolve-cwd-2.0.0" // { - dependencies = [ - sources."resolve-from-3.0.0" - ]; - }) - sources."resolve-from-5.0.0" - sources."resolve-url-0.2.1" - sources."responselike-1.0.2" - sources."restore-cursor-2.0.0" - sources."ret-0.1.15" - sources."retry-0.12.0" - sources."rgb-regex-1.0.1" - sources."rgba-regex-1.0.0" - sources."rimraf-2.7.1" - sources."ripemd160-2.0.2" - sources."run-async-2.4.1" - sources."run-queue-1.0.3" - sources."rxjs-6.6.7" - (sources."safe-array-concat-1.0.0" // { - dependencies = [ - sources."isarray-2.0.5" - ]; - }) - sources."safe-buffer-5.2.1" - sources."safe-regex-1.1.0" - sources."safe-regex-test-1.0.0" - sources."safer-buffer-2.1.2" - sources."sax-1.2.4" - sources."scheduler-0.19.1" - sources."schema-utils-2.7.1" - (sources."seek-bzip-1.0.6" // { - dependencies = [ - sources."commander-2.20.3" - ]; - }) - sources."select-hose-2.0.0" - sources."selfsigned-1.10.14" - sources."semver-5.7.2" - (sources."send-0.18.0" // { - dependencies = [ - (sources."debug-2.6.9" // { - dependencies = [ - sources."ms-2.0.0" - ]; - }) - sources."mime-1.6.0" - sources."ms-2.1.3" - sources."range-parser-1.2.1" - ]; - }) - sources."serialize-javascript-4.0.0" - (sources."serve-11.3.2" // { - dependencies = [ - sources."ajv-6.5.3" - sources."chalk-2.4.1" - sources."fast-deep-equal-2.0.1" - ]; - }) - (sources."serve-handler-6.1.3" // { - dependencies = [ - sources."content-disposition-0.5.2" - sources."mime-db-1.33.0" - sources."mime-types-2.1.18" - sources."minimatch-3.0.4" - ]; - }) - (sources."serve-index-1.9.1" // { - dependencies = [ - sources."debug-2.6.9" - sources."depd-1.1.2" - sources."http-errors-1.6.3" - sources."inherits-2.0.3" - sources."ms-2.0.0" - sources."setprototypeof-1.1.0" - sources."statuses-1.5.0" - ]; - }) - sources."serve-static-1.15.0" - sources."set-blocking-2.0.0" - (sources."set-value-2.0.1" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) - sources."setimmediate-1.0.5" - sources."setprototypeof-1.2.0" - sources."sha.js-2.4.11" - sources."shallow-clone-3.0.1" - sources."shallowequal-1.1.0" - sources."shebang-command-1.2.0" - sources."shebang-regex-1.0.0" - sources."shorthash-0.0.2" - sources."side-channel-1.0.4" - sources."signal-exit-3.0.7" - (sources."simple-swizzle-0.2.2" // { - dependencies = [ - sources."is-arrayish-0.3.2" - ]; - }) - sources."slash-2.0.0" - (sources."snapdragon-0.8.2" // { - dependencies = [ - sources."debug-2.6.9" - sources."define-property-0.2.5" - sources."extend-shallow-2.0.1" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" - sources."ms-2.0.0" - sources."source-map-0.5.7" - ]; - }) - (sources."snapdragon-node-2.1.1" // { - dependencies = [ - sources."define-property-1.0.0" - ]; - }) - (sources."snapdragon-util-3.0.1" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."socket.io-2.5.0" // { - dependencies = [ - sources."debug-4.1.1" - ]; - }) - sources."socket.io-adapter-1.1.2" - (sources."socket.io-client-2.5.0" // { - dependencies = [ - sources."component-emitter-1.3.0" - sources."debug-3.1.0" - sources."isarray-2.0.1" - sources."ms-2.0.0" - sources."socket.io-parser-3.3.3" - ]; - }) - (sources."socket.io-parser-3.4.3" // { - dependencies = [ - sources."debug-4.1.1" - sources."isarray-2.0.1" - ]; - }) - sources."sockjs-0.3.24" - (sources."sockjs-client-1.6.1" // { - dependencies = [ - sources."debug-3.2.7" - ]; - }) - sources."sort-keys-1.1.2" - sources."sort-keys-length-1.0.1" - sources."source-list-map-2.0.1" - sources."source-map-0.6.1" - sources."source-map-resolve-0.5.3" - sources."source-map-support-0.5.21" - sources."source-map-url-0.4.1" - sources."spdy-4.0.2" - (sources."spdy-transport-3.0.0" // { - dependencies = [ - sources."readable-stream-3.6.2" - ]; - }) - sources."split-string-3.1.0" - sources."sprintf-js-1.0.3" - sources."ssri-6.0.2" - sources."stable-0.1.8" - (sources."static-extend-0.1.2" // { - dependencies = [ - sources."define-property-0.2.5" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" - ]; - }) - sources."statuses-2.0.1" - sources."stream-browserify-2.0.2" - sources."stream-each-1.2.3" - sources."stream-http-2.8.3" - sources."stream-shift-1.0.1" - sources."strict-uri-encode-1.1.0" - (sources."string-width-2.1.1" // { - dependencies = [ - sources."strip-ansi-4.0.0" - ]; - }) - sources."string.prototype.trim-1.2.7" - sources."string.prototype.trimend-1.0.6" - sources."string.prototype.trimstart-1.0.6" - (sources."string_decoder-1.1.1" // { - dependencies = [ - sources."safe-buffer-5.1.2" - ]; - }) - (sources."strip-ansi-5.2.0" // { - dependencies = [ - sources."ansi-regex-4.1.1" - ]; - }) - sources."strip-dirs-2.1.0" - sources."strip-eof-1.0.0" - sources."strip-json-comments-2.0.1" - sources."strip-outer-1.0.1" - (sources."style-loader-0.23.1" // { - dependencies = [ - sources."json5-1.0.2" - sources."loader-utils-1.4.2" - sources."schema-utils-1.0.0" - ]; - }) - (sources."stylehacks-4.0.3" // { - dependencies = [ - sources."postcss-selector-parser-3.1.2" - ]; - }) - sources."supports-color-5.5.0" - sources."supports-preserve-symlinks-flag-1.0.0" - sources."svgo-1.3.2" - sources."swimmer-1.4.0" - sources."tapable-1.1.3" - (sources."tar-fs-2.1.1" // { - dependencies = [ - sources."bl-4.1.0" - sources."pump-3.0.0" - sources."readable-stream-3.6.2" - sources."tar-stream-2.2.0" - ]; - }) - sources."tar-stream-1.6.2" - sources."term-size-1.2.0" - (sources."terser-4.8.1" // { - dependencies = [ - sources."commander-2.20.3" - ]; - }) - (sources."terser-webpack-plugin-1.4.5" // { - dependencies = [ - sources."schema-utils-1.0.0" - ]; - }) - sources."through-2.3.8" - sources."through2-2.0.5" - sources."thunky-1.1.0" - sources."timed-out-4.0.1" - sources."timers-browserify-2.0.12" - sources."timsort-0.3.0" - sources."tmp-0.0.33" - sources."to-array-0.1.4" - sources."to-arraybuffer-1.0.1" - sources."to-buffer-1.1.1" - sources."to-fast-properties-2.0.0" - (sources."to-object-path-0.3.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."to-regex-3.0.2" - sources."to-regex-range-5.0.1" - sources."toidentifier-1.0.1" - sources."toposort-1.0.7" - sources."trim-repeated-1.0.0" - sources."tryer-1.0.1" - sources."tslib-1.14.1" - sources."tty-browserify-0.0.0" - sources."tunnel-agent-0.6.0" - sources."type-fest-0.21.3" - sources."type-is-1.6.18" - sources."typed-array-buffer-1.0.0" - sources."typed-array-byte-length-1.0.0" - sources."typed-array-byte-offset-1.0.0" - sources."typed-array-length-1.0.4" - sources."typedarray-0.0.6" - (sources."uglify-js-3.4.10" // { - dependencies = [ - sources."commander-2.19.0" - ]; - }) - sources."unbox-primitive-1.0.2" - sources."unbzip2-stream-1.4.3" - sources."unicode-canonical-property-names-ecmascript-2.0.0" - sources."unicode-match-property-ecmascript-2.0.0" - sources."unicode-match-property-value-ecmascript-2.1.0" - sources."unicode-property-aliases-ecmascript-2.1.0" - sources."union-value-1.0.1" - sources."uniq-1.0.1" - sources."uniqs-2.0.0" - sources."unique-filename-1.1.1" - sources."unique-slug-2.0.2" - sources."universalify-0.1.2" - sources."unpipe-1.0.0" - sources."unquote-1.1.1" - (sources."unset-value-1.0.0" // { - dependencies = [ - (sources."has-value-0.3.1" // { - dependencies = [ - sources."isobject-2.1.0" - ]; - }) - sources."has-values-0.1.4" - ]; - }) - sources."upath-1.2.0" - sources."update-browserslist-db-1.0.11" - sources."update-check-1.5.2" - sources."upper-case-1.1.3" - sources."uri-js-4.4.1" - sources."urix-0.1.0" - (sources."url-0.11.1" // { - dependencies = [ - sources."punycode-1.4.1" - ]; - }) - (sources."url-loader-2.3.0" // { - dependencies = [ - sources."json5-1.0.2" - sources."loader-utils-1.4.2" - ]; - }) - sources."url-parse-1.5.10" - sources."url-parse-lax-3.0.0" - sources."url-to-options-1.0.1" - sources."use-3.1.1" - sources."utf-8-validate-5.0.10" - (sources."util-0.11.1" // { - dependencies = [ - sources."inherits-2.0.3" - ]; - }) - sources."util-deprecate-1.0.2" - sources."util.promisify-1.0.0" - sources."utila-0.4.0" - sources."utils-merge-1.0.1" - sources."uuid-8.3.2" - sources."vary-1.1.2" - sources."vendors-1.0.4" - sources."vm-browserify-1.1.2" - sources."warning-4.0.3" - sources."watchpack-1.7.5" - (sources."watchpack-chokidar2-2.0.1" // { - dependencies = [ - sources."anymatch-2.0.0" - sources."binary-extensions-1.13.1" - sources."braces-2.3.2" - sources."chokidar-2.1.8" - sources."extend-shallow-2.0.1" - sources."fill-range-4.0.0" - sources."fsevents-1.2.13" - sources."glob-parent-3.1.0" - sources."is-binary-path-1.0.1" - sources."is-glob-3.1.0" - sources."is-number-3.0.0" - sources."kind-of-3.2.2" - sources."normalize-path-2.1.1" - sources."readdirp-2.2.1" - sources."to-regex-range-2.1.1" - ]; - }) - sources."wbuf-1.7.3" - (sources."webpack-4.46.0" // { - dependencies = [ - sources."json5-1.0.2" - sources."loader-utils-1.4.2" - sources."schema-utils-1.0.0" - ]; - }) - (sources."webpack-bundle-analyzer-3.9.0" // { - dependencies = [ - sources."acorn-7.4.1" - sources."commander-2.20.3" - sources."ws-6.2.2" - ]; - }) - (sources."webpack-dev-middleware-3.7.3" // { - dependencies = [ - sources."range-parser-1.2.1" - ]; - }) - (sources."webpack-dev-server-3.11.3" // { - dependencies = [ - sources."ansi-regex-2.1.1" - sources."anymatch-2.0.0" - sources."binary-extensions-1.13.1" - sources."braces-2.3.2" - sources."chokidar-2.1.8" - (sources."compression-1.7.4" // { - dependencies = [ - sources."debug-2.6.9" - ]; - }) - sources."extend-shallow-2.0.1" - sources."fill-range-4.0.0" - sources."fsevents-1.2.13" - sources."glob-parent-3.1.0" - sources."is-absolute-url-3.0.3" - sources."is-binary-path-1.0.1" - sources."is-glob-3.1.0" - sources."is-number-3.0.0" - sources."kind-of-3.2.2" - sources."ms-2.0.0" - sources."normalize-path-2.1.1" - sources."readdirp-2.2.1" - sources."safe-buffer-5.1.2" - sources."schema-utils-1.0.0" - sources."semver-6.3.1" - sources."strip-ansi-3.0.1" - sources."supports-color-6.1.0" - sources."to-regex-range-2.1.1" - sources."ws-6.2.2" - ]; - }) - sources."webpack-flush-chunks-2.0.3" - (sources."webpack-log-2.0.0" // { - dependencies = [ - sources."uuid-3.4.0" - ]; - }) - sources."webpack-node-externals-1.7.2" - sources."webpack-sources-1.4.3" - sources."websocket-driver-0.7.4" - sources."websocket-extensions-0.1.4" - sources."which-1.3.1" - sources."which-boxed-primitive-1.0.2" - sources."which-module-2.0.1" - sources."which-typed-array-1.1.11" - sources."widest-line-2.0.1" - sources."worker-farm-1.7.0" - (sources."wrap-ansi-5.1.0" // { - dependencies = [ - sources."string-width-3.1.0" - ]; - }) - sources."wrappy-1.0.2" - sources."ws-7.4.6" - sources."xmlhttprequest-ssl-1.6.3" - sources."xtend-4.0.2" - sources."y18n-4.0.3" - sources."yallist-3.1.1" - sources."yaml-1.10.2" - (sources."yargs-13.3.2" // { - dependencies = [ - sources."string-width-3.1.0" - ]; - }) - sources."yargs-parser-13.1.2" - sources."yauzl-2.10.0" - sources."yeast-0.1.2" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "A progressive static site generator for React"; - homepage = "https://github.com/react-static/react-static#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; react-tools = nodeEnv.buildNodePackage { name = "react-tools"; packageName = "react-tools"; @@ -110556,62 +107894,6 @@ in bypassCache = true; reconstructLock = true; }; - snyk = nodeEnv.buildNodePackage { - name = "snyk"; - packageName = "snyk"; - version = "1.1205.0"; - src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.1205.0.tgz"; - sha512 = "pYnSzBQXZPtPjHZ/VWmu6/dGj0yae6wKddarAZdeCIWnm8RSJ194mormeccprZ6IK8RwAxApZcL2hET5mDjxnA=="; - }; - dependencies = [ - sources."@sentry-internal/tracing-7.64.0" - sources."@sentry/core-7.64.0" - sources."@sentry/node-7.64.0" - sources."@sentry/types-7.64.0" - sources."@sentry/utils-7.64.0" - sources."agent-base-6.0.2" - sources."boolean-3.2.0" - sources."cookie-0.4.2" - sources."debug-4.3.4" - sources."define-properties-1.2.0" - sources."detect-node-2.1.0" - sources."es6-error-4.1.1" - sources."escape-string-regexp-4.0.0" - sources."function-bind-1.1.1" - sources."get-intrinsic-1.2.1" - sources."global-agent-3.0.0" - sources."globalthis-1.0.3" - sources."has-1.0.3" - sources."has-property-descriptors-1.0.0" - sources."has-proto-1.0.1" - sources."has-symbols-1.0.3" - sources."https-proxy-agent-5.0.1" - sources."json-stringify-safe-5.0.1" - sources."lru-cache-6.0.0" - sources."lru_map-0.3.3" - sources."matcher-3.0.0" - sources."ms-2.1.2" - sources."object-keys-1.1.1" - sources."roarr-2.15.4" - sources."semver-7.5.4" - sources."semver-compare-1.0.0" - sources."serialize-error-7.0.1" - sources."sprintf-js-1.1.2" - sources."tslib-2.6.2" - sources."type-fest-0.13.1" - sources."yallist-4.0.0" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "snyk library and cli utility"; - homepage = "https://github.com/snyk/snyk#readme"; - license = "Apache-2.0"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; "socket.io" = nodeEnv.buildNodePackage { name = "socket.io"; packageName = "socket.io"; @@ -116691,160 +113973,6 @@ in bypassCache = true; reconstructLock = true; }; - titanium = nodeEnv.buildNodePackage { - name = "titanium"; - packageName = "titanium"; - version = "6.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/titanium/-/titanium-6.1.1.tgz"; - sha512 = "jz1pZ1jDB72H63SaHYUYLbiBBVmaGPIprSKQr2rbuoNPNasp9EerMouqSUiVdnvaKElpnW/sWiMmPs4XINmo0w=="; - }; - dependencies = [ - sources."@sindresorhus/is-4.6.0" - sources."@szmarczak/http-timer-4.0.6" - sources."@types/cacheable-request-6.0.3" - sources."@types/http-cache-semantics-4.0.1" - sources."@types/keyv-3.1.4" - sources."@types/node-20.5.3" - sources."@types/responselike-1.0.0" - sources."@xmldom/xmldom-0.8.10" - sources."ajv-6.12.6" - sources."asn1-0.2.6" - sources."assert-plus-1.0.0" - sources."async-3.2.4" - sources."asynckit-0.4.0" - sources."at-least-node-1.0.0" - sources."aws-sign2-0.7.0" - sources."aws4-1.12.0" - sources."balanced-match-1.0.2" - sources."bcrypt-pbkdf-1.0.2" - sources."brace-expansion-1.1.11" - sources."buffer-crc32-0.2.13" - sources."cacheable-lookup-5.0.4" - sources."cacheable-request-7.0.4" - sources."caseless-0.12.0" - sources."clone-response-1.0.3" - sources."colors-1.4.0" - sources."combined-stream-1.0.8" - sources."concat-map-0.0.1" - sources."core-util-is-1.0.2" - sources."cycle-1.0.3" - sources."dashdash-1.14.1" - (sources."decompress-response-6.0.0" // { - dependencies = [ - sources."mimic-response-3.1.0" - ]; - }) - sources."defer-to-connect-2.0.1" - sources."delayed-stream-1.0.0" - sources."ecc-jsbn-0.1.2" - sources."end-of-stream-1.4.4" - sources."extend-3.0.2" - sources."extsprintf-1.3.0" - sources."eyes-0.1.8" - sources."fast-deep-equal-3.1.3" - sources."fast-json-stable-stringify-2.1.0" - sources."fd-slicer-1.1.0" - (sources."fields-0.1.24" // { - dependencies = [ - sources."colors-0.6.2" - ]; - }) - sources."forever-agent-0.6.1" - sources."form-data-2.3.3" - sources."fs-extra-9.1.0" - sources."fs.realpath-1.0.0" - sources."get-stream-5.2.0" - sources."getpass-0.1.7" - sources."glob-7.2.3" - sources."got-11.8.6" - sources."graceful-fs-4.2.11" - sources."har-schema-2.0.0" - sources."har-validator-5.1.5" - sources."http-cache-semantics-4.1.1" - sources."http-signature-1.2.0" - sources."http2-wrapper-1.0.3" - sources."humanize-0.0.9" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - sources."is-typedarray-1.0.0" - sources."isstream-0.1.2" - sources."jsbn-0.1.1" - sources."json-buffer-3.0.1" - sources."json-schema-0.4.0" - sources."json-schema-traverse-0.4.1" - sources."json-stringify-safe-5.0.1" - sources."jsonfile-6.1.0" - sources."jsprim-1.4.2" - sources."keypress-0.2.1" - sources."keyv-4.5.3" - sources."lowercase-keys-2.0.0" - sources."lru-cache-6.0.0" - sources."mime-db-1.52.0" - sources."mime-types-2.1.35" - sources."mimic-response-1.0.1" - sources."minimatch-3.1.2" - sources."minimist-1.2.8" - sources."mkdirp-0.5.6" - sources."node-appc-1.1.6" - sources."normalize-url-6.1.0" - sources."oauth-sign-0.9.0" - sources."once-1.4.0" - sources."p-cancelable-2.1.1" - sources."path-is-absolute-1.0.1" - sources."pend-1.2.0" - sources."performance-now-2.1.0" - sources."psl-1.9.0" - sources."pump-3.0.0" - sources."punycode-2.3.0" - sources."qs-6.5.3" - sources."quick-lru-5.1.1" - (sources."request-2.88.2" // { - dependencies = [ - sources."uuid-3.4.0" - ]; - }) - sources."resolve-alpn-1.2.1" - sources."responselike-2.0.1" - sources."rimraf-2.6.3" - sources."safe-buffer-5.2.1" - sources."safer-buffer-2.1.2" - sources."semver-7.3.8" - sources."sprintf-0.1.5" - sources."sshpk-1.17.0" - sources."stack-trace-0.0.10" - sources."temp-0.9.4" - (sources."tmp-0.2.1" // { - dependencies = [ - sources."rimraf-3.0.2" - ]; - }) - sources."tough-cookie-2.5.0" - sources."tunnel-agent-0.6.0" - sources."tweetnacl-0.14.5" - sources."universalify-2.0.0" - sources."uri-js-4.4.1" - sources."uuid-9.0.0" - sources."verror-1.10.0" - (sources."winston-2.4.6" // { - dependencies = [ - sources."colors-1.0.3" - ]; - }) - sources."wrappy-1.0.2" - sources."yallist-4.0.0" - sources."yauzl-2.10.0" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "TiDev Titanium Command line"; - homepage = "https://github.com/tidev/titanium#readme"; - license = "Apache-2.0"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; tsun = nodeEnv.buildNodePackage { name = "tsun"; packageName = "tsun"; @@ -119627,47 +116755,6 @@ in bypassCache = true; reconstructLock = true; }; - yaml-language-server = nodeEnv.buildNodePackage { - name = "yaml-language-server"; - packageName = "yaml-language-server"; - version = "1.14.0"; - src = fetchurl { - url = "https://registry.npmjs.org/yaml-language-server/-/yaml-language-server-1.14.0.tgz"; - sha512 = "HnNiHM5AOTXuM8ZpubzqgTy+7V5kFiMXVedOT2yjhvnxCw6pbMXcD/ymHaaT5v2ue0H8GGH4NFkvCEzcIcTJDg=="; - }; - dependencies = [ - sources."ajv-8.12.0" - sources."fast-deep-equal-3.1.3" - sources."json-schema-traverse-1.0.0" - sources."jsonc-parser-3.2.0" - sources."lodash-4.17.21" - sources."punycode-2.3.0" - sources."request-light-0.5.8" - sources."require-from-string-2.0.2" - sources."uri-js-4.4.1" - sources."vscode-json-languageservice-4.1.8" - sources."vscode-jsonrpc-6.0.0" - sources."vscode-languageserver-7.0.0" - (sources."vscode-languageserver-protocol-3.16.0" // { - dependencies = [ - sources."vscode-languageserver-types-3.16.0" - ]; - }) - sources."vscode-languageserver-textdocument-1.0.10" - sources."vscode-languageserver-types-3.17.3" - sources."vscode-nls-5.2.0" - sources."vscode-uri-3.0.7" - sources."yaml-2.2.2" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "YAML language server"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; yalc = nodeEnv.buildNodePackage { name = "yalc"; packageName = "yalc"; diff --git a/nixpkgs/pkgs/development/node-packages/overrides.nix b/nixpkgs/pkgs/development/node-packages/overrides.nix index 4b94a320362e..a73cd7d128cd 100644 --- a/nixpkgs/pkgs/development/node-packages/overrides.nix +++ b/nixpkgs/pkgs/development/node-packages/overrides.nix @@ -118,9 +118,6 @@ final: prev: { ''; }; - hsd = prev.hsd.override { - buildInputs = [ final.node-gyp-build pkgs.unbound ]; - }; ijavascript = prev.ijavascript.override (oldAttrs: { preRebuild = '' @@ -311,12 +308,11 @@ final: prev: { src = fetchurl { url = "https://registry.npmjs.org/prisma/-/prisma-${version}.tgz"; - hash = "sha256-0NxYp+W2KbR3xEV2OCXCIL3RqkvLfJHNKgl/PxapVbI="; + hash = "sha256-HiZtNHXkoSl3Q4cAerUs8c138AiDJJxzYNQT3I4+ea8="; }; postInstall = with pkgs; '' wrapProgram "$out/bin/prisma" \ --set PRISMA_SCHEMA_ENGINE_BINARY ${prisma-engines}/bin/schema-engine \ - --set PRISMA_MIGRATION_ENGINE_BINARY ${prisma-engines}/bin/schema-engine \ --set PRISMA_QUERY_ENGINE_BINARY ${prisma-engines}/bin/query-engine \ --set PRISMA_QUERY_ENGINE_LIBRARY ${lib.getLib prisma-engines}/lib/libquery_engine.node \ --set PRISMA_FMT_BINARY ${prisma-engines}/bin/prisma-fmt @@ -489,12 +485,4 @@ final: prev: { rm -r $out/lib/node_modules/wrangler/node_modules/@esbuild/sunos-x64 ''; }); - - yaml-language-server = prev.yaml-language-server.override { - nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ]; - postInstall = '' - wrapProgram "$out/bin/yaml-language-server" \ - --prefix NODE_PATH : ${final.prettier}/lib/node_modules - ''; - }; } diff --git a/nixpkgs/pkgs/development/ocaml-modules/conduit/mirage.nix b/nixpkgs/pkgs/development/ocaml-modules/conduit/mirage.nix index 9123c235dd3a..04025666c3d9 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/conduit/mirage.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/conduit/mirage.nix @@ -1,4 +1,5 @@ { buildDunePackage, conduit-lwt +, fetchpatch , ppx_sexp_conv, sexplib, uri, cstruct, mirage-flow , mirage-flow-combinators, mirage-random, mirage-time, mirage-clock , dns-client-mirage, vchan, xenstore, tls, tls-mirage, ipaddr, ipaddr-sexp @@ -9,7 +10,12 @@ buildDunePackage { pname = "conduit-mirage"; inherit (conduit-lwt) version src; - duneVersion = "3"; + + # Compatibility with tls ≥ 0.17 + patches = fetchpatch { + url = "https://github.com/mirage/ocaml-conduit/commit/403b4cec528dae71aded311215868a35c11dad7e.patch"; + hash = "sha256-R/iuLf2PSrx8mLKLueMA3+zr9sB8dX/3evjUbfQECBk="; + }; nativeBuildInputs = [ ppx_sexp_conv ]; diff --git a/nixpkgs/pkgs/development/ocaml-modules/tls/async.nix b/nixpkgs/pkgs/development/ocaml-modules/tls/async.nix index 5e861592cd7b..d4bdb84d685d 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/tls/async.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/tls/async.nix @@ -3,14 +3,9 @@ buildDunePackage rec { pname = "tls-async"; - inherit (tls) src meta version; + inherit (tls) src version; - minimalOCamlVersion = "4.13"; - - patches = [ - # Remove when TLS gets updated to v0.17.1. - ./janestreet-0.16.patch - ]; + minimalOCamlVersion = "4.14"; doCheck = true; @@ -22,4 +17,8 @@ buildDunePackage rec { mirage-crypto-rng-async tls ]; + + meta = tls.meta // { + description = "Transport Layer Security purely in OCaml, Async layer"; + }; } diff --git a/nixpkgs/pkgs/development/ocaml-modules/tls/default.nix b/nixpkgs/pkgs/development/ocaml-modules/tls/default.nix index 18506b611f2a..e89ac5aeeef5 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/tls/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/tls/default.nix @@ -1,40 +1,34 @@ { lib, fetchurl, buildDunePackage -, cstruct, cstruct-sexp, domain-name, fmt, ppx_cstruct, ppx_sexp_conv, logs, hkdf, mirage-crypto, mirage-crypto-ec, mirage-crypto-pk, mirage-crypto-rng, ocaml_lwt, ptime, sexplib, x509 -, ipaddr, ipaddr-sexp +, cstruct, domain-name, fmt, logs, hkdf, mirage-crypto, mirage-crypto-ec, mirage-crypto-pk, mirage-crypto-rng, lwt, ptime, x509 +, ipaddr , alcotest, cstruct-unix, ounit2, randomconv }: buildDunePackage rec { pname = "tls"; - version = "0.16.0"; + version = "0.17.1"; src = fetchurl { url = "https://github.com/mirleft/ocaml-tls/releases/download/v${version}/tls-${version}.tbz"; - sha256 = "sha256-uvIDZLNy6E/ce7YmzUUVaOeGRaHqPSUzuEPQDMu09tM="; + hash = "sha256-gBDStt4UjaIoaSgYHSM71yD6YPoVez1CULyg3QCMXT8="; }; minimalOCamlVersion = "4.08"; - duneVersion = "3"; propagatedBuildInputs = [ cstruct - cstruct-sexp domain-name fmt - ppx_cstruct - ppx_sexp_conv logs hkdf mirage-crypto mirage-crypto-ec mirage-crypto-pk mirage-crypto-rng - ocaml_lwt + lwt ptime - sexplib x509 ipaddr - ipaddr-sexp ]; doCheck = true; diff --git a/nixpkgs/pkgs/development/ocaml-modules/tls/janestreet-0.16.patch b/nixpkgs/pkgs/development/ocaml-modules/tls/janestreet-0.16.patch deleted file mode 100644 index 7d36ad227fa0..000000000000 --- a/nixpkgs/pkgs/development/ocaml-modules/tls/janestreet-0.16.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/async/tls_async.mli b/async/tls_async.mli -index b4894b8..101f27f 100644 ---- a/async/tls_async.mli -+++ b/async/tls_async.mli -@@ -55,4 +55,4 @@ val connect - -> 'addr Tcp.Where_to_connect.t - -> host:[ `host ] Domain_name.t option - -> (Session.t * Reader.t * Writer.t) Deferred.Or_error.t) -- Tcp.with_connect_options -+ Tcp.Aliases.with_connect_options -diff --git a/async/x509_async.ml b/async/x509_async.ml -index d4fad8c..4ee466a 100644 ---- a/async/x509_async.ml -+++ b/async/x509_async.ml -@@ -9,7 +9,7 @@ let file_contents file = - let load_all_in_directory ~directory ~f = - let open Deferred.Or_error.Let_syntax in - let%bind files = Deferred.Or_error.try_with (fun () -> Sys.ls_dir directory) in -- Deferred.Or_error.List.map files ~f:(fun file -> -+ Deferred.Or_error.List.map ~how:`Sequential files ~f:(fun file -> - let%bind contents = file_contents (directory ^/ file) in - f ~contents) - ;; diff --git a/nixpkgs/pkgs/development/ocaml-modules/tls/lwt.nix b/nixpkgs/pkgs/development/ocaml-modules/tls/lwt.nix index 90eefa4347e0..d7db822182d3 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/tls/lwt.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/tls/lwt.nix @@ -6,7 +6,6 @@ buildDunePackage rec { inherit (tls) src meta version; minimalOCamlVersion = "4.11"; - duneVersion = "3"; doCheck = true; diff --git a/nixpkgs/pkgs/development/ocaml-modules/tls/mirage.nix b/nixpkgs/pkgs/development/ocaml-modules/tls/mirage.nix index 667dd9b57c98..a8add9e6ea6b 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/tls/mirage.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/tls/mirage.nix @@ -5,7 +5,6 @@ buildDunePackage { pname = "tls-mirage"; inherit (tls) src version; - duneVersion = "3"; propagatedBuildInputs = [ fmt diff --git a/nixpkgs/pkgs/development/php-packages/castor/default.nix b/nixpkgs/pkgs/development/php-packages/castor/default.nix new file mode 100644 index 000000000000..ed6ce2ba33f4 --- /dev/null +++ b/nixpkgs/pkgs/development/php-packages/castor/default.nix @@ -0,0 +1,60 @@ +{ lib +, stdenv +, fetchurl +, makeBinaryWrapper +, installShellFiles +, php +, nix-update-script +, testers +, castor +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "castor"; + version = "0.8.0"; + + + src = fetchurl { + url = "https://github.com/jolicode/castor/releases/download/v${finalAttrs.version}/castor.linux-amd64.phar"; + hash = "sha256-0lnn4mS1/DgUoRoMFvCjwQ0j9CX9XWlskbtX9roFCfc="; + }; + + dontUnpack = true; + + nativeBuildInputs = [ makeBinaryWrapper installShellFiles ]; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin + install -D $src $out/libexec/castor/castor.phar + makeWrapper ${php}/bin/php $out/bin/castor \ + --add-flags "$out/libexec/castor/castor.phar" + runHook postInstall + ''; + + # castor requires to be initialized to generate completion files + postInstall = '' + echo "yes" | ${php}/bin/php $src + installShellCompletion --cmd castor \ + --bash <($out/bin/castor completion bash) \ + --fish <($out/bin/castor completion fish) \ + --zsh <($out/bin/castor completion zsh) + ''; + + passthru = { + updateScript = nix-update-script { }; + tests.version = testers.testVersion { + inherit (finalAttrs) version; + package = castor; + command = "castor --version"; + }; + }; + + meta = with lib; { + description = "DX oriented task runner and command launcher built with PHP"; + homepage = "https://github.com/jolicode/castor"; + changelog = "https://github.com/jolicode/castor/blob/v${finalAttrs.version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ gaelreyrol ]; + }; +}) diff --git a/nixpkgs/pkgs/development/php-packages/opentelemetry/default.nix b/nixpkgs/pkgs/development/php-packages/opentelemetry/default.nix index dda00a883d33..618d7806d97f 100644 --- a/nixpkgs/pkgs/development/php-packages/opentelemetry/default.nix +++ b/nixpkgs/pkgs/development/php-packages/opentelemetry/default.nix @@ -1,7 +1,7 @@ { lib, buildPecl, fetchFromGitHub }: let - version = "1.0.0beta6"; + version = "1.0.0beta7"; in buildPecl { inherit version; pname = "opentelemetry"; @@ -10,9 +10,11 @@ in buildPecl { owner = "open-telemetry"; repo = "opentelemetry-php-instrumentation"; rev = version; - hash = "sha256-dbyFb+Wh4thbnwASgPuQ4ceeke6NDMFLvNXjp66hLCM="; + hash = "sha256-FDCgRN+aV9c6ceKszrHDBmi14dEhrirlU8cbYrmIGdY="; }; + sourceRoot = "source/ext"; + doCheck = true; meta = with lib; { diff --git a/nixpkgs/pkgs/development/php-packages/psysh/default.nix b/nixpkgs/pkgs/development/php-packages/psysh/default.nix index de8fd450de28..04b0ff69cc03 100644 --- a/nixpkgs/pkgs/development/php-packages/psysh/default.nix +++ b/nixpkgs/pkgs/development/php-packages/psysh/default.nix @@ -2,14 +2,14 @@ let pname = "psysh"; - version = "0.11.18"; + version = "0.11.20"; in mkDerivation { inherit pname version; src = fetchurl { url = "https://github.com/bobthecow/psysh/releases/download/v${version}/psysh-v${version}.tar.gz"; - sha256 = "sha256-roonJBpMXOAsa/IyPn3kR1VSHH/kUJFuUU6myVI7Y+A="; + sha256 = "sha256-1d07/qE6qamsmBkkuuxIY9YgYC7wgP21QDc5Iu9Ecv4="; }; dontUnpack = true; diff --git a/nixpkgs/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/nixpkgs/pkgs/development/python-modules/adafruit-platformdetect/default.nix index d9fe80fcba4f..0bb566508b34 100644 --- a/nixpkgs/pkgs/development/python-modules/adafruit-platformdetect/default.nix +++ b/nixpkgs/pkgs/development/python-modules/adafruit-platformdetect/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "adafruit-platformdetect"; - version = "3.49.0"; + version = "3.51.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "Adafruit-PlatformDetect"; inherit version; - hash = "sha256-bLwPnKLOdk8scKF4hQgkBXRoz0Ph6/pcRLlJdN+cDoA="; + hash = "sha256-/a0IKOFWnXC6BJItpJDqiA9aCB1PNhglNlB/4KvyQdg="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/nixpkgs/pkgs/development/python-modules/aemet-opendata/default.nix b/nixpkgs/pkgs/development/python-modules/aemet-opendata/default.nix index 64e3cfa7b032..90f28265c090 100644 --- a/nixpkgs/pkgs/development/python-modules/aemet-opendata/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aemet-opendata/default.nix @@ -1,26 +1,36 @@ { lib +, aiohttp , buildPythonPackage -, pythonOlder , fetchFromGitHub , geopy +, pythonOlder , requests +, setuptools , urllib3 +, wheel }: buildPythonPackage rec { pname = "aemet-opendata"; - version = "0.2.2"; + version = "0.4.4"; + format = "pyproject"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.11"; src = fetchFromGitHub { owner = "Noltari"; repo = "AEMET-OpenData"; rev = "refs/tags/${version}"; - hash = "sha256-3f3hvui00oItu6t9rKecoCquqsD1Eeqz+SEsLBqGt48="; + hash = "sha256-Jm7fv1fNavp2GkfKPhZXYGnGuCBy6BdN9iTNYTBIyew="; }; + nativeBuildInputs = [ + setuptools + wheel + ]; + propagatedBuildInputs = [ + aiohttp geopy requests urllib3 @@ -29,11 +39,14 @@ buildPythonPackage rec { # no tests implemented doCheck = false; - pythonImportsCheck = [ "aemet_opendata.interface" ]; + pythonImportsCheck = [ + "aemet_opendata.interface" + ]; meta = with lib; { description = "Python client for AEMET OpenData Rest API"; homepage = "https://github.com/Noltari/AEMET-OpenData"; + changelog = "https://github.com/Noltari/AEMET-OpenData/releases/tag/${version}"; license = licenses.gpl2Only; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/aioairzone/default.nix b/nixpkgs/pkgs/development/python-modules/aioairzone/default.nix index 2ea2137f0405..ac094571d087 100644 --- a/nixpkgs/pkgs/development/python-modules/aioairzone/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aioairzone/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "aioairzone"; - version = "0.6.7"; + version = "0.6.8"; format = "pyproject"; disabled = pythonOlder "3.11"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Noltari"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-/LUTHeApktB4okt9bVkZe7G1dApVaYUdwty4sbK7IKQ="; + hash = "sha256-aCf0IO70t/QMmDmIwBKN3Um1HgHjHn1r6Dze/pWaQ5M="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/aiocomelit/default.nix b/nixpkgs/pkgs/development/python-modules/aiocomelit/default.nix new file mode 100644 index 000000000000..dd572da52210 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/aiocomelit/default.nix @@ -0,0 +1,52 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "aiocomelit"; + version = "0.0.6"; + format = "pyproject"; + + disabled = pythonOlder "3.10"; + + src = fetchFromGitHub { + owner = "chemelli74"; + repo = "aiocomelit"; + rev = "refs/tags/v${version}"; + hash = "sha256-u6CyqDFLgnIVak0UqN4JmL8ll/li3k9EhFs7iC5oZ9U="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace " --cov=aiocomelit --cov-report=term-missing:skip-covered" "" + ''; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + aiohttp + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "aiocomelit" + ]; + + meta = with lib; { + description = "Library to control Comelit Simplehome"; + homepage = "https://github.com/chemelli74/aiocomelit"; + changelog = "https://github.com/chemelli74/aiocomelit/blob/${version}/CHANGELOG.md"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/aioesphomeapi/default.nix b/nixpkgs/pkgs/development/python-modules/aioesphomeapi/default.nix index cc34f91fde9d..f0a310b7a14c 100644 --- a/nixpkgs/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "aioesphomeapi"; - version = "16.0.3"; + version = "16.0.5"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "esphome"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-x4kH8riHZbVibgwR2DmWB4tsswpub4m2LwnypVVUgqM="; + hash = "sha256-SueK59CZTKkQPsHThs7k9eCEmc1GwaRIrw3oSK4E80E="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/aiohomekit/default.nix b/nixpkgs/pkgs/development/python-modules/aiohomekit/default.nix index ed3823af9bef..e083abc1d7ea 100644 --- a/nixpkgs/pkgs/development/python-modules/aiohomekit/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aiohomekit/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "aiohomekit"; - version = "3.0.1"; + version = "3.0.2"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "Jc2k"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-TyVmvricfaS+i96DGwh0IKhMm56U1DyebAmRb+OFCh4="; + hash = "sha256-EE8+VoZ755wd8s3Gm0lziu+1r4rAFgdjEtqI0apoZ7E="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/aiohttp-socks/default.nix b/nixpkgs/pkgs/development/python-modules/aiohttp-socks/default.nix index ec91f0bd0c55..9b157264a7e9 100644 --- a/nixpkgs/pkgs/development/python-modules/aiohttp-socks/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aiohttp-socks/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "aiohttp-socks"; - version = "0.8.0"; + version = "0.8.1"; src = fetchPypi { inherit version; pname = "aiohttp_socks"; - hash = "sha256-knsdOzR0SPhv9SRcnKGeQPOX65OQZoK+WSeQZ4yYLzc="; + hash = "sha256-duWEJDS5Ts3EWNRZ8MJcD7buMh3FRKA+bJiO3P7QWz0="; }; propagatedBuildInputs = [ aiohttp attrs python-socks ]; diff --git a/nixpkgs/pkgs/development/python-modules/aiolyric/default.nix b/nixpkgs/pkgs/development/python-modules/aiolyric/default.nix index ba0b17a5eb58..b6346a511aa5 100644 --- a/nixpkgs/pkgs/development/python-modules/aiolyric/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aiolyric/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "aiolyric"; - version = "1.0.10"; + version = "1.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "timmo001"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-yKeG0UCQ8haT1hvywoIwKQ519GK2wFg0wXaRTFeKYIk="; + hash = "sha256-LDLpNuwkoPacI/a2NSlqUABRgwy+jAjGwOxmShLskso="; }; propagatedBuildInputs = [ @@ -29,8 +29,8 @@ buildPythonPackage rec { ]; disabledTests = [ - # AssertionError, https://github.com/timmo001/aiolyric/issues/5 - "test_location" + # AssertionError, https://github.com/timmo001/aiolyric/issues/61 + "test_priority" ]; pythonImportsCheck = [ diff --git a/nixpkgs/pkgs/development/python-modules/aiorecollect/default.nix b/nixpkgs/pkgs/development/python-modules/aiorecollect/default.nix index c5fdc3f8f36f..352f7eb9603d 100644 --- a/nixpkgs/pkgs/development/python-modules/aiorecollect/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aiorecollect/default.nix @@ -13,33 +13,18 @@ buildPythonPackage rec { pname = "aiorecollect"; - version = "2023.08.0"; + version = "2023.09.0"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "bachya"; repo = pname; - rev = version; - hash = "sha256-oTkWirq3w0DgQWWe0ziK+ry4pg6j6SQbBESLG4xgDE4="; + rev = "refs/tags/${version}"; + hash = "sha256-45LgfCA8037GqP4WfEjE4hj2YdKUGu2hGrQ/f0r1PAI="; }; - patches = [ - # This patch removes references to setuptools and wheel that are no longer - # necessary and changes poetry to poetry-core, so that we don't need to add - # unnecessary nativeBuildInputs. - # - # https://github.com/bachya/aiorecollect/pull/207 - # - (fetchpatch { - name = "clean-up-dependencies.patch"; - url = "https://github.com/bachya/aiorecollect/commit/0bfddead1c1b176be4d599b8e12ed608eac97b8b.patch"; - hash = "sha256-w/LAtyuyYsAAukDeIy8XLlp9QrydC1Wmi2zxEj1Zdm8="; - includes = [ "pyproject.toml" ]; - }) - ]; - postPatch = '' # this is not used directly by the project sed -i '/certifi =/d' pyproject.toml @@ -80,6 +65,7 @@ buildPythonPackage rec { and more. ''; homepage = "https://github.com/bachya/aiorecollect"; + changelog = "https://github.com/bachya/aiorecollect/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/aioruckus/default.nix b/nixpkgs/pkgs/development/python-modules/aioruckus/default.nix new file mode 100644 index 000000000000..a3d77994f432 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/aioruckus/default.nix @@ -0,0 +1,67 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchFromGitHub +, pytest-asyncio +, pytestCheckHook +, pythonOlder +, setuptools +, wheel +, xmltodict +}: + +buildPythonPackage rec { + pname = "aioruckus"; + version = "0.34"; + format = "pyproject"; + + disabled = pythonOlder "3.10"; + + src = fetchFromGitHub { + owner = "ms264556"; + repo = "aioruckus"; + rev = "refs/tags/v${version}"; + hash = "sha256-SPj1w1jAJFBsWj1+N8srAbvlh+yB3ZTT7aDcZTnmUto="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "setuptools>=68.1" "setuptools" + ''; + + nativeBuildInputs = [ + setuptools + wheel + ]; + + propagatedBuildInputs = [ + aiohttp + xmltodict + ]; + + pythonImportsCheck = [ + "aioruckus" + ]; + + nativeCheckInputs = [ + pytest-asyncio + pytestCheckHook + ]; + + disabledTests = [ + # these require a local ruckus device + "test_ap_info" + "test_authentication_error" + "test_connect_success" + "test_current_active_clients" + "test_mesh_info" + "test_system_info" + ]; + + meta = with lib; { + description = "Python client for Ruckus Unleashed and Ruckus ZoneDirector"; + homepage = "https://github.com/ms264556/aioruckus"; + license = licenses.bsd0; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/aioshelly/default.nix b/nixpkgs/pkgs/development/python-modules/aioshelly/default.nix index d00469ecb099..b47936c926d3 100644 --- a/nixpkgs/pkgs/development/python-modules/aioshelly/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aioshelly/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "aioshelly"; - version = "5.4.0"; + version = "6.0.0"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-cbgDuJXvZmbhIgxpuySGbJqz7DeI65DHwk1UPdNUs1Q="; + hash = "sha256-mB9BEVqbHcoUaygIgrtqk20wMJkL+dWpbeyG5VP4+sg="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/aiotractive/default.nix b/nixpkgs/pkgs/development/python-modules/aiotractive/default.nix index a39130c383a3..5891fa703a90 100644 --- a/nixpkgs/pkgs/development/python-modules/aiotractive/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aiotractive/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "aiotractive"; - version = "0.5.5"; + version = "0.5.6"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "zhulik"; repo = pname; rev = "v${version}"; - hash = "sha256-VCwIAeSAN4tMwB8TXN/ukrws0qYv/jHHeEu++m56AHA="; + hash = "sha256-jJw1L1++Z/r+E12tA6zoyyy4MmTpaaVVzKwfI6xcDBQ="; }; propagatedBuildInputs = [ @@ -29,6 +29,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "aiotractive" ]; meta = with lib; { + changelog = "https://github.com/zhulik/aiotractive/releases/tag/v${version}"; description = "Python client for the Tractive REST API"; homepage = "https://github.com/zhulik/aiotractive"; license = licenses.mit; diff --git a/nixpkgs/pkgs/development/python-modules/aiounifi/default.nix b/nixpkgs/pkgs/development/python-modules/aiounifi/default.nix index 09b177a61bf7..45591837df44 100644 --- a/nixpkgs/pkgs/development/python-modules/aiounifi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aiounifi/default.nix @@ -1,7 +1,6 @@ { lib , aiohttp , aioresponses -, async-timeout , buildPythonPackage , fetchFromGitHub , orjson @@ -10,25 +9,39 @@ , pytestCheckHook , pythonOlder , segno +, setuptools +, wheel }: buildPythonPackage rec { pname = "aiounifi"; - version = "55"; - format = "setuptools"; + version = "61"; + format = "pyproject"; - disabled = pythonOlder "3.9"; + disabled = pythonOlder "3.11"; src = fetchFromGitHub { owner = "Kane610"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-JvuP1Rhq01Y9KbfAJpawUQNWfxvlf9LY82RvXok4tgw="; + hash = "sha256-tzP20KDPCq1/fJY+OfEpo3LMbP662ROh2aPI4nmDp0Y="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "setuptools==" "setuptools>=" \ + --replace "wheel==" "wheel>=" + + sed -i '/--cov=/d' pyproject.toml + ''; + + nativeBuildInputs = [ + setuptools + wheel + ]; + propagatedBuildInputs = [ aiohttp - async-timeout orjson segno ]; diff --git a/nixpkgs/pkgs/development/python-modules/aiovodafone/default.nix b/nixpkgs/pkgs/development/python-modules/aiovodafone/default.nix new file mode 100644 index 000000000000..f0ad237f9208 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/aiovodafone/default.nix @@ -0,0 +1,54 @@ +{ lib +, aiohttp +, beautifulsoup4 +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "aiovodafone"; + version = "0.0.8"; + format = "pyproject"; + + disabled = pythonOlder "3.10"; + + src = fetchFromGitHub { + owner = "chemelli74"; + repo = "aiovodafone"; + rev = "refs/tags/v${version}"; + hash = "sha256-o21zaK3dJfURFAt8fPaOd95H7tuqLnFPC01RGHBIz4M="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace " --cov=aiovodafone --cov-report=term-missing:skip-covered" "" + ''; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + aiohttp + beautifulsoup4 + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "aiovodafone" + ]; + + meta = with lib; { + description = "Library to control Vodafon Station"; + homepage = "https://github.com/chemelli74/aiovodafone"; + changelog = "https://github.com/chemelli74/aiovodafone/blob/${version}/CHANGELOG.md"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/aiowaqi/default.nix b/nixpkgs/pkgs/development/python-modules/aiowaqi/default.nix new file mode 100644 index 000000000000..ba2d16c7e3e9 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/aiowaqi/default.nix @@ -0,0 +1,60 @@ +{ lib +, aiohttp +, aresponses +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pytest-asyncio +, pytestCheckHook +, pythonOlder +, syrupy +, yarl +}: + +buildPythonPackage rec { + pname = "aiowaqi"; + version = "1.1.0"; + format = "pyproject"; + + disabled = pythonOlder "3.11"; + + src = fetchFromGitHub { + owner = "joostlek"; + repo = "python-waqi"; + rev = "refs/tags/v${version}"; + hash = "sha256-CQCF59Tp0VE7PNHPdVzzZegLUNDkslzKapELDjZn1k4="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "--cov" "" + ''; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + aiohttp + yarl + ]; + + nativeCheckInputs = [ + aresponses + pytest-asyncio + pytestCheckHook + syrupy + ]; + + pythonImportsCheck = [ + "aiowaqi" + ]; + + meta = with lib; { + description = "Module to interact with the WAQI API"; + homepage = "https://github.com/joostlek/python-waqi"; + changelog = "https://github.com/joostlek/python-waqi/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/aliyun-python-sdk-config/default.nix b/nixpkgs/pkgs/development/python-modules/aliyun-python-sdk-config/default.nix index 565bcf750ac8..5801e6a5ee14 100644 --- a/nixpkgs/pkgs/development/python-modules/aliyun-python-sdk-config/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aliyun-python-sdk-config/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "aliyun-python-sdk-config"; - version = "2.2.11"; + version = "2.2.12"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-nkCNzOg6JYQkIlmcFm3VIjHvoHDK7hfw4PhrUwnNp28="; + hash = "sha256-blrT/yCQ2vxaociSqKvRX3fUyKLsAFT3UyFGB/AzZHI="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/ansible-runner/default.nix b/nixpkgs/pkgs/development/python-modules/ansible-runner/default.nix index 09cb189f40cd..4a9ff67c3cba 100644 --- a/nixpkgs/pkgs/development/python-modules/ansible-runner/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ansible-runner/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "ansible-runner"; - version = "2.3.3"; + version = "2.3.4"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-OP9jXkuUeR3ilWyB4mWDbsSWWzDp7jXXL88ycdxGuYs="; + hash = "sha256-eaG9E02BPI6jdAWZxv2WGhFCXOd1fy/XJc9W1qGnI2w="; }; patches = [ diff --git a/nixpkgs/pkgs/development/python-modules/ansible/core.nix b/nixpkgs/pkgs/development/python-modules/ansible/core.nix index 17bfb4203720..be0a887cd8a8 100644 --- a/nixpkgs/pkgs/development/python-modules/ansible/core.nix +++ b/nixpkgs/pkgs/development/python-modules/ansible/core.nix @@ -28,11 +28,11 @@ buildPythonPackage rec { pname = "ansible-core"; - version = "2.15.2"; + version = "2.15.3"; src = fetchPypi { inherit pname version; - hash = "sha256-hCUbAB8vnAkUvu3/zxlSnnRaExCBWdH+J96eOmpjrFo="; + hash = "sha256-JhvAGhUnT8WmlQ1bkrmqG318bo91Q8kUUF5b/ZdEeTo="; }; # ansible_connection is already wrapped, so don't pass it through diff --git a/nixpkgs/pkgs/development/python-modules/anthropic/default.nix b/nixpkgs/pkgs/development/python-modules/anthropic/default.nix index 911361f82b8a..8344af439070 100644 --- a/nixpkgs/pkgs/development/python-modules/anthropic/default.nix +++ b/nixpkgs/pkgs/development/python-modules/anthropic/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "anthropic"; - version = "0.3.10"; + version = "0.3.11"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "anthropics"; repo = "anthropic-sdk-python"; rev = "refs/tags/v${version}"; - hash = "sha256-OmT8a588eprCTUnnhLF5+XSOtetiUMouaWz1hrTl1ao="; + hash = "sha256-bjagT0I0/N76CGf1b8EBNyOTzPBWybr2I2yO5NWO3po="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/antlr4-python3-runtime/default.nix b/nixpkgs/pkgs/development/python-modules/antlr4-python3-runtime/default.nix index 39fef995bf98..20daf71c8cda 100644 --- a/nixpkgs/pkgs/development/python-modules/antlr4-python3-runtime/default.nix +++ b/nixpkgs/pkgs/development/python-modules/antlr4-python3-runtime/default.nix @@ -1,17 +1,27 @@ { lib , buildPythonPackage -, isPy3k +, setuptools , python -, antlr4 }: +, antlr4 +}: buildPythonPackage rec { pname = "antlr4-python3-runtime"; inherit (antlr4.runtime.cpp) version src; + + format = "pyproject"; + disabled = python.pythonOlder "3.6"; sourceRoot = "${src.name}/runtime/Python3"; - # in 4.9, test was renamed to tests + nativeBuildInputs = [ + setuptools + ]; + + # We use an asterisk because this expression is used also for old antlr + # versions, where there the tests directory is `test` and not `tests`. + # See e.g in package `baserow`. checkPhase = '' cd test* ${python.interpreter} run.py diff --git a/nixpkgs/pkgs/development/python-modules/anyio/default.nix b/nixpkgs/pkgs/development/python-modules/anyio/default.nix index 82874b9a3132..3508554d308d 100644 --- a/nixpkgs/pkgs/development/python-modules/anyio/default.nix +++ b/nixpkgs/pkgs/development/python-modules/anyio/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { pname = "anyio"; - version = "3.7.0"; + version = "3.7.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -37,7 +37,7 @@ buildPythonPackage rec { owner = "agronholm"; repo = pname; rev = version; - hash = "sha256-uXPp2ycYl3T/ybZihDchImC/Yi4qgHI37ZeA+I6dg4c="; + hash = "sha256-9/pAcVTzw9v57E5l4d8zNyBJM+QNGEuLKrQ0WUBW5xw="; }; env.SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/nixpkgs/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix b/nixpkgs/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix index 92c58450cee4..793591627837 100644 --- a/nixpkgs/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix +++ b/nixpkgs/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "appthreat-vulnerability-db"; - version = "5.2.5"; + version = "5.4.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "AppThreat"; repo = "vulnerability-db"; rev = "refs/tags/v${version}"; - hash = "sha256-h1xpP3fFr8+twa5jXQrZfKFjNAlCvXv7sFvhgJZ88H0="; + hash = "sha256-sfhcAEJn+9uTPZLjgurfpuWNEdefzQZSXZdw7IeuqZw="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/astropy-healpix/default.nix b/nixpkgs/pkgs/development/python-modules/astropy-healpix/default.nix index 35871bff21c8..64fe911661ff 100644 --- a/nixpkgs/pkgs/development/python-modules/astropy-healpix/default.nix +++ b/nixpkgs/pkgs/development/python-modules/astropy-healpix/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "astropy-healpix"; - version = "0.7"; + version = "1.0.0"; src = fetchPypi { inherit version; pname = lib.replaceStrings ["-"] ["_"] pname; - hash = "sha256-iMOE60MimXpY3ok46RrJ/5D2orbLKuI+IWnHQFrdOtg="; + hash = "sha256-9ILvYqEOaGMD84xm8I3xe53e5a2CIZwjVx7oDXar7qM="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/atlassian-python-api/default.nix b/nixpkgs/pkgs/development/python-modules/atlassian-python-api/default.nix index 2ce8a31193a1..fd389308c931 100755 --- a/nixpkgs/pkgs/development/python-modules/atlassian-python-api/default.nix +++ b/nixpkgs/pkgs/development/python-modules/atlassian-python-api/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "atlassian-python-api"; - version = "3.41.0"; + version = "3.41.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "atlassian-api"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-f1i4kX9lZ8ozv/jLzvu1XbCn+BheMn8SQE1mtivaEG8="; + hash = "sha256-DSIJOp5c/bqOOIZylhUGyIwIco5isA3ytCRR51WfTyI="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/aws-lambda-builders/default.nix b/nixpkgs/pkgs/development/python-modules/aws-lambda-builders/default.nix index c716a56dfb24..85a668a2c22e 100644 --- a/nixpkgs/pkgs/development/python-modules/aws-lambda-builders/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aws-lambda-builders/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aws-lambda-builders"; - version = "1.36.0"; + version = "1.37.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "awslabs"; repo = "aws-lambda-builders"; rev = "refs/tags/v${version}"; - hash = "sha256-cHpeNY0WY4yai/yWw2Oy1QLLjlj8PFNdB3BMbkP31Ds="; + hash = "sha256-ukHDrxx+Jxlp/Ypg1ltz7WN07X16spNdC7YygJhTBJo="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/aws-sam-translator/default.nix b/nixpkgs/pkgs/development/python-modules/aws-sam-translator/default.nix index 2a2915afcd75..f5af4ac77973 100644 --- a/nixpkgs/pkgs/development/python-modules/aws-sam-translator/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aws-sam-translator/default.nix @@ -59,7 +59,8 @@ buildPythonPackage rec { meta = with lib; { description = "Python library to transform SAM templates into AWS CloudFormation templates"; - homepage = "https://github.com/aws/serverless-application-model"; + homepage = "https://github.com/awslabs/serverless-application-model"; + changelog = "https://github.com/aws/serverless-application-model/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/awscrt/default.nix b/nixpkgs/pkgs/development/python-modules/awscrt/default.nix index dc9ddfeceb70..807cd8a02942 100644 --- a/nixpkgs/pkgs/development/python-modules/awscrt/default.nix +++ b/nixpkgs/pkgs/development/python-modules/awscrt/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "awscrt"; - version = "0.19.0"; + version = "0.19.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Q5DA+lraOebUYgjFDj11XUPZY1X8qD/1dwgeMoL2SZ0="; + hash = "sha256-kXf/TKw0YkWuSWNc1rQqbb3q4XWCRRkBAiDUisX/8UI="; }; buildInputs = lib.optionals stdenv.isDarwin [ diff --git a/nixpkgs/pkgs/development/python-modules/b2sdk/default.nix b/nixpkgs/pkgs/development/python-modules/b2sdk/default.nix index 4dac7ecf5b83..c577a7888a94 100644 --- a/nixpkgs/pkgs/development/python-modules/b2sdk/default.nix +++ b/nixpkgs/pkgs/development/python-modules/b2sdk/default.nix @@ -1,7 +1,8 @@ { lib -, arrow +, stdenv , buildPythonPackage , fetchPypi +, glibcLocales , importlib-metadata , logfury , pyfakefs @@ -12,18 +13,19 @@ , requests , setuptools-scm , tqdm +, typing-extensions }: buildPythonPackage rec { pname = "b2sdk"; - version = "1.19.0"; + version = "1.24.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-aJpSt+dXjw4S33dBiMkaR6wxzwLru+jseuPKFj2R36Y="; + hash = "sha256-6zSjCt+J6530f1GMc/omP1zXKQKU1SDLLvslMWoqMcU="; }; nativeBuildInputs = [ @@ -31,12 +33,13 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - arrow logfury requests tqdm ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata + ] ++ lib.optionals (pythonOlder "3.12") [ + typing-extensions ]; nativeCheckInputs = [ @@ -44,13 +47,13 @@ buildPythonPackage rec { pytest-lazy-fixture pytest-mock pyfakefs + ] ++ lib.optionals stdenv.isLinux [ + glibcLocales ]; postPatch = '' substituteInPlace setup.py \ --replace 'setuptools_scm<6.0' 'setuptools_scm' - substituteInPlace requirements.txt \ - --replace 'arrow>=0.8.0,<1.0.0' 'arrow' ''; disabledTestPaths = [ @@ -73,6 +76,7 @@ buildPythonPackage rec { meta = with lib; { description = "Client library and utilities for access to B2 Cloud Storage (backblaze)"; homepage = "https://github.com/Backblaze/b2-sdk-python"; + changelog = "https://github.com/Backblaze/b2-sdk-python/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/beautiful-date/default.nix b/nixpkgs/pkgs/development/python-modules/beautiful-date/default.nix new file mode 100644 index 000000000000..5b114655bcbb --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/beautiful-date/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, python-dateutil +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "beautiful-date"; + version = "2.2.0"; + format = "setuptools"; + + disable = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "kuzmoyev"; + repo = "beautiful-date"; + rev = "v${version}"; + hash = "sha256-5xRmHaAPf1ps75cOINHkHT1aYb5UGLZGl0OHVQaMES0="; + }; + + propagatedBuildInputs = [ + python-dateutil + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "beautiful_date" ]; + + meta = with lib; { + description = "Simple and beautiful way to create date and datetime objects in Python"; + homepage = "https://github.com/kuzmoyev/beautiful-date"; + license = licenses.mit; + maintainers = with maintainers; [ mbalatsko ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/bellows/default.nix b/nixpkgs/pkgs/development/python-modules/bellows/default.nix index 096fb2289888..effdf9d010f8 100644 --- a/nixpkgs/pkgs/development/python-modules/bellows/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bellows/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "bellows"; - version = "0.35.9"; + version = "0.36.3"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "bellows"; rev = "refs/tags/${version}"; - hash = "sha256-68t6l7/30euGo0dX5HTnGMl65j6UVF2f9fYZH6EhlzI="; + hash = "sha256-5s2I24gvHRXHm7ZTNZxc6ge9Kbe6UObcY29SvbIUWJg="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/bimmer-connected/default.nix b/nixpkgs/pkgs/development/python-modules/bimmer-connected/default.nix index baa4ddacfec5..57eb2dc26845 100644 --- a/nixpkgs/pkgs/development/python-modules/bimmer-connected/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bimmer-connected/default.nix @@ -7,9 +7,12 @@ , httpx , pycryptodome , pyjwt +, pytest-asyncio , pytestCheckHook +, python , respx , time-machine +, tzdata }: buildPythonPackage rec { @@ -39,12 +42,21 @@ buildPythonPackage rec { pyjwt ]; + postInstall = '' + cp -R bimmer_connected/tests/responses $out/${python.sitePackages}/bimmer_connected/tests/ + ''; + nativeCheckInputs = [ + pytest-asyncio pytestCheckHook respx time-machine ]; + preCheck = '' + export TZDIR=${tzdata}/${python.sitePackages}/tzdata/zoneinfo + ''; + pythonImportsCheck = [ "bimmer_connected" ]; diff --git a/nixpkgs/pkgs/development/python-modules/bleak-retry-connector/default.nix b/nixpkgs/pkgs/development/python-modules/bleak-retry-connector/default.nix index 846684551480..401037eb3dd7 100644 --- a/nixpkgs/pkgs/development/python-modules/bleak-retry-connector/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bleak-retry-connector/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "bleak-retry-connector"; - version = "3.1.1"; + version = "3.1.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-fw1Eo4f9MdCjICkZiCUX3wa947s1kv9qqYmYjd0zqF4="; + hash = "sha256-q+J4PUBm42jBcLbiywWwDZxUI0Gsl8GjnLPwniWp+Kw="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/bleak/default.nix b/nixpkgs/pkgs/development/python-modules/bleak/default.nix index dbe2364a9863..13b335d02617 100644 --- a/nixpkgs/pkgs/development/python-modules/bleak/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bleak/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "bleak"; - version = "0.20.2"; + version = "0.21.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "hbldh"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-hiQSsQHq1hoCQhoWU50i2NXYR/LaTHAize9cfr1uZsY="; + hash = "sha256-hnXBXm0BFNNzw563Ybr76KHiqt2sFqo0dtiRHGWsu3A="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/bluetooth-data-tools/default.nix b/nixpkgs/pkgs/development/python-modules/bluetooth-data-tools/default.nix index 3a4f1f567e90..920bb1cecc48 100644 --- a/nixpkgs/pkgs/development/python-modules/bluetooth-data-tools/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bluetooth-data-tools/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, cryptography , cython_3 , poetry-core , pytestCheckHook @@ -10,7 +11,7 @@ buildPythonPackage rec { pname = "bluetooth-data-tools"; - version = "1.9.1"; + version = "1.11.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -19,7 +20,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-DLB2mBjHPVT2Fg2Kr0WUDuu5nqBCbdu525wAD3ERKV8="; + hash = "sha256-iyfk0OOJezNCNyqRCbR2cTTTdgdYQM6hExTngd/3CtA="; }; # The project can build both an optimized cython version and an unoptimized @@ -32,6 +33,10 @@ buildPythonPackage rec { setuptools ]; + propagatedBuildInputs = [ + cryptography + ]; + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/nixpkgs/pkgs/development/python-modules/botocore-stubs/default.nix b/nixpkgs/pkgs/development/python-modules/botocore-stubs/default.nix index be8514f08acd..2bd7f8e6d90e 100644 --- a/nixpkgs/pkgs/development/python-modules/botocore-stubs/default.nix +++ b/nixpkgs/pkgs/development/python-modules/botocore-stubs/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "botocore-stubs"; - version = "1.31.39"; + version = "1.31.40"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "botocore_stubs"; inherit version; - hash = "sha256-pqpGnPXZT5lDnTpXBfsJk0/tBtUovgazAWZf/TZJfNg="; + hash = "sha256-IAGiU9r0ri4XHmE3uZgqAKf7/HpTRJoWhW3ASefNUhQ="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/bracex/default.nix b/nixpkgs/pkgs/development/python-modules/bracex/default.nix index b519021295b1..d2b8bb06ff9b 100644 --- a/nixpkgs/pkgs/development/python-modules/bracex/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bracex/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "bracex"; - version = "2.3.post1"; + version = "2.4"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-57I/yLLNBtPewGkrqr7LJJ3alOBqYXkB/wOmxW/XFpM="; + hash = "sha256-on6vHfQs9WH+1Yt6jz/fEp0eoWqB4frdHReYm8Y4S+s="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/bytecode/default.nix b/nixpkgs/pkgs/development/python-modules/bytecode/default.nix index d8521ddf0f15..95b28f4190fd 100644 --- a/nixpkgs/pkgs/development/python-modules/bytecode/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bytecode/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "bytecode"; - version = "0.14.2"; + version = "0.15.0"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "vstinner"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-HBXtpUl8Lcx3yCVnk9kVU0+AUVdgy1HQBV4rHEndiek="; + hash = "sha256-A8S3U07P4Olq9f7/q20aHOPAQsQp3OuGHtIAs8B8VEQ="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/nixpkgs/pkgs/development/python-modules/casbin/default.nix b/nixpkgs/pkgs/development/python-modules/casbin/default.nix index 9507cad79502..1b6a7d72e415 100644 --- a/nixpkgs/pkgs/development/python-modules/casbin/default.nix +++ b/nixpkgs/pkgs/development/python-modules/casbin/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "casbin"; - version = "1.26.0"; + version = "1.27.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = pname; repo = "pycasbin"; rev = "refs/tags/v${version}"; - hash = "sha256-wM27HW5w8fDjHoGV+OGDTaO5SKJrq8fGKh1EPQt+wlo="; + hash = "sha256-gZgaWgkvMuD7IfIy85rX3i6lZqj5WkStF0dHe+AQSJY="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/celery/default.nix b/nixpkgs/pkgs/development/python-modules/celery/default.nix index 9a198ab21fc6..750e3908cd3f 100644 --- a/nixpkgs/pkgs/development/python-modules/celery/default.nix +++ b/nixpkgs/pkgs/development/python-modules/celery/default.nix @@ -28,14 +28,14 @@ buildPythonPackage rec { pname = "celery"; - version = "5.3.3"; + version = "5.3.4"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-uskO+ZtwubW11M/Ov28atRaLhsYSC8fFgUzYI039k4E="; + hash = "sha256-kCPfaoli2nnrMMDITV9IY9l5OkZjVMyTHX9yQjmW3ig="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/certipy-ad/default.nix b/nixpkgs/pkgs/development/python-modules/certipy-ad/default.nix index 37a1c750b319..175a454ab1ea 100644 --- a/nixpkgs/pkgs/development/python-modules/certipy-ad/default.nix +++ b/nixpkgs/pkgs/development/python-modules/certipy-ad/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "certipy-ad"; - version = "4.7.0"; + version = "4.8.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "ly4k"; repo = "Certipy"; rev = "refs/tags/${version}"; - hash = "sha256-CkIxk+Aps9TRA2wEE/zZKl9t4CyjxEsgLntbn9kWY6o="; + hash = "sha256-CyTwaCYhxUqvycZBKSzTWLKmKvebCNyE4vqTUnaX1V0="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/cfn-lint/default.nix b/nixpkgs/pkgs/development/python-modules/cfn-lint/default.nix index 9c44a4f4b6b6..ed5377d9783a 100644 --- a/nixpkgs/pkgs/development/python-modules/cfn-lint/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cfn-lint/default.nix @@ -1,38 +1,37 @@ { lib +, aws-sam-translator , buildPythonPackage , fetchFromGitHub -, pythonOlder -, aws-sam-translator , jschema-to-python , jsonpatch , jsonschema , junit-xml +, mock , networkx +, pydot +, pytestCheckHook +, pythonOlder , pyyaml +, regex , sarif-om , setuptools -, six -, mock -, pydot -, pytestCheckHook +, sympy }: buildPythonPackage rec { pname = "cfn-lint"; - version = "0.73.2"; + version = "0.79.6"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "aws-cloudformation"; repo = "cfn-python-lint"; rev = "refs/tags/v${version}"; - hash = "sha256-CNB5LrXllGxy99NjCrbjkUXUpJ72U3pUnWqrqkOiCG8="; + hash = "sha256-5Lb8dA8HqDdEO/Ehv5y/JlP+te46mzrTw/kNHBb9l38="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace "jsonschema~=3.0" "jsonschema>=3.0" - ''; - propagatedBuildInputs = [ aws-sam-translator jschema-to-python @@ -40,9 +39,11 @@ buildPythonPackage rec { jsonschema junit-xml networkx + networkx pyyaml + regex sarif-om - six + sympy ]; nativeCheckInputs = [ @@ -62,34 +63,28 @@ buildPythonPackage rec { # https://github.com/aws-cloudformation/cfn-python-lint/issues/1705 # See also: https://github.com/NixOS/nixpkgs/issues/108076 "TestQuickStartTemplates" - # requires git directory + # Requires git directory "test_update_docs" # Tests depend on network access (fails in getaddrinfo) "test_update_resource_specs_python_2" "test_update_resource_specs_python_3" "test_sarif_formatter" + # Some CLI tests fails + "test_bad_config" + "test_override_parameters" + "test_positional_template_parameters" + "test_template_config" ]; pythonImportsCheck = [ "cfnlint" - "cfnlint.conditions" - "cfnlint.core" - "cfnlint.decode.node" - "cfnlint.decode.cfn_yaml" - "cfnlint.decode.cfn_json" - "cfnlint.decorators.refactored" - "cfnlint.graph" - "cfnlint.helpers" - "cfnlint.rules" - "cfnlint.runner" - "cfnlint.template" - "cfnlint.transform" ]; meta = with lib; { description = "Checks cloudformation for practices and behaviour that could potentially be improved"; homepage = "https://github.com/aws-cloudformation/cfn-python-lint"; - changelog = "https://github.com/aws-cloudformation/cfn-python-lint/blob/master/CHANGELOG.md"; + changelog = "https://github.com/aws-cloudformation/cfn-lint/blob/v${version}/CHANGELOG.md"; license = licenses.mit; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/chat-downloader/default.nix b/nixpkgs/pkgs/development/python-modules/chat-downloader/default.nix index 7bcb98a4efea..13434cc86d05 100644 --- a/nixpkgs/pkgs/development/python-modules/chat-downloader/default.nix +++ b/nixpkgs/pkgs/development/python-modules/chat-downloader/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "chat-downloader"; - version = "0.2.7"; + version = "0.2.8"; format = "setuptools"; src = fetchPypi { inherit version pname; - hash = "sha256-FKdeuw4MEy1ZNeOCYllYxxFBUj2/fy0r/pxJv8FpOso="; + hash = "sha256-WBasBhefgRkOdMdz2K/agvS+cY6m3/33wiu+Jl4d1Cg="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/cmaes/default.nix b/nixpkgs/pkgs/development/python-modules/cmaes/default.nix index fdb2a1d0fcc0..88085cd2fdf9 100644 --- a/nixpkgs/pkgs/development/python-modules/cmaes/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cmaes/default.nix @@ -10,15 +10,16 @@ buildPythonPackage rec { pname = "cmaes"; - version = "0.9.1"; - disabled = pythonOlder "3.7"; + version = "0.10.0"; format = "pyproject"; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "CyberAgentAILab"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-dd5vLT4Q0cI5ts0WgBpjPtOA81exGNjWSNHEiPggYbg="; + hash = "sha256-1mXulG/yqNwKQKDFGBh8uxIYOPSsm8+PNp++CSswc50="; }; nativeBuildInputs = [ setuptools ]; @@ -31,6 +32,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for CMA evolution strategy"; homepage = "https://github.com/CyberAgentAILab/cmaes"; + changelog = "https://github.com/CyberAgentAILab/cmaes/releases/tag/v${version}"; license = licenses.mit; maintainers = [ maintainers.bcdarwin ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/coinmetrics-api-client/default.nix b/nixpkgs/pkgs/development/python-modules/coinmetrics-api-client/default.nix index b426de499aa0..b113175941cc 100644 --- a/nixpkgs/pkgs/development/python-modules/coinmetrics-api-client/default.nix +++ b/nixpkgs/pkgs/development/python-modules/coinmetrics-api-client/default.nix @@ -11,13 +11,14 @@ , pythonOlder , pythonRelaxDepsHook , requests +, tqdm , typer , websocket-client }: buildPythonPackage rec { pname = "coinmetrics-api-client"; - version = "2023.8.24.13"; + version = "2023.8.30.20"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -27,7 +28,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "coinmetrics_api_client"; - hash = "sha256-Ju8QczI/vyX4//WMy92H66DafTGJefsOqIjifCfQXGU="; + hash = "sha256-zi9hFpmRILfWXA9eLGbzt/+v3l1wykZz10GUuH20hzE="; }; pythonRelaxDeps = [ @@ -44,6 +45,7 @@ buildPythonPackage rec { python-dateutil requests typer + tqdm websocket-client ]; diff --git a/nixpkgs/pkgs/development/python-modules/cryptography/default.nix b/nixpkgs/pkgs/development/python-modules/cryptography/default.nix index 076e045d7272..aa762e315c13 100644 --- a/nixpkgs/pkgs/development/python-modules/cryptography/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cryptography/default.nix @@ -1,10 +1,10 @@ { lib , stdenv -, callPackage , buildPythonPackage -, fetchPypi +, callPackage , cargo , cffi +, fetchPypi , hypothesis , iso8601 , isPyPy @@ -14,8 +14,8 @@ , pkg-config , pretend , py -, pytestCheckHook , pytest-subtests +, pytestCheckHook , pythonOlder , pytz , rustc @@ -29,20 +29,20 @@ let in buildPythonPackage rec { pname = "cryptography"; - version = "41.0.2"; # Also update the hash in vectors.nix + version = "41.0.3"; # Also update the hash in vectors.nix format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-fSML+FYWTeFk7LYVzMFMf8beaQbd1bSR86+Q01FMklw="; + hash = "sha256-bRknQRE+9eMNidy1uVbvThV48wRwhwG4tz044+FGHzQ="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; sourceRoot = "${pname}-${version}/${cargoRoot}"; name = "${pname}-${version}"; - hash = "sha256-hkuoICa/suMXlr4u95JbMlFzi27lJqJRmWnX3nZfzKU="; + hash = "sha256-LQu7waympGUs+CZun2yDQd2gUUAgyisKBG5mddrfSo0="; }; postPatch = '' @@ -62,9 +62,14 @@ buildPythonPackage rec { cffi ]; - buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ Security libiconv ] - ++ lib.optionals (pythonOlder "3.9") [ libxcrypt ]; + buildInputs = [ + openssl + ] ++ lib.optionals stdenv.isDarwin [ + Security + libiconv + ] ++ lib.optionals (pythonOlder "3.9") [ + libxcrypt + ]; propagatedBuildInputs = lib.optionals (!isPyPy) [ cffi diff --git a/nixpkgs/pkgs/development/python-modules/cryptography/vectors.nix b/nixpkgs/pkgs/development/python-modules/cryptography/vectors.nix index 554873de89e1..ff8bfa05ed51 100644 --- a/nixpkgs/pkgs/development/python-modules/cryptography/vectors.nix +++ b/nixpkgs/pkgs/development/python-modules/cryptography/vectors.nix @@ -1,4 +1,9 @@ -{ buildPythonPackage, fetchPypi, lib, cryptography, setuptools }: +{ lib +, buildPythonPackage +, fetchPypi +, cryptography +, setuptools +}: buildPythonPackage rec { pname = "cryptography-vectors"; @@ -9,15 +14,19 @@ buildPythonPackage rec { src = fetchPypi { pname = "cryptography_vectors"; inherit version; - hash = "sha256-Ao3/lKhSLKgYsRKV/xLfVfNI8zoZPAWX3f6COeU9FYI="; + hash = "sha256-gN4EUsSzT1b1UY6B69dba5BfVyiq7VIdQuQfTryKQ/s="; }; - nativeBuildInputs = [ setuptools ]; + nativeBuildInputs = [ + setuptools + ]; # No tests included doCheck = false; - pythonImportsCheck = [ "cryptography_vectors" ]; + pythonImportsCheck = [ + "cryptography_vectors" + ]; meta = with lib; { description = "Test vectors for the cryptography package"; diff --git a/nixpkgs/pkgs/development/python-modules/cssbeautifier/default.nix b/nixpkgs/pkgs/development/python-modules/cssbeautifier/default.nix new file mode 100644 index 000000000000..390c459242ae --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/cssbeautifier/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools +, jsbeautifier +}: + +buildPythonPackage rec { + pname = "cssbeautifier"; + version = "1.14.9"; + format = "pyproject"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-LaQyRy9oFw64VK/5exaiRyH1CQ7javLjEZlZConn9x8="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ jsbeautifier ]; + + # has no tests + doCheck = false; + + pythonImportsCheck = [ "cssbeautifier" ]; + + meta = with lib; { + description = "CSS unobfuscator and beautifier"; + homepage = "https://pypi.org/project/cssbeautifier/"; + license = licenses.mit; + maintainers = with maintainers; [ traxys ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/cwl-upgrader/default.nix b/nixpkgs/pkgs/development/python-modules/cwl-upgrader/default.nix index 21a9e359c413..97f2ff499c3e 100644 --- a/nixpkgs/pkgs/development/python-modules/cwl-upgrader/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cwl-upgrader/default.nix @@ -11,16 +11,16 @@ buildPythonPackage rec { pname = "cwl-upgrader"; - version = "1.2.8"; + version = "1.2.9"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "common-workflow-language"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-DwXwzhsv92t6PU4emmG7xlIU7uj3rcHh4+o9NqBMA+A="; + hash = "sha256-yvgGMGo4QK+PRDzqlOH4rP49fnJUlbYB9B5AnlX+LF8="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/cwl-utils/default.nix b/nixpkgs/pkgs/development/python-modules/cwl-utils/default.nix index 3c80a158b4e2..77f81963eefc 100644 --- a/nixpkgs/pkgs/development/python-modules/cwl-utils/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cwl-utils/default.nix @@ -16,16 +16,16 @@ buildPythonPackage rec { pname = "cwl-utils"; - version = "0.28"; + version = "0.29"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "common-workflow-language"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-hplpsig+phIX6WCbUV0ILcA62f5DE/yTyKfoaeumgyY="; + hash = "sha256-XxfeBikJcRcUCIVDAmPTtcrrgvZYrRKpjs5bmMokeeI="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/cypari2/default.nix b/nixpkgs/pkgs/development/python-modules/cypari2/default.nix index 70cd89afdcad..4cdd8f31a5fd 100644 --- a/nixpkgs/pkgs/development/python-modules/cypari2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cypari2/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { # (https://trac.sagemath.org/ticket/27267). depends on Cython patch. (fetchpatch { name = "use-trashcan-for-gen.patch"; - url = "https://git.sagemath.org/sage.git/plain/build/pkgs/cypari/patches/trashcan.patch?id=b6ea17ef8e4d652de0a85047bac8d41e90b25555"; + url = "https://raw.githubusercontent.com/sagemath/sage/b6ea17ef8e4d652de0a85047bac8d41e90b25555/build/pkgs/cypari/patches/trashcan.patch"; hash = "sha256-w4kktWb9/aR9z4CjrUvAMOxEwRN2WkubaKzQttN8rU8="; }) ]; diff --git a/nixpkgs/pkgs/development/python-modules/daqp/default.nix b/nixpkgs/pkgs/development/python-modules/daqp/default.nix new file mode 100644 index 000000000000..9ef1d3eee877 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/daqp/default.nix @@ -0,0 +1,52 @@ +{ lib +, stdenv +, fetchFromGitHub +, buildPythonPackage +, unittestCheckHook +, cython +, setuptools +, wheel +, numpy +}: +buildPythonPackage { + pname = "daqp"; + version = "0.5.1"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "darnstrom"; + repo = "daqp"; + rev = "5a15a3d16731d3d50f867218c1b281567db556fd"; + hash = "sha256-in7Ci/wM7i0csJ4XVfo1lboWOyfuuU+8E+TzGmMV3x0="; + }; + + sourceRoot = "source/interfaces/daqp-python"; + + postPatch = '' + sed -i 's|../../../daqp|../..|' setup.py + sed -i 's|if src_path and os.path.exists(src_path):|if False:|' setup.py + ''; + + nativeCheckInputs = [ unittestCheckHook ]; + + unittestFlagsArray = [ "-s" "test" "-p" "'*.py'" "-v" ]; + + nativeBuildInputs = [ + cython + setuptools + wheel + ]; + + propagatedBuildInputs = [ + numpy + ]; + + pythonImportsCheck = [ "daqp" ]; + + meta = with lib; { + description = "A dual active-set algorithm for convex quadratic programming"; + homepage = "https://github.com/darnstrom/daqp"; + license = licenses.mit; + maintainers = with maintainers; [ renesat ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/dataclass-factory/default.nix b/nixpkgs/pkgs/development/python-modules/dataclass-factory/default.nix new file mode 100644 index 000000000000..28caa864d456 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/dataclass-factory/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, nose2 +, typing-extensions +}: + +buildPythonPackage rec { + pname = "dataclass-factory"; + version = "2.13"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "reagento"; + repo = "dataclass-factory"; + rev = version; + hash = "sha256-hNPuqs3TvDleIxflCW5rutbXjDotFRLCNJlcTBFxFAw="; + }; + + nativeCheckInputs = [ + nose2 + ]; + + checkInputs = [ + typing-extensions + ]; + + pythonImportsCheck = [ "dataclass_factory" ]; + + checkPhase = '' + runHook preCheck + + nose2 -v tests + + runHook postCheck + ''; + + meta = with lib; { + description = "Modern way to convert python dataclasses or other objects to and from more common types like dicts or json-like structures"; + homepage = "https://github.com/reagento/dataclass-factory"; + changelog = "https://github.com/reagento/dataclass-factory/releases/tag/${src.rev}"; + license = licenses.asl20; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/dataclasses-json/default.nix b/nixpkgs/pkgs/development/python-modules/dataclasses-json/default.nix index 8b8ca7a7208b..32328178fa4e 100644 --- a/nixpkgs/pkgs/development/python-modules/dataclasses-json/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dataclasses-json/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "dataclasses-json"; - version = "0.5.15"; + version = "0.6.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "lidatong"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-ADWNB2Eu4TwlAvchyzBwGiw9YT9McPr9lsNfo1lR1WI="; + hash = "sha256-jv00WqSC/KCM+6+LtsCAQcqZTBbV1pavEqsCP/F84VU="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/datadog/default.nix b/nixpkgs/pkgs/development/python-modules/datadog/default.nix index fb3271af586f..2ec4ca43032b 100644 --- a/nixpkgs/pkgs/development/python-modules/datadog/default.nix +++ b/nixpkgs/pkgs/development/python-modules/datadog/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "datadog"; - version = "0.46.0"; + version = "0.47.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-5PvJKoXisJGaImiWrkX8Xks1bAxX8cJlllnfvgeJxnQ="; + hash = "sha256-R747LD1wmn9bcJ6xJu1P5sx5d9YY/lwVjdicKp99mRY="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/dbus-fast/default.nix b/nixpkgs/pkgs/development/python-modules/dbus-fast/default.nix index 28c4df0a62a2..bec651629d7f 100644 --- a/nixpkgs/pkgs/development/python-modules/dbus-fast/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dbus-fast/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "dbus-fast"; - version = "1.94.1"; + version = "2.0.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Ttz6AX/NH6/NNLgU2cMSb5e1jV/cq0LGW3ENARRP7H4="; + hash = "sha256-Dzr7CSoJhO/F75Ro686lKXCOzP2AxtR6wJOp70IOvUk="; }; # The project can build both an optimized cython version and an unoptimized @@ -66,11 +66,13 @@ buildPythonPackage rec { "test_export_alias" "test_export_introspection" "test_export_unexport" + "test_fast_disconnect" "test_glib_big_message" "test_high_level_service_fd_passing" "test_interface_add_remove_signal" "test_introspectable_interface" "test_methods" + "test_multiple_flags_in_message" "test_name_requests" "test_object_manager" "test_peer_interface" diff --git a/nixpkgs/pkgs/development/python-modules/dirty-equals/default.nix b/nixpkgs/pkgs/development/python-modules/dirty-equals/default.nix index a7195fcee166..5d0c94686926 100644 --- a/nixpkgs/pkgs/development/python-modules/dirty-equals/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dirty-equals/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dirty-equals"; - version = "0.6.0"; + version = "0.7.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "samuelcolvin"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-j+EqsKVRG2DDka1G3Px8ExYZt8QkqHkhojRnAHObdR4="; + hash = "sha256-ShbkPGj1whOQ11bFLUSTfvVEVlvc3JUzRDICbBohgMM="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/django-jinja2/default.nix b/nixpkgs/pkgs/development/python-modules/django-jinja2/default.nix index 8216ca4ff872..77d50b65ce6f 100644 --- a/nixpkgs/pkgs/development/python-modules/django-jinja2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django-jinja2/default.nix @@ -9,17 +9,17 @@ buildPythonPackage rec { pname = "django-jinja"; - version = "2.10.2"; + version = "2.11.0"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; format = "setuptools"; src = fetchFromGitHub { owner = "niwinz"; repo = "django-jinja"; - rev = version; - hash = "sha256-IZ4HjBQt6K8xbaYfO5DVlGKUVCQ3UciAUpfnqCjzyCE="; + rev = "refs/tags/${version}"; + hash = "sha256-0gkv9xinHux8TRiNBLl/JgcimXU3CzysxzGR2jn7OZ4="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/django-tastypie/default.nix b/nixpkgs/pkgs/development/python-modules/django-tastypie/default.nix index 8056aca7100e..004773037e88 100644 --- a/nixpkgs/pkgs/development/python-modules/django-tastypie/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django-tastypie/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "django-tastypie"; - version = "0.14.5"; + version = "0.14.6"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "django-tastypie"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-RgYinpo8eVzRaSkcnFkSq+IqpcFt6LCCHkpHyB/7u5M="; + hash = "sha256-emZVcycGLa8Z2yMv/NWZi1b5fPk50u841cFfFF3Ke/s="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/djangorestframework-stubs/default.nix b/nixpkgs/pkgs/development/python-modules/djangorestframework-stubs/default.nix new file mode 100644 index 000000000000..1d1d76ed3b68 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/djangorestframework-stubs/default.nix @@ -0,0 +1,54 @@ +{ lib +, buildPythonPackage +, django-stubs +, fetchFromGitHub +, mypy +, py +, pytest-mypy-plugins +, pytestCheckHook +, pythonOlder +, requests +, types-pyyaml +, types-requests +, typing-extensions +}: + +buildPythonPackage rec { + pname = "djangorestframework-stubs"; + version = "3.14.2"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "typeddjango"; + repo = "djangorestframework-stubs"; + rev = version; + hash = "sha256-T357ocJvDC+vt0I4VyAu0Q9YzY9cSK7shgp9fQ1qHyY="; + }; + + propagatedBuildInputs = [ + django-stubs + mypy + requests + types-pyyaml + types-requests + typing-extensions + ]; + + nativeCheckInputs = [ + mypy + py + pytest-mypy-plugins + pytestCheckHook + ]; + + meta = with lib; { + description = "PEP-484 stubs for Django REST Framework"; + homepage = "https://github.com/typeddjango/djangorestframework-stubs"; + changelog = "https://github.com/typeddjango/djangorestframework-stubs/releases/tag/${version}"; + license = licenses.mit; + maintainers = with maintainers; [ elohmeier ]; + }; +} + diff --git a/nixpkgs/pkgs/development/python-modules/dnspython/default.nix b/nixpkgs/pkgs/development/python-modules/dnspython/default.nix index 402272fb54b8..5bf9981170b1 100644 --- a/nixpkgs/pkgs/development/python-modules/dnspython/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dnspython/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "dnspython"; - version = "2.4.1"; + version = "2.4.2"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-wzlxx5r1vpaLuJfpXCRI4RpkXuhNk7Jlzgt6q+Xf3Kg="; + hash = "sha256-jc+ujHRgovhLQHLibxyfQQHKIMBxZJy3w06LapPViYQ="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/dunamai/default.nix b/nixpkgs/pkgs/development/python-modules/dunamai/default.nix index 87ff45fb468e..46e2361d9db9 100644 --- a/nixpkgs/pkgs/development/python-modules/dunamai/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dunamai/default.nix @@ -6,13 +6,12 @@ , importlib-metadata , packaging , pytestCheckHook -, setuptools , git }: buildPythonPackage rec { pname = "dunamai"; - version = "1.16.0"; + version = "1.18.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +20,7 @@ buildPythonPackage rec { owner = "mtkennerly"; repo = "dunamai"; rev = "refs/tags/v${version}"; - hash = "sha256-pPUn+1rv76N/7WVDyWJLPVMweJ1Qbx6/P4zIKU06hSs="; + hash = "sha256-QKXEFwOAa5nIQZA6DHNqnWyshnN+/6qovdqjCd9WF4k="; }; nativeBuildInputs = [ @@ -46,7 +45,11 @@ buildPythonPackage rec { nativeCheckInputs = [ git pytestCheckHook - setuptools + ]; + + disabledTests = [ + # clones from github.com + "test__version__from_git__shallow" ]; pythonImportsCheck = [ diff --git a/nixpkgs/pkgs/development/python-modules/dvc-data/default.nix b/nixpkgs/pkgs/development/python-modules/dvc-data/default.nix index e5ee78a02350..09ae0a82d634 100644 --- a/nixpkgs/pkgs/development/python-modules/dvc-data/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dvc-data/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "dvc-data"; - version = "2.15.4"; + version = "2.16.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-8lwEf1+deLojhJDjRjII8sHRCGCM6l+igigIvNJidxQ="; + hash = "sha256-pLagCMHxlN26x/zP6tDRchxTwqvRyARKO5EzmuWncUo="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/nixpkgs/pkgs/development/python-modules/dvc/default.nix b/nixpkgs/pkgs/development/python-modules/dvc/default.nix index 60f7c588eaa3..5700bec74686 100644 --- a/nixpkgs/pkgs/development/python-modules/dvc/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dvc/default.nix @@ -55,14 +55,14 @@ buildPythonPackage rec { pname = "dvc"; - version = "3.17.0"; + version = "3.18.0"; format = "pyproject"; src = fetchFromGitHub { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-MFwmER2BmSKqisgLvnLY3aFoRuzeObE7lr5JOesJdXE="; + hash = "sha256-wTKQmFvI4kaXGivRiGDoI4lM/xHxYUDBqplscvjVQRs="; }; pythonRelaxDeps = [ diff --git a/nixpkgs/pkgs/development/python-modules/epson-projector/default.nix b/nixpkgs/pkgs/development/python-modules/epson-projector/default.nix index 8054757dd0ab..66fb7964e53e 100644 --- a/nixpkgs/pkgs/development/python-modules/epson-projector/default.nix +++ b/nixpkgs/pkgs/development/python-modules/epson-projector/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "epson-projector"; - version = "0.5.0"; + version = "0.5.1"; src = fetchPypi { pname = "epson_projector"; inherit version; - hash = "sha256-a9pRncC22DCKX+7ObC8PORpR+RGbOBor2lbwzfrU8tk="; + hash = "sha256-LwsdMuwvLifIP1PRNhfLi4TTZRp/cw9Bcf57vrsNrbI="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/ete3/default.nix b/nixpkgs/pkgs/development/python-modules/ete3/default.nix index b3c598ad396b..48ec3ca62386 100644 --- a/nixpkgs/pkgs/development/python-modules/ete3/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ete3/default.nix @@ -7,7 +7,6 @@ , withTreeVisualization ? false , lxml , withXmlSupport ? false -, pyqt4 , pyqt5 }: @@ -25,7 +24,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "ete3" ]; propagatedBuildInputs = [ six numpy ] - ++ lib.optional withTreeVisualization (if isPy3k then pyqt5 else pyqt4) + ++ lib.optional withTreeVisualization pyqt5 ++ lib.optional withXmlSupport lxml; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/faraday-plugins/default.nix b/nixpkgs/pkgs/development/python-modules/faraday-plugins/default.nix index bdee002b5aad..784b13c3549a 100644 --- a/nixpkgs/pkgs/development/python-modules/faraday-plugins/default.nix +++ b/nixpkgs/pkgs/development/python-modules/faraday-plugins/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "faraday-plugins"; - version = "1.13.0"; + version = "1.13.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "infobyte"; repo = "faraday_plugins"; rev = "refs/tags/${version}"; - hash = "sha256-t1C9fS0LU46J7y+rp2pTCVma09aFqzuBtslrlU+MS1E="; + hash = "sha256-ZoxIuUeDkhACWGi+njZuMhO8P6nlErcBkub5VCMNm8Q="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/fastrlock/default.nix b/nixpkgs/pkgs/development/python-modules/fastrlock/default.nix index 98a36d2953d4..26da544933d0 100644 --- a/nixpkgs/pkgs/development/python-modules/fastrlock/default.nix +++ b/nixpkgs/pkgs/development/python-modules/fastrlock/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "fastrlock"; - version = "0.8.1"; + version = "0.8.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "scoder"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-KYJd1wGJo+z34cY0YfsRbpC9IsQY/VJqycGpMmLmaVk="; + hash = "sha256-2h+rhP/EVMG3IkJVkE74p4GeBTwV3BS7fUkKpwedr2k="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/faust-cchardet/default.nix b/nixpkgs/pkgs/development/python-modules/faust-cchardet/default.nix index ad979dbaf6ab..6ee8b07137ee 100644 --- a/nixpkgs/pkgs/development/python-modules/faust-cchardet/default.nix +++ b/nixpkgs/pkgs/development/python-modules/faust-cchardet/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "faust-cchardet"; - version = "2.1.18"; + version = "2.1.19"; format = "pyproject"; src = fetchFromGitHub { @@ -20,7 +20,7 @@ buildPythonPackage rec { repo = "cChardet"; rev = "refs/tags/v${version}"; fetchSubmodules = true; - hash = "sha256-jTOqxBss/FAb8nMkU62H6O4ysmirD2FTA9mtvxXh43k="; + hash = "sha256-yY6YEhXC4S47rxnkKAta4m16IVGn7gkHSt056bYOYJ4="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/flask-limiter/default.nix b/nixpkgs/pkgs/development/python-modules/flask-limiter/default.nix index b32fc7b25afc..1305234e43f7 100644 --- a/nixpkgs/pkgs/development/python-modules/flask-limiter/default.nix +++ b/nixpkgs/pkgs/development/python-modules/flask-limiter/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "alisaifee"; repo = "flask-limiter"; rev = "refs/tags/${version}"; - hash = "sha256-YDVZ/dD+TRJEnJRTRmGEB6EIkK5eQ5MdXh8FideoVDQ="; + hash = "sha256-UtmMd180bwFm426YevARq6r7DL182dI7dGAUPFKLWuM="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/gcsa/default.nix b/nixpkgs/pkgs/development/python-modules/gcsa/default.nix new file mode 100644 index 000000000000..9dd8b51fd31d --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/gcsa/default.nix @@ -0,0 +1,46 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, pytestCheckHook +, pyfakefs +, tzlocal +, google-api-python-client +, google-auth-httplib2 +, google-auth-oauthlib +, python-dateutil +, beautiful-date +}: + +buildPythonPackage rec { + pname = "gcsa"; + version = "2.1.0"; + format = "setuptools"; + disable = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "kuzmoyev"; + repo = "google-calendar-simple-api"; + rev = "v${version}"; + hash = "sha256-Ye8mQSzgaEZx0vUpt5xiMrJTFh2AmSB7ZZlKaEj/YpM="; + }; + + propagatedBuildInputs = [ + tzlocal + google-api-python-client + google-auth-httplib2 + google-auth-oauthlib + python-dateutil + beautiful-date + ]; + + nativeCheckInputs = [ pytestCheckHook pyfakefs ]; + pythonImportsCheck = [ "gcsa" ]; + + meta = with lib; { + description = "Pythonic wrapper for the Google Calendar API"; + homepage = "https://github.com/kuzmoyev/google-calendar-simple-api"; + license = licenses.mit; + maintainers = with maintainers; [ mbalatsko ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/gitpython/default.nix b/nixpkgs/pkgs/development/python-modules/gitpython/default.nix index 79cefa48656c..8721df4bf36a 100644 --- a/nixpkgs/pkgs/development/python-modules/gitpython/default.nix +++ b/nixpkgs/pkgs/development/python-modules/gitpython/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "gitpython"; - version = "3.1.32"; + version = "3.1.33"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "gitpython-developers"; repo = "GitPython"; rev = "refs/tags/${version}"; - hash = "sha256-Bhgu57w5QYfq5hlTh5gCJhbdwUMU+u0nrova/2V2ed0="; + hash = "sha256-SqpoI8QnynHRHUdenMrOAGib/SDpix4rSXfEes4xt/Y="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/globus-sdk/default.nix b/nixpkgs/pkgs/development/python-modules/globus-sdk/default.nix index e96d6dff8e42..76bd9c572fa4 100644 --- a/nixpkgs/pkgs/development/python-modules/globus-sdk/default.nix +++ b/nixpkgs/pkgs/development/python-modules/globus-sdk/default.nix @@ -12,16 +12,16 @@ buildPythonPackage rec { pname = "globus-sdk"; - version = "3.27.0"; + version = "3.28.0"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "globus"; repo = "globus-sdk-python"; rev = "refs/tags/${version}"; - hash = "sha256-ZgRYwx/vICs1ombD8LGvCr0Wf9TpQurDGBoC2mtbxRs="; + hash = "sha256-mKtqfEpnWftpGReaUrmXf3LftZnMtEizPi4RbIwgnUM="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/glyphslib/default.nix b/nixpkgs/pkgs/development/python-modules/glyphslib/default.nix index 7a44e6488643..17c7ba91f28b 100644 --- a/nixpkgs/pkgs/development/python-modules/glyphslib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/glyphslib/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "glyphslib"; - version = "6.3.0"; + version = "6.4.0"; format = "pyproject"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "googlefonts"; repo = "glyphsLib"; rev = "refs/tags/v${version}"; - hash = "sha256-wBtotr7nH7KL5ISaJFs4i8CCv4OCZnVOREUon8jhQdY="; + hash = "sha256-vbyI5pSoQWFHG8aqZC4FExKzzIo6yxwl9DgGSgDz8xU="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-dataproc/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-dataproc/default.nix index 267ba36b91db..9732cfe2a6a1 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-dataproc/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-dataproc/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-dataproc"; - version = "5.4.3"; + version = "5.5.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-2cd8Uqpd31KuZXc22/tTEkApM/crq4SA/C0q/phpdAI="; + hash = "sha256-XYjEmBMCkCUxKvAF2KNXwG72C6TMszLikFvLtnjJf14="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/griffe/default.nix b/nixpkgs/pkgs/development/python-modules/griffe/default.nix index 361323ee17b1..e94498a5c6d9 100644 --- a/nixpkgs/pkgs/development/python-modules/griffe/default.nix +++ b/nixpkgs/pkgs/development/python-modules/griffe/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "griffe"; - version = "0.35.2"; + version = "0.36.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "mkdocstrings"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-Sskz14aAPqUXhQjetPfhjVm8gjG4yrck3sHpgD37DPU="; + hash = "sha256-miv7CDpBJ5hUyPzQWLqSndmUYR9Lmaonrilod6uhBo8="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/nixpkgs/pkgs/development/python-modules/gspread/default.nix b/nixpkgs/pkgs/development/python-modules/gspread/default.nix index 9d05bf5e0930..fd01e1b1d815 100644 --- a/nixpkgs/pkgs/development/python-modules/gspread/default.nix +++ b/nixpkgs/pkgs/development/python-modules/gspread/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "gspread"; - version = "5.10.0"; + version = "5.11.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "burnash"; repo = "gspread"; rev = "refs/tags/v${version}"; - hash = "sha256-GAlQYQVuwsnkXqZOvG66f9kig+m392CVlrgUTqrTKyA="; + hash = "sha256-a8A47il9NrMdHkSX4YmQj4VIAYDXK5V+FUdwv+LGIfQ="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/gvm-tools/default.nix b/nixpkgs/pkgs/development/python-modules/gvm-tools/default.nix index b80f9a2e4d06..4b5498396dd7 100644 --- a/nixpkgs/pkgs/development/python-modules/gvm-tools/default.nix +++ b/nixpkgs/pkgs/development/python-modules/gvm-tools/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "gvm-tools"; - version = "23.4.0"; + version = "23.9.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "greenbone"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-L7GR50nlcm2EQ6YxLAfieQJ+vPUrCrj72KNSY73LFko="; + hash = "sha256-W49jmFwLrCu8NhQ65ll3iu+QbnHBA5sCeUgSLYLrui0="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/hahomematic/default.nix b/nixpkgs/pkgs/development/python-modules/hahomematic/default.nix index 9aa76821650b..c1bcfbc33899 100644 --- a/nixpkgs/pkgs/development/python-modules/hahomematic/default.nix +++ b/nixpkgs/pkgs/development/python-modules/hahomematic/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "2023.8.14"; + version = "2023.9.0"; format = "pyproject"; disabled = pythonOlder "3.11"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-msN3S7rBYZnCAh2IGBVzHjqiTapzH2kMV5CBFHmtcNE="; + hash = "sha256-FM07+ORPFne+9gtruuKqp2EwPLF9py7zi9a6vehN2Yk="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/hatasmota/default.nix b/nixpkgs/pkgs/development/python-modules/hatasmota/default.nix index 1491587ade27..3fa3546eb976 100644 --- a/nixpkgs/pkgs/development/python-modules/hatasmota/default.nix +++ b/nixpkgs/pkgs/development/python-modules/hatasmota/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "hatasmota"; - version = "0.6.5"; + version = "0.7.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "emontnemery"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-DqXGvn7vYC3SXOM/u+nMUshgBUe0O6Dcffaxh9vFohk="; + hash = "sha256-f8bRVo9365w5gMpkb31thGXCRWZuKfkFEow9Wv4/+bM="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/heudiconv/default.nix b/nixpkgs/pkgs/development/python-modules/heudiconv/default.nix index 2928be6ede9a..514d4e2477b6 100644 --- a/nixpkgs/pkgs/development/python-modules/heudiconv/default.nix +++ b/nixpkgs/pkgs/development/python-modules/heudiconv/default.nix @@ -1,31 +1,45 @@ { lib , buildPythonPackage -, fetchPypi -, pythonOlder -, pytestCheckHook , datalad -, git , dcm2niix -, nibabel -, pydicom -, nipype , dcmstack , etelemetry +, fetchPypi , filelock +, git +, nibabel +, nipype +, pydicom +, pytestCheckHook +, pythonOlder +, setuptools +, versioningit +, wheel }: buildPythonPackage rec { - version = "0.13.1"; pname = "heudiconv"; + version = "0.13.1"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-UUBRC6RToj4XVbJnxG+EKdue4NVpTAW31RNm9ieF1lU="; + hash = "sha256-UUBRC6RToj4XVbJnxG+EKdue4NVpTAW31RNm9ieF1lU="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "versioningit ~=" "versioningit >=" + ''; + + nativeBuildInputs = [ + setuptools + versioningit + wheel + ]; + propagatedBuildInputs = [ nibabel pydicom @@ -42,7 +56,13 @@ buildPythonPackage rec { git ]; - preCheck = ''export HOME=$(mktemp -d)''; + preCheck = '' + export HOME=$(mktemp -d) + ''; + + pythonImportsCheck = [ + "heudiconv" + ]; meta = with lib; { homepage = "https://heudiconv.readthedocs.io"; diff --git a/nixpkgs/pkgs/development/python-modules/html-tag-names/default.nix b/nixpkgs/pkgs/development/python-modules/html-tag-names/default.nix new file mode 100644 index 000000000000..543ef8686dc9 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/html-tag-names/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +}: + +buildPythonPackage rec { + pname = "html-tag-names"; + version = "0.1.2"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "Riverside-Healthcare"; + repo = "html-tag-names"; + rev = version; + hash = "sha256-2YywP4/0yocejuJwanC5g9BR7mcy5C+zMhCjNZ9FRH4="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + # has no tests + doCheck = false; + + pythonImportsCheck = [ "HtmlTagNames" ]; + + meta = with lib; { + description = "List of known HTML tags"; + homepage = "https://github.com/Riverside-Healthcare/html-tag-names"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ traxys ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/html-void-elements/default.nix b/nixpkgs/pkgs/development/python-modules/html-void-elements/default.nix new file mode 100644 index 000000000000..bef3d9208026 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/html-void-elements/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +}: + +buildPythonPackage rec { + pname = "html-void-elements"; + version = "0.1.0"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "Riverside-Healthcare"; + repo = "html-void-elements"; + rev = version; + hash = "sha256-Q5OEczTdgCCyoOsKv3MKRE3w4t/qyPG4YKbF19jlC88="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + # has no tests + doCheck = false; + + pythonImportsCheck = [ "HtmlVoidElements" ]; + + meta = with lib; { + description = "List of HTML void tag names"; + homepage = "https://github.com/Riverside-Healthcare/html-void-elements"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ traxys ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/huggingface-hub/default.nix b/nixpkgs/pkgs/development/python-modules/huggingface-hub/default.nix index 2f0374644d40..9fc7e657468d 100644 --- a/nixpkgs/pkgs/development/python-modules/huggingface-hub/default.nix +++ b/nixpkgs/pkgs/development/python-modules/huggingface-hub/default.nix @@ -4,7 +4,6 @@ , pythonOlder , filelock , fsspec -, importlib-metadata , packaging , pyyaml , requests @@ -14,16 +13,16 @@ buildPythonPackage rec { pname = "huggingface-hub"; - version = "0.15.1"; + version = "0.16.4"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "huggingface"; repo = "huggingface_hub"; rev = "refs/tags/v${version}"; - hash = "sha256-q30/oNP1NjyxiJuSfxyjFgciydImMUgPdGJ/tqVtwZk="; + hash = "sha256-fWvEvYiaLiVGmDdfibIHJAsu7nUX+eaE0QGolS3LHO8="; }; propagatedBuildInputs = [ @@ -34,8 +33,6 @@ buildPythonPackage rec { requests tqdm typing-extensions - ] ++ lib.optionals (pythonOlder "3.8") [ - importlib-metadata ]; # Tests require network access. @@ -45,7 +42,7 @@ buildPythonPackage rec { "huggingface_hub" ]; - meta = with lib; { + meta = with lib; { description = "Download and publish models and other files on the huggingface.co hub"; homepage = "https://github.com/huggingface/huggingface_hub"; changelog = "https://github.com/huggingface/huggingface_hub/releases/tag/v${version}"; diff --git a/nixpkgs/pkgs/development/python-modules/hvac/default.nix b/nixpkgs/pkgs/development/python-modules/hvac/default.nix index 732496cdee88..7f8c9c5bea8a 100644 --- a/nixpkgs/pkgs/development/python-modules/hvac/default.nix +++ b/nixpkgs/pkgs/development/python-modules/hvac/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "hvac"; - version = "1.1.1"; + version = "1.2.0"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-+dvMRrmLJQx4XrEFCqEe40oMi2YWt1IYzxNGqYF5kvk="; + hash = "sha256-b1qg1rgTi1hdRlbR/gG12HYWMQyASEuQnMhMLLjwZP0="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/idasen/default.nix b/nixpkgs/pkgs/development/python-modules/idasen/default.nix index 8ce6928b9057..8fb0b0c4d008 100644 --- a/nixpkgs/pkgs/development/python-modules/idasen/default.nix +++ b/nixpkgs/pkgs/development/python-modules/idasen/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "idasen"; - version = "0.10.0"; + version = "0.10.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "newAM"; repo = "idasen"; rev = "refs/tags/v${version}"; - hash = "sha256-aCVKnKWJlrlKD+74KL9JKlNpMGOzg/iWmB+1IMn0V/E="; + hash = "sha256-aCAtZsHH1tkti2A7OWw9rV4vij1n6T+R8nMa/MRZuF8="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/ilua/default.nix b/nixpkgs/pkgs/development/python-modules/ilua/default.nix index 143f1ed035f9..9c6a7f6cb337 100644 --- a/nixpkgs/pkgs/development/python-modules/ilua/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ilua/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, jupyter_console +, jupyter-console , jupyter-core , pygments , termcolor @@ -19,7 +19,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - jupyter_console + jupyter-console jupyter-core pygments termcolor diff --git a/nixpkgs/pkgs/development/python-modules/ipyvue/default.nix b/nixpkgs/pkgs/development/python-modules/ipyvue/default.nix index e71c3e845424..aba6a22ea168 100644 --- a/nixpkgs/pkgs/development/python-modules/ipyvue/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ipyvue/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "ipyvue"; - version = "1.9.2"; + version = "1.10.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - hash = "sha256-2j8qYRXR8nmV5++g4OJn65dq3lypgqo9oxBscNb4eNs="; + hash = "sha256-XPmrGg0SCTiZKMeTCeJywuKaa5ByY9FQTBy+THSJSiQ="; }; propagatedBuildInputs = [ ipywidgets ]; @@ -23,8 +23,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "ipyvue" ]; meta = with lib; { - description = "Jupyter widgets base for Vue libraries."; - homepage = "https://github.com/mariobuikhuizen/ipyvuetify"; + description = "Jupyter widgets base for Vue libraries"; + homepage = "https://github.com/mariobuikhuizen/ipyvue"; license = licenses.mit; maintainers = with maintainers; [ drewrisinger ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/jaraco-logging/default.nix b/nixpkgs/pkgs/development/python-modules/jaraco-logging/default.nix index e6cd8e253dd8..5e5e60b39624 100644 --- a/nixpkgs/pkgs/development/python-modules/jaraco-logging/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jaraco-logging/default.nix @@ -1,24 +1,28 @@ { lib , buildPythonPackage , fetchPypi +, pythonOlder , setuptools , setuptools-scm , tempora -, six }: buildPythonPackage rec { pname = "jaraco-logging"; - version = "3.1.2"; + version = "3.2.0"; format = "pyproject"; + disabled = pythonOlder "3.8"; + src = fetchPypi { pname = "jaraco.logging"; inherit version; - hash = "sha256-k6cLizdnd5rWx7Vu6YV5ztd7afFqu8rnSfYsLFnmeTE="; + hash = "sha256-X8ssPxI1HU1QN1trYPOJnFg3sjLxotj/y6/17NK3M+c="; }; - pythonNamespaces = [ "jaraco" ]; + pythonNamespaces = [ + "jaraco" + ]; nativeBuildInputs = [ setuptools @@ -27,17 +31,19 @@ buildPythonPackage rec { propagatedBuildInputs = [ tempora - six ]; # test no longer packaged with pypi doCheck = false; - pythonImportsCheck = [ "jaraco.logging" ]; + pythonImportsCheck = [ + "jaraco.logging" + ]; meta = with lib; { description = "Support for Python logging facility"; homepage = "https://github.com/jaraco/jaraco.logging"; + changelog = "https://github.com/jaraco/jaraco.logging/blob/v${version}/NEWS.rst"; license = licenses.mit; maintainers = with maintainers; [ ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/json-logging/default.nix b/nixpkgs/pkgs/development/python-modules/json-logging/default.nix index 5a56ea4fbc02..a3ac3ff7f005 100644 --- a/nixpkgs/pkgs/development/python-modules/json-logging/default.nix +++ b/nixpkgs/pkgs/development/python-modules/json-logging/default.nix @@ -46,6 +46,11 @@ buildPythonPackage rec { "quart" ]; + disabledTestPaths = [ + # Smoke tests don't always work + "tests/smoketests/test_run_smoketest.py" + ]; + __darwinAllowLocalNetworking = true; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/jupyter_console/default.nix b/nixpkgs/pkgs/development/python-modules/jupyter-console/default.nix index 91e21f91019e..e847c341f4d8 100644 --- a/nixpkgs/pkgs/development/python-modules/jupyter_console/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jupyter-console/default.nix @@ -18,15 +18,16 @@ }: buildPythonPackage rec { - pname = "jupyter_console"; - version = "6.6.1"; + pname = "jupyter-console"; + version = "6.6.3"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - hash = "sha256-WTEhLVy8H5Vvb9YVdVteFfOJqOqmlyiNu+Q3cBdhXsw="; + pname = "jupyter_console"; + inherit version; + hash = "sha256-VmpL8xyHrb+t8izfhG4wabWace1dpx1rpNiqrRSlNTk="; }; nativeBuildInputs = [ @@ -71,5 +72,6 @@ buildPythonPackage rec { homepage = "https://github.com/jupyter/jupyter_console"; changelog = "https://github.com/jupyter/jupyter_console/releases/tag/v${version}"; license = lib.licenses.bsd3; + maintainers = lib.teams.jupyter.members; }; } diff --git a/nixpkgs/pkgs/development/python-modules/jupyter-server/default.nix b/nixpkgs/pkgs/development/python-modules/jupyter-server/default.nix index b8a9a97e230a..0c3d704711d1 100644 --- a/nixpkgs/pkgs/development/python-modules/jupyter-server/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jupyter-server/default.nix @@ -36,14 +36,14 @@ buildPythonPackage rec { pname = "jupyter-server"; - version = "2.7.0"; + version = "2.7.3"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { pname = "jupyter_server"; inherit version; - hash = "sha256-NtoKJm0xpBrDNaNmyIkzwX36W7gXpI9cAsFtMDvJR38="; + hash = "sha256-1JFshYHE67xTTOvaqOyiR42fO/3Yjq4p/KsBIOrFdkk="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/jupyter/default.nix b/nixpkgs/pkgs/development/python-modules/jupyter/default.nix index 818623c2513b..b795dc9c9101 100644 --- a/nixpkgs/pkgs/development/python-modules/jupyter/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jupyter/default.nix @@ -3,7 +3,7 @@ , fetchPypi , notebook , qtconsole -, jupyter_console +, jupyter-console , nbconvert , ipykernel , ipywidgets @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "d9dc4b3318f310e34c82951ea5d6683f67bed7def4b259fafbfe4f1beb1d8e5f"; }; - propagatedBuildInputs = [ notebook qtconsole jupyter_console nbconvert ipykernel ipywidgets ]; + propagatedBuildInputs = [ notebook qtconsole jupyter-console nbconvert ipykernel ipywidgets ]; # Meta-package, no tests doCheck = false; diff --git a/nixpkgs/pkgs/development/python-modules/karton-config-extractor/default.nix b/nixpkgs/pkgs/development/python-modules/karton-config-extractor/default.nix index bce1025301e3..8d8b51bc842f 100644 --- a/nixpkgs/pkgs/development/python-modules/karton-config-extractor/default.nix +++ b/nixpkgs/pkgs/development/python-modules/karton-config-extractor/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "karton-config-extractor"; - version = "2.1.1"; + version = "2.2.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "CERT-Polska"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-ep69Rrm8Ek0lkgctz6vDAZ1MZ8kWKZSyIvMMAmzTngA="; + hash = "sha256-X2g/wgWLIY2ZIwH1l83EApyoeYQU5/MWq5S0qmYz+CA="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/libtmux/default.nix b/nixpkgs/pkgs/development/python-modules/libtmux/default.nix index ac07b77bf2b4..aab31436fb2b 100644 --- a/nixpkgs/pkgs/development/python-modules/libtmux/default.nix +++ b/nixpkgs/pkgs/development/python-modules/libtmux/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "libtmux"; - version = "0.23.0post0"; + version = "0.23.1"; format = "pyproject"; src = fetchFromGitHub { owner = "tmux-python"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-qk9QYfLVJVtkNgAZ19UziU7metluz10gDs9HbMoqZjo="; + hash = "sha256-uMsQFDPLsphS6T55sDMKFawYgAycp8u9NizF5ZHnMqQ="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/localstack/default.nix b/nixpkgs/pkgs/development/python-modules/localstack/default.nix index 2b722c92919f..e984554a843e 100644 --- a/nixpkgs/pkgs/development/python-modules/localstack/default.nix +++ b/nixpkgs/pkgs/development/python-modules/localstack/default.nix @@ -20,13 +20,13 @@ buildPythonPackage rec { pname = "localstack"; - version = "1.4.0"; + version = "2.2.0"; src = fetchFromGitHub { owner = "localstack"; repo = "localstack"; rev = "refs/tags/v${version}"; - hash = "sha256-mfPlpB1CvYuhnfucDfJjZtNS+1Kz0/l3+3uUXxxGiF4="; + hash = "sha256-hlK3pltajFRAtiwLOJQNmxRfoRAX5Jccygglbhb45O8="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/logilab/common.nix b/nixpkgs/pkgs/development/python-modules/logilab/common.nix index eef74d0695ec..9467f003c703 100644 --- a/nixpkgs/pkgs/development/python-modules/logilab/common.nix +++ b/nixpkgs/pkgs/development/python-modules/logilab/common.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "logilab-common"; - version = "1.9.7"; + version = "1.10.0"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-/JlN9RlIRLbi9TL9V6SgO6ddPeKqLzK402DqkLBRuxM="; + hash = "sha256-MoXt3tta5OimJUjOkWSMDCmXV0aS8N0W5bcANwAelYY="; }; nativeBuildInputs = [ @@ -27,6 +27,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ + setuptools mypy-extensions typing-extensions ] ++ lib.optionals (pythonOlder "3.8") [ diff --git a/nixpkgs/pkgs/development/python-modules/logilab/constraint.nix b/nixpkgs/pkgs/development/python-modules/logilab/constraint.nix index e609558d4c92..f97cb9593b6f 100644 --- a/nixpkgs/pkgs/development/python-modules/logilab/constraint.nix +++ b/nixpkgs/pkgs/development/python-modules/logilab/constraint.nix @@ -1,22 +1,57 @@ -{ lib, buildPythonPackage, fetchPypi, logilab-common, six }: +{ lib +, buildPythonPackage +, fetchPypi +, importlib-metadata +, logilab-common +, pip +, six +, pytestCheckHook +, setuptools +}: buildPythonPackage rec { pname = "logilab-constraint"; version = "0.6.2"; + format = "setuptools"; src = fetchPypi { inherit pname version; hash = "sha256-Jk6wvvcDEeHfy7dUcjbnzFIeGBYm5tXzCI26yy+t2qs="; }; + nativeBuildInputs = [ + importlib-metadata + pip + ]; + propagatedBuildInputs = [ - logilab-common six + logilab-common + setuptools + six + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + preCheck = '' + # avoid ModuleNotFoundError: No module named 'logilab.common' due to namespace + rm -r logilab + ''; + + disabledTests = [ + # these tests are abstract test classes intended to be inherited + "Abstract" ]; + pythonImportsCheck = [ "logilab.constraint" ]; meta = with lib; { description = "logilab-database provides some classes to make unified access to different"; - homepage = "https://www.logilab.org/project/logilab-database"; + homepage = "https://forge.extranet.logilab.fr/open-source/logilab-constraint"; + changelog = "https://forge.extranet.logilab.fr/open-source/logilab-constraint/-/blob/${version}/CHANGELOG.md"; + license = licenses.lgpl21Plus; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/magic-filter/default.nix b/nixpkgs/pkgs/development/python-modules/magic-filter/default.nix index 8a3a0fff574d..bf85abee73c8 100644 --- a/nixpkgs/pkgs/development/python-modules/magic-filter/default.nix +++ b/nixpkgs/pkgs/development/python-modules/magic-filter/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "magic-filter"; - version = "1.0.10"; + version = "1.0.11"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -16,8 +16,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "aiogram"; repo = "magic-filter"; - rev = "v${version}"; - hash = "sha256-mHqq/ci8uMACNutwmxKX1nrl3nTSnSyU2x1VxzWxqzM="; + rev = "refs/tags/v${version}"; + hash = "sha256-mfSq47UWOLyEDkAsdHsJuVl/rJ4KgiGPpDL7qSKEfws="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix b/nixpkgs/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix index e47f27d806cb..fc9636c351a0 100644 --- a/nixpkgs/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix +++ b/nixpkgs/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , fetchPypi , fetchpatch @@ -48,6 +49,12 @@ buildPythonPackage rec { twisted ]; + # Fails in Darwin's sandbox + postPatch = lib.optionalString stdenv.isDarwin '' + echo 'LogRequests.skip = "Operation not permitted"' >> src/wormhole_mailbox_server/test/test_web.py + echo 'WebSocketAPI.skip = "Operation not permitted"' >> src/wormhole_mailbox_server/test/test_web.py + ''; + checkPhase = '' trial -j$NIX_BUILD_CORES wormhole_mailbox_server ''; diff --git a/nixpkgs/pkgs/development/python-modules/magic-wormhole/default.nix b/nixpkgs/pkgs/development/python-modules/magic-wormhole/default.nix index f462793266b9..95635b94d505 100644 --- a/nixpkgs/pkgs/development/python-modules/magic-wormhole/default.nix +++ b/nixpkgs/pkgs/development/python-modules/magic-wormhole/default.nix @@ -56,6 +56,31 @@ buildPythonPackage rec { disabledTests = [ # Expected: (<class 'wormhole.errors.WrongPasswordError'>,) Got: Failure instance: Traceback (failure with no frames): <class 'wormhole.errors.LonelyError'>: "test_welcome" + ] ++ lib.optionals stdenv.isDarwin [ + # These tests doesn't work within Darwin's sandbox + "test_version" + "test_text" + "test_receiver" + "test_sender" + "test_sender_allocation" + "test_text_wrong_password" + "test_override" + "test_allocate_port" + "test_allocate_port_no_reuseaddr" + "test_ignore_localhost_hint" + "test_ignore_localhost_hint_orig" + "test_keep_only_localhost_hint" + "test_get_direct_hints" + "test_listener" + "test_success_direct" + "test_direct" + "test_relay" + ]; + + disabledTestPaths = lib.optionals stdenv.isDarwin [ + # These tests doesn't work within Darwin's sandbox + "src/wormhole/test/test_xfer_util.py" + "src/wormhole/test/test_wormhole.py" ]; postPatch = lib.optionalString stdenv.isLinux '' diff --git a/nixpkgs/pkgs/development/python-modules/marisa-trie/default.nix b/nixpkgs/pkgs/development/python-modules/marisa-trie/default.nix index b2510bd0a8fe..34a1a4767e72 100644 --- a/nixpkgs/pkgs/development/python-modules/marisa-trie/default.nix +++ b/nixpkgs/pkgs/development/python-modules/marisa-trie/default.nix @@ -5,15 +5,19 @@ , pytestCheckHook , hypothesis , readme_renderer +, pythonOlder }: buildPythonPackage rec { pname = "marisa-trie"; - version = "0.8.0"; + version = "1.0.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-PQGdF7DX9i1ubXvQUjbYJSYk6hwUC+uL+cbu/zizxwc="; + hash = "sha256-2KaDAfAjpyTrN5qqGxD4ip4aRYzIpBtSfGJQeFm0pNI="; }; nativeBuildInputs = [ @@ -60,6 +64,7 @@ buildPythonPackage rec { This package provides alternative Cython-based pip-installable Python bindings. ''; homepage = "https://github.com/kmike/marisa-trie"; + changelog = "https://github.com/pytries/marisa-trie/blob/${version}/CHANGES.rst"; license = licenses.mit; maintainers = with maintainers; [ ixxie ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/mautrix/default.nix b/nixpkgs/pkgs/development/python-modules/mautrix/default.nix index 4b83afc5d31a..5a92323dcd1c 100644 --- a/nixpkgs/pkgs/development/python-modules/mautrix/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mautrix/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "mautrix"; - version = "0.20.0"; + version = "0.20.1"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "mautrix"; repo = "python"; rev = "refs/tags/v${version}"; - hash = "sha256-op28CGpJBcCBiy0WXboaf4JeNRIMX6653QkAV6XW/yI="; + hash = "sha256-Byvwg6WW4b8kRWJkl6DG2Ioz4HYDaJyVEV98tS/ybXQ="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/mercadopago/default.nix b/nixpkgs/pkgs/development/python-modules/mercadopago/default.nix index aebb28c185a5..dc71fc326667 100644 --- a/nixpkgs/pkgs/development/python-modules/mercadopago/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mercadopago/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "mercadopago"; - version = "2.2.0"; + version = "2.2.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "mercadopago"; repo = "sdk-python"; rev = "refs/tags/${version}"; - hash = "sha256-HtPyIwip/cjvnBDZ0qGpLKJOkwETGSqXvTkH2pcd6cc="; + hash = "sha256-ABxYGYUBOzeOSE0yK8jym+ldinDUCTpqO165OWhszgs="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/metakernel/default.nix b/nixpkgs/pkgs/development/python-modules/metakernel/default.nix index 6d5f85acb481..3f270fee8fce 100644 --- a/nixpkgs/pkgs/development/python-modules/metakernel/default.nix +++ b/nixpkgs/pkgs/development/python-modules/metakernel/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "metakernel"; - version = "0.29.5"; + version = "0.30.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-tGp8CHQ1Ekn/2KiGZGd/8V6NdWMseDSETZ/Z3T3P91U="; + hash = "sha256-O5BAfb+6fCbETaJmWsVSayTId/57VjA7U3FGCeNe28Y="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/millheater/default.nix b/nixpkgs/pkgs/development/python-modules/millheater/default.nix index 6edd37f14dbc..b5153d7c4028 100644 --- a/nixpkgs/pkgs/development/python-modules/millheater/default.nix +++ b/nixpkgs/pkgs/development/python-modules/millheater/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "millheater"; - version = "0.11.1"; + version = "0.11.2"; format = "setuptools"; disabled = pythonOlder "3.10"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "pymill"; rev = "refs/tags/${version}"; - hash = "sha256-RlnZUI7F1u1rjmuPc2guqVomR25Izf5jejN6LlMZYS8="; + hash = "sha256-PsNT/mZ4Dun4s9QpGRyEuVxYcM5AXaUS28UsSOowOb4="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/mkdocstrings-python/default.nix b/nixpkgs/pkgs/development/python-modules/mkdocstrings-python/default.nix index df8b47a3e983..b7afeffe9d86 100644 --- a/nixpkgs/pkgs/development/python-modules/mkdocstrings-python/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mkdocstrings-python/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "mkdocstrings-python"; - version = "1.6.0"; + version = "1.6.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "mkdocstrings"; repo = "python"; rev = "refs/tags/${version}"; - hash = "sha256-r9zboUvF1IH32d6jQ+nRbzXejlZADt5+YNZ/LdFyULk="; + hash = "sha256-zbF+fqgXb8BAN+Nf2pRV/SeOXnJXLXJBIWZyZ6a9zP4="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/mwparserfromhell/default.nix b/nixpkgs/pkgs/development/python-modules/mwparserfromhell/default.nix index 453ff24ef7bf..effa1e42ad36 100644 --- a/nixpkgs/pkgs/development/python-modules/mwparserfromhell/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mwparserfromhell/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "mwparserfromhell"; - version = "0.6.4"; + version = "0.6.5"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-kr7JUorjTScok8yvK1J9+FwxT/KM+7MFY0BGewldg0w="; + hash = "sha256-K60L/2FFdjmeRHDWQAuinFLVlWgqS43mQq+7W+v0o0Y="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/mysql-connector/0001-Revert-Fix-MacOS-wheels-platform-tag.patch b/nixpkgs/pkgs/development/python-modules/mysql-connector/0001-Revert-Fix-MacOS-wheels-platform-tag.patch index 4356052d8715..4b8e40d6588b 100644 --- a/nixpkgs/pkgs/development/python-modules/mysql-connector/0001-Revert-Fix-MacOS-wheels-platform-tag.patch +++ b/nixpkgs/pkgs/development/python-modules/mysql-connector/0001-Revert-Fix-MacOS-wheels-platform-tag.patch @@ -1,36 +1,22 @@ -From c5d32ef5d656b0aa4b2c1fc61c901d40bf2fb96a Mon Sep 17 00:00:00 2001 -From: Alexander Ben Nasrallah <me@abn.sh> -Date: Mon, 19 Jul 2021 17:24:41 +0200 -Subject: [PATCH] Revert "Fix MacOS wheels platform tag" - -This reverts commit d1e89fd3d7391084cdf35b0806cb5d2a4b413654. ---- - cpydist/__init__.py | 5 +---- - 1 file changed, 1 insertion(+), 4 deletions(-) - diff --git a/cpydist/__init__.py b/cpydist/__init__.py -index 0e7f341..2619d7a 100644 +index 7fdbaf2..3c427da 100644 --- a/cpydist/__init__.py +++ b/cpydist/__init__.py -@@ -41,7 +41,7 @@ from distutils.command.install import install - from distutils.command.install_lib import install_lib - from distutils.core import Command - from distutils.dir_util import mkpath, remove_tree --from distutils.sysconfig import get_config_vars, get_python_version -+from distutils.sysconfig import get_python_version - from distutils.version import LooseVersion - from subprocess import check_call, Popen, PIPE - -@@ -57,9 +57,6 @@ version_py = os.path.join("lib", "mysql", "connector", "version.py") +@@ -38,7 +38,7 @@ import tempfile + from glob import glob + from pathlib import Path + from subprocess import PIPE, Popen, check_call +-from sysconfig import get_config_vars, get_python_version ++from sysconfig import get_python_version + + from setuptools import Command + from setuptools.command.build_ext import build_ext +@@ -68,8 +68,6 @@ version_py = os.path.join("lib", "mysql", "connector", "version.py") with open(version_py, "rb") as fp: exec(compile(fp.read(), version_py, "exec")) - + -if "MACOSX_DEPLOYMENT_TARGET" in get_config_vars(): - get_config_vars()["MACOSX_DEPLOYMENT_TARGET"] = "11.0" -- - COMMON_USER_OPTIONS = [ - ("byte-code-only", None, - "remove Python .py files; leave byte code .pyc only"), --- -2.31.1 + COMMON_USER_OPTIONS = [ + ( \ No newline at end of file diff --git a/nixpkgs/pkgs/development/python-modules/mysql-connector/default.nix b/nixpkgs/pkgs/development/python-modules/mysql-connector/default.nix index a96bd21cc0ec..ba963ff0d5dd 100644 --- a/nixpkgs/pkgs/development/python-modules/mysql-connector/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mysql-connector/default.nix @@ -6,21 +6,30 @@ , fetchFromGitHub , protobuf , pythonOlder -, fetchpatch +, mysql80 +, openssl +, pkgs }: buildPythonPackage rec { pname = "mysql-connector"; - version = "8.0.29"; + version = "8.0.33"; format = "setuptools"; disabled = pythonOlder "3.7"; + setupPyBuildFlags = [ + "--with-mysql-capi=\"${mysql80}\"" + "--with-openssl-include-dir=\"${openssl.dev}/include\"" + "--with-openssl-lib-dir=\"${lib.getLib openssl}/lib\"" + "-L \"${lib.getLib pkgs.zstd}/lib:${lib.getLib mysql80}/lib\"" + ]; + src = fetchFromGitHub { owner = "mysql"; repo = "mysql-connector-python"; rev = version; - hash = "sha256-X0qiXNYkNoR00ESUdByPj4dPnEnjLyopm25lm1JvkAk="; + hash = "sha256-GtMq7E2qBqFu54hjUotzPyxScTKXNdEQcmgHnS7lBhc="; }; patches = [ @@ -30,17 +39,19 @@ buildPythonPackage rec { # 10.12. The patch reverts # https://github.com/mysql/mysql-connector-python/commit/d1e89fd3d7391084cdf35b0806cb5d2a4b413654 ./0001-Revert-Fix-MacOS-wheels-platform-tag.patch + ]; - # Allow for clang to be used to build native extensions - (fetchpatch { - url = "https://github.com/mysql/mysql-connector-python/commit/fd24ce9dc8c60cc446a8e69458f7851d047c7831.patch"; - hash = "sha256-WvU1iB53MavCsksKCjGvUl7R3Ww/38alxxMVzjpr5Xg="; - }) + nativeBuildInputs = [ + mysql80 ]; + propagatedBuildInputs = [ dnspython protobuf + mysql80 + openssl + pkgs.zstd ]; pythonImportsCheck = [ diff --git a/nixpkgs/pkgs/development/python-modules/nuitka/default.nix b/nixpkgs/pkgs/development/python-modules/nuitka/default.nix index 9eb5faa6064e..ca2272ac1bd5 100644 --- a/nixpkgs/pkgs/development/python-modules/nuitka/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nuitka/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , fetchFromGitHub , vmprof -, pyqt4 , isPyPy , pkgs , scons @@ -21,7 +20,7 @@ buildPythonPackage rec { hash = "sha256-8eWOcxATVS866nlN39b2VU1CuXAfcn0yQsDweHS2yDU="; }; - nativeCheckInputs = [ vmprof pyqt4 ]; + nativeCheckInputs = [ vmprof ]; nativeBuildInputs = [ scons ]; propagatedBuildInputs = [ chrpath ]; diff --git a/nixpkgs/pkgs/development/python-modules/nvidia-ml-py/default.nix b/nixpkgs/pkgs/development/python-modules/nvidia-ml-py/default.nix index 8894de41d561..caf4028df577 100644 --- a/nixpkgs/pkgs/development/python-modules/nvidia-ml-py/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nvidia-ml-py/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "nvidia-ml-py"; - version = "12.535.77"; + version = "12.535.108"; format = "setuptools"; src = fetchPypi { inherit pname version; extension = "tar.gz"; - hash = "sha256-jYHl7Zk8hABkVBAq+ExL/99yulxRIStsASHGVoiYPhQ="; + hash = "sha256-FB/oGHcaFl+5P3Xb5/Afdnw7r6fBP2h29TWDURsHjuE="; }; patches = [ diff --git a/nixpkgs/pkgs/development/python-modules/openai/default.nix b/nixpkgs/pkgs/development/python-modules/openai/default.nix index 87e16ac90ac0..172ddb5970a9 100644 --- a/nixpkgs/pkgs/development/python-modules/openai/default.nix +++ b/nixpkgs/pkgs/development/python-modules/openai/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "openai"; - version = "0.27.9"; + version = "0.28.0"; format = "setuptools"; disabled = pythonOlder "3.7.1"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "openai"; repo = "openai-python"; rev = "refs/tags/v${version}"; - hash = "sha256-vp85M9VZvbY4saG88WcR3Qw8z+A9nU1Oi3sf9yitsV4="; + hash = "sha256-NDIHOX0W1nERvOWxnGBD42v+EjrND/9u90SS7KJzOW8="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/openllm-client/default.nix b/nixpkgs/pkgs/development/python-modules/openllm-client/default.nix new file mode 100644 index 000000000000..5fd2e6316bb0 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/openllm-client/default.nix @@ -0,0 +1,58 @@ +{ lib +, buildPythonPackage +, pythonOlder +, bentoml +, hatch-fancy-pypi-readme +, hatch-vcs +, hatchling +, httpx +, openllm-core +, soundfile +, transformers +}: + +buildPythonPackage rec { + inherit (openllm-core) src version; + pname = "openllm-client"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + sourceRoot = "source/openllm-client"; + + nativeBuildInputs = [ + hatch-fancy-pypi-readme + hatch-vcs + hatchling + ]; + + propagatedBuildInputs = [ + httpx + openllm-core + ]; + + passthru.optional-dependencies = { + grpc = [ + bentoml + ] ++ bentoml.optional-dependencies.grpc; + agents = [ + transformers + # diffusers + soundfile + ] ++ transformers.agents; + full = passthru.optional-dependencies.grpc ++ passthru.optional-dependencies.agents; + }; + + # there is no tests + doCheck = false; + + pythonImportsCheck = [ "openllm_client" ]; + + meta = with lib; { + description = "Interacting with OpenLLM HTTP/gRPC server, or any BentoML server"; + homepage = "https://github.com/bentoml/OpenLLM/tree/main/openllm-client"; + changelog = "https://github.com/bentoml/OpenLLM/blob/${src.rev}/CHANGELOG.md"; + license = licenses.asl20; + maintainers = with maintainers; [ natsukium ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/openllm-core/default.nix b/nixpkgs/pkgs/development/python-modules/openllm-core/default.nix new file mode 100644 index 000000000000..3f2c80cf0a57 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/openllm-core/default.nix @@ -0,0 +1,84 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, accelerate +, attrs +, bentoml +, bitsandbytes +, cattrs +, datasets +, hatch-fancy-pypi-readme +, hatch-vcs +, hatchling +, inflection +, mypy-extensions +, orjson +, peft +, ray +, transformers +, typing-extensions +}: + +buildPythonPackage rec { + pname = "openllm-core"; + version = "0.2.27"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "bentoml"; + repo = "OpenLLM"; + rev = "refs/tags/v${version}"; + hash = "sha256-R69Qsx9360pJx+7oyhHdeAXUjTAdevPmaBl9gj+AA8U="; + }; + + sourceRoot = "source/openllm-core"; + + nativeBuildInputs = [ + hatch-fancy-pypi-readme + hatch-vcs + hatchling + ]; + + propagatedBuildInputs = [ + attrs + bentoml + cattrs + inflection + mypy-extensions + orjson + typing-extensions + ]; + + passthru.optional-dependencies = { + vllm = [ + ray + # vllm + ]; + fine-tune = [ + accelerate + bitsandbytes + datasets + peft + transformers + # trl + ] ++ transformers.optional-dependencies.torch + ++ transformers.optional-dependencies.tokenizers + ++ transformers.optional-dependencies.accelerate; + }; + + # there is no tests + doCheck = false; + + pythonImportsCheck = [ "openllm_core" ]; + + meta = with lib; { + description = "Core components for OpenLLM"; + homepage = "https://github.com/bentoml/OpenLLM/tree/main/openllm-core"; + changelog = "https://github.com/bentoml/OpenLLM/blob/${src.rev}/CHANGELOG.md"; + license = licenses.asl20; + maintainers = with maintainers; [ natsukium ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/openllm/default.nix b/nixpkgs/pkgs/development/python-modules/openllm/default.nix new file mode 100644 index 000000000000..63974fa8be7b --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/openllm/default.nix @@ -0,0 +1,198 @@ +{ lib +, buildPythonPackage +, hatch-fancy-pypi-readme +, hatch-vcs +, hatchling +, pytestCheckHook +, pythonOlder +, pythonRelaxDepsHook +, accelerate +, bentoml +, bitsandbytes +, click +, datasets +, docker +, einops +, fairscale +, flax +, hypothesis +, ipython +, jax +, jaxlib +, jupyter +, jupytext +, keras +, nbformat +, notebook +, openai +, openllm-client +, openllm-core +, optimum +, peft +, pytest-mock +, pytest-randomly +, pytest-rerunfailures +, pytest-xdist +, ray +, safetensors +, sentencepiece +, soundfile +, syrupy +, tabulate +, tensorflow +, tiktoken +, transformers +, openai-triton +, xformers +}: + +buildPythonPackage rec { + inherit (openllm-core) src version; + pname = "openllm"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + sourceRoot = "source/openllm-python"; + + nativeBuildInputs = [ + hatch-fancy-pypi-readme + hatch-vcs + hatchling + pythonRelaxDepsHook + ]; + + pythonRemoveDeps = [ + # remove cuda-python as it has an unfree license + "cuda-python" + ]; + + propagatedBuildInputs = [ + bentoml + bitsandbytes + click + openllm-client + optimum + safetensors + tabulate + transformers + ] ++ bentoml.optional-dependencies.io + ++ tabulate.optional-dependencies.widechars + # ++ transformers.optional-dependencies.accelerate + ++ transformers.optional-dependencies.tokenizers + ++ transformers.optional-dependencies.torch; + + passthru.optional-dependencies = { + agents = [ + # diffusers + soundfile + transformers + ] ++ transformers.optional-dependencies.agents; + baichuan = [ + # cpm-kernels + sentencepiece + ]; + chatglm = [ + # cpm-kernels + sentencepiece + ]; + falcon = [ + einops + xformers + ]; + fine-tune = [ + accelerate + bitsandbytes + datasets + peft + # trl + ]; + flan-t5 = [ + flax + jax + jaxlib + keras + tensorflow + ]; + ggml = [ + # ctransformers + ]; + gptq = [ + # auto-gptq + ]; # ++ autogptq.optional-dependencies.triton; + grpc = [ + openllm-client + ] ++ openllm-client.optional-dependencies.grpc; + llama = [ + fairscale + sentencepiece + ]; + mpt = [ + einops + openai-triton + ]; + openai = [ + openai + tiktoken + ]; + opt = [ + flax + jax + jaxlib + keras + tensorflow + ]; + playground = [ + ipython + jupyter + jupytext + nbformat + notebook + ]; + starcoder = [ + bitsandbytes + ]; + vllm = [ + ray + # vllm + ]; + all = with passthru.optional-dependencies; ( + agents ++ baichuan ++ chatglm ++ falcon ++ fine-tune ++ flan-t5 ++ ggml ++ gptq ++ llama ++ mpt ++ openai ++ opt ++ playground ++ starcoder ++ vllm + ); + }; + + nativeCheckInputs = [ + docker + hypothesis + pytest-mock + pytest-randomly + pytest-rerunfailures + pytest-xdist + pytestCheckHook + syrupy + ]; + + preCheck = '' + export HOME=$TMPDIR + # skip GPUs test on CI + export GITHUB_ACTIONS=1 + ''; + + disabledTests = [ + # these tests access to huggingface.co + "test_opt_125m" + "test_opt_125m" + "test_flan_t5" + "test_flan_t5" + ]; + + pythonImportsCheck = [ "openllm" ]; + + meta = with lib; { + description = "Operating LLMs in production"; + homepage = "https://github.com/bentoml/OpenLLM/tree/main/openllm-python"; + changelog = "https://github.com/bentoml/OpenLLM/blob/${src.rev}/CHANGELOG.md"; + license = licenses.asl20; + maintainers = with maintainers; [ happysalada natsukium ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/openstacksdk/default.nix b/nixpkgs/pkgs/development/python-modules/openstacksdk/default.nix index b405a3b8fca9..748149ae1f44 100644 --- a/nixpkgs/pkgs/development/python-modules/openstacksdk/default.nix +++ b/nixpkgs/pkgs/development/python-modules/openstacksdk/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "openstacksdk"; - version = "1.4.0"; + version = "1.5.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-NhUSnttnyCr70aFwbpFf+mjg7r/JnJA8NDqsZRfdWFg="; + hash = "sha256-FBtR+ijGsc3rmOvcOMHO5qTnVL1ryEq3qqDQwrzlRD4="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/orange3/default.nix b/nixpkgs/pkgs/development/python-modules/orange3/default.nix index 6c857cc07acd..cff4a603c846 100644 --- a/nixpkgs/pkgs/development/python-modules/orange3/default.nix +++ b/nixpkgs/pkgs/development/python-modules/orange3/default.nix @@ -1,21 +1,21 @@ { lib -, buildPythonPackage -, copyDesktopItems -, fetchurl -, makeDesktopItem -, fetchFromGitHub -, nix-update-script -, python , baycomp , bottleneck +, buildPythonPackage , chardet +, copyDesktopItems , cython +, fetchFromGitHub +, fetchurl , httpx , joblib , keyring , keyrings-alt +, makeDesktopItem , matplotlib +, nix-update-script , numpy +, oldest-supported-numpy , openpyxl , opentsne , orange-canvas-core @@ -23,25 +23,32 @@ , pandas , pyqtgraph , pyqtwebengine +, python , python-louvain +, pythonOlder , pyyaml , qt5 , qtconsole +, recommonmark , requests , scikit-learn , scipy -, sphinx , serverfiles +, setuptools +, sphinx +, wheel , xlrd , xlsxwriter }: let -self = buildPythonPackage rec { + self = buildPythonPackage rec { pname = "orange3"; version = "3.35.0"; format = "pyproject"; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "biolab"; repo = "orange3"; @@ -50,6 +57,8 @@ self = buildPythonPackage rec { }; postPatch = '' + substituteInPlace pyproject.toml \ + --replace "setuptools>=41.0.0,<50.0" "setuptools" sed -i 's;\(scikit-learn\)[^$]*;\1;g' requirements-core.txt sed -i 's;pyqtgraph[^$]*;;g' requirements-gui.txt # TODO: remove after bump with a version greater than 0.13.1 ''; @@ -57,8 +66,12 @@ self = buildPythonPackage rec { nativeBuildInputs = [ copyDesktopItems cython + oldest-supported-numpy qt5.wrapQtAppsHook + recommonmark + setuptools sphinx + wheel ]; enableParallelBuilding = true; @@ -153,12 +166,14 @@ self = buildPythonPackage rec { }); }; - meta = { - mainProgram = "orange-canvas"; + meta = with lib; { description = "Data mining and visualization toolbox for novice and expert alike"; homepage = "https://orangedatamining.com/"; - license = [ lib.licenses.gpl3Plus ]; - maintainers = [ lib.maintainers.lucasew ]; + changelog = "https://github.com/biolab/orange3/blob/${version}/CHANGELOG.md"; + license = with licenses; [ gpl3Plus ]; + maintainers = with maintainers; [ lucasew ]; + mainProgram = "orange-canvas"; }; }; -in self +in +self diff --git a/nixpkgs/pkgs/development/python-modules/oslo-concurrency/default.nix b/nixpkgs/pkgs/development/python-modules/oslo-concurrency/default.nix index 3531f409f0ef..e6b7d7b05f3a 100644 --- a/nixpkgs/pkgs/development/python-modules/oslo-concurrency/default.nix +++ b/nixpkgs/pkgs/development/python-modules/oslo-concurrency/default.nix @@ -18,12 +18,12 @@ buildPythonPackage rec { pname = "oslo-concurrency"; - version = "5.1.1"; + version = "5.2.0"; src = fetchPypi { pname = "oslo.concurrency"; inherit version; - hash = "sha256-EQ+2Adgi3UsI7qJ5d9cNAfnxzR6vbezQQqIfQ78/KyU="; + hash = "sha256-ihnsV07QV+k9UWdDJgX/h0xLkBelIV/QIaIDTGzVKpI="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/oslo-log/default.nix b/nixpkgs/pkgs/development/python-modules/oslo-log/default.nix index 09b76eb27cb6..85f92e478354 100644 --- a/nixpkgs/pkgs/development/python-modules/oslo-log/default.nix +++ b/nixpkgs/pkgs/development/python-modules/oslo-log/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "oslo-log"; - version = "5.2.0"; + version = "5.3.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "oslo.log"; inherit version; - hash = "sha256-YiYzbVtu4YhfBXtl2+3oTEqcXk5K51oOjn84PBY+xIA="; + hash = "sha256-zJSqvbUOHiVxxsvEs5lpSgVBV2c1kIqYSgIjqeH72z4="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/osqp/default.nix b/nixpkgs/pkgs/development/python-modules/osqp/default.nix index 7f15cc189832..ac933f65e1c2 100644 --- a/nixpkgs/pkgs/development/python-modules/osqp/default.nix +++ b/nixpkgs/pkgs/development/python-modules/osqp/default.nix @@ -14,20 +14,16 @@ buildPythonPackage rec { pname = "osqp"; - version = "0.6.2.post8"; + version = "0.6.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-I9a65KNhL2DV9lLQ5fpLLq1QfKv/9dkw2CIFeubtZnc="; + hash = "sha256-A+Rg5oPsLOD4OTU936PEyP+lCauM9qKyr7tYb6RT4YA="; }; - postPatch = '' - sed -i 's/sp.random/np.random/g' src/osqp/tests/*.py - ''; - SETUPTOOLS_SCM_PRETEND_VERSION = version; dontUseCmakeConfigure = true; @@ -54,29 +50,8 @@ buildPythonPackage rec { ]; disabledTests = [ - # Test are failing due to scipy update (removal of scipy.random in 1.9.0) - # Is fixed upstream but requires a new release - "test_feasibility_problem" + # Need an unfree license package - mkl "test_issue14" - "test_polish_random" - "test_polish_unconstrained" - "test_primal_and_dual_infeasible_problem" - "test_primal_infeasible_problem" - "test_solve" - "test_unconstrained_problem" - "test_update_A_allind" - "test_update_A" - "test_update_bounds" - "test_update_l" - "test_update_P_A_allind" - "test_update_P_A_indA" - "test_update_P_A_indP_indA" - "test_update_P_A_indP" - "test_update_P_allind" - "test_update_P" - "test_update_q" - "test_update_u" - "test_warm_start" ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/pandas/default.nix b/nixpkgs/pkgs/development/python-modules/pandas/default.nix index d79b9eea4bce..e64f61e0ddec 100644 --- a/nixpkgs/pkgs/development/python-modules/pandas/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pandas/default.nix @@ -206,6 +206,8 @@ buildPythonPackage rec { ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ # tests/generic/test_finalize.py::test_binops[and_-args4-right] - AssertionError: assert {} == {'a': 1} "test_binops" + # These tests are unreliable on aarch64-darwin. See https://github.com/pandas-dev/pandas/issues/38921. + "test_rolling" ]; # Tests have relative paths, and need to reference compiled C extensions diff --git a/nixpkgs/pkgs/development/python-modules/peaqevcore/default.nix b/nixpkgs/pkgs/development/python-modules/peaqevcore/default.nix index e92022ecd68a..6a2cb70d4179 100644 --- a/nixpkgs/pkgs/development/python-modules/peaqevcore/default.nix +++ b/nixpkgs/pkgs/development/python-modules/peaqevcore/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "peaqevcore"; - version = "19.2.0"; + version = "19.3.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-1j1QQo8hTUM7CzDUiRvOUWImb+rGIQgPWl69hTvlZUo="; + hash = "sha256-hVI3syst8F5BNrHcu21OxszPMWuv0wY65yFdfoXLMWM="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/peft/default.nix b/nixpkgs/pkgs/development/python-modules/peft/default.nix index 8bd8b1a924f6..d6a4531312fa 100644 --- a/nixpkgs/pkgs/development/python-modules/peft/default.nix +++ b/nixpkgs/pkgs/development/python-modules/peft/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "peft"; - version = "0.4.0"; + version = "0.5.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-riOCe43/2xUpE6TTCEpMndeFTbaBN4JFDlv90tqVO4Y="; + hash = "sha256-FaD873ksim7ewOI6Wqcv+GuPmH45+yAvbJC1H/DSfI8="; }; nativeBuildInputs = [ setuptools ]; diff --git a/nixpkgs/pkgs/development/python-modules/piccolo-theme/default.nix b/nixpkgs/pkgs/development/python-modules/piccolo-theme/default.nix index fa6c63378625..0cb84c332a88 100644 --- a/nixpkgs/pkgs/development/python-modules/piccolo-theme/default.nix +++ b/nixpkgs/pkgs/development/python-modules/piccolo-theme/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "piccolo-theme"; - version = "0.16.1"; + version = "0.17.0"; src = fetchPypi { pname = "piccolo_theme"; inherit version; - hash = "sha256-4VOJ7l6tBhMBZ2x+T5Bl5WdnMg4JEBkwaGDA/9XUmc8="; + hash = "sha256-sq/xWPLLAz4w6JdUfnB5E52hmj8gmrbg1oeBedyjCEE="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pikepdf/default.nix b/nixpkgs/pkgs/development/python-modules/pikepdf/default.nix index 66d7cf680bfd..01884677f26d 100644 --- a/nixpkgs/pkgs/development/python-modules/pikepdf/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pikepdf/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "pikepdf"; - version = "8.2.1"; + version = "8.3.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -39,7 +39,7 @@ buildPythonPackage rec { postFetch = '' rm "$out/.git_archival.txt" ''; - hash = "sha256-8uPPEoLxoMRq/tkpThatwjPHZIMYQ8lNL6fLcG+nsnw="; + hash = "sha256-d76s4iJFwhzWSySXTS53PQQuWfWIboIRecEyjzobsME="; }; patches = [ diff --git a/nixpkgs/pkgs/development/python-modules/pillow-simd/default.nix b/nixpkgs/pkgs/development/python-modules/pillow-simd/default.nix index 4573e25a22b2..ca0d947d37b1 100644 --- a/nixpkgs/pkgs/development/python-modules/pillow-simd/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pillow-simd/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, buildPythonPackage, fetchFromGitHub, isPyPy, isPy3k , olefile, freetype, libjpeg, zlib, libtiff, libwebp, libxcrypt, tcl, lcms2 , libxcb, tk, libX11, openjpeg, libimagequant, pyroma, numpy, defusedxml -, pytestCheckHook +, pytestCheckHook, setuptools }@args: import ../pillow/generic.nix (rec { diff --git a/nixpkgs/pkgs/development/python-modules/pillow/default.nix b/nixpkgs/pkgs/development/python-modules/pillow/default.nix index bb669f421177..bf3b1991c39a 100644 --- a/nixpkgs/pkgs/development/python-modules/pillow/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pillow/default.nix @@ -6,7 +6,7 @@ , fetchpatch , isPyPy , defusedxml, olefile, freetype, libjpeg, zlib, libtiff, libwebp, libxcrypt, tcl, lcms2, tk, libX11 -, libxcb, openjpeg, libimagequant, pyroma, numpy, pytestCheckHook +, libxcb, openjpeg, libimagequant, pyroma, numpy, pytestCheckHook, setuptools # for passthru.tests , imageio, matplotlib, pilkit, pydicom, reportlab }@args: diff --git a/nixpkgs/pkgs/development/python-modules/pillow/generic.nix b/nixpkgs/pkgs/development/python-modules/pillow/generic.nix index 95ecce0522c3..5186e8a476bb 100644 --- a/nixpkgs/pkgs/development/python-modules/pillow/generic.nix +++ b/nixpkgs/pkgs/development/python-modules/pillow/generic.nix @@ -39,6 +39,8 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook pyroma numpy ]; + nativeBuildInputs = [ setuptools ]; + buildInputs = [ freetype libjpeg openjpeg libimagequant zlib libtiff libwebp libxcrypt tcl lcms2 ] ++ lib.optionals (lib.versionAtLeast version "7.1.0") [ libxcb ] ++ lib.optionals (isPyPy) [ tk libX11 ]; diff --git a/nixpkgs/pkgs/development/python-modules/pip/default.nix b/nixpkgs/pkgs/development/python-modules/pip/default.nix index bc06cb39e247..484a15e85876 100644 --- a/nixpkgs/pkgs/development/python-modules/pip/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pip/default.nix @@ -10,6 +10,9 @@ , pretend , pytest +# docs +, sphinx + # coupled downsteam dependencies , pip-tools }: @@ -36,18 +39,50 @@ buildPythonPackage rec { installShellFiles setuptools wheel + + # docs + sphinx ]; + outputs = [ + "out" + "man" + ]; + + # pip uses a custom sphinx extension and unusual conf.py location, mimic the internal build rather than attempting + # to fit sphinxHook see https://github.com/pypa/pip/blob/0778c1c153da7da457b56df55fb77cbba08dfb0c/noxfile.py#L129-L148 + postBuild = '' + cd docs + + # remove references to sphinx extentions only required for html doc generation + # sphinx.ext.intersphinx requires network connection or packaged object.inv files for python and pypug + # sphinxcontrib.towncrier is not currently packaged + for ext in sphinx.ext.intersphinx sphinx_copybutton sphinx_inline_tabs sphinxcontrib.towncrier myst_parser; do + substituteInPlace html/conf.py --replace '"'$ext'",' "" + done + + PYTHONPATH=$src/src:$PYTHONPATH sphinx-build -v \ + -d build/doctrees/man \ + -c html \ + -d build/doctrees/man \ + -b man \ + man \ + build/man + cd .. + ''; + nativeCheckInputs = [ mock scripttest virtualenv pretend pytest ]; # Pip wants pytest, but tests are not distributed doCheck = false; postInstall = '' + installManPage docs/build/man/* + installShellCompletion --cmd pip \ - --bash <($out/bin/pip completion --bash) \ - --fish <($out/bin/pip completion --fish) \ - --zsh <($out/bin/pip completion --zsh) + --bash <($out/bin/pip completion --bash --no-cache-dir) \ + --fish <($out/bin/pip completion --fish --no-cache-dir) \ + --zsh <($out/bin/pip completion --zsh --no-cache-dir) ''; passthru.tests = { inherit pip-tools; }; diff --git a/nixpkgs/pkgs/development/python-modules/pkutils/default.nix b/nixpkgs/pkgs/development/python-modules/pkutils/default.nix index e626c9bd587c..e3957533ea99 100644 --- a/nixpkgs/pkgs/development/python-modules/pkutils/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pkutils/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub -, nose +, nose3 , pythonOlder , pythonRelaxDepsHook , semver @@ -34,7 +34,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - nose + nose3 ]; checkPhase = '' diff --git a/nixpkgs/pkgs/development/python-modules/poetry-dynamic-versioning/default.nix b/nixpkgs/pkgs/development/python-modules/poetry-dynamic-versioning/default.nix index 625cd6ab9148..9c6440cd4c32 100644 --- a/nixpkgs/pkgs/development/python-modules/poetry-dynamic-versioning/default.nix +++ b/nixpkgs/pkgs/development/python-modules/poetry-dynamic-versioning/default.nix @@ -3,7 +3,6 @@ , dunamai , fetchFromGitHub , jinja2 -, markupsafe , poetry-core , poetry , pytestCheckHook @@ -13,7 +12,7 @@ buildPythonPackage rec { pname = "poetry-dynamic-versioning"; - version = "0.21.5"; + version = "1.0.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +21,7 @@ buildPythonPackage rec { owner = "mtkennerly"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-YFbIQLIbedErdKiPlZf0+6qtZexuJ6Q6pzhy54vSK5Y="; + hash = "sha256-BGAo3c0TzyhIiDtZjoEP+Eeu51WJB3Wg71poFMWJ+VM="; }; nativeBuildInputs = [ @@ -32,7 +31,6 @@ buildPythonPackage rec { propagatedBuildInputs = [ dunamai jinja2 - markupsafe tomlkit ]; diff --git a/nixpkgs/pkgs/development/python-modules/policy-sentry/default.nix b/nixpkgs/pkgs/development/python-modules/policy-sentry/default.nix index 5915459f8ec9..e358143afea3 100644 --- a/nixpkgs/pkgs/development/python-modules/policy-sentry/default.nix +++ b/nixpkgs/pkgs/development/python-modules/policy-sentry/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "policy-sentry"; - version = "0.12.8"; + version = "0.12.9"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "salesforce"; repo = "policy_sentry"; rev = "refs/tags/${version}"; - hash = "sha256-I56xWBbE1TqP+I8Op5X4TqHNB+gRlEPi7YQldIsjv4Q="; + hash = "sha256-mVB7qqADjf4XnDaQyL5C4/Z6hOxAMQbmr6fGnaXD+O0="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/prettytable/default.nix b/nixpkgs/pkgs/development/python-modules/prettytable/default.nix index 149556c125e5..b0efbcb373d4 100644 --- a/nixpkgs/pkgs/development/python-modules/prettytable/default.nix +++ b/nixpkgs/pkgs/development/python-modules/prettytable/default.nix @@ -1,27 +1,26 @@ { lib , buildPythonPackage , fetchFromGitHub -, pythonOlder , hatch-vcs , hatchling -, wcwidth -, importlib-metadata , pytest-lazy-fixture , pytestCheckHook +, pythonOlder +, wcwidth }: buildPythonPackage rec { pname = "prettytable"; - version = "3.5.0"; + version = "3.8.0"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "jazzband"; repo = "prettytable"; rev = "refs/tags/${version}"; - hash= "sha256-J6oWNug2MEkUZSi67mM5H/Nf4tdSTB/ku34plp1XWCM="; + hash= "sha256-JnxUjUosQJgprIbA9szSfw1Fi21Qc4WljoRAQv4x5YM="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -33,8 +32,6 @@ buildPythonPackage rec { propagatedBuildInputs = [ wcwidth - ] ++ lib.optionals (pythonOlder "3.8") [ - importlib-metadata ]; nativeCheckInputs = [ @@ -47,9 +44,9 @@ buildPythonPackage rec { ]; meta = with lib; { - changelog = "https://github.com/jazzband/prettytable/releases/tag/${version}"; description = "Display tabular data in a visually appealing ASCII table format"; homepage = "https://github.com/jazzband/prettytable"; + changelog = "https://github.com/jazzband/prettytable/releases/tag/${version}"; license = licenses.bsd3; maintainers = with maintainers; [ ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/pulumi-aws/default.nix b/nixpkgs/pkgs/development/python-modules/pulumi-aws/default.nix index cad2f1366e18..552c0fb42b37 100644 --- a/nixpkgs/pkgs/development/python-modules/pulumi-aws/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pulumi-aws/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pulumi-aws"; # Version is independant of pulumi's. - version = "6.0.3"; + version = "6.0.4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "pulumi"; repo = "pulumi-aws"; rev = "refs/tags/v${version}"; - hash = "sha256-AnyKDoD7hh3iYheUK8RXFfXEi5yChkZNAyWobC2ghmQ="; + hash = "sha256-YukXw7/KDfw6iYoN6UpF5XGb5D6oaaXTOpsduqZZz2Y="; }; sourceRoot = "${src.name}/sdk/python"; diff --git a/nixpkgs/pkgs/development/python-modules/pyaml/default.nix b/nixpkgs/pkgs/development/python-modules/pyaml/default.nix index 96ae8df32df0..a38cd3093e72 100644 --- a/nixpkgs/pkgs/development/python-modules/pyaml/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyaml/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "pyaml"; - version = "23.7.0"; + version = "23.9.3"; src = fetchPypi { inherit pname version; - sha256 = "sha256-DFELu4k4MJQA4LHkesFv2Q5W1lKAWpNBcSh4ZxjzNUY="; + sha256 = "sha256-s/mzgzUyfTIUyIg0kwA3OGwP5EV+GuGXGcVvqiOSIr0="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pyasn/default.nix b/nixpkgs/pkgs/development/python-modules/pyasn/default.nix index 0fc2121f1430..026b5fdff683 100644 --- a/nixpkgs/pkgs/development/python-modules/pyasn/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyasn/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pyasn"; - version = "1.6.1"; + version = "1.6.2"; src = fetchPypi { inherit pname version; - hash = "sha256-6UK1SRY2Pse4tw6urs0OtOQe8bz0ojl7KabXFfzN+SU="; + hash = "sha256-otVfs+5HlHYJ9QIRylsLrEEahvPJNfuSyksLirfGaP8="; }; datasrc = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/python-modules/pyenphase/default.nix b/nixpkgs/pkgs/development/python-modules/pyenphase/default.nix new file mode 100644 index 000000000000..b2513a37ab49 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pyenphase/default.nix @@ -0,0 +1,70 @@ +{ lib +, awesomeversion +, buildPythonPackage +, envoy-utils +, fetchFromGitHub +, httpx +, lxml +, orjson +, poetry-core +, pyjwt +, pytest-asyncio +, pytestCheckHook +, pythonOlder +, respx +, syrupy +, tenacity +}: + +buildPythonPackage rec { + pname = "pyenphase"; + version = "1.9.3"; + format = "pyproject"; + + disabled = pythonOlder "3.11"; + + src = fetchFromGitHub { + owner = "pyenphase"; + repo = "pyenphase"; + rev = "refs/tags/v${version}"; + hash = "sha256-Wcv5E0Oj8wkVOPGz9viXMNpaqK00xti+pF5Jt6mCWi4="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace " --cov=pyenphase --cov-report=term-missing:skip-covered" "" + ''; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + awesomeversion + envoy-utils + httpx + lxml + orjson + pyjwt + tenacity + ]; + + nativeCheckInputs = [ + pytest-asyncio + pytestCheckHook + respx + syrupy + ]; + + pythonImportsCheck = [ + "pyenphase" + ]; + + meta = with lib; { + description = "Library to control enphase envoy"; + homepage = "https://github.com/pyenphase/pyenphase"; + changelog = "https://github.com/pyenphase/pyenphase/blob/${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pyinstrument/default.nix b/nixpkgs/pkgs/development/python-modules/pyinstrument/default.nix index 9dfe3b82cb55..4cc60efbc637 100644 --- a/nixpkgs/pkgs/development/python-modules/pyinstrument/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyinstrument/default.nix @@ -2,19 +2,30 @@ , lib , buildPythonPackage , fetchFromGitHub +, pythonOlder +, setuptools +, wheel }: buildPythonPackage rec { pname = "pyinstrument"; - version = "4.5.0"; + version = "4.5.2"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "joerick"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-HvPapa3b9/Wc4ClaMOmCAIeHS7H4V9aCR9JCDol2ElE="; + hash = "sha256-VL/JzgMxn5zABfmol+5oofR1RjyxTdzvUi6JnwsSFao="; }; + nativeBuildInputs = [ + setuptools + wheel + ]; + # Module import recursion doCheck = false; @@ -25,6 +36,7 @@ buildPythonPackage rec { meta = with lib; { description = "Call stack profiler for Python"; homepage = "https://github.com/joerick/pyinstrument"; + changelog = "https://github.com/joerick/pyinstrument/releases/tag/v${version}"; license = licenses.bsd3; maintainers = with maintainers; [ onny ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/pymilvus/default.nix b/nixpkgs/pkgs/development/python-modules/pymilvus/default.nix index a27f49c8613a..b1605fac01b5 100644 --- a/nixpkgs/pkgs/development/python-modules/pymilvus/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pymilvus/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "pymilvus"; - version = "2.2.15"; + version = "2.3.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "milvus-io"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-wwhgO2iCzPXobyZI0narHPn2WCAB9sS1+AoLrP1Ih6Q="; + hash = "sha256-hp00iUT1atyTQk532z7VAajpfvtnKE8W2la9MW7NxoE="; }; env.SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/nixpkgs/pkgs/development/python-modules/pymodbus/default.nix b/nixpkgs/pkgs/development/python-modules/pymodbus/default.nix index c1b1b75d284c..d4715c131cea 100644 --- a/nixpkgs/pkgs/development/python-modules/pymodbus/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pymodbus/default.nix @@ -7,54 +7,57 @@ , prompt-toolkit , pygments , pyserial -, pyserial-asyncio , pytest-asyncio -, pytest-rerunfailures , pytest-xdist , pytestCheckHook , redis , sqlalchemy -, tornado , twisted +, typer }: buildPythonPackage rec { pname = "pymodbus"; - version = "3.3.2"; + version = "3.5.0"; format = "setuptools"; src = fetchFromGitHub { owner = "pymodbus-dev"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-EGJyb0AVLKN7FEoeWF4rVqmJBNbXHent9P+cxc13rQs="; + hash = "sha256-ZoGpMhJng46nW7v/QgjGCsFZV6xV4PSh9/DH1d2dzdg="; }; - # Twisted asynchronous version is not supported due to a missing dependency - propagatedBuildInputs = [ - aiohttp - click - prompt-toolkit - pygments - pyserial - pyserial-asyncio - tornado - ]; + passthru.optional-dependencies = { + repl = [ + aiohttp + typer + prompt-toolkit + pygments + click + ] ++ typer.optional-dependencies.all; + serial = [ + pyserial + ]; + }; nativeCheckInputs = [ mock pytest-asyncio - pytest-rerunfailures pytest-xdist pytestCheckHook redis sqlalchemy twisted - ]; + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + + preCheck = '' + pushd test + ''; - pytestFlagsArray = [ - "--reruns" "3" # Racy socket tests - ]; + postCheck = '' + popd + ''; pythonImportsCheck = [ "pymodbus" ]; diff --git a/nixpkgs/pkgs/development/python-modules/pyqt/4.x.nix b/nixpkgs/pkgs/development/python-modules/pyqt/4.x.nix deleted file mode 100644 index a0bf3f03f600..000000000000 --- a/nixpkgs/pkgs/development/python-modules/pyqt/4.x.nix +++ /dev/null @@ -1,69 +0,0 @@ -{ lib, stdenv, fetchurl, buildPythonPackage, python, dbus-python, sip_4, qt4, pkg-config, lndir, dbus, makeWrapper }: - -buildPythonPackage rec { - pname = "PyQt-x11-gpl"; - version = "4.12.3"; - format = "other"; - - src = fetchurl { - url = "mirror://sourceforge/pyqt/PyQt4_gpl_x11-${version}.tar.gz"; - sha256 = "0wnlasg62rm5d39nq1yw4namcx2ivxgzl93r5f2vb9s0yaz5l3x0"; - }; - - postPatch = '' - mkdir -p $out - lndir ${dbus-python} $out - rm -rf "$out/nix-support" - - export PYTHONPATH=$PYTHONPATH:$out/lib/${python.libPrefix}/site-packages - ${lib.optionalString stdenv.isDarwin '' - export QMAKESPEC="unsupported/macx-clang-libc++" # macOS target after bootstrapping phase \ - ''} - - substituteInPlace configure.py \ - --replace 'install_dir=pydbusmoddir' "install_dir='$out/lib/${python.libPrefix}/site-packages/dbus/mainloop'" \ - ${lib.optionalString stdenv.isDarwin '' - --replace "qt_macx_spec = 'macx-g++'" "qt_macx_spec = 'unsupported/macx-clang-libc++'" # for bootstrapping phase \ - ''} - - chmod +x configure.py - sed -i '1i#!${python.pythonForBuild.interpreter}' configure.py - ''; - - configureScript = "./configure.py"; - dontAddPrefix = true; - configureFlags = [ - "--confirm-license" - "--bindir=${placeholder "out"}/bin" - "--destdir=${placeholder "out"}/${python.sitePackages}" - "--plugin-destdir=${placeholder "out"}/lib/qt4/plugins" - "--sipdir=${placeholder "out"}/share/sip/PyQt4" - "--dbus=${lib.getDev dbus-python}/include/dbus-1.0" - "--verbose" - ]; - - nativeBuildInputs = [ pkg-config lndir makeWrapper qt4 ]; - buildInputs = [ qt4 dbus ]; - - propagatedBuildInputs = [ sip_4 ]; - - postInstall = '' - for i in $out/bin/*; do - wrapProgram $i --prefix PYTHONPATH : "$PYTHONPATH" - done - ''; - - enableParallelBuilding = true; - - passthru = { - qt = qt4; - }; - - meta = with lib; { - description = "Python bindings for Qt"; - license = "GPL"; - homepage = "http://www.riverbankcomputing.co.uk"; - maintainers = [ maintainers.sander ]; - platforms = platforms.mesaPlatforms; - }; -} diff --git a/nixpkgs/pkgs/development/python-modules/pyramid/default.nix b/nixpkgs/pkgs/development/python-modules/pyramid/default.nix index a5dbfd521d62..a2b24faf10db 100644 --- a/nixpkgs/pkgs/development/python-modules/pyramid/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyramid/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "pyramid"; - version = "2.0.1"; + version = "2.0.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-+r/XRQOeJq1bCRX8OW6HJcD4o9F7lB+WEezR7XbP59o="; + hash = "sha256-NyE4pzjkIWU1zHbczm7d1aGqypUTDyNU+4NCZMBvGN4="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pyruckus/default.nix b/nixpkgs/pkgs/development/python-modules/pyruckus/default.nix deleted file mode 100644 index d2b896605f7f..000000000000 --- a/nixpkgs/pkgs/development/python-modules/pyruckus/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, pexpect -, python-slugify -, pythonOlder -}: - -buildPythonPackage rec { - pname = "pyruckus"; - version = "0.16"; - disabled = pythonOlder "3.6"; - - src = fetchFromGitHub { - owner = "gabe565"; - repo = pname; - rev = "refs/tags/${version}"; - hash = "sha256-SVE5BrCCQgCrhOC0CSGgbZ9TEY3iZ9Rp/xMUShPAxxM="; - }; - - propagatedBuildInputs = [ - pexpect - python-slugify - ]; - - # Tests requires network features - doCheck = false; - pythonImportsCheck = [ "pyruckus" ]; - - meta = with lib; { - description = "Python client for Ruckus Unleashed"; - homepage = "https://github.com/gabe565/pyruckus"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ fab ]; - }; -} diff --git a/nixpkgs/pkgs/development/python-modules/pyschlage/default.nix b/nixpkgs/pkgs/development/python-modules/pyschlage/default.nix index ff0d39fa7e32..45ba38aed42b 100644 --- a/nixpkgs/pkgs/development/python-modules/pyschlage/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyschlage/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pyschlage"; - version = "2023.8.1"; + version = "2023.9.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "dknowles2"; repo = "pyschlage"; rev = "refs/tags/${version}"; - hash = "sha256-PTkuVGUdqRcvgcIL7yoVWNLQcWyDpXXHLxb7CoD8J1s="; + hash = "sha256-4uYUEx6OcUMG8nS/PqZK5hHFQd/7pTGIix2it8pleuY="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/nixpkgs/pkgs/development/python-modules/pyside/apiextractor.nix b/nixpkgs/pkgs/development/python-modules/pyside/apiextractor.nix deleted file mode 100644 index 1ad2d0123828..000000000000 --- a/nixpkgs/pkgs/development/python-modules/pyside/apiextractor.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, libxml2, libxslt, python3, qt4 }: - -# This derivation does not provide any Python module and should therefore be called via `all-packages.nix`. -let - pythonEnv = python3.withPackages (ps: with ps; [ sphinx ]); -in -stdenv.mkDerivation rec { - pname = "pyside-apiextractor"; - version = "0.10.10"; - - src = fetchFromGitHub { - owner = "PySide"; - repo = "Apiextractor"; - rev = version; - hash = "sha256-YH8aYyzv59xiIglZbdNgOPnmEQwNE2GmotAFFfFdMlg="; - }; - - outputs = [ "out" "dev" ]; - - preConfigure = '' - cmakeFlagsArray=("-DCMAKE_INSTALL_PREFIX=$dev") - ''; - - nativeBuildInputs = [ cmake pythonEnv ]; - buildInputs = [ qt4 libxml2 libxslt ]; - - meta = with lib; { - description = "Eases the development of bindings of Qt-based libraries for high level languages by automating most of the process"; - license = licenses.gpl2; - homepage = "http://www.pyside.org/docs/apiextractor/"; - maintainers = [ ]; - platforms = platforms.all; - }; -} diff --git a/nixpkgs/pkgs/development/python-modules/pyside/default.nix b/nixpkgs/pkgs/development/python-modules/pyside/default.nix deleted file mode 100644 index 82cc62f2c708..000000000000 --- a/nixpkgs/pkgs/development/python-modules/pyside/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib, fetchFromGitHub, cmake, buildPythonPackage, pysideGeneratorrunner, pysideShiboken, qt4, mesa, libGL }: - -buildPythonPackage rec { - pname = "pyside"; - version = "1.2.4"; - format = "other"; - - src = fetchFromGitHub { - owner = "PySide"; - repo = "PySide"; - rev = version; - hash = "sha256-14XbihJRMk9WaeK6NUBV/4OMFZF8EBIJgEJEaCU8Ecg="; - }; - - outputs = [ "out" "dev" ]; - - preConfigure = '' - cmakeFlagsArray=("-DCMAKE_INSTALL_PREFIX=$dev") - ''; - - nativeBuildInputs = [ cmake pysideGeneratorrunner pysideShiboken qt4 ]; - - buildInputs = [ mesa libGL ]; - - makeFlags = [ "QT_PLUGIN_PATH=${pysideShiboken}/lib/generatorrunner" ]; - - dontWrapQtApps = true; - - meta = { - description = "LGPL-licensed Python bindings for the Qt cross-platform application and UI framework"; - license = lib.licenses.lgpl21; - homepage = "http://www.pyside.org"; - }; -} diff --git a/nixpkgs/pkgs/development/python-modules/pyside/gcc6.patch b/nixpkgs/pkgs/development/python-modules/pyside/gcc6.patch deleted file mode 100644 index 440e94508c57..000000000000 --- a/nixpkgs/pkgs/development/python-modules/pyside/gcc6.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- Shiboken-1.2.4.org/tests/libsample/simplefile.cpp 2017-08-26 09:06:27.216859143 +0100 -+++ Shiboken-1.2.4/tests/libsample/simplefile.cpp 2017-08-26 09:05:40.037029652 +0100 -@@ -90,13 +90,13 @@ - SimpleFile::exists() const - { - std::ifstream ifile(p->m_filename); -- return ifile; -+ return (bool)ifile; - } - - bool - SimpleFile::exists(const char* filename) - { - std::ifstream ifile(filename); -- return ifile; -+ return (bool)ifile; - } - diff --git a/nixpkgs/pkgs/development/python-modules/pyside/generatorrunner.nix b/nixpkgs/pkgs/development/python-modules/pyside/generatorrunner.nix deleted file mode 100644 index 3d47ccd58f2b..000000000000 --- a/nixpkgs/pkgs/development/python-modules/pyside/generatorrunner.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pysideApiextractor, python3, qt4 }: - -# This derivation does not provide any Python module and should therefore be called via `all-packages.nix`. -let - pythonEnv = python3.withPackages(ps: with ps; [ sphinx ]); -in stdenv.mkDerivation rec { - pname = "pyside-generatorrunner"; - version = "0.6.16"; - - src = fetchFromGitHub { - owner = "PySide"; - repo = "Generatorrunner"; - rev = version; - hash = "sha256-JAghKY033RTD5b2elitzVQbbN3PMmT3BHwpqx8N5EYg="; - }; - - outputs = [ "out" "dev" ]; - - preConfigure = '' - cmakeFlagsArray=("-DCMAKE_INSTALL_PREFIX=$dev") - ''; - - nativeBuildInputs = [ cmake pythonEnv ]; - buildInputs = [ pysideApiextractor qt4 ]; - - meta = with lib; { - description = "Eases the development of binding generators for C++ and Qt-based libraries by providing a framework to help automating most of the process"; - license = licenses.gpl2; - homepage = "http://www.pyside.org/docs/generatorrunner/"; - maintainers = [ ]; - platforms = platforms.all; - }; -} diff --git a/nixpkgs/pkgs/development/python-modules/pyside/shiboken.nix b/nixpkgs/pkgs/development/python-modules/pyside/shiboken.nix deleted file mode 100644 index 9bad569806a6..000000000000 --- a/nixpkgs/pkgs/development/python-modules/pyside/shiboken.nix +++ /dev/null @@ -1,66 +0,0 @@ -{ lib, fetchFromGitHub, buildPythonPackage -, cmake -, fetchurl -, isPy3k -, libxml2 -, libxslt -, pkg-config -, pysideApiextractor -, pysideGeneratorrunner -, python -, pythonAtLeast -, qt4 -, sphinx -}: - -buildPythonPackage rec { - pname = "pyside-shiboken"; - version = "1.2.4"; - format = "other"; - - src = fetchFromGitHub { - owner = "PySide"; - repo = "Shiboken"; - rev = version; - sha256 = "0x2lyg52m6a0vn0665pgd1z1qrydglyfxxcggw6xzngpnngb6v5v"; - }; - - nativeBuildInputs = [ cmake pkg-config pysideApiextractor pysideGeneratorrunner sphinx qt4 ]; - - buildInputs = [ python libxml2 libxslt ]; - - outputs = [ "out" "dev" ]; - - preConfigure = '' - cmakeFlagsArray=("-DCMAKE_INSTALL_PREFIX=$dev") - echo "preConfigure: Fixing shiboken_generator install target." - substituteInPlace generator/CMakeLists.txt --replace \ - \"$\{GENERATORRUNNER_PLUGIN_DIR}\" lib/generatorrunner/ - ''; - - patches = [ - # gcc6 patch was also sent upstream: https://github.com/pyside/Shiboken/pull/86 - ./gcc6.patch - (lib.optional (pythonAtLeast "3.5") ./shiboken_py35.patch) - (fetchurl { - # https://github.com/pyside/Shiboken/pull/90 - name = "fix-build-with-python-3.9.patch"; - url = "https://github.com/pyside/Shiboken/commit/d1c901d4c0af581003553865360ba964cda041e8.patch"; - sha256 = "1f7slz8n8rps5r67hz3hi4rr82igc3l166shfy6647ivsb2fnxwy"; - }) - ]; - - cmakeFlags = lib.optionals isPy3k [ - "-DUSE_PYTHON3=TRUE" - "-DPYTHON3_INCLUDE_DIR=${lib.getDev python}/include/${python.libPrefix}" - "-DPYTHON3_LIBRARY=${lib.getLib python}/lib" - ]; - - meta = with lib; { - description = "Plugin (front-end) for pyside-generatorrunner, that generates bindings for C++ libraries using CPython source code"; - license = licenses.gpl2; - homepage = "http://www.pyside.org/"; - maintainers = [ ]; - platforms = platforms.all; - }; -} diff --git a/nixpkgs/pkgs/development/python-modules/pyside/shiboken_py35.patch b/nixpkgs/pkgs/development/python-modules/pyside/shiboken_py35.patch deleted file mode 100644 index fb095cf991cf..000000000000 --- a/nixpkgs/pkgs/development/python-modules/pyside/shiboken_py35.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/cmake/Modules/FindPython3Libs.cmake b/cmake/Modules/FindPython3Libs.cmake ---- a/cmake/Modules/FindPython3Libs.cmake -+++ b/cmake/Modules/FindPython3Libs.cmake -@@ -27,7 +27,7 @@ INCLUDE(CMakeFindFrameworks) - # Search for the python framework on Apple. - # CMAKE_FIND_FRAMEWORKS(Python) - --FOREACH(_CURRENT_VERSION 3.4 3.3 3.2 3.1 3.0) -+FOREACH(_CURRENT_VERSION 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0) - IF(_CURRENT_VERSION GREATER 3.1) - SET(_32FLAGS "m" "u" "mu" "dm" "du" "dmu" "") - ELSE() diff --git a/nixpkgs/pkgs/development/python-modules/pyside/tools.nix b/nixpkgs/pkgs/development/python-modules/pyside/tools.nix deleted file mode 100644 index cc52a0502f28..000000000000 --- a/nixpkgs/pkgs/development/python-modules/pyside/tools.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib, buildPythonPackage, fetchFromGitHub, cmake, qt4, pyside, pysideShiboken }: - -buildPythonPackage rec { - pname = "pyside-tools"; - version = "0.2.15"; - format = "other"; - - src = fetchFromGitHub { - owner = "PySide"; - repo = "Tools"; - rev = version; - sha256 = "017i2yxgjrisaifxqnl3ym8ijl63l2yl6a3474dsqhlyqz2nx2ll"; - }; - - outputs = [ "out" "dev" ]; - - preConfigure = '' - cmakeFlagsArray=("-DCMAKE_INSTALL_PREFIX=$dev") - ''; - - nativeBuildInputs = [ cmake ]; - - buildInputs = [ qt4 ]; - - propagatedBuildInputs = [ pyside pysideShiboken ]; - - meta = with lib; { - description = "Development tools (pyside-uic/rcc/lupdate) for PySide, the LGPL-licensed Python bindings for the Qt framework"; - license = licenses.gpl2; - homepage = "https://wiki.qt.io/PySide"; - maintainers = [ ]; - platforms = platforms.all; - }; -} diff --git a/nixpkgs/pkgs/development/python-modules/pyside6/default.nix b/nixpkgs/pkgs/development/python-modules/pyside6/default.nix index 0cf06e885c13..be99c0a086fb 100644 --- a/nixpkgs/pkgs/development/python-modules/pyside6/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyside6/default.nix @@ -2,7 +2,6 @@ , stdenv , cmake , ninja -, qt6 , python , moveBuildTree , shiboken6 @@ -14,7 +13,7 @@ stdenv.mkDerivation rec { inherit (shiboken6) version src; - sourceRoot = "pyside-setup-everywhere-src-${lib.versions.majorMinor version}/sources/${pname}"; + sourceRoot = "pyside-setup-everywhere-src-${version}/sources/${pname}"; # FIXME: cmake/Macros/PySideModules.cmake supposes that all Qt frameworks on macOS # reside in the same directory as QtCore.framework, which is not true for Nix. @@ -34,9 +33,12 @@ stdenv.mkDerivation rec { moveBuildTree ]; - buildInputs = with qt6; [ + buildInputs = with python.pkgs.qt6; [ # required qtbase + python.pkgs.ninja + python.pkgs.packaging + python.pkgs.setuptools ] ++ lib.optionals stdenv.isLinux [ # optional qt3d @@ -69,6 +71,12 @@ stdenv.mkDerivation rec { dontWrapQtApps = true; + postInstall = '' + cd ../../.. + ${python.pythonForBuild.interpreter} setup.py egg_info --build-type=pyside6 + cp -r PySide6.egg-info $out/${python.sitePackages}/ + ''; + meta = with lib; { description = "Python bindings for Qt"; license = with licenses; [ lgpl3Only gpl2Only gpl3Only ]; diff --git a/nixpkgs/pkgs/development/python-modules/pysigma-backend-elasticsearch/default.nix b/nixpkgs/pkgs/development/python-modules/pysigma-backend-elasticsearch/default.nix index 1bff99c95820..6d6f4c3baa4f 100644 --- a/nixpkgs/pkgs/development/python-modules/pysigma-backend-elasticsearch/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pysigma-backend-elasticsearch/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pysigma-backend-elasticsearch"; - version = "1.0.5"; + version = "1.0.6"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "SigmaHQ"; repo = "pySigma-backend-elasticsearch"; rev = "refs/tags/v${version}"; - hash = "sha256-a+2RW+S0Tpf1odfLi0JEdbxfJehF+HI/sHc4QX7lQ+4="; + hash = "sha256-bP64JMDhSYusLzRq0Mv89x1c9DflmYFTih9RP+dY4/c="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/pysigma/default.nix b/nixpkgs/pkgs/development/python-modules/pysigma/default.nix index 6ea53e7dadd8..a4309ea0fe56 100644 --- a/nixpkgs/pkgs/development/python-modules/pysigma/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pysigma/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pysigma"; - version = "0.10.4"; + version = "0.10.5"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "SigmaHQ"; repo = "pySigma"; rev = "refs/tags/v${version}"; - hash = "sha256-pEw0CmQYwZmfpN1mAv04eeOBTVX6JfW3aKhfofZaKYo="; + hash = "sha256-iiE6XHj5632sBlivUHz7HiNRjNpEh+OMqcJ65o2km6I="; }; pythonRelaxDeps = [ diff --git a/nixpkgs/pkgs/development/python-modules/pystache/default.nix b/nixpkgs/pkgs/development/python-modules/pystache/default.nix index 19d9b2cdf490..5cb51640b51d 100644 --- a/nixpkgs/pkgs/development/python-modules/pystache/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pystache/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pystache"; - version = "0.6.4"; + version = "0.6.5"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-4CkCIzBJsW4L4alPDHOJ6AViX2c1eD9FM7AgtaOKJ8c="; + hash = "sha256-nyONWgbxiEPg1JHY5OKS3AP+1qVMsKXDS+N6P6qXMXQ="; }; LC_ALL = "en_US.UTF-8"; diff --git a/nixpkgs/pkgs/development/python-modules/pytapo/default.nix b/nixpkgs/pkgs/development/python-modules/pytapo/default.nix index 7d026e0625ba..f27757b4784e 100644 --- a/nixpkgs/pkgs/development/python-modules/pytapo/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytapo/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pytapo"; - version = "3.1.18"; + version = "3.2.14"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-pYzp/iQHTXS+ovtWIwOoUfYg/h/46ZLNZyevK2vQHEA="; + hash = "sha256-V/D+eE6y1kCMZmp9rIcvS/wdcSyW3mYWEJqpCb74NtY="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pytesseract/default.nix b/nixpkgs/pkgs/development/python-modules/pytesseract/default.nix index b7c25bbf17c8..c1bfd320119b 100644 --- a/nixpkgs/pkgs/development/python-modules/pytesseract/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytesseract/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pytesseract"; - version = "0.3.10"; + version = "0.3.11"; format = "pyproject"; src = fetchFromGitHub { owner = "madmaze"; repo = pname; - rev = "v${version}"; - hash = "sha256-CyKXtaIE/8iPLqi0GHVUgTeJDYZyWBjkRvOKJJKCxZo="; + rev = "refs/tags/v${version}"; + hash = "sha256-8obU1QFlboQnFjb3JUkVG+tt0wDlRffVH/PBmN1r3dk="; }; patches = [ diff --git a/nixpkgs/pkgs/development/python-modules/pytest-quickcheck/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-quickcheck/default.nix index 16f85581cabf..a5e11c66a71a 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest-quickcheck/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest-quickcheck/default.nix @@ -2,30 +2,33 @@ , buildPythonPackage , fetchPypi , pytest +, pytestCheckHook , pytest-flakes -, tox }: buildPythonPackage rec { pname = "pytest-quickcheck"; version = "0.9.0"; + format = "setuptools"; src = fetchPypi { inherit pname version; hash = "sha256-UFF8ldnaImXU6al4kGjf720mbwXE6Nut9VlvNVrMVoY="; }; - buildInputs = [ pytest ]; + propagatedBuildInputs = [ + pytest + ]; - propagatedBuildInputs = [ pytest-flakes tox ]; + nativeCheckInputs = [ + pytestCheckHook + pytest-flakes + ]; meta = with lib; { license = licenses.asl20; homepage = "https://pypi.python.org/pypi/pytest-quickcheck"; description = "pytest plugin to generate random data inspired by QuickCheck"; maintainers = with maintainers; [ onny ]; - # Pytest support > 6.0 missing - # https://github.com/t2y/pytest-quickcheck/issues/17 - broken = true; }; } diff --git a/nixpkgs/pkgs/development/python-modules/python-bsblan/default.nix b/nixpkgs/pkgs/development/python-modules/python-bsblan/default.nix index 10db66e4bb22..2ffc8ed0b7f2 100644 --- a/nixpkgs/pkgs/development/python-modules/python-bsblan/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-bsblan/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "python-bsblan"; - version = "0.5.15"; + version = "0.5.16"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "liudger"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-PNgv3QXl3iyDX0KOn1egQrt6D64i3eCUyCPtXe94y0U="; + hash = "sha256-m80lnNd1ANddV0d/w3S7+QWzIPRklDZsWMO2g1hgEoQ="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/python-cinderclient/default.nix b/nixpkgs/pkgs/development/python-modules/python-cinderclient/default.nix index d4ef03912005..6473cb660086 100644 --- a/nixpkgs/pkgs/development/python-modules/python-cinderclient/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-cinderclient/default.nix @@ -17,11 +17,11 @@ buildPythonPackage rec { pname = "python-cinderclient"; - version = "9.3.0"; + version = "9.4.0"; src = fetchPypi { inherit pname version; - hash = "sha256-mmqjD+/0jAwP0Yjm1RUNvdkeP9WxDS2514uYEqsUr4g="; + hash = "sha256-pT5kcKUWYntZ0iUFIioMhXlL4afyd06HeWEFvUfulpU="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/python-jenkins/default.nix b/nixpkgs/pkgs/development/python-modules/python-jenkins/default.nix index 07044b9499bb..af0671279ab1 100644 --- a/nixpkgs/pkgs/development/python-modules/python-jenkins/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-jenkins/default.nix @@ -12,15 +12,17 @@ , requests , requests-mock , stestr +, multiprocess +, pythonRelaxDepsHook }: buildPythonPackage rec { pname = "python-jenkins"; - version = "1.7.0"; + version = "1.8.1"; src = fetchPypi { inherit pname version; - sha256 = "01jid5s09lr3kayr2h1z9n8h9nhyw3jxv9c4b5hrlxijknkqzvfy"; + hash = "sha256-/18dklOdkD+GmwLq8rExREfm1tePdn7c/dkpZ9UyucY="; }; # test uses timeout mechanism unsafe for use with the "spawn" @@ -30,18 +32,25 @@ buildPythonPackage rec { --replace test_jenkins_open_no_timeout dont_test_jenkins_open_no_timeout ''; + nativeBuildInputs = [ + pythonRelaxDepsHook + ]; + pythonRelaxDeps = [ + "setuptools" + ]; + buildInputs = [ mock ]; propagatedBuildInputs = [ pbr pyyaml setuptools six multi_key_dict requests ]; __darwinAllowLocalNetworking = true; - nativeCheckInputs = [ stestr testscenarios requests-mock ]; - checkPhase = '' - # Skip tests that fail due to setuptools>=66.0.0 rejecting PEP 440 - # non-conforming versions. See - # https://github.com/pypa/setuptools/issues/2497 for details. - stestr run -E "tests.test_plugins.(PluginsTestScenarios.test_plugin_version_comparison|PluginsTestScenarios.test_plugin_version_object_comparison|PluginsTest.test_plugin_equal|PluginsTest.test_plugin_not_equal)" - ''; + nativeCheckInputs = [ stestr testscenarios requests-mock multiprocess ]; + checkPhase = '' + # Skip tests that fail due to setuptools>=66.0.0 rejecting PEP 440 + # non-conforming versions. See + # https://github.com/pypa/setuptools/issues/2497 for details. + stestr run -E "tests.test_plugins.(PluginsTestScenarios.test_plugin_version_comparison|PluginsTestScenarios.test_plugin_version_object_comparison|PluginsTest.test_plugin_equal|PluginsTest.test_plugin_not_equal)" + ''; meta = with lib; { description = "Python bindings for the remote Jenkins API"; diff --git a/nixpkgs/pkgs/development/python-modules/python-manilaclient/default.nix b/nixpkgs/pkgs/development/python-modules/python-manilaclient/default.nix index f3d8d46bbe84..60be5e80c8c7 100644 --- a/nixpkgs/pkgs/development/python-modules/python-manilaclient/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-manilaclient/default.nix @@ -22,12 +22,12 @@ buildPythonPackage rec { pname = "python-manilaclient"; - version = "4.5.1"; + version = "4.6.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-jtcY0yPD6eBcTFNVgANY4brQkrAscADeY8hbfw6M/tI="; + hash = "sha256-JFdpPX2lVSGN/jVsKMOOKrPm51fwpD476TnQo/0AYWQ="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/python-novaclient/default.nix b/nixpkgs/pkgs/development/python-modules/python-novaclient/default.nix index 8cdc62e8c0f5..1bad0f4e6930 100644 --- a/nixpkgs/pkgs/development/python-modules/python-novaclient/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-novaclient/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "python-novaclient"; - version = "18.3.0"; + version = "18.4.0"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-UPdYfHorJSj3NQWBf5Q3rFwdBNV26b4mTS3u/9t0WnY="; + hash = "sha256-a2tq4sEescEI469V6qchGw/JGZk1oimmuj4N5RTBK1A="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/python-pptx/default.nix b/nixpkgs/pkgs/development/python-modules/python-pptx/default.nix index eb498ea05adf..d783efa71425 100644 --- a/nixpkgs/pkgs/development/python-modules/python-pptx/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-pptx/default.nix @@ -7,11 +7,11 @@ }: buildPythonPackage rec { pname = "python-pptx"; - version = "0.6.21"; + version = "0.6.22"; src = fetchPypi { inherit pname version; - hash = "sha256-d5iiqviVY1ZbPHEgwKz+mv93XbDbNYBUTjv0hAwuN48="; + hash = "sha256-OPjukt3jHSS0ViVg5hsDV+XZfs91xDUq5mFtWjKXhlQ="; }; # postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/python-swiftclient/default.nix b/nixpkgs/pkgs/development/python-modules/python-swiftclient/default.nix index bb8320846862..e34bad425b3c 100644 --- a/nixpkgs/pkgs/development/python-modules/python-swiftclient/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-swiftclient/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "python-swiftclient"; - version = "4.3.0"; + version = "4.4.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-Hj3fmYzL6n3CWqbfjrPffTi/S8lrBl8vhEMeglmBezM="; + hash = "sha256-p32Xqw5AEsZ4cy5XW9/u0oKzSJuRdegsRqR6yEke7oQ="; }; # remove duplicate script that will be created by setuptools from the diff --git a/nixpkgs/pkgs/development/python-modules/python_docs_theme/default.nix b/nixpkgs/pkgs/development/python-modules/python_docs_theme/default.nix index 4e7f9ff84884..1e3776b906a5 100644 --- a/nixpkgs/pkgs/development/python-modules/python_docs_theme/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python_docs_theme/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "python_docs_theme"; - version = "2023.3.1"; + version = "2023.7"; format = "flit"; src = fetchFromGitHub { owner = "python"; repo = "python-docs-theme"; - rev = version; - sha256 = "sha256-WyO5Xc67k5ExB4eCFd17sZCBMaV5djle9BAM0tn5CPc="; + rev = "refs/tags/${version}"; + sha256 = "sha256-43/TlgYm7Q4ZtY25MiLU9fd1atDmiDUeUK6AYfDfmag="; }; propagatedBuildInputs = [ sphinx ]; diff --git a/nixpkgs/pkgs/development/python-modules/pythonnet/default.nix b/nixpkgs/pkgs/development/python-modules/pythonnet/default.nix index 91dc505a3d83..3ec700149bed 100644 --- a/nixpkgs/pkgs/development/python-modules/pythonnet/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pythonnet/default.nix @@ -12,11 +12,11 @@ let pname = "pythonnet"; - version = "3.0.1"; + version = "3.0.2"; src = fetchPypi { pname = "pythonnet"; inherit version; - sha256 = "sha256-7U9/f5VRVAQRLds9oWOOGhATy1bmTEjE+mAwPwKwo90="; + sha256 = "sha256-LN0cztxkp8m9cRvj0P0MSniTJHQTncVKppe+3edBx0Y="; }; # This buildDotnetModule is used only to get nuget sources, the actual diff --git a/nixpkgs/pkgs/development/python-modules/pytibber/default.nix b/nixpkgs/pkgs/development/python-modules/pytibber/default.nix index 2701f7e64f1d..f18402db6bb0 100644 --- a/nixpkgs/pkgs/development/python-modules/pytibber/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytibber/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pytibber"; - version = "0.28.1"; + version = "0.28.2"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "pyTibber"; rev = "refs/tags/${version}"; - hash = "sha256-ZEdBV+X9Ib1JvE8nzey+er7GrQMAV79zqn8ssC+kKdU="; + hash = "sha256-vi5f4V0nPb9K3nwdmwMDoNE85Or6haOWjMY4d/2Fj2s="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pytimeparse2/default.nix b/nixpkgs/pkgs/development/python-modules/pytimeparse2/default.nix new file mode 100644 index 000000000000..becbbb267e48 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pytimeparse2/default.nix @@ -0,0 +1,32 @@ +{ lib, fetchFromGitHub, buildPythonPackage, dateutils }: + +buildPythonPackage rec { + pname = "pytimeparse2"; + version = "1.7.1"; + + src = fetchFromGitHub { + owner = "onegreyonewhite"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-zWRbSohTvbVd3GcRRoxH/UReVGYHC0YmbNgbt8N0X48="; + }; + + propagatedBuildInputs = [ dateutils ]; + + # custom checks, see + # https://github.com/onegreyonewhite/pytimeparse2/blob/e00df7506b6925f2c6a5783e89e9f239d128271a/tox.ini#L36C20-L36C78 + checkPhase = '' + runHook preCheck + python tests.py -vv --failfast + runHook postCheck + ''; + + pythonImportsCheck = [ "pytimeparse2" ]; + + meta = with lib; { + description = "A pytimeparse based project with the aim of optimizing functionality and providing stable support"; + homepage = "https://github.com/onegreyonewhite/pytimeparse2"; + license = licenses.mit; + maintainers = with maintainers; [ gador ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pytorch-lightning/default.nix b/nixpkgs/pkgs/development/python-modules/pytorch-lightning/default.nix index c76b97c2374a..5d46e647dc8a 100644 --- a/nixpkgs/pkgs/development/python-modules/pytorch-lightning/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytorch-lightning/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "pytorch-lightning"; - version = "2.0.7"; + version = "2.0.8"; format = "pyproject"; src = fetchFromGitHub { owner = "Lightning-AI"; repo = "pytorch-lightning"; rev = "refs/tags/${version}"; - hash = "sha256-R1uX5kPRnLWqqpEYbzJp7aOSK6e5mfyQ14CkbBCDszw="; + hash = "sha256-Z/5d7aUO9UO7c9PoekxP8PMajKlh//hk/YIp+BJMcho="; }; preConfigure = '' diff --git a/nixpkgs/pkgs/development/python-modules/pyvesync/default.nix b/nixpkgs/pkgs/development/python-modules/pyvesync/default.nix index 2d4e7217fff2..62ea4229079e 100644 --- a/nixpkgs/pkgs/development/python-modules/pyvesync/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyvesync/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pyvesync"; - version = "2.1.9"; + version = "2.1.10"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-88aCnPzC4RfmEsL05pgFoOCfz42R1eqaJGTmXoWu0gA="; + hash = "sha256-ddtTtTAUpvS8DN1vKVN+CjnmYp20xyxHydwOaDRjWzo="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pyvista/default.nix b/nixpkgs/pkgs/development/python-modules/pyvista/default.nix index e63038b54c0b..4d40a650506c 100644 --- a/nixpkgs/pkgs/development/python-modules/pyvista/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyvista/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pyvista"; - version = "0.41.1"; + version = "0.42.1"; format = "setuptools"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-vFxEMKEkiFOBrkvmaJPwoo+lOe6V9AmPxl32Tocy9p8="; + hash = "sha256-Bk2bw6WCLzMb3nLMCS9rRugNocA9eYju/aoE68TYu5c="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pywaze/default.nix b/nixpkgs/pkgs/development/python-modules/pywaze/default.nix new file mode 100644 index 000000000000..fbaa0e94ea87 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pywaze/default.nix @@ -0,0 +1,56 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, hatchling +, httpx +, pytest-asyncio +, pytestCheckHook +, pythonOlder +, respx +}: + +buildPythonPackage rec { + pname = "pywaze"; + version = "0.3.0"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "eifinger"; + repo = "pywaze"; + rev = "refs/tags/v${version}"; + hash = "sha256-z/6eSgERHKV/5vjbRWcyrxAMNDIHvM3GUoo3xf+AhNY="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "--cov --cov-report term-missing --cov=src/pywaze " "" + ''; + + nativeBuildInputs = [ + hatchling + ]; + + propagatedBuildInputs = [ + httpx + ]; + + nativeCheckInputs = [ + pytest-asyncio + pytestCheckHook + respx + ]; + + pythonImportsCheck = [ + "pywaze" + ]; + + meta = with lib; { + description = "Module for calculating WAZE routes and travel times"; + homepage = "https://github.com/eifinger/pywaze"; + changelog = "https://github.com/eifinger/pywaze/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/qbittorrent-api/default.nix b/nixpkgs/pkgs/development/python-modules/qbittorrent-api/default.nix index 2785ad3a32d9..a31438335ef8 100644 --- a/nixpkgs/pkgs/development/python-modules/qbittorrent-api/default.nix +++ b/nixpkgs/pkgs/development/python-modules/qbittorrent-api/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "qbittorrent-api"; - version = "2023.7.52"; + version = "2023.9.53"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-RHOupNo0jteUpxcxAojOfnBGGBt293j0OCHeKEritpQ="; + hash = "sha256-/q0bL1WxIn6giOp9kLUCLZRpS/2d2Rdr61rRwZXQRP8="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/qpsolvers/default.nix b/nixpkgs/pkgs/development/python-modules/qpsolvers/default.nix new file mode 100644 index 000000000000..18141543c98c --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/qpsolvers/default.nix @@ -0,0 +1,48 @@ +{ lib +, stdenv +, fetchFromGitHub +, buildPythonPackage +, unittestCheckHook +, daqp +, ecos +, numpy +, osqp +, scipy +, scs +, quadprog +}: +buildPythonPackage rec { + pname = "qpsolvers"; + version = "3.4.0"; + format = "flit"; + + src = fetchFromGitHub { + owner = "qpsolvers"; + repo = "qpsolvers"; + rev = "v${version}"; + hash = "sha256-GrYAhTWABBvU6rGoHi00jBa7ryjCNgzO/hQBTdSW9cg="; + }; + + pythonImportsCheck = [ "qpsolvers" ]; + + propagatedBuildInputs = [ + daqp + ecos + numpy + osqp + scipy + scs + ]; + + nativeCheckInputs = [ + quadprog + unittestCheckHook + ]; + + meta = with lib; { + description = "Quadratic programming solvers in Python with a unified API"; + homepage = "https://github.com/qpsolvers/qpsolvers"; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ renesat ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/qscintilla-qt4/default.nix b/nixpkgs/pkgs/development/python-modules/qscintilla-qt4/default.nix deleted file mode 100644 index a356bfddb934..000000000000 --- a/nixpkgs/pkgs/development/python-modules/qscintilla-qt4/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ lib -, buildPythonPackage -, isPy3k -, isPyPy -, pkgs -, python -, pyqt4 -}: - -buildPythonPackage { - pname = "qscintilla-qt4"; - version = pkgs.qscintilla-qt4.version; - format = "other"; - - disabled = isPyPy; - - src = pkgs.qscintilla-qt4.src; - - nativeBuildInputs = [ pkgs.xorg.lndir ]; - - buildInputs = [ pyqt4.qt pyqt4 ]; - - preConfigure = '' - mkdir -p $out - lndir ${pyqt4} $out - rm -rf "$out/nix-support" - cd Python - ${python.executable} ./configure-old.py \ - --destdir $out/lib/${python.libPrefix}/site-packages/PyQt4 \ - --apidir $out/api/${python.libPrefix} \ - -n ${pkgs.qscintilla-qt4}/include \ - -o ${pkgs.qscintilla-qt4}/lib \ - --sipdir $out/share/sip - ''; - - meta = with lib; { - description = "A Python binding to QScintilla, Qt based text editing control"; - license = licenses.lgpl21Plus; - maintainers = with maintainers; [ danbst ]; - platforms = platforms.linux; - }; -} diff --git a/nixpkgs/pkgs/development/python-modules/qtconsole/default.nix b/nixpkgs/pkgs/development/python-modules/qtconsole/default.nix index 57b16e254fcf..b963798f6560 100644 --- a/nixpkgs/pkgs/development/python-modules/qtconsole/default.nix +++ b/nixpkgs/pkgs/development/python-modules/qtconsole/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "qtconsole"; - version = "5.4.0"; + version = "5.4.4"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-V3SOov0mMgoLd626IBMc+7E4GMfJbYP6/LEQ/1X1izU="; + hash = "sha256-t/+1PXTyPO4p9M21Xdb6vI7DEtlPPEa6OOHd5FhpPfs="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/qtpy/default.nix b/nixpkgs/pkgs/development/python-modules/qtpy/default.nix index 35f8e56a280f..e534704a7c4a 100644 --- a/nixpkgs/pkgs/development/python-modules/qtpy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/qtpy/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "QtPy"; - version = "2.3.0"; + version = "2.4.0"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-BgPJyDzMA1pHF6EpCL9rxssiUJgn6i7A6Uwtp8ntV8U="; + hash = "sha256-2y1QgWeqYQZ4FWXI2lxvFIfeusujNRnO3DX6iZfUJNQ="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/quaternion/default.nix b/nixpkgs/pkgs/development/python-modules/quaternion/default.nix new file mode 100644 index 000000000000..ad53a085d327 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/quaternion/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, oldest-supported-numpy +, scipy +, numba +}: + +buildPythonPackage rec { + pname = "quaternion"; + version = "2022.4.3"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "moble"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-iLjVQ6eGwpLQXi8Sr5ShJdXMqYNclGEuq/oxR4ExDLA="; + }; + + propagatedBuildInputs = [ + oldest-supported-numpy + numba + scipy + ]; + + meta = with lib; { + description = "A package add built-in support for quaternions to numpy"; + homepage = "https://github.com/moble/quaternion"; + license = licenses.mit; + maintainers = [ maintainers.ocfox ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/rchitect/default.nix b/nixpkgs/pkgs/development/python-modules/rchitect/default.nix index ad1484dfc254..2ac13e9a47f1 100644 --- a/nixpkgs/pkgs/development/python-modules/rchitect/default.nix +++ b/nixpkgs/pkgs/development/python-modules/rchitect/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "rchitect"; - version = "0.4.1"; + version = "0.4.2"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "randy3k"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-fXL2UX0n9kKAVwMUP0z8V3UtJAy4xbAjnPIggUHllN0="; + hash = "sha256-e0xCUp5WBP4UKPkwPfrouNNYTBEnhlHHlkBQmghQfdk="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/recordlinkage/default.nix b/nixpkgs/pkgs/development/python-modules/recordlinkage/default.nix index 8c911b282605..4d8ab8e8a8c9 100644 --- a/nixpkgs/pkgs/development/python-modules/recordlinkage/default.nix +++ b/nixpkgs/pkgs/development/python-modules/recordlinkage/default.nix @@ -10,9 +10,11 @@ , pandas , pyarrow , pytest +, pythonOlder , scikit-learn , scipy -, pythonOlder +, setuptools +, setuptools-scm }: buildPythonPackage rec { @@ -21,11 +23,17 @@ buildPythonPackage rec { format = "pyproject"; disabled = pythonOlder "3.8"; + src = fetchPypi { inherit pname version; hash = "sha256-7NoMEN/xOLFwaBXeMysShfZwrn6MzpJZYhNQHVieaqQ="; }; + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; + propagatedBuildInputs = [ pyarrow jellyfish @@ -41,14 +49,19 @@ buildPythonPackage rec { # pytestCheckHook does not work # Reusing their CI setup which involves 'rm -rf recordlinkage' in preCheck phase do not work too. - nativeCheckInputs = [ pytest ]; + nativeCheckInputs = [ + pytest + ]; - pythonImportsCheck = [ "recordlinkage" ]; + pythonImportsCheck = [ + "recordlinkage" + ]; meta = with lib; { description = "Library to link records in or between data sources"; homepage = "https://recordlinkage.readthedocs.io/"; + changelog = "https://github.com/J535D165/recordlinkage/releases/tag/v${version}"; license = licenses.bsd3; - maintainers = [ maintainers.raitobezarius ]; + maintainers = with maintainers; [ raitobezarius ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/regex/default.nix b/nixpkgs/pkgs/development/python-modules/regex/default.nix index d41bed6136ed..2df8bf922ea7 100644 --- a/nixpkgs/pkgs/development/python-modules/regex/default.nix +++ b/nixpkgs/pkgs/development/python-modules/regex/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "regex"; - version = "2022.10.31"; + version = "2023.8.8"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-o6mJIdqaG/hFeu7mpVGUioNgFonl7N1zaJTqm77HfoM="; + hash = "sha256-/L3F8rDxzQ9qVs20b+QdLM4eZE47aIMvPu68X7D3cS4="; }; checkPhase = '' diff --git a/nixpkgs/pkgs/development/python-modules/reolink-aio/default.nix b/nixpkgs/pkgs/development/python-modules/reolink-aio/default.nix index b74665e2c342..758c957823a6 100644 --- a/nixpkgs/pkgs/development/python-modules/reolink-aio/default.nix +++ b/nixpkgs/pkgs/development/python-modules/reolink-aio/default.nix @@ -2,15 +2,14 @@ , aiohttp , buildPythonPackage , fetchFromGitHub -, ffmpeg-python , orjson , pythonOlder -, requests +, typing-extensions }: buildPythonPackage rec { pname = "reolink-aio"; - version = "0.7.8"; + version = "0.7.9"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -19,29 +18,22 @@ buildPythonPackage rec { owner = "starkillerOG"; repo = "reolink_aio"; rev = "refs/tags/${version}"; - hash = "sha256-vbSt1rD25Bt3Qac0uO0Z63JhbU5HU0p2ox046W6xyJU="; + hash = "sha256-+1FZzgVaj2hphSTFlOtaYH3o++kC/aaahU8i8urdme0="; }; - postPatch = '' - # Packages in nixpkgs is different than the module name - substituteInPlace setup.py \ - --replace "ffmpeg" "ffmpeg-python" - ''; - propagatedBuildInputs = [ aiohttp - ffmpeg-python orjson - requests + typing-extensions ]; - # All tests require a network device - doCheck = false; - pythonImportsCheck = [ "reolink_aio" ]; + # All tests require a network device + doCheck = false; + meta = with lib; { description = "Module to interact with the Reolink IP camera API"; homepage = "https://github.com/starkillerOG/reolink_aio"; diff --git a/nixpkgs/pkgs/development/python-modules/requirements-detector/default.nix b/nixpkgs/pkgs/development/python-modules/requirements-detector/default.nix index c86ed090919d..5acc7ae6ae26 100644 --- a/nixpkgs/pkgs/development/python-modules/requirements-detector/default.nix +++ b/nixpkgs/pkgs/development/python-modules/requirements-detector/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "requirements-detector"; - version = "1.1.0"; + version = "1.2.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,8 +20,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "landscapeio"; repo = pname; - rev = version; - hash = "sha256-H+h/PN1TrlpDRgI7tMWUhXlxj4CChwcxIR/BvyO261c="; + rev = "refs/tags/${version}"; + hash = "sha256-qmrHFQRypBJOI1N6W/Dtc5ss9JGqoPhFlbqrLHcb6vc="; }; nativeBuildInputs = [ @@ -46,6 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python tool to find and list requirements of a Python project"; homepage = "https://github.com/landscapeio/requirements-detector"; + changelog = "https://github.com/landscapeio/requirements-detector/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ kamadorueda ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/returns/default.nix b/nixpkgs/pkgs/development/python-modules/returns/default.nix index 0b54d62ba569..2e0275bd8040 100644 --- a/nixpkgs/pkgs/development/python-modules/returns/default.nix +++ b/nixpkgs/pkgs/development/python-modules/returns/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "returns"; - version = "0.21.0"; + version = "0.22.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "dry-python"; repo = "returns"; rev = "refs/tags/${version}"; - hash = "sha256-oYOCoh/pF2g4KGWC2mEnFD+zm2CKL+3x5JjzuZ3QHVQ="; + hash = "sha256-0eFirhBsj8SWfoAPWEMuFa+EvBgHKpNeKVj3qJ4L6hE="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/rich-argparse/default.nix b/nixpkgs/pkgs/development/python-modules/rich-argparse/default.nix index 5578acbe5b69..0fde4435543d 100644 --- a/nixpkgs/pkgs/development/python-modules/rich-argparse/default.nix +++ b/nixpkgs/pkgs/development/python-modules/rich-argparse/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "rich-argparse"; - version = "1.1.0"; + version = "1.3.0"; format = "pyproject"; src = fetchFromGitHub { owner = "hamdanal"; repo = "rich-argparse"; rev = "v${version}"; - hash = "sha256-Rnv4A9pZ5VHpNjrWnsKyxQ4ISCLjIUu3tbbOzP4uFuw="; + hash = "sha256-WAqFhH9gUwDZuORJ++fKjCmaCurdYpep3WPq68tWJ4U="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/riscv-config/default.nix b/nixpkgs/pkgs/development/python-modules/riscv-config/default.nix index 409c3a0d7ed1..7ded790ec53e 100644 --- a/nixpkgs/pkgs/development/python-modules/riscv-config/default.nix +++ b/nixpkgs/pkgs/development/python-modules/riscv-config/default.nix @@ -1,38 +1,44 @@ -{ buildPythonPackage +{ lib +, buildPythonPackage +, cerberus , fetchFromGitHub , fetchpatch -, lib -, cerberus +, pythonOlder , pyyaml , ruamel-yaml }: buildPythonPackage rec { pname = "riscv-config"; - version = "3.5.2"; + version = "3.13.1"; format = "setuptools"; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "riscv-software-src"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-K7W6yyqy/2c4WHyOojuvw2P/v7bND5K6WFfTujkofBw="; + hash = "sha256-SnUt6bsTEC7abdQr0nWyNOAJbW64B1K3yy1McfkdxAc="; }; - patches = [ - # Remove when updating to v3.8.0+ - (fetchpatch { - name = "remove-dangling-pip-import.patch"; - url = "https://github.com/riscv-software-src/riscv-config/commit/f75e7e13fe600b71254b0391be015ec533d3c3ef.patch"; - hash = "sha256-oVRynBIJevq3UzlMDRh2rVuBJZoEwEYhDma3Bb/QV2E="; - }) + propagatedBuildInputs = [ + cerberus + pyyaml + ruamel-yaml ]; - propagatedBuildInputs = [ cerberus pyyaml ruamel-yaml ]; + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "riscv_config" + ]; meta = with lib; { - homepage = "https://github.com/riscv/riscv-config"; description = "RISC-V configuration validator"; + homepage = "https://github.com/riscv/riscv-config"; + changelog = "https://github.com/riscv-software-src/riscv-config/blob/${version}/CHANGELOG.md"; maintainers = with maintainers; [ genericnerdyusername ]; license = licenses.bsd3; }; diff --git a/nixpkgs/pkgs/development/python-modules/ruamel-base/default.nix b/nixpkgs/pkgs/development/python-modules/ruamel-base/default.nix index 26b94d0fd917..675ae527b311 100644 --- a/nixpkgs/pkgs/development/python-modules/ruamel-base/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ruamel-base/default.nix @@ -18,6 +18,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "ruamel.base" ]; + pythonNamespaces = [ "ruamel" ]; + meta = with lib; { description = "Common routines for ruamel packages"; homepage = "https://sourceforge.net/projects/ruamel-base/"; diff --git a/nixpkgs/pkgs/development/python-modules/s3fs/default.nix b/nixpkgs/pkgs/development/python-modules/s3fs/default.nix index 80721c039a21..c66df5ec520f 100644 --- a/nixpkgs/pkgs/development/python-modules/s3fs/default.nix +++ b/nixpkgs/pkgs/development/python-modules/s3fs/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "s3fs"; - version = "2023.6.0"; + version = "2023.9.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Y/2N3wXrci3nhLe1AxlhB/KlGAYSmM8AWopHFbTUkRc="; + hash = "sha256-NQV9TVlyLKuf6RyaMBR+Plvd/FXsFP3od2xRIXnII90="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/schema-salad/default.nix b/nixpkgs/pkgs/development/python-modules/schema-salad/default.nix index 16d6c6120da1..b61a5e2e7bce 100644 --- a/nixpkgs/pkgs/development/python-modules/schema-salad/default.nix +++ b/nixpkgs/pkgs/development/python-modules/schema-salad/default.nix @@ -1,29 +1,30 @@ { lib , black , buildPythonPackage -, fetchPypi -, setuptools-scm , cachecontrol +, fetchPypi +, importlib-resources , lockfile , mistune , mypy +, pytestCheckHook +, pythonOlder , rdflib , ruamel-yaml , setuptools -, pytestCheckHook -, pythonOlder +, setuptools-scm }: buildPythonPackage rec { pname = "schema-salad"; - version = "8.4.20230606143604"; + version = "8.4.20230808163024"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-8Zo9ZhS0r+zsk7nHEh0x7gHYwaoWmyctQYRMph09mvY="; + hash = "sha256-ai4vv6EFX4yTR8sgRspiG+M8a8oa83LIlJPGX7q+Kd0="; }; nativeBuildInputs = [ @@ -32,6 +33,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ cachecontrol + importlib-resources lockfile mistune mypy diff --git a/nixpkgs/pkgs/development/python-modules/scs/default.nix b/nixpkgs/pkgs/development/python-modules/scs/default.nix index 973e54644bea..0a242e231373 100644 --- a/nixpkgs/pkgs/development/python-modules/scs/default.nix +++ b/nixpkgs/pkgs/development/python-modules/scs/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , fetchFromGitHub , blas @@ -11,13 +12,13 @@ buildPythonPackage rec { pname = "scs"; - version = "3.0.0"; + version = "3.2.3"; src = fetchFromGitHub { owner = "bodono"; repo = "scs-python"; rev = version; - hash = "sha256-7OgqCo21S0FDev8xv6/8iGFXg8naVi93zd8v1f9iaWw="; + hash = "sha256-/5yGvZy3luGQkbYcsb/6TZLYou91lpA3UKONviMVpuM="; fetchSubmodules = true; }; @@ -33,6 +34,12 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "scs" ]; + disabledTests = lib.lists.optional (stdenv.system == "x86_64-linux") [ + # `test/test_scs_rand.py` hang on "x86_64-linux" (https://github.com/NixOS/nixpkgs/pull/244532#pullrequestreview-1598095858) + "test_feasible" + "test_infeasibl" + "test_unbounded" + ]; meta = with lib; { description = "Python interface for SCS: Splitting Conic Solver"; diff --git a/nixpkgs/pkgs/development/python-modules/sdds/default.nix b/nixpkgs/pkgs/development/python-modules/sdds/default.nix index c36d066a7517..9ae9c01b39e0 100644 --- a/nixpkgs/pkgs/development/python-modules/sdds/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sdds/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "sdds"; - version = "0.3.1"; + version = "0.4.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,8 +16,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pylhc"; repo = pname; - rev = "refs/tags/${version}"; - hash = "sha256-lb4awMQ7GE7m2N2yiCpJ976I2j8hE98/93zCX7Rp4qU="; + rev = "refs/tags/v${version}"; + hash = "sha256-8tnJAptTUsC0atxM9Dpn90drcprdWrs8fYoX8RDkLyQ="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/seatconnect/default.nix b/nixpkgs/pkgs/development/python-modules/seatconnect/default.nix index 7f5fb4718ff9..782a1d43ec5a 100644 --- a/nixpkgs/pkgs/development/python-modules/seatconnect/default.nix +++ b/nixpkgs/pkgs/development/python-modules/seatconnect/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "seatconnect"; - version = "1.1.7"; + version = "1.1.9"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,8 +21,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "farfar"; repo = pname; - rev = version; - hash = "sha256-8QZtivHG+tf7S2hVlFaQ7yCeCCI7ft/EIr0D73mcURw="; + rev = "refs/tags/${version}"; + hash = "sha256-HITVrI0o94a61gy/TYSGFtLBYX4Rw/dK1o2/KsvHLTQ="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/nixpkgs/pkgs/development/python-modules/send2trash/default.nix b/nixpkgs/pkgs/development/python-modules/send2trash/default.nix index 890a38e63e9d..0fab032f93a1 100644 --- a/nixpkgs/pkgs/development/python-modules/send2trash/default.nix +++ b/nixpkgs/pkgs/development/python-modules/send2trash/default.nix @@ -7,25 +7,16 @@ buildPythonPackage rec { pname = "Send2Trash"; - version = "1.8.1b0"; + version = "1.8.2"; format = "pyproject"; src = fetchFromGitHub { owner = "hsoft"; repo = "send2trash"; rev = "refs/tags/${version}"; - hash = "sha256-kDUEfyMTk8CXSxTEi7E6kl09ohnWHeaoif+EIaIJh9Q="; + hash = "sha256-p0Pd9g+nLoT+oruthwjBn2E9rznvcx35VmzOAce2iTY="; }; - postPatch = '' - # Confuses setuptools validation - # setuptools.extern.packaging.requirements.InvalidRequirement: One of the parsed requirements in `extras_require[win32]` looks like a valid environment marker: 'sys_platform == "win32"' - sed -i '/win32 =/d' setup.cfg - - # setuptools.extern.packaging.requirements.InvalidRequirement: One of the parsed requirements in `extras_require[objc]` looks like a valid environment marker: 'sys_platform == "darwin"' - sed -i '/objc =/d' setup.cfg - ''; - nativeBuildInputs = [ setuptools ]; diff --git a/nixpkgs/pkgs/development/python-modules/sense-energy/default.nix b/nixpkgs/pkgs/development/python-modules/sense-energy/default.nix index 43836e882303..36317a10bfb3 100644 --- a/nixpkgs/pkgs/development/python-modules/sense-energy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sense-energy/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "sense-energy"; - version = "0.12.0"; + version = "0.12.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "scottbonline"; repo = "sense"; rev = "refs/tags/${version}"; - hash = "sha256-LVpTB7Q78N/cRbneJJ1aT+lFE790ssdMHo8VRirtDHY="; + hash = "sha256-6zhbchCRHyltJ/EP9Hnj4LoRn7/0PDJCmWNjF+IsQdM="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/setuptools-gettext/default.nix b/nixpkgs/pkgs/development/python-modules/setuptools-gettext/default.nix index 882eb6d4599b..725c71eeafdc 100644 --- a/nixpkgs/pkgs/development/python-modules/setuptools-gettext/default.nix +++ b/nixpkgs/pkgs/development/python-modules/setuptools-gettext/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "setuptools-gettext"; - version = "0.1.3"; + version = "0.1.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "breezy-team"; repo = "setuptools-gettext"; rev = "refs/tags/v${version}"; - hash = "sha256-pTjYdezNBFeLCh6cbC+YtHxQB4zrZAFTCjjNQffbHhc="; + hash = "sha256-16kzKB0xq3ApQlGQYp12oB7K99QCQMUwqpP54QiI3gg="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/shazamio/default.nix b/nixpkgs/pkgs/development/python-modules/shazamio/default.nix new file mode 100644 index 000000000000..ee1616f7b775 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/shazamio/default.nix @@ -0,0 +1,76 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, fetchpatch +, poetry-core +, wheel +, aiofiles +, aiohttp +, dataclass-factory +, numpy +, pydantic +, pydub +, ffmpeg +, pytest-asyncio +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "shazamio"; + version = "0.4.0.1"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "dotX12"; + repo = "ShazamIO"; + rev = version; + hash = "sha256-dfrdfbGkLYNjlS6Qv9Rnywv6nqiKrNXCICLSuAXpQBU="; + }; + + patches = [ + # remove poetry and virtualenv from build dependencies as they are not used + # https://github.com/dotX12/ShazamIO/pull/71 + (fetchpatch { + name = "remove-unused-build-dependencies.patch"; + url = "https://github.com/dotX12/ShazamIO/commit/5c61e1efe51c2826852da5b6aa6ad8ce3d4012a9.patch"; + hash = "sha256-KiU5RVBPnSs5qrReFeTe9ePg1fR7y0NchIIHcQwlPaI="; + }) + ]; + + nativeBuildInputs = [ + poetry-core + wheel + ]; + + propagatedBuildInputs = [ + aiofiles + aiohttp + dataclass-factory + numpy + pydantic + pydub + ]; + + nativeCheckInputs = [ + ffmpeg + pytest-asyncio + pytestCheckHook + ]; + + disabledTests = [ + # requires internet access + "test_about_artist" + "test_recognize_song_file" + "test_recognize_song_bytes" + ]; + + pythonImportsCheck = [ "shazamio" ]; + + meta = with lib; { + description = "A free asynchronous library from reverse engineered Shazam API"; + homepage = "https://github.com/dotX12/ShazamIO"; + changelog = "https://github.com/dotX12/ShazamIO/releases/tag/${src.rev}"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/shiboken6/default.nix b/nixpkgs/pkgs/development/python-modules/shiboken6/default.nix index 9bf4f0d6482e..ca227a625b73 100644 --- a/nixpkgs/pkgs/development/python-modules/shiboken6/default.nix +++ b/nixpkgs/pkgs/development/python-modules/shiboken6/default.nix @@ -2,24 +2,26 @@ , fetchurl , llvmPackages , python -, qt6 , cmake , autoPatchelfHook , stdenv , libxcrypt }: -llvmPackages.stdenv.mkDerivation rec { +let + stdenv' = if stdenv.cc.isClang then stdenv else llvmPackages.stdenv; +in +stdenv'.mkDerivation rec { pname = "shiboken6"; - version = "6.5.0"; + version = "6.5.2"; src = fetchurl { # https://download.qt.io/official_releases/QtForPython/shiboken6/ url = "https://download.qt.io/official_releases/QtForPython/shiboken6/PySide6-${version}-src/pyside-setup-everywhere-src-${version}.tar.xz"; - sha256 = "sha256-bvU7KRJyZ+OBkX5vk5nOdg7cBkTNWDGYix3nLJ1YOrQ="; + sha256 = "sha256-kNvx0U/NQcmKfL6kS4pJUeENC3mOFUdJdW5JRmVNG6g"; }; - sourceRoot = "pyside-setup-everywhere-src-${lib.versions.majorMinor version}/sources/${pname}"; + sourceRoot = "pyside-setup-everywhere-src-${version}/sources/${pname}"; patches = [ ./fix-include-qt-headers.patch @@ -35,7 +37,10 @@ llvmPackages.stdenv.mkDerivation rec { buildInputs = [ llvmPackages.llvm llvmPackages.libclang - qt6.qtbase + python.pkgs.qt6.qtbase + python.pkgs.ninja + python.pkgs.packaging + python.pkgs.setuptools ]; cmakeFlags = [ @@ -54,6 +59,12 @@ llvmPackages.stdenv.mkDerivation rec { patchelf $out/${python.sitePackages}/shiboken6/Shiboken.abi3.so --shrink-rpath --allowed-rpath-prefixes ${builtins.storeDir} ''; + postInstall = '' + cd ../../.. + ${python.pythonForBuild.interpreter} setup.py egg_info --build-type=shiboken6 + cp -r shiboken6.egg-info $out/${python.sitePackages}/ + ''; + dontWrapQtApps = true; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/simplepush/default.nix b/nixpkgs/pkgs/development/python-modules/simplepush/default.nix new file mode 100644 index 000000000000..e7461a850b30 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/simplepush/default.nix @@ -0,0 +1,48 @@ +{ lib +, aiohttp +, buildPythonPackage +, cryptography +, fetchFromGitHub +, pythonOlder +, requests +, setuptools +}: + +buildPythonPackage rec { + pname = "simplepush"; + version = "2.2.3"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "simplepush"; + repo = "simplepush-python"; + rev = "refs/tags/v${version}"; + hash = "sha256-DvDPihhx1rzJN6iQP5rHluplJ1AaN0b/glcd+tZCues="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + aiohttp + cryptography + requests + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "simplepush" + ]; + + meta = with lib; { + description = "Module to send push notifications via Simplepush"; + homepage = "https://github.com/simplepush/simplepush-python"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/sklearn-deap/default.nix b/nixpkgs/pkgs/development/python-modules/sklearn-deap/default.nix index 2530b9652032..7e8f8e159eca 100644 --- a/nixpkgs/pkgs/development/python-modules/sklearn-deap/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sklearn-deap/default.nix @@ -1,38 +1,52 @@ -{ lib, buildPythonPackage, fetchFromGitHub, fetchpatch, numpy, scipy, deap, scikit-learn, python }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, fetchpatch +, deap +, numpy +, scikit-learn +, scipy +, unittestCheckHook +}: buildPythonPackage rec { pname = "sklearn-deap"; - version = "0.2.3"; + version = "0.3.0"; + format = "setuptools"; # No tests in Pypi src = fetchFromGitHub { owner = "rsteca"; - repo = pname; + repo = "sklearn-deap"; rev = version; - sha256 = "1yqnmy8h08i2y6bb2s0a5nx9cwvyg45293whqh420c195gpzg1x3"; + hash = "sha256-bXBHlv1pIOyDLKCBeffyHaTZ7gNiZNl0soa73e8E4/M="; }; patches = [ - # Fix for scikit-learn v0.21.1. See: https://github.com/rsteca/sklearn-deap/pull/62 + # Fix for scikit-learn v1.1. See: https://github.com/rsteca/sklearn-deap/pull/80 (fetchpatch { - url = "https://github.com/rsteca/sklearn-deap/commit/3ae62990fc87f36b59382e7c4db3c74cf99ec3bf.patch"; - sha256 = "1na6wf4v0dcmyz3pz8aiqkmv76d1iz3hi4iyfq9kfnycgzpv1kxk"; + url = "https://github.com/rsteca/sklearn-deap/commit/3b84bd905796378dd845f99e083da17284c9ff6f.patch"; + hash = "sha256-YYLw0uzecyIbdNAy/CxxWDV67zJbZZhUMypnDm/zNGs="; + }) + (fetchpatch { + url = "https://github.com/rsteca/sklearn-deap/commit/2f60e215c834f60966b4e51df25e91939a72b952.patch"; + hash = "sha256-vn5nLPwwkjsQrp3q7C7Z230lkgRiyJN0TQxO8Apizg8="; }) ]; propagatedBuildInputs = [ numpy scipy deap scikit-learn ]; - checkPhase = '' - ${python.interpreter} test.py - ''; + nativeCheckInputs = [ + unittestCheckHook + ]; + + pythonImportsCheck = [ "evolutionary_search" ]; meta = with lib; { description = "Use evolutionary algorithms instead of gridsearch in scikit-learn"; homepage = "https://github.com/rsteca/sklearn-deap"; - license = licenses.lgpl3; + license = licenses.mit; maintainers = with maintainers; [ psyanticy ]; - # broken by scikit-learn 0.24.1 - broken = true; }; } diff --git a/nixpkgs/pkgs/development/python-modules/slack-bolt/default.nix b/nixpkgs/pkgs/development/python-modules/slack-bolt/default.nix index 30cf185c1aa7..f732da1d5d3f 100644 --- a/nixpkgs/pkgs/development/python-modules/slack-bolt/default.nix +++ b/nixpkgs/pkgs/development/python-modules/slack-bolt/default.nix @@ -1,4 +1,6 @@ -{ buildPythonPackage +{ aiohttp +, bottle +, buildPythonPackage , chalice , cherrypy , django @@ -7,17 +9,23 @@ , fetchFromGitHub , flask , flask-sockets +, gunicorn , lib , moto , numpy , pyramid , pytest-asyncio , pytestCheckHook +, pythonOlder , sanic , sanic-testing , slack-sdk , starlette , tornado +, uvicorn +, websocket-client +, websockets +, werkzeug }: buildPythonPackage rec { @@ -25,6 +33,8 @@ buildPythonPackage rec { version = "1.18.0"; format = "setuptools"; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "slackapi"; repo = "bolt-python"; @@ -40,23 +50,37 @@ buildPythonPackage rec { propagatedBuildInputs = [ slack-sdk ]; + passthru.optional-dependencies = { + async = [ + aiohttp + websockets + ]; + adapter = [ + bottle + chalice + cherrypy + django + falcon + fastapi + flask + flask-sockets + gunicorn + moto + pyramid + sanic + sanic-testing + starlette + tornado + uvicorn + websocket-client + werkzeug + ]; + }; + nativeCheckInputs = [ - chalice - cherrypy - django - falcon - fastapi - flask - flask-sockets - moto - pyramid pytest-asyncio pytestCheckHook - sanic - sanic-testing - starlette - tornado - ]; + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); # Work around "Read-only file system: '/homeless-shelter'" errors preCheck = '' @@ -66,6 +90,9 @@ buildPythonPackage rec { disabledTestPaths = [ # boddle is not packaged as of 2023-07-15 "tests/adapter_tests/bottle/" + # Tests are blocking at some point. Blocking could be performance-related. + "tests/scenario_tests_async/" + "tests/slack_bolt_async/" ]; disabledTests = [ @@ -82,6 +109,7 @@ buildPythonPackage rec { meta = with lib; { description = "A framework to build Slack apps using Python"; homepage = "https://github.com/slackapi/bolt-python"; + changelog = "https://github.com/slackapi/bolt-python/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ samuela ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/snowflake-connector-python/default.nix b/nixpkgs/pkgs/development/python-modules/snowflake-connector-python/default.nix index a85fc4029fea..741ef59f26da 100644 --- a/nixpkgs/pkgs/development/python-modules/snowflake-connector-python/default.nix +++ b/nixpkgs/pkgs/development/python-modules/snowflake-connector-python/default.nix @@ -27,14 +27,14 @@ buildPythonPackage rec { pname = "snowflake-connector-python"; - version = "3.1.0"; + version = "3.2.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-+sUfxc72+dV5iqRg9ObePlPhoPx7kT0r2Yta6Aa8yDs="; + hash = "sha256-Z2oNyhbefBIJAKoaX85kQIM7CmD3ZoK3zPFmeWcoLKM="; }; # snowflake-connector-python requires arrow 10.0.1, which we don't have in diff --git a/nixpkgs/pkgs/development/python-modules/snscrape/default.nix b/nixpkgs/pkgs/development/python-modules/snscrape/default.nix index 5d87fb52b2ab..cb07518e95d7 100644 --- a/nixpkgs/pkgs/development/python-modules/snscrape/default.nix +++ b/nixpkgs/pkgs/development/python-modules/snscrape/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "snscrape"; - version = "0.6.0.20230303"; + version = "0.7.0.20230622"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "JustAnotherArchivist"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-FY8byS+0yAhNSRxWsrsQMR5kdZmnHutru5Z6SWVfpiE="; + hash = "sha256-9xAUMr1SWFePEvIz6DFEexk9Txex3u8wPNfMAdxEUCA="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/nixpkgs/pkgs/development/python-modules/sphinxcontrib-plantuml/default.nix b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-plantuml/default.nix index b5d58792477d..cfdfd6de623b 100644 --- a/nixpkgs/pkgs/development/python-modules/sphinxcontrib-plantuml/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-plantuml/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "sphinxcontrib-plantuml"; - version = "0.25"; + version = "0.26"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-j95THZLRz8KBf+Nkez8tB+dmgsSoSInASlPoMffFRDI="; + hash = "sha256-rbM5fVywYTYyzT2teJQ4FCK6wkRkw5PLBQQE3WcSsac="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/spyder-kernels/default.nix b/nixpkgs/pkgs/development/python-modules/spyder-kernels/default.nix index 5ad7575c247c..e68f9db10193 100644 --- a/nixpkgs/pkgs/development/python-modules/spyder-kernels/default.nix +++ b/nixpkgs/pkgs/development/python-modules/spyder-kernels/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "spyder-kernels"; - version = "2.4.3"; + version = "2.4.4"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-0aNkq4nacW2RZxup2J748ZZgaLug5HB5ekiWU4KcqvM="; + hash = "sha256-NjuwoOFZTLaRY3RkGS9PGZaQlUaSUiQrQ8CSvzBaJd0="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/spyder/default.nix b/nixpkgs/pkgs/development/python-modules/spyder/default.nix index c1de80fc5161..9722222905a0 100644 --- a/nixpkgs/pkgs/development/python-modules/spyder/default.nix +++ b/nixpkgs/pkgs/development/python-modules/spyder/default.nix @@ -7,19 +7,16 @@ , cloudpickle , cookiecutter , diff-match-patch -, flake8 , intervaltree , jedi , jellyfish , keyring , matplotlib -, mccabe , nbconvert , numpy , numpydoc , psutil , pygments -, pylint , pylint-venv , pyls-spyder , pyopengl @@ -28,7 +25,6 @@ , python-lsp-server , pyxdg , pyzmq -, pycodestyle , qdarkstyle , qstylizer , qtawesome @@ -45,14 +41,14 @@ buildPythonPackage rec { pname = "spyder"; - version = "5.4.2"; + version = "5.4.5"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-L8zgT7M7N+P5/9FQgf6ab7afUQXC1afzwUjAp6yKxC8="; + hash = "sha256-/9p/8avjy1c3Dwos9Byx03kfVrRofVQus+Ae5beFnmo="; }; patches = [ diff --git a/nixpkgs/pkgs/development/python-modules/spyder/dont-clear-pythonpath.patch b/nixpkgs/pkgs/development/python-modules/spyder/dont-clear-pythonpath.patch index cb2a37930715..abb021e39554 100644 --- a/nixpkgs/pkgs/development/python-modules/spyder/dont-clear-pythonpath.patch +++ b/nixpkgs/pkgs/development/python-modules/spyder/dont-clear-pythonpath.patch @@ -1,24 +1,25 @@ -Don't remove sys.path entries that come from PYTHONPATH, or else the app cannot -be used in Nixpkgs. - -Author: Bjørn Forsman <bjorn.forsman@gmail.com> -diff -uNr spyder-5.4.0.orig/spyder/app/start.py spyder-5.4.0/spyder/app/start.py ---- spyder-5.4.0.orig/spyder/app/start.py 2022-08-30 02:02:28.000000000 +0200 -+++ spyder-5.4.0/spyder/app/start.py 2023-01-02 11:38:28.138744879 +0100 -@@ -6,16 +6,8 @@ +diff --git a/spyder/app/start.py b/spyder/app/start.py +index 97b08a600..66486e510 100644 +--- a/spyder/app/start.py ++++ b/spyder/app/start.py +@@ -6,20 +6,8 @@ # (see spyder/__init__.py for details) # ----------------------------------------------------------------------------- - + -# Remove PYTHONPATH paths from sys.path before other imports to protect against -# shadowed standard libraries. import os import sys -if os.environ.get('PYTHONPATH'): - for path in os.environ['PYTHONPATH'].split(os.pathsep): -- try: -- sys.path.remove(path.rstrip(os.sep)) -- except ValueError: -- pass - +- if os.name == 'nt' and 'pkgs' in path: +- # Don't remove pynsist installer entry for 'pkgs' directory +- continue +- else: +- try: +- sys.path.remove(path.rstrip(os.sep)) +- except ValueError: +- pass + # Standard library imports import ctypes diff --git a/nixpkgs/pkgs/development/python-modules/sqlmap/default.nix b/nixpkgs/pkgs/development/python-modules/sqlmap/default.nix index 1b5016a1ad0d..4dda36262dde 100644 --- a/nixpkgs/pkgs/development/python-modules/sqlmap/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sqlmap/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "sqlmap"; - version = "1.7.8"; + version = "1.7.9"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Ky/XmXhzmoF3UKNHu7xKcVWZf8epHp0ymqqQ9WHHObs="; + hash = "sha256-k07Dpkpa1MO9ICMl4a2YI2ONgcUG0vLOzC+wsoHxI3s="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/steamship/default.nix b/nixpkgs/pkgs/development/python-modules/steamship/default.nix index 9e0284d11819..e79b9993b883 100644 --- a/nixpkgs/pkgs/development/python-modules/steamship/default.nix +++ b/nixpkgs/pkgs/development/python-modules/steamship/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "steamship"; - version = "2.17.22"; + version = "2.17.27"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-PQI6r2DoarswjTc8jp+nrJqkmckQ6+eGuI0MU8kvnM8="; + hash = "sha256-Wgz0jkMaMUTM7ubb/TsGaQm8UbdPtEvzapl0h4xrqq0="; }; pythonRelaxDeps = [ diff --git a/nixpkgs/pkgs/development/python-modules/subdownloader/default.nix b/nixpkgs/pkgs/development/python-modules/subdownloader/default.nix deleted file mode 100644 index 2b536fa0e628..000000000000 --- a/nixpkgs/pkgs/development/python-modules/subdownloader/default.nix +++ /dev/null @@ -1,66 +0,0 @@ -{ lib -, buildPythonPackage -, fetchurl -, mmpython -, pyqt4 -}: - -buildPythonPackage rec { - version = "2.0.18"; - pname = "subdownloader"; - - src = fetchurl { - url = "https://launchpad.net/subdownloader/trunk/2.0.18/+download/subdownloader_2.0.18.orig.tar.gz"; - sha256 = "0manlfdpb585niw23ibb8n21mindd1bazp0pnxvmdjrp2mnw97ig"; - }; - - propagatedBuildInputs = [ mmpython pyqt4 ]; - - setup = '' - import os - import sys - - try: - if os.environ.get("NO_SETUPTOOLS"): - raise ImportError() - from setuptools import setup, Extension - SETUPTOOLS = True - except ImportError: - SETUPTOOLS = False - # Use distutils.core as a fallback. - # We won t be able to build the Wheel file on Windows. - from distutils.core import setup, Extension - - with open("README") as fp: - long_description = fp.read() - - requirements = [ ] - - install_options = { - "name": "subdownloader", - "version": "2.0.18", - "description": "Tool for automatic download/upload subtitles for videofiles using fast hashing", - "long_description": long_description, - "url": "http://www.subdownloader.net", - - "scripts": ["run.py"], - "packages": ["cli", "FileManagement", "gui", "languages", "modules"], - - } - if SETUPTOOLS: - install_options["install_requires"] = requirements - - setup(**install_options) - ''; - - postUnpack = '' - echo '${setup}' > $sourceRoot/setup.py - ''; - - meta = with lib; { - description = "Tool for automatic download/upload subtitles for videofiles using fast hashing"; - homepage = "https://www.subdownloader.net"; - license = licenses.gpl3; - }; - -} diff --git a/nixpkgs/pkgs/development/python-modules/swift/default.nix b/nixpkgs/pkgs/development/python-modules/swift/default.nix index 4e7b496b7a54..95dd8e55d4a4 100644 --- a/nixpkgs/pkgs/development/python-modules/swift/default.nix +++ b/nixpkgs/pkgs/development/python-modules/swift/default.nix @@ -24,11 +24,11 @@ buildPythonPackage rec { pname = "swift"; - version = "2.31.1"; + version = "2.32.0"; src = fetchPypi { inherit pname version; - hash = "sha256-6CRSIv2m2pqZdzRAEJ/6Qo90PZ7LRNg1zQg50Ecq2RQ="; + hash = "sha256-JeDmZx667rG1ARfRBUDTcOWe7u3ZiytZzGQSRp8bpes="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/tempora/default.nix b/nixpkgs/pkgs/development/python-modules/tempora/default.nix index 128af5bc0687..591cf9e3555f 100644 --- a/nixpkgs/pkgs/development/python-modules/tempora/default.nix +++ b/nixpkgs/pkgs/development/python-modules/tempora/default.nix @@ -1,31 +1,25 @@ { lib , buildPythonPackage , fetchPypi -, pythonOlder - -# build time -, setuptools-scm - -# runtime -, pytz -, jaraco-functools - -# tests , freezegun +, jaraco-functools , pytest-freezegun , pytestCheckHook +, pythonOlder +, pytz +, setuptools-scm }: buildPythonPackage rec { pname = "tempora"; - version = "5.2.1"; + version = "5.5.0"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-txdkhsWUinUgHo0LIe8sI8qAhHQGDfRyGMkilb3OUnY="; + hash = "sha256-E+T8yZfQUJwzBtaEHwPpOBt+Xkayvr+ukVGvkAhfDCY="; }; nativeBuildInputs = [ @@ -53,6 +47,7 @@ buildPythonPackage rec { meta = with lib; { description = "Objects and routines pertaining to date and time"; homepage = "https://github.com/jaraco/tempora"; + changelog = "https://github.com/jaraco/tempora/blob/v${version}/NEWS.rst"; license = licenses.mit; maintainers = with maintainers; [ ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/tidalapi/default.nix b/nixpkgs/pkgs/development/python-modules/tidalapi/default.nix index 87e84a43b916..bf21e0ee59d3 100644 --- a/nixpkgs/pkgs/development/python-modules/tidalapi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/tidalapi/default.nix @@ -37,6 +37,6 @@ buildPythonPackage rec { description = "Unofficial Python API for TIDAL music streaming service"; homepage = "https://github.com/tamland/python-tidal"; license = licenses.gpl3; - maintainers = [ maintainers.rodrgz ]; + maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/timetagger/default.nix b/nixpkgs/pkgs/development/python-modules/timetagger/default.nix index de652099767d..e41158d8c167 100644 --- a/nixpkgs/pkgs/development/python-modules/timetagger/default.nix +++ b/nixpkgs/pkgs/development/python-modules/timetagger/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "timetagger"; - version = "23.8.1"; + version = "23.9.2"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "almarklein"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-VHvCvXmNwxuk4Le2VqsU1CFcHfAr40WbhELzu5wfB1U="; + hash = "sha256-pg4lKRsgi4SZrKYnVmMfU5hzJriRqVa3InYW9emFLy8="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/tldextract/default.nix b/nixpkgs/pkgs/development/python-modules/tldextract/default.nix index a3d159000ab9..1b2c1a7e6ba0 100644 --- a/nixpkgs/pkgs/development/python-modules/tldextract/default.nix +++ b/nixpkgs/pkgs/development/python-modules/tldextract/default.nix @@ -9,22 +9,24 @@ , requests , requests-file , responses +, setuptools , setuptools-scm }: buildPythonPackage rec { pname = "tldextract"; - version = "3.4.4"; - format = "setuptools"; + version = "3.5.0"; + format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-X+MhDFd0Y1RRkdRa1SLT1eeNVSGM6XIV6CAE3K4eEjQ="; + hash = "sha256-TfHGW5W+YdWUKOhhHpVeVObx1Eg9Po1XM9OpBiFV6RA="; }; nativeBuildInputs = [ + setuptools setuptools-scm ]; diff --git a/nixpkgs/pkgs/development/python-modules/tlds/default.nix b/nixpkgs/pkgs/development/python-modules/tlds/default.nix index e9e71fcd5e59..1b001cd53659 100644 --- a/nixpkgs/pkgs/development/python-modules/tlds/default.nix +++ b/nixpkgs/pkgs/development/python-modules/tlds/default.nix @@ -5,14 +5,14 @@ buildPythonPackage rec { pname = "tlds"; - version = "2023050900"; + version = "2023080900"; format = "setuptools"; src = fetchFromGitHub { owner = "kichik"; repo = "tlds"; rev = "refs/tags/${version}"; - hash = "sha256-Fm2cRhUb1Gsr7mrcym/JjYAeG8f3RDhUnxzYIvpxmQE="; + hash = "sha256-n6SGOBkwGrjnH01yFd9giODUDkPGVMwB1H/fozzwQwU="; }; pythonImportsCheck = [ diff --git a/nixpkgs/pkgs/development/python-modules/tpm2-pytss/default.nix b/nixpkgs/pkgs/development/python-modules/tpm2-pytss/default.nix index b468e499f52a..4b0f9adba51b 100644 --- a/nixpkgs/pkgs/development/python-modules/tpm2-pytss/default.nix +++ b/nixpkgs/pkgs/development/python-modules/tpm2-pytss/default.nix @@ -63,6 +63,14 @@ buildPythonPackage rec { sed -i "s#@TPM2_TSS@#${tpm2-tss.out}#" src/tpm2_pytss/FAPI.py ''; + # Hardening has to be disabled + # due to pycparsing handling it poorly. + # See https://github.com/NixOS/nixpkgs/issues/252023 + # for more details. + hardeningDisable = [ + "fortify" + ]; + nativeBuildInputs = [ cffi pkgconfig # this is the Python module diff --git a/nixpkgs/pkgs/development/python-modules/universal-silabs-flasher/default.nix b/nixpkgs/pkgs/development/python-modules/universal-silabs-flasher/default.nix new file mode 100644 index 000000000000..348fa01ffbe1 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/universal-silabs-flasher/default.nix @@ -0,0 +1,73 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchFromGitHub + +# build-system +, setuptools +, setuptools-git-versioning +, wheel + +# dependencies +, async-timeout +, bellows +, click +, coloredlogs +, crc +, libgpiod +, typing-extensions +, zigpy + +# tests +, pytestCheckHook +, pytest-asyncio +, pytest-mock +, pytest-timeout +}: + +buildPythonPackage rec { + pname = "universal-silabs-flasher"; + version = "0.0.13"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "NabuCasa"; + repo = "universal-silabs-flasher"; + rev = "v${version}"; + hash = "sha256-qiaDPCnVb6JQ2fZRFK+QF4o8K2UbIWGNKl5oo6MQUW0="; + }; + + nativeBuildInputs = [ + setuptools + setuptools-git-versioning + wheel + ]; + + propagatedBuildInputs = [ + async-timeout + bellows + click + coloredlogs + crc + typing-extensions + zigpy + ] ++ lib.optionals (stdenv.hostPlatform.isLinux) [ + libgpiod + ]; + + nativeCheckInputs = [ + pytestCheckHook + pytest-asyncio + pytest-mock + pytest-timeout + ]; + + pythonImportsCheck = [ "universal_silabs_flasher" ]; + + meta = with lib; { + description = "Flashes Silicon Labs radios running EmberZNet or CPC multi-pan firmware"; + homepage = "https://github.com/NabuCasa/universal-silabs-flasher"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/unstructured-inference/default.nix b/nixpkgs/pkgs/development/python-modules/unstructured-inference/default.nix index e03d2a6f4544..eb34584736d3 100644 --- a/nixpkgs/pkgs/development/python-modules/unstructured-inference/default.nix +++ b/nixpkgs/pkgs/development/python-modules/unstructured-inference/default.nix @@ -9,6 +9,7 @@ , onnxruntime , transformers , detectron2 +, paddleocr # check inputs , pytestCheckHook , coverage @@ -21,14 +22,14 @@ buildPythonPackage rec { pname = "unstructured-inference"; - version = "0.5.7"; + version = "0.5.22"; format = "setuptools"; src = fetchFromGitHub { owner = "Unstructured-IO"; repo = "unstructured-inference"; rev = "refs/tags/${version}"; - hash = "sha256-xlsihi1ZTNgdnSk3H8rMBRi4AAxPKNFqygcIMtM/jE0="; + hash = "sha256-YMPChP8/KB/UioavIa0pdj0wH9bTkN8frFmkQZ3bUPc="; }; postPatch = '' @@ -44,7 +45,7 @@ buildPythonPackage rec { onnxruntime transformers detectron2 - # paddleocr + paddleocr # yolox ] ++ layoutparser.optional-dependencies.layoutmodels @@ -71,8 +72,6 @@ buildPythonPackage rec { "test_get_path_oob_move_nested[False]" # requires yolox "test_yolox" - # requires paddleocr - "test_table_prediction" ]; disabledTestPaths = [ @@ -90,10 +89,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "unstructured_inference" ]; meta = with lib; { - description = ""; + description = "hosted model inference code for layout parsing models"; homepage = "https://github.com/Unstructured-IO/unstructured-inference"; changelog = "https://github.com/Unstructured-IO/unstructured-inference/blob/${src.rev}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ happysalada ]; + platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/unstructured/default.nix b/nixpkgs/pkgs/development/python-modules/unstructured/default.nix index 951aec2cd879..2754f192d506 100644 --- a/nixpkgs/pkgs/development/python-modules/unstructured/default.nix +++ b/nixpkgs/pkgs/development/python-modules/unstructured/default.nix @@ -56,7 +56,7 @@ , grpcio }: let - version = "0.9.1"; + version = "0.10.12"; optional-dependencies = { huggingflace = [ langdetect @@ -90,7 +90,7 @@ buildPythonPackage { owner = "Unstructured-IO"; repo = "unstructured"; rev = "refs/tags/${version}"; - hash = "sha256-9O/rZ07vZC0XN5XgevFvWuG8gwyTM+gfn+OqgaIHld8="; + hash = "sha256-v5hNl93dUEo90Hgm5u2N7tB1W5fnu+Pmnv+iw7QyQKM="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/uptime-kuma-api/default.nix b/nixpkgs/pkgs/development/python-modules/uptime-kuma-api/default.nix index 330be3286742..2912c44fcf06 100644 --- a/nixpkgs/pkgs/development/python-modules/uptime-kuma-api/default.nix +++ b/nixpkgs/pkgs/development/python-modules/uptime-kuma-api/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "uptime-kuma-api"; - version = "1.1.0"; + version = "1.2.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "uptime_kuma_api"; inherit version; - hash = "sha256-3Y7PGidtmBjrIXGAElzRAv//kvX0ZcK3OX0xnfeuLWE="; + hash = "sha256-owRLc6823jJbEEzdJ3ORCkQfaEvxxs0uwYLzzCa17zI="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/uritools/default.nix b/nixpkgs/pkgs/development/python-modules/uritools/default.nix index 76678539bd9c..7975e0f74231 100644 --- a/nixpkgs/pkgs/development/python-modules/uritools/default.nix +++ b/nixpkgs/pkgs/development/python-modules/uritools/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "uritools"; - version = "4.0.1"; + version = "4.0.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-78XDpt4FQEhQaFqNPzTahHa1aqNRb7+O/1yHBMeigm8="; + hash = "sha256-BN8reH0Ot2IA6DGTgqA1Yvv+R0H9ZsFVBrCNO4IR1XM="; }; pythonImportsCheck = [ diff --git a/nixpkgs/pkgs/development/python-modules/vertica-python/default.nix b/nixpkgs/pkgs/development/python-modules/vertica-python/default.nix index 1787063f2aea..436ab5fa1ba4 100644 --- a/nixpkgs/pkgs/development/python-modules/vertica-python/default.nix +++ b/nixpkgs/pkgs/development/python-modules/vertica-python/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "vertica-python"; - version = "1.3.4"; + version = "1.3.5"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-2TyJs0GdYTZWJR66IV6XuBR4b3aRi9KhFy/4ji1c6NU="; + hash = "sha256-KzvJcBR6Bc+z6IAmJ0KR88aSQMjRx1UilS28oBv9nTE="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/vncdo/default.nix b/nixpkgs/pkgs/development/python-modules/vncdo/default.nix index ef33a46cc34c..b6d12a67185c 100644 --- a/nixpkgs/pkgs/development/python-modules/vncdo/default.nix +++ b/nixpkgs/pkgs/development/python-modules/vncdo/default.nix @@ -6,6 +6,7 @@ , nose , ptyprocess }: + buildPythonPackage rec { pname = "vncdo"; version = "0.12.0"; @@ -32,7 +33,7 @@ buildPythonPackage rec { description = "A command line VNC client and python library"; license = licenses.mit; maintainers = with maintainers; [ elitak ]; + mainProgram = pname; platforms = with platforms; linux ++ darwin; }; - } diff --git a/nixpkgs/pkgs/development/python-modules/vsure/default.nix b/nixpkgs/pkgs/development/python-modules/vsure/default.nix index f8242d34f4c2..441969da6137 100644 --- a/nixpkgs/pkgs/development/python-modules/vsure/default.nix +++ b/nixpkgs/pkgs/development/python-modules/vsure/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "vsure"; - version = "2.6.6"; + version = "2.6.7"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ecrBvKOhW3znVoXHQeKKW4o/hbA4fLhxJrWZObwtki8="; + hash = "sha256-/eVFa1BTFbvFTAt48Bv+bjsV7f2eVSuKARJQVxDqU9s="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/webauthn/default.nix b/nixpkgs/pkgs/development/python-modules/webauthn/default.nix index 39795ac6ce7f..2ef7d52e2a35 100644 --- a/nixpkgs/pkgs/development/python-modules/webauthn/default.nix +++ b/nixpkgs/pkgs/development/python-modules/webauthn/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "webauthn"; - version = "1.8.1"; + version = "1.10.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "duo-labs"; repo = "py_webauthn"; rev = "refs/tags/v${version}"; - hash = "sha256-ivPLS+kh/H8qLojgc5qh1ndPzSZbzbnm9E+LQGq8+Xs="; + hash = "sha256-ZfHFyjdZeKuKX/aokhB6L93HbBFnlrvuJZ2V4uRmNck="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/weconnect-mqtt/default.nix b/nixpkgs/pkgs/development/python-modules/weconnect-mqtt/default.nix index 0111a43b06ce..baffe37de0c9 100644 --- a/nixpkgs/pkgs/development/python-modules/weconnect-mqtt/default.nix +++ b/nixpkgs/pkgs/development/python-modules/weconnect-mqtt/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "weconnect-mqtt"; - version = "0.45.1"; + version = "0.46.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "tillsteinbach"; repo = "WeConnect-mqtt"; rev = "refs/tags/v${version}"; - hash = "sha256-lZa8HIGLSDd/avNuoYSUHJ0b3rSx8uHLuUz8lABQHO4="; + hash = "sha256-7TR6+woAV8f80t4epCnZj4jYYpTPKDkzwzNNsgofiwg="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/weconnect/default.nix b/nixpkgs/pkgs/development/python-modules/weconnect/default.nix index a70e833da9fc..a1d1522bb9a0 100644 --- a/nixpkgs/pkgs/development/python-modules/weconnect/default.nix +++ b/nixpkgs/pkgs/development/python-modules/weconnect/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "weconnect"; - version = "0.57.0"; + version = "0.58.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "tillsteinbach"; repo = "WeConnect-python"; rev = "refs/tags/v${version}"; - hash = "sha256-EqKjDPSjhI03ZwkHyNG4ZbIdrzn7wrjpGfze1Qkk0lk="; + hash = "sha256-2+RvDAKIUsQwmVrqcgt0RXOF+Z+lZ6oSyZyI+HTcZBs="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/whodap/default.nix b/nixpkgs/pkgs/development/python-modules/whodap/default.nix index c4b207962987..a666d0a156b5 100644 --- a/nixpkgs/pkgs/development/python-modules/whodap/default.nix +++ b/nixpkgs/pkgs/development/python-modules/whodap/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "whodap"; - version = "0.1.8"; + version = "0.1.9"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "pogzyb"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-hAU9143R/LDqDBgX3Y+gBG+dt4dpIIPDdO6HgH0ZTfg="; + hash = "sha256-0Wxx33AO9g4ACAUwkFkLo2AemK7PxXvZXWgHpu+E96c="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/xcffib/default.nix b/nixpkgs/pkgs/development/python-modules/xcffib/default.nix index b4def14ff47c..b0b00da0dc32 100644 --- a/nixpkgs/pkgs/development/python-modules/xcffib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/xcffib/default.nix @@ -1,37 +1,36 @@ { lib , buildPythonPackage -, fetchPypi -, fetchpatch -, xorg , cffi +, fetchPypi , pytestCheckHook +, pythonOlder +, xorg }: buildPythonPackage rec { - version = "1.2.0"; pname = "xcffib"; + version = "1.5.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-8yMCFEf55zB40hu5KMSPTavq6z87N+gDxta5hzXoFIM="; + hash = "sha256-qVyUZfL5e0/O3mBr0eCEB6Mt9xy3YP1Xv+U2d9tpGsw="; }; - patches = [ - (fetchpatch { - name = "remove-leftover-six-import.patch"; - url = "https://github.com/tych0/xcffib/commit/8a488867d30464913706376ca3a9f4c98ca6c5cf.patch"; - hash = "sha256-wEms0gC7tVqtmKMjjpH/34kdQ6HUV0h67bUGbgijlqw="; - }) - ]; - postPatch = '' # Hardcode cairo library path sed -e 's,ffi\.dlopen(,&"${xorg.libxcb.out}/lib/" + ,' -i xcffib/__init__.py ''; - propagatedBuildInputs = [ cffi ]; + propagatedNativeBuildInputs = [ + cffi + ]; - propagatedNativeBuildInputs = [ cffi ]; + propagatedBuildInputs = [ + cffi + ]; nativeCheckInputs = [ pytestCheckHook @@ -44,11 +43,14 @@ buildPythonPackage rec { rm -r xcffib ''; - pythonImportsCheck = [ "xcffib" ]; + pythonImportsCheck = [ + "xcffib" + ]; meta = with lib; { description = "A drop in replacement for xpyb, an XCB python binding"; homepage = "https://github.com/tych0/xcffib"; + changelog = "https://github.com/tych0/xcffib/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ kamilchm ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/ypy-websocket/default.nix b/nixpkgs/pkgs/development/python-modules/ypy-websocket/default.nix index 796118abc25c..fb7a18c325bc 100644 --- a/nixpkgs/pkgs/development/python-modules/ypy-websocket/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ypy-websocket/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "ypy-websocket"; - version = "0.12.1"; + version = "0.12.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "y-crdt"; repo = "ypy-websocket"; rev = "refs/tags/v${version}"; - hash = "sha256-JsSOh7CSHUnGJmNAP87fMMsRgdj6nNna1XVe15MYqoA="; + hash = "sha256-3ANuIwRxUoFo5SSdTvBhTHExrYR7timu7XkE0t+UyWk="; }; pythonRelaxDeps = [ diff --git a/nixpkgs/pkgs/development/python-modules/zamg/default.nix b/nixpkgs/pkgs/development/python-modules/zamg/default.nix index 6e3d7908bac2..af5b6053389d 100644 --- a/nixpkgs/pkgs/development/python-modules/zamg/default.nix +++ b/nixpkgs/pkgs/development/python-modules/zamg/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "zamg"; - version = "0.2.4"; + version = "0.3.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "killer0071234"; repo = "python-zamg"; rev = "refs/tags/v${version}"; - hash = "sha256-o1FMhwAHdkcfArT9QRgVi0ieRw4aVdBoqwdlV0sxpQ0="; + hash = "sha256-dt0y423Xw/IFi83DFvGdsN1uzJBMbm13pBYtMgMntuU="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/zeroconf/default.nix b/nixpkgs/pkgs/development/python-modules/zeroconf/default.nix index 0fb2134276e4..a0d3cd2517b0 100644 --- a/nixpkgs/pkgs/development/python-modules/zeroconf/default.nix +++ b/nixpkgs/pkgs/development/python-modules/zeroconf/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "zeroconf"; - version = "0.88.0"; + version = "0.102.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "jstasiak"; repo = "python-zeroconf"; rev = "refs/tags/${version}"; - hash = "sha256-PE/KK2MFSVinaCLztdu7LS+gSemlq4UzVVwSjK+9yiM="; + hash = "sha256-Z4RswQDA05wXXyg8CeIiuh9I1EXTyXh6Z88r7soGFTo="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/zigpy/default.nix b/nixpkgs/pkgs/development/python-modules/zigpy/default.nix index 77fb2ac72c42..4828ff4264c5 100644 --- a/nixpkgs/pkgs/development/python-modules/zigpy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/zigpy/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "zigpy"; - version = "0.57.0"; + version = "0.57.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zigpy"; rev = "refs/tags/${version}"; - hash = "sha256-79TOt3PRvkhuF6wf+acYhhzFFkYX0l3yLpxv8dNRk1U="; + hash = "sha256-aVrLiWPjc4xn2GvKmZCrRJGGbxP545PKqAH9rPq8IPo="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/zwave-js-server-python/default.nix b/nixpkgs/pkgs/development/python-modules/zwave-js-server-python/default.nix index 7c9de5a6fbef..3669f6c70f1f 100644 --- a/nixpkgs/pkgs/development/python-modules/zwave-js-server-python/default.nix +++ b/nixpkgs/pkgs/development/python-modules/zwave-js-server-python/default.nix @@ -10,16 +10,16 @@ buildPythonPackage rec { pname = "zwave-js-server-python"; - version = "0.49.0"; + version = "0.51.1"; format = "setuptools"; - disabled = pythonOlder "3.9"; + disabled = pythonOlder "3.11"; src = fetchFromGitHub { owner = "home-assistant-libs"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-6CN2Smwm693RUuRUdqrNKa7j2I3pjmR+QoPfpjti+h8="; + hash = "sha256-2U0mRlNUCZD05lgGB3dz2WaUxG2dv/C7nxD2sI3R8B8="; }; propagatedBuildInputs = [ @@ -27,8 +27,6 @@ buildPythonPackage rec { pydantic ]; - doCheck = lib.versionAtLeast pytest-aiohttp.version "1.0.0"; - nativeCheckInputs = [ pytest-aiohttp pytestCheckHook diff --git a/nixpkgs/pkgs/development/tools/allure/default.nix b/nixpkgs/pkgs/development/tools/allure/default.nix index 511f8a738351..cc70b4c4f5e6 100644 --- a/nixpkgs/pkgs/development/tools/allure/default.nix +++ b/nixpkgs/pkgs/development/tools/allure/default.nix @@ -2,7 +2,7 @@ let pname = "allure"; - version = "2.23.1"; + version = "2.24.0"; in stdenv.mkDerivation rec { inherit pname version; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/allure-framework/allure2/releases/download/${version}/allure-${version}.tgz"; - sha256 = "sha256-B06QKq6X9epmRt1wbGORzh8fLUXRAHo1Tv2hWUXJ9Ds="; + sha256 = "sha256-rLVvLqLC2hSxXWDxrw/PFq4o9DeDGU9aBxZuRHkxWfo="; }; dontConfigure = true; dontBuild = true; diff --git a/nixpkgs/pkgs/development/tools/analysis/checkov/default.nix b/nixpkgs/pkgs/development/tools/analysis/checkov/default.nix index 2cdb64b5ae7f..be3a9b163b69 100644 --- a/nixpkgs/pkgs/development/tools/analysis/checkov/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/checkov/default.nix @@ -22,14 +22,14 @@ with py.pkgs; buildPythonApplication rec { pname = "checkov"; - version = "2.4.22"; + version = "2.4.30"; format = "setuptools"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-pbeyv7Ms/7iJUsxEl2YeHjbXJ5ZJZe2OXtDpnnH5ZD8="; + hash = "sha256-sMNyeVaHdKI3IEN0/UR5XM72zDvMzyVAFMMcauan9J4="; }; patches = [ diff --git a/nixpkgs/pkgs/development/tools/analysis/checkstyle/default.nix b/nixpkgs/pkgs/development/tools/analysis/checkstyle/default.nix index c19c59d730b1..f8bc11d63a6a 100644 --- a/nixpkgs/pkgs/development/tools/analysis/checkstyle/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/checkstyle/default.nix @@ -1,12 +1,12 @@ { lib, stdenvNoCC, fetchurl, makeBinaryWrapper, jre }: stdenvNoCC.mkDerivation rec { - version = "10.12.2"; + version = "10.12.3"; pname = "checkstyle"; src = fetchurl { url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar"; - sha256 = "sha256-0vv04vPROCDjFo/mqkH4GXKEB8PvbU7qryGu+mzmShM="; + sha256 = "sha256-drJO3sZlh2G9f80cvPD41YjhHZt74lmV9bSIhUDrTKo="; }; nativeBuildInputs = [ makeBinaryWrapper ]; diff --git a/nixpkgs/pkgs/development/tools/analysis/codeql/default.nix b/nixpkgs/pkgs/development/tools/analysis/codeql/default.nix index 9bdf3829cd9e..6812f79f83b8 100644 --- a/nixpkgs/pkgs/development/tools/analysis/codeql/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/codeql/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "codeql"; - version = "2.14.2"; + version = "2.14.3"; dontConfigure = true; dontBuild = true; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip"; - sha256 = "sha256-FITcbf1+9euy55nQutDZMmRzpHxICdLBmTVHTRCyFLQ="; + sha256 = "sha256-GungnnWT4SoAGRmgFXooAwtha8hlEARNgUlqSrYHQ7o="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/tools/analysis/snyk/default.nix b/nixpkgs/pkgs/development/tools/analysis/snyk/default.nix new file mode 100644 index 000000000000..09222eb1d6f2 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/analysis/snyk/default.nix @@ -0,0 +1,26 @@ +{ buildNpmPackage, fetchFromGitHub, nodePackages, python3, lib }: + +buildNpmPackage rec { + pname = "snyk"; + version = "1.1207.0"; + + src = fetchFromGitHub { + owner = "snyk"; + repo = "cli"; + rev = "v${version}"; + hash = "sha256-wEXE+dcAfBK7fuoB23RdPSbJCaovB5sXrFO0QGyf+aw="; + }; + + npmDepsHash = "sha256-j3lMQh8++pb/00d9H2v7QBkpxIJdsuRQoFkNiQbvnF4="; + + nativeBuildInputs = [ nodePackages.node-gyp python3 ]; + + npmBuildScript = "build:prod"; + + meta = with lib; { + description = "Scans and monitors projects for security vulnerabilities"; + homepage = "https://snyk.io"; + license = licenses.asl20; + maintainers = with maintainers; [ ]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-aws.nix b/nixpkgs/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-aws.nix index 4f528ebb53b7..4f1dadfbf760 100644 --- a/nixpkgs/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-aws.nix +++ b/nixpkgs/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-aws.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "tflint-ruleset-aws"; - version = "0.23.1"; + version = "0.26.0"; src = fetchFromGitHub { owner = "terraform-linters"; repo = pname; rev = "v${version}"; - hash = "sha256-lvqWCTzb/07pEnNcrKkWumO17WXCFrDnNlw4LySl3Rs="; + hash = "sha256-SKPmD34a11ynNmnD2cDTSXgRpUZ7tukaGRO8PQY6T5s="; }; - vendorHash = "sha256-RFgLAOQhSqpuXT5Jypk4EVk4hgyHlUfhbZUM4rA9pLU="; + vendorHash = "sha256-JhAAyfDVRZS2QyvXNa61srlZKgsBFeKloeKbcXXpytk="; # upstream Makefile also does a go test $(go list ./... | grep -v integration) preCheck = '' diff --git a/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix b/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix index d84f0557cc11..4924e190251d 100644 --- a/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "tflint"; - version = "0.47.0"; + version = "0.48.0"; src = fetchFromGitHub { owner = "terraform-linters"; repo = pname; rev = "v${version}"; - hash = "sha256-YKsX+dAnVRiD48CRHaXzUzfqsqpi/bWHNH9lqzC/TZQ="; + hash = "sha256-QU3nSq13klBoa3+czvdlrNwtG0iQqoC/hcbTHr5KN14="; }; - vendorHash = "sha256-dgK7o2DJUwAynfekrn6mN8IVxCpJa9b+kiYMQSo0RIg="; + vendorHash = "sha256-yWxBiOPB0z3+bd6f+LalfVYYoV04scnl3YXJkaTo/dk="; doCheck = false; diff --git a/nixpkgs/pkgs/development/tools/analysis/tfsec/default.nix b/nixpkgs/pkgs/development/tools/analysis/tfsec/default.nix index 1127e6323de5..dd80de382475 100644 --- a/nixpkgs/pkgs/development/tools/analysis/tfsec/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/tfsec/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "tfsec"; - version = "1.28.1"; + version = "1.28.2"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - hash = "sha256-44DN3lV9BLBFr6kkD3IcamQg+t+xUqqao83f0nBKZvI="; + hash = "sha256-N1BL0DHppHyfxHQT98y3rtvyCArq/bcbDIiB0NxCsJA="; }; ldflags = [ @@ -22,7 +22,7 @@ buildGoModule rec { # "-extldflags '-fno-PIC -static'" ]; - vendorSha256 = "sha256-NQUDeNAWSWcIoSZjdbaFQTB3nMFGbLZLUDNFHMk6Enw="; + vendorHash = "sha256-7OTMJhW1Q1z/TOFa4oRCEIPF0cN8gZLdaQglqszXHdw="; subPackages = [ "cmd/tfsec" diff --git a/nixpkgs/pkgs/development/tools/analysis/valkyrie/default.nix b/nixpkgs/pkgs/development/tools/analysis/valkyrie/default.nix deleted file mode 100644 index fd24362bab17..000000000000 --- a/nixpkgs/pkgs/development/tools/analysis/valkyrie/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, stdenv, fetchurl, qt4, qmake4Hook }: - -stdenv.mkDerivation rec { - pname = "valkyrie"; - version = "2.0.0"; - - src = fetchurl { - url = "https://valgrind.org/downloads/${pname}-${version}.tar.bz2"; - sha256 = "0hwvsncf62mdkahwj9c8hpmm94c1wr5jn89370k6rj894kxry2x7"; - }; - - patchPhase = '' - sed -i '1s;^;#include <unistd.h>\n;' src/objects/tool_object.cpp - sed -i '1s;^;#include <unistd.h>\n;' src/utils/vk_config.cpp - sed -i '1s;^;#include <sys/types.h>\n;' src/utils/vk_config.cpp - sed -i '1s;^;#include <unistd.h>\n;' src/utils/vk_utils.cpp - sed -i '1s;^;#include <sys/types.h>\n;' src/utils/vk_utils.cpp - ''; - - buildInputs = [ qt4 ]; - - nativeBuildInputs = [ qmake4Hook ]; - - meta = with lib; { - homepage = "http://www.valgrind.org/"; - description = "Qt4-based GUI for the Valgrind 3.6.x series"; - license = licenses.gpl2; - platforms = platforms.linux; - maintainers = with maintainers; [ pSub ]; - }; -} diff --git a/nixpkgs/pkgs/development/tools/azcopy/default.nix b/nixpkgs/pkgs/development/tools/azcopy/default.nix index 0d94e4e2f6c3..c39dca4e28d8 100644 --- a/nixpkgs/pkgs/development/tools/azcopy/default.nix +++ b/nixpkgs/pkgs/development/tools/azcopy/default.nix @@ -22,7 +22,6 @@ buildGoModule rec { ''; meta = with lib; { - broken = stdenv.isDarwin; maintainers = with maintainers; [ colemickens kashw2 ]; license = licenses.mit; description = "The new Azure Storage data transfer utility - AzCopy v10"; diff --git a/nixpkgs/pkgs/development/tools/backblaze-b2/default.nix b/nixpkgs/pkgs/development/tools/backblaze-b2/default.nix index 353fda20ce19..3bab2e7bba2f 100644 --- a/nixpkgs/pkgs/development/tools/backblaze-b2/default.nix +++ b/nixpkgs/pkgs/development/tools/backblaze-b2/default.nix @@ -1,13 +1,14 @@ -{ lib, python3Packages, fetchPypi }: +{ lib, python3Packages, fetchPypi, installShellFiles }: python3Packages.buildPythonApplication rec { pname = "backblaze-b2"; - version = "3.7.0"; + version = "3.9.0"; + format = "setuptools"; src = fetchPypi { inherit version; pname = "b2"; - sha256 = "sha256-sW6gaZWUh3WX+0+qHRlQ4gZzKU4bL8ePPNKWo9rdF84="; + hash = "sha256-Z9LQapWl0zblcAyMOfKhn5/O1H6+tmgiPQfAB241jqU="; }; postPatch = '' @@ -19,22 +20,27 @@ python3Packages.buildPythonApplication rec { --replace 'setuptools_scm<6.0' 'setuptools_scm' ''; - nativeBuildInputs = with python3Packages; [ - setuptools-scm + nativeBuildInputs = [ + installShellFiles + python3Packages.setuptools-scm ]; propagatedBuildInputs = with python3Packages; [ + argcomplete + arrow b2sdk phx-class-registry setuptools docutils rst2ansi tabulate + tqdm ]; nativeCheckInputs = with python3Packages; [ backoff more-itertools + pexpect pytestCheckHook ]; @@ -46,25 +52,31 @@ python3Packages.buildPythonApplication rec { # require network "test_files_headers" "test_integration" + + # fixed by https://github.com/Backblaze/B2_Command_Line_Tool/pull/915 + "TestRmConsoleTool" ]; disabledTestPaths = [ # requires network "test/integration/test_b2_command_line.py" + + # it's hard to make it work on nix + "test/integration/test_autocomplete.py" ]; postInstall = '' mv "$out/bin/b2" "$out/bin/backblaze-b2" - sed 's/b2/backblaze-b2/' -i contrib/bash_completion/b2 - - mkdir -p "$out/share/bash-completion/completions" - cp contrib/bash_completion/b2 "$out/share/bash-completion/completions/backblaze-b2" + installShellCompletion --cmd backblaze-b2 \ + --bash <(${python3Packages.argcomplete}/bin/register-python-argcomplete backblaze-b2) \ + --zsh <(${python3Packages.argcomplete}/bin/register-python-argcomplete backblaze-b2) ''; meta = with lib; { description = "Command-line tool for accessing the Backblaze B2 storage service"; homepage = "https://github.com/Backblaze/B2_Command_Line_Tool"; + changelog = "https://github.com/Backblaze/B2_Command_Line_Tool/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ hrdinka kevincox tomhoule ]; }; diff --git a/nixpkgs/pkgs/development/tools/bazel-gazelle/default.nix b/nixpkgs/pkgs/development/tools/bazel-gazelle/default.nix index e288f5a8eaaf..6687bc2e46ff 100644 --- a/nixpkgs/pkgs/development/tools/bazel-gazelle/default.nix +++ b/nixpkgs/pkgs/development/tools/bazel-gazelle/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "bazel-gazelle"; - version = "0.32.0"; + version = "0.33.0"; src = fetchFromGitHub { owner = "bazelbuild"; repo = pname; rev = "v${version}"; - sha256 = "sha256-LJWL3PWKd6b+tNGFX5H2Hd7HNEtYh1pVtZhwDJNzhV0="; + hash = "sha256-WmDtMOEs7cOb/juWTHjkc8/92f2OL0vurMMM15IE3YI="; }; vendorHash = null; diff --git a/nixpkgs/pkgs/development/tools/bearer/default.nix b/nixpkgs/pkgs/development/tools/bearer/default.nix index d662ee9e42cc..fb97a5b15ab6 100644 --- a/nixpkgs/pkgs/development/tools/bearer/default.nix +++ b/nixpkgs/pkgs/development/tools/bearer/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "bearer"; - version = "1.19.2"; + version = "1.22.0"; src = fetchFromGitHub { owner = "bearer"; repo = "bearer"; rev = "refs/tags/v${version}"; - hash = "sha256-f0vH+GIWTlE23xWMiqbdOJFGWsrEGgz4YJt+4WEdruw="; + hash = "sha256-nRtbWefRtV9wD4rmnbiZQa0R5JuW8Vs5NRTWBNH4ydc="; }; - vendorHash = "sha256-gqks+q8HxQ54UjRANXBvnfTzE14M8FxbnTMG/JN4ntk="; + vendorHash = "sha256-rvL2/YrwkKHs6fTEg3MG2uRx+ii8Hg8c2wPly9In1E8="; subPackages = [ "cmd/bearer" diff --git a/nixpkgs/pkgs/development/tools/biome/default.nix b/nixpkgs/pkgs/development/tools/biome/default.nix index f853669bcc38..cdde6ab84b72 100644 --- a/nixpkgs/pkgs/development/tools/biome/default.nix +++ b/nixpkgs/pkgs/development/tools/biome/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "biome"; - version = "1.0.0"; + version = "1.1.2"; src = fetchFromGitHub { owner = "biomejs"; repo = "biome"; rev = "cli/v${version}"; - hash = "sha256-oX/LyC6JN0NUc/xi4G9lzKgF9yOlooAt69Gw+eLJxbE="; + hash = "sha256-DE5D4WLO41JA9f3zy3sBiBQ8MOQCbosx6p9AqIM3ddc="; }; - cargoHash = "sha256-4P57fmp5CpGn1wYkQos7PO3YFChup8LrrLExv9S76gs="; + cargoHash = "sha256-qP8CyGiWfytjAsxo6xS1ubowzwEqZN0vM/kQSOnS3rw="; nativeBuildInputs = [ pkg-config diff --git a/nixpkgs/pkgs/development/tools/build-managers/buck2/default.nix b/nixpkgs/pkgs/development/tools/build-managers/buck2/default.nix index fef32f1015cb..829cf2bb89b0 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/buck2/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/buck2/default.nix @@ -38,7 +38,7 @@ let buildHashes = builtins.fromJSON (builtins.readFile ./hashes.json); # our version of buck2; this should be a git tag - version = "2023-08-15"; + version = "2023-09-01"; # the platform-specific, statically linked binary — which is also # zstd-compressed @@ -63,7 +63,7 @@ let # tooling prelude-src = let - prelude-hash = "40d6fffd01f224d25a62d982f4a3f00b275a5677"; + prelude-hash = "3526cf5512668040e011d67e1e272da588264f3b"; name = "buck2-prelude-${version}.tar.gz"; hash = buildHashes."_prelude"; url = "https://github.com/facebook/buck2-prelude/archive/${prelude-hash}.tar.gz"; diff --git a/nixpkgs/pkgs/development/tools/build-managers/buck2/hashes.json b/nixpkgs/pkgs/development/tools/build-managers/buck2/hashes.json index 3918b447ca98..16575e64ca2e 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/buck2/hashes.json +++ b/nixpkgs/pkgs/development/tools/build-managers/buck2/hashes.json @@ -1,7 +1,7 @@ { "_comment": "@generated by pkgs/development/tools/build-managers/buck2/update.sh" -, "_prelude": "sha256-TaQ31JvG4ihVn3n1HLuxf9D6Kq5KOb6xRMVMt2odoqY=" -, "x86_64-linux": "sha256-3Ae0e/J4GI7qPZnN36Ss7qImY8JWmETkbSyKSuGbpbg=" -, "x86_64-darwin": "sha256-GOMuNFTwX8uf65OJ5o54u14T/47MSp/5g6crTJDa6mk=" -, "aarch64-linux": "sha256-4oZXiPDu0zlQtlFTH1uH7OHKaNVVUjiQeZYbtc39yi0=" -, "aarch64-darwin": "sha256-vPgK9cYjBz0d41n56Cxqjly5FAnr/vr0GsoqUuOIVQo=" +, "_prelude": "sha256-0ib3TuGLNy23wRHySOySBIc5ZHtM/vfb6GWmrq63v2o=" +, "x86_64-linux": "sha256-Xykduicmmugp7iLyTm4r4JGp6k0IX2czTJq9Y1CkvRw=" +, "x86_64-darwin": "sha256-v9a0WAlSUEpXsZouILEI4Pk0x/4MaVDgKVUzu26CIC8=" +, "aarch64-linux": "sha256-3S2eih5sFUMFQD4QlBVONm7n3CFNkJHiK4xBjHjXvPs=" +, "aarch64-darwin": "sha256-xGNaZayKVa1PToPNUPROV/UYRdw51xai60emNEC1lZ4=" } diff --git a/nixpkgs/pkgs/development/tools/build-managers/moon/default.nix b/nixpkgs/pkgs/development/tools/build-managers/moon/default.nix index 34de18d47163..d80209021544 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/moon/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/moon/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "moon"; - version = "1.10.1"; + version = "1.13.0"; src = fetchFromGitHub { owner = "moonrepo"; repo = pname; rev = "v${version}"; - hash = "sha256-JLCxG4iWm+yJ9WUqQxOeBnOLAugeTrM3bl79zKYBs6w="; + hash = "sha256-iCopvHLbOepgsMFn//kfIdNZtAN7kqzZ1lVXcIGAAso="; }; - cargoHash = "sha256-4PHc0BkK/QXrafOoeUS0XicKb/JDdJkLhbDAziYgZh4="; + cargoHash = "sha256-pEx7dszYfFxCGokkEbpNjoE1KsXo2r6t6FGLBXMZGwo="; env = { RUSTFLAGS = "-C strip=symbols"; diff --git a/nixpkgs/pkgs/development/tools/build-managers/sbt-extras/default.nix b/nixpkgs/pkgs/development/tools/build-managers/sbt-extras/default.nix index 8791fbb37bfb..c608a2e241af 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/sbt-extras/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/sbt-extras/default.nix @@ -3,14 +3,14 @@ stdenv.mkDerivation rec { pname = "sbt-extras"; - rev = "474915ff832c29944399fe1823d755dfcd587a5e"; - version = "2023-07-25"; + rev = "6918a7d323874cbc8d59d353f1ac8f105bb79b81"; + version = "2023-08-28"; src = fetchFromGitHub { owner = "paulp"; repo = "sbt-extras"; inherit rev; - sha256 = "+hrS2Hyh1mLEQBxZHpf6+uIb5cTYhq8odgvmVms2+G8="; + sha256 = "awRkk9mir/lcpPUEDnNeDSe+aynYKwKQd066cws5nhU="; }; dontBuild = true; diff --git a/nixpkgs/pkgs/development/tools/build-managers/sbt/default.nix b/nixpkgs/pkgs/development/tools/build-managers/sbt/default.nix index f2065d41068d..8165313ab8c8 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/sbt/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/sbt/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "sbt"; - version = "1.9.3"; + version = "1.9.4"; src = fetchurl { url = "https://github.com/sbt/sbt/releases/download/v${finalAttrs.version}/sbt-${finalAttrs.version}.tgz"; - hash = "sha256-nM+UTsyzPGaDDvn/nUbDQCdBzcbYgyUQRSYdsz50joI="; + hash = "sha256-aL0CJcKdo5ss+yW2dwqRn2nkdiG7JQESFSdC1/KauHA="; }; postPatch = '' @@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: { binaryNativeCode ]; description = "A build tool for Scala, Java and more"; - maintainers = with maintainers; [ nequissimus ]; + maintainers = with maintainers; [ nequissimus kashw2 ]; platforms = platforms.unix; }; }) diff --git a/nixpkgs/pkgs/development/tools/build-managers/waf/default.nix b/nixpkgs/pkgs/development/tools/build-managers/waf/default.nix index 58d3a7d86f42..de4022ed7d70 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/waf/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/waf/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitLab +, callPackage , ensureNewerSourcesForZipFilesHook , python3 # optional list of extra waf tools, e.g. `[ "doxygen" "pytest" ]` @@ -59,6 +60,13 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; + passthru = { + inherit python3 extraTools; + hook = callPackage ./hook.nix { + waf = finalAttrs.finalPackage; + }; + }; + meta = { homepage = "https://waf.io"; description = "The meta build system"; diff --git a/nixpkgs/pkgs/development/tools/code-maat/default.nix b/nixpkgs/pkgs/development/tools/code-maat/default.nix new file mode 100644 index 000000000000..c65b8844935f --- /dev/null +++ b/nixpkgs/pkgs/development/tools/code-maat/default.nix @@ -0,0 +1,45 @@ +{ lib +, stdenvNoCC +, fetchurl +, makeBinaryWrapper +, jre +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "code-maat"; + version = "1.0.3"; + + src = fetchurl { + url = "https://github.com/adamtornhill/code-maat/releases/download/v${finalAttrs.version}/code-maat-${finalAttrs.version}-standalone.jar"; + hash = "sha256-cAaGX9BX27Z2GN583YmhagWsBIygVc0ZDkzbspM9OJw="; + }; + + dontUnpack = true; + + nativeBuildInputs = [ + makeBinaryWrapper + ]; + + installPhase = + let + jar = "$out/libexec/code-maat/code-maat.jar"; + in + '' + runHook preInstall + + install -D ${finalAttrs.src} ${jar} + mkdir -p "$out/bin" + makeWrapper "${jre}/bin/java" "$out/bin/code-maat" \ + --add-flags "-jar ${jar}" + + runHook postInstall + ''; + + meta = with lib; { + description = "A command line tool to mine and analyze data from version-control systems"; + homepage = "https://github.com/adamtornhill/code-maat"; + platforms = platforms.unix; + license = licenses.gpl3; + maintainers = with maintainers; [ sir4ur0n ]; + }; +}) diff --git a/nixpkgs/pkgs/development/tools/conftest/default.nix b/nixpkgs/pkgs/development/tools/conftest/default.nix index 6007e1cc08f6..006661aa8029 100644 --- a/nixpkgs/pkgs/development/tools/conftest/default.nix +++ b/nixpkgs/pkgs/development/tools/conftest/default.nix @@ -6,15 +6,15 @@ buildGoModule rec { pname = "conftest"; - version = "0.44.1"; + version = "0.45.0"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "conftest"; rev = "refs/tags/v${version}"; - hash = "sha256-a/5g5USbK8Bat+V3vecuHVlh3e0omqWYrKe2rFTxxnM="; + hash = "sha256-e8aKjW1SCpmYcfiI1uH5tOjmQqS5kbhPEtRVR/FeWwA="; }; - vendorHash = "sha256-Q0bV6ePjQiIzYXB7sEiAYZ9kIbErPsoAXQqdMt8Xd10="; + vendorHash = "sha256-kSweCT/8boHb6Go18FBpLtbYI0unUU59QWLgQCrbpfs="; ldflags = [ "-s" diff --git a/nixpkgs/pkgs/development/tools/continuous-integration/buildbot/master.nix b/nixpkgs/pkgs/development/tools/continuous-integration/buildbot/master.nix index 714e1d42f915..d4c08cafbf26 100644 --- a/nixpkgs/pkgs/development/tools/continuous-integration/buildbot/master.nix +++ b/nixpkgs/pkgs/development/tools/continuous-integration/buildbot/master.nix @@ -65,14 +65,14 @@ let package = buildPythonApplication rec { pname = "buildbot"; - version = "3.9.0"; + version = "3.9.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-NP2nk9uVIyZOyil4KX+NyG1Z9YTSxDVA2ceMuO6JNH4="; + hash = "sha256-7QhIMUpzmxbh8qjz0hgqzibLkWADhTV523neo1wpGSA="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/tools/continuous-integration/buildbot/pkg.nix b/nixpkgs/pkgs/development/tools/continuous-integration/buildbot/pkg.nix index 55b8bdccb048..2af7289000e2 100644 --- a/nixpkgs/pkgs/development/tools/continuous-integration/buildbot/pkg.nix +++ b/nixpkgs/pkgs/development/tools/continuous-integration/buildbot/pkg.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-y0BRDB2L7aWCJJ25oL2HZ80ijZ2Ebm5d5WY0UnFgbo8="; + hash = "sha256-HmkJHN81AcQdKrA/XnH3REURCssXnzmoKjcmvinfzFo="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/tools/continuous-integration/buildbot/plugins.nix b/nixpkgs/pkgs/development/tools/continuous-integration/buildbot/plugins.nix index 495fa6dd50b1..7cc6136b53fb 100644 --- a/nixpkgs/pkgs/development/tools/continuous-integration/buildbot/plugins.nix +++ b/nixpkgs/pkgs/development/tools/continuous-integration/buildbot/plugins.nix @@ -8,7 +8,7 @@ src = fetchPypi { inherit pname version; - hash = "sha256-jdeVojfC421cxjXYFjlmIeEBuraqMnukAO1QZVPE2Oc="; + hash = "sha256-fwWzgIf0/+UiKRyiFUKPN4WUbmxQE5sU/ChAOqqLHE4="; }; # Remove unnecessary circular dependency on buildbot @@ -35,7 +35,7 @@ src = fetchPypi { inherit pname version; - hash = "sha256-JFzdK/DkPxwoPRaEbULNw3O3NGEIlMGrDKTVICAxdkI="; + hash = "sha256-ghCmbUw/Gj23J5X3fDn/FGkVvXUE9QWrPFTRXSsxEZ4="; }; buildInputs = [ buildbot-pkg ]; @@ -57,7 +57,7 @@ src = fetchPypi { inherit pname version; - hash = "sha256-+PrGubM/EOw1QTUyYPy51PzuOVZ8rjCcZpeIUybm3q8="; + hash = "sha256-B+xUsZBQWt4TwiBqukHO6o0R0XbjLxbCxQKLaWW0/Fw="; }; buildInputs = [ buildbot-pkg ]; @@ -79,7 +79,7 @@ src = fetchPypi { inherit pname version; - hash = "sha256-k93slBfR0rTJ0hmXG3nAMU/ar9hjX9+BPXD87DajaTU="; + hash = "sha256-LFZ3VquRHAHkRcQbw9apOlGlWCK42WT1tPGhW8zSXyo="; }; buildInputs = [ buildbot-pkg ]; @@ -101,7 +101,7 @@ src = fetchPypi { inherit pname version; - hash = "sha256-oKIHLllzeyAm2BsVbZE68h53V1WQjWlYDLpd73FVOe0="; + hash = "sha256-NGI4T0eVV4MxYpD7+BTKbi3r6USt28lXXInrgSd4ASU="; }; buildInputs = [ buildbot-pkg ]; @@ -123,7 +123,7 @@ src = fetchPypi { inherit pname version; - hash = "sha256-XPStbcijZJTmaR2mjyWSY1UCZmHpS7xF/vg/CsMR6+4="; + hash = "sha256-BtKA8zuJEyg3q3GnHS4XSGBLBk3IqCR8NOKui2rIn6Q="; }; buildInputs = [ buildbot-pkg ]; diff --git a/nixpkgs/pkgs/development/tools/continuous-integration/buildbot/worker.nix b/nixpkgs/pkgs/development/tools/continuous-integration/buildbot/worker.nix index 29ee6e2467df..5f3c0efab417 100644 --- a/nixpkgs/pkgs/development/tools/continuous-integration/buildbot/worker.nix +++ b/nixpkgs/pkgs/development/tools/continuous-integration/buildbot/worker.nix @@ -27,7 +27,7 @@ buildPythonPackage (rec { src = fetchPypi { inherit pname version; - hash = "sha256-L7TKo+4RDqHVVB/0ujR3jDxD+emvcEHdHTLyHe9jdk4="; + hash = "sha256-jI38ZhCcHbjah6lST6YtSZAwaeZPBWsgY3VTUf6s2x8="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/tools/continuous-integration/github-runner/default.nix b/nixpkgs/pkgs/development/tools/continuous-integration/github-runner/default.nix index 6ccc923ec30d..0b1a21c2852b 100644 --- a/nixpkgs/pkgs/development/tools/continuous-integration/github-runner/default.nix +++ b/nixpkgs/pkgs/development/tools/continuous-integration/github-runner/default.nix @@ -9,21 +9,28 @@ , glibcLocales , lib , nixosTests -, nodejs_16 , stdenv , which , buildPackages , runtimeShell + # List of Node.js runtimes the package should support +, nodeRuntimes ? [ "node20" ] +, nodejs_16 +, nodejs_20 }: + +# Node.js runtimes supported by upstream +assert builtins.all (x: builtins.elem x [ "node16" "node20" ]) nodeRuntimes; + buildDotnetModule rec { pname = "github-runner"; - version = "2.307.1"; + version = "2.308.0"; src = fetchFromGitHub { owner = "actions"; repo = "runner"; rev = "v${version}"; - hash = "sha256-h/JcOw7p/loBD6aj7NeZyqK3GtapNkjWTYw0G6OCmVQ="; + hash = "sha256-LrHScQbBkRPSNsfPxvE2+K9tON8xuR0e4JpKVuI+Gu0="; leaveDotGit = true; postFetch = '' git -C $out rev-parse --short HEAD > $out/.git-revision @@ -31,7 +38,7 @@ buildDotnetModule rec { ''; }; - # The git commit is read during the build and some tests depends on a git repo to be present + # The git commit is read during the build and some tests depend on a git repo to be present # https://github.com/actions/runner/blob/22d1938ac420a4cb9e3255e47a91c2e43c38db29/src/dir.proj#L5 unpackPhase = '' cp -r $src $TMPDIR/src @@ -178,6 +185,7 @@ buildDotnetModule rec { ++ lib.optionals (stdenv.hostPlatform.system == "aarch64-linux") [ # "JavaScript Actions in Alpine containers are only supported on x64 Linux runners. Detected Linux Arm64" "GitHub.Runner.Common.Tests.Worker.StepHostL0.DetermineNodeRuntimeVersionInAlpineContainerAsync" + "GitHub.Runner.Common.Tests.Worker.StepHostL0.DetermineNode20RuntimeVersionInAlpineContainerAsync" ] ++ lib.optionals DOTNET_SYSTEM_GLOBALIZATION_INVARIANT [ "GitHub.Runner.Common.Tests.ProcessExtensionL0.SuccessReadProcessEnv" @@ -185,13 +193,19 @@ buildDotnetModule rec { "GitHub.Runner.Common.Tests.Worker.VariablesL0.Constructor_SetsOrdinalIgnoreCaseComparer" "GitHub.Runner.Common.Tests.Worker.WorkerL0.DispatchCancellation" "GitHub.Runner.Common.Tests.Worker.WorkerL0.DispatchRunNewJob" + ] + ++ lib.optionals (!lib.elem "node16" nodeRuntimes) [ + "GitHub.Runner.Common.Tests.ProcessExtensionL0.SuccessReadProcessEnv" ]; testProjectFile = [ "src/Test/Test.csproj" ]; preCheck = '' mkdir -p _layout/externals + '' + lib.optionalString (lib.elem "node16" nodeRuntimes) '' ln -s ${nodejs_16} _layout/externals/node16 + '' + lib.optionalString (lib.elem "node20" nodeRuntimes) '' + ln -s ${nodejs_20} _layout/externals/node20 ''; postInstall = '' @@ -224,12 +238,15 @@ buildDotnetModule rec { --replace './externals' "$out/lib/externals" \ --replace './bin/RunnerService.js' "$out/lib/github-runner/RunnerService.js" - # The upstream package includes Node 16 and expects it at the path - # externals/node16. As opposed to the official releases, we don't + # The upstream package includes Node and expects it at the path + # externals/node$version. As opposed to the official releases, we don't # link the Alpine Node flavors. mkdir -p $out/lib/externals + '' + lib.optionalString (lib.elem "node16" nodeRuntimes) '' ln -s ${nodejs_16} $out/lib/externals/node16 - + '' + lib.optionalString (lib.elem "node20" nodeRuntimes) '' + ln -s ${nodejs_20} $out/lib/externals/node20 + '' + '' # Install Nodejs scripts called from workflows install -D src/Misc/layoutbin/hashFiles/index.js $out/lib/github-runner/hashFiles/index.js mkdir -p $out/lib/github-runner/checkScripts diff --git a/nixpkgs/pkgs/development/tools/ctlptl/default.nix b/nixpkgs/pkgs/development/tools/ctlptl/default.nix index 2931c3f3c3af..9e7a9ca27cda 100644 --- a/nixpkgs/pkgs/development/tools/ctlptl/default.nix +++ b/nixpkgs/pkgs/development/tools/ctlptl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ctlptl"; - version = "0.8.21"; + version = "0.8.22"; src = fetchFromGitHub { owner = "tilt-dev"; repo = pname; rev = "v${version}"; - hash = "sha256-ulP159bhiVxZ5D7YamPR7AhCZ5qBr63Eitgf0/Sc6lo="; + hash = "sha256-/LKsaWqJZG9LdUt9zVAspLOYGr0TrhOJB4j0Vv40rkE="; }; vendorHash = "sha256-nfSqu1u7NWbZYL7CEZ/i2tdxQBblRbwJwdwoEtol/Us="; diff --git a/nixpkgs/pkgs/development/tools/database/atlas/default.nix b/nixpkgs/pkgs/development/tools/database/atlas/default.nix index f17313ec3a0c..ee5d4f89d63e 100644 --- a/nixpkgs/pkgs/development/tools/database/atlas/default.nix +++ b/nixpkgs/pkgs/development/tools/database/atlas/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "atlas"; - version = "0.13.3"; + version = "0.14.0"; src = fetchFromGitHub { owner = "ariga"; repo = "atlas"; rev = "v${version}"; - hash = "sha256-mnLrmsKFDpjTHyOgOeL/YsWcTfbKgv/M+phJSMFQReU="; + hash = "sha256-6Y6b8BBfCErbKJqhR7zhltbysibUlY7KAyZe7g5mRxQ="; }; modRoot = "cmd/atlas"; - vendorHash = "sha256-Xi0N3lU/gqmkqJcJeQqkKr0rcbad6cIclhq4t6DCTZI="; + vendorHash = "sha256-1Hhl2TzJWWXk4du9nbJTPXdYuss4TWfUIOw2DaAJQis="; nativeBuildInputs = [ installShellFiles ]; diff --git a/nixpkgs/pkgs/development/tools/database/clickhouse-backup/default.nix b/nixpkgs/pkgs/development/tools/database/clickhouse-backup/default.nix index 3cbc537590cb..69356e51c167 100644 --- a/nixpkgs/pkgs/development/tools/database/clickhouse-backup/default.nix +++ b/nixpkgs/pkgs/development/tools/database/clickhouse-backup/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "clickhouse-backup"; - version = "2.3.2"; + version = "2.4.0"; src = fetchFromGitHub { owner = "AlexAkulov"; repo = pname; rev = "v${version}"; - sha256 = "sha256-B6MImom0BSvbZVjeMWvF+oDEfoALl4xhXXitaOOU/ZI="; + sha256 = "sha256-ngLDKAwdrX385BIPYlQAYkA0Ty73wWwEesKQuC6+cvo="; }; - vendorHash = "sha256-YSr3fKqJJtNRbUW1TjwDM96cA6CoYz1LUit/pC8V3Fs="; + vendorHash = "sha256-NOQV7c930kutXmgi1eaETu1JMJerKNK2Ns4YBRaoBUw="; ldflags = [ "-X main.version=${version}" diff --git a/nixpkgs/pkgs/development/tools/database/prisma-engines/Cargo.lock b/nixpkgs/pkgs/development/tools/database/prisma-engines/Cargo.lock index aa430dc84ac7..535adb0d320f 100644 --- a/nixpkgs/pkgs/development/tools/database/prisma-engines/Cargo.lock +++ b/nixpkgs/pkgs/development/tools/database/prisma-engines/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "addr2line" -version = "0.17.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b" +checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3" dependencies = [ "gimli", ] @@ -23,7 +23,7 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" dependencies = [ - "getrandom 0.2.7", + "getrandom 0.2.10", "once_cell", "version_check", ] @@ -41,14 +41,44 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "0.7.19" +version = "0.7.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" +dependencies = [ + "memchr", +] + +[[package]] +name = "aho-corasick" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e" +checksum = "86b8f9420f797f2d9e935edf629310eb938a0d839f984e25327f3c7eed22300c" dependencies = [ "memchr", ] [[package]] +name = "allocator-api2" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" + +[[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 = "anes" version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -65,9 +95,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.64" +version = "1.0.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9a8f622bcf6ff3df478e9deba3e03e4e04b300f8e6a139e192c05fa3490afc7" +checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854" [[package]] name = "arrayvec" @@ -77,9 +107,9 @@ checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" [[package]] name = "arrayvec" -version = "0.7.2" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" +checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" [[package]] name = "ascii" @@ -101,41 +131,42 @@ dependencies = [ [[package]] name = "async-stream" -version = "0.3.3" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dad5c83079eae9969be7fadefe640a1c566901f05ff91ab221de4b6f68d9507e" +checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51" dependencies = [ "async-stream-impl", "futures-core", + "pin-project-lite", ] [[package]] name = "async-stream-impl" -version = "0.3.3" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10f203db73a71dfa2fb6dd22763990fa26f3d2625a6da2da900d23b87d26be27" +checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 1.0.99", + "syn 2.0.28", ] [[package]] name = "async-trait" -version = "0.1.57" +version = "0.1.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76464446b8bc32758d7e88ee1a804d9914cd9b1cb264c029899680b0be29826f" +checksum = "cc6dde6e4ed435a4c1ee4e73592f5ba9da2151af10076cc04858746af9352d09" dependencies = [ "proc-macro2", "quote", - "syn 1.0.99", + "syn 2.0.28", ] [[package]] name = "asynchronous-codec" -version = "0.6.0" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0de5164e5edbf51c45fb8c2d9664ae1c095cce1b265ecf7569093c0d66ef690" +checksum = "4057f2c32adbb2fc158e22fb38433c8e9bbf76b75a4732c7c0cbaf695fb65568" dependencies = [ "bytes", "futures-sink", @@ -159,7 +190,7 @@ version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" dependencies = [ - "hermit-abi", + "hermit-abi 0.1.19", "libc", "winapi", ] @@ -172,9 +203,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "backtrace" -version = "0.3.66" +version = "0.3.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cab84319d616cfb654d03394f38ab7e6f0919e181b1b57e1fd15e7fb4077d9a7" +checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12" dependencies = [ "addr2line", "cc", @@ -191,6 +222,22 @@ version = "0.6.6-alpha.0" source = "git+https://github.com/prisma/barrel.git?branch=mssql-support#4e84cf3d5013b4c92eb81d7ba90cd1c1c01c6805" [[package]] +name = "base-x" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cbbc9d0964165b47557570cce6c952866c2678457aca742aafc9fb771d30270" + +[[package]] +name = "base36" +version = "0.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9c26bddc1271f7112e5ec797e8eeba6de2de211c1488e506b9500196dbf77c5" +dependencies = [ + "base-x", + "failure", +] + +[[package]] name = "base64" version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -204,15 +251,15 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64" -version = "0.21.0" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a" +checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" [[package]] name = "bigdecimal" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6aaf33151a6429fe9211d1b276eafdf70cdff28b071e76c0b0e1503221ea3744" +checksum = "a6773ddc0eafc0e509fb60e48dff7f450f8e674a0686ae8605e8d9901bd5eefa" dependencies = [ "num-bigint", "num-integer", @@ -252,9 +299,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.1.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c70beb79cbb5ce9c4f8e20849978f34225931f665bb49efa6982875a4d5facb3" +checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" [[package]] name = "bitvec" @@ -295,31 +342,78 @@ dependencies = [ [[package]] name = "block-buffer" -version = "0.10.3" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" dependencies = [ "generic-array", ] [[package]] +name = "borsh" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4114279215a005bc675e386011e594e1d9b800918cea18fcadadcce864a2046b" +dependencies = [ + "borsh-derive", + "hashbrown 0.13.2", +] + +[[package]] +name = "borsh-derive" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0754613691538d51f329cce9af41d7b7ca150bc973056f1156611489475f54f7" +dependencies = [ + "borsh-derive-internal", + "borsh-schema-derive-internal", + "proc-macro-crate", + "proc-macro2", + "syn 1.0.109", +] + +[[package]] +name = "borsh-derive-internal" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afb438156919598d2c7bad7e1c0adf3d26ed3840dbc010db1a882a65583ca2fb" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "borsh-schema-derive-internal" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "634205cc43f74a1b9046ef87c4540ebda95696ec0f315024860cad7c5b0f5ccd" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] name = "bson" -version = "2.4.0" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99d76085681585d39016f4d3841eb019201fc54d2dd0d92ad1e4fab3bfb32754" +checksum = "9aeb8bae494e49dbc330dd23cf78f6f7accee22f640ce3ab17841badaa4ce232" dependencies = [ "ahash 0.7.6", "base64 0.13.1", + "bitvec", "chrono", "hex", - "indexmap", + "indexmap 1.9.3", + "js-sys", "lazy_static", "rand 0.8.5", "serde", "serde_bytes", "serde_json", - "time 0.3.14", - "uuid 1.1.2", + "time 0.3.25", + "uuid", ] [[package]] @@ -347,9 +441,31 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.12.0" +version = "3.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" + +[[package]] +name = "bytecheck" +version = "0.6.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b6372023ac861f6e6dc89c8344a8f398fb42aaba2b5dbc649ca0c0e9dbcb627" +dependencies = [ + "bytecheck_derive", + "ptr_meta", + "simdutf8", +] + +[[package]] +name = "bytecheck_derive" +version = "0.6.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" +checksum = "a7ec4c6f261935ad534c0c22dbef2201b45918860eb1c574b972bd213a76af61" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] [[package]] name = "byteorder" @@ -359,9 +475,9 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "bytes" -version = "1.2.1" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec8a7b6a70fde80372154c65702f00a0f56f3e1c36abbc6c440484be248856db" +checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" [[package]] name = "cast" @@ -371,9 +487,12 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[package]] name = "cc" -version = "1.0.73" +version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11" +checksum = "305fe645edc1442a0fa8b6726ba61d422798d37a52e12eaecf4b022ebbb88f01" +dependencies = [ + "libc", +] [[package]] name = "cexpr" @@ -392,12 +511,13 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.20" +version = "0.4.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6127248204b9aba09a362f6c930ef6a78f2c1b2215f8a7b398c06e1083f17af0" +checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" dependencies = [ + "android-tzdata", + "iana-time-zone", "js-sys", - "num-integer", "num-traits", "serde", "time 0.1.43", @@ -407,9 +527,9 @@ dependencies = [ [[package]] name = "ciborium" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0c137568cc60b904a7724001b35ce2630fd00d5d84805fbb608ab89509d788f" +checksum = "effd91f6c78e5a4ace8a5d3c0b6bfaec9e2baaef55f3efc00e45fb2e477ee926" dependencies = [ "ciborium-io", "ciborium-ll", @@ -418,15 +538,15 @@ dependencies = [ [[package]] name = "ciborium-io" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "346de753af073cc87b52b2083a506b38ac176a44cfb05497b622e27be899b369" +checksum = "cdf919175532b369853f5d5e20b26b43112613fd6fe7aee757e35f7a44642656" [[package]] name = "ciborium-ll" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213030a2b5a4e0c0892b6652260cf6ccac84827b83a85a534e178e3906c4cf1b" +checksum = "defaa24ecc093c77630e6c15e17c51f5e187bf35ee514f4e2d67baaa96dae22b" dependencies = [ "ciborium-io", "half", @@ -434,9 +554,9 @@ dependencies = [ [[package]] name = "clang-sys" -version = "1.3.3" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a050e2153c5be08febd6734e29298e844fdb0fa21aeddd63b4eb7baa106c69b" +checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f" dependencies = [ "glob", "libc", @@ -460,13 +580,13 @@ dependencies = [ [[package]] name = "clap" -version = "3.2.23" +version = "3.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71655c45cb9845d3270c9d6df84ebe72b4dad3c2ba3f7023ad47c144e4e473a5" +checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123" dependencies = [ "bitflags 1.3.2", "clap_lex", - "indexmap", + "indexmap 1.9.3", "textwrap 0.16.0", ] @@ -481,9 +601,9 @@ dependencies = [ [[package]] name = "cmake" -version = "0.1.48" +version = "0.1.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8ad8cef104ac57b68b89df3208164d228503abbdce70f6880ffa3d970e7443a" +checksum = "a31c789563b815f77f4250caee12365734369f942439b7defd71e18a48197130" dependencies = [ "cc", ] @@ -511,13 +631,13 @@ dependencies = [ [[package]] name = "colored" -version = "2.0.0" +version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3616f750b84d8f0de8a58bda93e08e2a81ad3f523089b05f1dffecab48c6cbd" +checksum = "2674ec482fbc38012cf31e6c42ba0177b431a0cb6f15fe40efa5aab1bda516f6" dependencies = [ - "atty", + "is-terminal", "lazy_static", - "winapi", + "windows-sys 0.48.0", ] [[package]] @@ -541,20 +661,21 @@ checksum = "510ca239cf13b7f8d16a2b48f263de7b4f8c566f0af58d901031473c76afb1e3" [[package]] name = "console" -version = "0.15.2" +version = "0.15.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c050367d967ced717c04b65d8c619d863ef9292ce0c5760028655a2fb298718c" +checksum = "c926e00cc70edefdc64d3a5ff31cc65bb97a3460097762bd23afb4d8145fccf8" dependencies = [ "encode_unicode", "lazy_static", "libc", - "terminal_size", - "winapi", + "windows-sys 0.45.0", ] [[package]] -name = "context" -version = "0.1.0" +name = "convert_case" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" [[package]] name = "convert_case" @@ -577,9 +698,9 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" +checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" [[package]] name = "core-tests" @@ -596,9 +717,9 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.5" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" +checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" dependencies = [ "libc", ] @@ -622,7 +743,7 @@ dependencies = [ "atty", "cast", "ciborium", - "clap 3.2.23", + "clap 3.2.25", "criterion-plot", "itertools", "lazy_static", @@ -664,9 +785,9 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.6" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521" +checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" dependencies = [ "cfg-if", "crossbeam-utils", @@ -674,9 +795,9 @@ dependencies = [ [[package]] name = "crossbeam-deque" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "715e8152b692bba2d374b53d4875445368fdf21a94751410af607a5ac677d1fc" +checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" dependencies = [ "cfg-if", "crossbeam-epoch", @@ -685,23 +806,22 @@ dependencies = [ [[package]] name = "crossbeam-epoch" -version = "0.9.10" +version = "0.9.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "045ebe27666471bb549370b4b0b3e51b07f56325befa4284db65fc89c02511b1" +checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" dependencies = [ "autocfg", "cfg-if", "crossbeam-utils", "memoffset", - "once_cell", "scopeguard", ] [[package]] name = "crossbeam-queue" -version = "0.3.6" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd42583b04998a5363558e5f9291ee5a5ff6b49944332103f251e7479a82aa7" +checksum = "d1cfb3ea8a53f37c40dea2c7bedcbd88bdfae54f5e2175d6ecaff1c988353add" dependencies = [ "cfg-if", "crossbeam-utils", @@ -709,12 +829,11 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.11" +version = "0.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51887d4adc7b564537b15adcfb307936f8075dfcd5f00dde9a9f1d29383682bc" +checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" dependencies = [ "cfg-if", - "once_cell", ] [[package]] @@ -729,33 +848,45 @@ dependencies = [ [[package]] name = "ctor" -version = "0.1.23" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdffe87e1d521a10f9696f833fe502293ea446d7f256c06128293a4119bdf4cb" +checksum = "1f34ba9a9bcb8645379e9de8cb3ecfcf4d1c85ba66d90deb3259206fa5aa193b" dependencies = [ "quote", - "syn 1.0.99", + "syn 2.0.28", ] [[package]] -name = "ctor" -version = "0.2.0" +name = "cuid" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd4056f63fce3b82d852c3da92b08ea59959890813a7f4ce9c0ff85b10cf301b" +checksum = "51294db11d38eb763c92936c5c88425d0090e27dce21dd15748134af9e53e739" dependencies = [ - "quote", - "syn 2.0.14", + "base36", + "cuid-util", + "cuid2", + "hostname", + "num", + "once_cell", + "rand 0.8.5", ] [[package]] -name = "cuid" -version = "1.2.0" +name = "cuid-util" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ea2bfe0336ff1b7ca74819b2df8dfae9afea358aff6b1688baa5c181d8c3713" + +[[package]] +name = "cuid2" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2a2891c056384f8461606f2579208164d67475fb17a0f442ac8d5981d3c2807" +checksum = "47d99cacd52fd67db7490ad051c8c1973fb75520174d69aabbae08c534c9d0e8" dependencies = [ - "hostname", - "lazy_static", + "cuid-util", + "num", "rand 0.8.5", + "sha3", ] [[package]] @@ -779,7 +910,7 @@ dependencies = [ "proc-macro2", "quote", "strsim 0.10.0", - "syn 1.0.99", + "syn 1.0.109", ] [[package]] @@ -790,27 +921,27 @@ checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835" dependencies = [ "darling_core", "quote", - "syn 1.0.99", + "syn 1.0.109", ] [[package]] name = "dashmap" -version = "5.4.0" +version = "5.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "907076dfda823b0b36d2a1bb5f90c96660a5bbcd7729e10727f07858f22c4edc" +checksum = "6943ae99c34386c84a470c499d3414f66502a41340aa895406e0d2e4a207b91d" dependencies = [ "cfg-if", - "hashbrown 0.12.3", + "hashbrown 0.14.0", "lock_api", "once_cell", - "parking_lot_core 0.9.6", + "parking_lot_core 0.9.8", ] [[package]] name = "data-encoding" -version = "2.3.2" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ee2393c4a91429dffb4bedf19f4d6abf27d8a732c8ce4980305d782e5426d57" +checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308" [[package]] name = "datamodel-renderer" @@ -825,6 +956,12 @@ dependencies = [ ] [[package]] +name = "deranged" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7684a49fb1af197853ef7b2ee694bc1f5b4179556f1e5710e1760c5db6f5e929" + +[[package]] name = "derivative" version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -832,7 +969,20 @@ checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" dependencies = [ "proc-macro2", "quote", - "syn 1.0.99", + "syn 1.0.109", +] + +[[package]] +name = "derive_more" +version = "0.99.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" +dependencies = [ + "convert_case 0.4.0", + "proc-macro2", + "quote", + "rustc_version 0.4.0", + "syn 1.0.109", ] [[package]] @@ -861,20 +1011,20 @@ dependencies = [ [[package]] name = "digest" -version = "0.10.3" +version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2fb860ca6fafa5552fb6d0e816a69c8e49f0908bf524e30a90d97c85892d506" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ - "block-buffer 0.10.3", + "block-buffer 0.10.4", "crypto-common", "subtle", ] [[package]] name = "dissimilar" -version = "1.0.4" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c97b9233581d84b8e1e689cdd3a47b6f69770084fc246e86a7f78b0d9c1d4a5" +checksum = "86e3bdc80eee6e16b2b6b0f87fbc98c04bee3455e35174c0de1a125d0688c632" [[package]] name = "dmmf" @@ -884,7 +1034,7 @@ dependencies = [ "colored", "expect-test", "flate2", - "indexmap", + "indexmap 1.9.3", "indoc", "itertools", "pretty_assertions", @@ -898,9 +1048,9 @@ dependencies = [ [[package]] name = "either" -version = "1.8.1" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" [[package]] name = "encode_unicode" @@ -993,22 +1143,22 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "21cdad81446a7f7dc43f6a77409efeb9733d2fa65553efef6018ef257c959b73" dependencies = [ - "heck 0.4.0", + "heck 0.4.1", "proc-macro2", "quote", - "syn 1.0.99", + "syn 1.0.109", ] [[package]] name = "enum_dispatch" -version = "0.3.8" +version = "0.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0eb359f1476bf611266ac1f5355bc14aeca37b299d0ebccc038ee7058891c9cb" +checksum = "8f33313078bb8d4d05a2733a94ac4c2d8a0df9a2b84424ebf4f33bfc224a890e" dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 1.0.99", + "syn 2.0.28", ] [[package]] @@ -1029,14 +1179,20 @@ checksum = "5e9a1f9f7d83e59740248a6e14ecf93929ade55027844dfcea78beafccc15745" dependencies = [ "proc-macro2", "quote", - "syn 2.0.14", + "syn 2.0.28", ] [[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.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" +checksum = "6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f" dependencies = [ "errno-dragonfly", "libc", @@ -1055,15 +1211,37 @@ dependencies = [ [[package]] name = "expect-test" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d4661aca38d826eb7c72fe128e4238220616de4c0cc00db7bfc38e2e1364dd3" +checksum = "30d9eafeadd538e68fb28016364c9732d78e420b9ff8853fa5e4058861e9f8d3" dependencies = [ "dissimilar", "once_cell", ] [[package]] +name = "failure" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d32e9bd16cc02eae7db7ef620b392808b89f6a5e16bb3497d159c6b92a0f4f86" +dependencies = [ + "backtrace", + "failure_derive", +] + +[[package]] +name = "failure_derive" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", + "synstructure", +] + +[[package]] name = "fallible-iterator" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1077,12 +1255,9 @@ checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a" [[package]] name = "fastrand" -version = "1.8.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499" -dependencies = [ - "instant", -] +checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" [[package]] name = "fixedbitset" @@ -1098,9 +1273,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flate2" -version = "1.0.24" +version = "1.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f82b0f4c27ad9f8bfd1f3208d882da2b09c301bc1c828fd3a00d0216d2fbbff6" +checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" dependencies = [ "crc32fast", "libz-sys", @@ -1130,19 +1305,18 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "form_urlencoded" -version = "1.0.1" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191" +checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" dependencies = [ - "matches", "percent-encoding", ] [[package]] name = "frunk" -version = "0.4.0" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0cd67cf7d54b7e72d0ea76f3985c3747d74aee43e0218ad993b7903ba7a5395e" +checksum = "11a351b59e12f97b4176ee78497dff72e4276fb1ceb13e19056aca7fa0206287" dependencies = [ "frunk_core", "frunk_derives", @@ -1151,55 +1325,43 @@ dependencies = [ [[package]] name = "frunk_core" -version = "0.4.0" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1246cf43ec80bf8b2505b5c360b8fb999c97dabd17dbb604d85558d5cbc25482" +checksum = "af2469fab0bd07e64ccf0ad57a1438f63160c69b2e57f04a439653d68eb558d6" [[package]] name = "frunk_derives" -version = "0.4.0" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dbc4f084ec5a3f031d24ccedeb87ab2c3189a2f33b8d070889073837d5ea09e" +checksum = "b0fa992f1656e1707946bbba340ad244f0814009ef8c0118eb7b658395f19a2e" dependencies = [ "frunk_proc_macro_helpers", "quote", - "syn 1.0.99", + "syn 2.0.28", ] [[package]] name = "frunk_proc_macro_helpers" -version = "0.1.0" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99f11257f106c6753f5ffcb8e601fb39c390a088017aaa55b70c526bff15f63e" +checksum = "35b54add839292b743aeda6ebedbd8b11e93404f902c56223e51b9ec18a13d2c" dependencies = [ "frunk_core", "proc-macro2", "quote", - "syn 1.0.99", + "syn 2.0.28", ] [[package]] name = "frunk_proc_macros" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a078bd8459eccbb85e0b007b8f756585762a72a9efc53f359b371c3b6351dbcc" -dependencies = [ - "frunk_core", - "frunk_proc_macros_impl", - "proc-macro-hack", -] - -[[package]] -name = "frunk_proc_macros_impl" -version = "0.1.0" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ffba99f0fa4f57e42f57388fbb9a0ca863bc2b4261f3c5570fed579d5df6c32" +checksum = "71b85a1d4a9a6b300b41c05e8e13ef2feca03e0334127f29eca9506a7fe13a93" dependencies = [ "frunk_core", "frunk_proc_macro_helpers", - "proc-macro-hack", "quote", - "syn 1.0.99", + "syn 2.0.28", ] [[package]] @@ -1210,9 +1372,9 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" [[package]] name = "futures" -version = "0.3.24" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f21eda599937fba36daeb58a22e8f5cee2d14c4a17b5b7739c7c8e5e3b8230c" +checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" dependencies = [ "futures-channel", "futures-core", @@ -1225,9 +1387,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.24" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30bdd20c28fadd505d0fd6712cdfcb0d4b5648baf45faef7f852afb2399bb050" +checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" dependencies = [ "futures-core", "futures-sink", @@ -1235,15 +1397,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.24" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e5aa3de05362c3fb88de6531e6296e85cde7739cccad4b9dfeeb7f6ebce56bf" +checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" [[package]] name = "futures-executor" -version = "0.3.24" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ff63c23854bee61b6e9cd331d523909f238fc7636290b96826e9cfa5faa00ab" +checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" dependencies = [ "futures-core", "futures-task", @@ -1252,32 +1414,32 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.24" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbf4d2a7a308fd4578637c0b17c7e1c7ba127b8f6ba00b29f717e9655d85eb68" +checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" [[package]] name = "futures-macro" -version = "0.3.24" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42cd15d1c7456c04dbdf7e88bcd69760d74f3a798d6444e16974b505b0e62f17" +checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 1.0.99", + "syn 2.0.28", ] [[package]] name = "futures-sink" -version = "0.3.24" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21b20ba5a92e727ba30e72834706623d94ac93a725410b6a6b6fbc1b07f7ba56" +checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" [[package]] name = "futures-task" -version = "0.3.24" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6508c467c73851293f390476d4491cf4d227dbabcd4170f3bb6044959b294f1" +checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" [[package]] name = "futures-timer" @@ -1287,9 +1449,9 @@ checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" [[package]] name = "futures-util" -version = "0.3.24" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44fb6cb1be61cc1d2e43b262516aafcf63b241cffdb1d3fa115f91d9c7b09c90" +checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" dependencies = [ "futures-channel", "futures-core", @@ -1305,9 +1467,9 @@ dependencies = [ [[package]] name = "generic-array" -version = "0.14.6" +version = "0.14.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" dependencies = [ "typenum", "version_check", @@ -1326,9 +1488,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.7" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6" +checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" dependencies = [ "cfg-if", "libc", @@ -1337,15 +1499,15 @@ dependencies = [ [[package]] name = "gimli" -version = "0.26.2" +version = "0.27.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22030e2c5a68ec659fde1e949a745124b48e6fa8b045b7ed5bd1fe4ccc5c4e5d" +checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" [[package]] name = "glob" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "graphql-parser" @@ -1353,15 +1515,15 @@ version = "0.3.0" source = "git+https://github.com/prisma/graphql-parser#6a3f58bd879065588e710cb02b5bd30c1ce182c3" dependencies = [ "combine", - "indexmap", + "indexmap 1.9.3", "thiserror", ] [[package]] name = "h2" -version = "0.3.17" +version = "0.3.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66b91535aa35fea1523ad1b86cb6b53c28e0ae566ba4a460f4457e936cad7c6f" +checksum = "97ec8491ebaf99c8eaa73058b045fe58073cd6be7f596ac993ced0b0a0c01049" dependencies = [ "bytes", "fnv", @@ -1369,10 +1531,10 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap", + "indexmap 1.9.3", "slab", "tokio", - "tokio-util 0.7.3", + "tokio-util 0.7.8", "tracing", ] @@ -1410,12 +1572,22 @@ dependencies = [ ] [[package]] +name = "hashbrown" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" +dependencies = [ + "ahash 0.8.3", + "allocator-api2", +] + +[[package]] name = "hashlink" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0761a1b9491c4f2e3d66aa0f62d0fba0af9a0e2852e4d48ea506632a4b56e6aa" +checksum = "312f66718a2d7789ffef4f4b7b213138ed9f1eb3aa1d0d82fc99f88fb3ffd26f" dependencies = [ - "hashbrown 0.13.2", + "hashbrown 0.14.0", ] [[package]] @@ -1429,9 +1601,9 @@ dependencies = [ [[package]] name = "heck" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" @@ -1443,6 +1615,12 @@ dependencies = [ ] [[package]] +name = "hermit-abi" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" + +[[package]] name = "hex" version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1454,7 +1632,7 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" dependencies = [ - "digest 0.10.3", + "digest 0.10.7", ] [[package]] @@ -1470,18 +1648,18 @@ dependencies = [ [[package]] name = "html-escape" -version = "0.2.12" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15315cfa9503e9aa85a477138eff76a1b203a430703548052c330b69d8d8c205" +checksum = "6d1ad449764d627e22bfd7cd5e8868264fc9236e07c752972b4080cd351cb476" dependencies = [ "utf8-width", ] [[package]] name = "http" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399" +checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" dependencies = [ "bytes", "fnv", @@ -1513,9 +1691,9 @@ checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" [[package]] name = "hyper" -version = "0.14.23" +version = "0.14.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "034711faac9d2166cb1baf1a2fb0b60b1f277f8492fd72176c17f3515e1abd3c" +checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" dependencies = [ "bytes", "futures-channel", @@ -1528,7 +1706,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2", + "socket2 0.4.9", "tokio", "tower-service", "tracing", @@ -1561,6 +1739,29 @@ dependencies = [ ] [[package]] +name = "iana-time-zone" +version = "0.1.57" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "windows", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" +dependencies = [ + "cc", +] + +[[package]] name = "ident_case" version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1578,10 +1779,20 @@ dependencies = [ ] [[package]] +name = "idna" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] name = "indexmap" -version = "1.9.1" +version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ "autocfg", "hashbrown 0.12.3", @@ -1589,10 +1800,20 @@ dependencies = [ ] [[package]] +name = "indexmap" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +dependencies = [ + "equivalent", + "hashbrown 0.14.0", +] + +[[package]] name = "indoc" -version = "2.0.1" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f2cb48b81b1dc9f39676bf99f5499babfec7cd8fe14307f7b3d747208fb5690" +checksum = "2c785eefb63ebd0e33416dfcb8d6da0bf27ce752843a45632a67bf10d4d4b5c4" [[package]] name = "insta" @@ -1617,32 +1838,33 @@ dependencies = [ ] [[package]] -name = "io-lifetimes" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfa919a82ea574332e2de6e74b4c36e74d41982b335080fa59d4ef31be20fdf3" -dependencies = [ - "libc", - "windows-sys 0.45.0", -] - -[[package]] name = "ipconfig" -version = "0.3.0" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "723519edce41262b05d4143ceb95050e4c614f483e78e9fd9e39a8275a84ad98" +checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f" dependencies = [ - "socket2", + "socket2 0.5.3", "widestring", - "winapi", - "winreg 0.7.0", + "windows-sys 0.48.0", + "winreg 0.50.0", ] [[package]] name = "ipnet" -version = "2.5.0" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "879d54834c8c76457ef4293a689b2a8c59b076067ad77b15efafbb05f92a592b" +checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6" + +[[package]] +name = "is-terminal" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" +dependencies = [ + "hermit-abi 0.3.2", + "rustix", + "windows-sys 0.48.0", +] [[package]] name = "itertools" @@ -1655,19 +1877,24 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.3" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8af84674fe1f223a982c933a0ee1086ac4d4052aa0fb8060c12c6ad838e754" +checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[package]] -name = "js-drivers" +name = "js-connectors" version = "0.1.0" dependencies = [ "async-trait", + "bigdecimal", + "chrono", "expect-test", + "futures", "napi", "napi-derive", + "num-bigint", "once_cell", + "psl", "quaint", "serde", "serde_json", @@ -1678,9 +1905,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.56" +version = "0.3.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a38fc24e30fd564ce974c02bf1d337caddff65be6cc4735a1f7eab22a7440f04" +checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" dependencies = [ "wasm-bindgen", ] @@ -1711,6 +1938,15 @@ dependencies = [ ] [[package]] +name = "keccak" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f6d5ed8676d904364de097082f4e7d240b571b67989ced0240f08b7f966f940" +dependencies = [ + "cpufeatures", +] + +[[package]] name = "lazy_static" version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1797,15 +2033,15 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.140" +version = "0.2.147" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c" +checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" [[package]] name = "libloading" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efbc0f03f9a775e9f6aed295c6a1ba2253c5757a9e03d55c6caa46a681abcddd" +checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" dependencies = [ "cfg-if", "winapi", @@ -1824,9 +2060,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.8" +version = "1.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9702761c3935f8cc2f101793272e202c72b99da8f4224a19ddcf1279a6450bbf" +checksum = "d97137b25e321a73eef1418d1d5d2eda4d77e12813f8e6dead84bc52c5870a7b" dependencies = [ "cc", "pkg-config", @@ -1841,15 +2077,15 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] name = "linux-raw-sys" -version = "0.1.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" +checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503" [[package]] name = "lock_api" -version = "0.4.8" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f80bf5aacaf25cbfc8210d1cfb718f2bf3b11c4c54e5afe36c236853a8ec390" +checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" dependencies = [ "autocfg", "scopeguard", @@ -1857,12 +2093,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.17" +version = "0.4.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -dependencies = [ - "cfg-if", -] +checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" [[package]] name = "lru" @@ -1925,22 +2158,22 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" dependencies = [ - "regex-automata", + "regex-automata 0.1.10", ] [[package]] name = "matches" -version = "0.1.9" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" +checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" [[package]] name = "md-5" -version = "0.10.4" +version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66b48670c893079d3c2ed79114e3644b7004df1c361a4e0ad52e2e6940d07c3d" +checksum = "6365506850d44bff6e2fbcb5176cf63650e48bd45ef2fe2665ae1570e0f4b9ca" dependencies = [ - "digest 0.10.3", + "digest 0.10.7", ] [[package]] @@ -1957,9 +2190,9 @@ checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" [[package]] name = "memoffset" -version = "0.6.5" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" dependencies = [ "autocfg", ] @@ -1991,7 +2224,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "953cbbb6f9ba4b9304f4df79b98cdc9d14071ed93065a9fca11c00c5d9181b66" dependencies = [ "hyper", - "indexmap", + "indexmap 1.9.3", "ipnet", "metrics 0.19.0", "metrics-util 0.13.0", @@ -2010,7 +2243,7 @@ checksum = "49e30813093f757be5cf21e50389a24dc7dbb22c49f23b7e8f51d69b508a5ffa" dependencies = [ "proc-macro2", "quote", - "syn 1.0.99", + "syn 1.0.109", ] [[package]] @@ -2019,12 +2252,12 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "65a9e83b833e1d2e07010a386b197c13aa199bbd0fca5cf69bfa147972db890a" dependencies = [ - "aho-corasick", + "aho-corasick 0.7.20", "atomic-shim", "crossbeam-epoch", "crossbeam-utils", "hashbrown 0.11.2", - "indexmap", + "indexmap 1.9.3", "metrics 0.18.1", "num_cpus", "ordered-float", @@ -2065,23 +2298,23 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.5.4" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96590ba8f175222643a85693f33d26e9c8a015f599c216509b1a6894af675d34" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" dependencies = [ "adler", ] [[package]] name = "mio" -version = "0.8.5" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5d732bc30207a6423068df043e3d02e0735b155ad7ce1a6f76fe2baa5b158de" +checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" dependencies = [ "libc", "log", "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.42.0", + "windows-sys 0.48.0", ] [[package]] @@ -2105,9 +2338,9 @@ dependencies = [ [[package]] name = "mongodb" -version = "2.3.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b95afe97b0c799fdf69cd960272a2cb9662d077bd6efd84eb722bb9805d47554" +checksum = "ebcd85ec209a5b84fd9f54b9e381f6fa17462bc74160d018fc94fd8b9f61faa8" dependencies = [ "async-trait", "base64 0.13.1", @@ -2115,37 +2348,38 @@ dependencies = [ "bson", "chrono", "derivative", + "derive_more", "futures-core", "futures-executor", + "futures-io", "futures-util", "hex", "hmac", "lazy_static", "md-5", - "os_info", "pbkdf2", "percent-encoding", "rand 0.8.5", "rustc_version_runtime", - "rustls 0.20.6", + "rustls 0.20.8", "rustls-pemfile", "serde", "serde_bytes", "serde_with", "sha-1", - "sha2 0.10.5", - "socket2", + "sha2 0.10.7", + "socket2 0.4.9", "stringprep", "strsim 0.10.0", "take_mut", "thiserror", "tokio", "tokio-rustls 0.23.4", - "tokio-util 0.7.3", + "tokio-util 0.7.8", "trust-dns-proto", "trust-dns-resolver", "typed-builder", - "uuid 0.8.2", + "uuid", "webpki-roots", ] @@ -2170,7 +2404,7 @@ dependencies = [ "chrono", "cuid", "futures", - "indexmap", + "indexmap 1.9.3", "itertools", "mongodb", "mongodb-client", @@ -2188,14 +2422,14 @@ dependencies = [ "tracing", "tracing-futures", "user-facing-errors", - "uuid 1.1.2", + "uuid", ] [[package]] name = "mongodb-schema-connector" version = "0.1.0" dependencies = [ - "convert_case", + "convert_case 0.6.0", "datamodel-renderer", "dissimilar", "enumflags2", @@ -2256,11 +2490,11 @@ dependencies = [ "priority-queue", "serde", "serde_json", - "socket2", + "socket2 0.4.9", "thiserror", "tokio", "tokio-native-tls", - "tokio-util 0.7.3", + "tokio-util 0.7.8", "twox-hash", "url", ] @@ -2294,12 +2528,12 @@ dependencies = [ "serde", "serde_json", "sha1", - "sha2 0.10.5", + "sha2 0.10.7", "smallvec", "subprocess", "thiserror", - "time 0.3.14", - "uuid 1.1.2", + "time 0.3.25", + "uuid", ] [[package]] @@ -2322,12 +2556,12 @@ dependencies = [ [[package]] name = "napi" -version = "2.12.4" +version = "2.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "556470a21074b55be8adee5f27ca04389cfdaca323a28b4b0e9c15466de94731" +checksum = "0ede2d12cd6fce44da537a4be1f5510c73be2506c2e32dfaaafd1f36968f3a0e" dependencies = [ - "bitflags 2.1.0", - "ctor 0.2.0", + "bitflags 2.4.0", + "ctor", "napi-derive", "napi-sys", "once_cell", @@ -2349,11 +2583,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da1c6a8fa84d549aa8708fcd062372bf8ec6e849de39016ab921067d21bde367" dependencies = [ "cfg-if", - "convert_case", + "convert_case 0.6.0", "napi-derive-backend", "proc-macro2", "quote", - "syn 1.0.99", + "syn 1.0.109", ] [[package]] @@ -2362,13 +2596,13 @@ version = "1.0.52" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "20bbc7c69168d06a848f925ec5f0e0997f98e8c8d4f2cc30157f0da51c009e17" dependencies = [ - "convert_case", + "convert_case 0.6.0", "once_cell", "proc-macro2", "quote", "regex", - "semver 1.0.17", - "syn 1.0.99", + "semver 1.0.18", + "syn 1.0.109", ] [[package]] @@ -2382,9 +2616,9 @@ dependencies = [ [[package]] name = "native-tls" -version = "0.2.10" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd7e2f3618557f980e0b17e8856252eee3c97fa12c54dff0ca290fb6266ca4a9" +checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" dependencies = [ "lazy_static", "libc", @@ -2409,15 +2643,39 @@ dependencies = [ [[package]] name = "nom" -version = "7.1.1" +version = "7.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8903e5a29a317527874d0402f867152a3d21c908bb0b933e416c65e301d4c36" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" dependencies = [ "memchr", "minimal-lexical", ] [[package]] +name = "nu-ansi-term" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +dependencies = [ + "overload", + "winapi", +] + +[[package]] +name = "num" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b05180d69e3da0e530ba2a1dae5110317e49e3b7f3d41be227dc5f92e49ee7af" +dependencies = [ + "num-bigint", + "num-complex", + "num-integer", + "num-iter", + "num-rational", + "num-traits", +] + +[[package]] name = "num-bigint" version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2429,6 +2687,15 @@ dependencies = [ ] [[package]] +name = "num-complex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02e0d21255c828d6f128a1e41534206671e8c3ea0c62f32291e808dc82cff17d" +dependencies = [ + "num-traits", +] + +[[package]] name = "num-integer" version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2439,47 +2706,61 @@ dependencies = [ ] [[package]] -name = "num-traits" -version = "0.2.15" +name = "num-iter" +version = "0.1.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" dependencies = [ "autocfg", + "num-integer", + "num-traits", ] [[package]] -name = "num_cpus" -version = "1.13.1" +name = "num-rational" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1" +checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" dependencies = [ - "hermit-abi", - "libc", + "autocfg", + "num-bigint", + "num-integer", + "num-traits", ] [[package]] -name = "num_threads" -version = "0.1.6" +name = "num-traits" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" +dependencies = [ + "autocfg", +] + +[[package]] +name = "num_cpus" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ + "hermit-abi 0.3.2", "libc", ] [[package]] name = "object" -version = "0.29.0" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21158b2c33aa6d4561f1c0a6ea283ca92bc54802a93b263e910746d679a7eb53" +checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1" dependencies = [ "memchr", ] [[package]] name = "once_cell" -version = "1.17.0" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "oorandom" @@ -2495,9 +2776,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openssl" -version = "0.10.48" +version = "0.10.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "518915b97df115dd36109bfa429a48b8f737bd05508cf9588977b599648926d2" +checksum = "729b745ad4a5575dd06a3e1af1414bd330ee561c01b3899eb584baeaa8def17e" dependencies = [ "bitflags 1.3.2", "cfg-if", @@ -2510,13 +2791,13 @@ dependencies = [ [[package]] name = "openssl-macros" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c" +checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 1.0.99", + "syn 2.0.28", ] [[package]] @@ -2527,20 +2808,19 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-src" -version = "111.25.0+1.1.1t" +version = "111.27.0+1.1.1v" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3173cd3626c43e3854b1b727422a276e568d9ec5fe8cec197822cf52cfb743d6" +checksum = "06e8f197c82d7511c5b014030c9b1efeda40d7d5f99d23b4ceed3524a5e63f02" dependencies = [ "cc", ] [[package]] name = "openssl-sys" -version = "0.9.83" +version = "0.9.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "666416d899cf077260dac8698d60a60b435a46d57e82acb1be3d0dad87284e5b" +checksum = "866b5f16f90776b9bb8dc1e1802ac6f0513de3a7a7465867bfbc563dc737faac" dependencies = [ - "autocfg", "cc", "libc", "openssl-src", @@ -2618,29 +2898,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a86ed3f5f244b372d6b1a00b72ef7f8876d0bc6a78a4c9985c53614041512063" [[package]] -name = "os_info" -version = "3.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5209b2162b2c140df493a93689e04f8deab3a67634f5bc7a553c0a98e5b8d399" -dependencies = [ - "log", - "winapi", -] - -[[package]] name = "os_str_bytes" -version = "6.5.0" +version = "6.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ceedf44fb00f2d1984b0bc98102627ce622e083e49a5bacdb3e514fa4238e267" +checksum = "4d5d9eb14b174ee9aa2ef96dc2b94637a2d4b6e7cb873c7e171f0c20c6cf3eac" [[package]] -name = "output_vt100" -version = "0.1.3" +name = "overload" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "628223faebab4e3e40667ee0b2336d34a5b960ff60ea743ddfdbcf7770bcfb66" -dependencies = [ - "winapi", -] +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] name = "parking_lot" @@ -2660,7 +2927,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" dependencies = [ "lock_api", - "parking_lot_core 0.9.6", + "parking_lot_core 0.9.8", ] [[package]] @@ -2672,22 +2939,22 @@ dependencies = [ "cfg-if", "instant", "libc", - "redox_syscall", + "redox_syscall 0.2.16", "smallvec", "winapi", ] [[package]] name = "parking_lot_core" -version = "0.9.6" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba1ef8814b5c993410bb3adfad7a5ed269563e4a2f90c41f5d85be7fb47133bf" +checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" dependencies = [ "cfg-if", "libc", - "redox_syscall", + "redox_syscall 0.3.5", "smallvec", - "windows-sys 0.42.0", + "windows-targets 0.48.1", ] [[package]] @@ -2709,18 +2976,18 @@ dependencies = [ "diagnostics", "either", "enumflags2", - "indexmap", + "indexmap 1.9.3", "rustc-hash", "schema-ast", ] [[package]] name = "pbkdf2" -version = "0.10.1" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "271779f35b581956db91a3e55737327a03aa051e90b1c47aeb189508533adfd7" +checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" dependencies = [ - "digest 0.10.3", + "digest 0.10.7", ] [[package]] @@ -2731,24 +2998,24 @@ checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" [[package]] name = "pem" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03c64931a1a212348ec4f3b4362585eca7159d0d09cbdf4a7f74f02173596fd4" +checksum = "a8835c273a76a90455d7344889b0964598e3316e2a79ede8e36f16bdcf2228b8" dependencies = [ "base64 0.13.1", ] [[package]] name = "percent-encoding" -version = "2.1.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" +checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" [[package]] name = "pest" -version = "2.3.0" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b0560d531d1febc25a3c9398a62a71256c0178f2e3443baedd9ad4bb8c9deb4" +checksum = "1acb4a4365a13f749a93f1a094a7805e5cfa0955373a9de860d962eaa3a5fe5a" dependencies = [ "thiserror", "ucd-trie", @@ -2756,9 +3023,9 @@ dependencies = [ [[package]] name = "pest_derive" -version = "2.3.0" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "905708f7f674518498c1f8d644481440f476d39ca6ecae83319bba7c6c12da91" +checksum = "666d00490d4ac815001da55838c500eafb0320019bbaa44444137c48b443a853" dependencies = [ "pest", "pest_generator", @@ -2766,26 +3033,26 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.3.0" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5803d8284a629cc999094ecd630f55e91b561a1d1ba75e233b00ae13b91a69ad" +checksum = "68ca01446f50dbda87c1786af8770d535423fa8a53aec03b8f4e3d7eb10e0929" dependencies = [ "pest", "pest_meta", "proc-macro2", "quote", - "syn 1.0.99", + "syn 2.0.28", ] [[package]] name = "pest_meta" -version = "2.3.0" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1538eb784f07615c6d9a8ab061089c6c54a344c5b4301db51990ca1c241e8c04" +checksum = "56af0a30af74d0445c0bf6d9d051c979b516a1a5af790d251daee76005420a48" dependencies = [ "once_cell", "pest", - "sha-1", + "sha2 0.10.7", ] [[package]] @@ -2800,57 +3067,57 @@ dependencies = [ [[package]] name = "petgraph" -version = "0.6.2" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6d5014253a1331579ce62aa67443b4a658c5e7dd03d4bc6d302b94474888143" +checksum = "4dd7d28ee937e54fe3080c91faa1c3a46c06de6252988a7f4592ba2310ef22a4" dependencies = [ "fixedbitset 0.4.2", - "indexmap", + "indexmap 1.9.3", ] [[package]] name = "phf" -version = "0.11.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "928c6535de93548188ef63bb7c4036bd415cd8f36ad25af44b9789b2ee72a48c" +checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" dependencies = [ "phf_shared", ] [[package]] name = "phf_shared" -version = "0.11.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1fb5f6f826b772a8d4c0394209441e7d37cbbb967ae9c7e0e8134365c9ee676" +checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" dependencies = [ "siphasher", ] [[package]] name = "pin-project" -version = "1.0.12" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad29a609b6bcd67fee905812e544992d216af9d755757c05ed2d0e15a74c6ecc" +checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.0.12" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" +checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 1.0.99", + "syn 2.0.28", ] [[package]] name = "pin-project-lite" -version = "0.2.9" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" +checksum = "12cc1b0bf1727a77a54b6654e7b5f1af8604923edc8b81885f8ec92f9e3f0a05" [[package]] name = "pin-utils" @@ -2860,15 +3127,15 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkg-config" -version = "0.3.25" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae" +checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" [[package]] name = "plotters" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2538b639e642295546c50fcd545198c9d64ee2a38620a628724a3b266d5fbf97" +checksum = "d2c224ba00d7cadd4d5c660deaf2098e5e80e07846537c51f9cfa4be50c1fd45" dependencies = [ "num-traits", "plotters-backend", @@ -2879,15 +3146,15 @@ dependencies = [ [[package]] name = "plotters-backend" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "193228616381fecdc1224c62e96946dfbc73ff4384fba576e052ff8c1bea8142" +checksum = "9e76628b4d3a7581389a35d5b6e2139607ad7c75b17aed325f210aa91f4a9609" [[package]] name = "plotters-svg" -version = "0.3.3" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9a81d2759aae1dae668f783c308bc5c8ebd191ff4184aaa1b37f65a6ae5a56f" +checksum = "38f6d39893cca0701371e3c27294f09797214b86f1fb951b89ade8ec04e2abab" dependencies = [ "plotters-backend", ] @@ -2895,7 +3162,7 @@ dependencies = [ [[package]] name = "postgres-native-tls" version = "0.5.0" -source = "git+https://github.com/prisma/rust-postgres?branch=pgbouncer-mode#00d4815e58859261bdfca71c75be7dc657303f7d" +source = "git+https://github.com/prisma/rust-postgres?branch=pgbouncer-mode#429e76047f28e64761ad63bc6cc9335c3d3337b5" dependencies = [ "native-tls", "tokio", @@ -2906,7 +3173,7 @@ dependencies = [ [[package]] name = "postgres-protocol" version = "0.6.4" -source = "git+https://github.com/prisma/rust-postgres?branch=pgbouncer-mode#00d4815e58859261bdfca71c75be7dc657303f7d" +source = "git+https://github.com/prisma/rust-postgres?branch=pgbouncer-mode#429e76047f28e64761ad63bc6cc9335c3d3337b5" dependencies = [ "base64 0.13.1", "byteorder", @@ -2916,14 +3183,14 @@ dependencies = [ "md-5", "memchr", "rand 0.8.5", - "sha2 0.10.5", + "sha2 0.10.7", "stringprep", ] [[package]] name = "postgres-types" version = "0.2.4" -source = "git+https://github.com/prisma/rust-postgres?branch=pgbouncer-mode#00d4815e58859261bdfca71c75be7dc657303f7d" +source = "git+https://github.com/prisma/rust-postgres?branch=pgbouncer-mode#429e76047f28e64761ad63bc6cc9335c3d3337b5" dependencies = [ "bit-vec", "bytes", @@ -2932,14 +3199,14 @@ dependencies = [ "postgres-protocol", "serde", "serde_json", - "uuid 1.1.2", + "uuid", ] [[package]] name = "ppv-lite86" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "pretty-hex" @@ -2949,24 +3216,22 @@ checksum = "c6fa0831dd7cc608c38a5e323422a0077678fa5744aa2be4ad91c4ece8eec8d5" [[package]] name = "pretty_assertions" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a25e9bcb20aa780fd0bb16b72403a9064d6b3f22f026946029acb941a50af755" +checksum = "af7cee1a6c8a5b9208b3cb1061f10c0cb689087b3d8ce85fb9d2dd7a29b6ba66" dependencies = [ - "ctor 0.1.23", "diff", - "output_vt100", "yansi", ] [[package]] name = "priority-queue" -version = "1.3.1" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ca9c6be70d989d21a136eb86c2d83e4b328447fac4a88dace2143c179c86267" +checksum = "fff39edfcaec0d64e8d0da38564fad195d2d51b680940295fcc307366e101e61" dependencies = [ "autocfg", - "indexmap", + "indexmap 1.9.3", ] [[package]] @@ -3000,7 +3265,7 @@ dependencies = [ "prisma-value", "psl", "thiserror", - "uuid 1.1.2", + "uuid", ] [[package]] @@ -3023,7 +3288,16 @@ dependencies = [ "regex", "serde", "serde_json", - "uuid 1.1.2", + "uuid", +] + +[[package]] +name = "proc-macro-crate" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d6ea3c4595b96363c13943497db34af4460fb474a95c43f4446ad341b8c9785" +dependencies = [ + "toml", ] [[package]] @@ -3035,7 +3309,7 @@ dependencies = [ "proc-macro-error-attr", "proc-macro2", "quote", - "syn 1.0.99", + "syn 1.0.109", "version_check", ] @@ -3051,16 +3325,10 @@ dependencies = [ ] [[package]] -name = "proc-macro-hack" -version = "0.5.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" - -[[package]] name = "proc-macro2" -version = "1.0.56" +version = "1.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435" +checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" dependencies = [ "unicode-ident", ] @@ -3087,7 +3355,7 @@ dependencies = [ "lazy_static", "log", "multimap", - "petgraph 0.6.2", + "petgraph 0.6.3", "prost", "prost-types", "regex", @@ -3105,7 +3373,7 @@ dependencies = [ "itertools", "proc-macro2", "quote", - "syn 1.0.99", + "syn 1.0.109", ] [[package]] @@ -3153,6 +3421,26 @@ dependencies = [ ] [[package]] +name = "ptr_meta" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0738ccf7ea06b608c10564b31debd4f5bc5e197fc8bfe088f68ae5ce81e7a4f1" +dependencies = [ + "ptr_meta_derive", +] + +[[package]] +name = "ptr_meta_derive" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] name = "qe-setup" version = "0.1.0" dependencies = [ @@ -3204,7 +3492,7 @@ dependencies = [ "tracing", "tracing-core", "url", - "uuid 1.1.2", + "uuid", ] [[package]] @@ -3231,7 +3519,7 @@ dependencies = [ "async-trait", "chrono", "futures", - "indexmap", + "indexmap 1.9.3", "itertools", "prisma-models", "prisma-value", @@ -3239,7 +3527,7 @@ dependencies = [ "serde_json", "thiserror", "user-facing-errors", - "uuid 1.1.2", + "uuid", ] [[package]] @@ -3254,7 +3542,7 @@ dependencies = [ "cuid", "enumflags2", "futures", - "indexmap", + "indexmap 1.9.3", "itertools", "lru 0.7.8", "once_cell", @@ -3274,7 +3562,7 @@ dependencies = [ "tracing-opentelemetry", "tracing-subscriber", "user-facing-errors", - "uuid 1.1.2", + "uuid", ] [[package]] @@ -3338,7 +3626,7 @@ dependencies = [ "async-trait", "connection-string", "futures", - "js-drivers", + "js-connectors", "napi", "napi-build", "napi-derive", @@ -3386,7 +3674,7 @@ dependencies = [ "tracing", "tracing-futures", "user-facing-errors", - "uuid 1.1.2", + "uuid", ] [[package]] @@ -3396,7 +3684,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 1.0.99", + "syn 1.0.109", ] [[package]] @@ -3408,7 +3696,7 @@ dependencies = [ "enum_dispatch", "enumflags2", "hyper", - "indexmap", + "indexmap 1.9.3", "indoc", "itertools", "nom", @@ -3443,9 +3731,9 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" [[package]] name = "quote" -version = "1.0.26" +version = "1.0.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" +checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965" dependencies = [ "proc-macro2", ] @@ -3487,7 +3775,7 @@ checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ "libc", "rand_chacha 0.3.1", - "rand_core 0.6.3", + "rand_core 0.6.4", ] [[package]] @@ -3507,7 +3795,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" dependencies = [ "ppv-lite86", - "rand_core 0.6.3", + "rand_core 0.6.4", ] [[package]] @@ -3521,11 +3809,11 @@ dependencies = [ [[package]] name = "rand_core" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.7", + "getrandom 0.2.10", ] [[package]] @@ -3539,9 +3827,9 @@ dependencies = [ [[package]] name = "raw-cpuid" -version = "10.6.0" +version = "10.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6823ea29436221176fe662da99998ad3b4db2c7f31e7b6f5fe43adccd6320bb" +checksum = "6c297679cb867470fa8c9f67dbba74a78d78e3e98d7cf2b08d6d71540f797332" dependencies = [ "bitflags 1.3.2", ] @@ -3578,14 +3866,24 @@ dependencies = [ ] [[package]] +name = "redox_syscall" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] name = "regex" -version = "1.7.3" +version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b1f693b24f6ac912f4893ef08244d70b6067480d2f1a46e950c9691e6749d1d" +checksum = "81bc1d4caf89fac26a70747fe603c130093b53c773888797a6329091246d651a" dependencies = [ - "aho-corasick", + "aho-corasick 1.0.3", "memchr", - "regex-syntax", + "regex-automata 0.3.6", + "regex-syntax 0.7.4", ] [[package]] @@ -3594,7 +3892,18 @@ version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" dependencies = [ - "regex-syntax", + "regex-syntax 0.6.29", +] + +[[package]] +name = "regex-automata" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fed1ceff11a1dddaee50c9dc8e4938bd106e9d89ae372f192311e7da498e3b69" +dependencies = [ + "aho-corasick 1.0.3", + "memchr", + "regex-syntax 0.7.4", ] [[package]] @@ -3604,6 +3913,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] +name = "regex-syntax" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" + +[[package]] +name = "rend" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "581008d2099240d37fb08d77ad713bcaec2c4d89d50b5b21a8bb1996bbab68ab" +dependencies = [ + "bytecheck", +] + +[[package]] name = "request-handlers" version = "0.1.0" dependencies = [ @@ -3613,7 +3937,7 @@ dependencies = [ "dmmf", "futures", "graphql-parser", - "indexmap", + "indexmap 1.9.3", "insta", "itertools", "mongodb-query-connector", @@ -3634,11 +3958,11 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.11.16" +version = "0.11.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27b71749df584b7f4cac2c426c127a7c785a5106cc98f7a8feb044115f0fa254" +checksum = "cde824a14b7c14f85caff81225f411faacc04a2013f41670f41443742b1c1c55" dependencies = [ - "base64 0.21.0", + "base64 0.21.2", "bytes", "encoding_rs", "futures-core", @@ -3695,12 +4019,40 @@ dependencies = [ ] [[package]] +name = "rkyv" +version = "0.7.42" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0200c8230b013893c0b2d6213d6ec64ed2b9be2e0e016682b7224ff82cff5c58" +dependencies = [ + "bitvec", + "bytecheck", + "hashbrown 0.12.3", + "ptr_meta", + "rend", + "rkyv_derive", + "seahash", + "tinyvec", + "uuid", +] + +[[package]] +name = "rkyv_derive" +version = "0.7.42" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2e06b915b5c230a17d7a736d1e2e63ee753c256a8614ef3f5147b13a4f5541d" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] name = "rusqlite" version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "549b9d036d571d42e6e85d1c1425e2ac83491075078ca9a15be021c56b1641f2" dependencies = [ - "bitflags 2.1.0", + "bitflags 2.4.0", "chrono", "fallible-iterator", "fallible-streaming-iterator", @@ -3711,20 +4063,26 @@ dependencies = [ [[package]] name = "rust_decimal" -version = "1.26.1" +version = "1.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee9164faf726e4f3ece4978b25ca877ddc6802fa77f38cdccb32c7f805ecd70c" +checksum = "4a2ab0025103a60ecaaf3abf24db1db240a4e1c15837090d2c32f625ac98abea" dependencies = [ - "arrayvec 0.7.2", + "arrayvec 0.7.4", + "borsh", + "byteorder", + "bytes", "num-traits", + "rand 0.8.5", + "rkyv", "serde", + "serde_json", ] [[package]] name = "rustc-demangle" -version = "0.1.21" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" [[package]] name = "rustc-hash" @@ -3742,27 +4100,35 @@ dependencies = [ ] [[package]] +name = "rustc_version" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +dependencies = [ + "semver 1.0.18", +] + +[[package]] name = "rustc_version_runtime" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d31b7153270ebf48bf91c65ae5b0c00e749c4cfad505f66530ac74950249582f" dependencies = [ - "rustc_version", + "rustc_version 0.2.3", "semver 0.9.0", ] [[package]] name = "rustix" -version = "0.36.13" +version = "0.38.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a38f9520be93aba504e8ca974197f46158de5dcaa9fa04b57c57cd6a679d658" +checksum = "19ed4fa021d81c8392ce04db050a3da9a60299050b7ae1cf482d862b54a7218f" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.0", "errno", - "io-lifetimes", "libc", "linux-raw-sys", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] @@ -3780,9 +4146,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.20.6" +version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aab8ee6c7097ed6057f43c187a62418d0c05a4bd5f18b3571db50ee0f9ce033" +checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f" dependencies = [ "log", "ring", @@ -3804,18 +4170,18 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "0.3.0" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ee86d63972a7c661d1536fefe8c3c8407321c3df668891286de28abcd087360" +checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" dependencies = [ - "base64 0.13.1", + "base64 0.21.2", ] [[package]] name = "ryu" -version = "1.0.11" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09" +checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" [[package]] name = "same-file" @@ -3834,11 +4200,11 @@ checksum = "ece8e78b2f38ec51c51f5d475df0a7187ba5111b2a28bdc761ee05b075d40a71" [[package]] name = "schannel" -version = "0.1.21" +version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3" +checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" dependencies = [ - "windows-sys 0.42.0", + "windows-sys 0.48.0", ] [[package]] @@ -3929,9 +4295,9 @@ dependencies = [ [[package]] name = "scopeguard" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "sct" @@ -3954,10 +4320,16 @@ dependencies = [ ] [[package]] +name = "seahash" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" + +[[package]] name = "security-framework" -version = "2.7.0" +version = "2.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bc1bb97804af6631813c55739f771071e0f2ed33ee20b68c86ec505d906356c" +checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" dependencies = [ "bitflags 1.3.2", "core-foundation", @@ -3968,9 +4340,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.6.1" +version = "2.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0160a13a177a45bfb43ce71c01580998474f556ad854dcbca936dd2841a5c556" +checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" dependencies = [ "core-foundation-sys", "libc", @@ -3987,9 +4359,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" +checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" [[package]] name = "semver-parser" @@ -3999,40 +4371,40 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.144" +version = "1.0.183" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f747710de3dcd43b88c9168773254e809d8ddbdf9653b84e2554ab219f17860" +checksum = "32ac8da02677876d532745a130fc9d8e6edfa81a269b107c5b00829b91d8eb3c" dependencies = [ "serde_derive", ] [[package]] name = "serde_bytes" -version = "0.11.7" +version = "0.11.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfc50e8183eeeb6178dcb167ae34a8051d63535023ae38b5d8d12beae193d37b" +checksum = "ab33ec92f677585af6d88c65593ae2375adde54efdbf16d597f2cbc7a6d368ff" dependencies = [ "serde", ] [[package]] name = "serde_derive" -version = "1.0.144" +version = "1.0.183" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94ed3a816fb1d101812f83e789f888322c34e291f894f19590dc310963e87a00" +checksum = "aafe972d60b0b9bee71a91b92fee2d4fb3c9d7e8f6b179aa99f27203d99a4816" dependencies = [ "proc-macro2", "quote", - "syn 1.0.99", + "syn 2.0.28", ] [[package]] name = "serde_json" -version = "1.0.85" +version = "1.0.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e55a28e3aaef9d5ce0506d0a14dbba8054ddc7e499ef522dd8b26859ec9d4a44" +checksum = "076066c5f1078eac5b722a31827a8832fe108bed65dfa75e233c89f8206e976c" dependencies = [ - "indexmap", + "indexmap 2.0.0", "itoa", "ryu", "serde", @@ -4040,13 +4412,13 @@ dependencies = [ [[package]] name = "serde_repr" -version = "0.1.9" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fe39d9fbb0ebf5eb2c7cb7e2a47e4f462fad1379f1166b8ae49ad9eae89a7ca" +checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00" dependencies = [ "proc-macro2", "quote", - "syn 1.0.99", + "syn 2.0.28", ] [[package]] @@ -4080,14 +4452,14 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 1.0.99", + "syn 1.0.109", ] [[package]] name = "serial_test" -version = "0.9.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92761393ee4dc3ff8f4af487bd58f4307c9329bbedea02cac0089ad9c411e153" +checksum = "0e56dd856803e253c8f298af3f4d7eb0ae5e23a737252cd90bb4f3b435033b2d" dependencies = [ "dashmap", "futures", @@ -4099,36 +4471,35 @@ dependencies = [ [[package]] name = "serial_test_derive" -version = "0.9.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b6f5d1c3087fb119617cff2966fe3808a80e5eb59a8c1601d5994d66f4346a5" +checksum = "91d129178576168c589c9ec973feedf7d3126c01ac2bf08795109aa35b69fb8f" dependencies = [ - "proc-macro-error", "proc-macro2", "quote", - "syn 1.0.99", + "syn 2.0.28", ] [[package]] name = "sha-1" -version = "0.10.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "028f48d513f9678cda28f6e4064755b3fbb2af6acd672f2c209b62323f7aea0f" +checksum = "f5058ada175748e33390e40e872bd0fe59a19f265d0158daa551c5a88a76009c" dependencies = [ "cfg-if", "cpufeatures", - "digest 0.10.3", + "digest 0.10.7", ] [[package]] name = "sha1" -version = "0.10.4" +version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "006769ba83e921b3085caa8334186b00cf92b4cb1a6cf4632fbccc8eff5c7549" +checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" dependencies = [ "cfg-if", "cpufeatures", - "digest 0.10.3", + "digest 0.10.7", ] [[package]] @@ -4146,13 +4517,23 @@ dependencies = [ [[package]] name = "sha2" -version = "0.10.5" +version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9db03534dff993187064c4e0c05a5708d2a9728ace9a8959b77bedf415dac5" +checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8" dependencies = [ "cfg-if", "cpufeatures", - "digest 0.10.3", + "digest 0.10.7", +] + +[[package]] +name = "sha3" +version = "0.10.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75872d278a8f37ef87fa0ddbda7802605cb18344497949862c0d4dcb291eba60" +dependencies = [ + "digest 0.10.7", + "keccak", ] [[package]] @@ -4172,14 +4553,20 @@ checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" [[package]] name = "signal-hook-registry" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0" +checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" dependencies = [ "libc", ] [[package]] +name = "simdutf8" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a" + +[[package]] name = "similar" version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4202,30 +4589,40 @@ checksum = "04d2ecae5fcf33b122e2e6bd520a57ccf152d2dde3b38c71039df1a6867264ee" [[package]] name = "slab" -version = "0.4.7" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef" +checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" dependencies = [ "autocfg", ] [[package]] name = "smallvec" -version = "1.9.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fd0db749597d91ff862fd1d55ea87f7855a744a8425a64695b6fca237d1dad1" +checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" [[package]] name = "socket2" -version = "0.4.7" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd" +checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" dependencies = [ "libc", "winapi", ] [[package]] +name = "socket2" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877" +dependencies = [ + "libc", + "windows-sys 0.48.0", +] + +[[package]] name = "spin" version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4321,7 +4718,7 @@ dependencies = [ "tracing-futures", "tracing-opentelemetry", "user-facing-errors", - "uuid 1.1.2", + "uuid", ] [[package]] @@ -4351,7 +4748,7 @@ dependencies = [ "tracing-futures", "url", "user-facing-errors", - "uuid 1.1.2", + "uuid", ] [[package]] @@ -4363,7 +4760,7 @@ dependencies = [ "either", "enumflags2", "expect-test", - "indexmap", + "indexmap 1.9.3", "indoc", "once_cell", "pretty_assertions", @@ -4408,9 +4805,9 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] name = "stringprep" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ee348cb74b87454fff4b551cbf727025810a004f88aeacae7f85b87f4e9a1c1" +checksum = "db3737bde7edce97102e0e2b15365bf7a20bfdb5f60f4f9e8d7004258a51a8da" dependencies = [ "unicode-bidi", "unicode-normalization", @@ -4458,7 +4855,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 1.0.99", + "syn 1.0.109", ] [[package]] @@ -4473,15 +4870,15 @@ dependencies = [ [[package]] name = "subtle" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" +checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" [[package]] name = "syn" -version = "1.0.99" +version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58dbef6ec655055e20b86b15a8cc6d439cca19b667537ac6a1369572d151ab13" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ "proc-macro2", "quote", @@ -4490,9 +4887,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.14" +version = "2.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcf316d5356ed6847742d036f8a39c3b8435cac10bd528a4bd461928a6ab34d5" +checksum = "04361975b3f5e348b2189d8dc55bc942f278b2d482a6a0365de5bdd62d351567" dependencies = [ "proc-macro2", "quote", @@ -4500,6 +4897,18 @@ dependencies = [ ] [[package]] +name = "synstructure" +version = "0.12.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", + "unicode-xid", +] + +[[package]] name = "take_mut" version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4513,25 +4922,15 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "tempfile" -version = "3.4.0" +version = "3.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af18f7ae1acd354b992402e9ec5864359d693cd8a79dcbef59f76891701c1e95" +checksum = "dc02fddf48964c42031a0b3fe0428320ecf3a73c401040fc0096f97794310651" dependencies = [ "cfg-if", "fastrand", - "redox_syscall", + "redox_syscall 0.3.5", "rustix", - "windows-sys 0.42.0", -] - -[[package]] -name = "terminal_size" -version = "0.1.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "633c1a546cee861a1a6d0dc69ebeca693bf4296661ba7852b9d21d159e0506df" -dependencies = [ - "libc", - "winapi", + "windows-sys 0.48.0", ] [[package]] @@ -4560,7 +4959,7 @@ version = "0.1.0" dependencies = [ "proc-macro2", "quote", - "syn 1.0.99", + "syn 1.0.109", ] [[package]] @@ -4596,30 +4995,31 @@ checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" [[package]] name = "thiserror" -version = "1.0.34" +version = "1.0.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c1b05ca9d106ba7d2e31a9dab4a64e7be2cce415321966ea3132c49a656e252" +checksum = "611040a08a0439f8248d1990b111c95baa9c704c805fa1f62104b39655fd7f90" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.34" +version = "1.0.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8f2591983642de85c921015f3f070c665a197ed69e417af436115e3a1407487" +checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96" dependencies = [ "proc-macro2", "quote", - "syn 1.0.99", + "syn 2.0.28", ] [[package]] name = "thread_local" -version = "1.1.4" +version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5516c27b78311c50bf42c071425c560ac799b11c30b31f87e3081965fe5e0180" +checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" dependencies = [ + "cfg-if", "once_cell", ] @@ -4649,9 +5049,9 @@ dependencies = [ "pretty-hex", "thiserror", "tokio", - "tokio-util 0.7.3", + "tokio-util 0.7.8", "tracing", - "uuid 1.1.2", + "uuid", "winauth", ] @@ -4667,21 +5067,31 @@ dependencies = [ [[package]] name = "time" -version = "0.3.14" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c3f9a28b618c3a6b9251b6908e9c99e04b9e5c02e6581ccbb67d59c34ef7f9b" +checksum = "b0fdd63d58b18d663fbdf70e049f00a22c8e42be082203be7f26589213cd75ea" dependencies = [ + "deranged", "itoa", - "libc", - "num_threads", + "serde", + "time-core", "time-macros", ] [[package]] +name = "time-core" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" + +[[package]] name = "time-macros" -version = "0.2.4" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42657b1a6f4d817cda8e7a0ace261fe0cc946cf3a80314390b22cc61ae080792" +checksum = "eb71511c991639bb078fd5bf97757e03914361c48100d52878b8e52b46fb92cd" +dependencies = [ + "time-core", +] [[package]] name = "tinytemplate" @@ -4704,28 +5114,27 @@ dependencies = [ [[package]] name = "tinyvec_macros" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.25.0" +version = "1.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8e00990ebabbe4c14c08aca901caed183ecd5c09562a12c824bb53d3c3fd3af" +checksum = "2d3ce25f50619af8b0aec2eb23deebe84249e19e2ddd393a6e16e3300a6dadfd" dependencies = [ - "autocfg", + "backtrace", "bytes", "libc", - "memchr", "mio", "num_cpus", "parking_lot 0.12.1", "pin-project-lite", "signal-hook-registry", - "socket2", + "socket2 0.5.3", "tokio-macros", - "windows-sys 0.42.0", + "windows-sys 0.48.0", ] [[package]] @@ -4740,13 +5149,13 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "1.8.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9724f9a975fb987ef7a3cd9be0350edcbe130698af5b8f7a631e23d42d052484" +checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 1.0.99", + "syn 2.0.28", ] [[package]] @@ -4762,7 +5171,7 @@ dependencies = [ [[package]] name = "tokio-postgres" version = "0.7.7" -source = "git+https://github.com/prisma/rust-postgres?branch=pgbouncer-mode#00d4815e58859261bdfca71c75be7dc657303f7d" +source = "git+https://github.com/prisma/rust-postgres?branch=pgbouncer-mode#429e76047f28e64761ad63bc6cc9335c3d3337b5" dependencies = [ "async-trait", "byteorder", @@ -4777,9 +5186,9 @@ dependencies = [ "pin-project-lite", "postgres-protocol", "postgres-types", - "socket2", + "socket2 0.5.3", "tokio", - "tokio-util 0.7.3", + "tokio-util 0.7.8", ] [[package]] @@ -4799,16 +5208,16 @@ version = "0.23.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" dependencies = [ - "rustls 0.20.6", + "rustls 0.20.8", "tokio", "webpki 0.22.0", ] [[package]] name = "tokio-stream" -version = "0.1.11" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d660770404473ccd7bc9f8b28494a811bc18542b915c0855c51e8f419d5223ce" +checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" dependencies = [ "futures-core", "pin-project-lite", @@ -4832,9 +5241,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.3" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc463cd8deddc3770d20f9852143d50bf6094e640b485cb2e189a2099085ff45" +checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" dependencies = [ "bytes", "futures-core", @@ -4847,9 +5256,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.5.9" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7" +checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" dependencies = [ "serde", ] @@ -4896,7 +5305,7 @@ dependencies = [ "proc-macro2", "prost-build", "quote", - "syn 1.0.99", + "syn 1.0.109", ] [[package]] @@ -4907,13 +5316,13 @@ checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" dependencies = [ "futures-core", "futures-util", - "indexmap", + "indexmap 1.9.3", "pin-project", "pin-project-lite", "rand 0.8.5", "slab", "tokio", - "tokio-util 0.7.3", + "tokio-util 0.7.8", "tower-layer", "tower-service", "tracing", @@ -4933,9 +5342,9 @@ checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" [[package]] name = "tracing" -version = "0.1.36" +version = "0.1.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fce9567bd60a67d08a16488756721ba392f24f29006402881e43b19aac64307" +checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" dependencies = [ "cfg-if", "log", @@ -4946,20 +5355,20 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.22" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11c75893af559bc8e10716548bdef5cb2b983f8e637db9d0e15126b61b484ee2" +checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote", - "syn 1.0.99", + "syn 2.0.28", ] [[package]] name = "tracing-core" -version = "0.1.29" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aeea4303076558a00714b823f9ad67d58a3bbda1df83d8827d21193156e22f7" +checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" dependencies = [ "once_cell", "valuable", @@ -5022,20 +5431,20 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.11" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bc28f93baff38037f64e6f43d34cfa1605f27a49c34e8a04c5e78b0babf2596" +checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" dependencies = [ - "ansi_term", - "lazy_static", "matchers", + "nu-ansi-term", + "once_cell", "regex", "serde", "serde_json", "sharded-slab", "smallvec", "thread_local", - "time 0.3.14", + "time 0.3.25", "tracing", "tracing-core", "tracing-log", @@ -5055,7 +5464,7 @@ dependencies = [ "futures-channel", "futures-io", "futures-util", - "idna", + "idna 0.2.3", "ipnet", "lazy_static", "log", @@ -5089,9 +5498,9 @@ dependencies = [ [[package]] name = "try-lock" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" +checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" [[package]] name = "twox-hash" @@ -5112,53 +5521,59 @@ checksum = "89851716b67b937e393b3daa8423e67ddfc4bbbf1654bcf05488e95e0828db0c" dependencies = [ "proc-macro2", "quote", - "syn 1.0.99", + "syn 1.0.109", ] [[package]] name = "typenum" -version = "1.15.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" +checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" [[package]] name = "ucd-trie" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e79c4d996edb816c91e4308506774452e55e95c3c9de07b6729e17e15a5ef81" +checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" [[package]] name = "unicode-bidi" -version = "0.3.8" +version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992" +checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" -version = "1.0.3" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4f5b37a154999a8f3f98cc23a628d850e154479cd94decf3414696e12e31aaf" +checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" [[package]] name = "unicode-normalization" -version = "0.1.21" +version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "854cbdc4f7bc6ae19c820d44abdc3277ac3e1b2b93db20a636825d9322fb60e6" +checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" dependencies = [ "tinyvec", ] [[package]] name = "unicode-segmentation" -version = "1.9.0" +version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e8820f5d777f6224dc4be3632222971ac30164d4a258d595640799554ebfd99" +checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" [[package]] name = "unicode-width" -version = "0.1.9" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973" +checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" + +[[package]] +name = "unicode-xid" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" [[package]] name = "unicode_categories" @@ -5183,12 +5598,12 @@ checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" [[package]] name = "url" -version = "2.3.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22fe195a4f217c25b25cb5058ced57059824a678474874038dc88d211bf508d3" +checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" dependencies = [ "form_urlencoded", - "idna", + "idna 0.4.0", "percent-encoding", "serde", ] @@ -5199,7 +5614,7 @@ version = "0.1.0" dependencies = [ "proc-macro2", "quote", - "syn 1.0.99", + "syn 1.0.109", ] [[package]] @@ -5224,26 +5639,17 @@ checksum = "5190c9442dcdaf0ddd50f37420417d219ae5261bbf5db120d0f9bab996c9cba1" [[package]] name = "utf8parse" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "936e4b492acfd135421d8dca4b1aa80a7bfc26e702ef3af710e0752684df5372" - -[[package]] -name = "uuid" -version = "0.8.2" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" -dependencies = [ - "getrandom 0.2.7", -] +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "uuid" -version = "1.1.2" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd6469f4314d5f1ffec476e05f17cc9a78bc7a27a6a857842170bdf8d6f98d2f" +checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d" dependencies = [ - "getrandom 0.2.7", + "getrandom 0.2.10", "serde", ] @@ -5310,11 +5716,10 @@ dependencies = [ [[package]] name = "want" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" dependencies = [ - "log", "try-lock", ] @@ -5357,15 +5762,15 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 1.0.99", + "syn 1.0.109", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.29" +version = "0.4.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2eb6ec270a31b1d3c7e266b999739109abce8b6c87e4b31fcfcd788b65267395" +checksum = "f219e0d211ba40266969f6dbdd90636da12f75bee4fc9d6c23d1260dadb51454" dependencies = [ "cfg-if", "js-sys", @@ -5391,7 +5796,7 @@ checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" dependencies = [ "proc-macro2", "quote", - "syn 1.0.99", + "syn 1.0.109", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -5415,9 +5820,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.56" +version = "0.3.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c060b319f29dd25724f09a2ba1418f142f539b2be99fbf4d2d5a8f7330afb8eb" +checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97" dependencies = [ "js-sys", "wasm-bindgen", @@ -5445,18 +5850,18 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.22.4" +version = "0.22.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1c760f0d366a6c24a02ed7816e23e691f5d92291f94d15e836006fd11b04daf" +checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87" dependencies = [ "webpki 0.22.0", ] [[package]] name = "which" -version = "4.3.0" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c831fbbee9e129a8cf93e7747a82da9d95ba8e16621cae60ec2cdc849bacb7b" +checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269" dependencies = [ "either", "libc", @@ -5465,9 +5870,9 @@ dependencies = [ [[package]] name = "widestring" -version = "0.5.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17882f045410753661207383517a6f62ec3dbeb6a4ed2acce01f0728238d1983" +checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8" [[package]] name = "winapi" @@ -5514,18 +5919,12 @@ dependencies = [ ] [[package]] -name = "windows-sys" -version = "0.42.0" +name = "windows" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" dependencies = [ - "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 0.42.1", - "windows_x86_64_msvc 0.42.1", + "windows-targets 0.48.1", ] [[package]] @@ -5534,7 +5933,7 @@ version = "0.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" dependencies = [ - "windows-targets 0.42.1", + "windows-targets 0.42.2", ] [[package]] @@ -5543,29 +5942,29 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets 0.48.0", + "windows-targets 0.48.1", ] [[package]] name = "windows-targets" -version = "0.42.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7" +checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" dependencies = [ - "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 0.42.1", - "windows_x86_64_msvc 0.42.1", + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", ] [[package]] name = "windows-targets" -version = "0.48.0" +version = "0.48.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" +checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" dependencies = [ "windows_aarch64_gnullvm 0.48.0", "windows_aarch64_msvc 0.48.0", @@ -5578,9 +5977,9 @@ dependencies = [ [[package]] name = "windows_aarch64_gnullvm" -version = "0.42.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" [[package]] name = "windows_aarch64_gnullvm" @@ -5590,9 +5989,9 @@ checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" [[package]] name = "windows_aarch64_msvc" -version = "0.42.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" [[package]] name = "windows_aarch64_msvc" @@ -5602,9 +6001,9 @@ checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" [[package]] name = "windows_i686_gnu" -version = "0.42.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" [[package]] name = "windows_i686_gnu" @@ -5614,9 +6013,9 @@ checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" [[package]] name = "windows_i686_msvc" -version = "0.42.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" [[package]] name = "windows_i686_msvc" @@ -5626,9 +6025,9 @@ checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" [[package]] name = "windows_x86_64_gnu" -version = "0.42.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" [[package]] name = "windows_x86_64_gnu" @@ -5638,9 +6037,9 @@ checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" [[package]] name = "windows_x86_64_gnullvm" -version = "0.42.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" [[package]] name = "windows_x86_64_gnullvm" @@ -5650,9 +6049,9 @@ checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" [[package]] name = "windows_x86_64_msvc" -version = "0.42.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" [[package]] name = "windows_x86_64_msvc" @@ -5662,27 +6061,28 @@ checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" [[package]] name = "winreg" -version = "0.7.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0120db82e8a1e0b9fb3345a539c478767c0048d842860994d96113d5b667bd69" +checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" dependencies = [ "winapi", ] [[package]] name = "winreg" -version = "0.10.1" +version = "0.50.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" +checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" dependencies = [ - "winapi", + "cfg-if", + "windows-sys 0.48.0", ] [[package]] name = "wyz" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30b31594f29d27036c383b53b59ed3476874d518f0efb151b27a4c275141390e" +checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" dependencies = [ "tap", ] diff --git a/nixpkgs/pkgs/development/tools/database/prisma-engines/default.nix b/nixpkgs/pkgs/development/tools/database/prisma-engines/default.nix index f1f8c77410aa..bb76554c3d0d 100644 --- a/nixpkgs/pkgs/development/tools/database/prisma-engines/default.nix +++ b/nixpkgs/pkgs/development/tools/database/prisma-engines/default.nix @@ -14,13 +14,13 @@ # function correctly. rustPlatform.buildRustPackage rec { pname = "prisma-engines"; - version = "5.0.0"; + version = "5.2.0"; src = fetchFromGitHub { owner = "prisma"; repo = "prisma-engines"; rev = version; - sha256 = "sha256-/1wTqVvGUmN6PmoP6jXgUIB7QKkvkT5Rsg+L5zr4oN0="; + sha256 = "sha256-7bZ6qy5AL7c2F6HfyM7/G36XTkSVsq+T+xxNlrBCXL4="; }; # Use system openssl. @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec { "barrel-0.6.6-alpha.0" = "sha256-USh0lQ1z+3Spgc69bRFySUzhuY79qprLlEExTmYWFN8="; "graphql-parser-0.3.0" = "sha256-0ZAsj2mW6fCLhwTETucjbu4rPNzfbNiHu2wVTBlTNe4="; "mysql_async-0.31.3" = "sha256-QIO9s0Upc0/1W7ux1RNJNGKqzO4gB4gMV3NoakAbxkQ="; - "postgres-native-tls-0.5.0" = "sha256-OYbtGYAvDDCTeYfhav/BI2LJSyMyUERD7xa8GA/57rI="; + "postgres-native-tls-0.5.0" = "sha256-150GAIccGDAD+t/iWkLbXe4SblrW/KUcxkTy4Mrie5U="; }; }; diff --git a/nixpkgs/pkgs/development/tools/database/prqlc/default.nix b/nixpkgs/pkgs/development/tools/database/prqlc/default.nix index 0af504f5642e..dcb72c4e42c4 100644 --- a/nixpkgs/pkgs/development/tools/database/prqlc/default.nix +++ b/nixpkgs/pkgs/development/tools/database/prqlc/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "prqlc"; - version = "0.9.3"; + version = "0.9.4"; src = fetchFromGitHub { owner = "prql"; repo = "prql"; rev = version; - hash = "sha256-m5W7ddGlgxaQR+nCFygfLWU6QBDUOK9POPdR2H62j9Q="; + hash = "sha256-9BDBuAaer92BAwQexkZOyt99VXEbJT6/87DoCqVzjcQ="; }; - cargoHash = "sha256-7vjDWiod52fuAPHbB/UmqG9YZb8GvyZGMgdYr2qI+uM="; + cargoHash = "sha256-LeMl9t2ZYsBFuGnxJVvfmnjKFVIVO8ChmXQhXcSYV6s="; nativeBuildInputs = [ pkg-config diff --git a/nixpkgs/pkgs/development/tools/database/sqlc/default.nix b/nixpkgs/pkgs/development/tools/database/sqlc/default.nix index 92a740ac0a7a..b602704c928e 100644 --- a/nixpkgs/pkgs/development/tools/database/sqlc/default.nix +++ b/nixpkgs/pkgs/development/tools/database/sqlc/default.nix @@ -1,7 +1,7 @@ { lib, buildGoModule, fetchFromGitHub }: let - version = "1.20.0"; + version = "1.21.0"; in buildGoModule { pname = "sqlc"; @@ -10,12 +10,12 @@ buildGoModule { src = fetchFromGitHub { owner = "sqlc-dev"; repo = "sqlc"; - rev = "v${version}"; - sha256 = "sha256-ITW5jIlNoiW7sl6s5jCVRELglauZzSPmAj3PXVpdIGA="; + rev = "v${version}"; + hash = "sha256-BJKqVSyMjTedMuao8Bz92+B64B/x3M3MXKbSF+d0kDE="; }; proxyVendor = true; - vendorHash = "sha256-5ZJPHdjg3QCB/hJ+C7oXSfzBfg0fZ+kFyMXqC7KpJmY="; + vendorHash = "sha256-AnPC0x5V8ce9KH0B4Ujz2MrTIJA+P/BZG+fsRJ3LM78="; subPackages = [ "cmd/sqlc" ]; diff --git a/nixpkgs/pkgs/development/tools/database/vitess/default.nix b/nixpkgs/pkgs/development/tools/database/vitess/default.nix index 1b3d0a849110..da9740740615 100644 --- a/nixpkgs/pkgs/development/tools/database/vitess/default.nix +++ b/nixpkgs/pkgs/development/tools/database/vitess/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "vitess"; - version = "17.0.1"; + version = "17.0.2"; src = fetchFromGitHub { owner = "vitessio"; repo = pname; rev = "v${version}"; - hash = "sha256-EvCH1NxsGQzkXv0i5WOZXG9jeile0IHyZAoINgBIwYs="; + hash = "sha256-uST+FtYhGIn/Tieyofbh2r8xonw8qsS6ODrpd/A27r4="; }; vendorHash = "sha256-0OrPbMG7ElOD+9/kWx1HtvGUBiFpIsNs5Vu7QofzE6Q="; diff --git a/nixpkgs/pkgs/development/tools/djlint/default.nix b/nixpkgs/pkgs/development/tools/djlint/default.nix new file mode 100644 index 000000000000..ba3e5606d095 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/djlint/default.nix @@ -0,0 +1,45 @@ +{ lib +, python3 +, fetchFromGitHub +}: + +python3.pkgs.buildPythonApplication rec { + pname = "djlint"; + version = "1.32.1"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "Riverside-Healthcare"; + repo = "djlint"; + rev = "v${version}"; + hash = "sha256-///ZEkVohioloBJn6kxpEK5wmCzMp9ZYeAH1mONOA0E="; + }; + + nativeBuildInputs = [ + python3.pkgs.poetry-core + ]; + + propagatedBuildInputs = with python3.pkgs; [ + click + colorama + cssbeautifier + html-tag-names + html-void-elements + jsbeautifier + json5 + pathspec + pyyaml + regex + tomli + tqdm + ]; + + pythonImportsCheck = [ "djlint" ]; + + meta = with lib; { + description = "HTML Template Linter and Formatter. Django - Jinja - Nunjucks - Handlebars - GoLang"; + homepage = "https://github.com/Riverside-Healthcare/djlint"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ traxys ]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/ejs/default.nix b/nixpkgs/pkgs/development/tools/ejs/default.nix new file mode 100644 index 000000000000..5392a9c137a2 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/ejs/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildNpmPackage +, fetchFromGitHub +}: + +buildNpmPackage rec { + pname = "ejs"; + version = "3.1.9"; + + src = fetchFromGitHub { + owner = "mde"; + repo = "ejs"; + rev = "v${version}"; + hash = "sha256-bOZclhsnV3onxc32ZGfLpuGS5Jz6S12/BmkmwL4M6Dg="; + }; + + npmDepsHash = "sha256-829eWfJiMw9KRlhdmzD0ha//bgUQ5nPEzO+ayUPLxXY="; + + buildPhase = '' + runHook preBuild + + ./node_modules/.bin/jake build + + runHook postBuild + ''; + + meta = { + description = "Embedded JavaScript templates"; + homepage = "http://ejs.co"; + license = lib.licenses.asl20; + mainProgram = "ejs"; + maintainers = with lib.maintainers; [ wolfangaukang ]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/flyway/default.nix b/nixpkgs/pkgs/development/tools/flyway/default.nix index 4fec2ef0c065..54f2056732b9 100644 --- a/nixpkgs/pkgs/development/tools/flyway/default.nix +++ b/nixpkgs/pkgs/development/tools/flyway/default.nix @@ -1,10 +1,11 @@ -{ lib, stdenv, fetchurl, jre_headless, makeWrapper }: -stdenv.mkDerivation rec{ +{ lib, stdenv, fetchurl, jre_headless, makeWrapper, testers }: + +stdenv.mkDerivation (finalAttrs: { pname = "flyway"; - version = "9.21.2"; + version = "9.22.0"; src = fetchurl { - url = "mirror://maven/org/flywaydb/flyway-commandline/${version}/flyway-commandline-${version}.tar.gz"; - sha256 = "sha256-7MIjXF1qgEye2Z/cyeuSFkEmXT8AxkwYfw+/UevsPFg="; + url = "mirror://maven/org/flywaydb/flyway-commandline/${finalAttrs.version}/flyway-commandline-${finalAttrs.version}.tar.gz"; + sha256 = "sha256-vdg66ETDfa0WG1TrRWJ9XpMSCE9sd5GlYAJY2TERC5Y="; }; nativeBuildInputs = [ makeWrapper ]; dontBuild = true; @@ -12,13 +13,16 @@ stdenv.mkDerivation rec{ installPhase = '' mkdir -p $out/bin $out/share/flyway cp -r sql jars drivers conf $out/share/flyway - install -Dt $out/share/flyway/lib lib/community/*.jar lib/*.jar + install -Dt $out/share/flyway/lib lib/community/*.jar lib/*.jar lib/aad/*.jar lib/oracle_wallet/*.jar makeWrapper "${jre_headless}/bin/java" $out/bin/flyway \ --add-flags "-Djava.security.egd=file:/dev/../dev/urandom" \ --add-flags "-classpath '$out/share/flyway/lib/*:$out/share/flyway/drivers/*'" \ --add-flags "org.flywaydb.commandline.Main" \ --add-flags "-jarDirs='$out/share/flyway/jars'" ''; + passthru.tests = { + version = testers.testVersion { package = finalAttrs.finalPackage; }; + }; meta = with lib; { description = "Evolve your Database Schema easily and reliably across all your instances"; longDescription = '' @@ -30,9 +34,10 @@ stdenv.mkDerivation rec{ ''; downloadPage = "https://github.com/flyway/flyway"; homepage = "https://flywaydb.org/"; + changelog = "https://documentation.red-gate.com/fd/release-notes-for-flyway-engine-179732572.html"; sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.asl20; platforms = platforms.unix; maintainers = [ maintainers.cmcdragonkai ]; }; -} +}) diff --git a/nixpkgs/pkgs/development/tools/fmbt/default.nix b/nixpkgs/pkgs/development/tools/fmbt/default.nix deleted file mode 100644 index 852f00bf69c1..000000000000 --- a/nixpkgs/pkgs/development/tools/fmbt/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, python, autoreconfHook, pkg-config, makeWrapper -, flex -, gettext, libedit, glib, imagemagick6, libxml2, boost, gnuplot, graphviz -, tesseract, gts, libXtst -}: -stdenv.mkDerivation rec { - version = "0.42"; - pname = "fMBT"; - - src = fetchFromGitHub { - owner = "intel"; - repo = "fMBT"; - rev = "v${version}"; - sha256 = "1jb9nb2mipc5cg99a80dny4m06vz2zral0q30fv75rz2cb6ja4zp"; - }; - - nativeBuildInputs = [ autoreconfHook pkg-config flex makeWrapper - python.pkgs.wrapPython ]; - - buildInputs = [ python gettext libedit glib imagemagick6 libxml2 boost - gnuplot graphviz tesseract gts - ]; - - propagatedBuildInputs = with python.pkgs; [ - pyside pydbus pexpect pysideShiboken - ]; - - preBuild = '' - export PYTHONPATH="$PYTHONPATH:$out/lib/python${python.pythonVersion}/site-packages" - export PATH="$PATH:$out/bin" - export LD_LIBRARY_PATH="${lib.makeLibraryPath [libXtst]}" - ''; - - postInstall = '' - echo -e '#! ${stdenv.shell}\npython "$@"' > "$out/bin/fmbt-python" - chmod a+x "$out/bin/fmbt-python" - patchShebangs "$out/bin" - for i in "$out"/bin/*; do - wrapProgram "$i" --suffix "PATH" ":" "$PATH" \ - --suffix "PYTHONPATH" ":" "$PYTHONPATH" \ - --suffix "LD_LIBRARY_PATH" ":" "$LD_LIBRARY_PATH" - done - ''; - - meta = with lib; { - description = "Free Model-Based Testing tool"; - homepage = "https://github.com/intel/fMBT"; - license = licenses.lgpl21; - platforms = platforms.linux; - maintainers = with maintainers; [ raskin ]; - }; -} - diff --git a/nixpkgs/pkgs/development/tools/fsautocomplete/default.nix b/nixpkgs/pkgs/development/tools/fsautocomplete/default.nix index ab4c3f791219..aaa117622705 100644 --- a/nixpkgs/pkgs/development/tools/fsautocomplete/default.nix +++ b/nixpkgs/pkgs/development/tools/fsautocomplete/default.nix @@ -5,13 +5,13 @@ let in buildDotnetModule rec { pname = "fsautocomplete"; - version = "0.61.1"; + version = "0.62.0"; src = fetchFromGitHub { owner = "fsharp"; repo = "FsAutoComplete"; rev = "v${version}"; - sha256 = "sha256-e5td3mHTjlwcxZDDJmqKmn9Tfhtp4EVJ8C8Qn1xyeBo="; + sha256 = "sha256-pU/XGZZScbS2OiExLry4e9Oto9LrYr7j99y9+hRc+BU="; }; nugetDeps = ./deps.nix; diff --git a/nixpkgs/pkgs/development/tools/fsautocomplete/deps.nix b/nixpkgs/pkgs/development/tools/fsautocomplete/deps.nix index b04cacfa2f3b..4fed6a4f6d3e 100644 --- a/nixpkgs/pkgs/development/tools/fsautocomplete/deps.nix +++ b/nixpkgs/pkgs/development/tools/fsautocomplete/deps.nix @@ -8,6 +8,7 @@ (fetchNuGet { pname = "BlackFox.VsWhere"; version = "1.1.0"; sha256 = "1brk2rv4yjdbyc4x1qhcmii6rjqsyk52galjxir5carzhr72jrs1"; }) (fetchNuGet { pname = "CliWrap"; version = "3.4.4"; sha256 = "1g67sbhqxfl15ilazj64jc0z60ig1x03p2d4jwk6iw64smkp24x8"; }) (fetchNuGet { pname = "CommandLineParser"; version = "2.4.3"; sha256 = "1aca3q25n3dg55v4j3kzlzfzd5k2jpy6zhp8x7g74pdfdqzrhg55"; }) + (fetchNuGet { pname = "CommunityToolkit.HighPerformance"; version = "7.0.1"; sha256 = "18xw7fn0nm8aqcah1n2dkx4m45pz464s4p8bpbvnhdbbri62467r"; }) (fetchNuGet { pname = "Destructurama.FSharp"; version = "1.2.0"; sha256 = "0zbk88akz2k49zi5f62klz4h193zb4dfasjdcz4k4wr87chi06nv"; }) (fetchNuGet { pname = "DiffPlex"; version = "1.7.1"; sha256 = "1q78r70pirgb7j5wkh454ws237lihh0fig212cpbj02cz53c2h6j"; }) (fetchNuGet { pname = "dotnet-reportgenerator-globaltool"; version = "5.0.2"; sha256 = "0grzjd6h82f3whx8iax23v9dvq5c5qvqraadnrpkxsfc8p1z0ynh"; }) @@ -42,11 +43,11 @@ (fetchNuGet { pname = "Fantomas.Client"; version = "0.9.0"; sha256 = "1zixwk61fyk7y9q6f8266kwxi6byr8fmyp1lf57qhbbvhq2waj9d"; }) (fetchNuGet { pname = "FParsec"; version = "1.1.1"; sha256 = "01s3zrxl9kfx0264wy0m555pfx0s0z165n4fvpgx63jlqwbd8m04"; }) (fetchNuGet { pname = "FSharp.Analyzers.SDK"; version = "0.11.0"; sha256 = "0djgbxnygmpdkrw923z2vgirs5kamrvf94ls7pvnk43c52xlb0pf"; }) - (fetchNuGet { pname = "FSharp.Compiler.Service"; version = "43.7.300"; sha256 = "01aiczwsmv4ka6dkmw9vxfdy40wp5nzv7558pmywjixq3a780bqj"; }) + (fetchNuGet { pname = "FSharp.Compiler.Service"; version = "43.7.400"; sha256 = "1sdc63vyplw02s5wzrly1kdsmhb144arj57q22yggigmsrhzqlag"; }) (fetchNuGet { pname = "FSharp.Control.AsyncSeq"; version = "3.2.1"; sha256 = "02c8d8snd529rrcj6lsmab3wdq2sjh90j8sanx50ck9acfn9jd3v"; }) (fetchNuGet { pname = "FSharp.Control.Reactive"; version = "5.0.5"; sha256 = "0ahvd3s5wfv610ks3b00ya5r71cqm34ap8ywx0pyrzhlsbk1ybqg"; }) (fetchNuGet { pname = "FSharp.Core"; version = "6.0.5"; sha256 = "07929km96znf6xnqzmxdk3h48kz2rg9msf4c5xxmnjqr0ikfb8c6"; }) - (fetchNuGet { pname = "FSharp.Core"; version = "7.0.300"; sha256 = "017mp4ndfi9ckps9jczw6d48xm0c2rakf3i5g5f6mimhd1cvlf54"; }) + (fetchNuGet { pname = "FSharp.Core"; version = "7.0.400"; sha256 = "1pl6iqqcpm9djfn7f6ms5j1xbcyz00nb808qd6pmsjrnylflalgp"; }) (fetchNuGet { pname = "FSharp.Data.Adaptive"; version = "1.2.13"; sha256 = "16l1h718h110yl2q83hzy1rpalyqlicdaxln7g0bf8kzq9b2v6rz"; }) (fetchNuGet { pname = "FSharp.Formatting"; version = "14.0.1"; sha256 = "0sx4jlxzmrdcmc937arc9v0r90qkpf2gd1m9ngkpg88qvqcx4xsa"; }) (fetchNuGet { pname = "FSharp.UMX"; version = "1.1.0"; sha256 = "1rzf5m38fcpphfhcv359plk2sval16kj00gdfwzpm9gi8wjw8j8k"; }) @@ -64,21 +65,22 @@ (fetchNuGet { pname = "Grpc.Net.Common"; version = "2.51.0"; sha256 = "1b7iwf5qk4c449mi5lsnf6j99pwwrj79y8zkinzf5j2rslc97r0z"; }) (fetchNuGet { pname = "Humanizer.Core"; version = "2.14.1"; sha256 = "1ai7hgr0qwd7xlqfd92immddyi41j3ag91h3594yzfsgsy6yhyqi"; }) (fetchNuGet { pname = "Iced"; version = "1.17.0"; sha256 = "1999xavgpy2h83rh4indiq5mx5l509swqdi1raxj3ab6zvk49zpb"; }) - (fetchNuGet { pname = "IcedTasks"; version = "0.5.3"; sha256 = "0yrdlhynxbdpg4lwqny7fah32lrsr3qwfszlb8n0bpgbx6pnkk6d"; }) + (fetchNuGet { pname = "IcedTasks"; version = "0.5.4"; sha256 = "0584bbld25f6hzglzsah1n215658d4lwnzwxcazrwzyy25rmansl"; }) (fetchNuGet { pname = "ICSharpCode.Decompiler"; version = "7.2.1.6856"; sha256 = "19z68rgzl93lh1h8anbgzw119mhvcgr9nh5q2nxk6qihl2mx97ba"; }) (fetchNuGet { pname = "Ionide.KeepAChangelog.Tasks"; version = "0.1.8"; sha256 = "066zla2rp1sal6by3h3sg6ibpkk52kbhn30bzk58l6ym7q1kqa6b"; }) - (fetchNuGet { pname = "Ionide.LanguageServerProtocol"; version = "0.4.14"; sha256 = "0jkwnvn2g2bbnfvc7a3l30c6kkzwcrzxryq31pq9sm2nnnvk1dxs"; }) - (fetchNuGet { pname = "Ionide.ProjInfo"; version = "0.61.3"; sha256 = "0d6zzqzsd4gn2dnpkamzl0h2p94vfsnrkigjk3cyqp233xrbhqdf"; }) - (fetchNuGet { pname = "Ionide.ProjInfo.FCS"; version = "0.61.3"; sha256 = "1hlxhlbvwgb997q7169a6q8v804w8bfxhin2yljd77alj2yzal9r"; }) - (fetchNuGet { pname = "Ionide.ProjInfo.ProjectSystem"; version = "0.61.3"; sha256 = "1mhzvcfrnx5wd2nad321azsndr9yb47m3y7gim49a70fswngbl38"; }) - (fetchNuGet { pname = "Ionide.ProjInfo.Sln"; version = "0.61.3"; sha256 = "1a01c7r3q3sjz81p8d0j8k0j9inwgj2xfy8mc8r2699xk55bih09"; }) + (fetchNuGet { pname = "Ionide.LanguageServerProtocol"; version = "0.4.17"; sha256 = "14h8rkc9q6shh9fqa640bzfs1k1y5nfriwviwjynpjf79xbbcpvs"; }) + (fetchNuGet { pname = "Ionide.ProjInfo"; version = "0.62.0"; sha256 = "1da6hhca9vd6hxbz9jmwxwx2pc7d5ayd41sp6mzzmbk4n3jk32q2"; }) + (fetchNuGet { pname = "Ionide.ProjInfo.FCS"; version = "0.62.0"; sha256 = "1mkw4b1sawv1p0c4a1fidkw02bh9iik7fi80ffgqi0msc3ql8lmg"; }) + (fetchNuGet { pname = "Ionide.ProjInfo.ProjectSystem"; version = "0.62.0"; sha256 = "0kj9h5gvvrl720kg5jylx8w1jjmcci7bdhabr57sbq31vbgav74d"; }) + (fetchNuGet { pname = "Ionide.ProjInfo.Sln"; version = "0.62.0"; sha256 = "05yxz0hhpi1b0kdyzbjbb0klmpbaq8i5d0s4y59wr2qbz2318xpa"; }) + (fetchNuGet { pname = "LinkDotNet.StringBuilder"; version = "1.18.0"; sha256 = "0lgh4yjnim9qbqkmkgpx5fi2lha1cgcdbddvbsiw9jzp18fndxly"; }) (fetchNuGet { pname = "McMaster.NETCore.Plugins"; version = "1.4.0"; sha256 = "1k2qz0qnf2b1kfwbzcynivy93jm7dcwl866d0fl7qlgq5vql7niy"; }) (fetchNuGet { pname = "MessagePack"; version = "2.4.35"; sha256 = "0y8pz073ync51cv39lxldc797nmcm39r4pdhy2il6r95rppjqg5h"; }) (fetchNuGet { pname = "MessagePack.Annotations"; version = "2.4.35"; sha256 = "1jny2r6rwq7xzwymm779w9x8a5rhyln97mxzplxwd53wwbb0wbzd"; }) (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "6.0.0"; sha256 = "15gqy2m14fdlvy1g59207h5kisznm355kbw010gy19vh47z8gpz3"; }) + (fetchNuGet { pname = "Microsoft.Bcl.HashCode"; version = "1.1.0"; sha256 = "1ggsadahlp76zcn1plapszd5v5ja8rh479fwrahqd3knql4dfnr0"; }) (fetchNuGet { pname = "Microsoft.Build"; version = "17.2.0"; sha256 = "09hs74nr0kv83wc1way9x7vq3nmxbr2s4vdy99hx78kj25pylcr7"; }) (fetchNuGet { pname = "Microsoft.Build"; version = "17.4.0"; sha256 = "0j8rqwl8h2hh4yl4bvsijm0rl8356a8vfvdqj4jk5blmvfcfs7b4"; }) - (fetchNuGet { pname = "Microsoft.Build.Framework"; version = "17.4.0"; sha256 = "06yh8fxxfrqlhm5kd2mdlwz6zjfqb1haf7cp812q6apvh8akfnyd"; }) (fetchNuGet { pname = "Microsoft.Build.Framework"; version = "17.6.3"; sha256 = "0gj182wih2rr90c045a7x1cy04szv83zr21c725h70s7dcshdvn6"; }) (fetchNuGet { pname = "Microsoft.Build.Locator"; version = "1.5.3"; sha256 = "0km0zafgbm4qjg0azv40aanfn38fplkz057gqhyd76h4zgvwpxg4"; }) (fetchNuGet { pname = "Microsoft.Build.Tasks.Core"; version = "17.4.0"; sha256 = "12d3jg8qpf4k5gknxv728270faiwzb0qb6m8cfjwsqy990v54z2c"; }) @@ -129,11 +131,10 @@ (fetchNuGet { pname = "Microsoft.VisualStudio.Threading.Analyzers"; version = "17.3.44"; sha256 = "0l1hh2xb183xr5nk8xvbd8zz45n7h15cxlicg5zii6q68q8z49wf"; }) (fetchNuGet { pname = "Microsoft.VisualStudio.Validation"; version = "17.0.64"; sha256 = "1qm2dc9v1glpgy2blbcmsljwrsx55k82rjw4hiqh031h8idwryrl"; }) (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "5.0.0"; sha256 = "102hvhq2gmlcbq8y2cb7hdr2dnmjzfp2k3asr1ycwrfacwyaak7n"; }) - (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "6.0.1"; sha256 = "1map729br97ny6mqkaw5qsg55yjbfz2hskvy56qz8rf7p1bjhky2"; }) (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "7.0.0"; sha256 = "1bh77misznh19m1swqm3dsbji499b8xh9gk6w74sgbkarf6ni8lb"; }) (fetchNuGet { pname = "Mono.Cecil"; version = "0.11.4"; sha256 = "1yxa7mh432s7g7p9r7scqxvxjk5ypwc567qdbf0gmk8fbf0d3f8y"; }) (fetchNuGet { pname = "Mono.Posix.NETStandard"; version = "1.0.0"; sha256 = "0xlja36hwpjm837haq15mjh2prcf68lyrmn72nvgpz8qnf9vappw"; }) - (fetchNuGet { pname = "MSBuild.StructuredLogger"; version = "2.1.820"; sha256 = "04i27pcw06a7zb9p8yw255lczsap4aj8p2zncscm679380lxa7p1"; }) + (fetchNuGet { pname = "MSBuild.StructuredLogger"; version = "2.1.844"; sha256 = "0fp2gng4gk63ac0wz231zwbnpy6a35mq04gy8fc81gra6px4sy5v"; }) (fetchNuGet { pname = "Nerdbank.Streams"; version = "2.8.61"; sha256 = "1wxhrqlhb8wq1x5kn3wacylicznl3fgmfdqvx6r3s97yv89zyzy4"; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.2"; sha256 = "1p9splg1min274dpz7xdfgzrwkyfd3xlkygwpr1xgjvvyjvs6b0i"; }) @@ -158,7 +159,6 @@ (fetchNuGet { pname = "StreamJsonRpc"; version = "2.12.27"; sha256 = "15k0z6y3dsgipzfaa73irf5xjddr5mj9z26k27s8p6viay608cxc"; }) (fetchNuGet { pname = "System.Buffers"; version = "4.5.1"; sha256 = "04kb1mdrlcixj9zh1xdi5as0k0qi8byr5mi3p3jcxx72qz93s2y3"; }) (fetchNuGet { pname = "System.CodeDom"; version = "6.0.0"; sha256 = "1i55cxp8ycc03dmxx4n22qi6jkwfl23cgffb95izq7bjar8avxxq"; }) - (fetchNuGet { pname = "System.Collections.Immutable"; version = "6.0.0"; sha256 = "1js98kmjn47ivcvkjqdmyipzknb9xbndssczm8gq224pbaj1p88c"; }) (fetchNuGet { pname = "System.Collections.Immutable"; version = "7.0.0"; sha256 = "1n9122cy6v3qhsisc9lzwa1m1j62b8pi2678nsmnlyvfpk0zdagm"; }) (fetchNuGet { pname = "System.CommandLine"; version = "2.0.0-beta4.22272.1"; sha256 = "1iy5hwwgvx911g3yq65p4zsgpy08w4qz9j3h0igcf7yci44vw8yd"; }) (fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "5.0.0"; sha256 = "021h7x98lblq9avm1bgpa4i31c2kgsa7zn4sqhxf39g087ar756j"; }) @@ -170,9 +170,8 @@ (fetchNuGet { pname = "System.Composition.TypedParts"; version = "6.0.0"; sha256 = "0y9pq3y60nyrpfy51f576a0qjjdh61mcv8vnik32pm4bz56h9q72"; }) (fetchNuGet { pname = "System.Configuration.ConfigurationManager"; version = "6.0.0"; sha256 = "0sqapr697jbb4ljkq46msg0xx1qpmc31ivva6llyz2wzq3mpmxbw"; }) (fetchNuGet { pname = "System.Configuration.ConfigurationManager"; version = "7.0.0"; sha256 = "149d9kmakzkbw69cip1ny0wjlgcvnhrr7vz5pavpsip36k2mw02a"; }) - (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "6.0.0"; sha256 = "0rrihs9lnb1h6x4h0hn6kgfnh58qq7hx8qq99gh6fayx4dcnx3s5"; }) + (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "7.0.2"; sha256 = "1h97ikph775gya93qsjjaka87qcygbyh1064rh1hnfcnp5xv0ipi"; }) (fetchNuGet { pname = "System.Diagnostics.EventLog"; version = "7.0.0"; sha256 = "16p8z975dnzmncfifa9gw9n3k9ycpr2qvz7lglpghsvx0fava8k9"; }) - (fetchNuGet { pname = "System.Drawing.Common"; version = "6.0.0"; sha256 = "02n8rzm58dac2np8b3xw8ychbvylja4nh6938l5k2fhyn40imlgz"; }) (fetchNuGet { pname = "System.Drawing.Common"; version = "7.0.0"; sha256 = "0jwyv5zjxzr4bm4vhmz394gsxqa02q6pxdqd2hwy1f116f0l30dp"; }) (fetchNuGet { pname = "System.Formats.Asn1"; version = "6.0.0"; sha256 = "1vvr7hs4qzjqb37r0w1mxq7xql2b17la63jwvmgv65s1hj00g8r9"; }) (fetchNuGet { pname = "System.IO.Pipelines"; version = "6.0.3"; sha256 = "1jgdazpmwc21dd9naq3l9n5s8a1jnbwlvgkf1pnm0aji6jd4xqdz"; }) @@ -184,6 +183,7 @@ (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.7.0"; sha256 = "0l8jpxhpgjlf1nkz5lvp61r4kfdbhr29qi8aapcxn3izd9wd0j8r"; }) (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.7.0"; sha256 = "0mbjfajmafkca47zr8v36brvknzks5a7pgb49kfq2d188pyv6iap"; }) (fetchNuGet { pname = "System.Reflection.Metadata"; version = "6.0.1"; sha256 = "0fjqifk4qz9lw5gcadpfalpplyr0z2b3p9x7h0ll481a9sqvppc9"; }) + (fetchNuGet { pname = "System.Reflection.Metadata"; version = "7.0.0"; sha256 = "1wilasn2qmj870h2bhw348lspamm7pbinpb4m89icg113510l00v"; }) (fetchNuGet { pname = "System.Reflection.MetadataLoadContext"; version = "6.0.0"; sha256 = "1ijfiqpi3flp5g9amridhjjmzz6md1c6pnxx5h7pdbiqqx9rwrpk"; }) (fetchNuGet { pname = "System.Resources.Extensions"; version = "6.0.0"; sha256 = "1h73gps9ffw77vys4zwgm78fgackqw6a7rjrg75mmx79vdw1shgw"; }) (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; sha256 = "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc"; }) @@ -193,7 +193,6 @@ (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "6.0.0"; sha256 = "05kd3a8w7658hjxq9vvszxip30a479fjmfq4bq1r95nrsvs4hbss"; }) (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "7.0.1"; sha256 = "1nq9ngkqha70rv41692c79zq09cx6m85wkp3xj9yc31s62afyl5i"; }) (fetchNuGet { pname = "System.Security.Cryptography.Xml"; version = "6.0.1"; sha256 = "15d0np1njvy2ywf0qzdqyjk5sjs4zbfxg917jrvlbfwrqpqxb5dj"; }) - (fetchNuGet { pname = "System.Security.Permissions"; version = "6.0.0"; sha256 = "0jsl4xdrkqi11iwmisi1r2f2qn5pbvl79mzq877gndw6ans2zhzw"; }) (fetchNuGet { pname = "System.Security.Permissions"; version = "7.0.0"; sha256 = "0wkm6bj4abknzj41ygkziifx8mzhj4bix92wjvj6lihaw1gniq8c"; }) (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "5.0.0"; sha256 = "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8"; }) (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "6.0.0"; sha256 = "0gm2kiz2ndm9xyzxgi0jhazgwslcs427waxgfa30m7yqll1kcrww"; }) @@ -203,7 +202,6 @@ (fetchNuGet { pname = "System.Threading.Channels"; version = "6.0.0"; sha256 = "1qbyi7yymqc56frqy7awvcqc1m7x3xrpx87a37dgb3mbrjg9hlcj"; }) (fetchNuGet { pname = "System.Threading.Tasks.Dataflow"; version = "6.0.0"; sha256 = "1b4vyjdir9kdkiv2fqqm4f76h0df68k8gcd7jb2b38zgr2vpnk3c"; }) (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; sha256 = "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153"; }) - (fetchNuGet { pname = "System.Windows.Extensions"; version = "6.0.0"; sha256 = "1wy9pq9vn1bqg5qnv53iqrbx04yzdmjw4x5yyi09y3459vaa1sip"; }) (fetchNuGet { pname = "System.Windows.Extensions"; version = "7.0.0"; sha256 = "11r9f0v7qp365bdpq5ax023yra4qvygljz18dlqs650d44iay669"; }) (fetchNuGet { pname = "YoloDev.Expecto.TestSdk"; version = "0.13.3"; sha256 = "0y9bhgws3m2idj8cr53rn0155wwi6nhgbp6hmci0gc2w7fp3387c"; }) ] diff --git a/nixpkgs/pkgs/development/tools/gammaray/default.nix b/nixpkgs/pkgs/development/tools/gammaray/default.nix index aa334bfd2e42..29ab4973c994 100644 --- a/nixpkgs/pkgs/development/tools/gammaray/default.nix +++ b/nixpkgs/pkgs/development/tools/gammaray/default.nix @@ -4,6 +4,7 @@ , cmake , pkg-config , wrapQtAppsHook +, qtbase , wayland , elfutils , libbfd @@ -11,13 +12,13 @@ stdenv.mkDerivation rec { pname = "gammaray"; - version = "2.11.3"; + version = "3.0.0"; src = fetchFromGitHub { owner = "KDAB"; repo = pname; rev = "v${version}"; - hash = "sha256-ZFLHBPIjkbHlsatwuXdut1C5MpdkVUb9T7TTNhtP764="; + hash = "sha256-C8bej0q4p8F27hiJUye9G+sZbkAYaV8hW1GKWZyHAis="; }; nativeBuildInputs = [ @@ -27,6 +28,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + qtbase wayland elfutils libbfd @@ -38,6 +40,7 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ rewine ]; + mainProgram = "gammaray"; }; } diff --git a/nixpkgs/pkgs/development/tools/glpaper/default.nix b/nixpkgs/pkgs/development/tools/glpaper/default.nix index 52ed94921051..3a2cb1c63c6e 100644 --- a/nixpkgs/pkgs/development/tools/glpaper/default.nix +++ b/nixpkgs/pkgs/development/tools/glpaper/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromSourcehut, meson, ninja, pkg-config, wlroots, wayland, wayland-protocols +{ lib, stdenv, fetchFromSourcehut, meson, ninja, pkg-config, wayland , libX11, libGL }: stdenv.mkDerivation rec { diff --git a/nixpkgs/pkgs/development/tools/go-toml/default.nix b/nixpkgs/pkgs/development/tools/go-toml/default.nix index fb6c480cdca9..0b21b92da8dc 100644 --- a/nixpkgs/pkgs/development/tools/go-toml/default.nix +++ b/nixpkgs/pkgs/development/tools/go-toml/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "go-toml"; - version = "2.0.9"; + version = "2.1.0"; src = fetchFromGitHub { owner = "pelletier"; repo = pname; rev = "v${version}"; - sha256 = "sha256-zix04tIP9nhvYx8N7uk2cUWjSpMjb0XiPDK3km82XzQ="; + sha256 = "sha256-BEkshlB1Zze4sVo5YDwpj6ENHFLHL4IFmOIYgrWz+gQ="; }; vendorHash = "sha256-XOcCsb3zUChiYLTfOCbRQF71E2khzSt/ApFI8NAS13U="; @@ -20,6 +20,7 @@ buildGoModule rec { meta = with lib; { description = "Go library for the TOML language"; homepage = "https://github.com/pelletier/go-toml"; + changelog = "https://github.com/pelletier/go-toml/releases/tag/v${version}"; maintainers = [ maintainers.marsam ]; license = licenses.mit; }; diff --git a/nixpkgs/pkgs/development/tools/goconst/default.nix b/nixpkgs/pkgs/development/tools/goconst/default.nix index 002f13c77e3a..7d0123f00f85 100644 --- a/nixpkgs/pkgs/development/tools/goconst/default.nix +++ b/nixpkgs/pkgs/development/tools/goconst/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "goconst"; - version = "1.5.1"; + version = "1.6.0"; excludedPackages = [ "tests" ]; @@ -10,10 +10,10 @@ buildGoModule rec { owner = "jgautheron"; repo = "goconst"; rev = "v${version}"; - sha256 = "sha256-chBWxOy9V4pO3hMaeCoKwnQxIEYiSejUOD3QDBCpaoE="; + sha256 = "sha256-gd+0Gm1qANwgYKWAxpU7759BhyURalJCRxd/P6sczc4="; }; - vendorSha256 = null; + vendorHash = null; ldflags = [ "-s" "-w" ]; diff --git a/nixpkgs/pkgs/development/tools/gptcommit/default.nix b/nixpkgs/pkgs/development/tools/gptcommit/default.nix index 28f4648cd3aa..853e76a864fb 100644 --- a/nixpkgs/pkgs/development/tools/gptcommit/default.nix +++ b/nixpkgs/pkgs/development/tools/gptcommit/default.nix @@ -10,7 +10,7 @@ let pname = "gptcommit"; - version = "0.5.11"; + version = "0.5.13"; in rustPlatform.buildRustPackage { inherit pname version; @@ -19,10 +19,10 @@ rustPlatform.buildRustPackage { owner = "zurawiki"; repo = pname; rev = "v${version}"; - sha256 = "sha256-UUiqIwvZHV+WhzRc05sW/R3V+6ovL8+WoDOzz4chCq0="; + sha256 = "sha256-O0dqLN2wDXRIVcb9whlzK0BJOm/qhTH+nLpCwSUObng="; }; - cargoSha256 = "sha256-YoNC1kaYItpnn9tzRh61Hn58XbA/LPWokqdbPDD3sq4="; + cargoSha256 = "sha256-JwwQaThefWhJVRJ/a0WfdKJqr/NHgll6D6Y2QaeqWsc="; nativeBuildInputs = [ pkg-config ]; diff --git a/nixpkgs/pkgs/development/tools/gqlint/default.nix b/nixpkgs/pkgs/development/tools/gqlint/default.nix new file mode 100644 index 000000000000..18fc0cc624b7 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/gqlint/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildNpmPackage +, fetchFromGitHub +}: + +buildNpmPackage rec { + pname = "gqlint"; + version = "1.8.0"; + + src = fetchFromGitHub { + owner = "happylinks"; + repo = "gqlint"; + rev = "v${version}"; + hash = "sha256-m/Y7i3+93UdPnKQlZUHgtRbfSmJ1xYjao+bU+zxMgHw="; + }; + + npmDepsHash = "sha256-Fc5RbBqrJB7KSqLgTmIsPf3MK2n7vef/UVeFqH0o7mE="; + + dontNpmBuild = true; + + meta = { + description = "GraphQL linter"; + homepage = "https://github.com/happylinks/gqlint"; + license = lib.licenses.mit; + mainProgram = "gqlint"; + maintainers = with lib.maintainers; [ hardselius ]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/grpc-gateway/default.nix b/nixpkgs/pkgs/development/tools/grpc-gateway/default.nix index ee17ae777e78..4930224fb830 100644 --- a/nixpkgs/pkgs/development/tools/grpc-gateway/default.nix +++ b/nixpkgs/pkgs/development/tools/grpc-gateway/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "grpc-gateway"; - version = "2.16.2"; + version = "2.17.1"; src = fetchFromGitHub { owner = "grpc-ecosystem"; repo = "grpc-gateway"; rev = "v${version}"; - sha256 = "sha256-oKmT1qvEWNk0q5JnzsUaCWCsllUtyIAsWXUP4DsmgnA="; + sha256 = "sha256-zQAfy2dl0YtQGN9MARs9RhoqM/2GFn4iQb/X6vD8HHc="; }; - vendorHash = "sha256-YqDQ6dQQDzkehRN0jWmfjG4acB4rtL2HGHOl71IM8Lk="; + vendorHash = "sha256-2VkUQ6NhoRJY3qRS41igZ7U/908uWgkHaQ9V2veo1j8="; meta = with lib; { description = diff --git a/nixpkgs/pkgs/development/tools/jake/default.nix b/nixpkgs/pkgs/development/tools/jake/default.nix new file mode 100644 index 000000000000..b91a779cb53c --- /dev/null +++ b/nixpkgs/pkgs/development/tools/jake/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildNpmPackage +, fetchFromGitHub +}: + +buildNpmPackage rec { + pname = "jake"; + version = "10.8.7"; + + src = fetchFromGitHub { + owner = "jakejs"; + repo = "jake"; + rev = "v${version}"; + hash = "sha256-Qado9huQx9MVTFp8t7szB+IUVNWQqT/ni62JnURQqeM="; + }; + + npmDepsHash = "sha256-3pOFrH/em/HMTswrZLAeqPAb9U0/odcZPt4AkQkMhZM="; + + dontNpmBuild = true; + + meta = { + description = "JavaScript build tool, similar to Make or Rake"; + homepage = "https://github.com/jakejs/jake"; + license = lib.licenses.asl20; + mainProgram = "jake"; + maintainers = with lib.maintainers; [ jasoncarr ]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/k6/default.nix b/nixpkgs/pkgs/development/tools/k6/default.nix index 5c45cfc29a74..6f00c9d93269 100644 --- a/nixpkgs/pkgs/development/tools/k6/default.nix +++ b/nixpkgs/pkgs/development/tools/k6/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "k6"; - version = "0.45.1"; + version = "0.46.0"; src = fetchFromGitHub { owner = "grafana"; repo = pname; rev = "v${version}"; - sha256 = "sha256-TeZ4nAU5SorIrGeQ1zM8YWcDWPt3F2rhPLoKx2Vvl+Q="; + sha256 = "sha256-4ucnq/FTvdDpzf1RWRY+U5A+BCaaQWMTEaZtmU0JD90="; }; subPackages = [ "./" ]; @@ -34,6 +34,6 @@ buildGoModule rec { homepage = "https://k6.io/"; changelog = "https://github.com/grafana/k6/releases/tag/v${version}"; license = licenses.agpl3Plus; - maintainers = with maintainers; [ offline bryanasdev000 ]; + maintainers = with maintainers; [ offline bryanasdev000 kashw2 ]; }; } diff --git a/nixpkgs/pkgs/development/tools/ktlint/default.nix b/nixpkgs/pkgs/development/tools/ktlint/default.nix index 1718821d2102..60d14dc79e34 100644 --- a/nixpkgs/pkgs/development/tools/ktlint/default.nix +++ b/nixpkgs/pkgs/development/tools/ktlint/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ktlint"; - version = "0.50.0"; + version = "1.0.0"; src = fetchurl { url = "https://github.com/pinterest/ktlint/releases/download/${version}/ktlint"; - sha256 = "01qh85kclksgv484cwma7jyaxlz8rgk14l4mxcvzp2flprdnzgd2"; + sha256 = "1pc1ck87l849xfy1lcdr1v3p84qyxn9725pvh09czvlqs58yy6ax"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/development/tools/language-servers/dockerfile-language-server-nodejs/default.nix b/nixpkgs/pkgs/development/tools/language-servers/dockerfile-language-server-nodejs/default.nix new file mode 100644 index 000000000000..899efd605e20 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/language-servers/dockerfile-language-server-nodejs/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildNpmPackage +, fetchFromGitHub +}: + +buildNpmPackage rec { + pname = "dockerfile-language-server-nodejs"; + version = "0.10.2"; + + src = fetchFromGitHub { + owner = "rcjsuen"; + repo = "dockerfile-language-server-nodejs"; + rev = "v${version}"; + hash = "sha256-uwwwF1eMoSA2C5h56BBllTZW8zRHueNeVwhwtycrNfA="; + }; + + npmDepsHash = "sha256-lI+tkUBR0rmWcU57jU0y7XaMK3JADNU7fcbCxMmz/7s="; + + meta = { + changelog = "https://github.com/rcjsuen/dockerfile-language-server-nodejs/blob/${src.rev}/CHANGELOG.md"; + description = "A language server for Dockerfiles powered by Node.js, TypeScript, and VSCode technologies"; + homepage = "https://github.com/rcjsuen/dockerfile-language-server-nodejs"; + license = lib.licenses.mit; + mainProgram = "docker-langserver"; + maintainers = with lib.maintainers; [ rvolosatovs ]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/language-servers/emmet-ls/default.nix b/nixpkgs/pkgs/development/tools/language-servers/emmet-ls/default.nix new file mode 100644 index 000000000000..5950dc543855 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/language-servers/emmet-ls/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildNpmPackage +, fetchFromGitHub +, fetchpatch +}: + +buildNpmPackage rec { + pname = "emmet-ls"; + version = "0.4.1"; + + src = fetchFromGitHub { + owner = "aca"; + repo = "emmet-ls"; + rev = version; + hash = "sha256-TmsJpVLF9FZf/6uOM9LZBKC6S3bMPjA3QMiRMPaY9Dg="; + }; + + npmDepsHash = "sha256-Boaxkad7S6H+eTW5AHwBa/zj/f1oAGGSsmW1QrzuFWc="; + + patches = [ + # update package-lock.json as it is outdated + (fetchpatch { + name = "fix-lock-file-to-match-package-json.patch"; + url = "https://github.com/aca/emmet-ls/commit/111111a2c2113f751fa12a716ccfbeae61c32079.patch"; + hash = "sha256-/3ZbOBxScnfhL1F66cnIoD2flVeYTJ2sLxNHQ9Yrgjw="; + }) + ]; + + meta = with lib; { + description = "Emmet support based on LSP"; + homepage = "https://github.com/aca/emmet-ls"; + changelog = "https://github.com/aca/emmet-ls/releases/tag/${version}"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda ]; + mainProgram = "emmet-ls"; + }; +} diff --git a/nixpkgs/pkgs/development/tools/language-servers/millet/Cargo.lock b/nixpkgs/pkgs/development/tools/language-servers/millet/Cargo.lock index de07ef3606fe..d270627c0cde 100644 --- a/nixpkgs/pkgs/development/tools/language-servers/millet/Cargo.lock +++ b/nixpkgs/pkgs/development/tools/language-servers/millet/Cargo.lock @@ -19,16 +19,16 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "aho-corasick" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6748e8def348ed4d14996fa801f4122cd763fff530258cdc03f64b25f89d3a5a" +checksum = "0c378d78423fdad8089616f827526ee33c19f2fddbd5de1629152c9593ba4783" dependencies = [ "memchr", ] [[package]] name = "analysis" -version = "0.13.0" +version = "0.13.1" dependencies = [ "config", "diagnostic", @@ -118,7 +118,7 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chain-map" -version = "0.13.0" +version = "0.13.1" dependencies = [ "fast-hash", "str-util", @@ -127,11 +127,11 @@ dependencies = [ [[package]] name = "char-name" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#d5bd04cff3ee4f68ac69f961068a524d90c4e91d" +source = "git+https://github.com/azdavis/language-util.git#5e9a78d6f82e6129a784731bb2124bd2931f1416" [[package]] name = "cm-syntax" -version = "0.13.0" +version = "0.13.1" dependencies = [ "lex-util", "paths", @@ -143,7 +143,7 @@ dependencies = [ [[package]] name = "code-h2-md-map" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#d5bd04cff3ee4f68ac69f961068a524d90c4e91d" +source = "git+https://github.com/azdavis/language-util.git#5e9a78d6f82e6129a784731bb2124bd2931f1416" dependencies = [ "fast-hash", ] @@ -160,7 +160,7 @@ dependencies = [ [[package]] name = "config" -version = "0.13.0" +version = "0.13.1" dependencies = [ "fast-hash", "serde", @@ -188,7 +188,7 @@ checksum = "7704b5fdd17b18ae31c4c1da5a2e0305a2bf17b5249300a9ee9ed7b72114c636" [[package]] name = "cov-mark" -version = "0.13.0" +version = "0.13.1" dependencies = [ "fast-hash", "once_cell", @@ -225,7 +225,7 @@ dependencies = [ [[package]] name = "diagnostic" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#d5bd04cff3ee4f68ac69f961068a524d90c4e91d" +source = "git+https://github.com/azdavis/language-util.git#5e9a78d6f82e6129a784731bb2124bd2931f1416" [[package]] name = "diff" @@ -240,9 +240,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9bda8e21c04aca2ae33ffc2fd8c23134f3cac46db123ba97bd9d3f3b8a4a85e1" [[package]] +name = "dunce" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" + +[[package]] name = "elapsed" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#d5bd04cff3ee4f68ac69f961068a524d90c4e91d" +source = "git+https://github.com/azdavis/language-util.git#5e9a78d6f82e6129a784731bb2124bd2931f1416" dependencies = [ "log", ] @@ -274,9 +280,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f" +checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd" dependencies = [ "errno-dragonfly", "libc", @@ -296,7 +302,7 @@ dependencies = [ [[package]] name = "event-parse" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#d5bd04cff3ee4f68ac69f961068a524d90c4e91d" +source = "git+https://github.com/azdavis/language-util.git#5e9a78d6f82e6129a784731bb2124bd2931f1416" dependencies = [ "drop_bomb", "rowan", @@ -306,12 +312,18 @@ dependencies = [ [[package]] name = "fast-hash" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#d5bd04cff3ee4f68ac69f961068a524d90c4e91d" +source = "git+https://github.com/azdavis/language-util.git#5e9a78d6f82e6129a784731bb2124bd2931f1416" dependencies = [ "rustc-hash", ] [[package]] +name = "fastrand" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" + +[[package]] name = "flate2" version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -324,7 +336,7 @@ dependencies = [ [[package]] name = "fmt-util" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#d5bd04cff3ee4f68ac69f961068a524d90c4e91d" +source = "git+https://github.com/azdavis/language-util.git#5e9a78d6f82e6129a784731bb2124bd2931f1416" [[package]] name = "form_urlencoded" @@ -383,7 +395,7 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "identifier-case" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#d5bd04cff3ee4f68ac69f961068a524d90c4e91d" +source = "git+https://github.com/azdavis/language-util.git#5e9a78d6f82e6129a784731bb2124bd2931f1416" [[package]] name = "idna" @@ -398,7 +410,7 @@ dependencies = [ [[package]] name = "idx" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#d5bd04cff3ee4f68ac69f961068a524d90c4e91d" +source = "git+https://github.com/azdavis/language-util.git#5e9a78d6f82e6129a784731bb2124bd2931f1416" dependencies = [ "nohash-hasher", ] @@ -415,7 +427,7 @@ dependencies = [ [[package]] name = "input" -version = "0.13.0" +version = "0.13.1" dependencies = [ "cm-syntax", "config", @@ -463,7 +475,7 @@ checksum = "3752f229dcc5a481d60f385fa479ff46818033d881d2d801aa27dffcfb5e8306" [[package]] name = "lang-srv" -version = "0.13.0" +version = "0.13.1" dependencies = [ "analysis", "anyhow", @@ -491,7 +503,7 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "lex-util" -version = "0.13.0" +version = "0.13.1" [[package]] name = "libc" @@ -548,9 +560,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.5.0" +version = "2.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c" [[package]] name = "memoffset" @@ -563,7 +575,7 @@ dependencies = [ [[package]] name = "millet-cli" -version = "0.13.0" +version = "0.13.1" dependencies = [ "analysis", "codespan-reporting", @@ -581,7 +593,7 @@ dependencies = [ [[package]] name = "millet-ls" -version = "0.13.0" +version = "0.13.1" dependencies = [ "anyhow", "env_logger", @@ -601,7 +613,7 @@ dependencies = [ [[package]] name = "mlb-hir" -version = "0.13.0" +version = "0.13.1" dependencies = [ "fast-hash", "paths", @@ -612,7 +624,7 @@ dependencies = [ [[package]] name = "mlb-statics" -version = "0.13.0" +version = "0.13.1" dependencies = [ "config", "diagnostic", @@ -636,7 +648,7 @@ dependencies = [ [[package]] name = "mlb-syntax" -version = "0.13.0" +version = "0.13.1" dependencies = [ "lex-util", "paths", @@ -684,9 +696,9 @@ dependencies = [ [[package]] name = "object" -version = "0.32.0" +version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ac5bbd07aea88c60a577a1ce218075ffd59208b2d7ca97adf9bfc5aeb21ebe" +checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" dependencies = [ "memchr", ] @@ -699,7 +711,7 @@ checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "panic-hook" -version = "0.13.0" +version = "0.13.1" dependencies = [ "better-panic", ] @@ -707,8 +719,9 @@ dependencies = [ [[package]] name = "paths" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#d5bd04cff3ee4f68ac69f961068a524d90c4e91d" +source = "git+https://github.com/azdavis/language-util.git#5e9a78d6f82e6129a784731bb2124bd2931f1416" dependencies = [ + "dunce", "fast-hash", "glob", "idx", @@ -719,7 +732,7 @@ dependencies = [ [[package]] name = "pattern-match" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#d5bd04cff3ee4f68ac69f961068a524d90c4e91d" +source = "git+https://github.com/azdavis/language-util.git#5e9a78d6f82e6129a784731bb2124bd2931f1416" dependencies = [ "fast-hash", ] @@ -777,10 +790,19 @@ dependencies = [ ] [[package]] +name = "redox_syscall" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] name = "regex" -version = "1.9.3" +version = "1.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81bc1d4caf89fac26a70747fe603c130093b53c773888797a6329091246d651a" +checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47" dependencies = [ "aho-corasick", "memchr", @@ -790,9 +812,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.6" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed1ceff11a1dddaee50c9dc8e4938bd106e9d89ae372f192311e7da498e3b69" +checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795" dependencies = [ "aho-corasick", "memchr", @@ -801,9 +823,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" +checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" [[package]] name = "rowan" @@ -832,9 +854,9 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustix" -version = "0.38.8" +version = "0.38.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19ed4fa021d81c8392ce04db050a3da9a60299050b7ae1cf482d862b54a7218f" +checksum = "c0c3dde1fc030af041adc40e79c0e7fbcf431dd24870053d187d7c66e4b87453" dependencies = [ "bitflags 2.4.0", "errno", @@ -851,18 +873,18 @@ checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" [[package]] name = "serde" -version = "1.0.186" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f5db24220c009de9bd45e69fb2938f4b6d2df856aa9304ce377b3180f83b7c1" +checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.186" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ad697f7e0b65af4983a4ce8f56ed5b357e8d3c36651bf6a7e13639c17b8e670" +checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" dependencies = [ "proc-macro2", "quote", @@ -902,7 +924,7 @@ dependencies = [ [[package]] name = "slash-var-path" -version = "0.13.0" +version = "0.13.1" dependencies = [ "fast-hash", "str-util", @@ -910,14 +932,14 @@ dependencies = [ [[package]] name = "sml-comment" -version = "0.13.0" +version = "0.13.1" dependencies = [ "sml-syntax", ] [[package]] name = "sml-dynamics" -version = "0.13.0" +version = "0.13.1" dependencies = [ "fast-hash", "fmt-util", @@ -928,7 +950,7 @@ dependencies = [ [[package]] name = "sml-dynamics-tests" -version = "0.13.0" +version = "0.13.1" dependencies = [ "config", "pretty_assertions", @@ -944,7 +966,7 @@ dependencies = [ [[package]] name = "sml-file-syntax" -version = "0.13.0" +version = "0.13.1" dependencies = [ "config", "elapsed", @@ -958,7 +980,7 @@ dependencies = [ [[package]] name = "sml-fixity" -version = "0.13.0" +version = "0.13.1" dependencies = [ "fast-hash", "once_cell", @@ -967,7 +989,7 @@ dependencies = [ [[package]] name = "sml-hir" -version = "0.13.0" +version = "0.13.1" dependencies = [ "la-arena", "sml-lab", @@ -978,7 +1000,7 @@ dependencies = [ [[package]] name = "sml-hir-lower" -version = "0.13.0" +version = "0.13.1" dependencies = [ "config", "cov-mark", @@ -993,14 +1015,14 @@ dependencies = [ [[package]] name = "sml-lab" -version = "0.13.0" +version = "0.13.1" dependencies = [ "str-util", ] [[package]] name = "sml-lex" -version = "0.13.0" +version = "0.13.1" dependencies = [ "cov-mark", "diagnostic", @@ -1015,7 +1037,7 @@ source = "git+https://github.com/azdavis/sml-libs.git#0d94e3ce13f2a489dff86151f7 [[package]] name = "sml-naive-fmt" -version = "0.13.0" +version = "0.13.1" dependencies = [ "fast-hash", "sml-comment", @@ -1024,11 +1046,11 @@ dependencies = [ [[package]] name = "sml-namespace" -version = "0.13.0" +version = "0.13.1" [[package]] name = "sml-parse" -version = "0.13.0" +version = "0.13.1" dependencies = [ "diagnostic", "event-parse", @@ -1040,14 +1062,14 @@ dependencies = [ [[package]] name = "sml-path" -version = "0.13.0" +version = "0.13.1" dependencies = [ "str-util", ] [[package]] name = "sml-scon" -version = "0.13.0" +version = "0.13.1" dependencies = [ "num-bigint", "num-traits", @@ -1056,7 +1078,7 @@ dependencies = [ [[package]] name = "sml-statics" -version = "0.13.0" +version = "0.13.1" dependencies = [ "chain-map", "config", @@ -1079,7 +1101,7 @@ dependencies = [ [[package]] name = "sml-statics-types" -version = "0.13.0" +version = "0.13.1" dependencies = [ "chain-map", "code-h2-md-map", @@ -1098,7 +1120,7 @@ dependencies = [ [[package]] name = "sml-symbol-kind" -version = "0.13.0" +version = "0.13.1" dependencies = [ "sml-namespace", "sml-statics-types", @@ -1106,7 +1128,7 @@ dependencies = [ [[package]] name = "sml-syntax" -version = "0.13.0" +version = "0.13.1" dependencies = [ "code-h2-md-map", "fast-hash", @@ -1117,7 +1139,7 @@ dependencies = [ [[package]] name = "sml-ty-var-scope" -version = "0.13.0" +version = "0.13.1" dependencies = [ "fast-hash", "sml-hir", @@ -1135,16 +1157,16 @@ dependencies = [ [[package]] name = "str-util" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#d5bd04cff3ee4f68ac69f961068a524d90c4e91d" +source = "git+https://github.com/azdavis/language-util.git#5e9a78d6f82e6129a784731bb2124bd2931f1416" dependencies = [ "smol_str", ] [[package]] name = "syn" -version = "2.0.29" +version = "2.0.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a" +checksum = "718fa2415bcb8d8bd775917a1bf12a7931b6dfa890753378538118181e0cb398" dependencies = [ "proc-macro2", "quote", @@ -1154,7 +1176,7 @@ dependencies = [ [[package]] name = "syntax-gen" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#d5bd04cff3ee4f68ac69f961068a524d90c4e91d" +source = "git+https://github.com/azdavis/language-util.git#5e9a78d6f82e6129a784731bb2124bd2931f1416" dependencies = [ "char-name", "fast-hash", @@ -1165,6 +1187,19 @@ dependencies = [ ] [[package]] +name = "tempfile" +version = "3.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" +dependencies = [ + "cfg-if", + "fastrand", + "redox_syscall", + "rustix", + "windows-sys 0.48.0", +] + +[[package]] name = "termcolor" version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1175,7 +1210,7 @@ dependencies = [ [[package]] name = "tests" -version = "0.13.0" +version = "0.13.1" dependencies = [ "analysis", "cm-syntax", @@ -1201,7 +1236,7 @@ dependencies = [ [[package]] name = "text-pos" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#d5bd04cff3ee4f68ac69f961068a524d90c4e91d" +source = "git+https://github.com/azdavis/language-util.git#5e9a78d6f82e6129a784731bb2124bd2931f1416" dependencies = [ "line-index", "text-size-util", @@ -1216,7 +1251,7 @@ checksum = "f18aa187839b2bdb1ad2fa35ead8c4c2976b64e4363c386d45ac0f7ee85c9233" [[package]] name = "text-size-util" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#d5bd04cff3ee4f68ac69f961068a524d90c4e91d" +source = "git+https://github.com/azdavis/language-util.git#5e9a78d6f82e6129a784731bb2124bd2931f1416" dependencies = [ "text-size", ] @@ -1239,7 +1274,7 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "token" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#d5bd04cff3ee4f68ac69f961068a524d90c4e91d" +source = "git+https://github.com/azdavis/language-util.git#5e9a78d6f82e6129a784731bb2124bd2931f1416" [[package]] name = "toml" @@ -1278,7 +1313,7 @@ dependencies = [ [[package]] name = "topo-sort" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#d5bd04cff3ee4f68ac69f961068a524d90c4e91d" +source = "git+https://github.com/azdavis/language-util.git#5e9a78d6f82e6129a784731bb2124bd2931f1416" [[package]] name = "ungrammar" @@ -1325,13 +1360,13 @@ checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" [[package]] name = "uniq" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#d5bd04cff3ee4f68ac69f961068a524d90c4e91d" +source = "git+https://github.com/azdavis/language-util.git#5e9a78d6f82e6129a784731bb2124bd2931f1416" [[package]] name = "url" -version = "2.4.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" +checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" dependencies = [ "form_urlencoded", "idna", @@ -1519,11 +1554,12 @@ dependencies = [ [[package]] name = "xtask" -version = "0.13.0" +version = "0.13.1" dependencies = [ "anyhow", "flate2", "pico-args", + "tempfile", ] [[package]] diff --git a/nixpkgs/pkgs/development/tools/language-servers/millet/default.nix b/nixpkgs/pkgs/development/tools/language-servers/millet/default.nix index 95b7a2bc68fd..081333e89294 100644 --- a/nixpkgs/pkgs/development/tools/language-servers/millet/default.nix +++ b/nixpkgs/pkgs/development/tools/language-servers/millet/default.nix @@ -2,19 +2,19 @@ rustPlatform.buildRustPackage rec { pname = "millet"; - version = "0.13.0"; + version = "0.13.1"; src = fetchFromGitHub { owner = "azdavis"; repo = pname; rev = "v${version}"; - hash = "sha256-q7p3TB7YsfROW+6MCbcGCPTIekEgqQBi0MUHkIuhtHc="; + hash = "sha256-qq4SACB0heCOB8rJha+9Xi/ZZuAbasOieWM9IdZqYUw="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "char-name-0.1.0" = "sha256-uWKoRLEwbjndrtu30H0zysHLIXBqWa0SnYm6Iy1hUko="; + "char-name-0.1.0" = "sha256-txHvmD0ClTQqe6QhZ0DLgK5RON0UvZkxXCoZxC8U5+E="; "sml-libs-0.1.0" = "sha256-zQrhH24XlA9SeQ+sVzaVwJwrm80TRIjFq99Vay7QEN8="; }; }; diff --git a/nixpkgs/pkgs/development/tools/language-servers/perlnavigator/default.nix b/nixpkgs/pkgs/development/tools/language-servers/perlnavigator/default.nix new file mode 100644 index 000000000000..ddeb1a9e0b93 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/language-servers/perlnavigator/default.nix @@ -0,0 +1,80 @@ +{ lib +, buildNpmPackage +, fetchFromGitHub +}: + +let + version = "0.6.0"; + src = fetchFromGitHub { + owner = "bscan"; + repo = "PerlNavigator"; + rev = "v${version}"; + hash = "sha256-RMxM8g3ZdSt1B8WgwmcQgjpPZOCrVYYkhOt610SgbIw="; + }; + browser-ext = buildNpmPackage { + pname = "perlnavigator-web-server"; + inherit version src; + sourceRoot = "${src.name}/browser-ext"; + npmDepsHash = "sha256-PJKW+ni2wKw1ivkgQsL6g0jaxoYboa3XpVEEwgT4jWo="; + dontNpmBuild = true; + installPhase = '' + cp -r . "$out" + ''; + }; + client = buildNpmPackage { + pname = "perlnavigator-client"; + inherit version src; + sourceRoot = "${src.name}/client"; + npmDepsHash = "sha256-CM0l+D1VNkXBrZQHQGDiB/vAxMvpbHYoYlIugoLxSfA="; + dontNpmBuild = true; + installPhase = '' + cp -r . "$out" + ''; + }; + server = buildNpmPackage { + pname = "perlnavigator-server"; + inherit version src; + sourceRoot = "${src.name}/server"; + npmDepsHash = "sha256-TxK3ba9T97p8TBlULHUov6YX7WRl2QMq6TiNHxBoQeY="; + dontNpmBuild = true; + installPhase = '' + cp -r . "$out" + ''; + }; +in buildNpmPackage rec { + pname = "perlnavigator"; + inherit version src; + + npmDepsHash = "sha256-nEinmgrbbFC+nkfTwu9djiUS+tj0VM4WKl2oqKpcGtM="; + + postPatch = '' + sed -i /postinstall/d package.json + + rm -r browser-ext client server + cp -r ${browser-ext} browser-ext + cp -r ${client} client + cp -r ${server} server + chmod +w browser-ext client server + ''; + + env = { + PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD = 1; + }; + + npmBuildScript = "compile"; + + postInstall = '' + cp -r ${browser-ext}/node_modules "$out/lib/node_modules/perlnavigator/browser-ext" + cp -r ${client}/node_modules "$out/lib/node_modules/perlnavigator/client" + cp -r ${server}/node_modules "$out/lib/node_modules/perlnavigator/server" + ''; + + meta = { + changelog = "https://github.com/bscan/PerlNavigator/blob/${src.rev}/CHANGELOG.md"; + description = "Perl Language Server that includes syntax checking, perl critic, and code navigation"; + homepage = "https://github.com/bscan/PerlNavigator/tree/main/server"; + license = lib.licenses.mit; + mainProgram = "perlnavigator"; + maintainers = with lib.maintainers; [ wolfangaukang ]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/language-servers/pylyzer/default.nix b/nixpkgs/pkgs/development/tools/language-servers/pylyzer/default.nix index 2d64bf07a7ca..757eeb2b4d9e 100644 --- a/nixpkgs/pkgs/development/tools/language-servers/pylyzer/default.nix +++ b/nixpkgs/pkgs/development/tools/language-servers/pylyzer/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "pylyzer"; - version = "0.0.41"; + version = "0.0.42"; src = fetchFromGitHub { owner = "mtshiba"; repo = "pylyzer"; rev = "v${version}"; - hash = "sha256-8pDHCu0cmBDkMc5epVTT1JSKd9dbLsRk3ZyqBM5QJwc="; + hash = "sha256-SZwMgxQUuGq74mca1mgZ41esW/mr+mvlOhHXFALjd8U="; }; - cargoHash = "sha256-1eAxl9eO6SOTVT4e+kinsDPd2LFmF9+SflUJaFEJE6g="; + cargoHash = "sha256-iPNdkKLvLyJGwdd19tNNwuxVBctp1K+UuQjjLLzkgHg="; nativeBuildInputs = [ git diff --git a/nixpkgs/pkgs/development/tools/language-servers/ruff-lsp/default.nix b/nixpkgs/pkgs/development/tools/language-servers/ruff-lsp/default.nix index 3965a73cec04..23d91d328704 100644 --- a/nixpkgs/pkgs/development/tools/language-servers/ruff-lsp/default.nix +++ b/nixpkgs/pkgs/development/tools/language-servers/ruff-lsp/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "ruff-lsp"; - version = "0.0.37"; + version = "0.0.38"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "astral-sh"; repo = "ruff-lsp"; rev = "v${version}"; - hash = "sha256-B77q2qB0X8K8YkUjL5Hm7/aa/p3YCyhys5JnPjPQ+ZU="; + hash = "sha256-JWobbaXmIcd+c/EikiuUva5aHm3VDdeAQK60Krl6tVE="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/tools/language-servers/verible/default.nix b/nixpkgs/pkgs/development/tools/language-servers/verible/default.nix index c486cf38efee..4b2731167157 100644 --- a/nixpkgs/pkgs/development/tools/language-servers/verible/default.nix +++ b/nixpkgs/pkgs/development/tools/language-servers/verible/default.nix @@ -1,10 +1,10 @@ { lib , stdenv -, fetchFromGitHub , buildBazelPackage +, fetchFromGitHub , bazel_4 -, flex , bison +, flex , python3 }: @@ -17,8 +17,8 @@ buildBazelPackage rec { # These environment variables are read in bazel/build-version.py to create # a build string shown in the tools --version output. # If env variables not set, it would attempt to extract it from .git/. - GIT_DATE = "2023-05-05"; - GIT_VERSION = "v0.0-3253-gf85c768c"; + GIT_DATE = "2023-08-29"; + GIT_VERSION = "v0.0-3410-g398a8505"; # Derive nix package version from GIT_VERSION: "v1.2-345-abcde" -> "1.2.345" version = builtins.concatStringsSep "." (lib.take 3 (lib.drop 1 (builtins.splitVersion GIT_VERSION))); @@ -27,7 +27,7 @@ buildBazelPackage rec { owner = "chipsalliance"; repo = "verible"; rev = "${GIT_VERSION}"; - sha256 = "sha256-scLYQQt6spBImJEYG60ZbIsUfKqWBj2DINjZgFKESoI="; + sha256 = "sha256-qi//Dssgg5ITrL5jCpZXpSrhSm2xCqe53D9ctK7SQoU="; }; patches = [ @@ -37,6 +37,7 @@ buildBazelPackage rec { ./remove-unused-deps.patch ]; + bazel = bazel_4; bazelFlags = [ "--//bazel:use_local_flex_bison" "--javabase=@bazel_tools//tools/jdk:remote_jdk11" @@ -49,14 +50,14 @@ buildBazelPackage rec { # of the output derivation ? Is there a more robust way to do this ? # (Hashes extracted from the ofborg build logs) sha256 = { - aarch64-linux = "sha256-BrJyFeq3BB4sHIXMMxRIaYV+VJAfTs2bvK7pnw6faBY="; - x86_64-linux = "sha256-G6tqHWeQBi2Ph3IDFNu2sp+UU2BO93+lcyJ+kvpuRJo="; + aarch64-linux = "sha256-Hf/jF5Y7QS2ZNFmSx2LIb0b6gdjditE97HwWGqQJac8="; + x86_64-linux = "sha256-WBp5Fi5vvKLVgRWvQ3VB7sY6ySpbwCdhU5KqZH9sLy4="; }.${system} or (throw "No hash for system: ${system}"); }; nativeBuildInputs = [ - flex # We use local flex and bison as WORKSPACE sources fail - bison # .. to compile with newer glibc + bison # We use local flex and bison as WORKSPACE sources fail + flex # .. to compile with newer glibc python3 ]; @@ -72,7 +73,6 @@ buildBazelPackage rec { verilog/tools ''; - bazel = bazel_4; removeRulesCC = false; bazelTargets = [ ":install-binaries" ]; bazelTestTargets = [ "//..." ]; @@ -99,10 +99,10 @@ buildBazelPackage rec { }; meta = with lib; { - homepage = "https://github.com/chipsalliance/verible"; description = "Suite of SystemVerilog developer tools. Including a style-linter, indexer, formatter, and language server."; + homepage = "https://github.com/chipsalliance/verible"; license = licenses.asl20; - platforms = platforms.linux; maintainers = with maintainers; [ hzeller newam ]; + platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/development/tools/language-servers/yaml-language-server/default.nix b/nixpkgs/pkgs/development/tools/language-servers/yaml-language-server/default.nix new file mode 100644 index 000000000000..080b39dcf46e --- /dev/null +++ b/nixpkgs/pkgs/development/tools/language-servers/yaml-language-server/default.nix @@ -0,0 +1,41 @@ +{ lib +, mkYarnPackage +, fetchYarnDeps +, fetchFromGitHub +}: + +mkYarnPackage rec { + pname = "yaml-language-server"; + version = "1.14.0"; + + src = fetchFromGitHub { + owner = "redhat-developer"; + repo = "yaml-language-server"; + rev = version; + hash = "sha256-DS5kMw/x8hP2MzxHdHXnBqqBGLq21NiZBb5ApjEe/ts="; + }; + + packageJSON = ./package.json; + offlineCache = fetchYarnDeps { + yarnLock = "${src}/yarn.lock"; + hash = "sha256-zHcxZ4VU6CGux72Nsy0foU4gFshK1wO/LTfnwOoirmg="; + }; + + buildPhase = '' + runHook preBuild + + export HOME=$(mktemp -d) + yarn --offline build + + runHook postBuild + ''; + + meta = { + changelog = "https://github.com/redhat-developer/yaml-language-server/blob/${src.rev}/CHANGELOG.md"; + description = "Language Server for YAML Files"; + homepage = "https://github.com/redhat-developer/yaml-language-server"; + license = lib.licenses.mit; + mainProgram = "yaml-language-server"; + maintainers = with lib.maintainers; [ wolfangaukang ]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/language-servers/yaml-language-server/package.json b/nixpkgs/pkgs/development/tools/language-servers/yaml-language-server/package.json new file mode 100644 index 000000000000..c270da41f4df --- /dev/null +++ b/nixpkgs/pkgs/development/tools/language-servers/yaml-language-server/package.json @@ -0,0 +1,108 @@ +{ + "name": "yaml-language-server", + "description": "YAML language server", + "version": "1.14.0", + "author": "Gorkem Ercan (Red Hat)", + "license": "MIT", + "contributors": [ + { + "name": "Joshua Pinkney", + "email": "joshpinkney@gmail.com" + }, + { + "name": "Yevhen Vydolob", + "email": "yvydolob@redhat.com" + }, + { + "name": "Google LLC" + } + ], + "bin": { + "yaml-language-server": "./bin/yaml-language-server" + }, + "main": "./out/server/src/index.js", + "keywords": [ + "yaml", + "LSP" + ], + "repository": { + "type": "git", + "url": "https://github.com/redhat-developer/yaml-language-server.git" + }, + "optionalDependencies": { + "prettier": "2.8.7" + }, + "dependencies": { + "ajv": "^8.11.0", + "lodash": "4.17.21", + "request-light": "^0.5.7", + "vscode-json-languageservice": "4.1.8", + "vscode-languageserver": "^7.0.0", + "vscode-languageserver-textdocument": "^1.0.1", + "vscode-languageserver-types": "^3.16.0", + "vscode-nls": "^5.0.0", + "vscode-uri": "^3.0.2", + "yaml": "2.2.2" + }, + "devDependencies": { + "@microsoft/eslint-formatter-sarif": "3.0.0", + "@types/chai": "^4.2.12", + "@types/mocha": "8.2.2", + "@types/node": "16.x", + "@types/prettier": "2.7.2", + "@types/sinon": "^9.0.5", + "@types/sinon-chai": "^3.2.5", + "@typescript-eslint/eslint-plugin": "^5.38.0", + "@typescript-eslint/parser": "^5.38.0", + "chai": "^4.2.0", + "coveralls": "3.1.1", + "eslint": "^8.24.0", + "eslint-config-prettier": "^8.5.0", + "eslint-plugin-import": "^2.26.0", + "eslint-plugin-prettier": "^4.2.1", + "http-proxy-agent": "^5.0.0", + "https-proxy-agent": "^5.0.0", + "mocha": "9.2.2", + "mocha-lcov-reporter": "^1.3.0", + "nyc": "^15.1.0", + "rimraf": "^3.0.2", + "sinon": "^9.0.3", + "sinon-chai": "^3.5.0", + "source-map-support": "^0.5.19", + "ts-node": "^10.0.0", + "typescript": "^4.8.3" + }, + "scripts": { + "clean": "rimraf out/server && rimraf lib", + "compile": "tsc -p .", + "watch": "tsc --watch -p .", + "test": "mocha --require ts-node/register --timeout 5000 --ui bdd ./test/*.test.ts", + "coverage": "nyc mocha --require ts-node/register --timeout 5000 --require source-map-support/register --recursive --ui bdd ./test/*.test.ts", + "coveralls": "nyc --reporter=lcov --reporter=text mocha --timeout 5000 --require ts-node/register --require source-map-support/register --recursive --ui bdd ./test/*.test.ts", + "lint": "eslint --max-warnings 0 -c .eslintrc.js --ext .ts src test", + "lint-ci": "eslint --max-warnings 0 -c .eslintrc.js -f @microsoft/eslint-formatter-sarif -o eslint-result.sarif --ext .ts src test", + "prettier-fix": "yarn prettier --write .", + "build": "yarn clean && yarn lint && yarn compile && yarn build:libs", + "build:libs": "yarn compile:umd && yarn compile:esm", + "compile:umd": "tsc -p ./tsconfig.umd.json", + "compile:esm": "tsc -p ./tsconfig.esm.json", + "check-dependencies": "node ./scripts/check-dependencies.js", + "pull-remote": "git pull https://github.com/redhat-developer/yaml-language-server.git main" + }, + "nyc": { + "extension": [ + ".ts", + ".tsx" + ], + "exclude": [ + "**/*.d.ts", + "test/", + "out", + "lib", + "coverage/", + ".eslintrc.js", + "scripts" + ], + "all": true + } +} diff --git a/nixpkgs/pkgs/development/tools/ldid-procursus/default.nix b/nixpkgs/pkgs/development/tools/ldid-procursus/default.nix index 52866b041c0c..b9ffbb2fc871 100644 --- a/nixpkgs/pkgs/development/tools/ldid-procursus/default.nix +++ b/nixpkgs/pkgs/development/tools/ldid-procursus/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, installShellFiles , pkg-config , libplist , openssl @@ -9,17 +10,31 @@ stdenv.mkDerivation (finalAttrs: { pname = "ldid-procursus"; version = "2.1.5-procursus7"; + src = fetchFromGitHub { owner = "ProcursusTeam"; repo = "ldid"; rev = "v${finalAttrs.version}"; hash = "sha256-QnSmWY9zCOPYAn2VHc5H+VQXjTCyr0EuosxvKGGpDtQ="; }; - nativeBuildInputs = [ pkg-config libplist openssl ]; + + nativeBuildInputs = [ pkg-config installShellFiles ]; + buildInputs = [ libplist openssl ]; + stripDebugFlags = [ "--strip-unneeded" ]; makeFlags = [ "PREFIX=${placeholder "out"}" ]; + postPatch = '' + substituteInPlace Makefile \ + --replace "pkg-config" "$PKG_CONFIG" + ''; + + postInstall = '' + installShellCompletion --cmd ldid --zsh _ldid + ''; + meta = with lib; { + mainProgram = "ldid"; description = "Put real or fake signatures in a Mach-O binary"; homepage = "https://github.com/ProcursusTeam/ldid"; maintainers = with maintainers; [ keto ]; diff --git a/nixpkgs/pkgs/development/tools/ls-lint/default.nix b/nixpkgs/pkgs/development/tools/ls-lint/default.nix index bae79bd14c7a..9bbf37d57909 100644 --- a/nixpkgs/pkgs/development/tools/ls-lint/default.nix +++ b/nixpkgs/pkgs/development/tools/ls-lint/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ls-lint"; - version = "2.0.1"; + version = "2.1.0"; src = fetchFromGitHub { owner = "loeffel-io"; repo = "ls-lint"; rev = "v${version}"; - sha256 = "sha256-JG3gDmPfeGyiiIsFX0jFN1Xi9lY4eednmEfJLdu0atA="; + sha256 = "sha256-AlIXZ2tf1pFj6LVz8kyCFq0dUEPBm+0ejQH7VXm4H+M="; }; vendorHash = "sha256-/6Y20AvhUShaE1sNTccB62x8YkVLLjhl6fg5oY4gL4I="; diff --git a/nixpkgs/pkgs/development/tools/misc/catppuccin-catwalk/default.nix b/nixpkgs/pkgs/development/tools/misc/catppuccin-catwalk/default.nix index fc48fc83374b..e19ed72222f7 100644 --- a/nixpkgs/pkgs/development/tools/misc/catppuccin-catwalk/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/catppuccin-catwalk/default.nix @@ -1,41 +1,37 @@ { lib -, fetchPypi -, python3 -, +, fetchFromGitHub +, rustPlatform +, installShellFiles }: -python3.pkgs.buildPythonApplication rec { +rustPlatform.buildRustPackage { pname = "catppuccin-catwalk"; - version = "0.4.0"; - format = "pyproject"; + version = "0.1.0"; - src = fetchPypi { - inherit version; - pname = "catppuccin_catwalk"; - hash = "sha256-5TAw5H3soxe9vLhfj1qs8uMr4ybrHlCj4zdsMzvPo6s="; + src = fetchFromGitHub { + owner = "catppuccin"; + repo = "toolbox"; + rev = "b38153e94622bab574224bb24a6ae953b3a849da"; + hash = "sha256-zZRl6Xem41pBQmEoK24YR4TKiQ84nU5phBih2TF8G8g="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'Pillow = "^' 'Pillow = ">=' - ''; - - nativeBuildInputs = with python3.pkgs; [ - poetry-core - ]; + buildAndTestSubdir = "catwalk"; + cargoHash = "sha256-KoxivYLzJEjWbxIkizrMpmVwUF7bfVxl13H774lzQRg="; - propagatedBuildInputs = with python3.pkgs; [ - pillow - ]; + nativeBuildInputs = [ installShellFiles ]; - pythonImports = [ - "catwalk" - ]; + postInstall = '' + installShellCompletion --cmd catwalk \ + --bash <("$out/bin/catwalk" completion bash) \ + --zsh <("$out/bin/catwalk" completion zsh) \ + --fish <("$out/bin/catwalk" completion fish) + ''; meta = with lib; { - homepage = "https://github.com/catppuccin/toolbox"; + homepage = "https://github.com/catppuccin/toolbox/tree/main/catwalk"; description = "A CLI for Catppuccin that takes in four showcase images and displays them all at once"; license = licenses.mit; maintainers = with maintainers; [ ryanccn ]; + mainProgram = "catwalk"; }; } diff --git a/nixpkgs/pkgs/development/tools/misc/complgen/default.nix b/nixpkgs/pkgs/development/tools/misc/complgen/default.nix index c9685d53511e..ac49d7446bab 100644 --- a/nixpkgs/pkgs/development/tools/misc/complgen/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/complgen/default.nix @@ -3,22 +3,28 @@ , fetchFromGitHub }: -rustPlatform.buildRustPackage { +rustPlatform.buildRustPackage rec { pname = "complgen"; - version = "unstable-2023-08-22"; + version = "0.1.3"; src = fetchFromGitHub { owner = "adaszko"; repo = "complgen"; - rev = "8c9b9c51f3465c6d858e15f442b63e94b2f5ed1b"; - hash = "sha256-oYRaH3FbAFY7QujgFpUDD8gVam4+Gm9qROxCTMYBg9I="; + rev = "v${version}"; + hash = "sha256-YKJleWnUZodPuJcWX8w06PH6q1SzeUXL8AjYr9i7+sY="; }; - cargoHash = "sha256-LHnIIkQLuY+A09qhxSiyLmUpX/dES7xBE5m1uRPI0i0="; + cargoHash = "sha256-ytwhIcm4NeHDRzKNHaxo4ke+gridXKmiKHkPnACXV8o="; + + # Cargo.lock is outdated + postConfigure = '' + cargo metadata --offline + ''; meta = with lib; { description = "Generate {bash,fish,zsh} completions from a single EBNF-like grammar"; homepage = "https://github.com/adaszko/complgen"; + changelog = "https://github.com/adaszko/complgen/blob/${src.rev}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ figsoda ]; }; diff --git a/nixpkgs/pkgs/development/tools/misc/coreboot-toolchain/default.nix b/nixpkgs/pkgs/development/tools/misc/coreboot-toolchain/default.nix index dc96f6e3c6ce..66eff5e2427c 100644 --- a/nixpkgs/pkgs/development/tools/misc/coreboot-toolchain/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/coreboot-toolchain/default.nix @@ -17,14 +17,14 @@ let , withAda ? true }: - stdenvNoCC.mkDerivation rec { + stdenvNoCC.mkDerivation { pname = "coreboot-toolchain-${arch}"; - version = "4.20"; + version = "4.21"; src = fetchgit { url = "https://review.coreboot.org/coreboot"; - rev = "465fbbe93ee01b4576689a90b7ddbeec23cdace2"; - hash = "sha256-vzXOl+Z8VYh9Iq6+AMNb3apMv185J3mODauKMinSOI4="; + rev = "c1386ef6128922f49f93de5690ccd130a26eecf2"; + hash = "sha256-tFGyI170vbhRgJZDix69DfOD5nIY8T4chSP+qTt3kC8="; fetchSubmodules = false; leaveDotGit = true; postFetch = '' diff --git a/nixpkgs/pkgs/development/tools/misc/coreboot-toolchain/stable.nix b/nixpkgs/pkgs/development/tools/misc/coreboot-toolchain/stable.nix index a432aab59e78..d4419687ebee 100644 --- a/nixpkgs/pkgs/development/tools/misc/coreboot-toolchain/stable.nix +++ b/nixpkgs/pkgs/development/tools/misc/coreboot-toolchain/stable.nix @@ -21,10 +21,10 @@ }; } { - name = "gcc-11.3.0.tar.xz"; + name = "gcc-11.4.0.tar.xz"; archive = fetchurl { - sha256 = "0fdclcwf728wbq52vphfcjywzhpsjp3kifzj3pib3xcihs0z4z5l"; - url = "mirror://gnu/gcc/gcc-11.3.0/gcc-11.3.0.tar.xz"; + sha256 = "1ncd7akww0hl5kkmw1dj3qgqp3phdrr5dfnm7jia9s07n0ib4b9z"; + url = "mirror://gnu/gcc/gcc-11.4.0/gcc-11.4.0.tar.xz"; }; } { @@ -35,17 +35,17 @@ }; } { - name = "R10_20_22.tar.gz"; + name = "R06_28_23.tar.gz"; archive = fetchurl { - sha256 = "11iv3jrz27g7bv7ffyxsrgm4cq60cld2gkkl008p3lcwfyqpx88s"; - url = "https://github.com/acpica/acpica/archive/refs/tags/R10_20_22.tar.gz"; + sha256 = "0cadxihshyrjplrx01vna13r1m2f6lj1klw7mh8pg2m0gjdpjj12"; + url = "https://github.com/acpica/acpica/archive/refs/tags/R06_28_23.tar.gz"; }; } { - name = "nasm-2.15.05.tar.bz2"; + name = "nasm-2.16.01.tar.bz2"; archive = fetchurl { - sha256 = "1l1gxs5ncdbgz91lsl4y7w5aapask3w02q9inayb2m5bwlwq6jrw"; - url = "https://www.nasm.us/pub/nasm/releasebuilds/2.15.05/nasm-2.15.05.tar.bz2"; + sha256 = "0bmv8xbzck7jim7fzm6jnwiahqkprbpz6wzhg53irm28w0pavdim"; + url = "https://www.nasm.us/pub/nasm/releasebuilds/2.16.01/nasm-2.16.01.tar.bz2"; }; } ] diff --git a/nixpkgs/pkgs/development/tools/misc/dart-sass/default.nix b/nixpkgs/pkgs/development/tools/misc/dart-sass/default.nix index 8783ca578a23..2234e7bb35cd 100644 --- a/nixpkgs/pkgs/development/tools/misc/dart-sass/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/dart-sass/default.nix @@ -29,7 +29,7 @@ buildDartApplication rec { }; pubspecLockFile = ./pubspec.lock; - vendorHash = "sha256-YWxVpwuo97i00/F4WOn2AWiRFYSFIWbEbmxDF77gWsE="; + vendorHash = "sha256-oLHHKV5tTgEkCzqRscBXMNafKg4jdH2U9MhVY/Myfv4="; nativeBuildInputs = [ buf diff --git a/nixpkgs/pkgs/development/tools/misc/dart-sass/pubspec.lock b/nixpkgs/pkgs/development/tools/misc/dart-sass/pubspec.lock index b0cd7438f81a..e2fa02f62d96 100644 --- a/nixpkgs/pkgs/development/tools/misc/dart-sass/pubspec.lock +++ b/nixpkgs/pkgs/development/tools/misc/dart-sass/pubspec.lock @@ -66,13 +66,13 @@ packages: source: hosted version: "2.0.3" cli_pkg: - dependency: "direct dev" + dependency: "direct main" description: name: cli_pkg - sha256: "0f76b0ea3f158e9c68e3ae132e90435cfd094c507ae6aaeccb05bbc2ef758517" + sha256: "009e19944bbfb07c3b97f2f8c9941aa01ca70a7d3d0018e813303b4c3905c9b9" url: "https://pub.dev" source: hosted - version: "2.4.4" + version: "2.5.0" cli_repl: dependency: "direct main" description: @@ -82,7 +82,7 @@ packages: source: hosted version: "0.2.3" cli_util: - dependency: transitive + dependency: "direct dev" description: name: cli_util sha256: b8db3080e59b2503ca9e7922c3df2072cf13992354d5e944074ffa836fba43b7 @@ -93,10 +93,10 @@ packages: dependency: "direct main" description: name: collection - sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687 + sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a url: "https://pub.dev" source: hosted - version: "1.17.2" + version: "1.18.0" convert: dependency: transitive description: @@ -125,18 +125,18 @@ packages: dependency: transitive description: name: csslib - sha256: "831883fb353c8bdc1d71979e5b342c7d88acfbc643113c14ae51e2442ea0f20f" + sha256: "706b5707578e0c1b4b7550f64078f0a0f19dec3f50a178ffae7006b0a9ca58fb" url: "https://pub.dev" source: hosted - version: "0.17.3" + version: "1.0.0" dart_style: dependency: "direct dev" description: name: dart_style - sha256: f4f1f73ab3fd2afcbcca165ee601fe980d966af6a21b5970c6c9376955c528ad + sha256: "1efa911ca7086affd35f463ca2fc1799584fb6aa89883cf0af8e3664d6a02d55" url: "https://pub.dev" source: hosted - version: "2.3.1" + version: "2.3.2" dartdoc: dependency: "direct dev" description: @@ -189,18 +189,18 @@ packages: dependency: transitive description: name: html - sha256: "58e3491f7bf0b6a4ea5110c0c688877460d1a6366731155c4a4580e7ded773e8" + sha256: "3a7812d5bcd2894edf53dfaf8cd640876cf6cef50a8f238745c8b8120ea74d3a" url: "https://pub.dev" source: hosted - version: "0.15.3" + version: "0.15.4" http: dependency: "direct main" description: name: http - sha256: "5895291c13fa8a3bd82e76d5627f69e0d85ca6a30dcac95c4ea19a5d555879c2" + sha256: "759d1a329847dd0f39226c688d3e06a6b8679668e350e2891a6474f8b4bb8525" url: "https://pub.dev" source: hosted - version: "0.13.6" + version: "1.1.0" http_multi_server: dependency: transitive description: @@ -261,10 +261,10 @@ packages: dependency: transitive description: name: markdown - sha256: "8e332924094383133cee218b676871f42db2514f1f6ac617b6cf6152a7faab8e" + sha256: acf35edccc0463a9d7384e437c015a3535772e09714cf60e07eeef3a15870dcd url: "https://pub.dev" source: hosted - version: "7.1.0" + version: "7.1.1" matcher: dependency: transitive description: @@ -333,10 +333,10 @@ packages: dependency: transitive description: name: petitparser - sha256: cb3798bef7fc021ac45b308f4b51208a152792445cce0448c9a4ba5879dd8750 + sha256: eeb2d1428ee7f4170e2bd498827296a18d4e7fc462b71727d111c0ac7707cfa6 url: "https://pub.dev" source: hosted - version: "5.4.0" + version: "6.0.1" pointycastle: dependency: transitive description: @@ -357,26 +357,26 @@ packages: dependency: "direct main" description: name: protobuf - sha256: "01dd9bd0fa02548bf2ceee13545d4a0ec6046459d847b6b061d8a27237108a08" + sha256: "68645b24e0716782e58948f8467fd42a880f255096a821f9e7d0ec625b00c84d" url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "3.1.0" protoc_plugin: dependency: "direct dev" description: name: protoc_plugin - sha256: e2be5014ba145dc0f8de20ac425afa2a513aff64fe350d338e481d40de0573df + sha256: a800528e47f6efd31a57213dd11b6036f36cbd6677785742a2121e96f7c7a2b9 url: "https://pub.dev" source: hosted - version: "20.0.1" + version: "21.1.1" pub_api_client: dependency: "direct dev" description: name: pub_api_client - sha256: d4bc6c9ec778da1a79675eab41bde456b392973216acd783156afaee69230e22 + sha256: d456816ef5142906a22dc56e37be6bef6cb0276f0a26c11d1f7d277868202e71 url: "https://pub.dev" source: hosted - version: "2.4.0" + version: "2.6.0" pub_semver: dependency: "direct main" description: @@ -477,18 +477,18 @@ packages: dependency: "direct main" description: name: stack_trace - sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 + sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" url: "https://pub.dev" source: hosted - version: "1.11.0" + version: "1.11.1" stream_channel: dependency: "direct main" description: name: stream_channel - sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" + sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" stream_transform: dependency: "direct main" description: @@ -517,26 +517,26 @@ packages: dependency: "direct dev" description: name: test - sha256: "13b41f318e2a5751c3169137103b60c584297353d4b1761b66029bae6411fe46" + sha256: "9b0dd8e36af4a5b1569029949d50a52cb2a2a2fdaa20cebb96e6603b9ae241f9" url: "https://pub.dev" source: hosted - version: "1.24.3" + version: "1.24.6" test_api: dependency: transitive description: name: test_api - sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8" + sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" url: "https://pub.dev" source: hosted - version: "0.6.0" + version: "0.6.1" test_core: dependency: transitive description: name: test_core - sha256: "99806e9e6d95c7b059b7a0fc08f07fc53fabe54a829497f0d9676299f1e8637e" + sha256: "4bef837e56375537055fdbbbf6dd458b1859881f4c7e6da936158f77d61ab265" url: "https://pub.dev" source: hosted - version: "0.5.3" + version: "0.5.6" test_descriptor: dependency: "direct dev" description: @@ -553,14 +553,6 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.0" - tuple: - dependency: "direct main" - description: - name: tuple - sha256: "0ea99cd2f9352b2586583ab2ce6489d1f95a5f6de6fb9492faaf97ae2060f0aa" - url: "https://pub.dev" - source: hosted - version: "2.0.1" typed_data: dependency: "direct main" description: @@ -581,10 +573,10 @@ packages: dependency: transitive description: name: vm_service - sha256: f3743ca475e0c9ef71df4ba15eb2d7684eecd5c8ba20a462462e4e8b561b2e11 + sha256: c538be99af830f478718b51630ec1b6bee5e74e52c8a802d328d9e71d35d2583 url: "https://pub.dev" source: hosted - version: "11.6.0" + version: "11.10.0" watcher: dependency: "direct main" description: @@ -613,10 +605,10 @@ packages: dependency: transitive description: name: xml - sha256: "80d494c09849dc3f899d227a78c30c5b949b985ededf884cb3f3bcd39f4b447a" + sha256: af5e77e9b83f2f4adc5d3f0a4ece1c7f45a2467b695c2540381bac793e34e556 url: "https://pub.dev" source: hosted - version: "5.4.1" + version: "6.4.2" yaml: dependency: "direct dev" description: diff --git a/nixpkgs/pkgs/development/tools/misc/devspace/default.nix b/nixpkgs/pkgs/development/tools/misc/devspace/default.nix index 2f0ede781e54..7a099a2258c3 100644 --- a/nixpkgs/pkgs/development/tools/misc/devspace/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/devspace/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "devspace"; - version = "6.3.2"; + version = "6.3.3"; src = fetchFromGitHub { owner = "loft-sh"; repo = "devspace"; rev = "v${version}"; - sha256 = "sha256-TDC4zhsNcU3qwvBSxvaYxlWHXX1YllRX9n6CGKlXOq4="; + sha256 = "sha256-xAK06bpl8BGsVUu6O1C2l+tzeiCQoRUMIUtwntUZVvU="; }; vendorSha256 = null; diff --git a/nixpkgs/pkgs/development/tools/misc/editorconfig-checker/default.nix b/nixpkgs/pkgs/development/tools/misc/editorconfig-checker/default.nix index 1649031a7e7d..a548f599ceac 100644 --- a/nixpkgs/pkgs/development/tools/misc/editorconfig-checker/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/editorconfig-checker/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "editorconfig-checker"; - version = "2.7.0"; + version = "2.7.1"; src = fetchFromGitHub { owner = "editorconfig-checker"; repo = "editorconfig-checker"; rev = version; - hash = "sha256-8qGRcyDayXx3OflhE9Kw2AXM702/2pYB3JgfpQ0UYR8="; + hash = "sha256-TycKc6Zgf9QFTH3lfNC+/O52cp2xhKsKflxuQTac794="; }; vendorHash = "sha256-S93ZvC92V9nrBicEv1yQ3DEuf1FmxtvFoKPR15e8VmA="; @@ -28,6 +28,7 @@ buildGoModule rec { }; meta = with lib; { + changelog = "https://github.com/editorconfig-checker/editorconfig-checker/releases/tag/${src.rev}"; description = "A tool to verify that your files are in harmony with your .editorconfig"; homepage = "https://editorconfig-checker.github.io/"; license = licenses.mit; diff --git a/nixpkgs/pkgs/development/tools/misc/gef/default.nix b/nixpkgs/pkgs/development/tools/misc/gef/default.nix index a3b37d25ed89..1893d7ef0b2e 100644 --- a/nixpkgs/pkgs/development/tools/misc/gef/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/gef/default.nix @@ -21,13 +21,13 @@ let in stdenv.mkDerivation rec { pname = "gef"; - version = "2023.06"; + version = "2023.08"; src = fetchFromGitHub { owner = "hugsy"; repo = "gef"; rev = version; - sha256 = "sha256-QfVtDGhnyvRWQhxRnDyQFiHD7DByTGC3fUKadTB2w/U="; + sha256 = "sha256-MqpII3jhSc6aP/WQDktom2wxAvCkxCwfs1AFWij5J7A="; }; dontBuild = true; diff --git a/nixpkgs/pkgs/development/tools/misc/inotify-tools/default.nix b/nixpkgs/pkgs/development/tools/misc/inotify-tools/default.nix index bd126ceb7c1b..91c9d76c66d1 100644 --- a/nixpkgs/pkgs/development/tools/misc/inotify-tools/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/inotify-tools/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "inotify-tools"; - version = "3.22.6.0"; + version = "4.23.8.0"; src = fetchFromGitHub { repo = "inotify-tools"; owner = "inotify-tools"; rev = finalAttrs.version; - hash = "sha256-EYWVSgwoMjAlc/V5kv+2jfxEqWVW/lEoIxVd+ctEMsk="; + hash = "sha256-aD5jzUbDfB57wE1PSA3a+79owspSn7rcoRe5HsPDSXI="; }; configureFlags = [ diff --git a/nixpkgs/pkgs/development/tools/misc/n98-magerun/default.nix b/nixpkgs/pkgs/development/tools/misc/n98-magerun/default.nix index 9b3fb21602cc..dadca94c37b0 100644 --- a/nixpkgs/pkgs/development/tools/misc/n98-magerun/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/n98-magerun/default.nix @@ -1,39 +1,46 @@ -{ stdenv, fetchFromGitHub, makeWrapper, unzip, lib, php81 }: +{ + stdenv +, fetchurl +, makeBinaryWrapper +, php +, lib +, unzip +}: -let +stdenv.mkDerivation (finalAttrs: { pname = "n98-magerun"; version = "2.3.0"; -in -stdenv.mkDerivation { - inherit pname version; - - src = fetchFromGitHub { - owner = "netz98"; - repo = "n98-magerun1-dist"; - rev = version; - sha256 = "sha256-T7wQmEEYMG0J6+9nRt+tiMuihjnjjQ7UWy1C0vKoQY4="; + + src = fetchurl { + url = "https://github.com/netz98/n98-magerun/releases/download/${finalAttrs.version}/n98-magerun.phar"; + hash = "sha256-s+Cdr8zU3VBaBzxOh4nXjqPe+JPPxHWiFOEVS/86qOQ="; }; dontUnpack = true; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ + makeBinaryWrapper + ]; installPhase = '' runHook preInstall - mkdir -p $out/bin - install -D $src/n98-magerun $out/libexec/n98-magerun/n98-magerun-${version}.phar - makeWrapper ${php81}/bin/php $out/bin/n98-magerun \ - --add-flags "$out/libexec/n98-magerun/n98-magerun-${version}.phar" \ + + mkdir -p $out/bin $out/libexec/n98-magerun + + install -D $src $out/libexec/n98-magerun/n98-magerun.phar + makeWrapper ${php}/bin/php $out/bin/n98-magerun \ + --add-flags "$out/libexec/n98-magerun/n98-magerun.phar" \ --prefix PATH : ${lib.makeBinPath [ unzip ]} + runHook postInstall ''; - meta = with lib; { + meta = { + broken = true; # Not compatible with PHP 8.1, see https://github.com/netz98/n98-magerun/issues/1275 + changelog = "https://magerun.net/category/magerun/"; description = "The swiss army knife for Magento1/OpenMage developers"; - license = licenses.mit; homepage = "https://magerun.net/"; - changelog = "https://magerun.net/category/magerun/"; - maintainers = teams.php.members; - broken = true; # Not compatible with PHP 8.1, see https://github.com/netz98/n98-magerun/issues/1275 + license = lib.licenses.mit; + maintainers = lib.teams.php.members; }; -} +}) diff --git a/nixpkgs/pkgs/development/tools/misc/n98-magerun2/default.nix b/nixpkgs/pkgs/development/tools/misc/n98-magerun2/default.nix index d9c138281ed4..80ffef00444f 100644 --- a/nixpkgs/pkgs/development/tools/misc/n98-magerun2/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/n98-magerun2/default.nix @@ -1,38 +1,45 @@ -{ stdenv, fetchFromGitHub, makeWrapper, unzip, lib, php }: +{ + stdenv +, fetchurl +, makeBinaryWrapper +, php +, lib +, unzip +}: -let +stdenv.mkDerivation (finalAttrs: { pname = "n98-magerun2"; - version = "6.1.1"; -in -stdenv.mkDerivation { - inherit pname version; - - src = fetchFromGitHub { - owner = "netz98"; - repo = "n98-magerun2-dist"; - rev = version; - sha256 = "sha256-D2U1kLG6sOpBHDzNQ/LbiFUknvFhK+rkOPgWvW0pNmY="; + version = "7.1.0"; + + src = fetchurl { + url = "https://github.com/netz98/n98-magerun2/releases/download/${finalAttrs.version}/n98-magerun2.phar"; + hash = "sha256-DE5q1zoWZ4gJSs5JM5cr157oh5ufD1gaNt9X9vtuW/c="; }; dontUnpack = true; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ + makeBinaryWrapper + ]; installPhase = '' runHook preInstall - mkdir -p $out/bin - install -D $src/n98-magerun2 $out/libexec/n98-magerun2/n98-magerun2-${version}.phar + + mkdir -p $out/bin $out/libexec/n98-magerun2 + + install -D $src $out/libexec/n98-magerun2/n98-magerun2.phar makeWrapper ${php}/bin/php $out/bin/n98-magerun2 \ - --add-flags "$out/libexec/n98-magerun2/n98-magerun2-${version}.phar" \ + --add-flags "$out/libexec/n98-magerun2/n98-magerun2.phar" \ --prefix PATH : ${lib.makeBinPath [ unzip ]} + runHook postInstall ''; - meta = with lib; { + meta = { + changelog = "https://magerun.net/category/magerun/"; description = "The swiss army knife for Magento2 developers"; - license = licenses.mit; homepage = "https://magerun.net/"; - changelog = "https://magerun.net/category/magerun/"; - maintainers = teams.php.members; + license = lib.licenses.mit; + maintainers = lib.teams.php.members; }; -} +}) diff --git a/nixpkgs/pkgs/development/tools/misc/nrf-command-line-tools/default.nix b/nixpkgs/pkgs/development/tools/misc/nrf-command-line-tools/default.nix deleted file mode 100755 index fec7caacce3a..000000000000 --- a/nixpkgs/pkgs/development/tools/misc/nrf-command-line-tools/default.nix +++ /dev/null @@ -1,72 +0,0 @@ -{ lib -, stdenv -, fetchurl -, autoPatchelfHook -, udev -, libusb1 -, segger-jlink -}: - -let - supported = { - x86_64-linux = { - name = "linux-amd64"; - sha256 = "0e036afa51c83de7824ef75d34e165ed55efc486697b8ff105639644bce988e5"; - }; - i686-linux = { - name = "linux-i386"; - sha256 = "ba208559ae1195a0d4342374a0eb79697d31d6b848d180ac906494f17f56623b"; - }; - aarch64-linux = { - name = "linux-arm64"; - sha256 = "cffa4b8becdb5545705fd138422c648d809b520b7bc6c77b8b50aa1f79ebe845"; - }; - armv7l-linux = { - name = "linux-armhf"; - sha256 = "c58d330152ae1ef588a5ee1d93777e18b341d4f6a2754642b0ddd41821050a3a"; - }; - }; - - platform = supported.${stdenv.system} or (throw "unsupported platform ${stdenv.system}"); - - version = "10.16.0"; - - url = "https://nsscprodmedia.blob.core.windows.net/prod/software-and-other-downloads/desktop-software/nrf-command-line-tools/sw/versions-${lib.versions.major version}-x-x/${lib.versions.major version}-${lib.versions.minor version}-${lib.versions.patch version}/nrf-command-line-tools-${lib.versions.major version}.${lib.versions.minor version}.${lib.versions.patch version}_${platform.name}.tar.gz"; - -in stdenv.mkDerivation { - pname = "nrf-command-line-tools"; - inherit version; - - src = fetchurl { - inherit url; - inherit (platform) sha256; - }; - - runtimeDependencies = [ segger-jlink ]; - - nativeBuildInputs = [ autoPatchelfHook ]; - buildInputs = [ udev libusb1 ]; - - dontConfigure = true; - dontBuild = true; - - installPhase = '' - runHook preInstall - - rm -rf ./python - mkdir -p $out - cp -r * $out - - chmod +x $out/lib/* - - runHook postInstall - ''; - - meta = with lib; { - description = "Nordic Semiconductor nRF Command Line Tools"; - homepage = "https://www.nordicsemi.com/Products/Development-tools/nRF-Command-Line-Tools"; - license = licenses.unfree; - platforms = attrNames supported; - maintainers = with maintainers; [ stargate01 ]; - }; -} diff --git a/nixpkgs/pkgs/development/tools/misc/opengrok/default.nix b/nixpkgs/pkgs/development/tools/misc/opengrok/default.nix index cf02797a0da0..c5e217244f98 100644 --- a/nixpkgs/pkgs/development/tools/misc/opengrok/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/opengrok/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "opengrok"; - version = "1.12.13"; + version = "1.12.14"; # binary distribution src = fetchurl { url = "https://github.com/oracle/opengrok/releases/download/${version}/${pname}-${version}.tar.gz"; - hash = "sha256-DfSLQj6cbgDT56MwwnlC6hK/y3Hce2Ueprw0o3NURW0="; + hash = "sha256-4v+fDmDnmoAZimf63nSCqUp0y+a5UKQBxNWSNp64XE4="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/development/tools/misc/phpunit/default.nix b/nixpkgs/pkgs/development/tools/misc/phpunit/default.nix index 3d6f4fb5ad7e..ad94d669f697 100644 --- a/nixpkgs/pkgs/development/tools/misc/phpunit/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/phpunit/default.nix @@ -2,14 +2,14 @@ let pname = "phpunit"; - version = "10.2.6"; + version = "10.3.2"; in stdenv.mkDerivation { inherit pname version; src = fetchurl { url = "https://phar.phpunit.de/phpunit-${version}.phar"; - hash = "sha256-F2YKbAZtWIgwuFIg+wf57LaWPcY5mzYGR7sNDLH9Bb0="; + hash = "sha256-DHAr0oI9EUgsKlEdJFqdQXkYEMSTBYf91ZV6qjf+Kx0="; }; dontUnpack = true; diff --git a/nixpkgs/pkgs/development/tools/misc/protox/default.nix b/nixpkgs/pkgs/development/tools/misc/protox/default.nix index 6875292d241b..82849b6d9478 100644 --- a/nixpkgs/pkgs/development/tools/misc/protox/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/protox/default.nix @@ -5,14 +5,14 @@ rustPlatform.buildRustPackage rec { pname = "protox"; - version = "0.4.1"; + version = "0.5.0"; src = fetchCrate { inherit pname version; - hash = "sha256-n72Fvdo6LLk8pzYS2/5zk+dbsLRPAm6NZ5DsMRyHCTY="; + hash = "sha256-U9+7k7dQ6YFfsKMfFMg34g42qLvn+mcSRlAAys3eXNo="; }; - cargoHash = "sha256-wW4UcC3QAtriLEiXPndP+tZATftWP7ySavpIV6cGVCA="; + cargoHash = "sha256-sNOw19gxj+cEctxhXNWI8u15VJYlN8nSNl6Ha9sB/eE="; buildFeatures = [ "bin" ]; diff --git a/nixpkgs/pkgs/development/tools/misc/rsonpath/default.nix b/nixpkgs/pkgs/development/tools/misc/rsonpath/default.nix index 960c889e6b64..7a1e9ac6d4e7 100644 --- a/nixpkgs/pkgs/development/tools/misc/rsonpath/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/rsonpath/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "rsonpath"; - version = "0.6.1"; + version = "0.7.0"; src = fetchFromGitHub { owner = "v0ldek"; repo = "rsonpath"; rev = "v${version}"; - hash = "sha256-3ncaO7B3e4F2LFj1IjHvOyoWXBYQM69vPfPnsBr+tKI="; + hash = "sha256-VzHp5xMzAzo8ZCQyFCb1Igb0deJuZX+PIfs/oIy/zR0="; }; - cargoHash = "sha256-EjifSABhowk3PSQTuAm8+xRYbc0OwdqHMb9o/z1yuP0="; + cargoHash = "sha256-bnG95BgK41YJABqEGAbxg+gHoOksWc9nTChK7aCFK2E="; buildNoDefaultFeatures = !withSimd; diff --git a/nixpkgs/pkgs/development/tools/misc/segger-jlink/default.nix b/nixpkgs/pkgs/development/tools/misc/segger-jlink/default.nix deleted file mode 100755 index 15ddbbc88098..000000000000 --- a/nixpkgs/pkgs/development/tools/misc/segger-jlink/default.nix +++ /dev/null @@ -1,120 +0,0 @@ -{ lib -, stdenv -, fetchurl -, autoPatchelfHook -, qt4 -, udev -, config -, acceptLicense ? config.segger-jlink.acceptLicense or false -}: - -let - supported = { - x86_64-linux = { - name = "x86_64"; - sha256 = "90aa7e4f5eae6e60fd41978111b3ff124ba0269562d0d0ec3110d3cb4bb51fe2"; - }; - i686-linux = { - name = "i386"; - sha256 = "18aea42cd17591cada78af7cba0f94a9d851e9d29995b6c8e1e7033d0af35d1c"; - }; - aarch64-linux = { - name = "arm64"; - sha256 = "db410c1df80748827b4e25ff3abceee29e28305a0a7e30e4e39bb5c7e32f1aa2"; - }; - armv7l-linux = { - name = "arm"; - sha256 = "abcdaf44aeb2ad4e769709ec4fe971e259b23d297a98f58199c7bdf26db82e84"; - }; - }; - - platform = supported.${stdenv.system} or (throw "unsupported platform ${stdenv.system}"); - - version = "766"; - - url = "https://www.segger.com/downloads/jlink/JLink_Linux_V${version}_${platform.name}.tgz"; - -in stdenv.mkDerivation { - pname = "segger-jlink"; - inherit version; - - src = - assert !acceptLicense -> throw '' - Use of the "SEGGER JLink Software and Documentation pack" requires the - acceptance of the following licenses: - - - SEGGER Downloads Terms of Use [1] - - SEGGER Software Licensing [2] - - You can express acceptance by setting acceptLicense to true in your - configuration. Note that this is not a free license so it requires allowing - unfree licenses as well. - - configuration.nix: - nixpkgs.config.allowUnfree = true; - nixpkgs.config.segger-jlink.acceptLicense = true; - - config.nix: - allowUnfree = true; - segger-jlink.acceptLicense = true; - - [1]: ${url} - [2]: https://www.segger.com/purchase/licensing/ - ''; - fetchurl { - inherit url; - inherit (platform) sha256; - curlOpts = "--data accept_license_agreement=accepted"; - }; - - # Currently blocked by patchelf bug - # https://github.com/NixOS/patchelf/pull/275 - #runtimeDependencies = [ udev ]; - - nativeBuildInputs = [ autoPatchelfHook ]; - buildInputs = [ qt4 udev ]; - - dontConfigure = true; - dontBuild = true; - - installPhase = '' - runHook preInstall - - # Install binaries - mkdir -p $out/bin - mv J* $out/bin - - # Install libraries - mkdir -p $out/lib - mv libjlinkarm.so* $out/lib - # This library is opened via dlopen at runtime - for libr in $out/lib/*; do - ln -s $libr $out/bin - done - - # Install docs and examples - mkdir -p $out/share/docs - mv Doc/* $out/share/docs - mkdir -p $out/share/examples - mv Samples/* $out/share/examples - - # Install udev rule - mkdir -p $out/lib/udev/rules.d - mv 99-jlink.rules $out/lib/udev/rules.d/ - - runHook postInstall - ''; - - preFixup = '' - # Workaround to setting runtime dependecy - patchelf --add-needed libudev.so.1 $out/lib/libjlinkarm.so - ''; - - meta = with lib; { - description = "J-Link Software and Documentation pack"; - homepage = "https://www.segger.com/downloads/jlink/#J-LinkSoftwareAndDocumentationPack"; - license = licenses.unfree; - platforms = attrNames supported; - maintainers = with maintainers; [ FlorianFranzen stargate01 ]; - }; -} diff --git a/nixpkgs/pkgs/development/tools/misc/strace/default.nix b/nixpkgs/pkgs/development/tools/misc/strace/default.nix index 7a45889e4d2b..258e1e3304b6 100644 --- a/nixpkgs/pkgs/development/tools/misc/strace/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/strace/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "strace"; - version = "6.4"; + version = "6.5"; src = fetchurl { url = "https://strace.io/files/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-J5h9usV/39JgxttNyDKN81yVxoZ8ij1DcdWc3PTrkjg="; + sha256 = "sha256-37BRcCOJ4ZeaFRiStZAa/J6Tu8HHDYTJBq3jIkypGYA="; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; diff --git a/nixpkgs/pkgs/development/tools/misc/terramate/default.nix b/nixpkgs/pkgs/development/tools/misc/terramate/default.nix index c63c2574785d..92de3805149b 100644 --- a/nixpkgs/pkgs/development/tools/misc/terramate/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/terramate/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "terramate"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "terramate-io"; repo = "terramate"; rev = "v${version}"; - hash = "sha256-64tzzruhypIgDbsIOkAenyAYaRnCJiOIiuib3YPI0XI="; + hash = "sha256-bi/O4yG9m8uefY9CSn3yFmotxlFZz53cJG8SI1Zk1/4="; }; - vendorHash = "sha256-/PKibIGNeam6fP2eLUYd2kxlTO4KcboIbUQ2lKe2qYY="; + vendorHash = "sha256-gl5xsaSkGXlh+MfieVBPHGAbYZVF3GBbIkmvVhlJvqw="; # required for version info nativeBuildInputs = [ git ]; diff --git a/nixpkgs/pkgs/development/tools/misc/ztags/default.nix b/nixpkgs/pkgs/development/tools/misc/ztags/default.nix index 589e9c0062b2..5106ad68fcaa 100644 --- a/nixpkgs/pkgs/development/tools/misc/ztags/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/ztags/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation { pname = "ztags"; - version = "unstable-2023-08-03"; + version = "unstable-2023-08-29"; src = fetchFromGitHub { owner = "gpanders"; repo = "ztags"; - rev = "6ef039047f6580772c5ff97e8770d919dc07a4fa"; - hash = "sha256-WuDEHzNU3I4VPHEAkRdIUE5LPbQEKbUnITdFutGV58Y="; + rev = "87dbc4ba7993fa1537ddce942c6ce4cf90ce0809"; + hash = "sha256-FZZZnTmz4mxhiRXs16A41fz0WYIg6oGM7xj2cECRkrM="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/tools/norminette/default.nix b/nixpkgs/pkgs/development/tools/norminette/default.nix index 189b9b87d7c2..9e6c250aed87 100644 --- a/nixpkgs/pkgs/development/tools/norminette/default.nix +++ b/nixpkgs/pkgs/development/tools/norminette/default.nix @@ -5,13 +5,13 @@ python3Packages.buildPythonApplication rec { pname = "norminette"; - version = "3.3.53"; + version = "3.3.54"; src = fetchFromGitHub { owner = "42School"; repo = pname; rev = version; - hash = "sha256-IvLy6ryu3Cwfl8XAV+Hyof6mjKDGQy17gYQFrQU5kXg="; + hash = "sha256-r7cFaETv2gxNRhfw/F3B+7r3JzwvFvIFVSQ6MHQuEi4="; }; nativeCheckInputs = with python3Packages; [ diff --git a/nixpkgs/pkgs/development/tools/oh-my-posh/default.nix b/nixpkgs/pkgs/development/tools/oh-my-posh/default.nix index eef381178ac5..1420280cb559 100644 --- a/nixpkgs/pkgs/development/tools/oh-my-posh/default.nix +++ b/nixpkgs/pkgs/development/tools/oh-my-posh/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "oh-my-posh"; - version = "18.3.5"; + version = "18.7.0"; src = fetchFromGitHub { owner = "jandedobbeleer"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-5wcKG97NXTTTBJOD9kOsOp1MuHazAPlE4yLPWJoeCA8="; + hash = "sha256-dnaKcyDy4TdlTPl0hCUCshW6aFMLUUFwVskv1jiO0fk="; }; - vendorHash = "sha256-xkguBWk2Nh8w7C7tKbvaP0tRgZO4z08AEsdjNlJYC6Q="; + vendorHash = "sha256-GHOWcZqZmjL+EptcuCwbj0WSWKmhbsxpZFvHhlmsbxU="; sourceRoot = "${src.name}/src"; diff --git a/nixpkgs/pkgs/development/tools/okteto/default.nix b/nixpkgs/pkgs/development/tools/okteto/default.nix index 398746f87be2..9459b5c196f2 100644 --- a/nixpkgs/pkgs/development/tools/okteto/default.nix +++ b/nixpkgs/pkgs/development/tools/okteto/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "okteto"; - version = "2.19.0"; + version = "2.19.2"; src = fetchFromGitHub { owner = "okteto"; repo = "okteto"; rev = version; - hash = "sha256-cjdSJNhGP0YCent3r5GG1AhfWGbML46JAremXIwXMDY="; + hash = "sha256-kzrjIsyHf/hUo4Axcg97CrIyjeexc2IZ4/bITuUR7NM="; }; vendorHash = "sha256-u1oMX2ZplmDGx7ePfA5vKHUuDmWYVCJrYh2HQ23dTfU="; diff --git a/nixpkgs/pkgs/development/tools/oras/default.nix b/nixpkgs/pkgs/development/tools/oras/default.nix index c94aa786f5f1..50727b811c21 100644 --- a/nixpkgs/pkgs/development/tools/oras/default.nix +++ b/nixpkgs/pkgs/development/tools/oras/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "oras"; - version = "1.0.1"; + version = "1.1.0"; src = fetchFromGitHub { owner = "oras-project"; repo = "oras"; rev = "v${version}"; - hash = "sha256-Q+KTT7wIsakE79WJpP8uUhOEh+sJfcxC4Od8z92gX6Q="; + hash = "sha256-oWDxrxCrBU0quSpRLXZ0w1COuImVj4FzAmv8574x76o="; }; - vendorHash = "sha256-NhgppD2sYgdM3cAmtij/1Sd5Wq/my8nguHjUfv7wOaY="; + vendorHash = "sha256-51keQmj1eGT3rJysnfTWIl8xoHfz3NPL/qXegc3wwNc="; nativeBuildInputs = [ installShellFiles ]; diff --git a/nixpkgs/pkgs/development/tools/oxlint/default.nix b/nixpkgs/pkgs/development/tools/oxlint/default.nix new file mode 100644 index 000000000000..d6f03843b21e --- /dev/null +++ b/nixpkgs/pkgs/development/tools/oxlint/default.nix @@ -0,0 +1,36 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, stdenv +, darwin +}: + +rustPlatform.buildRustPackage rec { + pname = "oxlint"; + version = "0.0.12"; + + src = fetchFromGitHub { + owner = "web-infra-dev"; + repo = "oxc"; + rev = "oxlint_v${version}"; + hash = "sha256-/8h06MpkrOBg+bQ7yi9MDiYFGFhgFLjtBXBxvaOCnwI="; + }; + + cargoHash = "sha256-syc+kQq0kiuXUw7MFw02GoZM91syS0P5sQI6ns8z0ys="; + + buildInputs = lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; + + cargoBuildFlags = [ "--bin=oxlint" ]; + cargoTestFlags = cargoBuildFlags; + + meta = with lib; { + description = "A suite of high-performance tools for JavaScript and TypeScript written in Rust"; + homepage = "https://github.com/web-infra-dev/oxc"; + changelog = "https://github.com/web-infra-dev/oxc/releases/tag/${src.rev}"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda ]; + mainProgram = "oxlint"; + }; +} diff --git a/nixpkgs/pkgs/development/tools/parsing/antlr/4.nix b/nixpkgs/pkgs/development/tools/parsing/antlr/4.nix index 512732d06279..6c004a7b0b37 100644 --- a/nixpkgs/pkgs/development/tools/parsing/antlr/4.nix +++ b/nixpkgs/pkgs/development/tools/parsing/antlr/4.nix @@ -103,6 +103,20 @@ let }; in { + antlr4_13 = (mkAntlr { + version = "4.13.0"; + sourceSha256 = "sha256-s1yAdScMYg1wFpYNsBAtpifIhQsnSAgJg7JjPDx+htc="; + jarSha256 = "sha256-vG9KvA0iWidXASbFFAJWnwAKje2jSHtw52QoQOVw5KY="; + extraCppCmakeFlags = [ + # Generate CMake config files, which are not installed by default. + "-DANTLR4_INSTALL=ON" + + # Disable tests, since they require downloading googletest, which is + # not available in a sandboxed build. + "-DANTLR_BUILD_CPP_TESTS=OFF" + ]; + }).antlr; + antlr4_12 = (mkAntlr { version = "4.12.0"; sourceSha256 = "sha256-0JMG8UYFT+IAWvARY2KnuXSr5X6LlVZN4LJHy5d4x08="; diff --git a/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/default.nix b/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/default.nix index d175bfe01f30..b0423a98f9ec 100644 --- a/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/default.nix +++ b/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/default.nix @@ -49,6 +49,32 @@ poetry2nix.mkPoetryApplication { # Fails because of impurities (network, git etc etc) doCheck = false; + overrides = [ + poetry2nix.defaultPoetryOverrides + (self: super: { + cryptography = super.cryptography.overridePythonAttrs (old: { + meta = old.meta // { + knownVulnerabilities = old.meta.knownVulnerabilities or [ ] + ++ lib.optionals (lib.versionOlder old.version "41.0.0") [ + "CVE-2023-2650" + "CVE-2023-2975" + "CVE-2023-3446" + "CVE-2023-3817" + "CVE-2023-38325" + ]; + }; + }); + requests = super.requests.overridePythonAttrs (old: { + meta = old.meta // { + knownVulnerabilities = old.meta.knownVulnerabilities or [ ] + ++ lib.optionals (lib.versionOlder old.version "2.31.0") [ + "CVE-2023-32681" + ]; + }; + }); + }) + ]; + meta = with lib; { inherit (python.meta) platforms; maintainers = with maintainers; [ adisbladis jakewaksbaum ]; diff --git a/nixpkgs/pkgs/development/tools/protoc-gen-dart/default.nix b/nixpkgs/pkgs/development/tools/protoc-gen-dart/default.nix index 1df865b8292c..29892b954fc7 100644 --- a/nixpkgs/pkgs/development/tools/protoc-gen-dart/default.nix +++ b/nixpkgs/pkgs/development/tools/protoc-gen-dart/default.nix @@ -5,18 +5,18 @@ buildDartApplication rec { pname = "protoc-gen-dart"; - version = "2.1.0"; + version = "3.1.0"; src = fetchFromGitHub { owner = "google"; repo = "protobuf.dart"; rev = "protobuf-v${version}"; - sha256 = "sha256-uBQ8s1NBSWm88mpLfZwobTe/BDDT6UymSra88oUuPIA="; + sha256 = "sha256-2QnLS6GHhDHMCnAY+2c1wMyPY3EKtlijWHQC+9AVt0k="; }; sourceRoot = "${src.name}/protoc_plugin"; pubspecLockFile = ./pubspec.lock; - vendorHash = "sha256-jyhHZ1OUFo6ce3C5jEQPqmtRL4hr2nTfgVMR0k6AXtM="; + vendorHash = "sha256-yNgQLCLDCbA07v9tIwPRks/xPAzLVykNtIk+8C0twYM="; meta = with lib; { description = "Protobuf plugin for generating Dart code"; diff --git a/nixpkgs/pkgs/development/tools/protoc-gen-dart/pubspec.lock b/nixpkgs/pkgs/development/tools/protoc-gen-dart/pubspec.lock index a55b864ce23a..8d728eff5b3e 100644 --- a/nixpkgs/pkgs/development/tools/protoc-gen-dart/pubspec.lock +++ b/nixpkgs/pkgs/development/tools/protoc-gen-dart/pubspec.lock @@ -5,18 +5,18 @@ packages: dependency: transitive description: name: _fe_analyzer_shared - sha256: ae92f5d747aee634b87f89d9946000c2de774be1d6ac3e58268224348cd0101a + sha256: eb376e9acf6938204f90eb3b1f00b578640d3188b4c8a8ec054f9f479af8d051 url: "https://pub.dev" source: hosted - version: "61.0.0" + version: "64.0.0" analyzer: dependency: transitive description: name: analyzer - sha256: ea3d8652bda62982addfd92fdc2d0214e5f82e43325104990d4f4c4a2a313562 + sha256: "69f54f967773f6c26c7dcb13e93d7ccee8b17a641689da39e878d5cf13b06893" url: "https://pub.dev" source: hosted - version: "5.13.0" + version: "6.2.0" args: dependency: transitive description: @@ -45,10 +45,10 @@ packages: dependency: "direct dev" description: name: collection - sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687 + sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a url: "https://pub.dev" source: hosted - version: "1.17.2" + version: "1.18.0" convert: dependency: transitive description: @@ -73,14 +73,14 @@ packages: url: "https://pub.dev" source: hosted version: "3.0.3" - dart_style: - dependency: "direct main" + dart_flutter_team_lints: + dependency: "direct dev" description: - name: dart_style - sha256: f4f1f73ab3fd2afcbcca165ee601fe980d966af6a21b5970c6c9376955c528ad + name: dart_flutter_team_lints + sha256: e2f4fcafdaf0797e5af1c5c162d0b6c5025e9228ab3f95174340ed35c85dccd6 url: "https://pub.dev" source: hosted - version: "2.3.1" + version: "1.0.0" file: dependency: transitive description: @@ -146,13 +146,13 @@ packages: source: hosted version: "0.6.7" lints: - dependency: "direct dev" + dependency: transitive description: name: lints - sha256: a2c3d198cb5ea2e179926622d433331d8b58374ab8f29cdda6e863bd62fd369c + sha256: "0a217c6c989d21039f1498c3ed9f3ed71b354e69873f13a8dfc3c9fe76f1b452" url: "https://pub.dev" source: hosted - version: "1.0.1" + version: "2.1.1" logging: dependency: transitive description: @@ -223,7 +223,7 @@ packages: path: "../protobuf" relative: true source: path - version: "2.1.0" + version: "3.1.0" pub_semver: dependency: transitive description: @@ -292,18 +292,18 @@ packages: dependency: transitive description: name: stack_trace - sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 + sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" url: "https://pub.dev" source: hosted - version: "1.11.0" + version: "1.11.1" stream_channel: dependency: transitive description: name: stream_channel - sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" + sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" string_scanner: dependency: transitive description: @@ -324,26 +324,26 @@ packages: dependency: "direct dev" description: name: test - sha256: "13b41f318e2a5751c3169137103b60c584297353d4b1761b66029bae6411fe46" + sha256: "9b0dd8e36af4a5b1569029949d50a52cb2a2a2fdaa20cebb96e6603b9ae241f9" url: "https://pub.dev" source: hosted - version: "1.24.3" + version: "1.24.6" test_api: dependency: transitive description: name: test_api - sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8" + sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" url: "https://pub.dev" source: hosted - version: "0.6.0" + version: "0.6.1" test_core: dependency: transitive description: name: test_core - sha256: "99806e9e6d95c7b059b7a0fc08f07fc53fabe54a829497f0d9676299f1e8637e" + sha256: "4bef837e56375537055fdbbbf6dd458b1859881f4c7e6da936158f77d61ab265" url: "https://pub.dev" source: hosted - version: "0.5.3" + version: "0.5.6" typed_data: dependency: transitive description: @@ -356,10 +356,10 @@ packages: dependency: transitive description: name: vm_service - sha256: f3743ca475e0c9ef71df4ba15eb2d7684eecd5c8ba20a462462e4e8b561b2e11 + sha256: c538be99af830f478718b51630ec1b6bee5e74e52c8a802d328d9e71d35d2583 url: "https://pub.dev" source: hosted - version: "11.6.0" + version: "11.10.0" watcher: dependency: transitive description: diff --git a/nixpkgs/pkgs/development/tools/pscale/default.nix b/nixpkgs/pkgs/development/tools/pscale/default.nix index 6550fe0cc420..5ef1453d8770 100644 --- a/nixpkgs/pkgs/development/tools/pscale/default.nix +++ b/nixpkgs/pkgs/development/tools/pscale/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "pscale"; - version = "0.153.0"; + version = "0.154.0"; src = fetchFromGitHub { owner = "planetscale"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-iEn3iF13WSaNTF3+IHB1DlKNDPC1ObLQ2oAzPP8ffRM="; + sha256 = "sha256-TExrsxG+7K0QLuMmmIuNcmkFuU9jxbZsQSPxm1q+F0Q="; }; vendorHash = "sha256-hj+uzb1mpFrbbZXozCP9166i0C5pwIKhEtJOxovBCZE="; @@ -44,6 +44,6 @@ buildGoModule rec { changelog = "https://github.com/planetscale/cli/releases/tag/v${version}"; homepage = "https://www.planetscale.com/"; license = licenses.asl20; - maintainers = with maintainers; [ pimeys ]; + maintainers = with maintainers; [ pimeys kashw2 ]; }; } diff --git a/nixpkgs/pkgs/development/tools/pyenv/default.nix b/nixpkgs/pkgs/development/tools/pyenv/default.nix index a60ca4eda3f3..4ccb71973cb1 100644 --- a/nixpkgs/pkgs/development/tools/pyenv/default.nix +++ b/nixpkgs/pkgs/development/tools/pyenv/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "pyenv"; - version = "2.3.25"; + version = "2.3.26"; src = fetchFromGitHub { owner = "pyenv"; repo = "pyenv"; rev = "refs/tags/v${version}"; - hash = "sha256-804bLieYrfwzUrKSvZtC6Td4+fFPw1WrhV1NE4n49Rw="; + hash = "sha256-3pLH8/k+9T8lDBw/qd9WcYE4o3SwG/WXGWR0sLGUWLE="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/tools/react-static/default.nix b/nixpkgs/pkgs/development/tools/react-static/default.nix new file mode 100644 index 000000000000..d4552f68761a --- /dev/null +++ b/nixpkgs/pkgs/development/tools/react-static/default.nix @@ -0,0 +1,55 @@ +{ lib +, mkYarnPackage +, fetchFromGitHub +, fetchYarnDeps +}: + +mkYarnPackage rec { + pname = "react-static"; + version = "7.6.2"; + + src = fetchFromGitHub { + owner = "react-static"; + repo = "react-static"; + rev = "v${version}"; + hash = "sha256-dlYmD0vgEqWxYf7E0VYstZMAuNDGvQP7xDgHo/wmlUs="; + }; + + packageJSON = ./package.json; + + offlineCache = fetchYarnDeps { + yarnLock = "${src}/yarn.lock"; + hash = "sha256-SNnJPUzv+l2HXfA6NKYpJvn/DCX3a42JQ3N0+XYKbd8="; + }; + + buildPhase = '' + runHook preBuild + + yarn --cwd deps/react-static/packages/react-static --offline build + + runHook postBuild + ''; + + doDist = false; + + installPhase = '' + runHook preInstall + + mkdir -p "$out/lib/node_modules" + mv deps/react-static/packages/react-static "$out/lib/node_modules" + mv node_modules "$out/lib/node_modules/react-static" + + ln -s "$out/lib/node_modules/react-static/bin" "$out" + + runHook postInstall + ''; + + meta = { + changelog = "https://github.com/react-static/react-static/blob/${src.rev}/CHANGELOG.md"; + description = "A progressive static site generator for React"; + homepage = "https://github.com/react-static/react-static"; + license = lib.licenses.mit; + mainProgram = "react-static"; + maintainers = with lib.maintainers; [ ]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/react-static/package.json b/nixpkgs/pkgs/development/tools/react-static/package.json new file mode 100644 index 000000000000..70b873277fd2 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/react-static/package.json @@ -0,0 +1,154 @@ +{ + "name": "react-static", + "description": "A progressive static site generator for React", + "version": "7.6.2", + "license": "MIT", + "repository": "https://github.com/react-static/react-static", + "main": "lib/index.js", + "types": "src/index.d.ts", + "engines": { + "node": ">=8.9.0" + }, + "bin": { + "react-static": "./bin/react-static" + }, + "scripts": { + "prebuild": "rimraf lib", + "build": "cross-env REACT_STATIC_INTERNAL=true babel src --out-dir lib --ignore \"**/__tests__/*\" --ignore \"**/__mocks__/*\" --source-maps inline", + "watch": "yarn build --watch", + "watch:link": "onchange './lib/**/*' -- yalc push --changed", + "start": "yarn watch", + "test": "yarn format && yarn lint && yarn unitTest", + "lint": "eslint src", + "format": "prettier README.md {src,templates/*/src}/**/*.js --write", + "unitTest": "cross-env NODE_ENV=test yarn jest ./src", + "unitTestWatch": "cross-env NODE_ENV=test yarn jest src --watch", + "preversion": "yarn build && yarn test", + "publishLink": "echo '{{event}} to {{changed}}' && yalc publish" + }, + "peerDependencies": { + "react": "^16.9.0", + "react-dom": "^16.9.0", + "react-hot-loader": "^4.12.11" + }, + "dependencies": { + "@babel/cli": "^7.5.5", + "@babel/core": "^7.5.5", + "@babel/plugin-proposal-class-properties": "^7.5.5", + "@babel/plugin-proposal-export-default-from": "^7.5.2", + "@babel/plugin-proposal-optional-chaining": "^7.2.0", + "@babel/plugin-syntax-dynamic-import": "^7.2.0", + "@babel/plugin-transform-destructuring": "^7.5.0", + "@babel/plugin-transform-modules-commonjs": "^7.5.0", + "@babel/plugin-transform-runtime": "^7.5.5", + "@babel/preset-env": "^7.5.5", + "@babel/preset-react": "^7.0.0", + "@babel/preset-stage-0": "^7.0.0", + "@babel/register": "^7.5.5", + "@babel/runtime": "^7.5.5", + "@reach/router": "^1.3.1", + "autoprefixer": "^9.7.4", + "axios": "^0.21.1", + "babel-core": "7.0.0-bridge.0", + "babel-loader": "^8.0.6", + "babel-plugin-macros": "^2.6.1", + "babel-plugin-transform-react-remove-prop-types": "^0.4.24", + "babel-plugin-universal-import": "^4.0.0", + "case-sensitive-paths-webpack-plugin": "^2.2.0", + "chalk": "^2.4.2", + "chokidar": "^3.0.2", + "circular-dependency-plugin": "^5.2.0", + "cors": "^2.8.5", + "css-loader": "^2.1.1", + "download-git-repo": "^2.0.0", + "extract-css-chunks-webpack-plugin": "^4.6.0", + "file-loader": "3.0.1", + "fs-extra": "^7.0.1", + "git-promise": "^1.0.0", + "glob": "^7.1.4", + "gunzip-maybe": "^1.4.1", + "html-webpack-plugin": "^3.2.0", + "inquirer": "^6.5.1", + "inquirer-autocomplete-prompt": "^1.0.1", + "intersection-observer": "^0.7.0", + "jsesc": "^2.5.2", + "match-sorter": "^3.1.1", + "minimist": "^1.2.0", + "mutation-observer": "^1.0.3", + "optimize-css-assets-webpack-plugin": "^5.0.3", + "portfinder": "^1.0.21", + "postcss-flexbugs-fixes": "^4.1.0", + "postcss-loader": "^3.0.0", + "pretty-error": "^2.1.1", + "progress": "^2.0.3", + "prop-types": "^15.7.2", + "raf": "^3.4.1", + "raw-loader": "^3.1.0", + "react-helmet": "^6.1.0", + "react-universal-component": "^4.0.0", + "resolve-from": "^5.0.0", + "serve": "^11.1.0", + "shorthash": "^0.0.2", + "slash": "^2.0.0", + "socket.io": "^2.2.0", + "socket.io-client": "^2.2.0", + "style-loader": "0.23.1", + "swimmer": "^1.4.0", + "tar-fs": "^2.0.0", + "terser-webpack-plugin": "^1.4.1", + "upath": "^1.1.2", + "url-loader": "^2.1.0", + "webpack": "^4.39.2", + "webpack-bundle-analyzer": "^3.4.1", + "webpack-dev-server": "^3.8.0", + "webpack-flush-chunks": "^2.0.3", + "webpack-node-externals": "^1.7.2" + }, + "devDependencies": { + "@types/react": "^16.9.1", + "@types/react-helmet": "^6.1.0", + "babel-jest": "^24.8.0", + "cors": "^2.8.5", + "cross-env": "^5.2.0", + "enzyme": "^3.10.0", + "enzyme-adapter-react-16": "^1.14.0", + "enzyme-to-json": "^3.4.0", + "eslint": "^6.1.0", + "eslint-config-prettier": "^6.0.0", + "eslint-config-react-tools": "^1.1.7", + "eslint-plugin-babel": "^5.3.0", + "eslint-plugin-import": "^2.18.2", + "eslint-plugin-jsx-a11y": "^6.2.3", + "eslint-plugin-react": "^7.14.3", + "express": "^4.17.1", + "husky": "^3.0.3", + "jest": "^24.8.0", + "lerna": "^3.16.4", + "onchange": "^6.0.0", + "prettier": "1.18.2", + "react": "^16.9.0", + "react-dev-utils": "^9.0.3", + "react-dom": "^16.9.0", + "react-hot-loader": "^4.12.11", + "rimraf": "^2.7.0", + "webpack-hot-middleware": "^2.25.0" + }, + "jest": { + "verbose": true, + "moduleDirectories": [ + "node_modules", + "src" + ], + "testRegex": "(/__tests__/.*\\.(test))\\.jsx?$", + "moduleNameMapper": { + "static.config.js$": "<rootDir>/src/static/__mocks__/static.config.js.mock.js" + }, + "setupFiles": [ + "<rootDir>/setupTests.js" + ], + "snapshotSerializers": [ + "enzyme-to-json/serializer" + ] + }, + "gitHead": "875004e6e75d36043382b8ec8bba27a766c1a83a" +} diff --git a/nixpkgs/pkgs/development/tools/relic/default.nix b/nixpkgs/pkgs/development/tools/relic/default.nix index c2dc1873394a..3c4f1c070c6c 100644 --- a/nixpkgs/pkgs/development/tools/relic/default.nix +++ b/nixpkgs/pkgs/development/tools/relic/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "relic"; - version = "7.5.9"; + version = "7.6.1"; src = fetchFromGitHub { owner = "sassoftware"; repo = pname; rev = "v${version}"; - sha256 = "sha256-x+F/sXZAnGbzMCXKY05VSYM0o0ujf/aWUP/nrUo+FSs="; + sha256 = "sha256-wOQKSH60AGO6GLaJL1KDK2PzIt8X2V1z1sPhUWVeAG4="; }; vendorHash = "sha256-EZohpGzMDYKUbjSOIfoUbbsABNDOddrTt52pv+VQLdI="; diff --git a/nixpkgs/pkgs/development/tools/revive/default.nix b/nixpkgs/pkgs/development/tools/revive/default.nix index a66a232eb06e..cd2023ed0a12 100644 --- a/nixpkgs/pkgs/development/tools/revive/default.nix +++ b/nixpkgs/pkgs/development/tools/revive/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "revive"; - version = "1.3.2"; + version = "1.3.3"; src = fetchFromGitHub { owner = "mgechev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-zv9N5Sw23SalP2keII/WC71uhGU+nr+DG3GJcbUwonQ="; + sha256 = "sha256-+ac/Sq+4Ox/R3N7cMM+QADWf9jZJwYJEOvHDdkB5X9Q="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -18,7 +18,7 @@ buildGoModule rec { rm -rf $out/.git ''; }; - vendorHash = "sha256-7VZcZR04JyNa1a4CpLbE7ig+orML3fhdeBOZGTNACKc="; + vendorHash = "sha256-00w07PgPf+4eclxx6/fY9SbmOEU8FPxIOmg/i9NBboM="; ldflags = [ "-s" @@ -35,7 +35,7 @@ buildGoModule rec { # The following tests fail when built by nix: # - # $ nix log /nix/store/build-revive.1.3.2.drv | grep FAIL + # $ nix log /nix/store/build-revive.1.3.3.drv | grep FAIL # # --- FAIL: TestAll (0.01s) # --- FAIL: TestTimeEqual (0.00s) diff --git a/nixpkgs/pkgs/development/tools/rubyfmt/0001-cargo-lock-update-version.patch b/nixpkgs/pkgs/development/tools/rubyfmt/0001-cargo-lock-update-version.patch deleted file mode 100644 index d2bf9f9431ca..000000000000 --- a/nixpkgs/pkgs/development/tools/rubyfmt/0001-cargo-lock-update-version.patch +++ /dev/null @@ -1,25 +0,0 @@ -From d9df7aaaaf9c758499f569376a041045d99e4015 Mon Sep 17 00:00:00 2001 -From: Bob van der Linden <bobvanderlinden@gmail.com> -Date: Thu, 9 Feb 2023 16:17:46 +0100 -Subject: [PATCH 1/2] cargo: lock: update version - ---- - Cargo.lock | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Cargo.lock b/Cargo.lock -index 79a81d1..374c10a 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -642,7 +642,7 @@ dependencies = [ - - [[package]] - name = "rubyfmt-main" --version = "0.8.0-pre" -+version = "0.8.1" - dependencies = [ - "atty", - "clap", --- -2.39.1 - diff --git a/nixpkgs/pkgs/development/tools/rubyfmt/default.nix b/nixpkgs/pkgs/development/tools/rubyfmt/default.nix index 6cf2324b1d41..15457e80aad9 100644 --- a/nixpkgs/pkgs/development/tools/rubyfmt/default.nix +++ b/nixpkgs/pkgs/development/tools/rubyfmt/default.nix @@ -12,19 +12,20 @@ , libobjc , libunwind , libxcrypt +, libyaml , Foundation , Security }: rustPlatform.buildRustPackage rec { pname = "rubyfmt"; - version = "0.8.1"; + version = "0.10.0"; src = fetchFromGitHub { owner = "fables-tales"; repo = "rubyfmt"; rev = "v${version}"; - hash = "sha256-lHq9lcLMp6HUHMonEe3T2YGwMYW1W131H1jo1cy6kyc="; + hash = "sha256-IIHPU6iwFwQ5cOAtOULpMSjexFtTelSd/LGLuazdmUo="; fetchSubmodules = true; }; @@ -38,6 +39,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ zlib libxcrypt + libyaml ] ++ lib.optionals stdenv.isDarwin [ readline libiconv @@ -55,15 +57,13 @@ rustPlatform.buildRustPackage rec { ''; cargoPatches = [ - # The 0.8.1 release did not have an up-to-date lock file. The rubyfmt - # version in Cargo.toml was bumped, but it wasn't updated in the lock file. - ./0001-cargo-lock-update-version.patch - # Avoid checking whether ruby gitsubmodule is up-to-date. ./0002-remove-dependency-on-git.patch ]; - cargoHash = "sha256-keeIonGNgE0U0IVi8DeXAy6ygTXVXH+WDjob36epUDI="; + cargoHash = "sha256-QZ26GmsKyENkzdCGg2peie/aJhEt7KQAF/lwsibonDk="; + + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-fdeclspec"; preFixup = '' mv $out/bin/rubyfmt{-main,} @@ -74,5 +74,10 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/fables-tales/rubyfmt"; license = licenses.mit; maintainers = with maintainers; [ bobvanderlinden ]; + # = note: Undefined symbols for architecture x86_64: + # "_utimensat", referenced from: + # _utime_internal in librubyfmt-3c969812b3b27083.rlib(file.o) + broken = stdenv.isDarwin && stdenv.isx86_64; + mainProgram = "rubyfmt"; }; } diff --git a/nixpkgs/pkgs/development/tools/ruff/Cargo.lock b/nixpkgs/pkgs/development/tools/ruff/Cargo.lock index 261438324222..5d9734e49a51 100644 --- a/nixpkgs/pkgs/development/tools/ruff/Cargo.lock +++ b/nixpkgs/pkgs/development/tools/ruff/Cargo.lock @@ -28,18 +28,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "0.7.20" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" -dependencies = [ - "memchr", -] - -[[package]] -name = "aho-corasick" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41" +checksum = "0c378d78423fdad8089616f827526ee33c19f2fddbd5de1629152c9593ba4783" dependencies = [ "memchr", ] @@ -83,24 +74,23 @@ dependencies = [ [[package]] name = "anstream" -version = "0.3.2" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163" +checksum = "b1f58811cfac344940f1a400b6e6231ce35171f614f26439e80f8c1465c5cc0c" dependencies = [ "anstyle", "anstyle-parse", "anstyle-query", "anstyle-wincon", "colorchoice", - "is-terminal", "utf8parse", ] [[package]] name = "anstyle" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a30da5c5f2d5e72842e00bcb57657162cdabef0931f40e2deb9b4140440cecd" +checksum = "15c4c2c83f81532e5845a733998b6971faca23490340a418e9b72a3ec9de12ea" [[package]] name = "anstyle-parse" @@ -122,9 +112,9 @@ dependencies = [ [[package]] name = "anstyle-wincon" -version = "1.0.1" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188" +checksum = "58f54d10c6dfa51283a066ceab3ec1ab78d13fae00aa49243a45e4571fb79dfd" dependencies = [ "anstyle", "windows-sys 0.48.0", @@ -132,9 +122,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.71" +version = "1.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" +checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" [[package]] name = "argfile" @@ -162,9 +152,9 @@ dependencies = [ [[package]] name = "assert_cmd" -version = "2.0.11" +version = "2.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86d6b683edf8d1119fe420a94f8a7e389239666aa72e65495d91c00462510151" +checksum = "88903cb14723e4d4003335bb7f8a14f27691649105346a0f0957466c096adfe6" dependencies = [ "anstyle", "bstr", @@ -183,9 +173,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "base64" -version = "0.21.2" +version = "0.21.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" +checksum = "414dcefbc63d77c526a76b3afcf6fbb9b5e2791c19c3aa2297733208750c6e53" [[package]] name = "bincode" @@ -219,18 +209,18 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.3.3" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42" +checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" [[package]] name = "bstr" -version = "1.6.0" +version = "1.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6798148dccfbff0fae41c7574d2fa8f1ef3492fba0face179de5d8d447d67b05" +checksum = "4c2f7349907b712260e64b0afe2f84692af14a454be26187d9df565c7f69266a" dependencies = [ "memchr", - "regex-automata 0.3.0", + "regex-automata 0.3.7", "serde", ] @@ -257,9 +247,12 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[package]] name = "cc" -version = "1.0.79" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +dependencies = [ + "libc", +] [[package]] name = "cfg-if" @@ -278,9 +271,9 @@ dependencies = [ [[package]] name = "chrono" -version = "0.4.26" +version = "0.4.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" +checksum = "95ed24df0632f708f5f6d8082675bef2596f7084dee3dd55f632290bf35bfe0f" dependencies = [ "android-tzdata", "iana-time-zone", @@ -289,7 +282,7 @@ dependencies = [ "serde", "time 0.1.45", "wasm-bindgen", - "winapi", + "windows-targets 0.48.5", ] [[package]] @@ -321,9 +314,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.3.11" +version = "4.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1640e5cc7fb47dbb8338fd471b105e7ed6c3cb2aeb00c2e067127ffd3764a05d" +checksum = "7c8d502cbaec4595d2e7d5f61e318f05417bd2b66fdc3809498f0d3fdf0bea27" dependencies = [ "clap_builder", "clap_derive", @@ -332,9 +325,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.3.11" +version = "4.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98c59138d527eeaf9b53f35a77fcc1fad9d883116070c63d5de1c7dc7b00c72b" +checksum = "5891c7bc0edb3e1c2204fc5e94009affabeb1821c9e5fdc3959536c5c0bb984d" dependencies = [ "anstream", "anstyle", @@ -344,9 +337,9 @@ dependencies = [ [[package]] name = "clap_complete" -version = "4.3.2" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fc443334c81a804575546c5a8a79b4913b50e28d69232903604cada1de817ce" +checksum = "586a385f7ef2f8b4d86bddaa0c094794e7ccbfe5ffef1f434fe928143fc783a5" dependencies = [ "clap", ] @@ -365,9 +358,9 @@ dependencies = [ [[package]] name = "clap_complete_fig" -version = "4.3.1" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99fee1d30a51305a6c2ed3fc5709be3c8af626c9c958e04dd9ae94e27bcbce9f" +checksum = "9e9bae21b3f6eb417ad3054c8b1094aa0542116eba4979b1b271baefbfa6b965" dependencies = [ "clap", "clap_complete", @@ -385,21 +378,21 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.3.2" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8cd2b2a819ad6eec39e8f1d6b53001af1e5469f8c177579cdaeb313115b825f" +checksum = "c9fd1a5729c4548118d7d70ff234a44868d00489a4b6597b0b020918a0e91a1a" dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.29", ] [[package]] name = "clap_lex" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b" +checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961" [[package]] name = "clearscreen" @@ -415,6 +408,28 @@ dependencies = [ ] [[package]] +name = "codspeed" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5aeec2fbed4969dc38b5ca201115dd5c2614b8ef78e0a7221dd5f0977fb1552b" +dependencies = [ + "colored", + "libc", + "serde_json", +] + +[[package]] +name = "codspeed-criterion-compat" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b13f0a08d40ce7c95bdf288f725b975e62fcadfa8ba152340943bab6de43af7" +dependencies = [ + "codspeed", + "colored", + "criterion", +] + +[[package]] name = "colorchoice" version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -577,20 +592,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" [[package]] -name = "ctor" -version = "0.1.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096" -dependencies = [ - "quote", - "syn 1.0.109", -] - -[[package]] name = "darling" -version = "0.20.1" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0558d22a7b463ed0241e993f76f09f30b126687447751a8638587b864e4b3944" +checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e" dependencies = [ "darling_core", "darling_macro", @@ -598,27 +603,36 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.20.1" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab8bfa2e259f8ee1ce5e97824a3c55ec4404a0d772ca7fa96bf19f0752a046eb" +checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", "strsim", - "syn 2.0.23", + "syn 2.0.29", ] [[package]] name = "darling_macro" -version = "0.20.1" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29a358ff9f12ec09c3e61fef9b5a9902623a695a46a917b07f269bff1445611a" +checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" dependencies = [ "darling_core", "quote", - "syn 2.0.23", + "syn 2.0.29", +] + +[[package]] +name = "deranged" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946" +dependencies = [ + "serde", ] [[package]] @@ -709,15 +723,15 @@ checksum = "9bda8e21c04aca2ae33ffc2fd8c23134f3cac46db123ba97bd9d3f3b8a4a85e1" [[package]] name = "dyn-clone" -version = "1.0.11" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68b0cf012f1230e43cd00ebb729c6bb58707ecfa8ad08b52ef3a4ccd2697fc30" +checksum = "bbfc4744c1b8f2a09adc0e55242f60b1af195d88596bd8700be74418c056c555" [[package]] name = "either" -version = "1.8.1" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" [[package]] name = "ena" @@ -749,15 +763,15 @@ dependencies = [ [[package]] name = "equivalent" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88bffebc5d80432c9b140ee17875ff173a8ab62faad5b257da912bd2f6c1c0a1" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.1" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" +checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd" dependencies = [ "errno-dragonfly", "libc", @@ -776,12 +790,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "1.9.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" -dependencies = [ - "instant", -] +checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" [[package]] name = "fern" @@ -794,13 +805,13 @@ dependencies = [ [[package]] name = "filetime" -version = "0.2.21" +version = "0.2.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cbc844cecaee9d4443931972e1289c8ff485cb4cc2767cb03ca139ed6885153" +checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.2.16", + "redox_syscall 0.3.5", "windows-sys 0.48.0", ] @@ -812,15 +823,20 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flake8-to-ruff" -version = "0.0.286" +version = "0.0.287" dependencies = [ "anyhow", "clap", "colored", "configparser", + "itertools", + "log", "once_cell", + "pep440_rs", + "pretty_assertions", "regex", "ruff", + "ruff_workspace", "rustc-hash", "serde", "serde_json", @@ -831,9 +847,9 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.26" +version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" +checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010" dependencies = [ "crc32fast", "miniz_oxide", @@ -890,11 +906,11 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "globset" -version = "0.4.10" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "029d74589adefde59de1a0c4f4732695c32805624aec7b68d91503d4dba79afc" +checksum = "759c97c1e17c55525b57192c06a267cda0ac5210b222d6b82189a2338fa1c13d" dependencies = [ - "aho-corasick 0.7.20", + "aho-corasick", "bstr", "fnv", "log", @@ -1017,9 +1033,9 @@ dependencies = [ [[package]] name = "imperative" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f92123bf2fe0d9f1b5df1964727b970ca3b2d0203d47cf97fb1f36d856b6398" +checksum = "8b70798296d538cdaa6d652941fcc795963f8b9878b9e300c9fab7a522bd2fc0" dependencies = [ "phf", "rust-stemmers", @@ -1044,13 +1060,14 @@ checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" dependencies = [ "equivalent", "hashbrown 0.14.0", + "serde", ] [[package]] name = "indicatif" -version = "0.17.5" +version = "0.17.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ff8cc23a7393a397ed1d7f56e6365cba772aba9f9912ab968b03043c395d057" +checksum = "0b297dc40733f23a0e52728a58fa9489a5b7638a324932de16b41adc3ef80730" dependencies = [ "console", "instant", @@ -1112,17 +1129,6 @@ dependencies = [ ] [[package]] -name = "io-lifetimes" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" -dependencies = [ - "hermit-abi", - "libc", - "windows-sys 0.48.0", -] - -[[package]] name = "is-macro" version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1137,12 +1143,12 @@ dependencies = [ [[package]] name = "is-terminal" -version = "0.4.8" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24fddda5af7e54bf7da53067d6e802dbcc381d0a8eef629df528e3ebf68755cb" +checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ "hermit-abi", - "rustix 0.38.3", + "rustix", "windows-sys 0.48.0", ] @@ -1157,9 +1163,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.8" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b02a5381cc465bd3041d84623d0fa3b66738b52b8e2fc3bab8ad63ab032f4a" +checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[package]] name = "js-sys" @@ -1172,9 +1178,9 @@ dependencies = [ [[package]] name = "kqueue" -version = "1.0.7" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c8fc60ba15bf51257aa9807a48a61013db043fcf3a78cb0d916e8e396dcad98" +checksum = "7447f1ca1b7b563588a205fe93dea8df60fd981423a768bc1c0ded35ed147d0c" dependencies = [ "kqueue-sys", "libc", @@ -1182,9 +1188,9 @@ dependencies = [ [[package]] name = "kqueue-sys" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8367585489f01bc55dd27404dcf56b95e6da061a256a666ab23be9ba96a2e587" +checksum = "ed9625ffda8729b85e45cf04090035ac368927b8cebc34898e7c120f52e4838b" dependencies = [ "bitflags 1.3.2", "libc", @@ -1205,7 +1211,7 @@ dependencies = [ "lalrpop-util", "petgraph", "regex", - "regex-syntax 0.7.3", + "regex-syntax 0.7.5", "string_cache", "term", "tiny-keccak", @@ -1286,9 +1292,9 @@ dependencies = [ [[package]] name = "libmimalloc-sys" -version = "0.1.33" +version = "0.1.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4ac0e912c8ef1b735e92369695618dc5b1819f5a7bf3f167301a3ba1cea515e" +checksum = "25d058a81af0d1c22d7a1c948576bee6d673f7af3c0f35564abd6c81122f513d" dependencies = [ "cc", "libc", @@ -1302,15 +1308,9 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] name = "linux-raw-sys" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" - -[[package]] -name = "linux-raw-sys" -version = "0.4.3" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09fc20d2ca12cb9f044c93e3bd6d32d523e6e2ec3db4f7b2939cd99026ecd3f0" +checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503" [[package]] name = "lock_api" @@ -1324,9 +1324,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.19" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "matchers" @@ -1345,9 +1345,9 @@ checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" [[package]] name = "memchr" -version = "2.5.0" +version = "2.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "5486aed0026218e61b8a01d5fbd5a0a134649abb71a0e53b7bc088529dced86e" [[package]] name = "memoffset" @@ -1360,9 +1360,9 @@ dependencies = [ [[package]] name = "mimalloc" -version = "0.1.37" +version = "0.1.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e2894987a3459f3ffb755608bd82188f8ed00d0ae077f1edea29c068d639d98" +checksum = "972e5f23f6716f62665760b0f4cbf592576a80c7b879ba9beaafc0e558894127" dependencies = [ "libmimalloc-sys", ] @@ -1414,14 +1414,13 @@ checksum = "d906846a98739ed9d73d66e62c2641eef8321f1734b7a1156ab045a0248fb2b3" [[package]] name = "nix" -version = "0.26.2" +version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" +checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" dependencies = [ "bitflags 1.3.2", "cfg-if", "libc", - "static_assertions", ] [[package]] @@ -1464,9 +1463,9 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" +checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" dependencies = [ "autocfg", "num-integer", @@ -1485,9 +1484,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" dependencies = [ "autocfg", ] @@ -1536,15 +1535,6 @@ dependencies = [ ] [[package]] -name = "output_vt100" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "628223faebab4e3e40667ee0b2336d34a5b960ff60ea743ddfdbcf7770bcfb66" -dependencies = [ - "winapi", -] - -[[package]] name = "overload" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1570,14 +1560,14 @@ dependencies = [ "libc", "redox_syscall 0.3.5", "smallvec", - "windows-targets 0.48.1", + "windows-targets 0.48.5", ] [[package]] name = "paste" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4b27ab7be369122c218afc2079489cdcb4b517c0a3fc386ff11e1fedfcc2b35" +checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" [[package]] name = "path-absolutize" @@ -1666,12 +1656,12 @@ checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" [[package]] name = "petgraph" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dd7d28ee937e54fe3080c91faa1c3a46c06de6252988a7f4592ba2310ef22a4" +checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" dependencies = [ "fixedbitset", - "indexmap 1.9.3", + "indexmap 2.0.0", ] [[package]] @@ -1723,9 +1713,9 @@ dependencies = [ [[package]] name = "pin-project-lite" -version = "0.2.10" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c40d25201921e5ff0c862a505c6557ea88568a4e3ace775ab55e93f2f4f9d57" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" [[package]] name = "plotters" @@ -1768,9 +1758,9 @@ dependencies = [ [[package]] name = "portable-atomic" -version = "1.3.3" +version = "1.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "767eb9f07d4a5ebcb39bbf2d452058a93c011373abf6832e24194a1c3f004794" +checksum = "31114a898e107c51bb1609ffaf55a0e011cf6a4d7f1170d0015a165082c0338b" [[package]] name = "ppv-lite86" @@ -1814,13 +1804,11 @@ dependencies = [ [[package]] name = "pretty_assertions" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a25e9bcb20aa780fd0bb16b72403a9064d6b3f22f026946029acb941a50af755" +checksum = "af7cee1a6c8a5b9208b3cb1061f10c0cb689087b3d8ce85fb9d2dd7a29b6ba66" dependencies = [ - "ctor", "diff", - "output_vt100", "yansi", ] @@ -1850,9 +1838,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.63" +version = "1.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b368fba921b0dce7e60f5e04ec15e565b3303972b42bcfde1d0713b881959eb" +checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" dependencies = [ "unicode-ident", ] @@ -1872,12 +1860,12 @@ dependencies = [ [[package]] name = "quick-junit" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05b909fe9bf2abb1e3d6a97c9189a37c8105c61d03dca9ce6aace023e7d682bd" +checksum = "6bf780b59d590c25f8c59b44c124166a2a93587868b619fb8f5b47fb15e9ed6d" dependencies = [ "chrono", - "indexmap 1.9.3", + "indexmap 2.0.0", "nextest-workspace-hack", "quick-xml", "thiserror", @@ -1886,18 +1874,18 @@ dependencies = [ [[package]] name = "quick-xml" -version = "0.26.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f50b1c63b38611e7d4d7f68b82d3ad0cc71a2ad2e7f61fc10f1328d917c93cd" +checksum = "81b9228215d82c7b61490fec1de287136b5de6f5700f6e58ea9ad61a7964ca51" dependencies = [ "memchr", ] [[package]] name = "quote" -version = "1.0.29" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "573015e8ab27661678357f27dc26460738fd2b6c86e46f386fde94cb5d913105" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ "proc-macro2", ] @@ -1985,14 +1973,14 @@ dependencies = [ [[package]] name = "regex" -version = "1.9.0" +version = "1.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89089e897c013b3deb627116ae56a6955a72b8bed395c9526af31c9fe528b484" +checksum = "12de2eff854e5fa4b1295edd650e227e9d8fb0c9e90b12e7f36d6a6811791a29" dependencies = [ - "aho-corasick 1.0.2", + "aho-corasick", "memchr", - "regex-automata 0.3.0", - "regex-syntax 0.7.3", + "regex-automata 0.3.7", + "regex-syntax 0.7.5", ] [[package]] @@ -2006,13 +1994,13 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.0" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa250384981ea14565685dea16a9ccc4d1c541a13f82b9c168572264d1df8c56" +checksum = "49530408a136e16e5b486e883fbb6ba058e8e4e8ae6621a77b048b314336e629" dependencies = [ - "aho-corasick 1.0.2", + "aho-corasick", "memchr", - "regex-syntax 0.7.3", + "regex-syntax 0.7.5", ] [[package]] @@ -2023,9 +2011,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.7.3" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ab07dc67230e4a4718e70fd5c20055a4334b121f1f9db8fe63ef39ce9b8c846" +checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" [[package]] name = "result-like" @@ -2066,19 +2054,17 @@ dependencies = [ [[package]] name = "ruff" -version = "0.0.286" +version = "0.0.287" dependencies = [ "annotate-snippets 0.9.1", "anyhow", - "bitflags 2.3.3", + "bitflags 2.4.0", "chrono", "clap", "colored", - "dirs 5.0.1", "fern", "glob", "globset", - "ignore", "imperative", "insta", "is-macro", @@ -2102,6 +2088,7 @@ dependencies = [ "ruff_diagnostics", "ruff_index", "ruff_macros", + "ruff_notebook", "ruff_python_ast", "ruff_python_codegen", "ruff_python_index", @@ -2117,8 +2104,6 @@ dependencies = [ "semver", "serde", "serde_json", - "serde_with", - "shellexpand", "similar", "smallvec", "strum", @@ -2130,7 +2115,6 @@ dependencies = [ "typed-arena", "unicode-width", "unicode_names2", - "uuid", "wsl", ] @@ -2138,6 +2122,7 @@ dependencies = [ name = "ruff_benchmark" version = "0.0.0" dependencies = [ + "codspeed-criterion-compat", "criterion", "mimalloc", "once_cell", @@ -2167,14 +2152,14 @@ dependencies = [ [[package]] name = "ruff_cli" -version = "0.0.286" +version = "0.0.287" dependencies = [ "annotate-snippets 0.9.1", "anyhow", "argfile", "assert_cmd", "bincode", - "bitflags 2.3.3", + "bitflags 2.4.0", "cachedir", "chrono", "clap", @@ -2185,6 +2170,7 @@ dependencies = [ "glob", "ignore", "insta", + "is-macro", "itertools", "itoa", "log", @@ -2196,13 +2182,16 @@ dependencies = [ "ruff", "ruff_cache", "ruff_diagnostics", + "ruff_formatter", "ruff_macros", + "ruff_notebook", "ruff_python_ast", "ruff_python_formatter", "ruff_python_stdlib", "ruff_python_trivia", "ruff_source_file", "ruff_text_size", + "ruff_workspace", "rustc-hash", "serde", "serde_json", @@ -2210,7 +2199,9 @@ dependencies = [ "similar", "strum", "tempfile", + "thiserror", "tikv-jemallocator", + "tracing", "ureq", "walkdir", "wild", @@ -2236,6 +2227,7 @@ dependencies = [ "ruff_cli", "ruff_diagnostics", "ruff_formatter", + "ruff_notebook", "ruff_python_ast", "ruff_python_codegen", "ruff_python_formatter", @@ -2243,6 +2235,7 @@ dependencies = [ "ruff_python_parser", "ruff_python_stdlib", "ruff_python_trivia", + "ruff_workspace", "schemars", "serde", "serde_json", @@ -2297,14 +2290,33 @@ dependencies = [ "proc-macro2", "quote", "ruff_python_trivia", - "syn 2.0.23", + "syn 2.0.29", +] + +[[package]] +name = "ruff_notebook" +version = "0.0.0" +dependencies = [ + "anyhow", + "insta", + "itertools", + "once_cell", + "ruff_diagnostics", + "ruff_source_file", + "ruff_text_size", + "serde", + "serde_json", + "serde_with", + "test-case", + "thiserror", + "uuid", ] [[package]] name = "ruff_python_ast" version = "0.0.0" dependencies = [ - "bitflags 2.3.3", + "bitflags 2.4.0", "insta", "is-macro", "memchr", @@ -2337,7 +2349,7 @@ name = "ruff_python_formatter" version = "0.0.0" dependencies = [ "anyhow", - "bitflags 2.3.3", + "bitflags 2.4.0", "clap", "countme", "insta", @@ -2377,7 +2389,7 @@ dependencies = [ name = "ruff_python_literal" version = "0.0.0" dependencies = [ - "bitflags 2.3.3", + "bitflags 2.4.0", "hexf-parse", "is-macro", "itertools", @@ -2424,7 +2436,7 @@ dependencies = [ name = "ruff_python_semantic" version = "0.0.0" dependencies = [ - "bitflags 2.3.3", + "bitflags 2.4.0", "is-macro", "num-traits", "ruff_index", @@ -2502,12 +2514,15 @@ dependencies = [ "log", "ruff", "ruff_diagnostics", + "ruff_formatter", "ruff_python_ast", "ruff_python_codegen", "ruff_python_formatter", "ruff_python_index", "ruff_python_parser", "ruff_source_file", + "ruff_text_size", + "ruff_workspace", "serde", "serde-wasm-bindgen", "wasm-bindgen", @@ -2515,6 +2530,33 @@ dependencies = [ ] [[package]] +name = "ruff_workspace" +version = "0.0.0" +dependencies = [ + "anyhow", + "colored", + "dirs 5.0.1", + "glob", + "globset", + "ignore", + "itertools", + "log", + "path-absolutize", + "pep440_rs", + "regex", + "ruff", + "ruff_cache", + "ruff_macros", + "rustc-hash", + "schemars", + "serde", + "shellexpand", + "strum", + "tempfile", + "toml", +] + +[[package]] name = "rust-stemmers" version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2532,48 +2574,44 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustix" -version = "0.37.23" +version = "0.38.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06" +checksum = "ed6248e1caa625eb708e266e06159f135e8c26f2bb7ceb72dc4b2766d0340964" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.0", "errno", - "io-lifetimes", "libc", - "linux-raw-sys 0.3.8", + "linux-raw-sys", "windows-sys 0.48.0", ] [[package]] -name = "rustix" -version = "0.38.3" +name = "rustls" +version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac5ffa1efe7548069688cd7028f32591853cd7b5b756d41bcffd2353e4fc75b4" +checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8" dependencies = [ - "bitflags 2.3.3", - "errno", - "libc", - "linux-raw-sys 0.4.3", - "windows-sys 0.48.0", + "log", + "ring", + "rustls-webpki 0.101.4", + "sct", ] [[package]] -name = "rustls" -version = "0.21.2" +name = "rustls-webpki" +version = "0.100.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e32ca28af694bc1bbf399c33a516dbdf1c90090b8ab23c2bc24f834aa2247f5f" +checksum = "e98ff011474fa39949b7e5c0428f9b4937eda7da7848bbb947786b7be0b27dab" dependencies = [ - "log", "ring", - "rustls-webpki", - "sct", + "untrusted", ] [[package]] name = "rustls-webpki" -version = "0.100.1" +version = "0.101.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6207cd5ed3d8dca7816f8f3725513a34609c0c765bf652b8c3cb4cfd87db46b" +checksum = "7d93931baf2d282fff8d3a532bbfd7653f734643161b87e3e01e59a04439bf0d" dependencies = [ "ring", "untrusted", @@ -2581,15 +2619,15 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc31bd9b61a32c31f9650d18add92aa83a49ba979c143eefd27fe7177b05bd5f" +checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" [[package]] name = "ryu" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe232bdf6be8c8de797b22184ee71118d63780ea42ac85b61d1baa6d3b782ae9" +checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" [[package]] name = "same-file" @@ -2602,9 +2640,9 @@ dependencies = [ [[package]] name = "schemars" -version = "0.8.12" +version = "0.8.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02c613288622e5f0c3fdc5dbd4db1c5fbe752746b1d1a56a0630b78fd00de44f" +checksum = "763f8cd0d4c71ed8389c90cb8100cba87e763bd01a8e614d4f0af97bcd50a161" dependencies = [ "dyn-clone", "schemars_derive", @@ -2614,9 +2652,9 @@ dependencies = [ [[package]] name = "schemars_derive" -version = "0.8.12" +version = "0.8.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "109da1e6b197438deb6db99952990c7f959572794b80ff93707d55a232545e7c" +checksum = "ec0f696e21e10fa546b7ffb1c9672c6de8fbc7a81acf59524386d8639bf12737" dependencies = [ "proc-macro2", "quote", @@ -2632,9 +2670,9 @@ checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" [[package]] name = "scopeguard" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "sct" @@ -2648,15 +2686,15 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" +checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" [[package]] name = "serde" -version = "1.0.166" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d01b7404f9d441d3ad40e6a636a7782c377d2abdbe4fa2440e2edcc2f4f10db8" +checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" dependencies = [ "serde_derive", ] @@ -2674,13 +2712,13 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.166" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dd83d6dde2b6b2d466e14d9d1acce8816dedee94f735eac6395808b3483c6d6" +checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.29", ] [[package]] @@ -2696,9 +2734,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.100" +version = "1.0.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f1e14e89be7aa4c4b78bdbdc9eb5bf8517829a600ae8eaa39a6e1d960b5185c" +checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360" dependencies = [ "itoa", "ryu", @@ -2725,30 +2763,31 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.0.0" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f02d8aa6e3c385bf084924f660ce2a3a6bd333ba55b35e8590b321f35d88513" +checksum = "1ca3b16a3d82c4088f343b7480a93550b3eabe1a358569c2dfe38bbcead07237" dependencies = [ "base64", "chrono", "hex", "indexmap 1.9.3", + "indexmap 2.0.0", "serde", "serde_json", "serde_with_macros", - "time 0.3.22", + "time 0.3.28", ] [[package]] name = "serde_with_macros" -version = "3.0.0" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edc7d5d3932fb12ce722ee5e64dd38c504efba37567f0c402f6ca728c3b8b070" +checksum = "2e6be15c453eb305019bfa438b1593c731f36a289a7853f7707ee29e870b3b3c" dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.29", ] [[package]] @@ -2783,15 +2822,15 @@ checksum = "420acb44afdae038210c99e69aae24109f32f15500aa708e81d46c9f29d55fcf" [[package]] name = "siphasher" -version = "0.3.10" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" +checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" [[package]] name = "smallvec" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" +checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" [[package]] name = "spin" @@ -2859,9 +2898,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.23" +version = "2.0.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59fb7d6d8281a51045d62b8eb3a7d1ce347b76f312af50cd3dc0af39c87c1737" +checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a" dependencies = [ "proc-macro2", "quote", @@ -2879,15 +2918,14 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.6.0" +version = "3.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31c0432476357e58790aaa47a8efb0c5138f137343f3b5f23bd36a27e3b0a6d6" +checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" dependencies = [ - "autocfg", "cfg-if", "fastrand", "redox_syscall 0.3.5", - "rustix 0.37.23", + "rustix", "windows-sys 0.48.0", ] @@ -2967,22 +3005,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.43" +version = "1.0.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a35fc5b8971143ca348fa6df4f024d4d55264f3468c71ad1c2f365b0a4d58c42" +checksum = "97a802ec30afc17eee47b2855fc72e0c4cd62be9b4efe6591edde0ec5bd68d8f" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.43" +version = "1.0.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "463fe12d7993d3b327787537ce8dd4dfa058de32fc2b195ef3cde03dc4771e8f" +checksum = "6bb623b56e39ab7dcd4b1b98bb6c8f8d907ed255b18de254088016b27a8ee19b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.29", ] [[package]] @@ -2997,9 +3035,9 @@ dependencies = [ [[package]] name = "tikv-jemalloc-sys" -version = "0.5.3+5.3.0-patched" +version = "0.5.4+5.3.0-patched" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a678df20055b43e57ef8cddde41cdfda9a3c1a060b67f4c5836dfb1d78543ba8" +checksum = "9402443cb8fd499b6f327e40565234ff34dbda27460c5b47db0db77443dd85d1" dependencies = [ "cc", "libc", @@ -3007,9 +3045,9 @@ dependencies = [ [[package]] name = "tikv-jemallocator" -version = "0.5.0" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20612db8a13a6c06d57ec83953694185a367e16945f66565e8028d2c0bd76979" +checksum = "965fe0c26be5c56c94e38ba547249074803efd52adfb66de62107d95aab3eaca" dependencies = [ "libc", "tikv-jemalloc-sys", @@ -3028,10 +3066,11 @@ dependencies = [ [[package]] name = "time" -version = "0.3.22" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea9e1b3cf1243ae005d9e74085d4d542f3125458f3a81af210d901dcd7411efd" +checksum = "17f6bb557fd245c28e6411aa56b6403c689ad95061f50e4be16c274e70a17e48" dependencies = [ + "deranged", "itoa", "serde", "time-core", @@ -3046,9 +3085,9 @@ checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" [[package]] name = "time-macros" -version = "0.2.9" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "372950940a5f07bf38dbe211d7283c9e6d7327df53794992d293e534c733d09b" +checksum = "1a942f44339478ef67935ab2bbaec2fb0322496cf3cbe84b261e06ac3814c572" dependencies = [ "time-core", ] @@ -3089,9 +3128,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "toml" -version = "0.7.5" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ebafdf5ad1220cb59e7d17cf4d2c72015297b75b19a10472f99b89225089240" +checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542" dependencies = [ "serde", "serde_spanned", @@ -3110,9 +3149,9 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.19.11" +version = "0.19.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "266f016b7f039eec8a1a80dfe6156b633d208b9fccca5e4db1d6775b0c4e34a7" +checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a" dependencies = [ "indexmap 2.0.0", "serde", @@ -3142,7 +3181,7 @@ checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.29", ] [[package]] @@ -3157,9 +3196,9 @@ dependencies = [ [[package]] name = "tracing-indicatif" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b38ed3722d27705c3bd7ca0ccf29acc3d8e1c717b4cd87f97891a2c1834ea1af" +checksum = "57e05fe4a1c906d94b275d8aeb8ff8b9deaca502aeb59ae8ab500a92b8032ac8" dependencies = [ "indicatif", "tracing", @@ -3274,9 +3313,9 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" -version = "1.0.10" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22049a19f4a68748a168c0fc439f9516686aa045927ff767eca0a85101fb6e73" +checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" [[package]] name = "unicode-normalization" @@ -3324,16 +3363,16 @@ dependencies = [ "log", "once_cell", "rustls", - "rustls-webpki", + "rustls-webpki 0.100.2", "url", "webpki-roots", ] [[package]] name = "url" -version = "2.4.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" +checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" dependencies = [ "form_urlencoded", "idna", @@ -3367,7 +3406,7 @@ checksum = "f7e1ba1f333bd65ce3c9f27de592fcbc256dafe3af2717f56d7c87761fbaccf4" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.29", ] [[package]] @@ -3467,7 +3506,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.29", "wasm-bindgen-shared", ] @@ -3501,7 +3540,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.23", + "syn 2.0.29", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -3552,7 +3591,7 @@ version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b03058f88386e5ff5310d9111d53f48b17d732b401aeb83a8d5190f2ac459338" dependencies = [ - "rustls-webpki", + "rustls-webpki 0.100.2", ] [[package]] @@ -3612,7 +3651,7 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" dependencies = [ - "windows-targets 0.48.1", + "windows-targets 0.48.5", ] [[package]] @@ -3630,7 +3669,7 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets 0.48.1", + "windows-targets 0.48.5", ] [[package]] @@ -3650,17 +3689,17 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.48.1" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ - "windows_aarch64_gnullvm 0.48.0", - "windows_aarch64_msvc 0.48.0", - "windows_i686_gnu 0.48.0", - "windows_i686_msvc 0.48.0", - "windows_x86_64_gnu 0.48.0", - "windows_x86_64_gnullvm 0.48.0", - "windows_x86_64_msvc 0.48.0", + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", ] [[package]] @@ -3671,9 +3710,9 @@ checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_msvc" @@ -3683,9 +3722,9 @@ checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" [[package]] name = "windows_aarch64_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_i686_gnu" @@ -3695,9 +3734,9 @@ checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" [[package]] name = "windows_i686_gnu" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_msvc" @@ -3707,9 +3746,9 @@ checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" [[package]] name = "windows_i686_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_x86_64_gnu" @@ -3719,9 +3758,9 @@ checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" [[package]] name = "windows_x86_64_gnu" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnullvm" @@ -3731,9 +3770,9 @@ checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" [[package]] name = "windows_x86_64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_msvc" @@ -3743,15 +3782,15 @@ checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" [[package]] name = "windows_x86_64_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "winnow" -version = "0.4.7" +version = "0.5.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca0ace3845f0d96209f0375e6d367e3eb87eb65d27d445bdc9f1843a26f39448" +checksum = "7c2e3184b9c4e92ad5167ca73039d0c42476302ab603e2fec4487511f38ccefc" dependencies = [ "memchr", ] diff --git a/nixpkgs/pkgs/development/tools/ruff/default.nix b/nixpkgs/pkgs/development/tools/ruff/default.nix index fc5520be15b8..1d9438ffa599 100644 --- a/nixpkgs/pkgs/development/tools/ruff/default.nix +++ b/nixpkgs/pkgs/development/tools/ruff/default.nix @@ -10,13 +10,13 @@ rustPlatform.buildRustPackage rec { pname = "ruff"; - version = "0.0.286"; + version = "0.0.287"; src = fetchFromGitHub { owner = "astral-sh"; repo = pname; rev = "v${version}"; - hash = "sha256-5bMfOju1uJV4+a4UTzaanpzU6PjCSK9HHMdhvKVaNcg="; + hash = "sha256-T7PuhQnb7Ae9mYdaxDBltJWx5ODTscvEP3LcSEcSuLo="; }; cargoLock = { diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-about/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-about/default.nix index 7af3b28817ae..75a9fd030e83 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-about/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-about/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-about"; - version = "0.5.6"; + version = "0.5.7"; src = fetchFromGitHub { owner = "EmbarkStudios"; repo = "cargo-about"; rev = version; - sha256 = "sha256-nlumcRcL5HwRJTNqLJ9+UkSg88HuE96Rg8Tgc+ZcK2M="; + sha256 = "sha256-AROT/Q/C0lbkeoMYmY2Tzt0+yRVA8ESRo5mPM1h0HJs="; }; - cargoSha256 = "sha256-Fa1DGXzHDR3EAZyFg0g2aKFynQlC/LL+Tg5LKpOUzmM="; + cargoSha256 = "sha256-9HkaCUGo6jpzQn851ACM7kcBCkyMJJ/bb/qtV4Hp0lI="; nativeBuildInputs = [ pkg-config ]; @@ -36,5 +36,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/EmbarkStudios/cargo-about/blob/${version}/CHANGELOG.md"; license = with licenses; [ mit /* or */ asl20 ]; maintainers = with maintainers; [ evanjs figsoda matthiasbeyer ]; + mainProgram = "cargo-about"; }; } diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-audit/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-audit/default.nix index ed794a22896e..0de93c3da525 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-audit/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-audit/default.nix @@ -2,28 +2,32 @@ , rustPlatform , fetchCrate , pkg-config +, libgit2_1_5 , openssl +, zlib , stdenv , Security }: rustPlatform.buildRustPackage rec { pname = "cargo-audit"; - version = "0.17.6"; + version = "0.18.1"; src = fetchCrate { inherit pname version; - sha256 = "sha256-ICNcBqlkX1k3J5vc/bfoXw/+l2LdHOchv4PfY0G7Y94="; + hash = "sha256-XK2SsyT4CyDjCF56v/g7tX5SZKC3krBQNs/ddeFu35A="; }; - cargoSha256 = "sha256-ViqaiSLVfDJhMuHjHGi+NVRLPcRhe2a+oKXl4UNM+K8="; + cargoHash = "sha256-1Uifk1W7NCmHAbUl83GpMUBD6WWUl1J/HjtGv4dEuiA="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ + libgit2_1_5 openssl + zlib ] ++ lib.optionals stdenv.isDarwin [ Security ]; @@ -36,7 +40,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Audit Cargo.lock files for crates with security vulnerabilities"; homepage = "https://rustsec.org"; - changelog = "https://github.com/rustsec/rustsec/blob/cargo-audit/${version}/cargo-audit/CHANGELOG.md"; + changelog = "https://github.com/rustsec/rustsec/blob/cargo-audit/v${version}/cargo-audit/CHANGELOG.md"; license = with licenses; [ mit /* or */ asl20 ]; maintainers = with maintainers; [ basvandijk figsoda jk ]; }; diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-c/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-c/default.nix index 4f5418ea4fac..7ea4f6067bec 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-c/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-c/default.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-c"; - version = "0.9.22"; + version = "0.9.24"; src = fetchCrate { inherit pname; # this version may need to be updated along with package version - version = "${version}+cargo-0.72"; - hash = "sha256-B9y8/8qms+t6LnUFes4/MGcEp8P8C2hunCouiTMt0LY="; + version = "${version}+cargo-0.73.0"; + hash = "sha256-eNaK+SRrHz/DXkCcJP040R6bdhyFmjxkwHbXVFlHub8="; }; - cargoHash = "sha256-7amH8qPmi531sDy3aZsZ5J/oSCnbHY47YzsFODDPcBU="; + cargoHash = "sha256-Us50BbdNSJAx7JTKkvA4tjbGNueCJsAwGEelc1sP5pc="; nativeBuildInputs = [ pkg-config (lib.getDev curl) ]; buildInputs = [ openssl curl ] ++ lib.optionals stdenv.isDarwin [ diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-codspeed/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-codspeed/default.nix new file mode 100644 index 000000000000..f2a9376e2fa3 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/rust/cargo-codspeed/default.nix @@ -0,0 +1,51 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, curl +, pkg-config +, libgit2_1_5 +, openssl +, zlib +, stdenv +, darwin +}: + +rustPlatform.buildRustPackage rec { + pname = "cargo-codspeed"; + version = "2.2.0"; + + src = fetchFromGitHub { + owner = "CodSpeedHQ"; + repo = "codspeed-rust"; + rev = "v${version}"; + hash = "sha256-AGbo38weLBPxkaXgJpi+FXGuhPh7nyZcJOhw6BCDYOc="; + }; + + cargoHash = "sha256-NR+Z5oMaReEOZrLk7d/pB1F37k8tE7FXh4HdVnh+YFc="; + + nativeBuildInputs = [ + curl + pkg-config + ]; + + buildInputs = [ + curl + libgit2_1_5 + openssl + zlib + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk_11_0.frameworks.Security + ]; + + cargoBuildFlags = [ "-p=cargo-codspeed" ]; + cargoTestFlags = cargoBuildFlags; + + meta = with lib; { + description = "Cargo extension to build & run your codspeed benchmarks"; + homepage = "https://github.com/CodSpeedHQ/codspeed-rust"; + changelog = "https://github.com/CodSpeedHQ/codspeed-rust/releases/tag/${src.rev}"; + license = with licenses; [ mit asl20 ]; + maintainers = with maintainers; [ figsoda ]; + mainProgram = "cargo-codspeed"; + }; +} diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-component/Cargo.lock b/nixpkgs/pkgs/development/tools/rust/cargo-component/Cargo.lock index e7264f5d7f4c..6a68dfb2e61c 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-component/Cargo.lock +++ b/nixpkgs/pkgs/development/tools/rust/cargo-component/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "addr2line" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" dependencies = [ "gimli", ] @@ -31,9 +31,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6748e8def348ed4d14996fa801f4122cd763fff530258cdc03f64b25f89d3a5a" +checksum = "0c378d78423fdad8089616f827526ee33c19f2fddbd5de1629152c9593ba4783" dependencies = [ "memchr", ] @@ -55,24 +55,23 @@ dependencies = [ [[package]] name = "anstream" -version = "0.3.2" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163" +checksum = "b1f58811cfac344940f1a400b6e6231ce35171f614f26439e80f8c1465c5cc0c" dependencies = [ "anstyle", "anstyle-parse", "anstyle-query", "anstyle-wincon", "colorchoice", - "is-terminal", "utf8parse", ] [[package]] name = "anstyle" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a30da5c5f2d5e72842e00bcb57657162cdabef0931f40e2deb9b4140440cecd" +checksum = "15c4c2c83f81532e5845a733998b6971faca23490340a418e9b72a3ec9de12ea" [[package]] name = "anstyle-parse" @@ -94,9 +93,9 @@ dependencies = [ [[package]] name = "anstyle-wincon" -version = "1.0.2" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c677ab05e09154296dd37acecd46420c17b9713e8366facafa8fc0885167cf4c" +checksum = "58f54d10c6dfa51283a066ceab3ec1ab78d13fae00aa49243a45e4571fb79dfd" dependencies = [ "anstyle", "windows-sys", @@ -322,9 +321,9 @@ dependencies = [ [[package]] name = "backtrace" -version = "0.3.68" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12" +checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" dependencies = [ "addr2line", "cc", @@ -349,9 +348,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64" -version = "0.21.2" +version = "0.21.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" +checksum = "414dcefbc63d77c526a76b3afcf6fbb9b5e2791c19c3aa2297733208750c6e53" [[package]] name = "base64ct" @@ -419,9 +418,9 @@ dependencies = [ [[package]] name = "bstr" -version = "1.6.0" +version = "1.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6798148dccfbff0fae41c7574d2fa8f1ef3492fba0face179de5d8d447d67b05" +checksum = "4c2f7349907b712260e64b0afe2f84692af14a454be26187d9df565c7f69266a" dependencies = [ "memchr", "regex-automata", @@ -488,7 +487,7 @@ dependencies = [ "warg-protocol", "warg-server", "wasm-metadata", - "wasmparser 0.111.0", + "wasmparser 0.112.0", "wat", "wit-bindgen-rust-lib", "wit-component", @@ -583,15 +582,15 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.26" +version = "0.4.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" +checksum = "f56b4c72906975ca04becb8a30e102dfecddd0c06181e3e95ddc444be28881f8" dependencies = [ "android-tzdata", "iana-time-zone", "num-traits", "serde", - "winapi", + "windows-targets", ] [[package]] @@ -605,9 +604,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.3.23" +version = "4.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03aef18ddf7d879c15ce20f04826ef8418101c7e528014c3eeea13321047dca3" +checksum = "7c8d502cbaec4595d2e7d5f61e318f05417bd2b66fdc3809498f0d3fdf0bea27" dependencies = [ "clap_builder", "clap_derive", @@ -616,9 +615,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.3.23" +version = "4.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8ce6fffb678c9b80a70b6b6de0aad31df727623a70fd9a842c30cd573e2fa98" +checksum = "5891c7bc0edb3e1c2204fc5e94009affabeb1821c9e5fdc3959536c5c0bb984d" dependencies = [ "anstream", "anstyle", @@ -628,9 +627,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.3.12" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54a9bb5758fc5dfe728d1019941681eccaf0cf8a4189b692a0ee2f2ecf90a050" +checksum = "c9fd1a5729c4548118d7d70ff234a44868d00489a4b6597b0b020918a0e91a1a" dependencies = [ "heck", "proc-macro2", @@ -640,9 +639,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b" +checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961" [[package]] name = "colorchoice" @@ -874,9 +873,9 @@ dependencies = [ [[package]] name = "encoding_rs" -version = "0.8.32" +version = "0.8.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" +checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" dependencies = [ "cfg-if", ] @@ -923,9 +922,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f" +checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd" dependencies = [ "errno-dragonfly", "libc", @@ -1146,9 +1145,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.27.3" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" +checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" [[package]] name = "group" @@ -1439,7 +1438,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ "hermit-abi", - "rustix 0.38.8", + "rustix 0.38.10", "windows-sys", ] @@ -1586,9 +1585,9 @@ checksum = "ed1202b2a6f884ae56f04cff409ab315c5ce26b5e58d7412e484f01fd52f52ef" [[package]] name = "memchr" -version = "2.5.0" +version = "2.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "5486aed0026218e61b8a01d5fbd5a0a134649abb71a0e53b7bc088529dced86e" [[package]] name = "memoffset" @@ -1684,15 +1683,14 @@ dependencies = [ [[package]] name = "nix" -version = "0.26.2" +version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" +checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" dependencies = [ "bitflags 1.3.2", "cfg-if", "libc", "memoffset", - "static_assertions", ] [[package]] @@ -1736,9 +1734,9 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" +checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" dependencies = [ "autocfg", "num-integer", @@ -1808,9 +1806,9 @@ dependencies = [ [[package]] name = "object" -version = "0.31.1" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1" +checksum = "77ac5bbd07aea88c60a577a1ce218075ffd59208b2d7ca97adf9bfc5aeb21ebe" dependencies = [ "memchr", ] @@ -1829,11 +1827,11 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openssl" -version = "0.10.56" +version = "0.10.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "729b745ad4a5575dd06a3e1af1414bd330ee561c01b3899eb584baeaa8def17e" +checksum = "bac25ee399abb46215765b1cb35bc0212377e58a061560d8b29b024fd0430e7c" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.0", "cfg-if", "foreign-types", "libc", @@ -1861,9 +1859,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.91" +version = "0.9.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "866b5f16f90776b9bb8dc1e1802ac6f0513de3a7a7465867bfbc563dc737faac" +checksum = "db7e971c2c2bba161b2d2fdf37080177eff520b3bc044787c7f1f5f9e78d869b" dependencies = [ "cc", "libc", @@ -2036,9 +2034,9 @@ dependencies = [ [[package]] name = "pin-project-lite" -version = "0.2.12" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12cc1b0bf1727a77a54b6654e7b5f1af8604923edc8b81885f8ec92f9e3f0a05" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" [[package]] name = "pin-utils" @@ -2210,9 +2208,9 @@ dependencies = [ [[package]] name = "prost-reflect" -version = "0.11.4" +version = "0.11.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "000e1e05ebf7b26e1eba298e66fe4eee6eb19c567d0ffb35e0dd34231cdac4c8" +checksum = "6b823de344848e011658ac981009100818b322421676740546f8b52ed5249428" dependencies = [ "logos", "miette", @@ -2338,25 +2336,25 @@ dependencies = [ [[package]] name = "regex" -version = "1.9.3" +version = "1.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81bc1d4caf89fac26a70747fe603c130093b53c773888797a6329091246d651a" +checksum = "12de2eff854e5fa4b1295edd650e227e9d8fb0c9e90b12e7f36d6a6811791a29" dependencies = [ "aho-corasick", "memchr", "regex-automata", - "regex-syntax 0.7.4", + "regex-syntax 0.7.5", ] [[package]] name = "regex-automata" -version = "0.3.6" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed1ceff11a1dddaee50c9dc8e4938bd106e9d89ae372f192311e7da498e3b69" +checksum = "49530408a136e16e5b486e883fbb6ba058e8e4e8ae6621a77b048b314336e629" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.7.4", + "regex-syntax 0.7.5", ] [[package]] @@ -2367,17 +2365,17 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" +checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" [[package]] name = "reqwest" -version = "0.11.19" +version = "0.11.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20b9b67e2ca7dd9e9f9285b759de30ff538aab981abaaf7bc9bd90b84a0126c3" +checksum = "3e9ad3fe7488d7e34558a2033d45a0c90b72d97b4f80705666fea71472e2e6a1" dependencies = [ - "base64 0.21.2", + "base64 0.21.3", "bytes", "encoding_rs", "futures-core", @@ -2463,9 +2461,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.8" +version = "0.38.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19ed4fa021d81c8392ce04db050a3da9a60299050b7ae1cf482d862b54a7218f" +checksum = "ed6248e1caa625eb708e266e06159f135e8c26f2bb7ceb72dc4b2766d0340964" dependencies = [ "bitflags 2.4.0", "errno", @@ -2586,18 +2584,18 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.185" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be9b6f69f1dfd54c3b568ffa45c310d6973a5e5148fd40cf515acaf38cf5bc31" +checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.185" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc59dfdcbad1437773485e0367fea4b090a2e0a16d9ffc46af47764536a298ec" +checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" dependencies = [ "proc-macro2", "quote", @@ -2663,7 +2661,7 @@ version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ca3b16a3d82c4088f343b7480a93550b3eabe1a358569c2dfe38bbcead07237" dependencies = [ - "base64 0.21.2", + "base64 0.21.3", "chrono", "hex", "indexmap 1.9.3", @@ -2748,9 +2746,9 @@ dependencies = [ [[package]] name = "slab" -version = "0.4.8" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" dependencies = [ "autocfg", ] @@ -2855,7 +2853,7 @@ dependencies = [ "cfg-if", "fastrand 2.0.0", "redox_syscall 0.3.5", - "rustix 0.38.8", + "rustix 0.38.10", "windows-sys", ] @@ -2906,9 +2904,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fdd63d58b18d663fbdf70e049f00a22c8e42be082203be7f26589213cd75ea" +checksum = "17f6bb557fd245c28e6411aa56b6403c689ad95061f50e4be16c274e70a17e48" dependencies = [ "deranged", "itoa", @@ -2925,9 +2923,9 @@ checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" [[package]] name = "time-macros" -version = "0.2.11" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb71511c991639bb078fd5bf97757e03914361c48100d52878b8e52b46fb92cd" +checksum = "1a942f44339478ef67935ab2bbaec2fb0322496cf3cbe84b261e06ac3814c572" dependencies = [ "time-core", ] @@ -3219,9 +3217,9 @@ checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" [[package]] name = "url" -version = "2.4.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" +checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" dependencies = [ "form_urlencoded", "idna", @@ -3290,7 +3288,7 @@ dependencies = [ [[package]] name = "warg-api" version = "0.1.0" -source = "git+https://github.com/bytecodealliance/registry#e1106f404fed735776df6884d8d6568d0ba1af49" +source = "git+https://github.com/bytecodealliance/registry#028c5520e1bceb74db7c2a79b42e1e0624813294" dependencies = [ "itertools 0.11.0", "serde", @@ -3303,7 +3301,7 @@ dependencies = [ [[package]] name = "warg-client" version = "0.1.0" -source = "git+https://github.com/bytecodealliance/registry#e1106f404fed735776df6884d8d6568d0ba1af49" +source = "git+https://github.com/bytecodealliance/registry#028c5520e1bceb74db7c2a79b42e1e0624813294" dependencies = [ "anyhow", "async-trait", @@ -3336,10 +3334,10 @@ dependencies = [ [[package]] name = "warg-crypto" version = "0.1.0" -source = "git+https://github.com/bytecodealliance/registry#e1106f404fed735776df6884d8d6568d0ba1af49" +source = "git+https://github.com/bytecodealliance/registry#028c5520e1bceb74db7c2a79b42e1e0624813294" dependencies = [ "anyhow", - "base64 0.21.2", + "base64 0.21.3", "digest", "hex", "leb128", @@ -3356,7 +3354,7 @@ dependencies = [ [[package]] name = "warg-protobuf" version = "0.1.0" -source = "git+https://github.com/bytecodealliance/registry#e1106f404fed735776df6884d8d6568d0ba1af49" +source = "git+https://github.com/bytecodealliance/registry#028c5520e1bceb74db7c2a79b42e1e0624813294" dependencies = [ "anyhow", "pbjson", @@ -3374,10 +3372,10 @@ dependencies = [ [[package]] name = "warg-protocol" version = "0.1.0" -source = "git+https://github.com/bytecodealliance/registry#e1106f404fed735776df6884d8d6568d0ba1af49" +source = "git+https://github.com/bytecodealliance/registry#028c5520e1bceb74db7c2a79b42e1e0624813294" dependencies = [ "anyhow", - "base64 0.21.2", + "base64 0.21.3", "hex", "indexmap 2.0.0", "pbjson-types", @@ -3396,7 +3394,7 @@ dependencies = [ [[package]] name = "warg-server" version = "0.1.0" -source = "git+https://github.com/bytecodealliance/registry#e1106f404fed735776df6884d8d6568d0ba1af49" +source = "git+https://github.com/bytecodealliance/registry#028c5520e1bceb74db7c2a79b42e1e0624813294" dependencies = [ "anyhow", "axum", @@ -3426,7 +3424,7 @@ dependencies = [ [[package]] name = "warg-transparency" version = "0.1.0" -source = "git+https://github.com/bytecodealliance/registry#e1106f404fed735776df6884d8d6568d0ba1af49" +source = "git+https://github.com/bytecodealliance/registry#028c5520e1bceb74db7c2a79b42e1e0624813294" dependencies = [ "anyhow", "prost", @@ -3509,18 +3507,18 @@ checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" [[package]] name = "wasm-encoder" -version = "0.31.1" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41763f20eafed1399fff1afb466496d3a959f58241436cfdc17e3f5ca954de16" +checksum = "1ba64e81215916eaeb48fee292f29401d69235d62d8b8fd92a7b2844ec5ae5f7" dependencies = [ "leb128", ] [[package]] name = "wasm-metadata" -version = "0.10.2" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ac8d3bcbbb5081489f35966b86d127596e9cdacfb3824b79f43344662226178" +checksum = "08dc59d1fa569150851542143ca79438ca56845ccb31696c70225c638e063471" dependencies = [ "anyhow", "indexmap 2.0.0", @@ -3528,7 +3526,7 @@ dependencies = [ "serde_json", "spdx", "wasm-encoder", - "wasmparser 0.111.0", + "wasmparser 0.112.0", ] [[package]] @@ -3556,9 +3554,9 @@ dependencies = [ [[package]] name = "wasmparser" -version = "0.111.0" +version = "0.112.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad71036aada3f6b09251546e97e4f4f176dd6b41cf6fa55e7e0f65e86aec319a" +checksum = "e986b010f47fcce49cf8ea5d5f9e5d2737832f12b53ae8ae785bbe895d0877bf" dependencies = [ "indexmap 2.0.0", "semver", @@ -3566,9 +3564,9 @@ dependencies = [ [[package]] name = "wast" -version = "63.0.0" +version = "64.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2560471f60a48b77fccefaf40796fda61c97ce1e790b59dfcec9dc3995c9f63a" +checksum = "a259b226fd6910225aa7baeba82f9d9933b6d00f2ce1b49b80fa4214328237cc" dependencies = [ "leb128", "memchr", @@ -3578,9 +3576,9 @@ dependencies = [ [[package]] name = "wat" -version = "1.0.70" +version = "1.0.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bdc306c2c4c2f2bf2ba69e083731d0d2a77437fc6a350a19db139636e7e416c" +checksum = "53253d920ab413fca1c7dc2161d601c79b4fdf631d0ba51dd4343bf9b556c3f6" dependencies = [ "wast", ] @@ -3714,9 +3712,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "winnow" -version = "0.5.14" +version = "0.5.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d09770118a7eb1ccaf4a594a221334119a44a814fcb0d31c5b85e83e97227a97" +checksum = "7c2e3184b9c4e92ad5167ca73039d0c42476302ab603e2fec4487511f38ccefc" dependencies = [ "memchr", ] @@ -3759,15 +3757,16 @@ dependencies = [ "warg-protocol", "warg-server", "wasm-metadata", - "wasmparser 0.111.0", + "wasmparser 0.112.0", "wit-component", "wit-parser", ] [[package]] name = "wit-bindgen" -version = "0.10.0" -source = "git+https://github.com/bytecodealliance/wit-bindgen#749c01697bb3b11daeae4225789e14b765dcf839" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8a3e8e965dc50e6eb4410d9a11720719fadc6a1713803ea5f3be390b81c8279" dependencies = [ "bitflags 2.4.0", "wit-bindgen-rust-macro", @@ -3775,8 +3774,9 @@ dependencies = [ [[package]] name = "wit-bindgen-core" -version = "0.10.0" -source = "git+https://github.com/bytecodealliance/wit-bindgen#749c01697bb3b11daeae4225789e14b765dcf839" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77255512565dfbd0b61de466e854918041d1da53c7bc049d6188c6e02643dc1e" dependencies = [ "anyhow", "wit-component", @@ -3785,8 +3785,9 @@ dependencies = [ [[package]] name = "wit-bindgen-rust" -version = "0.10.0" -source = "git+https://github.com/bytecodealliance/wit-bindgen#749c01697bb3b11daeae4225789e14b765dcf839" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "399c60e6ea8598d1380e792f13d557007834f0fb799fea6503408cbc5debb4ae" dependencies = [ "anyhow", "heck", @@ -3798,8 +3799,9 @@ dependencies = [ [[package]] name = "wit-bindgen-rust-lib" -version = "0.10.0" -source = "git+https://github.com/bytecodealliance/wit-bindgen#749c01697bb3b11daeae4225789e14b765dcf839" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd9fb7a43c7dc28b0b727d6ae01bf369981229b7539e768fba2b7a4df13feeeb" dependencies = [ "heck", "wit-bindgen-core", @@ -3807,8 +3809,9 @@ dependencies = [ [[package]] name = "wit-bindgen-rust-macro" -version = "0.10.0" -source = "git+https://github.com/bytecodealliance/wit-bindgen#749c01697bb3b11daeae4225789e14b765dcf839" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44cea5ed784da06da0e55836a6c160e7502dbe28771c2368a595e8606243bf22" dependencies = [ "anyhow", "proc-macro2", @@ -3821,25 +3824,27 @@ dependencies = [ [[package]] name = "wit-component" -version = "0.13.2" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a9eb6179c5a26adc38fa5a22e263e7a3812c6777ca2e75d1717fd3789f82b64" +checksum = "66d9f2d16dd55d1a372dcfd4b7a466ea876682a5a3cb97e71ec9eef04affa876" dependencies = [ "anyhow", "bitflags 2.4.0", "indexmap 2.0.0", "log", + "serde", + "serde_json", "wasm-encoder", "wasm-metadata", - "wasmparser 0.111.0", + "wasmparser 0.112.0", "wit-parser", ] [[package]] name = "wit-parser" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8d6926af931f285e206ea71f9b67681f00a65d79097f81da7f9f285de006ba2" +checksum = "61e8b849bea13cc2315426b16efe6eb6813466d78f5fde69b0bb150c9c40e0dc" dependencies = [ "anyhow", "id-arena", diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-component/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-component/default.nix index 4942045a4934..d3469cc740f9 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-component/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-component/default.nix @@ -9,20 +9,19 @@ rustPlatform.buildRustPackage { pname = "cargo-component"; - version = "unstable-2023-08-24"; + version = "unstable-2023-09-06"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = "cargo-component"; - rev = "a4ee64625a5248234397a9c7c2a7513bb025b030"; - hash = "sha256-7fnzIzWb2f1tJfH3mLMesQtNCy4Zg7I/T+lGiorifY8="; + rev = "aa6e3c1168273b5cf6221fa0206f07f2ffb8567d"; + hash = "sha256-80076K+KfvFxyUxneEGAs8U7b+DoJLgUioIOTv+PWtI="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "warg-api-0.1.0" = "sha256-A5FQ/nbuzV8ockV6vOMKUEoJKeaId3oyZU1QeNpd1Zc="; - "wit-bindgen-0.10.0" = "sha256-/QZIIbUzDFUb5wAGoKFg1BbgNUEmP06ZJKVzhwlPecE="; + "warg-api-0.1.0" = "sha256-kzxvGZUMUOueR8t1tiCpGJlPxqEHQMb1m1jhPYoatbA="; }; }; diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-deny/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-deny/default.nix index 1ff7abaa4cb1..0221509d93cc 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-deny/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-deny/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-deny"; - version = "0.14.1"; + version = "0.14.2"; src = fetchFromGitHub { owner = "EmbarkStudios"; repo = "cargo-deny"; rev = version; - hash = "sha256-3k8UPA4zf2WfEZ8fnBhqpYH269nfecBv+68+7IDkuY4="; + hash = "sha256-IA5LaagNsAkSP7ut5iqUUI8DJMr7U+nwqVsCWR8mOnY="; }; - cargoHash = "sha256-w72T2MGtf6+YePscCHBWMzHXnB7+kdguZDuB7Hqs4rI="; + cargoHash = "sha256-xiVZNBIdnRorMZDabpfE6Pans3Nh56VA29fYRu7N5cE="; nativeBuildInputs = [ pkg-config diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-expand/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-expand/default.nix index 4227243be4f2..22fdee214487 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-expand/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-expand/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-expand"; - version = "1.0.65"; + version = "1.0.68"; src = fetchFromGitHub { owner = "dtolnay"; repo = pname; rev = version; - sha256 = "sha256-fPrke89Nlr9Yj0bkB6HTwMymQsjAQ+5+o7iVPGH7Tyc="; + sha256 = "sha256-j1Gq0mK5Gcn66QBiLFkUrIe2EfL3jwx3dRlYKyco77s="; }; - cargoHash = "sha256-Q7nBKdwZlL/HleuiniuvErGF6Avf58xR++cJ7PP8RME="; + cargoHash = "sha256-R4S765CjVLfeGg8Mmd0RJAtERIWj3opLbuWXcdOTFTc="; meta = with lib; { description = "A utility and Cargo subcommand designed to let people expand macros in their Rust source code"; diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-generate/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-generate/default.nix index 65dc535f71ab..a6ddc95e5326 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-generate/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-generate/default.nix @@ -2,7 +2,7 @@ , rustPlatform , fetchFromGitHub , pkg-config -, libgit2 +, libgit2_1_6 , openssl , stdenv , darwin @@ -11,20 +11,20 @@ rustPlatform.buildRustPackage rec { pname = "cargo-generate"; - version = "0.18.3"; + version = "0.18.4"; src = fetchFromGitHub { owner = "cargo-generate"; repo = "cargo-generate"; rev = "v${version}"; - sha256 = "sha256-Prue55oe3+NeiOiOYdr41sRqc6WvAVKC9nHD0a6mvrc="; + sha256 = "sha256-u4LEE3fDYneKhNU38VeVNvqcbDO0pws6yldgcvwSv6M="; }; - cargoSha256 = "sha256-TcJ8DeplbBOx3utdc67xkUg5Z4PYe/lnG+k/X5Zg0FQ="; + cargoSha256 = "sha256-pgffaqHWnm3RBE9TGbpRJX35BFpXW/na9wmad9eyCXw="; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libgit2 openssl ] ++ lib.optionals stdenv.isDarwin [ + buildInputs = [ libgit2_1_6 openssl ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-hack/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-hack/default.nix index 95eb36a70dc1..507ec3a71430 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-hack/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-hack/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-hack"; - version = "0.6.4"; + version = "0.6.5"; src = fetchCrate { inherit pname version; - sha256 = "sha256-kb4ftO4nhQ+MykK18O5aoexuBoN+u0xobUvIEge00jU="; + sha256 = "sha256-loGQTCi6lTNB/jn47fvWTqKr01p4xRqyq+Y02a/UwSc="; }; - cargoSha256 = "sha256-+Am9w3iU2kSAIx+1tK3kpoa+oJvLQ6Ew7LeP6njYEQw="; + cargoSha256 = "sha256-gk/0aTMlUWYKfJJ9CfTvYLTZ6/ShIRuhpywhuwFHD5E="; # some necessary files are absent in the crate version doCheck = false; diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-pgrx/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-pgrx/default.nix index ceab49a71780..d6cd2f39b61b 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-pgrx/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-pgrx/default.nix @@ -2,23 +2,32 @@ let pname = "cargo-pgrx"; - version = "0.9.8"; + version = "0.10.0"; in rustPlatform.buildRustPackage rec { inherit version pname; src = fetchCrate { inherit version pname; - hash = "sha256-Sk9fz84EheP+Ohq2e2E1q7dKDPE2Y4QSsHGlNvNb/g0="; + hash = "sha256-iqKcYp0dsay3/OE+N6KLjGEnloaImyS5xNaVciOYERc="; }; - cargoHash = "sha256-MSANrOjpcyKuoxyomCspxjYwzlT7BLJE3CseczOfOJY="; + cargoHash = "sha256-IWqHt6RL5ICBarmVx7QNjt3JrS0JYi/odEjPkLYMsPI="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; + preCheck = '' + export PGRX_HOME=$(mktemp -d) + ''; + + checkFlags = [ + # requires pgrx to be properly initialized with cargo pgrx init + "--skip=command::schema::tests::test_parse_managed_postmasters" + ]; + meta = with lib; { description = "Build Postgres Extensions with Rust!"; homepage = "https://github.com/tcdi/pgrx"; diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-semver-checks/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-semver-checks/default.nix index 7baf9b6682e8..5f7d213dc90d 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-semver-checks/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-semver-checks/default.nix @@ -2,8 +2,7 @@ , rustPlatform , fetchFromGitHub , pkg-config -, libgit2 -, openssl +, libgit2_1_6 , zlib , stdenv , darwin @@ -12,22 +11,21 @@ rustPlatform.buildRustPackage rec { pname = "cargo-semver-checks"; - version = "0.22.1"; + version = "0.23.0"; src = fetchFromGitHub { owner = "obi1kenobi"; repo = pname; rev = "v${version}"; - hash = "sha256-Qb01NLWCD7nglceJdUTnlf/XtPHl1P6ukr+QsjxMMos="; + hash = "sha256-/yMZ7ZmvCPFkrnuobbNGmgGNw16J8yT0DEUza7PD/Ow="; }; - cargoHash = "sha256-Qe/AGLoaCpbo001JkCN5qFytL4vWIPWhy3/pfBRoMmo="; + cargoHash = "sha256-u8hja6+T3NwcNub181TfuhI9+QFuIrgqIBlb1lm8+yk="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ - libgit2 - openssl + libgit2_1_6 zlib ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security @@ -37,13 +35,9 @@ rustPlatform.buildRustPackage rec { git ]; - # use system openssl - buildNoDefaultFeatures = true; - checkFlags = [ # requires nightly version of cargo-rustdoc "--skip=both_passing_manifest_path_and_directory_works" - "--skip=rustdoc_cmd::tests" "--skip=verify_binary_contains_lints" # requires internet access diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-watch/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-watch/default.nix index 85661f78e9fc..fda47b5070ae 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-watch/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-watch/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-watch"; - version = "8.4.0"; + version = "8.4.1"; src = fetchFromGitHub { owner = "watchexec"; repo = pname; rev = "v${version}"; - hash = "sha256-YwiTzIO60ct076vMoK9BHKa65Qet2PAvPRwnZcjDgcM="; + hash = "sha256-7nln9kuEVt8/NQ3BDdezSNfTyYo6qL2P2m5ZhQ7dAI8="; }; - cargoHash = "sha256-BzcKWQSB94H3XOsbwNvJoAHlZwkJvLABIrfFh9Ugfig="; + cargoHash = "sha256-0D+aM/zap5UDQ+k9c/p+ZfN1OUjDzFRArvcmqEOcBbM="; buildInputs = lib.optionals stdenv.isDarwin [ Cocoa CoreServices Foundation libiconv ]; diff --git a/nixpkgs/pkgs/development/tools/rust/dioxus-cli/default.nix b/nixpkgs/pkgs/development/tools/rust/dioxus-cli/default.nix index def31b1ce478..fbe1a6a3b730 100644 --- a/nixpkgs/pkgs/development/tools/rust/dioxus-cli/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/dioxus-cli/default.nix @@ -1,29 +1,47 @@ -{ lib, fetchCrate, rustPlatform, openssl, pkg-config, cacert, stdenv, CoreServices }: +{ lib +, stdenv +, fetchCrate +, rustPlatform +, pkg-config +, cacert +, openssl +, darwin +}: + rustPlatform.buildRustPackage rec { pname = "dioxus-cli"; - version = "0.3.2"; + version = "0.4.0"; src = fetchCrate { inherit pname version; - sha256 = "sha256-8S8zUOb2oiXbJQRgY/g9H2+EW+wWOQugr8+ou34CYPg="; + hash = "sha256-4BIuD/rrA398hPEoNt5PwWylPAR0fA1UKc90xyH5Fd0="; }; + cargoHash = "sha256-ok+fjvwz4k0/M5j7wut2A2AK6tuO3UfZtgoCXaCaHXY="; + nativeBuildInputs = [ pkg-config cacert ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ CoreServices ]; + buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.CoreServices + ]; - cargoSha256 = "sha256-sCP8njwYA29XmYu2vfuog0NCL1tZlsZiupkDVImrYCE="; + OPENSSL_NO_VENDOR = 1; checkFlags = [ - # these tests require dioxous binary in PATH, - # can be removed after: https://github.com/DioxusLabs/dioxus/pull/1138 - "--skip=cli::autoformat::spawn_properly" - "--skip=cli::translate::generates_svgs" + # requires network access + "--skip=server::web::proxy::test::add_proxy" + "--skip=server::web::proxy::test::add_proxy_trailing_slash" ]; + doInstallCheck = true; + installCheckPhase = '' + $out/bin/dx --version | grep "dioxus ${version}" + ''; + meta = with lib; { - description = "CLI tool for developing, testing, and publishing Dioxus apps"; homepage = "https://dioxuslabs.com"; + description = "CLI tool for developing, testing, and publishing Dioxus apps"; license = with licenses; [ mit asl20 ]; - maintainers = with maintainers; [ xanderio ]; + maintainers = with maintainers; [ xanderio cathalmullan ]; + mainProgram = "dx"; }; } diff --git a/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix b/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix index 444265e7f604..37a58bd40522 100644 --- a/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -13,14 +13,14 @@ rustPlatform.buildRustPackage rec { pname = "rust-analyzer-unwrapped"; - version = "2023-08-21"; - cargoSha256 = "sha256-aQFBNUXkoEsm5qKsMasqTIKoC0V7UUgmlukgOr5Vqpc="; + version = "2023-09-04"; + cargoSha256 = "sha256-J8eEHv262v21b1rs3e2seTwaKtvoGne5hXqa2jgQmoY="; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust-analyzer"; rev = version; - sha256 = "sha256-ribQkxEbMMb8vcBMKvcrPHFftMmlaF3HIAbJty9fDeY="; + sha256 = "sha256-Mk35KaY7OkEKNoj3Q3NEJ0PjFhqUd9Ry+NSzd3K1QUw="; }; cargoBuildFlags = [ "--bin" "rust-analyzer" "--bin" "rust-analyzer-proc-macro-srv" ]; diff --git a/nixpkgs/pkgs/development/tools/rust/specr-transpile/default.nix b/nixpkgs/pkgs/development/tools/rust/specr-transpile/default.nix index 567dfcf8d2c3..10a1acfac757 100644 --- a/nixpkgs/pkgs/development/tools/rust/specr-transpile/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/specr-transpile/default.nix @@ -5,14 +5,14 @@ rustPlatform.buildRustPackage rec { pname = "specr-transpile"; - version = "0.1.24"; + version = "0.1.25"; src = fetchCrate { inherit pname version; - hash = "sha256-+7NjB87pfFh8472gOV4HoKIqSiHnTCFOEVdKYBsn1qg="; + hash = "sha256-yB4b7VaZ22zk8jhQijBOWRks22TV19q9IQNlVXyBlss="; }; - cargoHash = "sha256-VgEyXm1uSsNJVjUYx66A35vLNxYErTrC8qBhYVlYyH4="; + cargoHash = "sha256-pD+Llzt4ekkQgKGidEL6jIbbFpuqjuFTmQM29FtReTY="; meta = with lib; { description = "Converts Specr lang code to Rust"; diff --git a/nixpkgs/pkgs/development/tools/rust/sqlx-cli/default.nix b/nixpkgs/pkgs/development/tools/rust/sqlx-cli/default.nix index ef71a6528b0c..98898bcf9c31 100644 --- a/nixpkgs/pkgs/development/tools/rust/sqlx-cli/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/sqlx-cli/default.nix @@ -4,6 +4,7 @@ , fetchFromGitHub , installShellFiles , pkg-config +, openssl , libiconv , testers , sqlx-cli @@ -26,19 +27,23 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-X7fLbih1s3sxn8vb2kQeFUKDK2DlC+sjm9ZTwj3FD1Y="; doCheck = false; - cargoBuildFlags = [ "--package sqlx-cli --no-default-features --features rustls,postgres,sqlite,mysql,completions" ]; + cargoBuildFlags = [ "--package sqlx-cli --no-default-features --features native-tls,postgres,sqlite,mysql,completions" ]; nativeBuildInputs = [ installShellFiles pkg-config ]; - buildInputs = lib.optionals stdenv.isDarwin [ - CoreFoundation - Security - SystemConfiguration - libiconv - ]; + buildInputs = + lib.optionals stdenv.isLinux [ + openssl + ] ++ + lib.optionals stdenv.isDarwin [ + CoreFoundation + Security + SystemConfiguration + libiconv + ]; postInstall = '' for shell in bash fish zsh; do diff --git a/nixpkgs/pkgs/development/tools/sd-local/default.nix b/nixpkgs/pkgs/development/tools/sd-local/default.nix index b6e61b41f939..da696c5d714c 100644 --- a/nixpkgs/pkgs/development/tools/sd-local/default.nix +++ b/nixpkgs/pkgs/development/tools/sd-local/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "sd-local"; - version = "1.0.46"; + version = "1.0.48"; src = fetchFromGitHub { owner = "screwdriver-cd"; repo = pname; rev = "v${version}"; - sha256 = "sha256-+Z12atz6fSM5FJFOqUhjalxkP/1Kkm3xWgwUVlB9JvM="; + sha256 = "sha256-cjPqVdHJt1/kxFCdjOKQIvq1V3KppHPeWozrawxdJek="; }; - vendorSha256 = "sha256-sgCUho8KFt0iFEuupQdMV6IZTVCsTXsNqv2ab5jp0mI="; + vendorHash = "sha256-uHu8jPPQCJAhXE+Lzw5/9wyw7sL5REQJsPsYII+Nusc="; subPackages = [ "." ]; diff --git a/nixpkgs/pkgs/development/tools/sentry-cli/default.nix b/nixpkgs/pkgs/development/tools/sentry-cli/default.nix index 702e8c803977..5f7fa29befab 100644 --- a/nixpkgs/pkgs/development/tools/sentry-cli/default.nix +++ b/nixpkgs/pkgs/development/tools/sentry-cli/default.nix @@ -9,13 +9,13 @@ }: rustPlatform.buildRustPackage rec { pname = "sentry-cli"; - version = "2.20.5"; + version = "2.20.7"; src = fetchFromGitHub { owner = "getsentry"; repo = "sentry-cli"; rev = version; - sha256 = "sha256-gV1IL2IKbmUeOJkMfJ3Hd8xoylVi0i7ADdxaISLF+wM="; + sha256 = "sha256-H1WRjNMYcWqc9Y8H7agzA7uMhvlA4DXpJOUpbUG+xxU="; }; doCheck = false; @@ -25,13 +25,13 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; nativeBuildInputs = [ pkg-config ]; - cargoHash = "sha256-9L+wfYO5BOkpB3VqUSOJEwq671SVGlWcbXd80m/UoYI="; + cargoHash = "sha256-WLnvyQQ51dIsD5g3FjHJhA+EqB1UEHghwxI/TVYwNdo="; meta = with lib; { homepage = "https://docs.sentry.io/cli/"; license = licenses.bsd3; description = "A command line utility to work with Sentry"; changelog = "https://github.com/getsentry/sentry-cli/raw/${version}/CHANGELOG.md"; - maintainers = with maintainers; [ rizary ]; + maintainers = with maintainers; [ rizary loewenheim ]; }; } diff --git a/nixpkgs/pkgs/development/tools/skaffold/default.nix b/nixpkgs/pkgs/development/tools/skaffold/default.nix index 78bfd893062b..0b9020416d3b 100644 --- a/nixpkgs/pkgs/development/tools/skaffold/default.nix +++ b/nixpkgs/pkgs/development/tools/skaffold/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "skaffold"; - version = "2.6.3"; + version = "2.7.0"; src = fetchFromGitHub { owner = "GoogleContainerTools"; repo = "skaffold"; rev = "v${version}"; - hash = "sha256-Jguy1h1Gb94cHGfXpiUF6A9MsRPA8lg99ej5uDtRp1s="; + hash = "sha256-uKrHWFyHuGX5dzrEvl7x305QgFOraS0L6J7gAFloUYc="; }; vendorHash = null; diff --git a/nixpkgs/pkgs/development/tools/swc/default.nix b/nixpkgs/pkgs/development/tools/swc/default.nix index c68542978d12..b71594de7224 100644 --- a/nixpkgs/pkgs/development/tools/swc/default.nix +++ b/nixpkgs/pkgs/development/tools/swc/default.nix @@ -5,15 +5,20 @@ rustPlatform.buildRustPackage rec { pname = "swc"; - version = "0.91.19"; + version = "0.91.68"; + + env = { + # swc depends on nightly features + RUSTC_BOOTSTRAP = 1; + }; src = fetchCrate { pname = "swc_cli"; inherit version; - sha256 = "sha256-BzReetAOKSGzHhITXpm+J2Rz8d9Hq2HUagQmfst74Ag="; + sha256 = "sha256-SLVXh+8oBcq/pKHB5mMLPOR4J3Xlns5eNs8mo2qh/30="; }; - cargoSha256 = "sha256-1U9YLrPYENv9iJobCxtgnQakJLDctWQwnDUtpLG3PGc="; + cargoSha256 = "sha256-nYMy4OtzNymzan/xZ6Ekx9QL+6AOtciI+sLl4f2Owy0="; buildFeatures = [ "swc_core/plugin_transform_host_native" ]; @@ -21,6 +26,6 @@ rustPlatform.buildRustPackage rec { description = "Rust-based platform for the Web"; homepage = "https://github.com/swc-project/swc"; license = licenses.asl20; - maintainers = with maintainers; [ dit7ya ]; + maintainers = with maintainers; [ dit7ya kashw2 ]; }; } diff --git a/nixpkgs/pkgs/development/tools/turso-cli/default.nix b/nixpkgs/pkgs/development/tools/turso-cli/default.nix index 2b9d622dedd0..e680ca3f5fec 100644 --- a/nixpkgs/pkgs/development/tools/turso-cli/default.nix +++ b/nixpkgs/pkgs/development/tools/turso-cli/default.nix @@ -5,13 +5,13 @@ }: buildGoModule rec { pname = "turso-cli"; - version = "0.81.0"; + version = "0.82.0"; src = fetchFromGitHub { owner = "tursodatabase"; repo = "turso-cli"; rev = "v${version}"; - hash = "sha256-Ck1q3II/o7f+n0pdR5PzUXG2c6GZmQFeddofHzPTLlA="; + hash = "sha256-JFuD10EhR1/nmYPMnNsR/8PUR5ScvWyS+vhg7ZO5TpI="; }; vendorHash = "sha256-Y/pg8+w6B1YQqaZ5wj8QZxiBHAG0Tf3Zec5WlVyA4eI="; @@ -23,6 +23,6 @@ buildGoModule rec { description = "This is the command line interface (CLI) to Turso."; homepage = "https://turso.tech"; license = licenses.mit; - maintainers = with maintainers; [zestsystem]; + maintainers = with maintainers; [ zestsystem kashw2 ]; }; } diff --git a/nixpkgs/pkgs/development/tools/twilio-cli/default.nix b/nixpkgs/pkgs/development/tools/twilio-cli/default.nix index 51b10de9c237..01b4732dc970 100644 --- a/nixpkgs/pkgs/development/tools/twilio-cli/default.nix +++ b/nixpkgs/pkgs/development/tools/twilio-cli/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "twilio-cli"; - version = "5.13.0"; + version = "5.14.0"; src = fetchzip { url = "https://twilio-cli-prod.s3.amazonaws.com/twilio-v${finalAttrs.version}/twilio-v${finalAttrs.version}.tar.gz"; - sha256 = "sha256-WfaXYNaNBMcOyQshJkMgzGSmID0tmZ0TRN6N3lR275Q="; + sha256 = "sha256-b+CL3Rxkzbk7wSUNXk+x0dQvjZWmOuVh/qWdrIhvJFo="; }; buildInputs = [ nodejs ]; diff --git a/nixpkgs/pkgs/development/tools/typos/default.nix b/nixpkgs/pkgs/development/tools/typos/default.nix index efd0a856226e..9508f5daf134 100644 --- a/nixpkgs/pkgs/development/tools/typos/default.nix +++ b/nixpkgs/pkgs/development/tools/typos/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "typos"; - version = "1.16.9"; + version = "1.16.11"; src = fetchFromGitHub { owner = "crate-ci"; repo = pname; rev = "v${version}"; - hash = "sha256-aFP4q3Cv7ESqgpBoYW70Fsl2GGEIX8bEl3/sEG6HGpM="; + hash = "sha256-6CinLQ3wdVG1Ry7nskbC4JlhwT9rlJiP1oc4ks1t7Ts="; }; - cargoHash = "sha256-mUcvKYe2SiuEWKXGG1jiF4YtVB72HlGc7HDHhgUhLaU="; + cargoHash = "sha256-S7cMbnelsUfP8t93jqv0PY50fN/XtkphKhiKfe2fE/c="; meta = with lib; { description = "Source code spell checker"; diff --git a/nixpkgs/pkgs/development/tools/upbound/default.nix b/nixpkgs/pkgs/development/tools/upbound/default.nix index 301ebdd40885..04b4e45500b5 100644 --- a/nixpkgs/pkgs/development/tools/upbound/default.nix +++ b/nixpkgs/pkgs/development/tools/upbound/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "upbound"; - version = "0.18.0"; + version = "0.19.1"; src = fetchFromGitHub { owner = pname; repo = "up"; rev = "v${version}"; - sha256 = "sha256-kpk54P9+ITBdlytwxfAhVNTkJN8SReFXgjUdWXclr1I="; + sha256 = "sha256-Dr6EKpKVy2DLhivJ42Bx+WJL2L710sQlXroaAm66Gpo="; }; - vendorHash = "sha256-aqKLWd7C7LLIZm5jSksqp35zWNSYSzTZ8gGHUgWgq9E="; + vendorHash = "sha256-J7rZAvEx0jgkhJIEE19rV2WdBCIvkqYzB72ZiABs56U="; subPackages = [ "cmd/docker-credential-up" "cmd/up" ]; diff --git a/nixpkgs/pkgs/development/tools/wails/default.nix b/nixpkgs/pkgs/development/tools/wails/default.nix index 195eae2e3546..627fe2ac2393 100644 --- a/nixpkgs/pkgs/development/tools/wails/default.nix +++ b/nixpkgs/pkgs/development/tools/wails/default.nix @@ -14,16 +14,16 @@ buildGoModule rec { pname = "wails"; - version = "2.5.1"; + version = "2.6.0"; src = fetchFromGitHub { owner = "wailsapp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-4JTkViqJ1rmVg6JGJ+uZrIo/mh6o1VE39gYoILdFWBE="; + sha256 = "sha256-jY+2I4SOr6gr2MCLrBBE9H0T1sTB13kEb1OJ717kWqg="; } + "/v2"; - vendorSha256 = "sha256-RiectpUhm24xjgfPZEMDVFSEzPtIjn7L/qC2KE2s5aw="; + vendorSha256 = "sha256-56LZQQzfFQTa4fo5bdZtK/VzNDBPyI9hDG4RkP38gcI="; proxyVendor = true; diff --git a/nixpkgs/pkgs/development/tools/wasmi/Cargo.lock b/nixpkgs/pkgs/development/tools/wasmi/Cargo.lock index 803024f50aa9..dfc5d70f774f 100644 --- a/nixpkgs/pkgs/development/tools/wasmi/Cargo.lock +++ b/nixpkgs/pkgs/development/tools/wasmi/Cargo.lock @@ -3,6 +3,15 @@ version = 3 [[package]] +name = "aho-corasick" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c378d78423fdad8089616f827526ee33c19f2fddbd5de1629152c9593ba4783" +dependencies = [ + "memchr", +] + +[[package]] name = "ambient-authority" version = "0.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -16,30 +25,29 @@ checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" [[package]] name = "anstream" -version = "0.3.2" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163" +checksum = "b1f58811cfac344940f1a400b6e6231ce35171f614f26439e80f8c1465c5cc0c" dependencies = [ "anstyle", "anstyle-parse", "anstyle-query", "anstyle-wincon", "colorchoice", - "is-terminal 0.4.7", "utf8parse", ] [[package]] name = "anstyle" -version = "1.0.0" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d" +checksum = "15c4c2c83f81532e5845a733998b6971faca23490340a418e9b72a3ec9de12ea" [[package]] name = "anstyle-parse" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e765fd216e48e067936442276d1d57399e37bce53c264d6fefbe298080cb57ee" +checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333" dependencies = [ "utf8parse", ] @@ -55,9 +63,9 @@ dependencies = [ [[package]] name = "anstyle-wincon" -version = "1.0.1" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188" +checksum = "58f54d10c6dfa51283a066ceab3ec1ab78d13fae00aa49243a45e4571fb79dfd" dependencies = [ "anstyle", "windows-sys 0.48.0", @@ -65,15 +73,15 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.71" +version = "1.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" +checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" [[package]] name = "assert_cmd" -version = "2.0.11" +version = "2.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86d6b683edf8d1119fe420a94f8a7e389239666aa72e65495d91c00462510151" +checksum = "88903cb14723e4d4003335bb7f8a14f27691649105346a0f0957466c096adfe6" dependencies = [ "anstyle", "bstr", @@ -92,13 +100,13 @@ checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9" [[package]] name = "async-trait" -version = "0.1.68" +version = "0.1.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" +checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.29", ] [[package]] @@ -125,13 +133,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] +name = "bitflags" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" + +[[package]] name = "bstr" -version = "1.5.0" +version = "1.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a246e68bb43f6cd9db24bea052a53e40405417c5fb372e3d1a8a7f770a564ef5" +checksum = "4c2f7349907b712260e64b0afe2f84692af14a454be26187d9df565c7f69266a" dependencies = [ "memchr", - "once_cell", "regex-automata", "serde", ] @@ -144,7 +157,7 @@ checksum = "0b0e103ce36d217d568903ad27b14ec2238ecb5d65bad2e756a8f3c0d651506e" dependencies = [ "cap-primitives", "cap-std", - "io-lifetimes 0.7.5", + "io-lifetimes", "windows-sys 0.36.1", ] @@ -157,10 +170,10 @@ dependencies = [ "ambient-authority", "fs-set-times", "io-extras", - "io-lifetimes 0.7.5", + "io-lifetimes", "ipnet", "maybe-owned", - "rustix 0.35.13", + "rustix 0.35.14", "winapi-util", "windows-sys 0.36.1", "winx", @@ -184,9 +197,9 @@ checksum = "c9d6e70b626eceac9d6fc790fe2d72cc3f2f7bc3c35f467690c54a526b0f56db" dependencies = [ "cap-primitives", "io-extras", - "io-lifetimes 0.7.5", + "io-lifetimes", "ipnet", - "rustix 0.35.13", + "rustix 0.35.14", ] [[package]] @@ -197,7 +210,7 @@ checksum = "c3a0524f7c4cff2ea547ae2b652bf7a348fd3e48f76556dc928d8b45ab2f1d50" dependencies = [ "cap-primitives", "once_cell", - "rustix 0.35.13", + "rustix 0.35.14", "winx", ] @@ -209,9 +222,12 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[package]] name = "cc" -version = "1.0.79" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +dependencies = [ + "libc", +] [[package]] name = "cfg-if" @@ -248,21 +264,9 @@ dependencies = [ [[package]] name = "clap" -version = "3.2.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123" -dependencies = [ - "bitflags", - "clap_lex 0.2.4", - "indexmap", - "textwrap", -] - -[[package]] -name = "clap" -version = "4.3.4" +version = "4.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80672091db20273a15cf9fdd4e47ed43b5091ec9841bf4c6145c9dfbbcae09ed" +checksum = "7c8d502cbaec4595d2e7d5f61e318f05417bd2b66fdc3809498f0d3fdf0bea27" dependencies = [ "clap_builder", "clap_derive", @@ -271,43 +275,33 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.3.4" +version = "4.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1458a1df40e1e2afebb7ab60ce55c1fa8f431146205aa5f4887e0b111c27636" +checksum = "5891c7bc0edb3e1c2204fc5e94009affabeb1821c9e5fdc3959536c5c0bb984d" dependencies = [ "anstream", "anstyle", - "bitflags", - "clap_lex 0.5.0", + "clap_lex", "strsim", ] [[package]] name = "clap_derive" -version = "4.3.2" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8cd2b2a819ad6eec39e8f1d6b53001af1e5469f8c177579cdaeb313115b825f" +checksum = "c9fd1a5729c4548118d7d70ff234a44868d00489a4b6597b0b020918a0e91a1a" dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.18", -] - -[[package]] -name = "clap_lex" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" -dependencies = [ - "os_str_bytes", + "syn 2.0.29", ] [[package]] name = "clap_lex" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b" +checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961" [[package]] name = "colorchoice" @@ -317,19 +311,19 @@ checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" [[package]] name = "criterion" -version = "0.4.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7c76e09c1aae2bc52b3d2f29e13c6572553b30c4aa1b8a49fd70de6412654cb" +checksum = "f2b12d017a929603d80db1831cd3a24082f8137ce19c69e6447f54f5fc8d692f" dependencies = [ "anes", - "atty", "cast", "ciborium", - "clap 3.2.25", + "clap", "criterion-plot", + "is-terminal 0.4.9", "itertools", - "lazy_static", "num-traits", + "once_cell", "oorandom", "regex", "serde", @@ -389,9 +383,9 @@ checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" [[package]] name = "either" -version = "1.8.1" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" [[package]] name = "errno" @@ -406,9 +400,9 @@ dependencies = [ [[package]] name = "errno" -version = "0.3.1" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" +checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd" dependencies = [ "errno-dragonfly", "libc", @@ -431,8 +425,8 @@ version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a267b6a9304912e018610d53fe07115d8b530b160e85db4d2d3a59f3ddde1aec" dependencies = [ - "io-lifetimes 0.7.5", - "rustix 0.35.13", + "io-lifetimes", + "rustix 0.35.14", "windows-sys 0.36.1", ] @@ -454,12 +448,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" [[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" - -[[package]] name = "heck" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -485,19 +473,9 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" - -[[package]] -name = "indexmap" -version = "1.9.3" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" -dependencies = [ - "autocfg", - "hashbrown", -] +checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" [[package]] name = "indexmap-nostd" @@ -506,18 +484,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e04e2fd2b8188ea827b32ef11de88377086d690286ab35747ef7f9bf3ccb590" [[package]] -name = "intx" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f38a50a899dc47a6d0ed5508e7f601a2e34c3a85303514b5d137f3c10a0c75" - -[[package]] name = "io-extras" version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4a5d8c2ab5becd8720e30fd25f8fa5500d8dc3fceadd8378f05859bd7b46fc49" dependencies = [ - "io-lifetimes 0.7.5", + "io-lifetimes", "windows-sys 0.36.1", ] @@ -532,21 +504,10 @@ dependencies = [ ] [[package]] -name = "io-lifetimes" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" -dependencies = [ - "hermit-abi 0.3.1", - "libc", - "windows-sys 0.48.0", -] - -[[package]] name = "ipnet" -version = "2.7.2" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12b6ee2129af8d4fb011108c73d99a1b83a85977f23b82460c0ae2e25bb4b57f" +checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6" [[package]] name = "is-terminal" @@ -555,20 +516,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0d508111813f9af3afd2f92758f77e4ed2cc9371b642112c6a48d22eb73105c5" dependencies = [ "hermit-abi 0.2.6", - "io-lifetimes 0.7.5", - "rustix 0.35.13", + "io-lifetimes", + "rustix 0.35.14", "windows-sys 0.36.1", ] [[package]] name = "is-terminal" -version = "0.4.7" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" +checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ - "hermit-abi 0.3.1", - "io-lifetimes 1.0.11", - "rustix 0.37.20", + "hermit-abi 0.3.2", + "rustix 0.38.10", "windows-sys 0.48.0", ] @@ -583,15 +543,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" - -[[package]] -name = "lazy_static" -version = "1.4.0" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[package]] name = "leb128" @@ -601,9 +555,9 @@ checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" [[package]] name = "libc" -version = "0.2.146" +version = "0.2.147" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f92be4933c13fd498862a9e02a3055f8a8d9c039ce33db97306fd5a6caa7f29b" +checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" [[package]] name = "libm" @@ -619,15 +573,15 @@ checksum = "d4d2456c373231a208ad294c33dc5bff30051eafd954cd4caae83a712b12854d" [[package]] name = "linux-raw-sys" -version = "0.3.8" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" +checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503" [[package]] name = "log" -version = "0.4.19" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "maybe-owned" @@ -637,15 +591,15 @@ checksum = "4facc753ae494aeb6e3c22f839b158aebd4f9270f55cd3c79906c45476c47ab4" [[package]] name = "memchr" -version = "2.5.0" +version = "2.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "5486aed0026218e61b8a01d5fbd5a0a134649abb71a0e53b7bc088529dced86e" [[package]] name = "num-traits" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" dependencies = [ "autocfg", ] @@ -663,22 +617,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" [[package]] -name = "os_str_bytes" -version = "6.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d5d9eb14b174ee9aa2ef96dc2b94637a2d4b6e7cb873c7e171f0c20c6cf3eac" - -[[package]] name = "paste" -version = "1.0.12" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79" +checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" [[package]] name = "pin-project-lite" -version = "0.2.9" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" [[package]] name = "ppv-lite86" @@ -716,18 +664,18 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.60" +version = "1.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dec2b086b7a862cf4de201096214fa870344cf922b2b30c167badb3af3195406" +checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.28" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ "proc-macro2", ] @@ -768,7 +716,7 @@ version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] @@ -784,34 +732,42 @@ dependencies = [ [[package]] name = "regex" -version = "1.8.4" +version = "1.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0ab3ca65655bb1e41f2a8c8cd662eb4fb035e67c3f78da1d61dffe89d07300f" +checksum = "12de2eff854e5fa4b1295edd650e227e9d8fb0c9e90b12e7f36d6a6811791a29" dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", "regex-syntax", ] [[package]] name = "regex-automata" -version = "0.1.10" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" +checksum = "49530408a136e16e5b486e883fbb6ba058e8e4e8ae6621a77b048b314336e629" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] [[package]] name = "regex-syntax" -version = "0.7.2" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78" +checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" [[package]] name = "rustix" -version = "0.35.13" +version = "0.35.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "727a1a6d65f786ec22df8a81ca3121107f235970dc1705ed681d3e6e8b9cd5f9" +checksum = "6380889b07a03b5ecf1d44dc9ede6fd2145d84b502a2a9ca0b03c48e0cc3220f" dependencies = [ - "bitflags", + "bitflags 1.3.2", "errno 0.2.8", - "io-lifetimes 0.7.5", + "io-lifetimes", "itoa", "libc", "linux-raw-sys 0.0.46", @@ -821,23 +777,22 @@ dependencies = [ [[package]] name = "rustix" -version = "0.37.20" +version = "0.38.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b96e891d04aa506a6d1f318d2771bcb1c7dfda84e126660ace067c9b474bb2c0" +checksum = "ed6248e1caa625eb708e266e06159f135e8c26f2bb7ceb72dc4b2766d0340964" dependencies = [ - "bitflags", - "errno 0.3.1", - "io-lifetimes 1.0.11", + "bitflags 2.4.0", + "errno 0.3.3", "libc", - "linux-raw-sys 0.3.8", + "linux-raw-sys 0.4.5", "windows-sys 0.48.0", ] [[package]] name = "ryu" -version = "1.0.13" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" +checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" [[package]] name = "same-file" @@ -850,29 +805,29 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.164" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e8c8cf938e98f769bc164923b06dce91cea1751522f46f8466461af04c9027d" +checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.164" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9735b638ccc51c28bf6914d90a2e9725b377144fc612c49a611fddd1b631d68" +checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.29", ] [[package]] name = "serde_json" -version = "1.0.97" +version = "1.0.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdf3bf93142acad5821c99197022e170842cdbc1c30482b98750c688c640842a" +checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360" dependencies = [ "itoa", "ryu", @@ -890,9 +845,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" +checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" [[package]] name = "spin" @@ -919,9 +874,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.18" +version = "2.0.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32d41677bcbe24c20c52e7c70b0d8db04134c5d1066bf98662e2871ad200ea3e" +checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a" dependencies = [ "proc-macro2", "quote", @@ -935,11 +890,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "92adbaf536f5aff6986e1e62ba36cee72b1718c5153eee08b9e728ddde3f6029" dependencies = [ "atty", - "bitflags", + "bitflags 1.3.2", "cap-fs-ext", "cap-std", - "io-lifetimes 0.7.5", - "rustix 0.35.13", + "io-lifetimes", + "rustix 0.35.14", "windows-sys 0.36.1", "winx", ] @@ -951,29 +906,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" [[package]] -name = "textwrap" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" - -[[package]] name = "thiserror" -version = "1.0.40" +version = "1.0.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" +checksum = "97a802ec30afc17eee47b2855fc72e0c4cd62be9b4efe6591edde0ec5bd68d8f" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.40" +version = "1.0.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" +checksum = "6bb623b56e39ab7dcd4b1b98bb6c8f8d907ed255b18de254088016b27a8ee19b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.29", ] [[package]] @@ -1001,13 +950,13 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.25" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8803eee176538f94ae9a14b55b2804eb7e1441f8210b1c31290b3bccdccff73b" +checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.29", ] [[package]] @@ -1021,9 +970,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.9" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0" +checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" [[package]] name = "unicode-width" @@ -1076,10 +1025,10 @@ dependencies = [ "cap-time-ext", "fs-set-times", "io-extras", - "io-lifetimes 0.7.5", + "io-lifetimes", "is-terminal 0.3.0", "once_cell", - "rustix 0.35.13", + "rustix 0.35.14", "system-interface", "tracing", "wasi-common", @@ -1093,11 +1042,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d47faf4f76ebfdeb1f3346a949c6fbf2f2471afc68280b00c76d6c02221d80ad" dependencies = [ "anyhow", - "bitflags", + "bitflags 1.3.2", "cap-rand", "cap-std", "io-extras", - "rustix 0.35.13", + "rustix 0.35.14", "thiserror", "tracing", "wiggle", @@ -1106,36 +1055,35 @@ dependencies = [ [[package]] name = "wasm-encoder" -version = "0.22.1" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a584273ccc2d9311f1dd19dc3fb26054661fa3e373d53ede5d1144ba07a9acd" +checksum = "41763f20eafed1399fff1afb466496d3a959f58241436cfdc17e3f5ca954de16" dependencies = [ "leb128", ] [[package]] name = "wasm-encoder" -version = "0.29.0" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18c41dbd92eaebf3612a39be316540b8377c871cb9bde6b064af962984912881" +checksum = "1ba64e81215916eaeb48fee292f29401d69235d62d8b8fd92a7b2844ec5ae5f7" dependencies = [ "leb128", ] [[package]] name = "wasmi" -version = "0.30.0" +version = "0.31.0" dependencies = [ "anyhow", "assert_matches", "criterion", - "intx", "smallvec", "spin", "wasmi_arena", "wasmi_core", "wasmparser-nostd", - "wast 52.0.3", + "wast 62.0.1", "wat", ] @@ -1145,11 +1093,11 @@ version = "0.4.0" [[package]] name = "wasmi_cli" -version = "0.30.0" +version = "0.31.0" dependencies = [ "anyhow", "assert_cmd", - "clap 4.3.4", + "clap", "wasmi", "wasmi_wasi", "wat", @@ -1157,7 +1105,7 @@ dependencies = [ [[package]] name = "wasmi_core" -version = "0.12.0" +version = "0.13.0" dependencies = [ "downcast-rs", "libm", @@ -1168,7 +1116,7 @@ dependencies = [ [[package]] name = "wasmi_wasi" -version = "0.30.0" +version = "0.31.0" dependencies = [ "wasi-cap-std-sync", "wasi-common", @@ -1197,35 +1145,35 @@ dependencies = [ [[package]] name = "wast" -version = "52.0.3" +version = "62.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15942180f265280eede7bc38b239e9770031d1821c02d905284216c645316430" +checksum = "b8ae06f09dbe377b889fbd620ff8fa21e1d49d1d9d364983c0cdbf9870cb9f1f" dependencies = [ "leb128", "memchr", "unicode-width", - "wasm-encoder 0.22.1", + "wasm-encoder 0.31.1", ] [[package]] name = "wast" -version = "60.0.0" +version = "64.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd06cc744b536e30387e72a48fdd492105b9c938bb4f415c39c616a7a0a697ad" +checksum = "a259b226fd6910225aa7baeba82f9d9933b6d00f2ce1b49b80fa4214328237cc" dependencies = [ "leb128", "memchr", "unicode-width", - "wasm-encoder 0.29.0", + "wasm-encoder 0.32.0", ] [[package]] name = "wat" -version = "1.0.66" +version = "1.0.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5abe520f0ab205366e9ac7d3e6b2fc71de44e32a2b58f2ec871b6b575bdcea3b" +checksum = "53253d920ab413fca1c7dc2161d601c79b4fdf631d0ba51dd4343bf9b556c3f6" dependencies = [ - "wast 60.0.0", + "wast 64.0.0", ] [[package]] @@ -1236,7 +1184,7 @@ checksum = "211ef4d238fd83bbe6f1bc57f3e2e20dc8b1f999188be252e7a535b696c6f84f" dependencies = [ "anyhow", "async-trait", - "bitflags", + "bitflags 1.3.2", "thiserror", "tracing", "wiggle-macro", @@ -1340,17 +1288,17 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ - "windows_aarch64_gnullvm 0.48.0", - "windows_aarch64_msvc 0.48.0", - "windows_i686_gnu 0.48.0", - "windows_i686_msvc 0.48.0", - "windows_x86_64_gnu 0.48.0", - "windows_x86_64_gnullvm 0.48.0", - "windows_x86_64_msvc 0.48.0", + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", ] [[package]] @@ -1361,9 +1309,9 @@ checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_msvc" @@ -1379,9 +1327,9 @@ checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" [[package]] name = "windows_aarch64_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_i686_gnu" @@ -1397,9 +1345,9 @@ checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" [[package]] name = "windows_i686_gnu" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_msvc" @@ -1415,9 +1363,9 @@ checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" [[package]] name = "windows_i686_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_x86_64_gnu" @@ -1433,9 +1381,9 @@ checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" [[package]] name = "windows_x86_64_gnu" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnullvm" @@ -1445,9 +1393,9 @@ checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" [[package]] name = "windows_x86_64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_msvc" @@ -1463,9 +1411,9 @@ checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" [[package]] name = "windows_x86_64_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "winx" @@ -1473,8 +1421,8 @@ version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b7b01e010390eb263a4518c8cebf86cb67469d1511c00b749a47b64c39e8054d" dependencies = [ - "bitflags", - "io-lifetimes 0.7.5", + "bitflags 1.3.2", + "io-lifetimes", "windows-sys 0.36.1", ] diff --git a/nixpkgs/pkgs/development/tools/wasmi/default.nix b/nixpkgs/pkgs/development/tools/wasmi/default.nix index aed99b4e73ff..4af59590722a 100644 --- a/nixpkgs/pkgs/development/tools/wasmi/default.nix +++ b/nixpkgs/pkgs/development/tools/wasmi/default.nix @@ -5,13 +5,13 @@ rustPlatform.buildRustPackage rec { pname = "wasmi"; - version = "0.30.0"; + version = "0.31.0"; src = fetchFromGitHub { owner = "paritytech"; repo = "wasmi"; rev = "v${version}"; - hash = "sha256-0G/K61JP4SehhP+wD9uwCU1GRjzJdz4fkePv+IiqUY4="; + hash = "sha256-chLWrZ+OLUTSFmTu+qKpjApXDmJFhS68N2RKjaql75U="; fetchSubmodules = true; }; diff --git a/nixpkgs/pkgs/development/tools/yamlfmt/default.nix b/nixpkgs/pkgs/development/tools/yamlfmt/default.nix index e1557101f160..3b54c025f89b 100644 --- a/nixpkgs/pkgs/development/tools/yamlfmt/default.nix +++ b/nixpkgs/pkgs/development/tools/yamlfmt/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "yamlfmt"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "google"; repo = pname; rev = "v${version}"; - sha256 = "sha256-l081PgSAT9h2oHp1eH96XztcCLeyv1Y11l6lJhHQj1I="; + sha256 = "sha256-+xlPXHM/4blnm09OcMSpvVTLJy38U4xkVMd3Ea2scyU="; }; vendorHash = "sha256-qrHrLOfyJhsuU75arDtfOhLaLqP+GWTfX+oyLX3aea8="; diff --git a/nixpkgs/pkgs/development/web/edge-runtime/default.nix b/nixpkgs/pkgs/development/web/edge-runtime/default.nix index 071d16b5f8f1..a84e232bbb4c 100644 --- a/nixpkgs/pkgs/development/web/edge-runtime/default.nix +++ b/nixpkgs/pkgs/development/web/edge-runtime/default.nix @@ -11,7 +11,7 @@ let pname = "edge-runtime"; - version = "1.10.0"; + version = "1.14.0"; in rustPlatform.buildRustPackage { inherit pname version; @@ -20,16 +20,16 @@ rustPlatform.buildRustPackage { owner = "supabase"; repo = pname; rev = "v${version}"; - hash = "sha256-AWdgqL7Io4v3Z4XNS5JDDGuUeSqsNpF/NpJQ7h5oJZs="; + hash = "sha256-63XStzO4Jt6ObWuzcBf2QwCIWsStXvhQ0XaJabELhWg="; fetchSubmodules = true; }; - cargoHash = "sha256-AIwMoqbnCl4DFX0gSGblkV8DgtruwXPw8ngHeBDD6Dw="; + cargoHash = "sha256-JwwdvvpqgSbl0Xyb5pQ5hzZRrrCnDSjwV+ikdO2pXCk="; nativeBuildInputs = [ pkg-config rustPlatform.bindgenHook ]; buildInputs = lib.optionals stdenv.isLinux [ openssl ] - ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Security CoreFoundation ]); + ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Security CoreFoundation SystemConfiguration ]); # The v8 package will try to download a `librusty_v8.a` release at build time to our read-only filesystem # To avoid this we pre-download the file and export it via RUSTY_V8_ARCHIVE diff --git a/nixpkgs/pkgs/development/web/edge-runtime/librusty_v8.nix b/nixpkgs/pkgs/development/web/edge-runtime/librusty_v8.nix index 30f6aebc2960..6e9fc0a669fd 100644 --- a/nixpkgs/pkgs/development/web/edge-runtime/librusty_v8.nix +++ b/nixpkgs/pkgs/development/web/edge-runtime/librusty_v8.nix @@ -1,3 +1,4 @@ +# auto-generated file -- DO NOT EDIT! { rust, stdenv, fetchurl }: let @@ -10,11 +11,11 @@ let }; in fetch_librusty_v8 { - version = "0.68.0"; + version = "0.74.3"; shas = { - x86_64-linux = "sha256-yq7YPD2TM6Uw0EvCqIsZ/lbE1RLgIg7a42qDVrr5fX4="; - aarch64-linux = "sha256-uZFm3hAeyEUUXqRJFLM3OBVfglH3AecjFKVgeJZu3L0="; - x86_64-darwin = "sha256-YkxoggK0I4rT/KNJ30StDPLUc02Mdjwal3JH+s/YTQo="; - aarch64-darwin = "sha256-aXE7W3sSzbhvC661BYTTHyHlihmVVtFSv85nSjGOLkU="; + x86_64-linux = "sha256-8pa8nqA6rbOSBVnp2Q8/IQqh/rfYQU57hMgwU9+iz4A="; + aarch64-linux = "sha256-3kXOV8rlCNbNBdXgOtd3S94qO+JIKyOByA4WGX+XVP0="; + x86_64-darwin = "sha256-iBBVKZiSoo08YEQ8J/Rt1/5b7a+2xjtuS6QL/Wod5nQ="; + aarch64-darwin = "sha256-Djnuc3l/jQKvBf1aej8LG5Ot2wPT0m5Zo1B24l1UHsM="; }; } diff --git a/nixpkgs/pkgs/development/web/flyctl/default.nix b/nixpkgs/pkgs/development/web/flyctl/default.nix index bafe5c20de76..7bc41ad694b3 100644 --- a/nixpkgs/pkgs/development/web/flyctl/default.nix +++ b/nixpkgs/pkgs/development/web/flyctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "flyctl"; - version = "0.1.71"; + version = "0.1.84"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - hash = "sha256-0VgXcWWJxm3VBG+GJitL22tHUfXf2pI9MAepqqTVSYo="; + hash = "sha256-StcakZFJxHRY36xuxZm/W9xoEye4HRPfC4dtczeT7nk="; }; - vendorHash = "sha256-h06iAJN3ZkcV1TN2iEY8DEZyu4DEgF+7nF4IXq6fD/4="; + vendorHash = "sha256-cfgI/kJOtH1Ptd1MUHvt+e2ErU5wL+8Xm4cfQ64iAhc="; subPackages = [ "." ]; diff --git a/nixpkgs/pkgs/development/web/insomnia/default.nix b/nixpkgs/pkgs/development/web/insomnia/default.nix index 99843767d906..286a0444db59 100644 --- a/nixpkgs/pkgs/development/web/insomnia/default.nix +++ b/nixpkgs/pkgs/development/web/insomnia/default.nix @@ -16,12 +16,11 @@ let ]; in stdenv.mkDerivation rec { pname = "insomnia"; - version = "2023.5.5"; + version = "2023.5.7"; src = fetchurl { - url = - "https://github.com/Kong/insomnia/releases/download/core%40${version}/Insomnia.Core-${version}.deb"; - sha256 = "sha256-/SrSpkfF3IrLl6BC4UknsTDraqN8uFKrKQSzQpBaRLY="; + url = "https://github.com/Kong/insomnia/releases/download/core%40${version}/Insomnia.Core-${version}.deb"; + sha256 = "sha256-XB8ktjF6VWj57whbXC0iwH3WpuMkGnRZCCdx86Mj2ZI="; }; nativeBuildInputs = [ @@ -91,7 +90,7 @@ in stdenv.mkDerivation rec { sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = licenses.mit; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ markus1189 babariviere ]; + maintainers = with maintainers; [ markus1189 babariviere kashw2 ]; }; } diff --git a/nixpkgs/pkgs/development/web/nodejs/nodejs.nix b/nixpkgs/pkgs/development/web/nodejs/nodejs.nix index bd90641c16f2..8b615a55dd3a 100644 --- a/nixpkgs/pkgs/development/web/nodejs/nodejs.nix +++ b/nixpkgs/pkgs/development/web/nodejs/nodejs.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, openssl, python, zlib, libuv, util-linux, http-parser +{ lib, stdenv, fetchurl, openssl, python, zlib, libuv, util-linux, http-parser, bash , pkg-config, which, buildPackages # for `.pkgs` attribute , callPackage @@ -14,6 +14,8 @@ let inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices; + isCross = stdenv.hostPlatform != stdenv.buildPlatform; + majorVersion = lib.versions.major version; minorVersion = lib.versions.minor version; @@ -48,12 +50,17 @@ let inherit sha256; }; + strictDeps = true; + CC_host = "cc"; CXX_host = "c++"; - depsBuildBuild = [ buildPackages.stdenv.cc openssl libuv zlib ]; + depsBuildBuild = [ buildPackages.stdenv.cc openssl libuv zlib icu ]; + # NB: technically, we do not need bash in build inputs since all scripts are + # wrappers over the corresponding JS scripts. There are some packages though + # that use bash wrappers, e.g. polaris-web. buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ApplicationServices ] - ++ [ zlib libuv openssl http-parser icu ]; + ++ [ zlib libuv openssl http-parser icu bash ]; nativeBuildInputs = [ which pkg-config python ] ++ lib.optionals stdenv.isDarwin [ xcbuild ]; @@ -63,14 +70,11 @@ let moveToDev = false; configureFlags = let - isCross = stdenv.hostPlatform != stdenv.buildPlatform; inherit (stdenv.hostPlatform) gcc isAarch32; in sharedConfigureFlags ++ lib.optionals (lib.versionOlder version "19") [ "--without-dtrace" ] ++ (lib.optionals isCross [ "--cross-compiling" - "--without-intl" - "--without-snapshot" "--dest-cpu=${let platform = stdenv.hostPlatform; in if platform.isAarch32 then "arm" else if platform.isAarch64 then "arm64" @@ -116,32 +120,28 @@ let inherit patches; - postPatch = '' - patchShebangs . - - # fix tests - for a in test/parallel/test-child-process-env.js \ - test/parallel/test-child-process-exec-env.js \ - test/parallel/test-child-process-default-options.js \ - test/fixtures/syntax/good_syntax_shebang.js \ - test/fixtures/syntax/bad_syntax_shebang.js ; do - substituteInPlace $a \ - --replace "/usr/bin/env" "${coreutils}/bin/env" - done - '' + lib.optionalString stdenv.isDarwin '' - sed -i -e "s|tr1/type_traits|type_traits|g" \ - -e "s|std::tr1|std|" src/util.h - ''; + doCheck = lib.versionAtLeast version "16"; # some tests fail on v14 - nativeCheckInputs = [ procps ]; - doCheck = false; # fails 4 out of 1453 tests + # Some dependencies required for tools/doc/node_modules (and therefore + # test-addons, jstest and others) target are not included in the tarball. + # Run test targets that do not require network access. + checkTarget = lib.concatStringsSep " " [ + "build-js-native-api-tests" + "build-node-api-tests" + "tooltest" + "cctest" + ]; + + # Do not create __pycache__ when running tests. + checkFlags = [ "PYTHONDONTWRITEBYTECODE=1" ]; postInstall = '' - PATH=$out/bin:$PATH patchShebangs $out + HOST_PATH=$out/bin patchShebangs --host $out - ${lib.optionalString (enableNpm && stdenv.hostPlatform == stdenv.buildPlatform) '' - mkdir -p $out/share/bash-completion/completions/ - HOME=$TMPDIR $out/bin/npm completion > $out/share/bash-completion/completions/npm + ${lib.optionalString (enableNpm) '' + mkdir -p $out/share/bash-completion/completions + ln -s $out/lib/node_modules/npm/lib/utils/completion.sh \ + $out/share/bash-completion/completions/npm for dir in "$out/lib/node_modules/npm/man/"*; do mkdir -p $out/share/man/$(basename "$dir") for page in "$dir"/*; do @@ -203,6 +203,14 @@ let platforms = platforms.linux ++ platforms.darwin; mainProgram = "node"; knownVulnerabilities = optional (versionOlder version "18") "This NodeJS release has reached its end of life. See https://nodejs.org/en/about/releases/."; + + # Node.js build system does not have separate host and target OS + # configurations (architectures are defined as host_arch and target_arch, + # but there is no such thing as host_os and target_os). + # + # We may be missing something here, but it doesn’t look like it is + # possible to cross-compile between different operating systems. + broken = stdenv.buildPlatform.parsed.kernel.name != stdenv.hostPlatform.parsed.kernel.name; }; passthru.python = python; # to ensure nodeEnv uses the same version diff --git a/nixpkgs/pkgs/development/web/nodejs/trap-handler-backport.patch b/nixpkgs/pkgs/development/web/nodejs/trap-handler-backport.patch new file mode 100644 index 000000000000..c562aea3a6e2 --- /dev/null +++ b/nixpkgs/pkgs/development/web/nodejs/trap-handler-backport.patch @@ -0,0 +1,76 @@ +Backport V8_TRAP_HANDLER_SUPPORTED conditional compilation for trap +handler implementation. + +See https://github.com/v8/v8/commit/e7bef8d4cc4f38cc3d5a532fbcc445dc62adc08f + +E.g. when cross-compiling from aarch64-linux for x86_64-linux target, +handler-inside-posix.cc is built on aarch64-linux even though it is not +supported; see src/trap-handler/trap-handler.h in v8 for (host, target) +combinations where trap handler is supported. + +Note that handler-inside-posix.cc fails to build in the case above. + +diff --git a/deps/v8/src/trap-handler/handler-inside-posix.cc b/deps/v8/src/trap-handler/handler-inside-posix.cc +index e4454c378f..17af3d75dc 100644 +--- a/deps/v8/src/trap-handler/handler-inside-posix.cc ++++ b/deps/v8/src/trap-handler/handler-inside-posix.cc +@@ -47,6 +47,8 @@ namespace v8 { + namespace internal { + namespace trap_handler { + ++#if V8_TRAP_HANDLER_SUPPORTED ++ + #if V8_OS_LINUX + #define CONTEXT_REG(reg, REG) &uc->uc_mcontext.gregs[REG_##REG] + #elif V8_OS_DARWIN +@@ -181,6 +183,8 @@ void HandleSignal(int signum, siginfo_t* info, void* context) { + // TryHandleSignal modifies context to change where we return to. + } + ++#endif ++ + } // namespace trap_handler + } // namespace internal + } // namespace v8 +diff --git a/deps/v8/src/trap-handler/handler-inside-win.cc b/deps/v8/src/trap-handler/handler-inside-win.cc +index fcccc78ee5..3d7a2c416a 100644 +--- a/deps/v8/src/trap-handler/handler-inside-win.cc ++++ b/deps/v8/src/trap-handler/handler-inside-win.cc +@@ -38,6 +38,8 @@ namespace v8 { + namespace internal { + namespace trap_handler { + ++#if V8_TRAP_HANDLER_SUPPORTED ++ + // The below struct needed to access the offset in the Thread Environment Block + // to see if the thread local storage for the thread has been allocated yet. + // +@@ -129,6 +131,8 @@ LONG HandleWasmTrap(EXCEPTION_POINTERS* exception) { + return EXCEPTION_CONTINUE_SEARCH; + } + ++#endif ++ + } // namespace trap_handler + } // namespace internal + } // namespace v8 +diff --git a/deps/v8/src/trap-handler/handler-outside-simulator.cc b/deps/v8/src/trap-handler/handler-outside-simulator.cc +index 179eab0659..5e58719e7f 100644 +--- a/deps/v8/src/trap-handler/handler-outside-simulator.cc ++++ b/deps/v8/src/trap-handler/handler-outside-simulator.cc +@@ -4,6 +4,9 @@ + + #include "include/v8config.h" + #include "src/trap-handler/trap-handler-simulator.h" ++#include "src/trap-handler/trap-handler.h" ++ ++#if V8_TRAP_HANDLER_SUPPORTED + + #if V8_OS_DARWIN + #define SYMBOL(name) "_" #name +@@ -35,3 +38,5 @@ asm( + SYMBOL(v8_probe_memory_continuation) ": \n" + // If the trap handler continues here, it wrote the landing pad in %rax. + " ret \n"); ++ ++#endif diff --git a/nixpkgs/pkgs/development/web/nodejs/v18.nix b/nixpkgs/pkgs/development/web/nodejs/v18.nix index 213f42718188..0eb1ab4ce3f6 100644 --- a/nixpkgs/pkgs/development/web/nodejs/v18.nix +++ b/nixpkgs/pkgs/development/web/nodejs/v18.nix @@ -1,11 +1,10 @@ -{ callPackage, openssl, python3, enableNpm ? true }: +{ callPackage, fetchpatch, openssl, python3, enableNpm ? true }: let buildNodejs = callPackage ./nodejs.nix { inherit openssl; python = python3; }; - in buildNodejs { inherit enableNpm; @@ -16,5 +15,13 @@ buildNodejs { ./bypass-darwin-xcrun-node16.patch ./revert-arm64-pointer-auth.patch ./node-npm-build-npm-package-logic.patch + ./trap-handler-backport.patch + # Fixes target toolchain arguments being passed to the host toolchain when + # cross-compiling. For example, -m64 is not available on aarch64. + (fetchpatch { + name = "common-gypi-cross.patch"; + url = "https://github.com/nodejs/node/pull/48597.patch"; + hash = "sha256-FmHmwlTxPw5mTW6t4zuy9vr4FxopjU4Kx+F1aqabG1s="; + }) ]; } diff --git a/nixpkgs/pkgs/development/web/nodejs/v20.nix b/nixpkgs/pkgs/development/web/nodejs/v20.nix index cfb90879c05d..257f440187bf 100644 --- a/nixpkgs/pkgs/development/web/nodejs/v20.nix +++ b/nixpkgs/pkgs/development/web/nodejs/v20.nix @@ -5,12 +5,11 @@ let inherit openssl; python = python3; }; - in buildNodejs { inherit enableNpm; - version = "20.5.1"; - sha256 = "sha256-Q5xxqi84woYWV7+lOOmRkaVxJYBmy/1FSFhgScgTQZA="; + version = "20.6.0"; + sha256 = "sha256-nvtcunqPSxjTiw19N6mzDe1zOQyE44DPTeianTCn1vo="; patches = [ ./revert-arm64-pointer-auth.patch ./disable-darwin-v8-system-instrumentation-node19.patch |