diff options
Diffstat (limited to 'pkgs/development')
736 files changed, 11521 insertions, 12888 deletions
diff --git a/pkgs/development/compilers/aspectj/builder.sh b/pkgs/development/compilers/aspectj/builder.sh index 7ea0a40d374..31ec97942e5 100755 --- a/pkgs/development/compilers/aspectj/builder.sh +++ b/pkgs/development/compilers/aspectj/builder.sh @@ -1,4 +1,4 @@ -if [ -e .attrs.sh ]; then source .attrs.sh; fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi source $stdenv/setup export JAVA_HOME=$jre diff --git a/pkgs/development/compilers/binaryen/default.nix b/pkgs/development/compilers/binaryen/default.nix index 5a139fb2906..dcadf054bc3 100644 --- a/pkgs/development/compilers/binaryen/default.nix +++ b/pkgs/development/compilers/binaryen/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "binaryen"; - version = "114"; + version = "116"; src = fetchFromGitHub { owner = "WebAssembly"; repo = "binaryen"; rev = "version_${version}"; - hash = "sha256-bzHNIQy0AN8mIFGG+638p/MBSqlkWuaOzKGSsMDAPH4="; + hash = "sha256-gMwbWiP+YDCVafQMBWhTuJGWmkYtnhEdn/oofKaUT08="; }; nativeBuildInputs = [ cmake python3 ]; diff --git a/pkgs/development/compilers/chicken/4/chicken.nix b/pkgs/development/compilers/chicken/4/chicken.nix index f33e594b7e2..29cf5b115b3 100644 --- a/pkgs/development/compilers/chicken/4/chicken.nix +++ b/pkgs/development/compilers/chicken/4/chicken.nix @@ -20,6 +20,13 @@ stdenv.mkDerivation { sha256 = "0hvckhi5gfny3mlva6d7y9pmx7cbwvq0r7mk11k3sdiik9hlkmdd"; }; + postPatch = lib.optionalString stdenv.isDarwin '' + # There is not enough space in the load command to accomodate a full path to the store, + # so use `@executable_path` to specify a relative path to chicken’s lib folder. + sed -e '/POSTINSTALL_PROGRAM_FLAGS = /{s|$(LIBDIR)|@executable_path/../lib|}' \ + -i Makefile.macosx + ''; + setupHook = lib.optional (bootstrap-chicken != null) ./setup-hook.sh; # -fno-strict-overflow is not a supported argument in clang on darwin @@ -31,7 +38,7 @@ stdenv.mkDerivation { ] ++ (lib.optionals stdenv.isDarwin [ "XCODE_TOOL_PATH=${darwin.binutils.bintools}/bin" "C_COMPILER=$(CC)" - "POSTINSTALL_PROGRAM=install_name_tool" + "POSTINSTALL_PROGRAM=${stdenv.cc.targetPrefix}install_name_tool" ]); # We need a bootstrap-chicken to regenerate the c-files after diff --git a/pkgs/development/compilers/chicken/4/fetchegg/builder.sh b/pkgs/development/compilers/chicken/4/fetchegg/builder.sh index cb56eabc5d7..78535382a7c 100644 --- a/pkgs/development/compilers/chicken/4/fetchegg/builder.sh +++ b/pkgs/development/compilers/chicken/4/fetchegg/builder.sh @@ -1,4 +1,4 @@ -if [ -e .attrs.sh ]; then source .attrs.sh; fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi source $stdenv/setup echo "exporting egg ${eggName} (version $version) into $out" diff --git a/pkgs/development/compilers/closure/default.nix b/pkgs/development/compilers/closure/default.nix index 02fff2b3d9b..39dfa67d23e 100644 --- a/pkgs/development/compilers/closure/default.nix +++ b/pkgs/development/compilers/closure/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "closure-compiler"; - version = "20230802"; + version = "20231112"; src = fetchurl { url = "mirror://maven/com/google/javascript/closure-compiler/v${version}/closure-compiler-v${version}.jar"; - sha256 = "sha256-IwqeBain2dqgg7H26G7bpusexkAqaiWEMv5CRc3EqV8="; + sha256 = "sha256-oH1/QZX8cF9sZikP5XpNdfsMepJrgW+uX0OGHhJVbmw="; }; dontUnpack = true; diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix index b72d418a97d..9ae727f9376 100644 --- a/pkgs/development/compilers/elm/default.nix +++ b/pkgs/development/compilers/elm/default.nix @@ -274,6 +274,17 @@ in lib.makeScope pkgs.newScope (self: with self; { } ); + elm-land = nodePkgs."elm-land".overrideAttrs ( + old: { + meta = with lib; nodePkgs."elm-land".meta // { + description = "A production-ready framework for building Elm applications."; + homepage = "https://elm.land/"; + license = licenses.bsd3; + maintainers = [ maintainers.zupo ]; + }; + } + ); + lamdera = callPackage ./packages/lamdera.nix {}; elm-doc-preview = nodePkgs."elm-doc-preview".overrideAttrs (old: { diff --git a/pkgs/development/compilers/elm/packages/node-composition.nix b/pkgs/development/compilers/elm/packages/node-composition.nix index b6110ac4db9..c825c6c6634 100644 --- a/pkgs/development/compilers/elm/packages/node-composition.nix +++ b/pkgs/development/compilers/elm/packages/node-composition.nix @@ -2,7 +2,7 @@ {pkgs ? import <nixpkgs> { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_14"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_18"}: let nodeEnv = import ../../../node-packages/node-env.nix { diff --git a/pkgs/development/compilers/elm/packages/node-packages.json b/pkgs/development/compilers/elm/packages/node-packages.json index 30b2662ba49..8112b01bc9e 100644 --- a/pkgs/development/compilers/elm/packages/node-packages.json +++ b/pkgs/development/compilers/elm/packages/node-packages.json @@ -3,6 +3,7 @@ "elm-coverage", "elm-doc-preview", "@elm-tooling/elm-language-server", + "elm-land", "elm-live", "elm-spa", "elm-test", diff --git a/pkgs/development/compilers/elm/packages/node-packages.nix b/pkgs/development/compilers/elm/packages/node-packages.nix index 5bf0474e66f..bfc0fcdf7bd 100644 --- a/pkgs/development/compilers/elm/packages/node-packages.nix +++ b/pkgs/development/compilers/elm/packages/node-packages.nix @@ -4,13 +4,13 @@ let sources = { - "@adobe/css-tools-4.2.0" = { + "@adobe/css-tools-4.3.1" = { name = "_at_adobe_slash_css-tools"; packageName = "@adobe/css-tools"; - version = "4.2.0"; + version = "4.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.2.0.tgz"; - sha512 = "E09FiIft46CmH5Qnjb0wsW54/YQd69LsxeKUOWawmws1XWvyFGURnAChH0mlr7YPFR1ofwvUQfcL0J3lMxXqPA=="; + url = "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.3.1.tgz"; + sha512 = "/62yikz7NLScCGAAST5SHdnjaDJQBDq0M2muyRTpf2VQhw6StBg2ALiu73zSJQ4fMVLA+0uBhBHAle7Wg+2kSg=="; }; }; "@babel/cli-7.12.10" = { @@ -1399,6 +1399,69 @@ let sha512 = "GaHYm+c0O9MjZRu0ongGBRbinu8gVAMd2UZjji6jVmqKtZluZnptXGWhz1E8j8D2HJ3f/yMxKAUC0b+57wncIw=="; }; }; + "@lydell/elm-0.19.1-14" = { + name = "_at_lydell_slash_elm"; + packageName = "@lydell/elm"; + version = "0.19.1-14"; + src = fetchurl { + url = "https://registry.npmjs.org/@lydell/elm/-/elm-0.19.1-14.tgz"; + sha512 = "otpGlYiNRvL7F9k6MJOTcuyIgHr+XWy/1NtHpGUgQi8lHrnuyCjwKFPPiimKpr3bcZTwpD4nebHuYR0bmPIKuA=="; + }; + }; + "@lydell/elm_darwin_arm64-0.19.1-3" = { + name = "_at_lydell_slash_elm_darwin_arm64"; + packageName = "@lydell/elm_darwin_arm64"; + version = "0.19.1-3"; + src = fetchurl { + url = "https://registry.npmjs.org/@lydell/elm_darwin_arm64/-/elm_darwin_arm64-0.19.1-3.tgz"; + sha512 = "RuKTz5ck+RBx4urj1EL/r0xWZZqBMPEXzNBQTEBCAMWLSi4Ck3TVz5pkhBaK+cRZXI+cCgytm/1bIttbp2fFIg=="; + }; + }; + "@lydell/elm_darwin_x64-0.19.1-2" = { + name = "_at_lydell_slash_elm_darwin_x64"; + packageName = "@lydell/elm_darwin_x64"; + version = "0.19.1-2"; + src = fetchurl { + url = "https://registry.npmjs.org/@lydell/elm_darwin_x64/-/elm_darwin_x64-0.19.1-2.tgz"; + sha512 = "MXfQwxdQfmuQ22iDCFlcXu5YTA0w6/ASzbxmWc+8DkgUkHTynjViGBVkQljAbYe4ZWgrYGWinZQQyhVnp/5oZw=="; + }; + }; + "@lydell/elm_linux_arm-0.19.1-0" = { + name = "_at_lydell_slash_elm_linux_arm"; + packageName = "@lydell/elm_linux_arm"; + version = "0.19.1-0"; + src = fetchurl { + url = "https://registry.npmjs.org/@lydell/elm_linux_arm/-/elm_linux_arm-0.19.1-0.tgz"; + sha512 = "crKrLzuT6jn4OOS7PWKZGYFw6vHwPu3iNP7lg8rFkOog/HxlkRwX4S695aILBG8SGTLhEdfP9tg28SQ7vR4Lpg=="; + }; + }; + "@lydell/elm_linux_arm64-0.19.1-4" = { + name = "_at_lydell_slash_elm_linux_arm64"; + packageName = "@lydell/elm_linux_arm64"; + version = "0.19.1-4"; + src = fetchurl { + url = "https://registry.npmjs.org/@lydell/elm_linux_arm64/-/elm_linux_arm64-0.19.1-4.tgz"; + sha512 = "JuUkkVBtJjUajtTriQFFANHDmwA14NhqNqgIcq5LCJ6vUQv5/LVd6NUOkl/Rdq7Ju/VN/XwBD1/vm7MGIMOTqA=="; + }; + }; + "@lydell/elm_linux_x64-0.19.1-1" = { + name = "_at_lydell_slash_elm_linux_x64"; + packageName = "@lydell/elm_linux_x64"; + version = "0.19.1-1"; + src = fetchurl { + url = "https://registry.npmjs.org/@lydell/elm_linux_x64/-/elm_linux_x64-0.19.1-1.tgz"; + sha512 = "1Y8UAb+GfUqlSjUTX9CaaZhJqvhVcfNbYC0N9AEutlXf1CzFMvF4VsDeZdxzhNI4allPRWBD1IqtdlLhBTFacA=="; + }; + }; + "@lydell/elm_win32_x64-0.19.1-1" = { + name = "_at_lydell_slash_elm_win32_x64"; + packageName = "@lydell/elm_win32_x64"; + version = "0.19.1-1"; + src = fetchurl { + url = "https://registry.npmjs.org/@lydell/elm_win32_x64/-/elm_win32_x64-0.19.1-1.tgz"; + sha512 = "3LMiJ+uUxDFLNnCd6HBmvVWSjSWjs/Z9dMXZWCMOcw3vrW9iOkRrsNGNxohRXun2YRd8wXOX8/DwVn8i2SJ3KA=="; + }; + }; "@mrmlnc/readdir-enhanced-2.2.1" = { name = "_at_mrmlnc_slash_readdir-enhanced"; packageName = "@mrmlnc/readdir-enhanced"; @@ -1642,13 +1705,13 @@ let sha512 = "U5icWpv7YnZYGsN4/cmh3WD2onMY0aJIiTE6+51TwJCttdHvtCYmkBNOobHlXwrJRL0nkH9jH4kD+1FAdMN4Tg=="; }; }; - "@types/node-20.8.9" = { + "@types/node-20.8.10" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "20.8.9"; + version = "20.8.10"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-20.8.9.tgz"; - sha512 = "UzykFsT3FhHb1h7yD4CA4YhBHq545JC0YnEz41xkipN88eKQtL6rSgocL5tbAP6Ola9Izm/Aw4Ora8He4x0BHg=="; + url = "https://registry.npmjs.org/@types/node/-/node-20.8.10.tgz"; + sha512 = "TlgT8JntpcbmKUFzjhsyhGfP2fsiz1Mv56im6enJ905xG1DAYesxJaeSbGqQmAw8OWPdhyJGhGSQGKRNJ45u9w=="; }; }; "@types/node-8.10.66" = { @@ -1957,13 +2020,13 @@ let sha512 = "XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ=="; }; }; - "acorn-8.11.0" = { + "acorn-8.11.2" = { name = "acorn"; packageName = "acorn"; - version = "8.11.0"; + version = "8.11.2"; src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-8.11.0.tgz"; - sha512 = "hNiSyky+cuYVALBrsjB7f9gMN9P4u09JyAiMNMLaVfsmkDJuH84M1T/0pfDX/OJfGWcobd2A7ecXYzygn8wibA=="; + url = "https://registry.npmjs.org/acorn/-/acorn-8.11.2.tgz"; + sha512 = "nc0Axzp/0FILLEVsm4fNwLCwMttvhEI263QtVPQcbpfZZ3ts0hLsZGOpE6czNlid7CJ9MlyH8reXkpsf3YUY4w=="; }; }; "address-1.0.3" = { @@ -3190,13 +3253,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001554" = { + "caniuse-lite-1.0.30001561" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001554"; + version = "1.0.30001561"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001554.tgz"; - sha512 = "A2E3U//MBwbJVzebddm1YfNp7Nud5Ip+IPn4BozBmn4KqVX7AvluoIDFWjsv5OkGnKUXQVmMSoMKLa3ScCblcQ=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001561.tgz"; + sha512 = "NTt0DNoKe958Q0BE0j0c1V9jbUzhBxHIEJy7asmGrpE0yG63KTV7PLHPnK2E1O9RsQrQ081I3NLuXGS6zht3cw=="; }; }; "case-sensitive-paths-webpack-plugin-2.3.0" = { @@ -3946,13 +4009,13 @@ let sha512 = "Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ=="; }; }; - "core-js-compat-3.33.1" = { + "core-js-compat-3.33.2" = { name = "core-js-compat"; packageName = "core-js-compat"; - version = "3.33.1"; + version = "3.33.2"; src = fetchurl { - url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.33.1.tgz"; - sha512 = "6pYKNOgD/j/bkC5xS5IIg6bncid3rfrI42oBH1SQJbsmYPKF7rhzcFzYCcxYMmNQQ0rCEB8WqpW7QHndOggaeQ=="; + url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.33.2.tgz"; + sha512 = "axfo+wxFVxnqf8RvxTzoAlzW4gRoacrHeoFlc9n0x50+7BEyZL/Rt3hicaED1/CEd7I6tPCPVUYcJwCMO5XUYw=="; }; }; "core-util-is-1.0.2" = { @@ -4810,13 +4873,13 @@ let sha512 = "WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="; }; }; - "electron-to-chromium-1.4.567" = { + "electron-to-chromium-1.4.576" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.4.567"; + version = "1.4.576"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.567.tgz"; - sha512 = "8KR114CAYQ4/r5EIEsOmOMqQ9j0MRbJZR3aXD/KFA8RuKzyoUB4XrUCg+l8RUGqTVQgKNIgTpjaG8YHRPAbX2w=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.576.tgz"; + sha512 = "yXsZyXJfAqzWk1WKryr0Wl0MN2D47xodPvEEwlVePBnhU5E7raevLQR+E6b9JAD3GfL/7MbAL9ZtWQQPcLx7wA=="; }; }; "elliptic-6.5.4" = { @@ -7204,15 +7267,6 @@ let sha512 = "opmNIX7uFnS96NtPmhWQgQx6/NYFgsUXYMllcfzwWKUMwfo8kku1TvE6hkNcH+Q1ts5cMVrsY7j0bxXQDciu9Q=="; }; }; - "is-accessor-descriptor-0.1.6" = { - name = "is-accessor-descriptor"; - packageName = "is-accessor-descriptor"; - version = "0.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz"; - sha512 = "e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A=="; - }; - }; "is-accessor-descriptor-1.0.1" = { name = "is-accessor-descriptor"; packageName = "is-accessor-descriptor"; @@ -7330,15 +7384,6 @@ let sha512 = "hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw=="; }; }; - "is-data-descriptor-0.1.4" = { - name = "is-data-descriptor"; - packageName = "is-data-descriptor"; - version = "0.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz"; - sha512 = "+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg=="; - }; - }; "is-data-descriptor-1.0.1" = { name = "is-data-descriptor"; packageName = "is-data-descriptor"; @@ -7357,22 +7402,22 @@ let sha512 = "9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ=="; }; }; - "is-descriptor-0.1.6" = { + "is-descriptor-0.1.7" = { name = "is-descriptor"; packageName = "is-descriptor"; - version = "0.1.6"; + version = "0.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz"; - sha512 = "avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg=="; + url = "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz"; + sha512 = "C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg=="; }; }; - "is-descriptor-1.0.2" = { + "is-descriptor-1.0.3" = { name = "is-descriptor"; packageName = "is-descriptor"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz"; - sha512 = "2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg=="; + url = "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz"; + sha512 = "JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw=="; }; }; "is-directory-0.3.1" = { @@ -8122,15 +8167,6 @@ let sha512 = "24XsCxmEbRwEDbz/qz3stgin8TTzZ1ESR56OMCN0ujYg+vRutNSiOj9bHH9u85DKgXguraugV5sFuvbD4FW/hw=="; }; }; - "kind-of-5.1.0" = { - name = "kind-of"; - packageName = "kind-of"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz"; - sha512 = "NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw=="; - }; - }; "kind-of-6.0.3" = { name = "kind-of"; packageName = "kind-of"; @@ -10957,13 +10993,13 @@ let sha512 = "jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ=="; }; }; - "punycode-2.3.0" = { + "punycode-2.3.1" = { name = "punycode"; packageName = "punycode"; - version = "2.3.0"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz"; - sha512 = "rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA=="; + url = "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz"; + sha512 = "vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg=="; }; }; "q-1.5.1" = { @@ -12928,13 +12964,13 @@ let sha512 = "7GlLk9JwlElY4Y6a/rmbH2MhVlTyVmiJd1PfTCqFaIBEGMYNsrO/v3SeGTdhBThLg4Z+NbOk/qFMwCa+J+3p/g=="; }; }; - "stylus-0.60.0" = { + "stylus-0.61.0" = { name = "stylus"; packageName = "stylus"; - version = "0.60.0"; + version = "0.61.0"; src = fetchurl { - url = "https://registry.npmjs.org/stylus/-/stylus-0.60.0.tgz"; - sha512 = "j2pBgEwzCu05yCuY4cmyp0FtPQQFBBAGB7TY7QaNl7eztiHwkxzwvIp5vjZJND/a1JNOka+ZW9ewVPFZpI3pcA=="; + url = "https://registry.npmjs.org/stylus/-/stylus-0.61.0.tgz"; + sha512 = "oaV9T4sRBiQfChXE0av9SrLD+ovEdQiWzPJ5kwIeYvMhjUDJnZtdubAG6lSSbaR4sCnoT6sw411IOl5Akcht4Q=="; }; }; "sudo-prompt-8.2.5" = { @@ -13108,13 +13144,22 @@ let sha512 = "4GnLC0x667eJG0ewJTa6z/yXrbLGv80D9Ru6HIpCQmO+Q4PfEtBFi0ObSckqwL6VyQv/7ENJieXHo2ANmdQwgw=="; }; }; - "terser-5.22.0" = { + "terser-5.15.1" = { name = "terser"; packageName = "terser"; - version = "5.22.0"; + version = "5.15.1"; src = fetchurl { - url = "https://registry.npmjs.org/terser/-/terser-5.22.0.tgz"; - sha512 = "hHZVLgRA2z4NWcN6aS5rQDc+7Dcy58HOf2zbYwmFcQ+ua3h6eEFf5lIDKTzbWwlazPyOZsFQO8V80/IjVNExEw=="; + url = "https://registry.npmjs.org/terser/-/terser-5.15.1.tgz"; + sha512 = "K1faMUvpm/FBxjBXud0LWVAGxmvoPbZbfTCYbSgaaYQaIXI3/TdI7a7ZGA73Zrou6Q8Zmz3oeUTsp/dj+ag2Xw=="; + }; + }; + "terser-5.24.0" = { + name = "terser"; + packageName = "terser"; + version = "5.24.0"; + src = fetchurl { + url = "https://registry.npmjs.org/terser/-/terser-5.24.0.tgz"; + sha512 = "ZpGR4Hy3+wBEzVEnHvstMvqpD/nABNelQn/z2r0fjVWGQsN3bpOLzQlqDxmb4CDZnXq5lpjnQ+mHQLAOpfM5iw=="; }; }; "terser-5.3.8" = { @@ -13549,6 +13594,15 @@ let sha512 = "zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q=="; }; }; + "typescript-4.9.3" = { + name = "typescript"; + packageName = "typescript"; + version = "4.9.3"; + src = fetchurl { + url = "https://registry.npmjs.org/typescript/-/typescript-4.9.3.tgz"; + sha512 = "CIfGzTelbKNEnLpLdGFgdyKhG23CKdKgQPOBc+OUNrkJ2vr+KSzsSV5kq5iWhEQbok+quxgGzrAtGWCyU7tHnA=="; + }; + }; "typescript-4.9.5" = { name = "typescript"; packageName = "typescript"; @@ -13720,13 +13774,13 @@ let sha512 = "rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="; }; }; - "universalify-2.0.0" = { + "universalify-2.0.1" = { name = "universalify"; packageName = "universalify"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz"; - sha512 = "hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ=="; + url = "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz"; + sha512 = "gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw=="; }; }; "unpipe-1.0.0" = { @@ -13990,6 +14044,15 @@ let sha512 = "ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw=="; }; }; + "vite-4.3.9" = { + name = "vite"; + packageName = "vite"; + version = "4.3.9"; + src = fetchurl { + url = "https://registry.npmjs.org/vite/-/vite-4.3.9.tgz"; + sha512 = "qsTNZjO9NoJNW7KnOrgYwczm0WctJ8m/yqYAMAK9Lxt4SoySUfS5S8ia9K7JHpa3KEeMfyF8LoJ3c5NeBJy6pg=="; + }; + }; "vite-4.5.0" = { name = "vite"; packageName = "vite"; @@ -14880,7 +14943,7 @@ in sources."process-nextick-args-1.0.7" sources."proxy-addr-2.0.7" sources."psl-1.9.0" - sources."punycode-2.3.0" + sources."punycode-2.3.1" sources."qs-6.7.0" sources."range-parser-1.2.1" sources."raw-body-2.4.0" @@ -15118,7 +15181,7 @@ in sources."picomatch-2.3.1" sources."pseudomap-1.0.2" sources."psl-1.9.0" - sources."punycode-2.3.0" + sources."punycode-2.3.1" sources."qs-6.5.3" sources."readdirp-3.1.3" sources."request-2.88.2" @@ -15471,6 +15534,148 @@ in bypassCache = true; reconstructLock = true; }; + elm-land = nodeEnv.buildNodePackage { + name = "elm-land"; + packageName = "elm-land"; + version = "0.19.4"; + src = fetchurl { + url = "https://registry.npmjs.org/elm-land/-/elm-land-0.19.4.tgz"; + sha512 = "ruspCQ7s+ZOSILEJ8psXuQMb4ASGfgXCqmMjiLIyV7oX42nSpQGYADTXwiAwo+E7ESev1TWspn/DkAxsuDo6Qg=="; + }; + dependencies = [ + sources."@adobe/css-tools-4.3.1" + sources."@esbuild/android-arm-0.17.19" + sources."@esbuild/android-arm64-0.17.19" + sources."@esbuild/android-x64-0.17.19" + sources."@esbuild/darwin-arm64-0.17.19" + sources."@esbuild/darwin-x64-0.17.19" + sources."@esbuild/freebsd-arm64-0.17.19" + sources."@esbuild/freebsd-x64-0.17.19" + sources."@esbuild/linux-arm-0.17.19" + sources."@esbuild/linux-arm64-0.17.19" + sources."@esbuild/linux-ia32-0.17.19" + sources."@esbuild/linux-loong64-0.17.19" + sources."@esbuild/linux-mips64el-0.17.19" + sources."@esbuild/linux-ppc64-0.17.19" + sources."@esbuild/linux-riscv64-0.17.19" + sources."@esbuild/linux-s390x-0.17.19" + sources."@esbuild/linux-x64-0.17.19" + sources."@esbuild/netbsd-x64-0.17.19" + sources."@esbuild/openbsd-x64-0.17.19" + sources."@esbuild/sunos-x64-0.17.19" + sources."@esbuild/win32-arm64-0.17.19" + sources."@esbuild/win32-ia32-0.17.19" + sources."@esbuild/win32-x64-0.17.19" + sources."@jridgewell/gen-mapping-0.3.3" + sources."@jridgewell/resolve-uri-3.1.1" + sources."@jridgewell/set-array-1.1.2" + sources."@jridgewell/source-map-0.3.5" + sources."@jridgewell/sourcemap-codec-1.4.15" + sources."@jridgewell/trace-mapping-0.3.20" + sources."@lydell/elm-0.19.1-14" + sources."@lydell/elm_darwin_arm64-0.19.1-3" + sources."@lydell/elm_darwin_x64-0.19.1-2" + sources."@lydell/elm_linux_arm-0.19.1-0" + sources."@lydell/elm_linux_arm64-0.19.1-4" + sources."@lydell/elm_linux_x64-0.19.1-1" + sources."@lydell/elm_win32_x64-0.19.1-1" + sources."@types/node-20.8.10" + sources."acorn-8.11.2" + sources."anymatch-3.1.3" + sources."balanced-match-1.0.2" + sources."binary-extensions-2.2.0" + sources."brace-expansion-1.1.11" + sources."braces-3.0.2" + sources."buffer-from-1.1.2" + sources."chokidar-3.5.3" + sources."commander-2.20.3" + sources."concat-map-0.0.1" + sources."copy-anything-2.0.6" + sources."cross-spawn-6.0.5" + sources."debug-3.2.7" + sources."errno-0.1.8" + sources."esbuild-0.17.19" + sources."fill-range-7.0.1" + sources."find-elm-dependencies-2.0.4" + sources."firstline-1.3.1" + sources."fs.realpath-1.0.0" + sources."fsevents-2.3.3" + sources."glob-7.2.3" + sources."glob-parent-5.1.2" + sources."graceful-fs-4.2.11" + sources."iconv-lite-0.6.3" + sources."image-size-0.5.5" + sources."immutable-4.3.4" + sources."inflight-1.0.6" + sources."inherits-2.0.4" + sources."is-binary-path-2.1.0" + sources."is-extglob-2.1.1" + sources."is-glob-4.0.3" + sources."is-number-7.0.0" + sources."is-what-3.14.1" + sources."isexe-2.0.0" + sources."less-4.2.0" + sources."lodash-4.17.21" + sources."make-dir-2.1.0" + sources."mime-1.6.0" + sources."minimatch-3.1.2" + sources."minimist-1.2.8" + sources."mkdirp-0.5.6" + sources."ms-2.1.3" + sources."nanoid-3.3.6" + sources."needle-3.2.0" + sources."nice-try-1.0.5" + sources."node-elm-compiler-5.0.6" + sources."normalize-path-3.0.0" + sources."once-1.4.0" + sources."parse-node-version-1.0.1" + sources."path-is-absolute-1.0.1" + sources."path-key-2.0.1" + sources."picocolors-1.0.0" + sources."picomatch-2.3.1" + sources."pify-4.0.1" + sources."postcss-8.4.31" + sources."prr-1.0.1" + sources."readdirp-3.6.0" + sources."rimraf-2.6.3" + sources."rollup-3.29.4" + sources."safer-buffer-2.1.2" + sources."sass-1.69.5" + sources."sax-1.3.0" + sources."semver-5.7.2" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + sources."source-map-0.6.1" + sources."source-map-js-1.0.2" + sources."source-map-support-0.5.21" + (sources."stylus-0.61.0" // { + dependencies = [ + sources."debug-4.3.4" + sources."ms-2.1.2" + sources."source-map-0.7.4" + ]; + }) + sources."sugarss-4.0.1" + sources."temp-0.9.4" + sources."terser-5.15.1" + sources."to-regex-range-5.0.1" + sources."tslib-2.6.2" + sources."typescript-4.9.3" + sources."undici-types-5.26.5" + sources."vite-4.3.9" + sources."which-1.3.1" + sources."wrappy-1.0.2" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Reliable web apps for everyone"; + homepage = "https://elm.land"; + license = "ISC"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; elm-live = nodeEnv.buildNodePackage { name = "elm-live"; packageName = "elm-live"; @@ -15756,7 +15961,7 @@ in sources."@types/cacheable-request-6.0.3" sources."@types/http-cache-semantics-4.0.3" sources."@types/keyv-3.1.4" - sources."@types/node-20.8.9" + sources."@types/node-20.8.10" sources."@types/responselike-1.0.2" sources."cacheable-lookup-2.0.1" sources."cacheable-request-7.0.4" @@ -15920,7 +16125,7 @@ in (sources."fs-extra-11.1.1" // { dependencies = [ sources."jsonfile-6.1.0" - sources."universalify-2.0.0" + sources."universalify-2.0.1" ]; }) sources."fs-minipass-1.2.7" @@ -15984,7 +16189,7 @@ in sources."performance-now-2.1.0" sources."picomatch-2.3.1" sources."psl-1.9.0" - sources."punycode-2.3.0" + sources."punycode-2.3.1" sources."qs-6.5.3" sources."readdirp-3.1.3" sources."request-2.88.2" @@ -16264,7 +16469,7 @@ in sources."@types/http-proxy-1.17.13" sources."@types/json-schema-7.0.14" sources."@types/minimatch-5.1.2" - sources."@types/node-20.8.9" + sources."@types/node-20.8.10" sources."@types/parse-json-4.0.1" sources."@types/q-1.5.7" sources."@types/source-list-map-0.1.4" @@ -16435,7 +16640,7 @@ in sources."camel-case-4.1.2" sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001554" + sources."caniuse-lite-1.0.30001561" sources."case-sensitive-paths-webpack-plugin-2.3.0" sources."caseless-0.12.0" (sources."chalk-2.4.2" // { @@ -16455,18 +16660,7 @@ in (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."is-descriptor-0.1.7" ]; }) (sources."clean-css-4.2.4" // { @@ -16534,7 +16728,7 @@ in ]; }) sources."core-js-2.6.12" - sources."core-js-compat-3.33.1" + sources."core-js-compat-3.33.2" sources."core-util-is-1.0.3" sources."cosmiconfig-5.2.1" (sources."create-ecdh-4.0.4" // { @@ -16659,7 +16853,7 @@ in sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.567" + sources."electron-to-chromium-1.4.576" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -16732,18 +16926,7 @@ in 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."is-descriptor-0.1.7" sources."ms-2.0.0" ]; }) @@ -16987,7 +17170,7 @@ in sources."is-core-module-2.13.1" sources."is-data-descriptor-1.0.1" sources."is-date-object-1.0.5" - sources."is-descriptor-1.0.2" + sources."is-descriptor-1.0.3" sources."is-directory-0.3.1" sources."is-extendable-0.1.1" sources."is-extglob-2.1.1" @@ -17144,13 +17327,7 @@ in (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."is-descriptor-0.1.7" sources."kind-of-3.2.2" ]; }) @@ -17520,7 +17697,7 @@ in sources."pump-2.0.1" ]; }) - sources."punycode-2.3.0" + sources."punycode-2.3.1" sources."q-1.5.1" sources."qs-6.5.3" sources."query-string-4.3.4" @@ -17696,18 +17873,7 @@ in 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."is-descriptor-0.1.7" sources."ms-2.0.0" ]; }) @@ -17764,18 +17930,7 @@ in (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."is-descriptor-0.1.7" ]; }) sources."statuses-2.0.1" @@ -18231,7 +18386,7 @@ in sha512 = "EFwDCYHm3rwCiwXwfSUKeDDcIYrQ61deChDk7ruXPN4y0PkIINIKbljLu3uOnKSYhzc5CGSc7avwiAlkxXnJsA=="; }; dependencies = [ - sources."@adobe/css-tools-4.2.0" + sources."@adobe/css-tools-4.3.1" sources."@esbuild/android-arm-0.17.19" sources."@esbuild/android-arm64-0.17.19" sources."@esbuild/android-x64-0.17.19" @@ -18284,7 +18439,7 @@ in sources."@types/rimraf-2.0.5" sources."@types/tmp-0.0.33" sources."accepts-1.3.8" - sources."acorn-8.11.0" + sources."acorn-8.11.2" (sources."agent-base-6.0.2" // { dependencies = [ sources."debug-4.3.4" @@ -18593,7 +18748,7 @@ in sources."proxy-addr-2.0.7" sources."prr-1.0.1" sources."pump-3.0.0" - sources."punycode-2.3.0" + sources."punycode-2.3.1" sources."qs-6.11.0" sources."queue-microtask-1.2.3" sources."range-parser-1.2.1" @@ -18671,11 +18826,10 @@ in sources."strip-ansi-cjs-6.0.1" sources."strip-bom-string-1.0.0" sources."strip-json-comments-2.0.1" - (sources."stylus-0.60.0" // { + (sources."stylus-0.61.0" // { dependencies = [ sources."debug-4.3.4" sources."ms-2.1.2" - sources."sax-1.2.4" sources."source-map-0.7.4" ]; }) @@ -18692,7 +18846,7 @@ in sources."mkdirp-1.0.4" ]; }) - (sources."terser-5.22.0" // { + (sources."terser-5.24.0" // { dependencies = [ sources."commander-2.20.3" ]; @@ -18707,7 +18861,7 @@ in sources."undici-types-5.26.5" sources."unique-filename-3.0.0" sources."unique-slug-4.0.0" - sources."universalify-2.0.0" + sources."universalify-2.0.1" sources."unpipe-1.0.0" sources."url-parse-lax-3.0.0" sources."utf-8-validate-5.0.10" @@ -18737,7 +18891,7 @@ in sources."@esbuild/win32-arm64-0.18.20" sources."@esbuild/win32-ia32-0.18.20" sources."@esbuild/win32-x64-0.18.20" - sources."@types/node-20.8.9" + sources."@types/node-20.8.10" sources."esbuild-0.18.20" ]; }) @@ -18789,7 +18943,7 @@ in sources."@types/cacheable-request-6.0.3" sources."@types/http-cache-semantics-4.0.3" sources."@types/keyv-3.1.4" - sources."@types/node-20.8.9" + sources."@types/node-20.8.10" sources."@types/responselike-1.0.2" sources."ansi-escapes-4.3.2" sources."ansi-regex-6.0.1" @@ -18938,7 +19092,7 @@ in sources."to-regex-range-5.0.1" sources."type-fest-0.21.3" sources."undici-types-5.26.5" - sources."universalify-2.0.0" + sources."universalify-2.0.1" sources."util-deprecate-1.0.2" sources."wcwidth-1.0.1" sources."which-2.0.2" diff --git a/pkgs/development/compilers/emscripten/default.nix b/pkgs/development/compilers/emscripten/default.nix index 37ccb5f1a02..436fda2a052 100644 --- a/pkgs/development/compilers/emscripten/default.nix +++ b/pkgs/development/compilers/emscripten/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { pname = "emscripten"; - version = "3.1.45"; + version = "3.1.47"; llvmEnv = symlinkJoin { name = "emscripten-llvm-${version}"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { name = "emscripten-node-modules-${version}"; inherit pname version src; - npmDepsHash = "sha256-kcWAio1fKuwqFCFlupX9KevjWPbv9W/Z/5EPrihQ6ms="; + npmDepsHash = "sha256-Qft+//za5ed6Oquxtcdpv7g5oOc2WmWuRJ/CDe+FEiI="; dontBuild = true; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "emscripten-core"; repo = "emscripten"; - hash = "sha256-yf0Yb/UjaBQpIEPZzzjaUmR+JzKPSJHMkrYLHxDXwOg="; + hash = "sha256-cRNkQ+7vUqJLNlf5dieeDcyT1jlBUeVxO8avoUvOPHI="; rev = version; }; @@ -85,6 +85,9 @@ stdenv.mkDerivation rec { cp -r . $appdir chmod -R +w $appdir + mkdir -p $appdir/node_modules + cp -r ${nodeModules}/* $appdir/node_modules + mkdir -p $out/bin for b in em++ em-config emar embuilder.py emcc emcmake emconfigure emmake emranlib emrun emscons emsize; do makeWrapper $appdir/$b $out/bin/$b \ diff --git a/pkgs/development/compilers/erg/default.nix b/pkgs/development/compilers/erg/default.nix index 27e32df0631..6d052179ebd 100644 --- a/pkgs/development/compilers/erg/default.nix +++ b/pkgs/development/compilers/erg/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "erg"; - version = "0.6.24"; + version = "0.6.25"; src = fetchFromGitHub { owner = "erg-lang"; repo = "erg"; rev = "v${version}"; - hash = "sha256-J8Zw79TXYpDfnsx6UgB4sqY1vdwVHildqtCcXlBvUxQ="; + hash = "sha256-z3481/vWmR5QlULfJZtLdGhwsJKBbLcvyC87SCngMVg="; }; - cargoHash = "sha256-4FhD9MvAhP88WGqVIUG2JHxd/gbDYf++bdlS6lVW0xs="; + cargoHash = "sha256-+jN+6At8tLHA/ilSBxugHIS79Cw8bGhE0RUNU4sSGeM="; nativeBuildInputs = [ makeWrapper diff --git a/pkgs/development/compilers/fpc/binary-builder-darwin.sh b/pkgs/development/compilers/fpc/binary-builder-darwin.sh index 39db0518281..8a8600f1f63 100755 --- a/pkgs/development/compilers/fpc/binary-builder-darwin.sh +++ b/pkgs/development/compilers/fpc/binary-builder-darwin.sh @@ -1,4 +1,4 @@ -if [ -e .attrs.sh ]; then source .attrs.sh; fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi source $stdenv/setup pkgdir=$(pwd)/pkg diff --git a/pkgs/development/compilers/fpc/binary-builder.sh b/pkgs/development/compilers/fpc/binary-builder.sh index c471378c275..568c3094107 100755 --- a/pkgs/development/compilers/fpc/binary-builder.sh +++ b/pkgs/development/compilers/fpc/binary-builder.sh @@ -1,4 +1,4 @@ -if [ -e .attrs.sh ]; then source .attrs.sh; fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi source $stdenv/setup tar xf $src diff --git a/pkgs/development/compilers/gcc/default.nix b/pkgs/development/compilers/gcc/default.nix index 0fe23000cc9..01f17251308 100644 --- a/pkgs/development/compilers/gcc/default.nix +++ b/pkgs/development/compilers/gcc/default.nix @@ -108,8 +108,8 @@ let inherit version; /* Cross-gcc settings (build == host != target) */ crossMingw = targetPlatform != hostPlatform && targetPlatform.isMinGW; - stageNameAddon = if withoutTargetLibc then "stage-static" else "stage-final"; - crossNameAddon = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-${stageNameAddon}-"; + stageNameAddon = optionalString withoutTargetLibc "-nolibc"; + crossNameAddon = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}${stageNameAddon}-"; javaAwtGtk = langJava && x11Support; xlibs = [ diff --git a/pkgs/development/compilers/gcc/patches/12/mangle-NIX_STORE-in-__FILE__.patch b/pkgs/development/compilers/gcc/patches/12/mangle-NIX_STORE-in-__FILE__.patch new file mode 100644 index 00000000000..d938d67a2d0 --- /dev/null +++ b/pkgs/development/compilers/gcc/patches/12/mangle-NIX_STORE-in-__FILE__.patch @@ -0,0 +1,85 @@ +From b10785c1be469319a09b10bc69db21159b0599ee Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich <siarheit@google.com> +Date: Fri, 22 Sep 2023 22:41:49 +0100 +Subject: [PATCH] gcc/file-prefix-map.cc: always mangle __FILE__ into invalid + store path + +Without the change `__FILE__` used in static inline functions in headers +embed paths to header files into executable images. For local headers +it's not a problem, but for headers in `/nix/store` this causes `-dev` +inputs to be retained in runtime closure. + +Typical examples are `nix` -> `nlohmann_json` and `pipewire` -> +`lttng-ust.dev`. + +Ideally we would like to use `-fmacro-prefix-map=` feature of `gcc` as: + + -fmacro-prefix-map=/nix/store/$hash1-nlohmann-json-ver=/nix/store/eeee.eee-nlohmann-json-ver + -fmacro-prefix-map=/nix/... + +In practice it quickly exhausts argument lengtth limit due to `gcc` +deficiency: https://gcc.gnu.org/PR111527 + +Until it;s fixed let's hardcode header mangling if $NIX_STORE variable +is present in the environment. + +Tested as: + + $ printf "# 0 \"/nix/store/01234567890123456789012345678901-pppppp-vvvvvvv\" \nconst char * f(void) { return __FILE__; }" | NIX_STORE=/nix/store ./gcc/xgcc -Bgcc -x c - -S -o - + ... + .string "/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-pppppp-vvvvvvv" + ... + +Mangled successfully. +--- a/gcc/file-prefix-map.cc ++++ b/gcc/file-prefix-map.cc +@@ -60,6 +60,9 @@ add_prefix_map (file_prefix_map *&maps, const char *arg, const char *opt) + maps = map; + } + ++/* Forward declaration for a $NIX_STORE remap hack below. */ ++static file_prefix_map *macro_prefix_maps; /* -fmacro-prefix-map */ ++ + /* Perform user-specified mapping of filename prefixes. Return the + GC-allocated new name corresponding to FILENAME or FILENAME if no + remapping was performed. */ +@@ -76,7 +79,30 @@ remap_filename (file_prefix_map *maps, const char *filename) + if (filename_ncmp (filename, map->old_prefix, map->old_len) == 0) + break; + if (!map) +- return filename; ++ { ++ if (maps == macro_prefix_maps) ++ { ++ /* Remap all fo $NIX_STORE/.{32} paths to ++ * equivalent $NIX_STORE/e{32}. ++ * ++ * That way we avoid argument parameters explosion ++ * and still avoid embedding headers into runtime closure: ++ * https://gcc.gnu.org/PR111527 ++ */ ++ char * nix_store = getenv("NIX_STORE"); ++ size_t nix_store_len = nix_store ? strlen(nix_store) : 0; ++ const char * name = filename; ++ size_t name_len = strlen(name); ++ if (nix_store && name_len >= nix_store_len + 1 + 32 && memcmp(name, nix_store, nix_store_len) == 0) ++ { ++ s = (char *) ggc_alloc_atomic (name_len + 1); ++ memcpy(s, name, name_len + 1); ++ memset(s + nix_store_len + 1, 'e', 32); ++ return s; ++ } ++ } ++ return filename; ++ } + name = filename + map->old_len; + name_len = strlen (name) + 1; + +@@ -90,7 +116,6 @@ remap_filename (file_prefix_map *maps, const char *filename) + ignore it in DW_AT_producer (dwarf2out.cc). */ + + /* Linked lists of file_prefix_map structures. */ +-static file_prefix_map *macro_prefix_maps; /* -fmacro-prefix-map */ + static file_prefix_map *debug_prefix_maps; /* -fdebug-prefix-map */ + static file_prefix_map *profile_prefix_maps; /* -fprofile-prefix-map */ + diff --git a/pkgs/development/compilers/gcc/patches/13/mangle-NIX_STORE-in-__FILE__.patch b/pkgs/development/compilers/gcc/patches/13/mangle-NIX_STORE-in-__FILE__.patch new file mode 100644 index 00000000000..57ae2111f02 --- /dev/null +++ b/pkgs/development/compilers/gcc/patches/13/mangle-NIX_STORE-in-__FILE__.patch @@ -0,0 +1,84 @@ +From b10785c1be469319a09b10bc69db21159b0599ee Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich <siarheit@google.com> +Date: Fri, 22 Sep 2023 22:41:49 +0100 +Subject: [PATCH] gcc/file-prefix-map.cc: always mangle __FILE__ into invalid + store path + +Without the change `__FILE__` used in static inline functions in headers +embed paths to header files into executable images. For local headers +it's not a problem, but for headers in `/nix/store` this causes `-dev` +inputs to be retained in runtime closure. + +Typical examples are `nix` -> `nlohmann_json` and `pipewire` -> +`lttng-ust.dev`. + +Ideally we would like to use `-fmacro-prefix-map=` feature of `gcc` as: + + -fmacro-prefix-map=/nix/store/$hash1-nlohmann-json-ver=/nix/store/eeee.eee-nlohmann-json-ver + -fmacro-prefix-map=/nix/... + +In practice it quickly exhausts argument lengtth limit due to `gcc` +deficiency: https://gcc.gnu.org/PR111527 + +Until it;s fixed let's hardcode header mangling if $NIX_STORE variable +is present in the environment. + +Tested as: + + $ printf "# 0 \"/nix/store/01234567890123456789012345678901-pppppp-vvvvvvv\" \nconst char * f(void) { return __FILE__; }" | NIX_STORE=/nix/store ./gcc/xgcc -Bgcc -x c - -S -o - + ... + .string "/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-pppppp-vvvvvvv" + ... + +Mangled successfully. +--- a/gcc/file-prefix-map.cc ++++ b/gcc/file-prefix-map.cc +@@ -69,6 +69,9 @@ add_prefix_map (file_prefix_map *&maps, const char *arg, const char *opt) + maps = map; + } + ++/* Forward declaration for a $NIX_STORE remap hack below. */ ++static file_prefix_map *macro_prefix_maps; /* -fmacro-prefix-map */ ++ + /* Perform user-specified mapping of filename prefixes. Return the + GC-allocated new name corresponding to FILENAME or FILENAME if no + remapping was performed. */ +@@ -102,6 +105,29 @@ remap_filename (file_prefix_map *maps, const char *filename) + break; + if (!map) + { ++ if (maps == macro_prefix_maps) ++ { ++ /* Remap all fo $NIX_STORE/.{32} paths to ++ * equivalent $NIX_STORE/e{32}. ++ * ++ * That way we avoid argument parameters explosion ++ * and still avoid embedding headers into runtime closure: ++ * https://gcc.gnu.org/PR111527 ++ */ ++ char * nix_store = getenv("NIX_STORE"); ++ size_t nix_store_len = nix_store ? strlen(nix_store) : 0; ++ const char * name = realname ? realname : filename; ++ size_t name_len = strlen(name); ++ if (nix_store && name_len >= nix_store_len + 1 + 32 && memcmp(name, nix_store, nix_store_len) == 0) ++ { ++ s = (char *) ggc_alloc_atomic (name_len + 1); ++ memcpy(s, name, name_len + 1); ++ memset(s + nix_store_len + 1, 'e', 32); ++ if (realname != filename) ++ free (const_cast <char *> (realname)); ++ return s; ++ } ++ } + if (realname != filename) + free (const_cast <char *> (realname)); + return filename; +@@ -124,7 +150,6 @@ remap_filename (file_prefix_map *maps, const char *filename) + ignore it in DW_AT_producer (gen_command_line_string in opts.cc). */ + + /* Linked lists of file_prefix_map structures. */ +-static file_prefix_map *macro_prefix_maps; /* -fmacro-prefix-map */ + static file_prefix_map *debug_prefix_maps; /* -fdebug-prefix-map */ + static file_prefix_map *profile_prefix_maps; /* -fprofile-prefix-map */ + + diff --git a/pkgs/development/compilers/gcc/patches/default.nix b/pkgs/development/compilers/gcc/patches/default.nix index 15880913bde..c4b0dbf91b6 100644 --- a/pkgs/development/compilers/gcc/patches/default.nix +++ b/pkgs/development/compilers/gcc/patches/default.nix @@ -63,8 +63,8 @@ in ++ optionals (noSysDirs) ( [(if atLeast12 then ./gcc-12-no-sys-dirs.patch else ./no-sys-dirs.patch)] ++ ({ - "13" = [ ./13/no-sys-dirs-riscv.patch ]; - "12" = [ ./no-sys-dirs-riscv.patch ]; + "13" = [ ./13/no-sys-dirs-riscv.patch ./13/mangle-NIX_STORE-in-__FILE__.patch ]; + "12" = [ ./no-sys-dirs-riscv.patch ./12/mangle-NIX_STORE-in-__FILE__.patch ]; "11" = [ ./no-sys-dirs-riscv.patch ]; "10" = [ ./no-sys-dirs-riscv.patch ]; "9" = [ ./no-sys-dirs-riscv-gcc9.patch ]; diff --git a/pkgs/development/compilers/ghc/9.0.2.nix b/pkgs/development/compilers/ghc/9.0.2.nix index f5f0c931714..6be098972ee 100644 --- a/pkgs/development/compilers/ghc/9.0.2.nix +++ b/pkgs/development/compilers/ghc/9.0.2.nix @@ -194,6 +194,7 @@ stdenv.mkDerivation (rec { url = "https://gitlab.haskell.org/ghc/ghc/-/commit/10e94a556b4f90769b7fd718b9790d58ae566600.patch"; sha256 = "0kmhfamr16w8gch0lgln2912r8aryjky1hfcda3jkcwa5cdzgjdv"; }) + ./docs-sphinx-7.patch # fix hyperlinked haddock sources: https://github.com/haskell/haddock/pull/1482 (fetchpatch { url = "https://patch-diff.githubusercontent.com/raw/haskell/haddock/pull/1482.patch"; diff --git a/pkgs/development/compilers/ghc/9.2.4.nix b/pkgs/development/compilers/ghc/9.2.4.nix index 6aa87a15201..3ed263a4332 100644 --- a/pkgs/development/compilers/ghc/9.2.4.nix +++ b/pkgs/development/compilers/ghc/9.2.4.nix @@ -194,6 +194,7 @@ stdenv.mkDerivation (rec { url = "https://gitlab.haskell.org/ghc/ghc/-/commit/10e94a556b4f90769b7fd718b9790d58ae566600.patch"; sha256 = "0kmhfamr16w8gch0lgln2912r8aryjky1hfcda3jkcwa5cdzgjdv"; }) + ./docs-sphinx-7.patch # fix hyperlinked haddock sources: https://github.com/haskell/haddock/pull/1482 (fetchpatch { url = "https://patch-diff.githubusercontent.com/raw/haskell/haddock/pull/1482.patch"; diff --git a/pkgs/development/compilers/ghc/9.2.5.nix b/pkgs/development/compilers/ghc/9.2.5.nix index c5aa5897761..6246630f549 100644 --- a/pkgs/development/compilers/ghc/9.2.5.nix +++ b/pkgs/development/compilers/ghc/9.2.5.nix @@ -194,6 +194,7 @@ stdenv.mkDerivation (rec { url = "https://gitlab.haskell.org/ghc/ghc/-/commit/10e94a556b4f90769b7fd718b9790d58ae566600.patch"; sha256 = "0kmhfamr16w8gch0lgln2912r8aryjky1hfcda3jkcwa5cdzgjdv"; }) + ./docs-sphinx-7.patch # fix hyperlinked haddock sources: https://github.com/haskell/haddock/pull/1482 (fetchpatch { url = "https://patch-diff.githubusercontent.com/raw/haskell/haddock/pull/1482.patch"; diff --git a/pkgs/development/compilers/ghc/9.2.6.nix b/pkgs/development/compilers/ghc/9.2.6.nix index 651ff1e7d44..124303c0c81 100644 --- a/pkgs/development/compilers/ghc/9.2.6.nix +++ b/pkgs/development/compilers/ghc/9.2.6.nix @@ -194,6 +194,7 @@ stdenv.mkDerivation (rec { url = "https://gitlab.haskell.org/ghc/ghc/-/commit/10e94a556b4f90769b7fd718b9790d58ae566600.patch"; sha256 = "0kmhfamr16w8gch0lgln2912r8aryjky1hfcda3jkcwa5cdzgjdv"; }) + ./docs-sphinx-7.patch # fix hyperlinked haddock sources: https://github.com/haskell/haddock/pull/1482 (fetchpatch { url = "https://patch-diff.githubusercontent.com/raw/haskell/haddock/pull/1482.patch"; diff --git a/pkgs/development/compilers/ghc/9.2.7.nix b/pkgs/development/compilers/ghc/9.2.7.nix index 74c0088473b..a627f74179b 100644 --- a/pkgs/development/compilers/ghc/9.2.7.nix +++ b/pkgs/development/compilers/ghc/9.2.7.nix @@ -194,6 +194,7 @@ stdenv.mkDerivation (rec { url = "https://gitlab.haskell.org/ghc/ghc/-/commit/10e94a556b4f90769b7fd718b9790d58ae566600.patch"; sha256 = "0kmhfamr16w8gch0lgln2912r8aryjky1hfcda3jkcwa5cdzgjdv"; }) + ./docs-sphinx-7.patch # fix hyperlinked haddock sources: https://github.com/haskell/haddock/pull/1482 (fetchpatch { url = "https://patch-diff.githubusercontent.com/raw/haskell/haddock/pull/1482.patch"; diff --git a/pkgs/development/compilers/ghc/9.2.8.nix b/pkgs/development/compilers/ghc/9.2.8.nix index 973e62f9553..a0451f57c6e 100644 --- a/pkgs/development/compilers/ghc/9.2.8.nix +++ b/pkgs/development/compilers/ghc/9.2.8.nix @@ -194,6 +194,7 @@ stdenv.mkDerivation (rec { url = "https://gitlab.haskell.org/ghc/ghc/-/commit/10e94a556b4f90769b7fd718b9790d58ae566600.patch"; sha256 = "0kmhfamr16w8gch0lgln2912r8aryjky1hfcda3jkcwa5cdzgjdv"; }) + ./docs-sphinx-7.patch # fix hyperlinked haddock sources: https://github.com/haskell/haddock/pull/1482 (fetchpatch { url = "https://patch-diff.githubusercontent.com/raw/haskell/haddock/pull/1482.patch"; diff --git a/pkgs/development/compilers/ghc/9.4.2.nix b/pkgs/development/compilers/ghc/9.4.2.nix index 3c51fb981af..7b921ecc441 100644 --- a/pkgs/development/compilers/ghc/9.4.2.nix +++ b/pkgs/development/compilers/ghc/9.4.2.nix @@ -205,6 +205,7 @@ stdenv.mkDerivation (rec { url = "https://gitlab.haskell.org/ghc/ghc/-/commit/10e94a556b4f90769b7fd718b9790d58ae566600.patch"; sha256 = "0kmhfamr16w8gch0lgln2912r8aryjky1hfcda3jkcwa5cdzgjdv"; }) + ./docs-sphinx-7.patch ] ++ lib.optionals (stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64) [ # Prevent the paths module from emitting symbols that we don't use # when building with separate outputs. diff --git a/pkgs/development/compilers/ghc/9.4.3.nix b/pkgs/development/compilers/ghc/9.4.3.nix index 87ce19f6605..2bddbea7bc7 100644 --- a/pkgs/development/compilers/ghc/9.4.3.nix +++ b/pkgs/development/compilers/ghc/9.4.3.nix @@ -205,6 +205,7 @@ stdenv.mkDerivation (rec { url = "https://gitlab.haskell.org/ghc/ghc/-/commit/10e94a556b4f90769b7fd718b9790d58ae566600.patch"; sha256 = "0kmhfamr16w8gch0lgln2912r8aryjky1hfcda3jkcwa5cdzgjdv"; }) + ./docs-sphinx-7.patch ] ++ lib.optionals (stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64) [ # Prevent the paths module from emitting symbols that we don't use # when building with separate outputs. diff --git a/pkgs/development/compilers/ghc/9.4.4.nix b/pkgs/development/compilers/ghc/9.4.4.nix index fa184a6fe17..e7465a95004 100644 --- a/pkgs/development/compilers/ghc/9.4.4.nix +++ b/pkgs/development/compilers/ghc/9.4.4.nix @@ -205,6 +205,7 @@ stdenv.mkDerivation (rec { url = "https://gitlab.haskell.org/ghc/ghc/-/commit/10e94a556b4f90769b7fd718b9790d58ae566600.patch"; sha256 = "0kmhfamr16w8gch0lgln2912r8aryjky1hfcda3jkcwa5cdzgjdv"; }) + ./docs-sphinx-7.patch ] ++ lib.optionals (stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64) [ # Prevent the paths module from emitting symbols that we don't use # when building with separate outputs. diff --git a/pkgs/development/compilers/ghc/9.4.5.nix b/pkgs/development/compilers/ghc/9.4.5.nix index 91032cb03d6..9442f2bf19b 100644 --- a/pkgs/development/compilers/ghc/9.4.5.nix +++ b/pkgs/development/compilers/ghc/9.4.5.nix @@ -205,6 +205,7 @@ stdenv.mkDerivation (rec { url = "https://gitlab.haskell.org/ghc/ghc/-/commit/10e94a556b4f90769b7fd718b9790d58ae566600.patch"; sha256 = "0kmhfamr16w8gch0lgln2912r8aryjky1hfcda3jkcwa5cdzgjdv"; }) + ./docs-sphinx-7.patch ] ++ lib.optionals (stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64) [ # Prevent the paths module from emitting symbols that we don't use # when building with separate outputs. diff --git a/pkgs/development/compilers/ghc/9.4.6.nix b/pkgs/development/compilers/ghc/9.4.6.nix index 3b0bef212a0..b64b3ba5ec6 100644 --- a/pkgs/development/compilers/ghc/9.4.6.nix +++ b/pkgs/development/compilers/ghc/9.4.6.nix @@ -197,6 +197,7 @@ stdenv.mkDerivation (rec { extraPrefix = "libraries/Cabal/"; sha256 = "sha256-yRQ6YmMiwBwiYseC5BsrEtDgFbWvst+maGgDtdD0vAY="; }) + ./docs-sphinx-7.patch # Work around a type not being defined when including Rts.h in bytestring's cbits # due to missing feature macros. See https://gitlab.haskell.org/ghc/ghc/-/issues/23810. diff --git a/pkgs/development/compilers/ghc/9.4.7.nix b/pkgs/development/compilers/ghc/9.4.7.nix index 48cec53e3b1..7ee135a13b4 100644 --- a/pkgs/development/compilers/ghc/9.4.7.nix +++ b/pkgs/development/compilers/ghc/9.4.7.nix @@ -197,6 +197,7 @@ stdenv.mkDerivation (rec { extraPrefix = "libraries/Cabal/"; sha256 = "sha256-yRQ6YmMiwBwiYseC5BsrEtDgFbWvst+maGgDtdD0vAY="; }) + ./docs-sphinx-7.patch ] ++ lib.optionals (stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64) [ # Prevent the paths module from emitting symbols that we don't use # when building with separate outputs. diff --git a/pkgs/development/compilers/ghc/common-hadrian.nix b/pkgs/development/compilers/ghc/common-hadrian.nix index d2d6dade497..5687555d5d9 100644 --- a/pkgs/development/compilers/ghc/common-hadrian.nix +++ b/pkgs/development/compilers/ghc/common-hadrian.nix @@ -266,6 +266,11 @@ stdenv.mkDerivation ({ enableParallelBuilding = true; + patches = [ + (if lib.versionAtLeast version "9.8" + then ./docs-sphinx-7-ghc98.patch + else ./docs-sphinx-7.patch ) + ]; postPatch = '' patchShebangs --build . ''; diff --git a/pkgs/development/compilers/ghc/docs-sphinx-7-ghc98.patch b/pkgs/development/compilers/ghc/docs-sphinx-7-ghc98.patch new file mode 100644 index 00000000000..3fc1a0f2156 --- /dev/null +++ b/pkgs/development/compilers/ghc/docs-sphinx-7-ghc98.patch @@ -0,0 +1,8 @@ +Fix build of docs after sphinx update. +https://github.com/sphinx-doc/sphinx/pull/11381 +https://gitlab.haskell.org/ghc/ghc/-/issues/24129 +--- a/docs/users_guide/rtd-theme/layout.html ++++ b/docs/users_guide/rtd-theme/layout.html +@@ -28 +28 @@ +- <link rel="stylesheet" href="{{ pathto('_static/' + style, 1) }}" type="text/css" /> ++ <link rel="stylesheet" href="{{ pathto('_static/' + styles[-1], 1) }}" type="text/css" /> diff --git a/pkgs/development/compilers/ghc/docs-sphinx-7.patch b/pkgs/development/compilers/ghc/docs-sphinx-7.patch new file mode 100644 index 00000000000..49fa45d1b9a --- /dev/null +++ b/pkgs/development/compilers/ghc/docs-sphinx-7.patch @@ -0,0 +1,8 @@ +Fix build of docs after sphinx update. +https://github.com/sphinx-doc/sphinx/pull/11381 +https://gitlab.haskell.org/ghc/ghc/-/issues/24129 +--- a/docs/users_guide/rtd-theme/layout.html ++++ b/docs/users_guide/rtd-theme/layout.html +@@ -67 +67 @@ +- <link rel="stylesheet" href="{{ pathto('_static/' + style, 1) }}" type="text/css" /> ++ <link rel="stylesheet" href="{{ pathto('_static/' + styles[-1], 1) }}" type="text/css" /> diff --git a/pkgs/development/compilers/glslang/default.nix b/pkgs/development/compilers/glslang/default.nix index 9753a1077a6..ff55201ebd0 100644 --- a/pkgs/development/compilers/glslang/default.nix +++ b/pkgs/development/compilers/glslang/default.nix @@ -9,13 +9,13 @@ }: stdenv.mkDerivation rec { pname = "glslang"; - version = "12.3.1"; + version = "13.1.1"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "glslang"; rev = version; - hash = "sha256-NP5ph598YSPbpzJJUR2r+EkqFmuItxgvOSDgDaN+Swg="; + hash = "sha256-fuzNsVYdnThMzd4tLN/sTbCBXg6qXKLDJRziOKyOBGg="; }; # These get set at all-packages, keep onto them for child drvs diff --git a/pkgs/development/compilers/go/1.21.nix b/pkgs/development/compilers/go/1.21.nix index 7806cf07443..c12af4db34c 100644 --- a/pkgs/development/compilers/go/1.21.nix +++ b/pkgs/development/compilers/go/1.21.nix @@ -46,11 +46,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "go"; - version = "1.21.3"; + version = "1.21.4"; src = fetchurl { url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz"; - hash = "sha256-GG8rb4yLcE5paCGwmrIEGlwe4T3LwxVqE63PdZMe5Ig="; + hash = "sha256-R7Jqg9K2WjwcG8rOJztpvuSaentRaKdgTe09JqN714c="; }; strictDeps = true; diff --git a/pkgs/development/compilers/ios-cross-compile/9.2_builder.sh b/pkgs/development/compilers/ios-cross-compile/9.2_builder.sh index 47459664af0..4eef8acb069 100644 --- a/pkgs/development/compilers/ios-cross-compile/9.2_builder.sh +++ b/pkgs/development/compilers/ios-cross-compile/9.2_builder.sh @@ -1,5 +1,5 @@ # -*- shell-script -*- -if [ -e .attrs.sh ]; then source .attrs.sh; fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi source $stdenv/setup function extract diff --git a/pkgs/development/compilers/julia/1.9-bin.nix b/pkgs/development/compilers/julia/1.9-bin.nix index 85c0d7043ef..04e768d0bff 100644 --- a/pkgs/development/compilers/julia/1.9-bin.nix +++ b/pkgs/development/compilers/julia/1.9-bin.nix @@ -24,24 +24,24 @@ let in stdenv.mkDerivation rec { pname = "julia-bin"; - version = "1.9.3"; + version = "1.9.4"; src = { x86_64-linux = fetchurl { url = "https://julialang-s3.julialang.org/bin/linux/x64/${lib.versions.majorMinor version}/julia-${version}-linux-x86_64.tar.gz"; - sha256 = "d76670cc9ba3e0fd4c1545dd3d00269c0694976a1176312795ebce1692d323d1"; + sha256 = "07d20c4c2518833e2265ca0acee15b355463361aa4efdab858dad826cf94325c"; }; aarch64-linux = fetchurl { url = "https://julialang-s3.julialang.org/bin/linux/aarch64/${lib.versions.majorMinor version}/julia-${version}-linux-aarch64.tar.gz"; - sha256 = "55437879f6b98470d96c4048b922501b643dfffb8865abeb90c7333a83df7524"; + sha256 = "541d0c5a9378f8d2fc384bb8595fc6ffe20d61054629a6e314fb2f8dfe2f2ade"; }; x86_64-darwin = fetchurl { url = "https://julialang-s3.julialang.org/bin/mac/x64/${lib.versions.majorMinor version}/julia-${version}-mac64.tar.gz"; - sha256 = "6eea87748424488226090d1e7d553e72ab106a873d63c732fc710a3d080abb97"; + sha256 = "67eec264f6afc9e9bf72c0f62c84d91c2ebdfaed6a0aa11606e3c983d278b441"; }; aarch64-darwin = fetchurl { url = "https://julialang-s3.julialang.org/bin/mac/aarch64/${lib.versions.majorMinor version}/julia-${version}-macaarch64.tar.gz"; - sha256 = "f518e38d7bd5b37766fb051916bd295993aa4b52a47018f4c98b5fde721ced87"; + sha256 = "67542975e86102eec95bc4bb7c30c5d8c7ea9f9a0b388f0e10f546945363b01a"; }; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); diff --git a/pkgs/development/compilers/julia/1.9.nix b/pkgs/development/compilers/julia/1.9.nix index 002cca08aac..715414e7dab 100644 --- a/pkgs/development/compilers/julia/1.9.nix +++ b/pkgs/development/compilers/julia/1.9.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "julia"; - version = "1.9.3"; + version = "1.9.4"; src = fetchurl { url = "https://github.com/JuliaLang/julia/releases/download/v${version}/julia-${version}-full.tar.gz"; - hash = "sha256-j8DJ3FRDoo01m9ed2jlA+pS6K3lmuJhlvrINqBEjwxY="; + hash = "sha256-YYQ7lkf9BtOymU8yd6ZN4ctaWlKX2TC4yOO8DpN0ACQ="; }; patches = [ diff --git a/pkgs/development/compilers/llvm/10/llvm/default.nix b/pkgs/development/compilers/llvm/10/llvm/default.nix index c4e6f2827e8..c09ec676e9e 100644 --- a/pkgs/development/compilers/llvm/10/llvm/default.nix +++ b/pkgs/development/compilers/llvm/10/llvm/default.nix @@ -133,7 +133,17 @@ in stdenv.mkDerivation (rec { hash = "sha256-CXwYxQezTq5vdmc8Yn88BUAEly6YZ5VEIA6X3y5NNOs="; stripLen = 1; }) - ] ++ lib.optional enablePolly ./gnu-install-dirs-polly.patch; + ] ++ lib.optionals enablePolly [ + ./gnu-install-dirs-polly.patch + # Add missing isl header includess required to build LLVM 10 + Polly with clang 16. + (fetchpatch { + name = "polly-ppcg-isl-headers.patch"; + url = "https://repo.or.cz/ppcg.git/patch/098ba285306114dc71497f7b51c357f69c9b4472"; + hash = "sha256-c9L30rDROYAMbUSuaK9U/ixyFMlH/Sa1n+VgLODzSCQ="; + extraPrefix = "tools/polly/lib/External/ppcg/"; + stripLen = 1; + }) + ]; postPatch = optionalString stdenv.isDarwin '' substituteInPlace cmake/modules/AddLLVM.cmake \ diff --git a/pkgs/development/compilers/llvm/15/default.nix b/pkgs/development/compilers/llvm/15/default.nix index 863d31874ec..6a3b8cbabab 100644 --- a/pkgs/development/compilers/llvm/15/default.nix +++ b/pkgs/development/compilers/llvm/15/default.nix @@ -266,11 +266,13 @@ in let targetLlvmLibraries.compiler-rt ]; extraBuildCommands = mkExtraBuildCommands cc; - nixSupport.cc-cflags = [ - "-rtlib=compiler-rt" - "-B${targetLlvmLibraries.compiler-rt}/lib" - "-nostdlib++" - ]; + nixSupport.cc-cflags = + [ + "-rtlib=compiler-rt" + "-B${targetLlvmLibraries.compiler-rt}/lib" + "-nostdlib++" + ] + ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions"; }; clangNoLibc = wrapCCWith rec { @@ -281,10 +283,12 @@ in let targetLlvmLibraries.compiler-rt ]; extraBuildCommands = mkExtraBuildCommands cc; - nixSupport.cc-cflags = [ - "-rtlib=compiler-rt" - "-B${targetLlvmLibraries.compiler-rt}/lib" - ]; + nixSupport.cc-cflags = + [ + "-rtlib=compiler-rt" + "-B${targetLlvmLibraries.compiler-rt}/lib" + ] + ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions"; }; clangNoCompilerRt = wrapCCWith rec { @@ -293,16 +297,22 @@ in let bintools = bintoolsNoLibc'; extraPackages = [ ]; extraBuildCommands = mkExtraBuildCommands0 cc; - nixSupport.cc-cflags = [ "-nostartfiles" ]; + nixSupport.cc-cflags = + [ + "-nostartfiles" + ] + ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions"; }; - clangNoCompilerRtWithLibc = wrapCCWith rec { + clangNoCompilerRtWithLibc = wrapCCWith (rec { cc = tools.clang-unwrapped; libcxx = null; bintools = bintools'; extraPackages = [ ]; extraBuildCommands = mkExtraBuildCommands0 cc; - }; + } // lib.optionalAttrs stdenv.targetPlatform.isWasm { + nixSupport.cc-cflags = [ "-fno-exceptions" ]; + }); }); diff --git a/pkgs/development/compilers/llvm/16/compiler-rt/default.nix b/pkgs/development/compilers/llvm/16/compiler-rt/default.nix index fc0d7533c99..9b6ab0a77c2 100644 --- a/pkgs/development/compilers/llvm/16/compiler-rt/default.nix +++ b/pkgs/development/compilers/llvm/16/compiler-rt/default.nix @@ -119,9 +119,9 @@ stdenv.mkDerivation { ''; # Hack around weird upsream RPATH bug - postInstall = lib.optionalString (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isWasm) '' + postInstall = lib.optionalString (stdenv.hostPlatform.isDarwin) '' ln -s "$out/lib"/*/* "$out/lib" - '' + lib.optionalString (useLLVM) '' + '' + lib.optionalString (useLLVM && stdenv.hostPlatform.isLinux) '' ln -s $out/lib/*/clang_rt.crtbegin-*.o $out/lib/crtbegin.o ln -s $out/lib/*/clang_rt.crtend-*.o $out/lib/crtend.o # Note the history of crt{begin,end}S in previous versions of llvm in nixpkg: diff --git a/pkgs/development/compilers/llvm/16/default.nix b/pkgs/development/compilers/llvm/16/default.nix index 24dd31ea9fe..541db8c400d 100644 --- a/pkgs/development/compilers/llvm/16/default.nix +++ b/pkgs/development/compilers/llvm/16/default.nix @@ -271,11 +271,13 @@ in let targetLlvmLibraries.compiler-rt ]; extraBuildCommands = mkExtraBuildCommands cc; - nixSupport.cc-cflags = [ - "-rtlib=compiler-rt" - "-B${targetLlvmLibraries.compiler-rt}/lib" - "-nostdlib++" - ]; + nixSupport.cc-cflags = + [ + "-rtlib=compiler-rt" + "-B${targetLlvmLibraries.compiler-rt}/lib" + "-nostdlib++" + ] + ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions"; }; clangNoLibc = wrapCCWith rec { @@ -286,10 +288,12 @@ in let targetLlvmLibraries.compiler-rt ]; extraBuildCommands = mkExtraBuildCommands cc; - nixSupport.cc-cflags = [ - "-rtlib=compiler-rt" - "-B${targetLlvmLibraries.compiler-rt}/lib" - ]; + nixSupport.cc-cflags = + [ + "-rtlib=compiler-rt" + "-B${targetLlvmLibraries.compiler-rt}/lib" + ] + ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions"; }; clangNoCompilerRt = wrapCCWith rec { @@ -298,17 +302,29 @@ in let bintools = bintoolsNoLibc'; extraPackages = [ ]; extraBuildCommands = mkExtraBuildCommands0 cc; - nixSupport.cc-cflags = [ "-nostartfiles" ]; + nixSupport.cc-cflags = + [ + "-nostartfiles" + ] + ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions"; }; - clangNoCompilerRtWithLibc = wrapCCWith rec { + clangNoCompilerRtWithLibc = wrapCCWith (rec { cc = tools.clang-unwrapped; libcxx = null; bintools = bintools'; extraPackages = [ ]; extraBuildCommands = mkExtraBuildCommands0 cc; - }; + } // lib.optionalAttrs stdenv.targetPlatform.isWasm { + nixSupport.cc-cflags = [ "-fno-exceptions" ]; + }); + # Has to be in tools despite mostly being a library, + # because we use a native helper executable from a + # non-cross build in cross builds. + libclc = callPackage ./libclc { + inherit buildLlvmTools; + }; }); libraries = lib.makeExtensible (libraries: let diff --git a/pkgs/development/libraries/libclc/default.nix b/pkgs/development/compilers/llvm/16/libclc/default.nix index 9148deeee6f..6fa0751f906 100644 --- a/pkgs/development/libraries/libclc/default.nix +++ b/pkgs/development/compilers/llvm/16/libclc/default.nix @@ -1,16 +1,16 @@ -{ lib, stdenv, fetchFromGitHub, buildPackages, ninja, cmake, python3, llvm_14 }: +{ lib, stdenv, version, runCommand, monorepoSrc, llvm, buildPackages, buildLlvmTools, ninja, cmake, python3 }: stdenv.mkDerivation rec { pname = "libclc"; - version = "16.0.3"; + inherit version; - src = fetchFromGitHub { - owner = "llvm"; - repo = "llvm-project"; - rev = "llvmorg-${version}"; - hash = "sha256-paWwnoU3XMqreRgh9JbT1tDMTwq/ZL0ss3SJTteEGL0="; - }; - sourceRoot = "${src.name}/libclc"; + src = runCommand "${pname}-src-${version}" {} '' + mkdir -p "$out" + cp -r ${monorepoSrc}/cmake "$out" + cp -r ${monorepoSrc}/${pname} "$out" + ''; + + sourceRoot = "${src.name}/${pname}"; outputs = [ "out" "dev" ]; @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace CMakeLists.txt \ --replace 'find_program( LLVM_CLANG clang PATHS ''${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH )' \ - 'find_program( LLVM_CLANG clang PATHS "${buildPackages.clang_14.cc}/bin" NO_DEFAULT_PATH )' \ + 'find_program( LLVM_CLANG clang PATHS "${buildLlvmTools.clang.cc}/bin" NO_DEFAULT_PATH )' \ --replace 'find_program( LLVM_AS llvm-as PATHS ''${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH )' \ - 'find_program( LLVM_AS llvm-as PATHS "${buildPackages.llvm_14}/bin" NO_DEFAULT_PATH )' \ + 'find_program( LLVM_AS llvm-as PATHS "${buildLlvmTools.llvm}/bin" NO_DEFAULT_PATH )' \ --replace 'find_program( LLVM_LINK llvm-link PATHS ''${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH )' \ - 'find_program( LLVM_LINK llvm-link PATHS "${buildPackages.llvm_14}/bin" NO_DEFAULT_PATH )' \ + 'find_program( LLVM_LINK llvm-link PATHS "${buildLlvmTools.llvm}/bin" NO_DEFAULT_PATH )' \ --replace 'find_program( LLVM_OPT opt PATHS ''${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH )' \ - 'find_program( LLVM_OPT opt PATHS "${buildPackages.llvm_14}/bin" NO_DEFAULT_PATH )' \ + 'find_program( LLVM_OPT opt PATHS "${buildLlvmTools.llvm}/bin" NO_DEFAULT_PATH )' \ --replace 'find_program( LLVM_SPIRV llvm-spirv PATHS ''${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH )' \ 'find_program( LLVM_SPIRV llvm-spirv PATHS "${buildPackages.spirv-llvm-translator}/bin" NO_DEFAULT_PATH )' '' + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ cmake ninja python3 ]; - buildInputs = [ llvm_14 ]; + buildInputs = [ llvm ]; strictDeps = true; postInstall = '' diff --git a/pkgs/development/libraries/libclc/libclc-gnu-install-dirs.patch b/pkgs/development/compilers/llvm/16/libclc/libclc-gnu-install-dirs.patch index 1e5108a27c3..1e5108a27c3 100644 --- a/pkgs/development/libraries/libclc/libclc-gnu-install-dirs.patch +++ b/pkgs/development/compilers/llvm/16/libclc/libclc-gnu-install-dirs.patch diff --git a/pkgs/development/compilers/llvm/16/libcxx/default.nix b/pkgs/development/compilers/llvm/16/libcxx/default.nix index c387764b4f6..78cd632024c 100644 --- a/pkgs/development/compilers/llvm/16/libcxx/default.nix +++ b/pkgs/development/compilers/llvm/16/libcxx/default.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { buildInputs = lib.optionals (!headersOnly) [ cxxabi ] - ++ lib.optionals (stdenv.hostPlatform.useLLVM or false) [ libunwind ]; + ++ lib.optionals (stdenv.hostPlatform.useLLVM or false && !stdenv.hostPlatform.isWasm) [ libunwind ]; cmakeFlags = let # See: https://libcxx.llvm.org/BuildingLibcxx.html#cmdoption-arg-libcxx-cxx-abi-string @@ -87,6 +87,7 @@ stdenv.mkDerivation rec { "-DLIBCXX_ENABLE_THREADS=OFF" "-DLIBCXX_ENABLE_FILESYSTEM=OFF" "-DLIBCXX_ENABLE_EXCEPTIONS=OFF" + "-DUNIX=ON" # Required otherwise libc++ fails to detect the correct linker ] ++ lib.optional (!enableShared) "-DLIBCXX_ENABLE_SHARED=OFF" # If we're only building the headers we don't actually *need* a functioning # C/C++ compiler: diff --git a/pkgs/development/compilers/llvm/16/libcxxabi/default.nix b/pkgs/development/compilers/llvm/16/libcxxabi/default.nix index 04bfee14aa1..90c57dc52a2 100644 --- a/pkgs/development/compilers/llvm/16/libcxxabi/default.nix +++ b/pkgs/development/compilers/llvm/16/libcxxabi/default.nix @@ -28,8 +28,6 @@ stdenv.mkDerivation rec { postUnpack = lib.optionalString stdenv.isDarwin '' export TRIPLE=x86_64-apple-darwin - '' + lib.optionalString stdenv.hostPlatform.isWasm '' - patch -p1 -d llvm -i ${../../common/libcxxabi/wasm.patch} ''; prePatch = '' @@ -65,7 +63,7 @@ stdenv.mkDerivation rec { # CMake however checks for this anyways; this flag tells it not to. See: # https://github.com/llvm/llvm-project/blob/4bd3f3759259548e159aeba5c76efb9a0864e6fa/llvm/runtimes/CMakeLists.txt#L243 "-DCMAKE_CXX_COMPILER_WORKS=ON" - ] ++ lib.optionals (stdenv.hostPlatform.useLLVM or false) [ + ] ++ lib.optionals (stdenv.hostPlatform.useLLVM or false && !stdenv.hostPlatform.isWasm) [ "-DLLVM_ENABLE_LIBCXX=ON" "-DLIBCXXABI_USE_LLVM_UNWINDER=ON" # libcxxabi's CMake looks as though it treats -nostdlib++ as implying -nostdlib, @@ -74,8 +72,11 @@ stdenv.mkDerivation rec { "-DCMAKE_EXE_LINKER_FLAGS=-nostdlib" "-DCMAKE_SHARED_LINKER_FLAGS=-nostdlib" ] ++ lib.optionals stdenv.hostPlatform.isWasm [ + "-DCMAKE_C_COMPILER_WORKS=ON" + "-DCMAKE_CXX_COMPILER_WORKS=ON" "-DLIBCXXABI_ENABLE_THREADS=OFF" "-DLIBCXXABI_ENABLE_EXCEPTIONS=OFF" + "-DUNIX=ON" # Required otherwise libc++ fails to detect the correct linker ] ++ lib.optionals (!enableShared) [ "-DLIBCXXABI_ENABLE_SHARED=OFF" ]; diff --git a/pkgs/development/compilers/llvm/16/lld/add-table-base.patch b/pkgs/development/compilers/llvm/16/lld/add-table-base.patch new file mode 100644 index 00000000000..15fc903a5e3 --- /dev/null +++ b/pkgs/development/compilers/llvm/16/lld/add-table-base.patch @@ -0,0 +1,190 @@ +From 93adcb770b99351b18553089c164fe3ef2119699 Mon Sep 17 00:00:00 2001 +From: Sam Clegg <sbc@chromium.org> +Date: Fri, 25 Aug 2023 13:56:16 -0700 +Subject: [PATCH] [lld][WebAssembly] Add `--table-base` setting + +This is similar to `--global-base` but determines where to place the +table segments rather than that data segments. + +See https://github.com/emscripten-core/emscripten/issues/20097 + +Differential Revision: https://reviews.llvm.org/D158892 +--- + test/wasm/table-base.s | 72 ++++++++++++++++++++++++++++++++++++++ + wasm/Driver.cpp | 19 ++++++++-- + wasm/Options.td | 5 ++- + wasm/Writer.cpp | 8 ----- + 4 files changed, 93 insertions(+), 11 deletions(-) + create mode 100644 test/wasm/table-base.s + +diff --git a/test/wasm/table-base.s b/test/wasm/table-base.s +new file mode 100644 +index 000000000000000..56fff414fd31d96 +--- /dev/null ++++ b/test/wasm/table-base.s +@@ -0,0 +1,72 @@ ++# RUN: llvm-mc -filetype=obj -triple=wasm32-unknown-unknown %s -o %t.o ++ ++# RUN: wasm-ld --export=__table_base -o %t.wasm %t.o ++# RUN: obj2yaml %t.wasm | FileCheck %s -check-prefix=CHECK-DEFAULT ++ ++# RUN: wasm-ld --table-base=100 --export=__table_base -o %t.wasm %t.o ++# RUN: obj2yaml %t.wasm | FileCheck %s -check-prefix=CHECK-100 ++ ++.globl _start ++_start: ++ .functype _start () -> () ++ i32.const _start ++ drop ++ end_function ++ ++# CHECK-DEFAULT: - Type: TABLE ++# CHECK-DEFAULT-NEXT: Tables: ++# CHECK-DEFAULT-NEXT: - Index: 0 ++# CHECK-DEFAULT-NEXT: ElemType: FUNCREF ++# CHECK-DEFAULT-NEXT: Limits: ++# CHECK-DEFAULT-NEXT: Flags: [ HAS_MAX ] ++# CHECK-DEFAULT-NEXT: Minimum: 0x2 ++# CHECK-DEFAULT-NEXT: Maximum: 0x2 ++ ++# CHECK-DEFAULT: - Type: GLOBAL ++# CHECK-DEFAULT-NEXT: Globals: ++# CHECK-DEFAULT-NEXT: - Index: 0 ++# CHECK-DEFAULT-NEXT: Type: I32 ++# CHECK-DEFAULT-NEXT: Mutable: true ++# CHECK-DEFAULT-NEXT: InitExpr: ++# CHECK-DEFAULT-NEXT: Opcode: I32_CONST ++# CHECK-DEFAULT-NEXT: Value: 66560 ++# CHECK-DEFAULT-NEXT: - Index: 1 ++# CHECK-DEFAULT-NEXT: Type: I32 ++# CHECK-DEFAULT-NEXT: Mutable: false ++# CHECK-DEFAULT-NEXT: InitExpr: ++# CHECK-DEFAULT-NEXT: Opcode: I32_CONST ++# CHECK-DEFAULT-NEXT: Value: 1 ++ ++# CHECK-DEFAULT: - Type: EXPORT ++# CHECK-DEFAULT: - Name: __table_base ++# CHECK-DEFAULT-NEXT: Kind: GLOBAL ++# CHECK-DEFAULT-NEXT: Index: 1 ++ ++# CHECK-100: - Type: TABLE ++# CHECK-100-NEXT: Tables: ++# CHECK-100-NEXT: - Index: 0 ++# CHECK-100-NEXT: ElemType: FUNCREF ++# CHECK-100-NEXT: Limits: ++# CHECK-100-NEXT: Flags: [ HAS_MAX ] ++# CHECK-100-NEXT: Minimum: 0x65 ++# CHECK-100-NEXT: Maximum: 0x65 ++ ++# CHECK-100: - Type: GLOBAL ++# CHECK-100-NEXT: Globals: ++# CHECK-100-NEXT: - Index: 0 ++# CHECK-100-NEXT: Type: I32 ++# CHECK-100-NEXT: Mutable: true ++# CHECK-100-NEXT: InitExpr: ++# CHECK-100-NEXT: Opcode: I32_CONST ++# CHECK-100-NEXT: Value: 66560 ++# CHECK-100-NEXT: - Index: 1 ++# CHECK-100-NEXT: Type: I32 ++# CHECK-100-NEXT: Mutable: false ++# CHECK-100-NEXT: InitExpr: ++# CHECK-100-NEXT: Opcode: I32_CONST ++# CHECK-100-NEXT: Value: 100 ++ ++# CHECK-100: - Type: EXPORT ++# CHECK-100: - Name: __table_base ++# CHECK-100-NEXT: Kind: GLOBAL ++# CHECK-100-NEXT: Index: 1 +diff --git a/wasm/Driver.cpp b/wasm/Driver.cpp +index 84304881f5ca34e..c2f5f0185781f36 100644 +--- a/wasm/Driver.cpp ++++ b/wasm/Driver.cpp +@@ -502,6 +502,7 @@ static void readConfigs(opt::InputArgList &args) { + + config->initialMemory = args::getInteger(args, OPT_initial_memory, 0); + config->globalBase = args::getInteger(args, OPT_global_base, 0); ++ config->tableBase = args::getInteger(args, OPT_table_base, 0); + config->maxMemory = args::getInteger(args, OPT_max_memory, 0); + config->zStackSize = + args::getZOptionValue(args, OPT_z, "stack-size", WasmPageSize); +@@ -573,6 +574,17 @@ static void setConfigs() { + if (config->exportTable) + error("-shared/-pie is incompatible with --export-table"); + config->importTable = true; ++ } else { ++ // Default table base. Defaults to 1, reserving 0 for the NULL function ++ // pointer. ++ if (!config->tableBase) ++ config->tableBase = 1; ++ // The default offset for static/global data, for when --global-base is ++ // not specified on the command line. The precise value of 1024 is ++ // somewhat arbitrary, and pre-dates wasm-ld (Its the value that ++ // emscripten used prior to wasm-ld). ++ if (!config->globalBase && !config->relocatable && !config->stackFirst) ++ config->globalBase = 1024; + } + + if (config->relocatable) { +@@ -666,8 +678,11 @@ static void checkOptions(opt::InputArgList &args) { + warn("-Bsymbolic is only meaningful when combined with -shared"); + } + +- if (config->globalBase && config->isPic) { +- error("--global-base may not be used with -shared/-pie"); ++ if (config->isPic) { ++ if (config->globalBase) ++ error("--global-base may not be used with -shared/-pie"); ++ if (config->tableBase) ++ error("--table-base may not be used with -shared/-pie"); + } + } + +diff --git a/wasm/Options.td b/wasm/Options.td +index 50417d2928e0a34..bb764396bf4df14 100644 +--- a/wasm/Options.td ++++ b/wasm/Options.td +@@ -191,7 +191,7 @@ def growable_table: FF<"growable-table">, + HelpText<"Remove maximum size from function table, allowing table to grow">; + + def global_base: JJ<"global-base=">, +- HelpText<"Where to start to place global data">; ++ HelpText<"Memory offset at which to place global data (Defaults to 1024)">; + + def import_memory: FF<"import-memory">, + HelpText<"Import the module's memory from the default module of \"env\" with the name \"memory\".">; +@@ -224,6 +224,9 @@ def no_entry: FF<"no-entry">, + def stack_first: FF<"stack-first">, + HelpText<"Place stack at start of linear memory rather than after data">; + ++def table_base: JJ<"table-base=">, ++ HelpText<"Table offset at which to place address taken functions (Defaults to 1)">; ++ + defm whole_archive: B<"whole-archive", + "Force load of all members in a static library", + "Do not force load of all members in a static library (default)">; +diff --git a/wasm/Writer.cpp b/wasm/Writer.cpp +index f25d358dc5bae6f..0576bf2907e49c4 100644 +--- a/wasm/Writer.cpp ++++ b/wasm/Writer.cpp +@@ -358,13 +358,6 @@ void Writer::layoutMemory() { + memoryPtr = config->globalBase; + } + } else { +- if (!config->globalBase && !config->relocatable && !config->isPic) { +- // The default offset for static/global data, for when --global-base is +- // not specified on the command line. The precise value of 1024 is +- // somewhat arbitrary, and pre-dates wasm-ld (Its the value that +- // emscripten used prior to wasm-ld). +- config->globalBase = 1024; +- } + memoryPtr = config->globalBase; + } + +@@ -1685,7 +1678,6 @@ void Writer::run() { + // For PIC code the table base is assigned dynamically by the loader. + // For non-PIC, we start at 1 so that accessing table index 0 always traps. + if (!config->isPic) { +- config->tableBase = 1; + if (WasmSym::definedTableBase) + WasmSym::definedTableBase->setVA(config->tableBase); + if (WasmSym::definedTableBase32) diff --git a/pkgs/development/compilers/llvm/16/lld/default.nix b/pkgs/development/compilers/llvm/16/lld/default.nix index cc18aee76a4..84943e8effc 100644 --- a/pkgs/development/compilers/llvm/16/lld/default.nix +++ b/pkgs/development/compilers/llvm/16/lld/default.nix @@ -26,6 +26,7 @@ stdenv.mkDerivation rec { patches = [ ./gnu-install-dirs.patch + ./add-table-base.patch ]; nativeBuildInputs = [ cmake ninja ]; diff --git a/pkgs/development/compilers/llvm/5/clang/LLVMgold-path.patch b/pkgs/development/compilers/llvm/5/clang/LLVMgold-path.patch deleted file mode 100644 index 6a09c91b513..00000000000 --- a/pkgs/development/compilers/llvm/5/clang/LLVMgold-path.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/lib/Driver/ToolChains/CommonArgs.cpp b/lib/Driver/ToolChains/CommonArgs.cpp -index 00bd60bc24bb..17416b0bd3c0 100644 ---- a/lib/Driver/ToolChains/CommonArgs.cpp -+++ b/lib/Driver/ToolChains/CommonArgs.cpp -@@ -376,8 +376,7 @@ void tools::AddGoldPlugin(const ToolChain &ToolChain, const ArgList &Args, - // as gold requires -plugin to come before any -plugin-opt that -Wl might - // forward. - CmdArgs.push_back("-plugin"); -- std::string Plugin = -- ToolChain.getDriver().Dir + "/../lib" CLANG_LIBDIR_SUFFIX "/LLVMgold.so"; -+ std::string Plugin = "@libllvmLibdir@" "/LLVMgold.so"; - CmdArgs.push_back(Args.MakeArgString(Plugin)); - - // Try to pass driver level flags relevant to LTO code generation down to diff --git a/pkgs/development/compilers/llvm/5/clang/default.nix b/pkgs/development/compilers/llvm/5/clang/default.nix deleted file mode 100644 index 70ffb3e0dd1..00000000000 --- a/pkgs/development/compilers/llvm/5/clang/default.nix +++ /dev/null @@ -1,127 +0,0 @@ -{ lib, stdenv, llvm_meta, fetch, substituteAll, cmake, libxml2, libllvm, version, clang-tools-extra_src, python3 -, buildLlvmTools -, fixDarwinDylibNames -, enableManpages ? false -}: - -let - self = stdenv.mkDerivation ({ - pname = "clang"; - inherit version; - - src = fetch "cfe" "0018520c4qxf5hgjdqgpz2dgl3faf4gsz87fdlb8zdmx99rfk77s"; - - unpackPhase = '' - unpackFile $src - mv cfe-${version}* clang - sourceRoot=$PWD/clang - unpackFile ${clang-tools-extra_src} - mv clang-tools-extra-* $sourceRoot/tools/extra - ''; - - nativeBuildInputs = [ cmake python3 ] - ++ lib.optional enableManpages python3.pkgs.sphinx - ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; - - buildInputs = [ libxml2 libllvm ]; - - cmakeFlags = [ - "-DCMAKE_CXX_FLAGS=-std=c++11" - "-DLLVM_ENABLE_RTTI=ON" - "-DLLVM_CONFIG_PATH=${libllvm.dev}/bin/llvm-config${lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) "-native"}" - ] ++ lib.optionals enableManpages [ - "-DCLANG_INCLUDE_DOCS=ON" - "-DLLVM_ENABLE_SPHINX=ON" - "-DSPHINX_OUTPUT_MAN=ON" - "-DSPHINX_OUTPUT_HTML=OFF" - "-DSPHINX_WARNINGS_AS_ERRORS=OFF" - ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - "-DLLVM_TABLEGEN_EXE=${buildLlvmTools.llvm}/bin/llvm-tblgen" - "-DCLANG_TABLEGEN=${buildLlvmTools.libclang.dev}/bin/clang-tblgen" - ]; - - patches = [ - ../../common/clang/5-8-purity.patch - ./gnu-install-dirs.patch - (substituteAll { - src = ./LLVMgold-path.patch; - libllvmLibdir = "${libllvm.lib}/lib"; - }) - ]; - - postPatch = '' - sed -i -e 's/DriverArgs.hasArg(options::OPT_nostdlibinc)/true/' \ - -e 's/Args.hasArg(options::OPT_nostdlibinc)/true/' \ - lib/Driver/ToolChains/*.cpp - '' + lib.optionalString stdenv.hostPlatform.isMusl '' - sed -i -e 's/lgcc_s/lgcc_eh/' lib/Driver/ToolChains/*.cpp - ''; - - outputs = [ "out" "lib" "dev" "python" ]; - - postInstall = '' - ln -sv $out/bin/clang $out/bin/cpp - - # Move libclang to 'lib' output - moveToOutput "lib/libclang.*" "$lib" - substituteInPlace $out/lib/cmake/clang/ClangTargets-release.cmake \ - --replace "\''${_IMPORT_PREFIX}/lib/libclang." "$lib/lib/libclang." - - mkdir -p $python/bin $python/share/{clang,scan-view} - mv $out/bin/{git-clang-format,scan-view} $python/bin - if [ -e $out/bin/set-xcode-analyzer ]; then - mv $out/bin/set-xcode-analyzer $python/bin - fi - mv $out/share/clang/*.py $python/share/clang - mv $out/share/scan-view/*.py $python/share/scan-view - rm $out/bin/c-index-test - patchShebangs $python/bin - - mkdir -p $dev/bin - cp bin/clang-tblgen $dev/bin - ''; - - passthru = { - inherit libllvm; - isClang = true; - hardeningUnsupportedFlags = [ "fortify3" ]; - }; - - meta = llvm_meta // { - homepage = "https://clang.llvm.org/"; - description = "A C language family frontend for LLVM"; - longDescription = '' - The Clang project provides a language front-end and tooling - infrastructure for languages in the C language family (C, C++, Objective - C/C++, OpenCL, CUDA, and RenderScript) for the LLVM project. - It aims to deliver amazingly fast compiles, extremely useful error and - warning messages and to provide a platform for building great source - level tools. The Clang Static Analyzer and clang-tidy are tools that - automatically find bugs in your code, and are great examples of the sort - of tools that can be built using the Clang frontend as a library to - parse C/C++ code. - ''; - mainProgram = "clang"; - }; - } // lib.optionalAttrs enableManpages { - pname = "clang-manpages"; - - buildPhase = '' - make docs-clang-man - ''; - - installPhase = '' - mkdir -p $out/share/man/man1 - # Manually install clang manpage - cp docs/man/*.1 $out/share/man/man1/ - ''; - - outputs = [ "out" ]; - - doCheck = false; - - meta = llvm_meta // { - description = "man page for Clang ${version}"; - }; - }); -in self diff --git a/pkgs/development/compilers/llvm/5/clang/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/5/clang/gnu-install-dirs.patch deleted file mode 100644 index 7e6903222f4..00000000000 --- a/pkgs/development/compilers/llvm/5/clang/gnu-install-dirs.patch +++ /dev/null @@ -1,242 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 2667b1d6892e..87c5ad58738f 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -5,6 +5,8 @@ cmake_minimum_required(VERSION 3.4.3) - if( CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR ) - project(Clang) - -+ include(GNUInstallDirs) -+ - # Rely on llvm-config. - set(CONFIG_OUTPUT) - find_program(LLVM_CONFIG "llvm-config") -@@ -344,7 +346,7 @@ include_directories(BEFORE - - if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) - install(DIRECTORY include/clang include/clang-c -- DESTINATION include -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} - FILES_MATCHING - PATTERN "*.def" - PATTERN "*.h" -@@ -353,7 +355,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) - ) - - install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include/clang -- DESTINATION include -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} - FILES_MATCHING - PATTERN "CMakeFiles" EXCLUDE - PATTERN "*.inc" -@@ -361,7 +363,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) - ) - - install(PROGRAMS utils/bash-autocomplete.sh -- DESTINATION share/clang -+ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang - ) - endif() - -diff --git a/cmake/modules/AddClang.cmake b/cmake/modules/AddClang.cmake -index e657059744a4..19da44638fe6 100644 ---- a/cmake/modules/AddClang.cmake -+++ b/cmake/modules/AddClang.cmake -@@ -99,9 +99,9 @@ macro(add_clang_library name) - install(TARGETS ${name} - COMPONENT ${name} - ${export_to_clangtargets} -- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} -- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} -- RUNTIME DESTINATION bin) -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) - - if (${ARG_SHARED} AND NOT CMAKE_CONFIGURATION_TYPES) - add_custom_target(install-${name} -@@ -143,7 +143,7 @@ macro(add_clang_tool name) - - install(TARGETS ${name} - ${export_to_clangtargets} -- RUNTIME DESTINATION bin -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - COMPONENT ${name}) - - if(NOT CMAKE_CONFIGURATION_TYPES) -@@ -160,5 +160,5 @@ endmacro() - macro(add_clang_symlink name dest) - add_llvm_tool_symlink(${name} ${dest} ALWAYS_GENERATE) - # Always generate install targets -- llvm_install_symlink(${name} ${dest} ALWAYS_GENERATE) -+ llvm_install_symlink(${name} ${dest} ${CMAKE_INSTALL_FULL_BINDIR} ALWAYS_GENERATE) - endmacro() -diff --git a/lib/Headers/CMakeLists.txt b/lib/Headers/CMakeLists.txt -index a621c02644e3..e140efc9c83c 100644 ---- a/lib/Headers/CMakeLists.txt -+++ b/lib/Headers/CMakeLists.txt -@@ -129,13 +129,13 @@ install( - FILES ${files} ${CMAKE_CURRENT_BINARY_DIR}/arm_neon.h - COMPONENT clang-headers - PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ -- DESTINATION lib${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/include) -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/include) - - install( - FILES ${cuda_wrapper_files} - COMPONENT clang-headers - PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ -- DESTINATION lib${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/include/cuda_wrappers) -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/include/cuda_wrappers) - - if (NOT CMAKE_CONFIGURATION_TYPES) # don't add this for IDE's. - add_custom_target(install-clang-headers -diff --git a/tools/c-index-test/CMakeLists.txt b/tools/c-index-test/CMakeLists.txt -index ad990e010eef..92e52d05afb9 100644 ---- a/tools/c-index-test/CMakeLists.txt -+++ b/tools/c-index-test/CMakeLists.txt -@@ -48,7 +48,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) - set_property(TARGET c-index-test APPEND PROPERTY INSTALL_RPATH - "@executable_path/../../lib") - else() -- set(INSTALL_DESTINATION bin) -+ set(INSTALL_DESTINATION ${CMAKE_INSTALL_BINDIR}) - endif() - - install(TARGETS c-index-test -diff --git a/tools/clang-check/CMakeLists.txt b/tools/clang-check/CMakeLists.txt -index 04151a8e0331..13918d91c4ba 100644 ---- a/tools/clang-check/CMakeLists.txt -+++ b/tools/clang-check/CMakeLists.txt -@@ -19,4 +19,4 @@ target_link_libraries(clang-check - ) - - install(TARGETS clang-check -- RUNTIME DESTINATION bin) -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) -diff --git a/tools/clang-format/CMakeLists.txt b/tools/clang-format/CMakeLists.txt -index a13633eaefc4..9b0094783690 100644 ---- a/tools/clang-format/CMakeLists.txt -+++ b/tools/clang-format/CMakeLists.txt -@@ -20,20 +20,20 @@ if( LLVM_USE_SANITIZE_COVERAGE ) - endif() - - install(PROGRAMS clang-format-bbedit.applescript -- DESTINATION share/clang -+ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang - COMPONENT clang-format) - install(PROGRAMS clang-format-diff.py -- DESTINATION share/clang -+ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang - COMPONENT clang-format) - install(PROGRAMS clang-format-sublime.py -- DESTINATION share/clang -+ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang - COMPONENT clang-format) - install(PROGRAMS clang-format.el -- DESTINATION share/clang -+ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang - COMPONENT clang-format) - install(PROGRAMS clang-format.py -- DESTINATION share/clang -+ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang - COMPONENT clang-format) - install(PROGRAMS git-clang-format -- DESTINATION bin -+ DESTINATION ${CMAKE_INSTALL_BINDIR} - COMPONENT clang-format) -diff --git a/tools/clang-offload-bundler/CMakeLists.txt b/tools/clang-offload-bundler/CMakeLists.txt -index 6161d08ae587..a003292d1676 100644 ---- a/tools/clang-offload-bundler/CMakeLists.txt -+++ b/tools/clang-offload-bundler/CMakeLists.txt -@@ -21,4 +21,4 @@ target_link_libraries(clang-offload-bundler - ${CLANG_OFFLOAD_BUNDLER_LIB_DEPS} - ) - --install(TARGETS clang-offload-bundler RUNTIME DESTINATION bin) -+install(TARGETS clang-offload-bundler RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) -diff --git a/tools/clang-rename/CMakeLists.txt b/tools/clang-rename/CMakeLists.txt -index 771e3bdea6f0..d1396e62b28f 100644 ---- a/tools/clang-rename/CMakeLists.txt -+++ b/tools/clang-rename/CMakeLists.txt -@@ -14,11 +14,11 @@ target_link_libraries(clang-rename - clangToolingRefactor - ) - --install(TARGETS clang-rename RUNTIME DESTINATION bin) -+install(TARGETS clang-rename RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) - - install(PROGRAMS clang-rename.py -- DESTINATION share/clang -+ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang - COMPONENT clang-rename) - install(PROGRAMS clang-rename.el -- DESTINATION share/clang -+ DESTINATION ${CMAKE_INSTALL_DATADIR}/clang - COMPONENT clang-rename) -diff --git a/tools/libclang/CMakeLists.txt b/tools/libclang/CMakeLists.txt -index 2dd670307636..1fe576f77ddb 100644 ---- a/tools/libclang/CMakeLists.txt -+++ b/tools/libclang/CMakeLists.txt -@@ -121,7 +121,7 @@ endif() - if(INTERNAL_INSTALL_PREFIX) - set(LIBCLANG_HEADERS_INSTALL_DESTINATION "${INTERNAL_INSTALL_PREFIX}/include") - else() -- set(LIBCLANG_HEADERS_INSTALL_DESTINATION include) -+ set(LIBCLANG_HEADERS_INSTALL_DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) - endif() - - install(DIRECTORY ../../include/clang-c -diff --git a/tools/scan-build/CMakeLists.txt b/tools/scan-build/CMakeLists.txt -index 380379300b09..adfd58ed5f7d 100644 ---- a/tools/scan-build/CMakeLists.txt -+++ b/tools/scan-build/CMakeLists.txt -@@ -41,7 +41,7 @@ if(CLANG_INSTALL_SCANBUILD) - ${CMAKE_BINARY_DIR}/bin/ - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/bin/${BinFile}) - list(APPEND Depends ${CMAKE_BINARY_DIR}/bin/${BinFile}) -- install(PROGRAMS bin/${BinFile} DESTINATION bin) -+ install(PROGRAMS bin/${BinFile} DESTINATION ${CMAKE_INSTALL_BINDIR}) - endforeach() - - foreach(LibexecFile ${LibexecFiles}) -@@ -53,7 +53,7 @@ if(CLANG_INSTALL_SCANBUILD) - ${CMAKE_BINARY_DIR}/libexec/ - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/libexec/${LibexecFile}) - list(APPEND Depends ${CMAKE_BINARY_DIR}/libexec/${LibexecFile}) -- install(PROGRAMS libexec/${LibexecFile} DESTINATION libexec) -+ install(PROGRAMS libexec/${LibexecFile} DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}) - endforeach() - - foreach(ManPage ${ManPages}) -@@ -77,7 +77,7 @@ if(CLANG_INSTALL_SCANBUILD) - ${CMAKE_BINARY_DIR}/share/scan-build/ - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/share/scan-build/${ShareFile}) - list(APPEND Depends ${CMAKE_BINARY_DIR}/share/scan-build/${ShareFile}) -- install(FILES share/scan-build/${ShareFile} DESTINATION share/scan-build) -+ install(FILES share/scan-build/${ShareFile} DESTINATION ${CMAKE_INSTALL_DATADIR}/scan-build) - endforeach() - - add_custom_target(scan-build ALL DEPENDS ${Depends}) -diff --git a/tools/scan-view/CMakeLists.txt b/tools/scan-view/CMakeLists.txt -index b305ca562a72..554bcb379061 100644 ---- a/tools/scan-view/CMakeLists.txt -+++ b/tools/scan-view/CMakeLists.txt -@@ -21,7 +21,7 @@ if(CLANG_INSTALL_SCANVIEW) - ${CMAKE_BINARY_DIR}/bin/ - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/bin/${BinFile}) - list(APPEND Depends ${CMAKE_BINARY_DIR}/bin/${BinFile}) -- install(PROGRAMS bin/${BinFile} DESTINATION bin) -+ install(PROGRAMS bin/${BinFile} DESTINATION ${CMAKE_INSTALL_BINDIR}) - endforeach() - - foreach(ShareFile ${ShareFiles}) -@@ -33,7 +33,7 @@ if(CLANG_INSTALL_SCANVIEW) - ${CMAKE_BINARY_DIR}/share/scan-view/ - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/share/${ShareFile}) - list(APPEND Depends ${CMAKE_BINARY_DIR}/share/scan-view/${ShareFile}) -- install(FILES share/${ShareFile} DESTINATION share/scan-view) -+ install(FILES share/${ShareFile} DESTINATION ${CMAKE_INSTALL_DATADIR}/scan-view) - endforeach() - - add_custom_target(scan-view ALL DEPENDS ${Depends}) diff --git a/pkgs/development/compilers/llvm/5/compiler-rt/armv7l.patch b/pkgs/development/compilers/llvm/5/compiler-rt/armv7l.patch deleted file mode 100644 index 77bf2640c47..00000000000 --- a/pkgs/development/compilers/llvm/5/compiler-rt/armv7l.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -ur compiler-rt-5.0.2.src/cmake/builtin-config-ix.cmake compiler-rt-5.0.2.src-patched/cmake/builtin-config-ix.cmake ---- compiler-rt-5.0.2.src/cmake/builtin-config-ix.cmake 2017-05-25 00:53:24.000000000 +0900 -+++ compiler-rt-5.0.2.src-patched/cmake/builtin-config-ix.cmake 2020-05-10 03:24:24.937433155 +0900 -@@ -24,7 +24,7 @@ - - - set(ARM64 aarch64) --set(ARM32 arm armhf armv6m armv7m armv7em armv7 armv7s armv7k) -+set(ARM32 arm armhf armv6m armv7m armv7em armv7 armv7s armv7k armv7l) - set(X86 i386 i686) - set(X86_64 x86_64) - set(MIPS32 mips mipsel) -diff -ur compiler-rt-5.0.2.src/lib/builtins/CMakeLists.txt compiler-rt-5.0.2.src-patched/lib/builtins/CMakeLists.txt ---- compiler-rt-5.0.2.src/lib/builtins/CMakeLists.txt 2017-07-13 04:33:30.000000000 +0900 -+++ compiler-rt-5.0.2.src-patched/lib/builtins/CMakeLists.txt 2020-05-10 03:24:45.945075423 +0900 -@@ -444,6 +444,7 @@ - set(armv7_SOURCES ${arm_SOURCES}) - set(armv7s_SOURCES ${arm_SOURCES}) - set(armv7k_SOURCES ${arm_SOURCES}) -+set(armv7l_SOURCES ${arm_SOURCES}) - set(arm64_SOURCES ${aarch64_SOURCES}) - - # macho_embedded archs diff --git a/pkgs/development/compilers/llvm/5/compiler-rt/codesign.patch b/pkgs/development/compilers/llvm/5/compiler-rt/codesign.patch deleted file mode 100644 index 8f4c76bca1e..00000000000 --- a/pkgs/development/compilers/llvm/5/compiler-rt/codesign.patch +++ /dev/null @@ -1,155 +0,0 @@ -From 3dec5f3475a26aeb4678627795c4b67c6b7b4785 Mon Sep 17 00:00:00 2001 -From: Will Dietz <w@wdtz.org> -Date: Tue, 19 Sep 2017 13:13:06 -0500 -Subject: [PATCH] remove codesign use on Apple, disable ios sim testing that - needs it - ---- - cmake/Modules/AddCompilerRT.cmake | 8 ------ - test/asan/CMakeLists.txt | 52 --------------------------------------- - test/tsan/CMakeLists.txt | 47 ----------------------------------- - 3 files changed, 107 deletions(-) - -diff --git a/cmake/Modules/AddCompilerRT.cmake b/cmake/Modules/AddCompilerRT.cmake -index bc5fb9ff7..b64eb4246 100644 ---- a/cmake/Modules/AddCompilerRT.cmake -+++ b/cmake/Modules/AddCompilerRT.cmake -@@ -210,14 +210,6 @@ function(add_compiler_rt_runtime name type) - set_target_properties(${libname} PROPERTIES IMPORT_PREFIX "") - set_target_properties(${libname} PROPERTIES IMPORT_SUFFIX ".lib") - endif() -- if(APPLE) -- # Ad-hoc sign the dylibs -- add_custom_command(TARGET ${libname} -- POST_BUILD -- COMMAND codesign --sign - $<TARGET_FILE:${libname}> -- WORKING_DIRECTORY ${COMPILER_RT_LIBRARY_OUTPUT_DIR} -- ) -- endif() - endif() - install(TARGETS ${libname} - ARCHIVE DESTINATION ${COMPILER_RT_LIBRARY_INSTALL_DIR} -diff --git a/test/asan/CMakeLists.txt b/test/asan/CMakeLists.txt -index 8bfc15b5c..f23d0f71a 100644 ---- a/test/asan/CMakeLists.txt -+++ b/test/asan/CMakeLists.txt -@@ -83,58 +83,6 @@ foreach(arch ${ASAN_TEST_ARCH}) - endif() - endforeach() - --# iOS and iOS simulator test suites --# These are not added into "check-all", in order to run these tests, use --# "check-asan-iossim-x86_64" and similar. They also require that an extra env --# variable to select which iOS device or simulator to use, e.g.: --# SANITIZER_IOSSIM_TEST_DEVICE_IDENTIFIER="iPhone 6" --if(APPLE) -- set(EXCLUDE_FROM_ALL ON) -- -- set(ASAN_TEST_TARGET_CC ${COMPILER_RT_TEST_COMPILER}) -- set(ASAN_TEST_IOS "1") -- pythonize_bool(ASAN_TEST_IOS) -- set(ASAN_TEST_DYNAMIC True) -- -- foreach(arch ${DARWIN_iossim_ARCHS}) -- set(ASAN_TEST_IOSSIM "1") -- pythonize_bool(ASAN_TEST_IOSSIM) -- set(ASAN_TEST_TARGET_ARCH ${arch}) -- set(ASAN_TEST_TARGET_CFLAGS "-arch ${arch} -isysroot ${DARWIN_iossim_SYSROOT} ${COMPILER_RT_TEST_COMPILER_CFLAGS}") -- set(ASAN_TEST_CONFIG_SUFFIX "-${arch}-iossim") -- get_bits_for_arch(${arch} ASAN_TEST_BITS) -- string(TOUPPER ${arch} ARCH_UPPER_CASE) -- set(CONFIG_NAME "IOSSim${ARCH_UPPER_CASE}Config") -- configure_lit_site_cfg( -- ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in -- ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/lit.site.cfg -- ) -- add_lit_testsuite(check-asan-iossim-${arch} "AddressSanitizer iOS Simulator ${arch} tests" -- ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/ -- DEPENDS ${ASAN_TEST_DEPS}) -- endforeach() -- -- foreach (arch ${DARWIN_ios_ARCHS}) -- set(ASAN_TEST_IOSSIM "0") -- pythonize_bool(ASAN_TEST_IOSSIM) -- set(ASAN_TEST_TARGET_ARCH ${arch}) -- set(ASAN_TEST_TARGET_CFLAGS "-arch ${arch} -isysroot ${DARWIN_ios_SYSROOT} ${COMPILER_RT_TEST_COMPILER_CFLAGS}") -- set(ASAN_TEST_CONFIG_SUFFIX "-${arch}-ios") -- get_bits_for_arch(${arch} ASAN_TEST_BITS) -- string(TOUPPER ${arch} ARCH_UPPER_CASE) -- set(CONFIG_NAME "IOS${ARCH_UPPER_CASE}Config") -- configure_lit_site_cfg( -- ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in -- ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/lit.site.cfg -- ) -- add_lit_testsuite(check-asan-ios-${arch} "AddressSanitizer iOS ${arch} tests" -- ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/ -- DEPENDS ${ASAN_TEST_DEPS}) -- endforeach() -- -- set(EXCLUDE_FROM_ALL OFF) --endif() -- - # Add unit tests. - if(COMPILER_RT_INCLUDE_TESTS) - set(ASAN_TEST_DYNAMIC False) -diff --git a/test/tsan/CMakeLists.txt b/test/tsan/CMakeLists.txt -index a68908612..cde0accb5 100644 ---- a/test/tsan/CMakeLists.txt -+++ b/test/tsan/CMakeLists.txt -@@ -42,53 +42,6 @@ foreach(arch ${TSAN_TEST_ARCH}) - list(APPEND TSAN_TESTSUITES ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}) - endforeach() - --# iOS and iOS simulator test suites --# These are not added into "check-all", in order to run these tests, use --# "check-tsan-iossim-x86_64" and similar. They also require an extra environment --# variable to select which iOS device or simulator to use, e.g.: --# SANITIZER_IOSSIM_TEST_DEVICE_IDENTIFIER="iPhone 6" --if(APPLE) -- set(EXCLUDE_FROM_ALL ON) -- -- set(TSAN_TEST_TARGET_CC ${COMPILER_RT_TEST_COMPILER}) -- set(TSAN_TEST_IOS "1") -- pythonize_bool(TSAN_TEST_IOS) -- -- set(arch "x86_64") -- set(TSAN_TEST_IOSSIM "1") -- pythonize_bool(TSAN_TEST_IOSSIM) -- set(TSAN_TEST_TARGET_ARCH ${arch}) -- set(TSAN_TEST_TARGET_CFLAGS "-arch ${arch} -isysroot ${DARWIN_iossim_SYSROOT} ${COMPILER_RT_TEST_COMPILER_CFLAGS}") -- set(TSAN_TEST_CONFIG_SUFFIX "-${arch}-iossim") -- string(TOUPPER ${arch} ARCH_UPPER_CASE) -- set(CONFIG_NAME "IOSSim${ARCH_UPPER_CASE}Config") -- configure_lit_site_cfg( -- ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in -- ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/lit.site.cfg -- ) -- add_lit_testsuite(check-tsan-iossim-${arch} "ThreadSanitizer iOS Simulator ${arch} tests" -- ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/ -- DEPENDS ${TSAN_TEST_DEPS}) -- -- set(arch "arm64") -- set(TSAN_TEST_IOSSIM "0") -- pythonize_bool(TSAN_TEST_IOSSIM) -- set(TSAN_TEST_TARGET_ARCH ${arch}) -- set(TSAN_TEST_TARGET_CFLAGS "-arch ${arch} -isysroot ${DARWIN_ios_SYSROOT} ${COMPILER_RT_TEST_COMPILER_CFLAGS}") -- set(TSAN_TEST_CONFIG_SUFFIX "-${arch}-ios") -- string(TOUPPER ${arch} ARCH_UPPER_CASE) -- set(CONFIG_NAME "IOS${ARCH_UPPER_CASE}Config") -- configure_lit_site_cfg( -- ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in -- ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/lit.site.cfg -- ) -- add_lit_testsuite(check-tsan-ios-${arch} "ThreadSanitizer iOS Simulator ${arch} tests" -- ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME}/ -- DEPENDS ${TSAN_TEST_DEPS}) -- -- set(EXCLUDE_FROM_ALL OFF) --endif() -- - if(COMPILER_RT_INCLUDE_TESTS) - configure_lit_site_cfg( - ${CMAKE_CURRENT_SOURCE_DIR}/Unit/lit.site.cfg.in --- -2.14.1 - diff --git a/pkgs/development/compilers/llvm/5/compiler-rt/compiler-rt-5-cstddef.patch b/pkgs/development/compilers/llvm/5/compiler-rt/compiler-rt-5-cstddef.patch deleted file mode 100644 index e7abf9735b9..00000000000 --- a/pkgs/development/compilers/llvm/5/compiler-rt/compiler-rt-5-cstddef.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/lib/xray/xray_buffer_queue.h -+++ b/lib/xray/xray_buffer_queue.h -@@ -17,6 +17,7 @@ - - #include "sanitizer_common/sanitizer_atomic.h" - #include "sanitizer_common/sanitizer_mutex.h" -+#include <cstddef> - #include <deque> - #include <unordered_set> - #include <utility> diff --git a/pkgs/development/compilers/llvm/5/compiler-rt/default.nix b/pkgs/development/compilers/llvm/5/compiler-rt/default.nix deleted file mode 100644 index fede3347e42..00000000000 --- a/pkgs/development/compilers/llvm/5/compiler-rt/default.nix +++ /dev/null @@ -1,112 +0,0 @@ -{ lib, stdenv, llvm_meta, version, fetch, cmake, python3, libllvm, libcxxabi -, doFakeLibgcc ? stdenv.hostPlatform.isFreeBSD -}: - -let - - useLLVM = stdenv.hostPlatform.useLLVM or false; - bareMetal = stdenv.hostPlatform.parsed.kernel.name == "none"; - inherit (stdenv.hostPlatform) isMusl; - -in - -stdenv.mkDerivation { - pname = "compiler-rt"; - inherit version; - src = fetch "compiler-rt" "0ipd4jdxpczgr2w6lzrabymz6dhzj69ywmyybjjc1q397zgrvziy"; - - nativeBuildInputs = [ cmake python3 libllvm.dev ]; - buildInputs = lib.optional stdenv.hostPlatform.isDarwin libcxxabi; - - env.NIX_CFLAGS_COMPILE = toString [ - "-DSCUDO_DEFAULT_OPTIONS=DeleteSizeMismatch=0:DeallocationTypeMismatch=0" - ]; - - cmakeFlags = [ - "-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON" - "-DCMAKE_C_COMPILER_TARGET=${stdenv.hostPlatform.config}" - "-DCMAKE_ASM_COMPILER_TARGET=${stdenv.hostPlatform.config}" - ] ++ lib.optionals (useLLVM || bareMetal || isMusl) [ - "-DCOMPILER_RT_BUILD_SANITIZERS=OFF" - "-DCOMPILER_RT_BUILD_XRAY=OFF" - "-DCOMPILER_RT_BUILD_LIBFUZZER=OFF" - ] ++ lib.optionals (useLLVM || bareMetal) [ - "-DCOMPILER_RT_BUILD_PROFILE=OFF" - ] ++ lib.optionals (useLLVM || bareMetal) [ - "-DCMAKE_C_COMPILER_WORKS=ON" - "-DCMAKE_CXX_COMPILER_WORKS=ON" - "-DCOMPILER_RT_BAREMETAL_BUILD=ON" - "-DCMAKE_SIZEOF_VOID_P=${toString (stdenv.hostPlatform.parsed.cpu.bits / 8)}" - ] ++ lib.optionals (useLLVM) [ - "-DCOMPILER_RT_BUILD_BUILTINS=ON" - "-DCMAKE_C_FLAGS=-nodefaultlibs" - #https://stackoverflow.com/questions/53633705/cmake-the-c-compiler-is-not-able-to-compile-a-simple-test-program - "-DCMAKE_TRY_COMPILE_TARGET_TYPE=STATIC_LIBRARY" - ] ++ lib.optionals (bareMetal) [ - "-DCOMPILER_RT_OS_DIR=baremetal" - ] ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ - # The compiler-rt build infrastructure sniffs supported platforms on Darwin - # and finds i386;x86_64;x86_64h. We only build for x86_64, so linking fails - # when it tries to use libc++ and libc++api for i386. - "-DDARWIN_osx_ARCHS=${stdenv.hostPlatform.darwinArch}" - ]; - - outputs = [ "out" "dev" ]; - - patches = [ - ./codesign.patch # Revert compiler-rt commit that makes codesign mandatory - # https://github.com/llvm/llvm-project/commit/947f9692440836dcb8d88b74b69dd379d85974ce - ../../common/compiler-rt/glibc.patch - ./gnu-install-dirs.patch - - ./sys-ustat.patch - ../../common/compiler-rt/libsanitizer-no-cyclades-9.patch - ./compiler-rt-5-cstddef.patch - ] ++ lib.optional stdenv.hostPlatform.isAarch32 ./armv7l.patch; - - # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks - # to get it, but they're unfree. Since LLVM is rather central to the stdenv, we patch out TSAN support so that Hydra - # can build this. If we didn't do it, basically the entire nixpkgs on Darwin would have an unfree dependency and we'd - # get no binary cache for the entire platform. If you really find yourself wanting the TSAN, make this controllable by - # a flag and turn the flag off during the stdenv build. - postPatch = lib.optionalString stdenv.isDarwin '' - substituteInPlace cmake/config-ix.cmake \ - --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)' - '' + lib.optionalString (useLLVM) '' - substituteInPlace lib/builtins/int_util.c \ - --replace "#include <stdlib.h>" "" - substituteInPlace lib/builtins/clear_cache.c \ - --replace "#include <assert.h>" "" - substituteInPlace lib/builtins/cpu_model.c \ - --replace "#include <assert.h>" "" - ''; - - # Hack around weird upsream RPATH bug - postInstall = lib.optionalString (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isWasm) '' - ln -s "$out/lib"/*/* "$out/lib" - '' + lib.optionalString (useLLVM) '' - ln -s $out/lib/*/clang_rt.crtbegin-*.o $out/lib/linux/crtbegin.o - ln -s $out/lib/*/clang_rt.crtend-*.o $out/lib/linux/crtend.o - ln -s $out/lib/*/clang_rt.crtbegin_shared-*.o $out/lib/linux/crtbeginS.o - ln -s $out/lib/*/clang_rt.crtend_shared-*.o $out/lib/linux/crtendS.o - '' + lib.optionalString doFakeLibgcc '' - ln -s $out/lib/freebsd/libclang_rt.builtins-*.a $out/lib/freebsd/libgcc.a - ''; - - meta = llvm_meta // { - homepage = "https://compiler-rt.llvm.org/"; - description = "Compiler runtime libraries"; - longDescription = '' - The compiler-rt project provides highly tuned implementations of the - low-level code generator support routines like "__fixunsdfdi" and other - calls generated when a target doesn't have a short sequence of native - instructions to implement a core IR operation. It also provides - implementations of run-time libraries for dynamic testing tools such as - AddressSanitizer, ThreadSanitizer, MemorySanitizer, and DataFlowSanitizer. - ''; - # "All of the code in the compiler-rt project is dual licensed under the MIT - # license and the UIUC License (a BSD-like license)": - license = with lib.licenses; [ mit ncsa ]; - broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; - }; -} diff --git a/pkgs/development/compilers/llvm/5/compiler-rt/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/5/compiler-rt/gnu-install-dirs.patch deleted file mode 100644 index 618e597e96d..00000000000 --- a/pkgs/development/compilers/llvm/5/compiler-rt/gnu-install-dirs.patch +++ /dev/null @@ -1,103 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index f997c53410c1..ac079d89b57b 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -12,6 +12,7 @@ cmake_minimum_required(VERSION 3.4.3) - # Check if compiler-rt is built as a standalone project. - if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR OR COMPILER_RT_STANDALONE_BUILD) - project(CompilerRT C CXX ASM) -+ include(GNUInstallDirs) - set(COMPILER_RT_STANDALONE_BUILD TRUE) - endif() - -diff --git a/cmake/Modules/AddCompilerRT.cmake b/cmake/Modules/AddCompilerRT.cmake -index bc5fb9ff722b..91fb79d1980c 100644 ---- a/cmake/Modules/AddCompilerRT.cmake -+++ b/cmake/Modules/AddCompilerRT.cmake -@@ -344,7 +344,7 @@ macro(add_compiler_rt_resource_file target_name file_name component) - add_custom_target(${target_name} DEPENDS ${dst_file}) - # Install in Clang resource directory. - install(FILES ${file_name} -- DESTINATION ${COMPILER_RT_INSTALL_PATH} -+ DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_PREFIX} - COMPONENT ${component}) - add_dependencies(${component} ${target_name}) - -@@ -361,7 +361,7 @@ macro(add_compiler_rt_script name) - add_custom_target(${name} DEPENDS ${dst}) - install(FILES ${dst} - PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE -- DESTINATION ${COMPILER_RT_INSTALL_PATH}/bin) -+ DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_BINDIR}) - endmacro(add_compiler_rt_script src name) - - # Builds custom version of libc++ and installs it in <prefix>. -diff --git a/cmake/Modules/CompilerRTDarwinUtils.cmake b/cmake/Modules/CompilerRTDarwinUtils.cmake -index f646975475bb..75885bf305b8 100644 ---- a/cmake/Modules/CompilerRTDarwinUtils.cmake -+++ b/cmake/Modules/CompilerRTDarwinUtils.cmake -@@ -391,7 +391,7 @@ macro(darwin_add_embedded_builtin_libraries) - set(DARWIN_macho_embedded_LIBRARY_OUTPUT_DIR - ${COMPILER_RT_OUTPUT_DIR}/lib/macho_embedded) - set(DARWIN_macho_embedded_LIBRARY_INSTALL_DIR -- ${COMPILER_RT_INSTALL_PATH}/lib/macho_embedded) -+ ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_LIBDIR}/macho_embedded) - - set(CFLAGS_armv7 "-target thumbv7-apple-darwin-eabi") - set(CFLAGS_i386 "-march=pentium") -diff --git a/cmake/base-config-ix.cmake b/cmake/base-config-ix.cmake -index b38c6ca96fac..a4580414cbc8 100644 ---- a/cmake/base-config-ix.cmake -+++ b/cmake/base-config-ix.cmake -@@ -43,11 +43,11 @@ if (LLVM_TREE_AVAILABLE) - else() - # Take output dir and install path from the user. - set(COMPILER_RT_OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR} CACHE PATH -- "Path where built compiler-rt libraries should be stored.") -+ "Path where built compiler-rt build artifacts should be stored.") - set(COMPILER_RT_EXEC_OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR}/bin CACHE PATH - "Path where built compiler-rt executables should be stored.") -- set(COMPILER_RT_INSTALL_PATH ${CMAKE_INSTALL_PREFIX} CACHE PATH -- "Path where built compiler-rt libraries should be installed.") -+ set(COMPILER_RT_INSTALL_PATH "" CACHE PATH -+ "Prefix where built compiler-rt artifacts should be installed, comes before CMAKE_INSTALL_PREFIX.") - option(COMPILER_RT_INCLUDE_TESTS "Generate and build compiler-rt unit tests." OFF) - option(COMPILER_RT_ENABLE_WERROR "Fail and stop if warning is triggered" OFF) - # Use a host compiler to compile/link tests. -@@ -67,9 +67,9 @@ if(NOT DEFINED COMPILER_RT_OS_DIR) - string(TOLOWER ${CMAKE_SYSTEM_NAME} COMPILER_RT_OS_DIR) - endif() - set(COMPILER_RT_LIBRARY_OUTPUT_DIR -- ${COMPILER_RT_OUTPUT_DIR}/lib/${COMPILER_RT_OS_DIR}) -+ ${COMPILER_RT_OUTPUT_DIR}/${CMAKE_INSTALL_FULL_LIBDIR}/${COMPILER_RT_OS_DIR}) - set(COMPILER_RT_LIBRARY_INSTALL_DIR -- ${COMPILER_RT_INSTALL_PATH}/lib/${COMPILER_RT_OS_DIR}) -+ ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_LIBDIR}/${COMPILER_RT_OS_DIR}) - - if(APPLE) - # On Darwin if /usr/include doesn't exist, the user probably has Xcode but not -diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt -index ec3bf40b95e6..af119f10ee2b 100644 ---- a/include/CMakeLists.txt -+++ b/include/CMakeLists.txt -@@ -44,8 +44,8 @@ set_target_properties(compiler-rt-headers PROPERTIES FOLDER "Compiler-RT Misc") - # Install sanitizer headers. - install(FILES ${SANITIZER_HEADERS} - PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ -- DESTINATION ${COMPILER_RT_INSTALL_PATH}/include/sanitizer) -+ DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_INCLUDEDIR}/sanitizer) - # Install xray headers. - install(FILES ${XRAY_HEADERS} - PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ -- DESTINATION ${COMPILER_RT_INSTALL_PATH}/include/xray) -+ DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_FULL_INCLUDEDIR}/xray) -diff --git a/lib/dfsan/CMakeLists.txt b/lib/dfsan/CMakeLists.txt -index 2c486bff821b..0ee715da95f8 100644 ---- a/lib/dfsan/CMakeLists.txt -+++ b/lib/dfsan/CMakeLists.txt -@@ -44,4 +44,4 @@ add_custom_command(OUTPUT ${dfsan_abilist_filename} - DEPENDS done_abilist.txt libc_ubuntu1404_abilist.txt) - add_dependencies(dfsan dfsan_abilist) - install(FILES ${dfsan_abilist_filename} -- DESTINATION ${COMPILER_RT_INSTALL_PATH}) -+ DESTINATION ${COMPILER_RT_INSTALL_PATH}/${CMAKE_INSTALL_PREFIX}) diff --git a/pkgs/development/compilers/llvm/5/compiler-rt/sys-ustat.patch b/pkgs/development/compilers/llvm/5/compiler-rt/sys-ustat.patch deleted file mode 100644 index d9e9a10d860..00000000000 --- a/pkgs/development/compilers/llvm/5/compiler-rt/sys-ustat.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 521935db9de17ad08748fd050137ac83b7734835 Mon Sep 17 00:00:00 2001 -From: Craig Topper <craig.topper@intel.com> -Date: Thu, 24 May 2018 17:59:47 +0000 -Subject: [PATCH] sanitizer: Use pre-computed size of struct ustat for Linux - -<sys/ustat.h> has been removed from glibc 2.28 by: - -commit cf2478d53ad7071e84c724a986b56fe17f4f4ca7 -Author: Adhemerval Zanella <adhemerval.zanella@linaro.org> -Date: Sun Mar 18 11:28:59 2018 +0800 - -Deprecate ustat syscall interface -This patch uses pre-computed size of struct ustat for Linux to fix - -https://bugs.llvm.org/show_bug.cgi?id=37418 - -Patch by H.J. Lu. - -Differential Revision: https://reviews.llvm.org/D47281 - -git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@333213 91177308-0d34-0410-b5e6-96231b3b80d8 ---- - .../sanitizer_platform_limits_posix.cc | 15 +++++++++++++-- - 1 file changed, 13 insertions(+), 2 deletions(-) - -diff --git a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc -index 94b8f3f627..936d818673 100644 ---- a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc -+++ b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc -@@ -159,7 +159,6 @@ typedef struct user_fpregs elf_fpregset_t; - # include <sys/procfs.h> - #endif - #include <sys/user.h> --#include <sys/ustat.h> - #include <linux/cyclades.h> - #include <linux/if_eql.h> - #include <linux/if_plip.h> -@@ -253,7 +252,19 @@ namespace __sanitizer { - #endif // SANITIZER_LINUX || SANITIZER_FREEBSD - - #if SANITIZER_LINUX && !SANITIZER_ANDROID -- unsigned struct_ustat_sz = sizeof(struct ustat); -+ // Use pre-computed size of struct ustat to avoid <sys/ustat.h> which -+ // has been removed from glibc 2.28. -+#if defined(__aarch64__) || defined(__s390x__) || defined (__mips64) \ -+ || defined(__powerpc64__) || defined(__arch64__) || defined(__sparcv9) \ -+ || defined(__x86_64__) -+#define SIZEOF_STRUCT_USTAT 32 -+#elif defined(__arm__) || defined(__i386__) || defined(__mips__) \ -+ || defined(__powerpc__) || defined(__s390__) -+#define SIZEOF_STRUCT_USTAT 20 -+#else -+#error Unknown size of struct ustat -+#endif -+ unsigned struct_ustat_sz = SIZEOF_STRUCT_USTAT; - unsigned struct_rlimit64_sz = sizeof(struct rlimit64); - unsigned struct_statvfs64_sz = sizeof(struct statvfs64); - #endif // SANITIZER_LINUX && !SANITIZER_ANDROID diff --git a/pkgs/development/compilers/llvm/5/default.nix b/pkgs/development/compilers/llvm/5/default.nix deleted file mode 100644 index 70f0d2e11bb..00000000000 --- a/pkgs/development/compilers/llvm/5/default.nix +++ /dev/null @@ -1,140 +0,0 @@ -{ lowPrio, newScope, pkgs, lib, stdenv, cmake, gccForLibs -, libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith -, buildLlvmTools # tools, but from the previous stage, for cross -, targetLlvmLibraries # libraries, but from the next stage, for cross -, targetLlvm -}: - -let - release_version = "5.0.2"; - version = release_version; # differentiating these is important for rc's - targetConfig = stdenv.targetPlatform.config; - - fetch = name: sha256: fetchurl { - url = "https://releases.llvm.org/${release_version}/${name}-${version}.src.tar.xz"; - inherit sha256; - }; - - clang-tools-extra_src = fetch "clang-tools-extra" "018b3fiwah8f8br5i26qmzh6sjvzchpn358sn8v079m49f2jldm3"; - - llvm_meta = { - license = lib.licenses.ncsa; - maintainers = lib.teams.llvm.members; - - # See llvm/cmake/config-ix.cmake. - platforms = - lib.platforms.aarch64 ++ - lib.platforms.arm ++ - lib.platforms.mips ++ - lib.platforms.power ++ - lib.platforms.s390x ++ - lib.platforms.wasi ++ - lib.platforms.x86; - }; - - tools = lib.makeExtensible (tools: let - callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch buildLlvmTools; }); - mkExtraBuildCommands = cc: '' - rsrc="$out/resource-root" - mkdir "$rsrc" - ln -s "${cc.lib}/lib/clang/${release_version}/include" "$rsrc" - echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags - ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib" - ''; - - in { - - libllvm = callPackage ./llvm { - inherit llvm_meta; - }; - - # `llvm` historically had the binaries. When choosing an output explicitly, - # we need to reintroduce `outputSpecified` to get the expected behavior e.g. of lib.get* - llvm = tools.libllvm; - - libllvm-polly = callPackage ./llvm { - inherit llvm_meta; - enablePolly = true; - }; - - llvm-polly = tools.libllvm-polly.lib // { outputSpecified = false; }; - - libclang = callPackage ./clang { - inherit clang-tools-extra_src llvm_meta; - }; - - clang-unwrapped = tools.libclang; - - llvm-manpages = lowPrio (tools.libllvm.override { - enableManpages = true; - python3 = pkgs.python3; # don't use python-boot - }); - - clang-manpages = lowPrio (tools.libclang.override { - enableManpages = true; - python3 = pkgs.python3; # don't use python-boot - }); - - # pick clang appropriate for package set we are targeting - clang = - /**/ if stdenv.targetPlatform.libc == null then tools.clangNoLibc - else if stdenv.targetPlatform.useLLVM or false then tools.clangUseLLVM - else if (pkgs.targetPackages.stdenv or stdenv).cc.isGNU then tools.libstdcxxClang - else tools.libcxxClang; - - libstdcxxClang = wrapCCWith rec { - cc = tools.clang-unwrapped; - # libstdcxx is taken from gcc in an ad-hoc way in cc-wrapper. - libcxx = null; - extraPackages = [ - targetLlvmLibraries.compiler-rt - ]; - extraBuildCommands = mkExtraBuildCommands cc; - }; - - libcxxClang = wrapCCWith rec { - cc = tools.clang-unwrapped; - libcxx = targetLlvmLibraries.libcxx; - extraPackages = [ - libcxx.cxxabi - targetLlvmLibraries.compiler-rt - ]; - extraBuildCommands = mkExtraBuildCommands cc; - }; - - lld = callPackage ./lld { - inherit llvm_meta; - }; - - lldb = callPackage ./lldb { - inherit llvm_meta; - }; - }); - - libraries = lib.makeExtensible (libraries: let - callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; }); - in { - - compiler-rt = callPackage ./compiler-rt { - inherit llvm_meta; - }; - - stdenv = overrideCC stdenv buildLlvmTools.clang; - - libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang; - - libcxx = callPackage ./libcxx { - inherit llvm_meta; - }; - - libcxxabi = callPackage ./libcxxabi { - inherit llvm_meta; - }; - - openmp = callPackage ./openmp { - inherit llvm_meta targetLlvm; - }; - }); - noExtend = extensible: lib.attrsets.removeAttrs extensible [ "extend" ]; - -in { inherit tools libraries release_version; } // (noExtend libraries) // (noExtend tools) diff --git a/pkgs/development/compilers/llvm/5/libcxx/default.nix b/pkgs/development/compilers/llvm/5/libcxx/default.nix deleted file mode 100644 index 073787e92db..00000000000 --- a/pkgs/development/compilers/llvm/5/libcxx/default.nix +++ /dev/null @@ -1,79 +0,0 @@ -{ lib, stdenv, llvm_meta, fetch, cmake, python3, fixDarwinDylibNames, version -, cxxabi ? if stdenv.hostPlatform.isFreeBSD then libcxxrt else libcxxabi -, libcxxabi, libcxxrt -}: - -assert stdenv.isDarwin -> cxxabi.pname == "libcxxabi"; - -stdenv.mkDerivation { - pname = "libcxx"; - inherit version; - - src = fetch "libcxx" "1672aaf95fgy4xsfra8pw24f6r93zwzpan1033hkcm8p2glqipvf"; - - postUnpack = '' - unpackFile ${libcxxabi.src} - export LIBCXXABI_INCLUDE_DIR="$PWD/$(ls -d libcxxabi-${version}*)/include" - ''; - - outputs = [ "out" "dev" ]; - - patches = [ - ./gnu-install-dirs.patch - ] ++ lib.optionals stdenv.hostPlatform.isMusl [ - ../../libcxx-0001-musl-hacks.patch - ]; - - prePatch = '' - substituteInPlace lib/CMakeLists.txt --replace "/usr/lib/libc++" "\''${LIBCXX_LIBCXXABI_LIB_PATH}/libc++" - ''; - - preConfigure = '' - # Get headers from the cxxabi source so we can see private headers not installed by the cxxabi package - cmakeFlagsArray=($cmakeFlagsArray -DLIBCXX_CXX_ABI_INCLUDE_PATHS="$LIBCXXABI_INCLUDE_DIR") - '' + lib.optionalString stdenv.hostPlatform.isMusl '' - patchShebangs utils/cat_files.py - ''; - nativeBuildInputs = [ cmake ] - ++ lib.optional stdenv.hostPlatform.isMusl python3 - ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; - - buildInputs = [ cxxabi ]; - - cmakeFlags = [ - "-DLIBCXX_LIBCPPABI_VERSION=2" - "-DLIBCXX_CXX_ABI=${cxxabi.pname}" - ] ++ lib.optional stdenv.hostPlatform.isMusl "-DLIBCXX_HAS_MUSL_LIBC=1" - ++ lib.optional (cxxabi.pname == "libcxxabi") "-DLIBCXX_LIBCXXABI_LIB_PATH=${cxxabi}/lib"; - - preInstall = lib.optionalString (stdenv.isDarwin) '' - for file in lib/*.dylib; do - if [ -L "$file" ]; then continue; fi - - baseName=$(basename $(${stdenv.cc.targetPrefix}otool -D $file | tail -n 1)) - installName="$out/lib/$baseName" - abiName=$(echo "$baseName" | sed -e 's/libc++/libc++abi/') - - for other in $(${stdenv.cc.targetPrefix}otool -L $file | awk '$1 ~ "/libc\\+\\+abi" { print $1 }'); do - ${stdenv.cc.targetPrefix}install_name_tool -change $other ${cxxabi}/lib/$abiName $file - done - done - ''; - - passthru = { - isLLVM = true; - inherit cxxabi; - }; - - meta = llvm_meta // { - homepage = "https://libcxx.llvm.org/"; - description = "C++ standard library"; - longDescription = '' - libc++ is an implementation of the C++ standard library, targeting C++11, - C++14 and above. - ''; - # "All of the code in libc++ is dual licensed under the MIT license and the - # UIUC License (a BSD-like license)": - license = with lib.licenses; [ mit ncsa ]; - }; -} diff --git a/pkgs/development/compilers/llvm/5/libcxx/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/5/libcxx/gnu-install-dirs.patch deleted file mode 100644 index d9ea0dc7dfd..00000000000 --- a/pkgs/development/compilers/llvm/5/libcxx/gnu-install-dirs.patch +++ /dev/null @@ -1,72 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index ca5afba86d19..ed69e4043c3d 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -22,6 +22,8 @@ set(CMAKE_MODULE_PATH - if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) - project(libcxx CXX C) - -+ include(GNUInstallDirs) -+ - set(PACKAGE_NAME libcxx) - set(PACKAGE_VERSION 5.0.0) - set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}") -diff --git a/cmake/Modules/HandleLibCXXABI.cmake b/cmake/Modules/HandleLibCXXABI.cmake -index b1f6bee8f945..1b455fceed7f 100644 ---- a/cmake/Modules/HandleLibCXXABI.cmake -+++ b/cmake/Modules/HandleLibCXXABI.cmake -@@ -55,7 +55,7 @@ macro(setup_abi_lib abidefines abilib abifiles abidirs) - ) - if (LIBCXX_INSTALL_HEADERS) - install(FILES "${LIBCXX_BINARY_INCLUDE_DIR}/${fpath}" -- DESTINATION ${LIBCXX_INSTALL_PREFIX}include/c++/v1/${dstdir} -+ DESTINATION ${LIBCXX_INSTALL_PREFIX}${CMAKE_INSTALL_INCLUDEDIR}/c++/v1/${dstdir} - COMPONENT libcxx - PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ - ) -diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt -index 5a1b2ccdc426..106d3d6c1d3c 100644 ---- a/include/CMakeLists.txt -+++ b/include/CMakeLists.txt -@@ -20,7 +20,7 @@ endif() - - if (LIBCXX_INSTALL_HEADERS) - install(DIRECTORY . -- DESTINATION ${LIBCXX_INSTALL_PREFIX}include/c++/v1 -+ DESTINATION ${LIBCXX_INSTALL_PREFIX}${CMAKE_INSTALL_INCLUDEDIR}/c++/v1 - COMPONENT cxx-headers - FILES_MATCHING - ${LIBCXX_HEADER_PATTERN} -@@ -44,7 +44,7 @@ if (LIBCXX_INSTALL_HEADERS) - set(generated_config_deps generate_config_header) - # Install the generated header as __config. - install(FILES ${LIBCXX_BINARY_DIR}/__generated_config -- DESTINATION ${LIBCXX_INSTALL_PREFIX}include/c++/v1 -+ DESTINATION ${LIBCXX_INSTALL_PREFIX}${CMAKE_INSTALL_INCLUDEDIR}/c++/v1 - PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ - RENAME __config - COMPONENT cxx-headers) -diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt -index 578651423f3b..277befd631ac 100644 ---- a/lib/CMakeLists.txt -+++ b/lib/CMakeLists.txt -@@ -355,8 +355,8 @@ if (LIBCXX_INSTALL_LIBRARY) - set(experimental_lib cxx_experimental) - endif() - install(TARGETS ${LIBCXX_TARGETS} ${experimental_lib} -- LIBRARY DESTINATION ${LIBCXX_INSTALL_PREFIX}lib${LIBCXX_LIBDIR_SUFFIX} COMPONENT cxx -- ARCHIVE DESTINATION ${LIBCXX_INSTALL_PREFIX}lib${LIBCXX_LIBDIR_SUFFIX} COMPONENT cxx -+ LIBRARY DESTINATION ${LIBCXX_INSTALL_PREFIX}${CMAKE_INSTALL_LIBDIR}${LIBCXX_LIBDIR_SUFFIX} COMPONENT cxx -+ ARCHIVE DESTINATION ${LIBCXX_INSTALL_PREFIX}${CMAKE_INSTALL_LIBDIR}${LIBCXX_LIBDIR_SUFFIX} COMPONENT cxx - ) - # NOTE: This install command must go after the cxx install command otherwise - # it will not be executed after the library symlinks are installed. -@@ -364,7 +364,7 @@ if (LIBCXX_INSTALL_LIBRARY) - # Replace the libc++ filename with $<TARGET_LINKER_FILE:cxx> - # after we required CMake 3.0. - install(FILES "${LIBCXX_LIBRARY_DIR}/libc++${CMAKE_SHARED_LIBRARY_SUFFIX}" -- DESTINATION ${LIBCXX_INSTALL_PREFIX}lib${LIBCXX_LIBDIR_SUFFIX} -+ DESTINATION ${LIBCXX_INSTALL_PREFIX}${CMAKE_INSTALL_LIBDIR}${LIBCXX_LIBDIR_SUFFIX} - COMPONENT libcxx) - endif() - endif() diff --git a/pkgs/development/compilers/llvm/5/libcxxabi/default.nix b/pkgs/development/compilers/llvm/5/libcxxabi/default.nix deleted file mode 100644 index cc2ac1beaf0..00000000000 --- a/pkgs/development/compilers/llvm/5/libcxxabi/default.nix +++ /dev/null @@ -1,70 +0,0 @@ -{ lib, stdenv, llvm_meta, cmake, fetch, libcxx, libunwind, llvm, version }: - -stdenv.mkDerivation { - pname = "libcxxabi"; - inherit version; - - src = fetch "libcxxabi" "12lp799rskr4fc2xr64qn4jfkjnfd8b1aymvsxyn4k9ar7r9pgqv"; - - outputs = [ "out" "dev" ]; - - postUnpack = '' - unpackFile ${libcxx.src} - unpackFile ${llvm.src} - export cmakeFlags="-DLLVM_PATH=$PWD/$(ls -d llvm-*) -DLIBCXXABI_LIBCXX_PATH=$PWD/$(ls -d libcxx-*)" - '' + lib.optionalString stdenv.isDarwin '' - export TRIPLE=x86_64-apple-darwin - '' + lib.optionalString stdenv.hostPlatform.isMusl '' - patch -p1 -d $(ls -d libcxx-*) -i ${../../libcxx-0001-musl-hacks.patch} - ''; - - patches = [ - ./gnu-install-dirs.patch - ]; - - nativeBuildInputs = [ cmake ]; - buildInputs = lib.optional (!stdenv.isDarwin) libunwind; - - preInstall = lib.optionalString stdenv.isDarwin '' - for file in lib/*.dylib; do - if [ -L "$file" ]; then continue; fi - - # Fix up the install name. Preserve the basename, just replace the path. - installName="$out/lib/$(basename $(${stdenv.cc.targetPrefix}otool -D $file | tail -n 1))" - - # this should be done in CMake, but having trouble figuring out - # the magic combination of necessary CMake variables - # if you fancy a try, take a look at - # https://gitlab.kitware.com/cmake/community/-/wikis/doc/cmake/RPATH-handling - ${stdenv.cc.targetPrefix}install_name_tool -id $installName $file - - # cc-wrapper passes '-lc++abi' to all c++ link steps, but that causes - # libcxxabi to sometimes link against a different version of itself. - # Here we simply make that second reference point to ourselves. - for other in $(${stdenv.cc.targetPrefix}otool -L $file | awk '$1 ~ "/libc\\+\\+abi" { print $1 }'); do - ${stdenv.cc.targetPrefix}install_name_tool -change $other $installName $file - done - done - ''; - - postInstall = '' - mkdir -p "$dev/include" - install -m 644 ../include/${if stdenv.isDarwin then "*" else "cxxabi.h"} "$dev/include" - ''; - - passthru = { - libName = "c++abi"; - }; - - meta = llvm_meta // { - homepage = "https://libcxxabi.llvm.org/"; - description = "Provides C++ standard library support"; - longDescription = '' - libc++abi is a new implementation of low level support for a standard C++ library. - ''; - # "All of the code in libc++abi is dual licensed under the MIT license and - # the UIUC License (a BSD-like license)": - license = with lib.licenses; [ mit ncsa ]; - maintainers = llvm_meta.maintainers ++ [ lib.maintainers.vlstill ]; - }; -} diff --git a/pkgs/development/compilers/llvm/5/libcxxabi/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/5/libcxxabi/gnu-install-dirs.patch deleted file mode 100644 index 760d7194f7b..00000000000 --- a/pkgs/development/compilers/llvm/5/libcxxabi/gnu-install-dirs.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 4db3328deb9c..74b39acfe588 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -20,6 +20,8 @@ set(CMAKE_MODULE_PATH - if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) - project(libcxxabi CXX C) - -+ include(GNUInstallDirs) -+ - set(PACKAGE_NAME libcxxabi) - set(PACKAGE_VERSION 5.0.0) - set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}") -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index adcc412880c9..71758665af05 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -174,8 +174,8 @@ endif() - add_custom_target(cxxabi DEPENDS ${LIBCXXABI_TARGETS}) - - install(TARGETS ${LIBCXXABI_TARGETS} -- LIBRARY DESTINATION ${LIBCXXABI_INSTALL_PREFIX}lib${LIBCXXABI_LIBDIR_SUFFIX} COMPONENT cxxabi -- ARCHIVE DESTINATION ${LIBCXXABI_INSTALL_PREFIX}lib${LIBCXXABI_LIBDIR_SUFFIX} COMPONENT cxxabi -+ LIBRARY DESTINATION ${LIBCXXABI_INSTALL_PREFIX}${CMAKE_INSTALL_LIBDIR}${LIBCXXABI_LIBDIR_SUFFIX} COMPONENT cxxabi -+ ARCHIVE DESTINATION ${LIBCXXABI_INSTALL_PREFIX}${CMAKE_INSTALL_LIBDIR}${LIBCXXABI_LIBDIR_SUFFIX} COMPONENT cxxabi - ) - - if (NOT CMAKE_CONFIGURATION_TYPES) diff --git a/pkgs/development/compilers/llvm/5/lld/default.nix b/pkgs/development/compilers/llvm/5/lld/default.nix deleted file mode 100644 index d3cbede8433..00000000000 --- a/pkgs/development/compilers/llvm/5/lld/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ lib, stdenv, llvm_meta -, buildLlvmTools -, fetch -, cmake -, libllvm -, version -}: - -stdenv.mkDerivation rec { - pname = "lld"; - inherit version; - - src = fetch "lld" "1ah75rjly6747jk1zbwca3z0svr9b09ylgxd4x9ns721xir6sia6"; - - patches = [ - ./gnu-install-dirs.patch - ]; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ libllvm ]; - - cmakeFlags = [ - "-DLLVM_CONFIG_PATH=${libllvm.dev}/bin/llvm-config${lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) "-native"}" - ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - "-DLLVM_TABLEGEN_EXE=${buildLlvmTools.llvm}/bin/llvm-tblgen" - ]; - - # Musl's default stack size is too small for lld to be able to link Firefox. - LDFLAGS = lib.optionalString stdenv.hostPlatform.isMusl "-Wl,-z,stack-size=2097152"; - - outputs = [ "out" "lib" "dev" ]; - - meta = llvm_meta // { - broken = stdenv.isDarwin; - homepage = "https://lld.llvm.org/"; - description = "The LLVM linker (unwrapped)"; - longDescription = '' - LLD is a linker from the LLVM project that is a drop-in replacement for - system linkers and runs much faster than them. It also provides features - that are useful for toolchain developers. - The linker supports ELF (Unix), PE/COFF (Windows), and Mach-O (macOS) - in descending order of completeness. Internally, LLD consists - of several different linkers. - ''; - }; -} diff --git a/pkgs/development/compilers/llvm/5/lld/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/5/lld/gnu-install-dirs.patch deleted file mode 100644 index ed673870dec..00000000000 --- a/pkgs/development/compilers/llvm/5/lld/gnu-install-dirs.patch +++ /dev/null @@ -1,68 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index e2ab0e35f1ab..f68e23d2a70d 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -6,6 +6,8 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) - set(CMAKE_INCLUDE_CURRENT_DIR ON) - set(LLD_BUILT_STANDALONE TRUE) - -+ include(GNUInstallDirs) -+ - find_program(LLVM_CONFIG_PATH "llvm-config" DOC "Path to llvm-config binary") - if(NOT LLVM_CONFIG_PATH) - message(FATAL_ERROR "llvm-config not found: specify LLVM_CONFIG_PATH") -@@ -203,7 +205,7 @@ include_directories(BEFORE - - if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) - install(DIRECTORY include/ -- DESTINATION include -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} - FILES_MATCHING - PATTERN "*.h" - PATTERN ".svn" EXCLUDE -diff --git a/cmake/modules/AddLLD.cmake b/cmake/modules/AddLLD.cmake -index fd1d44199ca6..2ec1831ed8f6 100644 ---- a/cmake/modules/AddLLD.cmake -+++ b/cmake/modules/AddLLD.cmake -@@ -20,9 +20,9 @@ macro(add_lld_library name) - install(TARGETS ${name} - COMPONENT ${name} - ${export_to_lldtargets} -- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} -- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} -- RUNTIME DESTINATION bin) -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) - - if (${ARG_SHARED} AND NOT CMAKE_CONFIGURATION_TYPES) - add_custom_target(install-${name} -@@ -56,7 +56,7 @@ macro(add_lld_tool name) - - install(TARGETS ${name} - ${export_to_lldtargets} -- RUNTIME DESTINATION bin -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - COMPONENT ${name}) - - if(NOT CMAKE_CONFIGURATION_TYPES) -@@ -73,5 +73,5 @@ endmacro() - macro(add_lld_symlink name dest) - add_llvm_tool_symlink(${name} ${dest} ALWAYS_GENERATE) - # Always generate install targets -- llvm_install_symlink(${name} ${dest} ALWAYS_GENERATE) -+ llvm_install_symlink(${name} ${dest} ${CMAKE_INSTALL_FULL_BINDIR} ALWAYS_GENERATE) - endmacro() -diff --git a/tools/lld/CMakeLists.txt b/tools/lld/CMakeLists.txt -index 2df10697ff66..94aa8d092220 100644 ---- a/tools/lld/CMakeLists.txt -+++ b/tools/lld/CMakeLists.txt -@@ -13,7 +13,7 @@ target_link_libraries(lld - ) - - install(TARGETS lld -- RUNTIME DESTINATION bin) -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) - - if(NOT LLD_SYMLINKS_TO_CREATE) - set(LLD_SYMLINKS_TO_CREATE lld-link ld.lld) diff --git a/pkgs/development/compilers/llvm/5/lldb/default.nix b/pkgs/development/compilers/llvm/5/lldb/default.nix deleted file mode 100644 index 6c60a44b3d6..00000000000 --- a/pkgs/development/compilers/llvm/5/lldb/default.nix +++ /dev/null @@ -1,88 +0,0 @@ -{ lib, stdenv, llvm_meta -, fetch -, fetchpatch -, cmake -, zlib -, ncurses -, swig -, which -, libedit -, libxml2 -, libllvm -, libclang -, python3 -, version -, darwin -}: - -stdenv.mkDerivation rec { - pname = "lldb"; - inherit version; - - src = fetch "lldb" "05j2a63yzln43852nng8a7y47spzlyr1cvdmgmbxgd29c8r0bfkq"; - - patches = [ - # Fix PythonString::GetString for >=python-3.7 - (fetchpatch { - url = "https://github.com/llvm/llvm-project/commit/5457b426f5e15a29c0acc8af1a476132f8be2a36.patch"; - sha256 = "1zbx4m0m8kbg0wq6740jcw151vb2pb1p25p401wiq8diqqagkjps"; - stripLen = 1; - }) - ./gnu-install-dirs.patch - ]; - - postPatch = '' - # Fix up various paths that assume llvm and clang are installed in the same place - sed -i 's,".*ClangConfig.cmake","${libclang.dev}/lib/cmake/clang/ClangConfig.cmake",' \ - cmake/modules/LLDBStandalone.cmake - sed -i 's,".*tools/clang/include","${libclang.dev}/include",' \ - cmake/modules/LLDBStandalone.cmake - sed -i 's,"$.LLVM_LIBRARY_DIR.",${libllvm.lib}/lib ${libclang.lib}/lib,' \ - cmake/modules/LLDBStandalone.cmake - ''; - - outputs = [ "out" "lib" "dev" ]; - - nativeBuildInputs = [ - cmake python3 which swig - ]; - - buildInputs = [ - ncurses zlib libedit libxml2 libllvm - ] ++ lib.optionals stdenv.isDarwin [ - darwin.libobjc - darwin.apple_sdk.libs.xpc - darwin.apple_sdk.frameworks.Foundation darwin.bootstrap_cmds darwin.apple_sdk.frameworks.Carbon darwin.apple_sdk.frameworks.Cocoa - ]; - - CXXFLAGS = "-fno-rtti"; - hardeningDisable = [ "format" ]; - - cmakeFlags = [ - "-DLLDB_INCLUDE_TESTS=${if doCheck then "YES" else "NO"}" - "-DLLDB_CODESIGN_IDENTITY=" # codesigning makes nondeterministic - ] ++ lib.optionals doCheck [ - "-DLLDB_TEST_C_COMPILER=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc" - "-DLLDB_TEST_CXX_COMPILER=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}c++" - ]; - - doCheck = false; - - postInstall = '' - mkdir -p $out/share/man/man1 - cp ../docs/lldb.1 $out/share/man/man1/ - ''; - - meta = llvm_meta // { - homepage = "https://lldb.llvm.org/"; - description = "A next-generation high-performance debugger"; - longDescription = '' - LLDB is a next generation, high-performance debugger. It is built as a set - of reusable components which highly leverage existing libraries in the - larger LLVM Project, such as the Clang expression parser and LLVM - disassembler. - ''; - # never built on aarch64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin && stdenv.isAarch64; - }; -} diff --git a/pkgs/development/compilers/llvm/5/lldb/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/5/lldb/gnu-install-dirs.patch deleted file mode 100644 index 5c6193b028f..00000000000 --- a/pkgs/development/compilers/llvm/5/lldb/gnu-install-dirs.patch +++ /dev/null @@ -1,76 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index ada293811b3e..6c2149309f65 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -7,6 +7,8 @@ set(CMAKE_MODULE_PATH - "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules" - ) - -+include(GNUInstallDirs) -+ - include(LLDBStandalone) - include(LLDBConfig) - include(AddLLDB) -diff --git a/cmake/modules/AddLLDB.cmake b/cmake/modules/AddLLDB.cmake -index 4c6f1efd673d..179a12b49cce 100644 ---- a/cmake/modules/AddLLDB.cmake -+++ b/cmake/modules/AddLLDB.cmake -@@ -54,14 +54,14 @@ function(add_lldb_library name) - endif() - install(TARGETS ${name} - COMPONENT ${name} -- RUNTIME DESTINATION bin -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - LIBRARY DESTINATION ${out_dir} - ARCHIVE DESTINATION ${out_dir}) - else() - install(TARGETS ${name} - COMPONENT ${name} -- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} -- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX}) -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) - endif() - if (NOT CMAKE_CONFIGURATION_TYPES) - add_custom_target(install-${name} -@@ -126,7 +126,7 @@ function(add_lldb_executable name) - if(ARG_GENERATE_INSTALL AND NOT (ARG_INCLUDE_IN_FRAMEWORK AND LLDB_BUILD_FRAMEWORK )) - install(TARGETS ${name} - COMPONENT ${name} -- RUNTIME DESTINATION bin) -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) - if (NOT CMAKE_CONFIGURATION_TYPES) - add_custom_target(install-${name} - DEPENDS ${name} -diff --git a/cmake/modules/LLDBConfig.cmake b/cmake/modules/LLDBConfig.cmake -index 726552675f47..f1f769f34446 100644 ---- a/cmake/modules/LLDBConfig.cmake -+++ b/cmake/modules/LLDBConfig.cmake -@@ -276,7 +276,7 @@ include_directories(BEFORE - if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) - install(DIRECTORY include/ - COMPONENT lldb_headers -- DESTINATION include -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} - FILES_MATCHING - PATTERN "*.h" - PATTERN ".svn" EXCLUDE -@@ -286,7 +286,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) - - install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include/ - COMPONENT lldb_headers -- DESTINATION include -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} - FILES_MATCHING - PATTERN "*.h" - PATTERN ".svn" EXCLUDE -diff --git a/tools/intel-mpx/CMakeLists.txt b/tools/intel-mpx/CMakeLists.txt -index 29ba9a1cacec..30e2f9334b95 100644 ---- a/tools/intel-mpx/CMakeLists.txt -+++ b/tools/intel-mpx/CMakeLists.txt -@@ -12,4 +12,4 @@ target_link_libraries(lldb-intel-mpxtable - PUBLIC liblldb LLVMSupport) - - install(TARGETS lldb-intel-mpxtable -- LIBRARY DESTINATION bin) -+ LIBRARY DESTINATION ${CMAKE_INSTALL_BINDIR}) diff --git a/pkgs/development/compilers/llvm/5/llvm/default.nix b/pkgs/development/compilers/llvm/5/llvm/default.nix deleted file mode 100644 index 74523490244..00000000000 --- a/pkgs/development/compilers/llvm/5/llvm/default.nix +++ /dev/null @@ -1,283 +0,0 @@ -{ lib, stdenv, llvm_meta -, pkgsBuildBuild -, fetch -, fetchpatch -, cmake -, python3 -, libffi -, enableGoldPlugin ? libbfd.hasPluginAPI -, libbfd -, libxml2 -, ncurses -, version -, release_version -, zlib -, buildLlvmTools -, debugVersion ? false -, enableManpages ? false -, enableSharedLibraries ? !enableManpages -, enablePolly ? false -}: - -let - inherit (lib) optional optionals optionalString; - - # Used when creating a versioned symlinks of libLLVM.dylib - versionSuffixes = with lib; - let parts = splitVersion release_version; in - imap (i: _: concatStringsSep "." (take i parts)) parts; -in - -stdenv.mkDerivation (rec { - pname = "llvm"; - inherit version; - - src = fetch "llvm" "0g1bbj2n6xv4p1n6hh17vj3vpvg56wacipc81dgwga9mg2lys8nm"; - polly_src = fetch "polly" "1f4i1qsw7ywx25v262p8syz339zcbvfkx295xz26hmqrn944xa6x"; - - unpackPhase = '' - unpackFile $src - mv llvm-${version}* llvm - sourceRoot=$PWD/llvm - '' + optionalString enablePolly '' - unpackFile $polly_src - mv polly-* $sourceRoot/tools/polly - ''; - - outputs = [ "out" "lib" "dev" "python" ]; - - nativeBuildInputs = [ cmake python3 ] - ++ optional enableManpages python3.pkgs.sphinx; - - buildInputs = [ libxml2 libffi ]; - - propagatedBuildInputs = [ ncurses zlib ]; - - patches = [ - (fetchpatch { - url = "https://bugzilla.redhat.com/attachment.cgi?id=1389687"; - name = "llvm-gcc8-type-mismatch.patch"; - sha256 = "0ga2123aclq3x9w72d0rm0az12m8c1i4r1106vh701hf4cghgbch"; - }) - ./fix-gcc9.patch - #(fetchpatch { - # name = "llvm-fix-gcc9.patch"; - # url = "https://reviews.llvm.org/file/data/zs3ck5ryvc5n672fd2kw/PHID-FILE-byoqefzwmkd7qnlip4v2/file"; - # sha256 = "0injj1hqgrbcbihhwp2nbal88jfykad30r54f2cdcx7gws2fcy8i"; - # stripLen = 1; - #}) - - # When cross-compiling we configure llvm-config-native with an approximation - # of the flags used for the normal LLVM build. To avoid the need for building - # a native libLLVM.so (which would fail) we force llvm-config to be linked - # statically against the necessary LLVM components always. - ../../llvm-config-link-static.patch - - ./gnu-install-dirs.patch - - # Fix invalid std::string(nullptr) for GCC 12 - (fetchpatch { - name = "nvptx-gcc-12.patch"; - url = "https://github.com/llvm/llvm-project/commit/99e64623ec9b31def9375753491cc6093c831809.patch"; - sha256 = "0zjfjgavqzi2ypqwqnlvy6flyvdz8hi1anwv0ybwnm2zqixg7za3"; - stripLen = 1; - }) - - ../../llvm-7-musl.patch - ] ++ lib.optional enablePolly ./gnu-install-dirs-polly.patch; - - postPatch = optionalString stdenv.isDarwin '' - substituteInPlace cmake/modules/AddLLVM.cmake \ - --replace 'set(_install_name_dir INSTALL_NAME_DIR "@rpath")' "set(_install_name_dir)" \ - --replace 'set(_install_rpath "@loader_path/../''${CMAKE_INSTALL_LIBDIR}" ''${extra_libdir})' "" - '' + '' - # FileSystem permissions tests fail with various special bits - substituteInPlace unittests/Support/CMakeLists.txt \ - --replace "Path.cpp" "" - rm unittests/Support/Path.cpp - - # llvm-5 does not support dwarf-5 style info, fails on gcc-11. - rm test/tools/llvm-symbolizer/print_context.c - '' + optionalString stdenv.isAarch64 '' - patch -p0 < ${../../aarch64.patch} - '' + optionalString stdenv.hostPlatform.isMusl '' - patch -p1 -i ${../../TLI-musl.patch} - substituteInPlace unittests/Support/CMakeLists.txt \ - --replace "add_subdirectory(DynamicLibrary)" "" - rm unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp - '' + '' - # Tweak tests to ignore namespace part of type to support - # gcc-12: https://gcc.gnu.org/PR103598. - # The change below mangles strings like: - # CHECK-NEXT: Starting llvm::Function pass manager run. - # to: - # CHECK-NEXT: Starting {{.*}}Function pass manager run. - for f in \ - test/Other/new-pass-manager.ll \ - test/Other/new-pm-defaults.ll \ - test/Other/new-pm-lto-defaults.ll \ - test/Other/new-pm-thinlto-defaults.ll \ - test/Other/pass-pipeline-parsing.ll \ - test/Transforms/Inline/cgscc-incremental-invalidate.ll \ - test/Transforms/Inline/clear-analyses.ll \ - ; do - echo "PATCH: $f" - substituteInPlace $f \ - --replace 'Starting llvm::' 'Starting {{.*}}' \ - --replace 'Finished llvm::' 'Finished {{.*}}' - done - ''; - - preConfigure = '' - # Workaround for configure flags that need to have spaces - cmakeFlagsArray+=( - -DLLVM_LIT_ARGS='-svj''${NIX_BUILD_CORES} --no-progress-bar' - ) - ''; - - # hacky fix: created binaries need to be run before installation - preBuild = '' - mkdir -p $out/ - ln -sv $PWD/lib $out - ''; - - cmakeBuildType = if debugVersion then "Debug" else "Release"; - - cmakeFlags = with stdenv; let - # These flags influence llvm-config's BuildVariables.inc in addition to the - # general build. We need to make sure these are also passed via - # CROSS_TOOLCHAIN_FLAGS_NATIVE when cross-compiling or llvm-config-native - # will return different results from the cross llvm-config. - # - # Some flags don't need to be repassed because LLVM already does so (like - # CMAKE_BUILD_TYPE), others are irrelevant to the result. - flagsForLlvmConfig = [ - "-DLLVM_INSTALL_CMAKE_DIR=${placeholder "dev"}/lib/cmake/llvm/" - "-DLLVM_ENABLE_RTTI=ON" - ] ++ optionals enableSharedLibraries [ - "-DLLVM_LINK_LLVM_DYLIB=ON" - ]; - in flagsForLlvmConfig ++ [ - "-DLLVM_INSTALL_UTILS=ON" # Needed by rustc - "-DLLVM_BUILD_TESTS=${if doCheck then "ON" else "OFF"}" - "-DLLVM_ENABLE_FFI=ON" - - "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" - "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}" - "-DTARGET_TRIPLE=${stdenv.hostPlatform.config}" - ] - ++ lib.optionals enableManpages [ - "-DLLVM_BUILD_DOCS=ON" - "-DLLVM_ENABLE_SPHINX=ON" - "-DSPHINX_OUTPUT_MAN=ON" - "-DSPHINX_OUTPUT_HTML=OFF" - "-DSPHINX_WARNINGS_AS_ERRORS=OFF" - ] ++ lib.optionals (enableGoldPlugin) [ - "-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include" - ] ++ lib.optionals (isDarwin) [ - "-DLLVM_ENABLE_LIBCXX=ON" - "-DCAN_TARGET_i386=false" - ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - "-DCMAKE_CROSSCOMPILING=True" - "-DLLVM_TABLEGEN=${buildLlvmTools.llvm}/bin/llvm-tblgen" - ( - let - nativeCC = pkgsBuildBuild.targetPackages.stdenv.cc; - nativeBintools = nativeCC.bintools.bintools; - nativeToolchainFlags = [ - "-DCMAKE_C_COMPILER=${nativeCC}/bin/${nativeCC.targetPrefix}cc" - "-DCMAKE_CXX_COMPILER=${nativeCC}/bin/${nativeCC.targetPrefix}c++" - "-DCMAKE_AR=${nativeBintools}/bin/${nativeBintools.targetPrefix}ar" - "-DCMAKE_STRIP=${nativeBintools}/bin/${nativeBintools.targetPrefix}strip" - "-DCMAKE_RANLIB=${nativeBintools}/bin/${nativeBintools.targetPrefix}ranlib" - ]; - # We need to repass the custom GNUInstallDirs values, otherwise CMake - # will choose them for us, leading to wrong results in llvm-config-native - nativeInstallFlags = [ - "-DCMAKE_INSTALL_PREFIX=${placeholder "out"}" - "-DCMAKE_INSTALL_BINDIR=${placeholder "out"}/bin" - "-DCMAKE_INSTALL_INCLUDEDIR=${placeholder "dev"}/include" - "-DCMAKE_INSTALL_LIBDIR=${placeholder "lib"}/lib" - "-DCMAKE_INSTALL_LIBEXECDIR=${placeholder "lib"}/libexec" - ]; - in "-DCROSS_TOOLCHAIN_FLAGS_NATIVE:list=" - + lib.concatStringsSep ";" (lib.concatLists [ - flagsForLlvmConfig - nativeToolchainFlags - nativeInstallFlags - ]) - ) - ]; - - postBuild = '' - rm -fR $out - ''; - - preCheck = '' - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD/lib - ''; - - postInstall = '' - mkdir -p $python/share - mv $out/share/opt-viewer $python/share/opt-viewer - moveToOutput "bin/llvm-config*" "$dev" - substituteInPlace "$dev/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \ - --replace "\''${_IMPORT_PREFIX}/lib/lib" "$lib/lib/lib" \ - --replace "$out/bin/llvm-config" "$dev/bin/llvm-config" - substituteInPlace "$dev/lib/cmake/llvm/LLVMConfig.cmake" \ - --replace 'set(LLVM_BINARY_DIR "''${LLVM_INSTALL_PREFIX}")' 'set(LLVM_BINARY_DIR "''${LLVM_INSTALL_PREFIX}'"$lib"'")' - '' - + optionalString (stdenv.isDarwin && enableSharedLibraries) '' - ${lib.concatMapStringsSep "\n" (v: '' - ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${v}.dylib - '') versionSuffixes} - '' - + optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' - cp NATIVE/bin/llvm-config $dev/bin/llvm-config-native - ''; - - doCheck = stdenv.isLinux && (!stdenv.isi686) - && (stdenv.hostPlatform == stdenv.buildPlatform); - - checkTarget = "check-all"; - - requiredSystemFeatures = [ "big-parallel" ]; - meta = llvm_meta // { - homepage = "https://llvm.org/"; - description = "A collection of modular and reusable compiler and toolchain technologies"; - longDescription = '' - The LLVM Project is a collection of modular and reusable compiler and - toolchain technologies. Despite its name, LLVM has little to do with - traditional virtual machines. The name "LLVM" itself is not an acronym; it - is the full name of the project. - LLVM began as a research project at the University of Illinois, with the - goal of providing a modern, SSA-based compilation strategy capable of - supporting both static and dynamic compilation of arbitrary programming - languages. Since then, LLVM has grown to be an umbrella project consisting - of a number of subprojects, many of which are being used in production by - a wide variety of commercial and open source projects as well as being - widely used in academic research. Code in the LLVM project is licensed - under the "Apache 2.0 License with LLVM exceptions". - ''; - }; -} // lib.optionalAttrs enableManpages { - pname = "llvm-manpages"; - - buildPhase = '' - make docs-llvm-man - ''; - - propagatedBuildInputs = []; - - installPhase = '' - make -C docs install - ''; - - outputs = [ "out" ]; - - doCheck = false; - - meta = llvm_meta // { - description = "man pages for LLVM ${version}"; - }; -}) diff --git a/pkgs/development/compilers/llvm/5/llvm/fix-gcc9.patch b/pkgs/development/compilers/llvm/5/llvm/fix-gcc9.patch deleted file mode 100644 index eaf71f1468d..00000000000 --- a/pkgs/development/compilers/llvm/5/llvm/fix-gcc9.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/lib/Target/Mips/MipsFastISel.cpp b/lib/Target/Mips/MipsFastISel.cpp -index f79cb0e6..c6279046 100644 ---- a/lib/Target/Mips/MipsFastISel.cpp -+++ b/lib/Target/Mips/MipsFastISel.cpp -@@ -70,6 +70,7 @@ - #include <cassert> - #include <cstdint> - #include <new> -+#include <array> - - #define DEBUG_TYPE "mips-fastisel" - -@@ -1309,13 +1310,13 @@ bool MipsFastISel::fastLowerArguments() { - return false; - } - -- const ArrayRef<MCPhysReg> GPR32ArgRegs = {Mips::A0, Mips::A1, Mips::A2, -- Mips::A3}; -- const ArrayRef<MCPhysReg> FGR32ArgRegs = {Mips::F12, Mips::F14}; -- const ArrayRef<MCPhysReg> AFGR64ArgRegs = {Mips::D6, Mips::D7}; -- ArrayRef<MCPhysReg>::iterator NextGPR32 = GPR32ArgRegs.begin(); -- ArrayRef<MCPhysReg>::iterator NextFGR32 = FGR32ArgRegs.begin(); -- ArrayRef<MCPhysReg>::iterator NextAFGR64 = AFGR64ArgRegs.begin(); -+ std::array<MCPhysReg, 4> GPR32ArgRegs = {{Mips::A0, Mips::A1, Mips::A2, -+ Mips::A3}}; -+ std::array<MCPhysReg, 2> FGR32ArgRegs = {{Mips::F12, Mips::F14}}; -+ std::array<MCPhysReg, 2> AFGR64ArgRegs = {{Mips::D6, Mips::D7}}; -+ auto NextGPR32 = GPR32ArgRegs.begin(); -+ auto NextFGR32 = FGR32ArgRegs.begin(); -+ auto NextAFGR64 = AFGR64ArgRegs.begin(); - - struct AllocatedReg { - const TargetRegisterClass *RC; diff --git a/pkgs/development/compilers/llvm/5/llvm/gnu-install-dirs-polly.patch b/pkgs/development/compilers/llvm/5/llvm/gnu-install-dirs-polly.patch deleted file mode 100644 index 40f6fa06036..00000000000 --- a/pkgs/development/compilers/llvm/5/llvm/gnu-install-dirs-polly.patch +++ /dev/null @@ -1,106 +0,0 @@ -diff --git a/tools/polly/CMakeLists.txt b/tools/polly/CMakeLists.txt -index 9ddc0f7ff81d..7ca45f286d47 100644 ---- a/tools/polly/CMakeLists.txt -+++ b/tools/polly/CMakeLists.txt -@@ -2,7 +2,11 @@ - if (NOT DEFINED LLVM_MAIN_SRC_DIR) - project(Polly) - cmake_minimum_required(VERSION 3.4.3) -+endif() -+ -+include(GNUInstallDirs) - -+if (NOT DEFINED LLVM_MAIN_SRC_DIR) - # Where is LLVM installed? - find_package(LLVM CONFIG REQUIRED) - set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${LLVM_CMAKE_DIR}) -@@ -157,14 +161,14 @@ include_directories( - - if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) - install(DIRECTORY include/ -- DESTINATION include -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} - FILES_MATCHING - PATTERN "*.h" - PATTERN ".svn" EXCLUDE - ) - - install(DIRECTORY ${POLLY_BINARY_DIR}/include/ -- DESTINATION include -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} - FILES_MATCHING - PATTERN "*.h" - PATTERN "CMakeFiles" EXCLUDE -diff --git a/tools/polly/cmake/CMakeLists.txt b/tools/polly/cmake/CMakeLists.txt -index 969292cd6b00..d7aea77bdd20 100644 ---- a/tools/polly/cmake/CMakeLists.txt -+++ b/tools/polly/cmake/CMakeLists.txt -@@ -79,18 +79,18 @@ file(GENERATE - - # Generate PollyConfig.cmake for the install tree. - unset(POLLY_EXPORTS) --set(POLLY_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}") -+set(POLLY_INSTALL_PREFIX "") - set(POLLY_CONFIG_LLVM_CMAKE_DIR "${LLVM_BINARY_DIR}/${LLVM_INSTALL_PACKAGE_DIR}") --set(POLLY_CONFIG_CMAKE_DIR "${POLLY_INSTALL_PREFIX}/${POLLY_INSTALL_PACKAGE_DIR}") --set(POLLY_CONFIG_LIBRARY_DIRS "${POLLY_INSTALL_PREFIX}/lib${LLVM_LIBDIR_SUFFIX}") -+set(POLLY_CONFIG_CMAKE_DIR "${POLLY_INSTALL_PREFIX}${CMAKE_INSTALL_PREFIX}/${POLLY_INSTALL_PACKAGE_DIR}") -+set(POLLY_CONFIG_LIBRARY_DIRS "${POLLY_INSTALL_PREFIX}${CMAKE_INSTALL_FULL_LIBDIR}${LLVM_LIBDIR_SUFFIX}") - if (POLLY_BUNDLED_ISL) - set(POLLY_CONFIG_INCLUDE_DIRS -- "${POLLY_INSTALL_PREFIX}/include" -- "${POLLY_INSTALL_PREFIX}/include/polly" -+ "${POLLY_INSTALL_PREFIX}${CMAKE_INSTALL_FULL_LIBDIR}" -+ "${POLLY_INSTALL_PREFIX}${CMAKE_INSTALL_FULL_LIBDIR}/polly" - ) - else() - set(POLLY_CONFIG_INCLUDE_DIRS -- "${POLLY_INSTALL_PREFIX}/include" -+ "${POLLY_INSTALL_PREFIX}${CMAKE_INSTALL_FULL_INCLUDEDIR}" - ${ISL_INCLUDE_DIRS} - ) - endif() -@@ -100,12 +100,12 @@ endif() - foreach(tgt IN LISTS POLLY_CONFIG_EXPORTED_TARGETS) - get_target_property(tgt_type ${tgt} TYPE) - if (tgt_type STREQUAL "EXECUTABLE") -- set(tgt_prefix "bin/") -+ set(tgt_prefix "${CMAKE_INSTALL_BINDIR}/") - else() -- set(tgt_prefix "lib/") -+ set(tgt_prefix "${CMAKE_INSTALL_LIBDIR}/") - endif() - -- set(tgt_path "${CMAKE_INSTALL_PREFIX}/${tgt_prefix}$<TARGET_FILE_NAME:${tgt}>") -+ set(tgt_path "${tgt_prefix}$<TARGET_FILE_NAME:${tgt}>") - file(RELATIVE_PATH tgt_path ${POLLY_CONFIG_CMAKE_DIR} ${tgt_path}) - - if (NOT tgt_type STREQUAL "INTERFACE_LIBRARY") -diff --git a/tools/polly/cmake/polly_macros.cmake b/tools/polly/cmake/polly_macros.cmake -index 32bed50bb060..cca5bfff4970 100644 ---- a/tools/polly/cmake/polly_macros.cmake -+++ b/tools/polly/cmake/polly_macros.cmake -@@ -44,8 +44,8 @@ macro(add_polly_library name) - if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY OR ${name} STREQUAL "LLVMPolly") - install(TARGETS ${name} - EXPORT LLVMExports -- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} -- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX}) -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) - endif() - set_property(GLOBAL APPEND PROPERTY LLVM_EXPORTS ${name}) - endmacro(add_polly_library) -diff --git a/tools/polly/lib/External/CMakeLists.txt b/tools/polly/lib/External/CMakeLists.txt -index 286c04fba287..07905e68f595 100644 ---- a/tools/polly/lib/External/CMakeLists.txt -+++ b/tools/polly/lib/External/CMakeLists.txt -@@ -268,7 +268,7 @@ if (POLLY_BUNDLED_ISL) - install(DIRECTORY - ${ISL_SOURCE_DIR}/include/ - ${ISL_BINARY_DIR}/include/ -- DESTINATION include/polly -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/polly - FILES_MATCHING - PATTERN "*.h" - PATTERN "CMakeFiles" EXCLUDE diff --git a/pkgs/development/compilers/llvm/5/llvm/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/5/llvm/gnu-install-dirs.patch deleted file mode 100644 index 3f6d6acb83f..00000000000 --- a/pkgs/development/compilers/llvm/5/llvm/gnu-install-dirs.patch +++ /dev/null @@ -1,386 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index c1e03aed4809..8b8bbb8c403e 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -279,15 +279,21 @@ if (CMAKE_BUILD_TYPE AND - message(FATAL_ERROR "Invalid value for CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}") - endif() - -+include(GNUInstallDirs) -+ - set(LLVM_LIBDIR_SUFFIX "" CACHE STRING "Define suffix of library directory name (32/64)" ) - --set(LLVM_TOOLS_INSTALL_DIR "bin" CACHE STRING "Path for binary subdirectory (defaults to 'bin')") -+set(LLVM_TOOLS_INSTALL_DIR "${CMAKE_INSTALL_BINDIR}" CACHE STRING -+ "Path for binary subdirectory (defaults to 'bin')") - mark_as_advanced(LLVM_TOOLS_INSTALL_DIR) - - set(LLVM_UTILS_INSTALL_DIR "bin" CACHE STRING - "Path to install LLVM utilities (enabled by LLVM_INSTALL_UTILS=ON) (defaults to LLVM_TOOLS_INSTALL_DIR)") - mark_as_advanced(LLVM_TOOLS_INSTALL_DIR) - -+set(LLVM_INSTALL_CMAKE_DIR "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/cmake/llvm" CACHE STRING -+ "Path for CMake subdirectory (defaults to lib/cmake/llvm)" ) -+ - # They are used as destination of target generators. - set(LLVM_RUNTIME_OUTPUT_INTDIR ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin) - set(LLVM_LIBRARY_OUTPUT_INTDIR ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX}) -@@ -512,9 +518,9 @@ option (LLVM_ENABLE_DOXYGEN "Use doxygen to generate llvm API documentation." OF - option (LLVM_ENABLE_SPHINX "Use Sphinx to generate llvm documentation." OFF) - option (LLVM_ENABLE_OCAMLDOC "Build OCaml bindings documentation." ON) - --set(LLVM_INSTALL_DOXYGEN_HTML_DIR "share/doc/llvm/doxygen-html" -+set(LLVM_INSTALL_DOXYGEN_HTML_DIR "${CMAKE_INSTALL_DOCDIR}/${project}/doxygen-html" - CACHE STRING "Doxygen-generated HTML documentation install directory") --set(LLVM_INSTALL_OCAMLDOC_HTML_DIR "share/doc/llvm/ocaml-html" -+set(LLVM_INSTALL_OCAMLDOC_HTML_DIR "${CMAKE_INSTALL_DOCDIR}/${project}/ocaml-html" - CACHE STRING "OCamldoc-generated HTML documentation install directory") - - option (LLVM_BUILD_EXTERNAL_COMPILER_RT -@@ -945,7 +951,7 @@ add_subdirectory(cmake/modules) - - if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) - install(DIRECTORY include/llvm include/llvm-c -- DESTINATION include -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} - COMPONENT llvm-headers - FILES_MATCHING - PATTERN "*.def" -@@ -957,7 +963,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) - ) - - install(DIRECTORY ${LLVM_INCLUDE_DIR}/llvm -- DESTINATION include -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} - COMPONENT llvm-headers - FILES_MATCHING - PATTERN "*.def" -diff --git a/cmake/modules/AddLLVM.cmake b/cmake/modules/AddLLVM.cmake -index 1c922651b133..d555fd627a4f 100644 ---- a/cmake/modules/AddLLVM.cmake -+++ b/cmake/modules/AddLLVM.cmake -@@ -589,11 +589,11 @@ macro(add_llvm_library name) - else() - if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY OR ${name} STREQUAL "LTO" OR - (LLVM_LINK_LLVM_DYLIB AND ${name} STREQUAL "LLVM")) -- set(install_dir lib${LLVM_LIBDIR_SUFFIX}) -+ set(install_dir ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) - if(ARG_SHARED OR BUILD_SHARED_LIBS) - if(WIN32 OR CYGWIN OR MINGW) - set(install_type RUNTIME) -- set(install_dir bin) -+ set(install_dir ${CMAKE_INSTALL_BINDIR}) - else() - set(install_type LIBRARY) - endif() -@@ -637,9 +637,9 @@ macro(add_llvm_loadable_module name) - if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) - if(WIN32 OR CYGWIN) - # DLL platform -- set(dlldir "bin") -+ set(dlldir "${CMAKE_INSTALL_BINDIR}") - else() -- set(dlldir "lib${LLVM_LIBDIR_SUFFIX}") -+ set(dlldir "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}") - endif() - - if(${name} IN_LIST LLVM_DISTRIBUTION_COMPONENTS OR -@@ -651,7 +651,7 @@ macro(add_llvm_loadable_module name) - install(TARGETS ${name} - ${export_to_llvmexports} - LIBRARY DESTINATION ${dlldir} -- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX}) -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) - endif() - set_property(GLOBAL APPEND PROPERTY LLVM_EXPORTS ${name}) - endif() -@@ -864,7 +864,7 @@ macro(add_llvm_example name) - endif() - add_llvm_executable(${name} ${ARGN}) - if( LLVM_BUILD_EXAMPLES ) -- install(TARGETS ${name} RUNTIME DESTINATION examples) -+ install(TARGETS ${name} RUNTIME DESTINATION ${CMAKE_INSTALL_DOCDIR}/examples) - endif() - set_target_properties(${name} PROPERTIES FOLDER "Examples") - endmacro(add_llvm_example name) -@@ -1275,7 +1275,7 @@ function(llvm_install_library_symlink name dest type) - set(full_name ${CMAKE_${type}_LIBRARY_PREFIX}${name}${CMAKE_${type}_LIBRARY_SUFFIX}) - set(full_dest ${CMAKE_${type}_LIBRARY_PREFIX}${dest}${CMAKE_${type}_LIBRARY_SUFFIX}) - -- set(output_dir lib${LLVM_LIBDIR_SUFFIX}) -+ set(output_dir ${CMAKE_INSTALL_FULL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) - if(WIN32 AND "${type}" STREQUAL "SHARED") - set(output_dir bin) - endif() -@@ -1293,7 +1293,7 @@ function(llvm_install_library_symlink name dest type) - endif() - endfunction() - --function(llvm_install_symlink name dest) -+function(llvm_install_symlink name dest output_dir) - cmake_parse_arguments(ARG "ALWAYS_GENERATE" "COMPONENT" "" ${ARGN}) - foreach(path ${CMAKE_MODULE_PATH}) - if(EXISTS ${path}/LLVMInstallSymlink.cmake) -@@ -1316,7 +1316,7 @@ function(llvm_install_symlink name dest) - set(full_dest ${dest}${CMAKE_EXECUTABLE_SUFFIX}) - - install(SCRIPT ${INSTALL_SYMLINK} -- CODE "install_symlink(${full_name} ${full_dest} ${LLVM_TOOLS_INSTALL_DIR})" -+ CODE "install_symlink(${full_name} ${full_dest} ${output_dir})" - COMPONENT ${component}) - - if (NOT CMAKE_CONFIGURATION_TYPES AND NOT ARG_ALWAYS_GENERATE) -@@ -1400,7 +1400,8 @@ function(add_llvm_tool_symlink link_name target) - endif() - - if ((TOOL_IS_TOOLCHAIN OR NOT LLVM_INSTALL_TOOLCHAIN_ONLY) AND LLVM_BUILD_TOOLS) -- llvm_install_symlink(${link_name} ${target}) -+ GNUInstallDirs_get_absolute_install_dir(output_dir LLVM_TOOLS_INSTALL_DIR) -+ llvm_install_symlink(${link_name} ${target} ${output_dir}) - endif() - endif() - endfunction() -@@ -1452,9 +1453,9 @@ function(llvm_setup_rpath name) - - if (APPLE) - set(_install_name_dir INSTALL_NAME_DIR "@rpath") -- set(_install_rpath "@loader_path/../lib" ${extra_libdir}) -+ set(_install_rpath "@loader_path/../${CMAKE_INSTALL_LIBDIR}" ${extra_libdir}) - elseif(UNIX) -- set(_install_rpath "\$ORIGIN/../lib${LLVM_LIBDIR_SUFFIX}" ${extra_libdir}) -+ set(_install_rpath "\$ORIGIN/../${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" ${extra_libdir}) - if(${CMAKE_SYSTEM_NAME} MATCHES "(FreeBSD|DragonFly)") - set_property(TARGET ${name} APPEND_STRING PROPERTY - LINK_FLAGS " -Wl,-z,origin ") -diff --git a/cmake/modules/AddOCaml.cmake b/cmake/modules/AddOCaml.cmake -index 1d8094cc505f..afdbe6e6d19c 100644 ---- a/cmake/modules/AddOCaml.cmake -+++ b/cmake/modules/AddOCaml.cmake -@@ -140,9 +140,9 @@ function(add_ocaml_library name) - endforeach() - - if( APPLE ) -- set(ocaml_rpath "@executable_path/../../../lib${LLVM_LIBDIR_SUFFIX}") -+ set(ocaml_rpath "@executable_path/../../../${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}") - elseif( UNIX ) -- set(ocaml_rpath "\\$ORIGIN/../../../lib${LLVM_LIBDIR_SUFFIX}") -+ set(ocaml_rpath "\\$ORIGIN/../../../${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}") - endif() - list(APPEND ocaml_flags "-ldopt" "-Wl,-rpath,${ocaml_rpath}") - -diff --git a/cmake/modules/AddSphinxTarget.cmake b/cmake/modules/AddSphinxTarget.cmake -index 4540c5c36c8e..4cefb17fbd55 100644 ---- a/cmake/modules/AddSphinxTarget.cmake -+++ b/cmake/modules/AddSphinxTarget.cmake -@@ -73,7 +73,7 @@ function (add_sphinx_target builder project) - - elseif (builder STREQUAL html) - string(TOUPPER "${project}" project_upper) -- set(${project_upper}_INSTALL_SPHINX_HTML_DIR "share/doc/${project}/html" -+ set(${project_upper}_INSTALL_SPHINX_HTML_DIR "${CMAKE_INSTALL_DOCDIR}/${project}/html" - CACHE STRING "HTML documentation install directory for ${project}") - - # '/.' indicates: copy the contents of the directory directly into -diff --git a/cmake/modules/CMakeLists.txt b/cmake/modules/CMakeLists.txt -index ac4b0b7c0304..21a6a3da8667 100644 ---- a/cmake/modules/CMakeLists.txt -+++ b/cmake/modules/CMakeLists.txt -@@ -1,4 +1,4 @@ --set(LLVM_INSTALL_PACKAGE_DIR lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm) -+set(LLVM_INSTALL_PACKAGE_DIR ${LLVM_INSTALL_CMAKE_DIR} CACHE STRING "Path for CMake subdirectory (defaults to 'cmake/llvm')") - set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/${LLVM_INSTALL_PACKAGE_DIR}") - - # First for users who use an installed LLVM, create the LLVMExports.cmake file. -@@ -84,11 +84,11 @@ foreach(p ${_count}) - set(LLVM_CONFIG_CODE "${LLVM_CONFIG_CODE} - get_filename_component(LLVM_INSTALL_PREFIX \"\${LLVM_INSTALL_PREFIX}\" PATH)") - endforeach(p) --set(LLVM_CONFIG_INCLUDE_DIRS "\${LLVM_INSTALL_PREFIX}/include") --set(LLVM_CONFIG_LIBRARY_DIRS "\${LLVM_INSTALL_PREFIX}/lib\${LLVM_LIBDIR_SUFFIX}") -+set(LLVM_CONFIG_INCLUDE_DIRS "\${LLVM_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}") -+set(LLVM_CONFIG_LIBRARY_DIRS "\${LLVM_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}\${LLVM_LIBDIR_SUFFIX}") - set(LLVM_CONFIG_CMAKE_DIR "\${LLVM_INSTALL_PREFIX}/${LLVM_INSTALL_PACKAGE_DIR}") - set(LLVM_CONFIG_BINARY_DIR "\${LLVM_INSTALL_PREFIX}") --set(LLVM_CONFIG_TOOLS_BINARY_DIR "\${LLVM_INSTALL_PREFIX}/bin") -+set(LLVM_CONFIG_TOOLS_BINARY_DIR "\${LLVM_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}") - set(LLVM_CONFIG_EXPORTS_FILE "\${LLVM_CMAKE_DIR}/LLVMExports.cmake") - set(LLVM_CONFIG_EXPORTS "${LLVM_EXPORTS}") - configure_file( -diff --git a/cmake/modules/LLVMInstallSymlink.cmake b/cmake/modules/LLVMInstallSymlink.cmake -index 482697b06baf..af2ac1e6c979 100644 ---- a/cmake/modules/LLVMInstallSymlink.cmake -+++ b/cmake/modules/LLVMInstallSymlink.cmake -@@ -10,7 +10,7 @@ function(install_symlink name target outdir) - set(LINK_OR_COPY copy) - endif() - -- set(bindir "${DESTDIR}${CMAKE_INSTALL_PREFIX}/${outdir}/") -+ set(bindir "${DESTDIR}${outdir}/") - - message("Creating ${name}") - -diff --git a/docs/CMake.rst b/docs/CMake.rst -index b6ebf37adc92..34c73d2869e0 100644 ---- a/docs/CMake.rst -+++ b/docs/CMake.rst -@@ -196,7 +196,7 @@ CMake manual, or execute ``cmake --help-variable VARIABLE_NAME``. - **LLVM_LIBDIR_SUFFIX**:STRING - Extra suffix to append to the directory where libraries are to be - installed. On a 64-bit architecture, one could use ``-DLLVM_LIBDIR_SUFFIX=64`` -- to install libraries to ``/usr/lib64``. -+ to install libraries to ``/usr/lib64``. See also ``CMAKE_INSTALL_LIBDIR``. - - **CMAKE_C_FLAGS**:STRING - Extra flags to use when compiling C source files. -@@ -461,8 +461,8 @@ LLVM-specific variables - - **LLVM_INSTALL_DOXYGEN_HTML_DIR**:STRING - The path to install Doxygen-generated HTML documentation to. This path can -- either be absolute or relative to the CMAKE_INSTALL_PREFIX. Defaults to -- `share/doc/llvm/doxygen-html`. -+ either be absolute or relative to the ``CMAKE_INSTALL_PREFIX``. Defaults to -+ `${CMAKE_INSTALL_DOCDIR}/${project}/doxygen-html`. - - **LLVM_ENABLE_SPHINX**:BOOL - If specified, CMake will search for the ``sphinx-build`` executable and will make -@@ -493,13 +493,33 @@ LLVM-specific variables - - **LLVM_INSTALL_SPHINX_HTML_DIR**:STRING - The path to install Sphinx-generated HTML documentation to. This path can -- either be absolute or relative to the CMAKE_INSTALL_PREFIX. Defaults to -- `share/doc/llvm/html`. -+ either be absolute or relative to the ``CMAKE_INSTALL_PREFIX``. Defaults to -+ `${CMAKE_INSTALL_DOCDIR}/${project}/html`. - - **LLVM_INSTALL_OCAMLDOC_HTML_DIR**:STRING - The path to install OCamldoc-generated HTML documentation to. This path can -- either be absolute or relative to the CMAKE_INSTALL_PREFIX. Defaults to -- `share/doc/llvm/ocaml-html`. -+ either be absolute or relative to the ``CMAKE_INSTALL_PREFIX``. Defaults to -+ `${CMAKE_INSTALL_DOCDIR}/${project}/ocaml-html`. -+ -+**CMAKE_INSTALL_BINDIR**:STRING -+ The path to install binary tools, relative to the ``CMAKE_INSTALL_PREFIX``. -+ Defaults to `bin`. -+ -+**CMAKE_INSTALL_LIBDIR**:STRING -+ The path to install libraries, relative to the ``CMAKE_INSTALL_PREFIX``. -+ Defaults to `lib`. -+ -+**CMAKE_INSTALL_INCLUDEDIR**:STRING -+ The path to install header files, relative to the ``CMAKE_INSTALL_PREFIX``. -+ Defaults to `include`. -+ -+**CMAKE_INSTALL_DOCDIR**:STRING -+ The path to install documentation, relative to the ``CMAKE_INSTALL_PREFIX``. -+ Defaults to `share/doc`. -+ -+**CMAKE_INSTALL_MANDIR**:STRING -+ The path to install manpage files, relative to the ``CMAKE_INSTALL_PREFIX``. -+ Defaults to `share/man`. - - **LLVM_CREATE_XCODE_TOOLCHAIN**:BOOL - OS X Only: If enabled CMake will generate a target named -@@ -651,9 +671,11 @@ the ``cmake`` command or by setting it directly in ``ccmake`` or ``cmake-gui``). - - This file is available in two different locations. - --* ``<INSTALL_PREFIX>/lib/cmake/llvm/LLVMConfig.cmake`` where -- ``<INSTALL_PREFIX>`` is the install prefix of an installed version of LLVM. -- On Linux typically this is ``/usr/lib/cmake/llvm/LLVMConfig.cmake``. -+* ``<LLVM_INSTALL_PACKAGE_DIR>LLVMConfig.cmake`` where -+ ``<LLVM_INSTALL_PACKAGE_DIR>`` is the location where LLVM CMake modules are -+ installed as part of an installed version of LLVM. This is typically -+ ``cmake/llvm/`` within the lib directory. On Linux, this is typically -+ ``/usr/lib/cmake/llvm/LLVMConfig.cmake``. - - * ``<LLVM_BUILD_ROOT>/lib/cmake/llvm/LLVMConfig.cmake`` where - ``<LLVM_BUILD_ROOT>`` is the root of the LLVM build tree. **Note: this is only -diff --git a/include/llvm/CMakeLists.txt b/include/llvm/CMakeLists.txt -index 1d5ca3ba92b0..026f5453c1da 100644 ---- a/include/llvm/CMakeLists.txt -+++ b/include/llvm/CMakeLists.txt -@@ -4,5 +4,5 @@ add_subdirectory(Support) - # If we're doing an out-of-tree build, copy a module map for generated - # header files into the build area. - if (NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}") -- configure_file(module.modulemap.build module.modulemap COPYONLY) -+ configure_file(module.modulemap.build ${LLVM_INCLUDE_DIR}/module.modulemap COPYONLY) - endif (NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}") -diff --git a/tools/llvm-config/BuildVariables.inc.in b/tools/llvm-config/BuildVariables.inc.in -index f201e1f7bff0..4582ed556a02 100644 ---- a/tools/llvm-config/BuildVariables.inc.in -+++ b/tools/llvm-config/BuildVariables.inc.in -@@ -24,6 +24,10 @@ - #define LLVM_CXXFLAGS "@LLVM_CXXFLAGS@" - #define LLVM_BUILDMODE "@LLVM_BUILDMODE@" - #define LLVM_LIBDIR_SUFFIX "@LLVM_LIBDIR_SUFFIX@" -+#define LLVM_INSTALL_BINDIR "@CMAKE_INSTALL_BINDIR@" -+#define LLVM_INSTALL_LIBDIR "@CMAKE_INSTALL_LIBDIR@" -+#define LLVM_INSTALL_INCLUDEDIR "@CMAKE_INSTALL_INCLUDEDIR@" -+#define LLVM_INSTALL_CMAKEDIR "@LLVM_INSTALL_CMAKE_DIR@" - #define LLVM_TARGETS_BUILT "@LLVM_TARGETS_BUILT@" - #define LLVM_SYSTEM_LIBS "@LLVM_SYSTEM_LIBS@" - #define LLVM_BUILD_SYSTEM "@LLVM_BUILD_SYSTEM@" -diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp -index 08b096afb052..2deae0dcfacc 100644 ---- a/tools/llvm-config/llvm-config.cpp -+++ b/tools/llvm-config/llvm-config.cpp -@@ -332,12 +332,26 @@ int main(int argc, char **argv) { - ("-I" + ActiveIncludeDir + " " + "-I" + ActiveObjRoot + "/include"); - } else { - ActivePrefix = CurrentExecPrefix; -- ActiveIncludeDir = ActivePrefix + "/include"; -- SmallString<256> path(StringRef(LLVM_TOOLS_INSTALL_DIR)); -- sys::fs::make_absolute(ActivePrefix, path); -- ActiveBinDir = path.str(); -- ActiveLibDir = ActivePrefix + "/lib" + LLVM_LIBDIR_SUFFIX; -- ActiveCMakeDir = ActiveLibDir + "/cmake/llvm"; -+ { -+ SmallString<256> path(StringRef(LLVM_INSTALL_INCLUDEDIR)); -+ sys::fs::make_absolute(ActivePrefix, path); -+ ActiveIncludeDir = std::string(path.str()); -+ } -+ { -+ SmallString<256> path(StringRef(LLVM_INSTALL_BINDIR)); -+ sys::fs::make_absolute(ActivePrefix, path); -+ ActiveBinDir = std::string(path.str()); -+ } -+ { -+ SmallString<256> path(StringRef(LLVM_INSTALL_LIBDIR LLVM_LIBDIR_SUFFIX)); -+ sys::fs::make_absolute(ActivePrefix, path); -+ ActiveLibDir = std::string(path.str()); -+ } -+ { -+ SmallString<256> path(StringRef(LLVM_INSTALL_CMAKEDIR)); -+ sys::fs::make_absolute(ActivePrefix, path); -+ ActiveCMakeDir = std::string(path.str()); -+ } - ActiveIncludeOption = "-I" + ActiveIncludeDir; - } - -diff --git a/tools/lto/CMakeLists.txt b/tools/lto/CMakeLists.txt -index 6e913519a809..85641eef721f 100644 ---- a/tools/lto/CMakeLists.txt -+++ b/tools/lto/CMakeLists.txt -@@ -19,7 +19,7 @@ set(LLVM_EXPORTED_SYMBOL_FILE ${CMAKE_CURRENT_SOURCE_DIR}/lto.exports) - add_llvm_library(LTO SHARED ${SOURCES} DEPENDS intrinsics_gen) - - install(FILES ${LLVM_MAIN_INCLUDE_DIR}/llvm-c/lto.h -- DESTINATION include/llvm-c -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/llvm-c - COMPONENT LTO) - - if (APPLE) -diff --git a/tools/opt-viewer/CMakeLists.txt b/tools/opt-viewer/CMakeLists.txt -index 19b606933082..27b9f71b3d79 100644 ---- a/tools/opt-viewer/CMakeLists.txt -+++ b/tools/opt-viewer/CMakeLists.txt -@@ -8,6 +8,6 @@ set (files - - foreach (file ${files}) - install(PROGRAMS ${file} -- DESTINATION share/opt-viewer -+ DESTINATION ${CMAKE_INSTALL_DATADIR}/opt-viewer - COMPONENT opt-viewer) - endforeach (file) diff --git a/pkgs/development/compilers/llvm/5/openmp/default.nix b/pkgs/development/compilers/llvm/5/openmp/default.nix deleted file mode 100644 index 900e920173f..00000000000 --- a/pkgs/development/compilers/llvm/5/openmp/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib -, stdenv -, llvm_meta -, fetch -, cmake -, llvm -, targetLlvm -, perl -, version -}: - -stdenv.mkDerivation { - pname = "openmp"; - inherit version; - - src = fetch "openmp" "0p2n52676wlq6y9q99n5pivq6pvvda1p994r69fxj206ahn59jir"; - - nativeBuildInputs = [ cmake perl ]; - buildInputs = [ - (if stdenv.buildPlatform == stdenv.hostPlatform then llvm else targetLlvm) - ]; - - meta = llvm_meta // { - homepage = "https://openmp.llvm.org/"; - description = "Support for the OpenMP language"; - longDescription = '' - The OpenMP subproject of LLVM contains the components required to build an - executable OpenMP program that are outside the compiler itself. - Contains the code for the runtime library against which code compiled by - "clang -fopenmp" must be linked before it can run and the library that - supports offload to target devices. - ''; - # "All of the code is dual licensed under the MIT license and the UIUC - # License (a BSD-like license)": - license = with lib.licenses; [ mit ncsa ]; - }; -} diff --git a/pkgs/development/compilers/llvm/7/lldb/default.nix b/pkgs/development/compilers/llvm/7/lldb/default.nix index 0a0aa3be18a..02e3cdcb8eb 100644 --- a/pkgs/development/compilers/llvm/7/lldb/default.nix +++ b/pkgs/development/compilers/llvm/7/lldb/default.nix @@ -52,7 +52,11 @@ stdenv.mkDerivation rec { ] ++ lib.optionals stdenv.isDarwin [ darwin.libobjc darwin.apple_sdk.libs.xpc - darwin.apple_sdk.frameworks.Foundation darwin.bootstrap_cmds darwin.apple_sdk.frameworks.Carbon darwin.apple_sdk.frameworks.Cocoa + darwin.apple_sdk.frameworks.Foundation + darwin.bootstrap_cmds + darwin.apple_sdk.frameworks.Carbon + darwin.apple_sdk.frameworks.Cocoa + darwin.apple_sdk.frameworks.DebugSymbols ]; CXXFLAGS = "-fno-rtti"; diff --git a/pkgs/development/compilers/lunarml/default.nix b/pkgs/development/compilers/lunarml/default.nix index 35ebea77782..1fa448fe9d8 100644 --- a/pkgs/development/compilers/lunarml/default.nix +++ b/pkgs/development/compilers/lunarml/default.nix @@ -6,7 +6,7 @@ }: let - version = "0.0.20230924"; + version = "0.0.20231113"; in stdenvNoCC.mkDerivation { inherit version; @@ -17,7 +17,7 @@ stdenvNoCC.mkDerivation { owner = "minoki"; repo = "LunarML"; rev = "refs/tags/v${version}"; - sha256 = "QN5iJEpJJZZuUfY/z57bpOQHDU31ecmJPWQtkXsLmDg="; + hash = "sha256-LmS+pkdCraY8sor+lsq/vCODFyVneKkZqjZqbJ1trb4="; }; outputs = [ "out" "doc" ]; diff --git a/pkgs/development/compilers/mcpp/default.nix b/pkgs/development/compilers/mcpp/default.nix index 0f556f85daa..e8eb62a15f1 100644 --- a/pkgs/development/compilers/mcpp/default.nix +++ b/pkgs/development/compilers/mcpp/default.nix @@ -14,6 +14,10 @@ stdenv.mkDerivation (finalAttrs: { hash= "sha256-T4feegblOeG+NU+c+PAobf8HT8KDSfcINkRAa1hNpkY="; }; + patches = [ + ./readlink.patch + ]; + configureFlags = [ "--enable-mcpplib" ]; meta = with lib; { diff --git a/pkgs/development/compilers/mcpp/readlink.patch b/pkgs/development/compilers/mcpp/readlink.patch new file mode 100644 index 00000000000..0f5fc6d7e96 --- /dev/null +++ b/pkgs/development/compilers/mcpp/readlink.patch @@ -0,0 +1,24 @@ +From 1c4b0f26614bff331eb8a9f2b514309af6f31fd0 Mon Sep 17 00:00:00 2001 +From: Jose <pepone@users.noreply.github.com> +Date: Mon, 26 Jun 2023 16:43:43 +0200 +Subject: [PATCH] Add 'unistd' header for readlink (#8) + +--- + src/system.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/src/system.c b/src/system.c +index a3501f9..646caf6 100644 +--- a/src/system.c ++++ b/src/system.c +@@ -37,6 +37,11 @@ + * 2. append the system-dependent routines in this file. + */ ++ ++#ifndef _MSC_VER ++# include <unistd.h> // For readlink() ++#endif ++ + #if PREPROCESSED + #include "mcpp.H" + #else diff --git a/pkgs/development/compilers/mrustc/bootstrap.nix b/pkgs/development/compilers/mrustc/bootstrap.nix index a8bf26bacdf..0996702ec62 100644 --- a/pkgs/development/compilers/mrustc/bootstrap.nix +++ b/pkgs/development/compilers/mrustc/bootstrap.nix @@ -2,7 +2,6 @@ , fetchurl , mrustc , mrustc-minicargo -, rust , llvm_12 , llvmPackages_12 , libffi @@ -74,7 +73,7 @@ stdenv.mkDerivation rec { "MRUSTC=${mrustc}/bin/mrustc" #"MINICARGO=${mrustc-minicargo}/bin/minicargo" # FIXME: we need to rebuild minicargo locally so --manifest-overrides is applied "LLVM_CONFIG=${llvm_12.dev}/bin/llvm-config" - "RUSTC_TARGET=${rust.toRustTarget stdenv.targetPlatform}" + "RUSTC_TARGET=${stdenv.targetPlatform.rust.rustcTarget}" ]; buildPhase = '' @@ -129,7 +128,7 @@ stdenv.mkDerivation rec { cp run_rustc/${outputDir}/prefix/bin/rustc_binary $out/bin/rustc cp -r run_rustc/${outputDir}/prefix/lib/* $out/lib/ - cp $out/lib/rustlib/${rust.toRustTarget stdenv.targetPlatform}/lib/*.so $out/lib/ + cp $out/lib/rustlib/${stdenv.targetPlatform.rust.rustcTarget}/lib/*.so $out/lib/ runHook postInstall ''; @@ -146,4 +145,3 @@ stdenv.mkDerivation rec { platforms = [ "x86_64-linux" ]; }; } - diff --git a/pkgs/development/compilers/neko/default.nix b/pkgs/development/compilers/neko/default.nix index 40e39d411d6..fff5762a38d 100644 --- a/pkgs/development/compilers/neko/default.nix +++ b/pkgs/development/compilers/neko/default.nix @@ -29,6 +29,9 @@ stdenv.mkDerivation rec { ++ lib.optionals stdenv.isDarwin [ pkgs.darwin.apple_sdk.frameworks.Security pkgs.darwin.apple_sdk.frameworks.Carbon]; cmakeFlags = [ "-DRUN_LDCONFIG=OFF" ]; + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; + }; installCheckPhase = '' bin/neko bin/test.n diff --git a/pkgs/development/compilers/ocaml/builder.sh b/pkgs/development/compilers/ocaml/builder.sh index 88acc0654cf..85b26848f4e 100644 --- a/pkgs/development/compilers/ocaml/builder.sh +++ b/pkgs/development/compilers/ocaml/builder.sh @@ -1,4 +1,4 @@ -if [ -e .attrs.sh ]; then source .attrs.sh; fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi source $stdenv/setup configureFlags="-prefix $out $configureFlags" diff --git a/pkgs/development/compilers/opensycl/default.nix b/pkgs/development/compilers/opensycl/default.nix index 995b21330a9..c406d4c9d5c 100644 --- a/pkgs/development/compilers/opensycl/default.nix +++ b/pkgs/development/compilers/opensycl/default.nix @@ -8,8 +8,9 @@ , libxml2 , libffi , makeWrapper +, config , rocmPackages -, rocmSupport ? false +, rocmSupport ? config.rocmSupport }: let inherit (llvmPackages_15) stdenv; diff --git a/pkgs/development/compilers/rust/1_72.nix b/pkgs/development/compilers/rust/1_73.nix index f540c229c6f..37e75e0a7a4 100644 --- a/pkgs/development/compilers/rust/1_72.nix +++ b/pkgs/development/compilers/rust/1_73.nix @@ -20,8 +20,8 @@ } @ args: import ./default.nix { - rustcVersion = "1.72.1"; - rustcSha256 = "sha256-f0iEX2pSzbtdY/sFKP1fUg60QydbVfmOMoFZ+GVo+JU="; + rustcVersion = "1.73.0"; + rustcSha256 = "sha256-ltYubR8tId96yKyzuYgkEfnnxwNhc/fy7enh8faxuzo="; llvmSharedForBuild = pkgsBuildBuild.llvmPackages_16.libllvm.override { enableSharedLibraries = true; }; llvmSharedForHost = pkgsBuildHost.llvmPackages_16.libllvm.override { enableSharedLibraries = true; }; @@ -35,25 +35,24 @@ import ./default.nix { # Note: the version MUST be one version prior to the version we're # building - bootstrapVersion = "1.71.1"; + bootstrapVersion = "1.72.1"; # fetch hashes by running `print-hashes.sh ${bootstrapVersion}` bootstrapHashes = { - 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"; + i686-unknown-linux-gnu = "a2a849a701dfd6643aaaa27e1ed5ac56aea00f7dee26c00d81c520808efd8911"; + x86_64-unknown-linux-gnu = "4fbd8df2000cf73c632d67a219a7fc153537ceffa2e6474491e3db71fdd5a410"; + x86_64-unknown-linux-musl = "94eddc044868a944a887d0b0375e393cb3acc6ebc034e3eac2ef2890ec7c0eac"; + arm-unknown-linux-gnueabihf = "a4d90538882181722d3e7cb8d7f021770e29e6b6d28375452e31a98049600110"; + armv7-unknown-linux-gnueabihf = "4c8e6b3c705a84d17894d3a1cfe744fb6083dd57c61868e67aac8b8512640ecb"; + aarch64-unknown-linux-gnu = "190d0473cbe619f163d33a6c4e2ef982abdd4178f73abc3194631cd2d5c8ed8b"; + aarch64-unknown-linux-musl = "c83778d1a95f6604bc3610a9070e8a8435c60a8bca5117aad71ffab36dea020f"; + x86_64-apple-darwin = "d01e7e9a7482f88a51b4fd888f06234274b49f51b5476c2d14fd46fd6e99ba9e"; + aarch64-apple-darwin = "42b0aaf269b6d9c60db13a64a920336d6064ab11d0c7043c9deeb9d4f67b3983"; + powerpc64le-unknown-linux-gnu = "9310df247efc072f2ca27354a875c4989cf3c29c9e545255a7472895d830163c"; + riscv64gc-unknown-linux-gnu = "1e08cd3ecd29d5bf247e3f7f4bc97318b439f0443dd9c99c36edcfa717d55101"; }; - selectRustPackage = pkgs: pkgs.rust_1_72; + selectRustPackage = pkgs: pkgs.rust_1_73; rustcPatches = [ ]; } diff --git a/pkgs/development/compilers/rust/bootstrap.nix b/pkgs/development/compilers/rust/bootstrap.nix index 7c0b46d5593..97ac6927025 100644 --- a/pkgs/development/compilers/rust/bootstrap.nix +++ b/pkgs/development/compilers/rust/bootstrap.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, rust, callPackage, version, hashes }: +{ stdenv, fetchurl, callPackage, version, hashes }: let - platform = rust.toRustTarget stdenv.hostPlatform; + platform = stdenv.hostPlatform.rust.rustcTarget; src = fetchurl { url = "https://static.rust-lang.org/dist/rust-${version}-${platform}.tar.gz"; diff --git a/pkgs/development/compilers/rust/cargo.nix b/pkgs/development/compilers/rust/cargo.nix index 46e238ff479..8eb628aa536 100644 --- a/pkgs/development/compilers/rust/cargo.nix +++ b/pkgs/development/compilers/rust/cargo.nix @@ -1,6 +1,6 @@ { lib, stdenv, pkgsBuildHost, pkgsHostHost , file, curl, pkg-config, python3, openssl, cmake, zlib -, installShellFiles, makeWrapper, rustPlatform, rust, rustc +, installShellFiles, makeWrapper, rustPlatform, rustc , CoreFoundation, Security , auditable ? !cargo-auditable.meta.broken , cargo-auditable @@ -116,6 +116,6 @@ rustPlatform.buildRustPackage.override { broken = stdenv.hostPlatform.isx86 && stdenv.buildPlatform != stdenv.hostPlatform; }; } -// lib.optionalAttrs (rust.toRustTarget stdenv.buildPlatform != rust.toRustTarget stdenv.hostPlatform) { +// lib.optionalAttrs (stdenv.buildPlatform.rust.rustcTarget != stdenv.hostPlatform.rust.rustcTarget) { HOST_PKG_CONFIG_PATH="${pkgsBuildBuild.pkg-config}/bin/pkg-config"; }) diff --git a/pkgs/development/compilers/rust/print-hashes.sh b/pkgs/development/compilers/rust/print-hashes.sh index dd2c116a341..ebf8d900bb3 100755 --- a/pkgs/development/compilers/rust/print-hashes.sh +++ b/pkgs/development/compilers/rust/print-hashes.sh @@ -19,7 +19,6 @@ PLATFORMS=( aarch64-apple-darwin powerpc64le-unknown-linux-gnu riscv64gc-unknown-linux-gnu - mips64el-unknown-linux-gnuabi64 ) BASEURL=https://static.rust-lang.org/dist VERSION=${1:-} diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index 1550887c356..1758abb6bea 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -1,7 +1,7 @@ { lib, stdenv, removeReferencesTo, pkgsBuildBuild, pkgsBuildHost, pkgsBuildTarget, targetPackages , llvmShared, llvmSharedForBuild, llvmSharedForHost, llvmSharedForTarget, llvmPackages , fetchurl, file, python3 -, darwin, cargo, cmake, rust, rustc, rustfmt +, darwin, cargo, cmake, rustc, rustfmt , pkg-config, openssl, xz , libiconv , which, libffi @@ -53,7 +53,7 @@ in stdenv.mkDerivation (finalAttrs: { # but it does support checking these idiosyncratic PKG_CONFIG_${TRIPLE} # environment variables. # [1]: https://github.com/rust-lang/pkg-config-rs/issues/53 - "PKG_CONFIG_${builtins.replaceStrings ["-"] ["_"] (rust.toRustTarget stdenv.buildPlatform)}" = + "PKG_CONFIG_${builtins.replaceStrings ["-"] ["_"] stdenv.buildPlatform.rust.rustcTarget}" = "${pkgsBuildHost.stdenv.cc.targetPrefix}pkg-config"; NIX_LDFLAGS = toString ( @@ -68,15 +68,18 @@ in stdenv.mkDerivation (finalAttrs: { # We need rust to build rust. If we don't provide it, configure will try to download it. # Reference: https://github.com/rust-lang/rust/blob/master/src/bootstrap/configure.py configureFlags = let - setBuild = "--set=target.${rust.toRustTarget stdenv.buildPlatform}"; - setHost = "--set=target.${rust.toRustTarget stdenv.hostPlatform}"; - setTarget = "--set=target.${rust.toRustTarget stdenv.targetPlatform}"; - ccForBuild = "${pkgsBuildBuild.targetPackages.stdenv.cc}/bin/${pkgsBuildBuild.targetPackages.stdenv.cc.targetPrefix}cc"; - cxxForBuild = "${pkgsBuildBuild.targetPackages.stdenv.cc}/bin/${pkgsBuildBuild.targetPackages.stdenv.cc.targetPrefix}c++"; - ccForHost = "${pkgsBuildHost.targetPackages.stdenv.cc}/bin/${pkgsBuildHost.targetPackages.stdenv.cc.targetPrefix}cc"; - cxxForHost = "${pkgsBuildHost.targetPackages.stdenv.cc}/bin/${pkgsBuildHost.targetPackages.stdenv.cc.targetPrefix}c++"; - ccForTarget = "${pkgsBuildTarget.targetPackages.stdenv.cc}/bin/${pkgsBuildTarget.targetPackages.stdenv.cc.targetPrefix}cc"; - cxxForTarget = "${pkgsBuildTarget.targetPackages.stdenv.cc}/bin/${pkgsBuildTarget.targetPackages.stdenv.cc.targetPrefix}c++"; + prefixForStdenv = stdenv: "${stdenv.cc}/bin/${stdenv.cc.targetPrefix}"; + ccPrefixForStdenv = stdenv: "${prefixForStdenv stdenv}${if (stdenv.cc.isClang or false) then "clang" else "cc"}"; + cxxPrefixForStdenv = stdenv: "${prefixForStdenv stdenv}${if (stdenv.cc.isClang or false) then "clang++" else "c++"}"; + setBuild = "--set=target.${stdenv.buildPlatform.rust.rustcTarget}"; + setHost = "--set=target.${stdenv.hostPlatform.rust.rustcTarget}"; + setTarget = "--set=target.${stdenv.targetPlatform.rust.rustcTarget}"; + ccForBuild = ccPrefixForStdenv pkgsBuildBuild.targetPackages.stdenv; + cxxForBuild = cxxPrefixForStdenv pkgsBuildBuild.targetPackages.stdenv; + ccForHost = ccPrefixForStdenv pkgsBuildHost.targetPackages.stdenv; + cxxForHost = cxxPrefixForStdenv pkgsBuildHost.targetPackages.stdenv; + ccForTarget = ccPrefixForStdenv pkgsBuildTarget.targetPackages.stdenv; + cxxForTarget = cxxPrefixForStdenv pkgsBuildTarget.targetPackages.stdenv; in [ "--release-channel=stable" "--set=build.rustc=${rustc}/bin/rustc" @@ -90,23 +93,23 @@ in stdenv.mkDerivation (finalAttrs: { "--tools=rustc,rust-analyzer-proc-macro-srv" "--enable-rpath" "--enable-vendor" - "--build=${rust.toRustTargetSpec stdenv.buildPlatform}" - "--host=${rust.toRustTargetSpec stdenv.hostPlatform}" + "--build=${stdenv.buildPlatform.rust.rustcTargetSpec}" + "--host=${stdenv.hostPlatform.rust.rustcTargetSpec}" # std is built for all platforms in --target. "--target=${concatStringsSep "," ([ - (rust.toRustTargetSpec stdenv.targetPlatform) + stdenv.targetPlatform.rust.rustcTargetSpec # (build!=target): When cross-building a compiler we need to add # the build platform as well so rustc can compile build.rs # scripts. ] ++ optionals (stdenv.buildPlatform != stdenv.targetPlatform && !fastCross) [ - (rust.toRustTargetSpec stdenv.buildPlatform) + stdenv.buildPlatform.rust.rustcTargetSpec # (host!=target): When building a cross-targeting compiler we # need to add the host platform as well so rustc can compile # build.rs scripts. ] ++ optionals (stdenv.hostPlatform != stdenv.targetPlatform && !fastCross) [ - (rust.toRustTargetSpec stdenv.hostPlatform) + stdenv.hostPlatform.rust.rustcTargetSpec ])}" "${setBuild}.cc=${ccForBuild}" @@ -137,7 +140,7 @@ in stdenv.mkDerivation (finalAttrs: { "${setHost}.musl-root=${pkgsBuildHost.targetPackages.stdenv.cc.libc}" ] ++ optionals stdenv.targetPlatform.isMusl [ "${setTarget}.musl-root=${pkgsBuildTarget.targetPackages.stdenv.cc.libc}" - ] ++ optionals (rust.IsNoStdTarget stdenv.targetPlatform) [ + ] ++ optionals stdenv.targetPlatform.rust.isNoStdTarget [ "--disable-docs" ] ++ optionals (stdenv.isDarwin && stdenv.isx86_64) [ # https://github.com/rust-lang/rust/issues/92173 @@ -149,12 +152,12 @@ in stdenv.mkDerivation (finalAttrs: { buildPhase = if fastCross then " runHook preBuild - mkdir -p build/${rust.toRustTargetSpec stdenv.hostPlatform}/stage0-{std,rustc}/${rust.toRustTargetSpec stdenv.hostPlatform}/release/ - ln -s ${rustc}/lib/rustlib/${rust.toRustTargetSpec stdenv.hostPlatform}/libstd-*.so build/${rust.toRustTargetSpec stdenv.hostPlatform}/stage0-std/${rust.toRustTargetSpec stdenv.hostPlatform}/release/libstd.so - ln -s ${rustc}/lib/rustlib/${rust.toRustTargetSpec stdenv.hostPlatform}/librustc_driver-*.so build/${rust.toRustTargetSpec stdenv.hostPlatform}/stage0-rustc/${rust.toRustTargetSpec stdenv.hostPlatform}/release/librustc.so - ln -s ${rustc}/bin/rustc build/${rust.toRustTargetSpec stdenv.hostPlatform}/stage0-rustc/${rust.toRustTargetSpec stdenv.hostPlatform}/release/rustc-main - touch build/${rust.toRustTargetSpec stdenv.hostPlatform}/stage0-std/${rust.toRustTargetSpec stdenv.hostPlatform}/release/.libstd.stamp - touch build/${rust.toRustTargetSpec stdenv.hostPlatform}/stage0-rustc/${rust.toRustTargetSpec stdenv.hostPlatform}/release/.librustc.stamp + mkdir -p build/${stdenv.hostPlatform.rust.rustcTargetSpec}/stage0-{std,rustc}/${stdenv.hostPlatform.rust.rustcTargetSpec}/release/ + ln -s ${rustc}/lib/rustlib/${stdenv.hostPlatform.rust.rustcTargetSpec}/libstd-*.so build/${stdenv.hostPlatform.rust.rustcTargetSpec}/stage0-std/${stdenv.hostPlatform.rust.rustcTargetSpec}/release/libstd.so + ln -s ${rustc}/lib/rustlib/${stdenv.hostPlatform.rust.rustcTargetSpec}/librustc_driver-*.so build/${stdenv.hostPlatform.rust.rustcTargetSpec}/stage0-rustc/${stdenv.hostPlatform.rust.rustcTargetSpec}/release/librustc.so + ln -s ${rustc}/bin/rustc build/${stdenv.hostPlatform.rust.rustcTargetSpec}/stage0-rustc/${stdenv.hostPlatform.rust.rustcTargetSpec}/release/rustc-main + touch build/${stdenv.hostPlatform.rust.rustcTargetSpec}/stage0-std/${stdenv.hostPlatform.rust.rustcTargetSpec}/release/.libstd.stamp + touch build/${stdenv.hostPlatform.rust.rustcTargetSpec}/stage0-rustc/${stdenv.hostPlatform.rust.rustcTargetSpec}/release/.librustc.stamp python ./x.py --keep-stage=0 --stage=1 build library/std runHook postBuild @@ -167,8 +170,8 @@ in stdenv.mkDerivation (finalAttrs: { mkdir -v $out/bin $doc $man makeWrapper ${rustc}/bin/rustc $out/bin/rustc --add-flags "--sysroot $out" makeWrapper ${rustc}/bin/rustdoc $out/bin/rustdoc --add-flags "--sysroot $out" - ln -s ${rustc}/lib/rustlib/{manifest-rust-std-,}${rust.toRustTargetSpec stdenv.hostPlatform} $out/lib/rustlib/ - echo rust-std-${rust.toRustTargetSpec stdenv.hostPlatform} >> $out/lib/rustlib/components + ln -s ${rustc}/lib/rustlib/{manifest-rust-std-,}${stdenv.hostPlatform.rust.rustcTargetSpec} $out/lib/rustlib/ + echo rust-std-${stdenv.hostPlatform.rust.rustcTargetSpec} >> $out/lib/rustlib/components lndir ${rustc.doc} $doc lndir ${rustc.man} $man @@ -288,9 +291,8 @@ in stdenv.mkDerivation (finalAttrs: { "i686-freebsd13" "x86_64-freebsd13" "x86_64-solaris" "aarch64-linux" "armv6l-linux" "armv7l-linux" "i686-linux" - "loongarch64-linux" "mipsel-linux" "mips64el-linux" - "powerpc64-linux" "powerpc64le-linux" "riscv64-linux" - "s390x-linux" "x86_64-linux" + "loongarch64-linux" "powerpc64-linux" "powerpc64le-linux" + "riscv64-linux" "s390x-linux" "x86_64-linux" "aarch64-netbsd" "armv7l-netbsd" "i686-netbsd" "powerpc-netbsd" "x86_64-netbsd" "i686-openbsd" "x86_64-openbsd" diff --git a/pkgs/development/compilers/souffle/default.nix b/pkgs/development/compilers/souffle/default.nix index 6a06213e959..68ceb1a7d7f 100644 --- a/pkgs/development/compilers/souffle/default.nix +++ b/pkgs/development/compilers/souffle/default.nix @@ -10,13 +10,13 @@ let in stdenv.mkDerivation rec { pname = "souffle"; - version = "2.4"; + version = "2.4.1"; src = fetchFromGitHub { owner = "souffle-lang"; repo = "souffle"; rev = version; - sha256 = "sha256-5g2Ikbfm5nQrsgGntZZ/VbjqSDOj0AP/mnH1nW2b4co="; + sha256 = "sha256-U3/1iNOLFzuXiBsVDAc5AXnK4F982Uifp18jjFNUv2o="; }; patches = [ @@ -34,6 +34,10 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DSOUFFLE_GIT=OFF" ]; + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = "-Wno-error=unused-but-set-variable"; + }; + postInstall = '' wrapProgram "$out/bin/souffle" --prefix PATH : "${toolsPath}" ''; diff --git a/pkgs/development/compilers/spirv-llvm-translator/default.nix b/pkgs/development/compilers/spirv-llvm-translator/default.nix index c6c743ce1e5..f19501a6d7d 100644 --- a/pkgs/development/compilers/spirv-llvm-translator/default.nix +++ b/pkgs/development/compilers/spirv-llvm-translator/default.nix @@ -55,10 +55,10 @@ stdenv.mkDerivation { }) ]; - nativeBuildInputs = [ pkg-config cmake spirv-tools ] + nativeBuildInputs = [ pkg-config cmake ] ++ (if isROCm then [ llvm ] else [ llvm.dev ]); - buildInputs = [ spirv-headers ] + buildInputs = [ spirv-headers spirv-tools ] ++ lib.optionals (!isROCm) [ llvm ]; nativeCheckInputs = [ lit ]; diff --git a/pkgs/development/compilers/squeak/default.nix b/pkgs/development/compilers/squeak/default.nix index 818ad22fae7..79627eba7c8 100644 --- a/pkgs/development/compilers/squeak/default.nix +++ b/pkgs/development/compilers/squeak/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchFromGitHub, fetchurl, fetchzip , autoconf, automake, autoreconfHook, clang, dos2unix, file, perl , pkg-config -, alsa-lib, coreutils, freetype, glib, glibc, gnugrep, libpulseaudio, libtool -, libuuid, openssl, pango, xorg +, alsa-lib, coreutils, freetype, glib, glibc, gnugrep, libGL, libpulseaudio +, libtool, libuuid, openssl, pango, xorg , squeakImageHash ? null, squeakSourcesHash ? null, squeakSourcesVersion ? null , squeakVersion ? null, squeakVmCommitHash ? null, squeakVmCommitHashHash ? null , squeakVmVersion ? null @@ -88,6 +88,7 @@ in stdenv.mkDerivation { glib glibc gnugrep + libGL libpulseaudio libtool libuuid diff --git a/pkgs/development/coq-modules/ITree/default.nix b/pkgs/development/coq-modules/ITree/default.nix index df41ab6e161..aee24225021 100644 --- a/pkgs/development/coq-modules/ITree/default.nix +++ b/pkgs/development/coq-modules/ITree/default.nix @@ -5,9 +5,10 @@ mkCoqDerivation rec { owner = "DeepSpec"; inherit version; defaultVersion = with lib.versions; lib.switch coq.version [ - { case = range "8.13" "8.17"; out = "5.1.1"; } + { case = range "8.13" "8.18"; out = "5.1.2"; } { case = range "8.10" "8.16"; out = "4.0.0"; } ] null; + release."5.1.2".sha256 = "sha256-uKJIjNXGWl0YS0WH52Rnr9Jz98Eo2k0X0qWB9hUYJMk="; release."5.1.1".sha256 = "sha256-VlmPNwaGkdWrH7Z6DGXRosGtjuuQ+FBiGcadN2Hg5pY="; release."5.1.0".sha256 = "sha256-ny7Mi1KgWADiFznkNJiRgD7Djc5SUclNgKOmWRxK+eo="; release."4.0.0".sha256 = "0h5rhndl8syc24hxq1gch86kj7mpmgr89bxp2hmf28fd7028ijsm"; diff --git a/pkgs/development/coq-modules/coqprime/default.nix b/pkgs/development/coq-modules/coqprime/default.nix index af2f56475fd..9420d69cb4b 100644 --- a/pkgs/development/coq-modules/coqprime/default.nix +++ b/pkgs/development/coq-modules/coqprime/default.nix @@ -6,13 +6,14 @@ mkCoqDerivation { owner = "thery"; inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ - { case = range "8.14" "8.18"; out = "8.17"; } + { case = range "8.14" "8.18"; out = "8.18"; } { 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"; } { case = "8.7"; out = "8.7.2"; } ] null; + release."8.18".sha256 = "sha256-KObBEYerWhIStmq90G3vs9K5LUEOfB2SPxirwLiWQ6E="; release."8.17".sha256 = "sha256-D878t/PijVCopRKHYqfwdNvt3arGlI8yxbK/vI6qZUY="; release."8.15".sha256 = "sha256:1zr2q52r08na8265019pj9spcz982ivixk6cnzk6l1srn2g328gv"; release."8.14.1".sha256= "sha256:0dqf87xkzcpg7gglbxjyx68ad84w1w73icxgy3s7d3w563glc2p7"; diff --git a/pkgs/development/coq-modules/dpdgraph/default.nix b/pkgs/development/coq-modules/dpdgraph/default.nix index 49333b41697..dac3fb2b74d 100644 --- a/pkgs/development/coq-modules/dpdgraph/default.nix +++ b/pkgs/development/coq-modules/dpdgraph/default.nix @@ -8,6 +8,7 @@ mkCoqDerivation { repo = "coq-dpdgraph"; inherit version; defaultVersion = lib.switch coq.coq-version [ + { case = "8.18"; out = "1.0+8.18"; } { case = "8.17"; out = "1.0+8.17"; } { case = "8.16"; out = "1.0+8.16"; } { case = "8.15"; out = "1.0+8.15"; } @@ -19,10 +20,9 @@ mkCoqDerivation { { case = "8.9"; out = "0.6.5"; } { case = "8.8"; out = "0.6.3"; } { case = "8.7"; out = "0.6.2"; } - { case = "8.6"; out = "0.6.1"; } - { case = "8.5"; out = "0.6"; } ] null; + release."1.0+8.18".sha256 = "sha256-z14MI1VSYzPqmF1PqDXzymXWRMYoTlQAfR/P3Pdf7fI="; release."1.0+8.17".sha256 = "sha256-gcvL3vseLKEF9xinT0579jXBBaA5E3rJ5KaU8RfKtm4="; release."1.0+8.16".sha256 = "sha256-xy4xcVHaD1OHBdGUzUy3SeZnHtOf1+UIh6YjUYFINm0="; release."1.0+8.15".sha256 = "sha256:1pxr0gakcz297y8hhrnssv5j07ccd58pv7rh7qv5g7855pfqrkg7"; diff --git a/pkgs/development/coq-modules/fourcolor/default.nix b/pkgs/development/coq-modules/fourcolor/default.nix index 7d22abad7c7..53f98c13861 100644 --- a/pkgs/development/coq-modules/fourcolor/default.nix +++ b/pkgs/development/coq-modules/fourcolor/default.nix @@ -16,7 +16,7 @@ mkCoqDerivation { defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [ { cases = [ (isGe "8.16") (isGe "2.0") ]; out = "1.3.1"; } { cases = [ (isGe "8.16") "2.0.0" ]; out = "1.3.0"; } - { cases = [ (isGe "8.11") (range "1.12" "1.17") ]; out = "1.2.5"; } + { cases = [ (isGe "8.11") (range "1.12" "1.18") ]; 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/pkgs/development/coq-modules/gappalib/default.nix b/pkgs/development/coq-modules/gappalib/default.nix index 8406fcbd134..ffdb5193ae3 100644 --- a/pkgs/development/coq-modules/gappalib/default.nix +++ b/pkgs/development/coq-modules/gappalib/default.nix @@ -6,7 +6,8 @@ mkCoqDerivation { owner = "gappa"; domain = "gitlab.inria.fr"; inherit version; - defaultVersion = if lib.versions.range "8.8" "8.17" coq.coq-version then "1.5.3" else null; + defaultVersion = if lib.versions.range "8.8" "8.18" coq.coq-version then "1.5.4" else null; + release."1.5.4".sha256 = "sha256-9PlkXqCu4rbFD7qnMF1GSpPCVmwJ3r593RfAvkJbbdA="; release."1.5.3".sha256 = "sha256-SuMopX5sm4jh2uBuE7zr6vhWhHYZYnab+epjqYJqg+s="; release."1.5.2".sha256 = "sha256-A021Bhqz5r2CZBayfjIiWrCIfUlejcQAfbTmOaf6QTM="; release."1.5.1".sha256 = "1806bq1z6q5rq2ma7d5kfbqfyfr755hjg0dq7b2llry8fx9cxjsg"; diff --git a/pkgs/development/coq-modules/graph-theory/default.nix b/pkgs/development/coq-modules/graph-theory/default.nix index 2c9f4e4cf27..0d28bbc0527 100644 --- a/pkgs/development/coq-modules/graph-theory/default.nix +++ b/pkgs/development/coq-modules/graph-theory/default.nix @@ -1,4 +1,4 @@ -{ lib, mkCoqDerivation, coq, mathcomp-algebra, mathcomp-finmap, mathcomp-fingroup +{ lib, mkCoqDerivation, coq, mathcomp, mathcomp-finmap , fourcolor, hierarchy-builder, version ? null }: mkCoqDerivation { @@ -6,16 +6,20 @@ mkCoqDerivation { release."0.9".sha256 = "sha256-Hl3JS9YERD8QQziXqZ9DqLHKp63RKI9HxoFYWSkJQZI="; release."0.9.1".sha256 = "sha256-lRRY+501x+DqNeItBnbwYIqWLDksinWIY4x/iojRNYU="; + release."0.9.2".sha256 = "sha256-DPYCZS8CzkfgpR+lmYhV2v20ezMtyWp8hdWpuh0OOQU="; + release."0.9.3".sha256 = "sha256-9WX3gsw+4btJLqcGg2W+7Qy+jaZtkfw7vCp8sXYmaWw="; releaseRev = v: "v${v}"; inherit version; - defaultVersion = with lib.versions; lib.switch coq.coq-version [ - { case = range "8.14" "8.16"; out = "0.9.1"; } - { case = range "8.12" "8.12"; out = "0.9"; } + defaultVersion = with lib.versions; lib.switch [ coq.coq-version mathcomp.version ] [ + { cases = [ (isGe "8.16") (range "2.0.0" "2.1.0") ]; out = "0.9.3"; } + { cases = [ (range "8.14" "8.18") (range "1.13.0" "1.18.0") ]; out = "0.9.2"; } + { cases = [ (range "8.14" "8.16") (range "1.13.0" "1.14.0") ]; out = "0.9.1"; } + { cases = [ (range "8.12" "8.13") (range "1.12.0" "1.14.0") ]; out = "0.9"; } ] null; - propagatedBuildInputs = [ mathcomp-algebra mathcomp-finmap mathcomp-fingroup fourcolor hierarchy-builder ]; + propagatedBuildInputs = [ mathcomp.algebra mathcomp-finmap mathcomp.fingroup fourcolor hierarchy-builder ]; meta = with lib; { description = "Library of formalized graph theory results in Coq"; diff --git a/pkgs/development/coq-modules/mathcomp-analysis/default.nix b/pkgs/development/coq-modules/mathcomp-analysis/default.nix index 7e608fc61f3..5cbfbdf0c6f 100644 --- a/pkgs/development/coq-modules/mathcomp-analysis/default.nix +++ b/pkgs/development/coq-modules/mathcomp-analysis/default.nix @@ -9,6 +9,8 @@ let repo = "analysis"; owner = "math-comp"; + release."0.6.6".sha256 = "sha256-tWtv6yeB5/vzwpKZINK9OQ0yQsvD8qu9zVSNHvLMX5Y="; + release."0.6.5".sha256 = "sha256-oJk9/Jl1SWra2aFAXRAVfX7ZUaDfajqdDksYaW8dv8E="; release."0.6.1".sha256 = "sha256-1VyNXu11/pDMuH4DmFYSUF/qZ4Bo+/Zl3Y0JkyrH/r0="; release."0.6.0".sha256 = "sha256-0msICcIrK6jbOSiBu0gIVU3RHwoEEvB88CMQqW/06rg="; release."0.5.3".sha256 = "sha256-1NjFsi5TITF8ZWx1NyppRmi8g6YaoUtTdS9bU/sUe5k="; @@ -24,7 +26,9 @@ let release."0.2.3".sha256 = "0p9mr8g1qma6h10qf7014dv98ln90dfkwn76ynagpww7qap8s966"; defaultVersion = with versions; lib.switch [ coq.version mathcomp.version ] [ - { cases = [ (isGe "8.14") (isGe "1.13.0") ]; out = "0.6.1"; } + { cases = [ (isGe "8.17") (range "1.15.0" "1.18.0") ]; out = "0.6.6"; } + { cases = [ (isGe "8.14") (range "1.15.0" "1.17.0") ]; out = "0.6.5"; } + { cases = [ (isGe "8.14") (range "1.13.0" "1.16.0") ]; out = "0.6.1"; } { cases = [ (isGe "8.14") (range "1.13" "1.15") ]; out = "0.5.2"; } { cases = [ (range "8.13" "8.15") (range "1.13" "1.14") ]; out = "0.5.1"; } { cases = [ (range "8.13" "8.15") (range "1.12" "1.14") ]; out = "0.3.13"; } diff --git a/pkgs/development/coq-modules/mathcomp-apery/default.nix b/pkgs/development/coq-modules/mathcomp-apery/default.nix index 69511693876..0b447909116 100644 --- a/pkgs/development/coq-modules/mathcomp-apery/default.nix +++ b/pkgs/development/coq-modules/mathcomp-apery/default.nix @@ -8,7 +8,7 @@ mkCoqDerivation { inherit version; defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [ - { cases = [ (range "8.13" "8.16") (isGe "1.12.0") ]; out = "1.0.2"; } + { cases = [ (range "8.13" "8.16") (range "1.12.0" "1.17.0") ]; out = "1.0.2"; } ] null; release."1.0.2".sha256 = "sha256-llxyMKYvWUA7fyroG1S/jtpioAoArmarR1edi3cikcY="; diff --git a/pkgs/development/coq-modules/mathcomp-finmap/default.nix b/pkgs/development/coq-modules/mathcomp-finmap/default.nix index 234d25f909b..fa6032a7f08 100644 --- a/pkgs/development/coq-modules/mathcomp-finmap/default.nix +++ b/pkgs/development/coq-modules/mathcomp-finmap/default.nix @@ -8,7 +8,7 @@ mkCoqDerivation { inherit version; defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [ { 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 = [ (range "8.13" "8.18") (range "1.12" "1.18") ]; 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"; } diff --git a/pkgs/development/coq-modules/mathcomp-infotheo/default.nix b/pkgs/development/coq-modules/mathcomp-infotheo/default.nix index d0bb3fb54a9..a649916892a 100644 --- a/pkgs/development/coq-modules/mathcomp-infotheo/default.nix +++ b/pkgs/development/coq-modules/mathcomp-infotheo/default.nix @@ -7,7 +7,7 @@ mkCoqDerivation { inherit version; defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp-analysis.version] [ { cases = [ (isGe "8.17") (isGe "0.6.0") ]; out = "0.5.2"; } - { cases = [ (range "8.15" "8.16") (range "0.5.4" "0.6.2") ]; out = "0.5.1"; } + { cases = [ (range "8.15" "8.16") (range "0.5.4" "0.6.5") ]; out = "0.5.1"; } ] null; release."0.5.1".sha256 = "sha256-yBBl5l+V+dggsg5KM59Yo9CULKog/xxE8vrW+ZRnX7Y="; release."0.5.2".sha256 = "sha256-8WAnAV53c0pMTdwj8XcUDUkLZbpUgIQbEOgOb63uHQA="; diff --git a/pkgs/development/coq-modules/mathcomp-zify/default.nix b/pkgs/development/coq-modules/mathcomp-zify/default.nix index bbb94420ab4..bc4ed1f1f74 100644 --- a/pkgs/development/coq-modules/mathcomp-zify/default.nix +++ b/pkgs/development/coq-modules/mathcomp-zify/default.nix @@ -10,7 +10,7 @@ mkCoqDerivation rec { defaultVersion = with lib.versions; lib.switch [ coq.coq-version mathcomp-algebra.version ] [ { 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.18") (range "1.12" "1.18.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; diff --git a/pkgs/development/coq-modules/mathcomp/default.nix b/pkgs/development/coq-modules/mathcomp/default.nix index ae1dcd57c3d..f95f1d425ea 100644 --- a/pkgs/development/coq-modules/mathcomp/default.nix +++ b/pkgs/development/coq-modules/mathcomp/default.nix @@ -19,7 +19,8 @@ let owner = "math-comp"; withDoc = single && (args.withDoc or false); defaultVersion = with versions; lib.switch coq.coq-version [ - { case = isGe "8.15"; out = "1.17.0"; } + { case = isGe "8.17"; out = "1.18.0"; } + { case = range "8.15" "8.18"; out = "1.17.0"; } { case = range "8.16" "8.18"; out = "2.1.0"; } { case = range "8.16" "8.18"; out = "2.0.0"; } { case = range "8.13" "8.18"; out = "1.16.0"; } @@ -37,6 +38,7 @@ let release = { "2.1.0".sha256 = "sha256-XDLx0BIkVRkSJ4sGCIE51j3rtkSGemNTs/cdVmTvxqo="; "2.0.0".sha256 = "sha256-dpOmrHYUXBBS9kmmz7puzufxlbNpIZofpcTvJFLG5DI="; + "1.18.0".sha256 = "sha256-mJJ/zvM2WtmBZU3U4oid/zCMvDXei/93v5hwyyqwiiY="; "1.17.0".sha256 = "sha256-bUfoSTMiW/GzC1jKFay6DRqGzKPuLOSUsO6/wPSFwNg="; "1.16.0".sha256 = "sha256-gXTKhRgSGeRBUnwdDezMsMKbOvxdffT+kViZ9e1gEz0="; "1.15.0".sha256 = "1bp0jxl35ms54s0mdqky15w9af03f3i0n06qk12k4gw1xzvwqv21"; diff --git a/pkgs/development/coq-modules/multinomials/default.nix b/pkgs/development/coq-modules/multinomials/default.nix index bffc169a1e9..d2bb38f8683 100644 --- a/pkgs/development/coq-modules/multinomials/default.nix +++ b/pkgs/development/coq-modules/multinomials/default.nix @@ -11,7 +11,7 @@ defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [ { cases = [ (isGe "8.16") (isGe "2.1.0") ]; out = "2.1.0"; } { cases = [ (isGe "8.16") "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.15") (range "1.15.0" "1.18.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"; } diff --git a/pkgs/development/embedded/blisp/default.nix b/pkgs/development/embedded/blisp/default.nix index 093e0ef195c..027ca82324f 100644 --- a/pkgs/development/embedded/blisp/default.nix +++ b/pkgs/development/embedded/blisp/default.nix @@ -32,6 +32,8 @@ stdenv.mkDerivation (finalAttrs: { "-DBLISP_USE_SYSTEM_LIBRARIES=ON" ]; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-error=implicit-function-declaration"; + passthru.tests.version = testers.testVersion { package = finalAttrs.finalPackage; version = "v${finalAttrs.version}"; @@ -42,6 +44,7 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.mit; mainProgram = "blisp"; homepage = "https://github.com/pine64/blisp"; + platforms = platforms.unix; maintainers = [ maintainers.bdd ]; }; }) diff --git a/pkgs/development/embedded/elf2uf2-rs/default.nix b/pkgs/development/embedded/elf2uf2-rs/default.nix index d26c0072265..49338184210 100644 --- a/pkgs/development/embedded/elf2uf2-rs/default.nix +++ b/pkgs/development/embedded/elf2uf2-rs/default.nix @@ -27,6 +27,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/JoNil/elf2uf2-rs"; license = with licenses; [ bsd0 ]; platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ polygon fortuneteller2k ]; + maintainers = with maintainers; [ polygon moni ]; }; } diff --git a/pkgs/development/guile-modules/guile-reader/default.nix b/pkgs/development/guile-modules/guile-reader/default.nix index edc6d73fffc..fcb6e8c7a8a 100644 --- a/pkgs/development/guile-modules/guile-reader/default.nix +++ b/pkgs/development/guile-modules/guile-reader/default.nix @@ -27,7 +27,11 @@ stdenv.mkDerivation rec { libffi ]; - env.GUILE_SITE = "${guile-lib}/${guile.siteDir}"; + env = { + GUILE_SITE = "${guile-lib}/${guile.siteDir}"; + } // lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; + }; configureFlags = [ "--with-guilemoduledir=$(out)/${guile.siteDir}" ]; diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix index 24e722a9913..91213b0274d 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix @@ -249,7 +249,9 @@ self: super: { # Fix ghc-9.6.x build errors. libmpd = appendPatch - (pkgs.fetchpatch { url = "https://github.com/vimus/libmpd-haskell/pull/138.patch"; + # https://github.com/vimus/libmpd-haskell/pull/138 + (pkgs.fetchpatch { url = "https://github.com/vimus/libmpd-haskell/compare/95d3b3bab5858d6d1f0e079d0ab7c2d182336acb...5737096a339edc265a663f51ad9d29baee262694.patch"; + name = "vimus-libmpd-haskell-pull-138.patch"; sha256 = "sha256-CvvylXyRmoCoRJP2MzRwL0SBbrEzDGqAjXS+4LsLutQ="; }) super.libmpd; @@ -259,8 +261,9 @@ self: super: { editedCabalFile = null; buildDepends = drv.buildDepends or [] ++ [ self.HUnit ]; patches = [(pkgs.fetchpatch { + # https://github.com/jgoerzen/configfile/pull/12 name = "ConfigFile-pr-12.patch"; - url = "https://github.com/jgoerzen/configfile/pull/12.patch"; + url = "https://github.com/jgoerzen/configfile/compare/d0a2e654be0b73eadbf2a50661d00574ad7b6f87...83ee30b43f74d2b6781269072cf5ed0f0e00012f.patch"; sha256 = "sha256-b7u9GiIAd2xpOrM0MfILHNb6Nt7070lNRIadn2l3DfQ="; })]; }) super.ConfigFile; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 5723167b408..2f5d72a0c50 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -1029,7 +1029,6 @@ broken-packages: - cut-the-crap # failure in job https://hydra.nixos.org/build/233238478 at 2023-09-02 - CV # failure in job https://hydra.nixos.org/build/233223571 at 2023-09-02 - d3js # failure in job https://hydra.nixos.org/build/233251474 at 2023-09-02 - - daemons # failure in job https://hydra.nixos.org/build/237233422 at 2023-10-21 - dag # failure in job https://hydra.nixos.org/build/233220719 at 2023-09-02 - DAG-Tournament # failure in job https://hydra.nixos.org/build/233218747 at 2023-09-02 - dahdit # failure in job https://hydra.nixos.org/build/233245113 at 2023-09-02 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 703497e1640..e79dd7e72fe 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -60,6 +60,9 @@ default-package-overrides: # hls-floskell-plugin 2.4 does not yet support floskell 0.11 - floskell < 0.11 + # Newer daemons requires GHC 9.6 + - daemons == 0.3.0 + extra-packages: - Cabal-syntax == 3.6.* # Dummy package that ensures packages depending on Cabal-syntax can work for Cabal < 3.8 - Cabal == 3.2.* # Used for packages needing newer Cabal on ghc 8.6 and 8.8 @@ -411,6 +414,9 @@ package-maintainers: - ttn-client - update-nix-fetchgit - zre + srid: + - ema + - emanote sternenseemann: # also maintain upstream package - cabal2nix diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 7001e4220ba..1819b29da46 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -811,5 +811,18 @@ stdenv.mkDerivation ({ // optionalAttrs (args ? dontStrip) { inherit dontStrip; } // optionalAttrs (postPhases != []) { inherit postPhases; } // optionalAttrs (stdenv.buildPlatform.libc == "glibc"){ LOCALE_ARCHIVE = "${glibcLocales}/lib/locale/locale-archive"; } + +# Implicit pointer to integer conversions are errors by default since clang 15. +# Works around https://gitlab.haskell.org/ghc/ghc/-/issues/23456. +// lib.optionalAttrs (stdenv.hasCC && stdenv.cc.isClang) { + NIX_CFLAGS_COMPILE = "-Wno-error=int-conversion"; +} + +# Ensure libc++abi is linked even when clang is invoked as just `clang` or `cc`. +# Works around https://github.com/NixOS/nixpkgs/issues/166205. +# This can be dropped once a fix has been committed to cc-wrapper. +// lib.optionalAttrs (stdenv.hasCC && stdenv.cc.isClang && stdenv.cc.libcxx != null) { + NIX_LDFLAGS = "-l${stdenv.cc.libcxx.cxxabi.libName}"; +} ) ) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 005dfd53a42..5138bf29657 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -78840,6 +78840,34 @@ self: { }: mkDerivation { pname = "daemons"; + version = "0.3.0"; + sha256 = "05h03qk31lank60cd0ig9h4rf8zl6p4li5smba919lgpm89lyvy3"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base bytestring cereal data-default directory filepath ghc-prim + network pipes transformers unix + ]; + executableHaskellDepends = [ + base bytestring cereal containers data-default ghc-prim network + pipes transformers + ]; + testHaskellDepends = [ + base data-default directory ghc-prim HUnit test-framework + test-framework-hunit unix + ]; + description = "Daemons in Haskell made fun and easy"; + license = lib.licenses.gpl3Only; + }) {}; + + "daemons_0_4_0" = callPackage + ({ mkDerivation, base, bytestring, cereal, containers, data-default + , directory, filepath, ghc-prim, HUnit, network, pipes + , test-framework, test-framework-hunit, transformers, unix + }: + mkDerivation { + pname = "daemons"; version = "0.4.0"; sha256 = "10fcxk749q90mlwgknqn6l5mff8b09acmikxzh5jkk5sr6bj86hz"; isLibrary = true; @@ -78860,7 +78888,6 @@ self: { description = "Daemons in Haskell made fun and easy"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "dag" = callPackage @@ -96497,6 +96524,7 @@ self: { ]; description = "Static site generator library with hot reload"; license = lib.licenses.agpl3Only; + maintainers = [ lib.maintainers.srid ]; }) {}; "ema-extra" = callPackage @@ -96822,6 +96850,7 @@ self: { badPlatforms = [ "x86_64-darwin" ]; hydraPlatforms = lib.platforms.none; mainProgram = "emanote"; + maintainers = [ lib.maintainers.srid ]; }) {}; "embed-config" = callPackage diff --git a/pkgs/development/interpreters/acl2/libipasirglucose4/default.nix b/pkgs/development/interpreters/acl2/libipasirglucose4/default.nix index c31e0dbe67f..e59d2ed7c17 100644 --- a/pkgs/development/interpreters/acl2/libipasirglucose4/default.nix +++ b/pkgs/development/interpreters/acl2/libipasirglucose4/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { # that as the version number, I guess. version = "2017"; - libname = pname + stdenv.targetPlatform.extensions.sharedLibrary; + libname = pname + stdenv.hostPlatform.extensions.sharedLibrary; src = fetchurl { url = "https://baldur.iti.kit.edu/sat-competition-2017/solvers/incremental/glucose-ipasir.zip"; diff --git a/pkgs/development/interpreters/babashka/default.nix b/pkgs/development/interpreters/babashka/default.nix index 4c4cfd67dcd..7f8281dd1de 100644 --- a/pkgs/development/interpreters/babashka/default.nix +++ b/pkgs/development/interpreters/babashka/default.nix @@ -33,9 +33,10 @@ let doInstallCheck = true; installCheckPhase = '' - $out/bin/bb --version | grep '${version}' - $out/bin/bb '(+ 1 2)' | grep '3' - $out/bin/bb '(vec (dedupe *input*))' <<< '[1 1 1 1 2]' | grep '[1 2]' + $out/bin/bb --version | fgrep '${version}' + $out/bin/bb '(+ 1 2)' | fgrep '3' + $out/bin/bb '(vec (dedupe *input*))' <<< '[1 1 1 1 2]' | fgrep '[1 2]' + $out/bin/bb '(prn "bépo à ê")' | fgrep 'bépo à ê' ''; # As of v1.2.174, this will remove references to ${graalvmDrv}/conf/chronology, diff --git a/pkgs/development/interpreters/guile/2.2.nix b/pkgs/development/interpreters/guile/2.2.nix index 617658e748b..918735517ea 100644 --- a/pkgs/development/interpreters/guile/2.2.nix +++ b/pkgs/development/interpreters/guile/2.2.nix @@ -34,9 +34,9 @@ builder rec { outputs = [ "out" "dev" "info" ]; setOutputFlags = false; # $dev gets into the library otherwise - depsBuildBuild = if stdenv.buildPlatform.isDarwin - then [ buildPackages.darwin.apple_sdk_11_0.stdenv.cc ] - else [ buildPackages.stdenv.cc ] + depsBuildBuild = [ + buildPackages.stdenv.cc + ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) pkgsBuildBuild.guile_2_2; nativeBuildInputs = [ diff --git a/pkgs/development/interpreters/guile/3.0.nix b/pkgs/development/interpreters/guile/3.0.nix index 2fe786271a7..a09afadf527 100644 --- a/pkgs/development/interpreters/guile/3.0.nix +++ b/pkgs/development/interpreters/guile/3.0.nix @@ -36,10 +36,9 @@ builder rec { outputs = [ "out" "dev" "info" ]; setOutputFlags = false; # $dev gets into the library otherwise - depsBuildBuild = if stdenv.buildPlatform.isDarwin - then [ buildPackages.darwin.apple_sdk_11_0.stdenv.cc ] - else [ buildPackages.stdenv.cc ] - ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) + depsBuildBuild = [ + buildPackages.stdenv.cc + ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) pkgsBuildBuild.guile_3_0; nativeBuildInputs = [ makeWrapper @@ -129,6 +128,9 @@ builder rec { doCheck = false; doInstallCheck = doCheck; + # In procedure bytevector-u8-ref: Argument 2 out of range + dontStrip = stdenv.isDarwin; + setupHook = ./setup-hook-3.0.sh; passthru = rec { diff --git a/pkgs/development/interpreters/nelua/default.nix b/pkgs/development/interpreters/nelua/default.nix index 8030980b778..fe4448c2f8d 100644 --- a/pkgs/development/interpreters/nelua/default.nix +++ b/pkgs/development/interpreters/nelua/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "nelua"; - version = "unstable-2023-01-21"; + version = "unstable-2023-09-16"; src = fetchFromGitHub { owner = "edubart"; repo = "nelua-lang"; - rev = "d10cc61bc54050b07874a8597f8df20534885105"; - hash = "sha256-HyNYqhPCQVBJqEcAUUXfvycXE8tWIMIUJJMTIV48ne8="; + rev = "596fcca5c77932da8a07c249de59a9dff3099495"; + hash = "sha256-gXTlAxW7s3VBiC1fGU0aUlGspHlvyY7FC5KLeU2FyGQ="; }; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/development/interpreters/php/8.3.nix b/pkgs/development/interpreters/php/8.3.nix index 63e7ec8e31b..23b9c2ee8e8 100644 --- a/pkgs/development/interpreters/php/8.3.nix +++ b/pkgs/development/interpreters/php/8.3.nix @@ -2,14 +2,12 @@ let base = (callPackage ./generic.nix (_args // { - version = "8.3.0RC5"; - hash = null; - })).overrideAttrs (oldAttrs: { - src = fetchurl { - url = "https://downloads.php.net/~jakub/php-8.3.0RC5.tar.xz"; - hash = "sha256-I42ded2tZO5ZQ+iU5DeNKjT+mNNoowew8gNOYDeB5aY="; + version = "8.3.0RC6"; + phpSrc = fetchurl { + url = "https://downloads.php.net/~eric/php-8.3.0RC6.tar.xz"; + hash = "sha256-Hntdz+vEkh7EQgnB4IrnG2sQ5bG2uJW7T3a0RIbHBe0="; }; - }); + })); in base.withExtensions ({ all, ... }: with all; ([ bcmath diff --git a/pkgs/development/interpreters/python/catch_conflicts/catch_conflicts.py b/pkgs/development/interpreters/python/catch_conflicts/catch_conflicts.py index bb82900c65a..d5c99e64751 100644 --- a/pkgs/development/interpreters/python/catch_conflicts/catch_conflicts.py +++ b/pkgs/development/interpreters/python/catch_conflicts/catch_conflicts.py @@ -1,30 +1,34 @@ -import pkg_resources +from importlib.metadata import PathDistribution +from pathlib import Path import collections import sys + do_abort = False packages = collections.defaultdict(list) -for f in sys.path: - for req in pkg_resources.find_distributions(f): - if req not in packages[req.project_name]: - # some exceptions inside buildPythonPackage - if req.project_name in ['setuptools', 'pip', 'wheel']: - continue - packages[req.project_name].append(req) + +for path in sys.path: + for dist_info in Path(path).glob("*.dist-info"): + dist = PathDistribution(dist_info) + + packages[dist._normalized_name].append( + f"{dist._normalized_name} {dist.version} ({dist._path})" + ) for name, duplicates in packages.items(): if len(duplicates) > 1: do_abort = True print("Found duplicated packages in closure for dependency '{}': ".format(name)) - for dup in duplicates: - print(" " + repr(dup)) + for duplicate in duplicates: + print(f"\t{duplicate}") if do_abort: print("") print( - 'Package duplicates found in closure, see above. Usually this ' - 'happens if two packages depend on different version ' - 'of the same dependency.') + "Package duplicates found in closure, see above. Usually this " + "happens if two packages depend on different version " + "of the same dependency." + ) sys.exit(1) diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix index b336caf6a0a..5cdd307e70f 100644 --- a/pkgs/development/interpreters/python/cpython/2.7/default.nix +++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix @@ -133,6 +133,11 @@ let ] ++ lib.optionals (x11Support && stdenv.isDarwin) [ ./use-correct-tcl-tk-on-darwin.patch + + ] ++ lib.optionals stdenv.isDarwin [ + # Fix darwin build https://bugs.python.org/issue34027 + ../3.7/darwin-libutil.patch + ] ++ lib.optionals stdenv.isLinux [ # Disable the use of ldconfig in ctypes.util.find_library (since diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 2d293bb29a0..8f775699f48 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -30,10 +30,10 @@ sourceVersion = { major = "3"; minor = "11"; - patch = "5"; + patch = "6"; suffix = ""; }; - hash = "sha256-hc0S6c8dbVpF8X96/hzr5+5ijTKCKBxJLoat9jbe+j8="; + hash = "sha256-D6t4+n8TP084IQxiYNkNfA1ccZhEZBnOBX7HrC5vXzg="; }; }; diff --git a/pkgs/development/interpreters/python/hooks/default.nix b/pkgs/development/interpreters/python/hooks/default.nix index 5aee357dd91..f7cc10274ae 100644 --- a/pkgs/development/interpreters/python/hooks/default.nix +++ b/pkgs/development/interpreters/python/hooks/default.nix @@ -107,7 +107,7 @@ in { makePythonHook { name = "python-catch-conflicts-hook"; substitutions = { - inherit pythonInterpreter pythonSitePackages setuptools; + inherit pythonInterpreter pythonSitePackages; catchConflicts=../catch_conflicts/catch_conflicts.py; }; } ./python-catch-conflicts-hook.sh) {}; @@ -183,16 +183,14 @@ in { }; } ./setuptools-check-hook.sh) {}; - setuptoolsRustBuildHook = callPackage ({ makePythonHook, setuptools-rust, rust }: + setuptoolsRustBuildHook = callPackage ({ makePythonHook, setuptools-rust }: makePythonHook { name = "setuptools-rust-setup-hook"; propagatedBuildInputs = [ setuptools-rust ]; substitutions = { pyLibDir = "${python}/lib/${python.libPrefix}"; - cargoBuildTarget = rust.toRustTargetSpec stdenv.hostPlatform; - cargoLinkerVar = lib.toUpper ( - builtins.replaceStrings ["-"] ["_"] ( - rust.toRustTarget stdenv.hostPlatform)); + cargoBuildTarget = stdenv.hostPlatform.rust.rustcTargetSpec; + cargoLinkerVar = stdenv.hostPlatform.rust.cargoEnvVarTarget; targetLinker = "${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc"; }; } ./setuptools-rust-hook.sh) {}; @@ -228,5 +226,8 @@ in { makePythonHook { name = "python${python.pythonVersion}-sphinx-hook"; propagatedBuildInputs = [ pythonOnBuildForHost.pkgs.sphinx installShellFiles ]; + substitutions = { + sphinxBuild = "${pythonOnBuildForHost.pkgs.sphinx}/bin/sphinx-build"; + }; } ./sphinx-hook.sh) {}; } diff --git a/pkgs/development/interpreters/python/hooks/sphinx-hook.sh b/pkgs/development/interpreters/python/hooks/sphinx-hook.sh index ca67fa9beab..0307e83d947 100644 --- a/pkgs/development/interpreters/python/hooks/sphinx-hook.sh +++ b/pkgs/development/interpreters/python/hooks/sphinx-hook.sh @@ -38,7 +38,7 @@ buildSphinxPhase() { for __builder in "${__sphinxBuilders[@]}"; do echo "Executing sphinx-build with ${__builder} builder" - sphinx-build -M "${__builder}" "${__sphinxRoot}" ".sphinx/${__builder}" -v + @sphinxBuild@ -M "${__builder}" "${__sphinxRoot}" ".sphinx/${__builder}" -v done runHook postBuildSphinx diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix index 060b840ce22..c14c6bc096f 100644 --- a/pkgs/development/interpreters/python/mk-python-derivation.nix +++ b/pkgs/development/interpreters/python/mk-python-derivation.nix @@ -102,13 +102,14 @@ , disabledTestPaths ? [] +# Allow passing in a custom stdenv to buildPython* +, stdenv ? python.stdenv + , ... } @ attrs: assert (pyproject != null) -> (format == null); let - inherit (python) stdenv; - format' = if pyproject != null then if pyproject then @@ -194,7 +195,7 @@ let # Keep extra attributes from `attrs`, e.g., `patchPhase', etc. self = toPythonModule (stdenv.mkDerivation ((builtins.removeAttrs attrs [ "disabled" "checkPhase" "checkInputs" "nativeCheckInputs" "doCheck" "doInstallCheck" "dontWrapPythonPrograms" "catchConflicts" "pyproject" "format" - "disabledTestPaths" "outputs" + "disabledTestPaths" "outputs" "stdenv" ]) // { name = namePrefix + name_; diff --git a/pkgs/development/interpreters/python/python-packages-base.nix b/pkgs/development/interpreters/python/python-packages-base.nix index 91ca84b34b8..b5afaf34ce6 100644 --- a/pkgs/development/interpreters/python/python-packages-base.nix +++ b/pkgs/development/interpreters/python/python-packages-base.nix @@ -13,7 +13,7 @@ let # Derivations built with `buildPythonPackage` can already be overridden with `override`, `overrideAttrs`, and `overrideDerivation`. # This function introduces `overridePythonAttrs` and it overrides the call to `buildPythonPackage`. - makeOverridablePythonPackage = f: origArgs: + makeOverridablePythonPackage = f: lib.mirrorFunctionArgs f (origArgs: let args = lib.fix (lib.extends (_: previousAttrs: { @@ -30,7 +30,7 @@ let overridePythonAttrs = newArgs: makeOverridablePythonPackage f (overrideWith newArgs); __functor = self: result; } - else result; + else result); mkPythonDerivation = if python.isPy3k then ./mk-python-derivation.nix diff --git a/pkgs/development/interpreters/python/python2/mk-python-derivation.nix b/pkgs/development/interpreters/python/python2/mk-python-derivation.nix index 1a6f9c784cf..6d51b51b215 100644 --- a/pkgs/development/interpreters/python/python2/mk-python-derivation.nix +++ b/pkgs/development/interpreters/python/python2/mk-python-derivation.nix @@ -57,7 +57,8 @@ # Raise an error if two packages are installed with the same name # TODO: For cross we probably need a different PYTHONPATH, or not # add the runtime deps until after buildPhase. -, catchConflicts ? (python.stdenv.hostPlatform == python.stdenv.buildPlatform) +# FIXME: disabled for Python 2 because broken +, catchConflicts ? false # Additional arguments to pass to the makeWrapper function, which wraps # generated binaries. diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index d650a03331e..3ccbe1e855a 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -15,13 +15,6 @@ let config = import ./config.nix { inherit fetchFromSavannah; }; rubygems = import ./rubygems { inherit stdenv lib fetchurl; }; - openssl3Gem = fetchFromGitHub { - owner = "ruby"; - repo = "openssl"; - rev = "v3.0.2"; - hash = "sha256-KhuKRP1JkMJv7CagGRQ0KKGOd5Oh0FP0fbj0VZ4utGo="; - }; - # Contains the ruby version heuristics rubyVersion = import ./ruby-version.nix { inherit lib; }; @@ -156,12 +149,6 @@ let rm -rf $sourceRoot/{lib,test}/rubygems* cp -r ${rubygems}/lib/rubygems* $sourceRoot/lib cp -r ${rubygems}/test/rubygems $sourceRoot/test - '' + opString (ver.majMin == "3.0" && opensslSupport) '' - # Replace the Gem by a OpenSSL3-compatible one. - echo "Hotpatching the OpenSSL gem with a 3.x series for OpenSSL 3 support..." - cp -vr ${openssl3Gem}/ext/openssl $sourceRoot/ext/ - cp -vr ${openssl3Gem}/lib/ $sourceRoot/ext/openssl/ - cp -vr ${openssl3Gem}/{History.md,openssl.gemspec} $sourceRoot/ext/openssl/ ''; postPatch = '' @@ -334,11 +321,6 @@ in { sha256 = "sha256-wtq2PLyPKgVSYQitQZ76Y6Z+1AdNu8+fwrHKZky0W6A="; }; - ruby_3_0 = generic { - version = rubyVersion "3" "0" "6" ""; - sha256 = "sha256-bmy9SQAw15EMD/IO3vq0KU380QRvD49H94tZeYesaD4="; - }; - ruby_3_1 = generic { version = rubyVersion "3" "1" "4" ""; sha256 = "sha256-o9VYeaDfqx1xQf3xDSKgfb+OXNxEFdob3gYSfVzDx7Y="; @@ -351,8 +333,8 @@ in { }; ruby_3_3 = generic { - version = rubyVersion "3" "3" "0" "preview2"; - sha256 = "sha256-MM6LD+EbN7WsCI9aV2V0S5NerEW7ianjgXMVMxRPWZE="; + version = rubyVersion "3" "3" "0" "preview3"; + sha256 = "sha256-CWkUG+kuZ+DtuEqPs1SsyY8BvXjmAqI6DxNgRcgvSAk="; cargoSha256 = "sha256-GeelTMRFIyvz1QS2L+Q3KAnyQy7jc0ejhx3TdEFVEbk="; }; diff --git a/pkgs/development/interpreters/ruby/rubygems/default.nix b/pkgs/development/interpreters/ruby/rubygems/default.nix index e40ccb5908d..8e9e35dae59 100644 --- a/pkgs/development/interpreters/ruby/rubygems/default.nix +++ b/pkgs/development/interpreters/ruby/rubygems/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "rubygems"; - version = "3.4.20"; + version = "3.4.22"; src = fetchurl { url = "https://rubygems.org/rubygems/rubygems-${version}.tgz"; - hash = "sha256-9jKKef7KPnSYgKb3zf1LaulFBJuDpY6pWOJHSpG6Hzs="; + hash = "sha256-gD+nd3bRHT0btWOCZhbIERJEJeAzGtH9mDxBRARqYVY="; }; patches = [ @@ -26,6 +26,7 @@ stdenv.mkDerivation rec { changelog = "https://github.com/rubygems/rubygems/blob/v${version}/CHANGELOG.md"; homepage = "https://rubygems.org/"; license = with licenses; [ mit /* or */ ruby ]; + mainProgram = "gem"; maintainers = with maintainers; [ zimbatm ]; }; } diff --git a/pkgs/development/interpreters/scheme48/default.nix b/pkgs/development/interpreters/scheme48/default.nix index 7a4178d82b1..82bd58469bd 100644 --- a/pkgs/development/interpreters/scheme48/default.nix +++ b/pkgs/development/interpreters/scheme48/default.nix @@ -14,6 +14,15 @@ stdenv.mkDerivation rec { substituteInPlace build/build-usual-image --replace '"(made by $USER on $date)"' '""' ''; + # Silence warnings related to use of implicitly declared library functions and implicit ints. + # TODO: Remove and/or fix with patches the next time this package is updated. + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = toString [ + "-Wno-error=implicit-function-declaration" + "-Wno-error=implicit-int" + ]; + }; + meta = with lib; { homepage = "https://s48.org/"; description = "Scheme 48 interpreter for R5RS"; diff --git a/pkgs/development/interpreters/shen-sbcl/default.nix b/pkgs/development/interpreters/shen-sbcl/default.nix index 194c67eba98..538f5e7f135 100644 --- a/pkgs/development/interpreters/shen-sbcl/default.nix +++ b/pkgs/development/interpreters/shen-sbcl/default.nix @@ -36,6 +36,7 @@ stdenv.mkDerivation rec { changelog = "https://github.com/Shen-Language/shen-cl/raw/v${version}/CHANGELOG.md"; platforms = sbcl.meta.platforms; maintainers = with maintainers; [ bsima ]; + broken = true; license = licenses.bsd3; }; } diff --git a/pkgs/development/interpreters/tinyscheme/default.nix b/pkgs/development/interpreters/tinyscheme/default.nix index 1b298af4ac4..fef3f5dacee 100644 --- a/pkgs/development/interpreters/tinyscheme/default.nix +++ b/pkgs/development/interpreters/tinyscheme/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { # We want to have the makefile pick up $CC, etc. so that we don't have # to unnecessarily tie this package to the GCC stdenv. ./02-use-toolchain-env-vars.patch - ] ++ lib.optionals stdenv.targetPlatform.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # On macOS the library suffix is .dylib: ./03-macOS-SOsuf.patch ]; diff --git a/pkgs/development/interpreters/zuo/default.nix b/pkgs/development/interpreters/zuo/default.nix index 95c05c3cf63..ef302aacc73 100644 --- a/pkgs/development/interpreters/zuo/default.nix +++ b/pkgs/development/interpreters/zuo/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zuo"; - version = "unstable-2023-10-17"; + version = "unstable-2023-11-10"; src = fetchFromGitHub { owner = "racket"; repo = "zuo"; - rev = "493e9cd08147add01bba9247f36759f095b87678"; - hash = "sha256-gsCjB3V+A0kMZJZ9onZ57R6b1Ha0K+Q383DQoVGfY7I="; + rev = "9e2aa26b0574b4ac53c838f6b59fd78f952c3923"; + hash = "sha256-wF+jj4+4uFofW9KhVqRF7EoWViRny2KuSfX/l6UN+yY="; }; doCheck = true; diff --git a/pkgs/development/libraries/NSPlist/default.nix b/pkgs/development/libraries/NSPlist/default.nix index 680e86dd64e..0ad16067397 100644 --- a/pkgs/development/libraries/NSPlist/default.nix +++ b/pkgs/development/libraries/NSPlist/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, flex, cmake }: stdenv.mkDerivation { pname = "NSPlist"; @@ -11,7 +11,12 @@ stdenv.mkDerivation { sha256 = "0v4yfiwfd08hmh2ydgy6pnmlzjbd96k78dsla9pfd56ka89aw74r"; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ flex cmake ]; + + preConfigure = '' + # Regenerate the lexer for improved compatibility with clang 16. + flex -o src/NSPlistLexer.cpp <(tail --lines=+17 src/NSPlistLexer.l) + ''; meta = with lib; { maintainers = with maintainers; [ matthewbauer ]; diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix index d74ab371bb1..dea308d59a2 100644 --- a/pkgs/development/libraries/SDL2/default.nix +++ b/pkgs/development/libraries/SDL2/default.nix @@ -9,7 +9,7 @@ , libGL , alsaSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid , alsa-lib -, x11Support ? !stdenv.targetPlatform.isWindows && !stdenv.hostPlatform.isAndroid +, x11Support ? !stdenv.hostPlatform.isWindows && !stdenv.hostPlatform.isAndroid , libX11 , xorgproto , libICE @@ -58,13 +58,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "SDL2"; - version = "2.28.3"; + version = "2.28.4"; src = fetchFromGitHub { owner = "libsdl-org"; repo = "SDL"; rev = "release-${finalAttrs.version}"; - hash = "sha256-/kQ2IyvAfmZ+zIUt1WuEIeX0nYPGXDlAQk2qDsQnFFs="; + hash = "sha256-1+1m0s3pBCTu924J/4aIu4IHk/N88x2djWDEsDpAJn4="; }; dontDisableStatic = if withStatic then 1 else 0; outputs = [ "out" "dev" ]; @@ -122,7 +122,7 @@ stdenv.mkDerivation (finalAttrs: { "--disable-oss" ] ++ lib.optional (!x11Support) "--without-x" ++ lib.optional alsaSupport "--with-alsa-prefix=${alsa-lib.out}/lib" - ++ lib.optional stdenv.targetPlatform.isWindows "--disable-video-opengles" + ++ lib.optional stdenv.hostPlatform.isWindows "--disable-video-opengles" ++ lib.optional stdenv.isDarwin "--disable-sdltest"; # We remove libtool .la files when static libs are requested, diff --git a/pkgs/development/libraries/SDL_mixer/default.nix b/pkgs/development/libraries/SDL_mixer/default.nix index 91e9f0a3edf..12b50cd476b 100644 --- a/pkgs/development/libraries/SDL_mixer/default.nix +++ b/pkgs/development/libraries/SDL_mixer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl +{ stdenv, lib, fetchurl, fetchpatch , SDL, libogg, libvorbis, smpeg, libmikmod , fluidsynth, pkg-config , enableNativeMidi ? false @@ -13,6 +13,44 @@ stdenv.mkDerivation rec { sha256 = "0alrhqgm40p4c92s26mimg9cm1y7rzr6m0p49687jxd9g6130i0n"; }; + patches = [ + # Fixes implicit declaration of `Mix_QuitFluidSynth`, which causes build failures with clang. + # https://github.com/libsdl-org/SDL_mixer/issues/287 + (fetchpatch { + name = "fluidsynth-fix-implicit-declaration.patch"; + url = "https://github.com/libsdl-org/SDL_mixer/commit/05b12a3c22c0746c29dc5478f5b7fbd8a51a1303.patch"; + hash = "sha256-MDuViLD1w1tAVLoX2yFeJ865v21S2roi0x7Yi7GYRVU="; + }) + # Backport of 2.0 fixes for incompatible function pointer conversions, fixing builds with clang. + (fetchpatch { + name = "fluidsynth-fix-function-pointer-conversions.patch"; + url = "https://github.com/libsdl-org/SDL_mixer/commit/0c504159d212b710a47cb25c669b21730fc78edd.patch"; + hash = "sha256-FSj7JLE2MbGVYCspoq3trXP5Ho+lAtnro2IUOHkto/U"; + }) + # Backport of MikMod fixes, which includes incompatible function pointer conversions. + (fetchpatch { + name = "mikmod-fixes.patch"; + url = "https://github.com/libsdl-org/SDL_mixer/commit/a3e5ff8142cf3530cddcb27b58f871f387796ab6.patch"; + hash = "sha256-dqD8hxx6U2HaelUx0WsGPiWuso++LjwasaAeTTGqdbk"; + }) + # More incompatible function pointer conversion fixes (this time in Vorbis-decoding code). + (fetchpatch { + name = "vorbis-fix-function-pointer-conversion.patch"; + url = "https://github.com/libsdl-org/SDL_mixer/commit/9e6d7b67a00656a68ea0c2eace75c587871549b9.patch"; + hash = "sha256-rZI3bFb/KxnduTkA/9CISccKHUgrX22KXg69sl/uXvU="; + }) + (fetchpatch { + name = "vorbis-fix-function-pointer-conversion-header-part.patch"; + url = "https://github.com/libsdl-org/SDL_mixer/commit/03bd4ca6aa38c1a382c892cef86296cd621ecc1d.patch"; + hash = "sha256-7HrSHYFYVgpamP7Q9znrFZMZ72jvz5wYpJEPqWev/I4="; + }) + (fetchpatch { + name = "vorbis-fix-function-pointer-signature.patch"; + url = "https://github.com/libsdl-org/SDL_mixer/commit/d28cbc34d63dd20b256103c3fe506ecf3d34d379.patch"; + hash = "sha256-sGbtF+Tcjf+6a28nJgawefeeKXnhcwu7G55e94oS9AU="; + }) + ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ SDL libogg libvorbis fluidsynth smpeg libmikmod ]; diff --git a/pkgs/development/libraries/Xaw3d/default.nix b/pkgs/development/libraries/Xaw3d/default.nix index f358a59ad62..f90be3a751e 100644 --- a/pkgs/development/libraries/Xaw3d/default.nix +++ b/pkgs/development/libraries/Xaw3d/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "Xaw3d"; - version = "1.6.3"; + version = "1.6.5"; src = fetchurl { - url = "https://www.x.org/releases/individual/lib/libXaw3d-${version}.tar.bz2"; - sha256 = "0i653s8g25cc0mimkwid9366bqkbyhdyjhckx7bw77j20hzrkfid"; + url = "https://www.x.org/releases/individual/lib/libXaw3d-${version}.tar.xz"; + sha256 = "sha256-NIHuS2dTuI4YhW6iZcuE8rAznujDu+yWaxVrOLWEGDM="; }; dontUseImakeConfigure = true; nativeBuildInputs = [ pkg-config bison flex imake gccmakedep ]; diff --git a/pkgs/development/libraries/aalib/clang.patch b/pkgs/development/libraries/aalib/clang.patch new file mode 100644 index 00000000000..5f8fa80f387 --- /dev/null +++ b/pkgs/development/libraries/aalib/clang.patch @@ -0,0 +1,74 @@ +diff -ur a/configure b/configure +--- a/configure 2001-04-26 10:44:54.000000000 -0400 ++++ b/configure 2023-10-21 23:19:52.941161475 -0400 +@@ -1005,7 +1005,7 @@ + #line 1006 "configure" + #include "confdefs.h" + +-main(){return(0);} ++int main(){return(0);} + EOF + if { (eval echo configure:1011: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + ac_cv_prog_cc_works=yes +diff -ur a/src/aafire.c b/src/aafire.c +--- a/src/aafire.c 2001-04-26 11:30:03.000000000 -0400 ++++ b/src/aafire.c 2023-10-21 23:46:54.478750904 -0400 +@@ -1,3 +1,4 @@ ++#include <stdlib.h> + #include <stdio.h> + #include "aalib.h" + +diff -ur a/src/aainfo.c b/src/aainfo.c +--- a/src/aainfo.c 2001-04-26 10:37:31.000000000 -0400 ++++ b/src/aainfo.c 2023-10-21 23:31:54.141133353 -0400 +@@ -1,4 +1,4 @@ +- ++#include <stdlib.h> + #include "aalib.h" + #include "aaint.h" + int main(int argc, char **argv) +diff -ur a/src/aakbdreg.c b/src/aakbdreg.c +--- a/src/aakbdreg.c 2023-10-21 23:19:00.787207960 -0400 ++++ b/src/aakbdreg.c 2023-10-21 23:23:49.667253541 -0400 +@@ -1,4 +1,5 @@ + #include <malloc.h> ++#include <string.h> + #include "config.h" + #include "aalib.h" + #include "aaint.h" +diff -ur a/src/aamoureg.c b/src/aamoureg.c +--- a/src/aamoureg.c 2023-10-21 23:19:00.787725591 -0400 ++++ b/src/aamoureg.c 2023-10-21 23:26:51.821477807 -0400 +@@ -1,4 +1,5 @@ + #include <malloc.h> ++#include <string.h> + #include "config.h" + #include "aalib.h" + #include "aaint.h" +diff -ur a/src/aaregist.c b/src/aaregist.c +--- a/src/aaregist.c 2023-10-21 23:19:00.788130179 -0400 ++++ b/src/aaregist.c 2023-10-21 23:19:38.929729034 -0400 +@@ -1,4 +1,5 @@ + #include <malloc.h> ++#include <string.h> + #include "config.h" + #include "aalib.h" + #include "aaint.h" +diff -ur a/src/aasavefont.c b/src/aasavefont.c +--- a/src/aasavefont.c 2001-04-26 10:37:31.000000000 -0400 ++++ b/src/aasavefont.c 2023-10-21 23:51:09.216521714 -0400 +@@ -1,3 +1,5 @@ ++#include <stdlib.h> ++#include <stdio.h> + #include "aalib.h" + int main(int argc, char **argv) + { +diff -ur a/src/aatest.c b/src/aatest.c +--- a/src/aatest.c 2001-04-26 10:37:31.000000000 -0400 ++++ b/src/aatest.c 2023-10-21 23:43:16.758422704 -0400 +@@ -1,3 +1,5 @@ ++#include <stdlib.h> ++#include <string.h> + #include "aalib.h" + int main(int argc, char **argv) + { diff --git a/pkgs/development/libraries/aalib/darwin.patch b/pkgs/development/libraries/aalib/darwin.patch index 44559d06210..94b548b35c1 100644 --- a/pkgs/development/libraries/aalib/darwin.patch +++ b/pkgs/development/libraries/aalib/darwin.patch @@ -18,9 +18,9 @@ index def65fe..f4f8efb 100644 @@ -1,4 +1,4 @@ -#include <malloc.h> +#include <stdlib.h> + #include <string.h> #include "config.h" #include "aalib.h" - #include "aaint.h" diff --git a/src/aalib.c b/src/aalib.c index 11fecc8..e3063b4 100644 --- a/src/aalib.c @@ -40,9 +40,9 @@ index 0380828..bb55fe3 100644 @@ -1,4 +1,4 @@ -#include <malloc.h> +#include <stdlib.h> + #include <string.h> #include "config.h" #include "aalib.h" - #include "aaint.h" diff --git a/src/aarec.c b/src/aarec.c index 70f4ebc..ee43e8a 100644 --- a/src/aarec.c @@ -61,9 +61,9 @@ index 54abec0..765155e 100644 @@ -1,4 +1,4 @@ -#include <malloc.h> +#include <stdlib.h> + #include <string.h> #include "config.h" #include "aalib.h" - #include "aaint.h" diff --git a/src/aax.c b/src/aax.c index adcbd82..36e3294 100644 --- a/src/aax.c diff --git a/pkgs/development/libraries/aalib/default.nix b/pkgs/development/libraries/aalib/default.nix index af0fa617401..903364ea27f 100644 --- a/pkgs/development/libraries/aalib/default.nix +++ b/pkgs/development/libraries/aalib/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "out" "man" "info" ]; setOutputFlags = false; # Doesn't support all the flags - patches = lib.optionals stdenv.isDarwin [ ./darwin.patch ]; + patches = [ ./clang.patch ] # Fix implicit `int` on `main` error with newer versions of clang + ++ lib.optionals stdenv.isDarwin [ ./darwin.patch ]; # The fuloong2f is not supported by aalib still preConfigure = '' diff --git a/pkgs/development/libraries/abseil-cpp/202103.nix b/pkgs/development/libraries/abseil-cpp/202103.nix index 712f89e383f..59294496f80 100644 --- a/pkgs/development/libraries/abseil-cpp/202103.nix +++ b/pkgs/development/libraries/abseil-cpp/202103.nix @@ -39,6 +39,10 @@ stdenv.mkDerivation rec { url = "https://github.com/abseil/abseil-cpp/commit/808bc202fc13e85a7948db0d7fb58f0f051200b1.patch"; sha256 = "sha256-ayY/aV/xWOdEyFSDqV7B5WDGvZ0ASr/aeBeYwP5RZVc="; }) + ] ++ lib.optionals stdenv.isDarwin [ + # Don’t propagate the path to CoreFoundation. Otherwise, it’s impossible to build packages + # that require a different SDK other than the default one. + ./cmake-core-foundation.patch ]; cmakeFlags = [ diff --git a/pkgs/development/libraries/abseil-cpp/202111.nix b/pkgs/development/libraries/abseil-cpp/202111.nix index d40ca0bd4ab..0c1a173eca4 100644 --- a/pkgs/development/libraries/abseil-cpp/202111.nix +++ b/pkgs/development/libraries/abseil-cpp/202111.nix @@ -18,6 +18,12 @@ stdenv.mkDerivation rec { sha256 = "sha256-sSXT6D4JSrk3dA7kVaxfKkzOMBpqXQb0WbMYWG+nGwk="; }; + patches = lib.optionals stdenv.isDarwin [ + # Don’t propagate the path to CoreFoundation. Otherwise, it’s impossible to build packages + # that require a different SDK other than the default one. + ./cmake-core-foundation.patch + ]; + cmakeFlags = [ "-DBUILD_SHARED_LIBS=${if static then "OFF" else "ON"}" ] ++ lib.optionals (cxxStandard != null) [ diff --git a/pkgs/development/libraries/abseil-cpp/202206.nix b/pkgs/development/libraries/abseil-cpp/202206.nix index 7ca25f41404..a605be3c05e 100644 --- a/pkgs/development/libraries/abseil-cpp/202206.nix +++ b/pkgs/development/libraries/abseil-cpp/202206.nix @@ -18,6 +18,12 @@ stdenv.mkDerivation rec { hash = "sha256-Od1FZOOWEXVQsnZBwGjDIExi6LdYtomyL0STR44SsG8="; }; + patches = lib.optionals stdenv.isDarwin [ + # Don’t propagate the path to CoreFoundation. Otherwise, it’s impossible to build packages + # that require a different SDK other than the default one. + ./cmake-core-foundation.patch + ]; + cmakeFlags = [ "-DBUILD_SHARED_LIBS=${if static then "OFF" else "ON"}" ] ++ lib.optionals (cxxStandard != null) [ diff --git a/pkgs/development/libraries/abseil-cpp/202301.nix b/pkgs/development/libraries/abseil-cpp/202301.nix index da5f1fc029e..4676264c26d 100644 --- a/pkgs/development/libraries/abseil-cpp/202301.nix +++ b/pkgs/development/libraries/abseil-cpp/202301.nix @@ -18,6 +18,12 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-PLoI7ix+reUqkZ947kWzls8lujYqWXk9A9a55UcfahI="; }; + patches = lib.optionals stdenv.isDarwin [ + # Don’t propagate the path to CoreFoundation. Otherwise, it’s impossible to build packages + # that require a different SDK other than the default one. + ./cmake-core-foundation.patch + ]; + cmakeFlags = [ "-DABSL_BUILD_TEST_HELPERS=ON" "-DABSL_USE_EXTERNAL_GOOGLETEST=ON" diff --git a/pkgs/development/libraries/abseil-cpp/cmake-core-foundation.patch b/pkgs/development/libraries/abseil-cpp/cmake-core-foundation.patch new file mode 100644 index 00000000000..61b57456b3f --- /dev/null +++ b/pkgs/development/libraries/abseil-cpp/cmake-core-foundation.patch @@ -0,0 +1,12 @@ +diff -ur a/absl/time/CMakeLists.txt b/absl/time/CMakeLists.txt +--- a/absl/time/CMakeLists.txt 1969-12-31 19:00:01.000000000 -0500 ++++ b/absl/time/CMakeLists.txt 2023-10-30 21:50:32.639061785 -0400 +@@ -55,7 +55,7 @@ + ) + + if(APPLE) +- find_library(CoreFoundation CoreFoundation) ++ set(CoreFoundation "-framework CoreFoundation") + endif() + + absl_cc_library( diff --git a/pkgs/development/libraries/allegro/5.nix b/pkgs/development/libraries/allegro/5.nix index b3346be1bb7..487b0dfde0d 100644 --- a/pkgs/development/libraries/allegro/5.nix +++ b/pkgs/development/libraries/allegro/5.nix @@ -1,10 +1,41 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, texinfo, libXext, xorgproto, libX11 -, libXpm, libXt, libXcursor, alsa-lib, cmake, zlib, libpng, libvorbis -, libXxf86dga, libXxf86misc -, libXxf86vm, openal, libGLU, libGL, libjpeg, flac -, libXi, libXfixes, freetype, libopus, libtheora -, physfs, enet, pkg-config, gtk3, pcre, libpulseaudio, libpthreadstubs +{ lib +, alsa-lib +, cmake +, enet +, fetchFromGitHub +, fetchpatch +, flac +, freetype +, gtk3 +, libGL +, libGLU +, libjpeg +, libopus +, libpng +, libpthreadstubs +, libpulseaudio +, libtheora +, libvorbis +, libwebp +, libX11 +, libXcursor , libXdmcp +, libXext +, libXfixes +, libXi +, libXpm +, libXt +, libXxf86dga +, libXxf86misc +, libXxf86vm +, openal +, pcre +, physfs +, pkg-config +, stdenv +, texinfo +, xorgproto +, zlib }: stdenv.mkDerivation rec { @@ -18,15 +49,45 @@ stdenv.mkDerivation rec { sha256 = "sha256-uNcaeTelFNfg+YjPYc7nK4TrFDxJsEuPhsF8x1cvIYQ="; }; - nativeBuildInputs = [ cmake pkg-config ]; + nativeBuildInputs = [ + cmake + pkg-config + ]; + buildInputs = [ - texinfo zlib libpng libvorbis openal libGLU libGL - libjpeg flac enet libtheora freetype physfs libopus - gtk3 pcre + enet + flac + freetype + gtk3 + libGL + libGLU + libjpeg + libopus + libpng + libtheora + libvorbis + libwebp + openal + pcre + physfs + texinfo + zlib ] ++ lib.optionals stdenv.isLinux [ - libXext xorgproto libX11 libXpm libXt libXcursor alsa-lib - libXxf86dga libXxf86misc libXxf86vm libXi libXfixes - libXdmcp libpulseaudio libpthreadstubs + alsa-lib + libpthreadstubs + libpulseaudio + libX11 + libXcursor + libXdmcp + libXext + libXfixes + libXi + libXpm + libXt + libXxf86dga + libXxf86misc + libXxf86vm + xorgproto ]; postPatch = '' diff --git a/pkgs/development/libraries/apr-util/clang-bdb.patch b/pkgs/development/libraries/apr-util/clang-bdb.patch new file mode 100644 index 00000000000..02e9c8378c6 --- /dev/null +++ b/pkgs/development/libraries/apr-util/clang-bdb.patch @@ -0,0 +1,12 @@ +diff -ur a/build/dbm.m4 b/build/dbm.m4 +--- a/build/dbm.m4 2013-11-23 13:00:53.000000000 -0500 ++++ b/build/dbm.m4 2023-10-22 20:16:37.764571446 -0400 +@@ -235,7 +235,7 @@ + #include <stdlib.h> + #include <stdio.h> + #include <$apu_try_berkeley_db_header> +-main () ++int main () + { + int major, minor, patch; + diff --git a/pkgs/development/libraries/apr-util/default.nix b/pkgs/development/libraries/apr-util/default.nix index b44b410d30e..a1cbbc5e664 100644 --- a/pkgs/development/libraries/apr-util/default.nix +++ b/pkgs/development/libraries/apr-util/default.nix @@ -19,15 +19,18 @@ stdenv.mkDerivation rec { sha256 = "sha256-pBB243EHRjJsOUUEKZStmk/KwM4Cd92P6gdv7DyXcrU="; }; - patches = [ ./fix-libxcrypt-build.patch ] - ++ lib.optional stdenv.isFreeBSD ./include-static-dependencies.patch; + patches = [ + ./fix-libxcrypt-build.patch + # Fix incorrect Berkeley DB detection with newer versions of clang due to implicit `int` on main errors. + ./clang-bdb.patch + ] ++ lib.optional stdenv.isFreeBSD ./include-static-dependencies.patch; NIX_CFLAGS_LINK = [ "-lcrypt" ]; outputs = [ "out" "dev" ]; outputBin = "dev"; - nativeBuildInputs = [ makeWrapper ] ++ lib.optional stdenv.isFreeBSD autoreconfHook; + nativeBuildInputs = [ makeWrapper autoreconfHook ]; configureFlags = [ "--with-apr=${apr.dev}" "--with-expat=${expat.dev}" ] ++ lib.optional (!stdenv.isCygwin) "--with-crypto" diff --git a/pkgs/development/libraries/audio/game-music-emu/default.nix b/pkgs/development/libraries/audio/game-music-emu/default.nix index a10aace767b..0f420745bae 100644 --- a/pkgs/development/libraries/audio/game-music-emu/default.nix +++ b/pkgs/development/libraries/audio/game-music-emu/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, cmake, removeReferencesTo }: +{ lib, stdenv, fetchurl, cmake, removeReferencesTo, zlib }: stdenv.mkDerivation rec { version = "0.6.3"; @@ -8,8 +8,9 @@ stdenv.mkDerivation rec { url = "https://bitbucket.org/mpyne/game-music-emu/downloads/${pname}-${version}.tar.xz"; sha256 = "07857vdkak306d9s5g6fhmjyxk7vijzjhkmqb15s7ihfxx9lx8xb"; }; - cmakeFlags = lib.optionals (stdenv.isDarwin || stdenv.hostPlatform.isMusl) [ "-DENABLE_UBSAN=OFF" ]; + cmakeFlags = [ "-DENABLE_UBSAN=OFF" ]; nativeBuildInputs = [ cmake removeReferencesTo ]; + buildInputs = [ zlib ]; # It used to reference it, in the past, but thanks to the postFixup hook, now # it doesn't. diff --git a/pkgs/development/libraries/audio/libmysofa/default.nix b/pkgs/development/libraries/audio/libmysofa/default.nix index a5ecbdcfccc..8955c8876ad 100644 --- a/pkgs/development/libraries/audio/libmysofa/default.nix +++ b/pkgs/development/libraries/audio/libmysofa/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libmysofa"; - version = "1.3.1"; + version = "1.3.2"; src = fetchFromGitHub { owner = "hoene"; repo = "libmysofa"; rev = "v${version}"; - sha256 = "sha256-QEfkeofsVxB9gyISL/P7bvnbcBuG7Q3A4UoAyQAXxgE="; + hash = "sha256-eXMGwa6lOtKoUCcHR9BM2S3NWAZkGyZzF3FAjYaWTvg="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/audio/libopenmpt/default.nix b/pkgs/development/libraries/audio/libopenmpt/default.nix index bb5a4e0dd53..b8b89abc8ea 100644 --- a/pkgs/development/libraries/audio/libopenmpt/default.nix +++ b/pkgs/development/libraries/audio/libopenmpt/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "libopenmpt"; - version = "0.7.2"; + version = "0.7.3"; outputs = [ "out" "dev" "bin" ]; src = fetchurl { url = "https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${version}+release.autotools.tar.gz"; - hash = "sha256-UJFD5aTzsT3Zjq4om/7BtWTt3XG7x8p4ZLgoNeMTMOE="; + hash = "sha256-LPg2m3kWsJJk8/FLn7bO81pum+4DKN7E9J2YIRzP1yI="; }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/audio/lilv/default.nix b/pkgs/development/libraries/audio/lilv/default.nix index 14b0d4c5e46..a0869edf4fb 100644 --- a/pkgs/development/libraries/audio/lilv/default.nix +++ b/pkgs/development/libraries/audio/lilv/default.nix @@ -1,4 +1,16 @@ -{ lib, stdenv, fetchurl, lv2, pkg-config, python3, serd, sord, sratom, wafHook +{ lib +, stdenv +, fetchurl +, lv2 +, meson +, ninja +, pkg-config +, python3 +, libsndfile +, serd +, sord +, sratom +, gitUpdater # test derivations , pipewire @@ -6,24 +18,29 @@ stdenv.mkDerivation rec { pname = "lilv"; - version = "0.24.12"; + version = "0.24.20"; - outputs = [ "out" "dev" ]; + outputs = [ "out" "dev" "man" ]; src = fetchurl { - url = "https://download.drobilla.net/${pname}-${version}.tar.bz2"; - sha256 = "sha256-JqN3kIkMnB+DggO0f1sjIDNP6SwCpNJuu+Jmnb12kGE="; + url = "https://download.drobilla.net/${pname}-${version}.tar.xz"; + hash = "sha256-T7CCubiyhuqSu7cb3mt1Ykzsq23wzGOe51oqCWIS7rw="; }; - patches = [ ./lilv-pkgconfig.patch ]; - - nativeBuildInputs = [ pkg-config python3 wafHook ]; - buildInputs = [ serd sord sratom ]; + nativeBuildInputs = [ meson ninja pkg-config python3 ]; + buildInputs = [ libsndfile serd sord sratom ]; propagatedBuildInputs = [ lv2 ]; - dontAddWafCrossFlags = true; - passthru.tests = { - inherit pipewire; + mesonFlags = [ "-Ddocs=disabled" ]; + + passthru = { + tests = { + inherit pipewire; + }; + updateScript = gitUpdater { + url = "https://gitlab.com/lv2/lilv.git"; + rev-prefix = "v"; + }; }; meta = with lib; { diff --git a/pkgs/development/libraries/audio/lilv/lilv-pkgconfig.patch b/pkgs/development/libraries/audio/lilv/lilv-pkgconfig.patch deleted file mode 100644 index a5a8c6007e4..00000000000 --- a/pkgs/development/libraries/audio/lilv/lilv-pkgconfig.patch +++ /dev/null @@ -1,6 +0,0 @@ ---- a/lilv.pc.in -+++ b/lilv.pc.in -@@ -9 +9,2 @@ Description: Simple C library for hosting LV2 plugins --Requires: @LILV_PKG_DEPS@ -+Requires: lv2 -+Requires.private: @LILV_PKG_DEPS@ diff --git a/pkgs/development/libraries/audio/zita-resampler/default.nix b/pkgs/development/libraries/audio/zita-resampler/default.nix index 075ce33ef9e..70054134767 100644 --- a/pkgs/development/libraries/audio/zita-resampler/default.nix +++ b/pkgs/development/libraries/audio/zita-resampler/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { cd source substituteInPlace Makefile \ --replace 'ldconfig' "" - '' + lib.optionalString (!stdenv.targetPlatform.isx86_64) '' + '' + lib.optionalString (!stdenv.hostPlatform.isx86_64) '' substituteInPlace Makefile \ --replace '-DENABLE_SSE2' "" ''; diff --git a/pkgs/development/libraries/audio/zix/default.nix b/pkgs/development/libraries/audio/zix/default.nix index 7d1bac57472..9f5d8867a15 100644 --- a/pkgs/development/libraries/audio/zix/default.nix +++ b/pkgs/development/libraries/audio/zix/default.nix @@ -28,6 +28,13 @@ stdenv.mkDerivation rec { "-Ddocs=disabled" ]; + env = lib.optionalAttrs stdenv.isDarwin { + # Do not fail the build on clang-16/darwin. + # TODO: drop the workaround when upstream fixes it in: + # https://gitlab.com/drobilla/zix/-/issues/3 + NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; + }; + meta = with lib; { description = "A lightweight C99 portability and data structure library"; homepage = "https://gitlab.com/drobilla/zix"; diff --git a/pkgs/development/libraries/audiofile/default.nix b/pkgs/development/libraries/audiofile/default.nix index c6d656388d4..f9974e2ca25 100644 --- a/pkgs/development/libraries/audiofile/default.nix +++ b/pkgs/development/libraries/audiofile/default.nix @@ -28,6 +28,9 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "man" ]; + # std::unary_function has been removed in c++17 + makeFlags = [ "CXXFLAGS=-std=c++11" ]; + # Even when statically linking, libstdc++.la is put in dependency_libs here, # and hence libstdc++.so passed to the linker, just pass -lstdc++ and let the # compiler do what it does best. (libaudiofile.la is a generated file, so we diff --git a/pkgs/development/libraries/blst/default.nix b/pkgs/development/libraries/blst/default.nix index ef174d1118a..48865cf8356 100644 --- a/pkgs/development/libraries/blst/default.nix +++ b/pkgs/development/libraries/blst/default.nix @@ -14,8 +14,8 @@ stdenv.mkDerivation ( finalAttrs: { buildPhase = '' runHook preBuild - ./build.sh ${lib.optionalString stdenv.targetPlatform.isWindows "flavour=mingw64"} - ./build.sh -shared ${lib.optionalString stdenv.targetPlatform.isWindows "flavour=mingw64"} + ./build.sh ${lib.optionalString stdenv.hostPlatform.isWindows "flavour=mingw64"} + ./build.sh -shared ${lib.optionalString stdenv.hostPlatform.isWindows "flavour=mingw64"} runHook postBuild ''; diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index 69a8978ae62..017b4cf46a7 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -1,12 +1,8 @@ -{ config, lib, stdenv, fetchurl, fetchpatch, pkg-config, libiconv -, libintl, expat, zlib, libpng, pixman, fontconfig, freetype -, x11Support? !stdenv.isDarwin, libXext, libXrender +{ lib, stdenv, fetchurl, fetchpatch, gtk-doc, meson, ninja, pkg-config, python3 +, docbook_xsl, fontconfig, freetype, libpng, pixman, zlib +, x11Support? !stdenv.isDarwin || true, libXext, libXrender , gobjectSupport ? true, glib -, xcbSupport ? x11Support, libxcb, xcbutil # no longer experimental since 1.12 -, libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms -, glSupport ? x11Support && config.cairo.gl or (libGLSupported && stdenv.isLinux) -, libGL # libGLU libGL is no longer a big dependency -, pdfSupport ? true +, xcbSupport ? x11Support, libxcb , darwin , testers }: @@ -17,82 +13,27 @@ in stdenv.mkDerivation (finalAttrs: let inherit (finalAttrs) pname version; in { pname = "cairo"; - version = "1.16.0"; + version = "1.18.0"; src = fetchurl { url = "https://cairographics.org/${if lib.mod (builtins.fromJSON (lib.versions.minor version)) 2 == 0 then "releases" else "snapshots"}/${pname}-${version}.tar.xz"; - sha256 = "0c930mk5xr2bshbdljv005j3j8zr47gqmkry3q6qgvqky6rjjysy"; + hash = "sha256-JDoHNrl4oz3uKfnMp1IXM7eKZbVBggb+970cPUzxC2Q="; }; - patches = [ - # Fixes CVE-2018-19876; see Nixpkgs issue #55384 - # CVE information: https://nvd.nist.gov/vuln/detail/CVE-2018-19876 - # Upstream PR: https://gitlab.freedesktop.org/cairo/cairo/merge_requests/5 - # - # This patch is the merged commit from the above PR. - (fetchpatch { - name = "CVE-2018-19876.patch"; - url = "https://gitlab.freedesktop.org/cairo/cairo/-/commit/6edf572ebb27b00d3c371ba5ae267e39d27d5b6d.patch"; - hash = "sha256-wZ51BZWlXByFY3/CTn7el2A9aYkwL1FygJ2zqnN+UIQ="; - }) - - # Fix PDF output. - # https://gitlab.freedesktop.org/cairo/cairo/issues/342 - (fetchpatch { - url = "https://gitlab.freedesktop.org/cairo/cairo/-/commit/5e34c5a9640e49dcc29e6b954c4187cfc838dbd1.patch"; - hash = "sha256-yCwsDUY7efVvOZkA6a0bPS+RrVc8Yk9bfPwWHeOjq5o="; - }) - - # Fixes CVE-2020-35492; see https://github.com/NixOS/nixpkgs/issues/120364. - # CVE information: https://nvd.nist.gov/vuln/detail/CVE-2020-35492 - # Upstream PR: https://gitlab.freedesktop.org/cairo/cairo/merge_requests/85 - (fetchpatch { - name = "CVE-2020-35492.patch"; - includes = [ "src/cairo-image-compositor.c" ]; - url = "https://gitlab.freedesktop.org/cairo/cairo/-/commit/78266cc8c0f7a595cfe8f3b694bfb9bcc3700b38.patch"; - hash = "sha256-cXKzLMENx4/BHXLZg3Kfkx3esCnaNaB7WvjNfL77FhE="; - }) - - # Workaround https://gitlab.freedesktop.org/cairo/cairo/-/issues/121 - ./skip-configure-stderr-check.patch - - # Fixes cairo crash on macOS Big Sur - # Upstream PR: https://gitlab.freedesktop.org/cairo/cairo/-/issues/420 - (fetchpatch { - url = "https://gitlab.freedesktop.org/cairo/cairo/-/commit/e22d7212acb454daccc088619ee147af03883974.diff"; - hash = "sha256-8G98nsPz3MLEWPDX9F0jKgXC4hC4NNdFQLSpmW3ay2s="; - }) - - # Fix clang build failures on newer LLVM versions - # Upstream PR: https://gitlab.freedesktop.org/cairo/cairo/-/merge_requests/119 - (fetchpatch { - name = "fix-types.patch"; - url = "https://gitlab.freedesktop.org/cairo/cairo/-/commit/38e486b34d435130f2fb38c429e6016c3c82cd53.patch"; - hash = "sha256-vmluOJSuTRiQHmbBBVCxOIkZ0O0ZEo0J4mgrUPn0SIo="; - }) - - # Fix unexpected color addition on grayscale images (usually text). - # Upstream fix: https://gitlab.freedesktop.org/cairo/cairo/-/merge_requests/114 - # Can be removed after 1.18 release - (fetchpatch { - name = "fix-grayscale-anialias.patch"; - url = "https://gitlab.freedesktop.org/cairo/cairo/-/commit/4f4d89506f58a64b4829b1bb239bab9e46d63727.diff"; - hash = "sha256-mbTg67e7APfdELsuMAgXdY3xokWbGtHF7VDD5UyYqKM="; - }) - - ]; - outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; # very small separateDebugInfo = true; nativeBuildInputs = [ + gtk-doc + meson + ninja pkg-config + python3 ]; buildInputs = [ - libiconv - libintl + docbook_xsl ] ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ CoreGraphics CoreText @@ -100,49 +41,53 @@ in { Carbon ]); - propagatedBuildInputs = [ fontconfig expat freetype pixman zlib libpng ] + propagatedBuildInputs = [ fontconfig freetype pixman libpng zlib ] ++ optionals x11Support [ libXext libXrender ] - ++ optionals xcbSupport [ libxcb xcbutil ] + ++ optionals xcbSupport [ libxcb ] ++ optional gobjectSupport glib - ++ optional glSupport libGL ; # TODO: maybe liblzo but what would it be for here? - configureFlags = [ - "--enable-tee" - ] ++ (if stdenv.isDarwin then [ - "--disable-dependency-tracking" - "--enable-quartz" - "--enable-quartz-font" - "--enable-quartz-image" - "--enable-ft" - ] else (optional xcbSupport "--enable-xcb" - ++ optional glSupport "--enable-gl" - ++ optional pdfSupport "--enable-pdf" - )) ++ optional (!x11Support) "--disable-xlib"; - - preConfigure = - # On FreeBSD, `-ldl' doesn't exist. - lib.optionalString stdenv.isFreeBSD - '' for i in "util/"*"/Makefile.in" boilerplate/Makefile.in - do - cat "$i" | sed -es/-ldl//g > t - mv t "$i" - done - '' - + - '' - # Work around broken `Requires.private' that prevents Freetype - # `-I' flags to be propagated. - sed -i "src/cairo.pc.in" \ - -es'|^Cflags:\(.*\)$|Cflags: \1 -I${freetype.dev}/include/freetype2 -I${freetype.dev}/include|g' - substituteInPlace configure --replace strings $STRINGS - ''; + mesonFlags = [ + "-Dgtk_doc=true" + + # error: #error config.h must be included before this header + "-Dsymbol-lookup=disabled" + + # Only used in tests, causes a dependency cycle + "-Dspectre=disabled" + + (lib.mesonEnable "glib" gobjectSupport) + (lib.mesonEnable "tests" finalAttrs.doCheck) + (lib.mesonEnable "xlib" x11Support) + (lib.mesonEnable "xcb" xcbSupport) + ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + "--cross-file=${builtins.toFile "cross-file.conf" '' + [properties] + ipc_rmid_deferred_release = ${ + { + linux = "true"; + freebsd = "true"; + netbsd = "false"; + }.${stdenv.hostPlatform.parsed.kernel.name} or + (throw "Unknown value for ipc_rmid_deferred_release") + } + ''}" + ]; + + preConfigure = '' + patchShebangs version.py + ''; enableParallelBuilding = true; doCheck = false; # fails - postInstall = lib.optionalString stdenv.isDarwin glib.flattenInclude; + postInstall = '' + # Work around broken `Requires.private' that prevents Freetype + # `-I' flags to be propagated. + sed -i "$out/lib/pkgconfig/cairo.pc" \ + -es'|^Cflags:\(.*\)$|Cflags: \1 -I${freetype.dev}/include/freetype2 -I${freetype.dev}/include|g' + '' + lib.optionalString stdenv.isDarwin glib.flattenInclude; passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; @@ -151,9 +96,8 @@ in { longDescription = '' Cairo is a 2D graphics library with support for multiple output devices. Currently supported output targets include the X - Window System, Quartz, Win32, image buffers, PostScript, PDF, - and SVG file output. Experimental backends include OpenGL - (through glitz), XCB, BeOS, OS/2, and DirectFB. + Window System, XCB, Quartz, Win32, image buffers, PostScript, + PDF, and SVG file output. Cairo is designed to produce consistent output on all output media while taking advantage of display hardware acceleration @@ -162,10 +106,10 @@ in { homepage = "http://cairographics.org/"; license = with licenses; [ lgpl2Plus mpl10 ]; pkgConfigModules = [ + "cairo-pdf" "cairo-ps" "cairo-svg" - ] ++ lib.optional gobjectSupport "cairo-gobject" - ++ lib.optional pdfSupport "cairo-pdf"; + ] ++ lib.optional gobjectSupport "cairo-gobject"; platforms = platforms.all; }; }) diff --git a/pkgs/development/libraries/cctz/default.nix b/pkgs/development/libraries/cctz/default.nix index f1c1a272b5f..0b945c8c599 100644 --- a/pkgs/development/libraries/cctz/default.nix +++ b/pkgs/development/libraries/cctz/default.nix @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { buildInputs = lib.optional stdenv.isDarwin Foundation; installTargets = [ "install_hdrs" ] - ++ lib.optional (!stdenv.targetPlatform.isStatic) "install_shared_lib" - ++ lib.optional stdenv.targetPlatform.isStatic "install_lib"; + ++ lib.optional (!stdenv.hostPlatform.isStatic) "install_shared_lib" + ++ lib.optional stdenv.hostPlatform.isStatic "install_lib"; postInstall = lib.optionalString stdenv.isDarwin '' install_name_tool -id $out/lib/libcctz.so $out/lib/libcctz.so diff --git a/pkgs/development/libraries/check/default.nix b/pkgs/development/libraries/check/default.nix index 8add9c62347..14b4e549264 100644 --- a/pkgs/development/libraries/check/default.nix +++ b/pkgs/development/libraries/check/default.nix @@ -11,6 +11,9 @@ stdenv.mkDerivation rec { sha256 = "02m25y9m46pb6n46s51av62kpd936lkfv3b13kfpckgvmh5lxpm8"; }; + # fortify breaks the libcompat vsnprintf implementation + hardeningDisable = lib.optionals (stdenv.hostPlatform.isMusl && (stdenv.hostPlatform != stdenv.buildPlatform)) [ "fortify" ]; + # Test can randomly fail: https://hydra.nixos.org/build/7243912 doCheck = false; diff --git a/pkgs/development/libraries/clutter/default.nix b/pkgs/development/libraries/clutter/default.nix index 80c4187c951..804aa13ed91 100644 --- a/pkgs/development/libraries/clutter/default.nix +++ b/pkgs/development/libraries/clutter/default.nix @@ -68,6 +68,10 @@ stdenv.mkDerivation rec { "--enable-quartz-backend=yes" ]; + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; + }; + #doCheck = true; # no tests possible without a display passthru = { diff --git a/pkgs/development/libraries/cogl/default.nix b/pkgs/development/libraries/cogl/default.nix index 41aa3045841..987d90e2699 100644 --- a/pkgs/development/libraries/cogl/default.nix +++ b/pkgs/development/libraries/cogl/default.nix @@ -53,6 +53,9 @@ stdenv.mkDerivation rec { "--enable-wayland-egl-server" "--enable-gles1" "--enable-gles2" + # Force linking against libGL. + # Otherwise, it tries to load it from the runtime library path. + "LIBS=-lGL" ] ++ lib.optionals stdenv.isDarwin [ "--disable-glx" "--without-x" @@ -82,11 +85,15 @@ stdenv.mkDerivation rec { buildInputs = lib.optionals pangoSupport [ pango cairo harfbuzz ] ++ lib.optionals stdenv.isDarwin [ OpenGL ]; - COGL_PANGO_DEP_CFLAGS = toString (lib.optionals (stdenv.isDarwin && pangoSupport) [ - "-I${pango.dev}/include/pango-1.0" - "-I${cairo.dev}/include/cairo" - "-I${harfbuzz.dev}/include/harfbuzz" - ]); + env = { + COGL_PANGO_DEP_CFLAGS = toString (lib.optionals (stdenv.isDarwin && pangoSupport) [ + "-I${pango.dev}/include/pango-1.0" + "-I${cairo.dev}/include/cairo" + "-I${harfbuzz.dev}/include/harfbuzz" + ]); + } // lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; + }; #doCheck = true; # all tests fail (no idea why) diff --git a/pkgs/development/libraries/enchant/2.x.nix b/pkgs/development/libraries/enchant/2.x.nix index 1b31cef9655..d4ab53f37bc 100644 --- a/pkgs/development/libraries/enchant/2.x.nix +++ b/pkgs/development/libraries/enchant/2.x.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchurl +, fetchpatch , aspell , groff , pkg-config @@ -22,6 +23,14 @@ stdenv.mkDerivation rec { hash = "sha256-ZoanKOVudg+N7gmiLw+1O0bunb59ZM+eW7NaZYv/fh0="; }; + patches = [ + # fix build with clang 16 + (fetchpatch { + url = "https://github.com/AbiWord/enchant/commit/f71eb22e4af7f9917011807a41cf295d3ce0ccbc.patch"; + hash = "sha256-9WWvpU3HKzPlxNBYQAKPppW6G3kOIC2A+MqX5eheBDA="; + }) + ]; + nativeBuildInputs = [ groff pkg-config diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index cd02c6bba15..e713ca1413f 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -43,7 +43,7 @@ , withFreetype ? withHeadlessDeps # Needed for drawtext filter , withFrei0r ? withFullDeps # frei0r video filtering , withFribidi ? withFullDeps # Needed for drawtext filter -, withGlslang ? withFullDeps && !stdenv.isDarwin +, withGlslang ? withFullDeps && !stdenv.isDarwin && lib.versionAtLeast version "5.0" , withGme ? withFullDeps # Game Music Emulator , withGnutls ? withHeadlessDeps , withGsm ? withFullDeps # GSM de/encoder @@ -52,7 +52,7 @@ , withLadspa ? withFullDeps # LADSPA audio filtering , withLibplacebo ? withFullDeps && !stdenv.isDarwin # libplacebo video processing library , withLzma ? withHeadlessDeps # xz-utils -, withMfx ? withFullDeps && (with stdenv.targetPlatform; isLinux && !isAarch) # Hardware acceleration via intel-media-sdk/libmfx +, withMfx ? withFullDeps && (with stdenv.hostPlatform; isLinux && !isAarch) # Hardware acceleration via intel-media-sdk/libmfx , withModplug ? withFullDeps && !stdenv.isDarwin # ModPlug support , withMp3lame ? withHeadlessDeps # LAME MP3 encoder , withMysofa ? withFullDeps # HRTF support via SOFAlizer @@ -386,8 +386,8 @@ stdenv.mkDerivation (finalAttrs: { (enableFeature withHardcodedTables "hardcoded-tables") (enableFeature withSafeBitstreamReader "safe-bitstream-reader") - (enableFeature (withMultithread && stdenv.targetPlatform.isUnix) "pthreads") - (enableFeature (withMultithread && stdenv.targetPlatform.isWindows) "w32threads") + (enableFeature (withMultithread && stdenv.hostPlatform.isUnix) "pthreads") + (enableFeature (withMultithread && stdenv.hostPlatform.isWindows) "w32threads") "--disable-os2threads" # We don't support OS/2 (enableFeature withNetwork "network") diff --git a/pkgs/development/libraries/flann/default.nix b/pkgs/development/libraries/flann/default.nix index ec1715b005f..eeac7d14568 100644 --- a/pkgs/development/libraries/flann/default.nix +++ b/pkgs/development/libraries/flann/default.nix @@ -43,6 +43,12 @@ stdenv.mkDerivation rec { url = "https://github.com/flann-lib/flann/commit/25eb56ec78472bd419a121c6905095a793cf8992.patch"; sha256 = "qt8h576Gn8uR7+T9u9bEBIRz6e6AoTKpa1JfdZVvW9s="; }) + ] ++ lib.optionals stdenv.cc.isClang [ + # Fix build with Clang 16. + (fetchpatch { + url = "https://github.com/flann-lib/flann/commit/be80cefa69b314a3d9e1ab971715e84145863ebb.patch"; + hash = "sha256-4SUKzQCm0Sx8N43Z6ShuMbgbbe7q8b2Ibk3WgkB0qa4="; + }) ]; cmakeFlags = [ diff --git a/pkgs/development/libraries/gdcm/default.nix b/pkgs/development/libraries/gdcm/default.nix index 76e661dfbd4..3298be5cc3c 100644 --- a/pkgs/development/libraries/gdcm/default.nix +++ b/pkgs/development/libraries/gdcm/default.nix @@ -9,7 +9,12 @@ , libiconv , enablePython ? false , python ? null -, swig +, swig4 +, expat +, libuuid +, openjpeg +, zlib +, pkg-config }: stdenv.mkDerivation rec { @@ -27,6 +32,10 @@ stdenv.mkDerivation rec { "-DGDCM_BUILD_APPLICATIONS=ON" "-DGDCM_BUILD_SHARED_LIBS=ON" "-DGDCM_BUILD_TESTING=ON" + "-DGDCM_USE_SYSTEM_EXPAT=ON" + "-DGDCM_USE_SYSTEM_ZLIB=ON" + "-DGDCM_USE_SYSTEM_UUID=ON" + "-DGDCM_USE_SYSTEM_OPENJPEG=ON" # hack around usual "`RUNTIME_DESTINATION` must not be an absolute path" issue: "-DCMAKE_INSTALL_LIBDIR=lib" "-DCMAKE_INSTALL_BINDIR=bin" @@ -38,15 +47,23 @@ stdenv.mkDerivation rec { "-DGDCM_INSTALL_PYTHONMODULE_DIR=${placeholder "out"}/${python.sitePackages}" ]; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ + cmake + pkg-config + ]; - buildInputs = lib.optionals enableVTK [ + buildInputs = [ + expat + libuuid + openjpeg + zlib + ] ++ lib.optionals enableVTK [ vtk ] ++ lib.optionals stdenv.isDarwin [ ApplicationServices Cocoa libiconv - ] ++ lib.optionals enablePython [ swig python ]; + ] ++ lib.optionals enablePython [ swig4 python ]; disabledTests = [ # require networking: diff --git a/pkgs/development/libraries/gecode/3.nix b/pkgs/development/libraries/gecode/3.nix index 36c7120ac60..1d6f158b52f 100644 --- a/pkgs/development/libraries/gecode/3.nix +++ b/pkgs/development/libraries/gecode/3.nix @@ -18,10 +18,17 @@ stdenv.mkDerivation rec { (import ./fix-const-weights-clang-patch.nix fetchpatch) ]; + postPatch = '' + substituteInPlace gecode/flatzinc/lexer.yy.cpp \ + --replace "register " "" + ''; + nativeBuildInputs = [ perl ]; preConfigure = "patchShebangs configure"; + env.CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++14"; + meta = with lib; { license = licenses.mit; homepage = "https://www.gecode.org"; diff --git a/pkgs/development/libraries/gf2x/default.nix b/pkgs/development/libraries/gf2x/default.nix index 70d06c107fd..1b45be61128 100644 --- a/pkgs/development/libraries/gf2x/default.nix +++ b/pkgs/development/libraries/gf2x/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchFromGitLab +, fetchpatch , autoreconfHook , buildPackages , optimize ? false # impure hardware optimizations @@ -17,6 +18,14 @@ stdenv.mkDerivation rec { sha256 = "04g5jg0i4vz46b4w2dvbmahwzi3k6b8g515mfw7im1inc78s14id"; }; + patches = [ + (fetchpatch { + name = "gf2x-1.3.0-configure-clang16.patch"; + url = "https://gitlab.inria.fr/gf2x/gf2x/-/commit/a2f0fd388c12ca0b9f4525c6cfbc515418dcbaf8.diff"; + hash = "sha256-Aj2KzWZMR24S04IbPOBPwacCU4rEiB+FFWxtRuF50LA="; + }) + ]; + depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/glibc/0001-aarch64-math-vector.h-add-NVCC-include-guard.patch b/pkgs/development/libraries/glibc/0001-aarch64-math-vector.h-add-NVCC-include-guard.patch new file mode 100644 index 00000000000..234bc1943c9 --- /dev/null +++ b/pkgs/development/libraries/glibc/0001-aarch64-math-vector.h-add-NVCC-include-guard.patch @@ -0,0 +1,37 @@ +From 44d0a3a9bd8c6fe59f6ccb44206a50a900bfcf4a Mon Sep 17 00:00:00 2001 +From: Connor Baker <connor.baker@tweag.io> +Date: Tue, 31 Oct 2023 14:30:24 +0000 +Subject: [PATCH] aarch64/math-vector.h: add NVCC include guard + +--- + sysdeps/aarch64/fpu/bits/math-vector.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/sysdeps/aarch64/fpu/bits/math-vector.h b/sysdeps/aarch64/fpu/bits/math-vector.h +index 7c200599c1..583a426494 100644 +--- a/sysdeps/aarch64/fpu/bits/math-vector.h ++++ b/sysdeps/aarch64/fpu/bits/math-vector.h +@@ -25,17 +25,17 @@ + /* Get default empty definitions for simd declarations. */ + #include <bits/libm-simd-decl-stubs.h> + +-#if __GNUC_PREREQ(9, 0) ++#if __GNUC_PREREQ(9, 0) && !defined(__CUDACC__) + # define __ADVSIMD_VEC_MATH_SUPPORTED + typedef __Float32x4_t __f32x4_t; + typedef __Float64x2_t __f64x2_t; +-#elif __glibc_clang_prereq(8, 0) ++#elif __glibc_clang_prereq(8, 0) && !defined(__CUDACC__) + # define __ADVSIMD_VEC_MATH_SUPPORTED + typedef __attribute__ ((__neon_vector_type__ (4))) float __f32x4_t; + typedef __attribute__ ((__neon_vector_type__ (2))) double __f64x2_t; + #endif + +-#if __GNUC_PREREQ(10, 0) || __glibc_clang_prereq(11, 0) ++#if (__GNUC_PREREQ(10, 0) || __glibc_clang_prereq(11, 0)) && !defined(__CUDACC__) + # define __SVE_VEC_MATH_SUPPORTED + typedef __SVFloat32_t __sv_f32_t; + typedef __SVFloat64_t __sv_f64_t; +-- +2.42.0 + diff --git a/pkgs/development/libraries/glibc/2.38-master.patch.gz b/pkgs/development/libraries/glibc/2.38-master.patch.gz index 4eb3c7b2cdb..6414956807f 100644 --- a/pkgs/development/libraries/glibc/2.38-master.patch.gz +++ b/pkgs/development/libraries/glibc/2.38-master.patch.gz Binary files differdiff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index 51d8a4dbe05..3e17817c0ba 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -44,7 +44,7 @@ let version = "2.38"; - patchSuffix = "-23"; + patchSuffix = "-27"; sha256 = "sha256-+4KZiZiyspllRnvBtp0VLpwwfSzzAcnq+0VVt3DvP9I="; in @@ -60,7 +60,7 @@ stdenv.mkDerivation ({ [ /* No tarballs for stable upstream branch, only https://sourceware.org/git/glibc.git and using git would complicate bootstrapping. $ git fetch --all -p && git checkout origin/release/2.38/master && git describe - glibc-2.38-23-g0e1ef6779a + glibc-2.38-27-g750a45a783 $ git show --minimal --reverse glibc-2.38.. | gzip -9n --rsyncable - > 2.38-master.patch.gz To compare the archive contents zdiff can be used. @@ -97,6 +97,18 @@ stdenv.mkDerivation ({ */ ./reenable_DT_HASH.patch ] + /* NVCC does not support ARM intrinsics. Since <math.h> is pulled in by almost + every HPC piece of software, without this patch CUDA compilation on ARM + is effectively broken. See + https://forums.developer.nvidia.com/t/nvcc-fails-to-build-with-arm-neon-instructions-cpp-vs-cu/248355/2. + */ + ++ ( + let + isAarch64 = stdenv.buildPlatform.isAarch64 || stdenv.hostPlatform.isAarch64; + isLinux = stdenv.buildPlatform.isLinux || stdenv.hostPlatform.isLinux; + in + lib.optional (isAarch64 && isLinux) ./0001-aarch64-math-vector.h-add-NVCC-include-guard.patch + ) ++ lib.optional stdenv.hostPlatform.isMusl ./fix-rpc-types-musl-conflicts.patch ++ lib.optional stdenv.buildPlatform.isDarwin ./darwin-cross-build.patch; @@ -276,7 +288,7 @@ stdenv.mkDerivation ({ license = licenses.lgpl2Plus; - maintainers = with maintainers; [ eelco ma27 ]; + maintainers = with maintainers; [ eelco ma27 connorbaker ]; platforms = platforms.linux; } // (args.meta or {}); }) diff --git a/pkgs/development/libraries/glibc/default.nix b/pkgs/development/libraries/glibc/default.nix index 11676560e80..be3bee081e7 100644 --- a/pkgs/development/libraries/glibc/default.nix +++ b/pkgs/development/libraries/glibc/default.nix @@ -154,7 +154,7 @@ in ln -sf $out/lib/libpthread.so.0 $out/lib/libpthread.so ln -sf $out/lib/librt.so.1 $out/lib/librt.so ln -sf $out/lib/libdl.so.2 $out/lib/libdl.so - ln -sf $out/lib/libutil.so.1 $out/lib/libutil.so + test -f $out/lib/libutil.so.1 && ln -sf $out/lib/libutil.so.1 $out/lib/libutil.so touch $out/lib/libpthread.a # Put libraries for static linking in a separate output. Note @@ -163,6 +163,8 @@ in mkdir -p $static/lib mv $out/lib/*.a $static/lib mv $static/lib/lib*_nonshared.a $out/lib + # If libutil.so.1 is missing, libutil.a is required. + test -f $out/lib/libutil.so.1 || mv $static/lib/libutil.a $out/lib # Some of *.a files are linker scripts where moving broke the paths. sed "/^GROUP/s|$out/lib/lib|$static/lib/lib|g" \ -i "$static"/lib/*.a diff --git a/pkgs/development/libraries/glibc/locales-builder.sh b/pkgs/development/libraries/glibc/locales-builder.sh index d91f936c937..27894b09b91 100644 --- a/pkgs/development/libraries/glibc/locales-builder.sh +++ b/pkgs/development/libraries/glibc/locales-builder.sh @@ -1,4 +1,4 @@ -if [ -e .attrs.sh ]; then source .attrs.sh; fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi # Glibc cannot have itself in its RPATH. export NIX_NO_SELF_RPATH=1 diff --git a/pkgs/development/libraries/glm/default.nix b/pkgs/development/libraries/glm/default.nix index 8af09dcd6f6..417d70d621b 100644 --- a/pkgs/development/libraries/glm/default.nix +++ b/pkgs/development/libraries/glm/default.nix @@ -16,13 +16,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-F//+3L5Ozrw6s7t4LrcUmO7sN30ZSESdrPAYX57zgr8="; }; - # https://github.com/g-truc/glm/pull/1055 - # Fix more implicit-int-float-conversion warnings # (https://github.com/g-truc/glm/pull/986 wasn't enough, and -Werror is used) - patches = [(fetchpatch { - url = "https://github.com/kraj/glm/commit/bd9b5060bc3b9581090d44f15b4e236566ea86a6.patch"; - sha256 = "sha256-QO4o/wV564kJimBcEyr9TWzREEnRJ1n0j0HPojN4pkI="; - })]; + # (https://github.com/g-truc/glm/pull/1055 neither) + patches = [ + (fetchpatch { + name = "glm-0.9.9.8-clang.patch"; + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/glm/files/glm-0.9.9.8-clang.patch?id=79476d4b145a4a6b0cbc0e73a6cefb5d584bf8fa"; + hash = "sha256-D8O+qofnGUEaH5nQGdNddwHyr5FhPQa/lOup4z4SFgY="; + }) + ]; outputs = [ "out" "doc" ]; diff --git a/pkgs/development/libraries/gnu-config/default.nix b/pkgs/development/libraries/gnu-config/default.nix index 2b088eb459a..0315f39c605 100644 --- a/pkgs/development/libraries/gnu-config/default.nix +++ b/pkgs/development/libraries/gnu-config/default.nix @@ -6,22 +6,22 @@ # files. let - rev = "d4e37b5868ef910e3e52744c34408084bb13051c"; + rev = "28ea239c53a2d5d8800c472bc2452eaa16e37af2"; # Don't use fetchgit as this is needed during Aarch64 bootstrapping configGuess = fetchurl { name = "config.guess-${builtins.substring 0 7 rev}"; url = "https://git.savannah.gnu.org/cgit/config.git/plain/config.guess?id=${rev}"; - sha256 = "191czpnbc1nxrygg8fd3839y1f4m9x43rp57vgrsas6p07zzh3c1"; + hash = "sha256-7CV3YUJSMm+InfHel7mkV8A6mpSBEEhWPCEaRElti6M="; }; configSub = fetchurl { name = "config.sub-${builtins.substring 0 7 rev}"; url = "https://git.savannah.gnu.org/cgit/config.git/plain/config.sub?id=${rev}"; - sha256 = "0148p54gw10p6sk2rn3gi9vvqm89rk8kcvl9335ckayhanx31381"; + hash = "sha256-Rlxf5nx9NrcugIgScWRF1NONS5RzTKjTaoY50SMjh4s="; }; in stdenv.mkDerivation { pname = "gnu-config"; - version = "2023-07-31"; + version = "2023-09-19"; unpackPhase = '' runHook preUnpack diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix index 0cfe4c79458..4dec79e0e2d 100644 --- a/pkgs/development/libraries/gpgme/default.nix +++ b/pkgs/development/libraries/gpgme/default.nix @@ -26,11 +26,11 @@ let in stdenv.mkDerivation rec { pname = "gpgme"; - version = "1.22.0"; + version = "1.23.0"; src = fetchurl { url = "mirror://gnupg/gpgme/${pname}-${version}.tar.bz2"; - hash = "sha256-lVHjcIGtO96BAYoNJPJFw/ggaZBUlZj7Mal6aDgKe3E="; + hash = "sha256-BD4u/hi0rSK5bUNN3nY/vtMs+NbCINxp3w0P+53Gb8Y="; }; patches = [ diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix index 84c3abd575c..daf3bad132d 100644 --- a/pkgs/development/libraries/grpc/default.nix +++ b/pkgs/development/libraries/grpc/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { pname = "grpc"; - version = "1.57.0"; # N.B: if you change this, please update: + version = "1.59.1"; # N.B: if you change this, please update: # pythonPackages.grpcio-tools # pythonPackages.grpcio-status @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { owner = "grpc"; repo = "grpc"; rev = "v${version}"; - hash = "sha256-ZPhPi4ODAAohCySVKeypaDID4ZUXvnfidOGK5EMXvh4="; + hash = "sha256-4bou7oFQOgyxjFqJdmiFT8xEMCsOap9v34W6SPrT4WQ="; fetchSubmodules = true; }; @@ -37,14 +37,8 @@ stdenv.mkDerivation rec { (fetchpatch { # armv6l support, https://github.com/grpc/grpc/pull/21341 name = "grpc-link-libatomic.patch"; - url = "https://github.com/lopsided98/grpc/commit/164f55260262c816e19cd2c41b564486097d62fe.patch"; - hash = "sha256-d6kMyjL5ZnEnEz4XZfRgXJBH53gp1r7q1tlwh+HM6+Y="; - }) - # Fix generated CMake config file - # FIXME: remove when merged - (fetchpatch { - url = "https://github.com/grpc/grpc/pull/33361/commits/117dc80eb43021dd5619023ef6d02d0d6ec7ae7a.patch"; - hash = "sha256-VBk3ZD5h9uOQVN0st+quUQK/wXqvfFNk8G8AN4f2MQo="; + url = "https://github.com/lopsided98/grpc/commit/a9b917666234f5665c347123d699055d8c2537b2.patch"; + hash = "sha256-Lm0GQsz/UjBbXXEE14lT0dcRzVmCKycrlrdBJj+KLu8="; }) ]; @@ -95,13 +89,12 @@ stdenv.mkDerivation rec { export LD_LIBRARY_PATH=$(pwd)''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH ''; - env.NIX_CFLAGS_COMPILE = lib.concatStringsSep " " ( - lib.optionals stdenv.cc.isClang [ - "-Wno-error=unknown-warning-option" - ] ++ lib.optionals stdenv.isAarch64 [ - "-Wno-error=format-security" - ] - ); + env.NIX_CFLAGS_COMPILE = toString ([ + "-Wno-error" + ] ++ lib.optionals stdenv.isDarwin [ + # Workaround for https://github.com/llvm/llvm-project/issues/48757 + "-Wno-elaborated-enum-base" + ]); enableParallelBuilds = true; diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix index 9599da0fdf5..8ff8220aa75 100644 --- a/pkgs/development/libraries/gstreamer/good/default.nix +++ b/pkgs/development/libraries/gstreamer/good/default.nix @@ -10,6 +10,7 @@ , orc , bzip2 , gettext +, libGL , libv4l , libdv , libavc1394 @@ -129,6 +130,7 @@ stdenv.mkDerivation rec { ]) ++ lib.optionals stdenv.isDarwin [ Cocoa ] ++ lib.optionals stdenv.isLinux [ + libGL libv4l libpulseaudio libavc1394 diff --git a/pkgs/development/libraries/gstreamer/rs/default.nix b/pkgs/development/libraries/gstreamer/rs/default.nix index e0d324936dd..ee467f965c8 100644 --- a/pkgs/development/libraries/gstreamer/rs/default.nix +++ b/pkgs/development/libraries/gstreamer/rs/default.nix @@ -2,13 +2,11 @@ , stdenv , fetchFromGitLab , fetchpatch -, writeText , rustPlatform , meson , ninja , python3 , pkg-config -, rust , rustc , cargo , cargo-c @@ -205,14 +203,7 @@ stdenv.mkDerivation rec { ) ++ [ (lib.mesonOption "sodium-source" "system") (lib.mesonEnable "doc" enableDocumentation) - ] ++ (let - crossFile = writeText "cross-file.conf" '' - [binaries] - rust = [ 'rustc', '--target', '${rust.toRustTargetSpec stdenv.hostPlatform}' ] - ''; - in lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ - "--cross-file=${crossFile}" - ]); + ]; # turn off all auto plugins since we use a list of plugins we generate mesonAutoFeatures = "disabled"; diff --git a/pkgs/development/libraries/gtk-sharp/builder.sh b/pkgs/development/libraries/gtk-sharp/builder.sh index 73914495d6d..45e640e2a70 100644 --- a/pkgs/development/libraries/gtk-sharp/builder.sh +++ b/pkgs/development/libraries/gtk-sharp/builder.sh @@ -1,4 +1,4 @@ -if [ -e .attrs.sh ]; then source .attrs.sh; fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi source $stdenv/setup genericBuild diff --git a/pkgs/development/libraries/hpp-fcl/default.nix b/pkgs/development/libraries/hpp-fcl/default.nix index 7bf71320686..53bd7f067b2 100644 --- a/pkgs/development/libraries/hpp-fcl/default.nix +++ b/pkgs/development/libraries/hpp-fcl/default.nix @@ -14,14 +14,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "hpp-fcl"; - version = "2.3.6"; + version = "2.3.7"; src = fetchFromGitHub { owner = "humanoid-path-planner"; repo = finalAttrs.pname; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-Y6ATYXsV8hH22XiXyvacuUhHTuNCzObPlxNX2vZGghM="; + hash = "sha256-Bytm5uaHYsfMeZ+JKs75003iHNObRBGDpV7Rz9yW7jQ="; }; strictDeps = true; diff --git a/pkgs/development/libraries/imlib2/default.nix b/pkgs/development/libraries/imlib2/default.nix index f85ec4d96b3..ab237d9dca0 100644 --- a/pkgs/development/libraries/imlib2/default.nix +++ b/pkgs/development/libraries/imlib2/default.nix @@ -22,6 +22,8 @@ , enlightenment , xorg , testers + +, gitUpdater }: let @@ -29,11 +31,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "imlib2"; - version = "1.12.0"; + version = "1.12.1"; src = fetchurl { url = "mirror://sourceforge/enlightenment/${finalAttrs.pname}-${finalAttrs.version}.tar.xz"; - hash = "sha256-lf9dTMF92fk0wuetFRw2DzCIgKCnhJpspDt8e5pLshY="; + hash = "sha256-jCTS0YnE1a5gLb8vwPuxF6qSPqtsiDBB8P7spOjGd04="; }; buildInputs = [ @@ -59,19 +61,25 @@ stdenv.mkDerivation (finalAttrs: { outputs = [ "bin" "out" "dev" ]; - passthru.tests = { - inherit - libcaca - diffoscopeMinimal - feh - icewm - openbox - fluxbox - enlightenment; + passthru = { + tests = { + inherit + libcaca + diffoscopeMinimal + feh + icewm + openbox + fluxbox + enlightenment; + pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + }; + updateScript = gitUpdater { + # No nicer place to find latest release. + url = "https://git.enlightenment.org/old/legacy-imlib2.git"; + rev-prefix = "v"; + }; }; - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - meta = with lib; { description = "Image manipulation library"; diff --git a/pkgs/development/libraries/jbig2dec/default.nix b/pkgs/development/libraries/jbig2dec/default.nix index a00399497e2..f8915282069 100644 --- a/pkgs/development/libraries/jbig2dec/default.nix +++ b/pkgs/development/libraries/jbig2dec/default.nix @@ -1,19 +1,23 @@ -{ lib, stdenv, fetchurl, python3, autoreconfHook }: +{ lib, stdenv, fetchurl, python3, autoconf, automake, libtool }: stdenv.mkDerivation rec { pname = "jbig2dec"; - version = "0.19"; + version = "0.20"; src = fetchurl { - url = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs9533/${pname}-${version}.tar.gz"; - sha256 = "0dwa24kjqyg9hmm40fh048sdxfpnasz43l2rm8wlkw1qbdlpd517"; + url = "https://github.com/ArtifexSoftware/jbig2dec/archive/${version}/jbig2dec-${version}.tar.gz"; + hash = "sha256-qXBTaaZjOrpTJpNFDsgCxWI5fhuCRmLegJ7ekvZ6/yE="; }; postPatch = '' patchShebangs test_jbig2dec.py ''; - nativeBuildInputs = [ autoreconfHook ]; + preConfigure = '' + ./autogen.sh + ''; + + nativeBuildInputs = [ autoconf automake libtool ]; nativeCheckInputs = [ python3 ]; doCheck = true; diff --git a/pkgs/development/libraries/jxrlib/default.nix b/pkgs/development/libraries/jxrlib/default.nix index e6768dc0fa5..517746aa9b5 100644 --- a/pkgs/development/libraries/jxrlib/default.nix +++ b/pkgs/development/libraries/jxrlib/default.nix @@ -32,6 +32,10 @@ stdenv.mkDerivation rec { strictDeps = true; + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; + }; + meta = with lib; { description = "Implementation of the JPEG XR image codec standard"; homepage = "https://jxrlib.codeplex.com"; diff --git a/pkgs/development/libraries/kde-frameworks/baloo.nix b/pkgs/development/libraries/kde-frameworks/baloo.nix index 3543fef6633..2a264d47c24 100644 --- a/pkgs/development/libraries/kde-frameworks/baloo.nix +++ b/pkgs/development/libraries/kde-frameworks/baloo.nix @@ -25,21 +25,6 @@ mkDerivation { outputs = [ "out" "dev" ]; propagatedBuildInputs = [ kcoreaddons kfilemetadata qtbase ]; - # baloo suffers from issues when running on btrfs as well as with certain LVM/dm-crypt setups - # where the device id will change on reboot causing baloo to reindex all the files and then having - # duplicate files. A patch has been proposed that addresses this, which has not been accepted yet. - # However, without this patch, people tend to disable baloo rather than dealing with the constant - # reindexing. - # - # https://bugs.kde.org/show_bug.cgi?id=402154 - patches = [ - (fetchpatch { - url = "https://bugsfiles.kde.org/attachment.cgi?id=159031"; - hash = "sha256-hCtNXUpRhIP94f7gpwTGWWh1h/7JRRJaRASIwHWQjnY="; - name = "use_fsid.patch"; - }) - ]; - # kde-baloo.service uses `ExecCondition=@KDE_INSTALL_FULL_BINDIR@/kde-systemd-start-condition ...` # which comes from the "plasma-workspace" derivation, but KDE_INSTALL_* all point at the "baloo" one # (`${lib.getBin pkgs.plasma-workspace}` would cause infinite recursion) diff --git a/pkgs/development/libraries/kde-frameworks/fetch.sh b/pkgs/development/libraries/kde-frameworks/fetch.sh index c72caa6d585..f53e0d6c16b 100644 --- a/pkgs/development/libraries/kde-frameworks/fetch.sh +++ b/pkgs/development/libraries/kde-frameworks/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/frameworks/5.110/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/frameworks/5.112/ -A '*.tar.xz' ) diff --git a/pkgs/development/libraries/kde-frameworks/kio/default.nix b/pkgs/development/libraries/kde-frameworks/kio/default.nix index 03e233c2879..8815683aef6 100644 --- a/pkgs/development/libraries/kde-frameworks/kio/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kio/default.nix @@ -29,12 +29,6 @@ mkDerivation { separateDebugInfo = true; patches = [ ./0001-Remove-impure-smbd-search-path.patch - - # Fix a crash when saving files. - (fetchpatch { - url = "https://invent.kde.org/frameworks/kio/-/commit/48322f44323a1fc09305d66d9093fe6c3780709e.patch"; - hash = "sha256-4NxI2mD/TdthvrzgatCAlM6VN3N38i3IJUHh0Bs8Fjk="; - }) ]; meta = { homepage = "https://api.kde.org/frameworks/kio/html/"; diff --git a/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix b/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix index a9d4baebf1c..04256007ef2 100644 --- a/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix +++ b/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix @@ -2,25 +2,11 @@ mkDerivation, lib, extra-cmake-modules, networkmanager, qtbase, - fetchpatch }: mkDerivation { pname = "networkmanager-qt"; - # backport patches for NetworkManager 1.44 compatibility - # FIXME: remove in 5.112 - patches = [ - (fetchpatch { - url = "https://invent.kde.org/frameworks/networkmanager-qt/-/commit/d9a938ddbfb5800503935926301ff2865ab77a6d.patch"; - hash = "sha256-EjFBcU0YJQocp8skDZUTxCQhfrtQP5Fdo8q1BC9lLnQ="; - }) - (fetchpatch { - url = "https://invent.kde.org/frameworks/networkmanager-qt/-/commit/d35c6cb97443424d228dfd8eee8282af6632b5f5.patch"; - hash = "sha256-KmRcCjdHGGk+5PY5JKNbk0BHCtdwibns+Hw4aNRaoZI="; - }) - ]; - nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ networkmanager qtbase ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix index 1fd8a2ba15a..f6909957ba4 100644 --- a/pkgs/development/libraries/kde-frameworks/srcs.nix +++ b/pkgs/development/libraries/kde-frameworks/srcs.nix @@ -4,667 +4,667 @@ { attica = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/attica-5.110.0.tar.xz"; - sha256 = "1lp7y0r3npv93kcw1fkgl8c2njbs6y4m8cg32b60pyjahfqspxd6"; - name = "attica-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/attica-5.112.0.tar.xz"; + sha256 = "0syg508bjfq5ycr246p3f4q37ihvqk5j7n66vkn7h7dvgwspjff5"; + name = "attica-5.112.0.tar.xz"; }; }; baloo = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/baloo-5.110.0.tar.xz"; - sha256 = "0bg2nyp7zp1mka7ng8bwcd0hrbglrdiz7xw43r9q8wycr9qmva1n"; - name = "baloo-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/baloo-5.112.0.tar.xz"; + sha256 = "17h83s5r70hg8qjv9vli43zv854jll40cmmh2pjcg7nlfi1ypcbz"; + name = "baloo-5.112.0.tar.xz"; }; }; bluez-qt = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/bluez-qt-5.110.0.tar.xz"; - sha256 = "1xvr85i0lkdpca64dzd7wqasc7acpzvh2kawl9nrfkrn96vrm0cz"; - name = "bluez-qt-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/bluez-qt-5.112.0.tar.xz"; + sha256 = "03kzvklzj9h4sl1850c1lh4b3z9lis7d6l9fb9cfnffh3wjpjagb"; + name = "bluez-qt-5.112.0.tar.xz"; }; }; breeze-icons = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/breeze-icons-5.110.0.tar.xz"; - sha256 = "1m5z8g7rvilvwfn65yazci51i83ixv7fc5sh2v5vgxrlmhbysg0s"; - name = "breeze-icons-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/breeze-icons-5.112.0.tar.xz"; + sha256 = "0n3xdja42hzn3hssj0a8d97kkb790kinp2xmslfl7w8izsz53p39"; + name = "breeze-icons-5.112.0.tar.xz"; }; }; extra-cmake-modules = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/extra-cmake-modules-5.110.0.tar.xz"; - sha256 = "0f347y8q3ckgfq4skh2q69n67v3w9k680db0br4f43i37vdzaikp"; - name = "extra-cmake-modules-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/extra-cmake-modules-5.112.0.tar.xz"; + sha256 = "1qn2shanzsv06q34zwhkjhb88j7crdp83qp265gpxmc049vq845c"; + name = "extra-cmake-modules-5.112.0.tar.xz"; }; }; frameworkintegration = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/frameworkintegration-5.110.0.tar.xz"; - sha256 = "0ghl5p01g3jdj75wzyjwq4b0l0p98r0vkkf6zj6d3lbax207z0sq"; - name = "frameworkintegration-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/frameworkintegration-5.112.0.tar.xz"; + sha256 = "1kiy4vcr8lj82mhpgn99yw4w6lwr26yjmsfdv3n6ha667gqv2gn6"; + name = "frameworkintegration-5.112.0.tar.xz"; }; }; kactivities = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kactivities-5.110.0.tar.xz"; - sha256 = "1c1456jc3s7cl2l3kmkgprgngip0j9c7ssd0b0fvjd41dwhzhra5"; - name = "kactivities-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kactivities-5.112.0.tar.xz"; + sha256 = "0nzbvby11f14h5w2q5wa5kij7bpx01ffqsi8mmjk71imhq5mzkfz"; + name = "kactivities-5.112.0.tar.xz"; }; }; kactivities-stats = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kactivities-stats-5.110.0.tar.xz"; - sha256 = "1agqsdgbmglrzpg9w4df9qdg4hf8g1nnnkq7adp6cxsj3x8c8zx4"; - name = "kactivities-stats-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kactivities-stats-5.112.0.tar.xz"; + sha256 = "0czic2s147nhjphdkfymnakrw73bzi0pbmb8s3frrxsf4yp7gvzy"; + name = "kactivities-stats-5.112.0.tar.xz"; }; }; kapidox = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kapidox-5.110.0.tar.xz"; - sha256 = "1qi2mcslw0gsxc6p5q78lhg3if01j8dhxf0ypwb8njsfjcr45d24"; - name = "kapidox-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kapidox-5.112.0.tar.xz"; + sha256 = "0fa80ncx4h5izhw6vjjglmxcs9h4rvf2q1bcm0m4zcpky5h8bdqi"; + name = "kapidox-5.112.0.tar.xz"; }; }; karchive = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/karchive-5.110.0.tar.xz"; - sha256 = "1pqc0j4xkhwc6gdgg1q7pl3hjnrscwz8vbdz8jbvpaz51cy5iipw"; - name = "karchive-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/karchive-5.112.0.tar.xz"; + sha256 = "0rzxxgp5hcs63yfqisvf1m2m0qyrj2ri9966h5hc25jh5ajrgmi7"; + name = "karchive-5.112.0.tar.xz"; }; }; kauth = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kauth-5.110.0.tar.xz"; - sha256 = "1yymmyvhqgrwdpy5c2narh6d0ac41mw9ifrhckcyr22kdyrmgcz1"; - name = "kauth-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kauth-5.112.0.tar.xz"; + sha256 = "1xq5jhnp3dyykx84p5ijhi6kj0x2iz8k665bkkz4zcv9l8gf9jv7"; + name = "kauth-5.112.0.tar.xz"; }; }; kbookmarks = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kbookmarks-5.110.0.tar.xz"; - sha256 = "1k04mcfciv3gq4qw5gkpq7189wfxxlr427h4827m3hs3ysbgc4vh"; - name = "kbookmarks-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kbookmarks-5.112.0.tar.xz"; + sha256 = "12m8wx8sv12mwj2xprbr3ywr66mq3415byjfsz8f5yx4lhywkcfi"; + name = "kbookmarks-5.112.0.tar.xz"; }; }; kcalendarcore = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kcalendarcore-5.110.0.tar.xz"; - sha256 = "19zb1g4lbiqy4vcay6hbjx9ak5r00frfn1hahpc544q9l0dznl52"; - name = "kcalendarcore-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kcalendarcore-5.112.0.tar.xz"; + sha256 = "0najg934lylb5m64lmkpv3v7ri2g3ncsg8ycg7gkm8r93nypa60r"; + name = "kcalendarcore-5.112.0.tar.xz"; }; }; kcmutils = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kcmutils-5.110.0.tar.xz"; - sha256 = "0ccgrd757ww890nvajw1s9yvq6iikp316q123rfminrc0mlrpzaq"; - name = "kcmutils-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kcmutils-5.112.0.tar.xz"; + sha256 = "0b4l5hf90jrbj4bbrkmyz1va6znwd8dpp2w0i5h002xbpf6vwp2y"; + name = "kcmutils-5.112.0.tar.xz"; }; }; kcodecs = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kcodecs-5.110.0.tar.xz"; - sha256 = "1i15q8kg1dn72sxg9djvg9h4mhqh9rgvnsf3bz0pjd5jbwqqyv1v"; - name = "kcodecs-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kcodecs-5.112.0.tar.xz"; + sha256 = "0pnmqq5asj361x9fk1vapwssafbb2zxjr0nh8lp8666f675wg2yx"; + name = "kcodecs-5.112.0.tar.xz"; }; }; kcompletion = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kcompletion-5.110.0.tar.xz"; - sha256 = "0a9l6p9kfg074wxz0r9dn43baibrbzbh80x60rds2jaf3yjg212g"; - name = "kcompletion-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kcompletion-5.112.0.tar.xz"; + sha256 = "1k09ahwgz1fipdc1l2k13r97hgyvwjsr5dlvhkbrd384sip84q8j"; + name = "kcompletion-5.112.0.tar.xz"; }; }; kconfig = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kconfig-5.110.0.tar.xz"; - sha256 = "1i9idh0rh8ryry5gf22wwgzd15y14jymxjdxbkgx13kqpfyqhaxd"; - name = "kconfig-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kconfig-5.112.0.tar.xz"; + sha256 = "080qv53727ijdz9325kzl81nxchds3cpy6siv1h5s4scbb92dpl6"; + name = "kconfig-5.112.0.tar.xz"; }; }; kconfigwidgets = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kconfigwidgets-5.110.0.tar.xz"; - sha256 = "04mlw41xdps7qgnmmccqgs7jc5iipx2vqp9bd91l3sz4p90wj3sg"; - name = "kconfigwidgets-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kconfigwidgets-5.112.0.tar.xz"; + sha256 = "0yk84f9pwb600pligwa2022r9srz4fd7kkf90r7q7vmf5r3hl3r9"; + name = "kconfigwidgets-5.112.0.tar.xz"; }; }; kcontacts = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kcontacts-5.110.0.tar.xz"; - sha256 = "0gib8nlis59kbhydqvf6alwxvy4db94r2p3vpbcdy48gc4i06344"; - name = "kcontacts-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kcontacts-5.112.0.tar.xz"; + sha256 = "0q20xnj43ysq1wdymvl8j8zyvycsqs4hm2x72gz42hd9dlbp77s5"; + name = "kcontacts-5.112.0.tar.xz"; }; }; kcoreaddons = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kcoreaddons-5.110.0.tar.xz"; - sha256 = "0xcd2ph62a7kbm8camp1vnsxlaq1kmqm9hw9gyphcdh0rh6fi3bf"; - name = "kcoreaddons-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kcoreaddons-5.112.0.tar.xz"; + sha256 = "032n4fl4d8lhgmd08f7nfa18izrccggxhdbgk33vnf1lw7c6yamp"; + name = "kcoreaddons-5.112.0.tar.xz"; }; }; kcrash = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kcrash-5.110.0.tar.xz"; - sha256 = "15j70r6afc0lyg41047r27l089gkq8fh39w9iyvhv0h8hfxxah6g"; - name = "kcrash-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kcrash-5.112.0.tar.xz"; + sha256 = "1sarh8ncibl8bz7pkd5xs4dd5vciyj82pckazxx4f482irdzyxzx"; + name = "kcrash-5.112.0.tar.xz"; }; }; kdav = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kdav-5.110.0.tar.xz"; - sha256 = "0qz5iq9fi1vk1z7w4wdh7kxrc06vnyrvs7n0llyrjaprzjn8yx6a"; - name = "kdav-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kdav-5.112.0.tar.xz"; + sha256 = "1m6basdd6p0yaij9jdsc35sj198gsackk3dx4kci3a8zlvvag32g"; + name = "kdav-5.112.0.tar.xz"; }; }; kdbusaddons = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kdbusaddons-5.110.0.tar.xz"; - sha256 = "0ilzk67h5cxrjf78hw505pvbqvd2lkjk3m0g188pcw0sdg10xb8h"; - name = "kdbusaddons-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kdbusaddons-5.112.0.tar.xz"; + sha256 = "0n04z0srf3xzd0m9sa9f3q7hrzbjrg1hbajzm89p71hfr7dmcgjq"; + name = "kdbusaddons-5.112.0.tar.xz"; }; }; kdeclarative = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kdeclarative-5.110.0.tar.xz"; - sha256 = "1vcqdi4lji97wm5vil2p1g7wi6rwrz0g6aiqf1nzi026fpsc8njj"; - name = "kdeclarative-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kdeclarative-5.112.0.tar.xz"; + sha256 = "1wzhqp5mzbk9lz7ks4ggzb1k6c3fkxwwyzdapwfgn79k5qrhqvjk"; + name = "kdeclarative-5.112.0.tar.xz"; }; }; kded = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kded-5.110.0.tar.xz"; - sha256 = "1n8hzkwhqrx4mb7ahqnkga01zslcp82ya22hppfapldy83bfrgyl"; - name = "kded-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kded-5.112.0.tar.xz"; + sha256 = "16qiybj9q1v6j5csyx2f7pdpxih60psszyyvq9yj4ycdzjhjzmmn"; + name = "kded-5.112.0.tar.xz"; }; }; kdelibs4support = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/portingAids/kdelibs4support-5.110.0.tar.xz"; - sha256 = "119hhc0f862kzr5flrlpg9b8xlcl1qxa5xkccad0hpba76pk2af4"; - name = "kdelibs4support-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/portingAids/kdelibs4support-5.112.0.tar.xz"; + sha256 = "0rrzqyawck0mmh8xfs73jx6jghv5bm1346h3xkhgw6ydfzdv3kcv"; + name = "kdelibs4support-5.112.0.tar.xz"; }; }; kdesignerplugin = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/portingAids/kdesignerplugin-5.110.0.tar.xz"; - sha256 = "146i8n9rrajh03x180z48qi8dn31dywsz052bhbn4yw61ag4w4nc"; - name = "kdesignerplugin-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/portingAids/kdesignerplugin-5.112.0.tar.xz"; + sha256 = "0rrk7d06m1ywxf6n1crf510imidhfkpfb58qpaby2fzwb1ifmlyj"; + name = "kdesignerplugin-5.112.0.tar.xz"; }; }; kdesu = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kdesu-5.110.0.tar.xz"; - sha256 = "0ll5k4lpn1v4bc365w2ky0qszikfz2r589ni8iyk109qdqciyrr9"; - name = "kdesu-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kdesu-5.112.0.tar.xz"; + sha256 = "1yn16q3yrycrh6xsfh7faa5n9cr0lafiwh9dwr5p8rm62nmas83g"; + name = "kdesu-5.112.0.tar.xz"; }; }; kdewebkit = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/portingAids/kdewebkit-5.110.0.tar.xz"; - sha256 = "0p09lby7csx3j513lm91k247iwxby423cz7da51n20qncan8g65v"; - name = "kdewebkit-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/portingAids/kdewebkit-5.112.0.tar.xz"; + sha256 = "11za35zxaa3mlvmrkp4rx47sl6ihbc1xgcaf18r6a0cyn4zhx2fz"; + name = "kdewebkit-5.112.0.tar.xz"; }; }; kdnssd = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kdnssd-5.110.0.tar.xz"; - sha256 = "0xmahgn572ah8ji4d4afalcl7r2krn971ix5jwcqgrj57m5haj45"; - name = "kdnssd-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kdnssd-5.112.0.tar.xz"; + sha256 = "0cd1dm44f12n29d8idh29djhfd2z6lj4hc4l42hxx2nasi009p2s"; + name = "kdnssd-5.112.0.tar.xz"; }; }; kdoctools = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kdoctools-5.110.0.tar.xz"; - sha256 = "1g05gppc6qzkag1x18anymbwdswpg32w6jh12x9jfj79vcp7wg4j"; - name = "kdoctools-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kdoctools-5.112.0.tar.xz"; + sha256 = "1cinjrbg31pilzlir9vmigf86ypgpxr9mmyqpjfvq6yxvxfnq7li"; + name = "kdoctools-5.112.0.tar.xz"; }; }; kemoticons = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kemoticons-5.110.0.tar.xz"; - sha256 = "1r1d3kw6wzw63kq9wy4ic2b9hcnmm4rs7v9f1z9jhq9m1jp0zy12"; - name = "kemoticons-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kemoticons-5.112.0.tar.xz"; + sha256 = "037xj9i1x81npm7fyqizkyi7k4slakx1c5x9drp0py5133a0k6z8"; + name = "kemoticons-5.112.0.tar.xz"; }; }; kfilemetadata = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kfilemetadata-5.110.0.tar.xz"; - sha256 = "07ma48iq5vpnj391shm3s9an3rqhxskfziw6pksmzxxnga0whbl9"; - name = "kfilemetadata-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kfilemetadata-5.112.0.tar.xz"; + sha256 = "1yvz3439jmg8m0ry9z0930ya679fahphb6s7mci23xf5zjpczgy4"; + name = "kfilemetadata-5.112.0.tar.xz"; }; }; kglobalaccel = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kglobalaccel-5.110.0.tar.xz"; - sha256 = "1iw22vyrk07pzcsh41cvfp8i8589jm1yqn1cx1ad5rmryzsjalzp"; - name = "kglobalaccel-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kglobalaccel-5.112.0.tar.xz"; + sha256 = "0flb0rkw5bh1xb706pgzsjq41slma4xwg3ghmvrdr622qf87w9hh"; + name = "kglobalaccel-5.112.0.tar.xz"; }; }; kguiaddons = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kguiaddons-5.110.0.tar.xz"; - sha256 = "0ajmxj8nhis6f4hwd64s9qfw3hbip80xrdy3d1wksykbq7g5b89c"; - name = "kguiaddons-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kguiaddons-5.112.0.tar.xz"; + sha256 = "0yw4ikb14f2q1z0hr64bxnxvg770jjllqfvhbnl5hn3m7l61psmb"; + name = "kguiaddons-5.112.0.tar.xz"; }; }; kholidays = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kholidays-5.110.0.tar.xz"; - sha256 = "0zikajmic93wqgy9865pf61sdlnsyzzf2jal7bj25is7a1mk8mjc"; - name = "kholidays-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kholidays-5.112.0.tar.xz"; + sha256 = "1b5jdss17wvm66gwzh6qb0caz9b3fnr6cd902bvqa7dr1aby4j52"; + name = "kholidays-5.112.0.tar.xz"; }; }; khtml = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/portingAids/khtml-5.110.0.tar.xz"; - sha256 = "17d87vjim32mn0s1d9zl9342aamqg4xmi6xh6d8ghrgms3vqc7in"; - name = "khtml-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/portingAids/khtml-5.112.0.tar.xz"; + sha256 = "0rw6286w971q61gahm1qzic0gsfmfz8x449jw6zy38d9k17h7s2n"; + name = "khtml-5.112.0.tar.xz"; }; }; ki18n = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/ki18n-5.110.0.tar.xz"; - sha256 = "03qks9kncvazq2wz3myrjgz5m0gjxm80m1ayv9vjndyyc74a9smw"; - name = "ki18n-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/ki18n-5.112.0.tar.xz"; + sha256 = "06wng9mpr2ln9dd1ayvwglc6071iqg5285jisg95vgf2c3kl5m9k"; + name = "ki18n-5.112.0.tar.xz"; }; }; kiconthemes = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kiconthemes-5.110.0.tar.xz"; - sha256 = "0bb6r7jaknjyhyjhdrlji320qgb7cgxshcgab0209zk8dl8a510d"; - name = "kiconthemes-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kiconthemes-5.112.0.tar.xz"; + sha256 = "04nqw9a2c7bba5y7y741wqwm95jfpbva71q1fj43grd6hcqlff53"; + name = "kiconthemes-5.112.0.tar.xz"; }; }; kidletime = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kidletime-5.110.0.tar.xz"; - sha256 = "0hc30778d1k0vm4qsp58cf3d5bnws328qxazm8d5a6kxdc7izz44"; - name = "kidletime-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kidletime-5.112.0.tar.xz"; + sha256 = "0pch2baf9867w6llk98mxag2y3sjz6irqci88rrsnwn4s1vcs356"; + name = "kidletime-5.112.0.tar.xz"; }; }; kimageformats = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kimageformats-5.110.0.tar.xz"; - sha256 = "0ivks2c2kgd26pr0n0b4x3hb7dmmq52vlp7f6ny14qpvm3cgnscd"; - name = "kimageformats-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kimageformats-5.112.0.tar.xz"; + sha256 = "1lw9vvmb032ymy0a1443q3p9nwn8shc9kbaz05jw4jwa74wp7i65"; + name = "kimageformats-5.112.0.tar.xz"; }; }; kinit = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kinit-5.110.0.tar.xz"; - sha256 = "0ps2299hf02yvgs971cb4bljbmdbcvcmm2xqz6q0h8asjkpkilv5"; - name = "kinit-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kinit-5.112.0.tar.xz"; + sha256 = "1mij6nw1w0zyv724096pfbb0r95300yqb884bx3wlm5nibawwpz7"; + name = "kinit-5.112.0.tar.xz"; }; }; kio = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kio-5.110.0.tar.xz"; - sha256 = "0sy91zlk60q5jligxp870srfc6fhd3fyk5yamkg266yfvyy9m3r2"; - name = "kio-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kio-5.112.0.tar.xz"; + sha256 = "16gv0f8l4jn19mrwc52c6gw2n8hb28n6v7x6kx7qbs3z0wf57f44"; + name = "kio-5.112.0.tar.xz"; }; }; kirigami2 = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kirigami2-5.110.0.tar.xz"; - sha256 = "13j9z0nha3wq97apgkj43bayqijpgy6a2l7f9iryww054aqdjggx"; - name = "kirigami2-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kirigami2-5.112.0.tar.xz"; + sha256 = "048f3sji3dx7q415fkmkj0xmnl0dxacdr9d08d5rqkxz2d94hzk3"; + name = "kirigami2-5.112.0.tar.xz"; }; }; kitemmodels = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kitemmodels-5.110.0.tar.xz"; - sha256 = "06gym33644npci4crhykyfyp2v74pya72kdzmqh4lkzp252pyfhj"; - name = "kitemmodels-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kitemmodels-5.112.0.tar.xz"; + sha256 = "130avvp4lq8f8pag39mna0p3rjyvhbq6akng9d4l01nf8287zv2s"; + name = "kitemmodels-5.112.0.tar.xz"; }; }; kitemviews = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kitemviews-5.110.0.tar.xz"; - sha256 = "1nqbypn0crbaqa8x19z0fh8mqbr8wbf8nc8wg0irzp32js9vcqyp"; - name = "kitemviews-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kitemviews-5.112.0.tar.xz"; + sha256 = "1xpk5xfrp38bjgsyvc3wmcq7vj1sa2wxz0wld2bby3nsixbrdq68"; + name = "kitemviews-5.112.0.tar.xz"; }; }; kjobwidgets = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kjobwidgets-5.110.0.tar.xz"; - sha256 = "1bl7igakmh1ipiamigs5s8fj6fy905b3j1dqgq9hxdxk59k1r1h2"; - name = "kjobwidgets-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kjobwidgets-5.112.0.tar.xz"; + sha256 = "1x1ip1c1v7mydvrz620gaajx6c1p88vlbi3i66fdfnxvhkcrqzqv"; + name = "kjobwidgets-5.112.0.tar.xz"; }; }; kjs = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/portingAids/kjs-5.110.0.tar.xz"; - sha256 = "0xlkdi7qs75ipf87h8m7bvjn4l28y5qy20hvag1gc370fxz54v15"; - name = "kjs-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/portingAids/kjs-5.112.0.tar.xz"; + sha256 = "00nr7darrijxm7czvjwvs4jrw8yd8ypz49l4xym19fvslcb5d0x9"; + name = "kjs-5.112.0.tar.xz"; }; }; kjsembed = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/portingAids/kjsembed-5.110.0.tar.xz"; - sha256 = "1ynmj8ac9g9amjz0ljz3wf7sjsrwmz1kfi26r36rpqlf9mmkzfqm"; - name = "kjsembed-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/portingAids/kjsembed-5.112.0.tar.xz"; + sha256 = "0hs6ka5qj1w3kha6rssvvpw6dh4pw001wfpfjzn8klawjwndjv1r"; + name = "kjsembed-5.112.0.tar.xz"; }; }; kmediaplayer = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/portingAids/kmediaplayer-5.110.0.tar.xz"; - sha256 = "1jhh3gsbibi2hrhswg1nz1mdxn2wir5p9cvqpcqv7k8vm6rb82z3"; - name = "kmediaplayer-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/portingAids/kmediaplayer-5.112.0.tar.xz"; + sha256 = "1bdanmrbzyh6hbpkflq7gwrjm03647pbbiv670li0cmyfmnz904r"; + name = "kmediaplayer-5.112.0.tar.xz"; }; }; knewstuff = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/knewstuff-5.110.0.tar.xz"; - sha256 = "0qld8ijy7z60qdlwa9vaq905xgzyvh5zw6ymngs00axl33m9bbbl"; - name = "knewstuff-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/knewstuff-5.112.0.tar.xz"; + sha256 = "1l417xsqpwxv73wm0fdgjpfnvs19casm1x2xsl299pj66kcm1y7l"; + name = "knewstuff-5.112.0.tar.xz"; }; }; knotifications = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/knotifications-5.110.0.tar.xz"; - sha256 = "0zm3d36v9dgqb3pdwpj962wpngfhq08q9x9rj99f88g9dlnmy6gm"; - name = "knotifications-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/knotifications-5.112.0.tar.xz"; + sha256 = "1xlx91rn826gw3mqddvfs884mx95rhksf70wc1m5jd49cdcgw1mz"; + name = "knotifications-5.112.0.tar.xz"; }; }; knotifyconfig = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/knotifyconfig-5.110.0.tar.xz"; - sha256 = "1651rh0av8lqp8rmb3djizsb8ypihkabprgppla3af2xf446n7wp"; - name = "knotifyconfig-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/knotifyconfig-5.112.0.tar.xz"; + sha256 = "18qikgc5lp5xjmar823j0cgwqpgc8b5sr8rq1x2p23pbb9ywfpqj"; + name = "knotifyconfig-5.112.0.tar.xz"; }; }; kpackage = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kpackage-5.110.0.tar.xz"; - sha256 = "1jd85m7pxzah9d6b3zi2nswvsinx85brkiq142vic5l0rm6l89id"; - name = "kpackage-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kpackage-5.112.0.tar.xz"; + sha256 = "0g84q54yhm9a1h48pim371rjbl208ka56a6xx23zqis20wqjs0kp"; + name = "kpackage-5.112.0.tar.xz"; }; }; kparts = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kparts-5.110.0.tar.xz"; - sha256 = "13av8v2kggbvyv8nxganjb88q38g3gbykbkwrigywc3767p838r3"; - name = "kparts-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kparts-5.112.0.tar.xz"; + sha256 = "0mr45zk4i7jfazkawi7i2ry88y9a17wsny4ck0zln3ggb6wra32c"; + name = "kparts-5.112.0.tar.xz"; }; }; kpeople = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kpeople-5.110.0.tar.xz"; - sha256 = "10drcfjcw00qhdlsficxb07hnnsd93smcig8argznpgwd61f807p"; - name = "kpeople-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kpeople-5.112.0.tar.xz"; + sha256 = "0xfczzy2pwdszzzmyj8ldr1178d93za26j0rqbj3wnqsnji9yn6n"; + name = "kpeople-5.112.0.tar.xz"; }; }; kplotting = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kplotting-5.110.0.tar.xz"; - sha256 = "1fbzy9k0gx1468qsdd1c8fqaml3c01yy0m6n205y3ymkca78hdbk"; - name = "kplotting-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kplotting-5.112.0.tar.xz"; + sha256 = "0a18ly62ilsmaihm398q1jvj10ccw00di3rywq0wq45n0ghnx7zx"; + name = "kplotting-5.112.0.tar.xz"; }; }; kpty = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kpty-5.110.0.tar.xz"; - sha256 = "1cx9wszi9zlay0vb9wz9hgbmbq006xgssnzzrmby4q4s6bhb92ps"; - name = "kpty-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kpty-5.112.0.tar.xz"; + sha256 = "1p6rm94hvq6w54h84vhcqbbnj2gmypipj05vx7c9bnijy0d4nfxf"; + name = "kpty-5.112.0.tar.xz"; }; }; kquickcharts = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kquickcharts-5.110.0.tar.xz"; - sha256 = "0s8xnsmhx2m6wn7fmmddzwnwc2yr3kvy85vd65m3avfw073rgj5v"; - name = "kquickcharts-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kquickcharts-5.112.0.tar.xz"; + sha256 = "1c634jda7lqmv009jg2jdarkd08q1hf4fb3wnj35hilj37c57b5a"; + name = "kquickcharts-5.112.0.tar.xz"; }; }; kross = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/portingAids/kross-5.110.0.tar.xz"; - sha256 = "169zsxrmbdv5xn6s0wmf1l2a3qghn88hgl714i0cnymq5ixy25x5"; - name = "kross-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/portingAids/kross-5.112.0.tar.xz"; + sha256 = "1b887bx4d3nr55305mk91wnm6bfhbgnqjmbc3a9jkv65c78j9hsa"; + name = "kross-5.112.0.tar.xz"; }; }; krunner = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/krunner-5.110.0.tar.xz"; - sha256 = "0q3jhq2cswnqj5rdkxhizlv06rsxsm38ipxhcsw6p8zqabi1i351"; - name = "krunner-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/krunner-5.112.0.tar.xz"; + sha256 = "00bfszbpr2w21nz3vhih8hp0f9gzn1906axvib3jm1w3kjmy2avn"; + name = "krunner-5.112.0.tar.xz"; }; }; kservice = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kservice-5.110.0.tar.xz"; - sha256 = "0rin6v96mcmw53dzw8sw56g7188623d1k4vs18bv44l86gixdhgg"; - name = "kservice-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kservice-5.112.0.tar.xz"; + sha256 = "01aj0yrlxlwr5sm1z0pq6caa4ijj3nsgqhza1zr4mzrx2ybf753z"; + name = "kservice-5.112.0.tar.xz"; }; }; ktexteditor = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/ktexteditor-5.110.0.tar.xz"; - sha256 = "0iwzw51km3mr8kdva14mxz9bvcfcf09v5igah2axkjaxazxyigla"; - name = "ktexteditor-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/ktexteditor-5.112.0.tar.xz"; + sha256 = "0d0cw9qd7mmnhdqayx4lcpd60hp1al5zwy565rsvxmjly564l3i9"; + name = "ktexteditor-5.112.0.tar.xz"; }; }; ktextwidgets = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/ktextwidgets-5.110.0.tar.xz"; - sha256 = "0cr7n58mak928dysyqhsr1pj0w90amikx9jav4gs4lzb4m4rjp7q"; - name = "ktextwidgets-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/ktextwidgets-5.112.0.tar.xz"; + sha256 = "0x83f0ih3c25yggmvyibyfaiikk4zc0k5gf6yr87c62ihgv7gniz"; + name = "ktextwidgets-5.112.0.tar.xz"; }; }; kunitconversion = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kunitconversion-5.110.0.tar.xz"; - sha256 = "083w0gz157j2g8qzm03yq3qwq58wafcq26qcc2ly2fksyyxkzzda"; - name = "kunitconversion-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kunitconversion-5.112.0.tar.xz"; + sha256 = "1zi47yd3aydy2mcmgfgwp4g12w7681lyc1niq5p13670mxhlkrwc"; + name = "kunitconversion-5.112.0.tar.xz"; }; }; kwallet = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kwallet-5.110.0.tar.xz"; - sha256 = "0mg5y8cvzvs7w3yy5xnpsps2b6m476l5ilw5kvarrjjpq7ybnkqz"; - name = "kwallet-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kwallet-5.112.0.tar.xz"; + sha256 = "1v38wyz9hhhvzwrpxsjkd8yqyy4yv9hii1413ffcm9x971nliq2s"; + name = "kwallet-5.112.0.tar.xz"; }; }; kwayland = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kwayland-5.110.0.tar.xz"; - sha256 = "0ggxvywvqfhhhb5370n90dyw0mjwkp3i7rgv58nyqsmby0g08r85"; - name = "kwayland-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kwayland-5.112.0.tar.xz"; + sha256 = "0nzpg4x9hg9jd1kg6sq0lh658kz3cz25z5kji7hpq2h0svmxx709"; + name = "kwayland-5.112.0.tar.xz"; }; }; kwidgetsaddons = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kwidgetsaddons-5.110.0.tar.xz"; - sha256 = "1cyphs0r5j2v93pwi9mbn6xd928lnhb0zmyfj5pywdx9n7lv0x6a"; - name = "kwidgetsaddons-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kwidgetsaddons-5.112.0.tar.xz"; + sha256 = "0x5mz04dwlpl0h75v0c5w04qjpcb3fbpjk7hbslwgfwr7gviqyib"; + name = "kwidgetsaddons-5.112.0.tar.xz"; }; }; kwindowsystem = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kwindowsystem-5.110.0.tar.xz"; - sha256 = "0l3aknr3zqz9zwqlyhnr8n53bcfb22rm38vdiv0l5vpwjbjn0270"; - name = "kwindowsystem-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kwindowsystem-5.112.0.tar.xz"; + sha256 = "08ihg6zq979h4v6c157n80pi3cfsg9w9qiyqaw3h79365zji73j1"; + name = "kwindowsystem-5.112.0.tar.xz"; }; }; kxmlgui = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/kxmlgui-5.110.0.tar.xz"; - sha256 = "1j8v52ix9sv7q76cvl2gnpjs602ri57kgfh21bvqd88gf2xnwxjq"; - name = "kxmlgui-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/kxmlgui-5.112.0.tar.xz"; + sha256 = "17jsqzxn5wgwsm3lrfgdygyzvqibzv9vfgg11s2gc5bq9x4s0j8g"; + name = "kxmlgui-5.112.0.tar.xz"; }; }; kxmlrpcclient = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/portingAids/kxmlrpcclient-5.110.0.tar.xz"; - sha256 = "0fzd9amj2j4bw54q8fbgczqf785s6siqr1a8wbqf56wyyhki5psx"; - name = "kxmlrpcclient-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/portingAids/kxmlrpcclient-5.112.0.tar.xz"; + sha256 = "09zwgrh336bk5cfab2zcdzcfdzjvlqa47ljfrciyh4h8m5f7y12h"; + name = "kxmlrpcclient-5.112.0.tar.xz"; }; }; modemmanager-qt = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/modemmanager-qt-5.110.0.tar.xz"; - sha256 = "08q43arx9q81rqwhczzcn4cyl5glalwzjncb120a2cihida2m71v"; - name = "modemmanager-qt-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/modemmanager-qt-5.112.0.tar.xz"; + sha256 = "0323zp03wj4ignfc94qg89h3j4qmh3mkdac5snr1axjaaf6sk6w8"; + name = "modemmanager-qt-5.112.0.tar.xz"; }; }; networkmanager-qt = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/networkmanager-qt-5.110.0.tar.xz"; - sha256 = "1bnlvpfhw6l64rgaxx9zkxd5wmwvyal5xmv31vxzf92ig6sgjdqq"; - name = "networkmanager-qt-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/networkmanager-qt-5.112.0.tar.xz"; + sha256 = "1larg78j7rlbbscv04imc1k6f1srapr2yrbyxif38d4iipfg04f9"; + name = "networkmanager-qt-5.112.0.tar.xz"; }; }; oxygen-icons5 = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/oxygen-icons5-5.110.0.tar.xz"; - sha256 = "1dmig458gbl0ypb99kj514nwl5gbjpfvixw9lipgc2wwnn1nkia2"; - name = "oxygen-icons5-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/oxygen-icons5-5.112.0.tar.xz"; + sha256 = "0yw2mixy5p8pw9866rfr0wcjhvilznakd0h6934svv0dk3lv054a"; + name = "oxygen-icons5-5.112.0.tar.xz"; }; }; plasma-framework = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/plasma-framework-5.110.0.tar.xz"; - sha256 = "0jfln8lrzmcnkqhl8pij5w6mdj6g25rwc332f07g9465y9ap07cf"; - name = "plasma-framework-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/plasma-framework-5.112.0.tar.xz"; + sha256 = "0nq8dzqk1hxzm8yngzgm9zqw8155fy38zq6k3613af5mgj7jmdhj"; + name = "plasma-framework-5.112.0.tar.xz"; }; }; prison = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/prison-5.110.0.tar.xz"; - sha256 = "019a3z18gq7nb3ahf5dd3b5fixzyfklg60dk2w4win2w19s70wb7"; - name = "prison-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/prison-5.112.0.tar.xz"; + sha256 = "1blgs0k4kz3smsf0qb9y6krzbssyv1hbqvjc7qvk4qwk81qhyfvq"; + name = "prison-5.112.0.tar.xz"; }; }; purpose = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/purpose-5.110.0.tar.xz"; - sha256 = "0nl6qh7j5c3ijnq0qw1a5jmj1x5nb9hlssjjn8fdvfr7q6z67rsc"; - name = "purpose-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/purpose-5.112.0.tar.xz"; + sha256 = "1cqcmhbb26xypllmk3z4r0z8sw79idzz6nz72ahwa4ha0pqbl8p3"; + name = "purpose-5.112.0.tar.xz"; }; }; qqc2-desktop-style = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/qqc2-desktop-style-5.110.0.tar.xz"; - sha256 = "04pyhlr89azw0kyjxfpx6phxljck8yiflcszd4xkgiw3n9rjyg3g"; - name = "qqc2-desktop-style-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/qqc2-desktop-style-5.112.0.tar.xz"; + sha256 = "1k74vwj07xf3fjfj8ff9zx5ndzq5m3bdnj4zgymkxm1gk3r6gl5y"; + name = "qqc2-desktop-style-5.112.0.tar.xz"; }; }; solid = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/solid-5.110.0.tar.xz"; - sha256 = "1k64cqlws7nxki21cwg197avfnxsxpw3isry5p7bqyfmq45ydcvd"; - name = "solid-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/solid-5.112.0.tar.xz"; + sha256 = "0hpm5akhk24fzbg27p6ql598s5mxa6n8h359ajf45afabimhjx0y"; + name = "solid-5.112.0.tar.xz"; }; }; sonnet = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/sonnet-5.110.0.tar.xz"; - sha256 = "16qk63yy1y03z4rlc08qzr7mmds1yz0k9x1ws2nzp47khkza250i"; - name = "sonnet-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/sonnet-5.112.0.tar.xz"; + sha256 = "026iivz27d7v4kpwkl6qwbcqnd71kvg77szy91fch37iki7z6361"; + name = "sonnet-5.112.0.tar.xz"; }; }; syndication = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/syndication-5.110.0.tar.xz"; - sha256 = "0dsd05ckfv9fdnrbgprriba7lbbfs2z9qv869pcr4n7pn7x778sd"; - name = "syndication-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/syndication-5.112.0.tar.xz"; + sha256 = "03if949klq28kaf3xzcva917fqv7cn6pzjwsgymya3nc730kfsc8"; + name = "syndication-5.112.0.tar.xz"; }; }; syntax-highlighting = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/syntax-highlighting-5.110.0.tar.xz"; - sha256 = "0gbmgan0cy4xhjcf10g0lffhwvkhhpcgbnk190xlzl4chnmpq9w5"; - name = "syntax-highlighting-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/syntax-highlighting-5.112.0.tar.xz"; + sha256 = "1m88nfmf4kxliqkgm78f95yvsjv76xm2rmg92v9mg00r9d00y95h"; + name = "syntax-highlighting-5.112.0.tar.xz"; }; }; threadweaver = { - version = "5.110.0"; + version = "5.112.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.110/threadweaver-5.110.0.tar.xz"; - sha256 = "085y4m7z0rybsvpqzl2sjwnf8yjm4lnc3n49idj2c0psm8v5ksm0"; - name = "threadweaver-5.110.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.112/threadweaver-5.112.0.tar.xz"; + sha256 = "1i3qj6qf0sv5pf8d5wx6gy11dqyp4x4b4759gwbhlrizkm4fa7f9"; + name = "threadweaver-5.112.0.tar.xz"; }; }; } diff --git a/pkgs/development/libraries/libAfterImage/default.nix b/pkgs/development/libraries/libAfterImage/default.nix index a569b59621e..828a6891e29 100644 --- a/pkgs/development/libraries/libAfterImage/default.nix +++ b/pkgs/development/libraries/libAfterImage/default.nix @@ -84,6 +84,10 @@ stdenv.mkDerivation { "--${if withX then "with" else "without"}-x" ]; + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; + }; + meta = with lib; { homepage = "http://www.afterstep.org/afterimage/"; description = "A generic image manipulation library"; diff --git a/pkgs/development/libraries/libaom/default.nix b/pkgs/development/libraries/libaom/default.nix index 6be0370a177..c5e40babfd6 100644 --- a/pkgs/development/libraries/libaom/default.nix +++ b/pkgs/development/libraries/libaom/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, fetchzip, yasm, perl, cmake, pkg-config, python3 , enableButteraugli ? true, libjxl , enableVmaf ? true, libvmaf +, gitUpdater }: let @@ -8,11 +9,11 @@ let in stdenv.mkDerivation rec { pname = "libaom"; - version = "3.6.1"; + version = "3.7.0"; src = fetchzip { url = "https://aomedia.googlesource.com/aom/+archive/v${version}.tar.gz"; - sha256 = "sha256-U7hmKdpjTtqStM4UIjCvgJ2swpZ1x0Px1Q9+gSHbaeQ="; + hash = "sha256-Zf0g/CMI73O9Dkn9o7aIvwZ/8wh3lCmVY8nZaPwBp68="; stripRoot = false; }; @@ -64,6 +65,14 @@ stdenv.mkDerivation rec { outputs = [ "out" "bin" "dev" "static" ]; + passthru = { + updateScript = gitUpdater { + url = "https://aomedia.googlesource.com/aom"; + rev-prefix = "v"; + ignoredVersions = "(alpha|beta|rc).*"; + }; + }; + meta = with lib; { description = "Alliance for Open Media AV1 codec library"; longDescription = '' diff --git a/pkgs/development/libraries/libb64/default.nix b/pkgs/development/libraries/libb64/default.nix index 38f16fa5bb1..3b24089e53c 100644 --- a/pkgs/development/libraries/libb64/default.nix +++ b/pkgs/development/libraries/libb64/default.nix @@ -30,6 +30,13 @@ stdenv.mkDerivation rec { url = "https://github.com/libb64/libb64/commit/b5edeafc89853c48fa41a4c16393a1fdc8638ab6.patch"; hash = "sha256-+bqfOOlT/t0FLQEMHuxW1BxJcx9rk0yYM3wD43mcymo"; }) + # Fix build with Clang 16. + # https://github.com/libb64/libb64/pull/10 + (fetchpatch { + name = "use-proper-function-prototype-for-main.patch"; + url = "https://github.com/libb64/libb64/commit/98eaf510f40e384b32c01ad4bd5c3a697fdd8560.patch"; + hash = "sha256-CGslJUw0og/bBBirLm0J5Q7cf2WW/vniVAkXHlb6lbQ="; + }) ] ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) (fetchpatch { name = "0001-example-Do-not-run-the-tests.patch"; url = "https://cgit.openembedded.org/meta-openembedded/plain/meta-oe/recipes-support/libb64/libb64/0001-example-Do-not-run-the-tests.patch?id=484e0de1e4ee107f21ae2a5c5f976ed987978baf"; diff --git a/pkgs/development/libraries/libbladeRF/default.nix b/pkgs/development/libraries/libbladeRF/default.nix index 937937ae826..ce570b76bc0 100644 --- a/pkgs/development/libraries/libbladeRF/default.nix +++ b/pkgs/development/libraries/libbladeRF/default.nix @@ -35,6 +35,10 @@ stdenv.mkDerivation rec { "-DBLADERF_GROUP=bladerf" ]; + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = "-Wno-error=unused-but-set-variable"; + }; + hardeningDisable = [ "fortify" ]; meta = with lib; { diff --git a/pkgs/development/libraries/libcamera/default.nix b/pkgs/development/libraries/libcamera/default.nix index a502bc0d796..076eccb1c26 100644 --- a/pkgs/development/libraries/libcamera/default.nix +++ b/pkgs/development/libraries/libcamera/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchgit +, fetchpatch , lib , meson , ninja @@ -31,6 +32,15 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "doc" ]; + patches = [ + (fetchpatch { + # https://git.libcamera.org/libcamera/libcamera.git/commit/?id=6cb92b523bd60bd7718df134cc5b1eff51cf42e5 + name = "libcamera-sphinx7.0-compat.patch"; + url = "https://git.libcamera.org/libcamera/libcamera.git/patch/?id=6cb92b523bd60bd7718df134cc5b1eff51cf42e5"; + hash = "sha256-gs0EiT3gWlmRjDim+o2C0VmnoWqEouP5pNTD4XbNSdE="; + }) + ]; + postPatch = '' patchShebangs utils/ ''; diff --git a/pkgs/development/libraries/libcbor/default.nix b/pkgs/development/libraries/libcbor/default.nix index fff5f705d7c..efb17eeaf31 100644 --- a/pkgs/development/libraries/libcbor/default.nix +++ b/pkgs/development/libraries/libcbor/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , cmake , cmocka @@ -22,6 +23,19 @@ stdenv.mkDerivation (finalAttrs: { sha256 = "sha256-ZTa+wG1g9KsVoqJG/yqxo2fJ7OhPnaI9QcfOmpOT3pg="; }; + outputs = [ "out" "dev" ]; + + patches = [ + # Pull fix pending upstream inclusion to support + # `CMAKE_INSTALL_INCLUDEDIR`: + # https://github.com/PJK/libcbor/pull/297 + (fetchpatch { + name = "includedir.patch"; + url = "https://github.com/PJK/libcbor/commit/d00a63e6d6858a2ed6be9b431b42799ed2c99ad8.patch"; + hash = "sha256-kBCSbAHOCGOs/4Yu6Vh0jcmzA/jYPkkPXPGPrptRfyk="; + }) + ]; + strictDeps = true; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/libcef/default.nix b/pkgs/development/libraries/libcef/default.nix index 5daca729bc7..2fb83097c02 100644 --- a/pkgs/development/libraries/libcef/default.nix +++ b/pkgs/development/libraries/libcef/default.nix @@ -69,7 +69,7 @@ let platforms."aarch64-linux".sha256 = "12sp58nxa3nv800badv62vpvc30hyb0ykywdaxgv9y8pswp9lq0z"; platforms."x86_64-linux".sha256 = "0vzzwq1k6bv9d209yg3samvfnfwj7s58y9r3p3pd98wxa9iyzf4j"; - platformInfo = builtins.getAttr stdenv.targetPlatform.system platforms; + platformInfo = builtins.getAttr stdenv.hostPlatform.system platforms; in stdenv.mkDerivation rec { pname = "cef-binary"; diff --git a/pkgs/development/libraries/libcmis/default.nix b/pkgs/development/libraries/libcmis/default.nix index 142e329fd09..52da3719991 100644 --- a/pkgs/development/libraries/libcmis/default.nix +++ b/pkgs/development/libraries/libcmis/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libcmis"; - version = "0.6.0"; + version = "0.6.2"; src = fetchFromGitHub { owner = "tdf"; repo = pname; rev = "v${version}"; - sha256 = "sha256-E2A4uJUayqMMxVifzeAeYKLL+FiV2vShNNdXe5ZLXZ4="; + sha256 = "sha256-HXiyQKjOlQXWABY10XrOiYxPqfpmUJC3a6xD98LIHDw="; }; nativeBuildInputs = [ autoreconfHook pkg-config docbook2x ]; diff --git a/pkgs/development/libraries/libdeflate/default.nix b/pkgs/development/libraries/libdeflate/default.nix index 6494f16a876..3bbf449d89a 100644 --- a/pkgs/development/libraries/libdeflate/default.nix +++ b/pkgs/development/libraries/libdeflate/default.nix @@ -7,13 +7,13 @@ }: stdenv.mkDerivation rec { pname = "libdeflate"; - version = "1.18"; + version = "1.19"; src = fetchFromGitHub { owner = "ebiggers"; repo = "libdeflate"; rev = "v${version}"; - sha256 = "sha256-dWSDAYn36GDtkghmouGhHzxpa6EVwCslIPqejlLMZNM="; + sha256 = "sha256-HgZ2an1PCPhiLsd3ZA7tgZ1wVTOdHzDr8FHrqJhEbQw="; }; cmakeFlags = lib.optionals stdenv.hostPlatform.isStatic [ "-DLIBDEFLATE_BUILD_SHARED_LIB=OFF" ]; diff --git a/pkgs/development/libraries/libdeltachat/Cargo.lock b/pkgs/development/libraries/libdeltachat/Cargo.lock index 80f4eb3346f..26a8f666646 100644 --- a/pkgs/development/libraries/libdeltachat/Cargo.lock +++ b/pkgs/development/libraries/libdeltachat/Cargo.lock @@ -198,12 +198,12 @@ dependencies = [ [[package]] name = "async-channel" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "336d835910fab747186c56586562cb46f42809c2843ef3a84f47509009522838" +checksum = "d37875bd9915b7d67c2f117ea2c30a0989874d0b2cb694fe25403c85763c0c9e" dependencies = [ "concurrent-queue", - "event-listener 3.0.0", + "event-listener 3.0.1", "event-listener-strategy", "futures-core", "pin-project-lite", @@ -224,11 +224,11 @@ dependencies = [ [[package]] name = "async-imap" -version = "0.9.2" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "936c1b580be4373b48c9c687e0c79285441664398354df28d0860087cac0c069" +checksum = "2e542b1682eba6b85a721daef0c58e79319ffd0c678565c07ac57c8071c548b5" dependencies = [ - "async-channel 1.9.0", + "async-channel 2.1.0", "base64 0.21.5", "bytes", "chrono", @@ -290,7 +290,7 @@ checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -512,9 +512,9 @@ dependencies = [ [[package]] name = "brotli-decompressor" -version = "2.5.0" +version = "2.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da74e2b81409b1b743f8f0c62cc6254afefb8b8e50bbfe3735550f7aeefa3448" +checksum = "4e2e4afe60d7dd600fdd3de8d0f08c2b7ec039712e3b6137ff98b7004e82de4f" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -522,9 +522,9 @@ dependencies = [ [[package]] name = "bstr" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c79ad7fb2dd38f3dabd76b09c6a5a20c038fc0213ef1e9afd30eb777f120f019" +checksum = "542f33a8835a0884b006a0c3df3dadd99c0c3f296ed26c2fdc8028e01ad6230c" dependencies = [ "memchr", "serde", @@ -707,18 +707,18 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.7" +version = "4.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac495e00dcec98c83465d5ad66c5c4fabd652fd6686e7c6269b117e729a6f17b" +checksum = "2275f18819641850fa26c89acc84d465c1bf91ce57bc2748b28c420473352f64" dependencies = [ "clap_builder", ] [[package]] name = "clap_builder" -version = "4.4.7" +version = "4.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c77ed9a32a62e6ca27175d00d29d05ca32e396ea1eb5fb01d8256b669cec7663" +checksum = "07cdf1b148b25c1e1f7a42225e30a0d99a615cd4637eae7365548dd4529b95bc" dependencies = [ "anstyle", "clap_lex", @@ -824,9 +824,9 @@ checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" [[package]] name = "cpufeatures" -version = "0.2.10" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fbc60abd742b35f2492f808e1abbb83d45f72db402e14c55057edc9c7b1e9e4" +checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0" dependencies = [ "libc", ] @@ -983,13 +983,13 @@ dependencies = [ [[package]] name = "curve25519-dalek-derive" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83fdaf97f4804dcebfa5862639bc9ce4121e82140bec2a987ac5140294865b5b" +checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -1087,11 +1087,11 @@ dependencies = [ [[package]] name = "deltachat" -version = "1.128.0" +version = "1.131.1" dependencies = [ "ansi_term", "anyhow", - "async-channel 2.0.0", + "async-channel 2.1.0", "async-imap", "async-native-tls", "async-smtp", @@ -1165,10 +1165,10 @@ dependencies = [ [[package]] name = "deltachat-jsonrpc" -version = "1.128.0" +version = "1.131.1" dependencies = [ "anyhow", - "async-channel 2.0.0", + "async-channel 2.1.0", "axum", "base64 0.21.5", "deltachat", @@ -1189,7 +1189,7 @@ dependencies = [ [[package]] name = "deltachat-repl" -version = "1.128.0" +version = "1.131.1" dependencies = [ "ansi_term", "anyhow", @@ -1204,7 +1204,7 @@ dependencies = [ [[package]] name = "deltachat-rpc-server" -version = "1.128.0" +version = "1.131.1" dependencies = [ "anyhow", "deltachat", @@ -1224,12 +1224,12 @@ name = "deltachat_derive" version = "2.0.0" dependencies = [ "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] name = "deltachat_ffi" -version = "1.128.0" +version = "1.131.1" dependencies = [ "anyhow", "deltachat", @@ -1433,7 +1433,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -1461,9 +1461,9 @@ dependencies = [ [[package]] name = "dyn-clone" -version = "1.0.14" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23d2f3407d9a573d666de4b5bdf10569d73ca9478087346697dcbae6244bfbcd" +checksum = "545b22097d44f8a9581187cdf93de7a71e4722bf51200cfaba810865b49a495d" [[package]] name = "ecdsa" @@ -1613,6 +1613,12 @@ dependencies = [ ] [[package]] +name = "embedded-io" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef1a6892d9eef45c8fa6b9e0086428a2cca8491aca8f787c534a3d6d0bcb3ced" + +[[package]] name = "encoded-words" version = "0.2.0" source = "git+https://github.com/async-email/encoded-words?branch=master#d55366b36f96e383f39c432aedce42ee8b43f796" @@ -1720,7 +1726,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -1733,14 +1739,14 @@ dependencies = [ "num-traits", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] name = "env_logger" -version = "0.10.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" +checksum = "95b3f3e67048839cb0d0781f445682a35113da7121f7c949db0e2be96a4fbece" dependencies = [ "humantime", "is-terminal", @@ -1757,9 +1763,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860" +checksum = "7c18ee0ed65a5f1f81cac6b1d213b69c35fa47d4252ad41f1486dbd8226fe36e" dependencies = [ "libc", "windows-sys", @@ -1792,9 +1798,9 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] name = "event-listener" -version = "3.0.0" +version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29e56284f00d94c1bc7fd3c77027b4623c88c1f53d8d2394c6199f2921dea325" +checksum = "01cec0252c2afff729ee6f00e903d479fba81784c8e2bd77447673471fdfaea1" dependencies = [ "concurrent-queue", "parking", @@ -1807,15 +1813,15 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d96b852f1345da36d551b9473fa1e2b1eb5c5195585c6c018118bc92a8d91160" dependencies = [ - "event-listener 3.0.0", + "event-listener 3.0.1", "pin-project-lite", ] [[package]] name = "fallible-iterator" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" +checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649" [[package]] name = "fallible-streaming-iterator" @@ -1864,9 +1870,9 @@ dependencies = [ [[package]] name = "fdeflate" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d329bdeac514ee06249dabc27877490f17f5d371ec693360768b838e19f3ae10" +checksum = "64d6dafc854908ff5da46ff3f8f473c6984119a2876a383a860246dd7841a868" dependencies = [ "simd-adler32", ] @@ -1893,9 +1899,9 @@ dependencies = [ [[package]] name = "fiat-crypto" -version = "0.2.1" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0870c84016d4b481be5c9f323c24f65e31e901ae618f0e80f4308fb00de1d2d" +checksum = "f69037fe1b785e84986b4f2cbcf647381876a00671d25ceef715d7812dd7e1dd" [[package]] name = "filetime" @@ -1968,9 +1974,9 @@ version = "1.0.0" [[package]] name = "futures" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" +checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335" dependencies = [ "futures-channel", "futures-core", @@ -1983,9 +1989,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" +checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" dependencies = [ "futures-core", "futures-sink", @@ -1993,15 +1999,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" +checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" [[package]] name = "futures-executor" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" +checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc" dependencies = [ "futures-core", "futures-task", @@ -2010,15 +2016,15 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" +checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" [[package]] name = "futures-lite" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c1155db57329dca6d018b61e76b1488ce9a2e5e44028cac420a5898f4fcef63" +checksum = "d3831c2651acb5177cbd83943f3d9c8912c5ad03c76afcc0e9511ba568ec5ebb" dependencies = [ "fastrand", "futures-core", @@ -2026,37 +2032,36 @@ dependencies = [ "memchr", "parking", "pin-project-lite", - "waker-fn", ] [[package]] name = "futures-macro" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" +checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] name = "futures-sink" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" +checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817" [[package]] name = "futures-task" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" +checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" [[package]] name = "futures-util" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" +checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" dependencies = [ "futures-channel", "futures-core", @@ -2094,9 +2099,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.10" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" +checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" dependencies = [ "cfg-if", "js-sys", @@ -2296,9 +2301,9 @@ dependencies = [ [[package]] name = "http" -version = "0.2.9" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" +checksum = "f95b9abcae896730d42b78e09c155ed4ddf82c07b4de772c64aee5b2d8b7c150" dependencies = [ "bytes", "fnv", @@ -2330,9 +2335,9 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "human-panic" -version = "1.2.1" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b82da652938b83f94cfdaaf9ae7aaadb8430d84b0dfda226998416318727eac2" +checksum = "7a79a67745be0cb8dd2771f03b24c2f25df98d5471fe7a595d668cfa2e6f843d" dependencies = [ "backtrace", "os_info", @@ -2460,9 +2465,9 @@ dependencies = [ [[package]] name = "imap-proto" -version = "0.16.2" +version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f73b1b63179418b20aa81002d616c5f21b4ba257da9bca6989ea64dc573933e0" +checksum = "305c25c6e69416059e3396c4a062b84dc7b0a782cd4c84d82bab268eb0421ec7" dependencies = [ "nom", ] @@ -2479,9 +2484,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.0.2" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897" +checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" dependencies = [ "equivalent", "hashbrown 0.14.2", @@ -2591,9 +2596,9 @@ checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e" [[package]] name = "js-sys" -version = "0.3.64" +version = "0.3.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" +checksum = "54c0c35952f67de54bb584e9fd912b3023117cbafc0a77d8f3dee1fb5f572fe8" dependencies = [ "wasm-bindgen", ] @@ -2651,9 +2656,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.149" +version = "0.2.150" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" +checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" [[package]] name = "libm" @@ -2662,10 +2667,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" [[package]] +name = "libredox" +version = "0.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" +dependencies = [ + "bitflags 2.4.1", + "libc", + "redox_syscall 0.4.1", +] + +[[package]] name = "libsqlite3-sys" -version = "0.26.0" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afc22eff61b133b115c6e8c74e818c628d6d5e7a502afea6f64dee076dd94326" +checksum = "cf4e226dcd58b4be396f7bd3c20da8fdee2911400705297ba7d2d7cc2c30f716" dependencies = [ "cc", "openssl-sys", @@ -2681,9 +2697,9 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] name = "linux-raw-sys" -version = "0.4.10" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" +checksum = "969488b55f8ac402214f3f5fd243ebb7206cf82de60d3172994707a4bcc2b829" [[package]] name = "lock_api" @@ -2818,7 +2834,7 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3" dependencies = [ - "getrandom 0.2.10", + "getrandom 0.2.11", ] [[package]] @@ -2974,7 +2990,7 @@ checksum = "cfb77679af88f8b125209d354a202862602672222e7f2313fdd6dc349bad4712" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -3067,9 +3083,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openssl" -version = "0.10.57" +version = "0.10.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bac25ee399abb46215765b1cb35bc0212377e58a061560d8b29b024fd0430e7c" +checksum = "7a257ad03cd8fb16ad4172fedf8094451e1af1c4b70097636ef2eac9a5f0cc33" dependencies = [ "bitflags 2.4.1", "cfg-if", @@ -3088,7 +3104,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -3108,9 +3124,9 @@ dependencies = [ [[package]] name = "openssl-sys" -version = "0.9.93" +version = "0.9.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db4d56a4c0478783083cfafcc42493dd4a981d41669da64b4572a2a089b51b1d" +checksum = "40a4130519a360279579c2053038317e40eff64d13fd3f004f9e1b72b8a6aaf9" dependencies = [ "cc", "libc", @@ -3206,13 +3222,13 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.8" +version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.3.5", + "redox_syscall 0.4.1", "smallvec", "windows-targets", ] @@ -3296,7 +3312,7 @@ dependencies = [ "p384 0.13.0", "rand 0.8.5", "ripemd", - "rsa 0.9.2", + "rsa 0.9.3", "sha1", "sha2 0.10.8", "sha3", @@ -3325,7 +3341,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -3391,9 +3407,9 @@ checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" [[package]] name = "platforms" -version = "3.1.2" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4503fa043bf02cee09a9582e9554b4c6403b2ef55e4612e96561d294419429f8" +checksum = "14e6ab3f592e6fb464fc9712d8d6e6912de6473954635fd76a589d832cffcbb0" [[package]] name = "plotters" @@ -3444,12 +3460,13 @@ checksum = "3bccab0e7fd7cc19f820a1c8c91720af652d0c88dc9664dd72aef2614f04af3b" [[package]] name = "postcard" -version = "1.0.6" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9ee729232311d3cd113749948b689627618133b1c5012b77342c1950b25eaeb" +checksum = "a55c51ee6c0db07e68448e336cf8ea4131a620edefebf9893e759b2d793420f8" dependencies = [ "cobs", "const_format", + "embedded-io", "postcard-derive", "serde", ] @@ -3499,9 +3516,9 @@ dependencies = [ [[package]] name = "primeorder" -version = "0.13.2" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c2fcef82c0ec6eefcc179b978446c399b3cdf73c392c35604e399eee6df1ee3" +checksum = "c7dbe9ed3b56368bd99483eb32fe9c17fdd3730aebadc906918ce78d54c7eeb4" dependencies = [ "elliptic-curve 0.13.6", ] @@ -3541,9 +3558,9 @@ dependencies = [ [[package]] name = "proptest" -version = "1.3.1" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c003ac8c77cb07bb74f5f198bce836a689bcd5a42574612bf14d17bfd08c20e" +checksum = "31b476131c3c86cb68032fdc5cb6d5a1045e3e42d96b69fa599fd77701e1f5bf" dependencies = [ "bitflags 2.4.1", "lazy_static", @@ -3551,7 +3568,7 @@ dependencies = [ "rand 0.8.5", "rand_chacha 0.3.1", "rand_xorshift", - "regex-syntax 0.7.5", + "regex-syntax 0.8.2", "unarray", ] @@ -3614,9 +3631,9 @@ dependencies = [ [[package]] name = "quinn-proto" -version = "0.10.5" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c78e758510582acc40acb90458401172d41f1016f8c9dde89e49677afb7eec1" +checksum = "141bf7dfde2fbc246bfd3fe12f2455aa24b0fbd9af535d8c86c7bd1381ff2b1a" dependencies = [ "bytes", "rand 0.8.5", @@ -3727,7 +3744,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.10", + "getrandom 0.2.11", ] [[package]] @@ -3786,30 +3803,30 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.2.16" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" dependencies = [ "bitflags 1.3.2", ] [[package]] name = "redox_syscall" -version = "0.3.5" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" dependencies = [ "bitflags 1.3.2", ] [[package]] name = "redox_users" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" +checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" dependencies = [ - "getrandom 0.2.10", - "redox_syscall 0.2.16", + "getrandom 0.2.11", + "libredox", "thiserror", ] @@ -3853,12 +3870,6 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" - -[[package]] -name = "regex-syntax" version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" @@ -3954,7 +3965,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb0205304757e5d899b9c2e448b867ffd03ae7f988002e47cd24954391394d0b" dependencies = [ "cc", - "getrandom 0.2.10", + "getrandom 0.2.11", "libc", "spin 0.9.8", "untrusted 0.9.0", @@ -3993,16 +4004,14 @@ dependencies = [ [[package]] name = "rsa" -version = "0.9.2" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ab43bb47d23c1a631b4b680199a45255dce26fa9ab2fa902581f624ff13e6a8" +checksum = "86ef35bf3e7fe15a53c4ab08a998e42271eab13eb0db224126bc7bc4c4bad96d" dependencies = [ - "byteorder", "const-oid", "digest 0.10.7", "num-bigint-dig", "num-integer", - "num-iter", "num-traits", "pkcs1 0.7.5", "pkcs8 0.10.2", @@ -4015,9 +4024,9 @@ dependencies = [ [[package]] name = "rusqlite" -version = "0.29.0" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "549b9d036d571d42e6e85d1c1425e2ac83491075078ca9a15be021c56b1641f2" +checksum = "a78046161564f5e7cd9008aff3b2990b3850dc8e0349119b98e8f251e099f24d" dependencies = [ "bitflags 2.4.1", "fallible-iterator", @@ -4065,9 +4074,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.20" +version = "0.38.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67ce50cb2e16c2903e30d1cbccfd8387a74b9d4c938b6a4c5ec6cc7556f7a8a0" +checksum = "2b426b0506e5d50a7d8dafcf2e81471400deb602392c7dd110815afb4eaf02a3" dependencies = [ "bitflags 2.4.1", "errno", @@ -4101,9 +4110,9 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" +checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" dependencies = [ "base64 0.21.5", ] @@ -4189,9 +4198,9 @@ dependencies = [ [[package]] name = "schemars" -version = "0.8.15" +version = "0.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f7b0ce13155372a76ee2e1c5ffba1fe61ede73fbea5630d61eee6fac4929c0c" +checksum = "45a28f4c49489add4ce10783f7911893516f15afe45d015608d41faca6bc4d29" dependencies = [ "dyn-clone", "schemars_derive", @@ -4201,9 +4210,9 @@ dependencies = [ [[package]] name = "schemars_derive" -version = "0.8.15" +version = "0.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e85e2a16b12bdb763244c69ab79363d71db2b4b918a2def53f80b02e0574b13c" +checksum = "c767fd6fa65d9ccf9cf026122c1b555f2ef9a4f0cea69da4d7dbc3e258d30967" dependencies = [ "proc-macro2", "quote", @@ -4280,9 +4289,9 @@ dependencies = [ [[package]] name = "self_cell" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c309e515543e67811222dbc9e3dd7e1056279b782e1dacffe4242b718734fb6" +checksum = "e388332cd64eb80cd595a00941baf513caffae8dce9cfd0467fc9c66397dade6" [[package]] name = "semver" @@ -4295,9 +4304,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.190" +version = "1.0.192" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91d3c334ca1ee894a2c6f6ad698fe8c435b76d504b13d436f0685d648d6d96f7" +checksum = "bca2a08484b285dcb282d0f67b26cadc0df8b19f8c12502c13d966bf9482f001" dependencies = [ "serde_derive", ] @@ -4322,13 +4331,13 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.190" +version = "1.0.192" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67c5609f394e5c2bd7fc51efda478004ea80ef42fee983d5c67a65e34f32c0e3" +checksum = "d6c7207fbec9faa48073f3e3074cbe553af6ea512d7c21ba46e434e70ea9fbc1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -4344,9 +4353,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.107" +version = "1.0.108" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" +checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" dependencies = [ "itoa", "ryu", @@ -4495,9 +4504,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.1" +version = "1.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" +checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" [[package]] name = "smawk" @@ -4629,7 +4638,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -4651,9 +4660,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.38" +version = "2.0.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" +checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" dependencies = [ "proc-macro2", "quote", @@ -4721,13 +4730,13 @@ checksum = "094c9f64d6de9a8506b1e49b63a29333b37ed9e821ee04be694d431b3264c3c5" [[package]] name = "tempfile" -version = "3.8.0" +version = "3.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" +checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" dependencies = [ "cfg-if", "fastrand", - "redox_syscall 0.3.5", + "redox_syscall 0.4.1", "rustix", "windows-sys", ] @@ -4783,7 +4792,7 @@ checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -4863,9 +4872,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.33.0" +version = "1.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f38200e3ef7995e5ef13baec2f432a6da0aa9ac495b2c0e8f3b7eec2c92d653" +checksum = "d0c014766411e834f7af5b8f4cf46257aab4036ca95e9d2c144a10f59ad6f5b9" dependencies = [ "backtrace", "bytes", @@ -4892,13 +4901,13 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" +checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -4980,9 +4989,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.7.8" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" +checksum = "a1a195ec8c9da26928f773888e0742ca3ca1040c6cd859c919c9f59c1954ab35" dependencies = [ "serde", "serde_spanned", @@ -5001,11 +5010,11 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.19.15" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03" dependencies = [ - "indexmap 2.0.2", + "indexmap 2.1.0", "serde", "serde_spanned", "toml_datetime", @@ -5060,7 +5069,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -5268,7 +5277,7 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc" dependencies = [ - "getrandom 0.2.10", + "getrandom 0.2.11", "serde", ] @@ -5291,12 +5300,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] -name = "waker-fn" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" - -[[package]] name = "walkdir" version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5335,9 +5338,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" +checksum = "7daec296f25a1bae309c0cd5c29c4b260e510e6d813c286b19eaadf409d40fce" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -5345,24 +5348,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" +checksum = "e397f4664c0e4e428e8313a469aaa58310d302159845980fd23b0f22a847f217" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.37" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03" +checksum = "9afec9963e3d0994cac82455b2b3502b81a7f40f9a0d32181f7528d9f4b43e02" dependencies = [ "cfg-if", "js-sys", @@ -5372,9 +5375,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" +checksum = "5961017b3b08ad5f3fe39f1e79877f8ee7c23c5e5fd5eb80de95abc41f1f16b2" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -5382,28 +5385,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" +checksum = "c5353b8dab669f5e10f5bd76df26a9360c748f054f862ff5f3f8aae0c7fb3907" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" +checksum = "0d046c5d029ba91a1ed14da14dca44b68bf2f124cfbaf741c54151fdb3e0750b" [[package]] name = "web-sys" -version = "0.3.64" +version = "0.3.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" +checksum = "5db499c5f66323272151db0e666cd34f78617522fb0c1604d31a27c50c206a85" dependencies = [ "js-sys", "wasm-bindgen", @@ -5582,9 +5585,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "winnow" -version = "0.5.17" +version = "0.5.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3b801d0e0a6726477cc207f60162da452f3a95adb368399bef20a946e06f65c" +checksum = "829846f3e3db426d4cee4510841b71a8e58aa2a76b1132579487ae430ccd9c7b" dependencies = [ "memchr", ] @@ -5691,22 +5694,22 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.7.15" +version = "0.7.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81ba595b9f2772fbee2312de30eeb80ec773b4cb2f1e8098db024afadda6c06f" +checksum = "8cd369a67c0edfef15010f980c3cbe45d7f651deac2cd67ce097cd801de16557" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.15" +version = "0.7.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "772666c41fb6dceaf520b564b962d738a8e1a83b41bd48945f50837aed78bb1d" +checksum = "c2f140bda219a26ccc0cdb03dba58af72590c53b22642577d88a927bc5c87d6b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -5726,5 +5729,5 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] diff --git a/pkgs/development/libraries/libdeltachat/default.nix b/pkgs/development/libraries/libdeltachat/default.nix index 092a235d9fd..d62e8bf245c 100644 --- a/pkgs/development/libraries/libdeltachat/default.nix +++ b/pkgs/development/libraries/libdeltachat/default.nix @@ -30,13 +30,13 @@ let }; in stdenv.mkDerivation rec { pname = "libdeltachat"; - version = "1.128.0"; + version = "1.131.1"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-core-rust"; rev = "v${version}"; - hash = "sha256-kujPkKKobn4/J0rCdZfnlNZzGM0SUVtOWOhyDawYiqw="; + hash = "sha256-JXSZrlekvPVGKR+ritxk3Eru2DhtUN9UBtqUZ7G9/gg="; }; patches = [ diff --git a/pkgs/development/libraries/libdovi/default.nix b/pkgs/development/libraries/libdovi/default.nix index cf1a9a561f3..c70a217f6fc 100644 --- a/pkgs/development/libraries/libdovi/default.nix +++ b/pkgs/development/libraries/libdovi/default.nix @@ -5,9 +5,7 @@ , rust , stdenv }: -let - rustTargetPlatformSpec = rust.toRustTargetSpec stdenv.hostPlatform; -in + rustPlatform.buildRustPackage rec { pname = "libdovi"; version = "3.1.2"; @@ -28,19 +26,19 @@ rustPlatform.buildRustPackage rec { buildPhase = '' runHook preBuild - ${rust.envVars.setEnv} cargo cbuild -j $NIX_BUILD_CORES --release --frozen --prefix=${placeholder "out"} --target ${rustTargetPlatformSpec} + ${rust.envVars.setEnv} cargo cbuild -j $NIX_BUILD_CORES --release --frozen --prefix=${placeholder "out"} --target ${stdenv.hostPlatform.rust.rustcTarget} runHook postBuild ''; installPhase = '' runHook preInstall - ${rust.envVars.setEnv} cargo cinstall -j $NIX_BUILD_CORES --release --frozen --prefix=${placeholder "out"} --target ${rustTargetPlatformSpec} + ${rust.envVars.setEnv} cargo cinstall -j $NIX_BUILD_CORES --release --frozen --prefix=${placeholder "out"} --target ${stdenv.hostPlatform.rust.rustcTarget} runHook postInstall ''; checkPhase = '' runHook preCheck - ${rust.envVars.setEnv} cargo ctest -j $NIX_BUILD_CORES --release --frozen --prefix=${placeholder "out"} --target ${rustTargetPlatformSpec} + ${rust.envVars.setEnv} cargo ctest -j $NIX_BUILD_CORES --release --frozen --prefix=${placeholder "out"} --target ${stdenv.hostPlatform.rust.rustcTarget} runHook postCheck ''; diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix index 31b284861d1..63a8522bd07 100644 --- a/pkgs/development/libraries/libdrm/default.nix +++ b/pkgs/development/libraries/libdrm/default.nix @@ -1,15 +1,16 @@ { stdenv, lib, fetchurl, pkg-config, meson, ninja, docutils , libpthreadstubs, libpciaccess , withValgrind ? lib.meta.availableOn stdenv.hostPlatform valgrind-light, valgrind-light +, gitUpdater }: stdenv.mkDerivation rec { pname = "libdrm"; - version = "2.4.116"; + version = "2.4.117"; src = fetchurl { url = "https://dri.freedesktop.org/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-RsU/QHNeo9JtYUKX8VX2ExpRBiSiQnT2VPZGnKkFM5o="; + hash = "sha256-ooiNaePrHIp3rcCKdaYPuuAfDSCNJvA00aEuNiNhJCs="; }; outputs = [ "out" "dev" "bin" ]; @@ -29,6 +30,16 @@ stdenv.mkDerivation rec { "-Detnaviv=disabled" ]; + passthru = { + updateScript = gitUpdater { + url = "https://gitlab.freedesktop.org/mesa/drm.git"; + rev-prefix = "libdrm-"; + # Skip versions like libdrm-2_0_2 that happen to go last when + # sorted. + ignoredVersions = "_"; + }; + }; + meta = with lib; { homepage = "https://gitlab.freedesktop.org/mesa/drm"; downloadPage = "https://dri.freedesktop.org/libdrm/"; diff --git a/pkgs/development/libraries/libepc/default.nix b/pkgs/development/libraries/libepc/default.nix index 9755d0977c8..a2822eae8d5 100644 --- a/pkgs/development/libraries/libepc/default.nix +++ b/pkgs/development/libraries/libepc/default.nix @@ -1,30 +1,51 @@ -{ lib, stdenv, fetchurl, pkg-config, intltool, gtk-doc, glib, avahi, gnutls, libuuid, libsoup, gtk3, gnome }: +{ stdenv +, lib +, fetchurl +, autoreconfHook +, pkg-config +, intltool +, gtk-doc +, glib +, avahi +, gnutls +, libuuid +, libsoup +, gtk3 +, gnome +}: -let - avahiWithGtk = avahi.override { gtk3Support = true; }; -in stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libepc"; version = "0.4.6"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/libepc/${lib.versions.majorMinor finalAttrs.version}/libepc-${finalAttrs.version}.tar.xz"; sha256 = "1s3svb2slqjsrqfv50c2ymnqcijcxb5gnx6bfibwh9l5ga290n91"; }; + patches = [ + # Remove dependency that is only needed by uninstalled examples. + ./no-avahi-ui.patch + ]; + nativeBuildInputs = [ + autoreconfHook + gnome.gnome-common pkg-config intltool gtk-doc ]; + buildInputs = [ glib libuuid gtk3 ]; + propagatedBuildInputs = [ - avahiWithGtk + avahi gnutls libsoup ]; @@ -33,7 +54,7 @@ in stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { - packageName = pname; + packageName = "libepc"; versionPolicy = "odd-unstable"; }; }; @@ -45,4 +66,4 @@ in stdenv.mkDerivation rec { maintainers = teams.gnome.members; platforms = platforms.linux; }; -} +}) diff --git a/pkgs/development/libraries/libepc/no-avahi-ui.patch b/pkgs/development/libraries/libepc/no-avahi-ui.patch new file mode 100644 index 00000000000..4649ecbe27c --- /dev/null +++ b/pkgs/development/libraries/libepc/no-avahi-ui.patch @@ -0,0 +1,36 @@ +diff --git a/Makefile.am b/Makefile.am +index acf0d25..13022d1 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -32,8 +32,6 @@ noinst_PROGRAMS = \ + examples/lookup-resource \ + examples/service-browser \ + examples/simple-publisher \ +- examples/consumer-ui \ +- examples/publisher-ui \ + examples/server-credentials \ + $(TESTS) + TESTS = \ +@@ -155,10 +153,6 @@ examples_service_browser_LDADD = $(example_epc_libs) + examples_simple_publisher_CFLAGS = $(example_epc_cflags) + examples_simple_publisher_LDADD = $(example_epc_libs) + +-examples_consumer_ui_CFLAGS = $(example_epc_ui_cflags) $(AVAHI_UI_CFLAGS) +-examples_consumer_ui_LDADD = $(example_epc_ui_libs) $(AVAHI_UI_LIBS) +-examples_publisher_ui_CFLAGS = $(example_epc_ui_cflags) $(AVAHI_UI_CFLAGS) -rdynamic +-examples_publisher_ui_LDADD = $(example_epc_ui_libs) $(AVAHI_UI_LIBS) + examples_server_credentials_CFLAGS = $(example_epc_ui_cflags) + examples_server_credentials_LDADD = $(example_epc_ui_libs) + +diff --git a/configure.ac b/configure.ac +index d68bf94..89bd471 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -53,7 +53,6 @@ PKG_CHECK_EXISTS([$GIO_REQUIREMENT], + GIO=$GIO_REQUIREMENT], + [AC_MSG_RESULT([no])]) + +-PKG_CHECK_MODULES(AVAHI_UI, [avahi-ui-gtk3 >= 0.6]) + PKG_CHECK_MODULES(LIBEPC, [avahi-client >= 0.6 + avahi-glib >= 0.6 + glib-2.0 >= 2.36 diff --git a/pkgs/development/libraries/libepoxy/default.nix b/pkgs/development/libraries/libepoxy/default.nix index 6c7b5591429..cd98e2229fe 100644 --- a/pkgs/development/libraries/libepoxy/default.nix +++ b/pkgs/development/libraries/libepoxy/default.nix @@ -31,6 +31,15 @@ stdenv.mkDerivation rec { '' + lib.optionalString stdenv.isDarwin '' substituteInPlace src/dispatch_common.h --replace "PLATFORM_HAS_GLX 0" "PLATFORM_HAS_GLX 1" + '' + # cgl_core and cgl_epoxy_api fail in darwin sandbox and on Hydra (because it's headless?) + + lib.optionalString stdenv.isDarwin '' + substituteInPlace test/meson.build \ + --replace "[ 'cgl_epoxy_api', [ 'cgl_epoxy_api.c' ] ]," "" + '' + + lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) '' + substituteInPlace test/meson.build \ + --replace "[ 'cgl_core', [ 'cgl_core.c' ] ]," "" ''; outputs = [ "out" "dev" ]; @@ -55,15 +64,6 @@ stdenv.mkDerivation rec { env.NIX_CFLAGS_COMPILE = lib.optionalString (x11Support && !stdenv.isDarwin) ''-DLIBGL_PATH="${lib.getLib libGL}/lib"''; - # cgl_core and cgl_epoxy_api fail in darwin sandbox and on Hydra (because it's headless?) - preCheck = lib.optionalString stdenv.isDarwin '' - substituteInPlace ../test/meson.build \ - --replace "[ 'cgl_epoxy_api', [ 'cgl_epoxy_api.c' ] ]," "" - '' + lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) '' - substituteInPlace ../test/meson.build \ - --replace "[ 'cgl_core', [ 'cgl_core.c' ] ]," "" - ''; - doCheck = true; meta = with lib; { diff --git a/pkgs/development/libraries/libffi/default.nix b/pkgs/development/libraries/libffi/default.nix index 681f9cbfb22..5bfa335314f 100644 --- a/pkgs/development/libraries/libffi/default.nix +++ b/pkgs/development/libraries/libffi/default.nix @@ -34,12 +34,6 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-gcc-arch=generic" # no detection of -march= or -mtune= "--enable-pax_emutramp" - - # Causes issues in downstream packages which misuse ffi_closure_alloc - # Reenable once these issues are fixed and merged: - # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/6155 - # https://gitlab.gnome.org/GNOME/gobject-introspection/-/merge_requests/283 - "--disable-exec-static-tramp" ]; preCheck = '' diff --git a/pkgs/development/libraries/libglvnd/default.nix b/pkgs/development/libraries/libglvnd/default.nix index fa9562947f8..b7ccb7085fb 100644 --- a/pkgs/development/libraries/libglvnd/default.nix +++ b/pkgs/development/libraries/libglvnd/default.nix @@ -5,14 +5,14 @@ stdenv.mkDerivation rec { pname = "libglvnd"; - version = "1.6.0"; + version = "1.7.0"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "glvnd"; repo = "libglvnd"; rev = "v${version}"; - sha256 = "sha256-p/vLxagN9nCYw1JpUmZetgctQbrp3Wo33OVFrtvmnjQ="; + sha256 = "sha256-2U9JtpGyP4lbxtVJeP5GUgh5XthloPvFIw28+nldYx8="; }; nativeBuildInputs = [ autoreconfHook pkg-config python3 addOpenGLRunpath ]; @@ -69,6 +69,8 @@ stdenv.mkDerivation rec { changelog = "https://gitlab.freedesktop.org/glvnd/libglvnd/-/tags/v${version}"; license = with licenses; [ mit bsd1 bsd3 gpl3Only asl20 ]; platforms = platforms.unix; + # https://gitlab.freedesktop.org/glvnd/libglvnd/-/issues/212 + badPlatforms = [ lib.systems.inspect.platformPatterns.isStatic ]; maintainers = with maintainers; [ primeos ]; }; } diff --git a/pkgs/development/libraries/libgnome-games-support/2.0.nix b/pkgs/development/libraries/libgnome-games-support/2.0.nix index a5f1c2576b9..03166a423c3 100644 --- a/pkgs/development/libraries/libgnome-games-support/2.0.nix +++ b/pkgs/development/libraries/libgnome-games-support/2.0.nix @@ -3,6 +3,7 @@ , fetchurl , pkg-config , glib +, gobject-introspection , gtk4 , libgee , gettext @@ -24,6 +25,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gettext + gobject-introspection meson ninja pkg-config diff --git a/pkgs/development/libraries/libgnome-games-support/default.nix b/pkgs/development/libraries/libgnome-games-support/default.nix index e63d7f8fe65..edfd21a4696 100644 --- a/pkgs/development/libraries/libgnome-games-support/default.nix +++ b/pkgs/development/libraries/libgnome-games-support/default.nix @@ -2,6 +2,7 @@ , fetchurl , pkg-config , glib +, gobject-introspection , gtk3 , libgee , gettext @@ -23,6 +24,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gettext + gobject-introspection meson ninja pkg-config diff --git a/pkgs/development/libraries/libhugetlbfs/default.nix b/pkgs/development/libraries/libhugetlbfs/default.nix index ff83b1835b5..0f7859be9db 100644 --- a/pkgs/development/libraries/libhugetlbfs/default.nix +++ b/pkgs/development/libraries/libhugetlbfs/default.nix @@ -32,6 +32,9 @@ stdenv.mkDerivation rec { "EXEDIR=$(bin)/bin" "DOCDIR=$(doc)/share/doc/libhugetlbfs" "MANDIR=$(man)/share/man" + ] ++ lib.optionals (stdenv.buildPlatform.system != stdenv.hostPlatform.system) [ + # The ARCH logic defaults to querying `uname`, which will return build platform arch + "ARCH=${stdenv.hostPlatform.uname.processor}" ]; # Default target builds tests as well, and the tests want a static diff --git a/pkgs/development/libraries/libical/default.nix b/pkgs/development/libraries/libical/default.nix index 35ffc46ec61..243c26af8e5 100644 --- a/pkgs/development/libraries/libical/default.nix +++ b/pkgs/development/libraries/libical/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { pname = "libical"; - version = "3.0.16"; + version = "3.0.17"; outputs = [ "out" "dev" ]; # "devdoc" ]; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { owner = "libical"; repo = "libical"; rev = "v${version}"; - sha256 = "sha256-3D/0leI3LLKDFOXkKSrmMamLoaXdi/2Z4iPUXqgwtg8="; + sha256 = "sha256-GqPCjI40kkqNv9zTnLdJgZVBxS4eZRHl+k/BN9vGnDo="; }; strictDeps = true; @@ -105,6 +105,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/libical/libical"; description = "An Open Source implementation of the iCalendar protocols"; + changelog = "https://github.com/libical/libical/raw/v${version}/ReleaseNotes.txt"; license = licenses.mpl20; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/libimagequant/Cargo.lock b/pkgs/development/libraries/libimagequant/Cargo.lock index 8823a070b81..fdad112994a 100644 --- a/pkgs/development/libraries/libimagequant/Cargo.lock +++ b/pkgs/development/libraries/libimagequant/Cargo.lock @@ -76,16 +76,6 @@ dependencies = [ ] [[package]] -name = "crossbeam-channel" -version = "0.5.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" -dependencies = [ - "cfg-if", - "crossbeam-utils", -] - -[[package]] name = "crossbeam-deque" version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -135,9 +125,9 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.27" +version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010" +checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" dependencies = [ "crc32fast", "miniz_oxide", @@ -153,18 +143,11 @@ dependencies = [ ] [[package]] -name = "hermit-abi" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" - -[[package]] name = "imagequant" -version = "4.2.1" +version = "4.2.2" dependencies = [ "arrayvec", "lodepng", - "num_cpus", "once_cell", "rayon", "rgb", @@ -173,7 +156,7 @@ dependencies = [ [[package]] name = "imagequant-sys" -version = "4.0.2" +version = "4.0.3" dependencies = [ "bitflags", "imagequant", @@ -182,15 +165,15 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.147" +version = "0.2.149" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" +checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" [[package]] name = "lodepng" -version = "3.7.2" +version = "3.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0ad39f75bbaa4b10bb6f2316543632a8046a5bcf9c785488d79720b21f044f8" +checksum = "a3cdccd0cf57a5d456f0656ebcff72c2e19503287e1afbf3b84382812adc0606" dependencies = [ "crc32fast", "fallible_collections", @@ -218,16 +201,6 @@ dependencies = [ ] [[package]] -name = "num_cpus" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" -dependencies = [ - "hermit-abi", - "libc", -] - -[[package]] name = "once_cell" version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -235,9 +208,9 @@ checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "rayon" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" +checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" dependencies = [ "either", "rayon-core", @@ -245,14 +218,12 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" +checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" dependencies = [ - "crossbeam-channel", "crossbeam-deque", "crossbeam-utils", - "num_cpus", ] [[package]] diff --git a/pkgs/development/libraries/libimagequant/default.nix b/pkgs/development/libraries/libimagequant/default.nix index 5792170b9f0..f60a1c7cab7 100644 --- a/pkgs/development/libraries/libimagequant/default.nix +++ b/pkgs/development/libraries/libimagequant/default.nix @@ -1,17 +1,14 @@ { lib, stdenv, fetchFromGitHub, fetchurl, rust, rustPlatform, cargo-c, python3 }: -let - rustTargetPlatformSpec = rust.toRustTargetSpec stdenv.hostPlatform; -in rustPlatform.buildRustPackage rec { pname = "libimagequant"; - version = "4.2.1"; + version = "4.2.2"; src = fetchFromGitHub { owner = "ImageOptim"; repo = pname; rev = version; - hash = "sha256-a5TztgNFRV9BVERpHI33ZEYwfOR46F9FzmbquzwGq3k="; + hash = "sha256-cZgnJOmj+xJDcewsxH2Jp5AAnFZKVuYxKPtoGeN03g4="; }; cargoLock = { @@ -26,13 +23,13 @@ rustPlatform.buildRustPackage rec { postBuild = '' pushd imagequant-sys - ${rust.envVars.setEnv} cargo cbuild --release --frozen --prefix=${placeholder "out"} --target ${rustTargetPlatformSpec} + ${rust.envVars.setEnv} cargo cbuild --release --frozen --prefix=${placeholder "out"} --target ${stdenv.hostPlatform.rust.rustcTarget} popd ''; postInstall = '' pushd imagequant-sys - ${rust.envVars.setEnv} cargo cinstall --release --frozen --prefix=${placeholder "out"} --target ${rustTargetPlatformSpec} + ${rust.envVars.setEnv} cargo cinstall --release --frozen --prefix=${placeholder "out"} --target ${stdenv.hostPlatform.rust.rustcTarget} popd ''; diff --git a/pkgs/development/libraries/libime/default.nix b/pkgs/development/libraries/libime/default.nix index 72fb19fd5ab..d10020fa992 100644 --- a/pkgs/development/libraries/libime/default.nix +++ b/pkgs/development/libraries/libime/default.nix @@ -28,13 +28,13 @@ let in stdenv.mkDerivation rec { pname = "libime"; - version = "1.1.2"; + version = "1.1.3"; src = fetchFromGitHub { owner = "fcitx"; repo = "libime"; rev = version; - sha256 = "sha256-0+NVGxujFOJvxX+Tk4mVYsk2Nl7WK6hjl0oylrT6PXU="; + sha256 = "sha256-C34hcea0htc9ayytjqy/t08yA2xMC18sAkDc9PK/Hhc="; fetchSubmodules = true; }; diff --git a/pkgs/development/libraries/libiscsi/default.nix b/pkgs/development/libraries/libiscsi/default.nix index 806a9729c57..826593b9d66 100644 --- a/pkgs/development/libraries/libiscsi/default.nix +++ b/pkgs/development/libraries/libiscsi/default.nix @@ -11,6 +11,11 @@ stdenv.mkDerivation rec { sha256 = "0ajrkkg5awmi8m4b3mha7h07ylg18k252qprvk1sgq0qbyd66zy7"; }; + postPatch = '' + substituteInPlace lib/socket.c \ + --replace "void iscsi_decrement_iface_rr() {" "void iscsi_decrement_iface_rr(void) {" + ''; + nativeBuildInputs = [ autoreconfHook ]; # This problem is gone on libiscsi master. diff --git a/pkgs/development/libraries/libnsl/default.nix b/pkgs/development/libraries/libnsl/default.nix index 4f9d7d09caa..59e16071ce7 100644 --- a/pkgs/development/libraries/libnsl/default.nix +++ b/pkgs/development/libraries/libnsl/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libnsl"; - version = "2.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "thkukuk"; repo = pname; rev = "v${version}"; - sha256 = "sha256-f9kNzzR8baf5mLgrh+bKO/rBRZA5ZYc1tJdyLE7Bi1w="; + sha256 = "sha256-bCToqXVE4RZcoZ2eTNZcVHyzKlWyIpSAssQCOZcfmEA="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/development/libraries/libpfm/default.nix b/pkgs/development/libraries/libpfm/default.nix index 8618986195e..0598fd6451e 100644 --- a/pkgs/development/libraries/libpfm/default.nix +++ b/pkgs/development/libraries/libpfm/default.nix @@ -1,16 +1,30 @@ -{ lib, stdenv, fetchurl +{ lib +, stdenv +, fetchurl , enableShared ? !stdenv.hostPlatform.isStatic +, windows }: -stdenv.mkDerivation (rec { +stdenv.mkDerivation (finalAttrs: { version = "4.13.0"; pname = "libpfm"; src = fetchurl { - url = "mirror://sourceforge/perfmon2/libpfm4/${pname}-${version}.tar.gz"; + url = "mirror://sourceforge/perfmon2/libpfm4/libpfm-${finalAttrs.version}.tar.gz"; sha256 = "sha256-0YuXdkx1VSjBBR03bjNUXQ62DG6/hWgENoE/pbBMw9E="; }; + # Don't install libpfm.so on windows as it doesn't exist + # This target is created only if `ifeq ($(SYS),Linux)` passes + patches = [ ./fix-windows.patch ]; + + # Upstream uses "WINDOWS" instead of "Windows" which is incorrect + # See: https://github.com/NixOS/nixpkgs/pull/252982#discussion_r1314346216 + postPatch = '' + substituteInPlace config.mk examples/Makefile \ + --replace '($(SYS),WINDOWS)' '($(SYS),Windows)' + ''; + makeFlags = [ "PREFIX=${placeholder "out"}" "LDCONFIG=true" @@ -19,6 +33,9 @@ stdenv.mkDerivation (rec { ]; env.NIX_CFLAGS_COMPILE = "-Wno-error"; + env.CONFIG_PFMLIB_SHARED = if enableShared then "y" else "n"; + + buildInputs = lib.optional stdenv.hostPlatform.isWindows windows.libgnurx; meta = with lib; { description = "Helper library to program the performance monitoring events"; @@ -29,11 +46,7 @@ stdenv.mkDerivation (rec { (PMU) of modern processors. ''; license = licenses.gpl2; - maintainers = [ maintainers.pierron ]; - platforms = platforms.linux; + maintainers = with maintainers; [ pierron t4ccer ]; + platforms = platforms.linux ++ platforms.windows; }; -} // lib.optionalAttrs ( ! enableShared ) -{ - CONFIG_PFMLIB_SHARED = "n"; -} -) +}) diff --git a/pkgs/development/libraries/libpfm/fix-windows.patch b/pkgs/development/libraries/libpfm/fix-windows.patch new file mode 100644 index 00000000000..584b9ba6eb8 --- /dev/null +++ b/pkgs/development/libraries/libpfm/fix-windows.patch @@ -0,0 +1,18 @@ +diff --git a/lib/Makefile b/lib/Makefile +index 5ca71e3..cd0717f 100644 +--- a/lib/Makefile ++++ b/lib/Makefile +@@ -428,11 +428,13 @@ install: + -mkdir -p $(DESTDIR)$(LIBDIR) + $(INSTALL) -m 644 $(ALIBPFM) $(DESTDIR)$(LIBDIR) + ifeq ($(CONFIG_PFMLIB_SHARED),y) ++ifeq ($(SYS),Linux) + $(INSTALL) $(SLIBPFM) $(DESTDIR)$(LIBDIR) + cd $(DESTDIR)$(LIBDIR); $(LN) $(SLIBPFM) $(VLIBPFM) + cd $(DESTDIR)$(LIBDIR); $(LN) $(SLIBPFM) libpfm.$(SOLIBEXT) + -$(LDCONFIG) + endif ++endif + + tags: + $(CTAGS) -o $(TOPDIR)/tags --tag-relative=yes $(SRCS) $(INCDEP) diff --git a/pkgs/development/libraries/libqtav/default.nix b/pkgs/development/libraries/libqtav/default.nix index 4a17bd951aa..afae47c96d3 100644 --- a/pkgs/development/libraries/libqtav/default.nix +++ b/pkgs/development/libraries/libqtav/default.nix @@ -4,7 +4,6 @@ , extra-cmake-modules , qtbase , qtmultimedia -, qtquick1 , qttools , libGL , libX11 @@ -25,7 +24,6 @@ mkDerivation rec { buildInputs = [ qtbase qtmultimedia - qtquick1 libGL libX11 libass diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix index a9dc9f349ff..613f7d3a2b3 100644 --- a/pkgs/development/libraries/libressl/default.nix +++ b/pkgs/development/libraries/libressl/default.nix @@ -100,4 +100,9 @@ in { version = "3.7.3"; hash = "sha256-eUjIVqkMglvXJotvhWdKjc0lS65C4iF4GyTj+NwzXbM="; }; + + libressl_3_8 = generic { + version = "3.8.2"; + hash = "sha256-bUuNW7slofgzZjnlbsUIgFLUOpUlZpeoXEzpEyPCWVQ="; + }; } diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index a0843d4b2ef..7ba6f1963e7 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -15,7 +15,6 @@ , libobjc , rustPlatform , rustc -, rust , cargo-auditable-cargo-wrapper , gi-docgen , python3Packages @@ -106,7 +105,7 @@ stdenv.mkDerivation (finalAttrs: { "--enable-always-build-tests" ] ++ lib.optional stdenv.isDarwin "--disable-Bsymbolic" - ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "RUST_TARGET=${rust.toRustTarget stdenv.hostPlatform}"; + ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "RUST_TARGET=${stdenv.hostPlatform.rust.rustcTarget}"; doCheck = false; # all tests fail on libtool-generated rsvg-convert not being able to find coreutils diff --git a/pkgs/development/libraries/librttopo/default.nix b/pkgs/development/libraries/librttopo/default.nix index 690417c3e73..5d768db366d 100644 --- a/pkgs/development/libraries/librttopo/default.nix +++ b/pkgs/development/libraries/librttopo/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { description = "RT Topology Library"; homepage = "https://git.osgeo.org/gitea/rttopo/librttopo"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ dotlambda ]; + maintainers = with maintainers; teams.geospatial.members ++ [ dotlambda ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libshout/default.nix b/pkgs/development/libraries/libshout/default.nix index 75fc2afbf18..e9547cc2af9 100644 --- a/pkgs/development/libraries/libshout/default.nix +++ b/pkgs/development/libraries/libshout/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config +{ lib, stdenv, fetchurl, fetchpatch, pkg-config , libvorbis, libtheora, speex }: # need pkg-config so that libshout installs ${out}/lib/pkgconfig/shout.pc @@ -12,6 +12,19 @@ stdenv.mkDerivation rec { sha256 = "sha256-OcvU8O/f3cl1XYghfkf48tcQj6dn+dWKK6JqFtj3yRA="; }; + patches = [ + # Fixes building libshout with clang. Can be dropped once the following MR is merged: + # https://gitlab.xiph.org/xiph/icecast-libshout/-/merge_requests/4. + (fetchpatch { + url = "https://gitlab.xiph.org/xiph/icecast-libshout/-/commit/600fa105a799986efcccddfedfdfd3e9a1988cd0.patch"; + hash = "sha256-XjogfcQJBPZX9MPAbNJyXaFZNekL1pabvtTT7N+cz+s="; + }) + (fetchpatch { + url = "https://gitlab.xiph.org/xiph/icecast-libshout/-/commit/8ab2de318d55c9d0987ffae7d9b94b365af732c1.patch"; + hash = "sha256-0+Wp2Xu59ESCJfoDcwAJHuAJyzMsaBe7f8Js3/ren2g="; + }) + ]; + outputs = [ "out" "dev" "doc" ]; depsBuildBuild = [ pkg-config ]; diff --git a/pkgs/development/libraries/libsodium/default.nix b/pkgs/development/libraries/libsodium/default.nix index b4eeed32d59..b3a00d89a5d 100644 --- a/pkgs/development/libraries/libsodium/default.nix +++ b/pkgs/development/libraries/libsodium/default.nix @@ -13,18 +13,18 @@ stdenv.mkDerivation (finalAttrs: { outputs = [ "out" "dev" ]; - patches = lib.optional stdenv.targetPlatform.isMinGW ./mingw-no-fortify.patch; + patches = lib.optional stdenv.hostPlatform.isMinGW ./mingw-no-fortify.patch; - nativeBuildInputs = lib.optional stdenv.targetPlatform.isMinGW autoreconfHook; + nativeBuildInputs = lib.optional stdenv.hostPlatform.isMinGW autoreconfHook; separateDebugInfo = stdenv.isLinux && stdenv.hostPlatform.libc != "musl"; enableParallelBuilding = true; - hardeningDisable = lib.optional (stdenv.targetPlatform.isMusl && stdenv.targetPlatform.isx86_32) "stackprotector"; + hardeningDisable = lib.optional (stdenv.hostPlatform.isMusl && stdenv.hostPlatform.isx86_32) "stackprotector"; # FIXME: the hardeingDisable attr above does not seems effective, so # the need to disable stackprotector via configureFlags - configureFlags = lib.optional (stdenv.targetPlatform.isMusl && stdenv.targetPlatform.isx86_32) "--disable-ssp"; + configureFlags = lib.optional (stdenv.hostPlatform.isMusl && stdenv.hostPlatform.isx86_32) "--disable-ssp"; doCheck = true; diff --git a/pkgs/development/libraries/libspatialindex/default.nix b/pkgs/development/libraries/libspatialindex/default.nix index 455d42c3bb4..16c98abf441 100644 --- a/pkgs/development/libraries/libspatialindex/default.nix +++ b/pkgs/development/libraries/libspatialindex/default.nix @@ -32,6 +32,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Extensible spatial index library in C++"; homepage = "https://libspatialindex.org"; license = licenses.mit; + maintainers = teams.geospatial.members; platforms = platforms.unix; }; }) diff --git a/pkgs/development/libraries/libspatialite/default.nix b/pkgs/development/libraries/libspatialite/default.nix index 372f0c479c8..b8d1fe45e44 100644 --- a/pkgs/development/libraries/libspatialite/default.nix +++ b/pkgs/development/libraries/libspatialite/default.nix @@ -64,6 +64,6 @@ stdenv.mkDerivation rec { # They allow any of these license = with licenses; [ gpl2Plus lgpl21Plus mpl11 ]; platforms = platforms.unix; - maintainers = with maintainers; [ dotlambda ]; + maintainers = with maintainers; teams.geospatial.members ++ [ dotlambda ]; }; } diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix index 4fc6449230d..8055704b089 100644 --- a/pkgs/development/libraries/libtiff/default.nix +++ b/pkgs/development/libraries/libtiff/default.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation rec { pname = "libtiff"; - version = "4.5.1"; + version = "4.6.0"; src = fetchFromGitLab { owner = "libtiff"; repo = "libtiff"; rev = "v${version}"; - hash = "sha256-qQEthy6YhNAQmdDMyoCIvK8f3Tx25MgqhJZW74CB93E="; + hash = "sha256-qCg5qjsPPynCHIg0JsPJldwVdcYkI68zYmyNAKUCoyw="; }; patches = [ diff --git a/pkgs/development/libraries/libtiff/headers.patch b/pkgs/development/libraries/libtiff/headers.patch index e0ef9f3478a..933e06f3232 100644 --- a/pkgs/development/libraries/libtiff/headers.patch +++ b/pkgs/development/libraries/libtiff/headers.patch @@ -1,9 +1,8 @@ -diff --git i/libtiff/Makefile.am w/libtiff/Makefile.am -index 44522b62..d66e5948 100644 +export private headers for freeimage --- i/libtiff/Makefile.am +++ w/libtiff/Makefile.am @@ -36,8 +36,12 @@ EXTRA_DIST = \ - tiffconf.h.cmake.in + tif_win32_versioninfo.rc libtiffinclude_HEADERS = \ + tif_config.h \ diff --git a/pkgs/development/libraries/libtiff/rename-version.patch b/pkgs/development/libraries/libtiff/rename-version.patch index ddd33ad4904..04fa1bfc88c 100644 --- a/pkgs/development/libraries/libtiff/rename-version.patch +++ b/pkgs/development/libraries/libtiff/rename-version.patch @@ -1,3 +1,4 @@ +fix case-insensitive build --- a/Makefile.am +++ b/Makefile.am @@ -34,7 +34,7 @@ docfiles = \ @@ -6,15 +7,15 @@ TODO \ - VERSION + VERSION.txt - + EXTRA_DIST = \ - cmake \ -@@ -61,7 +61,7 @@ SUBDIRS = port libtiff tools build contrib test doc - + placeholder.h \ +@@ -68,7 +68,7 @@ NEW_LIBTIFF_RELEASE_DATE=$(shell date +"%Y%m%d") release: - (rm -f $(top_srcdir)/RELEASE-DATE && echo $(LIBTIFF_RELEASE_DATE) > $(top_srcdir)/RELEASE-DATE) + @(echo --- Setting release date to $(NEW_LIBTIFF_RELEASE_DATE) and release version to $(LIBTIFF_VERSION) ---) + (rm -f $(top_srcdir)/RELEASE-DATE && echo $(NEW_LIBTIFF_RELEASE_DATE) > $(top_srcdir)/RELEASE-DATE) - (rm -f $(top_srcdir)/VERSION && echo $(LIBTIFF_VERSION) > $(top_srcdir)/VERSION) -+ (rm -f $(top_srcdir)/VERSION.txt && echo $(LIBTIFF_VERSION) > $(top_srcdir)/VERSION.txt) - (rm -f $(top_srcdir)/libtiff/tiffvers.h && sed 's,LIBTIFF_VERSION,$(LIBTIFF_VERSION),;s,LIBTIFF_RELEASE_DATE,$(LIBTIFF_RELEASE_DATE),;s,LIBTIFF_MAJOR_VERSION,$(LIBTIFF_MAJOR_VERSION),;s,LIBTIFF_MINOR_VERSION,$(LIBTIFF_MINOR_VERSION),;s,LIBTIFF_MICRO_VERSION,$(LIBTIFF_MICRO_VERSION),' $(top_srcdir)/libtiff/tiffvers.h.in > $(top_srcdir)/libtiff/tiffvers.h) - ++ (rm -f $(top_srcdir)/VERSION && echo $(LIBTIFF_VERSION) > $(top_srcdir)/VERSION.txt) + (rm -f $(top_builddir)/libtiff/tiffvers.h && sed 's,LIBTIFF_VERSION,$(LIBTIFF_VERSION),;s,LIBTIFF_RELEASE_DATE,$(NEW_LIBTIFF_RELEASE_DATE),;s,LIBTIFF_MAJOR_VERSION,$(LIBTIFF_MAJOR_VERSION),;s,LIBTIFF_MINOR_VERSION,$(LIBTIFF_MINOR_VERSION),;s,LIBTIFF_MICRO_VERSION,$(LIBTIFF_MICRO_VERSION),' $(top_srcdir)/libtiff/tiffvers.h.in > $(top_builddir)/libtiff/tiffvers.h && sed -i 's,@,,g' $(top_builddir)/libtiff/tiffvers.h) + pkgconfigdir = $(libdir)/pkgconfig diff --git a/pkgs/development/libraries/liburing/default.nix b/pkgs/development/libraries/liburing/default.nix index 5779389dda1..a42aab3d59e 100644 --- a/pkgs/development/libraries/liburing/default.nix +++ b/pkgs/development/libraries/liburing/default.nix @@ -1,25 +1,15 @@ -{ lib, stdenv, fetchgit, fetchpatch }: +{ lib, stdenv, fetchgit }: stdenv.mkDerivation rec { pname = "liburing"; - version = "2.4"; + version = "2.5"; src = fetchgit { url = "http://git.kernel.dk/${pname}"; rev = "liburing-${version}"; - sha256 = "sha256-vbe9uh9AqXyPkzwD6zHoHH3JMeAJEl2FSGzny1T7diM="; + sha256 = "sha256-hPyEZ0P1rfos53OCNd2OYFiqmv6TgpWaj5/xPLccCvM="; }; - patches = [ - # Pull upstream fix for parallel build failures: - # https://github.com/axboe/liburing/pull/891 - (fetchpatch { - name = "parallel.patch"; - url = "https://github.com/axboe/liburing/commit/c34dca74854cb6e7f2b09affa2a4ab0145e62371.patch"; - hash = "sha256-RZSgHdQy5d7mXtMvkMyr+/kMhp1w+S5v9cqk5NSii5o="; - }) - ]; - separateDebugInfo = true; enableParallelBuilding = true; # Upstream's configure script is not autoconf generated, but a hand written one. diff --git a/pkgs/development/libraries/libusb1/default.nix b/pkgs/development/libraries/libusb1/default.nix index 326ee302815..1f768a2cb26 100644 --- a/pkgs/development/libraries/libusb1/default.nix +++ b/pkgs/development/libraries/libusb1/default.nix @@ -4,7 +4,7 @@ , fetchpatch , autoreconfHook , pkg-config -, enableUdev ? stdenv.isLinux && !stdenv.targetPlatform.isStatic +, enableUdev ? stdenv.isLinux && !stdenv.hostPlatform.isStatic , udev , libobjc , IOKit diff --git a/pkgs/development/libraries/libusbsio/default.nix b/pkgs/development/libraries/libusbsio/default.nix index 1982311919b..090683898a1 100644 --- a/pkgs/development/libraries/libusbsio/default.nix +++ b/pkgs/development/libraries/libusbsio/default.nix @@ -1,7 +1,13 @@ -{ lib, stdenv, fetchzip, pkg-config, libusb1, systemdMinimal }: -let - binDirPrefix = if stdenv.isDarwin then "osx_" else "linux_"; -in +{ lib +, stdenv +, fetchzip +, pkg-config +, fixDarwinDylibNames +, libusb1 +, systemdMinimal +, darwin +}: + stdenv.mkDerivation rec { pname = "libusbsio"; version = "2.1.11"; @@ -15,15 +21,30 @@ stdenv.mkDerivation rec { rm -r bin/* ''; - nativeBuildInputs = [ pkg-config ]; + makeFlags = [ + "CC=${stdenv.cc.targetPrefix}cc" + "BINDIR=" + ]; + + nativeBuildInputs = [ + pkg-config + ] ++ lib.optionals stdenv.isDarwin [ + fixDarwinDylibNames + ]; + buildInputs = [ libusb1 + ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + AppKit + CoreFoundation + IOKit + ]) ++ lib.optionals stdenv.isLinux [ systemdMinimal # libudev ]; installPhase = '' runHook preInstall - install -D bin/${binDirPrefix}${stdenv.hostPlatform.parsed.cpu.name}/libusbsio${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/libusbsio${stdenv.hostPlatform.extensions.sharedLibrary} + install -D bin/libusbsio${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/libusbsio${stdenv.hostPlatform.extensions.sharedLibrary} runHook postInstall ''; diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix index 250b09ecee5..d8b7cbdab52 100644 --- a/pkgs/development/libraries/libuv/default.nix +++ b/pkgs/development/libraries/libuv/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchFromGitHub +, fetchpatch , autoconf , automake , libtool @@ -33,6 +34,15 @@ stdenv.mkDerivation (finalAttrs: { sha256 = "sha256-Lrsyh4qd3OkTw1cSPfahzfSGNt6+pRN1X21iiv1SsFo="; }; + patches = [ + # Disable io_uring close on selected kernels. Remove on next release + # https://github.com/libuv/libuv/pull/4141 + (fetchpatch { + url = "https://github.com/libuv/libuv/commit/c811169f91b2101f7302e96de3d2dc366ade3a25.patch"; + hash = "sha256-7vk6XGXwJcwYUQPqIJ3JPd/fPIGrjE5WRDSJCMQfKeU="; + }) + ]; + outputs = [ "out" "dev" ]; postPatch = let @@ -115,7 +125,7 @@ stdenv.mkDerivation (finalAttrs: { description = "A multi-platform support library with a focus on asynchronous I/O"; homepage = "https://libuv.org/"; changelog = "https://github.com/libuv/libuv/blob/v${finalAttrs.version}/ChangeLog"; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ marsam ]; platforms = platforms.all; license = with licenses; [ mit isc bsd2 bsd3 cc-by-40 ]; }; diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix index 7796ec25158..43fe69af2b0 100644 --- a/pkgs/development/libraries/libva/default.nix +++ b/pkgs/development/libraries/libva/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "libva" + lib.optionalString minimal "-minimal"; - version = "2.19.0"; + version = "2.20.0"; src = fetchFromGitHub { owner = "intel"; repo = "libva"; rev = version; - sha256 = "sha256-M6mAHvGl4d9EqdkDBSxSbpZUCUcrkpnf+hfo16L3eHs="; + sha256 = "sha256-ENAsytjqvS8xHZyZLPih3bzBgQ1f/j+s3dWZs1GTWHs="; }; outputs = [ "dev" "out" ]; diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index c36e3116dad..4c3740e4ba7 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -155,16 +155,12 @@ stdenv.mkDerivation rec { src/storage/storage_backend_disk.c \ src/storage/storage_util.c '' + lib.optionalString isDarwin '' - sed -i '/qemucapabilitiestest/d' tests/meson.build - sed -i '/vircryptotest/d' tests/meson.build - sed -i '/domaincapstest/d' tests/meson.build + # Darwin doesn’t support -fsemantic-interposition, but the problem doesn’t seem to affect Mach-O. + # See https://gitlab.com/libvirt/libvirt/-/merge_requests/235 + sed -i "s/not supported_cc_flags.contains('-fsemantic-interposition')/false/" meson.build sed -i '/qemufirmwaretest/d' tests/meson.build sed -i '/qemuvhostusertest/d' tests/meson.build sed -i '/qemuxml2xmltest/d' tests/meson.build - '' + lib.optionalString (isDarwin && isx86_64) '' - sed -i '/qemucaps2xmltest/d' tests/meson.build - sed -i '/qemuhotplugtest/d' tests/meson.build - sed -i '/virnetdaemontest/d' tests/meson.build ''; strictDeps = true; diff --git a/pkgs/development/libraries/libvterm-neovim/default.nix b/pkgs/development/libraries/libvterm-neovim/default.nix index 27ce41d20f6..0e92d28046a 100644 --- a/pkgs/development/libraries/libvterm-neovim/default.nix +++ b/pkgs/development/libraries/libvterm-neovim/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "libvterm-neovim"; # Releases are not tagged, look at commit history to find latest release - version = "0.3.2"; + version = "0.3.3"; src = fetchurl { - url = "https://www.leonerd.org.uk/code/libvterm/libvterm-${version}.tar.gz"; - sha256 = "sha256-ketQiAafTm7atp4UxCEvbaAZLmVpWVbcBIAWoNq4vPY="; + url = "https://launchpad.net/libvterm/trunk/v${lib.versions.majorMinor version}/+download/libvterm-${version}.tar.gz"; + hash = "sha256-CRVvQ90hKL00fL7r5Q2aVx0yxk4M8Y0hEZeUav9yJuA="; }; nativeBuildInputs = [ perl libtool ]; diff --git a/pkgs/development/libraries/libwacom/default.nix b/pkgs/development/libraries/libwacom/default.nix index c03dd99a125..254769349b1 100644 --- a/pkgs/development/libraries/libwacom/default.nix +++ b/pkgs/development/libraries/libwacom/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { pname = "libwacom"; - version = "2.7.0"; + version = "2.8.0"; outputs = [ "out" "dev" ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { owner = "linuxwacom"; repo = "libwacom"; rev = "libwacom-${version}"; - sha256 = "sha256-NNfhZMshM5U/EfJHuNgkDe5NEkEGKtJ56vSpXyGf/xw="; + hash = "sha256-VjFZBlOIG1L4dXPJ8DWxrbfVqdQC+X7zVXFryo43FFc="; }; postPatch = '' diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index ea0059e34b6..173cc2016e5 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -1,8 +1,8 @@ -{ stdenv, lib, fetchurl, fetchpatch +{ stdenv, lib, fetchurl, fetchpatch, buildPackages , meson, pkg-config, ninja , intltool, bison, flex, file, python3Packages, wayland-scanner , expat, libdrm, xorg, wayland, wayland-protocols, openssl -, llvmPackages_15, libffi, libomxil-bellagio, libva-minimal +, llvmPackages_16, libffi, libomxil-bellagio, libva-minimal , libelf, libvdpau , libglvnd, libunwind, lm_sensors , vulkan-loader, glslang @@ -64,10 +64,8 @@ , enableOSMesa ? stdenv.isLinux , enableOpenCL ? stdenv.isLinux && stdenv.isx86_64 , enablePatentEncumberedCodecs ? true -, libclc , jdupes , rustc -, rust-bindgen , spirv-llvm-translator , zstd , directx-headers @@ -95,13 +93,13 @@ let withLibdrm = lib.meta.availableOn stdenv.hostPlatform libdrm; - llvmPackages = llvmPackages_15; + llvmPackages = llvmPackages_16; # Align all the Mesa versions used. Required to prevent explosions when # two different LLVMs are loaded in the same process. # FIXME: these should really go into some sort of versioned LLVM package set - rust-bindgen' = rust-bindgen.override { - rust-bindgen-unwrapped = rust-bindgen.unwrapped.override { - clang = llvmPackages.clang; + rust-bindgen' = buildPackages.rust-bindgen.override { + rust-bindgen-unwrapped = buildPackages.rust-bindgen.unwrapped.override { + clang = buildPackages.llvmPackages_15.clang; }; }; spirv-llvm-translator' = spirv-llvm-translator.override { @@ -202,7 +200,8 @@ self = stdenv.mkDerivation { "-Dglvnd=true" # Enable RT for Intel hardware - "-Dintel-clc=enabled" + # https://gitlab.freedesktop.org/mesa/mesa/-/issues/9080 + (lib.mesonEnable "intel-clc" (stdenv.buildPlatform == stdenv.hostPlatform)) ] ++ lib.optionals enableOpenCL [ # Clover, old OpenCL frontend "-Dgallium-opencl=icd" @@ -218,26 +217,29 @@ self = stdenv.mkDerivation { ++ lib.optional (vulkanLayers != []) "-D vulkan-layers=${builtins.concatStringsSep "," vulkanLayers}"; buildInputs = with xorg; [ - expat llvmPackages.libllvm libglvnd xorgproto + expat glslang llvmPackages.libllvm libglvnd xorgproto libX11 libXext libxcb libXt libXfixes libxshmfence libXrandr libffi libvdpau libelf libXvMC libpthreadstubs openssl /*or another sha1 provider*/ zstd libunwind + python3Packages.python # for shebang ] ++ lib.optionals haveWayland [ wayland wayland-protocols ] ++ lib.optionals stdenv.isLinux [ libomxil-bellagio libva-minimal udev lm_sensors ] - ++ lib.optionals enableOpenCL [ libclc llvmPackages.clang llvmPackages.clang-unwrapped rustc rust-bindgen' spirv-llvm-translator' ] + ++ lib.optionals enableOpenCL [ llvmPackages.libclc llvmPackages.clang llvmPackages.clang-unwrapped spirv-llvm-translator' ] ++ lib.optional withValgrind valgrind-light ++ lib.optional haveZink vulkan-loader ++ lib.optional haveDozen directx-headers; - depsBuildBuild = [ pkg-config ]; + depsBuildBuild = [ pkg-config ] + ++ lib.optional enableOpenCL buildPackages.stdenv.cc; nativeBuildInputs = [ meson pkg-config ninja intltool bison flex file python3Packages.python python3Packages.mako python3Packages.ply jdupes glslang - ] ++ lib.optional haveWayland wayland-scanner; + ] ++ lib.optionals enableOpenCL [ rust-bindgen' rustc ] + ++ lib.optional haveWayland wayland-scanner; propagatedBuildInputs = with xorg; [ libXdamage libXxf86vm @@ -320,6 +322,9 @@ self = stdenv.mkDerivation { fi done + # Don't depend on build python + patchShebangs --host --update $out/bin/* + # NAR doesn't support hard links, so convert them to symlinks to save space. jdupes --hard-links --link-soft --recurse "$drivers" diff --git a/pkgs/development/libraries/microsoft-gsl/default.nix b/pkgs/development/libraries/microsoft-gsl/default.nix index f0bd76ab4fb..298aec48db7 100644 --- a/pkgs/development/libraries/microsoft-gsl/default.nix +++ b/pkgs/development/libraries/microsoft-gsl/default.nix @@ -20,6 +20,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ gtest ]; + # error: unsafe buffer access + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-unsafe-buffer-usage"; + doCheck = true; meta = with lib; { diff --git a/pkgs/development/libraries/minizip/default.nix b/pkgs/development/libraries/minizip/default.nix index 5619fe7039e..74493a06b52 100644 --- a/pkgs/development/libraries/minizip/default.nix +++ b/pkgs/development/libraries/minizip/default.nix @@ -1,9 +1,19 @@ -{ lib, stdenv, zlib, autoreconfHook }: +{ lib, stdenv, zlib, autoreconfHook, fetchpatch }: stdenv.mkDerivation { pname = "minizip"; inherit (zlib) src version; + patches = [ + (fetchpatch { + name = "CVE-2023-45853.patch"; + url = "https://github.com/madler/zlib/commit/73331a6a0481067628f065ffe87bb1d8f787d10c.patch"; + hash = "sha256-yayfe1g9HsvgMN28WF/MYkH7dGMX4PsK53FcnfL3InM="; + }) + ]; + + patchFlags = [ "-p3" ]; + nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ zlib ]; diff --git a/pkgs/development/libraries/monocypher/default.nix b/pkgs/development/libraries/monocypher/default.nix index 7ce84cbba83..b37cfffabc0 100644 --- a/pkgs/development/libraries/monocypher/default.nix +++ b/pkgs/development/libraries/monocypher/default.nix @@ -2,23 +2,13 @@ stdenv.mkDerivation rec { pname = "monocypher"; - version = "3.1.3"; + version = "4.0.2"; src = fetchurl { url = "https://monocypher.org/download/monocypher-${version}.tar.gz"; - hash = "sha256-tEK1d98o+MNsqgHZrpARtd2ccX2UvlIBaKBONtf1AW4="; + hash = "sha256-ONBxeXOMDJBnfbo863p7hJa8/qdYuhpT6AP+0wrgh5w="; }; - patches = [ - # Fix cross-compilation - (fetchpatch { - url = "https://github.com/LoupVaillant/Monocypher/commit/376715e1c0ebb375e50dfa757bc89486c9a7b404.patch"; - hash = "sha256-tuwSUaU4w+jkaj10ChMgUmOQmoKYnv5JgJ1og8EXxFk="; - }) - ]; - - makeFlags = [ "AR:=$(AR)" "CC:=$(CC)" ]; - installFlags = [ "PREFIX=$(out)" ]; doCheck = true; diff --git a/pkgs/development/libraries/mtxclient/default.nix b/pkgs/development/libraries/mtxclient/default.nix index dcba45f41c3..13816faefce 100644 --- a/pkgs/development/libraries/mtxclient/default.nix +++ b/pkgs/development/libraries/mtxclient/default.nix @@ -61,6 +61,6 @@ stdenv.mkDerivation rec { platforms = platforms.all; # Should be fixable if a higher clang version is used, see: # https://github.com/NixOS/nixpkgs/pull/85922#issuecomment-619287177 - broken = stdenv.targetPlatform.isDarwin; + broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/development/libraries/multipart-parser-c/default.nix b/pkgs/development/libraries/multipart-parser-c/default.nix index 45b0abdee71..89665f2efc9 100644 --- a/pkgs/development/libraries/multipart-parser-c/default.nix +++ b/pkgs/development/libraries/multipart-parser-c/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/lib - mv lib*${stdenv.targetPlatform.extensions.sharedLibrary} $out/lib/ + mv lib*${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/ mkdir -p $out/include mv *.h $out/include/ diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix index cb8333704ff..9c1c8b422a9 100644 --- a/pkgs/development/libraries/ncurses/default.nix +++ b/pkgs/development/libraries/ncurses/default.nix @@ -2,6 +2,7 @@ , stdenv , fetchurl , buildPackages +, ncurses , pkg-config , abiVersion ? "6" , enableStatic ? stdenv.hostPlatform.isStatic @@ -48,20 +49,20 @@ stdenv.mkDerivation (finalAttrs: { "/usr/share/terminfo" # upstream default, probably all FHS-based distros "/run/current-system/sw/share/terminfo" # NixOS ]}" + ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ + "--with-build-cc=${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}cc" ]; # Only the C compiler, and explicitly not C++ compiler needs this flag on solaris: CFLAGS = lib.optionalString stdenv.isSunOS "-D_XOPEN_SOURCE_EXTENDED"; strictDeps = true; - depsBuildBuild = [ - buildPackages.stdenv.cc - ]; nativeBuildInputs = [ pkg-config ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ - buildPackages.ncurses + # for `tic`, build already depends on for build `cc` so it's weird the build doesn't just build `tic`. + ncurses ]; buildInputs = lib.optional (mouseSupport && stdenv.isLinux) gpm; diff --git a/pkgs/development/libraries/ntl/default.nix b/pkgs/development/libraries/ntl/default.nix index 9335bec35ce..8fa37141628 100644 --- a/pkgs/development/libraries/ntl/default.nix +++ b/pkgs/development/libraries/ntl/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { "TUNE=${ if tune then "auto" - else if stdenv.targetPlatform.isx86 then + else if stdenv.hostPlatform.isx86 then "x86" # "chooses options that should be well suited for most x86 platforms" else "generic" # "chooses options that should be OK for most platforms" diff --git a/pkgs/development/libraries/omorfi/default.nix b/pkgs/development/libraries/omorfi/default.nix index d6d0f1741d1..6002ea46467 100644 --- a/pkgs/development/libraries/omorfi/default.nix +++ b/pkgs/development/libraries/omorfi/default.nix @@ -3,6 +3,7 @@ , autoreconfHook , cg3 , fetchFromGitHub +, fetchpatch , hfst , hfst-ospell , icu @@ -24,6 +25,16 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-UoqdwNWCNOPX6u1YBlnXUcB/fmcvcy/HXbYciVrMBOY="; }; + patches = [ + # allow building with python311. + # patch is incorporated upstream and should be removed on the next update + (fetchpatch { + name = "python311.patch"; + url = "https://github.com/flammie/omorfi/commit/9736452ae6624060dbea0876a722c3731e776357.patch"; + hash = "sha256-Q4fi5HMmO0fq8YI833vgv2EYp//9Um/xFoRk28WrUMk="; + }) + ]; + # Fix for omorfi-hyphenate.sh file not found error postInstall = '' ln -s $out/share/omorfi/{omorfi.hyphenate-rules.hfst,omorfi.hyphenate.hfst} diff --git a/pkgs/development/libraries/oniguruma/default.nix b/pkgs/development/libraries/oniguruma/default.nix index 3062c3cb4e1..a1a9dc87573 100644 --- a/pkgs/development/libraries/oniguruma/default.nix +++ b/pkgs/development/libraries/oniguruma/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "oniguruma"; - version = "6.9.8"; + version = "6.9.9"; # Note: do not use fetchpatch or fetchFromGitHub to keep this package available in __bootPackages src = fetchurl { url = "https://github.com/kkos/oniguruma/releases/download/v${version}/onig-${version}.tar.gz"; - sha256 = "sha256-KM1iwUZGI8eRBWX7HMqqAQSy/osSvNZG6B9ztHU1IT4="; + sha256 = "sha256-YBYr07n8b0iG1MegeSX/03QWdzL1Xc6MSRv9nNgYps8="; }; outputs = [ "dev" "lib" "out" ]; diff --git a/pkgs/development/libraries/onnxruntime/default.nix b/pkgs/development/libraries/onnxruntime/default.nix index 4a9ee61f561..7a8b8570f62 100644 --- a/pkgs/development/libraries/onnxruntime/default.nix +++ b/pkgs/development/libraries/onnxruntime/default.nix @@ -17,7 +17,7 @@ , microsoft-gsl , iconv , gtest -, protobuf3_21 +, protobuf_21 , pythonSupport ? true }: @@ -92,7 +92,7 @@ stdenv.mkDerivation rec { cmake pkg-config python3Packages.python - protobuf3_21 + protobuf_21 ] ++ lib.optionals pythonSupport (with python3Packages; [ setuptools wheel @@ -154,6 +154,13 @@ stdenv.mkDerivation rec { "-Donnxruntime_ENABLE_PYTHON=ON" ]; + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = toString [ + "-Wno-error=deprecated-declarations" + "-Wno-error=unused-but-set-variable" + ]; + }; + doCheck = true; postPatch = '' @@ -177,7 +184,7 @@ stdenv.mkDerivation rec { ''; passthru = { - protobuf = protobuf3_21; + protobuf = protobuf_21; tests = lib.optionalAttrs pythonSupport { python = python3Packages.onnxruntime; }; diff --git a/pkgs/development/libraries/opencore-amr/default.nix b/pkgs/development/libraries/opencore-amr/default.nix index 26b2715658b..38a50b75027 100644 --- a/pkgs/development/libraries/opencore-amr/default.nix +++ b/pkgs/development/libraries/opencore-amr/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "opencore-amr"; - version = "0.1.5"; + version = "0.1.6"; src = fetchurl { - url = "https://vorboss.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${version}.tar.gz"; - sha256 = "0hfk9khz3by0119h3jdwgdfd7jgkdbzxnmh1wssvylgnsnwnq01c"; + url = "mirror://sourceforge/opencore-amr/opencore-amr/opencore-amr-${version}.tar.gz"; + hash = "sha256-SD60BhCI4rNLNY5HVAtdSVqWzUaONhBQ+uYVsYCdxKE="; }; meta = { diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index 037192d871e..e3f458d0d73 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -1,8 +1,9 @@ { lib, stdenv , fetchFromGitHub , fetchpatch +, callPackage , cmake, pkg-config, unzip, zlib, pcre, hdf5 -, glog, boost, gflags, protobuf3_21 +, glog, boost, gflags, protobuf_21 , config , enableJPEG ? true, libjpeg @@ -14,8 +15,7 @@ , enableOpenblas ? true, openblas, blas, lapack , enableContrib ? true -, enableCuda ? config.cudaSupport && - stdenv.hostPlatform.isx86_64 +, enableCuda ? config.cudaSupport , cudaPackages ? { } , enableUnfree ? false , enableIpp ? false @@ -186,7 +186,7 @@ stdenv.mkDerivation { buildInputs = [ zlib pcre hdf5 glog boost gflags ] - ++ lib.optional useSystemProtobuf protobuf3_21 + ++ lib.optional useSystemProtobuf protobuf_21 ++ lib.optional enablePython pythonPackages.python ++ lib.optional enableGtk2 gtk2 ++ lib.optional enableGtk3 gtk3 @@ -289,7 +289,11 @@ stdenv.mkDerivation { hardeningDisable = [ "bindnow" "relro" ]; - passthru = lib.optionalAttrs enablePython { pythonPath = []; }; + passthru = lib.optionalAttrs enablePython { pythonPath = []; } // { + tests = lib.optionalAttrs enableCuda { + no-libstdcxx-errors = callPackage ./libstdcxx-test.nix { attrName = "opencv3"; }; + }; + }; meta = with lib; { description = "Open Computer Vision Library with more than 500 algorithms"; diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix index 68099a57c63..06360449c1b 100644 --- a/pkgs/development/libraries/opencv/4.x.nix +++ b/pkgs/development/libraries/opencv/4.x.nix @@ -11,7 +11,7 @@ , hdf5 , boost , gflags -, protobuf3_21 +, protobuf_21 , config , ocl-icd , buildPackages @@ -37,12 +37,11 @@ , blas , enableContrib ? true -, enableCuda ? config.cudaSupport && stdenv.hostPlatform.isx86_64 +, enableCuda ? config.cudaSupport , enableCublas ? enableCuda , enableCudnn ? false # NOTE: CUDNN has a large impact on closure size so we disable it by default , enableCufft ? enableCuda , cudaPackages ? {} -, symlinkJoin , nvidia-optical-flow-sdk , enableLto ? true @@ -83,11 +82,16 @@ , Accelerate , bzip2 , callPackage -}: +}@inputs: let version = "4.7.0"; + # It's necessary to consistently use backendStdenv when building with CUDA + # support, otherwise we get libstdc++ errors downstream + stdenv = throw "Use effectiveStdenv instead"; + effectiveStdenv = if enableCuda then cudaPackages.backendStdenv else inputs.stdenv; + src = fetchFromGitHub { owner = "opencv"; repo = "opencv"; @@ -121,11 +125,11 @@ let sha256 = "1msbkc3zixx61rcg6a04i1bcfhw1phgsrh93glq1n80hgsk3nbjq"; } + "/ippicv"; files = let name = platform: "ippicv_2019_${platform}_general_20180723.tgz"; in - if stdenv.hostPlatform.system == "x86_64-linux" then + if effectiveStdenv.hostPlatform.system == "x86_64-linux" then { ${name "lnx_intel64"} = "c0bd78adb4156bbf552c1dfe90599607"; } - else if stdenv.hostPlatform.system == "i686-linux" then + else if effectiveStdenv.hostPlatform.system == "i686-linux" then { ${name "lnx_ia32"} = "4f38432c30bfd6423164b7a24bbc98a0"; } - else if stdenv.hostPlatform.system == "x86_64-darwin" then + else if effectiveStdenv.hostPlatform.system == "x86_64-darwin" then { ${name "mac_intel64"} = "fe6b2bb75ae0e3f19ad3ae1a31dfa4a2"; } else throw "ICV is not available for this platform (or not yet supported by this package)"; @@ -232,35 +236,12 @@ let #https://github.com/xianyi/OpenBLAS/wiki/Faq/4bded95e8dc8aadc70ce65267d1093ca7bdefc4c#multi-threaded openblas_ = blas.provider.override { singleThreaded = true; }; - inherit (cudaPackages) backendStdenv cudaFlags cudaVersion; + inherit (cudaPackages) cudaFlags cudaVersion; inherit (cudaFlags) cudaCapabilities; - cuda-common-redist = with cudaPackages; [ - cuda_cccl # <thrust/*> - libnpp # npp.h - ] ++ lib.optionals enableCublas [ - libcublas # cublas_v2.h - ] ++ lib.optionals enableCudnn [ - cudnn # cudnn.h - ] ++ lib.optionals enableCufft [ - libcufft # cufft.h - ]; - - cuda-native-redist = symlinkJoin { - name = "cuda-native-redist-${cudaVersion}"; - paths = with cudaPackages; [ - cuda_cudart # cuda_runtime.h - cuda_nvcc - ] ++ cuda-common-redist; - }; - - cuda-redist = symlinkJoin { - name = "cuda-redist-${cudaVersion}"; - paths = cuda-common-redist; - }; in -stdenv.mkDerivation { +effectiveStdenv.mkDerivation { pname = "opencv"; inherit version src; @@ -317,9 +298,9 @@ stdenv.mkDerivation { echo '"(build info elided)"' > modules/core/version_string.inc ''; - buildInputs = [ zlib pcre boost gflags protobuf3_21 ] + buildInputs = [ zlib pcre boost gflags protobuf_21 ] ++ lib.optional enablePython pythonPackages.python - ++ lib.optional (stdenv.buildPlatform == stdenv.hostPlatform) hdf5 + ++ lib.optional (effectiveStdenv.buildPlatform == effectiveStdenv.hostPlatform) hdf5 ++ lib.optional enableGtk2 gtk2 ++ lib.optional enableGtk3 gtk3 ++ lib.optional enableVtk vtk @@ -330,7 +311,7 @@ stdenv.mkDerivation { ++ lib.optionals enableEXR [ openexr ilmbase ] ++ lib.optional enableJPEG2000 openjpeg ++ lib.optional enableFfmpeg ffmpeg - ++ lib.optionals (enableFfmpeg && stdenv.isDarwin) + ++ lib.optionals (enableFfmpeg && effectiveStdenv.isDarwin) [ VideoDecodeAcceleration bzip2 ] ++ lib.optionals enableGStreamer (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good ]) ++ lib.optional enableOvis ogre @@ -343,11 +324,21 @@ stdenv.mkDerivation { # tesseract & leptonica. ++ lib.optionals enableTesseract [ tesseract leptonica ] ++ lib.optional enableTbb tbb - ++ lib.optionals stdenv.isDarwin [ + ++ lib.optionals effectiveStdenv.isDarwin [ bzip2 AVFoundation Cocoa VideoDecodeAcceleration CoreMedia MediaToolbox Accelerate ] ++ lib.optionals enableDocs [ doxygen graphviz-nox ] - ++ lib.optionals enableCuda [ cuda-redist ]; + ++ lib.optionals enableCuda (with cudaPackages; [ + cuda_cudart + cuda_cccl # <thrust/*> + libnpp # npp.h + ] ++ lib.optionals enableCublas [ + libcublas # cublas_v2.h + ] ++ lib.optionals enableCudnn [ + cudnn # cudnn.h + ] ++ lib.optionals enableCufft [ + libcufft # cufft.h + ]); propagatedBuildInputs = lib.optional enablePython pythonPackages.numpy ++ lib.optionals enableCuda [ nvidia-optical-flow-sdk ]; @@ -357,7 +348,9 @@ stdenv.mkDerivation { pythonPackages.pip pythonPackages.wheel pythonPackages.setuptools - ] ++ lib.optionals enableCuda [ cuda-native-redist ]; + ] ++ lib.optionals enableCuda [ + cudaPackages.cuda_nvcc + ]; env.NIX_CFLAGS_COMPILE = lib.optionalString enableEXR "-I${ilmbase.dev}/include/OpenEXR"; @@ -369,7 +362,7 @@ stdenv.mkDerivation { "-DOPENCV_GENERATE_PKGCONFIG=ON" "-DWITH_OPENMP=ON" "-DBUILD_PROTOBUF=OFF" - "-DProtobuf_PROTOC_EXECUTABLE=${lib.getExe buildPackages.protobuf3_21}" + "-DProtobuf_PROTOC_EXECUTABLE=${lib.getExe buildPackages.protobuf_21}" "-DPROTOBUF_UPDATE_FILES=ON" "-DOPENCV_ENABLE_NONFREE=${printEnabled enableUnfree}" "-DBUILD_TESTS=${printEnabled runAccuracyTests}" @@ -400,17 +393,14 @@ stdenv.mkDerivation { (opencvFlag "ENABLE_LTO" enableLto) (opencvFlag "ENABLE_THIN_LTO" ( enableLto && ( - # Only clang supports thin LTO, so we must either be using clang through the stdenv, - stdenv.cc.isClang || - # or through the backend stdenv. - (enableCuda && backendStdenv.cc.isClang) + # Only clang supports thin LTO, so we must either be using clang through the effectiveStdenv, + effectiveStdenv.cc.isClang || + # or through the backend effectiveStdenv. + (enableCuda && effectiveStdenv.cc.isClang) ) )) ] ++ lib.optionals enableCuda [ "-DCUDA_FAST_MATH=ON" - # We need to set the C and C++ host compilers for CUDA to the same compiler. - "-DCMAKE_C_COMPILER=${backendStdenv.cc}/bin/cc" - "-DCMAKE_CXX_COMPILER=${backendStdenv.cc}/bin/c++" "-DCUDA_NVCC_FLAGS=--expt-relaxed-constexpr" # OpenCV respects at least three variables: @@ -421,7 +411,7 @@ stdenv.mkDerivation { "-DCUDA_ARCH_PTX=${lib.last cudaCapabilities}" "-DNVIDIA_OPTICAL_FLOW_2_0_HEADERS_PATH=${nvidia-optical-flow-sdk}" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals effectiveStdenv.isDarwin [ "-DWITH_OPENCL=OFF" "-DWITH_LAPACK=OFF" @@ -435,7 +425,7 @@ stdenv.mkDerivation { "-DBUILD_JPEG=OFF" "-DBUILD_PNG=OFF" "-DBUILD_WEBP=OFF" - ] ++ lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals (!effectiveStdenv.isDarwin) [ "-DOPENCL_LIBRARY=${ocl-icd}/lib/libOpenCL.so" ] ++ lib.optionals enablePython [ "-DOPENCV_SKIP_PYTHON_LOADER=ON" @@ -489,14 +479,17 @@ stdenv.mkDerivation { tests = { inherit (gst_all_1) gst-plugins-bad; } - // lib.optionalAttrs (!stdenv.isDarwin) { inherit qimgv; } + // lib.optionalAttrs (!effectiveStdenv.isDarwin) { inherit qimgv; } // lib.optionalAttrs (!enablePython) { pythonEnabled = pythonPackages.opencv4; } - // lib.optionalAttrs (stdenv.buildPlatform != "x86_64-darwin") { + // lib.optionalAttrs (effectiveStdenv.buildPlatform != "x86_64-darwin") { opencv4-tests = callPackage ./tests.nix { inherit enableGStreamer enableGtk2 enableGtk3 runAccuracyTests runPerformanceTests testDataSrc; inherit opencv4; - }; }; + } + // lib.optionalAttrs (enableCuda) { + no-libstdcxx-errors = callPackage ./libstdcxx-test.nix { attrName = "opencv4"; }; + }; } // lib.optionalAttrs enablePython { pythonPath = [ ]; }; meta = with lib; { diff --git a/pkgs/development/libraries/opencv/libstdcxx-test.nix b/pkgs/development/libraries/opencv/libstdcxx-test.nix new file mode 100644 index 00000000000..d8cc483da9a --- /dev/null +++ b/pkgs/development/libraries/opencv/libstdcxx-test.nix @@ -0,0 +1,17 @@ +{ python3Packages, runCommand, attrName }: + +runCommand "${python3Packages.${attrName}.name}-libstdcxx-test" +{ + nativeBuildInputs = [ + (python3Packages.python.withPackages (ps: [ + (ps.${attrName}.override { enableCuda = true; }) + ps.scikit-image + ])) + ]; +} '' + python << EOF + import cv2 + from skimage.transform import pyramid_reduce + EOF + touch $out +'' diff --git a/pkgs/development/libraries/openexr/3.nix b/pkgs/development/libraries/openexr/3.nix index a5ce27e270e..826c7b2c854 100644 --- a/pkgs/development/libraries/openexr/3.nix +++ b/pkgs/development/libraries/openexr/3.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "openexr"; - version = "3.2.0"; + version = "3.2.1"; src = fetchFromGitHub { owner = "AcademySoftwareFoundation"; repo = "openexr"; rev = "v${version}"; - hash = "sha256-cV+qgx3WzdotypgpZhVFxzdKAU2rNVw0KWSdkeN0gLk="; + hash = "sha256-ycn2RbHM/vIDUGGGnfNZ0Zm0qjjKRRNhkMD11PkpGF0="; }; outputs = [ "bin" "dev" "out" "doc" ]; diff --git a/pkgs/development/libraries/openfec/default.nix b/pkgs/development/libraries/openfec/default.nix index a908b4980da..dd6b0ce10c0 100644 --- a/pkgs/development/libraries/openfec/default.nix +++ b/pkgs/development/libraries/openfec/default.nix @@ -1,12 +1,17 @@ -{ stdenv, lib, fetchzip, cmake }: +{ stdenv +, lib +, fetchzip +, cmake +, gitUpdater +}: stdenv.mkDerivation rec { pname = "openfec"; - version = "1.4.2"; + version = "1.4.2.9"; src = fetchzip { - url = "http://openfec.org/files/openfec_v1_4_2.tgz"; - sha256 = "sha256:0c2lg8afr7lqpzrsi0g44a6h6s7nq4vz7yc9vm2k57ph2y6r86la"; + url = "https://github.com/roc-streaming/openfec/archive/refs/tags/v${version}.tar.gz"; + hash = "sha256-A/U9Nh8tspRoT3bYePJLUrNa9jxiL0r2Xaf64wWbmVA="; }; outputs = [ "out" "dev" ]; @@ -33,6 +38,11 @@ stdenv.mkDerivation rec { ln -s libopenfec${so} $out/lib/libopenfec${so}.1 ''; + passthru.updateScript = gitUpdater { + url = "https://github.com/roc-streaming/openfec.git"; + rev-prefix = "v"; + }; + meta = with lib; { description = "Application-level Forward Erasure Correction codes"; homepage = "https://github.com/roc-streaming/openfec"; diff --git a/pkgs/development/libraries/openjpeg/default.nix b/pkgs/development/libraries/openjpeg/default.nix index 50098de03dd..d528e2fc030 100644 --- a/pkgs/development/libraries/openjpeg/default.nix +++ b/pkgs/development/libraries/openjpeg/default.nix @@ -25,8 +25,10 @@ stdenv.mkDerivation rec { patches = [ # modernise cmake files, also fixes them for multiple outputs + # https://github.com/uclouvain/openjpeg/pull/1424 (fetchpatch { - url = "https://github.com/uclouvain/openjpeg/pull/1424.patch"; + name = "uclouvain-openjpeg-pull-1424.patch"; + url = "https://github.com/uclouvain/openjpeg/compare/52927287402a9f7353de8854c88f931051211e2f...9d4f70cfe99626f82f9c8dcbf45f07709e3511b2.patch"; sha256 = "sha256-CxVRt1u4HVOMUjWiZ2plmZC29t/zshCpSY+N4Wlrlvg="; }) # fix cmake files cross compilation diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 2b0d778ef3d..3aeafccb1ed 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -18,14 +18,14 @@ # files. let - common = { version, sha256, patches ? [], withDocs ? false, extraMeta ? {} }: + common = { version, hash, patches ? [], withDocs ? false, extraMeta ? {} }: stdenv.mkDerivation (finalAttrs: { pname = "openssl"; inherit version; src = fetchurl { url = "https://www.openssl.org/source/${finalAttrs.pname}-${version}.tar.gz"; - inherit sha256; + inherit hash; }; inherit patches; @@ -219,9 +219,11 @@ let meta = with lib; { homepage = "https://www.openssl.org/"; + changelog = "https://github.com/openssl/openssl/blob/openssl-${version}/CHANGES.md"; description = "A cryptographic library that implements the SSL and TLS protocols"; license = licenses.openssl; mainProgram = "openssl"; + maintainers = with maintainers; [ thillux ]; pkgConfigModules = [ "libcrypto" "libssl" @@ -238,7 +240,7 @@ in { # and backport this to stable release (23.05). openssl_1_1 = common { version = "1.1.1w"; - sha256 = "sha256-zzCYlQy02FOtlcCEHx+cbT3BAtzPys1SHZOSUgi3asg="; + hash = "sha256-zzCYlQy02FOtlcCEHx+cbT3BAtzPys1SHZOSUgi3asg="; patches = [ ./1.1/nix-ssl-cert-file.patch @@ -255,8 +257,32 @@ in { }; openssl_3 = common { - version = "3.0.11"; - sha256 = "sha256-s0JdO7SiIY0Gl+tB9/wM3t4BbtGcpJ0Wi3jo2UeIf1U="; + version = "3.0.12"; + hash = "sha256-+Tyejt3l6RZhGd4xdV/Ie0qjSGNmL2fd/LoU0La2m2E="; + + patches = [ + ./3.0/nix-ssl-cert-file.patch + + # openssl will only compile in KTLS if the current kernel supports it. + # This patch disables build-time detection. + ./3.0/openssl-disable-kernel-detection.patch + + (if stdenv.hostPlatform.isDarwin + then ./use-etc-ssl-certs-darwin.patch + else ./use-etc-ssl-certs.patch) + ]; + + withDocs = true; + + extraMeta = with lib; { + license = licenses.asl20; + }; + }; + + openssl_3_1 = common { + version = "3.1.4"; + hash = "sha256-hAr1Nmq5tSK95SWCa+PvD7Cvgcap69hMqmAP6hcx7uM="; + patches = [ ./3.0/nix-ssl-cert-file.patch diff --git a/pkgs/development/libraries/pdfhummus/default.nix b/pkgs/development/libraries/pdfhummus/default.nix index 7b9263a4209..a6b57f2b340 100644 --- a/pkgs/development/libraries/pdfhummus/default.nix +++ b/pkgs/development/libraries/pdfhummus/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "pdfhummus"; - version = "4.6"; + version = "4.6.1"; src = fetchFromGitHub { owner = "galkahana"; repo = "PDF-Writer"; rev = "v${version}"; - hash = "sha256-TP/NDh5fPPHuiRaj6+YZfhtHZmlb+mqtnXfzyjVKAHY="; + hash = "sha256-4QJxYxLELBDg5GZISdO2xKzJej8F21BY+GD+KkrGXws="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/piper-phonemize/default.nix b/pkgs/development/libraries/piper-phonemize/default.nix index 2016f7234e5..b08495cae74 100644 --- a/pkgs/development/libraries/piper-phonemize/default.nix +++ b/pkgs/development/libraries/piper-phonemize/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch # build , cmake @@ -22,19 +23,23 @@ let }; patches = [ + (fetchpatch { + url = "https://github.com/espeak-ng/espeak-ng/commit/497c6217d696c1190c3e8b992ff7b9110eb3bedd.patch"; + hash = "sha256-KfzqnRyQfz6nuMKnsHoUzb9rn9h/Pg54mupW1Cr+Zx0="; + }) ./espeak-mbrola.patch ]; }); in stdenv.mkDerivation rec { pname = "piper-phonemize"; - version = "2023.11.6-1"; + version = "2023.11.14-4"; src = fetchFromGitHub { owner = "rhasspy"; repo = "piper-phonemize"; rev = "refs/tags/${version}"; - hash = "sha256-IRvuA03Z6r8Re/ocq2G/r28uwI9RU3xmmNI7S2G40rc="; + hash = "sha256-pj1DZUhy3XWGn+wNtxKKDWET9gsfofEB0NZ+EEQz9q0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/pipewire/0040-alsa-profiles-use-libdir.patch b/pkgs/development/libraries/pipewire/0040-alsa-profiles-use-libdir.patch deleted file mode 100644 index fab89c4ffd9..00000000000 --- a/pkgs/development/libraries/pipewire/0040-alsa-profiles-use-libdir.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/meson.build b/meson.build -index 99a4b2d1..d4a4cda7 100644 ---- a/meson.build -+++ b/meson.build -@@ -55,7 +55,7 @@ endif - - spa_plugindir = pipewire_libdir / spa_name - --alsadatadir = pipewire_datadir / 'alsa-card-profile' / 'mixer' -+alsadatadir = pipewire_libdir / '..' / 'share' / 'alsa-card-profile' / 'mixer' - - pipewire_headers_dir = pipewire_name / 'pipewire' - diff --git a/pkgs/development/libraries/pipewire/0050-pipewire-pulse-path.patch b/pkgs/development/libraries/pipewire/0050-pipewire-pulse-path.patch deleted file mode 100644 index 230f1b30394..00000000000 --- a/pkgs/development/libraries/pipewire/0050-pipewire-pulse-path.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/meson_options.txt b/meson_options.txt -index 961ae2a76..692b84dfd 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -179,6 +179,9 @@ option('udev', - option('udevrulesdir', - type : 'string', - description : 'Directory for udev rules (defaults to /lib/udev/rules.d)') -+option('pipewire_pulse_prefix', -+ type : 'string', -+ description: 'Install directory for the pipewire-pulse daemon') - option('systemd-system-unit-dir', - type : 'string', - description : 'Directory for system systemd units (defaults to /usr/lib/systemd/system)') -diff --git a/src/daemon/systemd/user/meson.build b/src/daemon/systemd/user/meson.build -index d17f3794f..34afe4f1a 100644 ---- a/src/daemon/systemd/user/meson.build -+++ b/src/daemon/systemd/user/meson.build -@@ -9,7 +9,7 @@ install_data( - - systemd_config = configuration_data() - systemd_config.set('PW_BINARY', pipewire_bindir / 'pipewire') --systemd_config.set('PW_PULSE_BINARY', pipewire_bindir / 'pipewire-pulse') -+systemd_config.set('PW_PULSE_BINARY', get_option('pipewire_pulse_prefix') / 'bin/pipewire-pulse') - - configure_file(input : 'pipewire.service.in', - output : 'pipewire.service', diff --git a/pkgs/development/libraries/pipewire/0080-pipewire-config-dir.patch b/pkgs/development/libraries/pipewire/0080-pipewire-config-dir.patch deleted file mode 100644 index b8d8fcb0f90..00000000000 --- a/pkgs/development/libraries/pipewire/0080-pipewire-config-dir.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/meson.build b/meson.build -index b6b4553b..f21c29d8 100644 ---- a/meson.build -+++ b/meson.build -@@ -37,7 +37,10 @@ pipewire_localedir = prefix / get_option('localedir') - pipewire_sysconfdir = prefix / get_option('sysconfdir') - - pipewire_configdir = pipewire_sysconfdir / 'pipewire' --pipewire_confdatadir = pipewire_datadir / 'pipewire' -+pipewire_confdatadir = get_option('pipewire_confdata_dir') -+if pipewire_confdatadir == '' -+ pipewire_confdatadir = pipewire_datadir / 'pipewire' -+endif - modules_install_dir = pipewire_libdir / pipewire_name - - if host_machine.system() == 'linux' -diff --git a/meson_options.txt b/meson_options.txt -index 9bc33fcd..e4bd2dc1 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -61,6 +61,9 @@ option('jack-devel', - option('libjack-path', - description: 'Where to install the libjack.so library', - type: 'string') -+option('pipewire_confdata_dir', -+ type: 'string', -+ description: 'Directory for pipewire default configuration (defaults to /usr/share/pipewire)') - option('spa-plugins', - description: 'Enable spa plugins integration', - type: 'feature', diff --git a/pkgs/development/libraries/pipewire/0090-pipewire-config-template-paths.patch b/pkgs/development/libraries/pipewire/0090-pipewire-config-template-paths.patch deleted file mode 100644 index ca7d351257b..00000000000 --- a/pkgs/development/libraries/pipewire/0090-pipewire-config-template-paths.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff --git a/src/daemon/minimal.conf.in b/src/daemon/minimal.conf.in -index 9c885a38f..c474eb45d 100644 ---- a/src/daemon/minimal.conf.in -+++ b/src/daemon/minimal.conf.in -@@ -111,7 +111,7 @@ context.modules = [ - # access.allowed to list an array of paths of allowed - # apps. - #access.allowed = [ -- # @session_manager_path@ -+ # <session_manager_path> - #] - - # An array of rejected paths. -@@ -359,5 +359,5 @@ context.exec = [ - # It can be interesting to start another daemon here that listens - # on another address with the -a option (eg. -a tcp:4713). - # -- #@pulse_comment@{ path = "@pipewire_path@" args = "-c pipewire-pulse.conf" } -+ #@pulse_comment@{ path = "<pipewire_path>" args = "-c pipewire-pulse.conf" } - ] -diff --git a/src/daemon/pipewire.conf.in b/src/daemon/pipewire.conf.in -index 697bf094d..3a7b54ddd 100644 ---- a/src/daemon/pipewire.conf.in -+++ b/src/daemon/pipewire.conf.in -@@ -142,7 +142,7 @@ context.modules = [ - # access.allowed to list an array of paths of allowed - # apps. - #access.allowed = [ -- # @session_manager_path@ -+ # <session_manager_path> - #] - - # An array of rejected paths. -@@ -294,7 +294,7 @@ context.exec = [ - # but it is better to start it as a systemd service. - # Run the session manager with -h for options. - # -- @sm_comment@{ path = "@session_manager_path@" args = "@session_manager_args@" -+ @sm_comment@{ path = "<session_manager_path>" args = "@session_manager_args@" - @sm_comment@ condition = [ { exec.session-manager = null } { exec.session-manager = true } ] } - # - # You can optionally start the pulseaudio-server here as well -@@ -302,6 +302,6 @@ context.exec = [ - # It can be interesting to start another daemon here that listens - # on another address with the -a option (eg. -a tcp:4713). - # -- @pulse_comment@{ path = "@pipewire_path@" args = "-c pipewire-pulse.conf" -+ @pulse_comment@{ path = "<pipewire_path>" args = "-c pipewire-pulse.conf" - @pulse_comment@ condition = [ { exec.pipewire-pulse = null } { exec.pipewire-pulse = true } ] } - ] diff --git a/pkgs/development/libraries/pipewire/0095-spa-data-dir.patch b/pkgs/development/libraries/pipewire/0095-spa-data-dir.patch deleted file mode 100644 index d8241a809f6..00000000000 --- a/pkgs/development/libraries/pipewire/0095-spa-data-dir.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/meson.build b/meson.build -index 56599ebd1..3bed2d3e3 100644 ---- a/meson.build -+++ b/meson.build -@@ -54,7 +54,7 @@ else - endif - - spa_plugindir = pipewire_libdir / spa_name --spa_datadir = pipewire_datadir / spa_name -+spa_datadir = pipewire_libdir / spa_name - - alsadatadir = pipewire_datadir / 'alsa-card-profile' / 'mixer' diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index 1e66d1573fc..3876a5c892a 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -70,6 +70,7 @@ , tinycompress , ffadoSupport ? stdenv.buildPlatform.canExecute stdenv.hostPlatform , ffado +, libselinux }: # Bluetooth codec only makes sense if general bluetooth enabled @@ -80,12 +81,10 @@ let self = stdenv.mkDerivation rec { pname = "pipewire"; - version = "0.3.80"; + version = "0.3.84"; outputs = [ "out" - "lib" - "pulse" "jack" "dev" "doc" @@ -98,30 +97,14 @@ let owner = "pipewire"; repo = "pipewire"; rev = version; - sha256 = "sha256-6Ka83Bqd/nsfp8rv0GTBerpGP226MeZvC5u/j62FzP0="; + sha256 = "sha256-9W9y+wtS/CYUaPRrCRmRDeyvuS1XllMBNQLy6GAMqBM="; }; patches = [ - # Break up a dependency cycle between outputs. - ./0040-alsa-profiles-use-libdir.patch - # Change the path of the pipewire-pulse binary in the service definition. - ./0050-pipewire-pulse-path.patch # Load libjack from a known location ./0060-libjack-path.patch # Move installed tests into their own output. ./0070-installed-tests-path.patch - # Add option for changing the config install directory - ./0080-pipewire-config-dir.patch - # Remove output paths from the comments in the config templates to break dependency cycles - ./0090-pipewire-config-template-paths.patch - # Place SPA data files in lib output to avoid dependency cycles - ./0095-spa-data-dir.patch - - # backport fix for building with webrtc-audio-processing 0.3 on platforms where we don't have 1.x - (fetchpatch { - url = "https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/1f1c308c9766312e684f0b53fc2d1422c7414d31.patch"; - hash = "sha256-ECM7/84G99yzXsg5A2DkFnXFGJSV9lz3vD0IRSzR8vU="; - }) ]; strictDeps = true; @@ -142,6 +125,7 @@ let glib libjack2 libusb1 + libselinux libsndfile lilv ncurses @@ -174,9 +158,7 @@ let "-Dudevrulesdir=lib/udev/rules.d" "-Dinstalled_tests=enabled" "-Dinstalled_test_prefix=${placeholder "installedTests"}" - "-Dpipewire_pulse_prefix=${placeholder "pulse"}" "-Dlibjack-path=${placeholder "jack"}/lib" - "-Dlibv4l2-path=${placeholder "out"}/lib" "-Dlibcamera=${mesonEnableFeature libcameraSupport}" "-Dlibffado=${mesonEnableFeature ffadoSupport}" "-Droc=${mesonEnableFeature rocSupport}" @@ -185,7 +167,6 @@ let "-Dgstreamer=${mesonEnableFeature gstreamerSupport}" "-Dsystemd-system-service=${mesonEnableFeature enableSystemd}" "-Dudev=${mesonEnableFeature (!enableSystemd)}" - "-Dudevrulesdir=${placeholder "out"}/lib/udev/rules.d" "-Dffmpeg=${mesonEnableFeature ffmpegSupport}" "-Dbluez5=${mesonEnableFeature bluezSupport}" "-Dbluez5-backend-hsp-native=${mesonEnableFeature nativeHspSupport}" @@ -198,7 +179,6 @@ let "-Dbluez5-codec-lc3=${mesonEnableFeature bluezSupport}" "-Dbluez5-codec-ldac=${mesonEnableFeature ldacbtSupport}" "-Dsysconfdir=/etc" - "-Dpipewire_confdata_dir=${placeholder "lib"}/share/pipewire" "-Draop=${mesonEnableFeature raopSupport}" "-Dsession-managers=" "-Dvulkan=enabled" @@ -222,15 +202,6 @@ let ''; postInstall = '' - ${lib.optionalString enableSystemd '' - moveToOutput "share/systemd/user/pipewire-pulse.*" "$pulse" - moveToOutput "lib/systemd/user/pipewire-pulse.*" "$pulse" - ''} - - rm $out/bin/pipewire-pulse - mkdir -p $pulse/bin - ln -sf $out/bin/pipewire $pulse/bin/pipewire-pulse - moveToOutput "bin/pw-jack" "$jack" ''; diff --git a/pkgs/development/libraries/ppl/default.nix b/pkgs/development/libraries/ppl/default.nix index c9b456ba831..d49f3e6bd53 100644 --- a/pkgs/development/libraries/ppl/default.nix +++ b/pkgs/development/libraries/ppl/default.nix @@ -17,6 +17,13 @@ stdenv.mkDerivation { sha256 = "1zj90hm25pkgvk4jlkfzh18ak9b98217gbidl3731fdccbw6hr87"; })]; + postPatch = lib.optionalString stdenv.cc.isClang '' + substituteInPlace src/PIP_Tree.cc \ + --replace "std::auto_ptr" "std::unique_ptr" + substituteInPlace src/Powerset_inlines.hh src/Pointset_Powerset_inlines.hh \ + --replace "std::mem_fun_ref" "std::mem_fn" + ''; + nativeBuildInputs = [ perl gnum4 ]; propagatedBuildInputs = [ gmpxx ]; diff --git a/pkgs/development/libraries/protobuf/21.nix b/pkgs/development/libraries/protobuf/21.nix new file mode 100644 index 00000000000..09a8c81b3d1 --- /dev/null +++ b/pkgs/development/libraries/protobuf/21.nix @@ -0,0 +1,6 @@ +{ callPackage, ... } @ args: + +callPackage ./generic.nix ({ + version = "21.12"; + hash = "sha256-VZQEFHq17UsTH5CZZOcJBKiScGV2xPJ/e6gkkVliRCU="; +} // args) diff --git a/pkgs/development/libraries/protobuf/23.nix b/pkgs/development/libraries/protobuf/23.nix new file mode 100644 index 00000000000..abb2cc2f446 --- /dev/null +++ b/pkgs/development/libraries/protobuf/23.nix @@ -0,0 +1,6 @@ +{ callPackage, ... } @ args: + +callPackage ./generic.nix ({ + version = "23.4"; + hash = "sha256-eI+mrsZAOLEsdyTC3B+K+GjD3r16CmPx1KJ2KhCwFdg="; +} // args) diff --git a/pkgs/development/libraries/protobuf/24.nix b/pkgs/development/libraries/protobuf/24.nix new file mode 100644 index 00000000000..6741b8afe52 --- /dev/null +++ b/pkgs/development/libraries/protobuf/24.nix @@ -0,0 +1,6 @@ +{ callPackage, ... } @ args: + +callPackage ./generic.nix ({ + version = "24.4"; + hash = "sha256-I+Xtq4GOs++f/RlVff9MZuolXrMLmrZ2z6mkBayqQ2s="; +} // args) diff --git a/pkgs/development/libraries/protobuf/3.21.nix b/pkgs/development/libraries/protobuf/3.21.nix deleted file mode 100644 index fe85be8cf02..00000000000 --- a/pkgs/development/libraries/protobuf/3.21.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ callPackage, ... } @ args: - -callPackage ./generic-v3-cmake.nix ({ - version = "3.21.12"; - sha256 = "sha256-VZQEFHq17UsTH5CZZOcJBKiScGV2xPJ/e6gkkVliRCU="; -} // args) diff --git a/pkgs/development/libraries/protobuf/3.23.nix b/pkgs/development/libraries/protobuf/3.23.nix deleted file mode 100644 index 2d658d57419..00000000000 --- a/pkgs/development/libraries/protobuf/3.23.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ callPackage, ... } @ args: - -callPackage ./generic-v3-cmake.nix ({ - version = "3.23.4"; - sha256 = "sha256-eI+mrsZAOLEsdyTC3B+K+GjD3r16CmPx1KJ2KhCwFdg="; -} // args) diff --git a/pkgs/development/libraries/protobuf/3.24.nix b/pkgs/development/libraries/protobuf/3.24.nix deleted file mode 100644 index 60ad747194d..00000000000 --- a/pkgs/development/libraries/protobuf/3.24.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ callPackage, ... } @ args: - -callPackage ./generic-v3-cmake.nix ({ - version = "3.24.3"; - sha256 = "sha256-wXGQW/o674DeLXX2IlyZskl5OrBcSRptOMoJqLQGm94="; -} // args) diff --git a/pkgs/development/libraries/protobuf/generic-v3-cmake.nix b/pkgs/development/libraries/protobuf/generic.nix index dd31aba434c..cf00d1d50be 100644 --- a/pkgs/development/libraries/protobuf/generic-v3-cmake.nix +++ b/pkgs/development/libraries/protobuf/generic.nix @@ -11,7 +11,7 @@ , gtest , zlib , version -, sha256 +, hash # downstream dependencies , python3 @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "protocolbuffers"; repo = "protobuf"; rev = "v${version}"; - inherit sha256; + inherit hash; }; postPatch = lib.optionalString stdenv.isDarwin '' @@ -37,28 +37,24 @@ stdenv.mkDerivation (finalAttrs: { --replace 'tmpnam(b)' '"'$TMPDIR'/foo"' ''; - patches = lib.optionals (lib.versionOlder version "3.22") [ + patches = lib.optionals (lib.versionOlder version "22") [ # fix protobuf-targets.cmake installation paths, and allow for CMAKE_INSTALL_LIBDIR to be absolute # https://github.com/protocolbuffers/protobuf/pull/10090 (fetchpatch { url = "https://github.com/protocolbuffers/protobuf/commit/a7324f88e92bc16b57f3683403b6c993bf68070b.patch"; - sha256 = "sha256-SmwaUjOjjZulg/wgNmR/F5b8rhYA2wkKAjHIOxjcQdQ="; + hash = "sha256-SmwaUjOjjZulg/wgNmR/F5b8rhYA2wkKAjHIOxjcQdQ="; }) ] ++ lib.optionals stdenv.hostPlatform.isStatic [ ./static-executables-have-no-rpath.patch ]; - nativeBuildInputs = - let - protobufVersion = "${lib.versions.major version}_${lib.versions.minor version}"; - in - [ - cmake - ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - # protoc of the same version must be available for build. For non-cross builds, it's able to - # re-use the executable generated as part of the build - buildPackages."protobuf${protobufVersion}" - ]; + nativeBuildInputs = [ + cmake + ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + # protoc of the same version must be available for build. For non-cross builds, it's able to + # re-use the executable generated as part of the build + buildPackages."protobuf_${lib.versions.major version}" + ]; buildInputs = [ gtest @@ -71,23 +67,25 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; - cmakeDir = if lib.versionOlder version "3.22" then "../cmake" else null; + cmakeDir = if lib.versionOlder version "22" then "../cmake" else null; cmakeFlags = [ "-Dprotobuf_USE_EXTERNAL_GTEST=ON" "-Dprotobuf_ABSL_PROVIDER=package" ] ++ lib.optionals enableShared [ "-Dprotobuf_BUILD_SHARED_LIBS=ON" ] - # Tests fail to build on 32-bit platforms; fixed in 3.22 + # Tests fail to build on 32-bit platforms; fixed in 22.x # https://github.com/protocolbuffers/protobuf/issues/10418 - ++ lib.optionals (stdenv.targetPlatform.is32bit && lib.versionOlder version "3.22") [ + ++ lib.optionals (stdenv.hostPlatform.is32bit && lib.versionOlder version "22") [ "-Dprotobuf_BUILD_TESTS=OFF" ]; - # FIXME: investigate. 3.24 and 3.23 have different errors. + # FIXME: investigate. 24.x and 23.x have different errors. # At least some of it is not reproduced on some other machine; example: # https://hydra.nixos.org/build/235677717/nixlog/4/tail - doCheck = !(stdenv.isDarwin && lib.versionAtLeast version "3.23"); + # Also AnyTest.TestPackFromSerializationExceedsSizeLimit fails on 32-bit platforms + # https://github.com/protocolbuffers/protobuf/issues/8460 + doCheck = !(stdenv.isDarwin && lib.versionAtLeast version "23") && !stdenv.hostPlatform.is32bit; passthru = { tests = { diff --git a/pkgs/development/libraries/qmltermwidget/default.nix b/pkgs/development/libraries/qmltermwidget/default.nix index a8aec285a98..8c98fdbdd6f 100644 --- a/pkgs/development/libraries/qmltermwidget/default.nix +++ b/pkgs/development/libraries/qmltermwidget/default.nix @@ -4,7 +4,6 @@ , fetchpatch , qmake , qtbase -, qtquick1 , qtmultimedia , utmp }: @@ -26,7 +25,6 @@ stdenv.mkDerivation { buildInputs = [ qtbase - qtquick1 qtmultimedia ] ++ lib.optional stdenv.isDarwin utmp; diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix index df60188800a..a2b38046c5a 100644 --- a/pkgs/development/libraries/qt-5/5.15/default.nix +++ b/pkgs/development/libraries/qt-5/5.15/default.nix @@ -11,6 +11,7 @@ Check for any minor version changes. , lib, stdenv, fetchurl, fetchgit, fetchpatch, fetchFromGitHub, makeSetupHook, makeWrapper , bison, cups ? null, harfbuzz, libGL, perl, python3 , gstreamer, gst-plugins-base, gtk3, dconf +, llvmPackages_15, overrideSDK, overrideLibcxx , darwin # options @@ -45,13 +46,29 @@ let ./qtbase.patch.d/0009-qtbase-qtpluginpath.patch ./qtbase.patch.d/0010-qtbase-assert.patch ./qtbase.patch.d/0011-fix-header_module.patch - ./qtbase.patch.d/9999-backport-dbus-crash.patch ]; qtdeclarative = [ ./qtdeclarative.patch # prevent headaches from stale qmlcache data ./qtdeclarative-default-disable-qmlcache.patch ]; + qtlocation = lib.optionals stdenv.cc.isClang [ + # Fix build with Clang 16 + (fetchpatch { + url = "https://github.com/boostorg/numeric_conversion/commit/50a1eae942effb0a9b90724323ef8f2a67e7984a.patch"; + stripLen = 1; + extraPrefix = "src/3rdparty/mapbox-gl-native/deps/boost/1.65.1/"; + hash = "sha256-UEvIXzn387f9BAeBdhheStD/4M7en+rmqX8C6gstl6k="; + }) + ]; + qtmultimedia = lib.optionals stdenv.isDarwin [ + # build patch for qtmultimedia with xcode 15 + (fetchpatch { + url = "https://raw.githubusercontent.com/Homebrew/formula-patches/3f509180/qt5/qt5-qtmultimedia-xcode15.patch"; + stripLen = 1; + hash = "sha256-HrEqfmm8WbapWgLM0L4AKW8168pwT2zYI8HOJruEPSs="; + }) + ]; qtpim = [ ## Upstream patches after the Qt6 transition that apply without problems & fix bugs @@ -272,6 +289,18 @@ let qtwayland = callPackage ../modules/qtwayland.nix {}; qtwebchannel = callPackage ../modules/qtwebchannel.nix {}; qtwebengine = callPackage ../modules/qtwebengine.nix { + # The version of Chromium used by Qt WebEngine 5.15.x does not build with clang 16 due + # to the following errors: + # * -Wenum-constexpr-conversion: This is a downgradable error in clang 16, but it is planned + # to be made into a hard error in a future version of clang. Patches are not available for + # the version of v8 used by Chromium in Qt WebEngine, and fixing the code is non-trivial. + # * -Wincompatible-function-pointer-types: This is also a downgradable error generated + # starting with clang 16. Patches are available upstream that can be backported. + # Because the first error is non-trivial to fix and suppressing it risks future breakage, + # clang is pinned to clang 15. That also makes fixing the second set of errors unnecessary. + stdenv = + let stdenv' = if stdenv.cc.isClang then overrideLibcxx llvmPackages_15.stdenv else stdenv; + in if stdenv'.isDarwin then overrideSDK stdenv' "11.0" else stdenv'; inherit (srcs.qtwebengine) version; python = python3; postPatch = '' @@ -306,7 +335,7 @@ let qt3d qtcharts qtconnectivity qtdeclarative qtdoc qtgraphicaleffects qtimageformats qtlocation qtmultimedia qtquickcontrols qtquickcontrols2 qtscript qtsensors qtserialport qtsvg qttools qttranslations - qtvirtualkeyboard qtwebchannel qtwebengine qtwebkit qtwebsockets + qtvirtualkeyboard qtwebchannel qtwebengine qtwebsockets qtwebview qtx11extras qtxmlpatterns qtlottie qtdatavis3d ] ++ lib.optional (!stdenv.isDarwin) qtwayland ++ lib.optional (stdenv.isDarwin) qtmacextras); diff --git a/pkgs/development/libraries/qt-5/5.15/modules b/pkgs/development/libraries/qt-5/5.15/modules index d6ce8822d54..ccc7dbcb815 100644 --- a/pkgs/development/libraries/qt-5/5.15/modules +++ b/pkgs/development/libraries/qt-5/5.15/modules @@ -21,7 +21,6 @@ qtquickcontrols qtquickcontrols2 qtquicktimeline qtremoteobjects -qtscript qtscxml qtsensors qtserialbus diff --git a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/9999-backport-dbus-crash.patch b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/9999-backport-dbus-crash.patch deleted file mode 100644 index e1aa0119aa2..00000000000 --- a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/9999-backport-dbus-crash.patch +++ /dev/null @@ -1,79 +0,0 @@ -commit eb0c6846a5d05d686f0686f0f1ddddcad762ad26 (HEAD -> kde/5.15) -Author: K900 <me@0upti.me> -Date: Mon Aug 14 22:44:02 2023 +0300 - - QLibraryPrivate: Actually merge load hints - - Or old and new load hints in mergeLoadHints() instead of just storing - new ones. Andjust QLibraryPrivate::setLoadHints() to handle objects - with no file name differently and just set load hints directly. - - Mention that load hints are merged once the file name is set - in the documentation for QLibrary::setLoadHints(). - - Add a regression test into tst_qfactoryloader. - - Update and extend tst_QPluginLoader::loadHints() to take into account - load hints merging. - - Fixes: QTBUG-114480 - Change-Id: I3b9afaec7acde1f5ff992d913f8d7217392c7e00 - Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> - Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> - -diff --git a/src/corelib/plugin/qlibrary.cpp b/src/corelib/plugin/qlibrary.cpp -index 5d2f024267..45b5a3fe27 100644 ---- a/src/corelib/plugin/qlibrary.cpp -+++ b/src/corelib/plugin/qlibrary.cpp -@@ -526,7 +526,7 @@ void QLibraryPrivate::mergeLoadHints(QLibrary::LoadHints lh) - if (pHnd.loadRelaxed()) - return; - -- loadHintsInt.storeRelaxed(lh); -+ loadHintsInt.fetchAndOrRelaxed(lh); - } - - QFunctionPointer QLibraryPrivate::resolve(const char *symbol) -@@ -538,6 +538,13 @@ QFunctionPointer QLibraryPrivate::resolve(const char *symbol) - - void QLibraryPrivate::setLoadHints(QLibrary::LoadHints lh) - { -+ // Set the load hints directly for a dummy if this object is not associated -+ // with a file. Such object is not shared between multiple instances. -+ if (fileName.isEmpty()) { -+ loadHintsInt.storeRelaxed(lh); -+ return; -+ } -+ - // this locks a global mutex - QMutexLocker lock(&qt_library_mutex); - mergeLoadHints(lh); -@@ -1166,6 +1173,10 @@ QString QLibrary::errorString() const - lazy symbol resolution, and will not export external symbols for resolution - in other dynamically-loaded libraries. - -+ \note Hints can only be cleared when this object is not associated with a -+ file. Hints can only be added once the file name is set (\a hints will -+ be or'ed with the old hints). -+ - \note Setting this property after the library has been loaded has no effect - and loadHints() will not reflect those changes. - -diff --git a/src/corelib/plugin/qpluginloader.cpp b/src/corelib/plugin/qpluginloader.cpp -index 0a63b93762..ceee5d6385 100644 ---- a/src/corelib/plugin/qpluginloader.cpp -+++ b/src/corelib/plugin/qpluginloader.cpp -@@ -414,10 +414,11 @@ QString QPluginLoader::errorString() const - void QPluginLoader::setLoadHints(QLibrary::LoadHints loadHints) - { - if (!d) { -- d = QLibraryPrivate::findOrCreate(QString()); // ugly, but we need a d-ptr -+ d = QLibraryPrivate::findOrCreate({}, {}, loadHints); // ugly, but we need a d-ptr - d->errorString.clear(); -+ } else { -+ d->setLoadHints(loadHints); - } -- d->setLoadHints(loadHints); - } - - QLibrary::LoadHints QPluginLoader::loadHints() const diff --git a/pkgs/development/libraries/qt-5/5.15/srcs-generated.json b/pkgs/development/libraries/qt-5/5.15/srcs-generated.json index f67f9d66da7..81712934971 100644 --- a/pkgs/development/libraries/qt-5/5.15/srcs-generated.json +++ b/pkgs/development/libraries/qt-5/5.15/srcs-generated.json @@ -1,207 +1,202 @@ { "qt3d": { "url": "https://invent.kde.org/qt/qt/qt3d.git", - "rev": "01aa0a9cb22ce5ed2b7ead03ed9cbeb5f978e897", - "sha256": "0r1bicsjn4addsf0cw2vkf26kxlf8z1fh65w19gnqmcwkrr8hnja" + "rev": "c1f8fa2578d99e07f5e581f26bd532695b9534f9", + "sha256": "19wsf9capc8i5157hfp8g735scpcms329ylp0fg86j9qalg7ccwg" }, "qtactiveqt": { "url": "https://invent.kde.org/qt/qt/qtactiveqt.git", - "rev": "7a04a93e97390de2d91e89dc907e8240dd5a0c4f", - "sha256": "1bqy5cmimnlmgd02zpv0ipf74nx350fk0d4pm2j4pqipq1spq3bh" + "rev": "2ed4be9e852d2533b982493a26bf061b245dc106", + "sha256": "0v6fwykibl4d20sdh10inaavpzwp5ijpyw8k31078shw3hsgkqxf" }, "qtandroidextras": { "url": "https://invent.kde.org/qt/qt/qtandroidextras.git", - "rev": "1170e17043ff51590ccee30447bef1e43a999b0d", - "sha256": "0qhlhz7ng35mb5pmva9ivpxq1ib30dz8f1p93yil78cyl9mwqbbi" + "rev": "3d30862e761afd5fe8451857bb531b6fb8f63dc3", + "sha256": "0sq4dgk88n96wja1wp6j5swxhz8wksf1v4sibywvg7v431nfy82p" }, "qtbase": { "url": "https://invent.kde.org/qt/qt/qtbase.git", - "rev": "e24dc54b2b4054413650904288aa7a363eee23a7", - "sha256": "0gpg0avl06jbamgk5f9034cfqwyifgv4nyqx49rp0r9wm2m1cgxb" + "rev": "ea7a183732c17005f08ca14fd70cdd305c90396d", + "sha256": "0lblir4zcnxc2ix9frcsygkhfs5qx7xibpflapmi6d978jjfxjmx" }, "qtcharts": { "url": "https://invent.kde.org/qt/qt/qtcharts.git", - "rev": "7ce22b0633eb9d1eb59854fee4f2f545e1b842e0", - "sha256": "0q173ql5xyacwb5lwyrzhgch1bbjq4mmsfwhyssm3a9phqcj083m" + "rev": "e17308d5ce83a8b66aeeaaaf16ce16d4ee6b2826", + "sha256": "1igna3qdwpaf67lhj0m743cj127hyg73ynjhadhjk3gz34h12r09" }, "qtconnectivity": { "url": "https://invent.kde.org/qt/qt/qtconnectivity.git", - "rev": "eeaf42bccd49e8161fbae82d110026d25a5a9a7f", - "sha256": "0daa72yizb6v28bci72fw1w8y8al0mhb9k7kxn7vg22fbb3iyksf" + "rev": "e33b82889625b6a72e0be91c5023a30d53136a80", + "sha256": "17yxmj1xd2q0a2in6aygp88bsg1vivklmzjwi97llbmvcxxvzhfn" }, "qtdatavis3d": { "url": "https://invent.kde.org/qt/qt/qtdatavis3d.git", - "rev": "d366b0aad8454355acac79eddbab445c1108b1e9", - "sha256": "15ad1cbfdwnl6lnafgd4chdsl9wnwfcqqnd2m0dwj10n2lsa3nmw" + "rev": "d7af24d26b9fbb83bf57b2b7245d280eb78e8b22", + "sha256": "1h85cn4qabva8fcr69b35cmy9c7vbk2fz8licw5ca42bq141k4kw" }, "qtdeclarative": { "url": "https://invent.kde.org/qt/qt/qtdeclarative.git", - "rev": "3e98cdb2780d052fce3d7a3694596a690cd76aca", - "sha256": "15fn0zjfz7jnjgc7m368sna2mvhcp33r85r2kwc9hy7zkp1is6a1" + "rev": "1b0e366092bcfae0392592c3b7891f0e47af1018", + "sha256": "0fif6gbin3clvy7rfvrs5qdjqvi3ql9yciiwdbm7z0by2kzz1qsg" }, "qtdoc": { "url": "https://invent.kde.org/qt/qt/qtdoc.git", - "rev": "9dfbbfb9971db22d51eb40d6636583df5913be01", - "sha256": "1l192k1w5mjw14zq3h3pjb3m0zl56fhgxdjfxhmbncjx0ym98wzr" + "rev": "c8af0c56f1765302f8bdf874dfacb11c4e0bf4e3", + "sha256": "161wm1pq732nnbx8jbmiv1g1ziqzjwy48dpasy3zgj4i83qyvdas" }, "qtgamepad": { "url": "https://invent.kde.org/qt/qt/qtgamepad.git", - "rev": "f90bd729eb70d4a0770efed3f9bb1b6dbe67d37c", - "sha256": "1vbfmyb51lv3ms0iyizi05jiba688scjwxwvyrr8qnmg4qrjqjd5" + "rev": "4b52913503e3713200265cd6bc19b301792dbf96", + "sha256": "1n5pafxarhb4rsvr18al4hyc6xmm5nhjkknrnhdldy9vz7w50bgs" }, "qtgraphicaleffects": { "url": "https://invent.kde.org/qt/qt/qtgraphicaleffects.git", - "rev": "500ae59f809877e0ada9a68601564882f2733145", - "sha256": "0p8vxp5l7iihd1xww94asnb9xv2v94p9whqbljzn6gwr56wvys5l" + "rev": "cce7d784237cd2dd4af1abe2757d048e34e02685", + "sha256": "1yvxpkfxd44z9z44mfv77lfsbgjlmxz1rilblpp8h276zc5w6l5z" }, "qtimageformats": { "url": "https://invent.kde.org/qt/qt/qtimageformats.git", - "rev": "5aa33ec870977863c400103db94da452edbaf414", - "sha256": "02i3ns2ijiiy0jfad3lxrvvlr38bgarl8246ka0y8aa8by1ih35b" + "rev": "b22bf4d0d77c7dafe8b4622f8bb45ac0b9cc9bdd", + "sha256": "0gz1par4gkcwwbxh0g1n1lrzyjjmi53gqfmbb222gkf5k8kf0r2i" }, "qtlocation": { "url": "https://invent.kde.org/qt/qt/qtlocation.git", - "rev": "664701dc3acfca37500bc84ba03eed4953b684e9", - "sha256": "0nlzjksfzkjhla89warkj7c5h8z2h5ivnhnq1sw2385gfd4q5d8w" + "rev": "48a17e88fc1df5b6ae82a9787466226c830bcbf2", + "sha256": "0gn4zsf01xr0g8divixk2zpq97dnqs1cdc3q577ijczd2rcs6z4f" }, "qtlottie": { "url": "https://invent.kde.org/qt/qt/qtlottie.git", - "rev": "f65b6a268832fc86e1263a6597f2e369aefecd19", - "sha256": "157in9bvnd9q2jigrrl955y7d2gpj308g8mg7k19r1vaz6h4zlm7" + "rev": "909b79f4810b8ac62baa3544837793cfb132593b", + "sha256": "1bh5418nshzlgc3xf8yg1c0n70xcazr3ya9fdfn1xs3yhxdxcd8h" }, "qtmacextras": { "url": "https://invent.kde.org/qt/qt/qtmacextras.git", - "rev": "ca5e5fdca44e8e56dafaac2a5bd886cad2a5c0f5", - "sha256": "1yrk7kj5dvfcha8w0abvh8xfjn6nbl4njm1r2h2776l3sf46xd4c" + "rev": "cc717d0093d796e6bafb65892e6825f146c1d3cd", + "sha256": "1cdal8yfjwgl30fh2s5s45hy1mw70n8bfdsbx8q6j4g062dr16zd" }, "qtmultimedia": { "url": "https://invent.kde.org/qt/qt/qtmultimedia.git", - "rev": "78d05cfcec57a9e890cb5ddbea604f194e04315d", - "sha256": "1vf0gmf6bh3hadrrk0922dbagmvxi1il3pjiyhmz087bm80km1md" + "rev": "f587b18db4abd68cb6d4d77fbcec1b94c38d2a51", + "sha256": "16b3yaq7i0cs9sw8q5f98g9kzphy3kwy0nw6hzznnzpkmg0pgkv1" }, "qtnetworkauth": { "url": "https://invent.kde.org/qt/qt/qtnetworkauth.git", - "rev": "a0f23c6a1f11bd7c6a8e4fd34f10bdb0a35789fa", - "sha256": "0sy2s7xnq2xmqm3lcp439wn6zk6znzja489gh531mmkaj13kiqa9" + "rev": "1e3f2196bd45a5ee272b08b1d82cef29aaa89b61", + "sha256": "1jshzvsa2nnckakiybh6q7f0wdl5p04b6mymxvjzzphr0q32qn75" }, "qtpurchasing": { "url": "https://invent.kde.org/qt/qt/qtpurchasing.git", - "rev": "a3e675872e4b323f89b94b90b66caa945b576b2e", - "sha256": "0b6da91fja6w3mphsfydp0plcwmk8nywhd5v8irgc98v1hw114dg" + "rev": "736144c5827385000e391e9a55a0f0162b7e8112", + "sha256": "1djvj4glxc360my597g81aqjmrhk46447x5s2jj81yiflppvkbny" }, "qtquick3d": { "url": "https://invent.kde.org/qt/qt/qtquick3d.git", - "rev": "353f50a9851518eb637181c00302cd354e0ae98b", - "sha256": "1y269yamhlf46rwcvwzhdqhajyqj41xxf9x0l1nrcr4n07l4mbr8" + "rev": "f3c3c2041f4800a7fc1904771f5c6af036167dc9", + "sha256": "1xsxhx20spj50jmsqd5f2qa7kmr9rn08c22zkckhrgic73188dpg" }, "qtquickcontrols": { "url": "https://invent.kde.org/qt/qt/qtquickcontrols.git", - "rev": "0ea7cfdfbfa72d467fe542cc48ab3206c177a387", - "sha256": "1bvg32cz4x00j9333yas7cmfzx8rlhika4a9vwdikrr5a64awsl9" + "rev": "dcc90558d9c0cba41eec7df290943994289b0e87", + "sha256": "0xccglsr1c519lyfg58hj6aa34zfyxc4zff360kd84yxmp8r4y9i" }, "qtquickcontrols2": { "url": "https://invent.kde.org/qt/qt/qtquickcontrols2.git", - "rev": "0472a07a8f39587052216d85a7ed235c531eba2c", - "sha256": "1psal4kldwbhfgg0b234dhgm30s5q83g2krcik1p4sifrzgrry3r" + "rev": "a2d56960dd76c94a5115b5415be5ee174d377718", + "sha256": "03wikwwf329wzml59hw0mqqzqjqfp95k8bvifi21zgrnjfl8rsrr" }, "qtquicktimeline": { "url": "https://invent.kde.org/qt/qt/qtquicktimeline.git", - "rev": "4956b556ccb021e4691f314ab907ea2ebb1ca8a6", - "sha256": "0d6w36pvnk616ps7k1ykpk2ahcvn746svwmv3dxvf4capfij96rj" + "rev": "b1b4b882dabaa036c3fb73c4a879ba8efbb02ded", + "sha256": "07zaziin88y5cq9xy4dsfw2y7njs92qq00mg42350g1s6zqrlbv2" }, "qtremoteobjects": { "url": "https://invent.kde.org/qt/qt/qtremoteobjects.git", - "rev": "d10e7673218fa2b00191a82ad20cd3304a711fa6", - "sha256": "0z5dzgdr92yw3y5vx6l9r9kz81r0vvwi264la9r7j20jqb75i2a5" - }, - "qtscript": { - "url": "https://invent.kde.org/qt/qt/qtscript.git", - "rev": "4f8c35a528586541ea55bb8b3361eaa6749e52b1", - "sha256": "01jddzy51ks899mszz35lcdgmpl5czcgh5g9fb84pxdnpgaxrx9b" + "rev": "bdc316aca82769b43cb7821c10d80a1ca02b846e", + "sha256": "136izb42sdy42lr5amh343f97s59fwf3mv44dg5n8jwg0mg7s67b" }, "qtscxml": { "url": "https://invent.kde.org/qt/qt/qtscxml.git", - "rev": "7f276be586be79d41213a8dd05ef31144313d440", - "sha256": "0yiryqzs44nx5lg54gbs7gf5n2d5chybya71kcv0iwn48dbzy33n" + "rev": "e8727aabe55526956295407d27317ec15e12b283", + "sha256": "1gyas1prkvnmxlvb90s9qzpy1frk8c4b7n0wnjn0vkfp0cmv3w52" }, "qtsensors": { "url": "https://invent.kde.org/qt/qt/qtsensors.git", - "rev": "45c04582b15a9bb4be01ae99aa7fda1bbba7d0df", - "sha256": "0wp9ddna0zidl18707nrqsg8sybaggam0hmm9yxyyfnsr39wms4m" + "rev": "a41492b23cde20d1e00427d31e4637d06aea3638", + "sha256": "1p9w444bzgixw6a8qarznnr15ayn22k2limsi5mzqanf3j3bd3ml" }, "qtserialbus": { "url": "https://invent.kde.org/qt/qt/qtserialbus.git", - "rev": "b3081c36baee48b43b6285b4811dc6da451e2390", - "sha256": "167bmp5wrp9mflvzhgc2am9nnyw1vb58skdxjn7ag8jq88fhv0zz" + "rev": "c41785c9f36560722b917d373ee97eed8cc4089a", + "sha256": "05nvzh9lbkbsghpdb3q26nbxgdq5007xak8zxwd3cz9mhqy8xnyc" }, "qtserialport": { "url": "https://invent.kde.org/qt/qt/qtserialport.git", - "rev": "af58a4c62415fbfd997c43422acf93e2e6ab5155", - "sha256": "1ihjj7gqjy75ccf4qniilddyiknjklc88mxns6sy8wz3ymr58vfh" + "rev": "3380465d5d4977326616c5e57789a81681be650e", + "sha256": "06dzraplqhidkngl3sjb3sppqpvc8v8ahrjz06dnsh1dwj8hizh7" }, "qtspeech": { "url": "https://invent.kde.org/qt/qt/qtspeech.git", - "rev": "75142c77cda8ef3a5c1cae69863e963797c667b5", - "sha256": "0iaw13vx80yfcchkmrmp6n79i0i6b9rv7k69xxp3wb3l5d3n0ng0" + "rev": "3b163bfd46d96bc9ee848dcee49e9cabe6699287", + "sha256": "03d4qvxfzwcfgbjdrpq0hvnhbz8bj6diphwiywdp16kvfmp13g9f" }, "qtsvg": { "url": "https://invent.kde.org/qt/qt/qtsvg.git", - "rev": "37b2c764fb599c96fc415049208e871c729217c8", - "sha256": "11h0n9k6l4r97x6h1m09nzsblwmmkkj46nl80dnvjimb395d71ri" + "rev": "7d6e373c7db9c05ef586db0eb50c87cd894229ad", + "sha256": "1aw9xxfjhm14raj7nivrr1ljnqcmibbbjyrx4bawp58mqbq4as4x" }, "qttools": { "url": "https://invent.kde.org/qt/qt/qttools.git", - "rev": "9f7af2d08eea7c2a2a2bfe7e6a9b73d1b99f5123", - "sha256": "1vb6s9zy8nw6gd0kmk77bjvxwpnfbhaifrznp019zccckibzffsg" + "rev": "38ae810be3fb4984f75b55a16d3413e35d701af1", + "sha256": "0hc65pidlp6lnb3srr2hg3dnas3hdj9cxkp7azcndj3wi36mclwf" }, "qttranslations": { "url": "https://invent.kde.org/qt/qt/qttranslations.git", - "rev": "a680686754d84b91d4cc4252a2fb8af0c58f5f49", - "sha256": "1i92mk6f2ldwq12qa4wnlz52zya4nlpjm3r2vy95vkj69xi2bfk3" + "rev": "56065158ffc4cd0fd78f9edf4b21b77b969f8dbb", + "sha256": "1lyh8hryi6hgw50gz9l6qxjfb72k4a7cg10vw18iffi7yv262g0z" }, "qtvirtualkeyboard": { "url": "https://invent.kde.org/qt/qt/qtvirtualkeyboard.git", - "rev": "72373522141dd3206183eb5fa56ae1c36a6d4c2b", - "sha256": "1ndgy8jxn9f7dwg9kydhlbll20qdivfbvdlcxk8qpzilpccd2l3z" + "rev": "817378aa10176fd26eed36542bc657e48d9dd42e", + "sha256": "0ihgm8y19zlkp3677rp9hnzm56y74djsnpr78yk0mrbcbxv1hpwb" }, "qtwayland": { "url": "https://invent.kde.org/qt/qt/qtwayland.git", - "rev": "d4f650b6c29c621c58bc7b7e7c9ddcbbbc72e3b4", - "sha256": "11xqpj36mfyfhcip89i82dyclbkvs77byffax2kscv1kdj3x7w2l" + "rev": "4de268cbaf6ff3b633429577f06d3d746a3b202a", + "sha256": "1ris6yxd4igrjvjv7bnxkdr402lk1k0djalkbk5s4z8l4qpavn3y" }, "qtwebchannel": { "url": "https://invent.kde.org/qt/qt/qtwebchannel.git", - "rev": "74c0625337c8a8de0a465878c7e7d238e8d979ed", - "sha256": "0yz2sg8k3l88ngsgyfb6cljh8x5sicww59m447xk7yngxgyaj75m" + "rev": "f84887c1aee4ab04af375e639ae965c9ea2186a5", + "sha256": "0pn4ly4lyf0db9pfb80q45zssifjg3466hnw7ryxnm4331izvbja" }, "qtwebglplugin": { "url": "https://invent.kde.org/qt/qt/qtwebglplugin.git", - "rev": "13202e8a8c0c6d39026344b5a19a0148592160bc", - "sha256": "0gki7hc3684qhqbq7i4wa3w7szy3j6af0yfd50q2mxb1lbxjsdrx" + "rev": "ddcff45e8f2ca9f229017b3ded62327d2fb50af2", + "sha256": "1ybc94jidzqhrkm0v2daqq0nm34ydqpcgd8q4qhz9abi0ccj17s4" }, "qtwebsockets": { "url": "https://invent.kde.org/qt/qt/qtwebsockets.git", - "rev": "89fbe461e7091ae6a4689b7791293a06c9167776", - "sha256": "15vkh80rma5l9mrmg41vhxvqxlzqjzl8x20k33xm11lw2kjsszm5" + "rev": "d41bb9f4f7ab9d5ff184ef94cf2f6ff7cf01de00", + "sha256": "0pc14sd1dzrw599kdjg1309l9hf9ylp0pnyv7i6s2pyfqqq0x85r" }, "qtwebview": { "url": "https://invent.kde.org/qt/qt/qtwebview.git", - "rev": "7e941648610ff4033ae8f9709077edd0595364f0", - "sha256": "082w4r674fq7ks5jbh3pj3xb3sqlhn4giy7fy0h3vw170lmcqz0m" + "rev": "f078642eb9a440f6aa88f2beaf10f445de1e29bb", + "sha256": "0qak3y3qaxs6lf34y8rcp922sqd08nvag0lvl7znxm8d5b7qmnn6" }, "qtwinextras": { "url": "https://invent.kde.org/qt/qt/qtwinextras.git", - "rev": "5afc77f5347113b607ca0262505f3406e1be5bf4", - "sha256": "1a7dm0dxqq817pib1y6m0f09sc2cqd1qkfb9anznsgpmzynvfp6r" + "rev": "1bf19cc6a7972d8543485786418b6631459d3469", + "sha256": "09a6xacb0zsp44w5zz15lkh6sypy7y1xg7m1fkxj2n26wbdc2p52" }, "qtx11extras": { "url": "https://invent.kde.org/qt/qt/qtx11extras.git", - "rev": "74f81f0bfe17e5aabcebafcb0cf36f739133554c", - "sha256": "1akp4mwvfspxdq5akpyphf6p3ay0z9pzaigiiy198w9q0yvrkgl7" + "rev": "5fb2e067a38d3583684310130f5d8aad064f512f", + "sha256": "1whfsdmyihnzzy3ijh5wcbsw9ppg3s5nx2insw5yrx36iz0y054d" }, "qtxmlpatterns": { "url": "https://invent.kde.org/qt/qt/qtxmlpatterns.git", - "rev": "0c1dcfe344c03d48d753aeb58f139bc990f2611c", - "sha256": "1cab7y9asivdg9ypwc951pczf4ddgni60l1ajlfsprk48rypr7w1" + "rev": "5a1948ddc05bf44017ac12bd5c2b9bc79fbcb9a2", + "sha256": "0613zb8lzd1i2g5kbn7h39warx7hn1z5qi28zk8l88ivpn84dx4q" } } diff --git a/pkgs/development/libraries/qt-5/5.15/srcs.nix b/pkgs/development/libraries/qt-5/5.15/srcs.nix index 6729c7c31af..130fcd332ba 100644 --- a/pkgs/development/libraries/qt-5/5.15/srcs.nix +++ b/pkgs/development/libraries/qt-5/5.15/srcs.nix @@ -1,25 +1,18 @@ { lib, fetchgit, fetchFromGitHub }: let - version = "5.15.10"; - overrides = { - qtscript.version = "5.15.9"; - }; + version = "5.15.11"; mk = name: args: - let - override = overrides.${name} or {}; - in { - version = override.version or version; - src = override.src or - fetchgit { - inherit (args) url rev sha256; - fetchLFS = false; - fetchSubmodules = true; - deepClone = false; - leaveDotGit = false; - }; + inherit version; + src = fetchgit { + inherit (args) url rev sha256; + fetchLFS = false; + fetchSubmodules = true; + deepClone = false; + leaveDotGit = false; + }; }; in lib.mapAttrs mk (lib.importJSON ./srcs-generated.json) @@ -76,15 +69,26 @@ lib.mapAttrs mk (lib.importJSON ./srcs-generated.json) hash = "sha256-LPfBCEB5tJOljXpptsNk0sHGtJf/wIRL7fccN79Nh6o="; }; + qtscript = rec { + version = "5.15.15"; + + src = fetchFromGitHub { + owner = "qt"; + repo = "qtscript"; + rev = "v${version}-lts"; + hash = "sha256-o2YG1m3LuG9Kq9Bqi1wRa6ceHsivK+hJR7w08NE/kBo="; + }; + }; + qtwebengine = rec { - version = "5.15.14"; + version = "5.15.15"; - src = fetchFromGitHub { - owner = "qt"; - repo = "qtwebengine"; - rev = "v${version}-lts"; - hash = "sha256-jIoNwRdr0bZ2p0UMp/KDQuwgNjhzzGlb91UGjQgT60Y="; - fetchSubmodules = true; - }; + src = fetchFromGitHub { + owner = "qt"; + repo = "qtwebengine"; + rev = "v${version}-lts"; + hash = "sha256-AmW3u8D9Y8lXZu0aiuxYXNPzZ5GCXeBQGfAcgFuXAh4="; + fetchSubmodules = true; }; + }; } diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix index 58f90763a24..3503067aca7 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix @@ -306,7 +306,6 @@ qtModule ({ isAarch64 (patternLogicalAnd isMips isLittleEndian) ]); - broken = stdenv.isDarwin && stdenv.isx86_64; # This build takes a long time; particularly on slow architectures timeout = 24 * 3600; diff --git a/pkgs/development/libraries/qt-6/default.nix b/pkgs/development/libraries/qt-6/default.nix index 4a211e5cb91..bef3f7ef62e 100644 --- a/pkgs/development/libraries/qt-6/default.nix +++ b/pkgs/development/libraries/qt-6/default.nix @@ -9,6 +9,7 @@ , gst_all_1 , libglvnd , darwin +, overrideSDK , buildPackages , python3 @@ -141,13 +142,18 @@ let qtwebchannel = callPackage ./modules/qtwebchannel.nix { }; qtwebengine = callPackage ./modules/qtwebengine.nix { inherit (darwin) bootstrap_cmds cctools xnu; - inherit (darwin.apple_sdk_11_0) libpm libunwind llvmPackages_14; + inherit (darwin.apple_sdk_11_0) libpm libunwind; inherit (darwin.apple_sdk_11_0.libs) sandbox; inherit (darwin.apple_sdk_11_0.frameworks) AGL AVFoundation Accelerate Cocoa CoreLocation CoreML ForceFeedback GameController ImageCaptureCore LocalAuthentication MediaAccessibility MediaPlayer MetalKit Network OpenDirectory Quartz ReplayKit SecurityInterface Vision; + qtModule = qtModule.override { + stdenv = if stdenv.isDarwin + then overrideSDK stdenv { darwinMinVersion = "10.13"; darwinSdkVersion = "11.0"; } + else stdenv; + }; xcbuild = buildPackages.xcbuild.override { productBuildVer = "20A2408"; }; diff --git a/pkgs/development/libraries/qt-6/modules/qtwayland.nix b/pkgs/development/libraries/qt-6/modules/qtwayland.nix index ddd402f3c22..94f3b80e9c3 100644 --- a/pkgs/development/libraries/qt-6/modules/qtwayland.nix +++ b/pkgs/development/libraries/qt-6/modules/qtwayland.nix @@ -1,10 +1,10 @@ { qtModule , qtbase -, qtquick3d , qtdeclarative , wayland , pkg-config , libdrm +, fetchpatch }: qtModule { @@ -12,4 +12,12 @@ qtModule { propagatedBuildInputs = [ qtbase qtdeclarative ]; buildInputs = [ wayland libdrm ]; nativeBuildInputs = [ pkg-config ]; + patches = [ + # Fix a freezing bug with fcitx5. + # https://codereview.qt-project.org/c/qt/qtwayland/+/517601 + (fetchpatch { + url = "https://code.qt.io/cgit/qt/qtwayland.git/patch/?id=6fe83f6076423068b652fa4fcb0b5adbd297f2a8"; + hash = "sha256-TlZozKezpYm90B9qFP9qv76asRdIt+5bq9E3GcmFiDc="; + }) + ]; } diff --git a/pkgs/development/libraries/qt-6/modules/qtwebengine.nix b/pkgs/development/libraries/qt-6/modules/qtwebengine.nix index 8670fba6bb2..4b4172897e0 100644 --- a/pkgs/development/libraries/qt-6/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-6/modules/qtwebengine.nix @@ -60,7 +60,6 @@ , mesa , enableProprietaryCodecs ? true # darwin -, llvmPackages_14 , bootstrap_cmds , cctools , xcbuild @@ -106,7 +105,6 @@ qtModule { gn nodejs ] ++ lib.optionals stdenv.isDarwin [ - llvmPackages_14.clang bootstrap_cmds cctools xcbuild diff --git a/pkgs/development/libraries/rapidfuzz-cpp/default.nix b/pkgs/development/libraries/rapidfuzz-cpp/default.nix index ec9669f3c7d..2f4a2ee6b1d 100644 --- a/pkgs/development/libraries/rapidfuzz-cpp/default.nix +++ b/pkgs/development/libraries/rapidfuzz-cpp/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "rapidfuzz-cpp"; - version = "2.0.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = "maxbachmann"; repo = "rapidfuzz-cpp"; rev = "v${finalAttrs.version}"; - hash = "sha256-gLiITRCxX3nkzrlvU1/ZPxEo2v7q79/MwrnURUjrY28="; + hash = "sha256-OeGn3ks+vSHt4Kdzy6kqhpFOtjoHrbPZB1BrV6Ggzz4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/re2/default.nix b/pkgs/development/libraries/re2/default.nix index c5f74854f77..a1a22fb38e4 100644 --- a/pkgs/development/libraries/re2/default.nix +++ b/pkgs/development/libraries/re2/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "re2"; - version = "2023-09-01"; + version = "2023-11-01"; src = fetchFromGitHub { owner = "google"; repo = "re2"; rev = version; - hash = "sha256-dCEkwjIs8ITVUZ4N0+qeGoShGNqKkdvJ88teyGKN6pg="; + hash = "sha256-cKXe8r5MUag/z+seem4Zg/gmqIQjaCY7DBxiKlrnXPs="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/relibc/default.nix b/pkgs/development/libraries/relibc/default.nix index 28ed971a25e..437da86e8c2 100644 --- a/pkgs/development/libraries/relibc/default.nix +++ b/pkgs/development/libraries/relibc/default.nix @@ -63,8 +63,7 @@ redoxRustPlatform.buildRustPackage rec { DESTDIR=$out make install ''; - # TODO: should be hostPlatform - TARGET = buildPackages.rust.toRustTargetSpec stdenvNoCC.targetPlatform; + TARGET = stdenvNoCC.hostPlatform.rust.rustcTargetSpec; cargoLock = { lockFile = ./Cargo.lock; diff --git a/pkgs/development/libraries/rustc-demangle/default.nix b/pkgs/development/libraries/rustc-demangle/default.nix index 6dd6d46e30b..4e142c58452 100644 --- a/pkgs/development/libraries/rustc-demangle/default.nix +++ b/pkgs/development/libraries/rustc-demangle/default.nix @@ -1,4 +1,4 @@ -{ rustPlatform, fetchFromGitHub, rust, lib, stdenv }: +{ rustPlatform, fetchFromGitHub, lib, stdenv }: rustPlatform.buildRustPackage rec { pname = "rustc-demangle"; @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { postInstall = '' mkdir -p $out/lib - cp target/${rust.toRustTargetSpec stdenv.hostPlatform}/release/librustc_demangle.so $out/lib + cp target/${stdenv.hostPlatform.rust.rustcTargetSpec}/release/librustc_demangle.so $out/lib cp -R crates/capi/include $out ''; diff --git a/pkgs/development/libraries/s2n-tls/default.nix b/pkgs/development/libraries/s2n-tls/default.nix index c1483f90c43..73092a803d6 100644 --- a/pkgs/development/libraries/s2n-tls/default.nix +++ b/pkgs/development/libraries/s2n-tls/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "s2n-tls"; - version = "1.3.50"; + version = "1.3.56"; src = fetchFromGitHub { owner = "aws"; repo = pname; rev = "v${version}"; - sha256 = "sha256-B+znuvQ7TTl2u4rw64ylPywfpr066Yf8Wg0qrdByGRE="; + hash = "sha256-VS/85qu0Dc3HSeD0DYm2f4ur+ZRPhb1Srf7BeK7Pdfk="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/science/math/amd-libflame/default.nix b/pkgs/development/libraries/science/math/amd-libflame/default.nix index 2ed35d26b90..b03352c54e8 100644 --- a/pkgs/development/libraries/science/math/amd-libflame/default.nix +++ b/pkgs/development/libraries/science/math/amd-libflame/default.nix @@ -9,7 +9,7 @@ , withOpenMP ? true , blas64 ? false -, withAMDOpt ? false +, withAMDOpt ? true }: stdenv.mkDerivation rec { @@ -37,15 +37,15 @@ stdenv.mkDerivation rec { buildInputs = [ amd-blis aocl-utils ]; cmakeFlags = [ - "-DLIBAOCLUTILS_LIBRARY_PATH=${lib.getLib aocl-utils}/lib" + "-DLIBAOCLUTILS_LIBRARY_PATH=${lib.getLib aocl-utils}/lib/libaoclutils${stdenv.hostPlatform.extensions.sharedLibrary}" "-DLIBAOCLUTILS_INCLUDE_PATH=${lib.getDev aocl-utils}/include" "-DENABLE_BUILTIN_LAPACK2FLAME=ON" "-DENABLE_CBLAS_INTERFACES=ON" "-DENABLE_EXT_LAPACK_INTERFACE=ON" ] - ++ lib.optional (!withOpenMP) "ENABLE_MULTITHREADING=OFF" - ++ lib.optional blas64 "ENABLE_ILP64=ON" - ++ lib.optional withAMDOpt "ENABLE_AMD_OPT=ON"; + ++ lib.optional (!withOpenMP) "-DENABLE_MULTITHREADING=OFF" + ++ lib.optional blas64 "-DENABLE_ILP64=ON" + ++ lib.optional withAMDOpt "-DENABLE_AMD_OPT=ON"; postInstall = '' ln -s $out/lib/libflame.so $out/lib/liblapack.so.3 diff --git a/pkgs/development/libraries/science/math/blis/default.nix b/pkgs/development/libraries/science/math/blis/default.nix index 5b78afc15ed..2c9aa745ba1 100644 --- a/pkgs/development/libraries/science/math/blis/default.nix +++ b/pkgs/development/libraries/science/math/blis/default.nix @@ -48,8 +48,8 @@ in stdenv.mkDerivation rec { ''; postInstall = '' - ln -s $out/lib/libblis.so.3 $out/lib/libblas.so.3 - ln -s $out/lib/libblis.so.3 $out/lib/libcblas.so.3 + ln -s $out/lib/libblis.so.4 $out/lib/libblas.so.3 + ln -s $out/lib/libblis.so.4 $out/lib/libcblas.so.3 ln -s $out/lib/libblas.so.3 $out/lib/libblas.so ln -s $out/lib/libcblas.so.3 $out/lib/libcblas.so ''; diff --git a/pkgs/development/libraries/science/math/coin-utils/default.nix b/pkgs/development/libraries/science/math/coin-utils/default.nix index 22aa10fc6d1..60b9de0ab33 100644 --- a/pkgs/development/libraries/science/math/coin-utils/default.nix +++ b/pkgs/development/libraries/science/math/coin-utils/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config }: +{ lib, stdenv, fetchFromGitHub, fetchpatch }: stdenv.mkDerivation rec { version = "2.11.10"; @@ -11,6 +11,15 @@ stdenv.mkDerivation rec { hash = "sha256-Rbm45HRbRKQ6Cdup+gvKJ1xkK1HKG3irR5AIjhLer7g="; }; + patches = [ + (fetchpatch { + url = "https://github.com/coin-or/CoinUtils/commit/1700ed92c2bc1562aabe65dee3b4885bd5c87fb9.patch"; + stripLen = 1; + extraPrefix = "CoinUtils/"; + hash = "sha256-8S6XteZvoJlL+5MWiOrW7HXsdcnzpuEFTyzX9qg7OUY="; + }) + ]; + doCheck = true; meta = with lib; { diff --git a/pkgs/development/libraries/science/math/libtorch/bin.nix b/pkgs/development/libraries/science/math/libtorch/bin.nix index a47d8260714..47a6249ebdc 100644 --- a/pkgs/development/libraries/science/math/libtorch/bin.nix +++ b/pkgs/development/libraries/science/math/libtorch/bin.nix @@ -26,7 +26,7 @@ in stdenv.mkDerivation { inherit version; pname = "libtorch"; - src = fetchzip srcs."${stdenv.targetPlatform.system}-${device}" or unavailable; + src = fetchzip srcs."${stdenv.hostPlatform.system}-${device}" or unavailable; nativeBuildInputs = if stdenv.isDarwin then [ fixDarwinDylibNames ] diff --git a/pkgs/development/libraries/science/math/magma/generic.nix b/pkgs/development/libraries/science/math/magma/generic.nix index 27509ee9933..6b8588207dc 100644 --- a/pkgs/development/libraries/science/math/magma/generic.nix +++ b/pkgs/development/libraries/science/math/magma/generic.nix @@ -24,7 +24,8 @@ , libpthreadstubs , magmaRelease , ninja -, rocmSupport ? false +, config +, rocmSupport ? config.rocmSupport , static ? false , stdenv , symlinkJoin diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix index 950402315a9..3fc533e848d 100644 --- a/pkgs/development/libraries/science/math/openblas/default.nix +++ b/pkgs/development/libraries/science/math/openblas/default.nix @@ -141,7 +141,7 @@ let in stdenv.mkDerivation rec { pname = "openblas"; - version = "0.3.21"; + version = "0.3.24"; outputs = [ "out" "dev" ]; @@ -149,18 +149,9 @@ stdenv.mkDerivation rec { owner = "xianyi"; repo = "OpenBLAS"; rev = "v${version}"; - sha256 = "sha256-F6cXPqQai4kA5zrsa8E0Q7dD9zZHlwZ+B16EOGNXoXs="; + sha256 = "sha256-IuXhrZRB3o7kbnivv/6En/aAeF2F18sQw9pKs1WEJc4="; }; - patches = lib.optionals stdenv.hostPlatform.isLoongArch64 [ - # https://github.com/xianyi/OpenBLAS/pull/3626 - (fetchpatch { - name = "openblas-0.3.21-fix-loong.patch"; - url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sci-libs/openblas/files/openblas-0.3.21-fix-loong.patch?id=37ee4c70278eb41181f69e175575b0152b941655"; - hash = "sha256-iWy11l3wEvzNV08LbhOjnSPj1SjPH8RMnb3ORz7V+gc"; - }) - ]; - postPatch = '' # cc1: error: invalid feature modifier 'sve2' in '-march=armv8.5-a+sve+sve2+bf16' substituteInPlace Makefile.arm64 --replace "+sve2+bf16" "" diff --git a/pkgs/development/libraries/science/math/suitesparse/default.nix b/pkgs/development/libraries/science/math/suitesparse/default.nix index 67dfef186e7..dd2eb9478f7 100644 --- a/pkgs/development/libraries/science/math/suitesparse/default.nix +++ b/pkgs/development/libraries/science/math/suitesparse/default.nix @@ -60,6 +60,12 @@ stdenv.mkDerivation rec { ] ; + env = lib.optionalAttrs stdenv.isDarwin { + # Ensure that there is enough space for the `fixDarwinDylibNames` hook to + # update the install names of the output dylibs. + NIX_LDFLAGS = "-headerpad_max_install_names"; + }; + buildFlags = [ # Build individual shared libraries, not demos "library" diff --git a/pkgs/development/libraries/science/math/superlu/default.nix b/pkgs/development/libraries/science/math/superlu/default.nix index 26dd00d9606..f99e86ffe47 100644 --- a/pkgs/development/libraries/science/math/superlu/default.nix +++ b/pkgs/development/libraries/science/math/superlu/default.nix @@ -21,6 +21,13 @@ stdenv.mkDerivation rec { "-DUSE_XSDK_DEFAULTS=true" ]; + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = toString [ + "-Wno-error=implicit-function-declaration" + "-Wno-error=implicit-int" + ]; + }; + patches = [ ./add-superlu-lib-as-dependency-for-the-unit-tests.patch ]; diff --git a/pkgs/development/libraries/science/math/zn_poly/default.nix b/pkgs/development/libraries/science/math/zn_poly/default.nix index 13344db9ebc..bdaf6e6284e 100644 --- a/pkgs/development/libraries/science/math/zn_poly/default.nix +++ b/pkgs/development/libraries/science/math/zn_poly/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { # name of library file ("libzn_poly.so") libbasename = "libzn_poly"; - libext = stdenv.targetPlatform.extensions.sharedLibrary; + libext = stdenv.hostPlatform.extensions.sharedLibrary; makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; diff --git a/pkgs/development/libraries/sentry-native/default.nix b/pkgs/development/libraries/sentry-native/default.nix index e8c090e392b..95ba1dc68e5 100644 --- a/pkgs/development/libraries/sentry-native/default.nix +++ b/pkgs/development/libraries/sentry-native/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "sentry-native"; - version = "0.6.6"; + version = "0.6.7"; src = fetchFromGitHub { owner = "getsentry"; repo = "sentry-native"; rev = version; - hash = "sha256-mi9mEyb25fb3W6X07TX36fW6T2SOPOkDvpIXQn5sg8Q="; + hash = "sha256-pEFfs8xjc+6r+60aJF4Sjjy/oSU/+ADWgOBpS3t9rWI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/sfml/default.nix b/pkgs/development/libraries/sfml/default.nix index be5db122d24..c3ecd3a9866 100644 --- a/pkgs/development/libraries/sfml/default.nix +++ b/pkgs/development/libraries/sfml/default.nix @@ -37,6 +37,10 @@ stdenv.mkDerivation rec { extraPrefix = ""; sha256 = "sha256-9dNawJaYtkugR+2NvhQOhgsf6w9ZXHkBgsDRh8yAJc0="; }) + (fetchpatch { + url = "https://github.com/SFML/SFML/commit/bf92efe9a4035fee0258386173d53556aa196e49.patch"; + hash = "sha256-1htwPfpn7Z6s/3b+/i1tQ+btjr/tWv5m6IyDVMBNqQA="; + }) ]; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/shapelib/default.nix b/pkgs/development/libraries/shapelib/default.nix index f0afda7a900..fe17da91e58 100644 --- a/pkgs/development/libraries/shapelib/default.nix +++ b/pkgs/development/libraries/shapelib/default.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation rec { description = "C Library for reading, writing and updating ESRI Shapefiles"; homepage = "http://shapelib.maptools.org/"; license = licenses.gpl2; - maintainers = [ maintainers.ehmry ]; + maintainers = with maintainers; teams.geospatial.members ++ [ ehmry ]; }; } diff --git a/pkgs/development/libraries/simdjson/default.nix b/pkgs/development/libraries/simdjson/default.nix index 5ac49ac278f..53a5e09413c 100644 --- a/pkgs/development/libraries/simdjson/default.nix +++ b/pkgs/development/libraries/simdjson/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "simdjson"; - version = "3.4.0"; + version = "3.6.0"; src = fetchFromGitHub { owner = "simdjson"; repo = "simdjson"; rev = "v${version}"; - sha256 = "sha256-d1tJJCHbx+7klS918Db7S2N8zCdvd9MhI5ybxJpncUw="; + sha256 = "sha256-g1jrjRls9tJWh0koMg7MsUgRSNaty8YI+ivlwL6FCsk="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/smpeg/default.nix b/pkgs/development/libraries/smpeg/default.nix index f25ac14df86..099a3d838bb 100644 --- a/pkgs/development/libraries/smpeg/default.nix +++ b/pkgs/development/libraries/smpeg/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, SDL, autoconf, automake, libtool, gtk2, m4, pkg-config, libGLU, libGL, makeWrapper }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, SDL, autoconf, automake, libtool, gtk2, m4, pkg-config, libGLU, libGL, makeWrapper }: stdenv.mkDerivation rec { pname = "smpeg"; @@ -16,8 +16,24 @@ stdenv.mkDerivation rec { ./gcc6.patch ./libx11.patch ./gtk.patch + # These patches remove use of the `register` storage class specifier, + # allowing smpeg to build with clang 16, which defaults to C++17. + (fetchpatch { + url = "https://github.com/icculus/smpeg/commit/cc114ba0dd8644c0d6205bbce2384781daeff44b.patch"; + hash = "sha256-GxSD82j05pw0r2SxmPYAe/BXX4iUc+iHWhB9Ap4GzfA="; + }) + (fetchpatch { + url = "https://github.com/icculus/smpeg/commit/b369feca5bf99d6cff50d8eb316395ef48acf24f.patch"; + hash = "sha256-U+a6dbc5cm249KlUcf4vi79yUiT4hgEvMv522K4PqUc="; + }) ]; + postPatch = '' + substituteInPlace video/gdith.cpp \ + --replace 'register int' 'int' \ + --replace 'register Uint16' 'Uint16' + ''; + enableParallelBuilding = true; nativeBuildInputs = [ autoconf automake libtool m4 pkg-config makeWrapper ]; diff --git a/pkgs/development/libraries/spirv-headers/default.nix b/pkgs/development/libraries/spirv-headers/default.nix index 44ad21d6a14..3e18424d6b7 100644 --- a/pkgs/development/libraries/spirv-headers/default.nix +++ b/pkgs/development/libraries/spirv-headers/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "spirv-headers"; - version = "1.3.261.0"; + version = "1.3.268.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Headers"; - rev = "sdk-${version}"; - hash = "sha256-P/ZD53Xa4Fk9+N/bW5HhsfA+LjUnCbBsQDHvXesKu5M="; + rev = "vulkan-sdk-${version}"; + hash = "sha256-uOnSTih14bUPtrJgp7vVb3/UfdKsF6jFQqjlFeJ81AI="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index f51ce3a5000..ec4cc458c4b 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -17,13 +17,13 @@ in stdenv.mkDerivation rec { pname = "sqlite${lib.optionalString interactive "-interactive"}"; - version = "3.43.1"; + version = "3.43.2"; # nixpkgs-update: no auto update # NB! Make sure to update ./tools.nix src (in the same directory). src = fetchurl { url = "https://sqlite.org/2023/sqlite-autoconf-${archiveVersion version}.tar.gz"; - hash = "sha256-ORFslOdmMPItVM2Cw86jCFZfFxX3FtGyUn8cnJabpNk="; + hash = "sha256-bUIrb2LE3iyoDWGGDjo/tpNVTS91uxqsp0PMxNb2CfA="; }; outputs = [ "bin" "dev" "out" ]; diff --git a/pkgs/development/libraries/sqlite/tools.nix b/pkgs/development/libraries/sqlite/tools.nix index 31207ad9edf..6028c638a7e 100644 --- a/pkgs/development/libraries/sqlite/tools.nix +++ b/pkgs/development/libraries/sqlite/tools.nix @@ -4,12 +4,12 @@ let archiveVersion = import ./archive-version.nix lib; mkTool = { pname, makeTarget, description, homepage, mainProgram }: stdenv.mkDerivation rec { inherit pname; - version = "3.43.1"; + version = "3.43.2"; # nixpkgs-update: no auto update src = assert version == sqlite.version; fetchurl { url = "https://sqlite.org/2023/sqlite-src-${archiveVersion version}.zip"; - hash = "sha256-IunC70n+b4otvJPE09zgnG1qT1Y95SsKgXGtSajHKRc="; + hash = "sha256-62ZRUj9XpccPJC/Ba8QWuB7QLVkmOb+34JnyAeL5otM="; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/development/libraries/startup-notification/default.nix b/pkgs/development/libraries/startup-notification/default.nix index c1c5819ad42..bf84345be2d 100644 --- a/pkgs/development/libraries/startup-notification/default.nix +++ b/pkgs/development/libraries/startup-notification/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "3c391f7e930c583095045cd2d10eb73a64f085c7fde9d260f2652c7cb3cfbe4a"; }; - configureFlags = lib.optionals (stdenv.buildPlatform != stdenv.targetPlatform) [ + configureFlags = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "lf_cv_sane_realloc=yes" ]; diff --git a/pkgs/development/libraries/stfl/default.nix b/pkgs/development/libraries/stfl/default.nix index 845e815be59..e848b433095 100644 --- a/pkgs/development/libraries/stfl/default.nix +++ b/pkgs/development/libraries/stfl/default.nix @@ -13,6 +13,15 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses libiconv ]; + # Silence warnings related to use of implicitly declared library functions and implicit ints. + # TODO: Remove and/or fix with patches the next time this package is updated. + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = toString [ + "-Wno-error=implicit-function-declaration" + "-Wno-error=implicit-int" + ]; + }; + preBuild = '' sed -i s/gcc/cc/g Makefile sed -i s%ncursesw/ncurses.h%ncurses.h% stfl_internals.h diff --git a/pkgs/development/libraries/tbb/default.nix b/pkgs/development/libraries/tbb/default.nix index ff6a3343837..b6cc969b9f7 100644 --- a/pkgs/development/libraries/tbb/default.nix +++ b/pkgs/development/libraries/tbb/default.nix @@ -39,6 +39,8 @@ stdenv.mkDerivation rec { # Fix build with modern gcc # In member function 'void std::__atomic_base<_IntTp>::store(__int_type, std::memory_order) [with _ITp = bool]', NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isGNU [ "-Wno-error=stringop-overflow" ] ++ + # error: variable 'val' set but not used + lib.optionals stdenv.cc.isClang [ "-Wno-error=unused-but-set-variable" ] ++ # Workaround for gcc-12 ICE when using -O3 # https://gcc.gnu.org/PR108854 lib.optionals (stdenv.cc.isGNU && stdenv.isx86_32) [ "-O2" ]; diff --git a/pkgs/development/libraries/tecla/default.nix b/pkgs/development/libraries/tecla/default.nix index 7163f24815c..4c6ec8e0169 100644 --- a/pkgs/development/libraries/tecla/default.nix +++ b/pkgs/development/libraries/tecla/default.nix @@ -14,6 +14,10 @@ stdenv.mkDerivation rec { --replace "stripprog=" "stripprog=\$STRIP # " ''; + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; + }; + meta = { description = "Command-line editing library"; homepage = "https://www.astro.caltech.edu/~mcs/tecla/"; diff --git a/pkgs/development/libraries/ti-rpc/default.nix b/pkgs/development/libraries/ti-rpc/default.nix index 0e67ce8adea..c12178d833d 100644 --- a/pkgs/development/libraries/ti-rpc/default.nix +++ b/pkgs/development/libraries/ti-rpc/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libtirpc"; - version = "1.3.3"; + version = "1.3.4"; src = fetchurl { - url = "http://git.linux-nfs.org/?p=steved/libtirpc.git;a=snapshot;h=0fb94eef5062d2657d75eee686fa47238fafa312;sf=tgz"; - sha256 = "sha256-3P3xYKeAmLbBI4TdsG1VZBO7py9ktiwhXNtGsnryGNI="; + url = "http://git.linux-nfs.org/?p=steved/libtirpc.git;a=snapshot;h=refs/tags/libtirpc-${lib.replaceStrings ["."] ["-"] version};sf=tgz"; + sha256 = "sha256-fmZxpdyl98z+QBHpEccGB8A+YktuWONw6k0p06AImDw="; name = "${pname}-${version}.tar.gz"; }; @@ -15,11 +15,14 @@ stdenv.mkDerivation rec { KRB5_CONFIG = "${libkrb5.dev}/bin/krb5-config"; nativeBuildInputs = [ autoreconfHook ]; propagatedBuildInputs = [ libkrb5 ]; + strictDeps = true; preConfigure = '' sed -es"|/etc/netconfig|$out/etc/netconfig|g" -i doc/Makefile.in tirpc/netconfig.h ''; + enableParallelBuilding = true; + preInstall = '' mkdir -p $out/etc ''; diff --git a/pkgs/development/libraries/tiledb/default.nix b/pkgs/development/libraries/tiledb/default.nix index 21c63f71221..ea41b8156f7 100644 --- a/pkgs/development/libraries/tiledb/default.nix +++ b/pkgs/development/libraries/tiledb/default.nix @@ -65,6 +65,9 @@ stdenv.mkDerivation rec { postPatch = '' mkdir -p build/externals/src/ep_catch ln -sf ${catch2}/include/catch2 build/externals/src/ep_catch/single_include + + sed -i '38i list(APPEND OPENSSL_PATHS "${openssl.dev}" "${openssl.out}")' \ + cmake/Modules/FindOpenSSL_EP.cmake ''; doCheck = true; diff --git a/pkgs/development/libraries/tinycompress/default.nix b/pkgs/development/libraries/tinycompress/default.nix deleted file mode 100644 index 96b82bc696f..00000000000 --- a/pkgs/development/libraries/tinycompress/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ lib -, stdenv -, fetchurl -}: - -stdenv.mkDerivation rec { - pname = "tinycompress"; - version = "1.2.8"; - - src = fetchurl { - url = "mirror://alsa/tinycompress/${pname}-${version}.tar.bz2"; - hash = "sha256-L4l+URLNO8pnkLXOz9puBmLIvF7g+6uXKyR6DMYg1mw="; - }; - - meta = with lib; { - homepage = "http://www.alsa-project.org/"; - description = "a userspace library for anyone who wants to use the ALSA compressed APIs"; - license = licenses.bsd3; - platforms = platforms.linux; - maintainers = with maintainers; [ k900 ]; - }; -} diff --git a/pkgs/development/libraries/tk/generic.nix b/pkgs/development/libraries/tk/generic.nix index ab973c957ae..57a9b617d95 100644 --- a/pkgs/development/libraries/tk/generic.nix +++ b/pkgs/development/libraries/tk/generic.nix @@ -22,7 +22,7 @@ tcl.mkTclDerivation { substituteInPlace $file --replace "exec wish" "exec $out/bin/wish" done '' - + lib.optionalString (stdenv.isDarwin && lib.versionOlder stdenv.targetPlatform.darwinMinVersion "11") '' + + lib.optionalString (stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "11") '' substituteInPlace unix/configure* \ --replace " -framework UniformTypeIdentifiers" "" ''; diff --git a/pkgs/development/libraries/ucx/default.nix b/pkgs/development/libraries/ucx/default.nix index 4c2855185b0..627cac56bb7 100644 --- a/pkgs/development/libraries/ucx/default.nix +++ b/pkgs/development/libraries/ucx/default.nix @@ -3,7 +3,7 @@ , config , enableCuda ? config.cudaSupport , cudatoolkit -, enableRocm ? false +, enableRocm ? config.rocmSupport , rocmPackages }: diff --git a/pkgs/development/libraries/usrsctp/clang-fix-build.patch b/pkgs/development/libraries/usrsctp/clang-fix-build.patch new file mode 100644 index 00000000000..eb136e8be30 --- /dev/null +++ b/pkgs/development/libraries/usrsctp/clang-fix-build.patch @@ -0,0 +1,183 @@ +diff --git a/usrsctplib/netinet/sctp_cc_functions.c b/usrsctplib/netinet/sctp_cc_functions.c +index 57bcdaa..70cf8b7 100755 +--- a/usrsctplib/netinet/sctp_cc_functions.c ++++ b/usrsctplib/netinet/sctp_cc_functions.c +@@ -764,7 +764,7 @@ sctp_cwnd_update_after_sack_common(struct sctp_tcb *stcb, + #if defined(__FreeBSD__) && !defined(__Userspace__) + int old_cwnd; + #endif +- uint32_t t_ssthresh, t_cwnd, incr; ++ uint32_t t_ssthresh, incr; + uint64_t t_ucwnd_sbw; + uint64_t t_path_mptcp; + uint64_t mptcp_like_alpha; +@@ -773,7 +773,6 @@ sctp_cwnd_update_after_sack_common(struct sctp_tcb *stcb, + + /* MT FIXME: Don't compute this over and over again */ + t_ssthresh = 0; +- t_cwnd = 0; + t_ucwnd_sbw = 0; + t_path_mptcp = 0; + mptcp_like_alpha = 1; +@@ -783,7 +782,6 @@ sctp_cwnd_update_after_sack_common(struct sctp_tcb *stcb, + max_path = 0; + TAILQ_FOREACH(net, &stcb->asoc.nets, sctp_next) { + t_ssthresh += net->ssthresh; +- t_cwnd += net->cwnd; + /* lastsa>>3; we don't need to devide ...*/ + srtt = net->lastsa; + if (srtt > 0) { +diff --git a/usrsctplib/netinet/sctp_indata.c b/usrsctplib/netinet/sctp_indata.c +index 3bce9e9..42ce111 100755 +--- a/usrsctplib/netinet/sctp_indata.c ++++ b/usrsctplib/netinet/sctp_indata.c +@@ -3320,7 +3320,6 @@ sctp_strike_gap_ack_chunks(struct sctp_tcb *stcb, struct sctp_association *asoc, + struct sctp_tmit_chunk *tp1; + int strike_flag = 0; + struct timeval now; +- int tot_retrans = 0; + uint32_t sending_seq; + struct sctp_nets *net; + int num_dests_sacked = 0; +@@ -3691,7 +3690,6 @@ sctp_strike_gap_ack_chunks(struct sctp_tcb *stcb, struct sctp_association *asoc, + } + + tp1->rec.data.doing_fast_retransmit = 1; +- tot_retrans++; + /* mark the sending seq for possible subsequent FR's */ + /* + * SCTP_PRINTF("Marking TSN for FR new value %x\n", +diff --git a/usrsctplib/netinet/sctp_output.c b/usrsctplib/netinet/sctp_output.c +index 6a7dff9..a914b3b 100755 +--- a/usrsctplib/netinet/sctp_output.c ++++ b/usrsctplib/netinet/sctp_output.c +@@ -9970,7 +9970,7 @@ sctp_chunk_retransmission(struct sctp_inpcb *inp, + struct mbuf *m, *endofchain; + struct sctp_nets *net = NULL; + uint32_t tsns_sent = 0; +- int no_fragmentflg, bundle_at, cnt_thru; ++ int no_fragmentflg, bundle_at; + unsigned int mtu; + int error, i, one_chunk, fwd_tsn, ctl_cnt, tmr_started; + struct sctp_auth_chunk *auth = NULL; +@@ -10046,7 +10046,6 @@ sctp_chunk_retransmission(struct sctp_inpcb *inp, + } + } + one_chunk = 0; +- cnt_thru = 0; + /* do we have control chunks to retransmit? */ + if (m != NULL) { + /* Start a timer no matter if we succeed or fail */ +@@ -10368,7 +10367,6 @@ sctp_chunk_retransmission(struct sctp_inpcb *inp, + /* (void)SCTP_GETTIME_TIMEVAL(&net->last_sent_time); */ + + /* For auto-close */ +- cnt_thru++; + if (*now_filled == 0) { + (void)SCTP_GETTIME_TIMEVAL(&asoc->time_last_sent); + *now = asoc->time_last_sent; +@@ -13416,7 +13414,7 @@ sctp_lower_sosend(struct socket *so, + struct epoch_tracker et; + #endif + ssize_t sndlen = 0, max_len, local_add_more; +- int error, len; ++ int error; + struct mbuf *top = NULL; + int queue_only = 0, queue_only_for_init = 0; + int free_cnt_applied = 0; +@@ -14035,7 +14033,6 @@ sctp_lower_sosend(struct socket *so, + */ + local_add_more = sndlen; + } +- len = 0; + if (non_blocking) { + goto skip_preblock; + } +@@ -14265,7 +14262,6 @@ skip_preblock: + } + sctp_snd_sb_alloc(stcb, sndout); + atomic_add_int(&sp->length, sndout); +- len += sndout; + if (sinfo_flags & SCTP_SACK_IMMEDIATELY) { + sp->sinfo_flags |= SCTP_SACK_IMMEDIATELY; + } +diff --git a/usrsctplib/netinet/sctp_pcb.c b/usrsctplib/netinet/sctp_pcb.c +index 89a66bc..a952921 100755 +--- a/usrsctplib/netinet/sctp_pcb.c ++++ b/usrsctplib/netinet/sctp_pcb.c +@@ -7943,7 +7943,7 @@ sctp_drain_mbufs(struct sctp_tcb *stcb) + } + + void +-sctp_drain() ++sctp_drain(void) + { + /* + * We must walk the PCB lists for ALL associations here. The system +diff --git a/usrsctplib/netinet/sctp_sysctl.c b/usrsctplib/netinet/sctp_sysctl.c +index bb49e17..8b77f7e 100755 +--- a/usrsctplib/netinet/sctp_sysctl.c ++++ b/usrsctplib/netinet/sctp_sysctl.c +@@ -61,7 +61,7 @@ FEATURE(sctp, "Stream Control Transmission Protocol"); + */ + + void +-sctp_init_sysctls() ++sctp_init_sysctls(void) + { + SCTP_BASE_SYSCTL(sctp_sendspace) = SCTPCTL_MAXDGRAM_DEFAULT; + SCTP_BASE_SYSCTL(sctp_recvspace) = SCTPCTL_RECVSPACE_DEFAULT; +diff --git a/usrsctplib/user_socket.c b/usrsctplib/user_socket.c +index 513a5a9..89e9eb2 100755 +--- a/usrsctplib/user_socket.c ++++ b/usrsctplib/user_socket.c +@@ -2857,7 +2857,6 @@ sctp_userspace_ip_output(int *result, struct mbuf *o_pak, + struct mbuf *m_orig; + int iovcnt; + int len; +- int send_count; + struct ip *ip; + struct udphdr *udp; + struct sockaddr_in dst; +@@ -2930,16 +2929,13 @@ sctp_userspace_ip_output(int *result, struct mbuf *o_pak, + m_adj(m, sizeof(struct ip) + sizeof(struct udphdr)); + } + +- send_count = 0; + for (iovcnt = 0; m != NULL && iovcnt < MAXLEN_MBUF_CHAIN; m = m->m_next, iovcnt++) { + #if !defined(_WIN32) + send_iovec[iovcnt].iov_base = (caddr_t)m->m_data; + send_iovec[iovcnt].iov_len = SCTP_BUF_LEN(m); +- send_count += send_iovec[iovcnt].iov_len; + #else + send_iovec[iovcnt].buf = (caddr_t)m->m_data; + send_iovec[iovcnt].len = SCTP_BUF_LEN(m); +- send_count += send_iovec[iovcnt].len; + #endif + } + +@@ -3002,7 +2998,6 @@ void sctp_userspace_ip6_output(int *result, struct mbuf *o_pak, + struct mbuf *m_orig; + int iovcnt; + int len; +- int send_count; + struct ip6_hdr *ip6; + struct udphdr *udp; + struct sockaddr_in6 dst; +@@ -3076,16 +3071,13 @@ void sctp_userspace_ip6_output(int *result, struct mbuf *o_pak, + m_adj(m, sizeof(struct ip6_hdr)); + } + +- send_count = 0; + for (iovcnt = 0; m != NULL && iovcnt < MAXLEN_MBUF_CHAIN; m = m->m_next, iovcnt++) { + #if !defined(_WIN32) + send_iovec[iovcnt].iov_base = (caddr_t)m->m_data; + send_iovec[iovcnt].iov_len = SCTP_BUF_LEN(m); +- send_count += send_iovec[iovcnt].iov_len; + #else + send_iovec[iovcnt].buf = (caddr_t)m->m_data; + send_iovec[iovcnt].len = SCTP_BUF_LEN(m); +- send_count += send_iovec[iovcnt].len; + #endif + } + if (m != NULL) { diff --git a/pkgs/development/libraries/usrsctp/default.nix b/pkgs/development/libraries/usrsctp/default.nix index af8979c79d1..9723f887b82 100644 --- a/pkgs/development/libraries/usrsctp/default.nix +++ b/pkgs/development/libraries/usrsctp/default.nix @@ -11,6 +11,13 @@ stdenv.mkDerivation rec { sha256 = "10ndzkip8blgkw572n3dicl6mgjaa7kygwn3vls80liq92vf1sa9"; }; + patches = [ + # usrsctp fails to build with clang 15+ due to set but unused variable and missing prototype + # errors. These issues are fixed in the master branch, but a new release with them has not + # been made. The following patch can be dropped once a release has been made. + ./clang-fix-build.patch + ]; + nativeBuildInputs = [ cmake ]; # https://github.com/sctplab/usrsctp/issues/662 diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix index a9891a9d328..7edf2cdf7c4 100644 --- a/pkgs/development/libraries/v8/default.nix +++ b/pkgs/development/libraries/v8/default.nix @@ -136,7 +136,7 @@ stdenv.mkDerivation rec { ++ lib.optional stdenv.isDarwin ''use_lld=false''; env.NIX_CFLAGS_COMPILE = "-O2"; - FORCE_MAC_SDK_MIN = stdenv.targetPlatform.sdkVer or "10.12"; + FORCE_MAC_SDK_MIN = stdenv.hostPlatform.sdkVer or "10.12"; nativeBuildInputs = [ myGn diff --git a/pkgs/development/libraries/vapoursynth/plugin-interface.nix b/pkgs/development/libraries/vapoursynth/plugin-interface.nix index 064893a3dbc..f962634b131 100644 --- a/pkgs/development/libraries/vapoursynth/plugin-interface.nix +++ b/pkgs/development/libraries/vapoursynth/plugin-interface.nix @@ -36,7 +36,7 @@ plugins: let $CC -shared -fPIC ${source} -o "$out/lib/libvapoursynth-nix-plugins${ext}" ''; - ext = stdenv.targetPlatform.extensions.sharedLibrary; + ext = stdenv.hostPlatform.extensions.sharedLibrary; in runCommand "${vapoursynth.name}-with-plugins" { nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/libraries/vtk/generic.nix b/pkgs/development/libraries/vtk/generic.nix index c1717319292..02309b275bd 100644 --- a/pkgs/development/libraries/vtk/generic.nix +++ b/pkgs/development/libraries/vtk/generic.nix @@ -83,6 +83,10 @@ in stdenv.mkDerivation { "-DVTK_PYTHON_VERSION:STRING=${pythonMajor}" ]; + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-function-pointer-types"; + }; + postPatch = optionalString stdenv.isDarwin '' sed -i 's|COMMAND vtkHashSource|COMMAND "DYLD_LIBRARY_PATH=''${VTK_BINARY_DIR}/lib" ''${VTK_BINARY_DIR}/bin/vtkHashSource-${majorVersion}|' ./Parallel/Core/CMakeLists.txt sed -i 's/fprintf(output, shift)/fprintf(output, "%s", shift)/' ./ThirdParty/libxml2/vtklibxml2/xmlschemas.c diff --git a/pkgs/development/libraries/vulkan-headers/default.nix b/pkgs/development/libraries/vulkan-headers/default.nix index 48e036ad030..f6c9dcb953e 100644 --- a/pkgs/development/libraries/vulkan-headers/default.nix +++ b/pkgs/development/libraries/vulkan-headers/default.nix @@ -1,15 +1,15 @@ { lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "vulkan-headers"; - version = "1.3.261"; + version = "1.3.268.0"; nativeBuildInputs = [ cmake ]; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-Headers"; - rev = "v${version}"; - hash = "sha256-zKHew7SGUq1C3XGp/HrCle6KyqB4cziPcTYVqAr814s="; + rev = "vulkan-sdk-${version}"; + hash = "sha256-CDjWTXXnUgj9QaLDNuSVy+wf8If5LehwOZ0t0Fuh2Ro="; }; passthru.updateScript = ./update.sh; diff --git a/pkgs/development/libraries/vulkan-headers/update.sh b/pkgs/development/libraries/vulkan-headers/update.sh index 7f6292ed23b..da4e42ded84 100755 --- a/pkgs/development/libraries/vulkan-headers/update.sh +++ b/pkgs/development/libraries/vulkan-headers/update.sh @@ -3,7 +3,7 @@ set -euf -o pipefail -V_PACKAGES=( +SDK_PACKAGES=( "vulkan-headers" "vulkan-loader" "vulkan-validation-layers" @@ -11,9 +11,6 @@ V_PACKAGES=( "vulkan-tools-lunarg" "vulkan-extension-layer" "vulkan-utility-libraries" -) - -SDK_PACKAGES=( "spirv-headers" "spirv-cross" "spirv-tools" @@ -21,10 +18,6 @@ SDK_PACKAGES=( nix-update glslang --version-regex '(\d+\.\d+\.\d+)' --commit -for P in "${V_PACKAGES[@]}"; do - nix-update "$P" --version-regex "(?:v)(.*)" --commit -done - for P in "${SDK_PACKAGES[@]}"; do - nix-update "$P" --version-regex "(?:sdk-)(.*)" --commit + nix-update "$P" --version-regex "(?:vulkan-sdk-)(.*)" --commit done diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix index 6e994eaa78c..163cea7565c 100644 --- a/pkgs/development/libraries/vulkan-loader/default.nix +++ b/pkgs/development/libraries/vulkan-loader/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "vulkan-loader"; - version = "1.3.261"; + version = "1.3.268.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-Loader"; - rev = "v${version}"; - hash = "sha256-5QCVHfvjE98EnL2Dr7g9fdrJAg+np1Q6hgqcuZCWReQ="; + rev = "vulkan-sdk-${version}"; + hash = "sha256-TDn8eVz1fhGfvUiGcxqOk2BN9tuIF5+ssIXtOo3weS0="; }; patches = [ ./fix-pkgconfig.patch ]; diff --git a/pkgs/development/libraries/vulkan-loader/fix-pkgconfig.patch b/pkgs/development/libraries/vulkan-loader/fix-pkgconfig.patch index 42295a67d46..b9c5e8ad453 100644 --- a/pkgs/development/libraries/vulkan-loader/fix-pkgconfig.patch +++ b/pkgs/development/libraries/vulkan-loader/fix-pkgconfig.patch @@ -5,8 +5,8 @@ index 153815577..584b15273 100644 @@ -1,7 +1,5 @@ -prefix=@CMAKE_INSTALL_PREFIX@ -exec_prefix=${prefix} --libdir=${exec_prefix}/@CMAKE_INSTALL_REL_LIBDIR_PC@ --includedir=${prefix}/@CMAKE_INSTALL_REL_INCLUDEDIR_PC@ +-libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR_PC@ +-includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR_PC@ +libdir=@CMAKE_INSTALL_LIBDIR@ +includedir=@CMAKE_INSTALL_INCLUDEDIR@ diff --git a/pkgs/development/libraries/vulkan-utility-libraries/default.nix b/pkgs/development/libraries/vulkan-utility-libraries/default.nix index f82fad83627..c79f599f5c6 100644 --- a/pkgs/development/libraries/vulkan-utility-libraries/default.nix +++ b/pkgs/development/libraries/vulkan-utility-libraries/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "vulkan-utility-libraries"; - version = "1.3.269"; + version = "1.3.270"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-Utility-Libraries"; rev = "v${finalAttrs.version}"; - hash = "sha256-7BN+U97dqpSyCYhHuFTPqokRnABH7Gt91njZPxItpzg="; + hash = "sha256-P1v5UEAooTDGA10K4uck8lhcrbW2ccl44gWIGVnZ6uo="; }; nativeBuildInputs = [ cmake python3 ]; diff --git a/pkgs/development/libraries/wasilibc/default.nix b/pkgs/development/libraries/wasilibc/default.nix index 0dce309ef5c..4c49788464d 100644 --- a/pkgs/development/libraries/wasilibc/default.nix +++ b/pkgs/development/libraries/wasilibc/default.nix @@ -8,7 +8,7 @@ let pname = "wasilibc"; - version = "19"; + version = "20"; in stdenv.mkDerivation { inherit pname version; @@ -17,7 +17,7 @@ stdenv.mkDerivation { owner = "WebAssembly"; repo = "wasi-libc"; rev = "refs/tags/wasi-sdk-${version}"; - hash = "sha256-yQSKoSil/C/1lIHwEO9eQKC/ye3PJIFGYjHyNDn61y4="; + hash = "sha256-H92PDrH1FL7S3eMCK1+wqclryjhwghl21bOlRCAr1U4="; fetchSubmodules = true; }; diff --git a/pkgs/development/libraries/wayland/protocols.nix b/pkgs/development/libraries/wayland/protocols.nix index dc53bbb54d2..0fadb103ce3 100644 --- a/pkgs/development/libraries/wayland/protocols.nix +++ b/pkgs/development/libraries/wayland/protocols.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { version = "1.32"; # https://gitlab.freedesktop.org/wayland/wayland-protocols/-/issues/48 - doCheck = stdenv.hostPlatform == stdenv.buildPlatform && stdenv.targetPlatform.linker == "bfd" && wayland.withLibraries; + doCheck = stdenv.hostPlatform == stdenv.buildPlatform && stdenv.hostPlatform.linker == "bfd" && wayland.withLibraries; src = fetchurl { url = "https://gitlab.freedesktop.org/wayland/${pname}/-/releases/${version}/downloads/${pname}-${version}.tar.xz"; diff --git a/pkgs/development/libraries/webrtc-audio-processing/default.nix b/pkgs/development/libraries/webrtc-audio-processing/default.nix index b0f9ce53e72..ad2b12de891 100644 --- a/pkgs/development/libraries/webrtc-audio-processing/default.nix +++ b/pkgs/development/libraries/webrtc-audio-processing/default.nix @@ -20,6 +20,8 @@ stdenv.mkDerivation rec { hash = "sha256-8CDt4kMt2Owzyv22dqWIcFuHeg4Y3FxB405cLw3FZ+g="; }; + outputs = [ "out" "dev" ]; + nativeBuildInputs = [ meson ninja diff --git a/pkgs/development/libraries/wtk/builder.sh b/pkgs/development/libraries/wtk/builder.sh index c3ad173b093..ca5157c6d71 100644 --- a/pkgs/development/libraries/wtk/builder.sh +++ b/pkgs/development/libraries/wtk/builder.sh @@ -1,4 +1,4 @@ -if [ -e .attrs.sh ]; then source .attrs.sh; fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi source $stdenv/setup mkdir unzipped diff --git a/pkgs/development/libraries/wxSVG/default.nix b/pkgs/development/libraries/wxSVG/default.nix index 7b018c89f50..5e9b9f2fcb7 100644 --- a/pkgs/development/libraries/wxSVG/default.nix +++ b/pkgs/development/libraries/wxSVG/default.nix @@ -2,6 +2,7 @@ , stdenv , fetchurl , cairo +, expat , ffmpeg , libexif , pango @@ -28,6 +29,7 @@ stdenv.mkDerivation rec { buildInputs = [ cairo + expat ffmpeg libexif pango diff --git a/pkgs/development/libraries/wxwidgets/wxGTK32.nix b/pkgs/development/libraries/wxwidgets/wxGTK32.nix index 280602eee59..91a0b00670c 100644 --- a/pkgs/development/libraries/wxwidgets/wxGTK32.nix +++ b/pkgs/development/libraries/wxwidgets/wxGTK32.nix @@ -50,13 +50,13 @@ let in stdenv.mkDerivation rec { pname = "wxwidgets"; - version = "3.2.3"; + version = "3.2.4"; src = fetchFromGitHub { owner = "wxWidgets"; repo = "wxWidgets"; rev = "v${version}"; - hash = "sha256-tuLNNhQA9HGax1aueZHQ+eB2dyIQnKjlmarp7e6Jplc="; + hash = "sha256-YkV150sDsfBEHvHne0GF6i8Y5881NrByPkLtPAmb24E="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/libraries/x265/default.nix b/pkgs/development/libraries/x265/default.nix index 2fb4f995fe4..7e62812df89 100644 --- a/pkgs/development/libraries/x265/default.nix +++ b/pkgs/development/libraries/x265/default.nix @@ -26,26 +26,6 @@ let mkFlag = optSet: flag: if optSet then "-D${flag}=ON" else "-D${flag}=OFF"; isCross = stdenv.buildPlatform != stdenv.hostPlatform; - - cmakeCommonFlags = [ - "-Wno-dev" - (mkFlag custatsSupport "DETAILED_CU_STATS") - (mkFlag debugSupport "CHECKED_BUILD") - (mkFlag ppaSupport "ENABLE_PPA") - (mkFlag vtuneSupport "ENABLE_VTUNE") - (mkFlag werrorSupport "WARNINGS_AS_ERRORS") - # Potentially riscv cross could be fixed by providing the correct CMAKE_SYSTEM_PROCESSOR flag - ] ++ lib.optional (isCross && stdenv.hostPlatform.isRiscV) "-DENABLE_ASSEMBLY=OFF"; - - cmakeStaticLibFlags = [ - "-DHIGH_BIT_DEPTH=ON" - "-DENABLE_CLI=OFF" - "-DENABLE_SHARED=OFF" - "-DEXPORT_C_API=OFF" - ] ++ lib.optionals stdenv.hostPlatform.isPower [ - "-DENABLE_ALTIVEC=OFF" # https://bitbucket.org/multicoreware/x265_git/issues/320/fail-to-build-on-power8-le - ]; - in stdenv.mkDerivation rec { @@ -96,32 +76,54 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake nasm ] ++ lib.optionals (numaSupport) [ numactl ]; + cmakeFlags = [ + "-Wno-dev" + (mkFlag custatsSupport "DETAILED_CU_STATS") + (mkFlag debugSupport "CHECKED_BUILD") + (mkFlag ppaSupport "ENABLE_PPA") + (mkFlag vtuneSupport "ENABLE_VTUNE") + (mkFlag werrorSupport "WARNINGS_AS_ERRORS") + ]; + + cmakeStaticLibFlags = [ + "-DHIGH_BIT_DEPTH=ON" + "-DENABLE_CLI=OFF" + "-DENABLE_SHARED=OFF" + "-DEXPORT_C_API=OFF" + ] ++ lib.optionals stdenv.hostPlatform.isPower [ + "-DENABLE_ALTIVEC=OFF" # https://bitbucket.org/multicoreware/x265_git/issues/320/fail-to-build-on-power8-le + ]; + + preConfigure = lib.optionalString multibitdepthSupport '' + cmake -B build-10bits $cmakeFlags "''${cmakeFlagsArray[@]}" $cmakeStaticLibFlags + cmake -B build-12bits $cmakeFlags "''${cmakeFlagsArray[@]}" $cmakeStaticLibFlags -DMAIN12=ON + cmakeFlagsArray+=( + -DEXTRA_LIB="x265-10.a;x265-12.a" + -DEXTRA_LINK_FLAGS=-L. + -DLINKED_10BIT=ON + -DLINKED_12BIT=ON + ) + '' + '' + cmakeFlagsArray+=( + -DGIT_ARCHETYPE=1 # https://bugs.gentoo.org/814116 + ${mkFlag (!stdenv.hostPlatform.isStatic) "ENABLE_SHARED"} + -DHIGH_BIT_DEPTH=OFF + -DENABLE_HDR10_PLUS=ON + ${mkFlag (isCross && stdenv.hostPlatform.isAarch) "CROSS_COMPILE_ARM"} + ${mkFlag cliSupport "ENABLE_CLI"} + ${mkFlag unittestsSupport "ENABLE_TESTS"} + ) + ''; + # Builds 10bits and 12bits static libs on the side if multi bit-depth is wanted # (we are in x265_<version>/source/build) - preBuild = lib.optionalString (multibitdepthSupport) '' - cmake -S ../ -B ../build-10bits ${toString cmakeCommonFlags} ${toString cmakeStaticLibFlags} + preBuild = lib.optionalString multibitdepthSupport '' make -C ../build-10bits -j $NIX_BUILD_CORES - cmake -S ../ -B ../build-12bits ${toString cmakeCommonFlags} ${toString cmakeStaticLibFlags} -DMAIN12=ON make -C ../build-12bits -j $NIX_BUILD_CORES ln -s ../build-10bits/libx265.a ./libx265-10.a ln -s ../build-12bits/libx265.a ./libx265-12.a ''; - cmakeFlags = cmakeCommonFlags ++ [ - "-DGIT_ARCHETYPE=1" # https://bugs.gentoo.org/814116 - "-DENABLE_SHARED=${if stdenv.hostPlatform.isStatic then "OFF" else "ON"}" - "-DHIGH_BIT_DEPTH=OFF" - "-DENABLE_HDR10_PLUS=ON" - (mkFlag (isCross && stdenv.hostPlatform.isAarch) "CROSS_COMPILE_ARM") - (mkFlag cliSupport "ENABLE_CLI") - (mkFlag unittestsSupport "ENABLE_TESTS") - ] ++ lib.optionals (multibitdepthSupport) [ - "-DEXTRA_LIB=x265-10.a;x265-12.a" - "-DEXTRA_LINK_FLAGS=-L." - "-DLINKED_10BIT=ON" - "-DLINKED_12BIT=ON" - ]; - doCheck = unittestsSupport; checkPhase = '' runHook preCheck diff --git a/pkgs/development/libraries/xapian/default.nix b/pkgs/development/libraries/xapian/default.nix index c70b5e19570..73c3b1b5717 100644 --- a/pkgs/development/libraries/xapian/default.nix +++ b/pkgs/development/libraries/xapian/default.nix @@ -28,8 +28,6 @@ let doCheck = true; env.AUTOMATED_TESTING = true; # https://trac.xapian.org/changeset/8be35f5e1/git - patches = lib.optionals stdenv.isDarwin [ ./skip-flaky-darwin-test.patch ]; - # the configure script thinks that Darwin has ___exp10 # but it’s not available on my systems (or hydra apparently) postConfigure = lib.optionalString stdenv.isDarwin '' @@ -46,7 +44,7 @@ let homepage = "https://xapian.org/"; changelog = "https://xapian.org/docs/xapian-core-${version}/NEWS"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ matthiasbeyer ]; platforms = platforms.unix; }; }; @@ -54,5 +52,5 @@ in { # Don't forget to change the hashes in xapian-omega and # python3Packages.xapian. They inherit the version from this package, and # should always be built with the equivalent xapian version. - xapian_1_4 = generic "1.4.22" "sha256-BYhK8AsGcCzkhgV9YqO/vmYGz5Za2g9epXCzKKL6Hqg="; + xapian_1_4 = generic "1.4.24" "sha256-7aWubc9rBVOoZ2r2Sx/TBOmYzSD3eQMcyq96uaNzUxo="; } diff --git a/pkgs/development/libraries/xapian/skip-flaky-darwin-test.patch b/pkgs/development/libraries/xapian/skip-flaky-darwin-test.patch deleted file mode 100644 index d763a2a2b43..00000000000 --- a/pkgs/development/libraries/xapian/skip-flaky-darwin-test.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -Naur xapian-core.old/tests/api_db.cc xapian-core.new/tests/api_db.cc ---- xapian-core.old/tests/api_db.cc -+++ xapian-core.new/tests/api_db.cc -@@ -1020,6 +1020,7 @@ - - // test for keepalives - DEFINE_TESTCASE(keepalive1, remote) { -+ SKIP_TEST("Fails in darwin nix build environment"); - Xapian::Database db(get_remote_database("apitest_simpledata", 5000)); - - /* Test that keep-alives work */ -diff -Naur xapian-core.old/tests/api_scalability.cc xapian-core.new/tests/api_scalability.cc ---- xapian-core.old/tests/api_scalability.cc -+++ xapian-core.new/tests/api_scalability.cc -@@ -53,6 +53,7 @@ - } - - DEFINE_TESTCASE(bigoaddvalue1, writable) { -+ SKIP_TEST("Fails in darwin nix build environment"); - // O(n*n) is bad, but O(n*log(n)) is acceptable. - test_scalability(bigoaddvalue1_helper, 5000, O_N_LOG_N); - return true; -diff -Naur xapian-core.old/tests/api_serialise.cc xapian-core.new/tests/api_serialise.cc ---- xapian-core.old/tests/api_serialise.cc -+++ xapian-core.new/tests/api_serialise.cc -@@ -110,6 +110,7 @@ - - // Test for serialising a document obtained from a database. - DEFINE_TESTCASE(serialise_document2, writable) { -+ SKIP_TEST("Fails in darwin nix build environment"); - Xapian::Document origdoc; - origdoc.add_term("foo", 2); - origdoc.add_posting("foo", 10); diff --git a/pkgs/development/libraries/xapian/tools/omega/default.nix b/pkgs/development/libraries/xapian/tools/omega/default.nix index f5ae2ecfaa5..cba74b977de 100644 --- a/pkgs/development/libraries/xapian/tools/omega/default.nix +++ b/pkgs/development/libraries/xapian/tools/omega/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://oligarchy.co.uk/xapian/${version}/xapian-omega-${version}.tar.xz"; - hash = "sha256-Z0yXn7kPH0mQ64qQntq4jKSgCUF9/Vqwy6GeAsepVSg="; + hash = "sha256-0IdW5PM7GJFsyKJJPTEfHL647UNXvUD6XBdErcCA6/8="; }; buildInputs = [ xapian perl pcre2 zlib libmagic ]; diff --git a/pkgs/development/libraries/zeromq/4.x.nix b/pkgs/development/libraries/zeromq/4.x.nix index 9fa429f9a4c..6a0e173db3a 100644 --- a/pkgs/development/libraries/zeromq/4.x.nix +++ b/pkgs/development/libraries/zeromq/4.x.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , cmake , asciidoc , pkg-config @@ -11,25 +10,15 @@ stdenv.mkDerivation rec { pname = "zeromq"; - version = "4.3.4"; + version = "4.3.5"; src = fetchFromGitHub { owner = "zeromq"; repo = "libzmq"; rev = "v${version}"; - sha256 = "sha256-epOEyHOswUGVwzz0FLxhow/zISmZHxsIgmpOV8C8bQM="; + sha256 = "sha256-q2h5y0Asad+fGB9haO4Vg7a1ffO2JSb7czzlhmT3VmI="; }; - patches = [ - # Backport gcc-13 fix: - # https://github.com/zeromq/libzmq/pull/4480 - (fetchpatch { - name = "gcc-13.patch"; - url = "https://github.com/zeromq/libzmq/commit/438d5d88392baffa6c2c5e0737d9de19d6686f0d.patch"; - hash = "sha256-tSTYSrQzgnfbY/70QhPdOnpEXX05VAYwVYuW8P1LWf0="; - }) - ]; - nativeBuildInputs = [ cmake asciidoc pkg-config ]; buildInputs = [ libsodium ]; @@ -41,7 +30,7 @@ stdenv.mkDerivation rec { branch = "4"; homepage = "http://www.zeromq.org"; description = "The Intelligent Transport Layer"; - license = licenses.lgpl3Plus; + license = licenses.mpl20; platforms = platforms.all; maintainers = with maintainers; [ fpletz ]; }; diff --git a/pkgs/development/lua-modules/aliases.nix b/pkgs/development/lua-modules/aliases.nix index 47a097fd7f7..8f4ed9799c2 100644 --- a/pkgs/development/lua-modules/aliases.nix +++ b/pkgs/development/lua-modules/aliases.nix @@ -39,5 +39,6 @@ let in mapAliases { - "lpty" = throw "lpy was removed because broken and unmaintained "; # added 2023-10-14 + lpty = throw "lpy was removed because broken and unmaintained "; # added 2023-10-14 + cyrussasl = throw "cyrussasl was removed because broken and unmaintained "; # added 2023-10-18 } diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index f05933bdde3..fcde2f41ddc 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -5,10 +5,10 @@ nixpkgs$ ./maintainers/scripts/update-luarocks-packages You can customize the generated packages in pkgs/development/lua-modules/overrides.nix */ -{ stdenv, lib, fetchurl, fetchgit, callPackage, ... } @ args: +{ stdenv, lib, fetchurl, fetchgit, callPackage, ... }: final: prev: { -alt-getopt = callPackage({ luaAtLeast, lua, luaOlder, fetchgit, buildLuarocksPackage }: +alt-getopt = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "alt-getopt"; version = "0.8.0-1"; @@ -22,12 +22,13 @@ buildLuarocksPackage { "date": "2017-01-06T13:50:55+03:00", "path": "/nix/store/z72v77cw9188408ynsppwhlzii2dr740-lua-alt-getopt", "sha256": "1kq7r5668045diavsqd1j6i9hxdpsk99w8q4zr8cby9y3ws4q6rv", + "hash": "sha256-OxtMNB8++cVQ/gQjntLUt3WYopGhYb1VbIUAZEzJB88=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ lua ]; @@ -40,23 +41,18 @@ buildLuarocksPackage { }; }) {}; -argparse = callPackage({ luaOlder, buildLuarocksPackage, luaAtLeast, lua, fetchgit }: +argparse = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, lua, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "argparse"; - version = "scm-2"; - - src = fetchgit ( removeAttrs (builtins.fromJSON ''{ - "url": "https://github.com/luarocks/argparse.git", - "rev": "27967d7b52295ea7885671af734332038c132837", - "date": "2020-07-08T11:17:50+10:00", - "path": "/nix/store/vjm6c826hgvj7h7vqlbgkfpvijsd8yaf-argparse", - "sha256": "0idg79d0dfis4qhbkbjlmddq87np75hb2vj41i6prjpvqacvg5v1", - "fetchLFS": false, - "fetchSubmodules": true, - "deepClone": false, - "leaveDotGit": false -} - '') ["date" "path"]) ; + version = "0.7.1-1"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/argparse-0.7.1-1.rockspec"; + sha256 = "116iaczq6glzzin6qqa2zn7i22hdyzzsq6mzjiqnz6x1qmi0hig8"; + }).outPath; + src = fetchzip { + url = "https://github.com/luarocks/argparse/archive/0.7.1.zip"; + sha256 = "0idg79d0dfis4qhbkbjlmddq87np75hb2vj41i6prjpvqacvg5v1"; + }; disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); propagatedBuildInputs = [ lua ]; @@ -68,15 +64,17 @@ buildLuarocksPackage { }; }) {}; -basexx = callPackage({ buildLuarocksPackage, lua, fetchurl, luaOlder }: +basexx = callPackage({ buildLuarocksPackage, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "basexx"; - version = "scm-0"; - rockspecDir = "dist"; - + version = "0.4.1-1"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/basexx-0.4.1-1.rockspec"; + sha256 = "0kmydxm2wywl18cgj303apsx7hnfd68a9hx9yhq10fj7yfcxzv5f"; + }).outPath; src = fetchurl { - url = "https://github.com/aiq/basexx/archive/master.tar.gz"; - sha256 = "1x0d24aaj4zld4ifr7mi8zwrym5shsfphmwx5jzw2zg22r6xzlz1"; + url = "https://github.com/aiq/basexx/archive/v0.4.1.tar.gz"; + sha256 = "1rnz6xixxqwy0q6y2hi14rfid4w47h69gfi0rnlq24fz8q2b0qpz"; }; disabled = (luaOlder "5.1"); @@ -89,11 +87,14 @@ buildLuarocksPackage { }; }) {}; -binaryheap = callPackage({ buildLuarocksPackage, lua, fetchurl, luaOlder }: +binaryheap = callPackage({ buildLuarocksPackage, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "binaryheap"; version = "0.4-1"; - + knownRockspec = (fetchurl { + url = "mirror://luarocks/binaryheap-0.4-1.rockspec"; + sha256 = "1ah37lhskmrb26by5ygs7jblx7qnf6mphgw8kwhw0yacvmkcbql4"; + }).outPath; src = fetchurl { url = "https://github.com/Tieske/binaryheap.lua/archive/version_0v4.tar.gz"; sha256 = "0f5l4nb5s7dycbkgh3rrl7pf0npcf9k6m2gr2bsn09fjyb3bdc8h"; @@ -110,7 +111,7 @@ buildLuarocksPackage { }; }) {}; -bit32 = callPackage({ fetchgit, buildLuarocksPackage, lua, luaOlder }: +bit32 = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "bit32"; version = "5.3.0-1"; @@ -124,12 +125,13 @@ buildLuarocksPackage { "date": "2015-02-17T10:44:04+01:00", "path": "/nix/store/9kz7kgjmq0w9plrpha866bmwsgp4rfhn-lua-compat-5.2", "sha256": "1ipqlbvb5w394qwhm2f3w6pdrgy8v4q8sps5hh3pqz14dcqwakhj", + "hash": "sha256-Ek7FMWskfHwHhEVfjTDZyL/cruHDiQo5Jmnwsvai+MY=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; @@ -142,26 +144,27 @@ buildLuarocksPackage { }; }) {}; -busted = callPackage({ buildLuarocksPackage, luafilesystem, luasystem, fetchgit, luaOlder, lua-term, say, mediator_lua, penlight, luassert, lua_cliargs, lua, dkjson }: +busted = callPackage({ buildLuarocksPackage, dkjson, fetchgit, fetchurl, lua, lua-term, luaOlder, lua_cliargs, luafilesystem, luassert, luasystem, mediator_lua, penlight, say }: buildLuarocksPackage { pname = "busted"; - version = "2.1.1-1"; + version = "2.1.2-3"; knownRockspec = (fetchurl { - url = "mirror://luarocks/busted-2.1.1-1.rockspec"; - sha256 = "0f9iz3pa2gmb2vccvygp6zdiji7l8bap0vlgqgrcg331qsrkf70h"; + url = "mirror://luarocks/busted-2.1.2-3.rockspec"; + sha256 = "0ll8jzbpp6a9zdbbjglmq30jmx2zvr0rs83jgsjxmlfzzylkry8p"; }).outPath; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/lunarmodules/busted.git", - "rev": "e3ed48759b625f2e37bf02ccc057b2b98108f108", - "date": "2022-08-24T17:34:58+03:00", - "path": "/nix/store/7g9rxkyhabgx0acwmzl4r4xfh193avpw-busted", - "sha256": "0nab0s5lhk0nhh58c4jspv5sj4g7839gb5q145hrlgbsxqncp8wy", + "rev": "673cb6bad2ee3876d45e004fcac1c2f8a816344f", + "date": "2023-03-20T10:00:33+01:00", + "path": "/nix/store/k7xnpg0s36gxk5mb59wx1dj8ikiz92ja-busted", + "sha256": "1wsiiiw26yqglqkkailksinzcb9gaffcldrcfhga3zawf2518h8y", + "hash": "sha256-HkEUinBc/aEedCw3ypxTLy32bdSTRjUnpg97I3iMUfM=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ dkjson lua lua-term lua_cliargs luafilesystem luassert luasystem mediator_lua penlight say ]; @@ -173,7 +176,7 @@ buildLuarocksPackage { }; }) {}; -cassowary = callPackage({ buildLuarocksPackage, fetchgit, penlight, luaOlder, lua }: +cassowary = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder, penlight }: buildLuarocksPackage { pname = "cassowary"; version = "2.3.2-1"; @@ -187,12 +190,13 @@ buildLuarocksPackage { "date": "2022-04-22T11:23:46+03:00", "path": "/nix/store/51mb376xh9pnh2krk08ljmy01zhr9y3z-cassowary.lua", "sha256": "1lvl40dhzmbqqjrqpjgqlg2kl993fpdy1mpc6d1610zpa9znx1f0", + "hash": "sha256-wIVuf1L3g2BCM+zW4Nt1IyU6xaP4yYuzxHjVDxsgdNM=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua penlight ]; @@ -205,7 +209,7 @@ buildLuarocksPackage { }; }) {}; -cldr = callPackage({ penlight, luaOlder, lua, fetchgit, buildLuarocksPackage }: +cldr = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder, penlight }: buildLuarocksPackage { pname = "cldr"; version = "0.3.0-0"; @@ -219,12 +223,13 @@ buildLuarocksPackage { "date": "2022-12-06T12:36:06+03:00", "path": "/nix/store/3xgwqd2pica8301sbfrw4bmv0xm2wzx5-cldr-lua", "sha256": "0hlfb115qhamczzskvckxczf9dpp8cv8h6vz7zgdl2n025ik9dp4", + "hash": "sha256-5LY0YxHACtreP38biDZD97bkPuuT7an/Z1VBXEJYjkI=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua penlight ]; @@ -237,7 +242,7 @@ buildLuarocksPackage { }; }) {}; -compat53 = callPackage({ lua, luaAtLeast, fetchzip, luaOlder, buildLuarocksPackage }: +compat53 = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, lua, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "compat53"; version = "0.7-1"; @@ -261,7 +266,7 @@ buildLuarocksPackage { }; }) {}; -cosmo = callPackage({ buildLuarocksPackage, fetchgit, lpeg }: +cosmo = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lpeg }: buildLuarocksPackage { pname = "cosmo"; version = "16.06.04-1"; @@ -275,12 +280,13 @@ buildLuarocksPackage { "date": "2016-06-17T05:39:58-07:00", "path": "/nix/store/k3p4xc4cfihp4h8aj6vacr25rpcsjd96-cosmo", "sha256": "03b5gwsgxd777970d2h6rx86p7ivqx7bry8xmx2r396g3w85qy2p", + "hash": "sha256-V3hcEB/PpJFFrx35vE7HO55rUM8GigZOOue0/jR/ZQ0=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; propagatedBuildInputs = [ lpeg ]; @@ -292,7 +298,7 @@ buildLuarocksPackage { }; }) {}; -coxpcall = callPackage({ buildLuarocksPackage, fetchgit }: +coxpcall = callPackage({ buildLuarocksPackage, fetchgit, fetchurl }: buildLuarocksPackage { pname = "coxpcall"; version = "1.17.0-1"; @@ -306,12 +312,13 @@ buildLuarocksPackage { "date": "2018-02-26T19:53:11-03:00", "path": "/nix/store/1q4p5qvr6rlwisyarlgnmk4dx6vp8xdl-coxpcall", "sha256": "1k3q1rr2kavkscf99b5njxhibhp6iwhclrjk6nnnp233iwc2jvqi", + "hash": "sha256-EW8pGI9jiGutNVNmyiCP5sIVYZe2rJQc03OrKXIOeMw=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; meta = { @@ -321,7 +328,7 @@ buildLuarocksPackage { }; }) {}; -cqueues = callPackage({ fetchurl, buildLuarocksPackage, lua }: +cqueues = callPackage({ buildLuarocksPackage, fetchurl, lua }: buildLuarocksPackage { pname = "cqueues"; version = "20200726.52-0"; @@ -345,7 +352,7 @@ buildLuarocksPackage { }; }) {}; -cyan = callPackage({ argparse, buildLuarocksPackage, tl, fetchgit, luafilesystem }: +cyan = callPackage({ argparse, buildLuarocksPackage, fetchgit, fetchurl, luafilesystem, tl }: buildLuarocksPackage { pname = "cyan"; version = "0.3.0-1"; @@ -359,12 +366,13 @@ buildLuarocksPackage { "date": "2023-02-19T18:58:20-06:00", "path": "/nix/store/smpj81z2a2blb3qfpjwx9n52d50rp39w-cyan", "sha256": "0pskargvjn2phgz481b08ndhp3z23s7lqfs8qlwailr7a4f2fc7h", + "hash": "sha256-8DAnHFEn06g4xUg7TI8e4o8Lm0VgBUT+g1dYuV9WU18=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; propagatedBuildInputs = [ argparse luafilesystem tl ]; @@ -375,51 +383,24 @@ buildLuarocksPackage { }; }) {}; -cyrussasl = callPackage({ lua, luaOlder, buildLuarocksPackage, fetchgit }: -buildLuarocksPackage { - pname = "cyrussasl"; - version = "1.1.0-1"; - - src = fetchgit ( removeAttrs (builtins.fromJSON ''{ - "url": "https://github.com/JorjBauer/lua-cyrussasl", - "rev": "78ceec610da76d745d0eff4e21a4fb24832aa72d", - "date": "2015-08-21T18:24:54-04:00", - "path": "/nix/store/s7n7f80pz8k6lvfav55a5rwy5l45vs4l-lua-cyrussasl", - "sha256": "14kzm3vk96k2i1m9f5zvpvq4pnzaf7s91h5g4h4x2bq1mynzw2s1", - "fetchLFS": false, - "fetchSubmodules": true, - "deepClone": false, - "leaveDotGit": false -} - '') ["date" "path"]) ; - - disabled = (luaOlder "5.1"); - propagatedBuildInputs = [ lua ]; - - meta = { - homepage = "http://github.com/JorjBauer/lua-cyrussasl"; - description = "Cyrus SASL library for Lua 5.1+"; - license.fullName = "BSD"; - }; -}) {}; - -digestif = callPackage({ luafilesystem, fetchgit, lpeg, lua, buildLuarocksPackage, luaOlder }: +digestif = callPackage({ buildLuarocksPackage, fetchgit, lpeg, lua, luaOlder, luafilesystem }: buildLuarocksPackage { pname = "digestif"; version = "dev-1"; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/astoff/digestif", - "rev": "8f8448fa3f27611b32fe6398fe22ef24b8602ec9", - "date": "2023-02-24T22:38:11+01:00", - "path": "/nix/store/s7wxqcj3k8pgb3m86d8rs2ggpl63jxwn-digestif", - "sha256": "0k3srmilrz3ajj76kklksmifkgqrm0y7gr25h0vrrldrf1xp4pk0", + "rev": "c0199f9cd86021c0a89662002d7a3411d12fb168", + "date": "2023-03-10T15:04:26+01:00", + "path": "/nix/store/3s849fwc80lf7pvgsiavqmvc5538cwwd-digestif", + "sha256": "0xccrrfwvcj03nnrzs3iwig7y2ahl706h413hkywcplyd5407dv9", + "hash": "sha256-abcDSGmeXsb9hCMQaMChUAl/XuRx6J+tHUCyzV3OjHU=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.3"); propagatedBuildInputs = [ lpeg lua luafilesystem ]; @@ -431,7 +412,7 @@ buildLuarocksPackage { }; }) {}; -dkjson = callPackage({ buildLuarocksPackage, lua, luaAtLeast, luaOlder, fetchurl }: +dkjson = callPackage({ buildLuarocksPackage, fetchurl, lua, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "dkjson"; version = "2.6-1"; @@ -454,17 +435,17 @@ buildLuarocksPackage { }; }) {}; -fennel = callPackage({ luaOlder, buildLuarocksPackage, fetchurl, lua }: +fennel = callPackage({ buildLuarocksPackage, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "fennel"; - version = "1.3.0-1"; + version = "1.3.1-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/fennel-1.3.0-1.rockspec"; - sha256 = "1by78423n8k8i5sz7ji6w5igm8jkmyvd5x1y519hzmknphjqa263"; + url = "mirror://luarocks/fennel-1.3.1-1.rockspec"; + sha256 = "1dsavrsvngwx8vf1l2sj44arvip3bqkhsfh2sdkwa6r9mnw9zx87"; }).outPath; src = fetchurl { - url = "https://fennel-lang.org/downloads/fennel-1.3.0.tar.gz"; - sha256 = "0m754c74pj10c1qmc4zl89ifjiqcwafn8qagzfpfmcqv6r46pr23"; + url = "https://fennel-lang.org/downloads/fennel-1.3.1.tar.gz"; + sha256 = "1c7iwyc9f3a9k34fjq77zjk0minl3bl3f7wqlj8i1n2x7598nzgx"; }; disabled = (luaOlder "5.1"); @@ -478,7 +459,7 @@ buildLuarocksPackage { }; }) {}; -fifo = callPackage({ fetchzip, lua, buildLuarocksPackage }: +fifo = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, lua }: buildLuarocksPackage { pname = "fifo"; version = "0.2-0"; @@ -500,7 +481,7 @@ buildLuarocksPackage { }; }) {}; -fluent = callPackage({ lua, luaepnf, fetchgit, cldr, buildLuarocksPackage, penlight, luaOlder }: +fluent = callPackage({ buildLuarocksPackage, cldr, fetchgit, fetchurl, lua, luaOlder, luaepnf, penlight }: buildLuarocksPackage { pname = "fluent"; version = "0.2.0-0"; @@ -514,12 +495,13 @@ buildLuarocksPackage { "date": "2022-04-16T23:08:20+03:00", "path": "/nix/store/flxlnrzg6rx75qikiggmy494npx59p0b-fluent-lua", "sha256": "12js8l4hcxhziza0sry0f01kfm8f8m6kx843dmcky36z1y2mccmq", + "hash": "sha256-uDJWhQ/fDD9ZbYOgPk1FDlU3A3DAZw3Ujx92BglFWoo=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ cldr lua luaepnf penlight ]; @@ -532,23 +514,24 @@ buildLuarocksPackage { }; }) {}; -gitsigns-nvim = callPackage({ lua, fetchgit, buildLuarocksPackage }: +gitsigns-nvim = callPackage({ buildLuarocksPackage, fetchgit, lua }: buildLuarocksPackage { pname = "gitsigns.nvim"; version = "scm-1"; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/lewis6991/gitsigns.nvim", - "rev": "f388995990aba04cfdc7c3ab870c33e280601109", - "date": "2023-02-16T11:22:47+00:00", - "path": "/nix/store/i4acpc5h3sv909gyppm1qv2vqjq84xs1-gitsigns.nvim", - "sha256": "1nm1f1d8c632nfnkiak4j7ynyin379bmhag5qp2p912cd9cjvsgx", + "rev": "ff01d34daaed72f271a8ffa088a7e839a60c640f", + "date": "2023-10-06T09:04:46+01:00", + "path": "/nix/store/2m4fyzkkg6bdbfb4kpjrqgbawvs3khqg-gitsigns.nvim", + "sha256": "0clyngmmz0qilnjykqc8n7c5kidspywazwy3axsikgh4x8wzdn17", + "hash": "sha256-J9j2OeoEvhl1V8Pzr7i/usVZ2LGI4emlpRGDX+uznjI=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (lua.luaversion != "5.1"); propagatedBuildInputs = [ lua ]; @@ -560,17 +543,17 @@ buildLuarocksPackage { }; }) {}; -haskell-tools-nvim = callPackage({ plenary-nvim, fetchzip, lua, luaOlder, buildLuarocksPackage }: +haskell-tools-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, lua, luaOlder, plenary-nvim }: buildLuarocksPackage { pname = "haskell-tools.nvim"; - version = "2.3.0-1"; + version = "2.4.0-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/haskell-tools.nvim-2.3.0-1.rockspec"; - sha256 = "0jcmb0hzyhq14b2xcwdhwr9a9wbmfaw27vzfzkv52is24mwfr0p0"; + url = "mirror://luarocks/haskell-tools.nvim-2.4.0-1.rockspec"; + sha256 = "1sapapkz3ay9yrljmc1lwxjglv27f1zbh6m014r2z59px4ir61dz"; }).outPath; src = fetchzip { - url = "https://github.com/mrcjkb/haskell-tools.nvim/archive/2.3.0.zip"; - sha256 = "0lg8g2j9fbikgmhimvz9d0yb63csn85racc09qyszba2kviipr24"; + url = "https://github.com/mrcjkb/haskell-tools.nvim/archive/2.4.0.zip"; + sha256 = "054vfqsccq1qmqmglnppi2n7ksckldx8b5p62y35y0cbcdyh7wz3"; }; disabled = (luaOlder "5.1"); @@ -583,7 +566,7 @@ buildLuarocksPackage { }; }) {}; -http = callPackage({ luaossl, lpeg_patterns, lpeg, binaryheap, compat53, cqueues, bit32, basexx, fetchzip, lua, fifo, luaOlder, buildLuarocksPackage }: +http = callPackage({ basexx, binaryheap, bit32, buildLuarocksPackage, compat53, cqueues, fetchurl, fetchzip, fifo, lpeg, lpeg_patterns, lua, luaOlder, luaossl }: buildLuarocksPackage { pname = "http"; version = "0.3-0"; @@ -607,7 +590,7 @@ buildLuarocksPackage { }; }) {}; -inspect = callPackage({ fetchurl, buildLuarocksPackage, lua, luaOlder }: +inspect = callPackage({ buildLuarocksPackage, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "inspect"; version = "3.1.3-0"; @@ -630,7 +613,7 @@ buildLuarocksPackage { }; }) {}; -jsregexp = callPackage({ buildLuarocksPackage, lua, luaOlder, fetchgit }: +jsregexp = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "jsregexp"; version = "0.0.6-1"; @@ -644,12 +627,13 @@ buildLuarocksPackage { "date": "2023-02-12T14:19:03+01:00", "path": "/nix/store/aj42wy1yp53w406id33dyxpv1ws23g4b-jsregexp", "sha256": "0l7hn5f2jl4n2bpikb72szfzgc192jy3ig5pxx9061j44amyq89m", + "hash": "sha256-NSHsqyJEBgNS77e8OLwUKbD33dfirBnvEpZQKVyx8FA=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; @@ -661,7 +645,7 @@ buildLuarocksPackage { }; }) {}; -ldbus = callPackage({ luaOlder, fetchgit, lua, luaAtLeast, buildLuarocksPackage }: +ldbus = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "ldbus"; version = "scm-0"; @@ -675,12 +659,13 @@ buildLuarocksPackage { "date": "2021-11-10T23:58:54+11:00", "path": "/nix/store/j830jk2hkanz7abkdsbvg2warsyr0a2c-ldbus", "sha256": "18q98b98mfvjzbyssf18bpnlx4hsx4s9lwcwia4z9dxiaiw7b77j", + "hash": "sha256-8px1eFSxt/SJipxxmjTpGpJO7V0oOK39+nK7itJCCaM=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); propagatedBuildInputs = [ lua ]; @@ -692,34 +677,35 @@ buildLuarocksPackage { }; }) {}; -ldoc = callPackage({ fetchgit, buildLuarocksPackage, markdown, penlight }: +ldoc = callPackage({ buildLuarocksPackage, fetchgit, markdown, penlight }: buildLuarocksPackage { pname = "ldoc"; - version = "scm-3"; + version = "dev-1"; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ - "url": "https://github.com/stevedonovan/LDoc.git", - "rev": "01d648f4ad50c3d14f2acadee6acb26beda56990", - "date": "2022-11-18T00:01:45+01:00", - "path": "/nix/store/m7vvl2b5k69jrb88d0y60f2y4ryazkp9-LDoc", - "sha256": "1kl0ba9mnd7nksakzb3vwr0hkkkgyk92v93r2w9xnrq879dhy5mm", + "url": "https://github.com/lunarmodules/ldoc.git", + "rev": "e4940daf748affb86489b0782ed8abab2e88bebc", + "date": "2023-05-13T08:12:31+03:00", + "path": "/nix/store/sqhilwlh0glw1dxcx6w98wjkp65amvil-ldoc", + "sha256": "0an92jxvhbw2lvg269x6z3874x3wqmbmx52j4gsgxf9ldpizssgd", + "hash": "sha256-7Wn94200uf70I1KUXlfFfHRy0PimJyPepoIvuLsUySo=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; propagatedBuildInputs = [ markdown penlight ]; meta = { - homepage = "https://github.com/lunarmodules/LDoc"; + homepage = "http://lunarmodules.github.io/ldoc"; description = "A Lua Documentation Tool"; - license.fullName = "MIT/X11"; + license.fullName = "MIT <http://opensource.org/licenses/MIT>"; }; }) {}; -lgi = callPackage({ luaOlder, fetchgit, buildLuarocksPackage, lua }: +lgi = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "lgi"; version = "0.9.2-1"; @@ -733,12 +719,13 @@ buildLuarocksPackage { "date": "2017-10-09T20:55:55+02:00", "path": "/nix/store/vh82n8pc8dy5c8nph0vssk99vv7q4qg2-lgi", "sha256": "03rbydnj411xpjvwsyvhwy4plm96481d7jax544mvk7apd8sd5jj", + "hash": "sha256-UpamUbvqzF0JKV3J0wIiJlV6iedwe823vD0EIm3zKw8=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; @@ -750,7 +737,7 @@ buildLuarocksPackage { }; }) {}; -linenoise = callPackage({ buildLuarocksPackage, lua, fetchurl, luaOlder }: +linenoise = callPackage({ buildLuarocksPackage, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "linenoise"; version = "0.9-1"; @@ -770,7 +757,7 @@ buildLuarocksPackage { }; }) {}; -ljsyscall = callPackage({ lua, fetchurl, buildLuarocksPackage }: +ljsyscall = callPackage({ buildLuarocksPackage, fetchurl, lua }: buildLuarocksPackage { pname = "ljsyscall"; version = "0.12-1"; @@ -794,7 +781,7 @@ buildLuarocksPackage { }; }) {}; -lmathx = callPackage({ fetchurl, buildLuarocksPackage, lua }: +lmathx = callPackage({ buildLuarocksPackage, fetchurl, lua }: buildLuarocksPackage { pname = "lmathx"; version = "20150624-1"; @@ -817,7 +804,7 @@ buildLuarocksPackage { }; }) {}; -lmpfrlib = callPackage({ buildLuarocksPackage, fetchurl, luaAtLeast, lua, luaOlder }: +lmpfrlib = callPackage({ buildLuarocksPackage, fetchurl, lua, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "lmpfrlib"; version = "20170112-2"; @@ -827,7 +814,7 @@ buildLuarocksPackage { }).outPath; src = fetchurl { url = "http://www.circuitwizard.de/lmpfrlib/lmpfrlib.c"; - sha256 = "00d32cwvk298k3vyrjkdmfjgc69x1fwyks3hs7dqr2514zdhgssm"; + sha256 = "1bkfwdacj1drzqsfxf352fjppqqwi5d4j084jr9vj9dvjb31rbc1"; }; disabled = (luaOlder "5.3") || (luaAtLeast "5.5"); @@ -841,7 +828,7 @@ buildLuarocksPackage { }; }) {}; -loadkit = callPackage({ luaOlder, lua, buildLuarocksPackage, fetchgit }: +loadkit = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "loadkit"; version = "1.1.0-1"; @@ -851,16 +838,17 @@ buildLuarocksPackage { }).outPath; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/leafo/loadkit.git", - "rev": "c6c712dab45f6c568821f9ed7b49c790a44d12e7", - "date": "2021-01-07T14:41:10-08:00", - "path": "/nix/store/xvwq7b2za8ciww1gjw7vnspg9183xmfa-loadkit", - "sha256": "15znriijs7izf9f6vmhr6dnvw3pzr0yr0mh6ah41fmdwjqi7jzcz", + "rev": "95b13a36442f59b41ab52df96d52233c4a725dfd", + "date": "2023-08-17T11:36:25-07:00", + "path": "/nix/store/9xcy2p5pxiq0p17szv8p2lagb6xzb8c8-loadkit", + "sha256": "0hivmn5r1scxv3nckm4hqfplq33wiab3ypjwsfdkmp3bdri0dhxs", + "hash": "sha256-usMGYm5r3Dqb01xeP5aKfAxMr8OQ1Mns2J3pkIutO0I=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; @@ -873,17 +861,17 @@ buildLuarocksPackage { }; }) {}; -lpeg = callPackage({ luaOlder, buildLuarocksPackage, fetchurl, lua }: +lpeg = callPackage({ buildLuarocksPackage, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "lpeg"; - version = "1.0.2-1"; + version = "1.1.0-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/lpeg-1.0.2-1.rockspec"; - sha256 = "08a8p5cwlwpjawk8sczb7bq2whdsng4mmhphahyklf1bkvl2li89"; + url = "mirror://luarocks/lpeg-1.1.0-1.rockspec"; + sha256 = "03af1p00madfhfxjzrsxb0jm0n49ixwadnkdp0vbgs77d2v985jn"; }).outPath; src = fetchurl { - url = "http://www.inf.puc-rio.br/~roberto/lpeg/lpeg-1.0.2.tar.gz"; - sha256 = "1zjzl7acvcdavmcg5l7wi12jd4rh95q9pl5aiww7hv0v0mv6bmj8"; + url = "http://www.inf.puc-rio.br/~roberto/lpeg/lpeg-1.1.0.tar.gz"; + sha256 = "0aimsjpcpkh3kk65f0pg1z2bp6d83rn4dg6pgbx1yv14s9kms5ab"; }; disabled = (luaOlder "5.1"); @@ -897,7 +885,7 @@ buildLuarocksPackage { }; }) {}; -lpeg_patterns = callPackage({ lpeg, fetchzip, buildLuarocksPackage, lua }: +lpeg_patterns = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, lpeg, lua }: buildLuarocksPackage { pname = "lpeg_patterns"; version = "0.5-0"; @@ -919,7 +907,7 @@ buildLuarocksPackage { }; }) {}; -lpeglabel = callPackage({ fetchurl, lua, luaOlder, buildLuarocksPackage }: +lpeglabel = callPackage({ buildLuarocksPackage, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "lpeglabel"; version = "1.6.0-1"; @@ -942,7 +930,7 @@ buildLuarocksPackage { }; }) {}; -lrexlib-gnu = callPackage({ buildLuarocksPackage, luaOlder, lua, fetchgit }: +lrexlib-gnu = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "lrexlib-gnu"; version = "2.9.1-1"; @@ -956,12 +944,13 @@ buildLuarocksPackage { "date": "2020-08-07T12:10:29+03:00", "path": "/nix/store/vnnhcc0r9zhqwshmfzrn0ryai61l6xrd-lrexlib", "sha256": "15dsxq0363940rij9za8mc224n9n58i2iqw1z7r1jh3qpkaciw7j", + "hash": "sha256-8vDI1Lx4QBny+YHjKCIqNlkiBKtI/SRjBiQNMwDuupU=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; @@ -973,7 +962,7 @@ buildLuarocksPackage { }; }) {}; -lrexlib-pcre = callPackage({ lua, luaOlder, buildLuarocksPackage, fetchgit }: +lrexlib-pcre = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "lrexlib-pcre"; version = "2.9.1-1"; @@ -987,12 +976,13 @@ buildLuarocksPackage { "date": "2020-08-07T12:10:29+03:00", "path": "/nix/store/vnnhcc0r9zhqwshmfzrn0ryai61l6xrd-lrexlib", "sha256": "15dsxq0363940rij9za8mc224n9n58i2iqw1z7r1jh3qpkaciw7j", + "hash": "sha256-8vDI1Lx4QBny+YHjKCIqNlkiBKtI/SRjBiQNMwDuupU=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; @@ -1005,7 +995,7 @@ buildLuarocksPackage { }; }) {}; -lrexlib-posix = callPackage({ lua, luaOlder, buildLuarocksPackage, fetchgit }: +lrexlib-posix = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "lrexlib-posix"; version = "2.9.1-1"; @@ -1019,12 +1009,13 @@ buildLuarocksPackage { "date": "2020-08-07T12:10:29+03:00", "path": "/nix/store/vnnhcc0r9zhqwshmfzrn0ryai61l6xrd-lrexlib", "sha256": "15dsxq0363940rij9za8mc224n9n58i2iqw1z7r1jh3qpkaciw7j", + "hash": "sha256-8vDI1Lx4QBny+YHjKCIqNlkiBKtI/SRjBiQNMwDuupU=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; @@ -1036,7 +1027,7 @@ buildLuarocksPackage { }; }) {}; -lua-cjson = callPackage({ luaOlder, fetchgit, lua, buildLuarocksPackage }: +lua-cjson = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "lua-cjson"; version = "2.1.0.10-1"; @@ -1050,12 +1041,13 @@ buildLuarocksPackage { "date": "2021-12-10T20:19:58+08:00", "path": "/nix/store/1ac8lz6smfa8zqfipqfsg749l9rw4ly9-lua-cjson", "sha256": "03hdsv7d77mggis58k8fmlpbh1d544m0lfqyl9rpjcqkiqs1qvza", + "hash": "sha256-6m8cNI4TM3lzoh47CiohpQW4Lq0OTVR0fK+e087WDQ4=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; @@ -1067,7 +1059,7 @@ buildLuarocksPackage { }; }) {}; -lua-cmsgpack = callPackage({ luaOlder, fetchgit, lua, buildLuarocksPackage }: +lua-cmsgpack = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "lua-cmsgpack"; version = "0.4.0-0"; @@ -1081,12 +1073,13 @@ buildLuarocksPackage { "date": "2015-06-03T08:39:04+02:00", "path": "/nix/store/ksqvl7hbd5s7nb6hjffyic1shldac4z2-lua-cmsgpack", "sha256": "0j0ahc9rprgl6dqxybaxggjam2r5i2wqqsd6764n0d7fdpj9fqm0", + "hash": "sha256-oGKX5G3uNGCJOaZpjLmIJYuq5HtdLd9xM/TlmxODCkg=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; @@ -1098,7 +1091,7 @@ buildLuarocksPackage { }; }) {}; -lua-curl = callPackage({ lua, buildLuarocksPackage, fetchzip, luaOlder, luaAtLeast }: +lua-curl = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, lua, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "lua-curl"; version = "0.3.13-1"; @@ -1121,30 +1114,61 @@ buildLuarocksPackage { }; }) {}; -lua-iconv = callPackage({ fetchurl, lua, buildLuarocksPackage, luaOlder }: +lua-ffi-zlib = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }: +buildLuarocksPackage { + pname = "lua-ffi-zlib"; + version = "0.6-0"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/lua-ffi-zlib-0.6-0.rockspec"; + sha256 = "060sac715f1ris13fjv6gwqm0lk6by0a2zhldxd8hdrc0jss8p34"; + }).outPath; + src = fetchgit ( removeAttrs (builtins.fromJSON ''{ + "url": "https://github.com/hamishforbes/lua-ffi-zlib", + "rev": "61e95cb434e4047c8bc65a180c293a05bf754416", + "date": "2023-08-11T09:28:16+12:00", + "path": "/nix/store/gfyr81q84mgpgwyh28xpzlf34ndjkfwc-lua-ffi-zlib", + "sha256": "0r6vima495h0d4f8ibf3fv9b6k7rqnavgvsy78dybslrm7lwsz4p", + "hash": "sha256-l3zN6amZ6uUbOl7vt5XF+Uyz0nbDrYgcaQCWRFSN22Q=", + "fetchLFS": false, + "fetchSubmodules": true, + "deepClone": false, + "leaveDotGit": false +} + '') ["date" "path" "sha256"]) ; + + disabled = (luaOlder "5.1"); + propagatedBuildInputs = [ lua ]; + + meta = { + homepage = "https://github.com/hamishforbes/lua-ffi-zlib"; + description = "A Lua module using LuaJIT's FFI feature to access zlib."; + }; +}) {}; + +lua-iconv = callPackage({ buildLuarocksPackage, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "lua-iconv"; - version = "7-3"; + version = "7.0.0-2"; knownRockspec = (fetchurl { - url = "mirror://luarocks/lua-iconv-7-3.rockspec"; - sha256 = "0qh5vsaxd7s31p7a8rl08lwd6zv90wnvp15nll4fcz452kffpp72"; + url = "mirror://luarocks/lua-iconv-7.0.0-2.rockspec"; + sha256 = "1bj512kqcj2cxna7si4648fci51fs4bqvdn592i9cahscsc0kk9g"; }).outPath; src = fetchurl { - url = "https://github.com/downloads/ittner/lua-iconv/lua-iconv-7.tar.gz"; - sha256 = "02dg5x79fg5mwsycr0fj6w04zykdpiki9xjswkkwzdalqwaikny1"; + url = "https://github.com/lunarmodules/lua-iconv/archive/v7.0.0/lua-iconv-7.0.0.tar.gz"; + sha256 = "0arp0h342hpp4kfdxc69yxspziky4v7c13jbf12yrs8f1lnjzr0x"; }; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; meta = { - homepage = "http://ittner.github.com/lua-iconv/"; + homepage = "https://github.com/lunarmodules/lua-iconv/"; description = "Lua binding to the iconv"; license.fullName = "MIT/X11"; }; }) {}; -lua-lsp = callPackage({ fetchgit, inspect, lua, lpeglabel, dkjson, luaAtLeast, luaOlder, buildLuarocksPackage }: +lua-lsp = callPackage({ buildLuarocksPackage, dkjson, fetchgit, fetchurl, inspect, lpeglabel, lua, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "lua-lsp"; version = "0.1.0-2"; @@ -1158,12 +1182,13 @@ buildLuarocksPackage { "date": "2020-10-17T15:07:11-04:00", "path": "/nix/store/qn9syhm875k1qardhhsp025cm3dbnqvm-lua-lsp", "sha256": "17k3jq61jz6j9bz4vc3hmsfx1s26cfgq1acja8fqyixljklmsbqp", + "hash": "sha256-Fy9d6ZS0R48dUpKpgJ9jRujQna5wsE3+StJ8GQyWY54=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ dkjson inspect lpeglabel lua ]; @@ -1175,17 +1200,17 @@ buildLuarocksPackage { }; }) {}; -lua-messagepack = callPackage({ buildLuarocksPackage, lua, fetchurl, luaOlder }: +lua-messagepack = callPackage({ buildLuarocksPackage, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "lua-messagepack"; - version = "0.5.2-1"; + version = "0.5.3-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/lua-messagepack-0.5.2-1.rockspec"; - sha256 = "15liz6v8hsqgb3xrcd74a71nnjcz79gpc3ak351hk6k4gyjq2rfc"; + url = "mirror://luarocks/lua-messagepack-0.5.3-1.rockspec"; + sha256 = "0sc11ckizivijgdnqvb0xnagrak6d2caxc5j8jz8ad1b2plp50pq"; }).outPath; src = fetchurl { - url = "https://framagit.org/fperrad/lua-MessagePack/raw/releases/lua-messagepack-0.5.2.tar.gz"; - sha256 = "1jgi944d0vx4zs9lrphys9pw0wrsibip93sh141qjwymrjyjg1nc"; + url = "https://framagit.org/fperrad/lua-MessagePack/raw/releases/lua-messagepack-0.5.3.tar.gz"; + sha256 = "17qdigs2pzi38rfqgs63xh44n1vylb6bcmmbz3sby68f0n9p8kq6"; }; disabled = (luaOlder "5.1"); @@ -1198,26 +1223,27 @@ buildLuarocksPackage { }; }) {}; -lua-protobuf = callPackage({ luaOlder, buildLuarocksPackage, lua, fetchgit }: +lua-protobuf = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "lua-protobuf"; - version = "0.4.1-1"; + version = "0.5.0-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/lua-protobuf-0.4.1-1.rockspec"; - sha256 = "0b395lhby26drb8dzf2gn2avlwvxmnaqmqx5m4g3ik7dmmn7p09i"; + url = "mirror://luarocks/lua-protobuf-0.5.0-1.rockspec"; + sha256 = "08z73rsqi7ysdyjcwfqyr8z6i5r43kx5fd8l32wlzv6cx6yvlqc9"; }).outPath; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/starwing/lua-protobuf.git", - "rev": "2a2b0b95117642ad9470bfe0add7dd6ce82f3869", - "date": "2022-11-29T21:34:24+08:00", - "path": "/nix/store/8yjzfj6gy8nkz1dxf0bmy8afwiv8gsjr-lua-protobuf", - "sha256": "0c1vjji0nj9lznsxw5gbnhab0ibs69298yrsn5yky0hhz8mmx5nr", + "rev": "a256c34e12cad643d6ad189bddcbc314da9b0658", + "date": "2023-04-30T02:11:27+08:00", + "path": "/nix/store/n7ihjh36kp2f80016f9y8xydia2pclzq-lua-protobuf", + "sha256": "1kbanbgvmzcfnxq30f8hmirgc1d768lacpjihis9961pc7w96l9n", + "hash": "sha256-NlGT+GE3mJR0hFFepigypwX2cqwQOTBwt479ut+yas0=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; @@ -1230,26 +1256,27 @@ buildLuarocksPackage { }; }) {}; -lua-resty-http = callPackage({ lua, fetchgit, luaOlder, buildLuarocksPackage }: +lua-resty-http = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "lua-resty-http"; - version = "0.17.0.beta.1-0"; + version = "0.17.1-0"; knownRockspec = (fetchurl { - url = "mirror://luarocks/lua-resty-http-0.17.0.beta.1-0.rockspec"; - sha256 = "1cjl007k43cyrwvj0p58hvp00q4lnd9rq3v3pcvwi5an2pvxnv80"; + url = "mirror://luarocks/lua-resty-http-0.17.1-0.rockspec"; + sha256 = "05gid7c5i459clw707z1jic42s52ap4z66dbr9ims5znaq5s3wdk"; }).outPath; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/ledgetech/lua-resty-http", - "rev": "8cb73c4cc2118f0c62d9132e3b3b14aa36192e34", - "date": "2022-02-11T16:44:50+00:00", - "path": "/nix/store/29kr6whllphz0nla5nh1f8q30dgp9vnz-lua-resty-http", - "sha256": "0y253dnnx59a5c1nbkcv1p5kq7kdsd5i094i7wzpg5ar6xwvqhjb", + "rev": "4ab4269cf442ba52507aa2c718f606054452fcad", + "date": "2023-03-22T09:48:56+00:00", + "path": "/nix/store/ykd1d5fa56i1c286k58jm233lqvdv2mi-lua-resty-http", + "sha256": "0xdhygjqjpfkq1bq8b09fichww57q1z694lz16i3hcc3g4sr4hxg", + "hash": "sha256-r0OSNXmDMTiiCZ+SZH7Ap3AOWXQJLIRXwNNdieXzsHU=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; @@ -1261,7 +1288,7 @@ buildLuarocksPackage { }; }) {}; -lua-resty-jwt = callPackage({ luaOlder, lua-resty-openssl, fetchgit, lua, buildLuarocksPackage }: +lua-resty-jwt = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, lua-resty-openssl, luaOlder }: buildLuarocksPackage { pname = "lua-resty-jwt"; version = "0.2.3-0"; @@ -1275,12 +1302,13 @@ buildLuarocksPackage { "date": "2021-01-20T16:53:57-05:00", "path": "/nix/store/z4a8ffxj2i3gbjp0f8r377cdp88lkzl4-lua-resty-jwt", "sha256": "07w8r8gqbby06x493qzislig7a3giw0anqr4ivp3g2ms8v9fnng6", + "hash": "sha256-5lnr0ka6ijfujiRjqwCPb6jzItXx45FIN8CvhR/KiB8=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua lua-resty-openssl ]; @@ -1292,7 +1320,7 @@ buildLuarocksPackage { }; }) {}; -lua-resty-openidc = callPackage({ lua-resty-http, buildLuarocksPackage, fetchgit, lua-resty-session, luaOlder, lua, lua-resty-jwt }: +lua-resty-openidc = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, lua-resty-http, lua-resty-jwt, lua-resty-session, luaOlder }: buildLuarocksPackage { pname = "lua-resty-openidc"; version = "1.7.6-3"; @@ -1306,12 +1334,13 @@ buildLuarocksPackage { "date": "2023-01-30T19:06:51+01:00", "path": "/nix/store/nyd2jqhlq8gx4chapqyxk2q4dsxgm8hz-lua-resty-openidc", "sha256": "15dh9z7y84n840x02xsn2m9h9hdakbbv4p1z7dfz85v5w5i6c86p", + "hash": "sha256-1yBmYuFlF/RdOz9csteaqsEEUxVWdwE6IMgS5M9PsJU=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua lua-resty-http lua-resty-jwt lua-resty-session ]; @@ -1323,26 +1352,27 @@ buildLuarocksPackage { }; }) {}; -lua-resty-openssl = callPackage({ fetchgit, buildLuarocksPackage }: +lua-resty-openssl = callPackage({ buildLuarocksPackage, fetchgit, fetchurl }: buildLuarocksPackage { pname = "lua-resty-openssl"; - version = "0.8.17-1"; + version = "0.8.25-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/lua-resty-openssl-0.8.17-1.rockspec"; - sha256 = "1b4dv9mdb90n0f6982pnjb05rgb12nkn1j66a1ywcs5fqcmj4sb5"; + url = "mirror://luarocks/lua-resty-openssl-0.8.25-1.rockspec"; + sha256 = "0wy0fjb50kpcyk6mkjj364p4lrfxl0b34xnv2n0wib1brk536s1l"; }).outPath; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/fffonion/lua-resty-openssl.git", - "rev": "dc17f6b2ff3adaa3bcb586f1d09073a4f4f4ec9d", - "date": "2023-01-20T01:36:57+08:00", - "path": "/nix/store/hh9i8ndb861iplkf9mz6vs2akkyibazn-lua-resty-openssl", - "sha256": "14xmxskbw3clqr97y69d311rs6i97vl7dg8pzixsqf4ypgllzvig", + "rev": "f9a153288238e9b7e3d5d40144610410a06a83cd", + "date": "2023-09-05T15:19:20+08:00", + "path": "/nix/store/jnvr2pzvxl2psd5w030m4qnv5dsm8spb-lua-resty-openssl", + "sha256": "08fqgdfi0dr3n2lqrbgwa94dd2f6crn1kb0cfpccphknaypaw7dp", + "hash": "sha256-tx2urld2wsvYdQysGWxmxonWSFL8rYypsCM3EF172CE=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; meta = { @@ -1352,35 +1382,35 @@ buildLuarocksPackage { }; }) {}; -lua-resty-session = callPackage({ buildLuarocksPackage, fetchgit, luaOlder, lua, lua-resty-openssl /*, lua_pack, lua-ffi-zlib */ }: +lua-resty-session = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, lua-ffi-zlib, lua-resty-openssl, luaOlder }: buildLuarocksPackage { pname = "lua-resty-session"; - version = "4.0.3-1"; + version = "4.0.5-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/lua-resty-session-4.0.3-1.rockspec"; - sha256 = "17q8gf0zjdbfgphvjsnlzw1d6158v4ppiqxap6hjqr0prqa5yyfq"; + url = "mirror://luarocks/lua-resty-session-4.0.5-1.rockspec"; + sha256 = "0h0kqwna46mrraq310qjb7yigxwv13n4czk24xnqr21czxsskzkg"; }).outPath; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/bungle/lua-resty-session.git", - "rev": "3373d8138930b6d1e255bb80d9127503019301d7", - "date": "2023-02-21T20:52:32+02:00", - "path": "/nix/store/pdwd03w7505wkv4fw79a3mdlfijk9ngd-lua-resty-session", - "sha256": "1d105785jzn9x3by4r0baaffr5xmc2ilgd7z7izcwq9z29pnfv02", + "rev": "5f2aed616d16fa7ca04dc40e23d6941740cd634d", + "date": "2023-08-16T18:24:43+03:00", + "path": "/nix/store/s6i1idv9lx52x7lcl0kc2c9sm9pic4kq-lua-resty-session", + "sha256": "08pih1baqhlvsqvcr1zzympmn8v7gskmis6ffhigll37hbzvljcz", + "hash": "sha256-n0m6/4JnUPoidM7oWKd+ZyNbb/X/h8w21ptCrFaA8SI=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); - propagatedBuildInputs = [ lua lua-resty-openssl /* lua_pack lua-ffi-zlib */ ]; + propagatedBuildInputs = [ lua lua-ffi-zlib lua-resty-openssl ]; meta = { homepage = "https://github.com/bungle/lua-resty-session"; description = "Session Library for OpenResty - Flexible and Secure"; license.fullName = "BSD"; - broken = true; # lua_pack and lua-ffi-zlib are unpackaged, causing this package to not evaluate }; }) {}; @@ -1413,7 +1443,7 @@ buildLuarocksPackage { }; }) {}; -lua-subprocess = callPackage({ lua, buildLuarocksPackage, fetchgit, luaOlder }: +lua-subprocess = callPackage({ buildLuarocksPackage, fetchgit, lua, luaOlder }: buildLuarocksPackage { pname = "subprocess"; version = "scm-1"; @@ -1424,12 +1454,13 @@ buildLuarocksPackage { "date": "2021-01-09T22:31:54+01:00", "path": "/nix/store/3lr7n1k85kbf718wxr51xd40i8dfs5qd-lua-subprocess", "sha256": "0p91hda0b0hpgdbff5drcyygaizq086gw8vnvzn0y0fg3mc9if70", + "hash": "sha256-4LiYWB3PAQ/s33Yj/gwC+Ef1vGe5FedWexeCBVSDIV0=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; @@ -1442,7 +1473,7 @@ buildLuarocksPackage { }; }) {}; -lua-term = callPackage({ fetchurl, buildLuarocksPackage }: +lua-term = callPackage({ buildLuarocksPackage, fetchurl }: buildLuarocksPackage { pname = "lua-term"; version = "0.7-1"; @@ -1463,7 +1494,7 @@ buildLuarocksPackage { }; }) {}; -lua-toml = callPackage({ fetchgit, buildLuarocksPackage, luaOlder, lua }: +lua-toml = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "lua-toml"; version = "2.0-1"; @@ -1477,12 +1508,13 @@ buildLuarocksPackage { "date": "2017-12-08T16:30:50-08:00", "path": "/nix/store/cnpflpyj441c65jhb68hjr2bcvnj9han-lua-toml", "sha256": "0lklhgs4n7gbgva5frs39240da1y4nwlx6yxaj3ix6r5lp9sh07b", + "hash": "sha256-6wCo06Ulmx6HVN2bTrklPqgGiEhDZ1fUfusdS/SDdFI=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; @@ -1494,7 +1526,7 @@ buildLuarocksPackage { }; }) {}; -lua-yajl = callPackage({ luaOlder, buildLuarocksPackage, lua, fetchgit }: +lua-yajl = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "lua-yajl"; version = "2.0-1"; @@ -1508,12 +1540,13 @@ buildLuarocksPackage { "date": "2020-11-12T06:22:23-08:00", "path": "/nix/store/9acgxpqk52kwn03m5xasn4f6mmsby2r9-lua-yajl", "sha256": "1frry90y7vqnw1rd1dfnksilynh0n24gfhkmjd6wwba73prrg0pf", + "hash": "sha256-7oKX8x1HLc5Nk3VC94iwAFpPo57WtdBy4Bbv40HyObs=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; @@ -1526,7 +1559,7 @@ buildLuarocksPackage { }; }) {}; -lua-zlib = callPackage({ fetchgit, buildLuarocksPackage, luaOlder, lua }: +lua-zlib = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "lua-zlib"; version = "1.2-2"; @@ -1540,12 +1573,13 @@ buildLuarocksPackage { "date": "2017-10-07T08:26:37-07:00", "path": "/nix/store/6hjfczd3xkilkdxidgqzdrwmaiwnlf05-lua-zlib", "sha256": "1cv12s5c5lihmf3hb0rz05qf13yihy1bjpb7448v8mkiss6y1s5c", + "hash": "sha256-rOjgjdZxVrQRIWdduYKH0Y/gcAE/gwWHqzDSwooWYbM=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; @@ -1558,7 +1592,7 @@ buildLuarocksPackage { }; }) {}; -lua_cliargs = callPackage({ lua, luaOlder, buildLuarocksPackage, fetchurl }: +lua_cliargs = callPackage({ buildLuarocksPackage, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "lua_cliargs"; version = "3.0-2"; @@ -1578,7 +1612,7 @@ buildLuarocksPackage { }; }) {}; -luabitop = callPackage({ luaAtLeast, lua, fetchgit, buildLuarocksPackage, luaOlder }: +luabitop = callPackage({ buildLuarocksPackage, fetchgit, lua, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "luabitop"; version = "1.0.2-3"; @@ -1589,12 +1623,13 @@ buildLuarocksPackage { "date": "2021-08-30T10:14:03+02:00", "path": "/nix/store/sdnza0zpmlkz9jppnysasbvqy29f4zia-luabitop", "sha256": "1b57f99lrjbwsi4m23cq5kpj0dbpxh3xwr0mxs2rzykr2ijpgwrw", + "hash": "sha256-PPN3ZRR5+p+F7hVk3gfsdzUg7yyYDVFJ1HzJTFNyp6w=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1") || (luaAtLeast "5.3"); propagatedBuildInputs = [ lua ]; @@ -1606,26 +1641,27 @@ buildLuarocksPackage { }; }) {}; -luacheck = callPackage({ argparse, luafilesystem, lua, luaOlder, fetchgit, buildLuarocksPackage }: +luacheck = callPackage({ argparse, buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder, luafilesystem }: buildLuarocksPackage { pname = "luacheck"; - version = "1.1.0-1"; + version = "1.1.1-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/luacheck-1.1.0-1.rockspec"; - sha256 = "1r8d02x0hw28rd5p2gr7sf503lczjxv6qk1q66b375ibx6smpyza"; + url = "mirror://luarocks/luacheck-1.1.1-1.rockspec"; + sha256 = "11nrryqff2yis5s7jscbyv221p21i9sh924x7g9l3d6ijns8zmba"; }).outPath; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/lunarmodules/luacheck.git", - "rev": "fcbdeacad00e643e0d78c56b9ba6d8b3c7fa584f", - "date": "2022-12-19T20:51:56+03:00", - "path": "/nix/store/srzi8dfrbb9gby9lc7r4sndzzrpzd7nm-luacheck", - "sha256": "0bkbcxadlf0j59lyvadp7hs7l107blkci15i0hrbi72bx18hj99h", + "rev": "ababb6d403d634eb74d2c541035e9ede966e710d", + "date": "2023-06-10T11:27:25+03:00", + "path": "/nix/store/wkrhda7nww45g1waxdv9ghm35mwbvlfq-luacheck", + "sha256": "0abd5rfxv667n8d8v3g9cnkyghiwzhj3yk498gr2agd3mfcni7d7", + "hash": "sha256-p51omaujPSXyQ4lMPyT8PMLnp2XpjY0asseY3V0ubSk=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ argparse lua luafilesystem ]; @@ -1637,7 +1673,7 @@ buildLuarocksPackage { }; }) {}; -luacov = callPackage({ luaAtLeast, buildLuarocksPackage, luaOlder, lua, fetchgit }: +luacov = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "luacov"; version = "0.15.0-1"; @@ -1651,12 +1687,13 @@ buildLuarocksPackage { "date": "2021-02-15T18:47:58-03:00", "path": "/nix/store/9vm38il9knzx2m66m250qj1fzdfzqg0y-luacov", "sha256": "08550nna6qcb5jn6ds1hjm6010y8973wx4qbf9vrvrcn1k2yr6ki", + "hash": "sha256-cZrsxQyW5Z13cguTzsdJyIMATJUw6GasLItho6wFpSA=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); propagatedBuildInputs = [ lua ]; @@ -1668,7 +1705,7 @@ buildLuarocksPackage { }; }) {}; -luadbi = callPackage({ buildLuarocksPackage, lua, luaOlder, fetchgit, luaAtLeast }: +luadbi = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "luadbi"; version = "0.7.2-1"; @@ -1682,12 +1719,13 @@ buildLuarocksPackage { "date": "2019-01-14T09:39:17+00:00", "path": "/nix/store/a3qgawila4r4jc2lpdc4mwyzd1gvzazd-luadbi", "sha256": "167ivwmczhp98bxzpz3wdxcfj6vi0a10gpi7rdfjs2rbfwkzqvjh", + "hash": "sha256-UG78J3crCy1dyyfeB4ICcRvpWG98/Pv7QunCzyrf8Zg=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ lua ]; @@ -1699,7 +1737,7 @@ buildLuarocksPackage { }; }) {}; -luadbi-mysql = callPackage({ luaOlder, lua, buildLuarocksPackage, fetchgit, luadbi, luaAtLeast }: +luadbi-mysql = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaAtLeast, luaOlder, luadbi }: buildLuarocksPackage { pname = "luadbi-mysql"; version = "0.7.2-1"; @@ -1713,12 +1751,13 @@ buildLuarocksPackage { "date": "2019-01-14T09:39:17+00:00", "path": "/nix/store/a3qgawila4r4jc2lpdc4mwyzd1gvzazd-luadbi", "sha256": "167ivwmczhp98bxzpz3wdxcfj6vi0a10gpi7rdfjs2rbfwkzqvjh", + "hash": "sha256-UG78J3crCy1dyyfeB4ICcRvpWG98/Pv7QunCzyrf8Zg=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ lua luadbi ]; @@ -1730,7 +1769,7 @@ buildLuarocksPackage { }; }) {}; -luadbi-postgresql = callPackage({ lua, fetchgit, buildLuarocksPackage, luaOlder, luaAtLeast, luadbi }: +luadbi-postgresql = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaAtLeast, luaOlder, luadbi }: buildLuarocksPackage { pname = "luadbi-postgresql"; version = "0.7.2-1"; @@ -1744,12 +1783,13 @@ buildLuarocksPackage { "date": "2019-01-14T09:39:17+00:00", "path": "/nix/store/a3qgawila4r4jc2lpdc4mwyzd1gvzazd-luadbi", "sha256": "167ivwmczhp98bxzpz3wdxcfj6vi0a10gpi7rdfjs2rbfwkzqvjh", + "hash": "sha256-UG78J3crCy1dyyfeB4ICcRvpWG98/Pv7QunCzyrf8Zg=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ lua luadbi ]; @@ -1761,7 +1801,7 @@ buildLuarocksPackage { }; }) {}; -luadbi-sqlite3 = callPackage({ luaAtLeast, lua, luaOlder, buildLuarocksPackage, fetchgit, luadbi }: +luadbi-sqlite3 = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaAtLeast, luaOlder, luadbi }: buildLuarocksPackage { pname = "luadbi-sqlite3"; version = "0.7.2-1"; @@ -1775,12 +1815,13 @@ buildLuarocksPackage { "date": "2019-01-14T09:39:17+00:00", "path": "/nix/store/a3qgawila4r4jc2lpdc4mwyzd1gvzazd-luadbi", "sha256": "167ivwmczhp98bxzpz3wdxcfj6vi0a10gpi7rdfjs2rbfwkzqvjh", + "hash": "sha256-UG78J3crCy1dyyfeB4ICcRvpWG98/Pv7QunCzyrf8Zg=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ lua luadbi ]; @@ -1792,7 +1833,7 @@ buildLuarocksPackage { }; }) {}; -luaepnf = callPackage({ luaOlder, buildLuarocksPackage, lpeg, luaAtLeast, lua, fetchgit }: +luaepnf = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lpeg, lua, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "luaepnf"; version = "0.3-2"; @@ -1806,12 +1847,13 @@ buildLuarocksPackage { "date": "2015-01-15T16:54:10+01:00", "path": "/nix/store/n7gb0z26sl7dzdyy3bx1y3cz3npsna7d-lua-luaepnf", "sha256": "1lvsi3fklhvz671jgg0iqn0xbkzn9qjcbf2ks41xxjz3lapjr6c9", + "hash": "sha256-iZksr6Ljy94D0VO4xSRO9s/VgcURvCfDMX9DOt2IetM=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); propagatedBuildInputs = [ lpeg lua ]; @@ -1823,7 +1865,7 @@ buildLuarocksPackage { }; }) {}; -luaevent = callPackage({ lua, fetchurl, luaOlder, buildLuarocksPackage }: +luaevent = callPackage({ buildLuarocksPackage, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "luaevent"; version = "0.4.6-1"; @@ -1846,7 +1888,7 @@ buildLuarocksPackage { }; }) {}; -luaexpat = callPackage({ buildLuarocksPackage, fetchgit, luaOlder, lua }: +luaexpat = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "luaexpat"; version = "1.4.1-1"; @@ -1860,12 +1902,13 @@ buildLuarocksPackage { "date": "2022-10-04T16:36:23+02:00", "path": "/nix/store/dgrdkalikpqdap642qhppha1ajdnsvx0-luaexpat", "sha256": "1b4ck23p01ks3hgayan9n33f2kb6jvv63v4ww2mqczc09rqi0q46", + "hash": "sha256-hmAQcU6AfYar4JzsYfaWZk3hxrDJKq8eHHoGcIeYjKw=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; @@ -1878,7 +1921,7 @@ buildLuarocksPackage { }; }) {}; -luaffi = callPackage({ fetchgit, buildLuarocksPackage, lua, luaOlder }: +luaffi = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "luaffi"; version = "scm-1"; @@ -1892,12 +1935,13 @@ buildLuarocksPackage { "date": "2021-03-01T11:46:30-05:00", "path": "/nix/store/6dwfn64p3clcsxkq41b307q8izi0fvji-luaffifb", "sha256": "0nj76fw3yi57vfn35yvbdmpdbg9gmn5j1gw84ajs9w1j86sc0661", + "hash": "sha256-wRjAtEEy8KSlIoi/IIutL73Vbm1r+zKs26dEP7gzR1o=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; @@ -1909,7 +1953,7 @@ buildLuarocksPackage { }; }) {}; -luafilesystem = callPackage({ luaOlder, lua, fetchgit, buildLuarocksPackage }: +luafilesystem = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "luafilesystem"; version = "1.8.0-1"; @@ -1923,44 +1967,46 @@ buildLuarocksPackage { "date": "2020-04-22T22:16:42-03:00", "path": "/nix/store/qzjav1cmn4zwclpfs0xzykpbv835d84z-luafilesystem", "sha256": "16hpwhj6zgkjns3zilcg3lxfijm3cl71v39y9n5lbjk4b9kkwh54", + "hash": "sha256-pEA+Z1pkykWLTT6NHQ5lo8roOh2P0fiHtnK+byTkF5o=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; meta = { - homepage = "git://github.com/keplerproject/luafilesystem"; + homepage = "https://github.com/keplerproject/luafilesystem"; description = "File System Library for the Lua Programming Language"; maintainers = with lib.maintainers; [ flosse ]; license.fullName = "MIT/X11"; }; }) {}; -lualdap = callPackage({ fetchgit, lua, luaOlder, buildLuarocksPackage }: +lualdap = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "lualdap"; - version = "1.3.0-1"; + version = "1.3.1-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/lualdap-1.3.0-1.rockspec"; - sha256 = "0b51sm0fz4kiim20w538v31k9g20wq3msxdkh17drkr60ab25sc8"; + url = "mirror://luarocks/lualdap-1.3.1-1.rockspec"; + sha256 = "0c0j9dmrphg0dil4yhahcqzzyxhrv525g65jsz0q6iqwyx10bqbp"; }).outPath; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/lualdap/lualdap", - "rev": "be380f5d98f779c813a4fb4ae1400262366fc8d4", - "date": "2021-06-05T15:49:42+02:00", - "path": "/nix/store/99sy73yz6sidqhkl0kwdsd7r853aw38n-lualdap", - "sha256": "133d8br5f24z03ni38m0czrqfz0mr0ksdrc1g73rawpmiqarpps8", + "rev": "5c21b3e0d97a07b103f63edc7e649018e0453427", + "date": "2023-03-15T09:02:07+01:00", + "path": "/nix/store/ah7y5wpp3l0v5bk0gwzdvgzfpczb691k-lualdap", + "sha256": "1y3ap9si894xjlbrwx3c6bcfg60y80av802rscldg9scvm984jrg", + "hash": "sha256-L0uCUt1Mp9co01kAtBVAHpjn2DJsdJ4XlZ0kFHW6avg=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; @@ -1973,7 +2019,7 @@ buildLuarocksPackage { }; }) {}; -lualogging = callPackage({ luasocket, buildLuarocksPackage, fetchgit }: +lualogging = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, luasocket }: buildLuarocksPackage { pname = "lualogging"; version = "1.8.2-1"; @@ -1987,12 +2033,13 @@ buildLuarocksPackage { "date": "2023-01-27T20:29:41+01:00", "path": "/nix/store/pvb3yq11xgqhq6559sjd8rkf1x991rrz-lualogging", "sha256": "1mz5iiv9pfikkm4ay7j0q6mk3bmcxylnlg9piwda47xxc1zyb1j4", + "hash": "sha256-RIblf2C9H6Iajzc9aqnvrK4xq8FAHq9InTO6m3aM5dc=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; propagatedBuildInputs = [ luasocket ]; @@ -2003,7 +2050,7 @@ buildLuarocksPackage { }; }) {}; -luaossl = callPackage({ buildLuarocksPackage, lua, fetchzip }: +luaossl = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, lua }: buildLuarocksPackage { pname = "luaossl"; version = "20220711-0"; @@ -2025,7 +2072,7 @@ buildLuarocksPackage { }; }) {}; -luaposix = callPackage({ bit32, lua, luaOlder, fetchzip, luaAtLeast, buildLuarocksPackage }: +luaposix = callPackage({ bit32, buildLuarocksPackage, fetchurl, fetchzip, lua, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "luaposix"; version = "34.1.1-1"; @@ -2049,7 +2096,7 @@ buildLuarocksPackage { }; }) {}; -luarepl = callPackage({ buildLuarocksPackage, fetchurl, luaOlder, lua }: +luarepl = callPackage({ buildLuarocksPackage, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "luarepl"; version = "0.10-1"; @@ -2072,7 +2119,7 @@ buildLuarocksPackage { }; }) {}; -luarocks-build-rust-mlua = callPackage({ fetchgit, buildLuarocksPackage }: +luarocks-build-rust-mlua = callPackage({ buildLuarocksPackage, fetchgit, fetchurl }: buildLuarocksPackage { pname = "luarocks-build-rust-mlua"; version = "0.1.2-1"; @@ -2086,41 +2133,44 @@ buildLuarocksPackage { "date": "2023-06-29T16:47:41+01:00", "path": "/nix/store/n7id28r1m11xd550hayv99xhz96vpdjq-luarocks-build-rust-mlua", "sha256": "1zh1p5k7xpczi5db3k0fw0ljw9w0xxk1qjjcfg5rcznqjf48i3x7", + "hash": "sha256-p4+IiJPYfpbLc0xKHGbvgCcuKeAOzLFaiZ/dfma5Af4=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; meta = { homepage = "https://github.com/khvzak/luarocks-build-rust-mlua"; description = "A LuaRocks build backend for Lua modules written in Rust using mlua"; + maintainers = with lib.maintainers; [ mrcjkb ]; license.fullName = "MIT"; }; }) {}; -luasec = callPackage({ fetchgit, luaOlder, luasocket, buildLuarocksPackage, lua }: +luasec = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder, luasocket }: buildLuarocksPackage { pname = "luasec"; - version = "1.2.0-1"; + version = "1.3.2-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/luasec-1.2.0-1.rockspec"; - sha256 = "0zavdkwd701j8zqyzrpn1n5xd242vziq2l79amjdn5mcw81nrsdf"; + url = "mirror://luarocks/luasec-1.3.2-1.rockspec"; + sha256 = "09nqs60cmbq1bi70cdh7v5xjnlsm2mrxv9pmbbvczijvz184jh33"; }).outPath; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/brunoos/luasec", - "rev": "d9215ee00f6694a228daad50ee85827a4cd13583", - "date": "2022-07-30T08:42:53-03:00", - "path": "/nix/store/77m3g768a230h77nxiw23ay73aryq1zh-luasec", - "sha256": "1rz2lhf243lrsjsyjwxhijhqr88l8l8sndzzv9w4x1j0zpa9sblb", + "rev": "4c06287052d68fdbe7429b8f967cdc8ee94aa44a", + "date": "2023-08-31T17:09:53-03:00", + "path": "/nix/store/wnl78b5l3dxw52slphmi4rmr1cd8bd3r-luasec", + "sha256": "0rrdfbnkd8pgqwh3f0iyd5cxy7g1h0568a88m3sq1z7715js4yx3", + "hash": "sha256-o3uiZQnn/ID1qAgpZAqA4R3fWWk+Ajcgx++iNu1yLWc=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua luasocket ]; @@ -2133,7 +2183,7 @@ buildLuarocksPackage { }; }) {}; -luasocket = callPackage({ fetchgit, lua, luaOlder, buildLuarocksPackage }: +luasocket = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "luasocket"; version = "3.1.0-1"; @@ -2147,12 +2197,13 @@ buildLuarocksPackage { "date": "2022-07-27T10:07:00+03:00", "path": "/nix/store/r5pqxqjkdwl80nmjkv400mbls7cfymjc-luasocket", "sha256": "13hyf9cvny0kxwyg08929kkl31w74j66fj6zg1myyjr9nh5b795h", + "hash": "sha256-sKSzCrQpS+9reN9IZ4wkh4dB50wiIfA87xN4u1lyHo4=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; @@ -2164,26 +2215,27 @@ buildLuarocksPackage { }; }) {}; -luasql-sqlite3 = callPackage({ lua, buildLuarocksPackage, fetchgit, luaOlder }: +luasql-sqlite3 = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "luasql-sqlite3"; - version = "2.6.0-1"; + version = "2.6.0-2"; knownRockspec = (fetchurl { - url = "mirror://luarocks/luasql-sqlite3-2.6.0-1.rockspec"; - sha256 = "0w32znsfcaklcja6avqx7daaxbf0hr2v8g8bmz0fysb3401lmp02"; + url = "mirror://luarocks/luasql-sqlite3-2.6.0-2.rockspec"; + sha256 = "1xpbcpl4qhnzpyyszhdsrxhx2qc1dmndh926lv91xwphw7inwdwg"; }).outPath; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/keplerproject/luasql.git", - "rev": "e2660cbaeb13cb33d8346bb816c6a526241b3c2d", - "date": "2022-10-03T18:44:40-03:00", - "path": "/nix/store/mxzq779w3l19bgb424aa4cqdzxczmwr3-luasql", - "sha256": "052hc174am05plidilzf36vr736sp8vyydfb12qa8xr6mk74f6d1", + "rev": "25bf4ffce9323d28cb6f382f7ec9e8951e3084f9", + "date": "2023-07-19T14:20:27-03:00", + "path": "/nix/store/949886jxp7sx3yx910lc6d1yf3ym9mx5-luasql", + "sha256": "00q73j2nzqsm0vmxjkv83qh1dncmr5dgmkrkyxnb5ggygvcbh7w5", + "hash": "sha256-hR+42H7+vbJs9zPP+lrJldkWIB5oT9nrBlXjb4UcBwM=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; @@ -2196,7 +2248,7 @@ buildLuarocksPackage { }; }) {}; -luassert = callPackage({ luaOlder, fetchgit, buildLuarocksPackage, lua, say }: +luassert = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder, say }: buildLuarocksPackage { pname = "luassert"; version = "1.9.0-1"; @@ -2210,12 +2262,13 @@ buildLuarocksPackage { "date": "2022-08-24T00:00:45+03:00", "path": "/nix/store/vfcl25wxps5kvh5prjkkjlj1ga3kgw63-luassert", "sha256": "0wlp6qdm9dkwzs8lvnj7zvmid4y12v717ywlhxn2brkbjpvl2dwf", + "hash": "sha256-jjdB95Vr5iVsh5T7E84WwZMW6/5H2k2R/ny2VBs2l3I=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua say ]; @@ -2227,7 +2280,7 @@ buildLuarocksPackage { }; }) {}; -luasystem = callPackage({ buildLuarocksPackage, luaOlder, lua, fetchurl }: +luasystem = callPackage({ buildLuarocksPackage, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "luasystem"; version = "0.2.1-0"; @@ -2250,7 +2303,7 @@ buildLuarocksPackage { }; }) {}; -luaunbound = callPackage({ fetchurl, lua, buildLuarocksPackage, luaOlder, luaAtLeast }: +luaunbound = callPackage({ buildLuarocksPackage, fetchurl, lua, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "luaunbound"; version = "1.0.0-1"; @@ -2273,7 +2326,7 @@ buildLuarocksPackage { }; }) {}; -luaunit = callPackage({ buildLuarocksPackage, fetchzip, lua, luaAtLeast, luaOlder }: +luaunit = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, lua, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "luaunit"; version = "3.4-1"; @@ -2297,7 +2350,7 @@ buildLuarocksPackage { }; }) {}; -luautf8 = callPackage({ fetchurl, buildLuarocksPackage, lua, luaOlder }: +luautf8 = callPackage({ buildLuarocksPackage, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "luautf8"; version = "0.1.5-2"; @@ -2321,7 +2374,7 @@ buildLuarocksPackage { }; }) {}; -luazip = callPackage({ luaOlder, luaAtLeast, buildLuarocksPackage, lua, fetchgit }: +luazip = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "luazip"; version = "1.2.7-1"; @@ -2335,12 +2388,13 @@ buildLuarocksPackage { "date": "2017-09-05T14:02:52+03:00", "path": "/nix/store/idllj442c0iwnx1cpkrifx2afb7vh821-luazip", "sha256": "1jlqzqlds3aa3hnp737fm2awcx0hzmwyd87klv0cv13ny5v9f2x4", + "hash": "sha256-pAuXdvF2hM3ApvOg5nn9EHTGlajujHMtHEoN3Sj+mMo=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ lua ]; @@ -2352,23 +2406,24 @@ buildLuarocksPackage { }; }) {}; -lush-nvim = callPackage({ buildLuarocksPackage, fetchgit, luaAtLeast, luaOlder, lua }: +lush-nvim = callPackage({ buildLuarocksPackage, fetchgit, lua, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "lush.nvim"; version = "scm-1"; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/rktjmp/lush.nvim", - "rev": "b1e8eb1da3fee95ef31515a73c9eff9bf251088d", - "date": "2023-01-03T10:45:29+11:00", - "path": "/nix/store/wpnvi5bjlp7sl8g2li21qkcd7m1f3d3w-lush.nvim", - "sha256": "0q3prq4fm9rpczl7b1lgqnhs0z5jgvpdy0cp45jfpw4bvcy6vkpq", + "rev": "966aad1accd47fa11fbe2539234f81f678fef2de", + "date": "2023-09-23T12:10:39+10:00", + "path": "/nix/store/67046ilc92czfvwc5zdkkxg7iw2xjj45-lush.nvim", + "sha256": "0g1xib2k42py9qqccjz11qk52ri0drgdk5rb0ls7wzx4v636k15h", + "hash": "sha256-sIRphtmkf340BSuX2V5uIGZRJg7hS8YwTv4KMsWKPTw=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ lua ]; @@ -2381,7 +2436,7 @@ buildLuarocksPackage { }; }) {}; -luuid = callPackage({ luaOlder, luaAtLeast, buildLuarocksPackage, fetchurl, lua }: +luuid = callPackage({ buildLuarocksPackage, fetchurl, lua, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "luuid"; version = "20120509-2"; @@ -2404,7 +2459,7 @@ buildLuarocksPackage { }; }) {}; -luv = callPackage({ luaOlder, buildLuarocksPackage, fetchurl, lua }: +luv = callPackage({ buildLuarocksPackage, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "luv"; version = "1.44.2-1"; @@ -2427,7 +2482,7 @@ buildLuarocksPackage { }; }) {}; -lyaml = callPackage({ buildLuarocksPackage, fetchzip, lua, luaOlder, luaAtLeast }: +lyaml = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, lua, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "lyaml"; version = "6.2.8-1"; @@ -2451,7 +2506,7 @@ buildLuarocksPackage { }; }) {}; -magick = callPackage({ fetchgit, buildLuarocksPackage, lua }: +magick = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua }: buildLuarocksPackage { pname = "magick"; version = "1.6.0-1"; @@ -2465,24 +2520,26 @@ buildLuarocksPackage { "date": "2022-03-10T20:02:11-08:00", "path": "/nix/store/fpl99q09zg3qnk4kagxk1djabl1dm47l-magick", "sha256": "01b9qsz27f929rz5z7vapqhazxak74sichdwkjwb219nlhrwfncm", + "hash": "sha256-lVnHM6Q2BbG4nLxBFjU5U/WvIL5qn19+TiK5I77GaQU=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (lua.luaversion != "5.1"); propagatedBuildInputs = [ lua ]; meta = { - homepage = "git://github.com/leafo/magick.git"; + homepage = "https://github.com/leafo/magick.git"; description = "Lua bindings to ImageMagick & GraphicsMagick for LuaJIT using FFI"; + maintainers = with lib.maintainers; [ donovanglover ]; license.fullName = "MIT"; }; }) {}; -markdown = callPackage({ buildLuarocksPackage, luaAtLeast, fetchgit, luaOlder, lua }: +markdown = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "markdown"; version = "0.33-1"; @@ -2496,12 +2553,13 @@ buildLuarocksPackage { "date": "2015-09-27T17:49:28+03:00", "path": "/nix/store/akl80hh077hm20bdqj1lksy0fn2285b5-markdown", "sha256": "019bk2qprszqncnm8zy6ns6709iq1nwkf7i86nr38f035j4lc11y", + "hash": "sha256-PgRGiSwDODSyNSgeN7kNOCZwjLbGf1Qts/jrfLGYKwU=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ lua ]; @@ -2513,7 +2571,7 @@ buildLuarocksPackage { }; }) {}; -mediator_lua = callPackage({ luaOlder, lua, fetchurl, buildLuarocksPackage }: +mediator_lua = callPackage({ buildLuarocksPackage, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "mediator_lua"; version = "1.1.2-0"; @@ -2536,7 +2594,7 @@ buildLuarocksPackage { }; }) {}; -middleclass = callPackage({ luaOlder, buildLuarocksPackage, fetchurl, lua }: +middleclass = callPackage({ buildLuarocksPackage, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "middleclass"; version = "4.1.1-0"; @@ -2559,23 +2617,24 @@ buildLuarocksPackage { }; }) {}; -moonscript = callPackage({ lpeg, luaOlder, fetchgit, lua, buildLuarocksPackage, argparse, luafilesystem }: +moonscript = callPackage({ argparse, buildLuarocksPackage, fetchgit, lpeg, lua, luaOlder, luafilesystem }: buildLuarocksPackage { pname = "moonscript"; version = "dev-1"; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/leafo/moonscript.git", - "rev": "a0108328373d5f3f1aefb98341aa895dd75a1b2a", - "date": "2022-11-04T13:38:05-07:00", - "path": "/nix/store/js597jw44cdfq154a7bpqba99ninzsqh-moonscript", - "sha256": "02ig93c1dzrbs64mz40bkzz3p93fdxm6m0i7gfqwiickybr9wd97", + "rev": "fbd8ad48737651114a3d3a672b9f8f8b3a7022b7", + "date": "2023-06-23T09:33:37-07:00", + "path": "/nix/store/sy1dkcfp3rg7lvazba36sivpk0bs12r5-moonscript", + "sha256": "02w6lp5kid73dcd5x71666my7413l05ak0xvva6hp8ixbn6qraqn", + "hash": "sha256-FquMjV09oguN2ruDqQqgI5DjqzEmnF4aa+O0OMulhgs=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ argparse lpeg lua luafilesystem ]; @@ -2591,14 +2650,14 @@ buildLuarocksPackage { mpack = callPackage({ buildLuarocksPackage, fetchurl }: buildLuarocksPackage { pname = "mpack"; - version = "1.0.9-0"; + version = "1.0.11-0"; knownRockspec = (fetchurl { - url = "mirror://luarocks/mpack-1.0.9-0.rockspec"; - sha256 = "1v10kmw3qw559bbm142z40ib26bwvcyi64qjrk0vf8v6n1mx8wcn"; + url = "mirror://luarocks/mpack-1.0.11-0.rockspec"; + sha256 = "0alydkccamxldij7ki42imd37630d9qnqg22pndcgkawfclfqzqa"; }).outPath; src = fetchurl { - url = "https://github.com/libmpack/libmpack-lua/releases/download/1.0.9/libmpack-lua-1.0.9.tar.gz"; - sha256 = "17lyjmnbychacwahqgs128nb00xky777g7zw5wf20vrzkiq7xl0g"; + url = "https://github.com/libmpack/libmpack-lua/releases/download/1.0.11/libmpack-lua-1.0.11.tar.gz"; + sha256 = "15np7603rijavycvrjgjp12y64zs36390lg2hsnr5av790cfrnd2"; }; @@ -2609,7 +2668,7 @@ buildLuarocksPackage { }; }) {}; -nui-nvim = callPackage( { fetchgit, buildLuarocksPackage }: +nui-nvim = callPackage({ buildLuarocksPackage, fetchgit, fetchurl }: buildLuarocksPackage { pname = "nui.nvim"; version = "0.2.0-1"; @@ -2623,12 +2682,13 @@ buildLuarocksPackage { "date": "2023-07-20T10:45:09+06:00", "path": "/nix/store/8zdhjgipjjhi9b1y40r2yk5np4lp39as-nui.nvim", "sha256": "14a73dwl56kah9h36b40ir6iylvfs261ysz17qvi9vhp63vjq9cx", + "hash": "sha256-nSUs9zAX7hQ3PuFrH4zQblMfTY6ALDNggmqaQnkbR5E=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; meta = { @@ -2639,7 +2699,7 @@ buildLuarocksPackage { }; }) {}; -nvim-client = callPackage({ coxpcall, fetchurl, mpack, lua, luaOlder, luv, buildLuarocksPackage }: +nvim-client = callPackage({ buildLuarocksPackage, coxpcall, fetchurl, lua, luaOlder, luv, mpack }: buildLuarocksPackage { pname = "nvim-client"; version = "0.2.4-1"; @@ -2659,23 +2719,24 @@ buildLuarocksPackage { }; }) {}; -nvim-cmp = callPackage({ luaAtLeast, lua, fetchgit, buildLuarocksPackage, luaOlder }: +nvim-cmp = callPackage({ buildLuarocksPackage, fetchgit, lua, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "nvim-cmp"; version = "scm-1"; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/hrsh7th/nvim-cmp", - "rev": "7a3b1e76f74934b12fda82158237c6ad8bfd3d40", - "date": "2023-02-24T12:23:36+09:00", - "path": "/nix/store/s1qark9y2zkbwyl2mzg60z9r0h4hajf4-nvim-cmp", - "sha256": "0cy93aj02nkspr83sqsrix12jcnhkl5s2mbpjr5ffhpcrk19vlmx", + "rev": "5dce1b778b85c717f6614e3f4da45e9f19f54435", + "date": "2023-08-26T15:31:42+00:00", + "path": "/nix/store/lvpzc5q7mv66knxh1igvzkrcwkpg8l8q-nvim-cmp", + "sha256": "1yl5b680p6vhk1741riiwjnw7a4wn0nimjvcab0ij6mx3kf28rsq", + "hash": "sha256-WGck3By9GhnBUmzLGi2wnKjDreQx5kBOmHCbC5BZhfo=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ lua ]; @@ -2687,23 +2748,24 @@ buildLuarocksPackage { }; }) {}; -penlight = callPackage({ luafilesystem, luaOlder, fetchgit, buildLuarocksPackage, lua }: +penlight = callPackage({ buildLuarocksPackage, fetchgit, lua, luaOlder, luafilesystem }: buildLuarocksPackage { pname = "penlight"; version = "dev-1"; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/lunarmodules/penlight.git", - "rev": "7e67bcb1c4d95e7ca817356533419b4a72049b96", - "date": "2022-12-28T23:34:46+01:00", - "path": "/nix/store/14kax7nswd7in005cgb0f0r8194s9nsd-penlight", - "sha256": "17gcfi8hqpdp8m0f1nr9n5p1mzxxpq2qwf8zkqvjkb7qv1zqabj1", + "rev": "dc6d19c5c1e1b4ac55b14df17b7645af6b410140", + "date": "2023-09-21T10:51:09+02:00", + "path": "/nix/store/vbi0d32mbaqcra3jligv8ajq17m1wxa4-penlight", + "sha256": "12ppgby8ldh4zxwcr7cknacbdvk30fi92sgyzh1zbgvym4l44g0c", + "hash": "sha256-DDxCKKl+v/UD/P5pkaIDY+62mLKTncx4/wQ2ivx694o=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua luafilesystem ]; @@ -2716,23 +2778,24 @@ buildLuarocksPackage { }; }) {}; -plenary-nvim = callPackage({ lua, fetchgit, luaOlder, luaAtLeast, luassert, buildLuarocksPackage }: +plenary-nvim = callPackage({ buildLuarocksPackage, fetchgit, lua, luaAtLeast, luaOlder, luassert }: buildLuarocksPackage { pname = "plenary.nvim"; version = "scm-1"; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/nvim-lua/plenary.nvim", - "rev": "253d34830709d690f013daf2853a9d21ad7accab", - "date": "2023-02-19T10:05:49+01:00", - "path": "/nix/store/dnzlin3gqpvd35a8c5g5hwg3fl28vxgs-plenary.nvim", - "sha256": "17vvl06jc5vrfrv7gljflkqykshhg84wnhbl9br4pm050ywlg4ng", + "rev": "50012918b2fc8357b87cff2a7f7f0446e47da174", + "date": "2023-10-11T15:43:47+02:00", + "path": "/nix/store/jsgaq274w8pbl4pnmpii3izxafpl346g-plenary.nvim", + "sha256": "1sn7vpsbwpyndsjyxb4af8fvz4sfhlbavvw6jjsv3h18sdvkh7nd", + "hash": "sha256-zR44d9MowLG1lIbvrRaFTpO/HXKKrO6lbtZfvvTdx+o=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ lua luassert ]; @@ -2744,7 +2807,7 @@ buildLuarocksPackage { }; }) {}; -rapidjson = callPackage({ lua, buildLuarocksPackage, luaOlder, fetchgit }: +rapidjson = callPackage({ buildLuarocksPackage, fetchgit, lua, luaOlder }: buildLuarocksPackage { pname = "rapidjson"; version = "0.7.1-1"; @@ -2755,12 +2818,13 @@ buildLuarocksPackage { "date": "2021-04-09T19:59:20+08:00", "path": "/nix/store/65l71ph27pmipgrq8j4whg6n8h2avvs4-lua-rapidjson", "sha256": "1a6srvximxlh6gjkaj5y86d1kf06pc4gby2r6wpdw2pdac8k7xyb", + "hash": "sha256-y/czEVPtCt4uN1n49Qi7BrgZmkG+SDXlM5D2GvvO2qg=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; @@ -2772,44 +2836,21 @@ buildLuarocksPackage { }; }) {}; -readline = callPackage({ buildLuarocksPackage, fetchurl, luaAtLeast, luaOlder, lua, luaposix }: -buildLuarocksPackage { - pname = "readline"; - version = "3.2-0"; - knownRockspec = (fetchurl { - url = "mirror://luarocks/readline-3.2-0.rockspec"; - sha256 = "1r0sgisxm4xd1r6i053iibxh30j7j3rcj4wwkd8rzkj8nln20z24"; - }).outPath; - src = fetchurl { - url = "http://www.pjb.com.au/comp/lua/readline-3.2.tar.gz"; - sha256 = "1mk9algpsvyqwhnq7jlw4cgmfzj30l7n2r6ak4qxgdxgc39f48k4"; - }; - - disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); - propagatedBuildInputs = [ lua luaposix ]; - - meta = { - homepage = "http://pjb.com.au/comp/lua/readline.html"; - description = "Interface to the readline library"; - license.fullName = "MIT/X11"; - }; -}) {}; - -rest-nvim = callPackage({ lua, luaAtLeast, buildLuarocksPackage, luaOlder, fetchzip, plenary-nvim }: +rest-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, lua, luaOlder }: buildLuarocksPackage { pname = "rest.nvim"; - version = "0.1-2"; + version = "0.2-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/rest.nvim-0.1-2.rockspec"; - sha256 = "0l8k91483nz75ijgnyfb8r7mynsaps7ikvjkziimf62bv7aks3qh"; + url = "mirror://luarocks/rest.nvim-0.2-1.rockspec"; + sha256 = "1yq8gx585c10j8kybp20swyv9q0i3lm5k0rrv4bgsbwz3ychn0k1"; }).outPath; src = fetchzip { - url = "http://github.com/rest-nvim/rest.nvim/archive/0.1.zip"; - sha256 = "0yf1a1cjrrzw0wmjgg48g3qn9kfxn7hv38yx88l1sc1r1nsfijrq"; + url = "https://github.com/rest-nvim/rest.nvim/archive/0.2.zip"; + sha256 = "0ycjrrl37z465p71bdkas3q2ky1jmgr2cjnirnskdc6wz14wl09g"; }; - disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); - propagatedBuildInputs = [ lua plenary-nvim ]; + disabled = (luaOlder "5.1"); + propagatedBuildInputs = [ lua ]; meta = { homepage = "https://github.com/rest-nvim/rest.nvim"; @@ -2843,23 +2884,24 @@ buildLuarocksPackage { }; }) {}; -say = callPackage({ luaOlder, fetchgit, lua, buildLuarocksPackage }: +say = callPackage({ buildLuarocksPackage, fetchgit, lua, luaOlder }: buildLuarocksPackage { pname = "say"; version = "scm-1"; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/lunarmodules/say.git", - "rev": "45a3057e68c52b34ab59ef167efeb2340e356661", - "date": "2022-08-27T11:00:01+03:00", - "path": "/nix/store/324ryi5hlaisnyp4wpd1hvzcfv508i4s-say", - "sha256": "178pdsswwnja2f106701xmdxsdijjl5smm28dhhdcmjyb4mn8cr2", + "rev": "3e1f783d0aa496eb21d16e85b2235335cb9332df", + "date": "2023-08-13T02:37:27+03:00", + "path": "/nix/store/5biavac0k8z0xg4rr3bm8z3kdi8mm8c0-say", + "sha256": "04dkf0av6n71vmz0h86i5brklvaf9p91lkldn1xldpdr0qqs0x63", + "hash": "sha256-w3SgMQa53UZ7sI1OGtJNTm068yrRIAh+3eFYsxVwsxE=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; @@ -2871,7 +2913,7 @@ buildLuarocksPackage { }; }) {}; -serpent = callPackage({ fetchgit, luaAtLeast, lua, buildLuarocksPackage, luaOlder }: +serpent = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "serpent"; version = "0.30-2"; @@ -2885,12 +2927,13 @@ buildLuarocksPackage { "date": "2017-09-01T21:35:14-07:00", "path": "/nix/store/z6df44n3p07n4bia7s514vgngbkbpnap-serpent", "sha256": "0q80yfrgqgr01qprf0hrp284ngb7fbcq1v9rbzmdkhbm9lpgy8v8", + "hash": "sha256-aCP/Lk11wdnqXzntgNlyZz1LkLgZApcvDiA//LLzAGE=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); propagatedBuildInputs = [ lua ]; @@ -2903,7 +2946,7 @@ buildLuarocksPackage { }; }) {}; -sqlite = callPackage({ fetchgit, buildLuarocksPackage, luv }: +sqlite = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, luv }: buildLuarocksPackage { pname = "sqlite"; version = "v1.2.2-0"; @@ -2917,12 +2960,13 @@ buildLuarocksPackage { "date": "2022-06-17T15:57:13+03:00", "path": "/nix/store/637s46bsvsxfnzmy6ygig3y0vqmf3r8p-sqlite.lua", "sha256": "0ckifx6xxrannn9szacgiiqjsp4rswghxscdl3s411dhas8djj1m", + "hash": "sha256-NUjZkFawhUD0oI3pDh/XmVwtcYyPqa+TtVbl3k13cTI=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; propagatedBuildInputs = [ luv ]; @@ -2933,7 +2977,7 @@ buildLuarocksPackage { }; }) {}; -std-_debug = callPackage({ buildLuarocksPackage, lua, luaOlder, fetchgit, luaAtLeast }: +std-_debug = callPackage({ buildLuarocksPackage, fetchgit, lua, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "std._debug"; version = "git-1"; @@ -2944,12 +2988,13 @@ buildLuarocksPackage { "date": "2023-01-31T16:39:35-07:00", "path": "/nix/store/i24iz2hvnjp18iz9z8kljsy9iv17m2zl-_debug", "sha256": "07z5lz3gy8wzzks79r3v68vckj42i3sybhfmqx7h2s58ld2kn5fd", + "hash": "sha256-zRU7RaOoaAFPx9XB5fWIgsjJNjJ75HT0/J8j/8an5R8=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); propagatedBuildInputs = [ lua ]; @@ -2961,23 +3006,18 @@ buildLuarocksPackage { }; }) {}; -std-normalize = callPackage({ buildLuarocksPackage, fetchgit, lua, luaAtLeast, std-_debug, luaOlder }: +std-normalize = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, lua, luaAtLeast, luaOlder, std-_debug }: buildLuarocksPackage { pname = "std.normalize"; - version = "git-1"; - - src = fetchgit ( removeAttrs (builtins.fromJSON ''{ - "url": "https://github.com/lua-stdlib/normalize.git", - "rev": "ccc697998af22d9d7f675e73f4b27c7a52151b5c", - "date": "2022-01-02T16:33:35-08:00", - "path": "/nix/store/nvyy1ibp43pzaldj6ark02ypqr45wmy1-normalize", - "sha256": "1m6x4lp7xzghvagbqjljyqfcpilh76j25b71da6jd304xc9r0ngy", - "fetchLFS": false, - "fetchSubmodules": true, - "deepClone": false, - "leaveDotGit": false -} - '') ["date" "path"]) ; + version = "2.0.3-1"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/std.normalize-2.0.3-1.rockspec"; + sha256 = "1l83ikiaw4dch2r69cxpl93b9d4wf54vbjb6fcggnkxxgm0amj3a"; + }).outPath; + src = fetchzip { + url = "http://github.com/lua-stdlib/normalize/archive/v2.0.3.zip"; + sha256 = "1gyywglxd2y7ck3hk8ap73w0x7hf9irpg6vgs8yc6k9k4c5g3fgi"; + }; disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); propagatedBuildInputs = [ lua std-_debug ]; @@ -2989,7 +3029,7 @@ buildLuarocksPackage { }; }) {}; -stdlib = callPackage({ buildLuarocksPackage, luaAtLeast, fetchzip, lua, luaOlder }: +stdlib = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, lua, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "stdlib"; version = "41.2.2-1"; @@ -3013,7 +3053,7 @@ buildLuarocksPackage { }; }) {}; -teal-language-server = callPackage({ luafilesystem, buildLuarocksPackage, dkjson, cyan, fetchgit }: +teal-language-server = callPackage({ buildLuarocksPackage, cyan, dkjson, fetchgit, fetchurl, luafilesystem }: buildLuarocksPackage { pname = "teal-language-server"; version = "dev-1"; @@ -3027,12 +3067,13 @@ buildLuarocksPackage { "date": "2022-12-21T20:33:53-06:00", "path": "/nix/store/qyaz38njm8qgyfxca6m6f8i4lkfcfdb0-teal-language-server", "sha256": "12nqarykmdvxxci9l6gq2yhn4pjzzqlxyrl2c8svb97hka68wjvx", + "hash": "sha256-fUuOjJrwpLU1YoJm3yn+X15ioRf4GZoi6323On1W2Io=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; propagatedBuildInputs = [ cyan dkjson luafilesystem ]; @@ -3043,17 +3084,17 @@ buildLuarocksPackage { }; }) {}; -telescope-manix = callPackage({ telescope-nvim, buildLuarocksPackage, lua, fetchzip, luaOlder }: +telescope-manix = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, lua, luaOlder, telescope-nvim }: buildLuarocksPackage { pname = "telescope-manix"; - version = "0.4.0-1"; + version = "0.5.0-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/telescope-manix-0.4.0-1.rockspec"; - sha256 = "1kh3dn4aixydxrq01sbl40v7if8bmpsvv30qf7vig7dvl21aqkrp"; + url = "mirror://luarocks/telescope-manix-0.5.0-1.rockspec"; + sha256 = "0i5q9sr0vn0w6yqg530jx2fx52k9jr7rss4ibl49f1x3wv6sckv1"; }).outPath; src = fetchzip { - url = "https://github.com/mrcjkb/telescope-manix/archive/0.4.0.zip"; - sha256 = "153fqnk8iymyq309kpfiz3xmlqryj02rji3z7air23bgyjkx0gr8"; + url = "https://github.com/mrcjkb/telescope-manix/archive/0.5.0.zip"; + sha256 = "093vkh822ycnc1pri3zmzzqnz235xxam3z1l67zyyqlc1apbarax"; }; disabled = (luaOlder "5.1"); @@ -3066,7 +3107,7 @@ buildLuarocksPackage { }; }) {}; -telescope-nvim = callPackage({ plenary-nvim, buildLuarocksPackage, lua, fetchgit }: +telescope-nvim = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, plenary-nvim }: buildLuarocksPackage { pname = "telescope.nvim"; version = "scm-1"; @@ -3076,16 +3117,17 @@ buildLuarocksPackage { }).outPath; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/nvim-telescope/telescope.nvim", - "rev": "a3f17d3baf70df58b9d3544ea30abe52a7a832c2", - "date": "2023-02-26T13:26:12+01:00", - "path": "/nix/store/qyzs7im9nqn04h9w9nii4nv12ysgk1fk-telescope.nvim", - "sha256": "136pik53kwl2avjdakwfls10d85jqybl7yd0mbzxc5nry8krav22", + "rev": "74ce793a60759e3db0d265174f137fb627430355", + "date": "2023-10-11T12:29:23+02:00", + "path": "/nix/store/7k50qqgamc2ldxdf54jqs8sy8m8vcfzr-telescope.nvim", + "sha256": "1m4v097y8ypjm572k1qqii3z56w4x1dsjxd6gp0z24xqyvd4kpa4", + "hash": "sha256-RN1J2va4E/HBfaZ1qVvohJvyR4wYhylOqfJ65E8Cm9Q=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (lua.luaversion != "5.1"); propagatedBuildInputs = [ lua plenary-nvim ]; @@ -3097,26 +3139,27 @@ buildLuarocksPackage { }; }) {}; -tl = callPackage({ compat53, luafilesystem, argparse, buildLuarocksPackage, fetchgit }: +tl = callPackage({ argparse, buildLuarocksPackage, compat53, fetchgit, fetchurl, luafilesystem }: buildLuarocksPackage { pname = "tl"; - version = "0.15.1-1"; + version = "0.15.2-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/tl-0.15.1-1.rockspec"; - sha256 = "0f9wr91pxcvx43jp9ma4yb6f0r9yrc2fm437nx7xm0dyh7kac9p6"; + url = "mirror://luarocks/tl-0.15.2-1.rockspec"; + sha256 = "1qisdflgikry0jdqvnzdcqib2svbafp10n0gfwm3fcrzqsdxy0xr"; }).outPath; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/teal-language/tl", - "rev": "a10fb2c69827c1b0f8e1b8a5c848a06d6da5d3be", - "date": "2023-01-23T18:14:26-03:00", - "path": "/nix/store/x5p9v443g53sz2c8rvxa465gzfiv47wb-tl", - "sha256": "0hql1274wxji54cadalv4j3k82vd9xasvi119cdnm16mh85ir70s", + "rev": "d2fc36b5ff9a52d7265e63eb74cce70fd1cdbcb2", + "date": "2023-04-27T11:28:21-03:00", + "path": "/nix/store/ramhj3a29lrn0bblbgyxn4712a7caq8k-tl", + "sha256": "1dgldi9pgg23iz3xis4i43bnvkwirh7kkycmr5xp75s2cc85zhg0", + "hash": "sha256-4MFfEGNCl3N7yZX5OQ/Mkc9t1yCR6NjHj0O8d1Ns9LU=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; propagatedBuildInputs = [ argparse compat53 luafilesystem ]; @@ -3128,7 +3171,7 @@ buildLuarocksPackage { }; }) {}; -toml = callPackage({ lua, fetchgit, luaOlder, buildLuarocksPackage }: +toml = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder }: buildLuarocksPackage { pname = "toml"; version = "0.3.0-0"; @@ -3142,12 +3185,13 @@ buildLuarocksPackage { "date": "2023-02-19T23:00:49-05:00", "path": "/nix/store/p6a98sqp9a4jwsw6ghqcwpn9lxmhvkdg-toml.lua", "sha256": "05p33bq0ajl41vbsw9bx73shpf0p11n5gb6yy8asvp93zh2m51hq", + "hash": "sha256-GIZSBfwj3a0V8t6sV2wIF7gL9Th9Ja7XDoRKBfAa4xY=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; @@ -3160,7 +3204,7 @@ buildLuarocksPackage { }; }) {}; -toml-edit = callPackage({ luaOlder, luarocks-build-rust-mlua, buildLuarocksPackage, lua, fetchgit }: +toml-edit = callPackage({ buildLuarocksPackage, fetchgit, fetchurl, lua, luaOlder, luarocks-build-rust-mlua }: buildLuarocksPackage { pname = "toml-edit"; version = "0.1.4-1"; @@ -3174,12 +3218,13 @@ buildLuarocksPackage { "date": "2023-10-02T16:54:10+02:00", "path": "/nix/store/p1368agmqg4jwb1qvf2iff3fdrq9vkdj-toml-edit.lua", "sha256": "1aa8znjnmm84392gnl7w0hm069xfv7niym3i8my7kyk0vdgxja06", + "hash": "sha256-BijZX9tg+nl8RXFUH+3ZricDKgT8UPtEGgTVaqX9SKk=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua luarocks-build-rust-mlua ]; @@ -3192,7 +3237,7 @@ buildLuarocksPackage { }; }) {}; -vstruct = callPackage({ fetchgit, lua, buildLuarocksPackage, luaOlder }: +vstruct = callPackage({ buildLuarocksPackage, fetchgit, lua, luaOlder }: buildLuarocksPackage { pname = "vstruct"; version = "2.1.1-1"; @@ -3203,12 +3248,13 @@ buildLuarocksPackage { "date": "2020-05-06T23:13:06-04:00", "path": "/nix/store/a4i9k5hx9xiz38bij4hb505dg088jkss-vstruct", "sha256": "0sl9v874mckhh6jbxsan48s5xajzx193k4qlphw69sdbf8kr3p57", + "hash": "sha256-p9yRJ3Kr6WQ4vBSTOVLoX6peNCJW6b6kgXCySg7aiWo=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; @@ -3219,26 +3265,27 @@ buildLuarocksPackage { }; }) {}; -vusted = callPackage({ buildLuarocksPackage, fetchgit, busted }: +vusted = callPackage({ buildLuarocksPackage, busted, fetchgit, fetchurl }: buildLuarocksPackage { pname = "vusted"; - version = "2.2.0-1"; + version = "2.3.1-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/vusted-2.2.0-1.rockspec"; - sha256 = "1ri96pdwhck1sbdnkqj9ksv9hs86pv8v2f6vl25696v9snp9jkzs"; + url = "mirror://luarocks/vusted-2.3.1-1.rockspec"; + sha256 = "03h7l12xk43rql9vxb5nzfimx9srwaazx2r3j2zm1ba2qz06h0qc"; }).outPath; src = fetchgit ( removeAttrs (builtins.fromJSON ''{ "url": "https://github.com/notomo/vusted.git", - "rev": "f142170d3b802f6cedfcff67b945a260087ecf65", - "date": "2023-01-03T11:23:56+09:00", - "path": "/nix/store/la7h2a39wnjkdg1fzhkgw3hbrhs4c5kf-vusted", - "sha256": "17pdwaqjfkv2b7a801k5fdg2s0s75miiilfdjgmsyv7phighvkvw", + "rev": "2bc6818a756e47240d9284f1dfac21b011ca84ea", + "date": "2023-10-09T11:47:28+09:00", + "path": "/nix/store/jq2yl4adpnyilp3yyw161j1a29bwahqi-vusted", + "sha256": "04lxc78n3h1qhby6b4k9x8hb1c3sgqdid71fsvyg4y6j7rb55a8z", + "hash": "sha256-H6lSVj7SePL81i6cFht+erCwIOppkmX8gjjAYdFhnRI=", "fetchLFS": false, "fetchSubmodules": true, "deepClone": false, "leaveDotGit": false } - '') ["date" "path"]) ; + '') ["date" "path" "sha256"]) ; propagatedBuildInputs = [ busted ]; diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index ba36225a13b..e62b32ce6b6 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -117,12 +117,6 @@ with prev; ''; }); - cyrussasl = prev.cyrussasl.overrideAttrs (drv: { - externalDeps = [ - { name = "LIBSASL"; dep = cyrus_sasl; } - ]; - }); - fennel = prev.fennel.overrideAttrs(oa: { nativeBuildInputs = oa.nativeBuildInputs ++ [ installShellFiles @@ -322,7 +316,7 @@ with prev; externalDeps = [ { name = "EVENT"; dep = libevent; } ]; - disabled = luaOlder "5.1" || luaAtLeast "5.4"; + meta.broken = luaOlder "5.1" || luaAtLeast "5.4"; }); luaexpat = prev.luaexpat.overrideAttrs (_: { @@ -386,6 +380,11 @@ with prev; ]; }); + # lua-resty-session = prev.lua-resty-session.overrideAttrs (oa: { + # # lua_pack and lua-ffi-zlib are unpackaged, causing this package to not evaluate + # meta.broken = true; + # }); + lua-yajl = prev.lua-yajl.overrideAttrs (oa: { buildInputs = oa.buildInputs ++ [ yajl @@ -525,8 +524,21 @@ with prev; ''; }); - readline = prev.readline.overrideAttrs (oa: { - propagatedBuildInputs = oa.propagatedBuildInputs ++ [ readline.out ]; + readline = final.callPackage({ buildLuarocksPackage, fetchurl, luaAtLeast, luaOlder, lua, luaposix }: + buildLuarocksPackage ({ + pname = "readline"; + version = "3.2-0"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/readline-3.2-0.rockspec"; + sha256 = "1r0sgisxm4xd1r6i053iibxh30j7j3rcj4wwkd8rzkj8nln20z24"; + }).outPath; + src = fetchurl { + # the rockspec url doesn't work because 'www.' is not covered by the certificate so + # I manually removed the 'www' prefix here + url = "http://pjb.com.au/comp/lua/readline-3.2.tar.gz"; + sha256 = "1mk9algpsvyqwhnq7jlw4cgmfzj30l7n2r6ak4qxgdxgc39f48k4"; + }; + extraVariables = rec { READLINE_INCDIR = "${readline.dev}/include"; HISTORY_INCDIR = READLINE_INCDIR; @@ -535,9 +547,19 @@ with prev; unzip "$curSrc" tar xf *.tar.gz ''; - # Without this, source root is wrongly set to ./readline-2.6/doc - sourceRoot = "readline-${lib.versions.majorMinor oa.version}"; - }); + + disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); + propagatedBuildInputs = [ lua luaposix + readline.out + ]; + + meta = { + homepage = "http://pjb.com.au/comp/lua/readline.html"; + description = "Interface to the readline library"; + license.fullName = "MIT/X11"; + }; + })) {}; + sqlite = prev.sqlite.overrideAttrs (drv: { diff --git a/pkgs/development/misc/juce/default.nix b/pkgs/development/misc/juce/default.nix index 113cabc0440..6c409a18e7a 100644 --- a/pkgs/development/misc/juce/default.nix +++ b/pkgs/development/misc/juce/default.nix @@ -53,9 +53,9 @@ stdenv.mkDerivation (finalAttrs: { libglvnd # libGL.so webkitgtk # webkit2gtk-4.0 ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk_11_0.frameworks.Cocoa - darwin.apple_sdk_11_0.frameworks.MetalKit - darwin.apple_sdk_11_0.frameworks.WebKit + darwin.apple_sdk.frameworks.Cocoa + darwin.apple_sdk.frameworks.MetalKit + darwin.apple_sdk.frameworks.WebKit ]; meta = with lib; { diff --git a/pkgs/development/misc/resholve/0014-clang_incompatible_function_pointer_conversions.patch b/pkgs/development/misc/resholve/0014-clang_incompatible_function_pointer_conversions.patch new file mode 100644 index 00000000000..52d5e6adfe7 --- /dev/null +++ b/pkgs/development/misc/resholve/0014-clang_incompatible_function_pointer_conversions.patch @@ -0,0 +1,42 @@ +diff -ur a/decoder.c b/decoder.c +--- a/decoder.c 1980-01-02 00:00:00.000000000 -0500 ++++ b/decoder.c 2023-11-08 17:42:43.981838074 -0500 +@@ -94,7 +94,7 @@ + return PlaceObject(ctx, PyBool_FromLong((long)(value))); + } + +-static int handle_number(void *ctx, const char *value, unsigned int length) ++static int handle_number(void *ctx, const char *value, size_t length) + { + //fprintf(stderr, "handle_number: "); + //fwrite(value, length, 1, stderr); +@@ -127,7 +127,7 @@ + return status; + } + +-static int handle_string(void *ctx, const unsigned char *value, unsigned int length) ++static int handle_string(void *ctx, const unsigned char *value, size_t length) + { + return PlaceObject(ctx, PyString_FromStringAndSize((char *)value, length)); + } +@@ -142,7 +142,7 @@ + return success; + } + +-static int handle_dict_key(void *ctx, const unsigned char *value, unsigned int length) ++static int handle_dict_key(void *ctx, const unsigned char *value, size_t length) + { + PyObject *object = PyString_FromStringAndSize((const char *) value, length); + +diff -ur a/yajl.c b/yajl.c +--- a/yajl.c 1980-01-02 00:00:00.000000000 -0500 ++++ b/yajl.c 2023-11-08 17:41:18.781350335 -0500 +@@ -161,7 +161,7 @@ + } + + static struct PyMethodDef yajl_methods[] = { +- {"dumps", (PyCFunctionWithKeywords)(py_dumps), METH_VARARGS | METH_KEYWORDS, ++ {"dumps", (PyCFunction)(py_dumps), METH_VARARGS | METH_KEYWORDS, + "yajl.dumps(obj [, indent=None])\n\n\ + Returns an encoded JSON string of the specified `obj`\n\ + \n\ diff --git a/pkgs/development/misc/resholve/oildev.nix b/pkgs/development/misc/resholve/oildev.nix index 3e7dbc8e010..2459c492ebc 100644 --- a/pkgs/development/misc/resholve/oildev.nix +++ b/pkgs/development/misc/resholve/oildev.nix @@ -42,6 +42,10 @@ rec { hash = "sha256-H3GKN0Pq1VFD5+SWxm8CXUVO7zAyj/ngKVmDaG/aRT4="; fetchSubmodules = true; }; + patches = [ + # Fixes several incompatible function pointer conversions, which are errors in clang 16. + ./0014-clang_incompatible_function_pointer_conversions.patch + ]; # just for submodule IIRC nativeBuildInputs = [ git ]; }; diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 5963f7ebdf4..8041c85ff10 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -40,13 +40,13 @@ let sha512 = "DSzEEkbMYbAUVlhy7fg+BzccoRuSQzqHbIPGxGv19OJ2WKwS3/9ChAnQcII4g+GujcHhyJ8BUuOVAx/S5uAfQg=="; }; }; - "@adobe/css-tools-4.2.0" = { + "@adobe/css-tools-4.3.1" = { name = "_at_adobe_slash_css-tools"; packageName = "@adobe/css-tools"; - version = "4.2.0"; + version = "4.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.2.0.tgz"; - sha512 = "E09FiIft46CmH5Qnjb0wsW54/YQd69LsxeKUOWawmws1XWvyFGURnAChH0mlr7YPFR1ofwvUQfcL0J3lMxXqPA=="; + url = "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.3.1.tgz"; + sha512 = "/62yikz7NLScCGAAST5SHdnjaDJQBDq0M2muyRTpf2VQhw6StBg2ALiu73zSJQ4fMVLA+0uBhBHAle7Wg+2kSg=="; }; }; "@akryum/winattr-3.0.0" = { @@ -67,33 +67,6 @@ let sha512 = "3yWxPTq3UQ/FY9p1ErPxIyfT64elWaMvM9lIHnaqpyft63tkxodF5aUElYHrdisWve5cETkh1+KBw1yJuW0aRw=="; }; }; - "@alcalzone/jsonl-db-3.1.0" = { - name = "_at_alcalzone_slash_jsonl-db"; - packageName = "@alcalzone/jsonl-db"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@alcalzone/jsonl-db/-/jsonl-db-3.1.0.tgz"; - sha512 = "Wc1nxOyJVBF0NWrG1X7SQcb6mWWtr2i9e1cOSHQsjmnHlBYlFoj82fsP1NCZrHdXBhqQyYpdXP8ZQ8zz0iddFQ=="; - }; - }; - "@alcalzone/pak-0.9.0" = { - name = "_at_alcalzone_slash_pak"; - packageName = "@alcalzone/pak"; - version = "0.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@alcalzone/pak/-/pak-0.9.0.tgz"; - sha512 = "to2mQdMPxu/fF3at1QozRfEqrKTv7p0kLFXdv/kadjFm9Tph5JZCPC+gzQQhe5Cw2pQc8JkbmvOasENNHlezPQ=="; - }; - }; - "@alcalzone/proper-lockfile-4.1.3-0" = { - name = "_at_alcalzone_slash_proper-lockfile"; - packageName = "@alcalzone/proper-lockfile"; - version = "4.1.3-0"; - src = fetchurl { - url = "https://registry.npmjs.org/@alcalzone/proper-lockfile/-/proper-lockfile-4.1.3-0.tgz"; - sha512 = "8mlX3l5Xc+pYyiK9G156NyMosNuvvukL+TtNMqw7ti2zgVpz+WqPMPb2J1WU8I03Jbm4cXF+Q0D53hWvQqLQ0Q=="; - }; - }; "@alloc/quick-lru-5.2.0" = { name = "_at_alloc_slash_quick-lru"; packageName = "@alloc/quick-lru"; @@ -112,31 +85,31 @@ let sha512 = "lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg=="; }; }; - "@angular-devkit/architect-0.1602.9" = { + "@angular-devkit/architect-0.1700.0" = { name = "_at_angular-devkit_slash_architect"; packageName = "@angular-devkit/architect"; - version = "0.1602.9"; + version = "0.1700.0"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1602.9.tgz"; - sha512 = "U3vfb/e2sFfg0D9FyyRBXRPP7g4FBFtGK8Q3JPmvAVsHHwi5AUFRNR7YBChB/T5TMNY077HcTyEirVh2FeUpdA=="; + url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1700.0.tgz"; + sha512 = "whi7HvOjv1J3He9f+H8xNJWKyjAmWuWNl8gxNW6EZP/XLcrOu+/5QT4bPtXQBRIL/avZuc++5sNQS+kReaNCig=="; }; }; - "@angular-devkit/core-16.2.9" = { + "@angular-devkit/core-17.0.0" = { name = "_at_angular-devkit_slash_core"; packageName = "@angular-devkit/core"; - version = "16.2.9"; + version = "17.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/core/-/core-16.2.9.tgz"; - sha512 = "dcHWjHBNGm3yCeNz19y8A1At4KgyC6XHNnbFL0y+nnZYiaESXjUoXJYKASedI6A+Bpl0HNq2URhH6bL6Af3+4w=="; + url = "https://registry.npmjs.org/@angular-devkit/core/-/core-17.0.0.tgz"; + sha512 = "QUu3LnEi4A8t733v2+I0sLtyBJx3Q7zdTAhaauCbxbFhDid0cbYm8hYsyG/njor1irTPxSJbn6UoetVkwUQZxg=="; }; }; - "@angular-devkit/schematics-16.2.9" = { + "@angular-devkit/schematics-17.0.0" = { name = "_at_angular-devkit_slash_schematics"; packageName = "@angular-devkit/schematics"; - version = "16.2.9"; + version = "17.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-16.2.9.tgz"; - sha512 = "lB51CGCILpcSI37CwKUAGDLxMqh7zmuRbiPo9s9mSkCM4ccqxFlaL+VFTq2/laneARD6aikpOHnkVm5myNzQPw=="; + url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-17.0.0.tgz"; + sha512 = "LD7fjDORuBf139/oJ/gSwbIzQPfsm6Y67s1FD+XLi0QXaRt6dw4r7BMD08l1r//oPQofNgbEH4coGVO4NdCL/A=="; }; }; "@apidevtools/json-schema-ref-parser-9.0.6" = { @@ -319,13 +292,13 @@ let sha512 = "o/ObKgtMzl8SlpIdzaxFnt7SATKPxu4oIP/1NL+HDJRzxfJcAkOTAb/ZKMRyULbz4q+1t2/DAebs2Z1QairkZw=="; }; }; - "@astrojs/compiler-2.2.1" = { + "@astrojs/compiler-2.3.0" = { name = "_at_astrojs_slash_compiler"; packageName = "@astrojs/compiler"; - version = "2.2.1"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@astrojs/compiler/-/compiler-2.2.1.tgz"; - sha512 = "NJ1lWKzMkyEjE3W5NpPNAVot4/PLF5om/P6ekxNu3iLS05CaYFTcp7WpYMjdCC252b7wkNVAs45FNkVQ+RHW/g=="; + url = "https://registry.npmjs.org/@astrojs/compiler/-/compiler-2.3.0.tgz"; + sha512 = "pxYRAaRdMS6XUll8lbFM+Lr0DI1HKIDT+VpiC+S+9di5H/nmm3znZOgdMlLiMxADot+56eps+M1BvtKfQremXA=="; }; }; "@asyncapi/specs-4.3.1" = { @@ -436,13 +409,13 @@ let sha512 = "9Sp4vXjoG99qI6sFe09MfgIzsKwiOR0atqxmAcJJLn6fUNXhJEoW04n3w/YcRlk7P4gC9cOMsEyvb8xu+fDEOQ=="; }; }; - "@aws-sdk/client-cloudformation-3.441.0" = { + "@aws-sdk/client-cloudformation-3.445.0" = { name = "_at_aws-sdk_slash_client-cloudformation"; packageName = "@aws-sdk/client-cloudformation"; - version = "3.441.0"; + version = "3.445.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/client-cloudformation/-/client-cloudformation-3.441.0.tgz"; - sha512 = "AeeSHYhEAUwV9ixw63i9QC4W8/EMKkHWJOo3tx8hMT9T5ZYNGz+SKaWFvS/3g0BQPneU7H3D/HurTKF2IbSc7g=="; + url = "https://registry.npmjs.org/@aws-sdk/client-cloudformation/-/client-cloudformation-3.445.0.tgz"; + sha512 = "rhkU/a5iV1ntUw0ggfde8DRkjdRHmPEwlThZF/TT7leEhRKG97gJo7VztwwsSwrXeNPgXrhn0Qse2VaPDTFdVQ=="; }; }; "@aws-sdk/client-s3-3.296.0" = { @@ -454,13 +427,13 @@ let sha512 = "PI6mjM0fmcV2fqkkRoivF3DYex4lnbEz7WIsOFAwpHJBbA9ykClQpiutCKcgl0x/yEWAeTNdQtrCVeAwbxYfvw=="; }; }; - "@aws-sdk/client-s3-3.441.0" = { + "@aws-sdk/client-s3-3.445.0" = { name = "_at_aws-sdk_slash_client-s3"; packageName = "@aws-sdk/client-s3"; - version = "3.441.0"; + version = "3.445.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/client-s3/-/client-s3-3.441.0.tgz"; - sha512 = "tJUhHk4Nvakw/q3IVI2oDFCu48DzuPCMu2G3n42JPyvmY0RvmtRjduduoG1lYIGgRKJu81/MFr9i8CGYNK+/5A=="; + url = "https://registry.npmjs.org/@aws-sdk/client-s3/-/client-s3-3.445.0.tgz"; + sha512 = "2G+3MnO78irZRjlfkdvtlKRQ3yuOfrRMg8mztKpMw0q/9WHtwCcmaUUpl1bXwJ+BcNTVHopLQXdbzCeaxxI92w=="; }; }; "@aws-sdk/client-sso-3.296.0" = { @@ -472,13 +445,13 @@ let sha512 = "0P0x++jhlmhzViFPOHvTb7+Z6tSV9aONwB8CchIseg2enSPBbGfml7y5gQu1jdOTDS6pBUmrPZ+9sOI4/GvAfA=="; }; }; - "@aws-sdk/client-sso-3.441.0" = { + "@aws-sdk/client-sso-3.445.0" = { name = "_at_aws-sdk_slash_client-sso"; packageName = "@aws-sdk/client-sso"; - version = "3.441.0"; + version = "3.445.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.441.0.tgz"; - sha512 = "gndGymu4cEIN7WWhQ67RO0JMda09EGBlay2L8IKCHBK/65Y34FHUX1tCNbO2qezEzsi6BPW5o2n53Rd9QqpHUw=="; + url = "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.445.0.tgz"; + sha512 = "me4LvqNnu6kxi+sW7t0AgMv1Yi64ikas0x2+5jv23o6Csg32w0S0xOjCTKQYahOA5CMFunWvlkFIfxbqs+Uo7w=="; }; }; "@aws-sdk/client-sso-oidc-3.296.0" = { @@ -499,13 +472,13 @@ let sha512 = "ew7hSVNpitnLCIRVhnI2L1HZB/yYpRQFReR62fOqCUnpKqm6WGga37bnvgYbY5y0Rv23C0VHARovwunVg1gabA=="; }; }; - "@aws-sdk/client-sts-3.441.0" = { + "@aws-sdk/client-sts-3.445.0" = { name = "_at_aws-sdk_slash_client-sts"; packageName = "@aws-sdk/client-sts"; - version = "3.441.0"; + version = "3.445.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.441.0.tgz"; - sha512 = "GL0Cw2v7XL1cn0T+Sk5VHLlgBJoUdMsysXsHa1mFdk0l6XHMAAnwXVXiNnjmoDSPrG0psz7dL2AKzPVRXbIUjA=="; + url = "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.445.0.tgz"; + sha512 = "ogbdqrS8x9O5BTot826iLnTQ6i4/F5BSi/74gycneCxYmAnYnyUBNOWVnynv6XZiEWyDJQCU2UtMd52aNGW1GA=="; }; }; "@aws-sdk/config-resolver-3.296.0" = { @@ -517,13 +490,13 @@ let sha512 = "Ecdp7fmIitHo49NRCyIEHb9xlI43J7qkvhcwaKGGqN5jvoh0YhR2vNr195wWG8Ip/9PwsD4QV4g/XT5EY7XkMA=="; }; }; - "@aws-sdk/core-3.441.0" = { + "@aws-sdk/core-3.445.0" = { name = "_at_aws-sdk_slash_core"; packageName = "@aws-sdk/core"; - version = "3.441.0"; + version = "3.445.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/core/-/core-3.441.0.tgz"; - sha512 = "gV0eQwR0VnSPUYAbgDkbBtfXbSpZgl/K6UB13DP1IFFjQYbF/BxYwvcQe4jHoPOBifSgjEbl8MfOOeIyI7k9vg=="; + url = "https://registry.npmjs.org/@aws-sdk/core/-/core-3.445.0.tgz"; + sha512 = "6GYLElUG1QTOdmXG8zXa+Ull9IUeSeItKDYHKzHYfIkbsagMfYlf7wm9XIYlatjtgodNfZ3gPHAJfRyPmwKrsg=="; }; }; "@aws-sdk/credential-provider-env-3.296.0" = { @@ -562,13 +535,13 @@ let sha512 = "U0ecY0GX2jeDAgmTzaVO9YgjlLUfb8wgZSu1OwbOxCJscL/5eFkhcF0/xJQXDbRgcj4H4dlquqeSWsBVl/PgvQ=="; }; }; - "@aws-sdk/credential-provider-ini-3.441.0" = { + "@aws-sdk/credential-provider-ini-3.445.0" = { name = "_at_aws-sdk_slash_credential-provider-ini"; packageName = "@aws-sdk/credential-provider-ini"; - version = "3.441.0"; + version = "3.445.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.441.0.tgz"; - sha512 = "SQipQYxYqDUuSOfIhDmaTdwPTcndGQotGZXWJl56mMWqAhU8MkwjK+oMf3VgRt/umJC0QwUCF5HUHIj7gSB1JA=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.445.0.tgz"; + sha512 = "R7IYSGjNZ5KKJwQJ2HNPemjpAMWvdce91i8w+/aHfqeGfTXrmYJu99PeGRyyBTKEumBaojyjTRvmO8HzS+/l7g=="; }; }; "@aws-sdk/credential-provider-node-3.296.0" = { @@ -580,13 +553,13 @@ let sha512 = "oCkmh2b1DQhHkhd/qA9jiSIOkrBBK7cMg1/PVIgLw8e15NkzUHBObLJ/ZQw6ZzCxZzjlMYaFv9oCB8hyO8txmA=="; }; }; - "@aws-sdk/credential-provider-node-3.441.0" = { + "@aws-sdk/credential-provider-node-3.445.0" = { name = "_at_aws-sdk_slash_credential-provider-node"; packageName = "@aws-sdk/credential-provider-node"; - version = "3.441.0"; + version = "3.445.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.441.0.tgz"; - sha512 = "WB9p37yHq6fGJt6Vll29ijHbkh9VDbPM/n5ns73bTAgFD7R0ht5kPmdmHGQA6m3RKjcHLPbymQ3lXykkMwWf/Q=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.445.0.tgz"; + sha512 = "zI4k4foSjQRKNEsouculRcz7IbLfuqdFxypDLYwn+qPNMqJwWJ7VxOOeBSPUpHFcd7CLSfbHN2JAhQ7M02gPTA=="; }; }; "@aws-sdk/credential-provider-process-3.296.0" = { @@ -616,13 +589,13 @@ let sha512 = "zPFHDX/niXfcQrKQhmBv1XPYEe4b7im4vRKrzjYXgDRpG2M3LP0KaWIwN6Ap+GRYBNBthen86vhTlmKGzyU5YA=="; }; }; - "@aws-sdk/credential-provider-sso-3.441.0" = { + "@aws-sdk/credential-provider-sso-3.445.0" = { name = "_at_aws-sdk_slash_credential-provider-sso"; packageName = "@aws-sdk/credential-provider-sso"; - version = "3.441.0"; + version = "3.445.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.441.0.tgz"; - sha512 = "pTg16G+62mWCE8yGKuQnEBqPdpG5g71remf2jUqXaI1c7GCzbnkQDV9eD4DaAGOvzIs0wo9zAQnS2kVDPFlCYA=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.445.0.tgz"; + sha512 = "gJz7kAiDecdhtApgXnxfZsXKsww8BnifDF9MAx9Dr4X6no47qYsCCS3XPuEyRiF9VebXvHOH0H260Zp3bVyniQ=="; }; }; "@aws-sdk/credential-provider-web-identity-3.296.0" = { @@ -742,13 +715,13 @@ let sha512 = "SCIt10cr5dud7hvwveU4wkLjvkGssJ3GrcbHCds2NwI+JHmpcaaNYLAqi305JAuT29T36U5ssTFDSmrrEOcfag=="; }; }; - "@aws-sdk/lib-storage-3.441.0" = { + "@aws-sdk/lib-storage-3.445.0" = { name = "_at_aws-sdk_slash_lib-storage"; packageName = "@aws-sdk/lib-storage"; - version = "3.441.0"; + version = "3.445.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/lib-storage/-/lib-storage-3.441.0.tgz"; - sha512 = "Olj/kVIhJo9Cvw06dzn0uQ8M29L7Vu8tSj4MHCewH0goJ0GGIclOf83uVofMZO94zG7X/bv6+4CtNBJIhlokQw=="; + url = "https://registry.npmjs.org/@aws-sdk/lib-storage/-/lib-storage-3.445.0.tgz"; + sha512 = "sCP3lh71oMkx/B3+tSOGr81cff1Z1Yy5ejh5xa/YuH6OefQUFBM7/EC0CJiNfVXemh3D6O+biKETL+t2rAiZoQ=="; }; }; "@aws-sdk/md5-js-3.296.0" = { @@ -1084,13 +1057,13 @@ let sha512 = "xpjRjCZW+CDFdcMmmhIYg81ST5UAnJh61IHziQEk0FXONrg4kjyYPZAOjEdzXQ+HxJQuGQLKPhRdzxmQnbX7pg=="; }; }; - "@aws-sdk/s3-presigned-post-3.441.0" = { + "@aws-sdk/s3-presigned-post-3.445.0" = { name = "_at_aws-sdk_slash_s3-presigned-post"; packageName = "@aws-sdk/s3-presigned-post"; - version = "3.441.0"; + version = "3.445.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/s3-presigned-post/-/s3-presigned-post-3.441.0.tgz"; - sha512 = "IW8Q7wo7ACEcUjdzNeS6Ql7mMLjZVoxXssgrFCSlpdeykTXuD7Tx8frp7qCxzFKPm4sqtcGjmbTDRapZYJWlbQ=="; + url = "https://registry.npmjs.org/@aws-sdk/s3-presigned-post/-/s3-presigned-post-3.445.0.tgz"; + sha512 = "TBhusn9hrC9xkRkV9wP9TxP5f1t7QclWMBBuvsW60ybbbdPfRA5dRYnuXKQlfjQ7DcQO7K/YLElWAPfBcbJiwg=="; }; }; "@aws-sdk/s3-request-presigner-3.296.0" = { @@ -1102,13 +1075,13 @@ let sha512 = "BQv+oNA5EzJymrfh7cnMun/ougmTX3eo6bGCWn/bQdL1LyxodeVdRZacD5tN+lAUYtjhQ7yS23ozYh0lvWNEXw=="; }; }; - "@aws-sdk/s3-request-presigner-3.441.0" = { + "@aws-sdk/s3-request-presigner-3.445.0" = { name = "_at_aws-sdk_slash_s3-request-presigner"; packageName = "@aws-sdk/s3-request-presigner"; - version = "3.441.0"; + version = "3.445.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/s3-request-presigner/-/s3-request-presigner-3.441.0.tgz"; - sha512 = "EUVsmy92imURMLoA/MX+PL1SIONQ8YSi424BHJA6xGEoaqvQiaVKlv8jJfCqJ6qQ8oLiCLe2hOBSBTY1XZiy/g=="; + url = "https://registry.npmjs.org/@aws-sdk/s3-request-presigner/-/s3-request-presigner-3.445.0.tgz"; + sha512 = "UZrtfYdwkNfPkdCYdLYSshTBHkK1W1f3qf011f5P99sxC5nahBnBiLRMeTeKAxveIkAHKqYKlMVa/+gD65d5yA=="; }; }; "@aws-sdk/service-error-classification-3.296.0" = { @@ -1561,6 +1534,15 @@ let sha512 = "zqWdVIt+2Z+3wqxEOGzR5hXFZ8MGKK52x4vFLw8n58pR6ZfKRx3EXYTxTaYxYHc/PexPUTyimcTWFJbji9Z6Iw=="; }; }; + "@azure/core-rest-pipeline-1.10.1" = { + name = "_at_azure_slash_core-rest-pipeline"; + packageName = "@azure/core-rest-pipeline"; + version = "1.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@azure/core-rest-pipeline/-/core-rest-pipeline-1.10.1.tgz"; + sha512 = "Kji9k6TOFRDB5ZMTw8qUf2IJ+CeJtsuMdAHox9eqpTf1cefiNMpzrfnF6sINEBZJsaVaWgQ0o48B6kcUH68niA=="; + }; + }; "@azure/core-rest-pipeline-1.12.2" = { name = "_at_azure_slash_core-rest-pipeline"; packageName = "@azure/core-rest-pipeline"; @@ -1588,6 +1570,15 @@ let sha512 = "I5CGMoLtX+pI17ZdiFJZgxMJApsK6jjfm85hpgp3oazCdq5Wxgh4wMr7ge/TTWW1B5WBuvIOI1fMU/FrOAMKrw=="; }; }; + "@azure/core-util-1.2.0" = { + name = "_at_azure_slash_core-util"; + packageName = "@azure/core-util"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@azure/core-util/-/core-util-1.2.0.tgz"; + sha512 = "ffGIw+Qs8bNKNLxz5UPkz4/VBM/EZY07mPve1ZYFqYUdPwFqRj0RPk0U7LZMOfT7GCck9YjuT1Rfp1PApNl1ng=="; + }; + }; "@azure/core-util-1.6.1" = { name = "_at_azure_slash_core-util"; packageName = "@azure/core-util"; @@ -1651,6 +1642,15 @@ let sha512 = "Kc/dRvhZ9Q4+1FSfsTFDME/v6+R2Y1fuMty/TfwqE5p9GTPw08BPbKgeWinE8JRHRp+LemjQbUZsn4Q4l6Lszg=="; }; }; + "@azure/opentelemetry-instrumentation-azure-sdk-1.0.0-beta.5" = { + name = "_at_azure_slash_opentelemetry-instrumentation-azure-sdk"; + packageName = "@azure/opentelemetry-instrumentation-azure-sdk"; + version = "1.0.0-beta.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@azure/opentelemetry-instrumentation-azure-sdk/-/opentelemetry-instrumentation-azure-sdk-1.0.0-beta.5.tgz"; + sha512 = "fsUarKQDvjhmBO4nIfaZkfNSApm1hZBzcvpNbSrXdcUBxu7lRvKsV5DnwszX7cnhLyVOW9yl1uigtRQ1yDANjA=="; + }; + }; "@azure/storage-blob-12.11.0" = { name = "_at_azure_slash_storage-blob"; packageName = "@azure/storage-blob"; @@ -1705,22 +1705,22 @@ let sha512 = "XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w=="; }; }; - "@babel/compat-data-7.23.2" = { + "@babel/compat-data-7.23.3" = { name = "_at_babel_slash_compat-data"; packageName = "@babel/compat-data"; - version = "7.23.2"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.23.2.tgz"; - sha512 = "0S9TQMmDHlqAZ2ITT95irXKfxN9bncq8ZCoJhun3nHL/lLUxd2NKBJYoNGWH7S0hz6fRQwWlAWn/ILM0C70KZQ=="; + url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.23.3.tgz"; + sha512 = "BmR4bWbDIoFJmJ9z2cZ8Gmm2MXgEDgjdWgpKmKWUt54UGFJdlj31ECtbaDvCG/qVdG3AQ1SfpZEs01lUFbzLOQ=="; }; }; - "@babel/core-7.23.2" = { + "@babel/core-7.23.3" = { name = "_at_babel_slash_core"; packageName = "@babel/core"; - version = "7.23.2"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.23.2.tgz"; - sha512 = "n7s51eWdaWZ3vGT2tD4T7J6eJs3QoBXydv7vkUM06Bf1cbVD2Kc2UrkzhiQwobfV7NwOnQXYL7UBJ5VPU+RGoQ=="; + url = "https://registry.npmjs.org/@babel/core/-/core-7.23.3.tgz"; + sha512 = "Jg+msLuNuCJDyBvFv5+OKOUjWMZgd85bKjbICd3zWrKAo+bJ49HJufi7CQE0q0uR8NGyO6xkCACScNqyjHSZew=="; }; }; "@babel/generator-7.17.7" = { @@ -1741,13 +1741,13 @@ let sha512 = "W1lG5vUwFvfMd8HVXqdfbuG7RuaSrTCCD8cl8fP8wOivdbtbIg2Db3IWUcgvfxKbbn6ZBGYRW/Zk1MIwK49mgw=="; }; }; - "@babel/generator-7.23.0" = { + "@babel/generator-7.23.3" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; - version = "7.23.0"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.23.0.tgz"; - sha512 = "lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g=="; + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.23.3.tgz"; + sha512 = "keeZWAV4LU3tW0qRi19HRpabC/ilM0HRBBzf9/k8FFiG4KVpiv0FIy4hHfLfFQZNhziCTPTmd59zoyv6DNISzg=="; }; }; "@babel/helper-annotate-as-pure-7.22.5" = { @@ -1849,13 +1849,13 @@ let sha512 = "0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w=="; }; }; - "@babel/helper-module-transforms-7.23.0" = { + "@babel/helper-module-transforms-7.23.3" = { name = "_at_babel_slash_helper-module-transforms"; packageName = "@babel/helper-module-transforms"; - version = "7.23.0"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.23.0.tgz"; - sha512 = "WhDWw1tdrlT0gMgUJSlX0IQvoO1eN279zrAUbVB+KpV2c3Tylz8+GnKOLllCS6Z/iZQEyVYxhZVUdPTqs2YYPw=="; + url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.23.3.tgz"; + sha512 = "7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ=="; }; }; "@babel/helper-optimise-call-expression-7.22.5" = { @@ -1993,31 +1993,40 @@ let sha512 = "FDge0dFazETFcxGw/EXzOkN8uJp0PC7Qbm+Pe9T+av2zlBpOgunFHkQPPn+eRuClU73JF+98D531UgayY89tow=="; }; }; - "@babel/parser-7.23.0" = { + "@babel/parser-7.23.3" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.23.0"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.23.0.tgz"; - sha512 = "vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.23.3.tgz"; + sha512 = "uVsWNvlVsIninV2prNz/3lHCb+5CJ+e+IUBfbjToAHODtfGYLfCFuY4AU7TskI+dAKk+njsPiBjq1gKTvZOBaw=="; }; }; - "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.22.15" = { + "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.23.3" = { name = "_at_babel_slash_plugin-bugfix-safari-id-destructuring-collision-in-function-expression"; packageName = "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression"; - version = "7.22.15"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.22.15.tgz"; - sha512 = "FB9iYlz7rURmRJyXRKEnalYPPdn87H5no108cyuQQyMwlpJ2SJtpIUBI27kdTin956pz+LPypkPVPUTlxOmrsg=="; + url = "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.23.3.tgz"; + sha512 = "iRkKcCqb7iGnq9+3G6rZ+Ciz5VywC4XNRHe57lKM+jOeYAoR0lVqdeeDRfh0tQcTfw/+vBhHn926FmQhLtlFLQ=="; }; }; - "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.22.15" = { + "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.23.3" = { name = "_at_babel_slash_plugin-bugfix-v8-spread-parameters-in-optional-chaining"; packageName = "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining"; - version = "7.22.15"; + version = "7.23.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.23.3.tgz"; + sha512 = "WwlxbfMNdVEpQjZmK5mhm7oSwD3dS6eU+Iwsi4Knl9wAletWem7kaRsGOG+8UEbRyqxY4SS5zvtfXwX+jMxUwQ=="; + }; + }; + "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.23.3" = { + name = "_at_babel_slash_plugin-bugfix-v8-static-class-fields-redefine-readonly"; + packageName = "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.22.15.tgz"; - sha512 = "Hyph9LseGvAeeXzikV88bczhsrLrIZqDPxO+sSmAunMPaGrBGhfMWzCPYTtiW9t+HzSE2wtV8e5cc5P6r1xMDQ=="; + url = "https://registry.npmjs.org/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.23.3.tgz"; + sha512 = "XaJak1qcityzrX0/IU5nKHb34VaibwP3saKqG6a/tppelgllOH13LUann4ZCIBcVOeE6H18K4Vx9QKkVww3z/w=="; }; }; "@babel/plugin-proposal-async-generator-functions-7.20.7" = { @@ -2038,22 +2047,22 @@ let sha512 = "cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ=="; }; }; - "@babel/plugin-proposal-decorators-7.23.2" = { + "@babel/plugin-proposal-decorators-7.23.3" = { name = "_at_babel_slash_plugin-proposal-decorators"; packageName = "@babel/plugin-proposal-decorators"; - version = "7.23.2"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.23.2.tgz"; - sha512 = "eR0gJQc830fJVGz37oKLvt9W9uUIQSAovUl0e9sJ3YeO09dlcoBVYD3CLrjCj4qHdXmfiyTyFt8yeQYSN5fxLg=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.23.3.tgz"; + sha512 = "u8SwzOcP0DYSsa++nHd/9exlHb0NAlHCb890qtZZbSwPX2bFv8LBEztxwN7Xg/dS8oAFFidhrI9PBcLBJSkGRQ=="; }; }; - "@babel/plugin-proposal-export-default-from-7.22.17" = { + "@babel/plugin-proposal-export-default-from-7.23.3" = { name = "_at_babel_slash_plugin-proposal-export-default-from"; packageName = "@babel/plugin-proposal-export-default-from"; - version = "7.22.17"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-export-default-from/-/plugin-proposal-export-default-from-7.22.17.tgz"; - sha512 = "cop/3quQBVvdz6X5SJC6AhUv3C9DrVTM06LUEXimEdWAhCSyOJIr9NiZDU9leHZ0/aiG0Sh7Zmvaku5TWYNgbA=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-export-default-from/-/plugin-proposal-export-default-from-7.23.3.tgz"; + sha512 = "Q23MpLZfSGZL1kU7fWqV262q65svLSCIP5kZ/JCW/rKTCm/FrLjpvEd2kfUYMVeHh4QhV/xzyoRAHWrAZJrE3Q=="; }; }; "@babel/plugin-proposal-nullish-coalescing-operator-7.18.6" = { @@ -2128,13 +2137,13 @@ let sha512 = "b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw=="; }; }; - "@babel/plugin-syntax-decorators-7.22.10" = { + "@babel/plugin-syntax-decorators-7.23.3" = { name = "_at_babel_slash_plugin-syntax-decorators"; packageName = "@babel/plugin-syntax-decorators"; - version = "7.22.10"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.22.10.tgz"; - sha512 = "z1KTVemBjnz+kSEilAsI4lbkPOl5TvJH7YDSY1CTIzvLWJ+KHXp+mRe8VPmfnyvqOPqar1V2gid2PleKzRUstQ=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.23.3.tgz"; + sha512 = "cf7Niq4/+/juY67E0PbgH0TDhLQ5J7zS8C/Q5FFx+DWyrRa9sUQdTXkjqKu8zGvuqr7vw1muKiukseihU+PJDA=="; }; }; "@babel/plugin-syntax-dynamic-import-7.8.3" = { @@ -2146,13 +2155,13 @@ let sha512 = "5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ=="; }; }; - "@babel/plugin-syntax-export-default-from-7.22.5" = { + "@babel/plugin-syntax-export-default-from-7.23.3" = { name = "_at_babel_slash_plugin-syntax-export-default-from"; packageName = "@babel/plugin-syntax-export-default-from"; - version = "7.22.5"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-export-default-from/-/plugin-syntax-export-default-from-7.22.5.tgz"; - sha512 = "ODAqWWXB/yReh/jVQDag/3/tl6lgBueQkk/TcfW/59Oykm4c8a55XloX0CTk2k2VJiFWMgHby9xNX29IbCv9dQ=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-export-default-from/-/plugin-syntax-export-default-from-7.23.3.tgz"; + sha512 = "KeENO5ck1IeZ/l2lFZNy+mpobV3D2Zy5C1YFnWm+YuY5mQiAWc4yAp13dqgguwsBsFVLh4LPCEqCa5qW13N+hw=="; }; }; "@babel/plugin-syntax-export-namespace-from-7.8.3" = { @@ -2164,31 +2173,31 @@ let sha512 = "MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q=="; }; }; - "@babel/plugin-syntax-flow-7.22.5" = { + "@babel/plugin-syntax-flow-7.23.3" = { name = "_at_babel_slash_plugin-syntax-flow"; packageName = "@babel/plugin-syntax-flow"; - version = "7.22.5"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.22.5.tgz"; - sha512 = "9RdCl0i+q0QExayk2nOS7853w08yLucnnPML6EN9S8fgMPVtdLDCdx/cOQ/i44Lb9UeQX9A35yaqBBOMMZxPxQ=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.23.3.tgz"; + sha512 = "YZiAIpkJAwQXBJLIQbRFayR5c+gJ35Vcz3bg954k7cd73zqjvhacJuL9RbrzPz8qPmZdgqP6EUKwy0PCNhaaPA=="; }; }; - "@babel/plugin-syntax-import-assertions-7.22.5" = { + "@babel/plugin-syntax-import-assertions-7.23.3" = { name = "_at_babel_slash_plugin-syntax-import-assertions"; packageName = "@babel/plugin-syntax-import-assertions"; - version = "7.22.5"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.22.5.tgz"; - sha512 = "rdV97N7KqsRzeNGoWUOK6yUsWarLjE5Su/Snk9IYPU9CwkWHs4t+rTGOvffTR8XGkJMTAdLfO0xVnXm8wugIJg=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.23.3.tgz"; + sha512 = "lPgDSU+SJLK3xmFDTV2ZRQAiM7UuUjGidwBywFavObCiZc1BeAAcMtHJKUya92hPHO+at63JJPLygilZard8jw=="; }; }; - "@babel/plugin-syntax-import-attributes-7.22.5" = { + "@babel/plugin-syntax-import-attributes-7.23.3" = { name = "_at_babel_slash_plugin-syntax-import-attributes"; packageName = "@babel/plugin-syntax-import-attributes"; - version = "7.22.5"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.22.5.tgz"; - sha512 = "KwvoWDeNKPETmozyFE0P2rOLqh39EoQHNjqizrI5B8Vt0ZNS7M56s7dAiAqbYfiAYOuIzIh96z3iR2ktgu3tEg=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.23.3.tgz"; + sha512 = "pawnE0P9g10xgoP7yKr6CK63K2FMsTE+FZidZO/1PwRdzmAPVs+HS1mAURUsgaoxammTJvULUdIkEK0gOcU2tA=="; }; }; "@babel/plugin-syntax-import-meta-7.10.4" = { @@ -2209,13 +2218,13 @@ let sha512 = "lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA=="; }; }; - "@babel/plugin-syntax-jsx-7.22.5" = { + "@babel/plugin-syntax-jsx-7.23.3" = { name = "_at_babel_slash_plugin-syntax-jsx"; packageName = "@babel/plugin-syntax-jsx"; - version = "7.22.5"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.22.5.tgz"; - sha512 = "gvyP4hZrgrs/wWMaocvxZ44Hw0b3W8Pe+cMxc8V1ULQ07oh8VNbIRaoD1LRZVTvD+0nieDKjfgKg89sD7rrKrg=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.23.3.tgz"; + sha512 = "EB2MELswq55OHUoRZLGg/zC7QWUKfNLpE57m/S2yr1uEneIgsTgrSzXP3NXEsMkVn76OlaVVnzN+ugObuYGwhg=="; }; }; "@babel/plugin-syntax-logical-assignment-operators-7.10.4" = { @@ -2290,13 +2299,13 @@ let sha512 = "hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw=="; }; }; - "@babel/plugin-syntax-typescript-7.22.5" = { + "@babel/plugin-syntax-typescript-7.23.3" = { name = "_at_babel_slash_plugin-syntax-typescript"; packageName = "@babel/plugin-syntax-typescript"; - version = "7.22.5"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.22.5.tgz"; - sha512 = "1mS2o03i7t1c6VzH6fdQ3OA8tcEIxwG18zIPRp+UY1Ihv6W+XZzBCVxExF9upussPXJ0xE9XRHwMoNs1ep/nRQ=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.23.3.tgz"; + sha512 = "9EiNjVJOMwCO+43TqoTrgQ8jMwcAd0sWyXi9RPfIsLTj4R2MADDDQXELhffaUx/uJv2AYcxBgPwH6j4TIA4ytQ=="; }; }; "@babel/plugin-syntax-unicode-sets-regex-7.18.6" = { @@ -2308,238 +2317,238 @@ let sha512 = "727YkEAPwSIQTv5im8QHz3upqp92JTWhidIC81Tdx4VJYIte/VndKf1qKrfnnhPLiPghStWfvC/iFaMCQu7Nqg=="; }; }; - "@babel/plugin-transform-arrow-functions-7.22.5" = { + "@babel/plugin-transform-arrow-functions-7.23.3" = { name = "_at_babel_slash_plugin-transform-arrow-functions"; packageName = "@babel/plugin-transform-arrow-functions"; - version = "7.22.5"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.22.5.tgz"; - sha512 = "26lTNXoVRdAnsaDXPpvCNUq+OVWEVC6bx7Vvz9rC53F2bagUWW4u4ii2+h8Fejfh7RYqPxn+libeFBBck9muEw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.23.3.tgz"; + sha512 = "NzQcQrzaQPkaEwoTm4Mhyl8jI1huEL/WWIEvudjTCMJ9aBZNpsJbMASx7EQECtQQPS/DcnFpo0FIh3LvEO9cxQ=="; }; }; - "@babel/plugin-transform-async-generator-functions-7.23.2" = { + "@babel/plugin-transform-async-generator-functions-7.23.3" = { name = "_at_babel_slash_plugin-transform-async-generator-functions"; packageName = "@babel/plugin-transform-async-generator-functions"; - version = "7.23.2"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.23.2.tgz"; - sha512 = "BBYVGxbDVHfoeXbOwcagAkOQAm9NxoTdMGfTqghu1GrvadSaw6iW3Je6IcL5PNOw8VwjxqBECXy50/iCQSY/lQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.23.3.tgz"; + sha512 = "59GsVNavGxAXCDDbakWSMJhajASb4kBCqDjqJsv+p5nKdbz7istmZ3HrX3L2LuiI80+zsOADCvooqQH3qGCucQ=="; }; }; - "@babel/plugin-transform-async-to-generator-7.22.5" = { + "@babel/plugin-transform-async-to-generator-7.23.3" = { name = "_at_babel_slash_plugin-transform-async-to-generator"; packageName = "@babel/plugin-transform-async-to-generator"; - version = "7.22.5"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.22.5.tgz"; - sha512 = "b1A8D8ZzE/VhNDoV1MSJTnpKkCG5bJo+19R4o4oy03zM7ws8yEMK755j61Dc3EyvdysbqH5BOOTquJ7ZX9C6vQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.23.3.tgz"; + sha512 = "A7LFsKi4U4fomjqXJlZg/u0ft/n8/7n7lpffUP/ZULx/DtV9SGlNKZolHH6PE8Xl1ngCc0M11OaeZptXVkfKSw=="; }; }; - "@babel/plugin-transform-block-scoped-functions-7.22.5" = { + "@babel/plugin-transform-block-scoped-functions-7.23.3" = { name = "_at_babel_slash_plugin-transform-block-scoped-functions"; packageName = "@babel/plugin-transform-block-scoped-functions"; - version = "7.22.5"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.22.5.tgz"; - sha512 = "tdXZ2UdknEKQWKJP1KMNmuF5Lx3MymtMN/pvA+p/VEkhK8jVcQ1fzSy8KM9qRYhAf2/lV33hoMPKI/xaI9sADA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.23.3.tgz"; + sha512 = "vI+0sIaPIO6CNuM9Kk5VmXcMVRiOpDh7w2zZt9GXzmE/9KD70CUEVhvPR/etAeNK/FAEkhxQtXOzVF3EuRL41A=="; }; }; - "@babel/plugin-transform-block-scoping-7.23.0" = { + "@babel/plugin-transform-block-scoping-7.23.3" = { name = "_at_babel_slash_plugin-transform-block-scoping"; packageName = "@babel/plugin-transform-block-scoping"; - version = "7.23.0"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.23.0.tgz"; - sha512 = "cOsrbmIOXmf+5YbL99/S49Y3j46k/T16b9ml8bm9lP6N9US5iQ2yBK7gpui1pg0V/WMcXdkfKbTb7HXq9u+v4g=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.23.3.tgz"; + sha512 = "QPZxHrThbQia7UdvfpaRRlq/J9ciz1J4go0k+lPBXbgaNeY7IQrBj/9ceWjvMMI07/ZBzHl/F0R/2K0qH7jCVw=="; }; }; - "@babel/plugin-transform-class-properties-7.22.5" = { + "@babel/plugin-transform-class-properties-7.23.3" = { name = "_at_babel_slash_plugin-transform-class-properties"; packageName = "@babel/plugin-transform-class-properties"; - version = "7.22.5"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.22.5.tgz"; - sha512 = "nDkQ0NfkOhPTq8YCLiWNxp1+f9fCobEjCb0n8WdbNUBc4IB5V7P1QnX9IjpSoquKrXF5SKojHleVNs2vGeHCHQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.23.3.tgz"; + sha512 = "uM+AN8yCIjDPccsKGlw271xjJtGii+xQIF/uMPS8H15L12jZTsLfF4o5vNO7d/oUguOyfdikHGc/yi9ge4SGIg=="; }; }; - "@babel/plugin-transform-class-static-block-7.22.11" = { + "@babel/plugin-transform-class-static-block-7.23.3" = { name = "_at_babel_slash_plugin-transform-class-static-block"; packageName = "@babel/plugin-transform-class-static-block"; - version = "7.22.11"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.22.11.tgz"; - sha512 = "GMM8gGmqI7guS/llMFk1bJDkKfn3v3C4KHK9Yg1ey5qcHcOlKb0QvcMrgzvxo+T03/4szNh5lghY+fEC98Kq9g=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.23.3.tgz"; + sha512 = "PENDVxdr7ZxKPyi5Ffc0LjXdnJyrJxyqF5T5YjlVg4a0VFfQHW0r8iAtRiDXkfHlu1wwcvdtnndGYIeJLSuRMQ=="; }; }; - "@babel/plugin-transform-classes-7.22.15" = { + "@babel/plugin-transform-classes-7.23.3" = { name = "_at_babel_slash_plugin-transform-classes"; packageName = "@babel/plugin-transform-classes"; - version = "7.22.15"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.22.15.tgz"; - sha512 = "VbbC3PGjBdE0wAWDdHM9G8Gm977pnYI0XpqMd6LrKISj8/DJXEsWqgRuTYaNE9Bv0JGhTZUzHDlMk18IpOuoqw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.23.3.tgz"; + sha512 = "FGEQmugvAEu2QtgtU0uTASXevfLMFfBeVCIIdcQhn/uBQsMTjBajdnAtanQlOcuihWh10PZ7+HWvc7NtBwP74w=="; }; }; - "@babel/plugin-transform-computed-properties-7.22.5" = { + "@babel/plugin-transform-computed-properties-7.23.3" = { name = "_at_babel_slash_plugin-transform-computed-properties"; packageName = "@babel/plugin-transform-computed-properties"; - version = "7.22.5"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.22.5.tgz"; - sha512 = "4GHWBgRf0krxPX+AaPtgBAlTgTeZmqDynokHOX7aqqAB4tHs3U2Y02zH6ETFdLZGcg9UQSD1WCmkVrE9ErHeOg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.23.3.tgz"; + sha512 = "dTj83UVTLw/+nbiHqQSFdwO9CbTtwq1DsDqm3CUEtDrZNET5rT5E6bIdTlOftDTDLMYxvxHNEYO4B9SLl8SLZw=="; }; }; - "@babel/plugin-transform-destructuring-7.23.0" = { + "@babel/plugin-transform-destructuring-7.23.3" = { name = "_at_babel_slash_plugin-transform-destructuring"; packageName = "@babel/plugin-transform-destructuring"; - version = "7.23.0"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.23.0.tgz"; - sha512 = "vaMdgNXFkYrB+8lbgniSYWHsgqK5gjaMNcc84bMIOMRLH0L9AqYq3hwMdvnyqj1OPqea8UtjPEuS/DCenah1wg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.23.3.tgz"; + sha512 = "n225npDqjDIr967cMScVKHXJs7rout1q+tt50inyBCPkyZ8KxeI6d+GIbSBTT/w/9WdlWDOej3V9HE5Lgk57gw=="; }; }; - "@babel/plugin-transform-dotall-regex-7.22.5" = { + "@babel/plugin-transform-dotall-regex-7.23.3" = { name = "_at_babel_slash_plugin-transform-dotall-regex"; packageName = "@babel/plugin-transform-dotall-regex"; - version = "7.22.5"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.22.5.tgz"; - sha512 = "5/Yk9QxCQCl+sOIB1WelKnVRxTJDSAIxtJLL2/pqL14ZVlbH0fUQUZa/T5/UnQtBNgghR7mfB8ERBKyKPCi7Vw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.23.3.tgz"; + sha512 = "vgnFYDHAKzFaTVp+mneDsIEbnJ2Np/9ng9iviHw3P/KVcgONxpNULEW/51Z/BaFojG2GI2GwwXck5uV1+1NOYQ=="; }; }; - "@babel/plugin-transform-duplicate-keys-7.22.5" = { + "@babel/plugin-transform-duplicate-keys-7.23.3" = { name = "_at_babel_slash_plugin-transform-duplicate-keys"; packageName = "@babel/plugin-transform-duplicate-keys"; - version = "7.22.5"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.22.5.tgz"; - sha512 = "dEnYD+9BBgld5VBXHnF/DbYGp3fqGMsyxKbtD1mDyIA7AkTSpKXFhCVuj/oQVOoALfBs77DudA0BE4d5mcpmqw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.23.3.tgz"; + sha512 = "RrqQ+BQmU3Oyav3J+7/myfvRCq7Tbz+kKLLshUmMwNlDHExbGL7ARhajvoBJEvc+fCguPPu887N+3RRXBVKZUA=="; }; }; - "@babel/plugin-transform-dynamic-import-7.22.11" = { + "@babel/plugin-transform-dynamic-import-7.23.3" = { name = "_at_babel_slash_plugin-transform-dynamic-import"; packageName = "@babel/plugin-transform-dynamic-import"; - version = "7.22.11"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.22.11.tgz"; - sha512 = "g/21plo58sfteWjaO0ZNVb+uEOkJNjAaHhbejrnBmu011l/eNDScmkbjCC3l4FKb10ViaGU4aOkFznSu2zRHgA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.23.3.tgz"; + sha512 = "vTG+cTGxPFou12Rj7ll+eD5yWeNl5/8xvQvF08y5Gv3v4mZQoyFf8/n9zg4q5vvCWt5jmgymfzMAldO7orBn7A=="; }; }; - "@babel/plugin-transform-exponentiation-operator-7.22.5" = { + "@babel/plugin-transform-exponentiation-operator-7.23.3" = { name = "_at_babel_slash_plugin-transform-exponentiation-operator"; packageName = "@babel/plugin-transform-exponentiation-operator"; - version = "7.22.5"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.22.5.tgz"; - sha512 = "vIpJFNM/FjZ4rh1myqIya9jXwrwwgFRHPjT3DkUA9ZLHuzox8jiXkOLvwm1H+PQIP3CqfC++WPKeuDi0Sjdj1g=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.23.3.tgz"; + sha512 = "5fhCsl1odX96u7ILKHBj4/Y8vipoqwsJMh4csSA8qFfxrZDEA4Ssku2DyNvMJSmZNOEBT750LfFPbtrnTP90BQ=="; }; }; - "@babel/plugin-transform-export-namespace-from-7.22.11" = { + "@babel/plugin-transform-export-namespace-from-7.23.3" = { name = "_at_babel_slash_plugin-transform-export-namespace-from"; packageName = "@babel/plugin-transform-export-namespace-from"; - version = "7.22.11"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.22.11.tgz"; - sha512 = "xa7aad7q7OiT8oNZ1mU7NrISjlSkVdMbNxn9IuLZyL9AJEhs1Apba3I+u5riX1dIkdptP5EKDG5XDPByWxtehw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.23.3.tgz"; + sha512 = "yCLhW34wpJWRdTxxWtFZASJisihrfyMOTOQexhVzA78jlU+dH7Dw+zQgcPepQ5F3C6bAIiblZZ+qBggJdHiBAg=="; }; }; - "@babel/plugin-transform-flow-strip-types-7.22.5" = { + "@babel/plugin-transform-flow-strip-types-7.23.3" = { name = "_at_babel_slash_plugin-transform-flow-strip-types"; packageName = "@babel/plugin-transform-flow-strip-types"; - version = "7.22.5"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.22.5.tgz"; - sha512 = "tujNbZdxdG0/54g/oua8ISToaXTFBf8EnSb5PgQSciIXWOWKX3S4+JR7ZE9ol8FZwf9kxitzkGQ+QWeov/mCiA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.23.3.tgz"; + sha512 = "26/pQTf9nQSNVJCrLB1IkHUKyPxR+lMrH2QDPG89+Znu9rAMbtrybdbWeE9bb7gzjmE5iXHEY+e0HUwM6Co93Q=="; }; }; - "@babel/plugin-transform-for-of-7.22.15" = { + "@babel/plugin-transform-for-of-7.23.3" = { name = "_at_babel_slash_plugin-transform-for-of"; packageName = "@babel/plugin-transform-for-of"; - version = "7.22.15"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.22.15.tgz"; - sha512 = "me6VGeHsx30+xh9fbDLLPi0J1HzmeIIyenoOQHuw2D4m2SAU3NrspX5XxJLBpqn5yrLzrlw2Iy3RA//Bx27iOA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.23.3.tgz"; + sha512 = "X8jSm8X1CMwxmK878qsUGJRmbysKNbdpTv/O1/v0LuY/ZkZrng5WYiekYSdg9m09OTmDDUWeEDsTE+17WYbAZw=="; }; }; - "@babel/plugin-transform-function-name-7.22.5" = { + "@babel/plugin-transform-function-name-7.23.3" = { name = "_at_babel_slash_plugin-transform-function-name"; packageName = "@babel/plugin-transform-function-name"; - version = "7.22.5"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.22.5.tgz"; - sha512 = "UIzQNMS0p0HHiQm3oelztj+ECwFnj+ZRV4KnguvlsD2of1whUeM6o7wGNj6oLwcDoAXQ8gEqfgC24D+VdIcevg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.23.3.tgz"; + sha512 = "I1QXp1LxIvt8yLaib49dRW5Okt7Q4oaxao6tFVKS/anCdEOMtYwWVKoiOA1p34GOWIZjUK0E+zCp7+l1pfQyiw=="; }; }; - "@babel/plugin-transform-json-strings-7.22.11" = { + "@babel/plugin-transform-json-strings-7.23.3" = { name = "_at_babel_slash_plugin-transform-json-strings"; packageName = "@babel/plugin-transform-json-strings"; - version = "7.22.11"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.22.11.tgz"; - sha512 = "CxT5tCqpA9/jXFlme9xIBCc5RPtdDq3JpkkhgHQqtDdiTnTI0jtZ0QzXhr5DILeYifDPp2wvY2ad+7+hLMW5Pw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.23.3.tgz"; + sha512 = "H9Ej2OiISIZowZHaBwF0tsJOih1PftXJtE8EWqlEIwpc7LMTGq0rPOrywKLQ4nefzx8/HMR0D3JGXoMHYvhi0A=="; }; }; - "@babel/plugin-transform-literals-7.22.5" = { + "@babel/plugin-transform-literals-7.23.3" = { name = "_at_babel_slash_plugin-transform-literals"; packageName = "@babel/plugin-transform-literals"; - version = "7.22.5"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.22.5.tgz"; - sha512 = "fTLj4D79M+mepcw3dgFBTIDYpbcB9Sm0bpm4ppXPaO+U+PKFFyV9MGRvS0gvGw62sd10kT5lRMKXAADb9pWy8g=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.23.3.tgz"; + sha512 = "wZ0PIXRxnwZvl9AYpqNUxpZ5BiTGrYt7kueGQ+N5FiQ7RCOD4cm8iShd6S6ggfVIWaJf2EMk8eRzAh52RfP4rQ=="; }; }; - "@babel/plugin-transform-logical-assignment-operators-7.22.11" = { + "@babel/plugin-transform-logical-assignment-operators-7.23.3" = { name = "_at_babel_slash_plugin-transform-logical-assignment-operators"; packageName = "@babel/plugin-transform-logical-assignment-operators"; - version = "7.22.11"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.22.11.tgz"; - sha512 = "qQwRTP4+6xFCDV5k7gZBF3C31K34ut0tbEcTKxlX/0KXxm9GLcO14p570aWxFvVzx6QAfPgq7gaeIHXJC8LswQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.23.3.tgz"; + sha512 = "+pD5ZbxofyOygEp+zZAfujY2ShNCXRpDRIPOiBmTO693hhyOEteZgl876Xs9SAHPQpcV0vz8LvA/T+w8AzyX8A=="; }; }; - "@babel/plugin-transform-member-expression-literals-7.22.5" = { + "@babel/plugin-transform-member-expression-literals-7.23.3" = { name = "_at_babel_slash_plugin-transform-member-expression-literals"; packageName = "@babel/plugin-transform-member-expression-literals"; - version = "7.22.5"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.22.5.tgz"; - sha512 = "RZEdkNtzzYCFl9SE9ATaUMTj2hqMb4StarOJLrZRbqqU4HSBE7UlBw9WBWQiDzrJZJdUWiMTVDI6Gv/8DPvfew=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.23.3.tgz"; + sha512 = "sC3LdDBDi5x96LA+Ytekz2ZPk8i/Ck+DEuDbRAll5rknJ5XRTSaPKEYwomLcs1AA8wg9b3KjIQRsnApj+q51Ag=="; }; }; - "@babel/plugin-transform-modules-amd-7.23.0" = { + "@babel/plugin-transform-modules-amd-7.23.3" = { name = "_at_babel_slash_plugin-transform-modules-amd"; packageName = "@babel/plugin-transform-modules-amd"; - version = "7.23.0"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.23.0.tgz"; - sha512 = "xWT5gefv2HGSm4QHtgc1sYPbseOyf+FFDo2JbpE25GWl5BqTGO9IMwTYJRoIdjsF85GE+VegHxSCUt5EvoYTAw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.23.3.tgz"; + sha512 = "vJYQGxeKM4t8hYCKVBlZX/gtIY2I7mRGFNcm85sgXGMTBcoV3QdVtdpbcWEbzbfUIUZKwvgFT82mRvaQIebZzw=="; }; }; - "@babel/plugin-transform-modules-commonjs-7.23.0" = { + "@babel/plugin-transform-modules-commonjs-7.23.3" = { name = "_at_babel_slash_plugin-transform-modules-commonjs"; packageName = "@babel/plugin-transform-modules-commonjs"; - version = "7.23.0"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.23.0.tgz"; - sha512 = "32Xzss14/UVc7k9g775yMIvkVK8xwKE0DPdP5JTapr3+Z9w4tzeOuLNY6BXDQR6BdnzIlXnCGAzsk/ICHBLVWQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.23.3.tgz"; + sha512 = "aVS0F65LKsdNOtcz6FRCpE4OgsP2OFnW46qNxNIX9h3wuzaNcSQsJysuMwqSibC98HPrf2vCgtxKNwS0DAlgcA=="; }; }; - "@babel/plugin-transform-modules-systemjs-7.23.0" = { + "@babel/plugin-transform-modules-systemjs-7.23.3" = { name = "_at_babel_slash_plugin-transform-modules-systemjs"; packageName = "@babel/plugin-transform-modules-systemjs"; - version = "7.23.0"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.23.0.tgz"; - sha512 = "qBej6ctXZD2f+DhlOC9yO47yEYgUh5CZNz/aBoH4j/3NOlRfJXJbY7xDQCqQVf9KbrqGzIWER1f23doHGrIHFg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.23.3.tgz"; + sha512 = "ZxyKGTkF9xT9YJuKQRo19ewf3pXpopuYQd8cDXqNzc3mUNbOME0RKMoZxviQk74hwzfQsEe66dE92MaZbdHKNQ=="; }; }; - "@babel/plugin-transform-modules-umd-7.22.5" = { + "@babel/plugin-transform-modules-umd-7.23.3" = { name = "_at_babel_slash_plugin-transform-modules-umd"; packageName = "@babel/plugin-transform-modules-umd"; - version = "7.22.5"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.22.5.tgz"; - sha512 = "+S6kzefN/E1vkSsKx8kmQuqeQsvCKCd1fraCM7zXm4SFoggI099Tr4G8U81+5gtMdUeMQ4ipdQffbKLX0/7dBQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.23.3.tgz"; + sha512 = "zHsy9iXX2nIsCBFPud3jKn1IRPWg3Ing1qOZgeKV39m1ZgIdpJqvlWVeiHBZC6ITRG0MfskhYe9cLgntfSFPIg=="; }; }; "@babel/plugin-transform-named-capturing-groups-regex-7.22.5" = { @@ -2551,112 +2560,112 @@ let sha512 = "YgLLKmS3aUBhHaxp5hi1WJTgOUb/NCuDHzGT9z9WTt3YG+CPRhJs6nprbStx6DnWM4dh6gt7SU3sZodbZ08adQ=="; }; }; - "@babel/plugin-transform-new-target-7.22.5" = { + "@babel/plugin-transform-new-target-7.23.3" = { name = "_at_babel_slash_plugin-transform-new-target"; packageName = "@babel/plugin-transform-new-target"; - version = "7.22.5"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.22.5.tgz"; - sha512 = "AsF7K0Fx/cNKVyk3a+DW0JLo+Ua598/NxMRvxDnkpCIGFh43+h/v2xyhRUYf6oD8gE4QtL83C7zZVghMjHd+iw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.23.3.tgz"; + sha512 = "YJ3xKqtJMAT5/TIZnpAR3I+K+WaDowYbN3xyxI8zxx/Gsypwf9B9h0VB+1Nh6ACAAPRS5NSRje0uVv5i79HYGQ=="; }; }; - "@babel/plugin-transform-nullish-coalescing-operator-7.22.11" = { + "@babel/plugin-transform-nullish-coalescing-operator-7.23.3" = { name = "_at_babel_slash_plugin-transform-nullish-coalescing-operator"; packageName = "@babel/plugin-transform-nullish-coalescing-operator"; - version = "7.22.11"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.22.11.tgz"; - sha512 = "YZWOw4HxXrotb5xsjMJUDlLgcDXSfO9eCmdl1bgW4+/lAGdkjaEvOnQ4p5WKKdUgSzO39dgPl0pTnfxm0OAXcg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.23.3.tgz"; + sha512 = "xzg24Lnld4DYIdysyf07zJ1P+iIfJpxtVFOzX4g+bsJ3Ng5Le7rXx9KwqKzuyaUeRnt+I1EICwQITqc0E2PmpA=="; }; }; - "@babel/plugin-transform-numeric-separator-7.22.11" = { + "@babel/plugin-transform-numeric-separator-7.23.3" = { name = "_at_babel_slash_plugin-transform-numeric-separator"; packageName = "@babel/plugin-transform-numeric-separator"; - version = "7.22.11"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.22.11.tgz"; - sha512 = "3dzU4QGPsILdJbASKhF/V2TVP+gJya1PsueQCxIPCEcerqF21oEcrob4mzjsp2Py/1nLfF5m+xYNMDpmA8vffg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.23.3.tgz"; + sha512 = "s9GO7fIBi/BLsZ0v3Rftr6Oe4t0ctJ8h4CCXfPoEJwmvAPMyNrfkOOJzm6b9PX9YXcCJWWQd/sBF/N26eBiMVw=="; }; }; - "@babel/plugin-transform-object-rest-spread-7.22.15" = { + "@babel/plugin-transform-object-rest-spread-7.23.3" = { name = "_at_babel_slash_plugin-transform-object-rest-spread"; packageName = "@babel/plugin-transform-object-rest-spread"; - version = "7.22.15"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.22.15.tgz"; - sha512 = "fEB+I1+gAmfAyxZcX1+ZUwLeAuuf8VIg67CTznZE0MqVFumWkh8xWtn58I4dxdVf080wn7gzWoF8vndOViJe9Q=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.23.3.tgz"; + sha512 = "VxHt0ANkDmu8TANdE9Kc0rndo/ccsmfe2Cx2y5sI4hu3AukHQ5wAu4cM7j3ba8B9548ijVyclBU+nuDQftZsog=="; }; }; - "@babel/plugin-transform-object-super-7.22.5" = { + "@babel/plugin-transform-object-super-7.23.3" = { name = "_at_babel_slash_plugin-transform-object-super"; packageName = "@babel/plugin-transform-object-super"; - version = "7.22.5"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.22.5.tgz"; - sha512 = "klXqyaT9trSjIUrcsYIfETAzmOEZL3cBYqOYLJxBHfMFFggmXOv+NYSX/Jbs9mzMVESw/WycLFPRx8ba/b2Ipw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.23.3.tgz"; + sha512 = "BwQ8q0x2JG+3lxCVFohg+KbQM7plfpBwThdW9A6TMtWwLsbDA01Ek2Zb/AgDN39BiZsExm4qrXxjk+P1/fzGrA=="; }; }; - "@babel/plugin-transform-optional-catch-binding-7.22.11" = { + "@babel/plugin-transform-optional-catch-binding-7.23.3" = { name = "_at_babel_slash_plugin-transform-optional-catch-binding"; packageName = "@babel/plugin-transform-optional-catch-binding"; - version = "7.22.11"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.22.11.tgz"; - sha512 = "rli0WxesXUeCJnMYhzAglEjLWVDF6ahb45HuprcmQuLidBJFWjNnOzssk2kuc6e33FlLaiZhG/kUIzUMWdBKaQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.23.3.tgz"; + sha512 = "LxYSb0iLjUamfm7f1D7GpiS4j0UAC8AOiehnsGAP8BEsIX8EOi3qV6bbctw8M7ZvLtcoZfZX5Z7rN9PlWk0m5A=="; }; }; - "@babel/plugin-transform-optional-chaining-7.23.0" = { + "@babel/plugin-transform-optional-chaining-7.23.3" = { name = "_at_babel_slash_plugin-transform-optional-chaining"; packageName = "@babel/plugin-transform-optional-chaining"; - version = "7.23.0"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.23.0.tgz"; - sha512 = "sBBGXbLJjxTzLBF5rFWaikMnOGOk/BmK6vVByIdEggZ7Vn6CvWXZyRkkLFK6WE0IF8jSliyOkUN6SScFgzCM0g=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.23.3.tgz"; + sha512 = "zvL8vIfIUgMccIAK1lxjvNv572JHFJIKb4MWBz5OGdBQA0fB0Xluix5rmOby48exiJc987neOmP/m9Fnpkz3Tg=="; }; }; - "@babel/plugin-transform-parameters-7.22.15" = { + "@babel/plugin-transform-parameters-7.23.3" = { name = "_at_babel_slash_plugin-transform-parameters"; packageName = "@babel/plugin-transform-parameters"; - version = "7.22.15"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.22.15.tgz"; - sha512 = "hjk7qKIqhyzhhUvRT683TYQOFa/4cQKwQy7ALvTpODswN40MljzNDa0YldevS6tGbxwaEKVn502JmY0dP7qEtQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.23.3.tgz"; + sha512 = "09lMt6UsUb3/34BbECKVbVwrT9bO6lILWln237z7sLaWnMsTi7Yc9fhX5DLpkJzAGfaReXI22wP41SZmnAA3Vw=="; }; }; - "@babel/plugin-transform-private-methods-7.22.5" = { + "@babel/plugin-transform-private-methods-7.23.3" = { name = "_at_babel_slash_plugin-transform-private-methods"; packageName = "@babel/plugin-transform-private-methods"; - version = "7.22.5"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.22.5.tgz"; - sha512 = "PPjh4gyrQnGe97JTalgRGMuU4icsZFnWkzicB/fUtzlKUqvsWBKEpPPfr5a2JiyirZkHxnAqkQMO5Z5B2kK3fA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.23.3.tgz"; + sha512 = "UzqRcRtWsDMTLrRWFvUBDwmw06tCQH9Rl1uAjfh6ijMSmGYQ+fpdB+cnqRC8EMh5tuuxSv0/TejGL+7vyj+50g=="; }; }; - "@babel/plugin-transform-private-property-in-object-7.22.11" = { + "@babel/plugin-transform-private-property-in-object-7.23.3" = { name = "_at_babel_slash_plugin-transform-private-property-in-object"; packageName = "@babel/plugin-transform-private-property-in-object"; - version = "7.22.11"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.22.11.tgz"; - sha512 = "sSCbqZDBKHetvjSwpyWzhuHkmW5RummxJBVbYLkGkaiTOWGxml7SXt0iWa03bzxFIx7wOj3g/ILRd0RcJKBeSQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.23.3.tgz"; + sha512 = "a5m2oLNFyje2e/rGKjVfAELTVI5mbA0FeZpBnkOWWV7eSmKQ+T/XW0Vf+29ScLzSxX+rnsarvU0oie/4m6hkxA=="; }; }; - "@babel/plugin-transform-property-literals-7.22.5" = { + "@babel/plugin-transform-property-literals-7.23.3" = { name = "_at_babel_slash_plugin-transform-property-literals"; packageName = "@babel/plugin-transform-property-literals"; - version = "7.22.5"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.22.5.tgz"; - sha512 = "TiOArgddK3mK/x1Qwf5hay2pxI6wCZnvQqrFSqbtg1GLl2JcNMitVH/YnqjP+M31pLUeTfzY1HAXFDnUBV30rQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.23.3.tgz"; + sha512 = "jR3Jn3y7cZp4oEWPFAlRsSWjxKe4PZILGBSd4nis1TsC5qeSpb+nrtihJuDhNI7QHiVbUaiXa0X2RZY3/TI6Nw=="; }; }; - "@babel/plugin-transform-react-display-name-7.22.5" = { + "@babel/plugin-transform-react-display-name-7.23.3" = { name = "_at_babel_slash_plugin-transform-react-display-name"; packageName = "@babel/plugin-transform-react-display-name"; - version = "7.22.5"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.22.5.tgz"; - sha512 = "PVk3WPYudRF5z4GKMEYUrLjPl38fJSKNaEOkFuoprioowGuWN6w2RKznuFNSlJx7pzzXXStPUnNSOEO0jL5EVw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.23.3.tgz"; + sha512 = "GnvhtVfA2OAtzdX58FJxU19rhoGeQzyVndw3GgtdECQvQFXPEZIOVULHVZGAYmOgmqjXpVpfocAbSjh99V/Fqw=="; }; }; "@babel/plugin-transform-react-jsx-7.22.15" = { @@ -2668,139 +2677,139 @@ let sha512 = "oKckg2eZFa8771O/5vi7XeTvmM6+O9cxZu+kanTU7tD4sin5nO/G8jGJhq8Hvt2Z0kUoEDRayuZLaUlYl8QuGA=="; }; }; - "@babel/plugin-transform-react-jsx-self-7.22.5" = { + "@babel/plugin-transform-react-jsx-self-7.23.3" = { name = "_at_babel_slash_plugin-transform-react-jsx-self"; packageName = "@babel/plugin-transform-react-jsx-self"; - version = "7.22.5"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.22.5.tgz"; - sha512 = "nTh2ogNUtxbiSbxaT4Ds6aXnXEipHweN9YRgOX/oNXdf0cCrGn/+2LozFa3lnPV5D90MkjhgckCPBrsoSc1a7g=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.23.3.tgz"; + sha512 = "qXRvbeKDSfwnlJnanVRp0SfuWE5DQhwQr5xtLBzp56Wabyo+4CMosF6Kfp+eOD/4FYpql64XVJ2W0pVLlJZxOQ=="; }; }; - "@babel/plugin-transform-react-jsx-source-7.22.5" = { + "@babel/plugin-transform-react-jsx-source-7.23.3" = { name = "_at_babel_slash_plugin-transform-react-jsx-source"; packageName = "@babel/plugin-transform-react-jsx-source"; - version = "7.22.5"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.22.5.tgz"; - sha512 = "yIiRO6yobeEIaI0RTbIr8iAK9FcBHLtZq0S89ZPjDLQXBA4xvghaKqI0etp/tF3htTM0sazJKKLz9oEiGRtu7w=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.23.3.tgz"; + sha512 = "91RS0MDnAWDNvGC6Wio5XYkyWI39FMFO+JK9+4AlgaTH+yWwVTsw7/sn6LK0lH7c5F+TFkpv/3LfCJ1Ydwof/g=="; }; }; - "@babel/plugin-transform-regenerator-7.22.10" = { + "@babel/plugin-transform-regenerator-7.23.3" = { name = "_at_babel_slash_plugin-transform-regenerator"; packageName = "@babel/plugin-transform-regenerator"; - version = "7.22.10"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.22.10.tgz"; - sha512 = "F28b1mDt8KcT5bUyJc/U9nwzw6cV+UmTeRlXYIl2TNqMMJif0Jeey9/RQ3C4NOd2zp0/TRsDns9ttj2L523rsw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.23.3.tgz"; + sha512 = "KP+75h0KghBMcVpuKisx3XTu9Ncut8Q8TuvGO4IhY+9D5DFEckQefOuIsB/gQ2tG71lCke4NMrtIPS8pOj18BQ=="; }; }; - "@babel/plugin-transform-reserved-words-7.22.5" = { + "@babel/plugin-transform-reserved-words-7.23.3" = { name = "_at_babel_slash_plugin-transform-reserved-words"; packageName = "@babel/plugin-transform-reserved-words"; - version = "7.22.5"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.22.5.tgz"; - sha512 = "DTtGKFRQUDm8svigJzZHzb/2xatPc6TzNvAIJ5GqOKDsGFYgAskjRulbR/vGsPKq3OPqtexnz327qYpP57RFyA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.23.3.tgz"; + sha512 = "QnNTazY54YqgGxwIexMZva9gqbPa15t/x9VS+0fsEFWplwVpXYZivtgl43Z1vMpc1bdPP2PP8siFeVcnFvA3Cg=="; }; }; - "@babel/plugin-transform-runtime-7.23.2" = { + "@babel/plugin-transform-runtime-7.23.3" = { name = "_at_babel_slash_plugin-transform-runtime"; packageName = "@babel/plugin-transform-runtime"; - version = "7.23.2"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.23.2.tgz"; - sha512 = "XOntj6icgzMS58jPVtQpiuF6ZFWxQiJavISGx5KGjRj+3gqZr8+N6Kx+N9BApWzgS+DOjIZfXXj0ZesenOWDyA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.23.3.tgz"; + sha512 = "XcQ3X58CKBdBnnZpPaQjgVMePsXtSZzHoku70q9tUAQp02ggPQNM04BF3RvlW1GSM/McbSOQAzEK4MXbS7/JFg=="; }; }; - "@babel/plugin-transform-shorthand-properties-7.22.5" = { + "@babel/plugin-transform-shorthand-properties-7.23.3" = { name = "_at_babel_slash_plugin-transform-shorthand-properties"; packageName = "@babel/plugin-transform-shorthand-properties"; - version = "7.22.5"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.22.5.tgz"; - sha512 = "vM4fq9IXHscXVKzDv5itkO1X52SmdFBFcMIBZ2FRn2nqVYqw6dBexUgMvAjHW+KXpPPViD/Yo3GrDEBaRC0QYA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.23.3.tgz"; + sha512 = "ED2fgqZLmexWiN+YNFX26fx4gh5qHDhn1O2gvEhreLW2iI63Sqm4llRLCXALKrCnbN4Jy0VcMQZl/SAzqug/jg=="; }; }; - "@babel/plugin-transform-spread-7.22.5" = { + "@babel/plugin-transform-spread-7.23.3" = { name = "_at_babel_slash_plugin-transform-spread"; packageName = "@babel/plugin-transform-spread"; - version = "7.22.5"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.22.5.tgz"; - sha512 = "5ZzDQIGyvN4w8+dMmpohL6MBo+l2G7tfC/O2Dg7/hjpgeWvUx8FzfeOKxGog9IimPa4YekaQ9PlDqTLOljkcxg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.23.3.tgz"; + sha512 = "VvfVYlrlBVu+77xVTOAoxQ6mZbnIq5FM0aGBSFEcIh03qHf+zNqA4DC/3XMUozTg7bZV3e3mZQ0i13VB6v5yUg=="; }; }; - "@babel/plugin-transform-sticky-regex-7.22.5" = { + "@babel/plugin-transform-sticky-regex-7.23.3" = { name = "_at_babel_slash_plugin-transform-sticky-regex"; packageName = "@babel/plugin-transform-sticky-regex"; - version = "7.22.5"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.22.5.tgz"; - sha512 = "zf7LuNpHG0iEeiyCNwX4j3gDg1jgt1k3ZdXBKbZSoA3BbGQGvMiSvfbZRR3Dr3aeJe3ooWFZxOOG3IRStYp2Bw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.23.3.tgz"; + sha512 = "HZOyN9g+rtvnOU3Yh7kSxXrKbzgrm5X4GncPY1QOquu7epga5MxKHVpYu2hvQnry/H+JjckSYRb93iNfsioAGg=="; }; }; - "@babel/plugin-transform-template-literals-7.22.5" = { + "@babel/plugin-transform-template-literals-7.23.3" = { name = "_at_babel_slash_plugin-transform-template-literals"; packageName = "@babel/plugin-transform-template-literals"; - version = "7.22.5"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.22.5.tgz"; - sha512 = "5ciOehRNf+EyUeewo8NkbQiUs4d6ZxiHo6BcBcnFlgiJfu16q0bQUw9Jvo0b0gBKFG1SMhDSjeKXSYuJLeFSMA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.23.3.tgz"; + sha512 = "Flok06AYNp7GV2oJPZZcP9vZdszev6vPBkHLwxwSpaIqx75wn6mUd3UFWsSsA0l8nXAKkyCmL/sR02m8RYGeHg=="; }; }; - "@babel/plugin-transform-typeof-symbol-7.22.5" = { + "@babel/plugin-transform-typeof-symbol-7.23.3" = { name = "_at_babel_slash_plugin-transform-typeof-symbol"; packageName = "@babel/plugin-transform-typeof-symbol"; - version = "7.22.5"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.22.5.tgz"; - sha512 = "bYkI5lMzL4kPii4HHEEChkD0rkc+nvnlR6+o/qdqR6zrm0Sv/nodmyLhlq2DO0YKLUNd2VePmPRjJXSBh9OIdA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.23.3.tgz"; + sha512 = "4t15ViVnaFdrPC74be1gXBSMzXk3B4Us9lP7uLRQHTFpV5Dvt33pn+2MyyNxmN3VTTm3oTrZVMUmuw3oBnQ2oQ=="; }; }; - "@babel/plugin-transform-typescript-7.22.15" = { + "@babel/plugin-transform-typescript-7.23.3" = { name = "_at_babel_slash_plugin-transform-typescript"; packageName = "@babel/plugin-transform-typescript"; - version = "7.22.15"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.22.15.tgz"; - sha512 = "1uirS0TnijxvQLnlv5wQBwOX3E1wCFX7ITv+9pBV2wKEk4K+M5tqDaoNXnTH8tjEIYHLO98MwiTWO04Ggz4XuA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.23.3.tgz"; + sha512 = "ogV0yWnq38CFwH20l2Afz0dfKuZBx9o/Y2Rmh5vuSS0YD1hswgEgTfyTzuSrT2q9btmHRSqYoSfwFUVaC1M1Jw=="; }; }; - "@babel/plugin-transform-unicode-escapes-7.22.10" = { + "@babel/plugin-transform-unicode-escapes-7.23.3" = { name = "_at_babel_slash_plugin-transform-unicode-escapes"; packageName = "@babel/plugin-transform-unicode-escapes"; - version = "7.22.10"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.22.10.tgz"; - sha512 = "lRfaRKGZCBqDlRU3UIFovdp9c9mEvlylmpod0/OatICsSfuQ9YFthRo1tpTkGsklEefZdqlEFdY4A2dwTb6ohg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.23.3.tgz"; + sha512 = "OMCUx/bU6ChE3r4+ZdylEqAjaQgHAgipgW8nsCfu5pGqDcFytVd91AwRvUJSBZDz0exPGgnjoqhgRYLRjFZc9Q=="; }; }; - "@babel/plugin-transform-unicode-property-regex-7.22.5" = { + "@babel/plugin-transform-unicode-property-regex-7.23.3" = { name = "_at_babel_slash_plugin-transform-unicode-property-regex"; packageName = "@babel/plugin-transform-unicode-property-regex"; - version = "7.22.5"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.22.5.tgz"; - sha512 = "HCCIb+CbJIAE6sXn5CjFQXMwkCClcOfPCzTlilJ8cUatfzwHlWQkbtV0zD338u9dZskwvuOYTuuaMaA8J5EI5A=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.23.3.tgz"; + sha512 = "KcLIm+pDZkWZQAFJ9pdfmh89EwVfmNovFBcXko8szpBeF8z68kWIPeKlmSOkT9BXJxs2C0uk+5LxoxIv62MROA=="; }; }; - "@babel/plugin-transform-unicode-regex-7.22.5" = { + "@babel/plugin-transform-unicode-regex-7.23.3" = { name = "_at_babel_slash_plugin-transform-unicode-regex"; packageName = "@babel/plugin-transform-unicode-regex"; - version = "7.22.5"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.22.5.tgz"; - sha512 = "028laaOKptN5vHJf9/Arr/HiJekMd41hOEZYvNsrsXqJ7YPYuX2bQxh31fkZzGmq3YqHRJzYFFAVYvKfMPKqyg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.23.3.tgz"; + sha512 = "wMHpNA4x2cIA32b/ci3AfwNgheiva2W0WUKWTK7vBHBhDKfPsc5cFGNWm69WBqpwd86u1qwZ9PWevKqm1A3yAw=="; }; }; - "@babel/plugin-transform-unicode-sets-regex-7.22.5" = { + "@babel/plugin-transform-unicode-sets-regex-7.23.3" = { name = "_at_babel_slash_plugin-transform-unicode-sets-regex"; packageName = "@babel/plugin-transform-unicode-sets-regex"; - version = "7.22.5"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.22.5.tgz"; - sha512 = "lhMfi4FC15j13eKrh3DnYHjpGj6UKQHtNKTbtc1igvAhRy4+kLhV07OpLcsN0VgDEw/MjAvJO4BdMJsHwMhzCg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.23.3.tgz"; + sha512 = "W7lliA/v9bNR83Qc3q1ip9CQMZ09CcHDbHfbLRDNuAhn1Mvkr1ZNF7hPmztMQvtTGVLJ9m8IZqWsTkXOml8dbw=="; }; }; "@babel/polyfill-7.12.1" = { @@ -2812,22 +2821,22 @@ let sha512 = "X0pi0V6gxLi6lFZpGmeNa4zxtwEmCs42isWLNjZZDE0Y8yVfgu0T2OAHlzBbdYlqbW/YXVvoBHpATEM+goCj8g=="; }; }; - "@babel/preset-env-7.23.2" = { + "@babel/preset-env-7.23.3" = { name = "_at_babel_slash_preset-env"; packageName = "@babel/preset-env"; - version = "7.23.2"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.23.2.tgz"; - sha512 = "BW3gsuDD+rvHL2VO2SjAUNTBe5YrjsTiDyqamPDWY723na3/yPQ65X5oQkFVJZ0o50/2d+svm1rkPoJeR1KxVQ=="; + url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.23.3.tgz"; + sha512 = "ovzGc2uuyNfNAs/jyjIGxS8arOHS5FENZaNn4rtE7UdKMMkqHCvboHfcuhWLZNX5cB44QfcGNWjaevxMzzMf+Q=="; }; }; - "@babel/preset-flow-7.22.15" = { + "@babel/preset-flow-7.23.3" = { name = "_at_babel_slash_preset-flow"; packageName = "@babel/preset-flow"; - version = "7.22.15"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-flow/-/preset-flow-7.22.15.tgz"; - sha512 = "dB5aIMqpkgbTfN5vDdTRPzjqtWiZcRESNR88QYnoPR+bmdYoluOzMX9tQerTv0XzSgZYctPfO1oc0N5zdog1ew=="; + url = "https://registry.npmjs.org/@babel/preset-flow/-/preset-flow-7.23.3.tgz"; + sha512 = "7yn6hl8RIv+KNk6iIrGZ+D06VhVY35wLVf23Cz/mMu1zOr7u4MMP4j0nZ9tLf8+4ZFpnib8cFYgB/oYg9hfswA=="; }; }; "@babel/preset-modules-0.1.6-no-external-plugins" = { @@ -2839,13 +2848,13 @@ let sha512 = "HrcgcIESLm9aIR842yhJ5RWan/gebQUJ6E/E5+rf0y9o6oj7w0Br+sWuL6kEQ/o/AdfvR1Je9jG18/gnpwjEyA=="; }; }; - "@babel/preset-typescript-7.23.2" = { + "@babel/preset-typescript-7.23.3" = { name = "_at_babel_slash_preset-typescript"; packageName = "@babel/preset-typescript"; - version = "7.23.2"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.23.2.tgz"; - sha512 = "u4UJc1XsS1GhIGteM8rnGiIvf9rJpiVgMEeCnwlLA7WJPC+jcXWJAGxYmeqs5hOZD8BbAfnV5ezBOxQbb4OUxA=="; + url = "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.23.3.tgz"; + sha512 = "17oIGVlqz6CchO9RFYn5U6ZpWRZIngayYCtrPRSgANSwC2V1Jb+iP74nVxzzXJte8b8BYxrL1yY96xfhTBrNNQ=="; }; }; "@babel/register-7.22.15" = { @@ -2902,6 +2911,15 @@ let sha512 = "azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw=="; }; }; + "@babel/traverse-7.23.3" = { + name = "_at_babel_slash_traverse"; + packageName = "@babel/traverse"; + version = "7.23.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.3.tgz"; + sha512 = "+K0yF1/9yR0oHdE0StHuEj3uTPzwwbrLGfNOndVJVV2TqA5+j3oljJUb4nmB954FLGjNem976+B+eDuLIjesiQ=="; + }; + }; "@babel/types-7.17.0" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; @@ -2920,13 +2938,13 @@ let sha512 = "YuGopBq3ke25BVSiS6fgF49Ul9gH1x70Bcr6bqRLjWCkcX8Hre1/5+z+IiWOIerRMSSEfGZVB9z9kyq7wVs9YA=="; }; }; - "@babel/types-7.23.0" = { + "@babel/types-7.23.3" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; - version = "7.23.0"; + version = "7.23.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.23.0.tgz"; - sha512 = "0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg=="; + url = "https://registry.npmjs.org/@babel/types/-/types-7.23.3.tgz"; + sha512 = "OZnvoH2l8PK5eUvEcUyCt/sXgr/h+UWpVuBbOljwcrAgUl6lpchoQ++PHGyQy1AtYnVA6CEq3y5xeEI10brpXw=="; }; }; "@bconnorwhite/module-2.0.2" = { @@ -2938,22 +2956,22 @@ let sha512 = "ck1me5WMgZKp06gnJrVKEkytpehTTQbvsAMbF1nGPeHri/AZNhj87++PSE2LOxmZqM0EtGMaqeLdx7Lw7SUnTA=="; }; }; - "@bmewburn/js-beautify-1.14.7" = { + "@bmewburn/js-beautify-1.14.9" = { name = "_at_bmewburn_slash_js-beautify"; packageName = "@bmewburn/js-beautify"; - version = "1.14.7"; + version = "1.14.9"; src = fetchurl { - url = "https://registry.npmjs.org/@bmewburn/js-beautify/-/js-beautify-1.14.7.tgz"; - sha512 = "+s+Lw9+SesDdh4TsZyTRn6dCohzv3ioiR4YEXR8bQ+nl8J0Cz9oy+i/7vfrlLTD47/v1O8WsitR8wqL6epeevw=="; + url = "https://registry.npmjs.org/@bmewburn/js-beautify/-/js-beautify-1.14.9.tgz"; + sha512 = "PNz0Y8TElejGkQ3N6aiqoBLLa+kaIAQAgu6KFn/PN625W/t2LZVyoL68df5gRSvbpelrsczvQlVLsNp0mcJFgA=="; }; }; - "@bmewburn/vscode-html-languageserver-1.9.0" = { + "@bmewburn/vscode-html-languageserver-1.10.0" = { name = "_at_bmewburn_slash_vscode-html-languageserver"; packageName = "@bmewburn/vscode-html-languageserver"; - version = "1.9.0"; + version = "1.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/@bmewburn/vscode-html-languageserver/-/vscode-html-languageserver-1.9.0.tgz"; - sha512 = "yzZ6OK0W7frfoCqvl0s3KeVUUB22wYs74Qu3Y+VGgvW7yvq5m0M82RZQWghKdtLyQejc4469QlmhQsJmCF7ULg=="; + url = "https://registry.npmjs.org/@bmewburn/vscode-html-languageserver/-/vscode-html-languageserver-1.10.0.tgz"; + sha512 = "0lHL4Y1EJKHdRIEpXPZHnlIoxCKNglADDPloOYFcIoRj/O7zfRDrdPWPJgr2LeJDgXHklX6ltH6wp0Ywxa98AQ=="; }; }; "@braintree/sanitize-url-6.0.4" = { @@ -3019,40 +3037,40 @@ let sha512 = "htzFO1Zc57S8kgdRK9mLcPVTW1BY2ijfH7Dk2CeZmspTWKdKqSo1iwmqrq2WtRjFlo8aRZYgLX0wFrDXF/9DLA=="; }; }; - "@cdktf/cli-core-0.19.0" = { + "@cdktf/cli-core-0.19.1" = { name = "_at_cdktf_slash_cli-core"; packageName = "@cdktf/cli-core"; - version = "0.19.0"; + version = "0.19.1"; src = fetchurl { - url = "https://registry.npmjs.org/@cdktf/cli-core/-/cli-core-0.19.0.tgz"; - sha512 = "iSkhxuSHEPkPCPwvcM81ytniS3v/3YT+zY/MzeKWVkaMj1hZDF3e2C5gnjOdrb0ZCFIH1+znF+aJK9LiqBoV+Q=="; + url = "https://registry.npmjs.org/@cdktf/cli-core/-/cli-core-0.19.1.tgz"; + sha512 = "wWSz1qLviUs5ErpNg1kxc3Qx5o96wofnGTL4HQn9+SAZj7ta3dwNEojp1uSs4WnpY1tDq6H7vyXKh+FA8prW7g=="; }; }; - "@cdktf/commons-0.19.0" = { + "@cdktf/commons-0.19.1" = { name = "_at_cdktf_slash_commons"; packageName = "@cdktf/commons"; - version = "0.19.0"; + version = "0.19.1"; src = fetchurl { - url = "https://registry.npmjs.org/@cdktf/commons/-/commons-0.19.0.tgz"; - sha512 = "zhqGhx7PWa1lCa1B7RUH1qoln2emrGbGJ3kjRKMOxJxbTKdQBwFUbsaEOiOAVBm0ukTt2DX+VWQc8YPpMgSbgA=="; + url = "https://registry.npmjs.org/@cdktf/commons/-/commons-0.19.1.tgz"; + sha512 = "9X0rL5iOt3Q+CdtKeQeff09kEmZETAVbmFIZTFgdipFFR1eMQ0rGiTNFBr8ro23ZrVUbd74g/oBpc4eGirQe4A=="; }; }; - "@cdktf/hcl2cdk-0.19.0" = { + "@cdktf/hcl2cdk-0.19.1" = { name = "_at_cdktf_slash_hcl2cdk"; packageName = "@cdktf/hcl2cdk"; - version = "0.19.0"; + version = "0.19.1"; src = fetchurl { - url = "https://registry.npmjs.org/@cdktf/hcl2cdk/-/hcl2cdk-0.19.0.tgz"; - sha512 = "43XWR/ZLZVc8amOC6GmyGFkK9doiP9DKMjEDpYEnXCl1UhdFGHHipcSK6fnc30RCIq3KFF9FTuztvUyruToRyA=="; + url = "https://registry.npmjs.org/@cdktf/hcl2cdk/-/hcl2cdk-0.19.1.tgz"; + sha512 = "oFMUadPnDrOaMSTX1dQPuk/GFtSrk9/6B4G4CAYp9iXumqK204U0wEZYDFFEz5ieYhR86n/8YxA1GOOr0DmRZA=="; }; }; - "@cdktf/hcl2json-0.19.0" = { + "@cdktf/hcl2json-0.19.1" = { name = "_at_cdktf_slash_hcl2json"; packageName = "@cdktf/hcl2json"; - version = "0.19.0"; + version = "0.19.1"; src = fetchurl { - url = "https://registry.npmjs.org/@cdktf/hcl2json/-/hcl2json-0.19.0.tgz"; - sha512 = "wo68qo74dTxcZWJkwlhTV+YoVopUUUTpRC8W73HWkaL/lw6GDozh4GHwphagIHYJy07Ecxdx/WTp0sGDBaFBuQ=="; + url = "https://registry.npmjs.org/@cdktf/hcl2json/-/hcl2json-0.19.1.tgz"; + sha512 = "yQ5fTOK9aLuh3WsYV+ykqv0b1X+5KjqAgxaAU+f9pXNq3ght1Z6o7+jrBsPHpylcj318Bhl0Hc/PX3U/z6M2kg=="; }; }; "@cdktf/node-pty-prebuilt-multiarch-0.10.1-pre.11" = { @@ -3064,22 +3082,22 @@ let sha512 = "qvga/nzEtdCJMu/6jJfDqpzbRejvXtNhWFnbubfuYyN5nMNORNXX+POT4j+mQSDQar5bIQ1a812szw/zr47cfw=="; }; }; - "@cdktf/provider-generator-0.19.0" = { + "@cdktf/provider-generator-0.19.1" = { name = "_at_cdktf_slash_provider-generator"; packageName = "@cdktf/provider-generator"; - version = "0.19.0"; + version = "0.19.1"; src = fetchurl { - url = "https://registry.npmjs.org/@cdktf/provider-generator/-/provider-generator-0.19.0.tgz"; - sha512 = "+1qKfvSA4YH+i6PBbuDwj8xP5NNCsyeF5KR6S/2NqBxz/4w4xptB+h/IehiVGSHtwI2/XmL4bF3gLpNB9Q2dGg=="; + url = "https://registry.npmjs.org/@cdktf/provider-generator/-/provider-generator-0.19.1.tgz"; + sha512 = "Gg1DbDxhZ+CVT1uzDtvn3Q8C7MVVH1qBCAw33dLT22Faajut0ZO+/Bdai3/e81/jt4W50fN5b49MeTYG1hHRkw=="; }; }; - "@cdktf/provider-schema-0.19.0" = { + "@cdktf/provider-schema-0.19.1" = { name = "_at_cdktf_slash_provider-schema"; packageName = "@cdktf/provider-schema"; - version = "0.19.0"; + version = "0.19.1"; src = fetchurl { - url = "https://registry.npmjs.org/@cdktf/provider-schema/-/provider-schema-0.19.0.tgz"; - sha512 = "tfl6EqzBGL+qRBc+lgtb4qZvj8J4R+htF+N6BmrFnz9NiplRJmy1xzRMZ1fsrboeH0QExlyFYdIaZ97Q3CtD7A=="; + url = "https://registry.npmjs.org/@cdktf/provider-schema/-/provider-schema-0.19.1.tgz"; + sha512 = "31vX00P/fw+kgTVZ0hxKIfd6rTRsj6jc1BJaOOQd5yRM3NzbZdypNVkWsEyIAWp6kmPAHzHujpv5/F7IEPZCRA=="; }; }; "@chemzqm/msgpack-lite-0.1.29" = { @@ -3316,58 +3334,58 @@ let sha512 = "gB5C5nDIacLUdsMuW8YsM9SzK3vaFANe4J11CVXpovpy7bZUGrcJKmc6m/0gWG789pKr6XSZY2aEetjFvSRw5g=="; }; }; - "@cspell/cspell-bundled-dicts-7.3.8" = { + "@cspell/cspell-bundled-dicts-8.0.0" = { name = "_at_cspell_slash_cspell-bundled-dicts"; packageName = "@cspell/cspell-bundled-dicts"; - version = "7.3.8"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/cspell-bundled-dicts/-/cspell-bundled-dicts-7.3.8.tgz"; - sha512 = "Dj8iSGQyfgIsCjmXk9D/SjV7EpbpQSogeaGcBM66H33pd0GyGmLhn3biRN+vqi/vqWmsp75rT3kd5MKa8X5W9Q=="; + url = "https://registry.npmjs.org/@cspell/cspell-bundled-dicts/-/cspell-bundled-dicts-8.0.0.tgz"; + sha512 = "Phbb1ij1TQQuqxuuvxf5P6fvV9U+EVoATNLmDqFHvRZfUyuhgbJuCMzIPeBx4GfTTDWlPs51FYRvZ/Q8xBHsyA=="; }; }; - "@cspell/cspell-json-reporter-7.3.8" = { + "@cspell/cspell-json-reporter-8.0.0" = { name = "_at_cspell_slash_cspell-json-reporter"; packageName = "@cspell/cspell-json-reporter"; - version = "7.3.8"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/cspell-json-reporter/-/cspell-json-reporter-7.3.8.tgz"; - sha512 = "FxYJWtDgxIQYxdP0RWwRV8nzLfxVx8D8D5L2sbbP/0NFczDbq/zWYep4nSAHJT10aUJrogsVUYwNwdkr562wKA=="; + url = "https://registry.npmjs.org/@cspell/cspell-json-reporter/-/cspell-json-reporter-8.0.0.tgz"; + sha512 = "1ltK5N4xMGWjDSIkU+GJd3rXV8buXgO/lAgnpM1RhKWqAmG+u0k6pnhk2vIo/4qZQpgfK0l3J3h/Ky2FcE95vA=="; }; }; - "@cspell/cspell-pipe-7.3.8" = { + "@cspell/cspell-pipe-8.0.0" = { name = "_at_cspell_slash_cspell-pipe"; packageName = "@cspell/cspell-pipe"; - version = "7.3.8"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/cspell-pipe/-/cspell-pipe-7.3.8.tgz"; - sha512 = "/vKPfiHM5bJUkNX12w9j533Lm2JvvSMKUCChM2AxYjy6vL8prc/7ei++4g2xAWwRxLZPg2OfpDJS5EirZNBJdA=="; + url = "https://registry.npmjs.org/@cspell/cspell-pipe/-/cspell-pipe-8.0.0.tgz"; + sha512 = "1MH+9q3AmbzwK1BYhSGla8e4MAAYzzPApGvv8eyv0rWDmgmDTkGqJPTTvYj1wFvll5ximQ5OolpPQGv3JoWvtQ=="; }; }; - "@cspell/cspell-resolver-7.3.8" = { + "@cspell/cspell-resolver-8.0.0" = { name = "_at_cspell_slash_cspell-resolver"; packageName = "@cspell/cspell-resolver"; - version = "7.3.8"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/cspell-resolver/-/cspell-resolver-7.3.8.tgz"; - sha512 = "CeyQmhqZI5a+T7a6oiVN90TFlzU3qVVYqCaZ9grFrVOsmzY9ipH5gmqfgMavaBOqb0di/+VZS8d02suMOXcKLQ=="; + url = "https://registry.npmjs.org/@cspell/cspell-resolver/-/cspell-resolver-8.0.0.tgz"; + sha512 = "gtALHFLT2vSZ7BZlIg26AY3W9gkiqxPGE75iypWz06JHJs05ngnAR+h6VOu0+rmgx98hNfzPPEh4g+Tjm8Ma0A=="; }; }; - "@cspell/cspell-service-bus-7.3.8" = { + "@cspell/cspell-service-bus-8.0.0" = { name = "_at_cspell_slash_cspell-service-bus"; packageName = "@cspell/cspell-service-bus"; - version = "7.3.8"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/cspell-service-bus/-/cspell-service-bus-7.3.8.tgz"; - sha512 = "3E7gwY6QILrZH83p69i9CERbRBEqeBiKCIKnAd7U2PbxfFqG/P47fqpnarzSWFwFpU92oyGsYry+wC8TEGISRQ=="; + url = "https://registry.npmjs.org/@cspell/cspell-service-bus/-/cspell-service-bus-8.0.0.tgz"; + sha512 = "1EYhIHoZnhxpfEp6Bno6yVWYBuYfaQrwIfeDMntnezUcSmi7RyroQEcp5U7sLv69vhRD2c81o7r8iUaAbPSmIg=="; }; }; - "@cspell/cspell-types-7.3.8" = { + "@cspell/cspell-types-8.0.0" = { name = "_at_cspell_slash_cspell-types"; packageName = "@cspell/cspell-types"; - version = "7.3.8"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/cspell-types/-/cspell-types-7.3.8.tgz"; - sha512 = "hsOtaULDnawEL4pU0fga941GhvE8mbTbywrJBx+eGX3fnJsaUr8XQzCtnLsW2ko7WCLWFItNEhSSTPQHBFRLsw=="; + url = "https://registry.npmjs.org/@cspell/cspell-types/-/cspell-types-8.0.0.tgz"; + sha512 = "dPdxQI8dLJoJEjylaPYfCJNnm2XNMYPuowHE2FMcsnFR9hEchQAhnKVc/aD63IUYnUtUrPxPlUJdoAoj569e+g=="; }; }; "@cspell/dict-ada-4.0.2" = { @@ -3856,6 +3874,15 @@ let sha512 = "eeC20Q+UnHcTVBK6pgwhSjGIVugO2XqU7hv4ZfXp2F9DxGx1RME0+1sKX4qAGhdFGwOBsEzb2fwUsAEP6Mibpg=="; }; }; + "@cspell/dict-makefile-1.0.0" = { + name = "_at_cspell_slash_dict-makefile"; + packageName = "@cspell/dict-makefile"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@cspell/dict-makefile/-/dict-makefile-1.0.0.tgz"; + sha512 = "3W9tHPcSbJa6s0bcqWo6VisEDTSN5zOtDbnPabF7rbyjRpNo0uHXHRJQF8gAbFzoTzBBhgkTmrfSiuyQm7vBUQ=="; + }; + }; "@cspell/dict-node-1.0.12" = { name = "_at_cspell_slash_dict-node"; packageName = "@cspell/dict-node"; @@ -4090,22 +4117,22 @@ let sha512 = "niiEMPWPV9IeRBRzZ0TBZmNnkK3olkOPYxC1Ny2AX4TGlYRajcW0WUtoSHmvvjZNfWLSg2L6ruiBeuPSbjnG6A=="; }; }; - "@cspell/dynamic-import-7.3.8" = { + "@cspell/dynamic-import-8.0.0" = { name = "_at_cspell_slash_dynamic-import"; packageName = "@cspell/dynamic-import"; - version = "7.3.8"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dynamic-import/-/dynamic-import-7.3.8.tgz"; - sha512 = "s8x7dH/ScfW0pFEIvNFo4JOR7YmvM2wZSHOykmWTJCQ8k2EQ/+uECPp6ZxkoJoukTz8sj+3KzF0fRl5mKxPd6g=="; + url = "https://registry.npmjs.org/@cspell/dynamic-import/-/dynamic-import-8.0.0.tgz"; + sha512 = "HNkCepopgiEGuI1QGA6ob4+ayvoSMxvAqetLxP0u1sZzc50LH2DEWwotcNrpVdzZOtERHvIBcGaQKIBEx8pPRQ=="; }; }; - "@cspell/strong-weak-map-7.3.8" = { + "@cspell/strong-weak-map-8.0.0" = { name = "_at_cspell_slash_strong-weak-map"; packageName = "@cspell/strong-weak-map"; - version = "7.3.8"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/strong-weak-map/-/strong-weak-map-7.3.8.tgz"; - sha512 = "qNnt2wG45wb8JP54mENarnQgxfSYKPp3zlYID/2przbMNmVJRqUlcIBOdLI6plCgGeNkzJTl3T9T1ATbnN+LLw=="; + url = "https://registry.npmjs.org/@cspell/strong-weak-map/-/strong-weak-map-8.0.0.tgz"; + sha512 = "fRlqPSdpdub52vFtulDgLPzGPGe75I04ScId1zOO9ABP7/ro8VmaG//m1k7hsPkm6h7FG4jWympoA3aXDAcXaA=="; }; }; "@cspotcode/source-map-support-0.8.1" = { @@ -4225,22 +4252,31 @@ let sha512 = "RUl/439BHKshkhSGFRlZ1kzy68wL4mn8VNKDSZr3p0tciyZ33Mjfpl+vofqnHqXRmDI6nLnZpfJvhY3D88o0pA=="; }; }; - "@edge-runtime/primitives-3.1.1" = { + "@edge-runtime/ponyfill-2.4.1" = { + name = "_at_edge-runtime_slash_ponyfill"; + packageName = "@edge-runtime/ponyfill"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@edge-runtime/ponyfill/-/ponyfill-2.4.1.tgz"; + sha512 = "ZbR/EViY3gg2rmEAQTKPa6mXl4aR1/+cFcQe4r1segCjEbTAxT6PWu40odbu/KlZKSysEb2O/BWIC2lJgSJOMQ=="; + }; + }; + "@edge-runtime/primitives-4.0.5" = { name = "_at_edge-runtime_slash_primitives"; packageName = "@edge-runtime/primitives"; - version = "3.1.1"; + version = "4.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@edge-runtime/primitives/-/primitives-3.1.1.tgz"; - sha512 = "ROO22py+KdAfzqWZu6CtVMC4qV6mS0W1jPI51jGXE+uenyBUN7cQTWB9ReQc8Bm4cnjqmhajvpqEx3j7Y9iSOg=="; + url = "https://registry.npmjs.org/@edge-runtime/primitives/-/primitives-4.0.5.tgz"; + sha512 = "t7QiN5d/KpXgCvIfSt6Nm9Hj3WVdNgc5CpOD73jasY+9EvTI7Ngdj5cXvjcHrPcmYWJZMySPgeEeoL/1N/Llag=="; }; }; - "@edge-runtime/vm-3.1.1" = { + "@edge-runtime/vm-3.1.7" = { name = "_at_edge-runtime_slash_vm"; packageName = "@edge-runtime/vm"; - version = "3.1.1"; + version = "3.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/@edge-runtime/vm/-/vm-3.1.1.tgz"; - sha512 = "6NJRRG04/91qnWLZj+wZm27q6fJkTbkZdIJdo/Ig++GTxkAv8Wh/45nIcz9Xg7AzIAMpAkflFdiCrCoZ3hp1Iw=="; + url = "https://registry.npmjs.org/@edge-runtime/vm/-/vm-3.1.7.tgz"; + sha512 = "hUMFbDQ/nZN+1TLMi6iMO1QFz9RSV8yGG8S42WFPFma1d7VSNE0eMdJUmwjmtav22/iQkzHMmu6oTSfAvRGS8g=="; }; }; "@electron-forge/core-6.4.2" = { @@ -4342,13 +4378,13 @@ let sha512 = "MPAZQ4v6piCED7NT1LTVQf61o6Eg/laNoKbhbrFBSH1i20OUwbtV2MLj6Op292ynI9+1qdHKmFgctr6qPTCAQw=="; }; }; - "@electron/asar-3.2.7" = { + "@electron/asar-3.2.8" = { name = "_at_electron_slash_asar"; packageName = "@electron/asar"; - version = "3.2.7"; + version = "3.2.8"; src = fetchurl { - url = "https://registry.npmjs.org/@electron/asar/-/asar-3.2.7.tgz"; - sha512 = "8FaSCAIiZGYFWyjeevPQt+0e9xCK9YmJ2Rjg5SXgdsXon6cRnU0Yxnbe6CvJbQn26baifur2Y2G5EBayRIsjyg=="; + url = "https://registry.npmjs.org/@electron/asar/-/asar-3.2.8.tgz"; + sha512 = "cmskk5M06ewHMZAplSiF4AlME3IrnnZhKnWbtwKVLRkdJkKyUVjMLhDIiPIx/+6zQWVlKX/LtmK9xDme7540Sg=="; }; }; "@electron/get-2.0.3" = { @@ -4387,13 +4423,13 @@ let sha512 = "S1vgpzIOS1wCJmsYjdLz97MTUV6UTLcMk/HE3w90HYtVxvW+PQdwxLbgsrECX2bysqcnmM5a0K6mXj/gwVgYtQ=="; }; }; - "@electron/universal-1.4.2" = { + "@electron/universal-1.4.5" = { name = "_at_electron_slash_universal"; packageName = "@electron/universal"; - version = "1.4.2"; + version = "1.4.5"; src = fetchurl { - url = "https://registry.npmjs.org/@electron/universal/-/universal-1.4.2.tgz"; - sha512 = "ymGwXYBUGFS1DuTqYJwZ0p1gIlELKOf21zPJefij/amzV66vTXRNJ2mAtW0uRsaHfV+pzYTJVrt5oco44DFOMg=="; + url = "https://registry.npmjs.org/@electron/universal/-/universal-1.4.5.tgz"; + sha512 = "3vE9WBQnvlulKylrPbyc+9M4xnD7t1JxuCOF0nrFz00XrrkgbqeqxDf90PNcjLiuB4hAZKr1JooVA6KwsXj94w=="; }; }; "@emmetio/abbreviation-2.3.3" = { @@ -4450,15 +4486,6 @@ let sha512 = "LXV7QsWJxRuMYvKbiznh+U1ilIop3g2TeKRzUxOG5X3YITc8JyyTa90BmLwqqv0YnX4v32CSlG+vsziZp9dMvA=="; }; }; - "@esbuild/android-arm-0.15.18" = { - name = "_at_esbuild_slash_android-arm"; - packageName = "@esbuild/android-arm"; - version = "0.15.18"; - src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.15.18.tgz"; - sha512 = "5GT+kcs2WVGjVs7+boataCkO5Fg0y4kCjzkB5bAip7H4jfnOS3dA6KPiww9W1OEKTKeAcUVhdZGvgI65OXmUnw=="; - }; - }; "@esbuild/android-arm-0.17.19" = { name = "_at_esbuild_slash_android-arm"; packageName = "@esbuild/android-arm"; @@ -4477,6 +4504,15 @@ let sha512 = "fyi7TDI/ijKKNZTUJAQqiG5T7YjJXgnzkURqmGj13C6dCqckZBLdl4h7bkhHt/t0WP+zO9/zwroDvANaOqO5Sw=="; }; }; + "@esbuild/android-arm-0.19.5" = { + name = "_at_esbuild_slash_android-arm"; + packageName = "@esbuild/android-arm"; + version = "0.19.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.19.5.tgz"; + sha512 = "bhvbzWFF3CwMs5tbjf3ObfGqbl/17ict2/uwOSfr3wmxDE6VdS2GqY/FuzIPe0q0bdhj65zQsvqfArI9MY6+AA=="; + }; + }; "@esbuild/android-arm64-0.17.19" = { name = "_at_esbuild_slash_android-arm64"; packageName = "@esbuild/android-arm64"; @@ -4495,6 +4531,15 @@ let sha512 = "Nz4rJcchGDtENV0eMKUNa6L12zz2zBDXuhj/Vjh18zGqB44Bi7MBMSXjgunJgjRhCmKOjnPuZp4Mb6OKqtMHLQ=="; }; }; + "@esbuild/android-arm64-0.19.5" = { + name = "_at_esbuild_slash_android-arm64"; + packageName = "@esbuild/android-arm64"; + version = "0.19.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.19.5.tgz"; + sha512 = "5d1OkoJxnYQfmC+Zd8NBFjkhyCNYwM4n9ODrycTFY6Jk1IGiZ+tjVJDDSwDt77nK+tfpGP4T50iMtVi4dEGzhQ=="; + }; + }; "@esbuild/android-x64-0.17.19" = { name = "_at_esbuild_slash_android-x64"; packageName = "@esbuild/android-x64"; @@ -4513,6 +4558,15 @@ let sha512 = "8GDdlePJA8D6zlZYJV/jnrRAi6rOiNaCC/JclcXpB+KIuvfBN4owLtgzY2bsxnx666XjJx2kDPUmnTtR8qKQUg=="; }; }; + "@esbuild/android-x64-0.19.5" = { + name = "_at_esbuild_slash_android-x64"; + packageName = "@esbuild/android-x64"; + version = "0.19.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.19.5.tgz"; + sha512 = "9t+28jHGL7uBdkBjL90QFxe7DVA+KGqWlHCF8ChTKyaKO//VLuoBricQCgwhOjA1/qOczsw843Fy4cbs4H3DVA=="; + }; + }; "@esbuild/darwin-arm64-0.17.19" = { name = "_at_esbuild_slash_darwin-arm64"; packageName = "@esbuild/darwin-arm64"; @@ -4531,6 +4585,15 @@ let sha512 = "bxRHW5kHU38zS2lPTPOyuyTm+S+eobPUnTNkdJEfAddYgEcll4xkT8DB9d2008DtTbl7uJag2HuE5NZAZgnNEA=="; }; }; + "@esbuild/darwin-arm64-0.19.5" = { + name = "_at_esbuild_slash_darwin-arm64"; + packageName = "@esbuild/darwin-arm64"; + version = "0.19.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.19.5.tgz"; + sha512 = "mvXGcKqqIqyKoxq26qEDPHJuBYUA5KizJncKOAf9eJQez+L9O+KfvNFu6nl7SCZ/gFb2QPaRqqmG0doSWlgkqw=="; + }; + }; "@esbuild/darwin-x64-0.17.19" = { name = "_at_esbuild_slash_darwin-x64"; packageName = "@esbuild/darwin-x64"; @@ -4549,6 +4612,15 @@ let sha512 = "pc5gxlMDxzm513qPGbCbDukOdsGtKhfxD1zJKXjCCcU7ju50O7MeAZ8c4krSJcOIJGFR+qx21yMMVYwiQvyTyQ=="; }; }; + "@esbuild/darwin-x64-0.19.5" = { + name = "_at_esbuild_slash_darwin-x64"; + packageName = "@esbuild/darwin-x64"; + version = "0.19.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.19.5.tgz"; + sha512 = "Ly8cn6fGLNet19s0X4unjcniX24I0RqjPv+kurpXabZYSXGM4Pwpmf85WHJN3lAgB8GSth7s5A0r856S+4DyiA=="; + }; + }; "@esbuild/freebsd-arm64-0.17.19" = { name = "_at_esbuild_slash_freebsd-arm64"; packageName = "@esbuild/freebsd-arm64"; @@ -4567,6 +4639,15 @@ let sha512 = "yqDQHy4QHevpMAaxhhIwYPMv1NECwOvIpGCZkECn8w2WFHXjEwrBn3CeNIYsibZ/iZEUemj++M26W3cNR5h+Tw=="; }; }; + "@esbuild/freebsd-arm64-0.19.5" = { + name = "_at_esbuild_slash_freebsd-arm64"; + packageName = "@esbuild/freebsd-arm64"; + version = "0.19.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.19.5.tgz"; + sha512 = "GGDNnPWTmWE+DMchq1W8Sd0mUkL+APvJg3b11klSGUDvRXh70JqLAO56tubmq1s2cgpVCSKYywEiKBfju8JztQ=="; + }; + }; "@esbuild/freebsd-x64-0.17.19" = { name = "_at_esbuild_slash_freebsd-x64"; packageName = "@esbuild/freebsd-x64"; @@ -4585,6 +4666,15 @@ let sha512 = "tgWRPPuQsd3RmBZwarGVHZQvtzfEBOreNuxEMKFcd5DaDn2PbBxfwLcj4+aenoh7ctXcbXmOQIn8HI6mCSw5MQ=="; }; }; + "@esbuild/freebsd-x64-0.19.5" = { + name = "_at_esbuild_slash_freebsd-x64"; + packageName = "@esbuild/freebsd-x64"; + version = "0.19.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.19.5.tgz"; + sha512 = "1CCwDHnSSoA0HNwdfoNY0jLfJpd7ygaLAp5EHFos3VWJCRX9DMwWODf96s9TSse39Br7oOTLryRVmBoFwXbuuQ=="; + }; + }; "@esbuild/linux-arm-0.17.19" = { name = "_at_esbuild_slash_linux-arm"; packageName = "@esbuild/linux-arm"; @@ -4603,6 +4693,15 @@ let sha512 = "/5bHkMWnq1EgKr1V+Ybz3s1hWXok7mDFUMQ4cG10AfW3wL02PSZi5kFpYKrptDsgb2WAJIvRcDm+qIvXf/apvg=="; }; }; + "@esbuild/linux-arm-0.19.5" = { + name = "_at_esbuild_slash_linux-arm"; + packageName = "@esbuild/linux-arm"; + version = "0.19.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.19.5.tgz"; + sha512 = "lrWXLY/vJBzCPC51QN0HM71uWgIEpGSjSZZADQhq7DKhPcI6NH1IdzjfHkDQws2oNpJKpR13kv7/pFHBbDQDwQ=="; + }; + }; "@esbuild/linux-arm64-0.17.19" = { name = "_at_esbuild_slash_linux-arm64"; packageName = "@esbuild/linux-arm64"; @@ -4621,6 +4720,15 @@ let sha512 = "2YbscF+UL7SQAVIpnWvYwM+3LskyDmPhe31pE7/aoTMFKKzIc9lLbyGUpmmb8a8AixOL61sQ/mFh3jEjHYFvdA=="; }; }; + "@esbuild/linux-arm64-0.19.5" = { + name = "_at_esbuild_slash_linux-arm64"; + packageName = "@esbuild/linux-arm64"; + version = "0.19.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.19.5.tgz"; + sha512 = "o3vYippBmSrjjQUCEEiTZ2l+4yC0pVJD/Dl57WfPwwlvFkrxoSO7rmBZFii6kQB3Wrn/6GwJUPLU5t52eq2meA=="; + }; + }; "@esbuild/linux-ia32-0.17.19" = { name = "_at_esbuild_slash_linux-ia32"; packageName = "@esbuild/linux-ia32"; @@ -4639,13 +4747,13 @@ let sha512 = "P4etWwq6IsReT0E1KHU40bOnzMHoH73aXp96Fs8TIT6z9Hu8G6+0SHSw9i2isWrD2nbx2qo5yUqACgdfVGx7TA=="; }; }; - "@esbuild/linux-loong64-0.15.18" = { - name = "_at_esbuild_slash_linux-loong64"; - packageName = "@esbuild/linux-loong64"; - version = "0.15.18"; + "@esbuild/linux-ia32-0.19.5" = { + name = "_at_esbuild_slash_linux-ia32"; + packageName = "@esbuild/linux-ia32"; + version = "0.19.5"; src = fetchurl { - url = "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.15.18.tgz"; - sha512 = "L4jVKS82XVhw2nvzLg/19ClLWg0y27ulRwuP7lcyL6AbUWB5aPglXY3M21mauDQMDfRLs8cQmeT03r/+X3cZYQ=="; + url = "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.19.5.tgz"; + sha512 = "MkjHXS03AXAkNp1KKkhSKPOCYztRtK+KXDNkBa6P78F8Bw0ynknCSClO/ztGszILZtyO/lVKpa7MolbBZ6oJtQ=="; }; }; "@esbuild/linux-loong64-0.17.19" = { @@ -4666,6 +4774,15 @@ let sha512 = "nXW8nqBTrOpDLPgPY9uV+/1DjxoQ7DoB2N8eocyq8I9XuqJ7BiAMDMf9n1xZM9TgW0J8zrquIb/A7s3BJv7rjg=="; }; }; + "@esbuild/linux-loong64-0.19.5" = { + name = "_at_esbuild_slash_linux-loong64"; + packageName = "@esbuild/linux-loong64"; + version = "0.19.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.19.5.tgz"; + sha512 = "42GwZMm5oYOD/JHqHska3Jg0r+XFb/fdZRX+WjADm3nLWLcIsN27YKtqxzQmGNJgu0AyXg4HtcSK9HuOk3v1Dw=="; + }; + }; "@esbuild/linux-mips64el-0.17.19" = { name = "_at_esbuild_slash_linux-mips64el"; packageName = "@esbuild/linux-mips64el"; @@ -4684,6 +4801,15 @@ let sha512 = "d5NeaXZcHp8PzYy5VnXV3VSd2D328Zb+9dEq5HE6bw6+N86JVPExrA6O68OPwobntbNJ0pzCpUFZTo3w0GyetQ=="; }; }; + "@esbuild/linux-mips64el-0.19.5" = { + name = "_at_esbuild_slash_linux-mips64el"; + packageName = "@esbuild/linux-mips64el"; + version = "0.19.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.19.5.tgz"; + sha512 = "kcjndCSMitUuPJobWCnwQ9lLjiLZUR3QLQmlgaBfMX23UEa7ZOrtufnRds+6WZtIS9HdTXqND4yH8NLoVVIkcg=="; + }; + }; "@esbuild/linux-ppc64-0.17.19" = { name = "_at_esbuild_slash_linux-ppc64"; packageName = "@esbuild/linux-ppc64"; @@ -4702,6 +4828,15 @@ let sha512 = "WHPyeScRNcmANnLQkq6AfyXRFr5D6N2sKgkFo2FqguP44Nw2eyDlbTdZwd9GYk98DZG9QItIiTlFLHJHjxP3FA=="; }; }; + "@esbuild/linux-ppc64-0.19.5" = { + name = "_at_esbuild_slash_linux-ppc64"; + packageName = "@esbuild/linux-ppc64"; + version = "0.19.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.19.5.tgz"; + sha512 = "yJAxJfHVm0ZbsiljbtFFP1BQKLc8kUF6+17tjQ78QjqjAQDnhULWiTA6u0FCDmYT1oOKS9PzZ2z0aBI+Mcyj7Q=="; + }; + }; "@esbuild/linux-riscv64-0.17.19" = { name = "_at_esbuild_slash_linux-riscv64"; packageName = "@esbuild/linux-riscv64"; @@ -4720,6 +4855,15 @@ let sha512 = "WSxo6h5ecI5XH34KC7w5veNnKkju3zBRLEQNY7mv5mtBmrP/MjNBCAlsM2u5hDBlS3NGcTQpoBvRzqBcRtpq1A=="; }; }; + "@esbuild/linux-riscv64-0.19.5" = { + name = "_at_esbuild_slash_linux-riscv64"; + packageName = "@esbuild/linux-riscv64"; + version = "0.19.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.19.5.tgz"; + sha512 = "5u8cIR/t3gaD6ad3wNt1MNRstAZO+aNyBxu2We8X31bA8XUNyamTVQwLDA1SLoPCUehNCymhBhK3Qim1433Zag=="; + }; + }; "@esbuild/linux-s390x-0.17.19" = { name = "_at_esbuild_slash_linux-s390x"; packageName = "@esbuild/linux-s390x"; @@ -4738,6 +4882,15 @@ let sha512 = "+8231GMs3mAEth6Ja1iK0a1sQ3ohfcpzpRLH8uuc5/KVDFneH6jtAJLFGafpzpMRO6DzJ6AvXKze9LfFMrIHVQ=="; }; }; + "@esbuild/linux-s390x-0.19.5" = { + name = "_at_esbuild_slash_linux-s390x"; + packageName = "@esbuild/linux-s390x"; + version = "0.19.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.19.5.tgz"; + sha512 = "Z6JrMyEw/EmZBD/OFEFpb+gao9xJ59ATsoTNlj39jVBbXqoZm4Xntu6wVmGPB/OATi1uk/DB+yeDPv2E8PqZGw=="; + }; + }; "@esbuild/linux-x64-0.17.19" = { name = "_at_esbuild_slash_linux-x64"; packageName = "@esbuild/linux-x64"; @@ -4756,6 +4909,15 @@ let sha512 = "UYqiqemphJcNsFEskc73jQ7B9jgwjWrSayxawS6UVFZGWrAAtkzjxSqnoclCXxWtfwLdzU+vTpcNYhpn43uP1w=="; }; }; + "@esbuild/linux-x64-0.19.5" = { + name = "_at_esbuild_slash_linux-x64"; + packageName = "@esbuild/linux-x64"; + version = "0.19.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.19.5.tgz"; + sha512 = "psagl+2RlK1z8zWZOmVdImisMtrUxvwereIdyJTmtmHahJTKb64pAcqoPlx6CewPdvGvUKe2Jw+0Z/0qhSbG1A=="; + }; + }; "@esbuild/netbsd-x64-0.17.19" = { name = "_at_esbuild_slash_netbsd-x64"; packageName = "@esbuild/netbsd-x64"; @@ -4774,6 +4936,15 @@ let sha512 = "iO1c++VP6xUBUmltHZoMtCUdPlnPGdBom6IrO4gyKPFFVBKioIImVooR5I83nTew5UOYrk3gIJhbZh8X44y06A=="; }; }; + "@esbuild/netbsd-x64-0.19.5" = { + name = "_at_esbuild_slash_netbsd-x64"; + packageName = "@esbuild/netbsd-x64"; + version = "0.19.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.19.5.tgz"; + sha512 = "kL2l+xScnAy/E/3119OggX8SrWyBEcqAh8aOY1gr4gPvw76la2GlD4Ymf832UCVbmuWeTf2adkZDK+h0Z/fB4g=="; + }; + }; "@esbuild/openbsd-x64-0.17.19" = { name = "_at_esbuild_slash_openbsd-x64"; packageName = "@esbuild/openbsd-x64"; @@ -4792,6 +4963,15 @@ let sha512 = "e5e4YSsuQfX4cxcygw/UCPIEP6wbIL+se3sxPdCiMbFLBWu0eiZOJ7WoD+ptCLrmjZBK1Wk7I6D/I3NglUGOxg=="; }; }; + "@esbuild/openbsd-x64-0.19.5" = { + name = "_at_esbuild_slash_openbsd-x64"; + packageName = "@esbuild/openbsd-x64"; + version = "0.19.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.19.5.tgz"; + sha512 = "sPOfhtzFufQfTBgRnE1DIJjzsXukKSvZxloZbkJDG383q0awVAq600pc1nfqBcl0ice/WN9p4qLc39WhBShRTA=="; + }; + }; "@esbuild/sunos-x64-0.17.19" = { name = "_at_esbuild_slash_sunos-x64"; packageName = "@esbuild/sunos-x64"; @@ -4810,6 +4990,15 @@ let sha512 = "kDbFRFp0YpTQVVrqUd5FTYmWo45zGaXe0X8E1G/LKFC0v8x0vWrhOWSLITcCn63lmZIxfOMXtCfti/RxN/0wnQ=="; }; }; + "@esbuild/sunos-x64-0.19.5" = { + name = "_at_esbuild_slash_sunos-x64"; + packageName = "@esbuild/sunos-x64"; + version = "0.19.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.19.5.tgz"; + sha512 = "dGZkBXaafuKLpDSjKcB0ax0FL36YXCvJNnztjKV+6CO82tTYVDSH2lifitJ29jxRMoUhgkg9a+VA/B03WK5lcg=="; + }; + }; "@esbuild/win32-arm64-0.17.19" = { name = "_at_esbuild_slash_win32-arm64"; packageName = "@esbuild/win32-arm64"; @@ -4828,6 +5017,15 @@ let sha512 = "ddYFR6ItYgoaq4v4JmQQaAI5s7npztfV4Ag6NrhiaW0RrnOXqBkgwZLofVTlq1daVTQNhtI5oieTvkRPfZrePg=="; }; }; + "@esbuild/win32-arm64-0.19.5" = { + name = "_at_esbuild_slash_win32-arm64"; + packageName = "@esbuild/win32-arm64"; + version = "0.19.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.19.5.tgz"; + sha512 = "dWVjD9y03ilhdRQ6Xig1NWNgfLtf2o/STKTS+eZuF90fI2BhbwD6WlaiCGKptlqXlURVB5AUOxUj09LuwKGDTg=="; + }; + }; "@esbuild/win32-ia32-0.17.19" = { name = "_at_esbuild_slash_win32-ia32"; packageName = "@esbuild/win32-ia32"; @@ -4846,6 +5044,15 @@ let sha512 = "Wv7QBi3ID/rROT08SABTS7eV4hX26sVduqDOTe1MvGMjNd3EjOz4b7zeexIR62GTIEKrfJXKL9LFxTYgkyeu7g=="; }; }; + "@esbuild/win32-ia32-0.19.5" = { + name = "_at_esbuild_slash_win32-ia32"; + packageName = "@esbuild/win32-ia32"; + version = "0.19.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.19.5.tgz"; + sha512 = "4liggWIA4oDgUxqpZwrDhmEfAH4d0iljanDOK7AnVU89T6CzHon/ony8C5LeOdfgx60x5cnQJFZwEydVlYx4iw=="; + }; + }; "@esbuild/win32-x64-0.17.19" = { name = "_at_esbuild_slash_win32-x64"; packageName = "@esbuild/win32-x64"; @@ -4864,6 +5071,15 @@ let sha512 = "kTdfRcSiDfQca/y9QIkng02avJ+NCaQvrMejlsB3RRv5sE9rRoeBPISaZpKxHELzRxZyLvNts1P27W3wV+8geQ=="; }; }; + "@esbuild/win32-x64-0.19.5" = { + name = "_at_esbuild_slash_win32-x64"; + packageName = "@esbuild/win32-x64"; + version = "0.19.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.19.5.tgz"; + sha512 = "czTrygUsB/jlM8qEW5MD8bgYU2Xg14lo6kBDXW6HdxKjh8M5PzETGiSHaz9MtbXBYDloHNUAUW2tMiKW4KM9Mw=="; + }; + }; "@eslint-community/eslint-utils-4.4.0" = { name = "_at_eslint-community_slash_eslint-utils"; packageName = "@eslint-community/eslint-utils"; @@ -4891,13 +5107,13 @@ let sha512 = "J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw=="; }; }; - "@eslint/eslintrc-2.1.2" = { + "@eslint/eslintrc-2.1.3" = { name = "_at_eslint_slash_eslintrc"; packageName = "@eslint/eslintrc"; - version = "2.1.2"; + version = "2.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.2.tgz"; - sha512 = "+wvgpDsrB1YqAMdEUCcnTlpfVBH7Vqn6A/NT3D8WVXFIaKMlErPIZT3oCIAVCOtarRpMtelZLqJeU3t7WY6X6g=="; + url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.3.tgz"; + sha512 = "yZzuIG+jnVu6hNSzFEN07e8BxF3uAzYtQb6uDkaYZLo6oYZDCq454c5kB8zxnzfCYyP4MIuyBn10L0DqwujTmA=="; }; }; "@eslint/js-8.44.0" = { @@ -4909,13 +5125,13 @@ let sha512 = "Ag+9YM4ocKQx9AarydN0KY2j0ErMHNIocPDrVo8zAE44xLTjEtz81OdR68/cydGtk6m6jDb5Za3r2useMzYmSw=="; }; }; - "@eslint/js-8.52.0" = { + "@eslint/js-8.53.0" = { name = "_at_eslint_slash_js"; packageName = "@eslint/js"; - version = "8.52.0"; + version = "8.53.0"; src = fetchurl { - url = "https://registry.npmjs.org/@eslint/js/-/js-8.52.0.tgz"; - sha512 = "mjZVbpaeMZludF2fsWLD0Z9gCref1Tk4i9+wddjRvpUNqqcndPkBD09N/Mapey0b3jaXbLm2kICwFv2E64QinA=="; + url = "https://registry.npmjs.org/@eslint/js/-/js-8.53.0.tgz"; + sha512 = "Kn7K8dx/5U6+cT1yEhpX1w4PCSg0M+XyRILPgvwcEBjerFWCwQj5sbr3/VmxqV0JGHCBCzyd6LxypEuehypY1w=="; }; }; "@ethereumjs/rlp-4.0.1" = { @@ -5134,31 +5350,22 @@ let sha512 = "ghUVhNJQOCTdQckSGTHctNp/0jzvVoMMkVh+6SHn+TZj8sU15U/npXIDt8NtQp0HedlPaCgkVdMu8Sacne0aEA=="; }; }; - "@expo/eas-build-job-1.0.39" = { - name = "_at_expo_slash_eas-build-job"; - packageName = "@expo/eas-build-job"; - version = "1.0.39"; - src = fetchurl { - url = "https://registry.npmjs.org/@expo/eas-build-job/-/eas-build-job-1.0.39.tgz"; - sha512 = "OqCCxLx9HRMFQDiZvfpOfNmGhsTrV15IUOhmbp9iIa+uO/VyPpBvXqiA4ENCN9Jmf6yXtirIranCeJcm+jAuSA=="; - }; - }; - "@expo/eas-build-job-1.0.46" = { + "@expo/eas-build-job-1.0.48" = { name = "_at_expo_slash_eas-build-job"; packageName = "@expo/eas-build-job"; - version = "1.0.46"; + version = "1.0.48"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/eas-build-job/-/eas-build-job-1.0.46.tgz"; - sha512 = "f1KE3t8uvMKPSVVphXlJ70/zn5wMFB47yYM3orVZiirq2pd/0UfWYF5YiNktgEyGglxqmq3gNV06H9pEDTUJew=="; + url = "https://registry.npmjs.org/@expo/eas-build-job/-/eas-build-job-1.0.48.tgz"; + sha512 = "44N9fKrur7xOtY8DnHcFEzJTPenOBUkfpNous4xziG8u58oXvlraiNaTSi++4EpFfsBS3U+jQAW9UMlJqfu8WA=="; }; }; - "@expo/eas-json-5.5.0" = { + "@expo/eas-json-5.7.0" = { name = "_at_expo_slash_eas-json"; packageName = "@expo/eas-json"; - version = "5.5.0"; + version = "5.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/eas-json/-/eas-json-5.5.0.tgz"; - sha512 = "sQ/huismlHpWEJ1X1sqFu9NOH2SxqUFfXAhy87UqyTPvNfi+8FSPu20Vmq/4vfi9B+Avil14OhtZn/qiHarIBw=="; + url = "https://registry.npmjs.org/@expo/eas-json/-/eas-json-5.7.0.tgz"; + sha512 = "JNg1vXZzQPxGmvq3BoP40b6k49KWaysNSLpJhGFGy5oHhIC7BOI5P0yTCSdluxhd0Rq5oLc03tnYbqoFGWUT8g=="; }; }; "@expo/fingerprint-0.4.0" = { @@ -5953,24 +6160,6 @@ let sha512 = "97bYxNaDe/+GCUAKu0V2qudQmR3NFRnv3SrQd2FTtOAa9OWKwkvoBs2WzT7MkNwP4DIpYL6W/e3CSfShfhzEMw=="; }; }; - "@homebridge/ciao-1.1.7" = { - name = "_at_homebridge_slash_ciao"; - packageName = "@homebridge/ciao"; - version = "1.1.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@homebridge/ciao/-/ciao-1.1.7.tgz"; - sha512 = "q8XRDFn2peboPHGV+wbLCpp52anKiZsoNHZGA+t3I2iJ0/Qn+/8YNO0ILiJnPlVYos6fHceYiL75fhNIISTBRg=="; - }; - }; - "@hpcc-js/wasm-2.13.1" = { - name = "_at_hpcc-js_slash_wasm"; - packageName = "@hpcc-js/wasm"; - version = "2.13.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@hpcc-js/wasm/-/wasm-2.13.1.tgz"; - sha512 = "dJO0VQZFtUcqledAAU8b0yCw3HdkIVyrNjv8sAwdhDcOMRKdaNumi7Punj39u5h2CpdMN4g6I4gp584g/zVSzA=="; - }; - }; "@hpcc-js/wasm-2.14.1" = { name = "_at_hpcc-js_slash_wasm"; packageName = "@hpcc-js/wasm"; @@ -6061,40 +6250,40 @@ let sha512 = "trnsAYxU3xnS1gPHPyU961coFyLkh4gAD/0zQ5mymY4yOZ+CYvsPqUbOFSw0aDM4y0tV7tiFxL/1XfXPNC6IPg=="; }; }; - "@ibm-cloud/openapi-ruleset-0.45.5" = { + "@ibm-cloud/openapi-ruleset-1.14.2" = { name = "_at_ibm-cloud_slash_openapi-ruleset"; packageName = "@ibm-cloud/openapi-ruleset"; - version = "0.45.5"; + version = "1.14.2"; src = fetchurl { - url = "https://registry.npmjs.org/@ibm-cloud/openapi-ruleset/-/openapi-ruleset-0.45.5.tgz"; - sha512 = "8FqJQj8osll6iLOD5JsFWR+kOU1HbCp1Z2PjHeE67Wb/srz7V9B+YyjZOO9QAgLLHwvgt07XS13FQ+ArNNetGg=="; + url = "https://registry.npmjs.org/@ibm-cloud/openapi-ruleset/-/openapi-ruleset-1.14.2.tgz"; + sha512 = "ovB/kc5Rg1/69AUrEVb0R1spvvqvQpLm5rQUEQ92VyKokBDk8YnTP4H7sb/Xta1yoUR2Rcq+GMkwv15O9OE+qg=="; }; }; - "@ibm-cloud/openapi-ruleset-utilities-0.0.1" = { + "@ibm-cloud/openapi-ruleset-utilities-1.3.0" = { name = "_at_ibm-cloud_slash_openapi-ruleset-utilities"; packageName = "@ibm-cloud/openapi-ruleset-utilities"; - version = "0.0.1"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ibm-cloud/openapi-ruleset-utilities/-/openapi-ruleset-utilities-0.0.1.tgz"; - sha512 = "LBWf21EYmOJnM4azYPM4LsNbiH9GBK8rc1dwmDhuUELI43dEOGWSs2ateLn8/E9vyrVELGwQ1Y3Bu61YHa8kaA=="; + url = "https://registry.npmjs.org/@ibm-cloud/openapi-ruleset-utilities/-/openapi-ruleset-utilities-1.3.0.tgz"; + sha512 = "CuG5u6+gSEbU8IKGZqKH+WsH4rFU9KMYriDzG6F+DJ8XbtEd3RTHWMQdAeO/ec2XiyPF2j4VxWEXMzVZJ05bAA=="; }; }; - "@inquirer/checkbox-1.4.0" = { + "@inquirer/checkbox-1.5.0" = { name = "_at_inquirer_slash_checkbox"; packageName = "@inquirer/checkbox"; - version = "1.4.0"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@inquirer/checkbox/-/checkbox-1.4.0.tgz"; - sha512 = "7YcekwCvMTjrgjUursrH6AGZUSPw7gKPMvp0VhM3iq9mL46a7AeCfOTQTW0UPeiIfWmZK8wHyAD6wIhfDyLHpw=="; + url = "https://registry.npmjs.org/@inquirer/checkbox/-/checkbox-1.5.0.tgz"; + sha512 = "3cKJkW1vIZAs4NaS0reFsnpAjP0azffYII4I2R7PTI7ZTMg5Y1at4vzXccOH3762b2c2L4drBhpJpf9uiaGNxA=="; }; }; - "@inquirer/confirm-2.0.14" = { + "@inquirer/confirm-2.0.15" = { name = "_at_inquirer_slash_confirm"; packageName = "@inquirer/confirm"; - version = "2.0.14"; + version = "2.0.15"; src = fetchurl { - url = "https://registry.npmjs.org/@inquirer/confirm/-/confirm-2.0.14.tgz"; - sha512 = "Elzo5VX5lO1q9xy8CChDtDQNVLaucufdZBAM12qdfX1L3NQ+TypnZytGmWDXHBTpBTwuhEuwxNvUw7B0HCURkw=="; + url = "https://registry.npmjs.org/@inquirer/confirm/-/confirm-2.0.15.tgz"; + sha512 = "hj8Q/z7sQXsF0DSpLQZVDhWYGN6KLM/gNjjqGkpKwBzljbQofGjn0ueHADy4HUY+OqDHmXuwk/bY+tZyIuuB0w=="; }; }; "@inquirer/core-2.3.1" = { @@ -6106,49 +6295,49 @@ let sha512 = "faYAYnIfdEuns3jGKykaog5oUqFiEVbCx9nXGZfUhyEEpKcHt5bpJfZTb3eOBQKo8I/v4sJkZeBHmFlSZQuBCw=="; }; }; - "@inquirer/core-5.1.0" = { + "@inquirer/core-5.1.1" = { name = "_at_inquirer_slash_core"; packageName = "@inquirer/core"; - version = "5.1.0"; + version = "5.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@inquirer/core/-/core-5.1.0.tgz"; - sha512 = "EVnific72BhMOMo8mElvrYhGFWJZ73X6j0I+fITIPTsdAz6Z9A3w3csKy+XaH87/5QAEIQHR7RSCVXvQpIqNdQ=="; + url = "https://registry.npmjs.org/@inquirer/core/-/core-5.1.1.tgz"; + sha512 = "IuJyZQUg75+L5AmopgnzxYrgcU6PJKL0hoIs332G1Gv55CnmZrhG6BzNOeZ5sOsTi1YCGOopw4rYICv74ejMFg=="; }; }; - "@inquirer/editor-1.2.12" = { + "@inquirer/editor-1.2.13" = { name = "_at_inquirer_slash_editor"; packageName = "@inquirer/editor"; - version = "1.2.12"; + version = "1.2.13"; src = fetchurl { - url = "https://registry.npmjs.org/@inquirer/editor/-/editor-1.2.12.tgz"; - sha512 = "Y7zXQqcglPbbPkx0DPwx6HQFstJR5uex4hoQprjpdxSj8+Bf04+Og6mK/FNxoQbPvoNecegtmMGxDC+hVcMJZA=="; + url = "https://registry.npmjs.org/@inquirer/editor/-/editor-1.2.13.tgz"; + sha512 = "gBxjqt0B9GLN0j6M/tkEcmcIvB2fo9Cw0f5NRqDTkYyB9AaCzj7qvgG0onQ3GVPbMyMbbP4tWYxrBOaOdKpzNA=="; }; }; - "@inquirer/expand-1.1.13" = { + "@inquirer/expand-1.1.14" = { name = "_at_inquirer_slash_expand"; packageName = "@inquirer/expand"; - version = "1.1.13"; + version = "1.1.14"; src = fetchurl { - url = "https://registry.npmjs.org/@inquirer/expand/-/expand-1.1.13.tgz"; - sha512 = "/+7CGCa7iyJIpli0NtukEAjSI7+wGgjYzsByLVSSAk3U696ZlCCP6iPtsWx6d1qfmaMmCzejcjylOj6OAeu4bA=="; + url = "https://registry.npmjs.org/@inquirer/expand/-/expand-1.1.14.tgz"; + sha512 = "yS6fJ8jZYAsxdxuw2c8XTFMTvMR1NxZAw3LxDaFnqh7BZ++wTQ6rSp/2gGJhMacdZ85osb+tHxjVgx7F+ilv5g=="; }; }; - "@inquirer/input-1.2.13" = { + "@inquirer/input-1.2.14" = { name = "_at_inquirer_slash_input"; packageName = "@inquirer/input"; - version = "1.2.13"; + version = "1.2.14"; src = fetchurl { - url = "https://registry.npmjs.org/@inquirer/input/-/input-1.2.13.tgz"; - sha512 = "gALuvSpZRYfqygPjlYWodMZ4TXwALvw7Pk4tRFhE1oMN79rLVlg88Z/X6JCUh+uV2qLaxxgbeP+cgPWTvuWsCg=="; + url = "https://registry.npmjs.org/@inquirer/input/-/input-1.2.14.tgz"; + sha512 = "tISLGpUKXixIQue7jypNEShrdzJoLvEvZOJ4QRsw5XTfrIYfoWFqAjMQLerGs9CzR86yAI89JR6snHmKwnNddw=="; }; }; - "@inquirer/password-1.1.13" = { + "@inquirer/password-1.1.14" = { name = "_at_inquirer_slash_password"; packageName = "@inquirer/password"; - version = "1.1.13"; + version = "1.1.14"; src = fetchurl { - url = "https://registry.npmjs.org/@inquirer/password/-/password-1.1.13.tgz"; - sha512 = "6STGbL4Vm6ohE2yDBOSENCpCeywnvPux5psZVpvblGDop1oPiZkdsVI+NhsA0c4BE6YT0fNVK8Oqxf5Dgt5k7g=="; + url = "https://registry.npmjs.org/@inquirer/password/-/password-1.1.14.tgz"; + sha512 = "vL2BFxfMo8EvuGuZYlryiyAB3XsgtbxOcFs4H9WI9szAS/VZCAwdVqs8rqEeaAf/GV/eZOghIOYxvD91IsRWSg=="; }; }; "@inquirer/prompts-2.3.1" = { @@ -6160,22 +6349,22 @@ let sha512 = "YQeBFzIE+6fcec5N/U2mSz+IcKEG4wtGDwF7MBLIDgITWzB3o723JpKJ1rxWqdCvTXkYE+gDXK/seSN6omo3DQ=="; }; }; - "@inquirer/rawlist-1.2.13" = { + "@inquirer/rawlist-1.2.14" = { name = "_at_inquirer_slash_rawlist"; packageName = "@inquirer/rawlist"; - version = "1.2.13"; + version = "1.2.14"; src = fetchurl { - url = "https://registry.npmjs.org/@inquirer/rawlist/-/rawlist-1.2.13.tgz"; - sha512 = "f+bASrCY2x2F90MrBYX7nUSetL6FsVLfskhGWEyVwj6VIXzc9T878z3v7KU3V10D1trWrCVHOdeqEcbnO68yhg=="; + url = "https://registry.npmjs.org/@inquirer/rawlist/-/rawlist-1.2.14.tgz"; + sha512 = "xIYmDpYgfz2XGCKubSDLKEvadkIZAKbehHdWF082AyC2I4eHK44RUfXaoOAqnbqItZq4KHXS6jDJ78F2BmQvxg=="; }; }; - "@inquirer/select-1.3.0" = { + "@inquirer/select-1.3.1" = { name = "_at_inquirer_slash_select"; packageName = "@inquirer/select"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@inquirer/select/-/select-1.3.0.tgz"; - sha512 = "3sL5odCDYI+i+piAFqFa5ULDUKEpc0U1zEY4Wm6gjP6nMAHWM8r1UzMlpQXCyHny91Tz+oeSLeKinAde0z6R7w=="; + url = "https://registry.npmjs.org/@inquirer/select/-/select-1.3.1.tgz"; + sha512 = "EgOPHv7XOHEqiBwBJTyiMg9r57ySyW4oyYCumGp+pGyOaXQaLb2kTnccWI6NFd9HSi5kDJhF7YjA+3RfMQJ2JQ=="; }; }; "@inquirer/type-1.1.5" = { @@ -6718,15 +6907,6 @@ let sha512 = "qtLGzCNzPVJ3kdH6/zoLWDPjauHIKiLSBAR71Wa0+PWvGA8wODUQvRgxtpUA5YqAYL3CQ8S4qXhd/9WuWTZirg=="; }; }; - "@jsii/check-node-1.90.0" = { - name = "_at_jsii_slash_check-node"; - packageName = "@jsii/check-node"; - version = "1.90.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@jsii/check-node/-/check-node-1.90.0.tgz"; - sha512 = "bHrSs/X0mX6rVgBySk6JB/VYiqIV0HkznthZ4lpLabrgTEistwBYXxTf1kgNzfmUbIt0EeETwxdLAY0sqHE/+A=="; - }; - }; "@jsii/check-node-1.91.0" = { name = "_at_jsii_slash_check-node"; packageName = "@jsii/check-node"; @@ -6799,13 +6979,13 @@ let sha512 = "XPIN3cYDXsoJI/oDWoR2tD++juVrhgIago9xyKhZ7IhGlzdDM9QgC8D8saKNCz5pindGcznFr2HBSsEQSWnSjw=="; }; }; - "@lezer/lr-1.3.13" = { + "@lezer/lr-1.3.14" = { name = "_at_lezer_slash_lr"; packageName = "@lezer/lr"; - version = "1.3.13"; + version = "1.3.14"; src = fetchurl { - url = "https://registry.npmjs.org/@lezer/lr/-/lr-1.3.13.tgz"; - sha512 = "RLAbau/4uSzKgIKj96mI5WUtG1qtiR0Frn0Ei9zhPj8YOkHM+1Bb8SgdVvmR/aWJCFIzjo2KFnDiRZ75Xf5NdQ=="; + url = "https://registry.npmjs.org/@lezer/lr/-/lr-1.3.14.tgz"; + sha512 = "z5mY4LStlA3yL7aHT/rqgG614cfcvklS+8oFRFBYrs4YaWLJyKKM4+nN6KopToX0o9Hj6zmH6M5kinOYuy06ug=="; }; }; "@ljharb/through-2.3.11" = { @@ -7123,6 +7303,15 @@ let sha512 = "/fQjIbuNVIT/PbXvw178Tm97bxV0E0nVUFKHivMKtSI2pcs8xKdaWkHJxf9dTI0G/y5hp/KuCvgcUu5HwAtI1w=="; }; }; + "@npmcli/config-8.0.1" = { + name = "_at_npmcli_slash_config"; + packageName = "@npmcli/config"; + version = "8.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@npmcli/config/-/config-8.0.1.tgz"; + sha512 = "NKGmMYv/YTLwJr+qK9CvADSe82NTM9AFwFFpsZpVcPCT3XTdxvJBdXi8xvXWjHSCMb0Cb+7FtU/a5qqguCOhxA=="; + }; + }; "@npmcli/fs-1.1.1" = { name = "_at_npmcli_slash_fs"; packageName = "@npmcli/fs"; @@ -7159,6 +7348,15 @@ let sha512 = "9hwoB3gStVfa0N31ymBmrX+GuDGdVA/QWShZVqE0HK2Af+7QGGrCTbZia/SW0ImUTjTne7SP91qxDmtXvDHRPQ=="; }; }; + "@npmcli/git-5.0.3" = { + name = "_at_npmcli_slash_git"; + packageName = "@npmcli/git"; + version = "5.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@npmcli/git/-/git-5.0.3.tgz"; + sha512 = "UZp9NwK+AynTrKvHn5k3KviW/hA5eENmFsu3iAPe7sWRt0lFUdsY/wXIYjpDFe7cdSNwOIzbObfwgt6eL5/2zw=="; + }; + }; "@npmcli/installed-package-contents-2.0.2" = { name = "_at_npmcli_slash_installed-package-contents"; packageName = "@npmcli/installed-package-contents"; @@ -7222,6 +7420,15 @@ let sha512 = "gGq0NJkIGSwdbUt4yhdF8ZrmkGKVz9vAdVzpOfnom+V8PLSmSOVhZwbNvZZS1EYcJN5hzzKBxmmVVAInM6HQLg=="; }; }; + "@npmcli/promise-spawn-7.0.0" = { + name = "_at_npmcli_slash_promise-spawn"; + packageName = "@npmcli/promise-spawn"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@npmcli/promise-spawn/-/promise-spawn-7.0.0.tgz"; + sha512 = "wBqcGsMELZna0jDblGd7UXgOby45TQaMWmbFwWX+SEotk4HV6zG2t6rT9siyLhPk4P6YYqgfL1UO8nMWDBVJXQ=="; + }; + }; "@npmcli/run-script-6.0.2" = { name = "_at_npmcli_slash_run-script"; packageName = "@npmcli/run-script"; @@ -7231,6 +7438,15 @@ let sha512 = "NCcr1uQo1k5U+SYlnIrbAh3cxy+OQT1VtqiAbxdymSlptbzBb62AjH2xXgjNCoP073hoa1CfCAcwoZ8k96C4nA=="; }; }; + "@npmcli/run-script-7.0.2" = { + name = "_at_npmcli_slash_run-script"; + packageName = "@npmcli/run-script"; + version = "7.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@npmcli/run-script/-/run-script-7.0.2.tgz"; + sha512 = "Omu0rpA8WXvcGeY6DDzyRoY1i5DkCBkzyJ+m2u7PD6quzb0TvSqdIPOkTn8ZBOj7LbbcbMfZ3c5skwSu6m8y2w=="; + }; + }; "@nrwl/devkit-16.10.0" = { name = "_at_nrwl_slash_devkit"; packageName = "@nrwl/devkit"; @@ -7789,6 +8005,15 @@ let sha512 = "OWlrQAnWn9577PhVgqjUvMr1pg57Bc4jv0iL4w0PRuOSRvq67rvHW9Ie/dZVMvCzhSCB+UxhcY/PmCmFj33Q+g=="; }; }; + "@opentelemetry/api-1.7.0" = { + name = "_at_opentelemetry_slash_api"; + packageName = "@opentelemetry/api"; + version = "1.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@opentelemetry/api/-/api-1.7.0.tgz"; + sha512 = "AdY5wvN0P2vXBi3b29hxZgSFvdhdxPB9+f0B6s//P9Q8nibRWeA3cHm8UmLpio9ABigkVHJ5NMPk+Mz8VCCyrw=="; + }; + }; "@opentelemetry/api-logs-0.43.0" = { name = "_at_opentelemetry_slash_api-logs"; packageName = "@opentelemetry/api-logs"; @@ -7816,6 +8041,15 @@ let sha512 = "I6LrZvl1FF97FQXPR0iieWQmKnGxYtMbWA1GrAXnLUR+B1Hn2m8KqQNEIlZAucyv00GBgpWkpllmULmZfG8P3g=="; }; }; + "@opentelemetry/core-1.18.1" = { + name = "_at_opentelemetry_slash_core"; + packageName = "@opentelemetry/core"; + version = "1.18.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@opentelemetry/core/-/core-1.18.1.tgz"; + sha512 = "kvnUqezHMhsQvdsnhnqTNfAJs3ox/isB0SVrM1dhVFw7SsB7TstuVa6fgWnN2GdPyilIFLUvvbTZoVRmx6eiRg=="; + }; + }; "@opentelemetry/exporter-metrics-otlp-http-0.43.0" = { name = "_at_opentelemetry_slash_exporter-metrics-otlp-http"; packageName = "@opentelemetry/exporter-metrics-otlp-http"; @@ -7825,6 +8059,15 @@ let sha512 = "k0KHKLS/xEWI4e5xrsnHpRk7Adj7JSFbFeKF4ti1d9soek3y85ZC2fTzDQC+ysUYo/lccoAXGR/gjcYgQOe7pg=="; }; }; + "@opentelemetry/instrumentation-0.41.2" = { + name = "_at_opentelemetry_slash_instrumentation"; + packageName = "@opentelemetry/instrumentation"; + version = "0.41.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@opentelemetry/instrumentation/-/instrumentation-0.41.2.tgz"; + sha512 = "rxU72E0pKNH6ae2w5+xgVYZLzc5mlxAbGzF4shxMVK8YC2QQsfN38B2GPbj0jvrKWWNUElfclQ+YTykkNg/grw=="; + }; + }; "@opentelemetry/otlp-exporter-base-0.43.0" = { name = "_at_opentelemetry_slash_otlp-exporter-base"; packageName = "@opentelemetry/otlp-exporter-base"; @@ -7861,6 +8104,15 @@ let sha512 = "M2e5emqg5I7qRKqlzKx0ROkcPyF8PbcSaWEdsm72od9txP7Z/Pl8PDYOyu80xWvbHAWk5mDxOF6v3vNdifzclA=="; }; }; + "@opentelemetry/resources-1.18.1" = { + name = "_at_opentelemetry_slash_resources"; + packageName = "@opentelemetry/resources"; + version = "1.18.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@opentelemetry/resources/-/resources-1.18.1.tgz"; + sha512 = "JjbcQLYMttXcIabflLRuaw5oof5gToYV9fuXbcsoOeQ0BlbwUn6DAZi++PNsSz2jjPeASfDls10iaO/8BRIPRA=="; + }; + }; "@opentelemetry/sdk-logs-0.43.0" = { name = "_at_opentelemetry_slash_sdk-logs"; packageName = "@opentelemetry/sdk-logs"; @@ -7897,13 +8149,13 @@ let sha512 = "2T5HA1/1iE36Q9eg6D4zYlC4Y4GcycI1J6NsHPKZY9oWfAxWsoYnRlkPfUqyY5XVtocCo/xHpnJvGNHwzT70oQ=="; }; }; - "@opentelemetry/sdk-trace-base-1.17.1" = { + "@opentelemetry/sdk-trace-base-1.18.1" = { name = "_at_opentelemetry_slash_sdk-trace-base"; packageName = "@opentelemetry/sdk-trace-base"; - version = "1.17.1"; + version = "1.18.1"; src = fetchurl { - url = "https://registry.npmjs.org/@opentelemetry/sdk-trace-base/-/sdk-trace-base-1.17.1.tgz"; - sha512 = "pfSJJSjZj5jkCJUQZicSpzN8Iz9UKMryPWikZRGObPnJo6cUSoKkjZh6BM3j+D47G4olMBN+YZKYqkFM1L6zNA=="; + url = "https://registry.npmjs.org/@opentelemetry/sdk-trace-base/-/sdk-trace-base-1.18.1.tgz"; + sha512 = "tRHfDxN5dO+nop78EWJpzZwHsN1ewrZRVVwo03VJa3JQZxToRDH29/+MB24+yoa+IArerdr7INFJiX/iN4gjqg=="; }; }; "@opentelemetry/semantic-conventions-1.17.0" = { @@ -7924,67 +8176,76 @@ let sha512 = "xbR2U+2YjauIuo42qmE8XyJK6dYeRMLJuOlUP5SO4auET4VtOHOzgkRVOq+Ik18N+Xf3YPcqJs9dZMiDddz1eQ=="; }; }; - "@orval/angular-6.19.1" = { + "@opentelemetry/semantic-conventions-1.18.1" = { + name = "_at_opentelemetry_slash_semantic-conventions"; + packageName = "@opentelemetry/semantic-conventions"; + version = "1.18.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-1.18.1.tgz"; + sha512 = "+NLGHr6VZwcgE/2lw8zDIufOCGnzsA5CbQIMleXZTrgkBd0TanCX+MiDYJ1TOS4KL/Tqk0nFRxawnaYr6pkZkA=="; + }; + }; + "@orval/angular-6.20.0" = { name = "_at_orval_slash_angular"; packageName = "@orval/angular"; - version = "6.19.1"; + version = "6.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/@orval/angular/-/angular-6.19.1.tgz"; - sha512 = "8yd1Z75r8VBFFfednXz3eEIrVeEZX+HF6urH0t9EfifJBmO62kSwtJop3UoR3WXq6J4m+ck3nZ4lR9oJ7LeL9g=="; + url = "https://registry.npmjs.org/@orval/angular/-/angular-6.20.0.tgz"; + sha512 = "BXrK9NCFRw4+IbJUz30npAZQRPG3vpwHcf+tYiwAhFDJQVQOQy4429hLNBc2xPxsCilSQdQ1/by6AaVcTLe3VA=="; }; }; - "@orval/axios-6.19.1" = { + "@orval/axios-6.20.0" = { name = "_at_orval_slash_axios"; packageName = "@orval/axios"; - version = "6.19.1"; + version = "6.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/@orval/axios/-/axios-6.19.1.tgz"; - sha512 = "yV8da4UYoR3OnyqIkj8+b4SSO29e+zLSksKtcHST5DNxwx+wV23DLY9/kdQ286WjSkkQp16hK2XGXMg0cJMtBg=="; + url = "https://registry.npmjs.org/@orval/axios/-/axios-6.20.0.tgz"; + sha512 = "Dfno2JM2FBKEVlcsI45FfoN6Cygv+Mz6VcXs6ptb+Biy9aUZ5XlWByFwIF/U7XFjV4bWBb6PJHDeBq4dlpplvQ=="; }; }; - "@orval/core-6.19.1" = { + "@orval/core-6.20.0" = { name = "_at_orval_slash_core"; packageName = "@orval/core"; - version = "6.19.1"; + version = "6.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/@orval/core/-/core-6.19.1.tgz"; - sha512 = "EoHT+MkFL4+sKxi9bKxL0rEWplE3Nls+fp+dhySnCHyRqkV4OXxdBxQd6SawHJqRue1+RvFyEaKGCc2zwe6CPA=="; + url = "https://registry.npmjs.org/@orval/core/-/core-6.20.0.tgz"; + sha512 = "piX1w6wJSK6FYT1YCG8LCM7rraN3EQ0CUtKIi20UJ7EGBH7ss4OvHRSZMw81SER8zZ4uXlSdGFn5EQ9+8AkD1A=="; }; }; - "@orval/msw-6.19.1" = { + "@orval/msw-6.20.0" = { name = "_at_orval_slash_msw"; packageName = "@orval/msw"; - version = "6.19.1"; + version = "6.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/@orval/msw/-/msw-6.19.1.tgz"; - sha512 = "cE9Ix6W7a4brzytGuKH0IpcWljmznMbnEQf5+M7zfi6T7dQnc0cSmiNJW2kKgfO2hQqDJMoeXo3BA2eaKODpyQ=="; + url = "https://registry.npmjs.org/@orval/msw/-/msw-6.20.0.tgz"; + sha512 = "0BGgM97HDv6gfZ9dtcdWx7MBTy/+Mjc5GbG5NE3gmRIl+A7QMRx0vB+0SDMhxg/eKmYNwruxpJeQWAkYHnClNA=="; }; }; - "@orval/query-6.19.1" = { + "@orval/query-6.20.0" = { name = "_at_orval_slash_query"; packageName = "@orval/query"; - version = "6.19.1"; + version = "6.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/@orval/query/-/query-6.19.1.tgz"; - sha512 = "v2CSqLkPZePwytkQOazIvSPm8VZcZfSCt8zt2J1EiieJGSRZP2G9wA6nZdr3IVpiXUhq3R8xDg9Y8xO/VhoNlQ=="; + url = "https://registry.npmjs.org/@orval/query/-/query-6.20.0.tgz"; + sha512 = "dZ10Mb9qIcIh83OjrjjWtzpQulHQMyYZgX7yG2YIp1MZ2GHEQdJTHgLe8CdnXB9LJqo2En0DzXSZZdWdxYqfHA=="; }; }; - "@orval/swr-6.19.1" = { + "@orval/swr-6.20.0" = { name = "_at_orval_slash_swr"; packageName = "@orval/swr"; - version = "6.19.1"; + version = "6.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/@orval/swr/-/swr-6.19.1.tgz"; - sha512 = "CSkg/H6rpbX0JZ9QDOJLAyqf5//BA+ycdqAFGnL4TOAgN8z2AGeu1EqWyQc4Ls1YJIcLlzdrYE2poCT9KH1Weg=="; + url = "https://registry.npmjs.org/@orval/swr/-/swr-6.20.0.tgz"; + sha512 = "6TnG72/evQTMoQ+LoVyF/BF4/issxuvpVWJQPKzsrYnyAP5mdyMyTSTmp85R+72VodB00DD6jHdlTu8Rd0NaQw=="; }; }; - "@orval/zod-6.19.1" = { + "@orval/zod-6.20.0" = { name = "_at_orval_slash_zod"; packageName = "@orval/zod"; - version = "6.19.1"; + version = "6.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/@orval/zod/-/zod-6.19.1.tgz"; - sha512 = "A2LqEEM1eHusITeFXsQFNhVjXR5mg2oIwjQRmjJdCZ98HlZpMoO6opEURUTF2qNtREI8HrjEyN7mUNIcLxrDyA=="; + url = "https://registry.npmjs.org/@orval/zod/-/zod-6.20.0.tgz"; + sha512 = "6fDfyHEBG/23h3ZTcQ26JFSgj6zJgnhYwZEr1B+zBpLewOYuOo8UAVWvVBLZGg1Mba1KDOmSj8Vfbaug7sGVXg=="; }; }; "@parcel/bundler-default-2.10.2" = { @@ -8977,13 +9238,13 @@ let sha512 = "mrfKqIHnSZRyIzBcanNJmVQELTnX+qagEDlcKO90RgRBVOZGSGvZKeDihTRfWcqoDn5N/NkUcwWTccnpN18Tfg=="; }; }; - "@repeaterjs/repeater-3.0.4" = { + "@repeaterjs/repeater-3.0.5" = { name = "_at_repeaterjs_slash_repeater"; packageName = "@repeaterjs/repeater"; - version = "3.0.4"; + version = "3.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@repeaterjs/repeater/-/repeater-3.0.4.tgz"; - sha512 = "AW8PKd6iX3vAZ0vA43nOUOnbq/X5ihgU+mSXXqunMkeQADGiqw/PY0JNeYtD5sr0PAy51YPgAPbDoeapv9r8WA=="; + url = "https://registry.npmjs.org/@repeaterjs/repeater/-/repeater-3.0.5.tgz"; + sha512 = "l3YHBLAol6d/IKnB9LhpD0cEZWAoe3eFKUyTYWmFmCO2Q/WOckxLQAUyMZWwZV2M/m3+4vgRoaolFqaII82/TA=="; }; }; "@resvg/resvg-js-2.6.0" = { @@ -9103,24 +9364,6 @@ let sha512 = "8lJlghb+Unki5AyKgsnFbRJwkEj9r1NpwyuBG8yEJiG1W9eEGl03R3I7bsVa3haof/3J1NlWf0rzSa1G++A2iw=="; }; }; - "@rollup/plugin-commonjs-22.0.2" = { - name = "_at_rollup_slash_plugin-commonjs"; - packageName = "@rollup/plugin-commonjs"; - version = "22.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-22.0.2.tgz"; - sha512 = "//NdP6iIwPbMTcazYsiBMbJW7gfmpHom33u1beiIoHDEM0Q9clvtQB1T0efvMqHeKsGohiHo97BCPCkBXdscwg=="; - }; - }; - "@rollup/pluginutils-3.1.0" = { - name = "_at_rollup_slash_pluginutils"; - packageName = "@rollup/pluginutils"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-3.1.0.tgz"; - sha512 = "GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg=="; - }; - }; "@rollup/pluginutils-4.2.1" = { name = "_at_rollup_slash_pluginutils"; packageName = "@rollup/pluginutils"; @@ -9247,13 +9490,13 @@ let sha512 = "c/qwwcHyafOQuVQJj0IlBjf5yYgBI7YPJ77k4fOJYesb41jio65eaJODRUmfYKhTOFBrIZ66kgvGPlNbjuoRdQ=="; }; }; - "@schematics/angular-16.2.9" = { + "@schematics/angular-17.0.0" = { name = "_at_schematics_slash_angular"; packageName = "@schematics/angular"; - version = "16.2.9"; + version = "17.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/angular/-/angular-16.2.9.tgz"; - sha512 = "uiU2YbZRVHgk1N1DDsek/5CKhfpZ8myJYNJk8eHV5LswnXOP3aqvH23VhneaAgOYwK5fISC7eMG0pLVKMvFfZQ=="; + url = "https://registry.npmjs.org/@schematics/angular/-/angular-17.0.0.tgz"; + sha512 = "9jKU5x/WzaBsfSkUowK1X74FqtMXa6+A60XgW4ACO8i6fwKfPeS+tIrAieeYOX80/njBh7I5CvcpHmWA2SbcXQ=="; }; }; "@scure/base-1.1.3" = { @@ -9310,193 +9553,49 @@ let sha512 = "P33hHGdldxGabLFjPPpaTxVolMrzrcegejx+0GxjrIb9Zv48D8yAIA/QTDR2dFl7Uz7urX8aX6+5bCZslr+gWQ=="; }; }; - "@sentry-internal/tracing-7.77.0" = { + "@sentry-internal/tracing-7.80.0" = { name = "_at_sentry-internal_slash_tracing"; packageName = "@sentry-internal/tracing"; - version = "7.77.0"; + version = "7.80.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry-internal/tracing/-/tracing-7.77.0.tgz"; - sha512 = "8HRF1rdqWwtINqGEdx8Iqs9UOP/n8E0vXUu3Nmbqj4p5sQPA7vvCfq+4Y4rTqZFc7sNdFpDsRION5iQEh8zfZw=="; + url = "https://registry.npmjs.org/@sentry-internal/tracing/-/tracing-7.80.0.tgz"; + sha512 = "P1Ab9gamHLsbH9D82i1HY8xfq9dP8runvc4g50AAd6OXRKaJ45f2KGRZUmnMEVqBQ7YoPYp2LFMkrhNYbcZEoQ=="; }; }; - "@sentry/core-7.77.0" = { + "@sentry/core-7.80.0" = { name = "_at_sentry_slash_core"; packageName = "@sentry/core"; - version = "7.77.0"; + version = "7.80.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry/core/-/core-7.77.0.tgz"; - sha512 = "Tj8oTYFZ/ZD+xW8IGIsU6gcFXD/gfE+FUxUaeSosd9KHwBQNOLhZSsYo/tTVf/rnQI/dQnsd4onPZLiL+27aTg=="; + url = "https://registry.npmjs.org/@sentry/core/-/core-7.80.0.tgz"; + sha512 = "nJiiymdTSEyI035/rdD3VOq6FlOZ2wWLR5bit9LK8a3rzHU3UXkwScvEo6zYgs0Xp1sC0yu1S9+0BEiYkmi29A=="; }; }; - "@sentry/node-7.77.0" = { + "@sentry/node-7.80.0" = { name = "_at_sentry_slash_node"; packageName = "@sentry/node"; - version = "7.77.0"; + version = "7.80.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry/node/-/node-7.77.0.tgz"; - sha512 = "Ob5tgaJOj0OYMwnocc6G/CDLWC7hXfVvKX/ofkF98+BbN/tQa5poL+OwgFn9BA8ud8xKzyGPxGU6LdZ8Oh3z/g=="; + url = "https://registry.npmjs.org/@sentry/node/-/node-7.80.0.tgz"; + sha512 = "J35fqe8J5ac/17ZXT0ML3opYGTOclqYNE9Sybs1y9n6BqacHyzH8By72YrdI03F7JJDHwrcGw+/H8hGpkCwi0Q=="; }; }; - "@sentry/types-7.77.0" = { + "@sentry/types-7.80.0" = { name = "_at_sentry_slash_types"; packageName = "@sentry/types"; - version = "7.77.0"; + version = "7.80.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry/types/-/types-7.77.0.tgz"; - sha512 = "nfb00XRJVi0QpDHg+JkqrmEBHsqBnxJu191Ded+Cs1OJ5oPXEW6F59LVcBScGvMqe+WEk1a73eH8XezwfgrTsA=="; + url = "https://registry.npmjs.org/@sentry/types/-/types-7.80.0.tgz"; + sha512 = "4bpMO+2jWiWLDa8zbTASWWNLWe6yhjfPsa7/6VH5y9x1NGtL8oRbqUsTgsvjF3nmeHEMkHQsC8NHPaQ/ibFmZQ=="; }; }; - "@sentry/utils-7.77.0" = { + "@sentry/utils-7.80.0" = { name = "_at_sentry_slash_utils"; packageName = "@sentry/utils"; - version = "7.77.0"; + version = "7.80.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry/utils/-/utils-7.77.0.tgz"; - sha512 = "NmM2kDOqVchrey3N5WSzdQoCsyDkQkiRxExPaNI2oKQ/jMWHs9yt0tSy7otPBcXs0AP59ihl75Bvm1tDRcsp5g=="; - }; - }; - "@serialport/binding-mock-10.2.2" = { - name = "_at_serialport_slash_binding-mock"; - packageName = "@serialport/binding-mock"; - version = "10.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@serialport/binding-mock/-/binding-mock-10.2.2.tgz"; - sha512 = "HAFzGhk9OuFMpuor7aT5G1ChPgn5qSsklTFOTUX72Rl6p0xwcSVsRtG/xaGp6bxpN7fI9D/S8THLBWbBgS6ldw=="; - }; - }; - "@serialport/bindings-cpp-12.0.1" = { - name = "_at_serialport_slash_bindings-cpp"; - packageName = "@serialport/bindings-cpp"; - version = "12.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@serialport/bindings-cpp/-/bindings-cpp-12.0.1.tgz"; - sha512 = "r2XOwY2dDvbW7dKqSPIk2gzsr6M6Qpe9+/Ngs94fNaNlcTRCV02PfaoDmRgcubpNVVcLATlxSxPTIDw12dbKOg=="; - }; - }; - "@serialport/bindings-interface-1.2.2" = { - name = "_at_serialport_slash_bindings-interface"; - packageName = "@serialport/bindings-interface"; - version = "1.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@serialport/bindings-interface/-/bindings-interface-1.2.2.tgz"; - sha512 = "CJaUd5bLvtM9c5dmO9rPBHPXTa9R2UwpkJ0wdh9JCYcbrPWsKz+ErvR0hBLeo7NPeiFdjFO4sonRljiw4d2XiA=="; - }; - }; - "@serialport/parser-byte-length-12.0.0" = { - name = "_at_serialport_slash_parser-byte-length"; - packageName = "@serialport/parser-byte-length"; - version = "12.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@serialport/parser-byte-length/-/parser-byte-length-12.0.0.tgz"; - sha512 = "0ei0txFAj+s6FTiCJFBJ1T2hpKkX8Md0Pu6dqMrYoirjPskDLJRgZGLqoy3/lnU1bkvHpnJO+9oJ3PB9v8rNlg=="; - }; - }; - "@serialport/parser-cctalk-12.0.0" = { - name = "_at_serialport_slash_parser-cctalk"; - packageName = "@serialport/parser-cctalk"; - version = "12.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@serialport/parser-cctalk/-/parser-cctalk-12.0.0.tgz"; - sha512 = "0PfLzO9t2X5ufKuBO34DQKLXrCCqS9xz2D0pfuaLNeTkyGUBv426zxoMf3rsMRodDOZNbFblu3Ae84MOQXjnZw=="; - }; - }; - "@serialport/parser-delimiter-11.0.0" = { - name = "_at_serialport_slash_parser-delimiter"; - packageName = "@serialport/parser-delimiter"; - version = "11.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@serialport/parser-delimiter/-/parser-delimiter-11.0.0.tgz"; - sha512 = "aZLJhlRTjSmEwllLG7S4J8s8ctRAS0cbvCpO87smLvl3e4BgzbVgF6Z6zaJd3Aji2uSiYgfedCdNc4L6W+1E2g=="; - }; - }; - "@serialport/parser-delimiter-12.0.0" = { - name = "_at_serialport_slash_parser-delimiter"; - packageName = "@serialport/parser-delimiter"; - version = "12.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@serialport/parser-delimiter/-/parser-delimiter-12.0.0.tgz"; - sha512 = "gu26tVt5lQoybhorLTPsH2j2LnX3AOP2x/34+DUSTNaUTzu2fBXw+isVjQJpUBFWu6aeQRZw5bJol5X9Gxjblw=="; - }; - }; - "@serialport/parser-inter-byte-timeout-12.0.0" = { - name = "_at_serialport_slash_parser-inter-byte-timeout"; - packageName = "@serialport/parser-inter-byte-timeout"; - version = "12.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@serialport/parser-inter-byte-timeout/-/parser-inter-byte-timeout-12.0.0.tgz"; - sha512 = "GnCh8K0NAESfhCuXAt+FfBRz1Cf9CzIgXfp7SdMgXwrtuUnCC/yuRTUFWRvuzhYKoAo1TL0hhUo77SFHUH1T/w=="; - }; - }; - "@serialport/parser-packet-length-12.0.0" = { - name = "_at_serialport_slash_parser-packet-length"; - packageName = "@serialport/parser-packet-length"; - version = "12.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@serialport/parser-packet-length/-/parser-packet-length-12.0.0.tgz"; - sha512 = "p1hiCRqvGHHLCN/8ZiPUY/G0zrxd7gtZs251n+cfNTn+87rwcdUeu9Dps3Aadx30/sOGGFL6brIRGK4l/t7MuQ=="; - }; - }; - "@serialport/parser-readline-11.0.0" = { - name = "_at_serialport_slash_parser-readline"; - packageName = "@serialport/parser-readline"; - version = "11.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@serialport/parser-readline/-/parser-readline-11.0.0.tgz"; - sha512 = "rRAivhRkT3YO28WjmmG4FQX6L+KMb5/ikhyylRfzWPw0nSXy97+u07peS9CbHqaNvJkMhH1locp2H36aGMOEIA=="; - }; - }; - "@serialport/parser-readline-12.0.0" = { - name = "_at_serialport_slash_parser-readline"; - packageName = "@serialport/parser-readline"; - version = "12.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@serialport/parser-readline/-/parser-readline-12.0.0.tgz"; - sha512 = "O7cywCWC8PiOMvo/gglEBfAkLjp/SENEML46BXDykfKP5mTPM46XMaX1L0waWU6DXJpBgjaL7+yX6VriVPbN4w=="; - }; - }; - "@serialport/parser-ready-12.0.0" = { - name = "_at_serialport_slash_parser-ready"; - packageName = "@serialport/parser-ready"; - version = "12.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@serialport/parser-ready/-/parser-ready-12.0.0.tgz"; - sha512 = "ygDwj3O4SDpZlbrRUraoXIoIqb8sM7aMKryGjYTIF0JRnKeB1ys8+wIp0RFMdFbO62YriUDextHB5Um5cKFSWg=="; - }; - }; - "@serialport/parser-regex-12.0.0" = { - name = "_at_serialport_slash_parser-regex"; - packageName = "@serialport/parser-regex"; - version = "12.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@serialport/parser-regex/-/parser-regex-12.0.0.tgz"; - sha512 = "dCAVh4P/pZrLcPv9NJ2mvPRBg64L5jXuiRxIlyxxdZGH4WubwXVXY/kBTihQmiAMPxbT3yshSX8f2+feqWsxqA=="; - }; - }; - "@serialport/parser-slip-encoder-12.0.0" = { - name = "_at_serialport_slash_parser-slip-encoder"; - packageName = "@serialport/parser-slip-encoder"; - version = "12.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@serialport/parser-slip-encoder/-/parser-slip-encoder-12.0.0.tgz"; - sha512 = "0APxDGR9YvJXTRfY+uRGhzOhTpU5akSH183RUcwzN7QXh8/1jwFsFLCu0grmAUfi+fItCkR+Xr1TcNJLR13VNA=="; - }; - }; - "@serialport/parser-spacepacket-12.0.0" = { - name = "_at_serialport_slash_parser-spacepacket"; - packageName = "@serialport/parser-spacepacket"; - version = "12.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@serialport/parser-spacepacket/-/parser-spacepacket-12.0.0.tgz"; - sha512 = "dozONxhPC/78pntuxpz/NOtVps8qIc/UZzdc/LuPvVsqCoJXiRxOg6ZtCP/W58iibJDKPZPAWPGYeZt9DJxI+Q=="; - }; - }; - "@serialport/stream-12.0.0" = { - name = "_at_serialport_slash_stream"; - packageName = "@serialport/stream"; - version = "12.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@serialport/stream/-/stream-12.0.0.tgz"; - sha512 = "9On64rhzuqKdOQyiYLYv2lQOh3TZU/D3+IWCR5gk0alPel2nwpp4YwDEGiUBfrQZEdQ6xww0PWkzqth4wqwX3Q=="; + url = "https://registry.npmjs.org/@sentry/utils/-/utils-7.80.0.tgz"; + sha512 = "XbBCEl6uLvE50ftKwrEo6XWdDaZXHXu+kkHXTPWQEcnbvfZKLuG9V0Hxtxxq3xQgyWmuF05OH1GcqYqiO+v5Yg=="; }; }; "@serverless/dashboard-plugin-7.1.0" = { @@ -9535,22 +9634,22 @@ let sha512 = "7eDbqKv/OBd11jjdZjUwFGN8sHWkeUqLeHXHQxQ1azja2IM7WIH+z/aLgzR6LhB3/MINNwtjesDpjGqTMj2JKQ=="; }; }; - "@shopify/cli-kit-3.50.1" = { + "@shopify/cli-kit-3.50.2" = { name = "_at_shopify_slash_cli-kit"; packageName = "@shopify/cli-kit"; - version = "3.50.1"; + version = "3.50.2"; src = fetchurl { - url = "https://registry.npmjs.org/@shopify/cli-kit/-/cli-kit-3.50.1.tgz"; - sha512 = "pi8khn358ntuBEUq+XEVp90fMI12ehNx6U+NVyqwOzEAwktmNxJmiG4aXf1oIyjOnitZ0JGIaS6swjDO1IWQjw=="; + url = "https://registry.npmjs.org/@shopify/cli-kit/-/cli-kit-3.50.2.tgz"; + sha512 = "EqScyHo9EudDz6nGpvwBbkjUmDx5g8Uhy0Ls05ZTWBqGMP9tm9RdLqRYjyq6q6iEjrBMgois4Bw9De6Zcf9JOw=="; }; }; - "@shopify/plugin-did-you-mean-3.50.1" = { + "@shopify/plugin-did-you-mean-3.50.2" = { name = "_at_shopify_slash_plugin-did-you-mean"; packageName = "@shopify/plugin-did-you-mean"; - version = "3.50.1"; + version = "3.50.2"; src = fetchurl { - url = "https://registry.npmjs.org/@shopify/plugin-did-you-mean/-/plugin-did-you-mean-3.50.1.tgz"; - sha512 = "F8Bs4xtYJp2z1BJgu0KDAp//Uw+ZtTOfDltwedtTWqrZlZl5bHk82fYmWicCxVxTmI53A4+qmuredngXgC/iqA=="; + url = "https://registry.npmjs.org/@shopify/plugin-did-you-mean/-/plugin-did-you-mean-3.50.2.tgz"; + sha512 = "7i8HlEq06YIq8c3qfkoqa9uO5PhNmf6Cj5V/LZWzmhJgIPeXndJvrAxomyYwAHBugDm6Zx/kKEcIOlk4O4ZQFw=="; }; }; "@sideway/address-4.1.4" = { @@ -9589,6 +9688,15 @@ let sha512 = "PFutXEy0SmQxYI4texPw3dd2KewuNqv7OuK1ZFtY2fM754yhvG2KdgwIhRnoEE2uHdtdGNQ8s0lb94dW9sELog=="; }; }; + "@sigstore/bundle-2.1.0" = { + name = "_at_sigstore_slash_bundle"; + packageName = "@sigstore/bundle"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@sigstore/bundle/-/bundle-2.1.0.tgz"; + sha512 = "89uOo6yh/oxaU8AeOUnVrTdVMcGk9Q1hJa7Hkvalc6G3Z3CupWk4Xe9djSgJm9fMkH69s0P0cVHUoKSOemLdng=="; + }; + }; "@sigstore/protobuf-specs-0.2.1" = { name = "_at_sigstore_slash_protobuf-specs"; packageName = "@sigstore/protobuf-specs"; @@ -9607,6 +9715,15 @@ let sha512 = "INxFVNQteLtcfGmcoldzV6Je0sbbfh9I16DM4yJPw3j5+TFP8X6uIiA18mvpEa9yyeycAKgPmOA3X9hVdVTPUA=="; }; }; + "@sigstore/sign-2.2.0" = { + name = "_at_sigstore_slash_sign"; + packageName = "@sigstore/sign"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@sigstore/sign/-/sign-2.2.0.tgz"; + sha512 = "AAbmnEHDQv6CSfrWA5wXslGtzLPtAtHZleKOgxdQYvx/s76Fk6T6ZVt7w2IGV9j1UrFeBocTTQxaXG2oRrDhYA=="; + }; + }; "@sigstore/tuf-1.0.3" = { name = "_at_sigstore_slash_tuf"; packageName = "@sigstore/tuf"; @@ -9616,6 +9733,15 @@ let sha512 = "2bRovzs0nJZFlCN3rXirE4gwxCn97JNjMmwpecqlbgV9WcxX7WRuIrgzx/X7Ib7MYRbyUTpBYE0s2x6AmZXnlg=="; }; }; + "@sigstore/tuf-2.2.0" = { + name = "_at_sigstore_slash_tuf"; + packageName = "@sigstore/tuf"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@sigstore/tuf/-/tuf-2.2.0.tgz"; + sha512 = "KKATZ5orWfqd9ZG6MN8PtCIx4eevWSuGRKQvofnWXRpyMyUEpmrzg5M5BrCpjM+NfZ0RbNGOh5tCz/P2uoRqOA=="; + }; + }; "@sinclair/typebox-0.25.24" = { name = "_at_sinclair_slash_typebox"; packageName = "@sinclair/typebox"; @@ -10210,15 +10336,6 @@ let sha512 = "lyIc6JUlUA8Ve5ELywPC8I2Sdnh1zc1zmbYgVarhXIp9YeAB0ReeqmGEOWNtlHkbP2DAA1AL65Wfn2ncjK/jtQ=="; }; }; - "@stoplight/spectral-cli-6.11.0" = { - name = "_at_stoplight_slash_spectral-cli"; - packageName = "@stoplight/spectral-cli"; - version = "6.11.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@stoplight/spectral-cli/-/spectral-cli-6.11.0.tgz"; - sha512 = "IURDN47BPIf3q4ZyUPujGpBzuHWFE5yT34w9rTJ1GKA4SgdscEdQO9KoTjOPT4G4cvDlEV3bNxwQ3uRm7+wRlA=="; - }; - }; "@stoplight/spectral-core-1.18.3" = { name = "_at_stoplight_slash_spectral-core"; packageName = "@stoplight/spectral-core"; @@ -10228,22 +10345,13 @@ let sha512 = "YY8x7X2SWJIhGTLPol+eFiQpWPz0D0mJdkK2i4A0QJG68KkNhypP6+JBC7/Kz3XWjqr0L/RqAd+N5cQLPOKZGQ=="; }; }; - "@stoplight/spectral-formats-1.5.0" = { + "@stoplight/spectral-formats-1.6.0" = { name = "_at_stoplight_slash_spectral-formats"; packageName = "@stoplight/spectral-formats"; - version = "1.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@stoplight/spectral-formats/-/spectral-formats-1.5.0.tgz"; - sha512 = "VskkdU3qBSvI1dfJ79ysjvTssfNlbA6wrf/XkXK6iTyjfIVqOAWVtjypTb2U95tN/X8IjIBBhNWtZ4tNVZilrA=="; - }; - }; - "@stoplight/spectral-formatters-1.3.0" = { - name = "_at_stoplight_slash_spectral-formatters"; - packageName = "@stoplight/spectral-formatters"; - version = "1.3.0"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@stoplight/spectral-formatters/-/spectral-formatters-1.3.0.tgz"; - sha512 = "ryuMwlzbPUuyn7ybSEbFYsljYmvTaTyD51wyCQs4ROzgfm3Yo5QDD0IsiJUzUpKK/Ml61ZX8ebgiPiRFEJtBpg=="; + url = "https://registry.npmjs.org/@stoplight/spectral-formats/-/spectral-formats-1.6.0.tgz"; + sha512 = "X27qhUfNluiduH0u/QwJqhOd8Wk5YKdxVmKM03Aijlx0AH1H5mYt3l9r7t2L4iyJrsBaFPnMGt7UYJDGxszbNA=="; }; }; "@stoplight/spectral-functions-1.7.2" = { @@ -10273,24 +10381,6 @@ let sha512 = "5baQIYL0NJTSVy8v6RxOR4U51xOUYM8wJri1YvlAT6bPN8m0EIxMwfVYi0xUZEMVeHcWx869nIkoqyWmOutF2A=="; }; }; - "@stoplight/spectral-ruleset-bundler-1.5.2" = { - name = "_at_stoplight_slash_spectral-ruleset-bundler"; - packageName = "@stoplight/spectral-ruleset-bundler"; - version = "1.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@stoplight/spectral-ruleset-bundler/-/spectral-ruleset-bundler-1.5.2.tgz"; - sha512 = "4QUVUFAU+S7IQ9XeCu+0TQMYxKFpKnkOAfa9unRQ1iPL2cviaipEN6witpbAptdHJD3UUjx4OnwlX8WwmXSq9w=="; - }; - }; - "@stoplight/spectral-ruleset-migrator-1.9.5" = { - name = "_at_stoplight_slash_spectral-ruleset-migrator"; - packageName = "@stoplight/spectral-ruleset-migrator"; - version = "1.9.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@stoplight/spectral-ruleset-migrator/-/spectral-ruleset-migrator-1.9.5.tgz"; - sha512 = "76n/HETr3UinVl/xLNldrH9p0JNoD8Gz4K75J6E4OHp4xD0P+BA2e8+W30HjIvqm1LJdLU2BNma0ioy+q3B9RA=="; - }; - }; "@stoplight/spectral-rulesets-1.18.0" = { name = "_at_stoplight_slash_spectral-rulesets"; packageName = "@stoplight/spectral-rulesets"; @@ -10408,13 +10498,13 @@ let sha512 = "gqBJSmJMWomZFxlppaKea7NeAqFrDrrS0RMt24No92M3nJWcyI9YKGEQKl+EyJqZ5gh6w1s0cTklMHMzRwA1NA=="; }; }; - "@swc/core-1.3.95" = { + "@swc/core-1.3.96" = { name = "_at_swc_slash_core"; packageName = "@swc/core"; - version = "1.3.95"; + version = "1.3.96"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core/-/core-1.3.95.tgz"; - sha512 = "PMrNeuqIusq9DPDooV3FfNEbZuTu5jKAc04N3Hm6Uk2Fl49cqElLFQ4xvl4qDmVDz97n3n/C1RE0/f6WyGPEiA=="; + url = "https://registry.npmjs.org/@swc/core/-/core-1.3.96.tgz"; + sha512 = "zwE3TLgoZwJfQygdv2SdCK9mRLYluwDOM53I+dT6Z5ZvrgVENmY3txvWDvduzkV+/8IuvrRbVezMpxcojadRdQ=="; }; }; "@swc/counter-0.1.2" = { @@ -10444,13 +10534,13 @@ let sha512 = "myfUej5naTBWnqOCc/MdVOLVjXUXtIA+NpDrDBKJtLLg2shUjBu3cZmB/85RyitKc55+lUUyl7oRfLOvkr2hsw=="; }; }; - "@swc/wasm-1.3.95" = { + "@swc/wasm-1.3.97" = { name = "_at_swc_slash_wasm"; packageName = "@swc/wasm"; - version = "1.3.95"; + version = "1.3.97"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/wasm/-/wasm-1.3.95.tgz"; - sha512 = "cOE6Cu8bKR/69qyJKhLOQnUTZu3lUKHqI6XDhfLuG/zg/7LCwfECXhetkYBnzhB4pHre/8ZrRKaXCjcY9XJ+rQ=="; + url = "https://registry.npmjs.org/@swc/wasm/-/wasm-1.3.97.tgz"; + sha512 = "O9p6R6zN1NV1U64eBmU/2NvJGA79W/vUl9BaQwIgoSf2qrPrKMtexDV/aFk2N/mQriWxaK3HHxJAQSPRWsRs+w=="; }; }; "@szmarczak/http-timer-1.1.2" = { @@ -10498,13 +10588,13 @@ let sha512 = "/FcGQVvXAslhiC9aMG5gxKXJctg8N7XLZrP+wYrFTFccWEPZd/Xon5y7jUXpKOVSOFEA1MOKZKbPuK4ET5/T8Q=="; }; }; - "@textlint/ast-node-types-13.3.3" = { + "@textlint/ast-node-types-13.4.0" = { name = "_at_textlint_slash_ast-node-types"; packageName = "@textlint/ast-node-types"; - version = "13.3.3"; + version = "13.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/ast-node-types/-/ast-node-types-13.3.3.tgz"; - sha512 = "KCpJppfX3Km69twa6SmVEJ8mkyAZSrxw3XaaLQSlpc7PWnLUJSCHGPVECI1nSUDhiTd1r6zlRvWuyIAZJiov+A=="; + url = "https://registry.npmjs.org/@textlint/ast-node-types/-/ast-node-types-13.4.0.tgz"; + sha512 = "roVeLjnf8UPntFICb1uEwE2dccC8V/T5N1x7eBxkT3VDmSQkyfIAuGtlpwyH0wNKEwJmjO/2gSm2fCjW5K/rbA=="; }; }; "@textlint/ast-node-types-4.4.3" = { @@ -10516,139 +10606,139 @@ let sha512 = "qi2jjgO6Tn3KNPGnm6B7p6QTEPvY95NFsIAaJuwbulur8iJUEenp1OnoUfiDaC/g2WPPEFkcfXpmnu8XEMFo2A=="; }; }; - "@textlint/ast-tester-13.3.3" = { + "@textlint/ast-tester-13.4.0" = { name = "_at_textlint_slash_ast-tester"; packageName = "@textlint/ast-tester"; - version = "13.3.3"; + version = "13.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/ast-tester/-/ast-tester-13.3.3.tgz"; - sha512 = "vIIEJ0vDJb3Pr4kseOH9yzUCxx1EbX6PQDg/DgQj9sMAnwVG2sZvy2Uiga4+hj8SphdzaKia9Z+156UZzs+mzA=="; + url = "https://registry.npmjs.org/@textlint/ast-tester/-/ast-tester-13.4.0.tgz"; + sha512 = "dmqlPNxgQNaG63gTcMfF2b2VmQn7gnDN2ytF3c6sFB6YyTsiTh9wA/xsUBKqYWOMlYV5pLuO6TvItcUPCtVtZw=="; }; }; - "@textlint/ast-traverse-13.3.3" = { + "@textlint/ast-traverse-13.4.0" = { name = "_at_textlint_slash_ast-traverse"; packageName = "@textlint/ast-traverse"; - version = "13.3.3"; + version = "13.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/ast-traverse/-/ast-traverse-13.3.3.tgz"; - sha512 = "tZ25emmWf3mJ4+vM8CO6D7F8l00WXD6MJgnnlY9BHI/HbOlngBfmKhTVizQEwrWfYF80sQO5R9a+N4UEk67Wcg=="; + url = "https://registry.npmjs.org/@textlint/ast-traverse/-/ast-traverse-13.4.0.tgz"; + sha512 = "d64z9uJcyGRwZFNadkOTnSIMZEQfWiOEM4+RbakLF71kpmdMoF8pPK5mOgT0fsHoidGzlNxxUMThkIfSRMtG5w=="; }; }; - "@textlint/config-loader-13.3.3" = { + "@textlint/config-loader-13.4.0" = { name = "_at_textlint_slash_config-loader"; packageName = "@textlint/config-loader"; - version = "13.3.3"; + version = "13.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/config-loader/-/config-loader-13.3.3.tgz"; - sha512 = "DQA/7dYu3VDHP9Idd0Sn7HzwiFuNdKUXfA79pUGmJzNQUYaW0qADzyQCwfh7LlvhCcBmnLgX+8wb13o6OaHX5g=="; + url = "https://registry.npmjs.org/@textlint/config-loader/-/config-loader-13.4.0.tgz"; + sha512 = "uebTYdCZAw43BMWIB85EU6eoFe6aVArejeW6P+QR09aZvVIPoT6UJl1JYjGNiq0cVR5kR7bQS1w3Af55CvgOEQ=="; }; }; - "@textlint/feature-flag-13.3.3" = { + "@textlint/feature-flag-13.4.0" = { name = "_at_textlint_slash_feature-flag"; packageName = "@textlint/feature-flag"; - version = "13.3.3"; + version = "13.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/feature-flag/-/feature-flag-13.3.3.tgz"; - sha512 = "ltdwKQTvs9f/TgQ3asBx2EXmsSSsvxa7ySnTXSTZBkbVxqmrGY4zehDRiDCmuFZGVGCvCddY1QzCXy16ybk9Fg=="; + url = "https://registry.npmjs.org/@textlint/feature-flag/-/feature-flag-13.4.0.tgz"; + sha512 = "L/p2rkuOg6rOS395TXUFIDfmoCyHpHKnA6YFCqNXkDcpxo0W+YXnEdXDMd9P+KlsU9MNTC9nFduO4nHOfFYlPg=="; }; }; - "@textlint/fixer-formatter-13.3.3" = { + "@textlint/fixer-formatter-13.4.0" = { name = "_at_textlint_slash_fixer-formatter"; packageName = "@textlint/fixer-formatter"; - version = "13.3.3"; + version = "13.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/fixer-formatter/-/fixer-formatter-13.3.3.tgz"; - sha512 = "iCMFS8GrmUetXMIT4/jFxoL5v1QN5ODj1190Lb6D+EdTxsrAWssHOb6m7MOEhfOGYEArAkb3PjSxu7DPLrb50g=="; + url = "https://registry.npmjs.org/@textlint/fixer-formatter/-/fixer-formatter-13.4.0.tgz"; + sha512 = "iosRUAhQ4bQkwpg6HOCfaLufR5X0ImCOnoy+jqHNQD37ziRQF43B/IMHOqwQdX7MLHp6jPYALFDnl64+gjmKbA=="; }; }; - "@textlint/kernel-13.3.3" = { + "@textlint/kernel-13.4.0" = { name = "_at_textlint_slash_kernel"; packageName = "@textlint/kernel"; - version = "13.3.3"; + version = "13.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/kernel/-/kernel-13.3.3.tgz"; - sha512 = "HewzuuX2c2nlR+e8dREWrAYrOiyWb78eeObuW95miMjX/F6TjWmha4qrnrMCWbYbKDwC4en8dNGS4mm0vSdi4A=="; + url = "https://registry.npmjs.org/@textlint/kernel/-/kernel-13.4.0.tgz"; + sha512 = "QRHbaKSeqXzfi+XNISOyNM7h68v6/4QaLfo7CZnBBKxatvVoXUF5B/8MmxYrVB1TX/X9sY50zcwfTaYwZTYCNQ=="; }; }; - "@textlint/linter-formatter-13.3.3" = { + "@textlint/linter-formatter-13.4.0" = { name = "_at_textlint_slash_linter-formatter"; packageName = "@textlint/linter-formatter"; - version = "13.3.3"; + version = "13.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/linter-formatter/-/linter-formatter-13.3.3.tgz"; - sha512 = "z8xsk1bo9r8v6Ph76WLTBrfj+0+eyEfRlbTGBs+ie6YAGItBqkLYmDrD26DDfVjIZcXWdCXVX1Et6MOWomb//g=="; + url = "https://registry.npmjs.org/@textlint/linter-formatter/-/linter-formatter-13.4.0.tgz"; + sha512 = "vJGm0mM7TcsespHUxh4GnSWBOqdYyluHlLPLQwg4tCVYLjTgu2Vaz8BDCpwQ9BnRmEr484Qjug0RE1otQUFBrw=="; }; }; - "@textlint/markdown-to-ast-13.3.3" = { + "@textlint/markdown-to-ast-13.4.0" = { name = "_at_textlint_slash_markdown-to-ast"; packageName = "@textlint/markdown-to-ast"; - version = "13.3.3"; + version = "13.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/markdown-to-ast/-/markdown-to-ast-13.3.3.tgz"; - sha512 = "jeqWyChTtJHWxEnH46V6qjr+OCTh6evm45aDqMzdg+b8ocXY+NhudiCMeHcVGoz042UEwc6w4reLn8+Is+SZ+A=="; + url = "https://registry.npmjs.org/@textlint/markdown-to-ast/-/markdown-to-ast-13.4.0.tgz"; + sha512 = "rF70kFestQHaqB+cRl4QrvjIn0bjR3birnAXjux9iEXWfrS7cxWyrEWmKkBPO5o8yoGF9q9JKBkDaypPzNsIhg=="; }; }; - "@textlint/module-interop-13.3.3" = { + "@textlint/module-interop-13.4.0" = { name = "_at_textlint_slash_module-interop"; packageName = "@textlint/module-interop"; - version = "13.3.3"; + version = "13.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/module-interop/-/module-interop-13.3.3.tgz"; - sha512 = "CwfVpRGAxbkhGY9vLLU06Q/dy/RMNnyzbmt6IS2WIyxqxvGaF7QZtFYpKEEm63aemVyUvzQ7WM3yVOoUg6P92w=="; + url = "https://registry.npmjs.org/@textlint/module-interop/-/module-interop-13.4.0.tgz"; + sha512 = "o3h/ths4OrqeT5XLfTED6R0tjp/DLvbL8eG8b7uUgIEhUlHcSHwEUC6bEX7AzQS6/2DedrCBKLknQcdhl/iQ2A=="; }; }; - "@textlint/source-code-fixer-13.3.3" = { + "@textlint/source-code-fixer-13.4.0" = { name = "_at_textlint_slash_source-code-fixer"; packageName = "@textlint/source-code-fixer"; - version = "13.3.3"; + version = "13.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/source-code-fixer/-/source-code-fixer-13.3.3.tgz"; - sha512 = "h4jxWSetmcVuGwl71ai72784aneBQ0MkE5Mc3avl8PKIOIOyz0A1D7i9VQENWWIiqU8zyzmHwKGNSGyqWaqE2Q=="; + url = "https://registry.npmjs.org/@textlint/source-code-fixer/-/source-code-fixer-13.4.0.tgz"; + sha512 = "3jR5XPrSzJmSH8sg3XrkCu9sGSR7OOl78zrbX+1d84nDLdRdjLSa90COc4aJWwOMpKycwZhU6XltTqPJWI50rg=="; }; }; - "@textlint/text-to-ast-13.3.3" = { + "@textlint/text-to-ast-13.4.0" = { name = "_at_textlint_slash_text-to-ast"; packageName = "@textlint/text-to-ast"; - version = "13.3.3"; + version = "13.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/text-to-ast/-/text-to-ast-13.3.3.tgz"; - sha512 = "iQdiHAiUfB9XruuYWCb4fY/gD/Q5/MkH1xwUTpS8UJowNgwpTldagUJX1JbZQ2UHux+yRe9JFA+JKm3rrxgQFw=="; + url = "https://registry.npmjs.org/@textlint/text-to-ast/-/text-to-ast-13.4.0.tgz"; + sha512 = "oZQ20rA5VqqjUT689q/RDgHSI1ML6ySoEjfXMRBSXaN+7LXKFZdvLg4RQ5ECddNh3MIXcQHdjT7+qxuGyQzy6g=="; }; }; - "@textlint/textlint-plugin-markdown-13.3.3" = { + "@textlint/textlint-plugin-markdown-13.4.0" = { name = "_at_textlint_slash_textlint-plugin-markdown"; packageName = "@textlint/textlint-plugin-markdown"; - version = "13.3.3"; + version = "13.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/textlint-plugin-markdown/-/textlint-plugin-markdown-13.3.3.tgz"; - sha512 = "EhBZ/Q6ZXMVRPDeQbFdFbtc0wE7SC0DWy9lkjKXfcbLKW0ZPTvtjH3JqJtCPBZAYcexB8wKOiHImfwVfQJhJhg=="; + url = "https://registry.npmjs.org/@textlint/textlint-plugin-markdown/-/textlint-plugin-markdown-13.4.0.tgz"; + sha512 = "+bIOsbfQpdRzjkNDXY1ze4YyPGf1XKlkVVkkVpUlI7rehoVaUWKy2v41Y8gsQZjpBft31EXP1okA9qs7wTYr/w=="; }; }; - "@textlint/textlint-plugin-text-13.3.3" = { + "@textlint/textlint-plugin-text-13.4.0" = { name = "_at_textlint_slash_textlint-plugin-text"; packageName = "@textlint/textlint-plugin-text"; - version = "13.3.3"; + version = "13.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/textlint-plugin-text/-/textlint-plugin-text-13.3.3.tgz"; - sha512 = "MN/JMGLanqj8CJGuit8DDiyrO0yf1vxFMLWTDeMIXwSoe8VToHCt2j20zg8XNHGNrUbKj+wuhzhrkrKEI7uWxg=="; + url = "https://registry.npmjs.org/@textlint/textlint-plugin-text/-/textlint-plugin-text-13.4.0.tgz"; + sha512 = "k9GAId9bjdZB3oLBfzAjRD+LCOFQILS5o9s8ESPPJhR5apvURr7WkR2bR5/dHuxa0ivvPjksVzS/jyE2kk618g=="; }; }; - "@textlint/types-13.3.3" = { + "@textlint/types-13.4.0" = { name = "_at_textlint_slash_types"; packageName = "@textlint/types"; - version = "13.3.3"; + version = "13.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/types/-/types-13.3.3.tgz"; - sha512 = "i2B7uRh+Iv8ZBKPJ3n4I6uSrTUQq5LdEkhFYNUwnDYxmhudz1o79xm906kri2eM8lxThX/UYYgVuJWpEwS0b+g=="; + url = "https://registry.npmjs.org/@textlint/types/-/types-13.4.0.tgz"; + sha512 = "K7JjP0gUOuRgc7xyfZv2NML7dmzcb9UjoBu0QCgCmJP861ikAd1bONH+qE/3brTi4n8MJq9gO9smGjB2upExMA=="; }; }; - "@textlint/utils-13.3.3" = { + "@textlint/utils-13.4.0" = { name = "_at_textlint_slash_utils"; packageName = "@textlint/utils"; - version = "13.3.3"; + version = "13.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/utils/-/utils-13.3.3.tgz"; - sha512 = "roN+K3a36RxGc0tV+8HXVXpoPomEr3LCjNI8+hFmVjOu3RsUdLTyraNBqqaghaE0KgwCPODF0seuG1hteNI8LQ=="; + url = "https://registry.npmjs.org/@textlint/utils/-/utils-13.4.0.tgz"; + sha512 = "cXm9L3Ol/R5DR0YtHCMBa2PicvOoR5YU8Dx7RDJWHfp2rQvMghd3ogDmeol28s/Ei5oXRHY5HE2rWhYLhwrtVg=="; }; }; "@tokenizer/token-0.1.1" = { @@ -10804,6 +10894,15 @@ let sha512 = "QTnf++uxunWvG2z3UFNzAoQPHxnSXOwtaI3iJ+AohhV+5vONuArPjJE7aPXPVXfXJsqrVbZBu9b81AJoSd09IQ=="; }; }; + "@tufjs/canonical-json-2.0.0" = { + name = "_at_tufjs_slash_canonical-json"; + packageName = "@tufjs/canonical-json"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@tufjs/canonical-json/-/canonical-json-2.0.0.tgz"; + sha512 = "yVtV8zsdo8qFHe+/3kw81dSLyF7D576A5cCFCi4X7B39tWT7SekaEFUnvnWJHz+9qO7qJTah1JbrDjWKqFtdWA=="; + }; + }; "@tufjs/models-1.0.4" = { name = "_at_tufjs_slash_models"; packageName = "@tufjs/models"; @@ -10813,6 +10912,15 @@ let sha512 = "qaGV9ltJP0EO25YfFUPhxRVK0evXFIAGicsVXuRim4Ed9cjPxYhNnNJ49SFmbeLgtxpslIkX317IgpfcHPVj/A=="; }; }; + "@tufjs/models-2.0.0" = { + name = "_at_tufjs_slash_models"; + packageName = "@tufjs/models"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@tufjs/models/-/models-2.0.0.tgz"; + sha512 = "c8nj8BaOExmZKO2DXhDfegyhSGcG9E/mPN3U13L+/PsoWm1uaGiHHjxqSHQiasDBQwDA3aHuw9+9spYAP1qvvg=="; + }; + }; "@turist/fetch-7.2.0" = { name = "_at_turist_slash_fetch"; packageName = "@turist/fetch"; @@ -10831,13 +10939,13 @@ let sha512 = "qLOvfmlG2vCVw5fo/oz8WAZYlpe5a5OurgTj3diIxJCdjRHpapC+vQCz3er9LV79Vcat+DifBjeAhOAdmndtDQ=="; }; }; - "@types/accepts-1.3.6" = { + "@types/accepts-1.3.7" = { name = "_at_types_slash_accepts"; packageName = "@types/accepts"; - version = "1.3.6"; + version = "1.3.7"; src = fetchurl { - url = "https://registry.npmjs.org/@types/accepts/-/accepts-1.3.6.tgz"; - sha512 = "6+qlUg57yfE9OO63wnsJXLeq9cG3gSHBBIxNMOjNrbDRlDnm/NaR7RctfYcVCPq+j7d+MwOxqVEludH5+FKrlg=="; + url = "https://registry.npmjs.org/@types/accepts/-/accepts-1.3.7.tgz"; + sha512 = "Pay9fq2lM2wXPWbteBsRAGiWH2hig4ZE2asK+mm7kUzlxRTfL961rj89I6zV/E3PcIkDqyuBEcMxFT7rccugeQ=="; }; }; "@types/acorn-4.0.6" = { @@ -10867,22 +10975,22 @@ let sha512 = "ebDJ9b0e702Yr7pWgB0jzm+CX4Srzz8RcXtLJDJB+BSccqMa36uyH/zUsSYao5+BD1ytv3k3rPYCq4mAE1hsXA=="; }; }; - "@types/atob-2.1.3" = { + "@types/atob-2.1.4" = { name = "_at_types_slash_atob"; packageName = "@types/atob"; - version = "2.1.3"; + version = "2.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/atob/-/atob-2.1.3.tgz"; - sha512 = "z5fVgG6QAUY9ecy4zTsrhNEFaCGIU9qgfvFSGTbxVACaUMK1fJICZWE/JreBvZGc4BNgafnFkCWMDBeCebpeKg=="; + url = "https://registry.npmjs.org/@types/atob/-/atob-2.1.4.tgz"; + sha512 = "FisOhG87cCFqzCgq6FUtSYsTMOHCB/p28zJbSN1QBo4ZGJfg9PEhMjdIV++NDeOnloUUe0Gz6jwBV+L1Ac00Mw=="; }; }; - "@types/bn.js-5.1.4" = { + "@types/bn.js-5.1.5" = { name = "_at_types_slash_bn.js"; packageName = "@types/bn.js"; - version = "5.1.4"; + version = "5.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/bn.js/-/bn.js-5.1.4.tgz"; - sha512 = "ZtBd9L8hVtoBpPMSWfbwjC4dhQtJdlPS+e1A0Rydb7vg7bDcUwiRklPx24sMYtXcmAMST/k0Wze7JLbNU/5SkA=="; + url = "https://registry.npmjs.org/@types/bn.js/-/bn.js-5.1.5.tgz"; + sha512 = "V46N0zwKRF5Q00AZ6hWtN0T8gGmDUaUzLWQvHFo5yThtVwK/VCenFY3wXVbOvNfajEpsTfQM4IN9k/d6gUVX3A=="; }; }; "@types/body-parser-1.19.2" = { @@ -10894,31 +11002,31 @@ let sha512 = "ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g=="; }; }; - "@types/body-parser-1.19.4" = { + "@types/body-parser-1.19.5" = { name = "_at_types_slash_body-parser"; packageName = "@types/body-parser"; - version = "1.19.4"; + version = "1.19.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.4.tgz"; - sha512 = "N7UDG0/xiPQa2D/XrVJXjkWbpqHCd2sBaB32ggRF2l83RhPfamgKGF8gwwqyksS95qUS5ZYF9aF+lLPRlwI2UA=="; + url = "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.5.tgz"; + sha512 = "fB3Zu92ucau0iQ0JMCFQE7b/dv8Ot07NI3KaZIkIUNXq82k4eBAqUaneXfleGY9JWskeS9y+u0nXMyspcuQrCg=="; }; }; - "@types/bonjour-3.5.12" = { + "@types/bonjour-3.5.13" = { name = "_at_types_slash_bonjour"; packageName = "@types/bonjour"; - version = "3.5.12"; + version = "3.5.13"; src = fetchurl { - url = "https://registry.npmjs.org/@types/bonjour/-/bonjour-3.5.12.tgz"; - sha512 = "ky0kWSqXVxSqgqJvPIkgFkcn4C8MnRog308Ou8xBBIVo39OmUFy+jqNe0nPwLCDFxUpmT9EvT91YzOJgkDRcFg=="; + url = "https://registry.npmjs.org/@types/bonjour/-/bonjour-3.5.13.tgz"; + sha512 = "z9fJ5Im06zvUL548KvYNecEVlA7cVDkGUi6kZusb04mpyEFKCIZJvloCcmpmLaIahDpOQGHaHmG6imtPMmPXGQ=="; }; }; - "@types/bunyan-1.8.10" = { + "@types/bunyan-1.8.11" = { name = "_at_types_slash_bunyan"; packageName = "@types/bunyan"; - version = "1.8.10"; + version = "1.8.11"; src = fetchurl { - url = "https://registry.npmjs.org/@types/bunyan/-/bunyan-1.8.10.tgz"; - sha512 = "A82U/3EAdWX89f+dfysGiRvbeoLuRLV3i6SLg3HuNK4Yf+dHOqdbxT70vQUwvD3DOr2Dvpcv9dRX4ipTf0LpEg=="; + url = "https://registry.npmjs.org/@types/bunyan/-/bunyan-1.8.11.tgz"; + sha512 = "758fRH7umIMk5qt5ELmRMff4mLDlN+xyYzC+dkPTdKwbSkJFvz6xwyScrytPU0QIBbRRwbiE8/BIg8bpajerNQ=="; }; }; "@types/cacheable-request-6.0.3" = { @@ -10930,13 +11038,13 @@ let sha512 = "IQ3EbTzGxIigb1I3qPZc1rWJnH0BmSKv5QYTalEwweFvyBDLSAe24zP0le/hyi7ecGfZVlIVAg4BZqb8WBwKqw=="; }; }; - "@types/cli-progress-3.11.4" = { + "@types/cli-progress-3.11.5" = { name = "_at_types_slash_cli-progress"; packageName = "@types/cli-progress"; - version = "3.11.4"; + version = "3.11.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/cli-progress/-/cli-progress-3.11.4.tgz"; - sha512 = "yufTxeeNCZuEIxx2uebK8lpSAsJM4lvzakm/VxzYhDtqhXCzwH9jpn7nPCxzrROuEbLATqhFq4MIPoG0tlrsvw=="; + url = "https://registry.npmjs.org/@types/cli-progress/-/cli-progress-3.11.5.tgz"; + sha512 = "D4PbNRbviKyppS5ivBGyFO29POlySLmA2HyUFE4p5QGazAMM3CwkKWcvTl8gvElSuxRh6FPKL8XmidX873ou4g=="; }; }; "@types/commander-2.12.2" = { @@ -10948,40 +11056,40 @@ let sha512 = "0QEFiR8ljcHp9bAbWxecjVRuAMr16ivPiGOw6KFQBVrVd0RQIcM3xKdRisH2EDWgVWujiYtHwhSkSUoAAGzH7Q=="; }; }; - "@types/common-tags-1.8.3" = { + "@types/common-tags-1.8.4" = { name = "_at_types_slash_common-tags"; packageName = "@types/common-tags"; - version = "1.8.3"; + version = "1.8.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/common-tags/-/common-tags-1.8.3.tgz"; - sha512 = "v3smfzf7umSwpkJrmlUe+apSv6bVnrIFCeBeprnP4f8lIh6pECZxyD50e8yFwfouIt85TdxN5yXiFwS5fnsS3w=="; + url = "https://registry.npmjs.org/@types/common-tags/-/common-tags-1.8.4.tgz"; + sha512 = "S+1hLDJPjWNDhcGxsxEbepzaxWqURP/o+3cP4aa2w7yBXgdcmKGQtZzP8JbyfOd0m+33nh+8+kvxYE2UJtBDkg=="; }; }; - "@types/concat-stream-2.0.1" = { + "@types/concat-stream-2.0.2" = { name = "_at_types_slash_concat-stream"; packageName = "@types/concat-stream"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/concat-stream/-/concat-stream-2.0.1.tgz"; - sha512 = "v5HP9ZsRbzFq5XRo2liUZPKzwbGK5SuGVMWZjE6iJOm/JNdESk3/rkfcPe0lcal0C32PTLVlYUYqGpMGNdDsDg=="; + url = "https://registry.npmjs.org/@types/concat-stream/-/concat-stream-2.0.2.tgz"; + sha512 = "hgEx+hdJnfCHa62l6SNHNoe/cRge2HoUZe9KEDwOs2TvyocLTlTuw0rUMiii99kG2avc+BubhNpZ+cu05Gl8oQ=="; }; }; - "@types/connect-3.4.37" = { + "@types/connect-3.4.38" = { name = "_at_types_slash_connect"; packageName = "@types/connect"; - version = "3.4.37"; + version = "3.4.38"; src = fetchurl { - url = "https://registry.npmjs.org/@types/connect/-/connect-3.4.37.tgz"; - sha512 = "zBUSRqkfZ59OcwXon4HVxhx5oWCJmc0OtBTK05M+p0dYjgN6iTwIL2T/WbsQZrEsdnwaF9cWQ+azOnpPvIqY3Q=="; + url = "https://registry.npmjs.org/@types/connect/-/connect-3.4.38.tgz"; + sha512 = "K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug=="; }; }; - "@types/connect-history-api-fallback-1.5.2" = { + "@types/connect-history-api-fallback-1.5.3" = { name = "_at_types_slash_connect-history-api-fallback"; packageName = "@types/connect-history-api-fallback"; - version = "1.5.2"; + version = "1.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.5.2.tgz"; - sha512 = "gX2j9x+NzSh4zOhnRPSdPPmTepS4DfxES0AvIFv3jGv5QyeAJf6u6dY5/BAoAJU9Qq1uTvwOku8SSC2GnCRl6Q=="; + url = "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.5.3.tgz"; + sha512 = "6mfQ6iNvhSKCZJoY6sIG3m0pKkdUcweVNOLuBBKvoWGzl2yRxOJcYOTRyLKt3nxXvBLJWa6QkW//tgbIwJehmA=="; }; }; "@types/cookie-0.4.1" = { @@ -10993,13 +11101,13 @@ let sha512 = "XW/Aa8APYr6jSVVA1y/DEIZX0/GMKLEVekNG727R8cs56ahETkRAy/3DR7+fJyh7oUgGwNQaRfXCun0+KbWY7Q=="; }; }; - "@types/cookiejar-2.1.3" = { + "@types/cookiejar-2.1.4" = { name = "_at_types_slash_cookiejar"; packageName = "@types/cookiejar"; - version = "2.1.3"; + version = "2.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/cookiejar/-/cookiejar-2.1.3.tgz"; - sha512 = "LZ8SD3LpNmLMDLkG2oCBjZg+ETnx6XdCjydUE0HwojDmnDfDUnhMKKbtth1TZh+hzcqb03azrYWoXLS8sMXdqg=="; + url = "https://registry.npmjs.org/@types/cookiejar/-/cookiejar-2.1.4.tgz"; + sha512 = "b698BLJ6kPVd6uhHsY7wlebZdrWPXYied883PDSzpJZYOP97EOn/oGdLCH3jJf157srkFReIZY5v0H1s8Dozrg=="; }; }; "@types/cors-2.8.12" = { @@ -11011,94 +11119,85 @@ let sha512 = "vt+kDhq/M2ayberEtJcIN/hxXy1Pk+59g2FV/ZQceeaTyCtCucjL2Q7FXlFjtWn4n15KCr1NE2lNNFhp0lEThw=="; }; }; - "@types/cors-2.8.15" = { + "@types/cors-2.8.16" = { name = "_at_types_slash_cors"; packageName = "@types/cors"; - version = "2.8.15"; + version = "2.8.16"; src = fetchurl { - url = "https://registry.npmjs.org/@types/cors/-/cors-2.8.15.tgz"; - sha512 = "n91JxbNLD8eQIuXDIChAN1tCKNWCEgpceU9b7ZMbFA+P+Q4yIeh80jizFLEvolRPc1ES0VdwFlGv+kJTSirogw=="; + url = "https://registry.npmjs.org/@types/cors/-/cors-2.8.16.tgz"; + sha512 = "Trx5or1Nyg1Fq138PCuWqoApzvoSLWzZ25ORBiHMbbUT42g578lH1GT4TwYDbiUOLFuDsCkfLneT2105fsFWGg=="; }; }; - "@types/debug-4.1.10" = { + "@types/debug-4.1.12" = { name = "_at_types_slash_debug"; packageName = "@types/debug"; - version = "4.1.10"; + version = "4.1.12"; src = fetchurl { - url = "https://registry.npmjs.org/@types/debug/-/debug-4.1.10.tgz"; - sha512 = "tOSCru6s732pofZ+sMv9o4o3Zc+Sa8l3bxd/tweTQudFn06vAzb13ZX46Zi6m6EJ+RUbRTHvgQJ1gBtSgkaUYA=="; + url = "https://registry.npmjs.org/@types/debug/-/debug-4.1.12.tgz"; + sha512 = "vIChWdVG3LG1SMxEvI/AK+FWJthlrqlTu7fbrlywTkkaONwk/UAGaULXRlf8vkzFBLVm0zkMdCquhL5aOjhXPQ=="; }; }; - "@types/diff-3.5.7" = { + "@types/diff-3.5.8" = { name = "_at_types_slash_diff"; packageName = "@types/diff"; - version = "3.5.7"; + version = "3.5.8"; src = fetchurl { - url = "https://registry.npmjs.org/@types/diff/-/diff-3.5.7.tgz"; - sha512 = "dEg0Y/cggst2Dr6wM+6+vVvHgOkmR6VMB+Zt5dc7Wy8zYily1yKP8mzRWKhX3vaefxZYnbL4pNtZ2UWosl+VqA=="; + url = "https://registry.npmjs.org/@types/diff/-/diff-3.5.8.tgz"; + sha512 = "CZ5vepL87+M8PxRIvJjR181Erahch2w7Jev/XJm+Iot/SOvJh8QqH/N79b+vsKtYF6fFzoPieiiq2c5tzmXR9A=="; }; }; - "@types/ejs-3.1.4" = { + "@types/ejs-3.1.5" = { name = "_at_types_slash_ejs"; packageName = "@types/ejs"; - version = "3.1.4"; + version = "3.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/ejs/-/ejs-3.1.4.tgz"; - sha512 = "fnM/NjByiWdSRJRrmGxgqOSAnmOnsvX1QcNYk5TVyIIj+7ZqOKMb9gQa4OIl/lil2w/8TiTWV+nz3q8yqxez/w=="; + url = "https://registry.npmjs.org/@types/ejs/-/ejs-3.1.5.tgz"; + sha512 = "nv+GSx77ZtXiJzwKdsASqi+YQ5Z7vwHsTP0JY2SiQgjGckkBRKZnk8nIM+7oUZ1VCtuTz0+By4qVR7fqzp/Dfg=="; }; }; - "@types/es-aggregate-error-1.0.4" = { + "@types/es-aggregate-error-1.0.5" = { name = "_at_types_slash_es-aggregate-error"; packageName = "@types/es-aggregate-error"; - version = "1.0.4"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/es-aggregate-error/-/es-aggregate-error-1.0.4.tgz"; - sha512 = "95tL6tLR8P3Utx4SxXUEc0e+k2B9VhtBozhgxKGpv30ylIuxGxf080d7mYZ08sH5UjpDv/Nd6F80tH1p+KuPIg=="; + url = "https://registry.npmjs.org/@types/es-aggregate-error/-/es-aggregate-error-1.0.5.tgz"; + sha512 = "N2YcF5clfLoFqpSXr50khdH9cItGytbDXti6UMc4948VivZp0g1tiJxes5yqtWO3LWQf/mArYrQFWarUWj8lcQ=="; }; }; - "@types/eslint-8.44.6" = { + "@types/eslint-8.44.7" = { name = "_at_types_slash_eslint"; packageName = "@types/eslint"; - version = "8.44.6"; + version = "8.44.7"; src = fetchurl { - url = "https://registry.npmjs.org/@types/eslint/-/eslint-8.44.6.tgz"; - sha512 = "P6bY56TVmX8y9J87jHNgQh43h6VVU+6H7oN7hgvivV81K2XY8qJZ5vqPy/HdUoVIelii2kChYVzQanlswPWVFw=="; + url = "https://registry.npmjs.org/@types/eslint/-/eslint-8.44.7.tgz"; + sha512 = "f5ORu2hcBbKei97U73mf+l9t4zTGl74IqZ0GQk4oVea/VS8tQZYkUveSYojk+frraAVYId0V2WC9O4PTNru2FQ=="; }; }; - "@types/eslint-scope-3.7.6" = { + "@types/eslint-scope-3.7.7" = { name = "_at_types_slash_eslint-scope"; packageName = "@types/eslint-scope"; - version = "3.7.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.6.tgz"; - sha512 = "zfM4ipmxVKWdxtDaJ3MP3pBurDXOCoyjvlpE3u6Qzrmw4BPbfm4/ambIeTk/r/J0iq/+2/xp0Fmt+gFvXJY2PQ=="; - }; - }; - "@types/estree-0.0.39" = { - name = "_at_types_slash_estree"; - packageName = "@types/estree"; - version = "0.0.39"; + version = "3.7.7"; src = fetchurl { - url = "https://registry.npmjs.org/@types/estree/-/estree-0.0.39.tgz"; - sha512 = "EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw=="; + url = "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.7.tgz"; + sha512 = "MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg=="; }; }; - "@types/estree-1.0.4" = { + "@types/estree-1.0.5" = { name = "_at_types_slash_estree"; packageName = "@types/estree"; - version = "1.0.4"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/estree/-/estree-1.0.4.tgz"; - sha512 = "2JwWnHK9H+wUZNorf2Zr6ves96WHoWDJIftkcxPKsS7Djta6Zu519LarhRNljPXkpsZR2ZMwNCPeW7omW07BJw=="; + url = "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz"; + sha512 = "/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw=="; }; }; - "@types/estree-jsx-1.0.2" = { + "@types/estree-jsx-1.0.3" = { name = "_at_types_slash_estree-jsx"; packageName = "@types/estree-jsx"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/estree-jsx/-/estree-jsx-1.0.2.tgz"; - sha512 = "GNBWlGBMjiiiL5TSkvPtOteuXsiVitw5MYGY1UYlrAq0SKyczsls6sCD7TZ8fsjRsvCVxml7EbyjJezPb3DrSA=="; + url = "https://registry.npmjs.org/@types/estree-jsx/-/estree-jsx-1.0.3.tgz"; + sha512 = "pvQ+TKeRHeiUGRhvYwRrQ/ISnohKkSJR14fT2yqyZ4e9K5vqc7hrtY2Y1Dw0ZwAzQ6DQsxsaCUuSIIi8v0Cq6w=="; }; }; "@types/express-4.17.14" = { @@ -11110,13 +11209,13 @@ let sha512 = "TEbt+vaPFQ+xpxFLFssxUDXj5cWCxZJjIcB7Yg0k0GMHGtgtQgpvx/MUQUeAkNbA9AAGrwkAsoeItdTgS7FMyg=="; }; }; - "@types/express-4.17.20" = { + "@types/express-4.17.21" = { name = "_at_types_slash_express"; packageName = "@types/express"; - version = "4.17.20"; + version = "4.17.21"; src = fetchurl { - url = "https://registry.npmjs.org/@types/express/-/express-4.17.20.tgz"; - sha512 = "rOaqlkgEvOW495xErXMsmyX3WKBInbhG5eqojXYi3cGUaLoRDlXa5d52fkfWZT963AZ3v2eZ4MbKE6WpDAGVsw=="; + url = "https://registry.npmjs.org/@types/express/-/express-4.17.21.tgz"; + sha512 = "ejlPM315qwLpaQlQDTjPdsUFSc6ZsP4AN6AlWnogPjQ7CVi7PYF3YVz+CY3jE2pwYf7E/7HlDAN0rV2GxTG0HQ=="; }; }; "@types/express-serve-static-core-4.17.31" = { @@ -11128,13 +11227,13 @@ let sha512 = "DxMhY+NAsTwMMFHBTtJFNp5qiHKJ7TeqOo23zVEM9alT1Ml27Q3xcTH0xwxn7Q0BbMcVEJOs/7aQtUWupUQN3Q=="; }; }; - "@types/express-serve-static-core-4.17.39" = { + "@types/express-serve-static-core-4.17.41" = { name = "_at_types_slash_express-serve-static-core"; packageName = "@types/express-serve-static-core"; - version = "4.17.39"; + version = "4.17.41"; src = fetchurl { - url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.39.tgz"; - sha512 = "BiEUfAiGCOllomsRAZOiMFP7LAnrifHpt56pc4Z7l9K6ACyN06Ns1JLMBxwkfLOjJRlSf06NwWsT7yzfpaVpyQ=="; + url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.41.tgz"; + sha512 = "OaJ7XLaelTgrvlZD8/aa0vvvxZdUmlCn6MtWeB7TkiKW70BQLc9XEPpDLPdbo52ZhXUCrznlWdCHWxJWtdyajA=="; }; }; "@types/geojson-7946.0.4" = { @@ -11164,13 +11263,13 @@ let sha512 = "ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA=="; }; }; - "@types/hast-2.3.7" = { + "@types/hast-2.3.8" = { name = "_at_types_slash_hast"; packageName = "@types/hast"; - version = "2.3.7"; + version = "2.3.8"; src = fetchurl { - url = "https://registry.npmjs.org/@types/hast/-/hast-2.3.7.tgz"; - sha512 = "EVLigw5zInURhzfXUM65eixfadfsHKomGKUakToXo84t8gGIJuTcD2xooM2See7GyQ7DRtYjhCHnSUQez8JaLw=="; + url = "https://registry.npmjs.org/@types/hast/-/hast-2.3.8.tgz"; + sha512 = "aMIqAlFd2wTIDZuvLbhUT+TGvMxrNC8ECUIVtH6xxy0sQLs3iu6NO8Kp/VT5je7i5ufnebXzdV1dNDMnvaH6IQ=="; }; }; "@types/html-minifier-terser-6.1.0" = { @@ -11182,31 +11281,31 @@ let sha512 = "oh/6byDPnL1zeNXFrDXFLyZjkr1MsBG667IM792caf1L2UPOOMf65NFzjUH/ltyfwjAGfs1rsX1eftK0jC/KIg=="; }; }; - "@types/http-cache-semantics-4.0.3" = { + "@types/http-cache-semantics-4.0.4" = { name = "_at_types_slash_http-cache-semantics"; packageName = "@types/http-cache-semantics"; - version = "4.0.3"; + version = "4.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.3.tgz"; - sha512 = "V46MYLFp08Wf2mmaBhvgjStM3tPa+2GAdy/iqoX+noX1//zje2x4XmrIU0cAwyClATsTmahbtoQ2EwP7I5WSiA=="; + url = "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.4.tgz"; + sha512 = "1m0bIFVc7eJWyve9S0RnuRgcQqF/Xd5QsUZAZeQFr1Q3/p9JWoQQEqmVy+DPTNpGXwhgIetAoYF8JSc33q29QA=="; }; }; - "@types/http-errors-2.0.3" = { + "@types/http-errors-2.0.4" = { name = "_at_types_slash_http-errors"; packageName = "@types/http-errors"; - version = "2.0.3"; + version = "2.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.3.tgz"; - sha512 = "pP0P/9BnCj1OVvQR2lF41EkDG/lWWnDyA203b/4Fmi2eTyORnBtcDoKDwjWQthELrBvWkMOrvSOnZ8OVlW6tXA=="; + url = "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.4.tgz"; + sha512 = "D0CFMMtydbJAegzOyHjtiKPLlvnm3iTZyZRSZoLq2mRhDdmLfIWOCYPfQJ4cu2erKghU++QvjcUjp/5h7hESpA=="; }; }; - "@types/http-proxy-1.17.13" = { + "@types/http-proxy-1.17.14" = { name = "_at_types_slash_http-proxy"; packageName = "@types/http-proxy"; - version = "1.17.13"; + version = "1.17.14"; src = fetchurl { - url = "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.13.tgz"; - sha512 = "GkhdWcMNiR5QSQRYnJ+/oXzu0+7JJEPC8vkWXK351BkhjraZF+1W13CUYARUvX9+NqIU2n6YHA4iwywsc/M6Sw=="; + url = "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.14.tgz"; + sha512 = "SSrD0c1OQzlFX7pGu1eXxSEjemej64aaNPRhhVYUGqXh0BtldAAx37MG8btcumvpgKyZp1F5Gn3JkktdxiFv6w=="; }; }; "@types/inquirer-6.5.0" = { @@ -11218,58 +11317,58 @@ let sha512 = "rjaYQ9b9y/VFGOpqBEXRavc3jh0a+e6evAbI31tMda8VlPaSy0AZJfXsvmIe3wklc7W6C3zCSfleuMXR7NOyXw=="; }; }; - "@types/inquirer-8.2.9" = { + "@types/inquirer-8.2.10" = { name = "_at_types_slash_inquirer"; packageName = "@types/inquirer"; - version = "8.2.9"; + version = "8.2.10"; src = fetchurl { - url = "https://registry.npmjs.org/@types/inquirer/-/inquirer-8.2.9.tgz"; - sha512 = "5IEO2PwCy4NZDgj977dho4Qbdiw6dJZJzD4ZaB/9j7dfppf7z0xxFPKZz/FtTAUQbDjmWHJ6Jlz/gn0YzWHPsw=="; + url = "https://registry.npmjs.org/@types/inquirer/-/inquirer-8.2.10.tgz"; + sha512 = "IdD5NmHyVjWM8SHWo/kPBgtzXatwPkfwzyP3fN1jF2g9BWt5WO+8hL2F4o2GKIYsU40PpqeevuUWvkS/roXJkA=="; }; }; - "@types/is-empty-1.2.2" = { + "@types/is-empty-1.2.3" = { name = "_at_types_slash_is-empty"; packageName = "@types/is-empty"; - version = "1.2.2"; + version = "1.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/is-empty/-/is-empty-1.2.2.tgz"; - sha512 = "BmFyKRHSsE+LFmOUQIYMg/8UJ+fNX3fxev0/OXGKWxUldHD8/bQYhXsTF7wR8woS0h8CWdLK39REjQ/Fxm6bFg=="; + url = "https://registry.npmjs.org/@types/is-empty/-/is-empty-1.2.3.tgz"; + sha512 = "4J1l5d79hoIvsrKh5VUKVRA1aIdsOb10Hu5j3J2VfP/msDnfTdGPmNp2E1Wg+vs97Bktzo+MZePFFXSGoykYJw=="; }; }; - "@types/istanbul-lib-coverage-2.0.5" = { + "@types/istanbul-lib-coverage-2.0.6" = { name = "_at_types_slash_istanbul-lib-coverage"; packageName = "@types/istanbul-lib-coverage"; - version = "2.0.5"; + version = "2.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.5.tgz"; - sha512 = "zONci81DZYCZjiLe0r6equvZut0b+dBRPBN5kBDjsONnutYNtJMoWQ9uR2RkL1gLG9NMTzvf+29e5RFfPbeKhQ=="; + url = "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.6.tgz"; + sha512 = "2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w=="; }; }; - "@types/istanbul-lib-report-3.0.2" = { + "@types/istanbul-lib-report-3.0.3" = { name = "_at_types_slash_istanbul-lib-report"; packageName = "@types/istanbul-lib-report"; - version = "3.0.2"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.2.tgz"; - sha512 = "8toY6FgdltSdONav1XtUHl4LN1yTmLza+EuDazb/fEmRNCwjyqNVIQWs2IfC74IqjHkREs/nQ2FWq5kZU9IC0w=="; + url = "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.3.tgz"; + sha512 = "NQn7AHQnk/RSLOxrBbGyJM/aVQ+pjj5HCgasFxc0K/KhoATfQ/47AyUl15I2yBUpihjmas+a+VJBOqecrFH+uA=="; }; }; - "@types/istanbul-reports-3.0.3" = { + "@types/istanbul-reports-3.0.4" = { name = "_at_types_slash_istanbul-reports"; packageName = "@types/istanbul-reports"; - version = "3.0.3"; + version = "3.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.3.tgz"; - sha512 = "1nESsePMBlf0RPRffLZi5ujYh7IH1BWL4y9pr+Bn3cJBdxz+RTP8bUFljLz9HvzhhOSWKdyBZ4DIivdL6rvgZg=="; + url = "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.4.tgz"; + sha512 = "pk2B1NWalF9toCRu6gjBzR69syFjP4Od8WRAX+0mmf9lAjCRicLOWc+ZrxZHx/0XRjotgkF9t6iaMJ+aXcOdZQ=="; }; }; - "@types/jquery-3.5.25" = { + "@types/jquery-3.5.27" = { name = "_at_types_slash_jquery"; packageName = "@types/jquery"; - version = "3.5.25"; + version = "3.5.27"; src = fetchurl { - url = "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.25.tgz"; - sha512 = "gykx2c+OZf5nx2tv/5fDQqmvGgTiXshELy5jf9IgXPtVfSBl57IUYByN4osbwMXwJijWGOEYQABzGaFZE79A0Q=="; + url = "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.27.tgz"; + sha512 = "TR28Y8ezIGgfyA02UOh9x+Fy16/1qWYAnvtRd2gTBJuccX/vmddyti0MezLkTv7f+OLofVc2T961VPyKv1tXJQ=="; }; }; "@types/js-levenshtein-1.1.2" = { @@ -11290,13 +11389,13 @@ let sha512 = "k4ih8ayQ65e26vhCxeMTKtZ808DzC0RFQ4unBvPEy9bcFhS4aPm3oXgWWZNmZ4u+H2WzHQDCNrRC5iNX+afiZw=="; }; }; - "@types/json-schema-7.0.14" = { + "@types/json-schema-7.0.15" = { name = "_at_types_slash_json-schema"; packageName = "@types/json-schema"; - version = "7.0.14"; + version = "7.0.15"; src = fetchurl { - url = "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.14.tgz"; - sha512 = "U3PUjAudAdJBeC2pgN8uTIKgxrb4nlDF3SF0++EldXQvQBGkpFZMSnwQiIoDU77tv45VgNkl/L4ouD+rEomujw=="; + url = "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz"; + sha512 = "5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA=="; }; }; "@types/json5-0.0.29" = { @@ -11317,22 +11416,22 @@ let sha512 = "BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg=="; }; }; - "@types/linkify-it-3.0.4" = { + "@types/linkify-it-3.0.5" = { name = "_at_types_slash_linkify-it"; packageName = "@types/linkify-it"; - version = "3.0.4"; + version = "3.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/linkify-it/-/linkify-it-3.0.4.tgz"; - sha512 = "hPpIeeHb/2UuCw06kSNAOVWgehBLXEo0/fUs0mw3W2qhqX89PI2yvok83MnuctYGCPrabGIoi0fFso4DQ+sNUQ=="; + url = "https://registry.npmjs.org/@types/linkify-it/-/linkify-it-3.0.5.tgz"; + sha512 = "yg6E+u0/+Zjva+buc3EIb+29XEg4wltq7cSmd4Uc2EE/1nUVmxyzpX6gUXD0V8jIrG0r7YeOGVIbYRkxeooCtw=="; }; }; - "@types/lodash-4.14.200" = { + "@types/lodash-4.14.201" = { name = "_at_types_slash_lodash"; packageName = "@types/lodash"; - version = "4.14.200"; + version = "4.14.201"; src = fetchurl { - url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.200.tgz"; - sha512 = "YI/M/4HRImtNf3pJgbF+W6FrXovqj+T+/HpENLTooK9PnkacBsDpeP3IpHab40CClUfhNmdM2WTNP2sa2dni5Q=="; + url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.201.tgz"; + sha512 = "y9euML0cim1JrykNxADLfaG0FgD1g/yTHwUs/Jg9ZIU7WKj2/4IW9Lbb1WZbvck78W/lfGXFfe+u2EGfIJXdLQ=="; }; }; "@types/long-4.0.2" = { @@ -11362,49 +11461,49 @@ let sha512 = "GKMHFfv3458yYy+v/N8gjufHO6MSZKCOXpZc5GXIWWy8uldwfmPn98vp81gZ5f9SVw8YYBctgfJ22a2d7AOMeQ=="; }; }; - "@types/mdast-3.0.14" = { + "@types/mdast-3.0.15" = { name = "_at_types_slash_mdast"; packageName = "@types/mdast"; - version = "3.0.14"; + version = "3.0.15"; src = fetchurl { - url = "https://registry.npmjs.org/@types/mdast/-/mdast-3.0.14.tgz"; - sha512 = "gVZ04PGgw1qLZKsnWnyFv4ORnaJ+DXLdHTVSFbU8yX6xZ34Bjg4Q32yPkmveUP1yItXReKfB0Aknlh/3zxTKAw=="; + url = "https://registry.npmjs.org/@types/mdast/-/mdast-3.0.15.tgz"; + sha512 = "LnwD+mUEfxWMa1QpDraczIn6k0Ee3SMicuYSSzS6ZYl2gKS09EClnJYGd8Du6rfc5r/GZEk5o1mRb8TaTj03sQ=="; }; }; - "@types/mdast-4.0.2" = { + "@types/mdast-4.0.3" = { name = "_at_types_slash_mdast"; packageName = "@types/mdast"; - version = "4.0.2"; + version = "4.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/mdast/-/mdast-4.0.2.tgz"; - sha512 = "tYR83EignvhYO9iU3kDg8V28M0jqyh9zzp5GV+EO+AYnyUl3P5ltkTeJuTiFZQFz670FSb3EwT/6LQdX+UdKfw=="; + url = "https://registry.npmjs.org/@types/mdast/-/mdast-4.0.3.tgz"; + sha512 = "LsjtqsyF+d2/yFOYaN22dHZI1Cpwkrj+g06G8+qtUKlhovPW89YhqSnfKtMbkgmEtYpH2gydRNULd6y8mciAFg=="; }; }; - "@types/mdurl-1.0.4" = { + "@types/mdurl-1.0.5" = { name = "_at_types_slash_mdurl"; packageName = "@types/mdurl"; - version = "1.0.4"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/mdurl/-/mdurl-1.0.4.tgz"; - sha512 = "ARVxjAEX5TARFRzpDRVC6cEk0hUIXCCwaMhz8y7S1/PxU6zZS1UMjyobz7q4w/D/R552r4++EhwmXK1N2rAy0A=="; + url = "https://registry.npmjs.org/@types/mdurl/-/mdurl-1.0.5.tgz"; + sha512 = "6L6VymKTzYSrEf4Nev4Xa1LCHKrlTlYCBMTlQKFuddo1CvQcE52I0mwfOJayueUC7MJuXOeHTcIU683lzd0cUA=="; }; }; - "@types/mime-1.3.4" = { + "@types/mime-1.3.5" = { name = "_at_types_slash_mime"; packageName = "@types/mime"; - version = "1.3.4"; + version = "1.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/mime/-/mime-1.3.4.tgz"; - sha512 = "1Gjee59G25MrQGk8bsNvC6fxNiRgUlGn2wlhGf95a59DrprnnHk80FIMMFG9XHMdrfsuA119ht06QPDXA1Z7tw=="; + url = "https://registry.npmjs.org/@types/mime/-/mime-1.3.5.tgz"; + sha512 = "/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w=="; }; }; - "@types/mime-3.0.3" = { + "@types/mime-3.0.4" = { name = "_at_types_slash_mime"; packageName = "@types/mime"; - version = "3.0.3"; + version = "3.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/mime/-/mime-3.0.3.tgz"; - sha512 = "i8MBln35l856k5iOhKk2XJ4SeAWg75mLIpZB4v6imOagKL6twsukBZGDMNhdOVk7yRFTMPpfILocMos59Q1otQ=="; + url = "https://registry.npmjs.org/@types/mime/-/mime-3.0.4.tgz"; + sha512 = "iJt33IQnVRkqeqC7PzBHPTC6fDlRNRW8vjrgqtScAhrmMwe8c4Eo7+fUGTa+XdWrpEgpyKWMYmi2dIwMAYRzPw=="; }; }; "@types/minimatch-3.0.5" = { @@ -11425,22 +11524,22 @@ let sha512 = "K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA=="; }; }; - "@types/minimist-1.2.4" = { + "@types/minimist-1.2.5" = { name = "_at_types_slash_minimist"; packageName = "@types/minimist"; - version = "1.2.4"; + version = "1.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.4.tgz"; - sha512 = "Kfe/D3hxHTusnPNRbycJE1N77WHDsdS4AjUYIzlDzhDrS47NrwuL3YW4VITxwR7KCVpzwgy4Rbj829KSSQmwXQ=="; + url = "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.5.tgz"; + sha512 = "hov8bUuiLiyFPGyFPE1lwWhmzYbirOXQNNo40+y3zow8aFVTeyn3VWL0VFFfdNddA8S4Vf0Tc062rzyNr7Paag=="; }; }; - "@types/ms-0.7.33" = { + "@types/ms-0.7.34" = { name = "_at_types_slash_ms"; packageName = "@types/ms"; - version = "0.7.33"; + version = "0.7.34"; src = fetchurl { - url = "https://registry.npmjs.org/@types/ms/-/ms-0.7.33.tgz"; - sha512 = "AuHIyzR5Hea7ij0P9q7vx7xu4z0C28ucwjAZC0ja7JhINyCnOw8/DnvAPQQ9TfOlCtZAmCERKQX9+o1mgQhuOQ=="; + url = "https://registry.npmjs.org/@types/ms/-/ms-0.7.34.tgz"; + sha512 = "nG96G3Wp6acyAgJqGasjODb+acrI7KltPiRxzHPXnP3NgI28bpQDRv53olbqGXbfcgF5aiiHmO3xpwEpS5Ld9g=="; }; }; "@types/mute-stream-0.0.1" = { @@ -11452,13 +11551,13 @@ let sha512 = "0yQLzYhCqGz7CQPE3iDmYjhb7KMBFOP+tBkyw+/Y2YyDI5wpS7itXXxneN1zSsUwWx3Ji6YiVYrhAnpQGS/vkw=="; }; }; - "@types/mute-stream-0.0.2" = { + "@types/mute-stream-0.0.4" = { name = "_at_types_slash_mute-stream"; packageName = "@types/mute-stream"; - version = "0.0.2"; + version = "0.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/mute-stream/-/mute-stream-0.0.2.tgz"; - sha512 = "FpiGjk6+IOrN0lZEfUUjdra1csU1VxwYFj4S0Zj+TJpu5x5mZW30RkEZojTadrNZHNmpCHgoE62IQZAH0OeuIA=="; + url = "https://registry.npmjs.org/@types/mute-stream/-/mute-stream-0.0.4.tgz"; + sha512 = "CPM9nzrCPPJHQNA9keH9CVkVI+WR5kMa+7XEs5jcGQ0VoAGnLv242w8lIVgwAEfmE4oufJRaTc9PNLQl0ioAow=="; }; }; "@types/nanoid-3.0.0" = { @@ -11470,13 +11569,13 @@ let sha512 = "UXitWSmXCwhDmAKe7D3hNQtQaHeHt5L8LO1CB8GF8jlYVzOv5cBWDNqiJ+oPEWrWei3i3dkZtHY/bUtd0R/uOQ=="; }; }; - "@types/nlcst-1.0.3" = { + "@types/nlcst-1.0.4" = { name = "_at_types_slash_nlcst"; packageName = "@types/nlcst"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/nlcst/-/nlcst-1.0.3.tgz"; - sha512 = "cpO6PPMz4E++zxP2Vhp/3KVl2Nbtj+Iksb25rlRinG7mphu2zmCIKWWlqdsx1NwJEISogR2eeZTD7JqLOCzaiw=="; + url = "https://registry.npmjs.org/@types/nlcst/-/nlcst-1.0.4.tgz"; + sha512 = "ABoYdNQ/kBSsLvZAekMhIPMQ3YUZvavStpKYs7BjLLuKVmIMA0LUgZ7b54zzuWJRbHF80v1cNf4r90Vd6eMQDg=="; }; }; "@types/node-10.17.60" = { @@ -11515,13 +11614,13 @@ let sha512 = "JkRpuVz3xCNCWaeQ5EHLR/6woMbHZz/jZ7Kmc63AkU+1HxnoUugzSWMck7dsR4DvNYX8jp9wTi9K7WvnxOIQZQ=="; }; }; - "@types/node-16.18.60" = { + "@types/node-16.18.61" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "16.18.60"; + version = "16.18.61"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-16.18.60.tgz"; - sha512 = "ZUGPWx5vKfN+G2/yN7pcSNLkIkXEvlwNaJEd4e0ppX7W2S8XAkdc/37hM4OUNJB9sa0p12AOvGvxL4JCPiz9DA=="; + url = "https://registry.npmjs.org/@types/node/-/node-16.18.61.tgz"; + sha512 = "k0N7BqGhJoJzdh6MuQg1V1ragJiXTh8VUBAZTWjJ9cUq23SG0F0xavOwZbhiP4J3y20xd6jxKx+xNUhkMAi76Q=="; }; }; "@types/node-16.9.1" = { @@ -11533,22 +11632,22 @@ let sha512 = "QpLcX9ZSsq3YYUUnD3nFDY8H7wctAhQj/TFKL8Ya8v5fMm3CFXxo8zStsLAl780ltoYoo1WvKUVGBQK+1ifr7g=="; }; }; - "@types/node-18.11.19" = { + "@types/node-18.18.8" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "18.11.19"; + version = "18.18.8"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-18.11.19.tgz"; - sha512 = "YUgMWAQBWLObABqrvx8qKO1enAvBUdjZOAWQ5grBAkp5LQv45jBvYKZ3oFS9iKRCQyFjqw6iuEa1vmFqtxYLZw=="; + url = "https://registry.npmjs.org/@types/node/-/node-18.18.8.tgz"; + sha512 = "OLGBaaK5V3VRBS1bAkMVP2/W9B+H8meUfl866OrMNQqt7wDgdpWPp5o6gmIc9pB+lIQHSq4ZL8ypeH1vPxcPaQ=="; }; }; - "@types/node-18.18.8" = { + "@types/node-18.18.9" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "18.18.8"; + version = "18.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-18.18.8.tgz"; - sha512 = "OLGBaaK5V3VRBS1bAkMVP2/W9B+H8meUfl866OrMNQqt7wDgdpWPp5o6gmIc9pB+lIQHSq4ZL8ypeH1vPxcPaQ=="; + url = "https://registry.npmjs.org/@types/node/-/node-18.18.9.tgz"; + sha512 = "0f5klcuImLnG4Qreu9hPj/rEfFq6YRc5n2mAjSsH+ec/mJL+3voBH0+8T7o8RpFjH7ovc+TRsL/c7OYIQsPTfQ=="; }; }; "@types/node-20.5.9" = { @@ -11560,13 +11659,13 @@ let sha512 = "PcGNd//40kHAS3sTlzKB9C9XL4K0sTup8nbG5lC14kzEteTNuAFh9u5nA0o5TWnSG2r/JNPRXFVcHJIIeRlmqQ=="; }; }; - "@types/node-20.8.10" = { + "@types/node-20.9.0" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "20.8.10"; + version = "20.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-20.8.10.tgz"; - sha512 = "TlgT8JntpcbmKUFzjhsyhGfP2fsiz1Mv56im6enJ905xG1DAYesxJaeSbGqQmAw8OWPdhyJGhGSQGKRNJ45u9w=="; + url = "https://registry.npmjs.org/@types/node/-/node-20.9.0.tgz"; + sha512 = "nekiGu2NDb1BcVofVcEKMIwzlx4NjHlcjhoxxKBNLtz15Y1z7MYf549DFvkHSId02Ax6kGwWntIBPC3l/JZcmw=="; }; }; "@types/node-6.14.13" = { @@ -11587,121 +11686,112 @@ let sha512 = "DHqhlq5jeESLy19TYhLakJ07kNumXWjcDdxXsLUMJZ6ue8VZJj4kLPQVE/2mdHh3xZziNF1xppu5lwmS53HR+A=="; }; }; - "@types/node-fetch-2.6.8" = { + "@types/node-fetch-2.6.9" = { name = "_at_types_slash_node-fetch"; packageName = "@types/node-fetch"; - version = "2.6.8"; + version = "2.6.9"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.6.8.tgz"; - sha512 = "nnH5lV9QCMPsbEVdTb5Y+F3GQxLSw1xQgIydrb2gSfEavRPs50FnMr+KUaa+LoPSqibm2N+ZZxH7lavZlAT4GA=="; + url = "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.6.9.tgz"; + sha512 = "bQVlnMLFJ2d35DkPNjEPmd9ueO/rh5EiaZt2bhqiSarPjZIuIV6bPQVqcrEyvNo+AfTrRGVazle1tl597w3gfA=="; }; }; - "@types/node-forge-1.3.8" = { + "@types/node-forge-1.3.9" = { name = "_at_types_slash_node-forge"; packageName = "@types/node-forge"; - version = "1.3.8"; + version = "1.3.9"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node-forge/-/node-forge-1.3.8.tgz"; - sha512 = "vGXshY9vim9CJjrpcS5raqSjEfKlJcWy2HNdgUasR66fAnVEYarrf1ULV4nfvpC1nZq/moA9qyqBcu83x+Jlrg=="; + url = "https://registry.npmjs.org/@types/node-forge/-/node-forge-1.3.9.tgz"; + sha512 = "meK88cx/sTalPSLSoCzkiUB4VPIFHmxtXm5FaaqRDqBX2i/Sy8bJ4odsan0b20RBjPh06dAQ+OTTdnyQyhJZyQ=="; }; }; - "@types/normalize-package-data-2.4.3" = { + "@types/normalize-package-data-2.4.4" = { name = "_at_types_slash_normalize-package-data"; packageName = "@types/normalize-package-data"; - version = "2.4.3"; + version = "2.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.3.tgz"; - sha512 = "ehPtgRgaULsFG8x0NeYJvmyH1hmlfsNLujHe9dQEia/7MAJYdzMSi19JtchUHjmBA6XC/75dK55mzZH+RyieSg=="; + url = "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.4.tgz"; + sha512 = "37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA=="; }; }; - "@types/parse-json-4.0.1" = { + "@types/parse-json-4.0.2" = { name = "_at_types_slash_parse-json"; packageName = "@types/parse-json"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.1.tgz"; - sha512 = "3YmXzzPAdOTVljVMkTMBdBEvlOLg2cDQaDhnnhT3nT9uDbnJzjWhKlzb+desT12Y7tGqaN6d+AbozcKzyL36Ng=="; - }; - }; - "@types/parse5-5.0.3" = { - name = "_at_types_slash_parse5"; - packageName = "@types/parse5"; - version = "5.0.3"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/parse5/-/parse5-5.0.3.tgz"; - sha512 = "kUNnecmtkunAoQ3CnjmMkzNU/gtxG8guhi+Fk2U/kOpIKjIMKnXGp4IJCgQJrXSgMsWYimYG4TGjz/UzbGEBTw=="; + url = "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.2.tgz"; + sha512 = "dISoDXWWQwUquiKsyZ4Ng+HX2KsPL7LyHKHQwgGFEA3IaKac4Obd+h2a/a6waisAoepJlBcx9paWqjA8/HVjCw=="; }; }; - "@types/prop-types-15.7.9" = { + "@types/prop-types-15.7.10" = { name = "_at_types_slash_prop-types"; packageName = "@types/prop-types"; - version = "15.7.9"; + version = "15.7.10"; src = fetchurl { - url = "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.9.tgz"; - sha512 = "n1yyPsugYNSmHgxDFjicaI2+gCNjsBck8UX9kuofAKlc0h1bL+20oSF72KeNaW2DUlesbEVCFgyV2dPGTiY42g=="; + url = "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.10.tgz"; + sha512 = "mxSnDQxPqsZxmeShFH+uwQ4kO4gcJcGahjjMFeLbKE95IAZiiZyiEepGZjtXJ7hN/yfu0bu9xN2ajcU0JcxX6A=="; }; }; - "@types/pug-2.0.8" = { + "@types/pug-2.0.9" = { name = "_at_types_slash_pug"; packageName = "@types/pug"; - version = "2.0.8"; + version = "2.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@types/pug/-/pug-2.0.8.tgz"; - sha512 = "QzhsZ1dMGyJbn/D9V80zp4GIA4J4rfAjCCxc3MP+new0E8dyVdSkR735Lx+n3LIaHNFcjHL5+TbziccuT+fdoQ=="; + url = "https://registry.npmjs.org/@types/pug/-/pug-2.0.9.tgz"; + sha512 = "Yg4LkgFYvn1faISbDNWmcAC1XoDT8IoMUFspp5mnagKk+UvD2N0IWt5A7GRdMubsNWqgCLmrkf8rXkzNqb4szA=="; }; }; - "@types/qs-6.9.9" = { + "@types/qs-6.9.10" = { name = "_at_types_slash_qs"; packageName = "@types/qs"; - version = "6.9.9"; + version = "6.9.10"; src = fetchurl { - url = "https://registry.npmjs.org/@types/qs/-/qs-6.9.9.tgz"; - sha512 = "wYLxw35euwqGvTDx6zfY1vokBFnsK0HNrzc6xNHchxfO2hpuRg74GbkEW7e3sSmPvj0TjCDT1VCa6OtHXnubsg=="; + url = "https://registry.npmjs.org/@types/qs/-/qs-6.9.10.tgz"; + sha512 = "3Gnx08Ns1sEoCrWssEgTSJs/rsT2vhGP+Ja9cnnk9k4ALxinORlQneLXFeFKOTJMOeZUFD1s7w+w2AphTpvzZw=="; }; }; - "@types/range-parser-1.2.6" = { + "@types/range-parser-1.2.7" = { name = "_at_types_slash_range-parser"; packageName = "@types/range-parser"; - version = "1.2.6"; + version = "1.2.7"; src = fetchurl { - url = "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.6.tgz"; - sha512 = "+0autS93xyXizIYiyL02FCY8N+KkKPhILhcUSA276HxzreZ16kl+cmwvV2qAM/PuCCwPXzOXOWhiPcw20uSFcA=="; + url = "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.7.tgz"; + sha512 = "hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ=="; }; }; - "@types/react-18.2.34" = { + "@types/react-18.2.37" = { name = "_at_types_slash_react"; packageName = "@types/react"; - version = "18.2.34"; + version = "18.2.37"; src = fetchurl { - url = "https://registry.npmjs.org/@types/react/-/react-18.2.34.tgz"; - sha512 = "U6eW/alrRk37FU/MS2RYMjx0Va2JGIVXELTODaTIYgvWGCV4Y4TfTUzG8DdmpDNIT0Xpj/R7GfyHOJJrDttcvg=="; + url = "https://registry.npmjs.org/@types/react/-/react-18.2.37.tgz"; + sha512 = "RGAYMi2bhRgEXT3f4B92WTohopH6bIXw05FuGlmJEnv/omEn190+QYEIYxIAuIBdKgboYYdVved2p1AxZVQnaw=="; }; }; - "@types/react-dom-18.2.14" = { + "@types/react-dom-18.2.15" = { name = "_at_types_slash_react-dom"; packageName = "@types/react-dom"; - version = "18.2.14"; + version = "18.2.15"; src = fetchurl { - url = "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.2.14.tgz"; - sha512 = "V835xgdSVmyQmI1KLV2BEIUgqEuinxp9O4G6g3FqO/SqLac049E53aysv0oEFD2kHfejeKU+ZqL2bcFWj9gLAQ=="; + url = "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.2.15.tgz"; + sha512 = "HWMdW+7r7MR5+PZqJF6YFNSCtjz1T0dsvo/f1BV6HkV+6erD/nA7wd9NM00KVG83zf2nJ7uATPO9ttdIPvi3gg=="; }; }; - "@types/readdir-glob-1.1.3" = { + "@types/readdir-glob-1.1.4" = { name = "_at_types_slash_readdir-glob"; packageName = "@types/readdir-glob"; - version = "1.1.3"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/readdir-glob/-/readdir-glob-1.1.3.tgz"; - sha512 = "trCChHpWDGCJCUPJRwD62eapW4KOru6h4S7n9KUIESaxhyBM/2Jh20P3XrFRQQ6Df78E/rq2DbUCVZlI8CXPnA=="; + url = "https://registry.npmjs.org/@types/readdir-glob/-/readdir-glob-1.1.4.tgz"; + sha512 = "uEJsErL2wFCTcbbmJpIuD8OWYNabgv1oaYP2bOkzZXKtk3c6LCYQEKngIqBj2VR2NMv9DOAXSkxSYOWtHxh2gQ=="; }; }; - "@types/responselike-1.0.2" = { + "@types/responselike-1.0.3" = { name = "_at_types_slash_responselike"; packageName = "@types/responselike"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.2.tgz"; - sha512 = "/4YQT5Kp6HxUDb4yhRkm0bJ7TbjvTddqX7PZ5hz6qV3pxSo72f/6YPRo+Mu2DU307tm9IioO69l7uAwn5XNcFA=="; + url = "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.3.tgz"; + sha512 = "H/+L+UkTV33uf49PH5pCAUBVPNj2nDBXTN+qS1dOwyyg24l3CcicicCA7ca+HMvJBZcFgl5r8e+RR6elsb4Lyw=="; }; }; "@types/retry-0.12.0" = { @@ -11713,31 +11803,22 @@ let sha512 = "wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA=="; }; }; - "@types/retry-0.12.4" = { + "@types/retry-0.12.5" = { name = "_at_types_slash_retry"; packageName = "@types/retry"; - version = "0.12.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/retry/-/retry-0.12.4.tgz"; - sha512 = "l1YzFLj8Y6OhLdt7HKXlz56DoEmksB7qR8KVk+MpFsS4duwnoszLgDlLxJB0vgSqtg/rAS5gmYg5Bjw2sMJ8Ew=="; - }; - }; - "@types/sarif-2.1.6" = { - name = "_at_types_slash_sarif"; - packageName = "@types/sarif"; - version = "2.1.6"; + version = "0.12.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/sarif/-/sarif-2.1.6.tgz"; - sha512 = "x+68l19JJnfXX9oq85k6KZwsPuOa2BKESkYqbRbA09zLSZXIDNyDo1illgDB/P0ZdpIa4EII3pHJ6DQq3xo3Qw=="; + url = "https://registry.npmjs.org/@types/retry/-/retry-0.12.5.tgz"; + sha512 = "3xSjTp3v03X/lSQLkczaN9UIEwJMoMCA1+Nb5HfbJEQWogdeQIyVtTvxPXDQjZ5zws8rFQfVfRdz03ARihPJgw=="; }; }; - "@types/scheduler-0.16.5" = { + "@types/scheduler-0.16.6" = { name = "_at_types_slash_scheduler"; packageName = "@types/scheduler"; - version = "0.16.5"; + version = "0.16.6"; src = fetchurl { - url = "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.5.tgz"; - sha512 = "s/FPdYRmZR8SjLWGMCuax7r3qCWQw9QKHzXVukAuuIJkXkDRwp+Pu5LMIVFi0Fxbav35WURicYr8u1QsoybnQw=="; + url = "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.6.tgz"; + sha512 = "Vlktnchmkylvc9SnwwwozTv04L/e1NykF5vgoQ0XTmI8DD+wxfjQuHuvHS3p0r2jz2x2ghPs2h1FVeDirIteWA=="; }; }; "@types/seedrandom-3.0.1" = { @@ -11749,58 +11830,67 @@ let sha512 = "giB9gzDeiCeloIXDgzFBCgjj1k4WxcDrZtGl6h1IqmUPlxF+Nx8Ve+96QCyDZ/HseB/uvDsKbpib9hU5cU53pw=="; }; }; - "@types/semver-7.5.4" = { + "@types/semver-7.5.5" = { name = "_at_types_slash_semver"; packageName = "@types/semver"; - version = "7.5.4"; + version = "7.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/semver/-/semver-7.5.4.tgz"; - sha512 = "MMzuxN3GdFwskAnb6fz0orFvhfqi752yjaXylr0Rp4oDg5H0Zn1IuyRhDVvYOwAXoJirx2xuS16I3WjxnAIHiQ=="; + url = "https://registry.npmjs.org/@types/semver/-/semver-7.5.5.tgz"; + sha512 = "+d+WYC1BxJ6yVOgUgzK8gWvp5qF8ssV5r4nsDcZWKRWcDQLQ619tvWAxJQYGgBrO1MnLJC7a5GtiYsAoQ47dJg=="; }; }; - "@types/send-0.17.3" = { + "@types/send-0.17.4" = { name = "_at_types_slash_send"; packageName = "@types/send"; - version = "0.17.3"; + version = "0.17.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/send/-/send-0.17.3.tgz"; - sha512 = "/7fKxvKUoETxjFUsuFlPB9YndePpxxRAOfGC/yJdc9kTjTeP5kRCTzfnE8kPUKCeyiyIZu0YQ76s50hCedI1ug=="; + url = "https://registry.npmjs.org/@types/send/-/send-0.17.4.tgz"; + sha512 = "x2EM6TJOybec7c52BX0ZspPodMsQUd5L6PRwOunVyVUhXiBSKf3AezDL8Dgvgt5o0UfKNfuA0eMLr2wLT4AiBA=="; }; }; - "@types/serve-index-1.9.3" = { + "@types/serve-index-1.9.4" = { name = "_at_types_slash_serve-index"; packageName = "@types/serve-index"; - version = "1.9.3"; + version = "1.9.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/serve-index/-/serve-index-1.9.3.tgz"; - sha512 = "4KG+yMEuvDPRrYq5fyVm/I2uqAJSAwZK9VSa+Zf+zUq9/oxSSvy3kkIqyL+jjStv6UCVi8/Aho0NHtB1Fwosrg=="; + url = "https://registry.npmjs.org/@types/serve-index/-/serve-index-1.9.4.tgz"; + sha512 = "qLpGZ/c2fhSs5gnYsQxtDEq3Oy8SXPClIXkW5ghvAvsNuVSA8k+gCONcUCS/UjLEYvYps+e8uBtfgXgvhwfNug=="; }; }; - "@types/serve-static-1.15.4" = { + "@types/serve-static-1.15.5" = { name = "_at_types_slash_serve-static"; packageName = "@types/serve-static"; - version = "1.15.4"; + version = "1.15.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.4.tgz"; - sha512 = "aqqNfs1XTF0HDrFdlY//+SGUxmdSUbjeRXb5iaZc3x0/vMbYmdw9qvOgHWOyyLFxSSRnUuP5+724zBgfw8/WAw=="; + url = "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.5.tgz"; + sha512 = "PDRk21MnK70hja/YF8AHfC7yIsiQHn1rcXx7ijCFBX/k+XQJhQT/gw3xekXKJvx+5SXaMMS8oqQy09Mzvz2TuQ=="; }; }; - "@types/sizzle-2.3.5" = { + "@types/shimmer-1.0.5" = { + name = "_at_types_slash_shimmer"; + packageName = "@types/shimmer"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/shimmer/-/shimmer-1.0.5.tgz"; + sha512 = "9Hp0ObzwwO57DpLFF0InUjUm/II8GmKAvzbefxQTihCb7KI6yc9yzf0nLc4mVdby5N4DRCgQM2wCup9KTieeww=="; + }; + }; + "@types/sizzle-2.3.6" = { name = "_at_types_slash_sizzle"; packageName = "@types/sizzle"; - version = "2.3.5"; + version = "2.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.5.tgz"; - sha512 = "tAe4Q+OLFOA/AMD+0lq8ovp8t3ysxAOeaScnfNdZpUxaGl51ZMDEITxkvFl1STudQ58mz6gzVGl9VhMKhwRnZQ=="; + url = "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.6.tgz"; + sha512 = "m04Om5Gz6kbjUwAQ7XJJQ30OdEFsSmAVsvn4NYwcTRyMVpKKa1aPuESw1n2CxS5fYkOQv3nHgDKeNa8e76fUkw=="; }; }; - "@types/sockjs-0.3.35" = { + "@types/sockjs-0.3.36" = { name = "_at_types_slash_sockjs"; packageName = "@types/sockjs"; - version = "0.3.35"; + version = "0.3.36"; src = fetchurl { - url = "https://registry.npmjs.org/@types/sockjs/-/sockjs-0.3.35.tgz"; - sha512 = "tIF57KB+ZvOBpAQwSaACfEu7htponHXaFzP7RfKYgsOS0NoYnn+9+jzp7bbq4fWerizI3dTB4NfAZoyeQKWJLw=="; + url = "https://registry.npmjs.org/@types/sockjs/-/sockjs-0.3.36.tgz"; + sha512 = "MK9V6NzAS1+Ud7JV9lJLFqW85VbC9dq3LmwZCuBe4wBDgKC0Kj/jd8Xl+nSviU+Qc3+m7umHHyHg//2KSa0a0Q=="; }; }; "@types/superagent-3.8.2" = { @@ -11812,40 +11902,40 @@ let sha512 = "kdU8ydio1weSvhIIh9rptZ6MdMiR2NQGFnlnZ5qQ7OiQS1ej79zK4GaJ9qX3naSTpOA7iWqwUnZCQpd7SpD1NA=="; }; }; - "@types/supports-color-8.1.2" = { + "@types/supports-color-8.1.3" = { name = "_at_types_slash_supports-color"; packageName = "@types/supports-color"; - version = "8.1.2"; + version = "8.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/supports-color/-/supports-color-8.1.2.tgz"; - sha512 = "nhs1D8NjNueBqRBhBTsc81g90g7VBD4wnMTMy9oP+QIldHuJkE655QTL2D1jkj3LyCd+Q5Y69oOpfxN1l0eCMA=="; + url = "https://registry.npmjs.org/@types/supports-color/-/supports-color-8.1.3.tgz"; + sha512 = "Hy6UMpxhE3j1tLpl27exp1XqHD7n8chAiNPzWfz16LPZoMMoSc4dzLl6w9qijkEb/r5O1ozdu1CWGA2L83ZeZg=="; }; }; - "@types/through-0.0.32" = { + "@types/through-0.0.33" = { name = "_at_types_slash_through"; packageName = "@types/through"; - version = "0.0.32"; + version = "0.0.33"; src = fetchurl { - url = "https://registry.npmjs.org/@types/through/-/through-0.0.32.tgz"; - sha512 = "7XsfXIsjdfJM2wFDRAtEWp3zb2aVPk5QeyZxGlVK57q4u26DczMHhJmlhr0Jqv0THwxam/L8REXkj8M2I/lcvw=="; + url = "https://registry.npmjs.org/@types/through/-/through-0.0.33.tgz"; + sha512 = "HsJ+z3QuETzP3cswwtzt2vEIiHBk/dCcHGhbmG5X3ecnwFD/lPrMpliGXxSCg03L9AhrdwA4Oz/qfspkDW+xGQ=="; }; }; - "@types/tinycolor2-1.4.5" = { + "@types/tinycolor2-1.4.6" = { name = "_at_types_slash_tinycolor2"; packageName = "@types/tinycolor2"; - version = "1.4.5"; + version = "1.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/@types/tinycolor2/-/tinycolor2-1.4.5.tgz"; - sha512 = "uLJijDHN5E6j5n1qefF9oaeplgszXglWXWTviMoFr/YxgvbyrkFil20yDT7ljhCiTQ/BfCYtxfJS81LdTro5DQ=="; + url = "https://registry.npmjs.org/@types/tinycolor2/-/tinycolor2-1.4.6.tgz"; + sha512 = "iEN8J0BoMnsWBqjVbWH/c0G0Hh7O21lpR2/+PrvAVgWdzL7eexIFm4JN/Wn10PTcmNdtS6U67r499mlWMXOxNw=="; }; }; - "@types/triple-beam-1.3.4" = { + "@types/triple-beam-1.3.5" = { name = "_at_types_slash_triple-beam"; packageName = "@types/triple-beam"; - version = "1.3.4"; + version = "1.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/triple-beam/-/triple-beam-1.3.4.tgz"; - sha512 = "HlJjF3wxV4R2VQkFpKe0YqJLilYNgtRtsqqZtby7RkVsSs+i+vbyzjtUwpFEdUCKcrGzCiEJE7F/0mKjh0sunA=="; + url = "https://registry.npmjs.org/@types/triple-beam/-/triple-beam-1.3.5.tgz"; + sha512 = "6WaYesThRMCl19iryMYP7/x2OVgCtbIVflDGFpWnb9irXI3UjYE4AzmYuiUKY1AJstGijoY+MgUszMgRxIYTYw=="; }; }; "@types/tunnel-0.0.3" = { @@ -11857,31 +11947,31 @@ let sha512 = "sOUTGn6h1SfQ+gbgqC364jLFBw2lnFqkgF3q0WovEHRLMrVD1sd5aufqi/aJObLekJO+Aq5z646U4Oxy6shXMA=="; }; }; - "@types/unist-2.0.9" = { + "@types/unist-2.0.10" = { name = "_at_types_slash_unist"; packageName = "@types/unist"; - version = "2.0.9"; + version = "2.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/@types/unist/-/unist-2.0.9.tgz"; - sha512 = "zC0iXxAv1C1ERURduJueYzkzZ2zaGyc+P2c95hgkikHPr3z8EdUZOlgEQ5X0DRmwDZn+hekycQnoeiiRVrmilQ=="; + url = "https://registry.npmjs.org/@types/unist/-/unist-2.0.10.tgz"; + sha512 = "IfYcSBWE3hLpBg8+X2SEa8LVkJdJEkT2Ese2aaLs3ptGdVtABxndrMaxuFlQ1qdFf9Q5rDvDpxI3WwgvKFAsQA=="; }; }; - "@types/unist-3.0.1" = { + "@types/unist-3.0.2" = { name = "_at_types_slash_unist"; packageName = "@types/unist"; - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/unist/-/unist-3.0.1.tgz"; - sha512 = "ue/hDUpPjC85m+PM9OQDMZr3LywT+CT6mPsQq8OJtCLiERkGRcQUFvu9XASF5XWqyZFXbf15lvb3JFJ4dRLWPg=="; + url = "https://registry.npmjs.org/@types/unist/-/unist-3.0.2.tgz"; + sha512 = "dqId9J8K/vGi5Zr7oo212BGii5m3q5Hxlkwy3WpYuKPklmBEvsbMYYyLxAQpSffdLl/gdW0XUpKWFvYmyoWCoQ=="; }; }; - "@types/urijs-1.19.22" = { + "@types/urijs-1.19.23" = { name = "_at_types_slash_urijs"; packageName = "@types/urijs"; - version = "1.19.22"; + version = "1.19.23"; src = fetchurl { - url = "https://registry.npmjs.org/@types/urijs/-/urijs-1.19.22.tgz"; - sha512 = "qnYBwfN7O/+i6E1Kr8JaCKsrCLpRCiQ1XxkSxNIYuJ/5Aagt0+HlMX78DJMUrNzDULMz0eu2gcprlxJaDtACOw=="; + url = "https://registry.npmjs.org/@types/urijs/-/urijs-1.19.23.tgz"; + sha512 = "3Zbk6RzmIpvKTNEHO2RcPOGHM++BQEITMqBRR1Ju32WbruhV/pygYgxiP3xA0b1B88zjzs0Izzjxsbj768+IjA=="; }; }; "@types/vscode-1.75.1" = { @@ -11911,22 +12001,22 @@ let sha512 = "ltIpx+kM7g/MLRZfkbL7EsCEjfzCcScLpkg37eXEtx5kmrAKBkTJwd1GIAjDSL8wTpM6Hzn5YO4pSb91BEwu1g=="; }; }; - "@types/ws-8.5.8" = { + "@types/ws-8.5.9" = { name = "_at_types_slash_ws"; packageName = "@types/ws"; - version = "8.5.8"; + version = "8.5.9"; src = fetchurl { - url = "https://registry.npmjs.org/@types/ws/-/ws-8.5.8.tgz"; - sha512 = "flUksGIQCnJd6sZ1l5dqCEG/ksaoAg/eUwiLAGTJQcfgvZJKF++Ta4bJA6A5aPSJmsr+xlseHn4KLgVlNnvPTg=="; + url = "https://registry.npmjs.org/@types/ws/-/ws-8.5.9.tgz"; + sha512 = "jbdrY0a8lxfdTp/+r7Z4CkycbOFN8WX+IOchLJr3juT/xzbJ8URyTVSJ/hvNdadTgM1mnedb47n+Y31GsFnQlg=="; }; }; - "@types/yargs-15.0.17" = { + "@types/yargs-15.0.18" = { name = "_at_types_slash_yargs"; packageName = "@types/yargs"; - version = "15.0.17"; + version = "15.0.18"; src = fetchurl { - url = "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.17.tgz"; - sha512 = "cj53I8GUcWJIgWVTSVe2L7NJAB5XWGdsoMosVvUgv1jEnMbAcsbaCzt1coUcyi8Sda5PgTWAooG8jNyDTD+CWA=="; + url = "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.18.tgz"; + sha512 = "DDi2KmvAnNsT/EvU8jp1UR7pOJojBtJ3GLZ/uw1MUq4VbbESppPWoHUY4h0OB4BbEbGJiyEsmUcuZDZtoR+ZwQ=="; }; }; "@types/yargs-16.0.5" = { @@ -11938,22 +12028,22 @@ let sha512 = "AxO/ADJOBFJScHbWhq2xAhlWP24rY4aCEG/NFaMvbT3X2MgRsLjhjQwsn0Zi5zn0LG9jUhCCZMeX9Dkuw6k+vQ=="; }; }; - "@types/yargs-parser-21.0.2" = { + "@types/yargs-parser-21.0.3" = { name = "_at_types_slash_yargs-parser"; packageName = "@types/yargs-parser"; - version = "21.0.2"; + version = "21.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.2.tgz"; - sha512 = "5qcvofLPbfjmBfKaLfj/+f+Sbd6pN4zl7w7VSVI5uz7m9QZTuB2aZAa2uo1wHFBNN2x6g/SoTkXmd8mQnQF2Cw=="; + url = "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.3.tgz"; + sha512 = "I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ=="; }; }; - "@types/yauzl-2.10.2" = { + "@types/yauzl-2.10.3" = { name = "_at_types_slash_yauzl"; packageName = "@types/yauzl"; - version = "2.10.2"; + version = "2.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.2.tgz"; - sha512 = "Km7XAtUIduROw7QPgvcft0lIupeG8a8rdKL8RiSyKvlE7dYY31fEn41HVuQsRFDuROA8tA4K2UVL+WdfFmErBA=="; + url = "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.3.tgz"; + sha512 = "oJoftv0LSuaDZE3Le4DbKX+KS9G36NzOeSap90UIK0yMA/NhKJhqlSGtNDORNRaIbQfzjXDrQa0ytJ6mNRGz/Q=="; }; }; "@types/yoga-layout-1.9.2" = { @@ -11974,13 +12064,13 @@ let sha512 = "xuv6ghKGoiq856Bww/yVYnXGsKa588kY3M0XK7uUW/3fJNNULKRfZfSBkMTSpqGG/8ZCXCadfh8G/z/B4aqS/A=="; }; }; - "@typescript-eslint/eslint-plugin-6.9.1" = { + "@typescript-eslint/eslint-plugin-6.10.0" = { name = "_at_typescript-eslint_slash_eslint-plugin"; packageName = "@typescript-eslint/eslint-plugin"; - version = "6.9.1"; + version = "6.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.9.1.tgz"; - sha512 = "w0tiiRc9I4S5XSXXrMHOWgHgxbrBn1Ro+PmiYhSg2ZVdxrAJtQgzU5o2m1BfP6UOn7Vxcc6152vFjQfmZR4xEg=="; + url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.10.0.tgz"; + sha512 = "uoLj4g2OTL8rfUQVx2AFO1hp/zja1wABJq77P6IclQs6I/m9GLrm7jCdgzZkvWdDCQf1uEvoa8s8CupsgWQgVg=="; }; }; "@typescript-eslint/parser-6.0.0" = { @@ -11992,13 +12082,13 @@ let sha512 = "TNaufYSPrr1U8n+3xN+Yp9g31vQDJqhXzzPSHfQDLcaO4tU+mCfODPxCwf4H530zo7aUBE3QIdxCXamEnG04Tg=="; }; }; - "@typescript-eslint/parser-6.9.1" = { + "@typescript-eslint/parser-6.10.0" = { name = "_at_typescript-eslint_slash_parser"; packageName = "@typescript-eslint/parser"; - version = "6.9.1"; + version = "6.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.9.1.tgz"; - sha512 = "C7AK2wn43GSaCUZ9do6Ksgi2g3mwFkMO3Cis96kzmgudoVaKyt62yNzJOktP0HDLb/iO2O0n2lBOzJgr6Q/cyg=="; + url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.10.0.tgz"; + sha512 = "+sZwIj+s+io9ozSxIWbNB5873OSdfeBEH/FR0re14WLI6BaKuSOnnwCJ2foUiu8uXf4dRp1UqHP0vrZ1zXGrog=="; }; }; "@typescript-eslint/scope-manager-6.0.0" = { @@ -12010,13 +12100,13 @@ let sha512 = "o4q0KHlgCZTqjuaZ25nw5W57NeykZT9LiMEG4do/ovwvOcPnDO1BI5BQdCsUkjxFyrCL0cSzLjvIMfR9uo7cWg=="; }; }; - "@typescript-eslint/scope-manager-6.9.1" = { + "@typescript-eslint/scope-manager-6.10.0" = { name = "_at_typescript-eslint_slash_scope-manager"; packageName = "@typescript-eslint/scope-manager"; - version = "6.9.1"; + version = "6.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.9.1.tgz"; - sha512 = "38IxvKB6NAne3g/+MyXMs2Cda/Sz+CEpmm+KLGEM8hx/CvnSRuw51i8ukfwB/B/sESdeTGet1NH1Wj7I0YXswg=="; + url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.10.0.tgz"; + sha512 = "TN/plV7dzqqC2iPNf1KrxozDgZs53Gfgg5ZHyw8erd6jd5Ta/JIEcdCheXFt9b1NYb93a1wmIIVW/2gLkombDg=="; }; }; "@typescript-eslint/type-utils-6.0.0" = { @@ -12028,13 +12118,13 @@ let sha512 = "ah6LJvLgkoZ/pyJ9GAdFkzeuMZ8goV6BH7eC9FPmojrnX9yNCIsfjB+zYcnex28YO3RFvBkV6rMV6WpIqkPvoQ=="; }; }; - "@typescript-eslint/type-utils-6.9.1" = { + "@typescript-eslint/type-utils-6.10.0" = { name = "_at_typescript-eslint_slash_type-utils"; packageName = "@typescript-eslint/type-utils"; - version = "6.9.1"; + version = "6.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.9.1.tgz"; - sha512 = "eh2oHaUKCK58qIeYp19F5V5TbpM52680sB4zNSz29VBQPTWIlE/hCj5P5B1AChxECe/fmZlspAWFuRniep1Skg=="; + url = "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.10.0.tgz"; + sha512 = "wYpPs3hgTFblMYwbYWPT3eZtaDOjbLyIYuqpwuLBBqhLiuvJ+9sEp2gNRJEtR5N/c9G1uTtQQL5AhV0fEPJYcg=="; }; }; "@typescript-eslint/types-6.0.0" = { @@ -12046,13 +12136,13 @@ let sha512 = "Zk9KDggyZM6tj0AJWYYKgF0yQyrcnievdhG0g5FqyU3Y2DRxJn4yWY21sJC0QKBckbsdKKjYDV2yVrrEvuTgxg=="; }; }; - "@typescript-eslint/types-6.9.1" = { + "@typescript-eslint/types-6.10.0" = { name = "_at_typescript-eslint_slash_types"; packageName = "@typescript-eslint/types"; - version = "6.9.1"; + version = "6.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.9.1.tgz"; - sha512 = "BUGslGOb14zUHOUmDB2FfT6SI1CcZEJYfF3qFwBeUrU6srJfzANonwRYHDpLBuzbq3HaoF2XL2hcr01c8f8OaQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.10.0.tgz"; + sha512 = "36Fq1PWh9dusgo3vH7qmQAj5/AZqARky1Wi6WpINxB6SkQdY5vQoT2/7rW7uBIsPDcvvGCLi4r10p0OJ7ITAeg=="; }; }; "@typescript-eslint/typescript-estree-6.0.0" = { @@ -12064,13 +12154,13 @@ let sha512 = "2zq4O7P6YCQADfmJ5OTDQTP3ktajnXIRrYAtHM9ofto/CJZV3QfJ89GEaM2BNGeSr1KgmBuLhEkz5FBkS2RQhQ=="; }; }; - "@typescript-eslint/typescript-estree-6.9.1" = { + "@typescript-eslint/typescript-estree-6.10.0" = { name = "_at_typescript-eslint_slash_typescript-estree"; packageName = "@typescript-eslint/typescript-estree"; - version = "6.9.1"; + version = "6.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.9.1.tgz"; - sha512 = "U+mUylTHfcqeO7mLWVQ5W/tMLXqVpRv61wm9ZtfE5egz7gtnmqVIw9ryh0mgIlkKk9rZLY3UHygsBSdB9/ftyw=="; + url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.10.0.tgz"; + sha512 = "ek0Eyuy6P15LJVeghbWhSrBCj/vJpPXXR+EpaRZqou7achUWL8IdYnMSC5WHAeTWswYQuP2hAZgij/bC9fanBg=="; }; }; "@typescript-eslint/utils-6.0.0" = { @@ -12082,13 +12172,13 @@ let sha512 = "SOr6l4NB6HE4H/ktz0JVVWNXqCJTOo/mHnvIte1ZhBQ0Cvd04x5uKZa3zT6tiodL06zf5xxdK8COiDvPnQ27JQ=="; }; }; - "@typescript-eslint/utils-6.9.1" = { + "@typescript-eslint/utils-6.10.0" = { name = "_at_typescript-eslint_slash_utils"; packageName = "@typescript-eslint/utils"; - version = "6.9.1"; + version = "6.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.9.1.tgz"; - sha512 = "L1T0A5nFdQrMVunpZgzqPL6y2wVreSyHhKGZryS6jrEN7bD9NplVAyMryUhXsQ4TWLnZmxc2ekar/lSGIlprCA=="; + url = "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.10.0.tgz"; + sha512 = "v+pJ1/RcVyRc0o4wAGux9x42RHmAjIGzPRo538Z8M1tVx6HOnoQBCX/NoadHQlZeC+QO2yr4nNSFWOoraZCAyg=="; }; }; "@typescript-eslint/visitor-keys-6.0.0" = { @@ -12100,13 +12190,13 @@ let sha512 = "cvJ63l8c0yXdeT5POHpL0Q1cZoRcmRKFCtSjNGJxPkcP571EfZMcNbzWAc7oK3D1dRzm/V5EwtkANTZxqvuuUA=="; }; }; - "@typescript-eslint/visitor-keys-6.9.1" = { + "@typescript-eslint/visitor-keys-6.10.0" = { name = "_at_typescript-eslint_slash_visitor-keys"; packageName = "@typescript-eslint/visitor-keys"; - version = "6.9.1"; + version = "6.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.9.1.tgz"; - sha512 = "MUaPUe/QRLEffARsmNfmpghuQkW436DvESW+h+M52w0coICHRfD6Np9/K6PdACwnrq1HmuLl+cSPZaJmeVPkSw=="; + url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.10.0.tgz"; + sha512 = "xMGluxQIEtOM7bqFCo+rCMh5fqI+ZxV5RUUOa29iVPz1OgCZrtc7rFnz5cLUazlkPKYqX+75iuDq7m0HQ48nCg=="; }; }; "@ungap/structured-clone-1.2.0" = { @@ -12154,22 +12244,22 @@ let sha512 = "1O/biKiVhhn0EtvDF4UOvz325K4RrLupfL8rHcmqD2TBLv4qVDWQuzx4JGa1FfqjjRb+C9TNZ6w19f32Mq85Ug=="; }; }; - "@vercel/build-utils-7.2.2" = { + "@vercel/build-utils-7.2.3" = { name = "_at_vercel_slash_build-utils"; packageName = "@vercel/build-utils"; - version = "7.2.2"; + version = "7.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/build-utils/-/build-utils-7.2.2.tgz"; - sha512 = "CUMgVKTJCba5tGe+KZaVvwGUCsuSeuNEmPIzMggIMDtzdqllRu8+QjjIhEI+unHoYvUgGfen6Z5lMeMo9Ne0qQ=="; + url = "https://registry.npmjs.org/@vercel/build-utils/-/build-utils-7.2.3.tgz"; + sha512 = "mo1w4SXUN+obQlg9wMTdc9xLJnrfubpreZmOTyK70icOcCEOXP5sKm044/PM2GZrzkWIXYYAfcMxNnOmWQMR0g=="; }; }; - "@vercel/error-utils-2.0.1" = { + "@vercel/error-utils-2.0.2" = { name = "_at_vercel_slash_error-utils"; packageName = "@vercel/error-utils"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/error-utils/-/error-utils-2.0.1.tgz"; - sha512 = "ZUVpRFArh5eyKpJmdfEuCaMpZKQvZgUq0pQ7PdK8m5FgRYEvF4I0TMJH3JnkbYaMMUH82aYWZr+/hFJtEBcmTQ=="; + url = "https://registry.npmjs.org/@vercel/error-utils/-/error-utils-2.0.2.tgz"; + sha512 = "Sj0LFafGpYr6pfCqrQ82X6ukRl5qpmVrHM/191kNYFqkkB9YkjlMAj6QcEsvCG259x4QZ7Tya++0AB85NDPbKQ=="; }; }; "@vercel/fun-1.1.0" = { @@ -12190,13 +12280,13 @@ let sha512 = "iTEA0vY6RBPuEzkwUTVzSHDATo1aF6bdLLspI68mQ/BTbi5UQEGjpjyzdKOVcSYApDtFU6M6vypZ1t4vIEnHvw=="; }; }; - "@vercel/gatsby-plugin-vercel-builder-2.0.8" = { + "@vercel/gatsby-plugin-vercel-builder-2.0.9" = { name = "_at_vercel_slash_gatsby-plugin-vercel-builder"; packageName = "@vercel/gatsby-plugin-vercel-builder"; - version = "2.0.8"; + version = "2.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/gatsby-plugin-vercel-builder/-/gatsby-plugin-vercel-builder-2.0.8.tgz"; - sha512 = "cK6YR0jLP6gLFXYk74JGP5IDSXP8u6mtIhWQ63Ud0eQId0HZZJNy+LCOhSSRDupbC0+lAWsHiEMsBBtkDMKWLg=="; + url = "https://registry.npmjs.org/@vercel/gatsby-plugin-vercel-builder/-/gatsby-plugin-vercel-builder-2.0.9.tgz"; + sha512 = "TwGki2MRL4o75ji/4MOjjpfKP6vq87oME/qpBpcWl+CYt/mx3NaWnNwjhEoEkakrZrrHp0Aw9HYBeAksWsjudw=="; }; }; "@vercel/go-3.0.3" = { @@ -12217,13 +12307,13 @@ let sha512 = "4PYk4LeIWPTjGtgnxvB0Hdw7aqCau843/96K2xX3z9pa0Hn//pUnZBMz2jrs5MRseCm1Li1LdQAK3u8/vaUnVQ=="; }; }; - "@vercel/next-4.0.11" = { + "@vercel/next-4.0.14" = { name = "_at_vercel_slash_next"; packageName = "@vercel/next"; - version = "4.0.11"; + version = "4.0.14"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/next/-/next-4.0.11.tgz"; - sha512 = "eoSZW6vE9jaIksBwiV/EM7bYK8A3R2+u0a0wNv53kYi1R8QD2SUmLcwzpT13Z5/YF3Gk9AKsC8lLzqgNzeI4PQ=="; + url = "https://registry.npmjs.org/@vercel/next/-/next-4.0.14.tgz"; + sha512 = "29x93X278ElpbftrSgHvdY9OGVZkHurm3ST/WbdyE/AASEuqwOvShkpAoQl8idlFJFHPjd4c2v5xv1ZVyEb6sg=="; }; }; "@vercel/nft-0.24.2" = { @@ -12235,13 +12325,13 @@ let sha512 = "KhY3Ky/lCqE+fHpOXiKOLnXYJ49PZh1dyDSfVtZhmYtmica0NQgyO6kPOAGDNWqD9IOBx8hb65upxxjfnfa1JA=="; }; }; - "@vercel/node-3.0.7" = { + "@vercel/node-3.0.9" = { name = "_at_vercel_slash_node"; packageName = "@vercel/node"; - version = "3.0.7"; + version = "3.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/node/-/node-3.0.7.tgz"; - sha512 = "0KrDGi6z+qPtCyC7wSHmHDU/ot352AJpAeAO1OIEYqYFsYwzvwuyu7TbGGwiUbtolij4/EBUCls3YmwADM/vKw=="; + url = "https://registry.npmjs.org/@vercel/node/-/node-3.0.9.tgz"; + sha512 = "vDkxXdO6aZQWrvYOZpUtz7WTcpdUn2cgjmqdEztjK3tnXAp988FcCNTivGG/uDUmsQPIQ/XQvUjkBRLlIWTSeA=="; }; }; "@vercel/python-4.1.0" = { @@ -12262,13 +12352,13 @@ let sha512 = "9iWTxfMkC7yNnwN2xxOdptiIDAgXe1V1fh3aw92MWt5PBRcFY9RqgIPF7Q3Qa7yzQFgpbHwCnSTqWO+HCEuFtw=="; }; }; - "@vercel/remix-builder-2.0.10" = { + "@vercel/remix-builder-2.0.11" = { name = "_at_vercel_slash_remix-builder"; packageName = "@vercel/remix-builder"; - version = "2.0.10"; + version = "2.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/remix-builder/-/remix-builder-2.0.10.tgz"; - sha512 = "RRVIodMFWHkw/Y3Cko4A5vIVuom8Ox+XwS5kqsW4tpSKWL9eBD3mVmNPR7MDQdt5v/9sL+8o2KSCjbjzOdIaLg=="; + url = "https://registry.npmjs.org/@vercel/remix-builder/-/remix-builder-2.0.11.tgz"; + sha512 = "blp+PPXFZ4KWLHrh0PZfR9Er/yOQAzPJLbmvJtfJIBnes8SVmIWB89xl+P89HVruknK+FNvCotEFCU41DUjoWw=="; }; }; "@vercel/routing-utils-3.1.0" = { @@ -12289,13 +12379,13 @@ let sha512 = "MqFynhtZ905L210DWAbgkiEQEK39LTtp9eL2Nm6PjzhjNzU6hV0UfK8Z24vU9CC6J4mrUTTZx396fH7XTYJWqg=="; }; }; - "@vercel/static-build-2.0.9" = { + "@vercel/static-build-2.0.10" = { name = "_at_vercel_slash_static-build"; packageName = "@vercel/static-build"; - version = "2.0.9"; + version = "2.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/static-build/-/static-build-2.0.9.tgz"; - sha512 = "OReIxBZkGo/xKAWMtGQRh7lu6SpVAmKg7Z/1ACXJVhTWCbOqhw8obI7Gf4ynYHrNrv9yjE4w6L8gdqaWLBOWGA=="; + url = "https://registry.npmjs.org/@vercel/static-build/-/static-build-2.0.10.tgz"; + sha512 = "H3YM60+Jx/X9YbHrPaQYflJiSC5fQu9R39j+njIAQAQHiitiqFAnFEzQfOXSp52csb0uJ9XacL94vjzQ/T2S5w=="; }; }; "@vercel/static-config-3.0.0" = { @@ -12586,22 +12676,22 @@ let sha512 = "jNYQ+3z7HDZ3IR3Z3Dlo3yOPbHexpygkn2IJ7sjA62oGolnNWeF7kvpLwni18l8N5InhS66m9w31an1Fs5pCZA=="; }; }; - "@vue/compiler-core-3.3.7" = { + "@vue/compiler-core-3.3.8" = { name = "_at_vue_slash_compiler-core"; packageName = "@vue/compiler-core"; - version = "3.3.7"; + version = "3.3.8"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.3.7.tgz"; - sha512 = "pACdY6YnTNVLXsB86YD8OF9ihwpolzhhtdLVHhBL6do/ykr6kKXNYABRtNMGrsQXpEXXyAdwvWWkuTbs4MFtPQ=="; + url = "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.3.8.tgz"; + sha512 = "hN/NNBUECw8SusQvDSqqcVv6gWq8L6iAktUR0UF3vGu2OhzRqcOiAno0FmBJWwxhYEXRlQJT5XnoKsVq1WZx4g=="; }; }; - "@vue/compiler-dom-3.3.7" = { + "@vue/compiler-dom-3.3.8" = { name = "_at_vue_slash_compiler-dom"; packageName = "@vue/compiler-dom"; - version = "3.3.7"; + version = "3.3.8"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.3.7.tgz"; - sha512 = "0LwkyJjnUPssXv/d1vNJ0PKfBlDoQs7n81CbO6Q0zdL7H1EzqYRrTVXDqdBVqro0aJjo/FOa1qBAPVI4PGSHBw=="; + url = "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.3.8.tgz"; + sha512 = "+PPtv+p/nWDd0AvJu3w8HS0RIm/C6VGBIRe24b9hSyNWOAPEUosFZ5diwawwP8ip5sJ8n0Pe87TNNNHnvjs0FQ=="; }; }; "@vue/compiler-sfc-2.7.15" = { @@ -12613,49 +12703,49 @@ let sha512 = "FCvIEevPmgCgqFBH7wD+3B97y7u7oj/Wr69zADBf403Tui377bThTjBvekaZvlRr4IwUAu3M6hYZeULZFJbdYg=="; }; }; - "@vue/compiler-sfc-3.3.7" = { + "@vue/compiler-sfc-3.3.8" = { name = "_at_vue_slash_compiler-sfc"; packageName = "@vue/compiler-sfc"; - version = "3.3.7"; + version = "3.3.8"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.3.7.tgz"; - sha512 = "7pfldWy/J75U/ZyYIXRVqvLRw3vmfxDo2YLMwVtWVNew8Sm8d6wodM+OYFq4ll/UxfqVr0XKiVwti32PCrruAw=="; + url = "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.3.8.tgz"; + sha512 = "WMzbUrlTjfYF8joyT84HfwwXo+8WPALuPxhy+BZ6R4Aafls+jDBnSz8PDz60uFhuqFbl3HxRfxvDzrUf3THwpA=="; }; }; - "@vue/compiler-ssr-3.3.7" = { + "@vue/compiler-ssr-3.3.8" = { name = "_at_vue_slash_compiler-ssr"; packageName = "@vue/compiler-ssr"; - version = "3.3.7"; + version = "3.3.8"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.3.7.tgz"; - sha512 = "TxOfNVVeH3zgBc82kcUv+emNHo+vKnlRrkv8YvQU5+Y5LJGJwSNzcmLUoxD/dNzv0bhQ/F0s+InlgV0NrApJZg=="; + url = "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.3.8.tgz"; + sha512 = "hXCqQL/15kMVDBuoBYpUnSYT8doDNwsjvm3jTefnXr+ytn294ySnT8NlsFHmTgKNjwpuFy7XVV8yTeLtNl/P6w=="; }; }; - "@vue/reactivity-3.3.7" = { + "@vue/reactivity-3.3.8" = { name = "_at_vue_slash_reactivity"; packageName = "@vue/reactivity"; - version = "3.3.7"; + version = "3.3.8"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.3.7.tgz"; - sha512 = "cZNVjWiw00708WqT0zRpyAgduG79dScKEPYJXq2xj/aMtk3SKvL3FBt2QKUlh6EHBJ1m8RhBY+ikBUzwc7/khg=="; + url = "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.3.8.tgz"; + sha512 = "ctLWitmFBu6mtddPyOKpHg8+5ahouoTCRtmAHZAXmolDtuZXfjL2T3OJ6DL6ezBPQB1SmMnpzjiWjCiMYmpIuw=="; }; }; - "@vue/reactivity-transform-3.3.7" = { + "@vue/reactivity-transform-3.3.8" = { name = "_at_vue_slash_reactivity-transform"; packageName = "@vue/reactivity-transform"; - version = "3.3.7"; + version = "3.3.8"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/reactivity-transform/-/reactivity-transform-3.3.7.tgz"; - sha512 = "APhRmLVbgE1VPGtoLQoWBJEaQk4V8JUsqrQihImVqKT+8U6Qi3t5ATcg4Y9wGAPb3kIhetpufyZ1RhwbZCIdDA=="; + url = "https://registry.npmjs.org/@vue/reactivity-transform/-/reactivity-transform-3.3.8.tgz"; + sha512 = "49CvBzmZNtcHua0XJ7GdGifM8GOXoUMOX4dD40Y5DxI3R8OUhMlvf2nvgUAcPxaXiV5MQQ1Nwy09ADpnLQUqRw=="; }; }; - "@vue/shared-3.3.7" = { + "@vue/shared-3.3.8" = { name = "_at_vue_slash_shared"; packageName = "@vue/shared"; - version = "3.3.7"; + version = "3.3.8"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/shared/-/shared-3.3.7.tgz"; - sha512 = "N/tbkINRUDExgcPTBvxNkvHGu504k8lzlNQRITVnm6YjOjwa4r0nnbd4Jb01sNpur5hAllyRJzSK5PvB9PPwRg=="; + url = "https://registry.npmjs.org/@vue/shared/-/shared-3.3.8.tgz"; + sha512 = "8PGwybFwM4x8pcfgqEQFy70NaQxASvOC5DJwLQfpArw1UDfUXrJkdxD3BhVTMS+0Lef/TU7YO0Jvr0jJY8T+mw=="; }; }; "@webassemblyjs/ast-1.11.1" = { @@ -13495,78 +13585,6 @@ let sha512 = "nzvgl3VfhcELQ8LyVrYOru+UtAy1nrygk2+AGbTm8a5YcO6o8lSjAT+pfg3vJWxIoZKOUhrK6UU7xW/+00kQrg=="; }; }; - "@zwave-js/cc-12.3.0" = { - name = "_at_zwave-js_slash_cc"; - packageName = "@zwave-js/cc"; - version = "12.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@zwave-js/cc/-/cc-12.3.0.tgz"; - sha512 = "oEajP6yigFlHtGmorlQQ6L5RacwZciDBFihjZJxvxbbzOcoKskaxdR62SR51nf6o7jeWMudSP1jra6dYz5Q18A=="; - }; - }; - "@zwave-js/config-12.3.0" = { - name = "_at_zwave-js_slash_config"; - packageName = "@zwave-js/config"; - version = "12.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@zwave-js/config/-/config-12.3.0.tgz"; - sha512 = "idwjJrYFFaPZ70ZZV8kOQSee/dVQmz1qAKy53aS0bLrKihX/qr66hjApnyAR+fgqKBXsvaFk1QJm8dy+Q/g1WQ=="; - }; - }; - "@zwave-js/core-12.3.0" = { - name = "_at_zwave-js_slash_core"; - packageName = "@zwave-js/core"; - version = "12.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@zwave-js/core/-/core-12.3.0.tgz"; - sha512 = "QHH5brGId+gr/bwrAkkjg4CGDRJb9PKCqy6jdLNxPhJdNSRaQ2DLzlWfKbfGnyYd39U6/b/JdGg9h+Gutb9s0w=="; - }; - }; - "@zwave-js/host-12.3.0" = { - name = "_at_zwave-js_slash_host"; - packageName = "@zwave-js/host"; - version = "12.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@zwave-js/host/-/host-12.3.0.tgz"; - sha512 = "2ngot/kI363S2iLglKCTqwHjhVeuX6nCjynuak1RZXSRO1oH0W8JxNfVL9WexadBj9ygrdHtRTIUY4e1csbcIw=="; - }; - }; - "@zwave-js/nvmedit-12.3.0" = { - name = "_at_zwave-js_slash_nvmedit"; - packageName = "@zwave-js/nvmedit"; - version = "12.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@zwave-js/nvmedit/-/nvmedit-12.3.0.tgz"; - sha512 = "eAPvpOSNS5wzS6Hs7+BOmDtAbIoozfOyB6/TOW9DtwEHdvKreR4x4D/tUVvxqnc7icCOcLo+iOM8jqR3VYXbMg=="; - }; - }; - "@zwave-js/serial-12.3.0" = { - name = "_at_zwave-js_slash_serial"; - packageName = "@zwave-js/serial"; - version = "12.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@zwave-js/serial/-/serial-12.3.0.tgz"; - sha512 = "mNjGI2BzDua+dL7T9nqxAqBqwL8cZvP5SJw0aZ4vPUERnSJGd230dbTSjvOA0VrO7DwU21UHcI86uMUD2yOgDQ=="; - }; - }; - "@zwave-js/shared-12.2.3" = { - name = "_at_zwave-js_slash_shared"; - packageName = "@zwave-js/shared"; - version = "12.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@zwave-js/shared/-/shared-12.2.3.tgz"; - sha512 = "UwUas5IZxaPywaTY8lQNBE/e5aEWddgHQGJ3yn6Se0O717SeboIlw+Xu3befPBANadCk7EFGiN2SX/DaQCyggQ=="; - }; - }; - "@zwave-js/testing-12.3.0" = { - name = "_at_zwave-js_slash_testing"; - packageName = "@zwave-js/testing"; - version = "12.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@zwave-js/testing/-/testing-12.3.0.tgz"; - sha512 = "mAyimQf+uuTj3CfciAGw+xBRz5WvbEAaUCATI0aHoSxd21pbYFcrspLpnotQK8rbAbUHTb+fGzHj4unFTVrkvw=="; - }; - }; "CSSselect-0.4.1" = { name = "CSSselect"; packageName = "CSSselect"; @@ -13981,6 +13999,15 @@ let sha512 = "0poP0T7el6Vq3rstR8Mn4V/IQrpBLO6POkUSrN7RhyY+GF/InCFShQzsQ39T25gkHhLgSLByyAz+Kjb+c2L98w=="; }; }; + "aggregate-error-5.0.0" = { + name = "aggregate-error"; + packageName = "aggregate-error"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/aggregate-error/-/aggregate-error-5.0.0.tgz"; + sha512 = "gOsf2YwSlleG6IjRYG2A7k0HmBMEo6qVNk9Bp/EaLgAJT5ngH6PXbqa4ItvnEwCm/velL5jAnQgsHsWnjhGmvw=="; + }; + }; "airplay-js-0.3.0" = { name = "airplay-js"; packageName = "airplay-js"; @@ -14107,22 +14134,13 @@ let sha512 = "YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw=="; }; }; - "alcalzone-shared-4.0.8" = { - name = "alcalzone-shared"; - packageName = "alcalzone-shared"; - version = "4.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/alcalzone-shared/-/alcalzone-shared-4.0.8.tgz"; - sha512 = "Rr0efCjNL9lw7miDvU8exL87Y42ehsLU2jUGNQUphhnlvxnTMrHeApWgoOSGZvsE2PhxC3KO7Z+VpQ/IbuV3aA=="; - }; - }; - "alex-9.1.1" = { + "alex-11.0.1" = { name = "alex"; packageName = "alex"; - version = "9.1.1"; + version = "11.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/alex/-/alex-9.1.1.tgz"; - sha512 = "2mYyFfQnzWzDd6lSACRePBj8YP6fzzvclPkfGfYrY6vPNFDoQKrCAAdF0XCKROGJGnbSWX1K5PrxixVTaV5ODw=="; + url = "https://registry.npmjs.org/alex/-/alex-11.0.1.tgz"; + sha512 = "rKLBZxD/lvuykdC6XB8ma9YjDl46j9ayHROZUtC1yJ2jlGpoP7RZR1tBBSjtlr260ixIW6iCkqAnHzmti5Q6CQ=="; }; }; "align-text-0.1.4" = { @@ -14134,13 +14152,13 @@ let sha512 = "GrTZLRpmp6wIC2ztrWW9MjjTgSKccffgFagbNDOX95/dcjEcYZibYTeaOntySQLcdw1ztBoFkviiUvTMbb9MYg=="; }; }; - "all-package-names-2.0.771" = { + "all-package-names-2.0.773" = { name = "all-package-names"; packageName = "all-package-names"; - version = "2.0.771"; + version = "2.0.773"; src = fetchurl { - url = "https://registry.npmjs.org/all-package-names/-/all-package-names-2.0.771.tgz"; - sha512 = "rOeeaPYdzDezjpnh6K3ZxaReFsd+Ecflii66nAVcwD/72aU5lO6Bb4OIW8wVOOnUDvhloaqKf3Y1Tl0NqrnQAw=="; + url = "https://registry.npmjs.org/all-package-names/-/all-package-names-2.0.773.tgz"; + sha512 = "ub74H8f5oeGhTMCl5fueOGG0uIamGvFpYuu2ADZdV26tpXNV1xm6G/05ffpYa5UF2FvVFdo5VnTJqnD6e9G4MQ=="; }; }; "amdefine-1.0.1" = { @@ -14629,13 +14647,13 @@ let sha512 = "zy9cHePtMP0YhwG+CfHm0bgwdnga2X3gZexpdCwEj//dpb+TKajtiC8REEUJUSq6Ab4f9cgNy2l8ObXzCXFkEw=="; }; }; - "applicationinsights-2.3.6" = { + "applicationinsights-2.7.3" = { name = "applicationinsights"; packageName = "applicationinsights"; - version = "2.3.6"; + version = "2.7.3"; src = fetchurl { - url = "https://registry.npmjs.org/applicationinsights/-/applicationinsights-2.3.6.tgz"; - sha512 = "ZzXXpZpDRGcy6Pp5V319nDF9/+Ey7jNknEXZyaBajtC5onN0dcBem6ng5jcb3MPH2AjYWRI8XgyNEuzP/6Y5/A=="; + url = "https://registry.npmjs.org/applicationinsights/-/applicationinsights-2.7.3.tgz"; + sha512 = "JY8+kTEkjbA+kAVNWDtpfW2lqsrDALfDXuxOs74KLPu2y13fy/9WB52V4LfYVTVcW1/jYOXjTxNS2gPZIDh1iw=="; }; }; "applicationinsights-native-metrics-0.0.10" = { @@ -15457,13 +15475,13 @@ let sha512 = "mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA=="; }; }; - "async-3.2.4" = { + "async-3.2.5" = { name = "async"; packageName = "async"; - version = "3.2.4"; + version = "3.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-3.2.4.tgz"; - sha512 = "iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ=="; + url = "https://registry.npmjs.org/async/-/async-3.2.5.tgz"; + sha512 = "baNZyqaaLhyLVKm/DlvdW051MSgO6b8eVfIezl9E5PqWxFgzLm/wQntEW4zOytVburDEr0JlALEpdOFwvErLsg=="; }; }; "async-done-1.3.2" = { @@ -15700,13 +15718,13 @@ let sha512 = "d1W2aNSYcz/sxYO4pMGX9vq65qOTu0P800epMud+6cYYX0QcT7zyqcxec3VWzpgvdXo57UWmVbZpLMjX2m1I7Q=="; }; }; - "aws-crt-1.18.3" = { + "aws-crt-1.19.0" = { name = "aws-crt"; packageName = "aws-crt"; - version = "1.18.3"; + version = "1.19.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-crt/-/aws-crt-1.18.3.tgz"; - sha512 = "SgY9bKtQQpuqWuXMdJS07lIr4JV80nFS4bpR9cW1TbfOhRLDBIHSHc/iat7T+6Co7+ukni1dhd5iZ0Uf24vqtQ=="; + url = "https://registry.npmjs.org/aws-crt/-/aws-crt-1.19.0.tgz"; + sha512 = "pBRSpy4TsL/fxW7Lp1xpN1FhnxvtBXFYx3Njo/j/m8GSV3Ytq/mBetYq7vhDb7CJQmFJCWod9I0yShqjiSUuyQ=="; }; }; "aws-sdk-2.1340.0" = { @@ -15727,13 +15745,13 @@ let sha512 = "U7kAHRbvTy753IXKV8Oom/AqlqnsbXG+Kw5gRbKi6VcsZ3hR/EpNMzdRXTWO5U415bnLWGo8WAqIz67PIaaKsw=="; }; }; - "aws-sdk-2.1486.0" = { + "aws-sdk-2.1492.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.1486.0"; + version = "2.1492.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1486.0.tgz"; - sha512 = "YVGhKGWP5mHWIla6/a7MXwHyKrjcy2xIo65Z6rCvG2uxVa3NxGz4Wo7yNRqA8QGCS6buYz9MmRJLv2KOtkb7JQ=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1492.0.tgz"; + sha512 = "3q17ruBkwb3pL87CHSbRlYiwx1LCq7D7hIjHgZ/5SPeKknkXgkHnD20SD2lC8Nj3xGbpIUhoKXcpDAGgIM5DBA=="; }; }; "aws-sign2-0.7.0" = { @@ -15781,15 +15799,6 @@ let sha512 = "ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg=="; }; }; - "axios-0.24.0" = { - name = "axios"; - packageName = "axios"; - version = "0.24.0"; - src = fetchurl { - url = "https://registry.npmjs.org/axios/-/axios-0.24.0.tgz"; - sha512 = "Q6cWsys88HoPgAaFAVUb0WpPk0O8iTeisR9IMqy9G8AbO4NlpVknrnQS03zzF9PGAWgO3cgletO3VjV/P7VztA=="; - }; - }; "axios-0.25.0" = { name = "axios"; packageName = "axios"; @@ -15817,13 +15826,13 @@ let sha512 = "S4XCWMEmzvo64T9GfvQDOXgYRDJ/wsSZc7Jvdgx5u1sd0JwsuPLqb3SYmusag+edF6ziyMensPVqLTSc1PiSEA=="; }; }; - "axios-1.6.0" = { + "axios-1.6.1" = { name = "axios"; packageName = "axios"; - version = "1.6.0"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/axios/-/axios-1.6.0.tgz"; - sha512 = "EZ1DYihju9pwVB+jg67ogm+Tmqc6JmhamRN6I4Zt8DfZu5lbcQGw3ozH9lFejSJgs/ibaef3A9PMXPLeefFGJg=="; + url = "https://registry.npmjs.org/axios/-/axios-1.6.1.tgz"; + sha512 = "vfBmhDpKafglh0EldBEbVuoe7DyAavGSLWhuSm5ZSEKQnHhBf0xAAwybbNH1IkrJNGnS/VG4I5yxig1pCEXE4g=="; }; }; "axobject-query-3.2.1" = { @@ -16006,15 +16015,6 @@ let sha512 = "gX8v+l+BTue2lmmqD/yQiR6JUUY+5OWNZTI1qyusViqC9R2iv4YFPqT23IcJfpYqlYb3DOiwunfVjKLickdQ6g=="; }; }; - "backslash-0.2.0" = { - name = "backslash"; - packageName = "backslash"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/backslash/-/backslash-0.2.0.tgz"; - sha512 = "Avs+8FUZ1HF/VFP4YWwHQZSGzRPm37ukU1JQYQWijuHhtXdOuAzcZ8PcAzfIw898a8PyBzdn+RtnKA6MzW0X2A=="; - }; - }; "bail-1.0.5" = { name = "bail"; packageName = "bail"; @@ -16879,15 +16879,6 @@ let sha512 = "yL8sYzt0avlYGOY6LqtECkGrJOY3cCLAbFPaNfgE+4fD45ZrdYqLdY8yF4bqyTkpfW9e6W0YqBkN7dIn/PrZoA=="; }; }; - "boxen-4.2.0" = { - name = "boxen"; - packageName = "boxen"; - version = "4.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/boxen/-/boxen-4.2.0.tgz"; - sha512 = "eB4uT9RGzg2odpER62bBwSLvUeGC+WbRjjyyFhGsKnc8wp/m0+hQsMUvUe3H2V0D5vw0nBdO1hCJoZo5mKeuIQ=="; - }; - }; "boxen-5.1.2" = { name = "boxen"; packageName = "boxen"; @@ -18022,13 +18013,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001559" = { + "caniuse-lite-1.0.30001561" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001559"; + version = "1.0.30001561"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001559.tgz"; - sha512 = "cPiMKZgqgkg5LY3/ntGeLFUpi6tzddBNS58A4tnTgQw1zON7u2sZMU7SzOeVH4tj20++9ggL+V6FDOFMTaFFYA=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001561.tgz"; + sha512 = "NTt0DNoKe958Q0BE0j0c1V9jbUzhBxHIEJy7asmGrpE0yG63KTV7PLHPnK2E1O9RsQrQ081I3NLuXGS6zht3cw=="; }; }; "canvas-2.11.2" = { @@ -18157,31 +18148,31 @@ let sha512 = "eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg=="; }; }; - "cdk8s-2.67.6" = { + "cdk8s-2.68.2" = { name = "cdk8s"; packageName = "cdk8s"; - version = "2.67.6"; + version = "2.68.2"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s/-/cdk8s-2.67.6.tgz"; - sha512 = "GlIeZmXxnPRWNtxgMXhHOV/qPy5kyaxgA4uUpQTn9bVgBwwMnv9AmVeQKiLjRQ0Mq0DjVWHTVXnmP1mu3zjQ6Q=="; + url = "https://registry.npmjs.org/cdk8s/-/cdk8s-2.68.2.tgz"; + sha512 = "95DmLwUW0dv+2RK7J/IdYqgRWDNVV9YN6dZaPIjbzoE0Y1D4HIGe51oCJpaa1bYAMba7v+sippd2pLxA7dxdIA=="; }; }; - "cdk8s-plus-25-2.22.49" = { + "cdk8s-plus-25-2.22.54" = { name = "cdk8s-plus-25"; packageName = "cdk8s-plus-25"; - version = "2.22.49"; + version = "2.22.54"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s-plus-25/-/cdk8s-plus-25-2.22.49.tgz"; - sha512 = "qQTymImB/uu89WiipR1pMuGJP/CS1o8QHdye4abPYT085H6i9P1lzxvvWtXnjYUFScU63X79R5uh8xx2AzaO0A=="; + url = "https://registry.npmjs.org/cdk8s-plus-25/-/cdk8s-plus-25-2.22.54.tgz"; + sha512 = "ZYeuv3aw5E/SviEP1r49H0CauzacJAkSj3f9InMmI0PlMJNNDrXxly6OxnNxP+hnUXCRMo+YjZMr+tBz4SjaNA=="; }; }; - "cdktf-0.19.0" = { + "cdktf-0.19.1" = { name = "cdktf"; packageName = "cdktf"; - version = "0.19.0"; + version = "0.19.1"; src = fetchurl { - url = "https://registry.npmjs.org/cdktf/-/cdktf-0.19.0.tgz"; - sha512 = "5tcNhvrvsE9WawC5cPwV7B9ATQ5lWNjyCJN7EnMofxTtkBEdnnGx0esC+vpNO4Fs0LhmV37qCUlm+K6anZaPYw=="; + url = "https://registry.npmjs.org/cdktf/-/cdktf-0.19.1.tgz"; + sha512 = "scZhp2+FEgNUd+l5vaDCHABdwFApB1Lcknn2+dUw8aYwNsMoYT0tWs4AzPg22Z4jQFOIQLIXmBxifhr+RahdRg=="; }; }; "center-align-0.1.3" = { @@ -18328,15 +18319,6 @@ let sha512 = "shx7oQ0Awen/BRIdkjkvz54PnEEI/EjwXDSIZp86/KKdbafHh1Df/RYGBhn4hbe2+uKC9FnT5UCEdyPz3ai9hQ=="; }; }; - "character-entities-html4-1.1.4" = { - name = "character-entities-html4"; - packageName = "character-entities-html4"; - version = "1.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/character-entities-html4/-/character-entities-html4-1.1.4.tgz"; - sha512 = "HRcDxZuZqMx3/a+qrzxdBKBPUpxWEq9xw2OPZ3a/174ihfrQKVsFhqtthBInFy1zZ9GgZyFXOatNujm8M+El3g=="; - }; - }; "character-entities-html4-2.1.0" = { name = "character-entities-html4"; packageName = "character-entities-html4"; @@ -18706,6 +18688,15 @@ let sha512 = "UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A=="; }; }; + "cjs-module-lexer-1.2.3" = { + name = "cjs-module-lexer"; + packageName = "cjs-module-lexer"; + version = "1.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.2.3.tgz"; + sha512 = "0TNiGstbQmCFwt4akjjBg5pLRTSyj/PkWQ1ZoO2zntmg9yLqSRxwEa4iCfQLGjqhiqBfOJa7W/E8wfGrTDmlZQ=="; + }; + }; "clap-1.2.3" = { name = "clap"; packageName = "clap"; @@ -18796,6 +18787,15 @@ let sha512 = "LYv6XPxoyODi36Dp976riBtSY27VmFo+MKqEU9QCCWyTrdEPDog+RWA7xQWHi6Vbp61j5c4cdzzX1NidnwtUWg=="; }; }; + "clean-stack-5.2.0" = { + name = "clean-stack"; + packageName = "clean-stack"; + version = "5.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/clean-stack/-/clean-stack-5.2.0.tgz"; + sha512 = "TyUIUJgdFnCISzG5zu3291TAsE77ddchd0bepon1VVQrKLGKFED4iXFEDQ24mIPdPBbyE16PK3F8MYE1CmcBEQ=="; + }; + }; "clean-webpack-plugin-4.0.0" = { name = "clean-webpack-plugin"; packageName = "clean-webpack-plugin"; @@ -19030,6 +19030,15 @@ let sha512 = "wfOBkjXteqSnI59oPcJkcPl/ZmwvMMOj340qUIY1SKZCv0B9Cf4D4fAucRkIKQmsIuYK3x1rrgU7MeGRruiuiA=="; }; }; + "cli-truncate-4.0.0" = { + name = "cli-truncate"; + packageName = "cli-truncate"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-truncate/-/cli-truncate-4.0.0.tgz"; + sha512 = "nPdaFdQ0h/GEigbPClz11D0v/ZJEwxmeVZGeMo3Z5StPtUTkA9o1lD6QwoirYiSDzbcwn2XcjwmCp68W1IS4TA=="; + }; + }; "cli-ux-4.9.3" = { name = "cli-ux"; packageName = "cli-ux"; @@ -19489,15 +19498,6 @@ let sha512 = "hzWp6TUE2d/jCcN67LrW1eh5b/rSDKQK6oD6VMLlggYVUUFexgTH9z3dNYihzX4RMhze5FTUsUmOXViJKFQR/A=="; }; }; - "collapse-white-space-1.0.6" = { - name = "collapse-white-space"; - packageName = "collapse-white-space"; - version = "1.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/collapse-white-space/-/collapse-white-space-1.0.6.tgz"; - sha512 = "jEovNnrhMuqyCcjfEJA56v0Xq8SkIoPKDyaHahwo3POf4qcSXqMYuwNcOTzp74vTsR9Tn08z4MxWqAhcekogkQ=="; - }; - }; "collection-map-1.0.0" = { name = "collection-map"; packageName = "collection-map"; @@ -21236,22 +21236,22 @@ let sha512 = "pP2W2BvLrRKggS1fUk8qQw2FG8PhyV969dlwF3M0jAg/HH83n76H+KGdzGsmEut6VJFlJYQkd1ZZskjaeVWnrA=="; }; }; - "cspell-dictionary-7.3.8" = { + "cspell-dictionary-8.0.0" = { name = "cspell-dictionary"; packageName = "cspell-dictionary"; - version = "7.3.8"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/cspell-dictionary/-/cspell-dictionary-7.3.8.tgz"; - sha512 = "gkq4t78eLR0xC3P0vDDHPeNY4iZRd5YE6Z8uDJ7RM4UaX/TSdVUN9KNFr34RnJ119NYVHujpL9+uW7wPSAe8Eg=="; + url = "https://registry.npmjs.org/cspell-dictionary/-/cspell-dictionary-8.0.0.tgz"; + sha512 = "R/AzUj7W7F4O4fAOL8jvIiUqPYGy6jIBlDkxO9SZe/A6D2kOICZZzGSXMZ0M7OKYqxc6cioQUMKOJsLkDXfDXw=="; }; }; - "cspell-gitignore-7.3.8" = { + "cspell-gitignore-8.0.0" = { name = "cspell-gitignore"; packageName = "cspell-gitignore"; - version = "7.3.8"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/cspell-gitignore/-/cspell-gitignore-7.3.8.tgz"; - sha512 = "vJzCOUEiw6/MwV/U4Ux3bgSdj9mXB+X5eHL+qzVoyFI7ArlvrkuGTL+iFJThQcS8McM3SGqtvaBNCiKBmAeCkA=="; + url = "https://registry.npmjs.org/cspell-gitignore/-/cspell-gitignore-8.0.0.tgz"; + sha512 = "Uv+ENdUm+EXwQuG9187lKmE1t8b2KW+6VaQHP7r01WiuhkwhfzmWA7C30iXVcwRcsMw07wKiWvMEtG6Zlzi6lQ=="; }; }; "cspell-glob-0.1.25" = { @@ -21263,22 +21263,22 @@ let sha512 = "/XaSHrGBpMJa+duFz3GKOWfrijrfdHT7a/XGgIcq3cymCSpOH+DPho42sl0jLI/hjM+8yv2m8aEoxRT8yVSnlg=="; }; }; - "cspell-glob-7.3.8" = { + "cspell-glob-8.0.0" = { name = "cspell-glob"; packageName = "cspell-glob"; - version = "7.3.8"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/cspell-glob/-/cspell-glob-7.3.8.tgz"; - sha512 = "wUZC6znyxEs0wlhzGfZ4XHkATPJyazJIFi/VvAdj+KHe7U8SoSgitJVDQqdgectI2y3MxR7lQdVLX9dONFh+7A=="; + url = "https://registry.npmjs.org/cspell-glob/-/cspell-glob-8.0.0.tgz"; + sha512 = "wOkRA1OTIPhyN7a+k9Qq45yFXM+tBFi9DS5ObiLv6t6VTBIeMQpwRK0KLViHmjTgiA6eWx53Dnr+DZfxcAkcZA=="; }; }; - "cspell-grammar-7.3.8" = { + "cspell-grammar-8.0.0" = { name = "cspell-grammar"; packageName = "cspell-grammar"; - version = "7.3.8"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/cspell-grammar/-/cspell-grammar-7.3.8.tgz"; - sha512 = "nTjAlMAZAVSFhBd9U3MB9l5FfC5JCCr9DTOA2wWxusVOm+36MbSEH90ucLPkhPa9/+0HtbpDhqVMwXCZllRpsg=="; + url = "https://registry.npmjs.org/cspell-grammar/-/cspell-grammar-8.0.0.tgz"; + sha512 = "uxpRvbBxOih6SjFQvKTBPTA+YyqYM5UFTNTFuRnA6g6WZeg+NJaTkbQrTgXja4B2r8MJ6XU22YrKTtHNNcP7bQ=="; }; }; "cspell-io-4.1.7" = { @@ -21290,13 +21290,13 @@ let sha512 = "V0/tUu9FnIS3v+vAvDT6NNa14Nc/zUNX8+YUUOfFAiDJJTdqefmvcWjOJBIMYBf3wIk9iWLmLbMM+bNHqr7DSQ=="; }; }; - "cspell-io-7.3.8" = { + "cspell-io-8.0.0" = { name = "cspell-io"; packageName = "cspell-io"; - version = "7.3.8"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/cspell-io/-/cspell-io-7.3.8.tgz"; - sha512 = "XrxPbaiek7EZh+26k9RYVz2wKclaMqM6mXBiu/kpFAHRHHfz91ado6xWvyxZ7UAxQ8ixEwZ+oz9TU+k21gHzyw=="; + url = "https://registry.npmjs.org/cspell-io/-/cspell-io-8.0.0.tgz"; + sha512 = "NVdVmQd7SU/nxYwWtO/6gzux/kp1Dt36zKds0+QHZhQ18JJjXduF5e+WUttqKi2oj/vvmjiG4HGFKQVDBcBz3w=="; }; }; "cspell-lib-4.3.12" = { @@ -21308,13 +21308,13 @@ let sha512 = "yCCb6MoW1K8Tsr/WVEQoO4dfYhH9bCsjQayccb8MlyDaNNuWJHuX+gUGHsZSXSuChSh8PrTWKXJzs13/uM977g=="; }; }; - "cspell-lib-7.3.8" = { + "cspell-lib-8.0.0" = { name = "cspell-lib"; packageName = "cspell-lib"; - version = "7.3.8"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/cspell-lib/-/cspell-lib-7.3.8.tgz"; - sha512 = "2L770sI5DdsAKVzO3jxmfP2fz4LryW6dzL93BpN7WU+ebFC6rg4ioa5liOJV4WoDo2fNQMSeqfW4Aawu9zWR7A=="; + url = "https://registry.npmjs.org/cspell-lib/-/cspell-lib-8.0.0.tgz"; + sha512 = "X/BzUjrzHOx7YlhvSph/OlMu1RmCTnybeZvIE67d1Pd7wT1TmZhFTnmvruUhoHxWEudOEe4HjzuNL9ph6Aw+aA=="; }; }; "cspell-trie-lib-4.2.8" = { @@ -21326,13 +21326,13 @@ let sha512 = "Nt3c0gxOYXIc3/yhALDukpje1BgR6guvlUKWQO2zb0r7qRWpwUw2j2YM4dWbHQeH/3Hx5ei4Braa6cMaiJ5YBw=="; }; }; - "cspell-trie-lib-7.3.8" = { + "cspell-trie-lib-8.0.0" = { name = "cspell-trie-lib"; packageName = "cspell-trie-lib"; - version = "7.3.8"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/cspell-trie-lib/-/cspell-trie-lib-7.3.8.tgz"; - sha512 = "UQx1Bazbyz2eQJ/EnMohINnUdZvAQL+OcQU3EPPbNWM1DWF4bJGgmFXKNCRYfJk6wtOZVXG5g5AZXx9KnHeN9A=="; + url = "https://registry.npmjs.org/cspell-trie-lib/-/cspell-trie-lib-8.0.0.tgz"; + sha512 = "0rC5e1C0uM78uuS+lC1T18EojWZyNvq4bPOPCisnwuhuWrAfCqrFrX/qDNslWk3VTOPbsEMlFj6OnIGQnfwSKg=="; }; }; "cspell-util-bundle-4.1.11" = { @@ -21695,15 +21695,6 @@ let sha512 = "T6CEkoSV4q50zW3TlTHMbzy1E5+zlnNcY+yb7tWVYlTwPhx9LpnfAkd4wecpWknDyptp4k97LUZeInlf6jdzBg=="; }; }; - "cuid-2.1.8" = { - name = "cuid"; - packageName = "cuid"; - version = "2.1.8"; - src = fetchurl { - url = "https://registry.npmjs.org/cuid/-/cuid-2.1.8.tgz"; - sha512 = "xiEMER6E7TlTPnDxrM4eRiC6TRgjNX9xzEZ5U/Se2YJKr7Mq4pJn/2XEHjl3STcSh96GmkHPcBXLES8M29wyyg=="; - }; - }; "culvert-0.1.2" = { name = "culvert"; packageName = "culvert"; @@ -21722,15 +21713,6 @@ let sha512 = "/fITjgjGU50vjQ4FH6eUoYu+iUoUKIXws2hL15JJpIR+BbTxaXQsMuuyjtNh2WqsSBS5nsaZHFsFecyw5CCAng=="; }; }; - "cuss-1.21.0" = { - name = "cuss"; - packageName = "cuss"; - version = "1.21.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cuss/-/cuss-1.21.0.tgz"; - sha512 = "X3VvImImJ5q6w0wOgJtxAX+RC06d26egp/A/vdSxqOrsRtAA9biXAkc4PZGj/3gx0+z+gDFri6BpcpwuG1/UEw=="; - }; - }; "cuss-2.2.0" = { name = "cuss"; packageName = "cuss"; @@ -21821,15 +21803,6 @@ let sha512 = "KHW6M86R+FUPYGb3R5XiYjXPq7VzwxZ22buHhAEVG5ztoEcZZMLov530mmccaqA1GghZArjQV46fuc8kUqhhHw=="; }; }; - "d3-array-3.2.2" = { - name = "d3-array"; - packageName = "d3-array"; - version = "3.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/d3-array/-/d3-array-3.2.2.tgz"; - sha512 = "yEEyEAbDrF8C6Ob2myOBLjwBLck1Z89jMGFee0oPsn95GqjerpaOA4ch+vc2l0FNFFwMD5N7OCSEN5eAlsUbgQ=="; - }; - }; "d3-array-3.2.4" = { name = "d3-array"; packageName = "d3-array"; @@ -22100,13 +22073,13 @@ let sha512 = "p0bK60CEzph1iqmnxut7d/1kyTmm3UWtPlwdkM31AU+LW+BXazd5zJdoCn7VFxNCHXRngPHRnsNn5uGjLRGndg=="; }; }; - "d3-graphviz-5.1.0" = { + "d3-graphviz-5.2.0" = { name = "d3-graphviz"; packageName = "d3-graphviz"; - version = "5.1.0"; + version = "5.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/d3-graphviz/-/d3-graphviz-5.1.0.tgz"; - sha512 = "PSUmKfbqhixVlTOsT9ziV/wxHAzf31rfq1POUrdfOseJQ3+GQmLTKMWNgyGc5QXtNZq3emsgQycs7W0Hr4wVvw=="; + url = "https://registry.npmjs.org/d3-graphviz/-/d3-graphviz-5.2.0.tgz"; + sha512 = "M/2gQkSe5beBQFmE2Qh8RPZivOV48GR4pVPV8kWQ6lBs1TqIjgGqi/AOvKTLILDLTwVx4KSGHCnH62K8xyDwvg=="; }; }; "d3-hierarchy-1.1.9" = { @@ -22946,22 +22919,22 @@ let sha512 = "OUepMozQULMLUmhxS95Vudo0jb0UchLimi3+pQ2plj61Fcy8axbP9hbiD4Sz6DPqn6XG3kfmziVfQ1rSys5AJQ=="; }; }; - "deep-equal-1.1.1" = { + "deep-equal-1.1.2" = { name = "deep-equal"; packageName = "deep-equal"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.1.tgz"; - sha512 = "yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g=="; + url = "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.2.tgz"; + sha512 = "5tdhKF6DbU7iIzrIOa1AOUt39ZRm13cmL1cGEh//aqR8x9+tNfbywRf0n5FD/18OKMdo7DNEtrX2t22ZAkI+eg=="; }; }; - "deep-equal-2.2.2" = { + "deep-equal-2.2.3" = { name = "deep-equal"; packageName = "deep-equal"; - version = "2.2.2"; + version = "2.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/deep-equal/-/deep-equal-2.2.2.tgz"; - sha512 = "xjVyBf0w5vH0I42jdAZzOKVldmPgSulmiyPRywoyq7HXC9qdgo17kxJE+rdnif5Tz6+pIrpJI8dCpMNLIGkUiA=="; + url = "https://registry.npmjs.org/deep-equal/-/deep-equal-2.2.3.tgz"; + sha512 = "ZIwpnevOurS8bpT4192sqAowWM76JDKSHYzMLty3BZGSswgq6pBaH3DhCSW5xVAZICZyKdOBPjwww5wfgT/6PA=="; }; }; "deep-extend-0.4.2" = { @@ -23495,22 +23468,22 @@ let sha512 = "rXSP0bf+5n0Qonsb+SVVfNfIsimO4HEtmnIpPHY8Q1UCzKlQrDMfdobr8nJOOsRgWCyMRqeSBQzmWUMq7zvVig=="; }; }; - "diagnostic-channel-1.1.0" = { + "diagnostic-channel-1.1.1" = { name = "diagnostic-channel"; packageName = "diagnostic-channel"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/diagnostic-channel/-/diagnostic-channel-1.1.0.tgz"; - sha512 = "fwujyMe1gj6rk6dYi9hMZm0c8Mz8NDMVl2LB4iaYh3+LIAThZC8RKFGXWG0IML2OxAit/ZFRgZhMkhQ3d/bobQ=="; + url = "https://registry.npmjs.org/diagnostic-channel/-/diagnostic-channel-1.1.1.tgz"; + sha512 = "r2HV5qFkUICyoaKlBEpLKHjxMXATUf/l+h8UZPGBHGLy4DDiY2sOLcIctax4eRnTw5wH2jTMExLntGPJ8eOJxw=="; }; }; - "diagnostic-channel-publishers-1.0.5" = { + "diagnostic-channel-publishers-1.0.7" = { name = "diagnostic-channel-publishers"; packageName = "diagnostic-channel-publishers"; - version = "1.0.5"; + version = "1.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/diagnostic-channel-publishers/-/diagnostic-channel-publishers-1.0.5.tgz"; - sha512 = "dJwUS0915pkjjimPJVDnS/QQHsH0aOYhnZsLJdnZIMOrB+csj8RnZhWTuwnm8R5v3Z7OZs+ksv5luC14DGB7eg=="; + url = "https://registry.npmjs.org/diagnostic-channel-publishers/-/diagnostic-channel-publishers-1.0.7.tgz"; + sha512 = "SEECbY5AiVt6DfLkhkaHNeshg1CogdLLANA8xlG/TKvS+XUgvIKl7VspJGYiEdL5OUyzMVnr7o0AwB7f+/Mjtg=="; }; }; "dicer-0.3.0" = { @@ -24386,22 +24359,13 @@ let sha512 = "8E4ZLK4uRuB9pwywGpy/B9vcz4gCp6IY7u4cMbeCINr/fjb1v+0wf0Ae2XlfSnG8xZYnE4uaJBjFkYI0bqcIdw=="; }; }; - "edge-runtime-2.5.1" = { + "edge-runtime-2.5.7" = { name = "edge-runtime"; packageName = "edge-runtime"; - version = "2.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/edge-runtime/-/edge-runtime-2.5.1.tgz"; - sha512 = "E0kY1Dqvwvk9yh7dvR56KnCjXf/dlbrrGjO5Sjnz9Ja3WqYT3csv2B8O4erxJiOWfWy9NTukBk4Kb3yrR66gBw=="; - }; - }; - "editorconfig-0.15.3" = { - name = "editorconfig"; - packageName = "editorconfig"; - version = "0.15.3"; + version = "2.5.7"; src = fetchurl { - url = "https://registry.npmjs.org/editorconfig/-/editorconfig-0.15.3.tgz"; - sha512 = "M9wIMFx96vq0R4F+gRpY3o2exzb8hEj/n9S8unZtHSvYjibBp/iMufSzvmOcV/laG0ZtuTVGtiJggPOSW2r93g=="; + url = "https://registry.npmjs.org/edge-runtime/-/edge-runtime-2.5.7.tgz"; + sha512 = "gA4qSVP0sNwJlkdQ2nahDPASlSl8twUd17o+JolPa1EtXpLTGzIpOETvodgJwXIxa+zaD8bnAXCdsWrx2PhlVQ=="; }; }; "editorconfig-1.0.4" = { @@ -24440,13 +24404,22 @@ let sha512 = "XofXdikjYI7MVBcnXeoOvRR+yFFFHOLs3J7PF5KYQweigtgLshcH4W660PsvHr4lYZ03JBpLyEcUB8DzHZ+BNw=="; }; }; - "electron-to-chromium-1.4.574" = { + "electron-to-chromium-1.4.579" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.4.574"; + version = "1.4.579"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.574.tgz"; - sha512 = "bg1m8L0n02xRzx4LsTTMbBPiUd9yIR+74iPtS/Ao65CuXvhVZHP0ym1kSdDG3yHFDXqHQQBKujlN1AQ8qZnyFg=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.579.tgz"; + sha512 = "bJKvA+awBIzYR0xRced7PrQuRIwGQPpo6ZLP62GAShahU9fWpsNN2IP6BSP1BLDDSbxvBVRGAMWlvVVq3npmLA=="; + }; + }; + "electron-to-chromium-1.4.580" = { + name = "electron-to-chromium"; + packageName = "electron-to-chromium"; + version = "1.4.580"; + src = fetchurl { + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.580.tgz"; + sha512 = "T5q3pjQon853xxxHUq3ZP68ZpvJHuSMY2+BZaW3QzjS4HvNuvsMmZ/+lU+nCrftre1jFZ+OSlExynXWBihnXzw=="; }; }; "elegant-spinner-1.0.1" = { @@ -24693,6 +24666,15 @@ let sha512 = "IML/R4eG/pUS5w7OfcDE0jKrljWS9nwnEfsxWCIJF5eO6AHo6+Hlv+lQbdlAYsiJPHzUthLm1RUjnBzWOs45cw=="; }; }; + "engine.io-6.5.4" = { + name = "engine.io"; + packageName = "engine.io"; + version = "6.5.4"; + src = fetchurl { + url = "https://registry.npmjs.org/engine.io/-/engine.io-6.5.4.tgz"; + sha512 = "KdVSDKhVKyOi+r5uEabrDLZw2qXStVvCsEB/LN3mw4WFi6Gx50jTyuxYVCwAAC0U46FdnzP/ScKRBTXb/NiEOg=="; + }; + }; "engine.io-client-1.3.1" = { name = "engine.io-client"; packageName = "engine.io-client"; @@ -24720,13 +24702,13 @@ let sha512 = "qsgyc/CEhJ6cgMUwxRRtOndGVhIu5hpL5tR4umSpmX/MvkFoIxUTM7oFMDQumHNzlNLwSVy6qhstFPoWTf7dOw=="; }; }; - "engine.io-client-6.5.2" = { + "engine.io-client-6.5.3" = { name = "engine.io-client"; packageName = "engine.io-client"; - version = "6.5.2"; + version = "6.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-6.5.2.tgz"; - sha512 = "CQZqbrpEYnrpGqC07a9dJDz4gePZUgTPMU3NKJPSeQOyw27Tst4Pl3FemKoFGAlHzgZmKjoRmiJvbWfhCXUlIg=="; + url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-6.5.3.tgz"; + sha512 = "9Z0qLB0NIisTRt1DZ/8U2k12RJn8yls/nXMZLn+/N8hANT3TcYjKFKcwbw5zFQiN4NTde3TSY9zb79e1ij6j9Q=="; }; }; "engine.io-parser-1.0.6" = { @@ -25197,15 +25179,6 @@ let sha512 = "wI4ZiIfFxpkuxB8ju4MHrGwGLyp1+awEHAHVpx6w7a+1pmYIq8T9FGEVVwFo0iFierDoMj++Xq69GXWYn2EiwA=="; }; }; - "esbuild-0.15.18" = { - name = "esbuild"; - packageName = "esbuild"; - version = "0.15.18"; - src = fetchurl { - url = "https://registry.npmjs.org/esbuild/-/esbuild-0.15.18.tgz"; - sha512 = "x/R72SmW3sSFRm5zrrIjAhCeQSAWoni3CmHEqfQrZIQTM3lVCdehdwuIqaOtfC2slvpdlLa62GYoN8SxT23m6Q=="; - }; - }; "esbuild-0.17.19" = { name = "esbuild"; packageName = "esbuild"; @@ -25224,6 +25197,15 @@ let sha512 = "ceqxoedUrcayh7Y7ZX6NdbbDzGROiyVBgC4PriJThBKSVPWnnFHZAkfI1lJT8QFkOwH4qOS2SJkS4wvpGl8BpA=="; }; }; + "esbuild-0.19.5" = { + name = "esbuild"; + packageName = "esbuild"; + version = "0.19.5"; + src = fetchurl { + url = "https://registry.npmjs.org/esbuild/-/esbuild-0.19.5.tgz"; + sha512 = "bUxalY7b1g8vNhQKdB24QDmHeY4V4tw/s6Ak5z+jJX9laP5MoQseTOMemAr0gxssjNcH0MCViG8ONI2kksvfFQ=="; + }; + }; "esbuild-android-64-0.14.47" = { name = "esbuild-android-64"; packageName = "esbuild-android-64"; @@ -25233,15 +25215,6 @@ let sha512 = "R13Bd9+tqLVFndncMHssZrPWe6/0Kpv2/dt4aA69soX4PRxlzsVpCvoJeFE8sOEoeVEiBkI0myjlkDodXlHa0g=="; }; }; - "esbuild-android-64-0.15.18" = { - name = "esbuild-android-64"; - packageName = "esbuild-android-64"; - version = "0.15.18"; - src = fetchurl { - url = "https://registry.npmjs.org/esbuild-android-64/-/esbuild-android-64-0.15.18.tgz"; - sha512 = "wnpt3OXRhcjfIDSZu9bnzT4/TNTDsOUvip0foZOUBG7QbSt//w3QV4FInVJxNhKc/ErhUxc5z4QjHtMi7/TbgA=="; - }; - }; "esbuild-android-arm64-0.14.47" = { name = "esbuild-android-arm64"; packageName = "esbuild-android-arm64"; @@ -25251,15 +25224,6 @@ let sha512 = "OkwOjj7ts4lBp/TL6hdd8HftIzOy/pdtbrNA4+0oVWgGG64HrdVzAF5gxtJufAPOsEjkyh1oIYvKAUinKKQRSQ=="; }; }; - "esbuild-android-arm64-0.15.18" = { - name = "esbuild-android-arm64"; - packageName = "esbuild-android-arm64"; - version = "0.15.18"; - src = fetchurl { - url = "https://registry.npmjs.org/esbuild-android-arm64/-/esbuild-android-arm64-0.15.18.tgz"; - sha512 = "G4xu89B8FCzav9XU8EjsXacCKSG2FT7wW9J6hOc18soEHJdtWu03L3TQDGf0geNxfLTtxENKBzMSq9LlbjS8OQ=="; - }; - }; "esbuild-darwin-64-0.14.47" = { name = "esbuild-darwin-64"; packageName = "esbuild-darwin-64"; @@ -25269,15 +25233,6 @@ let sha512 = "R6oaW0y5/u6Eccti/TS6c/2c1xYTb1izwK3gajJwi4vIfNs1s8B1dQzI1UiC9T61YovOQVuePDcfqHLT3mUZJA=="; }; }; - "esbuild-darwin-64-0.15.18" = { - name = "esbuild-darwin-64"; - packageName = "esbuild-darwin-64"; - version = "0.15.18"; - src = fetchurl { - url = "https://registry.npmjs.org/esbuild-darwin-64/-/esbuild-darwin-64-0.15.18.tgz"; - sha512 = "2WAvs95uPnVJPuYKP0Eqx+Dl/jaYseZEUUT1sjg97TJa4oBtbAKnPnl3b5M9l51/nbx7+QAEtuummJZW0sBEmg=="; - }; - }; "esbuild-darwin-arm64-0.14.47" = { name = "esbuild-darwin-arm64"; packageName = "esbuild-darwin-arm64"; @@ -25287,15 +25242,6 @@ let sha512 = "seCmearlQyvdvM/noz1L9+qblC5vcBrhUaOoLEDDoLInF/VQ9IkobGiLlyTPYP5dW1YD4LXhtBgOyevoIHGGnw=="; }; }; - "esbuild-darwin-arm64-0.15.18" = { - name = "esbuild-darwin-arm64"; - packageName = "esbuild-darwin-arm64"; - version = "0.15.18"; - src = fetchurl { - url = "https://registry.npmjs.org/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.15.18.tgz"; - sha512 = "tKPSxcTJ5OmNb1btVikATJ8NftlyNlc8BVNtyT/UAr62JFOhwHlnoPrhYWz09akBLHI9nElFVfWSTSRsrZiDUA=="; - }; - }; "esbuild-freebsd-64-0.14.47" = { name = "esbuild-freebsd-64"; packageName = "esbuild-freebsd-64"; @@ -25305,15 +25251,6 @@ let sha512 = "ZH8K2Q8/Ux5kXXvQMDsJcxvkIwut69KVrYQhza/ptkW50DC089bCVrJZZ3sKzIoOx+YPTrmsZvqeZERjyYrlvQ=="; }; }; - "esbuild-freebsd-64-0.15.18" = { - name = "esbuild-freebsd-64"; - packageName = "esbuild-freebsd-64"; - version = "0.15.18"; - src = fetchurl { - url = "https://registry.npmjs.org/esbuild-freebsd-64/-/esbuild-freebsd-64-0.15.18.tgz"; - sha512 = "TT3uBUxkteAjR1QbsmvSsjpKjOX6UkCstr8nMr+q7zi3NuZ1oIpa8U41Y8I8dJH2fJgdC3Dj3CXO5biLQpfdZA=="; - }; - }; "esbuild-freebsd-arm64-0.14.47" = { name = "esbuild-freebsd-arm64"; packageName = "esbuild-freebsd-arm64"; @@ -25323,15 +25260,6 @@ let sha512 = "ZJMQAJQsIOhn3XTm7MPQfCzEu5b9STNC+s90zMWe2afy9EwnHV7Ov7ohEMv2lyWlc2pjqLW8QJnz2r0KZmeAEQ=="; }; }; - "esbuild-freebsd-arm64-0.15.18" = { - name = "esbuild-freebsd-arm64"; - packageName = "esbuild-freebsd-arm64"; - version = "0.15.18"; - src = fetchurl { - url = "https://registry.npmjs.org/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.15.18.tgz"; - sha512 = "R/oVr+X3Tkh+S0+tL41wRMbdWtpWB8hEAMsOXDumSSa6qJR89U0S/PpLXrGF7Wk/JykfpWNokERUpCeHDl47wA=="; - }; - }; "esbuild-linux-32-0.14.47" = { name = "esbuild-linux-32"; packageName = "esbuild-linux-32"; @@ -25341,15 +25269,6 @@ let sha512 = "FxZOCKoEDPRYvq300lsWCTv1kcHgiiZfNrPtEhFAiqD7QZaXrad8LxyJ8fXGcWzIFzRiYZVtB3ttvITBvAFhKw=="; }; }; - "esbuild-linux-32-0.15.18" = { - name = "esbuild-linux-32"; - packageName = "esbuild-linux-32"; - version = "0.15.18"; - src = fetchurl { - url = "https://registry.npmjs.org/esbuild-linux-32/-/esbuild-linux-32-0.15.18.tgz"; - sha512 = "lphF3HiCSYtaa9p1DtXndiQEeQDKPl9eN/XNoBf2amEghugNuqXNZA/ZovthNE2aa4EN43WroO0B85xVSjYkbg=="; - }; - }; "esbuild-linux-64-0.14.47" = { name = "esbuild-linux-64"; packageName = "esbuild-linux-64"; @@ -25359,15 +25278,6 @@ let sha512 = "nFNOk9vWVfvWYF9YNYksZptgQAdstnDCMtR6m42l5Wfugbzu11VpMCY9XrD4yFxvPo9zmzcoUL/88y0lfJZJJw=="; }; }; - "esbuild-linux-64-0.15.18" = { - name = "esbuild-linux-64"; - packageName = "esbuild-linux-64"; - version = "0.15.18"; - src = fetchurl { - url = "https://registry.npmjs.org/esbuild-linux-64/-/esbuild-linux-64-0.15.18.tgz"; - sha512 = "hNSeP97IviD7oxLKFuii5sDPJ+QHeiFTFLoLm7NZQligur8poNOWGIgpQ7Qf8Balb69hptMZzyOBIPtY09GZYw=="; - }; - }; "esbuild-linux-arm-0.14.47" = { name = "esbuild-linux-arm"; packageName = "esbuild-linux-arm"; @@ -25377,15 +25287,6 @@ let sha512 = "ZGE1Bqg/gPRXrBpgpvH81tQHpiaGxa8c9Rx/XOylkIl2ypLuOcawXEAo8ls+5DFCcRGt/o3sV+PzpAFZobOsmA=="; }; }; - "esbuild-linux-arm-0.15.18" = { - name = "esbuild-linux-arm"; - packageName = "esbuild-linux-arm"; - version = "0.15.18"; - src = fetchurl { - url = "https://registry.npmjs.org/esbuild-linux-arm/-/esbuild-linux-arm-0.15.18.tgz"; - sha512 = "UH779gstRblS4aoS2qpMl3wjg7U0j+ygu3GjIeTonCcN79ZvpPee12Qun3vcdxX+37O5LFxz39XeW2I9bybMVA=="; - }; - }; "esbuild-linux-arm64-0.14.47" = { name = "esbuild-linux-arm64"; packageName = "esbuild-linux-arm64"; @@ -25395,15 +25296,6 @@ let sha512 = "ywfme6HVrhWcevzmsufjd4iT3PxTfCX9HOdxA7Hd+/ZM23Y9nXeb+vG6AyA6jgq/JovkcqRHcL9XwRNpWG6XRw=="; }; }; - "esbuild-linux-arm64-0.15.18" = { - name = "esbuild-linux-arm64"; - packageName = "esbuild-linux-arm64"; - version = "0.15.18"; - src = fetchurl { - url = "https://registry.npmjs.org/esbuild-linux-arm64/-/esbuild-linux-arm64-0.15.18.tgz"; - sha512 = "54qr8kg/6ilcxd+0V3h9rjT4qmjc0CccMVWrjOEM/pEcUzt8X62HfBSeZfT2ECpM7104mk4yfQXkosY8Quptug=="; - }; - }; "esbuild-linux-mips64le-0.14.47" = { name = "esbuild-linux-mips64le"; packageName = "esbuild-linux-mips64le"; @@ -25413,15 +25305,6 @@ let sha512 = "mg3D8YndZ1LvUiEdDYR3OsmeyAew4MA/dvaEJxvyygahWmpv1SlEEnhEZlhPokjsUMfRagzsEF/d/2XF+kTQGg=="; }; }; - "esbuild-linux-mips64le-0.15.18" = { - name = "esbuild-linux-mips64le"; - packageName = "esbuild-linux-mips64le"; - version = "0.15.18"; - src = fetchurl { - url = "https://registry.npmjs.org/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.15.18.tgz"; - sha512 = "Mk6Ppwzzz3YbMl/ZZL2P0q1tnYqh/trYZ1VfNP47C31yT0K8t9s7Z077QrDA/guU60tGNp2GOwCQnp+DYv7bxQ=="; - }; - }; "esbuild-linux-ppc64le-0.14.47" = { name = "esbuild-linux-ppc64le"; packageName = "esbuild-linux-ppc64le"; @@ -25431,15 +25314,6 @@ let sha512 = "WER+f3+szmnZiWoK6AsrTKGoJoErG2LlauSmk73LEZFQ/iWC+KhhDsOkn1xBUpzXWsxN9THmQFltLoaFEH8F8w=="; }; }; - "esbuild-linux-ppc64le-0.15.18" = { - name = "esbuild-linux-ppc64le"; - packageName = "esbuild-linux-ppc64le"; - version = "0.15.18"; - src = fetchurl { - url = "https://registry.npmjs.org/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.15.18.tgz"; - sha512 = "b0XkN4pL9WUulPTa/VKHx2wLCgvIAbgwABGnKMY19WhKZPT+8BxhZdqz6EgkqCLld7X5qiCY2F/bfpUUlnFZ9w=="; - }; - }; "esbuild-linux-riscv64-0.14.47" = { name = "esbuild-linux-riscv64"; packageName = "esbuild-linux-riscv64"; @@ -25449,15 +25323,6 @@ let sha512 = "1fI6bP3A3rvI9BsaaXbMoaOjLE3lVkJtLxsgLHqlBhLlBVY7UqffWBvkrX/9zfPhhVMd9ZRFiaqXnB1T7BsL2g=="; }; }; - "esbuild-linux-riscv64-0.15.18" = { - name = "esbuild-linux-riscv64"; - packageName = "esbuild-linux-riscv64"; - version = "0.15.18"; - src = fetchurl { - url = "https://registry.npmjs.org/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.15.18.tgz"; - sha512 = "ba2COaoF5wL6VLZWn04k+ACZjZ6NYniMSQStodFKH/Pu6RxzQqzsmjR1t9QC89VYJxBeyVPTaHuBMCejl3O/xg=="; - }; - }; "esbuild-linux-s390x-0.14.47" = { name = "esbuild-linux-s390x"; packageName = "esbuild-linux-s390x"; @@ -25467,15 +25332,6 @@ let sha512 = "eZrWzy0xFAhki1CWRGnhsHVz7IlSKX6yT2tj2Eg8lhAwlRE5E96Hsb0M1mPSE1dHGpt1QVwwVivXIAacF/G6mw=="; }; }; - "esbuild-linux-s390x-0.15.18" = { - name = "esbuild-linux-s390x"; - packageName = "esbuild-linux-s390x"; - version = "0.15.18"; - src = fetchurl { - url = "https://registry.npmjs.org/esbuild-linux-s390x/-/esbuild-linux-s390x-0.15.18.tgz"; - sha512 = "VbpGuXEl5FCs1wDVp93O8UIzl3ZrglgnSQ+Hu79g7hZu6te6/YHgVJxCM2SqfIila0J3k0csfnf8VD2W7u2kzQ=="; - }; - }; "esbuild-netbsd-64-0.14.47" = { name = "esbuild-netbsd-64"; packageName = "esbuild-netbsd-64"; @@ -25485,15 +25341,6 @@ let sha512 = "Qjdjr+KQQVH5Q2Q1r6HBYswFTToPpss3gqCiSw2Fpq/ua8+eXSQyAMG+UvULPqXceOwpnPo4smyZyHdlkcPppQ=="; }; }; - "esbuild-netbsd-64-0.15.18" = { - name = "esbuild-netbsd-64"; - packageName = "esbuild-netbsd-64"; - version = "0.15.18"; - src = fetchurl { - url = "https://registry.npmjs.org/esbuild-netbsd-64/-/esbuild-netbsd-64-0.15.18.tgz"; - sha512 = "98ukeCdvdX7wr1vUYQzKo4kQ0N2p27H7I11maINv73fVEXt2kyh4K4m9f35U1K43Xc2QGXlzAw0K9yoU7JUjOg=="; - }; - }; "esbuild-openbsd-64-0.14.47" = { name = "esbuild-openbsd-64"; packageName = "esbuild-openbsd-64"; @@ -25503,15 +25350,6 @@ let sha512 = "QpgN8ofL7B9z8g5zZqJE+eFvD1LehRlxr25PBkjyyasakm4599iroUpaj96rdqRlO2ShuyqwJdr+oNqWwTUmQw=="; }; }; - "esbuild-openbsd-64-0.15.18" = { - name = "esbuild-openbsd-64"; - packageName = "esbuild-openbsd-64"; - version = "0.15.18"; - src = fetchurl { - url = "https://registry.npmjs.org/esbuild-openbsd-64/-/esbuild-openbsd-64-0.15.18.tgz"; - sha512 = "yK5NCcH31Uae076AyQAXeJzt/vxIo9+omZRKj1pauhk3ITuADzuOx5N2fdHrAKPxN+zH3w96uFKlY7yIn490xQ=="; - }; - }; "esbuild-sunos-64-0.14.47" = { name = "esbuild-sunos-64"; packageName = "esbuild-sunos-64"; @@ -25521,15 +25359,6 @@ let sha512 = "uOeSgLUwukLioAJOiGYm3kNl+1wJjgJA8R671GYgcPgCx7QR73zfvYqXFFcIO93/nBdIbt5hd8RItqbbf3HtAQ=="; }; }; - "esbuild-sunos-64-0.15.18" = { - name = "esbuild-sunos-64"; - packageName = "esbuild-sunos-64"; - version = "0.15.18"; - src = fetchurl { - url = "https://registry.npmjs.org/esbuild-sunos-64/-/esbuild-sunos-64-0.15.18.tgz"; - sha512 = "On22LLFlBeLNj/YF3FT+cXcyKPEI263nflYlAhz5crxtp3yRG1Ugfr7ITyxmCmjm4vbN/dGrb/B7w7U8yJR9yw=="; - }; - }; "esbuild-windows-32-0.14.47" = { name = "esbuild-windows-32"; packageName = "esbuild-windows-32"; @@ -25539,15 +25368,6 @@ let sha512 = "H0fWsLTp2WBfKLBgwYT4OTfFly4Im/8B5f3ojDv1Kx//kiubVY0IQunP2Koc/fr/0wI7hj3IiBDbSrmKlrNgLQ=="; }; }; - "esbuild-windows-32-0.15.18" = { - name = "esbuild-windows-32"; - packageName = "esbuild-windows-32"; - version = "0.15.18"; - src = fetchurl { - url = "https://registry.npmjs.org/esbuild-windows-32/-/esbuild-windows-32-0.15.18.tgz"; - sha512 = "o+eyLu2MjVny/nt+E0uPnBxYuJHBvho8vWsC2lV61A7wwTWC3jkN2w36jtA+yv1UgYkHRihPuQsL23hsCYGcOQ=="; - }; - }; "esbuild-windows-64-0.14.47" = { name = "esbuild-windows-64"; packageName = "esbuild-windows-64"; @@ -25557,15 +25377,6 @@ let sha512 = "/Pk5jIEH34T68r8PweKRi77W49KwanZ8X6lr3vDAtOlH5EumPE4pBHqkCUdELanvsT14yMXLQ/C/8XPi1pAtkQ=="; }; }; - "esbuild-windows-64-0.15.18" = { - name = "esbuild-windows-64"; - packageName = "esbuild-windows-64"; - version = "0.15.18"; - src = fetchurl { - url = "https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-0.15.18.tgz"; - sha512 = "qinug1iTTaIIrCorAUjR0fcBk24fjzEedFYhhispP8Oc7SFvs+XeW3YpAKiKp8dRpizl4YYAhxMjlftAMJiaUw=="; - }; - }; "esbuild-windows-arm64-0.14.47" = { name = "esbuild-windows-arm64"; packageName = "esbuild-windows-arm64"; @@ -25575,15 +25386,6 @@ let sha512 = "HFSW2lnp62fl86/qPQlqw6asIwCnEsEoNIL1h2uVMgakddf+vUuMcCbtUY1i8sst7KkgHrVKCJQB33YhhOweCQ=="; }; }; - "esbuild-windows-arm64-0.15.18" = { - name = "esbuild-windows-arm64"; - packageName = "esbuild-windows-arm64"; - version = "0.15.18"; - src = fetchurl { - url = "https://registry.npmjs.org/esbuild-windows-arm64/-/esbuild-windows-arm64-0.15.18.tgz"; - sha512 = "q9bsYzegpZcLziq0zgUi5KqGVtfhjxGbnksaBFYmWLxeV/S1fK4OLdq2DFYnXcLMjlZw2L0jLsk1eGoB522WXQ=="; - }; - }; "esc-exit-3.0.0" = { name = "esc-exit"; packageName = "esc-exit"; @@ -25737,13 +25539,13 @@ let sha512 = "pd8KSxiQpdYRfYa9Wufvdoct3ZPQQuVuU5O6scNgMuOMYuxvH0IGaYK0wUFjo4UYYQQCUndlXiMbnxopwvvTiw=="; }; }; - "eslint-8.52.0" = { + "eslint-8.53.0" = { name = "eslint"; packageName = "eslint"; - version = "8.52.0"; + version = "8.53.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-8.52.0.tgz"; - sha512 = "zh/JHnaixqHZsolRB/w9/02akBk9EPrOs9JwcTP2ek7yL5bVvXuRariiaAjjoJ5DvuwQ1WAE/HsMz+w17YgBCg=="; + url = "https://registry.npmjs.org/eslint/-/eslint-8.53.0.tgz"; + sha512 = "N4VuiPjXDUa4xVeV/GC/RV3hQW9Nw+Y463lkWaKKXKYMvmRiRDAtfpuPFLN+E1/6ZhyR8J2ig+eVREnYgUsiag=="; }; }; "eslint-config-prettier-8.10.0" = { @@ -26043,15 +25845,6 @@ let sha512 = "SqmZANLWS0mnatqbSfRP5g8OXZC12Fgg1IwNtLsyHDzJizORW4khDfjPqJZsemPWBB2uqykUah5YpQ6epsqC/w=="; }; }; - "estree-walker-1.0.1" = { - name = "estree-walker"; - packageName = "estree-walker"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/estree-walker/-/estree-walker-1.0.1.tgz"; - sha512 = "1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg=="; - }; - }; "estree-walker-2.0.2" = { name = "estree-walker"; packageName = "estree-walker"; @@ -26358,22 +26151,22 @@ let sha512 = "ov6w/2LCiuyO4RLYGdpFGjkcs0wMTgGE8PrkTHikeUy5iJekXyPIKUjifk5CsE0pt7sMCrMZ3YNqoCj6idQOnQ=="; }; }; - "execa-5.0.1" = { + "execa-5.1.1" = { name = "execa"; packageName = "execa"; - version = "5.0.1"; + version = "5.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/execa/-/execa-5.0.1.tgz"; - sha512 = "4hFTjFbFzQa3aCLobpbPJR/U+VoL1wdV5ozOWjeet0AWDeYr9UFGM1eUFWHX+VtOWFq4p0xXUXfW1YxUaP4fpw=="; + url = "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz"; + sha512 = "8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg=="; }; }; - "execa-5.1.1" = { + "execa-6.1.0" = { name = "execa"; packageName = "execa"; - version = "5.1.1"; + version = "6.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz"; - sha512 = "8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg=="; + url = "https://registry.npmjs.org/execa/-/execa-6.1.0.tgz"; + sha512 = "QVWlX2e50heYJcCPG0iWtf8r0xjEYfz/OYLGDYH+IyjWezzPNxz63qNFOu0l4YftGWuizFVZHHs8PrLU5p2IDA=="; }; }; "execa-7.2.0" = { @@ -27078,6 +26871,15 @@ let sha512 = "kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg=="; }; }; + "fast-glob-3.3.2" = { + name = "fast-glob"; + packageName = "fast-glob"; + version = "3.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz"; + sha512 = "oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow=="; + }; + }; "fast-json-patch-3.1.1" = { name = "fast-json-patch"; packageName = "fast-json-patch"; @@ -27348,15 +27150,6 @@ let sha512 = "CpKgwraLo4YWY9cUEICNJ1WcOVR2WE1Jvot3Nvr7FGBiGOKgkn1CmF4zuCl9VxvEh1nQsdYXtQg+V0etPiED6g=="; }; }; - "figgy-pudding-3.5.2" = { - name = "figgy-pudding"; - packageName = "figgy-pudding"; - version = "3.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.2.tgz"; - sha512 = "0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw=="; - }; - }; "figlet-1.5.0" = { name = "figlet"; packageName = "figlet"; @@ -27456,15 +27249,6 @@ let sha512 = "WhYlIPdaYeE6/Pow1Js4QwRQBVXRoRWCZxPLL/YrzUwsZHT8fZuBxP8zZHawLQ8HxwORumP+CoRVuUxkAJD0dw=="; }; }; - "file-stream-rotator-0.6.1" = { - name = "file-stream-rotator"; - packageName = "file-stream-rotator"; - version = "0.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/file-stream-rotator/-/file-stream-rotator-0.6.1.tgz"; - sha512 = "u+dBid4PvZw17PmDeRcNOtCP9CCK/9lRN2w+r1xIS7yOL9JFrIBKTvrYsxT4P0pGtThYTn++QS5ChHaUov3+zQ=="; - }; - }; "file-type-10.11.0" = { name = "file-type"; packageName = "file-type"; @@ -27906,13 +27690,13 @@ let sha512 = "eN9cmsIlRdq06wu3m01OOEgQf5Xh/M7REm0jfZ4eL3V3XisjXzfRq3iyqtKS+FhO6wB36FvWRiRGdeSx5KpLAQ=="; }; }; - "fkill-8.1.1" = { + "fkill-9.0.0" = { name = "fkill"; packageName = "fkill"; - version = "8.1.1"; + version = "9.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/fkill/-/fkill-8.1.1.tgz"; - sha512 = "138B7rFQMEKoJQOVl3NCPyRAaex0ruLvQgqkEWa/CyUY9MFFxZ8TtztiMJSs6/wD60M6kK0OKUOwHRsr3U2RBg=="; + url = "https://registry.npmjs.org/fkill/-/fkill-9.0.0.tgz"; + sha512 = "MdYSsbdCaIRjzo5edthZtWmEZVMfr1qrtYZUHIdO3swCE+CoZA8S5l0s4jDsYlTa9ZiXv0pTgpzE7s4N8NeUOA=="; }; }; "flagged-respawn-1.0.1" = { @@ -28005,13 +27789,13 @@ let sha512 = "dz4HxH6pOvbUzZpZ/yXhafjbR2I8cenK5xL0KtBFb7U2ADsR+OwXifnxZjij/pZWF775uSCMzWVd+jDik2H2IA=="; }; }; - "flow-parser-0.220.0" = { + "flow-parser-0.220.1" = { name = "flow-parser"; packageName = "flow-parser"; - version = "0.220.0"; + version = "0.220.1"; src = fetchurl { - url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.220.0.tgz"; - sha512 = "Fks+nOCqhorp4NpAtAxf09UaR/9xDf3AnU1UkWczmpneoHh06Y3AoEA4tIe2HbYrOHT9JArUgDZpCFhP4clo1A=="; + url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.220.1.tgz"; + sha512 = "RoM3ARqVYvxnwtkM36RjQFzo5Z9p22jUqtuMrN8gzA/8fU6iMLFE3cXkdSFPyfHRXLU8ILH8TCtSFADk1ACPCg=="; }; }; "fluent-ffmpeg-2.1.2" = { @@ -28257,15 +28041,6 @@ let sha512 = "wzsgA6WOq+09wrU1tsJ09udeR/YZRaeArL9e1wPbFg3GG2yDnC2ldKpxs4xunpFF9DgqCqOIra3bc1HWrJ37Ww=="; }; }; - "format-util-1.0.5" = { - name = "format-util"; - packageName = "format-util"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/format-util/-/format-util-1.0.5.tgz"; - sha512 = "varLbTj0e0yVyRpqQhuWV+8hlePAgaoFRhNFj50BNjEIrw1/DphHSObtqwskVCPWNgzwPoQrZAbfa/SBiicNeg=="; - }; - }; "formdata-polyfill-4.0.10" = { name = "formdata-polyfill"; packageName = "formdata-polyfill"; @@ -28923,6 +28698,15 @@ let sha512 = "DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="; }; }; + "get-east-asian-width-1.2.0" = { + name = "get-east-asian-width"; + packageName = "get-east-asian-width"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/get-east-asian-width/-/get-east-asian-width-1.2.0.tgz"; + sha512 = "2nk+7SIVb14QrgXFHcm84tD4bKQz0RxPuMT8Ag5KPOq7J5fEmAg0UbXdTOSHqNuHSU28k55qnceesxXRZGzKWA=="; + }; + }; "get-installed-path-2.1.1" = { name = "get-installed-path"; packageName = "get-installed-path"; @@ -29625,15 +29409,6 @@ let sha512 = "NknMLn7F2J7aflwFOlGdNIuCDpN3VGoSoB+aap3KABFWbHVn1TCgFC+np23J8W2BiZbjfEw3BFBycSMv1AFblg=="; }; }; - "global-dirs-2.1.0" = { - name = "global-dirs"; - packageName = "global-dirs"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/global-dirs/-/global-dirs-2.1.0.tgz"; - sha512 = "MG6kdOUh/xBnyo9cJFeIKkLEc1AyFq42QTU4XiX51i2NEdxLxLWXIjEjmqKeSuKR7pAZjTqUVoT2b2huxVLgYQ=="; - }; - }; "global-dirs-3.0.1" = { name = "global-dirs"; packageName = "global-dirs"; @@ -29725,15 +29500,6 @@ let sha512 = "sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA=="; }; }; - "globalyzer-0.1.0" = { - name = "globalyzer"; - packageName = "globalyzer"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/globalyzer/-/globalyzer-0.1.0.tgz"; - sha512 = "40oNTM9UfG6aBmuKxk/giHn5nQ8RVz/SS4Ir6zgzOv9/qC3kKZ9v4etGTcJbEl/NyVQH7FGU7d+X1egr57Md2Q=="; - }; - }; "globby-11.0.1" = { name = "globby"; packageName = "globby"; @@ -29797,15 +29563,6 @@ let sha512 = "xYfnw62CKG8nLkZBfWbhWwDw02CHty86jfPcc2cr3ZfeuK9ysoVPPEUxf21bAD/rWAgk52SuBrLJlefNy8mvFg=="; }; }; - "globrex-0.1.2" = { - name = "globrex"; - packageName = "globrex"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/globrex/-/globrex-0.1.2.tgz"; - sha512 = "uHJgbwAMwNFf5mLst7IWLNg14x1CkeqglJb/K3doi4dw6q2IvAAmM/Y81kevy83wP+Sst+nutFTYOGg3d1lsxg=="; - }; - }; "globule-1.3.4" = { name = "globule"; packageName = "globule"; @@ -30616,15 +30373,6 @@ let sha512 = "vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA=="; }; }; - "hast-util-embedded-1.0.6" = { - name = "hast-util-embedded"; - packageName = "hast-util-embedded"; - version = "1.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/hast-util-embedded/-/hast-util-embedded-1.0.6.tgz"; - sha512 = "JQMW+TJe0UAIXZMjCJ4Wf6ayDV9Yv3PBDPsHD4ExBpAspJ6MOcCX+nzVF+UJVv7OqPcg852WEMSHQPoRA+FVSw=="; - }; - }; "hast-util-embedded-2.0.1" = { name = "hast-util-embedded"; packageName = "hast-util-embedded"; @@ -30643,15 +30391,6 @@ let sha512 = "gOc8UB99F6eWVWFtM9jUikjN7QkWxB3nY0df5Z0Zq1/Nkwl5V4hAAsl0tmwlgWl/1shlTF8DnNYLO8X6wRV9pA=="; }; }; - "hast-util-from-parse5-6.0.1" = { - name = "hast-util-from-parse5"; - packageName = "hast-util-from-parse5"; - version = "6.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/hast-util-from-parse5/-/hast-util-from-parse5-6.0.1.tgz"; - sha512 = "jeJUWiN5pSxW12Rh01smtVkZgZr33wBokLzKLwinYOUfSzm1Nl/c3GUGebDyOKjdsRgMvoVbV0VpAcpjF4NrJA=="; - }; - }; "hast-util-from-parse5-7.1.2" = { name = "hast-util-from-parse5"; packageName = "hast-util-from-parse5"; @@ -30661,15 +30400,6 @@ let sha512 = "Nz7FfPBuljzsN3tCQ4kCBKqdNhQE2l0Tn+X1ubgKBPRoiDIu1mL08Cfw4k7q71+Duyaw7DXDN+VTAp4Vh3oCOw=="; }; }; - "hast-util-has-property-1.0.4" = { - name = "hast-util-has-property"; - packageName = "hast-util-has-property"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/hast-util-has-property/-/hast-util-has-property-1.0.4.tgz"; - sha512 = "ghHup2voGfgFoHMGnaLHOjbYFACKrRh9KFttdCzMCbFoBMJXiNi2+XTrPP8+q6cDJM/RSqlCfVWrjp1H201rZg=="; - }; - }; "hast-util-has-property-2.0.1" = { name = "hast-util-has-property"; packageName = "hast-util-has-property"; @@ -30679,15 +30409,6 @@ let sha512 = "X2+RwZIMTMKpXUzlotatPzWj8bspCymtXH3cfG3iQKV+wPF53Vgaqxi/eLqGck0wKq1kS9nvoB1wchbCPEL8sg=="; }; }; - "hast-util-is-body-ok-link-1.0.4" = { - name = "hast-util-is-body-ok-link"; - packageName = "hast-util-is-body-ok-link"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/hast-util-is-body-ok-link/-/hast-util-is-body-ok-link-1.0.4.tgz"; - sha512 = "mFblNpLvFbD8dG2Nw5dJBYZkxIHeph1JAh5yr4huI7T5m8cV0zaXNiqzKPX/JdjA+tIDF7c33u9cxK132KRjyQ=="; - }; - }; "hast-util-is-body-ok-link-2.0.0" = { name = "hast-util-is-body-ok-link"; packageName = "hast-util-is-body-ok-link"; @@ -30697,15 +30418,6 @@ let sha512 = "S58hCexyKdD31vMsErvgLfflW6vYWo/ixRLPJTtkOvLld24vyI8vmYmkgLA5LG3la2ME7nm7dLGdm48gfLRBfw=="; }; }; - "hast-util-is-element-1.1.0" = { - name = "hast-util-is-element"; - packageName = "hast-util-is-element"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/hast-util-is-element/-/hast-util-is-element-1.1.0.tgz"; - sha512 = "oUmNua0bFbdrD/ELDSSEadRVtWZOf3iF6Lbv81naqsIV99RnSCieTbWuWCY8BAeEfKJTKl0gRdokv+dELutHGQ=="; - }; - }; "hast-util-is-element-2.1.3" = { name = "hast-util-is-element"; packageName = "hast-util-is-element"; @@ -30733,15 +30445,6 @@ let sha512 = "jdlwBjEexy1oGz0aJ2f4GKMaVKkA9jwjr4MjAAI22E5fM/TXVZHuS5OpONtdeIkRKqAaryQ2E9xNQxijoThSZA=="; }; }; - "hast-util-phrasing-1.0.5" = { - name = "hast-util-phrasing"; - packageName = "hast-util-phrasing"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/hast-util-phrasing/-/hast-util-phrasing-1.0.5.tgz"; - sha512 = "P3uxm+8bnwcfAS/XpGie9wMmQXAQqsYhgQQKRwmWH/V6chiq0lmTy8KjQRJmYjusdMtNKGCUksdILSZy1suSpQ=="; - }; - }; "hast-util-phrasing-2.0.2" = { name = "hast-util-phrasing"; packageName = "hast-util-phrasing"; @@ -30751,15 +30454,6 @@ let sha512 = "yGkCfPkkfCyiLfK6KEl/orMDr/zgCnq/NaO9HfULx6/Zga5fso5eqQA5Ov/JZVqACygvw9shRYWgXNcG2ilo7w=="; }; }; - "hast-util-to-nlcst-1.2.8" = { - name = "hast-util-to-nlcst"; - packageName = "hast-util-to-nlcst"; - version = "1.2.8"; - src = fetchurl { - url = "https://registry.npmjs.org/hast-util-to-nlcst/-/hast-util-to-nlcst-1.2.8.tgz"; - sha512 = "cKMArohUvGw4fpN9PKDCIB+klMojkWzz5zNVNFRdKa0oC1MVX1TaDki1E/tb9xqS8WlUjKifIjmrNmRbEJzrJg=="; - }; - }; "hast-util-to-nlcst-2.2.0" = { name = "hast-util-to-nlcst"; packageName = "hast-util-to-nlcst"; @@ -30769,15 +30463,6 @@ let sha512 = "BFBvuoEo9yCHklUSCz6+JG/FAkr+qCVaW1bE0/Y8+SBhuaz7s+suHDpkyQxH7FF2kqctYRhquLRCcmn+PS0IUQ=="; }; }; - "hast-util-to-string-1.0.4" = { - name = "hast-util-to-string"; - packageName = "hast-util-to-string"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/hast-util-to-string/-/hast-util-to-string-1.0.4.tgz"; - sha512 = "eK0MxRX47AV2eZ+Lyr18DCpQgodvaS3fAQO2+b9Two9F5HEoRPhiUMNzoXArMJfZi2yieFzUBMRl3HNJ3Jus3w=="; - }; - }; "hast-util-to-string-2.0.0" = { name = "hast-util-to-string"; packageName = "hast-util-to-string"; @@ -30787,15 +30472,6 @@ let sha512 = "02AQ3vLhuH3FisaMM+i/9sm4OXGSq1UhOOCpTLLQtHdL3tZt7qil69r8M8iDkZYyC0HCFylcYoP+8IO7ddta1A=="; }; }; - "hast-util-whitespace-1.0.4" = { - name = "hast-util-whitespace"; - packageName = "hast-util-whitespace"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/hast-util-whitespace/-/hast-util-whitespace-1.0.4.tgz"; - sha512 = "I5GTdSfhYfAPNztx2xJRQpG8cuDSNt599/7YUn7Gx/WxNMsG+a835k97TDkFgk123cwjfwINaZknkKkphx/f2A=="; - }; - }; "hast-util-whitespace-2.0.1" = { name = "hast-util-whitespace"; packageName = "hast-util-whitespace"; @@ -30814,15 +30490,6 @@ let sha512 = "WlztFuK+Lrvi3EggsqOkQ52rKbxkXL3RwB6t5lwoa8QLMemoWfBuL43eDrwOamJyR7uKQKdmKYaBH1NZBiIRrQ=="; }; }; - "hastscript-6.0.0" = { - name = "hastscript"; - packageName = "hastscript"; - version = "6.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/hastscript/-/hastscript-6.0.0.tgz"; - sha512 = "nDM6bvd7lIqDUiYEiu5Sl/+6ReP0BMk/2f4U/Rooccxkj0P5nm+acM5PrGJ/t5I8qPGiqZSE6hVAwZEdZIvP4w=="; - }; - }; "hastscript-7.2.0" = { name = "hastscript"; packageName = "hastscript"; @@ -31561,6 +31228,15 @@ let sha512 = "B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw=="; }; }; + "human-signals-3.0.1" = { + name = "human-signals"; + packageName = "human-signals"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/human-signals/-/human-signals-3.0.1.tgz"; + sha512 = "rQLskxnM/5OCldHo+wNXbpVgDn5A17CUoKX+7Sokwaknlq7CdSnphy0W39GU8dw59XiCXmFXDg4fRuckQRKewQ=="; + }; + }; "human-signals-4.3.1" = { name = "human-signals"; packageName = "human-signals"; @@ -31615,15 +31291,6 @@ let sha512 = "YeuIBmFsGjUfO3qBmMOc0rQaun4mIpGKET5WDwvu8lU7gvwpcariZLNtL0Fzj+zazcHUrlXHiptcFhBMFaxzfg=="; }; }; - "ibm-openapi-validator-0.97.5" = { - name = "ibm-openapi-validator"; - packageName = "ibm-openapi-validator"; - version = "0.97.5"; - src = fetchurl { - url = "https://registry.npmjs.org/ibm-openapi-validator/-/ibm-openapi-validator-0.97.5.tgz"; - sha512 = "MlXLjQCZRU0yqQ6EFzBhCehkFXp/rXuGsjsEglK+ldDJZV/YQy7dw1V6ROzoiibjm0f00J7L3ubLvlbIlHilGQ=="; - }; - }; "iconv-lite-0.4.23" = { name = "iconv-lite"; packageName = "iconv-lite"; @@ -31912,6 +31579,15 @@ let sha512 = "8+hPJLML+m1ym9NSeZXTXFkY5+ml0fYFAzO5yhZiaFQvk9kO0NkE7vd7e7kCVjkTmAxsDPbrWwLQACMwGTDgIg=="; }; }; + "import-in-the-middle-1.4.2" = { + name = "import-in-the-middle"; + packageName = "import-in-the-middle"; + version = "1.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/import-in-the-middle/-/import-in-the-middle-1.4.2.tgz"; + sha512 = "9WOz1Yh/cvO/p69sxRmhyQwrIGGSp7EIdcb+fFNVi7CzQGQB8U1/1XrKVSbEd/GNOAeM0peJtmi7+qphe7NvAw=="; + }; + }; "import-jsx-4.0.1" = { name = "import-jsx"; packageName = "import-jsx"; @@ -31957,13 +31633,22 @@ let sha512 = "f8KcQ1D80V7RnqVm+/lirO9zkOxjGxhaTC1IPrBGd3MEfNgmNG67tSUO9gTi2F3Blr2Az6g1vocaxzkVnWl9MA=="; }; }; - "import-meta-resolve-3.0.0" = { + "import-meta-resolve-3.1.1" = { name = "import-meta-resolve"; packageName = "import-meta-resolve"; - version = "3.0.0"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/import-meta-resolve/-/import-meta-resolve-3.0.0.tgz"; - sha512 = "4IwhLhNNA8yy445rPjD/lWh++7hMDOml2eHtd58eG7h+qK3EryMuuRbsHGPikCoAgIkkDnckKfWSk2iDla/ejg=="; + url = "https://registry.npmjs.org/import-meta-resolve/-/import-meta-resolve-3.1.1.tgz"; + sha512 = "qeywsE/KC3w9Fd2ORrRDUw6nS/nLwZpXgfrOc2IILvZYnCaEMd+D56Vfg9k4G29gIeVi3XKql1RQatME8iYsiw=="; + }; + }; + "import-meta-resolve-4.0.0" = { + name = "import-meta-resolve"; + packageName = "import-meta-resolve"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/import-meta-resolve/-/import-meta-resolve-4.0.0.tgz"; + sha512 = "okYUR7ZQPH+efeuMJGlq4f8ubUgO50kByRPyt/Cy1Io4PSRsPjxME+YlVaCOx+NIToW7hCsZNFJyTPFFKepRSA=="; }; }; "imurmurhash-0.1.4" = { @@ -32092,15 +31777,6 @@ let sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="; }; }; - "ini-1.3.7" = { - name = "ini"; - packageName = "ini"; - version = "1.3.7"; - src = fetchurl { - url = "https://registry.npmjs.org/ini/-/ini-1.3.7.tgz"; - sha512 = "iKpRpXP+CrP2jyrxvg1kMUpXDyRUFDWurxbnVT1vQPx+Wz9uCYsMIqYuSBLV+PAaZG/d7kRLKRFc9oDMsH+mFQ=="; - }; - }; "ini-1.3.8" = { name = "ini"; packageName = "ini"; @@ -32281,15 +31957,6 @@ let sha512 = "JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA=="; }; }; - "inquirer-8.2.4" = { - name = "inquirer"; - packageName = "inquirer"; - version = "8.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/inquirer/-/inquirer-8.2.4.tgz"; - sha512 = "nn4F01dxU8VeKfq192IjLsxu0/OmMZ4Lg3xKAns148rCaXP6ntAoEkVYZThWjwON8AlzdZZi6oqnhNbxUG9hVg=="; - }; - }; "inquirer-8.2.6" = { name = "inquirer"; packageName = "inquirer"; @@ -32308,13 +31975,22 @@ let sha512 = "B2LafrnnhbRzCWfAdOXisUzL89Kg8cVJlYmhqoi3flSiV/TveO+nsXwgKr9h9PIo+J1hz7nBSk6gegRIMBBf7g=="; }; }; - "inquirer-autocomplete-prompt-1.4.0" = { + "inquirer-9.2.12" = { + name = "inquirer"; + packageName = "inquirer"; + version = "9.2.12"; + src = fetchurl { + url = "https://registry.npmjs.org/inquirer/-/inquirer-9.2.12.tgz"; + sha512 = "mg3Fh9g2zfuVWJn6lhST0O7x4n03k7G8Tx5nvikJkbq8/CK47WDVm+UznF0G6s5Zi0KcyUisr6DU8T67N5U+1Q=="; + }; + }; + "inquirer-autocomplete-prompt-3.0.1" = { name = "inquirer-autocomplete-prompt"; packageName = "inquirer-autocomplete-prompt"; - version = "1.4.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/inquirer-autocomplete-prompt/-/inquirer-autocomplete-prompt-1.4.0.tgz"; - sha512 = "qHgHyJmbULt4hI+kCmwX92MnSxDs/Yhdt4wPA30qnoa01OF6uTXV8yvH4hKXgdaTNmkZ9D01MHjqKYEuJN+ONw=="; + url = "https://registry.npmjs.org/inquirer-autocomplete-prompt/-/inquirer-autocomplete-prompt-3.0.1.tgz"; + sha512 = "DQBXwX2fVQPVUzu4v4lGgtNgyjcX2+rTyphb2MeSOQh3xUayKAfHAF4y0KgsMi06m6ZiR3xIOdzMZMfQgX2m9w=="; }; }; "inquirer-autosubmit-prompt-0.2.0" = { @@ -32767,15 +32443,6 @@ let sha512 = "FWyyY60MeTNyeSRpkM2Iry0G9hpr7/9kD40mD/cGQEuilcZYS4okz8SN2Q6rLCJ8gbCt6fN+rC+6tMGS99LaxQ=="; }; }; - "is-alphanumeric-1.0.0" = { - name = "is-alphanumeric"; - packageName = "is-alphanumeric"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-alphanumeric/-/is-alphanumeric-1.0.0.tgz"; - sha512 = "ZmRL7++ZkcMOfDuWZuMJyIVLr2keE1o/DeNWh1EmgqGhUcV+9BIVsx0BcSBOHTZqzjs4+dISzr2KAeBEWGgXeA=="; - }; - }; "is-alphanumerical-1.0.4" = { name = "is-alphanumerical"; packageName = "is-alphanumerical"; @@ -33289,15 +32956,6 @@ let sha512 = "KIYLCCJghfHZxqjYBE7rEy0OBuTd5xCHS7tHVgvCLkx7StIoaxwNW3hCALgEUjFfeRk+MG/Qxmp/vtETEF3tRA=="; }; }; - "is-installed-globally-0.3.2" = { - name = "is-installed-globally"; - packageName = "is-installed-globally"; - version = "0.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.3.2.tgz"; - sha512 = "wZ8x1js7Ia0kecP/CHM/3ABkAmujX7WPvQk6uu3Fly/Mk44pySulQpnHG46OMjHGXApINnV4QhY3SWnECO2z5g=="; - }; - }; "is-installed-globally-0.4.0" = { name = "is-installed-globally"; packageName = "is-installed-globally"; @@ -33442,15 +33100,6 @@ let sha512 = "9r39FIr3d+KD9SbX0sfMsHzb5PP3uimOiwr3YupUaUFG4W0l1U57Rx3utpttV7qz5U3jmrO5auUa04LU9pyHsg=="; }; }; - "is-npm-4.0.0" = { - name = "is-npm"; - packageName = "is-npm"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-npm/-/is-npm-4.0.0.tgz"; - sha512 = "96ECIfh9xtDDlPylNPXhzjsykHsMJZ18ASpaWzQyBr4YRTcVjUvzaHayDAES2oU/3KpljhHUjtSRNiDwi0F0ig=="; - }; - }; "is-npm-5.0.0" = { name = "is-npm"; packageName = "is-npm"; @@ -33757,15 +33406,6 @@ let sha512 = "cr/SlUEe5zOGmzvj9bUyC4LVvkNVAXu4GytXLNMr1pny+a65MpQ9IJzFHD5vi7FyJgb4qt27+eS3TuQnqB+RQw=="; }; }; - "is-reference-1.2.1" = { - name = "is-reference"; - packageName = "is-reference"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-reference/-/is-reference-1.2.1.tgz"; - sha512 = "U82MsXXiFIrjCK4otLT+o2NA2Cd2g5MLoOVXUZjIOhLurrRxpEXzI8O0KZHr3IjLvlAH1kTPYSuqer5T9ZVBKQ=="; - }; - }; "is-reference-3.0.2" = { name = "is-reference"; packageName = "is-reference"; @@ -34099,15 +33739,6 @@ let sha512 = "sNxgpk9793nzSs7bA6JQJGeIuRBQhAaNGG77kzYQgMkrID+lS6SlK07K5LaptscDlSaIgH+GPFzf+d75FVxozA=="; }; }; - "is-whitespace-character-1.0.4" = { - name = "is-whitespace-character"; - packageName = "is-whitespace-character"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/is-whitespace-character/-/is-whitespace-character-1.0.4.tgz"; - sha512 = "SDweEzfIZM0SJV0EUga669UTKlmL0Pq8Lno0QDQsPnvECB3IM2aP0gdx5TrU0A01MAPfViaZiI2V1QMZLaKK5w=="; - }; - }; "is-windows-1.0.2" = { name = "is-windows"; packageName = "is-windows"; @@ -34117,15 +33748,6 @@ let sha512 = "eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA=="; }; }; - "is-word-character-1.0.4" = { - name = "is-word-character"; - packageName = "is-word-character"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/is-word-character/-/is-word-character-1.0.4.tgz"; - sha512 = "5SMO8RVennx3nZrqtKwCGyyetPE9VDba5ugvKLaD4KopPG5kR4mQ7tNt/r7feL5yt5h3lpuBbIUmCOG2eSzXHA=="; - }; - }; "is-wsl-1.1.0" = { name = "is-wsl"; packageName = "is-wsl"; @@ -34342,13 +33964,13 @@ let sha512 = "X3HBmm7+Th+l4/kMtqwcHHgELD0Lfl0Ina6S3+grr+mKmTxsrM84NAO1UuRPIxIbGLIl3TCEu45S1kdu21HYbQ=="; }; }; - "istanbul-lib-coverage-3.2.0" = { + "istanbul-lib-coverage-3.2.2" = { name = "istanbul-lib-coverage"; packageName = "istanbul-lib-coverage"; - version = "3.2.0"; + version = "3.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz"; - sha512 = "eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw=="; + url = "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz"; + sha512 = "O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg=="; }; }; "istanbul-lib-hook-3.0.0" = { @@ -34927,13 +34549,13 @@ let sha512 = "dJ2FbnUfX5Eg9BdZx6Cz2JhDsvzGi2DoQeomzdjO9ltvVUouAFPWkpcUtJdLXaNmHQtPM4/I+AzelUX7w2mWVw=="; }; }; - "jsii-5.2.23" = { + "jsii-5.2.26" = { name = "jsii"; packageName = "jsii"; - version = "5.2.23"; + version = "5.2.26"; src = fetchurl { - url = "https://registry.npmjs.org/jsii/-/jsii-5.2.23.tgz"; - sha512 = "OrQU4r4187z93ORCgjtMYKTomygNmIE8zMFqGohBjD4sCLqgzSB70O2KBTas8Hplz5iZULdxP3+6a8P3kr1MnQ=="; + url = "https://registry.npmjs.org/jsii/-/jsii-5.2.26.tgz"; + sha512 = "R5R2mKKMVVs6a8nWJEtMWZXFr845visS4b4q4TK/xBQD7fmI2pylJftCJlePskwlv8W3hFlqSoQ2yp+Hbm8fZg=="; }; }; "jsii-pacmak-1.91.0" = { @@ -34963,22 +34585,22 @@ let sha512 = "v8eW/XiJHklnkmTtCIbyAeDPUVfovU/ZNh1ixvGri/ps5H3iRRpLEmqGJGMm2IEIjNCSmnmIsDMQLw20/7Nu+Q=="; }; }; - "jsii-rosetta-5.2.1" = { + "jsii-rosetta-5.2.2" = { name = "jsii-rosetta"; packageName = "jsii-rosetta"; - version = "5.2.1"; + version = "5.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-rosetta/-/jsii-rosetta-5.2.1.tgz"; - sha512 = "X98IBiNZSIkwmYfZ0de2b3dh7/BVBW//j8a/CVwm55J1YXYW9r6M/uIqRvqihD0GXgPVRCUjLpM/6BDluNSA8w=="; + url = "https://registry.npmjs.org/jsii-rosetta/-/jsii-rosetta-5.2.2.tgz"; + sha512 = "bMGJKdQLlvYXUawoY+6EMH/5RwOttNCiTxczaJlV27BpxWeqTYIYMAVcb+d+6FTNKvZ2AcbCjqlROW6RDONanQ=="; }; }; - "jsii-srcmak-0.1.953" = { + "jsii-srcmak-0.1.960" = { name = "jsii-srcmak"; packageName = "jsii-srcmak"; - version = "0.1.953"; + version = "0.1.960"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.953.tgz"; - sha512 = "HIJEsYUgwj+Xsg368PPJVAWVJB9m0YYRT1xbP4SexWc9OU8/pulMb8QPkPc7STe37qE/AreNzfj95JsmKdU0+A=="; + url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.960.tgz"; + sha512 = "G/VsiDLcNzhIMfwPdVnhnNFz9bpRPISI2JJhHQ2+GgFL2Pk413jGEih3C2n7gQ1Z3mdolSEYGLvqaL3szFT2ng=="; }; }; "json-buffer-3.0.0" = { @@ -35017,24 +34639,6 @@ let sha512 = "GOehvd5PO2FeZ5T4c+RxobeT5a1PiGpF4u9/3+UvrMU4bhnVqzJY7hm39wg8PDCqkU91fWGH8qjWR4bn+wgq9w=="; }; }; - "json-dup-key-validator-1.0.3" = { - name = "json-dup-key-validator"; - packageName = "json-dup-key-validator"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/json-dup-key-validator/-/json-dup-key-validator-1.0.3.tgz"; - sha512 = "JvJcV01JSiO7LRz7DY1Fpzn4wX2rJ3dfNTiAfnlvLNdhhnm0Pgdvhi2SGpENrZn7eSg26Ps3TPhOcuD/a4STXQ=="; - }; - }; - "json-logic-js-2.0.2" = { - name = "json-logic-js"; - packageName = "json-logic-js"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/json-logic-js/-/json-logic-js-2.0.2.tgz"; - sha512 = "ZBtBdMJieqQcH7IX/LaBsr5pX+Y5JIW+EhejtM3Ffg2jdN9Iwf+Ht6TbHnvAZ/YtwyuhPaCBlnvzrwVeWdvGDQ=="; - }; - }; "json-parse-better-errors-1.0.2" = { name = "json-parse-better-errors"; packageName = "json-parse-better-errors"; @@ -35125,15 +34729,6 @@ let sha512 = "YBOEogm5w9Op337yb6pAT6ZXDqlxAsQCanM3grid8lMWNxRJO/zWEJi3ZzqDL8boWfwhTFym5EFrNgWwpqcBRg=="; }; }; - "json-schema-ref-parser-5.1.3" = { - name = "json-schema-ref-parser"; - packageName = "json-schema-ref-parser"; - version = "5.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/json-schema-ref-parser/-/json-schema-ref-parser-5.1.3.tgz"; - sha512 = "CpDFlBwz/6la78hZxyB9FECVKGYjIIl3Ms3KLqFj99W7IIb7D00/RDgc++IGB4BBALl0QRhh5m4q5WNSopvLtQ=="; - }; - }; "json-schema-to-ts-1.6.4" = { name = "json-schema-to-ts"; packageName = "json-schema-to-ts"; @@ -35440,15 +35035,6 @@ let sha512 = "p/nXbhSEcu3pZRdkW1OfJhpsVtW1gd4Wa1fnQc9YLiTfAjn0312eMKimbdIQzuZl9aa9xUGaRlP9T/CJE/ditQ=="; }; }; - "jsonschema-1.4.1" = { - name = "jsonschema"; - packageName = "jsonschema"; - version = "1.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/jsonschema/-/jsonschema-1.4.1.tgz"; - sha512 = "S6cATIPVv1z0IlxdN+zUk5EPjkGCdnhN4wVSBlvoUO1tOLJootbo9CquNJmbIh4yikWHiUedhRYrNPn1arpEmQ=="; - }; - }; "jsonwebtoken-9.0.0" = { name = "jsonwebtoken"; packageName = "jsonwebtoken"; @@ -36214,15 +35800,6 @@ let sha512 = "vHBVMw1JFMTgEk15zRsJuSAg7QtGGHpUSEfnbcRL1/gTBag9iEfJbyjpDmdJmwMhvpoLoNBtdAUCdGnaP32hhw=="; }; }; - "libnpmconfig-1.2.1" = { - name = "libnpmconfig"; - packageName = "libnpmconfig"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/libnpmconfig/-/libnpmconfig-1.2.1.tgz"; - sha512 = "9esX8rTQAHqarx6qeZqmGQKBNZR5OIbl/Ayr0qQDy3oXja2iFVQQI81R6GZ2a02bSNZ9p3YOGX1O6HHCb1X7kA=="; - }; - }; "libnpmpublish-7.3.0" = { name = "libnpmpublish"; packageName = "libnpmpublish"; @@ -36268,94 +35845,13 @@ let sha512 = "yRHaiQDizWSzoXk3APcA71eOI/UuhEkNN9DiW2Tt44mhYzX4joFoCZlxsSOF7RyeLlfqzFLQI1ngFq3ggMPhOw=="; }; }; - "lightningcss-1.22.0" = { + "lightningcss-1.22.1" = { name = "lightningcss"; packageName = "lightningcss"; - version = "1.22.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lightningcss/-/lightningcss-1.22.0.tgz"; - sha512 = "+z0qvwRVzs4XGRXelnWRNwqsXUx8k3bSkbP8vD42kYKSk3z9OM2P3e/gagT7ei/gwh8DTS80LZOFZV6lm8Z8Fg=="; - }; - }; - "lightningcss-darwin-arm64-1.22.0" = { - name = "lightningcss-darwin-arm64"; - packageName = "lightningcss-darwin-arm64"; - version = "1.22.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lightningcss-darwin-arm64/-/lightningcss-darwin-arm64-1.22.0.tgz"; - sha512 = "aH2be3nNny+It5YEVm8tBSSdRlBVWQV8m2oJ7dESiYRzyY/E/bQUe2xlw5caaMuhlM9aoTMtOH25yzMhir0qPg=="; - }; - }; - "lightningcss-darwin-x64-1.22.0" = { - name = "lightningcss-darwin-x64"; - packageName = "lightningcss-darwin-x64"; - version = "1.22.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lightningcss-darwin-x64/-/lightningcss-darwin-x64-1.22.0.tgz"; - sha512 = "9KHRFA0Y6mNxRHeoQMp0YaI0R0O2kOgUlYPRjuasU4d+pI8NRhVn9bt0yX9VPs5ibWX1RbDViSPtGJvYYrfVAQ=="; - }; - }; - "lightningcss-freebsd-x64-1.22.0" = { - name = "lightningcss-freebsd-x64"; - packageName = "lightningcss-freebsd-x64"; - version = "1.22.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lightningcss-freebsd-x64/-/lightningcss-freebsd-x64-1.22.0.tgz"; - sha512 = "xaYL3xperGwD85rQioDb52ozF3NAJb+9wrge3jD9lxGffplu0Mn35rXMptB8Uc2N9Mw1i3Bvl7+z1evlqVl7ww=="; - }; - }; - "lightningcss-linux-arm-gnueabihf-1.22.0" = { - name = "lightningcss-linux-arm-gnueabihf"; - packageName = "lightningcss-linux-arm-gnueabihf"; - version = "1.22.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lightningcss-linux-arm-gnueabihf/-/lightningcss-linux-arm-gnueabihf-1.22.0.tgz"; - sha512 = "epQGvXIjOuxrZpMpMnRjK54ZqzhiHhCPLtHvw2fb6NeK2kK9YtF0wqmeTBiQ1AkbWfnnXGTstYaFNiadNK+StQ=="; - }; - }; - "lightningcss-linux-arm64-gnu-1.22.0" = { - name = "lightningcss-linux-arm64-gnu"; - packageName = "lightningcss-linux-arm64-gnu"; - version = "1.22.0"; + version = "1.22.1"; src = fetchurl { - url = "https://registry.npmjs.org/lightningcss-linux-arm64-gnu/-/lightningcss-linux-arm64-gnu-1.22.0.tgz"; - sha512 = "AArGtKSY4DGTA8xP8SDyNyKtpsUl1Rzq6FW4JomeyUQ4nBrR71uPChksTpj3gmWuGhZeRKLeCUI1DBid/zhChg=="; - }; - }; - "lightningcss-linux-arm64-musl-1.22.0" = { - name = "lightningcss-linux-arm64-musl"; - packageName = "lightningcss-linux-arm64-musl"; - version = "1.22.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lightningcss-linux-arm64-musl/-/lightningcss-linux-arm64-musl-1.22.0.tgz"; - sha512 = "RRraNgP8hnBPhInTTUdlFm+z16C/ghbxBG51Sw00hd7HUyKmEUKRozyc5od+/N6pOrX/bIh5vIbtMXIxsos0lg=="; - }; - }; - "lightningcss-linux-x64-gnu-1.22.0" = { - name = "lightningcss-linux-x64-gnu"; - packageName = "lightningcss-linux-x64-gnu"; - version = "1.22.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lightningcss-linux-x64-gnu/-/lightningcss-linux-x64-gnu-1.22.0.tgz"; - sha512 = "grdrhYGRi2KrR+bsXJVI0myRADqyA7ekprGxiuK5QRNkv7kj3Yq1fERDNyzZvjisHwKUi29sYMClscbtl+/Zpw=="; - }; - }; - "lightningcss-linux-x64-musl-1.22.0" = { - name = "lightningcss-linux-x64-musl"; - packageName = "lightningcss-linux-x64-musl"; - version = "1.22.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lightningcss-linux-x64-musl/-/lightningcss-linux-x64-musl-1.22.0.tgz"; - sha512 = "t5f90X+iQUtIyR56oXIHMBUyQFX/zwmPt72E6Dane3P8KNGlkijTg2I75XVQS860gNoEFzV7Mm5ArRRA7u5CAQ=="; - }; - }; - "lightningcss-win32-x64-msvc-1.22.0" = { - name = "lightningcss-win32-x64-msvc"; - packageName = "lightningcss-win32-x64-msvc"; - version = "1.22.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lightningcss-win32-x64-msvc/-/lightningcss-win32-x64-msvc-1.22.0.tgz"; - sha512 = "64HTDtOOZE9PUCZJiZZQpyqXBbdby1lnztBccnqh+NtbKxjnGzP92R2ngcgeuqMPecMNqNWxgoWgTGpC+yN5Sw=="; + url = "https://registry.npmjs.org/lightningcss/-/lightningcss-1.22.1.tgz"; + sha512 = "Fy45PhibiNXkm0cK5FJCbfO8Y6jUpD/YcHf/BtuI+jvYYqSXKF4muk61jjE8YxCR9y+hDYIWSzHTc+bwhDE6rQ=="; }; }; "lilconfig-2.1.0" = { @@ -36412,13 +35908,13 @@ let sha512 = "7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg=="; }; }; - "lines-and-columns-2.0.3" = { + "lines-and-columns-2.0.4" = { name = "lines-and-columns"; packageName = "lines-and-columns"; - version = "2.0.3"; + version = "2.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-2.0.3.tgz"; - sha512 = "cNOjgCnLB+FnvWWtyRTzmB3POJ+cXxTA81LoW7u8JdmhfXzriropYwpjShnz1QLLWsQwY7nIxoDmcPTwphDK9w=="; + url = "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-2.0.4.tgz"; + sha512 = "wM1+Z03eypVAVUCE7QdSqpVIvelbOakn1M0bPDoA4SGWPx3sNDVUiMo3L6To6WWGClB7VyXnhQ4Sn7gxiJbE6A=="; }; }; "linewise-0.0.3" = { @@ -36628,22 +36124,22 @@ let sha512 = "gUD/epcRms75Cw8RT1pUdHugZYM5ce64ucs2GEISABwkRsOQr0q2wm/MV2TKThycIe5e0ytRweW2RZxclogCdQ=="; }; }; - "load-plugin-3.0.0" = { + "load-plugin-5.1.0" = { name = "load-plugin"; packageName = "load-plugin"; - version = "3.0.0"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/load-plugin/-/load-plugin-3.0.0.tgz"; - sha512 = "od7eKCCZ62ITvFf8nHHrIiYmgOHb4xVNDRDqxBWSaao5FZyyZVX8OmRCbwjDGPrSrgIulwPNyBsWCGnhiDC0oQ=="; + url = "https://registry.npmjs.org/load-plugin/-/load-plugin-5.1.0.tgz"; + sha512 = "Lg1CZa1CFj2CbNaxijTL6PCbzd4qGTlZov+iH2p5Xwy/ApcZJh+i6jMN2cYePouTfjJfrNu3nXFdEw8LvbjPFQ=="; }; }; - "load-plugin-5.1.0" = { + "load-plugin-6.0.1" = { name = "load-plugin"; packageName = "load-plugin"; - version = "5.1.0"; + version = "6.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/load-plugin/-/load-plugin-5.1.0.tgz"; - sha512 = "Lg1CZa1CFj2CbNaxijTL6PCbzd4qGTlZov+iH2p5Xwy/ApcZJh+i6jMN2cYePouTfjJfrNu3nXFdEw8LvbjPFQ=="; + url = "https://registry.npmjs.org/load-plugin/-/load-plugin-6.0.1.tgz"; + sha512 = "YZyxJaWfN4F1xfPCyKFNIOL26vlFukmJY7wegxsriav4y2/0ZiICota6uFvyy52GjUj+tsPSjGLX+2m7kiU0+g=="; }; }; "load-yaml-file-0.2.0" = { @@ -37222,15 +36718,6 @@ let sha512 = "W3Bx6mdkRTGtlJISOvVD/lbqjTlPPUDTMnlXZFnVwi9NKJ6tiAk6LVdlhZMm17VZisqhKcgzpO5Wz91PCt5b0w=="; }; }; - "lodash.intersection-4.4.0" = { - name = "lodash.intersection"; - packageName = "lodash.intersection"; - version = "4.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.intersection/-/lodash.intersection-4.4.0.tgz"; - sha512 = "N+L0cCfnqMv6mxXtSPeKt+IavbOBBSiAEkKyLasZ8BVcP9YXQgxLO12oPR8OyURwKV8l5vJKiE1M8aS70heuMg=="; - }; - }; "lodash.isarguments-3.1.0" = { name = "lodash.isarguments"; packageName = "lodash.isarguments"; @@ -37834,6 +37321,15 @@ let sha512 = "tCRIJM51SHjAayKwC+QAg8hT8vg6z7GSgLJKGvzuPb1Wc+hLzqtuVLxp6/HzSPOozuK+8ErAhy7U/sVzw8Dgfg=="; }; }; + "loglevel-plugin-prefix-0.8.4" = { + name = "loglevel-plugin-prefix"; + packageName = "loglevel-plugin-prefix"; + version = "0.8.4"; + src = fetchurl { + url = "https://registry.npmjs.org/loglevel-plugin-prefix/-/loglevel-plugin-prefix-0.8.4.tgz"; + sha512 = "WpG9CcFAOjz/FtNht+QJeGpvVl/cdR6P0z6OcXSkr8wFJOsV2GRj2j10JLfjuA4aYkcKCNIEqRGCyTife9R8/g=="; + }; + }; "long-4.0.0" = { name = "long"; packageName = "long"; @@ -38077,15 +37573,6 @@ let sha512 = "CHqbAq7NFlW3RSnoWXLJBxCWaZVBrfa9UEHId2M3AW8iEBurbqduNexEUCGc3SHc6iCYXNJCDi903LajSVAEPQ=="; }; }; - "lru-cache-7.14.1" = { - name = "lru-cache"; - packageName = "lru-cache"; - version = "7.14.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lru-cache/-/lru-cache-7.14.1.tgz"; - sha512 = "ysxwsnTKdAx96aTRdhDOCQfDgbHnt8SK0KY8SEjO0wHinhWOFTESbjVCMPbU1uGXg/ch4lifqx0wfjOawU2+WA=="; - }; - }; "lru-cache-7.18.3" = { name = "lru-cache"; packageName = "lru-cache"; @@ -38168,15 +37655,6 @@ let sha512 = "8UnnX2PeRAPZuN12svgR9j7M1uWMovg/CEnIwIG0LFkXSJJe4PdfUGiTGl8V9bsBHFUtfVINcSyYxd7q+kx9fA=="; }; }; - "magic-string-0.30.1" = { - name = "magic-string"; - packageName = "magic-string"; - version = "0.30.1"; - src = fetchurl { - url = "https://registry.npmjs.org/magic-string/-/magic-string-0.30.1.tgz"; - sha512 = "mbVKXPmS0z0G4XqFDCTllmDQ6coZzn94aMlb0o/A4HEHJCKcanlDZwYJgwnkmgD3jyWhUgj9VsPrfd972yPffA=="; - }; - }; "magic-string-0.30.5" = { name = "magic-string"; packageName = "magic-string"; @@ -38402,15 +37880,6 @@ let sha512 = "4y7uGv8bd2WdM9vpQsiQNo41Ln1NvhvDRuVt0k2JZQ+ezN2uaQes7lZeZ+QQUHOLQAtDaBJ+7wCbi+ab/KFs+w=="; }; }; - "markdown-escapes-1.0.4" = { - name = "markdown-escapes"; - packageName = "markdown-escapes"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/markdown-escapes/-/markdown-escapes-1.0.4.tgz"; - sha512 = "8z4efJYk43E0upd0NbVXwgSTQs6cT3T06etieCMEg7dRbzCbxUCK/GHlX8mhHRDcp+OLlHkPKsvqQTCvsRl2cg=="; - }; - }; "markdown-it-12.3.2" = { name = "markdown-it"; packageName = "markdown-it"; @@ -38654,15 +38123,6 @@ let sha512 = "LFgVbaHIHMqCRuCZyfCtUOq9/Lnzhi7Z0KFUE2fhD54+JN2jLh3hC02RLkqauJ3U4soU6H1J3tfj/Byk7GoEjA=="; }; }; - "matcher-1.1.1" = { - name = "matcher"; - packageName = "matcher"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/matcher/-/matcher-1.1.1.tgz"; - sha512 = "+BmqxWIubKTRKNWx/ahnCkk3mG8m7OturVlqq6HiojGJTd5hVYbgZm6WzcYPCoB+KBT4Vd6R7WSRG2OADNaCjg=="; - }; - }; "matcher-3.0.0" = { name = "matcher"; packageName = "matcher"; @@ -38771,15 +38231,6 @@ let sha512 = "c2YOUbp33+6thdCUi34xIyOU/a7bvGKj/3DB1iaPMTuPHf/Q2d5s4sn1FaCOO43XkXggnb08y5W2PU8UNYNLKQ=="; }; }; - "mdast-comment-marker-1.1.2" = { - name = "mdast-comment-marker"; - packageName = "mdast-comment-marker"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/mdast-comment-marker/-/mdast-comment-marker-1.1.2.tgz"; - sha512 = "vTFXtmbbF3rgnTh3Zl3irso4LtvwUq/jaDvT2D1JqTGAwaipcS7RpTxzi6KjoRqI9n2yuAhzLDAC8xVTF3XYVQ=="; - }; - }; "mdast-comment-marker-2.1.2" = { name = "mdast-comment-marker"; packageName = "mdast-comment-marker"; @@ -38789,15 +38240,6 @@ let sha512 = "HED3ezseRVkBzZ0uK4q6RJMdufr/2p3VfVZstE3H1N9K8bwtspztWo6Xd7rEatuGNoCXaBna8oEqMwUn0Ve1bw=="; }; }; - "mdast-util-compact-2.0.1" = { - name = "mdast-util-compact"; - packageName = "mdast-util-compact"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/mdast-util-compact/-/mdast-util-compact-2.0.1.tgz"; - sha512 = "7GlnT24gEwDrdAwEHrU4Vv5lLWrEer4KOkAiKT9nYstsTad7Oc1TwqT2zIMKRdZF7cTuaf+GA1E4Kv7jJh8mPA=="; - }; - }; "mdast-util-find-and-replace-1.1.1" = { name = "mdast-util-find-and-replace"; packageName = "mdast-util-find-and-replace"; @@ -39059,15 +38501,6 @@ let sha512 = "SR2VnIEdVNCJbP6y7kVTJgPLifdr8WEU440fQec7qHoHOUz/oJ2jmNRqdDQ3rbiStOXb2mCDGTuwsK5OPUgYlQ=="; }; }; - "mdast-util-to-nlcst-4.0.1" = { - name = "mdast-util-to-nlcst"; - packageName = "mdast-util-to-nlcst"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/mdast-util-to-nlcst/-/mdast-util-to-nlcst-4.0.1.tgz"; - sha512 = "Y4ffygj85MTt70STKnEquw6k73jYWJBaYcb4ITAKgSNokZF7fH8rEHZ1GsRY/JaxqUevMaEnsDmkVv5Z9uVRdg=="; - }; - }; "mdast-util-to-nlcst-5.2.1" = { name = "mdast-util-to-nlcst"; packageName = "mdast-util-to-nlcst"; @@ -39158,15 +38591,6 @@ let sha512 = "+0FV+YXgmt4cxAHY1HtmZFVzVbhWAIuABtxhHuZ9uQGIg3opmK2kg5V62DGntWyfgqA9ZywaTPi4w8ummYDdHA=="; }; }; - "mdns-server-1.0.11" = { - name = "mdns-server"; - packageName = "mdns-server"; - version = "1.0.11"; - src = fetchurl { - url = "https://registry.npmjs.org/mdns-server/-/mdns-server-1.0.11.tgz"; - sha512 = "luzHnhQYmxaqrvYb8akwH2V/lSSyAumDoAK1zmogvpsj7sd4l04AF/LchBYH44NQVm7oo/KBVVFg3AbsJXr12w=="; - }; - }; "mdurl-1.0.1" = { name = "mdurl"; packageName = "mdurl"; @@ -39347,15 +38771,6 @@ let sha512 = "CbTqYU17ABaLefO8vCU153ZZlprKYWDljcndKKDCFcYQITzWCXZAVk4QMFZPgvzrnUQ3uItnIE/LoUOwrT15Ig=="; }; }; - "meow-7.1.1" = { - name = "meow"; - packageName = "meow"; - version = "7.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/meow/-/meow-7.1.1.tgz"; - sha512 = "GWHvA5QOcS412WCo8vwKDlTelGLsCGBVevQB5Kva961rmNfun0PCbv5+xta2kUMFJyR8/oWnn7ddeKdosbAPbA=="; - }; - }; "meow-8.1.2" = { name = "meow"; packageName = "meow"; @@ -40517,6 +39932,15 @@ let sha512 = "lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g=="; }; }; + "minimatch-6.2.0" = { + name = "minimatch"; + packageName = "minimatch"; + version = "6.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/minimatch/-/minimatch-6.2.0.tgz"; + sha512 = "sauLxniAmvnhhRjFwPNnJKaPFYyddAgbYdeUpHULtCT/GhzdCx/MDNy+Y40lBxTQUrMzDE8e0S43Z5uqfO0REg=="; + }; + }; "minimatch-7.4.6" = { name = "minimatch"; packageName = "minimatch"; @@ -41282,6 +40706,15 @@ let sha512 = "BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA=="; }; }; + "nanoid-3.3.7" = { + name = "nanoid"; + packageName = "nanoid"; + version = "3.3.7"; + src = fetchurl { + url = "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz"; + sha512 = "eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g=="; + }; + }; "nanomatch-1.2.13" = { name = "nanomatch"; packageName = "nanomatch"; @@ -41625,15 +41058,6 @@ let sha512 = "V52MLl7BU+tH2Np9tDrIXK8bql3MVUadnMIl/0/oZSGC9keuro0O9UUv9QKp0aMvtN8HRew4G7byY7H4eWsxaQ=="; }; }; - "nlcst-is-literal-1.2.2" = { - name = "nlcst-is-literal"; - packageName = "nlcst-is-literal"; - version = "1.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/nlcst-is-literal/-/nlcst-is-literal-1.2.2.tgz"; - sha512 = "R+1OJEmRl3ZOp9d8PbiRxGpnvmpi3jU+lzSqCJoLeogdEh0FYDRH1aC223qUbaKffxNTJkEfeDOeQfziw749yA=="; - }; - }; "nlcst-is-literal-2.1.1" = { name = "nlcst-is-literal"; packageName = "nlcst-is-literal"; @@ -41643,15 +41067,6 @@ let sha512 = "/PyEKNHN+SrcrmnZRwszzZYbvZSN2AVD506+rfMUzyFHB0PtUmqZOdUuXmQxQeZXv6o29pT5chLjQJdC9weOCQ=="; }; }; - "nlcst-normalize-2.1.5" = { - name = "nlcst-normalize"; - packageName = "nlcst-normalize"; - version = "2.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/nlcst-normalize/-/nlcst-normalize-2.1.5.tgz"; - sha512 = "xSqTKv8IHIy3n/orD7wj81BZljLfbrTot0Pv64MYUnQUXfDbi1xDSpJR4qEmbFWyFoHsmivcOdgrK+o7ky3mcw=="; - }; - }; "nlcst-normalize-3.1.1" = { name = "nlcst-normalize"; packageName = "nlcst-normalize"; @@ -41661,15 +41076,6 @@ let sha512 = "Fz6DhC0dmsuqilkz0viOScT+u9UGjgUpSrzo6yOZlcQ24F/m2BuoVF72KUOKZ06dRUeWyPpCSMxI5ONop9Qptw=="; }; }; - "nlcst-search-2.0.0" = { - name = "nlcst-search"; - packageName = "nlcst-search"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/nlcst-search/-/nlcst-search-2.0.0.tgz"; - sha512 = "+3xdctMFTcG+76vKAa0wObNg1EYq7IIQlZcL+HxSFXkHO1DgSPRjsPJrmelVIvMg7rk+wmBcdPEoScv/CTT1Zw=="; - }; - }; "nlcst-search-3.1.1" = { name = "nlcst-search"; packageName = "nlcst-search"; @@ -41994,6 +41400,15 @@ let sha512 = "dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA=="; }; }; + "node-gyp-10.0.1" = { + name = "node-gyp"; + packageName = "node-gyp"; + version = "10.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/node-gyp/-/node-gyp-10.0.1.tgz"; + sha512 = "gg3/bHehQfZivQVfqIyy8wTdSymF9yTyP4CJifK73imyNMU8AIGQE2pUa7dNWfmMeG9cDVF2eehiRMv0LC1iAg=="; + }; + }; "node-gyp-3.8.0" = { name = "node-gyp"; packageName = "node-gyp"; @@ -42021,15 +41436,6 @@ let sha512 = "OQkWKbjQKbGkMf/xqI1jjy3oCTgMKJac58G2+bjZb3fza6gW2YrCSdMQYaoTb70crvE//Gngr4f0AgVHmqHvBQ=="; }; }; - "node-gyp-build-4.6.0" = { - name = "node-gyp-build"; - packageName = "node-gyp-build"; - version = "4.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.6.0.tgz"; - sha512 = "NTZVKn9IylLwUzaKjkas1e4u2DLNcV4rdYagA4PWdPwW87Bi7z+BznyKSRwS/761tV/lzCGXplWsiaMjLqP2zQ=="; - }; - }; "node-gyp-build-4.6.1" = { name = "node-gyp-build"; packageName = "node-gyp-build"; @@ -42165,15 +41571,6 @@ let sha512 = "Jd4cvbJMryN21r5HgxQOpMEqv+ooke/korixNNK3mGqfGJmy0M77WDDzo/05969+OkMy3XW1UuZsSmW9KQm7Fw=="; }; }; - "node-sarif-builder-2.0.3" = { - name = "node-sarif-builder"; - packageName = "node-sarif-builder"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/node-sarif-builder/-/node-sarif-builder-2.0.3.tgz"; - sha512 = "Pzr3rol8fvhG/oJjIq2NTVB0vmdNNlz22FENhhPojYRZ4/ee08CfK4YuKmuL54V9MLhI1kpzxfOJ/63LzmZzDg=="; - }; - }; "node-schedule-2.1.0" = { name = "node-schedule"; packageName = "node-schedule"; @@ -42471,13 +41868,13 @@ let sha512 = "KGvQ0cB70AQfg107Xvs/Fbu+dGmZoTRJp2TaPwcwQm3/7PteUyN2BCgk8KBMPGBUXZdVwyWS8fDCGFygBm19UQ=="; }; }; - "npm-9.9.0" = { + "npm-9.9.1" = { name = "npm"; packageName = "npm"; - version = "9.9.0"; + version = "9.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-9.9.0.tgz"; - sha512 = "wkd7sjz4KmdmddYQcd0aTP73P1cEuPlekeulz4jTDeMVx/Zo5XZ5KQ1z3eUzV3Q/WZpEO0NJXTrD5FNFe6fhCA=="; + url = "https://registry.npmjs.org/npm/-/npm-9.9.1.tgz"; + sha512 = "D3YZ1ZTxPGDHLLiFU9q3sVrPfYnn6BaJ1hogm3vdWi8oOmHGtTlPUPXAM0iG22UT0JRkBnMDOh6oUhpbEYgg2A=="; }; }; "npm-bundled-1.1.2" = { @@ -42561,6 +41958,15 @@ let sha512 = "uFyyCEmgBfZTtrKk/5xDfHp6+MdrqGotX/VoOyEEl3mBwiEE5FlBaePanazJSVMPT7vKepcjYBY2ztg9A3yPIA=="; }; }; + "npm-package-arg-11.0.1" = { + name = "npm-package-arg"; + packageName = "npm-package-arg"; + version = "11.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-11.0.1.tgz"; + sha512 = "M7s1BD4NxdAvBKUPqqRW957Xwcl/4Zvo8Aj+ANrzvIPzGJZElrH7Z//rSaec2ORcND6FHHLnZeY8qgTpXDMFQQ=="; + }; + }; "npm-package-arg-6.1.0" = { name = "npm-package-arg"; packageName = "npm-package-arg"; @@ -42642,13 +42048,13 @@ let sha512 = "d6RGEuRrNS5/N84iglPivjaJPxhDbZmlbTwTDX2IbcRHG5bZCdtysYMhwiPvcF4GisXHGn7xsxv+GQ7T/02M5Q=="; }; }; - "npm-pick-manifest-8.0.1" = { - name = "npm-pick-manifest"; - packageName = "npm-pick-manifest"; - version = "8.0.1"; + "npm-packlist-8.0.0" = { + name = "npm-packlist"; + packageName = "npm-packlist"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-8.0.1.tgz"; - sha512 = "mRtvlBjTsJvfCCdmPtiu2bdlx8d/KXtF7yNXNWe7G0Z36qWA9Ny5zXsI2PfBZEv7SXgoxTmNaTzGSbbzDZChoA=="; + url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-8.0.0.tgz"; + sha512 = "ErAGFB5kJUciPy1mmx/C2YFbvxoJ0QJ9uwkCZOeR6CqLLISPZBOiFModAbSXnjjlwW5lOhuhXva+fURsSGJqyw=="; }; }; "npm-pick-manifest-8.0.2" = { @@ -42660,6 +42066,15 @@ let sha512 = "1dKY+86/AIiq1tkKVD3l0WI+Gd3vkknVGAggsFeBkTvbhMQ1OND/LKkYv4JtXPKUJ8bOTCyLiqEg2P6QNdK+Gg=="; }; }; + "npm-pick-manifest-9.0.0" = { + name = "npm-pick-manifest"; + packageName = "npm-pick-manifest"; + version = "9.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-9.0.0.tgz"; + sha512 = "VfvRSs/b6n9ol4Qb+bDwNGUXutpy76x6MARw/XssevE0TnctIKcmklJZM5Z7nqs5z5aW+0S63pgCNbpkUNNXBg=="; + }; + }; "npm-registry-client-8.6.0" = { name = "npm-registry-client"; packageName = "npm-registry-client"; @@ -42678,6 +42093,15 @@ let sha512 = "kIDMIo4aBm6xg7jOttupWZamsZRkAqMqwqqbVXnUqstY5+tapvv6bkH/qMR76jdgV+YljEUCyWx3hRYMrJiAgA=="; }; }; + "npm-registry-fetch-16.1.0" = { + name = "npm-registry-fetch"; + packageName = "npm-registry-fetch"; + version = "16.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-16.1.0.tgz"; + sha512 = "PQCELXKt8Azvxnt5Y85GseQDJJlglTFM9L9U9gkv2y4e9s0k3GVDdOx3YoB6gm2Do0hlkzC39iCGXby+Wve1Bw=="; + }; + }; "npm-registry-utilities-1.0.0" = { name = "npm-registry-utilities"; packageName = "npm-registry-utilities"; @@ -42759,15 +42183,6 @@ let sha512 = "/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg=="; }; }; - "nrf-intel-hex-1.3.0" = { - name = "nrf-intel-hex"; - packageName = "nrf-intel-hex"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/nrf-intel-hex/-/nrf-intel-hex-1.3.0.tgz"; - sha512 = "oXwBJxX/0Jc4fe2Jxjv3Mw9/qw9JdToDLvJuozfVx+twpkc2oSUm8W/OODX6W4kmWOaYA11ORpGLfQ8BP7mndw=="; - }; - }; "nssocket-0.6.0" = { name = "nssocket"; packageName = "nssocket"; @@ -43335,15 +42750,6 @@ let sha512 = "fvaSZRzprpwLFge/mcwE0CItfniNisVNamDdMK1FQUjh4ArQZ8ZWSkDaJbZc3XaANKZHq0xIa8NJpZ2HSe3oXA=="; }; }; - "ono-4.0.11" = { - name = "ono"; - packageName = "ono"; - version = "4.0.11"; - src = fetchurl { - url = "https://registry.npmjs.org/ono/-/ono-4.0.11.tgz"; - sha512 = "jQ31cORBFE6td25deYeD80wxKBMj+zBmHTrVxnc6CKhx8gho6ipmWM5zj/oeoqioZ99yqBls9Z/9Nss7J26G2g=="; - }; - }; "oo-ascii-tree-1.91.0" = { name = "oo-ascii-tree"; packageName = "oo-ascii-tree"; @@ -44037,15 +43443,6 @@ let sha512 = "RwFpb72c/BhQLEXIZ5K2e+AhgNVmIejGlTgiB9MzZ0e93GRvqZ7uSi0dvRF7/XIXDeNkra2fNHBxTyPDGySpjQ=="; }; }; - "p-queue-7.4.1" = { - name = "p-queue"; - packageName = "p-queue"; - version = "7.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/p-queue/-/p-queue-7.4.1.tgz"; - sha512 = "vRpMXmIkYF2/1hLBKisKeVYJZ8S2tZ0zEAmIJgdVKP2nq0nh4qCdf8bgw+ZgKrkh71AOCaqzwbJJk1WtdcF3VA=="; - }; - }; "p-reduce-2.1.0" = { name = "p-reduce"; packageName = "p-reduce"; @@ -44280,13 +43677,13 @@ let sha512 = "rJVZeIwHTUta23sIZgEIM62WYwbmGbThdbnkt81ravBplQv+HjyroqnLRNH2+sLJHcGZmLRmhPwACqhfTcOmnA=="; }; }; - "pad-2.3.0" = { - name = "pad"; - packageName = "pad"; - version = "2.3.0"; + "pacote-17.0.4" = { + name = "pacote"; + packageName = "pacote"; + version = "17.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/pad/-/pad-2.3.0.tgz"; - sha512 = "lxrgnOG5AXmzMRT1O5urWtYFxHnFSE+QntgTHij1nvS4W+ubhQLmQRHmZXDeEvk9I00itAixLqU9Q6fE0gW3sw=="; + url = "https://registry.npmjs.org/pacote/-/pacote-17.0.4.tgz"; + sha512 = "eGdLHrV/g5b5MtD5cTPyss+JxOlaOloSMG3UwPMAvL8ywaLJ6beONPF40K4KKl/UI6q5hTKCJq5rCu8tkF+7Dg=="; }; }; "pako-0.2.9" = { @@ -44397,15 +43794,6 @@ let sha512 = "bjnliEOmGv3y1aMEfREMBJ9tfL3WR0i0CKPj61DnSLaoxWR3nLrsQrEbCId/8rF4NyRF0cCqisSVXyQYWM+mCQ=="; }; }; - "parse-english-4.2.0" = { - name = "parse-english"; - packageName = "parse-english"; - version = "4.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/parse-english/-/parse-english-4.2.0.tgz"; - sha512 = "jw5N6wZUZViIw3VLG/FUSeL3vDhfw5Q2g4E3nYC69Mm5ANbh9ZWd+eligQbeUoyObZM8neynTn3l14e09pjEWg=="; - }; - }; "parse-english-5.0.0" = { name = "parse-english"; packageName = "parse-english"; @@ -44550,15 +43938,6 @@ let sha512 = "/oF7PUUBjCqHmMEE6xIQeX5ZokQ9+miudACzPt4KBU2qi6CxZYPdisPXx4ad7wpZJYi2ZpcW2PacLTU3De3ebw=="; }; }; - "parse-latin-4.3.0" = { - name = "parse-latin"; - packageName = "parse-latin"; - version = "4.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/parse-latin/-/parse-latin-4.3.0.tgz"; - sha512 = "TYKL+K98dcAWoCw/Ac1yrPviU8Trk+/gmjQVaoWEFDZmVD4KRg6c/80xKqNNFQObo2mTONgF8trzAf2UTwKafw=="; - }; - }; "parse-latin-5.0.1" = { name = "parse-latin"; packageName = "parse-latin"; @@ -45108,13 +44487,13 @@ let sha512 = "MkhCqzzBEpPvxxQ71Md0b1Kk51W01lrYvlMzSUaIzNsODdd7mqhiimSZlr+VegAz5Z6Vzt9Xg2ttE//XBhH3EQ=="; }; }; - "path-to-glob-pattern-1.0.2" = { + "path-to-glob-pattern-2.0.1" = { name = "path-to-glob-pattern"; packageName = "path-to-glob-pattern"; - version = "1.0.2"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/path-to-glob-pattern/-/path-to-glob-pattern-1.0.2.tgz"; - sha512 = "ryF65N5MBB9XOjE5mMOi+0bMrh1F0ORQmqDSSERvv5zD62Cfc5QC6rK1AR1xuDIG1I091CkNENblbteWy1bXgw=="; + url = "https://registry.npmjs.org/path-to-glob-pattern/-/path-to-glob-pattern-2.0.1.tgz"; + sha512 = "tmciSlVyHnX0LC86+zSr+0LURw9rDPw8ilhXcmTpVUOnI6OsKdCzXQs5fTG10Bjz26IBdnKL3XIaP+QvGsk5YQ=="; }; }; "path-to-regexp-0.1.7" = { @@ -45342,6 +44721,15 @@ let sha512 = "JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA=="; }; }; + "picomatch-3.0.1" = { + name = "picomatch"; + packageName = "picomatch"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/picomatch/-/picomatch-3.0.1.tgz"; + sha512 = "I3EurrIQMlRc9IaAZnqRR044Phh2DXY+55o7uJ0V+hYZAcQYSuFWsc9q5PvyDHUSCe1Qxn/iBz+78s86zWnGag=="; + }; + }; "pid-from-port-1.1.3" = { name = "pid-from-port"; packageName = "pid-from-port"; @@ -45360,13 +44748,13 @@ let sha512 = "boqPJtSgZC6KOgXKNPC+/XR3xwVtpOtaLa7JLcdf8jfVe0ZM2TwllBXxxLUO8GQbOLJ4/hEtf2+L1QCKbaoHUg=="; }; }; - "pid-port-0.2.0" = { + "pid-port-1.0.0" = { name = "pid-port"; packageName = "pid-port"; - version = "0.2.0"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/pid-port/-/pid-port-0.2.0.tgz"; - sha512 = "xVU9H1FCRSeGrD9Oim5bLg2U7B2BgW0qzK2oahpV5BIf9hwzqQaWyOkOVC0Kgbsc90A9x6525beawx+QK+JduQ=="; + url = "https://registry.npmjs.org/pid-port/-/pid-port-1.0.0.tgz"; + sha512 = "LSNBeKChRPA4Xlrs6+zV588G1hSrFvANtPV5rt/5MPfSPK3V9XPWxx1d29svsrOjngT9ifLisXWCLS7DvO9ZhQ=="; }; }; "pidtree-0.6.0" = { @@ -46791,6 +46179,15 @@ let sha512 = "BBJoiorUKoP2AuM5q/yKwIfT1YWRHsaxjW+Ayu9erLhqKOfnXzzVVML0XTYoQZuI1YvcWKmc1dh06DEy4+KzfA=="; }; }; + "process-exists-5.0.0" = { + name = "process-exists"; + packageName = "process-exists"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/process-exists/-/process-exists-5.0.0.tgz"; + sha512 = "6QPRh5fyHD8MaXr4GYML8K/YY0Sq5dKHGIOrAKS3cYpHQdmygFCcijIu1dVoNKAZ0TWAMoeh8KDK9dF8auBkJA=="; + }; + }; "process-nextick-args-1.0.7" = { name = "process-nextick-args"; packageName = "process-nextick-args"; @@ -47133,6 +46530,15 @@ let sha512 = "v4Bl6I3f2kJfr5o80ShABNHAokIgY+wFDTQfE+X3zWYgSGQOCBeYptLZUpoOALBqO5EawmDN/tjTldJesd0ujQ=="; }; }; + "ps-list-8.1.1" = { + name = "ps-list"; + packageName = "ps-list"; + version = "8.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ps-list/-/ps-list-8.1.1.tgz"; + sha512 = "OPS9kEJYVmiO48u/B9qneqhkMvgCxT+Tm28VCEJpheTpl8cJ0ffZRRNgS5mrQRTrX5yRTpaJ+hRDeefXYmmorQ=="; + }; + }; "ps-tree-1.2.0" = { name = "ps-tree"; packageName = "ps-tree"; @@ -47412,13 +46818,13 @@ let sha512 = "pMpnA0qRdFp32b1sJl1wOJNxZLQ2cbQx+k6tjNtZ8CpvVhNqEPRgivZ2WOUev2YMajecdH7ctUPDvEe87nariQ=="; }; }; - "pyright-1.1.334" = { + "pyright-1.1.335" = { name = "pyright"; packageName = "pyright"; - version = "1.1.334"; + version = "1.1.335"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.334.tgz"; - sha512 = "EJoW78gXPeAWd0e86P8kSIbY1pO3JJxNYu2BRlv/ZflcMvCY+zpyamuQC5EcXxXtr1WzBdcQwfo/NIBqtQPEow=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.335.tgz"; + sha512 = "4iI9JPJP1YRAv4q99l0arfv3uAqQBkuqUOrmQLq7Iv6rt9HmU00R1908DqwaiePRT6HgyXCMbMmVTcs2UyKnAA=="; }; }; "q-1.5.1" = { @@ -47682,15 +47088,6 @@ let sha512 = "b3w19IEXnt5auacLAbePVsqPyVQUwmuhJQrrWnVhm4pP8PAMg2U9vFHbAD9XYXXbMDjdLJs0x5NLqwTV8uFK4g=="; }; }; - "quotation-1.1.3" = { - name = "quotation"; - packageName = "quotation"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/quotation/-/quotation-1.1.3.tgz"; - sha512 = "45gUgmX/RtQOQV1kwM06boP49OYXcKCPrYwdmAvs5YqkpiobhNKKwo524JM6Ma0ko3oN9tXNcWs9+ABq3Ry7YA=="; - }; - }; "quotation-2.0.2" = { name = "quotation"; packageName = "quotation"; @@ -48213,6 +47610,15 @@ let sha512 = "AEtWXYfopBj2z5N5PbkAOeNHRPUg5q+Nen7QLxV8M2zJq1ym6/lCz3fYNTCXe19puu2d06jfHhrP7v/S2PtMMw=="; }; }; + "read-package-json-7.0.0" = { + name = "read-package-json"; + packageName = "read-package-json"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/read-package-json/-/read-package-json-7.0.0.tgz"; + sha512 = "uL4Z10OKV4p6vbdvIXB+OzhInYtIozl/VxUBPgNkBuUi2DeRonnuspmaVAMcrkmfjKGNmRndyQAbE7/AmzGwFg=="; + }; + }; "read-package-json-fast-3.0.2" = { name = "read-package-json-fast"; packageName = "read-package-json-fast"; @@ -48843,15 +48249,6 @@ let sha512 = "0S3CpvpTAgGmnz8kiCyFLGuW5yA4OQhyNTm/nwPopZ7+PI11WnGl1TTWTGv/2hPEe/g2jRLlhVVSsoDH8waRug=="; }; }; - "rehype-parse-7.0.1" = { - name = "rehype-parse"; - packageName = "rehype-parse"; - version = "7.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/rehype-parse/-/rehype-parse-7.0.1.tgz"; - sha512 = "fOiR9a9xH+Le19i4fGzIEowAbwG7idy2Jzs4mOrFWBSJ0sNUgy0ev871dwWnbOo371SjgjG4pwzrbgSVrKxecw=="; - }; - }; "rehype-parse-8.0.5" = { name = "rehype-parse"; packageName = "rehype-parse"; @@ -48861,15 +48258,6 @@ let sha512 = "Ds3RglaY/+clEX2U2mHflt7NlMA72KspZ0JLUJgBBLpRddBcEw3H8uYZQliQriku22NZpYMfjDdSgHcjxue24A=="; }; }; - "rehype-retext-2.0.4" = { - name = "rehype-retext"; - packageName = "rehype-retext"; - version = "2.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/rehype-retext/-/rehype-retext-2.0.4.tgz"; - sha512 = "OnGX5RE8WyEs/Snz+Bs8DM9uGdrNUXMhCC7CW3S1cIZVOC90VdewdE+71kpG6LOzS0xwgZyItwrhjGv+oQgwkQ=="; - }; - }; "rehype-retext-3.0.2" = { name = "rehype-retext"; packageName = "rehype-retext"; @@ -48942,15 +48330,6 @@ let sha512 = "ZssAvH9FjGYlJ/PBVKdSmfyPc3Cz4rTWgZLI4iE/SX8Nt5l3o3oEjv3wwG5VD7xOjktzdwp5coac+kJV9l4jgg=="; }; }; - "remark-frontmatter-2.0.0" = { - name = "remark-frontmatter"; - packageName = "remark-frontmatter"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/remark-frontmatter/-/remark-frontmatter-2.0.0.tgz"; - sha512 = "uNOQt4tO14qBFWXenF0MLC4cqo3dv8qiHPGyjCl1rwOT0LomSHpcElbjjVh5CwzElInB38HD8aSRVugKQjeyHA=="; - }; - }; "remark-frontmatter-3.0.0" = { name = "remark-frontmatter"; packageName = "remark-frontmatter"; @@ -49428,24 +48807,6 @@ let sha512 = "TDnjSv77Oynf+K1deGWZPKSwh3/9hykVAxVm9enAw6BmicCGklREET8s19KYnjGsNPms0pNDJLmp+bnHDVItAQ=="; }; }; - "remark-mdx-2.0.0-next.7" = { - name = "remark-mdx"; - packageName = "remark-mdx"; - version = "2.0.0-next.7"; - src = fetchurl { - url = "https://registry.npmjs.org/remark-mdx/-/remark-mdx-2.0.0-next.7.tgz"; - sha512 = "JHYCfxJzvjTw8h5y10f+mCvbfIt5klAkWlULqPu1nM/r6ghF3tzJl0AFQFj5b/m/7U553+yYb/y4n0julMERYA=="; - }; - }; - "remark-message-control-6.0.0" = { - name = "remark-message-control"; - packageName = "remark-message-control"; - version = "6.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/remark-message-control/-/remark-message-control-6.0.0.tgz"; - sha512 = "k9bt7BYc3G7YBdmeAhvd3VavrPa/XlKWR3CyHjr4sLO9xJyly8WHHT3Sp+8HPR8lEUv+/sZaffL7IjMLV0f6BA=="; - }; - }; "remark-message-control-7.1.1" = { name = "remark-message-control"; packageName = "remark-message-control"; @@ -49473,15 +48834,6 @@ let sha512 = "FCxlKLNGknS5ba/1lmpYijMUzX2esxW5xQqjWxw2eHFfS2MSdaHVINFmhjo+qN1WhZhNimq0dZATN9pH0IDrpA=="; }; }; - "remark-parse-8.0.3" = { - name = "remark-parse"; - packageName = "remark-parse"; - version = "8.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/remark-parse/-/remark-parse-8.0.3.tgz"; - sha512 = "E1K9+QLGgggHxCQtLt++uXltxEprmWzNfg+MxpfHsZlrddKzZ/hZyWHDbK3/Ap8HJQqYJRXP+jHczdL6q6i85Q=="; - }; - }; "remark-parse-9.0.0" = { name = "remark-parse"; packageName = "remark-parse"; @@ -49491,15 +48843,6 @@ let sha512 = "geKatMwSzEXKHuzBNU1z676sGcDcFoChMK38TgdHJNAYfFtsfHDQG7MoJAjs6sgYMqyLduCYWDIWZIxiPeafEw=="; }; }; - "remark-retext-4.0.0" = { - name = "remark-retext"; - packageName = "remark-retext"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/remark-retext/-/remark-retext-4.0.0.tgz"; - sha512 = "cYCchalpf25bTtfXF24ribYvqytPKq0TiEhqQDBHvVEEsApebwruPWP1cTcvTFBidmpXyqzycm+y8ng7Kmvc8Q=="; - }; - }; "remark-retext-5.0.1" = { name = "remark-retext"; packageName = "remark-retext"; @@ -49518,15 +48861,6 @@ let sha512 = "1OSmLd3awB/t8qdoEOMazZkNsfVTeY4fTsgzcQFdXNq8ToTN4ZGwrMnlda4K6smTFKD+GRV6O48i6Z4iKgPPpw=="; }; }; - "remark-stringify-8.1.1" = { - name = "remark-stringify"; - packageName = "remark-stringify"; - version = "8.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/remark-stringify/-/remark-stringify-8.1.1.tgz"; - sha512 = "q4EyPZT3PcA3Eq7vPpT6bIdokXzFGp9i85igjmhRyXWmPs0Y6/d2FYwUNotKAWyLch7g0ASZJn/KHHcHZQ163A=="; - }; - }; "remark-stringify-9.0.1" = { name = "remark-stringify"; packageName = "remark-stringify"; @@ -49779,15 +49113,6 @@ let sha512 = "TqVDgp251BW4b8ddQ2ptaj/57Z3LZHLscAUT7v6qs70buqF2/IoOVjYbpjJ6HiW7j5+waqegGI8xKJ/+uzgDmw=="; }; }; - "require-all-3.0.0" = { - name = "require-all"; - packageName = "require-all"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/require-all/-/require-all-3.0.0.tgz"; - sha512 = "jPGN876lc5exWYrMcgZSd7U42P0PmVQzxnQB13fCSzmyGnqQWW4WUz5DosZ/qe24hz+5o9lSvW2epBNZ1xa6Fw=="; - }; - }; "require-directory-2.1.1" = { name = "require-directory"; packageName = "require-directory"; @@ -49815,6 +49140,15 @@ let sha512 = "efCx3b+0Z69/LGJmm9Yvi4cqEdxnoGnxYxGxBghkkTTFeXRtTCmmhO0AnAfHz59k957uTSuy8WaHqOs8wbYUWg=="; }; }; + "require-in-the-middle-7.2.0" = { + name = "require-in-the-middle"; + packageName = "require-in-the-middle"; + version = "7.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/require-in-the-middle/-/require-in-the-middle-7.2.0.tgz"; + sha512 = "3TLx5TGyAY6AOqLBoXmHkNql0HIf2RGbuMgCDT2WO/uGVAPJs6h7Kl+bN6TIZGd9bWhWPwnDnTHGtW8Iu77sdw=="; + }; + }; "require-main-filename-1.0.1" = { name = "require-main-filename"; packageName = "require-main-filename"; @@ -49896,15 +49230,6 @@ let sha512 = "ab9EmR80F/zQTMNeneUr4cv+jSwPJgIlvEmVwLerwrWVbpLlBuls9XHzIeTFy4cegU2NHBp3va0LKOzU5qFEYQ=="; }; }; - "reserved-0.1.2" = { - name = "reserved"; - packageName = "reserved"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/reserved/-/reserved-0.1.2.tgz"; - sha512 = "/qO54MWj5L8WCBP9/UNe2iefJc+L9yETbH32xO/ft/EYPOTCR5k+azvDUgdCOKwZH8hXwPd0b8XBL78Nn2U69g=="; - }; - }; "reserved-words-0.1.2" = { name = "reserved-words"; packageName = "reserved-words"; @@ -49914,15 +49239,6 @@ let sha512 = "0S5SrIUJ9LfpbVl4Yzij6VipUdafHrOTzvmfazSw/jeZrZtQK303OPZW+obtkaw7jQlTQppy0UvZWm9872PbRw=="; }; }; - "resolve-1.22.2" = { - name = "resolve"; - packageName = "resolve"; - version = "1.22.2"; - src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.22.2.tgz"; - sha512 = "Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g=="; - }; - }; "resolve-1.22.8" = { name = "resolve"; packageName = "resolve"; @@ -50157,15 +49473,6 @@ let sha512 = "TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg=="; }; }; - "retext-english-3.0.4" = { - name = "retext-english"; - packageName = "retext-english"; - version = "3.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/retext-english/-/retext-english-3.0.4.tgz"; - sha512 = "yr1PgaBDde+25aJXrnt3p1jvT8FVLVat2Bx8XeAWX13KXo8OT+3nWGU3HWxM4YFJvmfqvJYJZG2d7xxaO774gw=="; - }; - }; "retext-english-4.1.0" = { name = "retext-english"; packageName = "retext-english"; @@ -50175,15 +49482,6 @@ let sha512 = "Pky2idjvgkzfodO0GH9X4IU8LX/d4ULTnLf7S1WsBRlSCh/JdTFPafXZstJqZehtQWNHrgoCqVOiGugsNFYvIQ=="; }; }; - "retext-equality-5.5.0" = { - name = "retext-equality"; - packageName = "retext-equality"; - version = "5.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/retext-equality/-/retext-equality-5.5.0.tgz"; - sha512 = "ha7zrQ+Bq4xWifm21IcAzc9xhMWCJYfePUjRRNE2mXi8cFhaq1F8+cD78YA2nd6W2mxd11VGTVKY9O0DmzEywQ=="; - }; - }; "retext-equality-6.6.0" = { name = "retext-equality"; packageName = "retext-equality"; @@ -50193,15 +49491,6 @@ let sha512 = "il0Q8Dlxluc67UQnk49XmwISl3mzf1Lvuat0yZKzR2NuuluzTXI4EK44HA5JOobt/vmYkDaJaDsxHf0MmE4OMA=="; }; }; - "retext-profanities-6.1.0" = { - name = "retext-profanities"; - packageName = "retext-profanities"; - version = "6.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/retext-profanities/-/retext-profanities-6.1.0.tgz"; - sha512 = "40Ym0WOgy7rRY4tR2iL01g3Y5Ql+9NBV21hycIhNX3uv+6vjaWB30NWN+tTcxNIWBJEwXHoTDMiVdAMm6ZpHVA=="; - }; - }; "retext-profanities-7.2.2" = { name = "retext-profanities"; packageName = "retext-profanities"; @@ -50391,15 +49680,6 @@ let sha512 = "IXgzBWvWQwE6PrDI05OvmXUIruQTcoMDzRsOd5CDvHCVLcLHMTSYvOK5Cm46kWqlV3yAbuSpBZdJ5oP5OUoStg=="; }; }; - "rollup-2.79.1" = { - name = "rollup"; - packageName = "rollup"; - version = "2.79.1"; - src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.79.1.tgz"; - sha512 = "uKxbd0IhMZOhjAiD5oAFp7BqvkA4Dv47qpOCtaNvng4HBwdbWtdOh8f5nZNuk2rp51PMGk3bzfWu5oayNEuYnw=="; - }; - }; "rollup-3.29.4" = { name = "rollup"; packageName = "rollup"; @@ -51282,15 +50562,6 @@ let sha512 = "owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w=="; }; }; - "serialport-12.0.0" = { - name = "serialport"; - packageName = "serialport"; - version = "12.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/serialport/-/serialport-12.0.0.tgz"; - sha512 = "AmH3D9hHPFmnF/oq/rvigfiAouAKyK/TjnrkwZRYSFZxNggJxwvbAbfYrLeuvq7ktUdhuHdVdSjj852Z55R+uA=="; - }; - }; "serve-favicon-2.5.0" = { name = "serve-favicon"; packageName = "serve-favicon"; @@ -51687,15 +50958,6 @@ let sha512 = "q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw=="; }; }; - "sigmund-1.0.1" = { - name = "sigmund"; - packageName = "sigmund"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"; - sha512 = "fCvEXfh6NWpm+YSuY2bpXb/VIihqWA6hLsgboC+0nl71Q7N7o2eaCW8mJa/NLvQhs6jpd3VZV4UiUQlV6+lc8g=="; - }; - }; "signal-exit-3.0.7" = { name = "signal-exit"; packageName = "signal-exit"; @@ -51732,6 +50994,15 @@ let sha512 = "0Zjz0oe37d08VeOtBIuB6cRriqXse2e8w+7yIy2XSXjshRKxbc2KkhXjL229jXSxEm7UbcjS76wcJDGQddVI9A=="; }; }; + "sigstore-2.1.0" = { + name = "sigstore"; + packageName = "sigstore"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/sigstore/-/sigstore-2.1.0.tgz"; + sha512 = "kPIj+ZLkyI3QaM0qX8V/nSsweYND3W448pwkDgS6CQ74MfhEkIR8ToK5Iyx46KJYRjseVcD3Rp9zAmUAj6ZjPw=="; + }; + }; "simple-concat-1.0.1" = { name = "simple-concat"; packageName = "simple-concat"; @@ -53091,15 +52362,6 @@ let sha512 = "QjMLR0A3WwFY2aZdV0okfFEJB5TRjkggXZjxP3A1RsWsNHNu3YPv8btmtc6iCFZ0Rul3FE93OYogvhOUClU+ng=="; }; }; - "state-toggle-1.0.3" = { - name = "state-toggle"; - packageName = "state-toggle"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/state-toggle/-/state-toggle-1.0.3.tgz"; - sha512 = "d/5Z4/2iiCnHw6Xzghyhb+GcmF89bxwgXG60wjIiZaxnymbyOmI8Hk4VqHXiVVp6u2ysaskFfXg3ekCj4WNftQ=="; - }; - }; "static-extend-0.1.2" = { name = "static-extend"; packageName = "static-extend"; @@ -53577,6 +52839,15 @@ let sha512 = "k01swCJAgQmuADB0YIc+7TuatfNvTBVOoaUWJjTB9R4VJzR5vNWzf5t42ESVZFPS8xTySF7CAdV4t/aaIm3UnQ=="; }; }; + "string-width-7.0.0" = { + name = "string-width"; + packageName = "string-width"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/string-width/-/string-width-7.0.0.tgz"; + sha512 = "GPQHj7row82Hjo9hKZieKcHIhaAIKOJvFSIZXuCU9OASVZrMNUaZuz++SPVrBjnLsnk4k+z9f2EIypgxf2vNFw=="; + }; + }; "string-width-cjs-4.2.3" = { name = "string-width-cjs"; packageName = "string-width-cjs"; @@ -53667,15 +52938,6 @@ let sha512 = "hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA=="; }; }; - "stringify-entities-3.1.0" = { - name = "stringify-entities"; - packageName = "stringify-entities"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/stringify-entities/-/stringify-entities-3.1.0.tgz"; - sha512 = "3FP+jGMmMV/ffZs86MoghGqAoqXAdxLrJP4GUdrDN1aIScYih5tuIO3eF4To5AJZ79KDZ8Fpdy7QJnK8SsL1Vg=="; - }; - }; "stringify-entities-4.0.3" = { name = "stringify-entities"; packageName = "stringify-entities"; @@ -54027,13 +53289,13 @@ let sha512 = "MuzIIVRSbc8XxHH7FjkvWqkIcr1BvoMZoR/oFuAJDlh7VSaNJzrB4uJ38GRQa+mWjLXODAMzeDe0xi9GYbGwnw=="; }; }; - "stylus-0.60.0" = { + "stylus-0.61.0" = { name = "stylus"; packageName = "stylus"; - version = "0.60.0"; + version = "0.61.0"; src = fetchurl { - url = "https://registry.npmjs.org/stylus/-/stylus-0.60.0.tgz"; - sha512 = "j2pBgEwzCu05yCuY4cmyp0FtPQQFBBAGB7TY7QaNl7eztiHwkxzwvIp5vjZJND/a1JNOka+ZW9ewVPFZpI3pcA=="; + url = "https://registry.npmjs.org/stylus/-/stylus-0.61.0.tgz"; + sha512 = "oaV9T4sRBiQfChXE0av9SrLD+ovEdQiWzPJ5kwIeYvMhjUDJnZtdubAG6lSSbaR4sCnoT6sw411IOl5Akcht4Q=="; }; }; "subarg-1.0.0" = { @@ -54324,13 +53586,13 @@ let sha512 = "+N/Q9kV1+F+UeWYoSiULYo4xYSDQlTgb+ayMobAXPwMnLvop7oxKMo9OzIrX5x3eS4L4f2UHhc9axXwY8DpChg=="; }; }; - "svgo-3.0.2" = { + "svgo-3.0.3" = { name = "svgo"; packageName = "svgo"; - version = "3.0.2"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/svgo/-/svgo-3.0.2.tgz"; - sha512 = "Z706C1U2pb1+JGP48fbazf3KxHrWOsLme6Rv7imFBn5EnuanDW1GPaA/P1/dvObE670JDePC3mnj0k0B7P0jjQ=="; + url = "https://registry.npmjs.org/svgo/-/svgo-3.0.3.tgz"; + sha512 = "X4UZvLhOglD5Xrp834HzGHf8RKUW0Ahigg/08yRO1no9t2NxffOkMiQ0WmaMIbaGlVTlSst2zWANsdhz5ybXgA=="; }; }; "swagger2openapi-7.0.8" = { @@ -54414,13 +53676,13 @@ let sha512 = "ulAk51I9UVUyJgxlv9M6lFot2WP3e7t8Kz9+IS6D4rVba1tR9kON+Ey69f+1R4Q8cd45Lod6a4IcJIxnzGc/zA=="; }; }; - "systeminformation-5.21.15" = { + "systeminformation-5.21.16" = { name = "systeminformation"; packageName = "systeminformation"; - version = "5.21.15"; + version = "5.21.16"; src = fetchurl { - url = "https://registry.npmjs.org/systeminformation/-/systeminformation-5.21.15.tgz"; - sha512 = "vMLwsGgJZW6GvoBXVWNZuRQG0MPxlfQnIIIY9ZxoogWftUpJ9C33qD+32e1meFlXuWpN0moNApPFLpbsSi4OaQ=="; + url = "https://registry.npmjs.org/systeminformation/-/systeminformation-5.21.16.tgz"; + sha512 = "WJZdc5RbmDF1VOJcS+G2oIBeNgmMTyJ8+enHe9stIyBg2XhboUTsSfN9HrFMDV+fgXwJ50kNKgD3TzodsFgB+g=="; }; }; "sywac-1.3.0" = { @@ -54622,13 +53884,13 @@ let sha512 = "5KcOFzPvd1nGFVrmB7H4+QAWVjYOf//+QTbOj0GpXbqtqbKGWVczG+rq6VhXAtdtlKLTs16NAmHRyF5vbggQ2w=="; }; }; - "taskkill-4.0.0" = { + "taskkill-5.0.0" = { name = "taskkill"; packageName = "taskkill"; - version = "4.0.0"; + version = "5.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/taskkill/-/taskkill-4.0.0.tgz"; - sha512 = "h+BGQ8ExIUZ81h4iHRvatZY5eeBBl2WZk31MmMdFG9LBTc5eCH5u/bzZ7phaPH3bsiB7WhM7YTkOyB2dyFQfXg=="; + url = "https://registry.npmjs.org/taskkill/-/taskkill-5.0.0.tgz"; + sha512 = "+HRtZ40Vc+6YfCDWCeAsixwxJgMbPY4HHuTgzPYH3JXvqHWUlsCfy+ylXlAKhFNcuLp4xVeWeFBUhDk+7KYUvQ=="; }; }; "tcp-port-used-1.0.2" = { @@ -55189,15 +54451,6 @@ let sha512 = "qsdtZH+vMoCARQtyod4imc2nIJwg9Cc7lPRrw9CzF8ZKR0khdr8+2nX80PBhET3tcyTtJDxAffGh2rXH4tyU8A=="; }; }; - "tiny-glob-0.2.9" = { - name = "tiny-glob"; - packageName = "tiny-glob"; - version = "0.2.9"; - src = fetchurl { - url = "https://registry.npmjs.org/tiny-glob/-/tiny-glob-0.2.9.tgz"; - sha512 = "g/55ssRPUjShh+xkfx9UPDXqhckHEsHr4Vd9zX55oSdGZc/MD0m3sferOkwWtp98bv+kcVfEHtRJgBVJzelrzg=="; - }; - }; "tinycolor-0.0.1" = { name = "tinycolor"; packageName = "tinycolor"; @@ -55396,15 +54649,6 @@ let sha512 = "+QIz37Ly7acM4EMdw2PRN389OneM5+d844tirkGp4dPKzI5OE72V9OsbFp+CIYJDahZ41ZV05hNtcPAQUAm9/Q=="; }; }; - "to-vfile-6.1.0" = { - name = "to-vfile"; - packageName = "to-vfile"; - version = "6.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/to-vfile/-/to-vfile-6.1.0.tgz"; - sha512 = "BxX8EkCxOAZe+D/ToHdDsJcVI4HqQfmw0tCkp31zf3dNP/XWIAjU4CmeuSwsSoOzOTqHPOL0KUzyZqJplkD0Qw=="; - }; - }; "to-vfile-7.2.4" = { name = "to-vfile"; packageName = "to-vfile"; @@ -55657,15 +54901,6 @@ let sha512 = "1m4RA7xVAJrSGrrXGs0L3YTwyvBs2S8PbRHaLZAkFw7JR8oIFwYtysxlBZhYIa7xSyiYJKZ3iGrrk55cGA3i9A=="; }; }; - "trim-0.0.1" = { - name = "trim"; - packageName = "trim"; - version = "0.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/trim/-/trim-0.0.1.tgz"; - sha512 = "YzQV+TZg4AxpKxaTHK3c3D+kRDCGVEE7LemdlQZoQXn0iennk10RsIoY6ikzAqJTc9Xjl9C1/waHom/J86ziAQ=="; - }; - }; "trim-newlines-1.0.0" = { name = "trim-newlines"; packageName = "trim-newlines"; @@ -55711,15 +54946,6 @@ let sha512 = "pkonvlKk8/ZuR0D5tLW8ljt5I8kmxp2XKymhepUeOdCEfKpZaktSArkLHZt76OB1ZvO9bssUsDty4SWhLvZpLg=="; }; }; - "trim-trailing-lines-1.1.4" = { - name = "trim-trailing-lines"; - packageName = "trim-trailing-lines"; - version = "1.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/trim-trailing-lines/-/trim-trailing-lines-1.1.4.tgz"; - sha512 = "rjUWSqnfTNrjbB9NQWfPMH/xRK1deHeGsHoVfpxJ++XeYXE0d6B1En37AHfw3jtfTU7dzMzZL2jjpe8Qb5gLIQ=="; - }; - }; "triple-beam-1.4.1" = { name = "triple-beam"; packageName = "triple-beam"; @@ -55972,6 +55198,15 @@ let sha512 = "i3P9Kgw3ytjELUfpuKVDNBJvk4u5bXL6gskv572mcevPbSKCV3zt3djhmlEQ65yERjIbOSncy7U4cQJaB1CBCg=="; }; }; + "tuf-js-2.1.0" = { + name = "tuf-js"; + packageName = "tuf-js"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tuf-js/-/tuf-js-2.1.0.tgz"; + sha512 = "eD7YPPjVlMzdggrOeE8zwoegUaG/rt6Bt3jwoQPunRiNVzgcCE009UDFJKJjG+Gk9wFu6W/Vi+P5d/5QpdD9jA=="; + }; + }; "tumblr-0.4.1" = { name = "tumblr"; packageName = "tumblr"; @@ -56251,13 +55486,13 @@ let sha512 = "tLq3bSNx+xSpwvAJnzrK0Ep5CLNWjvFTOp71URMaAEWBfRb9nnJiBoUe0tF8bI4ZFO3omgBR6NvnbzVUT3Ly4g=="; }; }; - "type-fest-4.6.0" = { + "type-fest-4.7.1" = { name = "type-fest"; packageName = "type-fest"; - version = "4.6.0"; + version = "4.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/type-fest/-/type-fest-4.6.0.tgz"; - sha512 = "rLjWJzQFOq4xw7MgJrCZ6T1jIOvvYElXT12r+y0CC6u67hegDHaxcPqb2fZHOGlqxugGQPNB1EnTezjBetkwkw=="; + url = "https://registry.npmjs.org/type-fest/-/type-fest-4.7.1.tgz"; + sha512 = "iWr8RUmzAJRfhZugX9O7nZE6pCxDU8CZ3QxsLuTnGcBLJpCaP2ll3s4eMTBoFnU/CeXY/5rfQSuAEsTGJO4y8A=="; }; }; "type-is-1.6.18" = { @@ -56422,13 +55657,13 @@ let sha512 = "mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w=="; }; }; - "typescript-5.3.0-dev.20231101" = { + "typescript-5.4.0-dev.20231109" = { name = "typescript"; packageName = "typescript"; - version = "5.3.0-dev.20231101"; + version = "5.4.0-dev.20231109"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-5.3.0-dev.20231101.tgz"; - sha512 = "yt5zz7L+TBfzeJhMA/tAEO1YU8J2DWsFN3LbeMslNPXL3S0lR3yvePdl6fXCk7QFjnfaRtXH0noNdWg2imHWXg=="; + url = "https://registry.npmjs.org/typescript/-/typescript-5.4.0-dev.20231109.tgz"; + sha512 = "wX5CSyZbJ0xsgAe0Fyefs8eqEe7o7mp7Nv5EHydBYFpJI/FWZFc4rSF2mGNNZ/1D7JMQgwjCAkZd/2TTF3m/Uw=="; }; }; "typescript-auto-import-cache-0.2.1" = { @@ -56737,22 +55972,22 @@ let sha512 = "UR1khWeAjugW3548EfQmL9Z7pGMlBgXteQpr1IZeZBtnkCJQJIJ1Scj0mb9wQaPvUZ9Q17XqW6TIaPchJkyfqw=="; }; }; - "undici-5.23.0" = { + "undici-5.26.5" = { name = "undici"; packageName = "undici"; - version = "5.23.0"; + version = "5.26.5"; src = fetchurl { - url = "https://registry.npmjs.org/undici/-/undici-5.23.0.tgz"; - sha512 = "1D7w+fvRsqlQ9GscLBwcAJinqcZGHUKjbOmXdlE/v8BvEGXjeWAax+341q44EuTcHXXnfyKNbKRq4Lg7OzhMmg=="; + url = "https://registry.npmjs.org/undici/-/undici-5.26.5.tgz"; + sha512 = "cSb4bPFd5qgR7qr2jYAi0hlX9n5YKK2ONKkLFkxl+v/9BvC0sOpZjBHDBSXc5lWAf5ty9oZdRXytBIHzgUcerw=="; }; }; - "undici-5.27.0" = { + "undici-5.27.2" = { name = "undici"; packageName = "undici"; - version = "5.27.0"; + version = "5.27.2"; src = fetchurl { - url = "https://registry.npmjs.org/undici/-/undici-5.27.0.tgz"; - sha512 = "l3ydWhlhOJzMVOYkymLykcRRXqbUaQriERtR70B9LzNkZ4bX52Fc8wbTDneMiwo8T+AemZXvXaTx+9o5ROxrXg=="; + url = "https://registry.npmjs.org/undici/-/undici-5.27.2.tgz"; + sha512 = "iS857PdOEy/y3wlM3yRp+6SNQQ6xU0mmZcwRSriqk+et/cwWAtwmIGf6WkoDN2EK/AMdCO/dfXzIwi+rFMrjjQ=="; }; }; "undici-types-5.26.5" = { @@ -56764,15 +55999,6 @@ let sha512 = "JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA=="; }; }; - "unherit-1.1.3" = { - name = "unherit"; - packageName = "unherit"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/unherit/-/unherit-1.1.3.tgz"; - sha512 = "Ft16BJcnapDKp0+J/rqFC3Rrk6Y/Ng4nzsC028k2jdDII/rdZ7Wd3pPT/6+vIIxRagwRc9K0IUX0Ra4fKvw+WQ=="; - }; - }; "unherit-3.0.1" = { name = "unherit"; packageName = "unherit"; @@ -56881,15 +56107,6 @@ let sha512 = "Sg7j110mtefBD+qunSLO1lqOEKdrwBFBrR6Qd8f4uwkhWNlbkaqwHse6e7QvD3AP/MNoJdEDLaf8OxYyoWgorQ=="; }; }; - "unified-diff-3.1.0" = { - name = "unified-diff"; - packageName = "unified-diff"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/unified-diff/-/unified-diff-3.1.0.tgz"; - sha512 = "d29qhcADmrvjgSYDLDUmmE/zvVyKUW+O3gRz6Bjj7fcv8kGBlrYBmMjnuBI+wuTou/PXaVl3hPeSh9mXZ0iGSA=="; - }; - }; "unified-diff-4.0.1" = { name = "unified-diff"; packageName = "unified-diff"; @@ -56908,22 +56125,13 @@ let sha512 = "5+JDIs4hqKfHnJcVCxTid1yBoI/++FfF/1PFdSMpaftZZZY+qg2JFruRbf7PaIwa9KgLotXQV3gSjtY0IdcFGQ=="; }; }; - "unified-engine-11.1.0" = { + "unified-engine-11.1.1" = { name = "unified-engine"; packageName = "unified-engine"; - version = "11.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/unified-engine/-/unified-engine-11.1.0.tgz"; - sha512 = "RS3K5PgNjDRQN9eNIefLUDxpfyWIItmKcjBhD1VnYYT/h7xpheZoZBtb5gtwFyKWZlhKCGRVQknIm1M8qHZfIg=="; - }; - }; - "unified-engine-8.2.0" = { - name = "unified-engine"; - packageName = "unified-engine"; - version = "8.2.0"; + version = "11.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/unified-engine/-/unified-engine-8.2.0.tgz"; - sha512 = "ZlMm62ejrf+tJHdyOjQfljszngQjRor95q2XZMGk6rpJUYi7ZIHY/EXEhOcj9PZkMKKdLIM+dqL4s0ceyk9wbA=="; + url = "https://registry.npmjs.org/unified-engine/-/unified-engine-11.1.1.tgz"; + sha512 = "uVx/R+Q8V5wv5EPdPzBPPscSKpbqWeqqIc0lMfDcn3aS+QDENTpDY+wdPQ5oswuQSpPn/miuP0FspIwo19++IA=="; }; }; "unified-lint-rule-1.0.6" = { @@ -56944,15 +56152,6 @@ let sha512 = "JWudPtRN7TLFHVLEVZ+Rm8FUb6kCAtHxEXFgBGDxRSdNMnGyTU5zyYvduHSF/liExlFB3vdFvsAHnNVE/UjAwA=="; }; }; - "unified-message-control-3.0.3" = { - name = "unified-message-control"; - packageName = "unified-message-control"; - version = "3.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/unified-message-control/-/unified-message-control-3.0.3.tgz"; - sha512 = "oY5z2n8ugjpNHXOmcgrw0pQeJzavHS0VjPBP21tOcm7rc2C+5Q+kW9j5+gqtf8vfW/8sabbsK5+P+9QPwwEHDA=="; - }; - }; "unified-message-control-4.0.0" = { name = "unified-message-control"; packageName = "unified-message-control"; @@ -57160,15 +56359,6 @@ let sha512 = "qF72kLmPxAw0oN2fwpWIqbXAVyEqUzDHMsbtPvOudIlUzXYFIeQIuxXQCRCFh22B7cixvU0MG7m3MW8FTq/S+A=="; }; }; - "unist-util-inspect-5.0.1" = { - name = "unist-util-inspect"; - packageName = "unist-util-inspect"; - version = "5.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/unist-util-inspect/-/unist-util-inspect-5.0.1.tgz"; - sha512 = "fPNWewS593JSmg49HbnE86BJKuBi1/nMWhDSccBvbARfxezEuJV85EaARR9/VplveiwCoLm2kWq+DhP8TBaDpw=="; - }; - }; "unist-util-inspect-7.0.2" = { name = "unist-util-inspect"; packageName = "unist-util-inspect"; @@ -57259,15 +56449,6 @@ let sha512 = "yXi4Lm+TG5VG+qvokP6tpnk+r1EPwyYL04JWDxLvgvPV40jANh7nm3udk65OOWquvbMDe+PL9+LmkxDpTv/7BA=="; }; }; - "unist-util-position-3.1.0" = { - name = "unist-util-position"; - packageName = "unist-util-position"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/unist-util-position/-/unist-util-position-3.1.0.tgz"; - sha512 = "w+PkwCbYSFw8vpgWD0v7zRCl1FpY3fjDSQ3/N/wNd9Ffa4gPi8+4keqt99N3XW6F99t/mUzp2xAhNmfKWp95QA=="; - }; - }; "unist-util-position-4.0.4" = { name = "unist-util-position"; packageName = "unist-util-position"; @@ -57286,15 +56467,6 @@ let sha512 = "poZa0eXpS+/XpoQwGwl79UUdea4ol2ZuCYguVaJS4qzIOMDzbqz8a3erUCOmubSZkaOuGamb3tX790iwOIROww=="; }; }; - "unist-util-remove-position-2.0.1" = { - name = "unist-util-remove-position"; - packageName = "unist-util-remove-position"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/unist-util-remove-position/-/unist-util-remove-position-2.0.1.tgz"; - sha512 = "fDZsLYIe2uT+oGFnuZmy73K6ZxOPG/Qcm+w7jbEjaFcJgbQ6cqjs/eSPzXhsmGpAsWPkqZM9pYjww5QTn3LHMA=="; - }; - }; "unist-util-remove-position-4.0.2" = { name = "unist-util-remove-position"; packageName = "unist-util-remove-position"; @@ -57448,13 +56620,13 @@ let sha512 = "L/PqWzfTP9lzzEa6CKs0k2nARxTdZduw3zyh8d2NVBnsyvHjSX4TWse388YrrQKbvI8w20fGjGlhgT96WwKykw=="; }; }; - "universal-user-agent-6.0.0" = { + "universal-user-agent-6.0.1" = { name = "universal-user-agent"; packageName = "universal-user-agent"; - version = "6.0.0"; + version = "6.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-6.0.0.tgz"; - sha512 = "isyNax3wXoKaulPDZWHQqbmIx1k2tb9fb3GGDBRxCscfYV2Ch7WxPArBsFEG8s/safwXTT7H4QGhaIkTp9447w=="; + url = "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-6.0.1.tgz"; + sha512 = "yCzhz6FN2wU1NiiQRogkTQszlQSlpWaw8SvVegAc+bDxbzHgh1vX8uIe8OYyMH6DwH+sdTJsgMl36+mSMdRJIQ=="; }; }; "universalify-0.1.2" = { @@ -57682,15 +56854,6 @@ let sha512 = "iQSLFuxB2ZFAxXGN28DTxk/GNGlBmtqawvguYDtChAHI9Xjy0z7c7hpw6ywutK34SEDYTpLEsAM1ATMq5pcQsw=="; }; }; - "update-notifier-4.1.3" = { - name = "update-notifier"; - packageName = "update-notifier"; - version = "4.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/update-notifier/-/update-notifier-4.1.3.tgz"; - sha512 = "Yld6Z0RyCYGB6ckIjffGOSOmHXj1gMeE7aROz4MG+XMkmixBX4jUngrGXNYz7wPKBmtoD4MnBa2Anu7RSKht/A=="; - }; - }; "update-notifier-5.1.0" = { name = "update-notifier"; packageName = "update-notifier"; @@ -58366,13 +57529,13 @@ let sha512 = "Hq72JaTpcTFdWiNA4Y22Amej2GH3BFmBaKPPlDZ4/oC8HNn2ISHLkFrJU4Ds8R3jcUi7oo5Y9jcMHKjES+N9wQ=="; }; }; - "vega-5.25.0" = { + "vega-5.26.0" = { name = "vega"; packageName = "vega"; - version = "5.25.0"; + version = "5.26.0"; src = fetchurl { - url = "https://registry.npmjs.org/vega/-/vega-5.25.0.tgz"; - sha512 = "lr+uj0mhYlSN3JOKbMNp1RzZBenWp9DxJ7kR3lha58AFNCzzds7pmFa7yXPbtbaGhB7Buh/t6n+Bzk3Y0VnF5g=="; + url = "https://registry.npmjs.org/vega/-/vega-5.26.0.tgz"; + sha512 = "Gvg4SMv6dHdY7aEbbsr6rbUfsI3hVVrEhGKmb5vV8SEqtJqGoeIKT/QZ9Yjw5uQOaGJJqkPcox3WW0n+qGGP/Q=="; }; }; "vega-canvas-1.2.7" = { @@ -58447,13 +57610,13 @@ let sha512 = "Rll7YgpYbsgaAa54AmtEWrxaJqgOh5fXlvM2wewO4trb9vwM53KBv4Q/uBWCLK3LLGeBXIF6gjDt2LFuJAUtkQ=="; }; }; - "vega-functions-5.13.2" = { + "vega-functions-5.14.0" = { name = "vega-functions"; packageName = "vega-functions"; - version = "5.13.2"; + version = "5.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/vega-functions/-/vega-functions-5.13.2.tgz"; - sha512 = "YE1Xl3Qi28kw3vdXVYgKFMo20ttd3+SdKth1jUNtBDGGdrOpvPxxFhZkVqX+7FhJ5/1UkDoAYs/cZY0nRKiYgA=="; + url = "https://registry.npmjs.org/vega-functions/-/vega-functions-5.14.0.tgz"; + sha512 = "Q0rocHmJDfQ0tS91kdN8WcEosq1e3HPK1Yf5z36SPYPmTzKw3uxUGE52tLxC832acAYqPmi8R41wAoI/yFQTPg=="; }; }; "vega-geo-4.4.1" = { @@ -58492,13 +57655,13 @@ let sha512 = "qy5x32SaT0YkEujQM2yKqvLGV9XWQ2aEDSugBFTdYzu/1u4bxdUSRDREOlrJ9Km3RWIOgFiCkobPmFxo47SKuA=="; }; }; - "vega-parser-6.2.0" = { + "vega-parser-6.2.1" = { name = "vega-parser"; packageName = "vega-parser"; - version = "6.2.0"; + version = "6.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/vega-parser/-/vega-parser-6.2.0.tgz"; - sha512 = "as+QnX8Qxe9q51L1C2sVBd+YYYctP848+zEvkBT2jlI2g30aZ6Uv7sKsq7QTL6DUbhXQKR0XQtzlanckSFdaOQ=="; + url = "https://registry.npmjs.org/vega-parser/-/vega-parser-6.2.1.tgz"; + sha512 = "F79bQXt6fMkACR+TfFl7ueehKO26yCR/3iRZxhU7/pgHerx/d8K8pf2onMguu3NAN4eitT+PPuTgkDZtcqo9Qg=="; }; }; "vega-projection-1.6.0" = { @@ -58528,31 +57691,31 @@ let sha512 = "0dDYXyFLQcxPQ2OQU0WuBVYLRZnm+/CwVu6i6N4idS7R9VXIX5581EkCh3pZ20pQ/+oaA7oJ0pR9rJgJ6rukRQ=="; }; }; - "vega-scale-7.3.0" = { + "vega-scale-7.3.1" = { name = "vega-scale"; packageName = "vega-scale"; - version = "7.3.0"; + version = "7.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/vega-scale/-/vega-scale-7.3.0.tgz"; - sha512 = "pMOAI2h+e1z7lsqKG+gMfR6NKN2sTcyjZbdJwntooW0uFHwjLGjMSY7kSd3nSEquF0HQ8qF7zR6gs1eRwlGimw=="; + url = "https://registry.npmjs.org/vega-scale/-/vega-scale-7.3.1.tgz"; + sha512 = "tyTlaaCpHN2Ik/PPKl/j9ThadBDjPtypqW1D7IsUSkzfoZ7RPlI2jwAaoj2C/YW5jFRbEOx3njmjogp48I5CvA=="; }; }; - "vega-scenegraph-4.10.2" = { + "vega-scenegraph-4.11.0" = { name = "vega-scenegraph"; packageName = "vega-scenegraph"; - version = "4.10.2"; + version = "4.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/vega-scenegraph/-/vega-scenegraph-4.10.2.tgz"; - sha512 = "R8m6voDZO5+etwNMcXf45afVM3XAtokMqxuDyddRl9l1YqSJfS+3u8hpolJ50c2q6ZN20BQiJwKT1o0bB7vKkA=="; + url = "https://registry.npmjs.org/vega-scenegraph/-/vega-scenegraph-4.11.0.tgz"; + sha512 = "NQtxA53/w9whUwZScv+/vxSb68frgLwanpy207vaBew46hnFZI9GUWmLWemOww8pJwBnVmnF4jFhUBbKq13HVw=="; }; }; - "vega-selections-5.4.1" = { + "vega-selections-5.4.2" = { name = "vega-selections"; packageName = "vega-selections"; - version = "5.4.1"; + version = "5.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/vega-selections/-/vega-selections-5.4.1.tgz"; - sha512 = "EtYc4DvA+wXqBg9tq+kDomSoVUPCmQfS7hUxy2qskXEed79YTimt3Hcl1e1fW226I4AVDBEqTTKebmKMzbSgAA=="; + url = "https://registry.npmjs.org/vega-selections/-/vega-selections-5.4.2.tgz"; + sha512 = "99FUhYmg0jOJr2/K4TcEURmJRkuibrCDc8KBUX7qcQEITzrZ5R6a4QE+sarCvbb3hi8aA9GV2oyST6MQeA9mgQ=="; }; }; "vega-statistics-1.9.0" = { @@ -58573,22 +57736,22 @@ let sha512 = "z1qbgyX0Af2kQSGFbApwBbX2meenGvsoX8Nga8uyWN8VIbiySo/xqizz1KrP6NbB6R+x5egKmkjdnyNThPeEWA=="; }; }; - "vega-transforms-4.10.2" = { + "vega-transforms-4.11.0" = { name = "vega-transforms"; packageName = "vega-transforms"; - version = "4.10.2"; + version = "4.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/vega-transforms/-/vega-transforms-4.10.2.tgz"; - sha512 = "sJELfEuYQ238PRG+GOqQch8D69RYnJevYSGLsRGQD2LxNz3j+GlUX6Pid+gUEH5HJy22Q5L0vsTl2ZNhIr4teQ=="; + url = "https://registry.npmjs.org/vega-transforms/-/vega-transforms-4.11.0.tgz"; + sha512 = "BeDASz7s9pIFjcSBljJJb8Eg0to2VjU0DvS/UjCQQYtqlfmzz78/mZnHyC+mW06h58ZKN+1QrIfqTZ6uMB4ySw=="; }; }; - "vega-typings-0.24.2" = { + "vega-typings-1.0.0" = { name = "vega-typings"; packageName = "vega-typings"; - version = "0.24.2"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/vega-typings/-/vega-typings-0.24.2.tgz"; - sha512 = "fW02GElYoqweCCaPqH6iH44UZnzXiX9kbm1qyecjU3k5s0vtufLI7Yuz/a/uL37mEAqTMQplBBAlk0T9e2e1Dw=="; + url = "https://registry.npmjs.org/vega-typings/-/vega-typings-1.0.0.tgz"; + sha512 = "ML8MVdNQurPvOQ6mskp+Zxf7Yy4M5G73QI04aIi51hACqa032qOxgzApZUPEoqBDBczm4zPPF0X9SQgaxJXq4A=="; }; }; "vega-util-1.17.2" = { @@ -58618,13 +57781,13 @@ let sha512 = "NxEq4ZD4QwWGRrl2yDLnBRXM9FgCI+vvYb3ZC2+nVDtkUxOlEIKZsMMw31op5GZpfClWLbjCT3mVvzO2xaTF+g=="; }; }; - "vega-voronoi-4.2.1" = { + "vega-voronoi-4.2.2" = { name = "vega-voronoi"; packageName = "vega-voronoi"; - version = "4.2.1"; + version = "4.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/vega-voronoi/-/vega-voronoi-4.2.1.tgz"; - sha512 = "zzi+fxU/SBad4irdLLsG3yhZgXWZezraGYVQfZFWe8kl7W/EHUk+Eqk/eetn4bDeJ6ltQskX+UXH3OP5Vh0Q0Q=="; + url = "https://registry.npmjs.org/vega-voronoi/-/vega-voronoi-4.2.2.tgz"; + sha512 = "Bq2YOp2MGphhQnUuLwl3dsyBs6MuEU86muTjDbBJg33+HkZtE1kIoQZr+EUHa46NBsY1NzSKddOTu8wcaFrWiQ=="; }; }; "vega-wordcloud-4.1.4" = { @@ -58708,15 +57871,6 @@ let sha512 = "1bYqc7pt6NIADBJ98UiG0Bn/CHIVOoZ/IyEkqIruLg0mE1BKzkOXY2D6CSqQIcKqgadppE5lrxgWXJmXd7zZJw=="; }; }; - "vfile-find-up-5.0.1" = { - name = "vfile-find-up"; - packageName = "vfile-find-up"; - version = "5.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/vfile-find-up/-/vfile-find-up-5.0.1.tgz"; - sha512 = "YWx8fhWQNYpHxFkR5fDO4lCdvPcY4jfCG7qUMHVvSp14vRfkEYxFG/vUEV0eJuXoKFfiAmMkAS8dekOYnpAJ+A=="; - }; - }; "vfile-find-up-6.1.0" = { name = "vfile-find-up"; packageName = "vfile-find-up"; @@ -58726,15 +57880,6 @@ let sha512 = "plN64Ff/wLPvKC8ucTzyB97cgV7SdIcFL74HLCSmI/79FqOI1WACbNM4noKrJa+dZRgN6Gwp4BQElm/yBDqC3w=="; }; }; - "vfile-location-3.2.0" = { - name = "vfile-location"; - packageName = "vfile-location"; - version = "3.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/vfile-location/-/vfile-location-3.2.0.tgz"; - sha512 = "aLEIZKv/oxuCDZ8lkJGhuhztf/BW4M+iHdCwglA/eWc+vtuRFJj8EtgceYFX4LRjOhCAAiNHsKGssC6onJ+jbA=="; - }; - }; "vfile-location-4.1.0" = { name = "vfile-location"; packageName = "vfile-location"; @@ -58771,15 +57916,6 @@ let sha512 = "jRDZ1IMLttGj41KcZvlrYAaI3CfqpLpfpf+Mfig13viT6NKvRzWZ+lXz0Y5D60w6uJIBAOGq9mSHf0gktF0duw=="; }; }; - "vfile-reporter-6.0.2" = { - name = "vfile-reporter"; - packageName = "vfile-reporter"; - version = "6.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/vfile-reporter/-/vfile-reporter-6.0.2.tgz"; - sha512 = "GN2bH2gs4eLnw/4jPSgfBjo+XCuvnX9elHICJZjVD4+NM0nsUrMTvdjGY5Sc/XG69XVTgLwj7hknQVc6M9FukA=="; - }; - }; "vfile-reporter-7.0.5" = { name = "vfile-reporter"; packageName = "vfile-reporter"; @@ -58807,15 +57943,6 @@ let sha512 = "kPQ8wnn7lSS89B5kvdGfNxq3rz32dsAY2lPSIq0LtK/Dq0zMXchsEo3+UmJeUThqF8POtwtdjp8H8LNShBcpbA=="; }; }; - "vfile-sort-2.2.2" = { - name = "vfile-sort"; - packageName = "vfile-sort"; - version = "2.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/vfile-sort/-/vfile-sort-2.2.2.tgz"; - sha512 = "tAyUqD2R1l/7Rn7ixdGkhXLD3zsg+XLAeUDUhXearjfIcpL1Hcsj5hHpCoy/gvfK/Ws61+e972fm0F7up7hfYA=="; - }; - }; "vfile-sort-3.0.1" = { name = "vfile-sort"; packageName = "vfile-sort"; @@ -58834,15 +57961,6 @@ let sha512 = "lffPI1JrbHDTToJwcq0rl6rBmkjQmMuXkAxsZPRS9DXbaJQvc642eCg6EGxcX2i1L+esbuhq+2l9tBll5v8AeQ=="; }; }; - "vfile-statistics-1.1.4" = { - name = "vfile-statistics"; - packageName = "vfile-statistics"; - version = "1.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/vfile-statistics/-/vfile-statistics-1.1.4.tgz"; - sha512 = "lXhElVO0Rq3frgPvFBwahmed3X03vjPF8OcjKMy8+F1xU/3Q3QU3tKEDp743SFtb74PdF0UWpxPvtOP0GCLheA=="; - }; - }; "vfile-statistics-2.0.1" = { name = "vfile-statistics"; packageName = "vfile-statistics"; @@ -58978,58 +58096,58 @@ let sha512 = "Dhxzh5HZuiHQhbvTW9AMetFfBHDMYpo23Uo9btPXgdYP+3T5S+p+jgNy7spra+veYhBP2dCSgxR/i2Y02h5/6w=="; }; }; - "volar-service-css-0.0.14" = { + "volar-service-css-0.0.16" = { name = "volar-service-css"; packageName = "volar-service-css"; - version = "0.0.14"; + version = "0.0.16"; src = fetchurl { - url = "https://registry.npmjs.org/volar-service-css/-/volar-service-css-0.0.14.tgz"; - sha512 = "xmyKoyWpbgM0u7mGA1ogyj5ol7CfQADm5eXNpeJeX3Rp79rFEtz1DuuaIjcgRvhSYsjJfPBOtOvHBwTRf4HaEQ=="; + url = "https://registry.npmjs.org/volar-service-css/-/volar-service-css-0.0.16.tgz"; + sha512 = "gK/XD35t/P3SQrUuS8LMlCnE2ItIk+kXI6gPvBYl1NZ7O+tLH8rUWXA32YgpwNoITxYrm/G1seaq08zs4aiPvg=="; }; }; - "volar-service-emmet-0.0.14" = { + "volar-service-emmet-0.0.16" = { name = "volar-service-emmet"; packageName = "volar-service-emmet"; - version = "0.0.14"; + version = "0.0.16"; src = fetchurl { - url = "https://registry.npmjs.org/volar-service-emmet/-/volar-service-emmet-0.0.14.tgz"; - sha512 = "0meSKjQ93j5iSYl6Y+qtARfAYr3J2wNSr6wlKr/V9KULAy+8/me8q9l8wkTQqdRMujZAv2j/LzgQ65Yc9mnA1w=="; + url = "https://registry.npmjs.org/volar-service-emmet/-/volar-service-emmet-0.0.16.tgz"; + sha512 = "8sWWywzVJOD+PWDArOXDWbiRlM7+peydFhXJT71i4X1WPW32RyPxn6FypvciO+amqpfZP2rXfB9eibIJ+EofSQ=="; }; }; - "volar-service-html-0.0.14" = { + "volar-service-html-0.0.16" = { name = "volar-service-html"; packageName = "volar-service-html"; - version = "0.0.14"; + version = "0.0.16"; src = fetchurl { - url = "https://registry.npmjs.org/volar-service-html/-/volar-service-html-0.0.14.tgz"; - sha512 = "PQb97QICxXhXD7AJFU/S/Vexd1L4IP2Sa5SzxYyKnApcx0GNdxaIbFHlev9wazrTgtCtSnaVXJBxY05pZzTKPw=="; + url = "https://registry.npmjs.org/volar-service-html/-/volar-service-html-0.0.16.tgz"; + sha512 = "/oEXXgry++1CnTXQBUNf9B8MZfTlYZuJfZA7Zx9MN7WS4ZPxk3BFOdal/cXH6RNR2ruNEYr5QTW9rsqtoUscag=="; }; }; - "volar-service-prettier-0.0.14" = { + "volar-service-prettier-0.0.16" = { name = "volar-service-prettier"; packageName = "volar-service-prettier"; - version = "0.0.14"; + version = "0.0.16"; src = fetchurl { - url = "https://registry.npmjs.org/volar-service-prettier/-/volar-service-prettier-0.0.14.tgz"; - sha512 = "woZLBikvv8u0jUAq10ZTtuo9hmnQ1RHZubMhzyJbWwkr6L7wT7bPZkscdyaCGrzBT3Pz4zbS0bnpAC5GLAILTA=="; + url = "https://registry.npmjs.org/volar-service-prettier/-/volar-service-prettier-0.0.16.tgz"; + sha512 = "Kj2ZdwJGEvfYbsHW8Sjrew/7EB4PgRoas4f8yAJzUUVxIC/kvhUwLDxQc8+N2IibomN76asJGWe+i6VZZvgIkw=="; }; }; - "volar-service-typescript-0.0.14" = { + "volar-service-typescript-0.0.16" = { name = "volar-service-typescript"; packageName = "volar-service-typescript"; - version = "0.0.14"; + version = "0.0.16"; src = fetchurl { - url = "https://registry.npmjs.org/volar-service-typescript/-/volar-service-typescript-0.0.14.tgz"; - sha512 = "PGHFUbGPLE6/8ldNPO7FxwZdvRLlWBZ26RnJPCM48DBaGTc7qHGkXMtPQq5YCD10d8VwpZirz0eno8K0z+8bpg=="; + url = "https://registry.npmjs.org/volar-service-typescript/-/volar-service-typescript-0.0.16.tgz"; + sha512 = "k/qFKM2oxs/3fhbr/vcBSHnCLZ1HN3Aeh+bGvV9Lc9qIhrNyCVsDFOUJN1Qp4dI72+Y+eFSIDCLHmFEZdsP2EA=="; }; }; - "volar-service-typescript-twoslash-queries-0.0.14" = { + "volar-service-typescript-twoslash-queries-0.0.16" = { name = "volar-service-typescript-twoslash-queries"; packageName = "volar-service-typescript-twoslash-queries"; - version = "0.0.14"; + version = "0.0.16"; src = fetchurl { - url = "https://registry.npmjs.org/volar-service-typescript-twoslash-queries/-/volar-service-typescript-twoslash-queries-0.0.14.tgz"; - sha512 = "Lg/AcacxyBmVbZhHZwnwvt+MEn/5YlbLiJ7DJG6Dt3xiuQmpXwZmM+JE7/ZMvPt4gxW6AL9zHz21M6JSPCkJ+g=="; + url = "https://registry.npmjs.org/volar-service-typescript-twoslash-queries/-/volar-service-typescript-twoslash-queries-0.0.16.tgz"; + sha512 = "0gPrkDTD2bMj2AnSNykOKhfmPnBFE2LS1lF3LWA7qu1ChRnJF0sodwCCbbeNYJ9+yth956ApoU1BVQ8UrMg+yw=="; }; }; "vscode-css-languageservice-3.0.13" = { @@ -59185,6 +58303,15 @@ let sha512 = "C+r0eKJUIfiDIfwJhria30+TYWPtuHJXHtI7J0YlOmKAo7ogxP20T0zxB7HZQIFhIyvoBPwWskjxrvAtfjyZfA=="; }; }; + "vscode-jsonrpc-8.2.0-next.2" = { + name = "vscode-jsonrpc"; + packageName = "vscode-jsonrpc"; + version = "8.2.0-next.2"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-8.2.0-next.2.tgz"; + sha512 = "1FQrqLselaLLe5ApFSU/8qGUbJ8tByWbqczMkT2PEDpDYthCQTe5wONPuVphe7BB+FvZwvBFI2kFkY7FtyHc1A=="; + }; + }; "vscode-languageclient-8.1.0" = { name = "vscode-languageclient"; packageName = "vscode-languageclient"; @@ -59266,6 +58393,15 @@ let sha512 = "eUt8f1z2N2IEUDBsKaNapkz7jl5QpskN2Y0G01T/ItMxBxw1fJwvtySGB9QMecatne8jFIWJGWI61dWjyTLQsw=="; }; }; + "vscode-languageserver-8.2.0-next.3" = { + name = "vscode-languageserver"; + packageName = "vscode-languageserver"; + version = "8.2.0-next.3"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-8.2.0-next.3.tgz"; + sha512 = "fqHRwcIRoxfKke7iLDSeUmdo3uk7o/uWNn/44xdWa4urdhsvpTZ5c1GsL1EX4TAvdDg0qeXy89NBZ5Gld2DkgQ=="; + }; + }; "vscode-languageserver-9.0.1" = { name = "vscode-languageserver"; packageName = "vscode-languageserver"; @@ -59329,6 +58465,15 @@ let sha512 = "924/h0AqsMtA5yK22GgMtCYiMdCOtWTSGgUOkgEDX+wk2b0x4sAfLiO4NxBxqbiVtz7K7/1/RgVrVI0NClZwqA=="; }; }; + "vscode-languageserver-protocol-3.17.4-next.3" = { + name = "vscode-languageserver-protocol"; + packageName = "vscode-languageserver-protocol"; + version = "3.17.4-next.3"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.4-next.3.tgz"; + sha512 = "GnW3ldfzlsDK9B1/L1edBW1ddSakC59r+DRipTYCcXIT/zCCbLID998Dxn+exgrL33e3/XLQ+7hQQiSz6TnhKQ=="; + }; + }; "vscode-languageserver-protocol-3.17.5" = { name = "vscode-languageserver-protocol"; packageName = "vscode-languageserver-protocol"; @@ -59446,6 +58591,15 @@ let sha512 = "SYU4z1dL0PyIMd4Vj8YOqFvHu7Hz/enbWtpfnVbJHU4Nd1YNYx8u0ennumc6h48GQNeOLxmwySmnADouT/AuZA=="; }; }; + "vscode-languageserver-types-3.17.4-next.2" = { + name = "vscode-languageserver-types"; + packageName = "vscode-languageserver-types"; + version = "3.17.4-next.2"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.4-next.2.tgz"; + sha512 = "r6tXyCXyXQH7b6VHkvRT0Nd9v+DWQiosgTR6HQajCb4iJ1myr3KgueWEGBF1Ph5/YAiDy8kXUhf8dHl7wE1H2A=="; + }; + }; "vscode-languageserver-types-3.17.5" = { name = "vscode-languageserver-types"; packageName = "vscode-languageserver-types"; @@ -60337,15 +59491,6 @@ let sha512 = "oEXTISQnC8VlSAKf1KYSSd7J6IWuRPQqDdo8eoRNaYKLvwSb5+79Z3Yi1lrl6KDpU6/VWaxpakDAtb1oQ4n9aw=="; }; }; - "winston-daily-rotate-file-4.7.1" = { - name = "winston-daily-rotate-file"; - packageName = "winston-daily-rotate-file"; - version = "4.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/winston-daily-rotate-file/-/winston-daily-rotate-file-4.7.1.tgz"; - sha512 = "7LGPiYGBPNyGHLn9z33i96zx/bd71pjBn9tqQzO3I4Tayv94WPmBNwKC7CO1wPHdP9uvu+Md/1nr6VSH9h0iaA=="; - }; - }; "winston-transport-4.6.0" = { name = "winston-transport"; packageName = "winston-transport"; @@ -61121,15 +60266,6 @@ let sha512 = "og7TEJhXvn1a7kzZGQ7ETjdQVS2UfZyTlsEdDOqvQF7GoxNfY+0YLCzBy1kPdsDDx4QuNAonQPddpsn6Xl/7sw=="; }; }; - "xstate-4.38.2" = { - name = "xstate"; - packageName = "xstate"; - version = "4.38.2"; - src = fetchurl { - url = "https://registry.npmjs.org/xstate/-/xstate-4.38.2.tgz"; - sha512 = "Fba/DwEPDLneHT3tbJ9F3zafbQXszOlyCJyQqqdzmtlY/cwE2th462KK48yaANf98jHlP6lJvxfNtN0LFKXPQg=="; - }; - }; "xstate-4.38.3" = { name = "xstate"; packageName = "xstate"; @@ -61238,13 +60374,13 @@ let sha512 = "r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg=="; }; }; - "yaml-2.3.3" = { + "yaml-2.3.4" = { name = "yaml"; packageName = "yaml"; - version = "2.3.3"; + version = "2.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/yaml/-/yaml-2.3.3.tgz"; - sha512 = "zw0VAJxgeZ6+++/su5AFoqBbZbrEakwu+X0M5HmcwUiBL7AzcuPKjj5we4xfQLp78LkEMpD0cOnUhmgOVy3KdQ=="; + url = "https://registry.npmjs.org/yaml/-/yaml-2.3.4.tgz"; + sha512 = "8aAvwVUSHpfEqTQ4w/KMlf3HcRdt50E5ODIQJBw1fQ5RL34xabzxtUlzTXVqc4rkZsPbvrXKWnABCD7kWSmocA=="; }; }; "yaml-ast-parser-0.0.43" = { @@ -61265,15 +60401,6 @@ let sha512 = "ULGbghCLsN8Hs8vfExlqrJIe8Hl2TUjD7/zsIGMP8U+dgRXEsDXk4yydxeZJgdGiimP1XB7zhmhOB4/HyfqOyQ=="; }; }; - "yaml-js-0.2.3" = { - name = "yaml-js"; - packageName = "yaml-js"; - version = "0.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/yaml-js/-/yaml-js-0.2.3.tgz"; - sha512 = "6xUQtVKl1qcd0EXtTEzUDVJy9Ji1fYa47LtkDtYKlIjhibPE9knNPmoRyf6SGREFHlOAUyDe9OdYqRP4DuSi5Q=="; - }; - }; "yamljs-0.3.0" = { name = "yamljs"; packageName = "yamljs"; @@ -61346,15 +60473,6 @@ let sha512 = "c2k48R0PwKIqKhPMWjeiF6y2xY/gPMUlro0sgxqXpbOIohWiLNXWslsootttv7E1e73QPAMQSg5FeySbVcpsPQ=="; }; }; - "yargs-17.3.1" = { - name = "yargs"; - packageName = "yargs"; - version = "17.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-17.3.1.tgz"; - sha512 = "WUANQeVgjLbNsEmGk20f+nlHgOqzRFpiGWVaBrYGYIGANIIu3lWjoyi0fNlFmJkvfhCZ6BXINe7/W2O2bV4iaA=="; - }; - }; "yargs-17.7.2" = { name = "yargs"; packageName = "yargs"; @@ -61634,13 +60752,13 @@ let sha512 = "N+d4UJSJbt/R3wqY7Coqs5pcV0aUj2j9IaQ3rNj9bVCLld8tTGKRa2USARjnvZJWVx1NDmQev8EknoczaOQDOA=="; }; }; - "youch-3.3.2" = { + "youch-3.3.3" = { name = "youch"; packageName = "youch"; - version = "3.3.2"; + version = "3.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/youch/-/youch-3.3.2.tgz"; - sha512 = "9cwz/z7abtcHOIuH45nzmUFCZbyJA1nLqlirKvyNRx4wDMhqsBaifAJzBej7L4fsVPjFxYq3NK3GAcfvZsydFw=="; + url = "https://registry.npmjs.org/youch/-/youch-3.3.3.tgz"; + sha512 = "qSFXUk3UZBLfggAW3dJKg0BMblG5biqSF8M34E06o5CSsZtH92u9Hqmj2RzGiHDi64fhe83+4tENFP2DB6t6ZA=="; }; }; "yurnalist-2.1.0" = { @@ -61697,15 +60815,6 @@ let sha512 = "9qv4rlDiopXg4E69k+vMHjNN63YFMe9sZMrdlvKnCjlCRWeCBswPPMPUfx+ipsAWq1LXHe70RcbaHdJJpS6hyQ=="; }; }; - "zod-1.11.17" = { - name = "zod"; - packageName = "zod"; - version = "1.11.17"; - src = fetchurl { - url = "https://registry.npmjs.org/zod/-/zod-1.11.17.tgz"; - sha512 = "UzIwO92D0dSFwIRyyqAfRXICITLjF0IP8tRbEK/un7adirMssWZx8xF/1hZNE7t61knWZ+lhEuUvxlu2MO8qqA=="; - }; - }; "zod-3.21.4" = { name = "zod"; packageName = "zod"; @@ -61742,15 +60851,6 @@ let sha512 = "fjUZh4nQ1s6HMccgIeE0VP4QG/YRGPmyjO9sAh890aQKPEk3nqbfUXhMFaC+Dr5KvYBm8BCyvfpZf2jY9aGSsw=="; }; }; - "zwave-js-12.3.0" = { - name = "zwave-js"; - packageName = "zwave-js"; - version = "12.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/zwave-js/-/zwave-js-12.3.0.tgz"; - sha512 = "ZiGFyWSHT6xXgFsMj0gh+5D76h4oKSqoDBBVlrZitJShpan6LqE9eEhocP4XFTXs7XrLlbbo54gEz7y5P0KP9Q=="; - }; - }; "zwitch-1.0.5" = { name = "zwitch"; packageName = "zwitch"; @@ -61775,16 +60875,15 @@ in "@angular/cli" = nodeEnv.buildNodePackage { name = "_at_angular_slash_cli"; packageName = "@angular/cli"; - version = "16.2.9"; + version = "17.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@angular/cli/-/cli-16.2.9.tgz"; - sha512 = "wkpV/Ni26LUeDmhee2TPXXEq3feEdZMSG8+nkfUK9kqIcxm0IjI1GLPeiVOX7aQobuKNe2cCAFNwsrXWjj+2og=="; + url = "https://registry.npmjs.org/@angular/cli/-/cli-17.0.0.tgz"; + sha512 = "VzKYmN+1wSE2wLBEFu/NHSrRQbeaKkEDO9aZxd7nAnxC5T1Zcva7dfqZIXMHXH2HESYAZCvOS8ikBE/7DCtWWw=="; }; dependencies = [ - sources."@angular-devkit/architect-0.1602.9" - sources."@angular-devkit/core-16.2.9" - sources."@angular-devkit/schematics-16.2.9" - sources."@gar/promisify-1.1.3" + sources."@angular-devkit/architect-0.1700.0" + sources."@angular-devkit/core-17.0.0" + sources."@angular-devkit/schematics-17.0.0" (sources."@isaacs/cliui-8.0.2" // { dependencies = [ sources."ansi-regex-6.0.1" @@ -61796,36 +60895,24 @@ in ]; }) sources."@jridgewell/sourcemap-codec-1.4.15" - sources."@npmcli/fs-2.1.2" - sources."@npmcli/git-4.1.0" + sources."@ljharb/through-2.3.11" + sources."@npmcli/agent-2.2.0" + sources."@npmcli/fs-3.1.0" + sources."@npmcli/git-5.0.3" sources."@npmcli/installed-package-contents-2.0.2" - sources."@npmcli/move-file-2.0.1" sources."@npmcli/node-gyp-3.0.0" - sources."@npmcli/promise-spawn-6.0.2" - sources."@npmcli/run-script-6.0.2" - sources."@schematics/angular-16.2.9" - sources."@sigstore/bundle-1.1.0" + sources."@npmcli/promise-spawn-7.0.0" + sources."@npmcli/run-script-7.0.2" + sources."@schematics/angular-17.0.0" + sources."@sigstore/bundle-2.1.0" sources."@sigstore/protobuf-specs-0.2.1" - (sources."@sigstore/sign-1.0.0" // { - dependencies = [ - sources."make-fetch-happen-11.1.1" - sources."minipass-7.0.4" - sources."minipass-fetch-3.0.4" - ]; - }) - sources."@sigstore/tuf-1.0.3" - sources."@tootallnate/once-2.0.0" - sources."@tufjs/canonical-json-1.0.0" - (sources."@tufjs/models-1.0.4" // { - dependencies = [ - sources."brace-expansion-2.0.1" - sources."minimatch-9.0.3" - ]; - }) + sources."@sigstore/sign-2.2.0" + sources."@sigstore/tuf-2.2.0" + sources."@tufjs/canonical-json-2.0.0" + sources."@tufjs/models-2.0.0" sources."@yarnpkg/lockfile-1.1.0" - sources."abbrev-1.1.1" - sources."agent-base-6.0.2" - sources."agentkeepalive-4.5.0" + sources."abbrev-2.0.0" + sources."agent-base-7.1.0" sources."aggregate-error-3.1.0" sources."ajv-8.12.0" sources."ajv-formats-2.1.1" @@ -61833,113 +60920,89 @@ in sources."ansi-escapes-4.3.2" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" - sources."anymatch-3.1.3" - sources."aproba-2.0.0" - sources."are-we-there-yet-3.0.1" + (sources."anymatch-3.1.3" // { + dependencies = [ + sources."picomatch-2.3.1" + ]; + }) sources."balanced-match-1.0.2" sources."base64-js-1.5.1" sources."binary-extensions-2.2.0" sources."bl-4.1.0" - sources."brace-expansion-1.1.11" + sources."brace-expansion-2.0.1" sources."braces-3.0.2" sources."buffer-5.7.1" sources."builtins-5.0.1" - (sources."cacache-17.1.4" // { - dependencies = [ - sources."@npmcli/fs-3.1.0" - sources."brace-expansion-2.0.1" - sources."glob-10.3.10" - sources."minimatch-9.0.3" - sources."minipass-7.0.4" - sources."unique-filename-3.0.0" - sources."unique-slug-4.0.0" - ]; - }) - sources."chalk-4.1.2" + sources."cacache-18.0.0" + sources."call-bind-1.0.5" + sources."chalk-5.3.0" sources."chardet-0.7.0" sources."chokidar-3.5.3" sources."chownr-2.0.0" sources."clean-stack-2.2.0" sources."cli-cursor-3.1.0" sources."cli-spinners-2.9.1" - sources."cli-width-3.0.0" - sources."cliui-8.0.1" + sources."cli-width-4.1.0" + (sources."cliui-8.0.1" // { + dependencies = [ + sources."wrap-ansi-7.0.0" + ]; + }) sources."clone-1.0.4" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."color-support-1.1.3" - sources."concat-map-0.0.1" - sources."console-control-strings-1.1.0" (sources."cross-spawn-7.0.3" // { dependencies = [ + sources."isexe-2.0.0" sources."which-2.0.2" ]; }) - (sources."debug-4.3.4" // { - dependencies = [ - sources."ms-2.1.2" - ]; - }) + sources."debug-4.3.4" sources."defaults-1.0.4" + sources."define-data-property-1.1.1" sources."define-lazy-prop-2.0.0" - sources."delegates-1.0.0" sources."eastasianwidth-0.2.0" sources."emoji-regex-8.0.0" - (sources."encoding-0.1.13" // { - dependencies = [ - sources."iconv-lite-0.6.3" - ]; - }) sources."env-paths-2.2.1" sources."err-code-2.0.3" sources."escalade-3.1.1" - sources."escape-string-regexp-1.0.5" + sources."escape-string-regexp-5.0.0" sources."exponential-backoff-3.1.1" sources."external-editor-3.1.0" sources."fast-deep-equal-3.1.3" - sources."figures-3.2.0" + sources."figures-5.0.0" sources."fill-range-7.0.1" (sources."foreground-child-3.1.1" // { dependencies = [ sources."signal-exit-4.1.0" ]; }) - (sources."fs-minipass-3.0.3" // { - dependencies = [ - sources."minipass-7.0.4" - ]; - }) - sources."fs.realpath-1.0.0" + sources."fs-minipass-3.0.3" sources."fsevents-2.3.3" sources."function-bind-1.1.2" - sources."gauge-4.0.4" sources."get-caller-file-2.0.5" - sources."glob-7.2.3" + sources."get-intrinsic-1.2.2" + sources."glob-10.3.10" sources."glob-parent-5.1.2" + sources."gopd-1.0.1" sources."graceful-fs-4.2.11" sources."has-flag-4.0.0" - sources."has-unicode-2.0.1" + sources."has-property-descriptors-1.0.1" + sources."has-proto-1.0.1" + sources."has-symbols-1.0.3" sources."hasown-2.0.0" - sources."hosted-git-info-6.1.1" + sources."hosted-git-info-7.0.1" sources."http-cache-semantics-4.1.1" - sources."http-proxy-agent-5.0.0" - sources."https-proxy-agent-5.0.1" - sources."humanize-ms-1.2.1" + sources."http-proxy-agent-7.0.0" + sources."https-proxy-agent-7.0.2" sources."iconv-lite-0.4.24" sources."ieee754-1.2.1" - (sources."ignore-walk-6.0.3" // { - dependencies = [ - sources."brace-expansion-2.0.1" - sources."minimatch-9.0.3" - ]; - }) + sources."ignore-walk-6.0.3" sources."imurmurhash-0.1.4" sources."indent-string-4.0.0" - sources."infer-owner-1.0.4" - sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-4.1.1" - sources."inquirer-8.2.4" + sources."inquirer-9.2.11" sources."ip-2.0.0" sources."is-binary-path-2.1.0" sources."is-core-module-2.13.1" @@ -61950,42 +61013,33 @@ in sources."is-interactive-1.0.0" sources."is-lambda-1.0.1" sources."is-number-7.0.0" - sources."is-unicode-supported-0.1.0" + sources."is-unicode-supported-1.3.0" sources."is-wsl-2.2.0" - sources."isexe-2.0.0" + sources."isexe-3.1.1" sources."jackspeak-2.3.6" sources."json-parse-even-better-errors-3.0.0" sources."json-schema-traverse-1.0.0" sources."jsonc-parser-3.2.0" sources."jsonparse-1.3.1" sources."lodash-4.17.21" - sources."log-symbols-4.1.0" - sources."lru-cache-7.18.3" - sources."magic-string-0.30.1" - (sources."make-fetch-happen-10.2.1" // { + (sources."log-symbols-4.1.0" // { dependencies = [ - sources."brace-expansion-2.0.1" - sources."cacache-16.1.3" - sources."fs-minipass-2.1.0" - sources."glob-8.1.0" - sources."minimatch-5.1.6" - sources."minipass-3.3.6" - sources."ssri-9.0.1" + sources."chalk-4.1.2" + sources."is-unicode-supported-0.1.0" ]; }) + sources."lru-cache-10.0.1" + sources."magic-string-0.30.5" + sources."make-fetch-happen-13.0.0" sources."mimic-fn-2.1.0" - sources."minimatch-3.1.2" - sources."minipass-5.0.0" + sources."minimatch-9.0.3" + sources."minipass-7.0.4" (sources."minipass-collect-1.0.2" // { dependencies = [ sources."minipass-3.3.6" ]; }) - (sources."minipass-fetch-2.1.2" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) + sources."minipass-fetch-3.0.4" (sources."minipass-flush-1.0.5" // { dependencies = [ sources."minipass-3.3.6" @@ -62012,71 +61066,53 @@ in ]; }) sources."mkdirp-1.0.4" - sources."ms-2.1.3" - sources."mute-stream-0.0.8" + sources."ms-2.1.2" + sources."mute-stream-1.0.0" sources."negotiator-0.6.3" - (sources."node-gyp-9.4.1" // { - dependencies = [ - sources."which-2.0.2" - ]; - }) - sources."nopt-6.0.0" - sources."normalize-package-data-5.0.0" + sources."node-gyp-10.0.1" + sources."nopt-7.2.0" + sources."normalize-package-data-6.0.0" sources."normalize-path-3.0.0" sources."npm-bundled-3.0.0" sources."npm-install-checks-6.3.0" sources."npm-normalize-package-bin-3.0.1" - sources."npm-package-arg-10.1.0" - sources."npm-packlist-7.0.4" - sources."npm-pick-manifest-8.0.1" - (sources."npm-registry-fetch-14.0.5" // { + sources."npm-package-arg-11.0.1" + sources."npm-packlist-8.0.0" + sources."npm-pick-manifest-9.0.0" + sources."npm-registry-fetch-16.1.0" + sources."onetime-5.1.2" + sources."open-8.4.2" + (sources."ora-5.4.1" // { dependencies = [ - sources."make-fetch-happen-11.1.1" - (sources."minipass-fetch-3.0.4" // { - dependencies = [ - sources."minipass-7.0.4" - ]; - }) + sources."chalk-4.1.2" + sources."is-unicode-supported-0.1.0" ]; }) - sources."npmlog-6.0.2" - sources."once-1.4.0" - sources."onetime-5.1.2" - sources."open-8.4.2" - sources."ora-5.4.1" sources."os-tmpdir-1.0.2" sources."p-map-4.0.0" - sources."pacote-15.2.0" - sources."path-is-absolute-1.0.1" + sources."pacote-17.0.4" sources."path-key-3.1.1" sources."path-parse-1.0.7" - (sources."path-scurry-1.10.1" // { - dependencies = [ - sources."lru-cache-10.0.1" - ]; - }) - sources."picomatch-2.3.1" + sources."path-scurry-1.10.1" + sources."picomatch-3.0.1" sources."proc-log-3.0.0" sources."promise-inflight-1.0.1" sources."promise-retry-2.0.1" sources."punycode-2.3.1" - (sources."read-package-json-6.0.4" // { + sources."read-package-json-7.0.0" + sources."read-package-json-fast-3.0.2" + sources."readable-stream-3.6.2" + (sources."readdirp-3.6.0" // { dependencies = [ - sources."brace-expansion-2.0.1" - sources."glob-10.3.10" - sources."minimatch-9.0.3" + sources."picomatch-2.3.1" ]; }) - sources."read-package-json-fast-3.0.2" - sources."readable-stream-3.6.2" - sources."readdirp-3.6.0" sources."require-directory-2.1.1" sources."require-from-string-2.0.2" - sources."resolve-1.22.2" + sources."resolve-1.22.8" sources."restore-cursor-3.1.0" sources."retry-0.12.0" - sources."rimraf-3.0.2" - sources."run-async-2.4.1" + sources."run-async-3.0.0" sources."rxjs-7.8.1" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" @@ -62085,30 +61121,20 @@ in sources."lru-cache-6.0.0" ]; }) - sources."set-blocking-2.0.0" + sources."set-function-length-1.1.1" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."signal-exit-3.0.7" - (sources."sigstore-1.9.0" // { - dependencies = [ - sources."make-fetch-happen-11.1.1" - sources."minipass-7.0.4" - sources."minipass-fetch-3.0.4" - ]; - }) + sources."sigstore-2.1.0" sources."smart-buffer-4.2.0" sources."socks-2.7.1" - sources."socks-proxy-agent-7.0.0" + sources."socks-proxy-agent-8.0.2" sources."source-map-0.7.4" sources."spdx-correct-3.2.0" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" sources."spdx-license-ids-3.0.16" - (sources."ssri-10.0.5" // { - dependencies = [ - sources."minipass-7.0.4" - ]; - }) + sources."ssri-10.0.5" sources."string-width-4.2.3" sources."string-width-cjs-4.2.3" sources."string_decoder-1.3.0" @@ -62124,32 +61150,24 @@ in sources."minipass-3.3.6" ]; }) + sources."minipass-5.0.0" ]; }) - sources."through-2.3.8" sources."tmp-0.0.33" sources."to-regex-range-5.0.1" sources."tslib-2.6.2" - (sources."tuf-js-1.1.7" // { - dependencies = [ - sources."make-fetch-happen-11.1.1" - sources."minipass-7.0.4" - sources."minipass-fetch-3.0.4" - ]; - }) + sources."tuf-js-2.1.0" sources."type-fest-0.21.3" - sources."unique-filename-2.0.1" - sources."unique-slug-3.0.0" + sources."unique-filename-3.0.0" + sources."unique-slug-4.0.0" sources."uri-js-4.4.1" sources."util-deprecate-1.0.2" sources."validate-npm-package-license-3.0.4" sources."validate-npm-package-name-5.0.0" sources."wcwidth-1.0.1" - sources."which-3.0.1" - sources."wide-align-1.1.5" - sources."wrap-ansi-7.0.0" + sources."which-4.0.0" + sources."wrap-ansi-6.2.0" sources."wrap-ansi-cjs-7.0.0" - sources."wrappy-1.0.2" sources."y18n-5.0.8" sources."yallist-4.0.0" sources."yargs-17.7.2" @@ -62186,13 +61204,13 @@ in "@astrojs/language-server" = nodeEnv.buildNodePackage { name = "_at_astrojs_slash_language-server"; packageName = "@astrojs/language-server"; - version = "2.5.1"; + version = "2.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/@astrojs/language-server/-/language-server-2.5.1.tgz"; - sha512 = "CBSGC3lsGnauVloVWq7+8N8F+IRsyiVe/3WevYf0TmmO8aPhmSzbAAF3vhYWfja3/HLtwNJsm6ltfRkMyYOyaQ=="; + url = "https://registry.npmjs.org/@astrojs/language-server/-/language-server-2.5.2.tgz"; + sha512 = "O5SMzoQ65wSxA1KygreI9UJYmHpgt15bSYBxceHwqX7OCDM4Ek8mr6mZn45LGDtwM3dp1uup7kp8exfRPwIFbA=="; }; dependencies = [ - sources."@astrojs/compiler-2.2.1" + sources."@astrojs/compiler-2.3.0" sources."@emmetio/abbreviation-2.3.3" sources."@emmetio/css-abbreviation-2.1.8" sources."@emmetio/scanner-1.0.4" @@ -62214,7 +61232,7 @@ in sources."@vscode/l10n-0.0.16" sources."braces-3.0.2" sources."emmet-2.4.6" - sources."fast-glob-3.3.1" + sources."fast-glob-3.3.2" sources."fastq-1.15.0" sources."fill-range-7.0.1" sources."glob-parent-5.1.2" @@ -62246,12 +61264,12 @@ in sources."typesafe-path-0.2.2" sources."typescript-5.2.2" sources."typescript-auto-import-cache-0.3.0" - sources."volar-service-css-0.0.14" - sources."volar-service-emmet-0.0.14" - sources."volar-service-html-0.0.14" - sources."volar-service-prettier-0.0.14" - sources."volar-service-typescript-0.0.14" - sources."volar-service-typescript-twoslash-queries-0.0.14" + sources."volar-service-css-0.0.16" + sources."volar-service-emmet-0.0.16" + sources."volar-service-html-0.0.16" + sources."volar-service-prettier-0.0.16" + sources."volar-service-typescript-0.0.16" + sources."volar-service-typescript-twoslash-queries-0.0.16" sources."vscode-css-languageservice-6.2.10" sources."vscode-html-languageservice-5.1.1" sources."vscode-jsonrpc-8.2.0" @@ -62284,13 +61302,13 @@ in dependencies = [ sources."@ampproject/remapping-2.2.1" sources."@babel/code-frame-7.22.13" - sources."@babel/compat-data-7.23.2" - (sources."@babel/core-7.23.2" // { + sources."@babel/compat-data-7.23.3" + (sources."@babel/core-7.23.3" // { dependencies = [ sources."semver-6.3.1" ]; }) - sources."@babel/generator-7.23.0" + sources."@babel/generator-7.23.3" (sources."@babel/helper-compilation-targets-7.22.15" // { dependencies = [ sources."semver-6.3.1" @@ -62300,7 +61318,7 @@ in sources."@babel/helper-function-name-7.23.0" sources."@babel/helper-hoist-variables-7.22.5" sources."@babel/helper-module-imports-7.22.15" - sources."@babel/helper-module-transforms-7.23.0" + sources."@babel/helper-module-transforms-7.23.3" 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" @@ -62308,10 +61326,10 @@ in sources."@babel/helper-validator-option-7.22.15" sources."@babel/helpers-7.23.2" sources."@babel/highlight-7.22.20" - sources."@babel/parser-7.23.0" + sources."@babel/parser-7.23.3" sources."@babel/template-7.22.15" - sources."@babel/traverse-7.23.2" - sources."@babel/types-7.23.0" + sources."@babel/traverse-7.23.3" + sources."@babel/types-7.23.3" sources."@jridgewell/gen-mapping-0.3.3" sources."@jridgewell/resolve-uri-3.1.1" sources."@jridgewell/set-array-1.1.2" @@ -62321,7 +61339,7 @@ in sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" sources."browserslist-4.22.1" - sources."caniuse-lite-1.0.30001559" + sources."caniuse-lite-1.0.30001561" sources."chalk-2.4.2" sources."color-convert-1.9.3" sources."color-name-1.1.3" @@ -62329,7 +61347,7 @@ in sources."concat-map-0.0.1" sources."convert-source-map-2.0.0" sources."debug-4.3.4" - sources."electron-to-chromium-1.4.574" + sources."electron-to-chromium-1.4.579" sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" sources."fs-readdir-recursive-1.1.0" @@ -62415,9 +61433,9 @@ in sources."@commitlint/to-lines-18.1.0" sources."@commitlint/top-level-18.1.0" sources."@commitlint/types-18.1.0" - sources."@types/minimist-1.2.4" - sources."@types/node-18.18.8" - sources."@types/normalize-package-data-2.4.3" + sources."@types/minimist-1.2.5" + sources."@types/node-18.18.9" + sources."@types/normalize-package-data-2.4.4" sources."JSONStream-1.3.5" sources."ajv-8.12.0" sources."ansi-regex-5.0.1" @@ -62713,7 +61731,7 @@ in ]; }) sources."@babel/code-frame-7.22.13" - sources."@babel/generator-7.23.0" + sources."@babel/generator-7.23.3" sources."@babel/helper-environment-visitor-7.22.20" sources."@babel/helper-function-name-7.23.0" sources."@babel/helper-hoist-variables-7.22.5" @@ -62721,10 +61739,10 @@ in sources."@babel/helper-string-parser-7.22.5" sources."@babel/helper-validator-identifier-7.22.20" sources."@babel/highlight-7.22.20" - sources."@babel/parser-7.23.0" + sources."@babel/parser-7.23.3" sources."@babel/template-7.22.15" - sources."@babel/traverse-7.23.2" - sources."@babel/types-7.23.0" + sources."@babel/traverse-7.23.3" + sources."@babel/types-7.23.3" sources."@devexpress/error-stack-parser-2.0.6" sources."@jridgewell/gen-mapping-0.3.3" sources."@jridgewell/resolve-uri-3.1.1" @@ -62735,7 +61753,7 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@opentelemetry/api-1.6.0" + sources."@opentelemetry/api-1.7.0" sources."@pnpm/crypto.base32-hash-2.0.0" sources."@pnpm/dependency-path-2.1.5" sources."@pnpm/error-1.4.0" @@ -62796,20 +61814,20 @@ in sources."@szmarczak/http-timer-1.1.2" sources."@tootallnate/once-2.0.0" sources."@types/argparse-1.0.38" - sources."@types/lodash-4.14.200" + sources."@types/lodash-4.14.201" sources."@types/minimatch-3.0.5" - sources."@types/minimist-1.2.4" - sources."@types/node-20.8.10" + sources."@types/minimist-1.2.5" + sources."@types/node-20.9.0" sources."@types/node-fetch-2.6.2" - sources."@types/normalize-package-data-2.4.3" - sources."@types/parse-json-4.0.1" + sources."@types/normalize-package-data-2.4.4" + sources."@types/parse-json-4.0.2" sources."@types/tunnel-0.0.3" - sources."@vue/compiler-core-3.3.7" - sources."@vue/compiler-dom-3.3.7" - sources."@vue/compiler-sfc-3.3.7" - sources."@vue/compiler-ssr-3.3.7" - sources."@vue/reactivity-transform-3.3.7" - sources."@vue/shared-3.3.7" + sources."@vue/compiler-core-3.3.8" + sources."@vue/compiler-dom-3.3.8" + sources."@vue/compiler-sfc-3.3.8" + sources."@vue/compiler-ssr-3.3.8" + sources."@vue/reactivity-transform-3.3.8" + sources."@vue/shared-3.3.8" sources."@yarnpkg/lockfile-1.0.2" sources."@zkochan/cmd-shim-5.4.1" sources."agent-base-6.0.2" @@ -62952,7 +61970,7 @@ in sources."expand-tilde-2.0.2" sources."external-editor-3.1.0" sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.3.1" + sources."fast-glob-3.3.2" sources."fastq-1.15.0" sources."figures-3.0.0" sources."fill-range-7.0.1" @@ -63169,7 +62187,7 @@ in sources."multimatch-5.0.0" sources."mute-stream-0.0.8" sources."mz-2.7.0" - sources."nanoid-3.3.6" + sources."nanoid-3.3.7" sources."node-emoji-1.11.0" sources."node-fetch-2.6.7" sources."normalize-package-data-3.0.3" @@ -63455,10 +62473,10 @@ in "@shopify/cli" = nodeEnv.buildNodePackage { name = "_at_shopify_slash_cli"; packageName = "@shopify/cli"; - version = "3.50.1"; + version = "3.50.2"; src = fetchurl { - url = "https://registry.npmjs.org/@shopify/cli/-/cli-3.50.1.tgz"; - sha512 = "B7r0I4Ft5Tg814hKnIabQVZ4hXKK+PcpaYlLu1IEfCCueaL4r43IBnVeOzLOqIa3REfxS3RTglxSYOPl1vawQg=="; + url = "https://registry.npmjs.org/@shopify/cli/-/cli-3.50.2.tgz"; + sha512 = "7Lzgcpk/Ic/mKb4cvXy9CLlU3/VPs0ZLD/8rviL+yV35th/rsYeoeEpTO2xzzYTkhdcQMJM0+TzsggS3sQLKeQ=="; }; dependencies = [ (sources."@alcalzone/ansi-tokenize-0.1.3" // { @@ -63546,12 +62564,13 @@ in ]; }) sources."@pnpm/npm-conf-2.2.2" - (sources."@shopify/cli-kit-3.50.1" // { + (sources."@shopify/cli-kit-3.50.2" // { dependencies = [ sources."ansi-escapes-6.2.0" sources."ansi-regex-6.0.1" sources."argparse-2.0.1" sources."chalk-5.3.0" + sources."fast-glob-3.3.1" sources."fs-extra-11.1.0" sources."js-yaml-4.1.0" sources."strip-ansi-7.1.0" @@ -63560,27 +62579,27 @@ in sources."type-fest-3.13.1" ]; }) - sources."@shopify/plugin-did-you-mean-3.50.1" + sources."@shopify/plugin-did-you-mean-3.50.2" sources."@sindresorhus/is-5.6.0" - sources."@swc/core-1.3.95" + sources."@swc/core-1.3.96" sources."@swc/counter-0.1.2" sources."@swc/helpers-0.5.3" sources."@swc/types-0.1.5" - sources."@swc/wasm-1.3.95" + sources."@swc/wasm-1.3.97" sources."@szmarczak/http-timer-5.0.1" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.4" sources."@types/archiver-5.3.2" - sources."@types/cli-progress-3.11.4" - sources."@types/http-cache-semantics-4.0.3" - sources."@types/node-20.8.10" - sources."@types/prop-types-15.7.9" - sources."@types/react-18.2.34" - sources."@types/readdir-glob-1.1.3" - sources."@types/scheduler-0.16.5" - sources."@types/tinycolor2-1.4.5" + sources."@types/cli-progress-3.11.5" + sources."@types/http-cache-semantics-4.0.4" + sources."@types/node-20.9.0" + sources."@types/prop-types-15.7.10" + sources."@types/react-18.2.37" + sources."@types/readdir-glob-1.1.4" + sources."@types/scheduler-0.16.6" + sources."@types/tinycolor2-1.4.6" sources."abort-controller-3.0.0" sources."acorn-8.11.2" sources."acorn-walk-8.3.0" @@ -63607,7 +62626,7 @@ in sources."array-union-2.1.0" sources."as-table-1.0.55" sources."astral-regex-2.0.0" - sources."async-3.2.4" + sources."async-3.2.5" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" sources."atomically-2.0.2" @@ -63725,7 +62744,7 @@ in }) sources."extract-files-9.0.0" sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.3.1" + sources."fast-glob-3.3.2" sources."fastq-1.15.0" sources."fetch-blob-3.2.0" (sources."figures-5.0.0" // { @@ -63906,7 +62925,7 @@ in sources."node-gyp-build-4.6.1" sources."normalize-path-3.0.0" sources."normalize-url-8.0.0" - sources."npm-9.9.0" + sources."npm-9.9.1" sources."npm-run-path-4.0.1" sources."object-treeify-1.1.33" sources."once-1.4.0" @@ -64120,16 +63139,16 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@swc/core-1.3.95" + sources."@swc/core-1.3.96" sources."@swc/counter-0.1.2" sources."@swc/helpers-0.5.3" sources."@swc/types-0.1.5" - sources."@swc/wasm-1.3.95" + sources."@swc/wasm-1.3.97" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.4" - sources."@types/node-20.8.10" + sources."@types/node-20.9.0" sources."acorn-8.11.2" sources."acorn-walk-8.3.0" sources."any-promise-1.3.0" @@ -64152,7 +63171,7 @@ in sources."didyoumean-1.2.2" sources."diff-4.0.2" sources."dlv-1.1.3" - (sources."fast-glob-3.3.1" // { + (sources."fast-glob-3.3.2" // { dependencies = [ sources."glob-parent-5.1.2" ]; @@ -64180,7 +63199,7 @@ in sources."micromatch-4.0.5" sources."minimatch-3.1.2" sources."mz-2.7.0" - sources."nanoid-3.3.6" + sources."nanoid-3.3.7" sources."normalize-path-3.0.0" sources."object-assign-4.1.1" sources."object-hash-3.0.0" @@ -64223,7 +63242,7 @@ in sources."util-deprecate-1.0.2" sources."v8-compile-cache-lib-3.0.1" sources."wrappy-1.0.2" - sources."yaml-2.3.3" + sources."yaml-2.3.4" sources."yn-3.1.1" ]; buildInputs = globalBuildInputs; @@ -64255,16 +63274,16 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@swc/core-1.3.95" + sources."@swc/core-1.3.96" sources."@swc/counter-0.1.2" sources."@swc/helpers-0.5.3" sources."@swc/types-0.1.5" - sources."@swc/wasm-1.3.95" + sources."@swc/wasm-1.3.97" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.4" - sources."@types/node-20.8.10" + sources."@types/node-20.9.0" sources."acorn-8.11.2" sources."acorn-walk-8.3.0" sources."any-promise-1.3.0" @@ -64287,7 +63306,7 @@ in sources."didyoumean-1.2.2" sources."diff-4.0.2" sources."dlv-1.1.3" - (sources."fast-glob-3.3.1" // { + (sources."fast-glob-3.3.2" // { dependencies = [ sources."glob-parent-5.1.2" ]; @@ -64316,7 +63335,7 @@ in sources."mini-svg-data-uri-1.4.4" sources."minimatch-3.1.2" sources."mz-2.7.0" - sources."nanoid-3.3.6" + sources."nanoid-3.3.7" sources."normalize-path-3.0.0" sources."object-assign-4.1.1" sources."object-hash-3.0.0" @@ -64359,7 +63378,7 @@ in sources."util-deprecate-1.0.2" sources."v8-compile-cache-lib-3.0.1" sources."wrappy-1.0.2" - sources."yaml-2.3.3" + sources."yaml-2.3.4" sources."yn-3.1.1" ]; buildInputs = globalBuildInputs; @@ -64409,16 +63428,16 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@swc/core-1.3.95" + sources."@swc/core-1.3.96" sources."@swc/counter-0.1.2" sources."@swc/helpers-0.5.3" sources."@swc/types-0.1.5" - sources."@swc/wasm-1.3.95" + sources."@swc/wasm-1.3.97" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.4" - sources."@types/node-20.8.10" + sources."@types/node-20.9.0" sources."acorn-8.11.2" sources."acorn-walk-8.3.0" sources."any-promise-1.3.0" @@ -64441,7 +63460,7 @@ in sources."didyoumean-1.2.2" sources."diff-4.0.2" sources."dlv-1.1.3" - (sources."fast-glob-3.3.1" // { + (sources."fast-glob-3.3.2" // { dependencies = [ sources."glob-parent-5.1.2" ]; @@ -64469,7 +63488,7 @@ in sources."micromatch-4.0.5" sources."minimatch-3.1.2" sources."mz-2.7.0" - sources."nanoid-3.3.6" + sources."nanoid-3.3.7" sources."normalize-path-3.0.0" sources."object-assign-4.1.1" sources."object-hash-3.0.0" @@ -64512,7 +63531,7 @@ in sources."util-deprecate-1.0.2" sources."v8-compile-cache-lib-3.0.1" sources."wrappy-1.0.2" - sources."yaml-2.3.3" + sources."yaml-2.3.4" sources."yn-3.1.1" ]; buildInputs = globalBuildInputs; @@ -64544,16 +63563,16 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@swc/core-1.3.95" + sources."@swc/core-1.3.96" sources."@swc/counter-0.1.2" sources."@swc/helpers-0.5.3" sources."@swc/types-0.1.5" - sources."@swc/wasm-1.3.95" + sources."@swc/wasm-1.3.97" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.4" - sources."@types/node-20.8.10" + sources."@types/node-20.9.0" sources."acorn-8.11.2" sources."acorn-walk-8.3.0" sources."any-promise-1.3.0" @@ -64576,7 +63595,7 @@ in sources."didyoumean-1.2.2" sources."diff-4.0.2" sources."dlv-1.1.3" - (sources."fast-glob-3.3.1" // { + (sources."fast-glob-3.3.2" // { dependencies = [ sources."glob-parent-5.1.2" ]; @@ -64607,7 +63626,7 @@ in sources."micromatch-4.0.5" sources."minimatch-3.1.2" sources."mz-2.7.0" - sources."nanoid-3.3.6" + sources."nanoid-3.3.7" sources."normalize-path-3.0.0" sources."object-assign-4.1.1" sources."object-hash-3.0.0" @@ -64658,7 +63677,7 @@ in sources."util-deprecate-1.0.2" sources."v8-compile-cache-lib-3.0.1" sources."wrappy-1.0.2" - sources."yaml-2.3.3" + sources."yaml-2.3.4" sources."yn-3.1.1" ]; buildInputs = globalBuildInputs; @@ -64674,10 +63693,10 @@ in "@uppy/companion" = nodeEnv.buildNodePackage { name = "_at_uppy_slash_companion"; packageName = "@uppy/companion"; - version = "4.10.1"; + version = "4.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@uppy/companion/-/companion-4.10.1.tgz"; - sha512 = "Z/Qw8aXr4G5DsMDoGRFIXUv2tR5I1Us45xuH3f4bSxpoxff7b4xeQ7LEoY6ebL2fjM7ELwLjF/9TEYTvyGmV6w=="; + url = "https://registry.npmjs.org/@uppy/companion/-/companion-4.11.0.tgz"; + sha512 = "TycDEH1WPvMj5oEz76eq+iioCzamb5ml1KmfR9KLHsoAucTbj6NGiWNjCCKdduxefbeKP0PQtvVZUnjZnIPafg=="; }; dependencies = [ (sources."@aws-crypto/crc32-3.0.0" // { @@ -64720,17 +63739,17 @@ in sources."tslib-1.14.1" ]; }) - sources."@aws-sdk/client-s3-3.441.0" - sources."@aws-sdk/client-sso-3.441.0" - sources."@aws-sdk/client-sts-3.441.0" - sources."@aws-sdk/core-3.441.0" + sources."@aws-sdk/client-s3-3.445.0" + sources."@aws-sdk/client-sso-3.445.0" + sources."@aws-sdk/client-sts-3.445.0" + sources."@aws-sdk/core-3.445.0" sources."@aws-sdk/credential-provider-env-3.433.0" - sources."@aws-sdk/credential-provider-ini-3.441.0" - sources."@aws-sdk/credential-provider-node-3.441.0" + sources."@aws-sdk/credential-provider-ini-3.445.0" + sources."@aws-sdk/credential-provider-node-3.445.0" sources."@aws-sdk/credential-provider-process-3.433.0" - sources."@aws-sdk/credential-provider-sso-3.441.0" + sources."@aws-sdk/credential-provider-sso-3.445.0" sources."@aws-sdk/credential-provider-web-identity-3.433.0" - (sources."@aws-sdk/lib-storage-3.441.0" // { + (sources."@aws-sdk/lib-storage-3.445.0" // { dependencies = [ sources."buffer-5.6.0" ]; @@ -64748,8 +63767,8 @@ in sources."@aws-sdk/middleware-ssec-3.433.0" sources."@aws-sdk/middleware-user-agent-3.438.0" sources."@aws-sdk/region-config-resolver-3.433.0" - sources."@aws-sdk/s3-presigned-post-3.441.0" - sources."@aws-sdk/s3-request-presigner-3.441.0" + sources."@aws-sdk/s3-presigned-post-3.445.0" + sources."@aws-sdk/s3-request-presigner-3.445.0" sources."@aws-sdk/signature-v4-multi-region-3.437.0" sources."@aws-sdk/token-providers-3.438.0" sources."@aws-sdk/types-3.433.0" @@ -64820,19 +63839,23 @@ in sources."@smithy/util-waiter-2.0.12" sources."@szmarczak/http-timer-4.0.6" sources."@types/cacheable-request-6.0.3" - sources."@types/http-cache-semantics-4.0.3" + sources."@types/http-cache-semantics-4.0.4" sources."@types/keyv-3.1.4" - sources."@types/node-20.8.10" - sources."@types/responselike-1.0.2" - sources."@types/ws-8.5.8" + sources."@types/node-20.9.0" + sources."@types/responselike-1.0.3" + sources."@types/ws-8.5.9" sources."accepts-1.3.8" sources."ansi-styles-4.3.0" sources."array-flatten-1.1.1" sources."asn1.js-5.4.1" sources."asynckit-0.4.0" sources."atob-2.1.2" - sources."aws-crt-1.18.3" - sources."axios-0.24.0" + sources."aws-crt-1.19.0" + (sources."axios-1.6.1" // { + dependencies = [ + sources."form-data-4.0.0" + ]; + }) sources."balanced-match-1.0.2" sources."base64-js-1.5.1" (sources."basic-auth-2.0.1" // { @@ -65075,6 +64098,7 @@ in sources."ipaddr.js-1.9.1" ]; }) + sources."proxy-from-env-1.1.0" sources."pump-3.0.0" sources."qs-6.10.3" sources."querystringify-2.2.0" @@ -65177,7 +64201,7 @@ in sha512 = "+/kSxBAkZbeVBePoG2qRSvCkVIslk1dNlU5wQHAcbzOFTi7pEQR6C+kjoj94I+vGXVGMFfDwOYm07sPsd8dM6w=="; }; dependencies = [ - sources."@babel/parser-7.23.0" + sources."@babel/parser-7.23.3" sources."@emmetio/abbreviation-2.3.3" sources."@emmetio/css-abbreviation-2.1.8" sources."@emmetio/scanner-1.0.4" @@ -65204,13 +64228,13 @@ in ]; }) sources."@vscode/l10n-0.0.11" - sources."@vue/compiler-core-3.3.7" - sources."@vue/compiler-dom-3.3.7" - sources."@vue/compiler-sfc-3.3.7" - sources."@vue/compiler-ssr-3.3.7" - sources."@vue/reactivity-3.3.7" - sources."@vue/reactivity-transform-3.3.7" - sources."@vue/shared-3.3.7" + sources."@vue/compiler-core-3.3.8" + sources."@vue/compiler-dom-3.3.8" + sources."@vue/compiler-sfc-3.3.8" + sources."@vue/compiler-ssr-3.3.8" + sources."@vue/reactivity-3.3.8" + sources."@vue/reactivity-transform-3.3.8" + sources."@vue/shared-3.3.8" sources."acorn-7.4.1" sources."balanced-match-1.0.2" sources."brace-expansion-2.0.1" @@ -65236,7 +64260,7 @@ in sources."magic-string-0.30.5" sources."minimatch-9.0.3" sources."muggle-string-0.2.2" - sources."nanoid-3.3.6" + sources."nanoid-3.3.7" sources."object-assign-4.1.1" sources."picocolors-1.0.0" sources."postcss-8.4.31" @@ -65334,13 +64358,13 @@ in sources."supports-color-5.5.0" ]; }) - sources."@babel/compat-data-7.23.2" - (sources."@babel/core-7.23.2" // { + sources."@babel/compat-data-7.23.3" + (sources."@babel/core-7.23.3" // { dependencies = [ sources."semver-6.3.1" ]; }) - sources."@babel/generator-7.23.0" + sources."@babel/generator-7.23.3" sources."@babel/helper-annotate-as-pure-7.22.5" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.22.15" (sources."@babel/helper-compilation-targets-7.22.15" // { @@ -65366,7 +64390,7 @@ in sources."@babel/helper-hoist-variables-7.22.5" sources."@babel/helper-member-expression-to-functions-7.23.0" sources."@babel/helper-module-imports-7.22.15" - sources."@babel/helper-module-transforms-7.23.0" + sources."@babel/helper-module-transforms-7.23.3" 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.20" @@ -65389,9 +64413,10 @@ in sources."supports-color-5.5.0" ]; }) - sources."@babel/parser-7.23.0" - sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.22.15" - sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.22.15" + sources."@babel/parser-7.23.3" + sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.23.3" + sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.23.3" + sources."@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.23.3" sources."@babel/plugin-proposal-class-properties-7.18.6" sources."@babel/plugin-proposal-nullish-coalescing-operator-7.18.6" sources."@babel/plugin-proposal-optional-chaining-7.21.0" @@ -65401,12 +64426,12 @@ in sources."@babel/plugin-syntax-class-static-block-7.14.5" sources."@babel/plugin-syntax-dynamic-import-7.8.3" sources."@babel/plugin-syntax-export-namespace-from-7.8.3" - sources."@babel/plugin-syntax-flow-7.22.5" - sources."@babel/plugin-syntax-import-assertions-7.22.5" - sources."@babel/plugin-syntax-import-attributes-7.22.5" + sources."@babel/plugin-syntax-flow-7.23.3" + sources."@babel/plugin-syntax-import-assertions-7.23.3" + sources."@babel/plugin-syntax-import-attributes-7.23.3" 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-jsx-7.23.3" 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" @@ -65415,66 +64440,66 @@ in 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-typescript-7.22.5" + sources."@babel/plugin-syntax-typescript-7.23.3" 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.23.2" - 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.23.0" - sources."@babel/plugin-transform-class-properties-7.22.5" - sources."@babel/plugin-transform-class-static-block-7.22.11" - sources."@babel/plugin-transform-classes-7.22.15" - sources."@babel/plugin-transform-computed-properties-7.22.5" - sources."@babel/plugin-transform-destructuring-7.23.0" - 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.11" - sources."@babel/plugin-transform-exponentiation-operator-7.22.5" - sources."@babel/plugin-transform-export-namespace-from-7.22.11" - sources."@babel/plugin-transform-flow-strip-types-7.22.5" - sources."@babel/plugin-transform-for-of-7.22.15" - sources."@babel/plugin-transform-function-name-7.22.5" - sources."@babel/plugin-transform-json-strings-7.22.11" - sources."@babel/plugin-transform-literals-7.22.5" - sources."@babel/plugin-transform-logical-assignment-operators-7.22.11" - sources."@babel/plugin-transform-member-expression-literals-7.22.5" - sources."@babel/plugin-transform-modules-amd-7.23.0" - sources."@babel/plugin-transform-modules-commonjs-7.23.0" - sources."@babel/plugin-transform-modules-systemjs-7.23.0" - sources."@babel/plugin-transform-modules-umd-7.22.5" + sources."@babel/plugin-transform-arrow-functions-7.23.3" + sources."@babel/plugin-transform-async-generator-functions-7.23.3" + sources."@babel/plugin-transform-async-to-generator-7.23.3" + sources."@babel/plugin-transform-block-scoped-functions-7.23.3" + sources."@babel/plugin-transform-block-scoping-7.23.3" + sources."@babel/plugin-transform-class-properties-7.23.3" + sources."@babel/plugin-transform-class-static-block-7.23.3" + sources."@babel/plugin-transform-classes-7.23.3" + sources."@babel/plugin-transform-computed-properties-7.23.3" + sources."@babel/plugin-transform-destructuring-7.23.3" + sources."@babel/plugin-transform-dotall-regex-7.23.3" + sources."@babel/plugin-transform-duplicate-keys-7.23.3" + sources."@babel/plugin-transform-dynamic-import-7.23.3" + sources."@babel/plugin-transform-exponentiation-operator-7.23.3" + sources."@babel/plugin-transform-export-namespace-from-7.23.3" + sources."@babel/plugin-transform-flow-strip-types-7.23.3" + sources."@babel/plugin-transform-for-of-7.23.3" + sources."@babel/plugin-transform-function-name-7.23.3" + sources."@babel/plugin-transform-json-strings-7.23.3" + sources."@babel/plugin-transform-literals-7.23.3" + sources."@babel/plugin-transform-logical-assignment-operators-7.23.3" + sources."@babel/plugin-transform-member-expression-literals-7.23.3" + sources."@babel/plugin-transform-modules-amd-7.23.3" + sources."@babel/plugin-transform-modules-commonjs-7.23.3" + sources."@babel/plugin-transform-modules-systemjs-7.23.3" + sources."@babel/plugin-transform-modules-umd-7.23.3" 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.11" - sources."@babel/plugin-transform-numeric-separator-7.22.11" - sources."@babel/plugin-transform-object-rest-spread-7.22.15" - sources."@babel/plugin-transform-object-super-7.22.5" - sources."@babel/plugin-transform-optional-catch-binding-7.22.11" - sources."@babel/plugin-transform-optional-chaining-7.23.0" - sources."@babel/plugin-transform-parameters-7.22.15" - sources."@babel/plugin-transform-private-methods-7.22.5" - sources."@babel/plugin-transform-private-property-in-object-7.22.11" - sources."@babel/plugin-transform-property-literals-7.22.5" - sources."@babel/plugin-transform-regenerator-7.22.10" - sources."@babel/plugin-transform-reserved-words-7.22.5" - 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-typescript-7.22.15" - 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.23.2" // { + sources."@babel/plugin-transform-new-target-7.23.3" + sources."@babel/plugin-transform-nullish-coalescing-operator-7.23.3" + sources."@babel/plugin-transform-numeric-separator-7.23.3" + sources."@babel/plugin-transform-object-rest-spread-7.23.3" + sources."@babel/plugin-transform-object-super-7.23.3" + sources."@babel/plugin-transform-optional-catch-binding-7.23.3" + sources."@babel/plugin-transform-optional-chaining-7.23.3" + sources."@babel/plugin-transform-parameters-7.23.3" + sources."@babel/plugin-transform-private-methods-7.23.3" + sources."@babel/plugin-transform-private-property-in-object-7.23.3" + sources."@babel/plugin-transform-property-literals-7.23.3" + sources."@babel/plugin-transform-regenerator-7.23.3" + sources."@babel/plugin-transform-reserved-words-7.23.3" + sources."@babel/plugin-transform-shorthand-properties-7.23.3" + sources."@babel/plugin-transform-spread-7.23.3" + sources."@babel/plugin-transform-sticky-regex-7.23.3" + sources."@babel/plugin-transform-template-literals-7.23.3" + sources."@babel/plugin-transform-typeof-symbol-7.23.3" + sources."@babel/plugin-transform-typescript-7.23.3" + sources."@babel/plugin-transform-unicode-escapes-7.23.3" + sources."@babel/plugin-transform-unicode-property-regex-7.23.3" + sources."@babel/plugin-transform-unicode-regex-7.23.3" + sources."@babel/plugin-transform-unicode-sets-regex-7.23.3" + (sources."@babel/preset-env-7.23.3" // { dependencies = [ sources."semver-6.3.1" ]; }) - sources."@babel/preset-flow-7.22.15" + sources."@babel/preset-flow-7.23.3" sources."@babel/preset-modules-0.1.6-no-external-plugins" - sources."@babel/preset-typescript-7.23.2" + sources."@babel/preset-typescript-7.23.3" (sources."@babel/register-7.22.15" // { dependencies = [ sources."make-dir-2.1.0" @@ -65485,8 +64510,8 @@ in sources."@babel/regjsgen-0.8.0" sources."@babel/runtime-7.23.2" sources."@babel/template-7.22.15" - sources."@babel/traverse-7.23.2" - sources."@babel/types-7.23.0" + sources."@babel/traverse-7.23.3" + sources."@babel/types-7.23.3" sources."@graphql-tools/merge-8.3.1" (sources."@graphql-tools/mock-8.7.20" // { dependencies = [ @@ -65525,15 +64550,15 @@ in sources."@sideway/formula-3.0.1" sources."@sideway/pinpoint-2.0.0" sources."@sindresorhus/is-0.7.0" - sources."@types/accepts-1.3.6" + sources."@types/accepts-1.3.7" sources."@types/body-parser-1.19.2" - sources."@types/connect-3.4.37" + sources."@types/connect-3.4.38" sources."@types/cors-2.8.12" - sources."@types/ejs-3.1.4" + sources."@types/ejs-3.1.5" sources."@types/express-4.17.14" sources."@types/express-serve-static-core-4.17.31" - sources."@types/http-errors-2.0.3" - sources."@types/inquirer-8.2.9" + sources."@types/http-errors-2.0.4" + sources."@types/inquirer-8.2.10" (sources."@types/jscodeshift-0.7.2" // { dependencies = [ sources."ast-types-0.12.1" @@ -65541,13 +64566,13 @@ in ]; }) sources."@types/long-4.0.2" - sources."@types/mime-3.0.3" - sources."@types/node-20.8.10" - sources."@types/normalize-package-data-2.4.3" - sources."@types/qs-6.9.9" - sources."@types/range-parser-1.2.6" - sources."@types/serve-static-1.15.4" - sources."@types/through-0.0.32" + sources."@types/mime-3.0.4" + sources."@types/node-20.9.0" + sources."@types/normalize-package-data-2.4.4" + sources."@types/qs-6.9.10" + sources."@types/range-parser-1.2.7" + sources."@types/serve-static-1.15.5" + sources."@types/through-0.0.33" sources."@vue/cli-shared-utils-5.0.8" (sources."@vue/cli-ui-5.0.8" // { dependencies = [ @@ -65556,10 +64581,10 @@ in }) sources."@vue/cli-ui-addon-webpack-5.0.8" sources."@vue/cli-ui-addon-widgets-5.0.8" - sources."@vue/compiler-core-3.3.7" - sources."@vue/compiler-dom-3.3.7" + sources."@vue/compiler-core-3.3.8" + sources."@vue/compiler-dom-3.3.8" sources."@vue/compiler-sfc-2.7.15" - sources."@vue/shared-3.3.7" + sources."@vue/shared-3.3.8" sources."accepts-1.3.8" sources."aggregate-error-3.1.0" sources."ansi-align-3.0.1" @@ -65651,7 +64676,7 @@ in }) sources."call-bind-1.0.5" sources."camelcase-6.3.0" - sources."caniuse-lite-1.0.30001559" + sources."caniuse-lite-1.0.30001561" sources."caw-2.0.1" sources."chalk-4.1.2" sources."chardet-0.7.0" @@ -65751,7 +64776,7 @@ in sources."easy-stack-1.0.1" sources."ee-first-1.1.1" sources."ejs-3.1.9" - sources."electron-to-chromium-1.4.574" + sources."electron-to-chromium-1.4.579" sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" sources."encoding-0.1.13" @@ -65804,7 +64829,7 @@ in sources."extend-shallow-2.0.1" ]; }) - sources."fast-glob-3.3.1" + sources."fast-glob-3.3.2" sources."fast-json-stable-stringify-2.1.0" sources."fastq-1.15.0" sources."fd-slicer-1.1.0" @@ -65851,7 +64876,7 @@ in sources."which-2.0.2" ]; }) - sources."flow-parser-0.220.0" + sources."flow-parser-0.220.1" sources."for-in-1.0.2" sources."forwarded-0.2.0" sources."fragment-cache-0.2.1" @@ -65966,7 +64991,7 @@ in sources."iterall-1.3.0" (sources."jake-10.8.7" // { dependencies = [ - sources."async-3.2.4" + sources."async-3.2.5" ]; }) sources."javascript-stringify-2.1.0" @@ -66135,7 +65160,7 @@ in sources."posix-character-classes-0.1.1" (sources."postcss-8.4.31" // { dependencies = [ - sources."nanoid-3.3.6" + sources."nanoid-3.3.7" ]; }) sources."prepend-http-2.0.0" @@ -66534,13 +65559,13 @@ in }; dependencies = [ sources."@babel/code-frame-7.22.13" - sources."@babel/generator-7.23.0" + sources."@babel/generator-7.23.3" sources."@babel/helper-string-parser-7.22.5" sources."@babel/helper-validator-identifier-7.22.20" sources."@babel/highlight-7.22.20" - sources."@babel/parser-7.23.0" + sources."@babel/parser-7.23.3" sources."@babel/template-7.22.15" - sources."@babel/types-7.23.0" + sources."@babel/types-7.23.3" sources."@jridgewell/gen-mapping-0.3.3" sources."@jridgewell/resolve-uri-3.1.1" sources."@jridgewell/set-array-1.1.2" @@ -66640,21 +65665,21 @@ in sources."@sindresorhus/is-5.6.0" sources."@szmarczak/http-timer-5.0.1" sources."@types/acorn-4.0.6" - sources."@types/concat-stream-2.0.1" - sources."@types/debug-4.1.10" - sources."@types/estree-1.0.4" - sources."@types/estree-jsx-1.0.2" - sources."@types/hast-2.3.7" - sources."@types/http-cache-semantics-4.0.3" - sources."@types/is-empty-1.2.2" - sources."@types/mdast-3.0.14" - sources."@types/minimist-1.2.4" - sources."@types/ms-0.7.33" - sources."@types/nlcst-1.0.3" - sources."@types/node-18.18.8" - sources."@types/normalize-package-data-2.4.3" - sources."@types/supports-color-8.1.2" - sources."@types/unist-2.0.9" + sources."@types/concat-stream-2.0.2" + sources."@types/debug-4.1.12" + sources."@types/estree-1.0.5" + sources."@types/estree-jsx-1.0.3" + sources."@types/hast-2.3.8" + sources."@types/http-cache-semantics-4.0.4" + sources."@types/is-empty-1.2.3" + sources."@types/mdast-3.0.15" + sources."@types/minimist-1.2.5" + sources."@types/ms-0.7.34" + sources."@types/nlcst-1.0.4" + sources."@types/node-18.18.9" + sources."@types/normalize-package-data-2.4.4" + sources."@types/supports-color-8.1.3" + sources."@types/unist-2.0.10" sources."abbrev-2.0.0" sources."acorn-8.11.2" sources."acorn-jsx-5.3.2" @@ -67061,7 +66086,7 @@ in (sources."unified-engine-10.1.0" // { dependencies = [ sources."is-plain-obj-4.1.0" - sources."lines-and-columns-2.0.3" + sources."lines-and-columns-2.0.4" sources."parse-json-6.0.2" ]; }) @@ -67133,7 +66158,7 @@ in sources."xdg-basedir-5.1.0" sources."xtend-2.1.2" sources."yallist-4.0.0" - sources."yaml-2.3.3" + sources."yaml-2.3.4" sources."yargs-parser-21.1.1" sources."yocto-queue-1.0.0" sources."zwitch-2.0.4" @@ -67208,11 +66233,11 @@ in }; dependencies = [ sources."browserslist-4.22.1" - sources."caniuse-lite-1.0.30001559" - sources."electron-to-chromium-1.4.574" + sources."caniuse-lite-1.0.30001561" + sources."electron-to-chromium-1.4.579" sources."escalade-3.1.1" sources."fraction.js-4.3.7" - sources."nanoid-3.3.6" + sources."nanoid-3.3.7" sources."node-releases-2.0.13" sources."normalize-range-0.1.2" sources."picocolors-1.0.0" @@ -67272,10 +66297,10 @@ in aws-cdk = nodeEnv.buildNodePackage { name = "aws-cdk"; packageName = "aws-cdk"; - version = "2.103.1"; + version = "2.105.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-cdk/-/aws-cdk-2.103.1.tgz"; - sha512 = "5DXPlMi8Gf/a6fMqwY6uVwuR21PDDNGkAGkMVTTuaiulc4RsMjQUGq8I4xaPIYQRvR+VHFU+JQ5j5PnI5/gBrA=="; + url = "https://registry.npmjs.org/aws-cdk/-/aws-cdk-2.105.0.tgz"; + sha512 = "3ji+HNlCJUJ3o9h430gdRhocmeQrpM49fibXpvj3rvzBwuyWSTe2t8uohMPScSMETv59sHOlZpOdAEd+WwkuHQ=="; }; dependencies = [ sources."fsevents-2.3.2" @@ -67315,21 +66340,21 @@ in sources."@nodelib/fs.walk-1.2.8" sources."@sindresorhus/is-5.6.0" sources."@szmarczak/http-timer-5.0.1" - sources."@types/debug-4.1.10" - sources."@types/eslint-8.44.6" - sources."@types/estree-1.0.4" - sources."@types/estree-jsx-1.0.2" - (sources."@types/hast-2.3.7" // { + sources."@types/debug-4.1.12" + sources."@types/eslint-8.44.7" + sources."@types/estree-1.0.5" + sources."@types/estree-jsx-1.0.3" + (sources."@types/hast-2.3.8" // { dependencies = [ - sources."@types/unist-2.0.9" + sources."@types/unist-2.0.10" ]; }) - sources."@types/http-cache-semantics-4.0.3" - sources."@types/json-schema-7.0.14" - sources."@types/mdast-4.0.2" - sources."@types/ms-0.7.33" - sources."@types/normalize-package-data-2.4.3" - sources."@types/unist-3.0.1" + sources."@types/http-cache-semantics-4.0.4" + sources."@types/json-schema-7.0.15" + sources."@types/mdast-4.0.3" + sources."@types/ms-0.7.34" + sources."@types/normalize-package-data-2.4.4" + sources."@types/unist-3.0.2" (sources."ansi-escapes-4.3.2" // { dependencies = [ sources."type-fest-0.21.3" @@ -67404,7 +66429,7 @@ in sources."eslint-rule-docs-1.1.235" sources."execa-8.0.1" sources."extend-3.0.2" - sources."fast-glob-3.3.1" + sources."fast-glob-3.3.2" sources."fastq-1.15.0" sources."fill-range-7.0.1" sources."form-data-encoder-2.1.4" @@ -67458,7 +66483,7 @@ in sources."keyv-4.5.4" sources."kind-of-6.0.3" sources."kleur-4.1.5" - sources."lines-and-columns-2.0.3" + sources."lines-and-columns-2.0.4" sources."lodash.iteratee-4.7.0" sources."log-symbols-5.1.0" sources."longest-streak-3.1.0" @@ -67466,21 +66491,21 @@ in sources."lru-cache-10.0.1" (sources."mdast-comment-marker-2.1.2" // { dependencies = [ - sources."@types/mdast-3.0.14" - sources."@types/unist-2.0.9" + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" ]; }) sources."mdast-util-from-markdown-2.0.0" (sources."mdast-util-heading-style-2.0.1" // { dependencies = [ - sources."@types/mdast-3.0.14" - sources."@types/unist-2.0.9" + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" ]; }) (sources."mdast-util-mdx-expression-1.3.2" // { dependencies = [ - sources."@types/mdast-3.0.14" - sources."@types/unist-2.0.9" + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" sources."mdast-util-from-markdown-1.3.1" sources."mdast-util-phrasing-3.0.1" sources."mdast-util-to-markdown-1.5.0" @@ -67575,8 +66600,8 @@ in sources."remark-15.0.1" (sources."remark-lint-9.1.2" // { dependencies = [ - sources."@types/mdast-3.0.14" - sources."@types/unist-2.0.9" + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" sources."unified-10.1.2" sources."unist-util-stringify-position-3.0.3" sources."vfile-5.3.7" @@ -67585,8 +66610,8 @@ in }) (sources."remark-lint-blockquote-indentation-3.1.2" // { dependencies = [ - sources."@types/mdast-3.0.14" - sources."@types/unist-2.0.9" + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" sources."unified-10.1.2" sources."unist-util-is-5.2.1" sources."unist-util-stringify-position-3.0.3" @@ -67597,8 +66622,8 @@ in }) (sources."remark-lint-checkbox-character-style-4.1.2" // { dependencies = [ - sources."@types/mdast-3.0.14" - sources."@types/unist-2.0.9" + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" sources."unified-10.1.2" sources."unist-util-is-5.2.1" sources."unist-util-stringify-position-3.0.3" @@ -67609,8 +66634,8 @@ in }) (sources."remark-lint-checkbox-content-indent-4.1.2" // { dependencies = [ - sources."@types/mdast-3.0.14" - sources."@types/unist-2.0.9" + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" sources."unified-10.1.2" sources."unist-util-is-5.2.1" sources."unist-util-stringify-position-3.0.3" @@ -67621,8 +66646,8 @@ in }) (sources."remark-lint-code-block-style-3.1.2" // { dependencies = [ - sources."@types/mdast-3.0.14" - sources."@types/unist-2.0.9" + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" sources."unified-10.1.2" sources."unist-util-is-5.2.1" sources."unist-util-stringify-position-3.0.3" @@ -67633,8 +66658,8 @@ in }) (sources."remark-lint-definition-case-3.1.2" // { dependencies = [ - sources."@types/mdast-3.0.14" - sources."@types/unist-2.0.9" + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" sources."unified-10.1.2" sources."unist-util-is-5.2.1" sources."unist-util-stringify-position-3.0.3" @@ -67645,8 +66670,8 @@ in }) (sources."remark-lint-definition-spacing-3.1.2" // { dependencies = [ - sources."@types/mdast-3.0.14" - sources."@types/unist-2.0.9" + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" sources."unified-10.1.2" sources."unist-util-is-5.2.1" sources."unist-util-stringify-position-3.0.3" @@ -67657,7 +66682,7 @@ in }) (sources."remark-lint-double-link-0.2.0" // { dependencies = [ - sources."@types/unist-2.0.9" + sources."@types/unist-2.0.10" sources."normalize-url-5.3.1" sources."unist-util-is-5.2.1" sources."unist-util-visit-4.1.2" @@ -67665,8 +66690,8 @@ in }) (sources."remark-lint-emphasis-marker-3.1.2" // { dependencies = [ - sources."@types/mdast-3.0.14" - sources."@types/unist-2.0.9" + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" sources."unified-10.1.2" sources."unist-util-is-5.2.1" sources."unist-util-stringify-position-3.0.3" @@ -67677,8 +66702,8 @@ in }) (sources."remark-lint-fenced-code-marker-3.1.2" // { dependencies = [ - sources."@types/mdast-3.0.14" - sources."@types/unist-2.0.9" + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" sources."unified-10.1.2" sources."unist-util-is-5.2.1" sources."unist-util-stringify-position-3.0.3" @@ -67689,8 +66714,8 @@ in }) (sources."remark-lint-file-extension-2.1.2" // { dependencies = [ - sources."@types/mdast-3.0.14" - sources."@types/unist-2.0.9" + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" sources."unified-10.1.2" sources."unist-util-stringify-position-3.0.3" sources."vfile-5.3.7" @@ -67699,8 +66724,8 @@ in }) (sources."remark-lint-final-newline-2.1.2" // { dependencies = [ - sources."@types/mdast-3.0.14" - sources."@types/unist-2.0.9" + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" sources."unified-10.1.2" sources."unist-util-stringify-position-3.0.3" sources."vfile-5.3.7" @@ -67709,8 +66734,8 @@ in }) (sources."remark-lint-hard-break-spaces-3.1.2" // { dependencies = [ - sources."@types/mdast-3.0.14" - sources."@types/unist-2.0.9" + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" sources."unified-10.1.2" sources."unist-util-is-5.2.1" sources."unist-util-stringify-position-3.0.3" @@ -67721,8 +66746,8 @@ in }) (sources."remark-lint-heading-style-3.1.2" // { dependencies = [ - sources."@types/mdast-3.0.14" - sources."@types/unist-2.0.9" + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" sources."unified-10.1.2" sources."unist-util-is-5.2.1" sources."unist-util-stringify-position-3.0.3" @@ -67733,8 +66758,8 @@ in }) (sources."remark-lint-link-title-style-3.1.2" // { dependencies = [ - sources."@types/mdast-3.0.14" - sources."@types/unist-2.0.9" + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" sources."unified-10.1.2" sources."unist-util-is-5.2.1" sources."unist-util-stringify-position-3.0.3" @@ -67745,8 +66770,8 @@ in }) (sources."remark-lint-list-item-bullet-indent-4.1.2" // { dependencies = [ - sources."@types/mdast-3.0.14" - sources."@types/unist-2.0.9" + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" sources."unified-10.1.2" sources."unist-util-is-5.2.1" sources."unist-util-stringify-position-3.0.3" @@ -67757,8 +66782,8 @@ in }) (sources."remark-lint-list-item-content-indent-3.1.2" // { dependencies = [ - sources."@types/mdast-3.0.14" - sources."@types/unist-2.0.9" + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" sources."unified-10.1.2" sources."unist-util-is-5.2.1" sources."unist-util-stringify-position-3.0.3" @@ -67769,8 +66794,8 @@ in }) (sources."remark-lint-list-item-indent-3.1.2" // { dependencies = [ - sources."@types/mdast-3.0.14" - sources."@types/unist-2.0.9" + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" sources."unified-10.1.2" sources."unist-util-is-5.2.1" sources."unist-util-stringify-position-3.0.3" @@ -67786,8 +66811,8 @@ in }) (sources."remark-lint-no-auto-link-without-protocol-3.1.2" // { dependencies = [ - sources."@types/mdast-3.0.14" - sources."@types/unist-2.0.9" + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" sources."mdast-util-to-string-3.2.0" sources."unified-10.1.2" sources."unist-util-is-5.2.1" @@ -67799,8 +66824,8 @@ in }) (sources."remark-lint-no-blockquote-without-marker-5.1.2" // { dependencies = [ - sources."@types/mdast-3.0.14" - sources."@types/unist-2.0.9" + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" sources."unified-10.1.2" sources."unist-util-is-5.2.1" sources."unist-util-stringify-position-3.0.3" @@ -67811,8 +66836,8 @@ in }) (sources."remark-lint-no-emphasis-as-heading-3.1.2" // { dependencies = [ - sources."@types/mdast-3.0.14" - sources."@types/unist-2.0.9" + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" sources."unified-10.1.2" sources."unist-util-is-5.2.1" sources."unist-util-stringify-position-3.0.3" @@ -67832,8 +66857,8 @@ in }) (sources."remark-lint-no-file-name-articles-2.1.2" // { dependencies = [ - sources."@types/mdast-3.0.14" - sources."@types/unist-2.0.9" + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" sources."unified-10.1.2" sources."unist-util-stringify-position-3.0.3" sources."vfile-5.3.7" @@ -67842,8 +66867,8 @@ in }) (sources."remark-lint-no-file-name-consecutive-dashes-2.1.2" // { dependencies = [ - sources."@types/mdast-3.0.14" - sources."@types/unist-2.0.9" + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" sources."unified-10.1.2" sources."unist-util-stringify-position-3.0.3" sources."vfile-5.3.7" @@ -67852,8 +66877,8 @@ in }) (sources."remark-lint-no-file-name-irregular-characters-2.1.2" // { dependencies = [ - sources."@types/mdast-3.0.14" - sources."@types/unist-2.0.9" + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" sources."unified-10.1.2" sources."unist-util-stringify-position-3.0.3" sources."vfile-5.3.7" @@ -67862,8 +66887,8 @@ in }) (sources."remark-lint-no-file-name-mixed-case-2.1.2" // { dependencies = [ - sources."@types/mdast-3.0.14" - sources."@types/unist-2.0.9" + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" sources."unified-10.1.2" sources."unist-util-stringify-position-3.0.3" sources."vfile-5.3.7" @@ -67872,8 +66897,8 @@ in }) (sources."remark-lint-no-file-name-outer-dashes-2.1.2" // { dependencies = [ - sources."@types/mdast-3.0.14" - sources."@types/unist-2.0.9" + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" sources."unified-10.1.2" sources."unist-util-stringify-position-3.0.3" sources."vfile-5.3.7" @@ -67882,8 +66907,8 @@ in }) (sources."remark-lint-no-heading-content-indent-4.1.2" // { dependencies = [ - sources."@types/mdast-3.0.14" - sources."@types/unist-2.0.9" + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" sources."unified-10.1.2" sources."unist-util-is-5.2.1" sources."unist-util-stringify-position-3.0.3" @@ -67894,8 +66919,8 @@ in }) (sources."remark-lint-no-heading-indent-4.1.2" // { dependencies = [ - sources."@types/mdast-3.0.14" - sources."@types/unist-2.0.9" + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" sources."unified-10.1.2" sources."unist-util-is-5.2.1" sources."unist-util-stringify-position-3.0.3" @@ -67906,8 +66931,8 @@ in }) (sources."remark-lint-no-heading-punctuation-3.1.2" // { dependencies = [ - sources."@types/mdast-3.0.14" - sources."@types/unist-2.0.9" + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" sources."mdast-util-to-string-3.2.0" sources."unified-10.1.2" sources."unist-util-is-5.2.1" @@ -67919,8 +66944,8 @@ in }) (sources."remark-lint-no-inline-padding-4.1.2" // { dependencies = [ - sources."@types/mdast-3.0.14" - sources."@types/unist-2.0.9" + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" sources."mdast-util-to-string-3.2.0" sources."unified-10.1.2" sources."unist-util-is-5.2.1" @@ -67932,8 +66957,8 @@ in }) (sources."remark-lint-no-multiple-toplevel-headings-3.1.2" // { dependencies = [ - sources."@types/mdast-3.0.14" - sources."@types/unist-2.0.9" + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" sources."unified-10.1.2" sources."unist-util-is-5.2.1" sources."unist-util-stringify-position-3.0.3" @@ -67949,8 +66974,8 @@ in }) (sources."remark-lint-no-shell-dollars-3.1.2" // { dependencies = [ - sources."@types/mdast-3.0.14" - sources."@types/unist-2.0.9" + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" sources."unified-10.1.2" sources."unist-util-is-5.2.1" sources."unist-util-stringify-position-3.0.3" @@ -67961,8 +66986,8 @@ in }) (sources."remark-lint-no-table-indentation-4.1.2" // { dependencies = [ - sources."@types/mdast-3.0.14" - sources."@types/unist-2.0.9" + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" sources."unified-10.1.2" sources."unist-util-is-5.2.1" sources."unist-util-stringify-position-3.0.3" @@ -67973,8 +66998,8 @@ in }) (sources."remark-lint-no-undefined-references-4.2.1" // { dependencies = [ - sources."@types/mdast-3.0.14" - sources."@types/unist-2.0.9" + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" sources."micromark-util-normalize-identifier-1.1.0" sources."micromark-util-symbol-1.1.0" sources."unified-10.1.2" @@ -67987,8 +67012,8 @@ in }) (sources."remark-lint-no-unneeded-full-reference-image-3.1.2" // { dependencies = [ - sources."@types/mdast-3.0.14" - sources."@types/unist-2.0.9" + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" sources."micromark-util-normalize-identifier-1.1.0" sources."micromark-util-symbol-1.1.0" sources."unified-10.1.2" @@ -68001,8 +67026,8 @@ in }) (sources."remark-lint-no-unneeded-full-reference-link-3.1.2" // { dependencies = [ - sources."@types/mdast-3.0.14" - sources."@types/unist-2.0.9" + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" sources."micromark-util-normalize-identifier-1.1.0" sources."micromark-util-symbol-1.1.0" sources."unified-10.1.2" @@ -68015,8 +67040,8 @@ in }) (sources."remark-lint-no-unused-definitions-3.1.2" // { dependencies = [ - sources."@types/mdast-3.0.14" - sources."@types/unist-2.0.9" + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" sources."unified-10.1.2" sources."unist-util-is-5.2.1" sources."unist-util-stringify-position-3.0.3" @@ -68027,8 +67052,8 @@ in }) (sources."remark-lint-ordered-list-marker-style-3.1.2" // { dependencies = [ - sources."@types/mdast-3.0.14" - sources."@types/unist-2.0.9" + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" sources."unified-10.1.2" sources."unist-util-is-5.2.1" sources."unist-util-stringify-position-3.0.3" @@ -68039,8 +67064,8 @@ in }) (sources."remark-lint-ordered-list-marker-value-3.1.2" // { dependencies = [ - sources."@types/mdast-3.0.14" - sources."@types/unist-2.0.9" + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" sources."unified-10.1.2" sources."unist-util-is-5.2.1" sources."unist-util-stringify-position-3.0.3" @@ -68051,8 +67076,8 @@ in }) (sources."remark-lint-rule-style-3.1.2" // { dependencies = [ - sources."@types/mdast-3.0.14" - sources."@types/unist-2.0.9" + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" sources."unified-10.1.2" sources."unist-util-is-5.2.1" sources."unist-util-stringify-position-3.0.3" @@ -68063,8 +67088,8 @@ in }) (sources."remark-lint-strong-marker-3.1.2" // { dependencies = [ - sources."@types/mdast-3.0.14" - sources."@types/unist-2.0.9" + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" sources."unified-10.1.2" sources."unist-util-is-5.2.1" sources."unist-util-stringify-position-3.0.3" @@ -68075,8 +67100,8 @@ in }) (sources."remark-lint-table-cell-padding-4.1.3" // { dependencies = [ - sources."@types/mdast-3.0.14" - sources."@types/unist-2.0.9" + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" sources."unified-10.1.2" sources."unist-util-is-5.2.1" sources."unist-util-stringify-position-3.0.3" @@ -68087,8 +67112,8 @@ in }) (sources."remark-lint-table-pipe-alignment-3.1.3" // { dependencies = [ - sources."@types/mdast-3.0.14" - sources."@types/unist-2.0.9" + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" sources."unified-10.1.2" sources."unist-util-is-5.2.1" sources."unist-util-stringify-position-3.0.3" @@ -68099,8 +67124,8 @@ in }) (sources."remark-lint-table-pipes-4.1.2" // { dependencies = [ - sources."@types/mdast-3.0.14" - sources."@types/unist-2.0.9" + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" sources."unified-10.1.2" sources."unist-util-is-5.2.1" sources."unist-util-stringify-position-3.0.3" @@ -68111,8 +67136,8 @@ in }) (sources."remark-lint-unordered-list-marker-style-3.1.2" // { dependencies = [ - sources."@types/mdast-3.0.14" - sources."@types/unist-2.0.9" + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" sources."unified-10.1.2" sources."unist-util-is-5.2.1" sources."unist-util-stringify-position-3.0.3" @@ -68123,8 +67148,8 @@ in }) (sources."remark-message-control-7.1.1" // { dependencies = [ - sources."@types/mdast-3.0.14" - sources."@types/unist-2.0.9" + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" sources."unified-10.1.2" sources."unist-util-stringify-position-3.0.3" sources."vfile-5.3.7" @@ -68183,11 +67208,11 @@ in sources."to-regex-range-5.0.1" sources."to-vfile-8.0.0" sources."trough-2.1.0" - sources."type-fest-4.6.0" + sources."type-fest-4.7.1" sources."unified-11.0.4" (sources."unified-lint-rule-2.1.2" // { dependencies = [ - sources."@types/unist-2.0.9" + sources."@types/unist-2.0.10" sources."unified-10.1.2" sources."unist-util-stringify-position-3.0.3" sources."vfile-5.3.7" @@ -68196,7 +67221,7 @@ in }) (sources."unified-message-control-4.0.0" // { dependencies = [ - sources."@types/unist-2.0.9" + sources."@types/unist-2.0.10" sources."unist-util-is-5.2.1" sources."unist-util-stringify-position-3.0.3" sources."unist-util-visit-3.1.0" @@ -68211,7 +67236,7 @@ in sources."unist-util-find-all-before-5.0.0" (sources."unist-util-find-all-between-2.1.0" // { dependencies = [ - sources."@types/unist-2.0.9" + sources."@types/unist-2.0.10" sources."unist-util-find-1.0.4" sources."unist-util-is-4.1.0" sources."unist-util-visit-2.0.3" @@ -68223,7 +67248,7 @@ in sources."unist-util-map-1.0.5" (sources."unist-util-position-4.0.4" // { dependencies = [ - sources."@types/unist-2.0.9" + sources."@types/unist-2.0.10" ]; }) sources."unist-util-stringify-position-4.0.0" @@ -68242,7 +67267,7 @@ in }) (sources."unist-util-visit-parents-5.1.3" // { dependencies = [ - sources."@types/unist-2.0.9" + sources."@types/unist-2.0.10" sources."unist-util-is-5.2.1" ]; }) @@ -68257,7 +67282,7 @@ in sources."vfile-6.0.1" (sources."vfile-location-4.1.0" // { dependencies = [ - sources."@types/unist-2.0.9" + sources."@types/unist-2.0.10" sources."unist-util-stringify-position-3.0.3" sources."vfile-5.3.7" sources."vfile-message-3.1.4" @@ -68720,8 +67745,8 @@ in dependencies = [ sources."@socket.io/component-emitter-3.1.0" sources."@types/cookie-0.4.1" - sources."@types/cors-2.8.15" - sources."@types/node-20.8.10" + sources."@types/cors-2.8.16" + sources."@types/node-20.9.0" sources."accepts-1.3.8" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" @@ -68766,7 +67791,7 @@ in sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" sources."engine.io-6.5.3" - sources."engine.io-client-6.5.2" + sources."engine.io-client-6.5.3" sources."engine.io-parser-5.2.1" sources."escalade-3.1.1" sources."escape-html-1.0.3" @@ -68911,10 +67936,10 @@ in cdk8s-cli = nodeEnv.buildNodePackage { name = "cdk8s-cli"; packageName = "cdk8s-cli"; - version = "2.163.0"; + version = "2.172.0"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-2.163.0.tgz"; - sha512 = "NmAubHYjEj4VzjT/F82x+LLu5jCdLKC4Q/xYdOdrDeyw5ceZsmpNZD/kiTyeAleJpVO9BL2YpdHLd4zZiyPZHw=="; + url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-2.172.0.tgz"; + sha512 = "gxFAdtebL8JG6ZmqtUvyAVJytqQSbsWpOVzxELPOwlJ6SDxI1kCvdmKOk/s3GAvkD4GLfbPXd+7jlTWL+BpCjg=="; }; dependencies = [ sources."@colors/colors-1.6.0" @@ -68936,8 +67961,8 @@ in sources."@octokit/request-error-2.1.0" sources."@octokit/rest-18.12.0" sources."@octokit/types-6.41.0" - sources."@types/node-16.18.60" - sources."@types/triple-beam-1.3.4" + sources."@types/node-16.18.61" + sources."@types/triple-beam-1.3.5" sources."@xmldom/xmldom-0.8.10" sources."aggregate-error-3.1.0" sources."ajv-8.12.0" @@ -68946,7 +67971,7 @@ in sources."ansi-styles-4.3.0" sources."array-union-2.1.0" sources."astral-regex-2.0.0" - sources."async-3.2.4" + sources."async-3.2.5" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" sources."axios-0.27.2" @@ -68970,8 +67995,8 @@ in sources."buffer-5.7.1" sources."camelcase-6.3.0" sources."case-1.6.3" - sources."cdk8s-2.67.6" - sources."cdk8s-plus-25-2.22.49" + sources."cdk8s-2.68.2" + sources."cdk8s-plus-25-2.22.54" sources."chalk-4.1.2" sources."chardet-0.7.0" sources."clean-stack-2.2.0" @@ -69019,7 +68044,7 @@ in sources."dotenv-16.3.1" (sources."downlevel-dts-0.11.0" // { dependencies = [ - sources."typescript-5.3.0-dev.20231101" + sources."typescript-5.4.0-dev.20231109" ]; }) sources."emoji-regex-8.0.0" @@ -69034,7 +68059,7 @@ in ]; }) sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.3.1" + sources."fast-glob-3.3.2" sources."fastq-1.15.0" sources."fecha-4.2.3" (sources."figures-3.2.0" // { @@ -69112,11 +68137,11 @@ in sources."yargs-16.2.0" ]; }) - (sources."jsii-srcmak-0.1.953" // { + (sources."jsii-srcmak-0.1.960" // { dependencies = [ sources."cliui-8.0.1" sources."fs-extra-9.1.0" - (sources."jsii-5.2.23" // { + (sources."jsii-5.2.26" // { dependencies = [ sources."yargs-17.7.2" ]; @@ -69229,7 +68254,7 @@ in sources."tslib-2.6.2" sources."type-fest-0.21.3" sources."typescript-3.9.10" - sources."universal-user-agent-6.0.0" + sources."universal-user-agent-6.0.1" sources."universalify-2.0.1" sources."uri-js-4.4.1" sources."util-deprecate-1.0.2" @@ -69246,7 +68271,7 @@ in sources."xmlbuilder-15.1.1" sources."y18n-5.0.8" sources."yallist-4.0.0" - sources."yaml-2.3.3" + sources."yaml-2.3.4" (sources."yargs-15.4.1" // { dependencies = [ sources."camelcase-5.3.1" @@ -69273,10 +68298,10 @@ in cdktf-cli = nodeEnv.buildNodePackage { name = "cdktf-cli"; packageName = "cdktf-cli"; - version = "0.19.0"; + version = "0.19.1"; src = fetchurl { - url = "https://registry.npmjs.org/cdktf-cli/-/cdktf-cli-0.19.0.tgz"; - sha512 = "WGLs0IOgig8WDO2E6RYWtG5lCDL+ICX+plFipWT8JhuJpemxBhk8pO8uhDSWvBF85ZpVecQv+szfQVmXq8mdUg=="; + url = "https://registry.npmjs.org/cdktf-cli/-/cdktf-cli-0.19.1.tgz"; + sha512 = "itqPbZKIYpdCCIUGzX/yVSrcD0U16XqpNbnE8hX7E3Kg2Lus5/fjeXX2ijyZw3vp63ScS+5PStEyMNooCh84IA=="; }; dependencies = [ (sources."@babel/code-frame-7.22.13" // { @@ -69290,7 +68315,7 @@ in sources."supports-color-5.5.0" ]; }) - sources."@babel/generator-7.23.0" + sources."@babel/generator-7.23.3" sources."@babel/helper-string-parser-7.22.5" sources."@babel/helper-validator-identifier-7.22.20" (sources."@babel/highlight-7.22.20" // { @@ -69304,51 +68329,50 @@ in sources."supports-color-5.5.0" ]; }) - sources."@babel/parser-7.23.0" + sources."@babel/parser-7.23.3" sources."@babel/template-7.22.15" - sources."@babel/types-7.23.0" - sources."@cdktf/cli-core-0.19.0" - (sources."@cdktf/commons-0.19.0" // { + sources."@babel/types-7.23.3" + sources."@cdktf/cli-core-0.19.1" + (sources."@cdktf/commons-0.19.1" // { dependencies = [ sources."fs-extra-11.1.1" sources."uuid-9.0.1" ]; }) - (sources."@cdktf/hcl2cdk-0.19.0" // { + (sources."@cdktf/hcl2cdk-0.19.1" // { dependencies = [ sources."brace-expansion-2.0.1" sources."camelcase-6.3.0" sources."glob-10.3.10" sources."minimatch-9.0.3" - sources."zod-3.22.4" ]; }) - (sources."@cdktf/hcl2json-0.19.0" // { + (sources."@cdktf/hcl2json-0.19.1" // { dependencies = [ sources."fs-extra-11.1.1" ]; }) sources."@cdktf/node-pty-prebuilt-multiarch-0.10.1-pre.11" - (sources."@cdktf/provider-generator-0.19.0" // { + (sources."@cdktf/provider-generator-0.19.1" // { dependencies = [ - sources."@types/node-18.11.19" + sources."@types/node-18.18.8" ]; }) - (sources."@cdktf/provider-schema-0.19.0" // { + (sources."@cdktf/provider-schema-0.19.1" // { dependencies = [ sources."fs-extra-11.1.1" ]; }) - (sources."@inquirer/checkbox-1.4.0" // { + (sources."@inquirer/checkbox-1.5.0" // { dependencies = [ - sources."@inquirer/core-5.1.0" + sources."@inquirer/core-5.1.1" sources."cli-spinners-2.9.1" sources."signal-exit-4.1.0" ]; }) - (sources."@inquirer/confirm-2.0.14" // { + (sources."@inquirer/confirm-2.0.15" // { dependencies = [ - sources."@inquirer/core-5.1.0" + sources."@inquirer/core-5.1.1" sources."cli-spinners-2.9.1" sources."signal-exit-4.1.0" ]; @@ -69359,39 +68383,39 @@ in sources."cli-spinners-2.9.1" ]; }) - (sources."@inquirer/editor-1.2.12" // { + (sources."@inquirer/editor-1.2.13" // { dependencies = [ - sources."@inquirer/core-5.1.0" + sources."@inquirer/core-5.1.1" sources."cli-spinners-2.9.1" sources."signal-exit-4.1.0" ]; }) - (sources."@inquirer/expand-1.1.13" // { + (sources."@inquirer/expand-1.1.14" // { dependencies = [ - sources."@inquirer/core-5.1.0" + sources."@inquirer/core-5.1.1" sources."cli-spinners-2.9.1" sources."signal-exit-4.1.0" ]; }) - (sources."@inquirer/input-1.2.13" // { + (sources."@inquirer/input-1.2.14" // { dependencies = [ - sources."@inquirer/core-5.1.0" + sources."@inquirer/core-5.1.1" sources."cli-spinners-2.9.1" sources."signal-exit-4.1.0" ]; }) - sources."@inquirer/password-1.1.13" + sources."@inquirer/password-1.1.14" sources."@inquirer/prompts-2.3.1" - (sources."@inquirer/rawlist-1.2.13" // { + (sources."@inquirer/rawlist-1.2.14" // { dependencies = [ - sources."@inquirer/core-5.1.0" + sources."@inquirer/core-5.1.1" sources."cli-spinners-2.9.1" sources."signal-exit-4.1.0" ]; }) - (sources."@inquirer/select-1.3.0" // { + (sources."@inquirer/select-1.3.1" // { dependencies = [ - sources."@inquirer/core-5.1.0" + sources."@inquirer/core-5.1.1" sources."cli-spinners-2.9.1" sources."signal-exit-4.1.0" ]; @@ -69412,23 +68436,23 @@ in sources."@jridgewell/set-array-1.1.2" sources."@jridgewell/sourcemap-codec-1.4.15" sources."@jridgewell/trace-mapping-0.3.20" - sources."@jsii/check-node-1.90.0" + sources."@jsii/check-node-1.91.0" sources."@jsii/spec-1.91.0" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@sentry-internal/tracing-7.77.0" - sources."@sentry/core-7.77.0" - sources."@sentry/node-7.77.0" - sources."@sentry/types-7.77.0" - sources."@sentry/utils-7.77.0" - sources."@types/mute-stream-0.0.2" - sources."@types/node-20.8.10" - sources."@types/prop-types-15.7.9" - sources."@types/react-18.2.34" - sources."@types/scheduler-0.16.5" + sources."@sentry-internal/tracing-7.80.0" + sources."@sentry/core-7.80.0" + sources."@sentry/node-7.80.0" + sources."@sentry/types-7.80.0" + sources."@sentry/utils-7.80.0" + sources."@types/mute-stream-0.0.4" + sources."@types/node-20.9.0" + sources."@types/prop-types-15.7.10" + sources."@types/react-18.2.37" + sources."@types/scheduler-0.16.6" sources."@types/wrap-ansi-3.0.0" - sources."@types/yauzl-2.10.2" + sources."@types/yauzl-2.10.3" sources."@types/yoga-layout-1.9.2" sources."@xmldom/xmldom-0.8.10" sources."address-1.2.2" @@ -69453,7 +68477,7 @@ in sources."arr-rotate-1.0.0" sources."array-buffer-byte-length-1.0.0" sources."astral-regex-2.0.0" - sources."async-3.2.4" + sources."async-3.2.5" sources."at-least-node-1.0.0" sources."auto-bind-4.0.0" sources."available-typed-arrays-1.0.5" @@ -69469,7 +68493,7 @@ in sources."call-bind-1.0.5" sources."camelcase-5.3.1" sources."case-1.6.3" - sources."cdktf-0.19.0" + sources."cdktf-0.19.1" sources."chalk-4.1.2" sources."chardet-0.7.0" sources."chokidar-3.5.3" @@ -69507,7 +68531,7 @@ in sources."debug-4.3.4" sources."decamelize-1.2.0" sources."decompress-response-6.0.0" - (sources."deep-equal-2.2.2" // { + (sources."deep-equal-2.2.3" // { dependencies = [ sources."isarray-2.0.5" ]; @@ -69522,7 +68546,7 @@ in sources."detect-port-1.5.1" (sources."downlevel-dts-0.11.0" // { dependencies = [ - sources."typescript-5.3.0-dev.20231101" + sources."typescript-5.4.0-dev.20231109" ]; }) sources."eastasianwidth-0.2.0" @@ -69551,7 +68575,7 @@ in ]; }) sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.3.1" + sources."fast-glob-3.3.2" sources."fastq-1.15.0" sources."fd-slicer-1.1.0" (sources."figures-3.2.0" // { @@ -69657,14 +68681,9 @@ in sources."jackspeak-2.3.6" sources."js-tokens-4.0.0" sources."jsesc-2.5.2" - (sources."jsii-5.2.23" // { - dependencies = [ - sources."@jsii/check-node-1.91.0" - ]; - }) + sources."jsii-5.2.26" (sources."jsii-pacmak-1.91.0" // { dependencies = [ - sources."@jsii/check-node-1.91.0" sources."cliui-7.0.4" sources."escape-string-regexp-4.0.0" sources."fs-extra-10.1.0" @@ -69679,7 +68698,6 @@ in }) (sources."jsii-reflect-1.91.0" // { dependencies = [ - sources."@jsii/check-node-1.91.0" sources."cliui-7.0.4" sources."fs-extra-10.1.0" sources."wrap-ansi-7.0.0" @@ -69688,8 +68706,8 @@ in sources."yargs-parser-20.2.9" ]; }) - sources."jsii-rosetta-5.2.1" - (sources."jsii-srcmak-0.1.953" // { + sources."jsii-rosetta-5.2.2" + (sources."jsii-srcmak-0.1.960" // { dependencies = [ sources."fs-extra-9.1.0" sources."yargs-15.4.1" @@ -69896,7 +68914,7 @@ in sources."archiver-utils-3.0.4" ]; }) - sources."zod-1.11.17" + sources."zod-3.22.4" ]; buildInputs = globalBuildInputs; meta = { @@ -70222,10 +69240,10 @@ in coc-go = nodeEnv.buildNodePackage { name = "coc-go"; packageName = "coc-go"; - version = "1.3.27"; + version = "1.3.28"; src = fetchurl { - url = "https://registry.npmjs.org/coc-go/-/coc-go-1.3.27.tgz"; - sha512 = "db1WeOPFArtbNEa6IMCtovlXJUS4W+qfXWoqiUCDPvRxBMDZMROSum2nx+hbo6TZwkDacT9X59hkqRxDLVdprA=="; + url = "https://registry.npmjs.org/coc-go/-/coc-go-1.3.28.tgz"; + sha512 = "XbjcMohLS6V8sonh9sJRFVMCv2YP0dGlFT+y/bQ1qkj1zsyd7WutWAJAqfpopZTJN0SQxbStRcre8CV0fTE5EA=="; }; dependencies = [ sources."isexe-2.0.0" @@ -70703,13 +69721,13 @@ in coc-pyright = nodeEnv.buildNodePackage { name = "coc-pyright"; packageName = "coc-pyright"; - version = "1.1.334"; + version = "1.1.335"; src = fetchurl { - url = "https://registry.npmjs.org/coc-pyright/-/coc-pyright-1.1.334.tgz"; - sha512 = "U6gGd8uvMPXW1TMrIcx1QeW+GnbKrWWGer5EOgbQFRFrzWuEipe/NU5Iv/S+YqUnkkdPMN2HeKL2BLoLsNq60Q=="; + url = "https://registry.npmjs.org/coc-pyright/-/coc-pyright-1.1.335.tgz"; + sha512 = "c5G9caUYxOC7PjiagbQhShXpx1Pj92Vya3wVr782rEwOmIxELZsFuiGWhgQEwKhneB+grH6do2QF6mSiUr07Xw=="; }; dependencies = [ - sources."pyright-1.1.334" + sources."pyright-1.1.335" ]; buildInputs = globalBuildInputs; meta = { @@ -71057,15 +70075,15 @@ in sources."chalk-2.4.2" ]; }) - sources."@babel/compat-data-7.23.2" - sources."@babel/core-7.23.2" - sources."@babel/generator-7.23.0" + sources."@babel/compat-data-7.23.3" + sources."@babel/core-7.23.3" + sources."@babel/generator-7.23.3" sources."@babel/helper-compilation-targets-7.22.15" sources."@babel/helper-environment-visitor-7.22.20" sources."@babel/helper-function-name-7.23.0" sources."@babel/helper-hoist-variables-7.22.5" sources."@babel/helper-module-imports-7.22.15" - sources."@babel/helper-module-transforms-7.23.0" + sources."@babel/helper-module-transforms-7.23.3" 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" @@ -71077,10 +70095,10 @@ in sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.23.0" + sources."@babel/parser-7.23.3" sources."@babel/template-7.22.15" - sources."@babel/traverse-7.23.2" - sources."@babel/types-7.23.0" + sources."@babel/traverse-7.23.3" + sources."@babel/types-7.23.3" sources."@jridgewell/gen-mapping-0.3.3" sources."@jridgewell/resolve-uri-3.1.1" sources."@jridgewell/set-array-1.1.2" @@ -71091,11 +70109,11 @@ in sources."@nodelib/fs.walk-1.2.8" sources."@stylelint/postcss-css-in-js-0.37.3" sources."@stylelint/postcss-markdown-0.36.2" - sources."@types/mdast-3.0.14" - sources."@types/minimist-1.2.4" - sources."@types/normalize-package-data-2.4.3" - sources."@types/parse-json-4.0.1" - sources."@types/unist-2.0.9" + sources."@types/mdast-3.0.15" + sources."@types/minimist-1.2.5" + sources."@types/normalize-package-data-2.4.4" + sources."@types/parse-json-4.0.2" + sources."@types/unist-2.0.10" sources."ajv-8.12.0" sources."ansi-regex-5.0.1" sources."ansi-styles-3.2.1" @@ -71119,7 +70137,7 @@ in sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001559" + sources."caniuse-lite-1.0.30001561" (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -71156,7 +70174,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.4.574" + sources."electron-to-chromium-1.4.579" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -71166,7 +70184,7 @@ in sources."extend-3.0.2" sources."fast-deep-equal-3.1.3" sources."fast-diff-1.3.0" - sources."fast-glob-3.3.1" + sources."fast-glob-3.3.2" sources."fastest-levenshtein-1.0.16" sources."fastq-1.15.0" sources."file-entry-cache-6.0.1" @@ -72224,7 +71242,7 @@ in sources."@babel/helper-validator-identifier-7.22.20" sources."@babel/highlight-7.22.20" sources."@hutson/parse-repository-url-5.0.0" - sources."@types/normalize-package-data-2.4.3" + sources."@types/normalize-package-data-2.4.4" sources."JSONStream-1.3.5" sources."add-stream-1.0.0" sources."ansi-styles-3.2.1" @@ -72268,7 +71286,7 @@ in sources."json-parse-even-better-errors-3.0.0" sources."json-stringify-safe-5.0.1" sources."jsonparse-1.3.1" - sources."lines-and-columns-2.0.3" + sources."lines-and-columns-2.0.4" sources."locate-path-7.2.0" sources."lru-cache-10.0.1" sources."meow-12.1.1" @@ -72301,7 +71319,7 @@ in sources."tempfile-5.0.0" sources."text-extensions-2.4.0" sources."through-2.3.8" - sources."type-fest-4.6.0" + sources."type-fest-4.7.1" sources."uglify-js-3.17.4" sources."validate-npm-package-license-3.0.4" sources."wordwrap-1.0.0" @@ -72338,7 +71356,7 @@ in sources."cpy-10.1.0" sources."dir-glob-3.0.1" sources."escape-string-regexp-5.0.0" - sources."fast-glob-3.3.1" + sources."fast-glob-3.3.2" sources."fastq-1.15.0" sources."fill-range-7.0.1" sources."glob-parent-5.1.2" @@ -72398,8 +71416,8 @@ in }) sources."@cycle/run-3.4.0" sources."@cycle/time-0.10.1" - sources."@types/cookiejar-2.1.3" - sources."@types/node-20.8.10" + sources."@types/cookiejar-2.1.4" + sources."@types/node-20.9.0" sources."@types/superagent-3.8.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" @@ -72574,10 +71592,10 @@ in cspell = nodeEnv.buildNodePackage { name = "cspell"; packageName = "cspell"; - version = "7.3.8"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/cspell/-/cspell-7.3.8.tgz"; - sha512 = "8AkqsBQAMsKYV5XyJLB6rBs5hgspL4+MPOg6mBKG2j5EvQgRVc6dIfAPWDNLpIeW2a3+7K5BIWqKHapKPeiknQ=="; + url = "https://registry.npmjs.org/cspell/-/cspell-8.0.0.tgz"; + sha512 = "Nayy25Dh+GAlDFDpVZaQhmidP947rpj1Pn9lmZ3nUFjD9W/yj0h0vrjMLMN4dbonddkmKh4t51C+7NuMP405hg=="; }; dependencies = [ (sources."@babel/code-frame-7.22.13" // { @@ -72591,12 +71609,12 @@ in sources."chalk-2.4.2" ]; }) - sources."@cspell/cspell-bundled-dicts-7.3.8" - sources."@cspell/cspell-json-reporter-7.3.8" - sources."@cspell/cspell-pipe-7.3.8" - sources."@cspell/cspell-resolver-7.3.8" - sources."@cspell/cspell-service-bus-7.3.8" - sources."@cspell/cspell-types-7.3.8" + sources."@cspell/cspell-bundled-dicts-8.0.0" + sources."@cspell/cspell-json-reporter-8.0.0" + sources."@cspell/cspell-pipe-8.0.0" + sources."@cspell/cspell-resolver-8.0.0" + sources."@cspell/cspell-service-bus-8.0.0" + sources."@cspell/cspell-types-8.0.0" sources."@cspell/dict-ada-4.0.2" sources."@cspell/dict-aws-4.0.0" sources."@cspell/dict-bash-4.1.2" @@ -72629,6 +71647,7 @@ in sources."@cspell/dict-latex-4.0.0" sources."@cspell/dict-lorem-ipsum-4.0.0" sources."@cspell/dict-lua-4.0.2" + sources."@cspell/dict-makefile-1.0.0" sources."@cspell/dict-node-4.0.3" sources."@cspell/dict-npm-5.0.12" sources."@cspell/dict-php-4.0.4" @@ -72645,8 +71664,8 @@ in sources."@cspell/dict-swift-2.0.1" sources."@cspell/dict-typescript-3.1.2" sources."@cspell/dict-vue-3.0.0" - sources."@cspell/dynamic-import-7.3.8" - sources."@cspell/strong-weak-map-7.3.8" + sources."@cspell/dynamic-import-8.0.0" + sources."@cspell/strong-weak-map-8.0.0" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -72670,16 +71689,16 @@ in sources."core-util-is-1.0.3" sources."cosmiconfig-8.0.0" sources."crypto-random-string-4.0.0" - (sources."cspell-dictionary-7.3.8" // { + (sources."cspell-dictionary-8.0.0" // { dependencies = [ sources."fast-equals-4.0.3" ]; }) - sources."cspell-gitignore-7.3.8" - sources."cspell-glob-7.3.8" - sources."cspell-grammar-7.3.8" - sources."cspell-io-7.3.8" - (sources."cspell-lib-7.3.8" // { + sources."cspell-gitignore-8.0.0" + sources."cspell-glob-8.0.0" + sources."cspell-grammar-8.0.0" + sources."cspell-io-8.0.0" + (sources."cspell-lib-8.0.0" // { dependencies = [ sources."find-up-6.3.0" sources."locate-path-7.2.0" @@ -72689,14 +71708,13 @@ in sources."yocto-queue-1.0.0" ]; }) - sources."cspell-trie-lib-7.3.8" + sources."cspell-trie-lib-8.0.0" sources."dot-prop-6.0.1" - sources."encoding-0.1.13" sources."error-ex-1.3.2" sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" sources."fast-equals-5.0.1" - sources."fast-glob-3.3.1" + sources."fast-glob-3.3.2" sources."fast-json-stable-stringify-2.1.0" sources."fastq-1.15.0" sources."file-entry-cache-7.0.1" @@ -72713,14 +71731,13 @@ in sources."graceful-fs-4.2.11" sources."has-flag-3.0.0" sources."has-own-prop-2.0.0" - sources."iconv-lite-0.6.3" (sources."import-fresh-3.3.0" // { dependencies = [ sources."parent-module-1.0.1" sources."resolve-from-4.0.0" ]; }) - sources."import-meta-resolve-3.0.0" + sources."import-meta-resolve-3.1.1" sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.4" @@ -72742,7 +71759,6 @@ in sources."merge2-1.4.1" sources."micromatch-4.0.5" sources."minimatch-3.1.2" - sources."node-fetch-2.7.0" sources."once-1.4.0" sources."p-limit-3.1.0" sources."p-locate-5.0.0" @@ -72758,20 +71774,16 @@ in sources."reusify-1.0.4" sources."rimraf-3.0.2" sources."run-parallel-1.2.0" - sources."safer-buffer-2.1.2" sources."semver-7.5.4" sources."signal-exit-3.0.7" sources."strip-ansi-7.1.0" sources."supports-color-5.5.0" sources."to-regex-range-5.0.1" - sources."tr46-0.0.3" sources."type-fest-1.4.0" sources."typedarray-to-buffer-3.1.5" sources."unique-string-3.0.0" sources."vscode-languageserver-textdocument-1.0.11" sources."vscode-uri-3.0.8" - sources."webidl-conversions-3.0.1" - sources."whatwg-url-5.0.0" sources."wrappy-1.0.2" sources."write-file-atomic-3.0.3" sources."xdg-basedir-5.1.0" @@ -72854,7 +71866,7 @@ in sources."crypto-random-string-2.0.0" sources."del-6.1.1" sources."dir-glob-3.0.1" - sources."fast-glob-3.3.1" + sources."fast-glob-3.3.2" sources."fastq-1.15.0" sources."fill-range-7.0.1" sources."find-up-4.1.0" @@ -73078,17 +72090,17 @@ in ]; }) sources."@oclif/screen-3.0.8" - sources."@swc/core-1.3.95" + sources."@swc/core-1.3.96" sources."@swc/counter-0.1.2" sources."@swc/helpers-0.5.3" sources."@swc/types-0.1.5" - sources."@swc/wasm-1.3.95" + sources."@swc/wasm-1.3.97" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.4" - sources."@types/cli-progress-3.11.4" - sources."@types/node-20.8.10" + sources."@types/cli-progress-3.11.5" + sources."@types/node-20.9.0" sources."acorn-8.11.2" sources."acorn-walk-8.3.0" sources."ansi-escapes-4.3.2" @@ -73099,7 +72111,7 @@ in sources."argparse-1.0.10" sources."array-union-2.1.0" sources."astral-regex-2.0.0" - sources."async-3.2.4" + sources."async-3.2.5" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" sources."axios-0.27.2" @@ -73144,7 +72156,7 @@ in sources."escape-string-regexp-4.0.0" sources."esprima-4.0.1" sources."external-editor-3.1.0" - sources."fast-glob-3.3.1" + sources."fast-glob-3.3.2" sources."fast-levenshtein-3.0.0" sources."fastest-levenshtein-1.0.16" sources."fastq-1.15.0" @@ -73293,10 +72305,10 @@ in elasticdump = nodeEnv.buildNodePackage { name = "elasticdump"; packageName = "elasticdump"; - version = "6.104.1"; + version = "6.106.0"; src = fetchurl { - url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.104.1.tgz"; - sha512 = "XNJKI18duz36jomTjGE0kbMzAx++Wh7+xW53CLUTjACvm0COhopTkj9jRY/kuRiYT8NhuGM/JYzXLI7xuET9gg=="; + url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.106.0.tgz"; + sha512 = "jbj++5ILcP+Hn/dX8Cj8YWICYKRPVMVyzaI4wW/O0NMlRnEWrWU5Qo1m3UKRolPuZ/KcP+pIXvUJJHdvUlojsw=="; }; dependencies = [ sources."@fast-csv/format-4.3.5" @@ -73496,7 +72508,7 @@ in sources."@electron-forge/template-vite-typescript-6.4.2" sources."@electron-forge/template-webpack-6.4.2" sources."@electron-forge/template-webpack-typescript-6.4.2" - (sources."@electron/asar-3.2.7" // { + (sources."@electron/asar-3.2.8" // { dependencies = [ sources."commander-5.1.0" ]; @@ -73516,7 +72528,7 @@ in }) sources."@electron/osx-sign-1.0.5" sources."@electron/rebuild-3.3.0" - (sources."@electron/universal-1.4.2" // { + (sources."@electron/universal-1.4.5" // { dependencies = [ sources."@malept/cross-spawn-promise-1.1.1" sources."fs-extra-9.1.0" @@ -73533,11 +72545,11 @@ in sources."@szmarczak/http-timer-4.0.6" sources."@tootallnate/once-2.0.0" sources."@types/cacheable-request-6.0.3" - sources."@types/http-cache-semantics-4.0.3" + sources."@types/http-cache-semantics-4.0.4" sources."@types/keyv-3.1.4" - sources."@types/node-20.8.10" - sources."@types/responselike-1.0.2" - sources."@types/yauzl-2.10.2" + sources."@types/node-20.9.0" + sources."@types/responselike-1.0.3" + sources."@types/yauzl-2.10.3" sources."@xmldom/xmldom-0.8.10" sources."abbrev-1.1.1" sources."agent-base-6.0.2" @@ -73646,7 +72658,7 @@ in sources."expand-tilde-2.0.2" sources."exponential-backoff-3.1.1" sources."extract-zip-2.0.1" - sources."fast-glob-3.3.1" + sources."fast-glob-3.3.2" sources."fastq-1.15.0" sources."fd-slicer-1.1.0" sources."filename-reserved-regex-2.0.0" @@ -73943,10 +72955,10 @@ in eas-cli = nodeEnv.buildNodePackage { name = "eas-cli"; packageName = "eas-cli"; - version = "5.6.0"; + version = "5.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/eas-cli/-/eas-cli-5.6.0.tgz"; - sha512 = "M1lBKzISUsUhXWmY+f08Nsn5sbKIKRYjymSMdEVh47C46r9sWqL6zqsIrN3Kfv/DXvXL4qo2YiWrAQLxuvWk4A=="; + url = "https://registry.npmjs.org/eas-cli/-/eas-cli-5.7.0.tgz"; + sha512 = "kfYqd9I7S5qm0G4mUF2pNyNuHNImLTOdtd339rV+Y2/mcYMYSeu55tMBMGNFYpDMCHGCNf7d0oLJJ4lqhwdgbQ=="; }; dependencies = [ sources."@0no-co/graphql.web-1.0.4" @@ -73975,21 +72987,15 @@ in ]; }) sources."@expo/config-types-49.0.0" - (sources."@expo/eas-build-job-1.0.46" // { + (sources."@expo/eas-build-job-1.0.48" // { dependencies = [ sources."joi-17.11.0" sources."semver-7.5.4" ]; }) - (sources."@expo/eas-json-5.5.0" // { + (sources."@expo/eas-json-5.7.0" // { dependencies = [ sources."@babel/code-frame-7.18.6" - (sources."@expo/eas-build-job-1.0.39" // { - dependencies = [ - sources."joi-17.11.0" - sources."semver-7.5.4" - ]; - }) ]; }) (sources."@expo/fingerprint-0.4.0" // { @@ -74091,8 +73097,8 @@ in sources."@sideway/address-4.1.4" sources."@sideway/formula-3.0.1" sources."@sideway/pinpoint-2.0.0" - sources."@types/bunyan-1.8.10" - sources."@types/node-20.8.10" + sources."@types/bunyan-1.8.11" + sources."@types/node-20.9.0" sources."@urql/core-4.0.11" sources."@urql/exchange-retry-1.2.0" sources."@xmldom/xmldom-0.8.10" @@ -74112,7 +73118,7 @@ in sources."argparse-1.0.10" sources."array-union-2.1.0" sources."asn1-0.2.6" - sources."async-3.2.4" + sources."async-3.2.5" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" sources."balanced-match-1.0.2" @@ -74463,7 +73469,7 @@ in }) sources."xmlbuilder-15.1.1" sources."yallist-4.0.0" - sources."yaml-2.3.3" + sources."yaml-2.3.4" sources."yocto-queue-0.1.0" ]; buildInputs = globalBuildInputs; @@ -74504,9 +73510,9 @@ in }; dependencies = [ sources."@alcalzone/ansi-tokenize-0.1.3" - sources."@types/prop-types-15.7.9" - sources."@types/react-18.2.34" - sources."@types/scheduler-0.16.5" + sources."@types/prop-types-15.7.10" + sources."@types/react-18.2.37" + sources."@types/scheduler-0.16.6" sources."ajv-8.12.0" sources."ajv-formats-2.1.1" (sources."ansi-escapes-6.2.0" // { @@ -74681,17 +73687,17 @@ in eslint = nodeEnv.buildNodePackage { name = "eslint"; packageName = "eslint"; - version = "8.52.0"; + version = "8.53.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-8.52.0.tgz"; - sha512 = "zh/JHnaixqHZsolRB/w9/02akBk9EPrOs9JwcTP2ek7yL5bVvXuRariiaAjjoJ5DvuwQ1WAE/HsMz+w17YgBCg=="; + url = "https://registry.npmjs.org/eslint/-/eslint-8.53.0.tgz"; + sha512 = "N4VuiPjXDUa4xVeV/GC/RV3hQW9Nw+Y463lkWaKKXKYMvmRiRDAtfpuPFLN+E1/6ZhyR8J2ig+eVREnYgUsiag=="; }; dependencies = [ sources."@aashutoshrathi/word-wrap-1.2.6" sources."@eslint-community/eslint-utils-4.4.0" sources."@eslint-community/regexpp-4.10.0" - sources."@eslint/eslintrc-2.1.2" - sources."@eslint/js-8.52.0" + sources."@eslint/eslintrc-2.1.3" + sources."@eslint/js-8.53.0" sources."@humanwhocodes/config-array-0.11.13" sources."@humanwhocodes/module-importer-1.0.1" sources."@humanwhocodes/object-schema-2.0.1" @@ -74717,7 +73723,7 @@ in sources."deep-is-0.1.4" sources."doctrine-3.0.0" sources."escape-string-regexp-4.0.0" - sources."eslint-8.52.0" + sources."eslint-8.53.0" sources."eslint-scope-7.2.2" sources."eslint-visitor-keys-3.4.3" sources."espree-9.6.1" @@ -74825,8 +73831,8 @@ in dependencies = [ sources."@ampproject/remapping-2.2.1" sources."@babel/code-frame-7.10.4" - sources."@babel/compat-data-7.23.2" - (sources."@babel/core-7.23.2" // { + sources."@babel/compat-data-7.23.3" + (sources."@babel/core-7.23.3" // { dependencies = [ sources."@babel/code-frame-7.22.13" sources."chalk-2.4.2" @@ -74834,7 +73840,7 @@ in sources."semver-6.3.1" ]; }) - sources."@babel/generator-7.23.0" + sources."@babel/generator-7.23.3" sources."@babel/helper-annotate-as-pure-7.22.5" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.22.15" (sources."@babel/helper-compilation-targets-7.22.15" // { @@ -74860,7 +73866,7 @@ in sources."@babel/helper-hoist-variables-7.22.5" sources."@babel/helper-member-expression-to-functions-7.23.0" sources."@babel/helper-module-imports-7.22.15" - sources."@babel/helper-module-transforms-7.23.0" + sources."@babel/helper-module-transforms-7.23.3" 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.20" @@ -74878,13 +73884,14 @@ in sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.23.0" - sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.22.15" - sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.22.15" + sources."@babel/parser-7.23.3" + sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.23.3" + sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.23.3" + sources."@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.23.3" sources."@babel/plugin-proposal-async-generator-functions-7.20.7" sources."@babel/plugin-proposal-class-properties-7.18.6" - sources."@babel/plugin-proposal-decorators-7.23.2" - sources."@babel/plugin-proposal-export-default-from-7.22.17" + sources."@babel/plugin-proposal-decorators-7.23.3" + sources."@babel/plugin-proposal-export-default-from-7.23.3" sources."@babel/plugin-proposal-nullish-coalescing-operator-7.18.6" sources."@babel/plugin-proposal-object-rest-spread-7.20.7" sources."@babel/plugin-proposal-optional-catch-binding-7.18.6" @@ -74893,16 +73900,16 @@ in 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-decorators-7.22.10" + sources."@babel/plugin-syntax-decorators-7.23.3" sources."@babel/plugin-syntax-dynamic-import-7.8.3" - sources."@babel/plugin-syntax-export-default-from-7.22.5" + sources."@babel/plugin-syntax-export-default-from-7.23.3" sources."@babel/plugin-syntax-export-namespace-from-7.8.3" - sources."@babel/plugin-syntax-flow-7.22.5" - sources."@babel/plugin-syntax-import-assertions-7.22.5" - sources."@babel/plugin-syntax-import-attributes-7.22.5" + sources."@babel/plugin-syntax-flow-7.23.3" + sources."@babel/plugin-syntax-import-assertions-7.23.3" + sources."@babel/plugin-syntax-import-attributes-7.23.3" 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-jsx-7.23.3" 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" @@ -74911,68 +73918,68 @@ in 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-typescript-7.22.5" + sources."@babel/plugin-syntax-typescript-7.23.3" 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.23.2" - 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.23.0" - sources."@babel/plugin-transform-class-properties-7.22.5" - sources."@babel/plugin-transform-class-static-block-7.22.11" - sources."@babel/plugin-transform-classes-7.22.15" - sources."@babel/plugin-transform-computed-properties-7.22.5" - sources."@babel/plugin-transform-destructuring-7.23.0" - 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.11" - sources."@babel/plugin-transform-exponentiation-operator-7.22.5" - sources."@babel/plugin-transform-export-namespace-from-7.22.11" - sources."@babel/plugin-transform-flow-strip-types-7.22.5" - sources."@babel/plugin-transform-for-of-7.22.15" - sources."@babel/plugin-transform-function-name-7.22.5" - sources."@babel/plugin-transform-json-strings-7.22.11" - sources."@babel/plugin-transform-literals-7.22.5" - sources."@babel/plugin-transform-logical-assignment-operators-7.22.11" - sources."@babel/plugin-transform-member-expression-literals-7.22.5" - sources."@babel/plugin-transform-modules-amd-7.23.0" - sources."@babel/plugin-transform-modules-commonjs-7.23.0" - sources."@babel/plugin-transform-modules-systemjs-7.23.0" - sources."@babel/plugin-transform-modules-umd-7.22.5" + sources."@babel/plugin-transform-arrow-functions-7.23.3" + sources."@babel/plugin-transform-async-generator-functions-7.23.3" + sources."@babel/plugin-transform-async-to-generator-7.23.3" + sources."@babel/plugin-transform-block-scoped-functions-7.23.3" + sources."@babel/plugin-transform-block-scoping-7.23.3" + sources."@babel/plugin-transform-class-properties-7.23.3" + sources."@babel/plugin-transform-class-static-block-7.23.3" + sources."@babel/plugin-transform-classes-7.23.3" + sources."@babel/plugin-transform-computed-properties-7.23.3" + sources."@babel/plugin-transform-destructuring-7.23.3" + sources."@babel/plugin-transform-dotall-regex-7.23.3" + sources."@babel/plugin-transform-duplicate-keys-7.23.3" + sources."@babel/plugin-transform-dynamic-import-7.23.3" + sources."@babel/plugin-transform-exponentiation-operator-7.23.3" + sources."@babel/plugin-transform-export-namespace-from-7.23.3" + sources."@babel/plugin-transform-flow-strip-types-7.23.3" + sources."@babel/plugin-transform-for-of-7.23.3" + sources."@babel/plugin-transform-function-name-7.23.3" + sources."@babel/plugin-transform-json-strings-7.23.3" + sources."@babel/plugin-transform-literals-7.23.3" + sources."@babel/plugin-transform-logical-assignment-operators-7.23.3" + sources."@babel/plugin-transform-member-expression-literals-7.23.3" + sources."@babel/plugin-transform-modules-amd-7.23.3" + sources."@babel/plugin-transform-modules-commonjs-7.23.3" + sources."@babel/plugin-transform-modules-systemjs-7.23.3" + sources."@babel/plugin-transform-modules-umd-7.23.3" 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.11" - sources."@babel/plugin-transform-numeric-separator-7.22.11" - sources."@babel/plugin-transform-object-rest-spread-7.22.15" - sources."@babel/plugin-transform-object-super-7.22.5" - sources."@babel/plugin-transform-optional-catch-binding-7.22.11" - sources."@babel/plugin-transform-optional-chaining-7.23.0" - sources."@babel/plugin-transform-parameters-7.22.15" - sources."@babel/plugin-transform-private-methods-7.22.5" - sources."@babel/plugin-transform-private-property-in-object-7.22.11" - sources."@babel/plugin-transform-property-literals-7.22.5" - sources."@babel/plugin-transform-react-display-name-7.22.5" + sources."@babel/plugin-transform-new-target-7.23.3" + sources."@babel/plugin-transform-nullish-coalescing-operator-7.23.3" + sources."@babel/plugin-transform-numeric-separator-7.23.3" + sources."@babel/plugin-transform-object-rest-spread-7.23.3" + sources."@babel/plugin-transform-object-super-7.23.3" + sources."@babel/plugin-transform-optional-catch-binding-7.23.3" + sources."@babel/plugin-transform-optional-chaining-7.23.3" + sources."@babel/plugin-transform-parameters-7.23.3" + sources."@babel/plugin-transform-private-methods-7.23.3" + sources."@babel/plugin-transform-private-property-in-object-7.23.3" + sources."@babel/plugin-transform-property-literals-7.23.3" + sources."@babel/plugin-transform-react-display-name-7.23.3" sources."@babel/plugin-transform-react-jsx-7.22.15" - sources."@babel/plugin-transform-react-jsx-self-7.22.5" - sources."@babel/plugin-transform-react-jsx-source-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.23.2" // { + sources."@babel/plugin-transform-react-jsx-self-7.23.3" + sources."@babel/plugin-transform-react-jsx-source-7.23.3" + sources."@babel/plugin-transform-regenerator-7.23.3" + sources."@babel/plugin-transform-reserved-words-7.23.3" + (sources."@babel/plugin-transform-runtime-7.23.3" // { 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-typescript-7.22.15" - 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.23.2" // { + sources."@babel/plugin-transform-shorthand-properties-7.23.3" + sources."@babel/plugin-transform-spread-7.23.3" + sources."@babel/plugin-transform-sticky-regex-7.23.3" + sources."@babel/plugin-transform-template-literals-7.23.3" + sources."@babel/plugin-transform-typeof-symbol-7.23.3" + sources."@babel/plugin-transform-typescript-7.23.3" + sources."@babel/plugin-transform-unicode-escapes-7.23.3" + sources."@babel/plugin-transform-unicode-property-regex-7.23.3" + sources."@babel/plugin-transform-unicode-regex-7.23.3" + sources."@babel/plugin-transform-unicode-sets-regex-7.23.3" + (sources."@babel/preset-env-7.23.3" // { dependencies = [ sources."semver-6.3.1" ]; @@ -74986,13 +73993,13 @@ in sources."chalk-2.4.2" ]; }) - (sources."@babel/traverse-7.23.2" // { + (sources."@babel/traverse-7.23.3" // { dependencies = [ sources."@babel/code-frame-7.22.13" sources."chalk-2.4.2" ]; }) - sources."@babel/types-7.23.0" + sources."@babel/types-7.23.3" sources."@colors/colors-1.5.0" sources."@expo/apple-utils-1.0.0" sources."@expo/bunyan-4.0.0" @@ -75163,41 +74170,41 @@ in sources."@sindresorhus/is-4.6.0" sources."@szmarczak/http-timer-4.0.6" sources."@trysound/sax-0.2.0" - sources."@types/body-parser-1.19.4" - sources."@types/bonjour-3.5.12" + sources."@types/body-parser-1.19.5" + sources."@types/bonjour-3.5.13" sources."@types/cacheable-request-6.0.3" - sources."@types/connect-3.4.37" - sources."@types/connect-history-api-fallback-1.5.2" - sources."@types/eslint-8.44.6" - sources."@types/eslint-scope-3.7.6" - sources."@types/estree-1.0.4" - sources."@types/express-4.17.20" - sources."@types/express-serve-static-core-4.17.39" + sources."@types/connect-3.4.38" + sources."@types/connect-history-api-fallback-1.5.3" + sources."@types/eslint-8.44.7" + sources."@types/eslint-scope-3.7.7" + sources."@types/estree-1.0.5" + sources."@types/express-4.17.21" + sources."@types/express-serve-static-core-4.17.41" sources."@types/glob-7.2.0" sources."@types/html-minifier-terser-6.1.0" - sources."@types/http-cache-semantics-4.0.3" - sources."@types/http-errors-2.0.3" - sources."@types/http-proxy-1.17.13" - sources."@types/istanbul-lib-coverage-2.0.5" - sources."@types/istanbul-lib-report-3.0.2" - sources."@types/istanbul-reports-3.0.3" - sources."@types/json-schema-7.0.14" + sources."@types/http-cache-semantics-4.0.4" + sources."@types/http-errors-2.0.4" + sources."@types/http-proxy-1.17.14" + sources."@types/istanbul-lib-coverage-2.0.6" + sources."@types/istanbul-lib-report-3.0.3" + sources."@types/istanbul-reports-3.0.4" + sources."@types/json-schema-7.0.15" sources."@types/keyv-3.1.4" - sources."@types/mime-1.3.4" + sources."@types/mime-1.3.5" sources."@types/minimatch-5.1.2" - sources."@types/node-20.8.10" - sources."@types/node-forge-1.3.8" - sources."@types/qs-6.9.9" - sources."@types/range-parser-1.2.6" - sources."@types/responselike-1.0.2" - sources."@types/retry-0.12.4" - sources."@types/send-0.17.3" - sources."@types/serve-index-1.9.3" - sources."@types/serve-static-1.15.4" - sources."@types/sockjs-0.3.35" - sources."@types/ws-8.5.8" - sources."@types/yargs-15.0.17" - sources."@types/yargs-parser-21.0.2" + sources."@types/node-20.9.0" + sources."@types/node-forge-1.3.9" + sources."@types/qs-6.9.10" + sources."@types/range-parser-1.2.7" + sources."@types/responselike-1.0.3" + sources."@types/retry-0.12.5" + sources."@types/send-0.17.4" + sources."@types/serve-index-1.9.4" + sources."@types/serve-static-1.15.5" + sources."@types/sockjs-0.3.36" + sources."@types/ws-8.5.9" + sources."@types/yargs-15.0.18" + sources."@types/yargs-parser-21.0.3" sources."@urql/core-2.3.6" sources."@urql/exchange-retry-0.3.0" sources."@webassemblyjs/ast-1.11.6" @@ -75316,7 +74323,7 @@ in sources."camel-case-4.1.2" sources."camelcase-6.3.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001559" + sources."caniuse-lite-1.0.30001561" (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -75459,7 +74466,7 @@ in sources."dot-case-3.0.4" sources."duplexer3-0.1.5" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.574" + sources."electron-to-chromium-1.4.579" sources."emoji-regex-8.0.0" sources."emojis-list-3.0.0" sources."encodeurl-1.0.2" @@ -75581,7 +74588,7 @@ in ]; }) sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.3.1" + sources."fast-glob-3.3.2" sources."fast-json-stable-stringify-2.1.0" sources."fastq-1.15.0" sources."faye-websocket-0.11.4" @@ -75829,7 +74836,7 @@ in sources."multicast-dns-7.2.5" sources."mv-2.1.1" sources."mz-2.7.0" - sources."nanoid-3.3.6" + sources."nanoid-3.3.7" sources."ncp-2.0.0" (sources."needle-2.9.1" // { dependencies = [ @@ -76399,16 +75406,16 @@ in dependencies = [ sources."@ampproject/remapping-2.2.1" sources."@babel/code-frame-7.22.13" - sources."@babel/compat-data-7.23.2" - sources."@babel/core-7.23.2" - sources."@babel/generator-7.23.0" + sources."@babel/compat-data-7.23.3" + sources."@babel/core-7.23.3" + sources."@babel/generator-7.23.3" sources."@babel/helper-annotate-as-pure-7.22.5" sources."@babel/helper-compilation-targets-7.22.15" sources."@babel/helper-environment-visitor-7.22.20" sources."@babel/helper-function-name-7.23.0" sources."@babel/helper-hoist-variables-7.22.5" sources."@babel/helper-module-imports-7.22.15" - sources."@babel/helper-module-transforms-7.23.0" + sources."@babel/helper-module-transforms-7.23.3" sources."@babel/helper-plugin-utils-7.22.5" sources."@babel/helper-simple-access-7.22.5" sources."@babel/helper-split-export-declaration-7.22.6" @@ -76417,28 +75424,28 @@ in sources."@babel/helper-validator-option-7.22.15" sources."@babel/helpers-7.23.2" sources."@babel/highlight-7.22.20" - sources."@babel/parser-7.23.0" + sources."@babel/parser-7.23.3" sources."@babel/plugin-proposal-object-rest-spread-7.20.7" - sources."@babel/plugin-syntax-jsx-7.22.5" + sources."@babel/plugin-syntax-jsx-7.23.3" sources."@babel/plugin-syntax-object-rest-spread-7.8.3" - sources."@babel/plugin-transform-destructuring-7.23.0" - sources."@babel/plugin-transform-parameters-7.22.15" + sources."@babel/plugin-transform-destructuring-7.23.3" + sources."@babel/plugin-transform-parameters-7.23.3" sources."@babel/plugin-transform-react-jsx-7.22.15" sources."@babel/template-7.22.15" - sources."@babel/traverse-7.23.2" - sources."@babel/types-7.23.0" + sources."@babel/traverse-7.23.3" + sources."@babel/types-7.23.3" 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.20" - sources."@types/minimist-1.2.4" - sources."@types/node-20.8.10" - sources."@types/normalize-package-data-2.4.3" - sources."@types/prop-types-15.7.9" - sources."@types/react-18.2.34" - sources."@types/scheduler-0.16.5" - sources."@types/yauzl-2.10.2" + sources."@types/minimist-1.2.5" + sources."@types/node-20.9.0" + sources."@types/normalize-package-data-2.4.4" + sources."@types/prop-types-15.7.10" + sources."@types/react-18.2.37" + sources."@types/scheduler-0.16.6" + sources."@types/yauzl-2.10.3" sources."@types/yoga-layout-1.9.2" sources."agent-base-6.0.2" (sources."ansi-escapes-4.3.2" // { @@ -76464,7 +75471,7 @@ in sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001559" + sources."caniuse-lite-1.0.30001561" sources."chalk-2.4.2" sources."chownr-1.1.4" sources."ci-info-2.0.0" @@ -76490,7 +75497,7 @@ in }) sources."delay-5.0.0" sources."devtools-protocol-0.0.981744" - sources."electron-to-chromium-1.4.574" + sources."electron-to-chromium-1.4.579" sources."emoji-regex-8.0.0" sources."encoding-0.1.13" sources."end-of-stream-1.4.4" @@ -76690,10 +75697,10 @@ in fauna-shell = nodeEnv.buildNodePackage { name = "fauna-shell"; packageName = "fauna-shell"; - version = "1.1.0"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/fauna-shell/-/fauna-shell-1.1.0.tgz"; - sha512 = "eEXMUd+tdYj3W4jvMvnOhANmLmQSOpr4pNssVjyiBUHq1QD2t8E+WlNoeTEpX7dO7H+fIXKAWWHyeUvOIYHvGA=="; + url = "https://registry.npmjs.org/fauna-shell/-/fauna-shell-1.1.2.tgz"; + sha512 = "gGfiMOxAZQTuVW2aWMhNTCBu6L/cdt5olLH/wy2teL4ZiM5c1YYCXt/NHP1mOSATV/l9i/CxmGiFomgcDzCDfQ=="; }; dependencies = [ sources."@cspotcode/source-map-support-0.8.1" @@ -76731,17 +75738,17 @@ in sources."@oclif/plugin-plugins-2.4.7" sources."@oclif/screen-1.0.4" sources."@sindresorhus/is-0.7.0" - sources."@swc/core-1.3.95" + sources."@swc/core-1.3.96" sources."@swc/counter-0.1.2" sources."@swc/helpers-0.5.3" sources."@swc/types-0.1.5" - sources."@swc/wasm-1.3.95" + sources."@swc/wasm-1.3.97" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.4" - sources."@types/cli-progress-3.11.4" - sources."@types/node-20.8.10" + sources."@types/cli-progress-3.11.5" + sources."@types/node-20.9.0" sources."acorn-8.11.2" sources."acorn-walk-8.3.0" sources."ajv-6.12.6" @@ -76756,7 +75763,7 @@ in sources."asn1-0.2.6" sources."assert-plus-1.0.0" sources."astral-regex-2.0.0" - sources."async-3.2.4" + sources."async-3.2.5" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" sources."aws-sign2-0.7.0" @@ -76885,7 +75892,7 @@ in sources."extract-stack-1.0.0" sources."extsprintf-1.3.0" sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.3.1" + sources."fast-glob-3.3.2" sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" sources."fastq-1.15.0" @@ -77200,97 +76207,58 @@ in fkill-cli = nodeEnv.buildNodePackage { name = "fkill-cli"; packageName = "fkill-cli"; - version = "7.1.0"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/fkill-cli/-/fkill-cli-7.1.0.tgz"; - sha512 = "EkJbYwI1Wt3oujxNlFF0Mq3hqdkDtQz7cPhZnXzUxmNhaxVopDqiwnB3zZmVvt2t6uKvplh21kLTTJ11hWH+0w=="; + url = "https://registry.npmjs.org/fkill-cli/-/fkill-cli-8.0.0.tgz"; + sha512 = "+eT/06NHwPXfzUSe4vDjjam9gZtalhwDYOq0xX6va88BLZd8APbo17Ajkz4hdnr2Gpls5+xFUqMeiklAQtBHYQ=="; }; dependencies = [ - (sources."@babel/code-frame-7.22.13" // { - dependencies = [ - sources."ansi-styles-3.2.1" - sources."chalk-2.4.2" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."escape-string-regexp-1.0.5" - sources."has-flag-3.0.0" - sources."supports-color-5.5.0" - ]; - }) - sources."@babel/helper-validator-identifier-7.22.20" - (sources."@babel/highlight-7.22.20" // { - dependencies = [ - sources."ansi-styles-3.2.1" - sources."chalk-2.4.2" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."escape-string-regexp-1.0.5" - sources."has-flag-3.0.0" - sources."supports-color-5.5.0" - ]; - }) - sources."@types/minimist-1.2.4" - sources."@types/normalize-package-data-2.4.3" - sources."aggregate-error-4.0.1" + sources."@ljharb/through-2.3.11" + sources."aggregate-error-5.0.0" sources."ansi-escapes-4.3.2" sources."ansi-regex-6.0.1" - sources."ansi-styles-4.3.0" - sources."arrify-3.0.0" + sources."ansi-styles-6.2.1" sources."base64-js-1.5.1" sources."bl-4.1.0" sources."buffer-5.7.1" - sources."camelcase-6.3.0" - (sources."camelcase-keys-7.0.2" // { - dependencies = [ - sources."type-fest-1.4.0" - ]; - }) - sources."chalk-4.1.2" + sources."call-bind-1.0.5" + sources."chalk-5.3.0" sources."chardet-0.7.0" - sources."clean-stack-4.2.0" + sources."clean-stack-5.2.0" sources."cli-cursor-3.1.0" sources."cli-spinners-2.9.1" - sources."cli-truncate-3.1.0" - sources."cli-width-3.0.0" + sources."cli-truncate-4.0.0" + sources."cli-width-4.1.0" sources."clone-1.0.4" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."cross-spawn-7.0.3" - sources."decamelize-5.0.1" - (sources."decamelize-keys-1.1.1" // { - dependencies = [ - sources."decamelize-1.2.0" - sources."map-obj-1.0.1" - ]; - }) sources."defaults-1.0.4" - sources."eastasianwidth-0.2.0" - sources."emoji-regex-9.2.2" - sources."error-ex-1.3.2" + sources."define-data-property-1.1.1" + sources."emoji-regex-10.3.0" sources."esc-exit-3.0.0" sources."escape-string-regexp-5.0.0" - sources."execa-5.1.1" + sources."execa-8.0.1" sources."external-editor-3.1.0" - (sources."figures-3.2.0" // { - dependencies = [ - sources."escape-string-regexp-1.0.5" - ]; - }) - sources."find-up-5.0.0" - sources."fkill-8.1.1" + sources."figures-5.0.0" + sources."fkill-9.0.0" sources."function-bind-1.1.2" sources."fuzzy-search-3.2.1" - sources."get-stream-6.0.1" - sources."hard-rejection-2.1.0" + sources."get-east-asian-width-1.2.0" + sources."get-intrinsic-1.2.2" + sources."get-stream-8.0.1" + sources."gopd-1.0.1" sources."has-flag-4.0.0" + sources."has-property-descriptors-1.0.1" + sources."has-proto-1.0.1" + sources."has-symbols-1.0.3" sources."hasown-2.0.0" - sources."hosted-git-info-4.1.0" - sources."human-signals-2.1.0" + sources."human-signals-5.0.0" sources."iconv-lite-0.4.24" sources."ieee754-1.2.1" sources."indent-string-5.0.0" sources."inherits-2.0.4" - (sources."inquirer-8.2.6" // { + (sources."inquirer-9.2.12" // { dependencies = [ sources."ansi-regex-5.0.1" sources."emoji-regex-8.0.0" @@ -77299,125 +76267,98 @@ in sources."strip-ansi-6.0.1" ]; }) - (sources."inquirer-autocomplete-prompt-1.4.0" // { + (sources."inquirer-autocomplete-prompt-3.0.1" // { dependencies = [ - sources."rxjs-6.6.7" - sources."tslib-1.14.1" + sources."ansi-escapes-6.2.0" + sources."run-async-2.4.1" + sources."type-fest-3.13.1" ]; }) - sources."is-arrayish-0.2.1" - sources."is-core-module-2.13.1" sources."is-fullwidth-code-point-4.0.0" sources."is-interactive-1.0.0" - sources."is-plain-obj-1.1.0" - sources."is-stream-2.0.1" - sources."is-unicode-supported-0.1.0" + sources."is-stream-3.0.0" + sources."is-unicode-supported-1.3.0" sources."isexe-2.0.0" - sources."js-tokens-4.0.0" - sources."json-parse-even-better-errors-2.3.1" - sources."kind-of-6.0.3" - sources."lines-and-columns-1.2.4" - sources."locate-path-6.0.0" sources."lodash-4.17.21" - sources."log-symbols-4.1.0" - sources."lru-cache-6.0.0" - sources."map-obj-4.3.0" - (sources."meow-10.1.5" // { + (sources."log-symbols-4.1.0" // { dependencies = [ - sources."type-fest-1.4.0" + sources."ansi-styles-4.3.0" + sources."chalk-4.1.2" + sources."is-unicode-supported-0.1.0" ]; }) + sources."meow-12.1.1" sources."merge-stream-2.0.0" - sources."mimic-fn-2.1.0" - sources."min-indent-1.0.1" - (sources."minimist-options-4.1.0" // { + sources."mimic-fn-4.0.0" + sources."mute-stream-1.0.0" + (sources."npm-run-path-5.1.0" // { dependencies = [ - sources."arrify-1.0.1" + sources."path-key-4.0.0" ]; }) - sources."mute-stream-0.0.8" - sources."normalize-package-data-3.0.3" - sources."npm-run-path-4.0.1" sources."num-sort-3.0.0" - sources."onetime-5.1.2" + sources."onetime-6.0.0" (sources."ora-5.4.1" // { dependencies = [ sources."ansi-regex-5.0.1" + sources."ansi-styles-4.3.0" + sources."chalk-4.1.2" + sources."is-unicode-supported-0.1.0" sources."strip-ansi-6.0.1" ]; }) sources."os-tmpdir-1.0.2" - sources."p-limit-3.1.0" - sources."p-locate-5.0.0" - sources."parse-json-5.2.0" - sources."path-exists-4.0.0" sources."path-key-3.1.1" - sources."pid-port-0.2.0" - (sources."process-exists-4.1.0" // { - dependencies = [ - sources."ps-list-6.3.0" - ]; - }) - sources."ps-list-7.2.0" - sources."quick-lru-5.1.1" - (sources."read-pkg-6.0.0" // { - dependencies = [ - sources."type-fest-1.4.0" - ]; - }) - (sources."read-pkg-up-8.0.0" // { + sources."picocolors-1.0.0" + sources."pid-port-1.0.0" + sources."process-exists-5.0.0" + sources."ps-list-8.1.1" + sources."readable-stream-3.6.2" + (sources."restore-cursor-3.1.0" // { dependencies = [ - sources."type-fest-1.4.0" + sources."mimic-fn-2.1.0" + sources."onetime-5.1.2" + sources."signal-exit-3.0.7" ]; }) - sources."readable-stream-3.6.2" - sources."redent-4.0.0" - sources."restore-cursor-3.1.0" - sources."run-async-2.4.1" + sources."run-async-3.0.0" sources."rxjs-7.8.1" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" - sources."semver-7.5.4" + sources."set-function-length-1.1.1" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" - sources."signal-exit-3.0.7" - (sources."slice-ansi-5.0.0" // { - dependencies = [ - sources."ansi-styles-6.2.1" - ]; - }) - sources."spdx-correct-3.2.0" - sources."spdx-exceptions-2.3.0" - sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.16" - sources."string-width-5.1.2" + sources."signal-exit-4.1.0" + sources."slice-ansi-5.0.0" + sources."string-width-7.0.0" sources."string_decoder-1.3.0" sources."strip-ansi-7.1.0" - sources."strip-final-newline-2.0.0" - sources."strip-indent-4.0.0" + sources."strip-final-newline-3.0.0" sources."supports-color-7.2.0" - sources."taskkill-4.0.0" - sources."through-2.3.8" + (sources."taskkill-5.0.0" // { + dependencies = [ + sources."execa-6.1.0" + sources."get-stream-6.0.1" + sources."human-signals-3.0.1" + sources."signal-exit-3.0.7" + ]; + }) sources."tmp-0.0.33" - sources."trim-newlines-4.1.1" sources."tslib-2.6.2" sources."type-fest-0.21.3" sources."util-deprecate-1.0.2" - sources."validate-npm-package-license-3.0.4" sources."wcwidth-1.0.1" sources."which-2.0.2" (sources."wrap-ansi-6.2.0" // { dependencies = [ sources."ansi-regex-5.0.1" + sources."ansi-styles-4.3.0" sources."emoji-regex-8.0.0" sources."is-fullwidth-code-point-3.0.0" sources."string-width-4.2.3" sources."strip-ansi-6.0.1" ]; }) - sources."yallist-4.0.0" - sources."yargs-parser-20.2.9" - sources."yocto-queue-0.1.0" ]; buildInputs = globalBuildInputs; meta = { @@ -77445,10 +76386,10 @@ in sources."@scure/base-1.1.3" sources."@scure/bip32-1.3.1" sources."@scure/bip39-1.2.1" - sources."@types/atob-2.1.3" + sources."@types/atob-2.1.4" sources."@types/inquirer-6.5.0" - sources."@types/node-20.8.10" - sources."@types/through-0.0.32" + sources."@types/node-20.9.0" + sources."@types/through-0.0.33" sources."ajv-6.12.6" sources."ansi-escapes-4.3.2" sources."ansi-regex-5.0.1" @@ -77633,7 +76574,7 @@ in dependencies = [ sources."@colors/colors-1.6.0" sources."@dabh/diagnostics-2.0.3" - sources."@types/triple-beam-1.3.4" + sources."@types/triple-beam-1.3.5" (sources."anymatch-2.0.0" // { dependencies = [ sources."normalize-path-2.1.1" @@ -77710,7 +76651,7 @@ in sources."cycle-1.0.3" sources."debug-2.6.9" sources."decode-uri-component-0.2.2" - sources."deep-equal-2.2.2" + sources."deep-equal-2.2.3" sources."define-data-property-1.1.1" sources."define-properties-1.2.1" sources."define-property-2.0.2" @@ -78003,7 +76944,7 @@ in sources."which-typed-array-1.1.13" (sources."winston-3.11.0" // { dependencies = [ - sources."async-3.2.4" + sources."async-3.2.5" sources."readable-stream-3.6.2" ]; }) @@ -78060,9 +77001,9 @@ in sources."utf-8-validate-6.0.3" ]; }) - sources."@types/bn.js-5.1.4" + sources."@types/bn.js-5.1.5" sources."@types/lru-cache-5.1.1" - sources."@types/node-20.8.10" + sources."@types/node-20.9.0" sources."@types/seedrandom-3.0.1" sources."abstract-level-1.0.3" (sources."abstract-leveldown-7.2.0" // { @@ -78115,13 +77056,13 @@ in sources."chalk-2.4.2" ]; }) - sources."@babel/compat-data-7.23.2" - (sources."@babel/core-7.23.2" // { + sources."@babel/compat-data-7.23.3" + (sources."@babel/core-7.23.3" // { dependencies = [ sources."semver-6.3.1" ]; }) - sources."@babel/generator-7.23.0" + sources."@babel/generator-7.23.3" sources."@babel/helper-annotate-as-pure-7.22.5" (sources."@babel/helper-compilation-targets-7.22.15" // { dependencies = [ @@ -78138,7 +77079,7 @@ in sources."@babel/helper-hoist-variables-7.22.5" sources."@babel/helper-member-expression-to-functions-7.23.0" sources."@babel/helper-module-imports-7.22.15" - sources."@babel/helper-module-transforms-7.23.0" + sources."@babel/helper-module-transforms-7.23.3" sources."@babel/helper-optimise-call-expression-7.22.5" sources."@babel/helper-plugin-utils-7.22.5" sources."@babel/helper-replace-supers-7.22.20" @@ -78154,16 +77095,16 @@ in sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.23.0" - sources."@babel/plugin-syntax-jsx-7.22.5" - sources."@babel/plugin-syntax-typescript-7.22.5" - sources."@babel/plugin-transform-modules-commonjs-7.23.0" - sources."@babel/plugin-transform-typescript-7.22.15" - sources."@babel/preset-typescript-7.23.2" + sources."@babel/parser-7.23.3" + sources."@babel/plugin-syntax-jsx-7.23.3" + sources."@babel/plugin-syntax-typescript-7.23.3" + sources."@babel/plugin-transform-modules-commonjs-7.23.3" + sources."@babel/plugin-transform-typescript-7.23.3" + sources."@babel/preset-typescript-7.23.3" sources."@babel/runtime-7.23.2" sources."@babel/template-7.22.15" - sources."@babel/traverse-7.23.2" - sources."@babel/types-7.23.0" + sources."@babel/traverse-7.23.3" + sources."@babel/types-7.23.3" sources."@hapi/hoek-9.3.0" sources."@hapi/topo-5.1.0" sources."@jridgewell/gen-mapping-0.3.3" @@ -78186,12 +77127,12 @@ in sources."@turist/fetch-7.2.0" sources."@turist/time-0.0.2" sources."@types/cacheable-request-6.0.3" - sources."@types/common-tags-1.8.3" - sources."@types/http-cache-semantics-4.0.3" + sources."@types/common-tags-1.8.4" + sources."@types/http-cache-semantics-4.0.4" sources."@types/keyv-3.1.4" - sources."@types/node-20.8.10" - sources."@types/node-fetch-2.6.8" - sources."@types/responselike-1.0.2" + sources."@types/node-20.9.0" + sources."@types/node-fetch-2.6.9" + sources."@types/responselike-1.0.3" sources."@types/yoga-layout-1.9.2" sources."ansi-align-3.0.1" (sources."ansi-escapes-4.3.2" // { @@ -78216,7 +77157,7 @@ in ]; }) sources."camelcase-6.3.0" - sources."caniuse-lite-1.0.30001559" + sources."caniuse-lite-1.0.30001561" (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -78277,7 +77218,7 @@ in sources."domhandler-4.3.1" sources."domutils-2.8.0" sources."dot-prop-5.3.0" - sources."electron-to-chromium-1.4.574" + sources."electron-to-chromium-1.4.579" sources."emoji-regex-8.0.0" sources."encoding-0.1.13" sources."end-of-stream-1.4.4" @@ -79006,8 +77947,8 @@ in sources."@nodelib/fs.walk-1.2.8" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-20.8.10" - sources."@types/parse-json-4.0.1" + sources."@types/node-20.9.0" + sources."@types/parse-json-4.0.2" sources."@types/websocket-1.0.2" sources."abort-controller-3.0.0" sources."aggregate-error-3.1.0" @@ -79090,7 +78031,7 @@ in sources."dataloader-2.0.0" sources."debug-4.3.4" sources."decompress-response-3.3.0" - sources."deep-equal-2.2.2" + sources."deep-equal-2.2.3" sources."deep-extend-0.6.0" sources."defaults-1.0.4" sources."defer-to-connect-1.1.3" @@ -79120,7 +78061,7 @@ in sources."extract-files-9.0.0" sources."extsprintf-1.3.0" sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.3.1" + sources."fast-glob-3.3.2" sources."fast-json-stable-stringify-2.1.0" sources."fast-safe-stringify-2.1.1" sources."fastq-1.15.0" @@ -79493,15 +78434,15 @@ in sources."@ampproject/remapping-2.2.1" sources."@ardatan/sync-fetch-0.0.1" sources."@babel/code-frame-7.22.13" - sources."@babel/compat-data-7.23.2" - sources."@babel/core-7.23.2" - sources."@babel/generator-7.23.0" + sources."@babel/compat-data-7.23.3" + sources."@babel/core-7.23.3" + sources."@babel/generator-7.23.3" sources."@babel/helper-compilation-targets-7.22.15" sources."@babel/helper-environment-visitor-7.22.20" sources."@babel/helper-function-name-7.23.0" sources."@babel/helper-hoist-variables-7.22.5" sources."@babel/helper-module-imports-7.22.15" - sources."@babel/helper-module-transforms-7.23.0" + sources."@babel/helper-module-transforms-7.23.3" sources."@babel/helper-plugin-utils-7.22.5" sources."@babel/helper-simple-access-7.22.5" sources."@babel/helper-split-export-declaration-7.22.6" @@ -79510,12 +78451,12 @@ in sources."@babel/helper-validator-option-7.22.15" sources."@babel/helpers-7.23.2" sources."@babel/highlight-7.22.20" - sources."@babel/parser-7.23.0" - sources."@babel/plugin-syntax-import-assertions-7.22.5" + sources."@babel/parser-7.23.3" + sources."@babel/plugin-syntax-import-assertions-7.23.3" sources."@babel/polyfill-7.12.1" sources."@babel/template-7.22.15" - sources."@babel/traverse-7.23.2" - sources."@babel/types-7.23.0" + sources."@babel/traverse-7.23.3" + sources."@babel/types-7.23.3" sources."@graphql-tools/batch-execute-9.0.2" sources."@graphql-tools/code-file-loader-8.0.1" sources."@graphql-tools/delegate-10.0.3" @@ -79543,18 +78484,18 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@repeaterjs/repeater-3.0.4" - sources."@types/estree-1.0.4" - sources."@types/node-20.8.10" - sources."@types/ws-8.5.8" + sources."@repeaterjs/repeater-3.0.5" + sources."@types/estree-1.0.5" + sources."@types/node-20.9.0" + sources."@types/ws-8.5.9" sources."@types/yargs-16.0.5" - sources."@types/yargs-parser-21.0.2" - sources."@vue/compiler-core-3.3.7" - sources."@vue/compiler-dom-3.3.7" - sources."@vue/compiler-sfc-3.3.7" - sources."@vue/compiler-ssr-3.3.7" - sources."@vue/reactivity-transform-3.3.7" - sources."@vue/shared-3.3.7" + sources."@types/yargs-parser-21.0.3" + sources."@vue/compiler-core-3.3.8" + sources."@vue/compiler-dom-3.3.8" + sources."@vue/compiler-sfc-3.3.8" + sources."@vue/compiler-ssr-3.3.8" + sources."@vue/reactivity-transform-3.3.8" + sources."@vue/shared-3.3.8" sources."@whatwg-node/events-0.1.1" sources."@whatwg-node/fetch-0.9.14" sources."@whatwg-node/node-fetch-0.5.0" @@ -79572,7 +78513,7 @@ in sources."bufferutil-4.0.8" sources."busboy-1.6.0" sources."callsites-3.1.0" - sources."caniuse-lite-1.0.30001559" + sources."caniuse-lite-1.0.30001561" sources."chalk-2.4.2" sources."cliui-7.0.4" (sources."code-red-1.0.4" // { @@ -79596,7 +78537,7 @@ in sources."dir-glob-3.0.1" sources."dotenv-10.0.0" sources."dset-3.1.3" - sources."electron-to-chromium-1.4.574" + sources."electron-to-chromium-1.4.579" sources."emoji-regex-8.0.0" sources."encoding-0.1.13" sources."error-ex-1.3.2" @@ -79605,7 +78546,7 @@ in sources."estree-walker-2.0.2" sources."extract-files-11.0.0" sources."fast-decode-uri-component-1.0.1" - sources."fast-glob-3.3.1" + sources."fast-glob-3.3.2" sources."fast-querystring-1.1.2" sources."fast-url-parser-1.1.3" sources."fastq-1.15.0" @@ -79661,7 +78602,7 @@ in sources."minimatch-3.1.2" sources."mkdirp-1.0.4" sources."ms-2.1.2" - sources."nanoid-3.3.6" + sources."nanoid-3.3.7" sources."no-case-3.0.4" sources."node-abort-controller-3.1.1" sources."node-fetch-2.7.0" @@ -81143,8 +80084,8 @@ in }; dependencies = [ sources."@jcubic/lily-0.3.0" - sources."@types/jquery-3.5.25" - sources."@types/sizzle-2.3.5" + sources."@types/jquery-3.5.27" + sources."@types/sizzle-2.3.6" sources."ansidec-0.3.4" sources."arch-2.2.0" sources."clipboardy-2.3.0" @@ -81195,22 +80136,25 @@ in intelephense = nodeEnv.buildNodePackage { name = "intelephense"; packageName = "intelephense"; - version = "1.9.5"; + version = "1.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/intelephense/-/intelephense-1.9.5.tgz"; - sha512 = "5iU2b84SLE3JOlfGU/g6XCzioEdcflmpHRxPLKEMhEzV43DHgBwbdsTagDtXKtO50hi8osrzA85/HOCglrylKA=="; + url = "https://registry.npmjs.org/intelephense/-/intelephense-1.10.0.tgz"; + sha512 = "Qr0HfhN1dGPHCAaboH2ypopDadAQyH3uIcIbegslWZao2msrpJ6sIJwKWc10QJBbS5s/jorA9NCk+x+2fwlhaw=="; }; dependencies = [ sources."@azure/abort-controller-1.1.0" sources."@azure/core-auth-1.5.0" - sources."@azure/core-http-2.3.2" - sources."@azure/core-tracing-1.0.0-preview.13" - sources."@azure/core-util-1.6.1" + sources."@azure/core-rest-pipeline-1.10.1" + sources."@azure/core-tracing-1.0.1" + sources."@azure/core-util-1.2.0" sources."@azure/logger-1.0.4" - sources."@bmewburn/js-beautify-1.14.7" - sources."@bmewburn/vscode-html-languageserver-1.9.0" + sources."@azure/opentelemetry-instrumentation-azure-sdk-1.0.0-beta.5" + sources."@bmewburn/js-beautify-1.14.9" + sources."@bmewburn/vscode-html-languageserver-1.10.0" + sources."@isaacs/cliui-8.0.2" (sources."@mapbox/node-pre-gyp-1.0.11" // { dependencies = [ + sources."abbrev-1.1.1" sources."nopt-5.0.0" ]; }) @@ -81218,11 +80162,13 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@opentelemetry/api-1.6.0" - sources."@opentelemetry/core-1.17.1" - sources."@opentelemetry/resources-1.17.1" - sources."@opentelemetry/sdk-trace-base-1.17.1" - sources."@opentelemetry/semantic-conventions-1.17.1" + sources."@one-ini/wasm-0.1.1" + sources."@opentelemetry/api-1.7.0" + sources."@opentelemetry/core-1.18.1" + sources."@opentelemetry/instrumentation-0.41.2" + sources."@opentelemetry/resources-1.18.1" + sources."@opentelemetry/sdk-trace-base-1.18.1" + sources."@opentelemetry/semantic-conventions-1.18.1" sources."@protobufjs/aspromise-1.1.2" sources."@protobufjs/base64-1.1.2" sources."@protobufjs/codegen-2.0.4" @@ -81234,15 +80180,18 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@selderee/plugin-htmlparser2-0.11.0" - sources."@types/node-20.8.10" - sources."@types/node-fetch-2.6.8" - sources."@types/tunnel-0.0.3" + sources."@tootallnate/once-2.0.0" + sources."@types/node-20.9.0" + sources."@types/shimmer-1.0.5" sources."@vscode/l10n-0.0.16" - sources."abbrev-1.1.1" + sources."abbrev-2.0.0" + sources."acorn-8.11.2" + sources."acorn-import-assertions-1.9.0" sources."agent-base-6.0.2" sources."ajv-6.12.6" sources."ansi-regex-5.0.1" - sources."applicationinsights-2.3.6" + sources."ansi-styles-6.2.1" + sources."applicationinsights-2.7.3" sources."applicationinsights-native-metrics-0.0.10" sources."aproba-2.0.0" sources."are-we-there-yet-2.0.0" @@ -81263,103 +80212,105 @@ in sources."braces-3.0.2" sources."caseless-0.12.0" sources."chownr-2.0.0" + sources."cjs-module-lexer-1.2.3" (sources."cls-hooked-4.2.2" // { dependencies = [ sources."semver-5.7.2" ]; }) + sources."color-convert-2.0.1" + sources."color-name-1.1.4" sources."color-support-1.1.3" sources."combined-stream-1.0.8" - sources."commander-2.20.3" + sources."commander-10.0.1" sources."concat-map-0.0.1" sources."config-chain-1.1.13" sources."console-control-strings-1.1.0" sources."continuation-local-storage-3.2.1" sources."core-util-is-1.0.2" + sources."cross-spawn-7.0.3" sources."dashdash-1.14.1" sources."debug-4.3.4" sources."deepmerge-4.3.1" sources."delayed-stream-1.0.0" sources."delegates-1.0.0" sources."detect-libc-2.0.2" - (sources."diagnostic-channel-1.1.0" // { - dependencies = [ - sources."semver-5.7.2" - ]; - }) - sources."diagnostic-channel-publishers-1.0.5" + sources."diagnostic-channel-1.1.1" + sources."diagnostic-channel-publishers-1.0.7" sources."dom-serializer-2.0.0" sources."domelementtype-2.3.0" sources."domhandler-5.0.3" sources."domino-2.1.6" sources."domutils-3.1.0" + sources."eastasianwidth-0.2.0" sources."ecc-jsbn-0.1.2" - (sources."editorconfig-0.15.3" // { - dependencies = [ - sources."lru-cache-4.1.5" - sources."semver-5.7.2" - ]; - }) + sources."editorconfig-1.0.4" sources."emitter-listener-1.1.2" - sources."emoji-regex-8.0.0" + sources."emoji-regex-9.2.2" sources."encoding-0.1.13" sources."entities-4.5.0" sources."extend-3.0.2" sources."extsprintf-1.3.0" sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.2.12" + sources."fast-glob-3.3.2" sources."fast-json-stable-stringify-2.1.0" sources."fastq-1.15.0" sources."fill-range-7.0.1" + sources."foreground-child-3.1.1" sources."forever-agent-0.6.1" sources."form-data-4.0.0" - (sources."fs-extra-11.1.1" // { - dependencies = [ - sources."universalify-2.0.1" - ]; - }) + sources."fs-extra-11.1.1" (sources."fs-minipass-2.1.0" // { dependencies = [ sources."minipass-3.3.6" - sources."yallist-4.0.0" ]; }) sources."fs.realpath-1.0.0" - sources."gauge-3.0.2" + sources."function-bind-1.1.2" + (sources."gauge-3.0.2" // { + dependencies = [ + sources."emoji-regex-8.0.0" + sources."signal-exit-3.0.7" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" + ]; + }) sources."getpass-0.1.7" - sources."glob-8.1.0" + sources."glob-10.3.10" sources."glob-parent-5.1.2" sources."graceful-fs-4.2.11" sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."has-unicode-2.0.1" + sources."hasown-2.0.0" sources."html-to-text-9.0.5" sources."htmlparser2-8.0.2" + sources."http-proxy-agent-5.0.0" sources."http-signature-1.2.0" sources."https-proxy-agent-5.0.1" sources."iconv-lite-0.6.3" + sources."import-in-the-middle-1.4.2" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.8" + sources."is-core-module-2.13.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.3" sources."is-number-7.0.0" sources."is-typedarray-1.0.0" + sources."isexe-2.0.0" sources."isstream-0.1.2" + sources."jackspeak-2.3.6" sources."jsbn-0.1.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" // { - dependencies = [ - sources."universalify-2.0.1" - ]; - }) + sources."jsonfile-6.1.0" sources."jsprim-1.4.2" sources."leac-0.6.0" sources."long-5.2.3" - sources."lru-cache-7.14.1" + sources."lru-cache-10.0.1" (sources."make-dir-3.1.0" // { dependencies = [ sources."semver-6.3.1" @@ -81369,46 +80320,46 @@ in sources."micromatch-4.0.5" sources."mime-db-1.52.0" sources."mime-types-2.1.35" - sources."minimatch-5.1.6" - sources."minipass-5.0.0" + sources."minimatch-9.0.1" + sources."minipass-7.0.4" (sources."minizlib-2.1.2" // { dependencies = [ sources."minipass-3.3.6" - sources."yallist-4.0.0" ]; }) sources."mkdirp-1.0.4" + sources."module-details-from-path-1.0.3" sources."ms-2.1.2" sources."nan-2.18.0" sources."node-fetch-2.7.0" - sources."nopt-6.0.0" + sources."nopt-7.2.0" sources."npmlog-5.0.1" sources."oauth-sign-0.9.0" sources."object-assign-4.1.1" sources."once-1.4.0" sources."parseley-0.12.1" sources."path-is-absolute-1.0.1" + sources."path-key-3.1.1" + sources."path-parse-1.0.7" + sources."path-scurry-1.10.1" sources."peberminta-0.9.0" sources."performance-now-2.1.0" sources."picomatch-2.3.1" - sources."process-0.11.10" sources."proto-list-1.2.4" sources."protobufjs-7.2.5" - sources."pseudomap-1.0.2" sources."psl-1.9.0" sources."punycode-2.3.1" sources."qs-6.5.3" - sources."querystringify-2.2.0" sources."queue-microtask-1.2.3" sources."readable-stream-3.6.2" (sources."request-2.88.2" // { dependencies = [ sources."form-data-2.3.3" - sources."tough-cookie-2.5.0" sources."uuid-3.4.0" ]; }) - sources."requires-port-1.0.0" + sources."require-in-the-middle-7.2.0" + sources."resolve-1.22.8" sources."reusify-1.0.4" (sources."rimraf-3.0.2" // { dependencies = [ @@ -81420,78 +80371,89 @@ in sources."run-parallel-1.2.0" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" - sources."sax-1.3.0" sources."selderee-0.11.0" - (sources."semver-7.3.8" // { + (sources."semver-7.5.4" // { dependencies = [ sources."lru-cache-6.0.0" - sources."yallist-4.0.0" ]; }) sources."set-blocking-2.0.0" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" sources."shimmer-1.2.1" - sources."sigmund-1.0.1" - sources."signal-exit-3.0.7" + sources."signal-exit-4.1.0" sources."sshpk-1.18.0" sources."stack-chain-1.3.7" - sources."string-width-4.2.3" + sources."string-width-5.1.2" + (sources."string-width-cjs-4.2.3" // { + dependencies = [ + sources."emoji-regex-8.0.0" + sources."strip-ansi-6.0.1" + ]; + }) sources."string_decoder-1.3.0" - sources."strip-ansi-6.0.1" + (sources."strip-ansi-7.1.0" // { + dependencies = [ + sources."ansi-regex-6.0.1" + ]; + }) + sources."strip-ansi-cjs-6.0.1" + sources."supports-preserve-symlinks-flag-1.0.0" (sources."tar-6.2.0" // { dependencies = [ - sources."yallist-4.0.0" + sources."minipass-5.0.0" ]; }) sources."to-regex-range-5.0.1" - sources."tough-cookie-4.1.3" + sources."tough-cookie-2.5.0" sources."tr46-0.0.3" sources."tslib-2.6.2" - sources."tunnel-0.0.6" sources."tunnel-agent-0.6.0" sources."turndown-7.1.2" sources."turndown-plugin-gfm-1.0.2" sources."tweetnacl-0.14.5" - sources."typescript-4.9.5" + sources."typescript-5.2.2" sources."undici-types-5.26.5" - sources."universalify-0.2.0" + sources."universalify-2.0.1" sources."uri-js-4.4.1" - sources."url-parse-1.5.10" sources."util-deprecate-1.0.2" sources."uuid-8.3.2" sources."verror-1.10.0" - (sources."vscode-css-languageservice-6.2.10" // { - dependencies = [ - sources."vscode-languageserver-types-3.17.5" - ]; - }) - (sources."vscode-html-languageservice-5.1.1" // { + sources."vscode-css-languageservice-6.2.10" + sources."vscode-html-languageservice-5.1.1" + sources."vscode-jsonrpc-8.2.0" + (sources."vscode-languageserver-8.2.0-next.3" // { dependencies = [ - sources."vscode-languageserver-types-3.17.5" + sources."vscode-jsonrpc-8.2.0-next.2" + sources."vscode-languageserver-protocol-3.17.4-next.3" + sources."vscode-languageserver-types-3.17.4-next.2" ]; }) - sources."vscode-jsonrpc-8.2.0" - (sources."vscode-languageserver-8.0.2" // { + sources."vscode-languageserver-protocol-3.17.5" + sources."vscode-languageserver-textdocument-1.0.11" + sources."vscode-languageserver-types-3.17.5" + sources."vscode-uri-3.0.8" + sources."webidl-conversions-3.0.1" + sources."whatwg-url-5.0.0" + sources."which-2.0.2" + (sources."wide-align-1.1.5" // { dependencies = [ - sources."vscode-jsonrpc-8.0.2" - sources."vscode-languageserver-protocol-3.17.2" + sources."emoji-regex-8.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" ]; }) - (sources."vscode-languageserver-protocol-3.17.5" // { + sources."wrap-ansi-8.1.0" + (sources."wrap-ansi-cjs-7.0.0" // { dependencies = [ - sources."vscode-languageserver-types-3.17.5" + sources."ansi-styles-4.3.0" + sources."emoji-regex-8.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" ]; }) - sources."vscode-languageserver-textdocument-1.0.11" - sources."vscode-languageserver-types-3.17.2" - sources."vscode-nls-5.2.0" - sources."vscode-uri-3.0.8" - sources."webidl-conversions-3.0.1" - sources."whatwg-url-5.0.0" - sources."wide-align-1.1.5" sources."wrappy-1.0.2" - sources."xml2js-0.5.0" - sources."xmlbuilder-11.0.1" - sources."yallist-2.1.2" + sources."yallist-4.0.0" ]; buildInputs = globalBuildInputs; meta = { @@ -81701,8 +80663,8 @@ in sources."@smithy/util-utf8-2.0.0" sources."@tootallnate/once-2.0.0" sources."@types/nanoid-3.0.0" - sources."@types/node-20.8.10" - sources."@types/ws-8.5.8" + sources."@types/node-20.9.0" + sources."@types/ws-8.5.9" sources."abab-2.0.6" sources."abbrev-1.1.1" sources."agent-base-6.0.2" @@ -81732,7 +80694,7 @@ in sources."asynckit-0.4.0" sources."atob-2.1.2" sources."available-typed-arrays-1.0.5" - sources."aws-crt-1.18.3" + sources."aws-crt-1.19.0" (sources."aws-sdk-2.1340.0" // { dependencies = [ sources."buffer-4.9.2" @@ -81745,7 +80707,7 @@ in }) sources."aws-sign2-0.7.0" sources."aws4-1.12.0" - sources."axios-0.24.0" + sources."axios-1.6.1" sources."b4a-1.6.4" sources."balanced-match-1.0.2" sources."base-64-1.0.0" @@ -82315,6 +81277,7 @@ in sources."promise-inflight-1.0.1" sources."promise-retry-2.0.1" sources."proper-lockfile-4.1.2" + sources."proxy-from-env-1.1.0" sources."psl-1.9.0" sources."pump-3.0.0" sources."punycode-2.3.1" @@ -82569,35 +81532,71 @@ in js-beautify = nodeEnv.buildNodePackage { name = "js-beautify"; packageName = "js-beautify"; - version = "1.14.9"; + version = "1.14.11"; src = fetchurl { - url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.14.9.tgz"; - sha512 = "coM7xq1syLcMyuVGyToxcj2AlzhkDjmfklL8r0JgJ7A76wyGMpJ1oA35mr4APdYNO/o/4YY8H54NQIJzhMbhBg=="; + url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.14.11.tgz"; + sha512 = "rPogWqAfoYh1Ryqqh2agUpVfbxAhbjuN1SmU86dskQUKouRiggUTCO4+2ym9UPXllc2WAp0J+T5qxn7Um3lCdw=="; }; dependencies = [ + sources."@isaacs/cliui-8.0.2" sources."@one-ini/wasm-0.1.1" - sources."abbrev-1.1.1" + sources."abbrev-2.0.0" + sources."ansi-regex-5.0.1" + sources."ansi-styles-6.2.1" sources."balanced-match-1.0.2" sources."brace-expansion-2.0.1" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" sources."commander-10.0.1" sources."config-chain-1.1.13" + sources."cross-spawn-7.0.3" + sources."eastasianwidth-0.2.0" sources."editorconfig-1.0.4" - sources."fs.realpath-1.0.0" - (sources."glob-8.1.0" // { - dependencies = [ - sources."minimatch-5.1.6" - ]; - }) - sources."inflight-1.0.6" - sources."inherits-2.0.4" + sources."emoji-regex-9.2.2" + sources."foreground-child-3.1.1" + sources."glob-10.3.10" sources."ini-1.3.8" + sources."is-fullwidth-code-point-3.0.0" + sources."isexe-2.0.0" + sources."jackspeak-2.3.6" sources."lru-cache-6.0.0" sources."minimatch-9.0.1" - sources."nopt-6.0.0" - sources."once-1.4.0" + sources."minipass-7.0.4" + sources."nopt-7.2.0" + sources."path-key-3.1.1" + (sources."path-scurry-1.10.1" // { + dependencies = [ + sources."lru-cache-10.0.1" + ]; + }) sources."proto-list-1.2.4" sources."semver-7.5.4" - sources."wrappy-1.0.2" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" + sources."signal-exit-4.1.0" + sources."string-width-5.1.2" + (sources."string-width-cjs-4.2.3" // { + dependencies = [ + sources."emoji-regex-8.0.0" + sources."strip-ansi-6.0.1" + ]; + }) + (sources."strip-ansi-7.1.0" // { + dependencies = [ + sources."ansi-regex-6.0.1" + ]; + }) + sources."strip-ansi-cjs-6.0.1" + sources."which-2.0.2" + sources."wrap-ansi-8.1.0" + (sources."wrap-ansi-cjs-7.0.0" // { + dependencies = [ + sources."ansi-styles-4.3.0" + sources."emoji-regex-8.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" + ]; + }) sources."yallist-4.0.0" ]; buildInputs = globalBuildInputs; @@ -82640,11 +81639,11 @@ in sha512 = "e8cIg2z62InH7azBBi3EsSEqrKx+nUtAS5bBcYTSpZFA+vhNPyhv8PTFZ0WsjOPDj04/dOLlm08EDcQJDqaGQg=="; }; dependencies = [ - sources."@babel/parser-7.23.0" + sources."@babel/parser-7.23.3" sources."@jsdoc/salty-0.2.5" - sources."@types/linkify-it-3.0.4" + sources."@types/linkify-it-3.0.5" sources."@types/markdown-it-12.2.3" - sources."@types/mdurl-1.0.4" + sources."@types/mdurl-1.0.5" sources."argparse-2.0.1" sources."bluebird-3.7.2" sources."catharsis-0.9.0" @@ -82949,7 +81948,7 @@ in ]; }) sources."ms-2.0.0" - sources."nanoid-3.3.6" + sources."nanoid-3.3.7" sources."negotiator-0.6.3" sources."object-assign-4.1.1" sources."object-inspect-1.13.1" @@ -83650,7 +82649,7 @@ in sources."external-editor-3.1.0" sources."extract-stack-2.0.0" sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.3.1" + sources."fast-glob-3.3.2" sources."fast-json-stable-stringify-2.1.0" sources."fastq-1.15.0" (sources."figures-3.2.0" // { @@ -83808,13 +82807,13 @@ in sources."@ampproject/remapping-2.2.1" sources."@babel/cli-7.23.0" sources."@babel/code-frame-7.22.13" - sources."@babel/compat-data-7.23.2" - (sources."@babel/core-7.23.2" // { + sources."@babel/compat-data-7.23.3" + (sources."@babel/core-7.23.3" // { dependencies = [ sources."semver-6.3.1" ]; }) - sources."@babel/generator-7.23.0" + sources."@babel/generator-7.23.3" sources."@babel/helper-annotate-as-pure-7.22.5" (sources."@babel/helper-compilation-targets-7.22.15" // { dependencies = [ @@ -83825,7 +82824,7 @@ in sources."@babel/helper-function-name-7.23.0" sources."@babel/helper-hoist-variables-7.22.5" sources."@babel/helper-module-imports-7.22.15" - sources."@babel/helper-module-transforms-7.23.0" + sources."@babel/helper-module-transforms-7.23.3" sources."@babel/helper-plugin-utils-7.22.5" sources."@babel/helper-simple-access-7.22.5" sources."@babel/helper-split-export-declaration-7.22.6" @@ -83835,13 +82834,13 @@ in sources."@babel/helpers-7.23.2" sources."@babel/highlight-7.22.20" sources."@babel/node-7.22.19" - sources."@babel/parser-7.23.0" - sources."@babel/plugin-syntax-jsx-7.22.5" + sources."@babel/parser-7.23.3" + sources."@babel/plugin-syntax-jsx-7.23.3" sources."@babel/plugin-transform-react-jsx-7.22.15" sources."@babel/register-7.22.15" sources."@babel/template-7.22.15" - sources."@babel/traverse-7.23.2" - sources."@babel/types-7.23.0" + sources."@babel/traverse-7.23.3" + sources."@babel/types-7.23.3" sources."@jridgewell/gen-mapping-0.3.3" sources."@jridgewell/resolve-uri-3.1.1" sources."@jridgewell/set-array-1.1.2" @@ -83947,7 +82946,7 @@ in sources."bufferutil-4.0.8" sources."bytes-3.1.2" sources."call-bind-1.0.5" - sources."caniuse-lite-1.0.30001559" + sources."caniuse-lite-1.0.30001561" sources."canvas-2.11.2" sources."chalk-2.4.2" sources."chardet-1.6.1" @@ -84007,7 +83006,7 @@ in }) sources."dotenv-8.6.0" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.574" + sources."electron-to-chromium-1.4.579" sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" sources."encoding-0.1.13" @@ -84034,7 +83033,7 @@ in ]; }) sources."express-validator-6.15.0" - sources."fast-glob-3.3.1" + sources."fast-glob-3.3.2" sources."fastq-1.15.0" sources."fill-range-7.0.1" sources."filter-obj-1.1.0" @@ -84465,7 +83464,7 @@ in sources."core-util-is-1.0.3" sources."emoji-regex-8.0.0" sources."escalade-3.1.1" - sources."fast-glob-3.3.1" + sources."fast-glob-3.3.2" sources."fastq-1.15.0" sources."fill-range-7.0.1" sources."get-caller-file-2.0.5" @@ -84637,7 +83636,7 @@ in sources."@swc-node/core-1.10.6" sources."@swc-node/register-1.6.8" sources."@swc-node/sourcemap-support-0.3.0" - sources."@swc/core-1.3.95" + sources."@swc/core-1.3.96" sources."@swc/counter-0.1.2" sources."@swc/helpers-0.5.3" sources."@swc/types-0.1.5" @@ -84650,8 +83649,8 @@ in ]; }) sources."@types/minimatch-3.0.5" - sources."@types/minimist-1.2.4" - sources."@types/normalize-package-data-2.4.3" + sources."@types/minimist-1.2.5" + sources."@types/normalize-package-data-2.4.4" sources."@yarnpkg/lockfile-1.1.0" (sources."@yarnpkg/parsers-3.0.0-rc.46" // { dependencies = [ @@ -84681,9 +83680,9 @@ in sources."array-ify-1.0.0" sources."array-union-2.1.0" sources."arrify-1.0.1" - sources."async-3.2.4" + sources."async-3.2.5" sources."asynckit-0.4.0" - sources."axios-1.6.0" + sources."axios-1.6.1" sources."balanced-match-1.0.2" sources."base64-js-1.5.1" sources."before-after-hook-2.2.3" @@ -84811,7 +83810,7 @@ in sources."tmp-0.0.33" ]; }) - sources."fast-glob-3.3.1" + sources."fast-glob-3.3.2" sources."fastq-1.15.0" sources."figures-3.2.0" (sources."filelist-1.0.4" // { @@ -85107,7 +84106,7 @@ in dependencies = [ sources."cli-spinners-2.6.1" sources."glob-7.1.4" - sources."lines-and-columns-2.0.3" + sources."lines-and-columns-2.0.4" sources."lru-cache-6.0.0" sources."semver-7.5.3" sources."yargs-17.7.2" @@ -85384,7 +84383,7 @@ in sources."uglify-js-3.17.4" sources."unique-filename-2.0.1" sources."unique-slug-3.0.0" - sources."universal-user-agent-6.0.0" + sources."universal-user-agent-6.0.1" sources."universalify-2.0.1" sources."upath-2.0.1" sources."util-deprecate-1.0.2" @@ -86320,9 +85319,9 @@ in }; dependencies = [ sources."@types/commander-2.12.2" - sources."@types/diff-3.5.7" + sources."@types/diff-3.5.8" sources."@types/get-stdin-5.0.1" - sources."@types/node-20.8.10" + sources."@types/node-20.9.0" sources."commander-2.20.3" sources."diff-3.5.0" sources."get-stdin-5.0.1" @@ -86400,7 +85399,7 @@ in sha512 = "zave+vI4AMeLp0FlUllAwGbNytSKsS3R2Zgtf3ufVT892Z/L6Ro9osZwE9PNA7s0IkJ4onnuHqatpsaCiAShJw=="; }; dependencies = [ - sources."async-3.2.4" + sources."async-3.2.5" sources."boolbase-1.0.0" sources."chalk-5.3.0" sources."cheerio-1.0.0-rc.12" @@ -86998,8 +85997,8 @@ in sources."@colors/colors-1.6.0" sources."@dabh/diagnostics-2.0.3" sources."@msgpack/msgpack-2.8.0" - sources."@types/triple-beam-1.3.4" - sources."async-3.2.4" + sources."@types/triple-beam-1.3.5" + sources."async-3.2.5" sources."color-3.2.1" sources."color-convert-1.9.3" sources."color-name-1.1.3" @@ -87065,10 +86064,10 @@ in node-gyp = nodeEnv.buildNodePackage { name = "node-gyp"; packageName = "node-gyp"; - version = "10.0.0"; + version = "10.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/node-gyp/-/node-gyp-10.0.0.tgz"; - sha512 = "LkaKUbjyacJGRHiuhUeUblzZNxTF1/XNooyAl6aiaJ6ZpeurR4Mk9sjxncGNSI7pETqyqM+hLAER0788oSxt0A=="; + url = "https://registry.npmjs.org/node-gyp/-/node-gyp-10.0.1.tgz"; + sha512 = "gg3/bHehQfZivQVfqIyy8wTdSymF9yTyP4CJifK73imyNMU8AIGQE2pUa7dNWfmMeG9cDVF2eehiRMv0LC1iAg=="; }; dependencies = [ sources."@isaacs/cliui-8.0.2" @@ -87346,7 +86345,7 @@ in sources."@node-red/util-3.1.0" sources."@sindresorhus/is-5.6.0" sources."@szmarczak/http-timer-5.0.1" - sources."@types/http-cache-semantics-4.0.3" + sources."@types/http-cache-semantics-4.0.4" sources."abbrev-1.1.1" sources."accepts-1.3.8" sources."acorn-8.8.2" @@ -88037,13 +87036,13 @@ in 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.3" + sources."@types/http-cache-semantics-4.0.4" sources."@types/keyv-3.1.4" - sources."@types/node-20.8.10" - sources."@types/normalize-package-data-2.4.3" - sources."@types/responselike-1.0.2" + sources."@types/node-20.9.0" + sources."@types/normalize-package-data-2.4.4" + sources."@types/responselike-1.0.3" sources."aggregate-error-4.0.1" - sources."all-package-names-2.0.771" + sources."all-package-names-2.0.773" sources."ansi-align-3.0.1" sources."ansi-escapes-4.3.2" sources."ansi-regex-5.0.1" @@ -88151,7 +87150,7 @@ in sources."execa-7.2.0" sources."exit-hook-3.2.0" sources."external-editor-3.1.0" - sources."fast-glob-3.3.1" + sources."fast-glob-3.3.2" sources."fastq-1.15.0" sources."figures-5.0.0" sources."fill-range-7.0.1" @@ -88209,7 +87208,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-2.0.0" - sources."inquirer-9.2.11" + sources."inquirer-9.2.12" (sources."inquirer-autosubmit-prompt-0.2.0" // { dependencies = [ sources."ansi-escapes-3.2.0" @@ -88619,10 +87618,10 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "10.2.2"; + version = "10.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-10.2.2.tgz"; - sha512 = "VSP/rh88wBQ+b7bz0NOdZQBQCuWLI/etpWfgUWDmNaMy0MuD1xJBMofEzuFojNpJANVaJCkN5U7KgfPdR2V1fg=="; + url = "https://registry.npmjs.org/npm/-/npm-10.2.3.tgz"; + sha512 = "GbUui/rHTl0mW8HhJSn4A0Xg89yCR3I9otgJT1i0z1QBPOVlgbh6rlcUTpHT8Gut9O1SJjWRUU0nEcAymhG2tQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -88691,10 +87690,10 @@ in orval = nodeEnv.buildNodePackage { name = "orval"; packageName = "orval"; - version = "6.19.1"; + version = "6.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/orval/-/orval-6.19.1.tgz"; - sha512 = "V7z+mn8X4JcgC0uaGs6rwNNOJH4wk+LUidxiPoXVaLtHt8g7qUfKQseozbXx8rk+Qgx8WT7EY2+AjDNYNSTjGA=="; + url = "https://registry.npmjs.org/orval/-/orval-6.20.0.tgz"; + sha512 = "hBH0oRgV3Opwd0kOZa3An0+bPESlclzLqLA37jCGky4yNCwG3DTvhgGRqCgB0De6hBoOlOcRs/jh919LfaALIA=="; }; dependencies = [ sources."@apidevtools/json-schema-ref-parser-9.0.6" @@ -88702,30 +87701,48 @@ in sources."@apidevtools/swagger-methods-3.0.2" sources."@apidevtools/swagger-parser-10.1.0" sources."@asyncapi/specs-4.3.1" - sources."@esbuild/android-arm-0.15.18" - sources."@esbuild/linux-loong64-0.15.18" + sources."@esbuild/android-arm-0.19.5" + sources."@esbuild/android-arm64-0.19.5" + sources."@esbuild/android-x64-0.19.5" + sources."@esbuild/darwin-arm64-0.19.5" + sources."@esbuild/darwin-x64-0.19.5" + sources."@esbuild/freebsd-arm64-0.19.5" + sources."@esbuild/freebsd-x64-0.19.5" + sources."@esbuild/linux-arm-0.19.5" + sources."@esbuild/linux-arm64-0.19.5" + sources."@esbuild/linux-ia32-0.19.5" + sources."@esbuild/linux-loong64-0.19.5" + sources."@esbuild/linux-mips64el-0.19.5" + sources."@esbuild/linux-ppc64-0.19.5" + sources."@esbuild/linux-riscv64-0.19.5" + sources."@esbuild/linux-s390x-0.19.5" + sources."@esbuild/linux-x64-0.19.5" + sources."@esbuild/netbsd-x64-0.19.5" + sources."@esbuild/openbsd-x64-0.19.5" + sources."@esbuild/sunos-x64-0.19.5" + sources."@esbuild/win32-arm64-0.19.5" + sources."@esbuild/win32-ia32-0.19.5" + sources."@esbuild/win32-x64-0.19.5" sources."@exodus/schemasafe-1.3.0" - sources."@ibm-cloud/openapi-ruleset-0.45.5" - sources."@ibm-cloud/openapi-ruleset-utilities-0.0.1" + sources."@ibm-cloud/openapi-ruleset-1.14.2" + sources."@ibm-cloud/openapi-ruleset-utilities-1.3.0" sources."@jsdevtools/ono-7.1.3" sources."@jsep-plugin/regex-1.0.3" sources."@jsep-plugin/ternary-1.1.3" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@orval/angular-6.19.1" - sources."@orval/axios-6.19.1" - sources."@orval/core-6.19.1" - sources."@orval/msw-6.19.1" - sources."@orval/query-6.19.1" - sources."@orval/swr-6.19.1" - sources."@orval/zod-6.19.1" - sources."@rollup/plugin-commonjs-22.0.2" - (sources."@rollup/pluginutils-3.1.0" // { + sources."@orval/angular-6.20.0" + sources."@orval/axios-6.20.0" + (sources."@orval/core-6.20.0" // { dependencies = [ - sources."estree-walker-1.0.1" + sources."fs-extra-11.1.1" ]; }) + sources."@orval/msw-6.20.0" + sources."@orval/query-6.20.0" + sources."@orval/swr-6.20.0" + sources."@orval/zod-6.20.0" sources."@stoplight/better-ajv-errors-1.0.3" sources."@stoplight/json-3.21.0" (sources."@stoplight/json-ref-readers-1.2.2" // { @@ -88736,23 +87753,16 @@ in sources."@stoplight/json-ref-resolver-3.1.6" sources."@stoplight/ordered-object-literal-1.0.4" sources."@stoplight/path-1.3.2" - (sources."@stoplight/spectral-cli-6.11.0" // { - dependencies = [ - sources."fast-glob-3.2.12" - ]; - }) (sources."@stoplight/spectral-core-1.18.3" // { dependencies = [ sources."@stoplight/types-13.6.0" + sources."minimatch-3.1.2" ]; }) - sources."@stoplight/spectral-formats-1.5.0" - sources."@stoplight/spectral-formatters-1.3.0" + sources."@stoplight/spectral-formats-1.6.0" sources."@stoplight/spectral-functions-1.7.2" sources."@stoplight/spectral-parsers-1.0.3" sources."@stoplight/spectral-ref-resolver-1.0.4" - sources."@stoplight/spectral-ruleset-bundler-1.5.2" - sources."@stoplight/spectral-ruleset-migrator-1.9.5" sources."@stoplight/spectral-rulesets-1.18.0" (sources."@stoplight/spectral-runtime-1.1.2" // { dependencies = [ @@ -88762,12 +87772,10 @@ in sources."@stoplight/types-13.20.0" sources."@stoplight/yaml-4.2.3" sources."@stoplight/yaml-ast-parser-0.0.48" - sources."@types/es-aggregate-error-1.0.4" - sources."@types/estree-0.0.39" - sources."@types/json-schema-7.0.14" - sources."@types/node-20.8.10" - sources."@types/sarif-2.1.6" - sources."@types/urijs-1.19.22" + sources."@types/es-aggregate-error-1.0.5" + sources."@types/json-schema-7.0.15" + sources."@types/node-20.9.0" + sources."@types/urijs-1.19.23" sources."abort-controller-3.0.0" sources."acorn-8.11.2" sources."ajv-8.12.0" @@ -88782,35 +87790,24 @@ in sources."array-buffer-byte-length-1.0.0" sources."array-union-2.1.0" sources."arraybuffer.prototype.slice-1.0.2" - sources."as-table-1.0.55" - sources."ast-types-0.14.2" sources."astring-1.8.6" sources."available-typed-arrays-1.0.5" - sources."backslash-0.2.0" sources."balanced-match-1.0.2" sources."binary-extensions-2.2.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."builtins-1.0.3" sources."cac-6.7.14" sources."call-bind-1.0.5" sources."call-me-maybe-1.0.2" sources."chalk-4.1.2" sources."chokidar-3.5.3" - sources."cliui-7.0.4" - sources."clone-1.0.4" + sources."cliui-8.0.1" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."commander-2.20.3" - sources."commondir-1.0.1" sources."compare-versions-6.1.0" sources."concat-map-0.0.1" sources."cross-spawn-7.0.3" - sources."cuid-2.1.8" - sources."data-uri-to-buffer-2.0.2" sources."debug-4.3.4" - sources."deepmerge-2.2.1" - sources."defaults-1.0.4" sources."define-data-property-1.1.1" sources."define-properties-1.2.1" sources."dependency-graph-0.11.0" @@ -88823,62 +87820,29 @@ in sources."es-set-tostringtag-2.0.2" sources."es-to-primitive-1.2.1" sources."es6-promise-3.3.1" - sources."esbuild-0.15.18" - sources."esbuild-android-64-0.15.18" - sources."esbuild-android-arm64-0.15.18" - sources."esbuild-darwin-64-0.15.18" - sources."esbuild-darwin-arm64-0.15.18" - sources."esbuild-freebsd-64-0.15.18" - sources."esbuild-freebsd-arm64-0.15.18" - sources."esbuild-linux-32-0.15.18" - sources."esbuild-linux-64-0.15.18" - sources."esbuild-linux-arm-0.15.18" - sources."esbuild-linux-arm64-0.15.18" - sources."esbuild-linux-mips64le-0.15.18" - sources."esbuild-linux-ppc64le-0.15.18" - sources."esbuild-linux-riscv64-0.15.18" - sources."esbuild-linux-s390x-0.15.18" - sources."esbuild-netbsd-64-0.15.18" - sources."esbuild-openbsd-64-0.15.18" - sources."esbuild-sunos-64-0.15.18" - sources."esbuild-windows-32-0.15.18" - sources."esbuild-windows-64-0.15.18" - sources."esbuild-windows-arm64-0.15.18" + sources."esbuild-0.19.5" sources."escalade-3.1.1" - sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" - sources."estree-walker-2.0.2" sources."esutils-2.0.3" sources."event-target-shim-5.0.1" sources."execa-5.1.1" sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.3.1" + sources."fast-glob-3.3.2" sources."fast-memoize-2.5.2" sources."fast-safe-stringify-2.1.1" sources."fastq-1.15.0" sources."fill-range-7.0.1" - (sources."find-up-5.0.0" // { - dependencies = [ - sources."locate-path-6.0.0" - sources."p-limit-3.1.0" - sources."p-locate-5.0.0" - sources."path-exists-4.0.0" - ]; - }) + sources."find-up-5.0.0" sources."for-each-0.3.3" - sources."format-util-1.0.5" sources."fs-extra-10.1.0" - sources."fs.realpath-1.0.0" sources."fsevents-2.3.3" sources."function-bind-1.1.2" sources."function.prototype.name-1.1.6" sources."functions-have-names-1.2.3" sources."get-caller-file-2.0.5" sources."get-intrinsic-1.2.2" - sources."get-source-2.0.12" sources."get-stream-6.0.1" sources."get-symbol-description-1.0.0" - sources."glob-7.2.3" sources."glob-parent-5.1.2" sources."globalthis-1.0.3" sources."globby-11.1.0" @@ -88891,26 +87855,17 @@ in sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."hasown-2.0.0" - sources."hpagent-1.2.0" sources."http2-client-1.3.5" sources."human-signals-2.1.0" - (sources."ibm-openapi-validator-0.97.5" // { - dependencies = [ - sources."find-up-3.0.0" - ]; - }) sources."iconv-lite-0.6.3" sources."ignore-5.2.4" sources."immer-9.0.21" - sources."inflight-1.0.6" - sources."inherits-2.0.4" sources."internal-slot-1.0.6" sources."is-array-buffer-3.0.2" sources."is-bigint-1.0.4" sources."is-binary-path-2.1.0" sources."is-boolean-object-1.1.2" sources."is-callable-1.2.7" - sources."is-core-module-2.13.1" sources."is-date-object-1.0.5" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" @@ -88918,7 +87873,6 @@ in sources."is-negative-zero-2.0.2" sources."is-number-7.0.0" sources."is-number-object-1.0.7" - sources."is-reference-1.2.1" sources."is-regex-1.1.4" sources."is-shared-array-buffer-1.0.2" sources."is-stream-2.0.1" @@ -88930,20 +87884,13 @@ in sources."isexe-2.0.0" sources."js-yaml-3.14.1" sources."jsep-1.3.8" - sources."json-dup-key-validator-1.0.3" - (sources."json-schema-ref-parser-5.1.3" // { - dependencies = [ - sources."debug-3.2.7" - ]; - }) sources."json-schema-traverse-1.0.0" sources."jsonc-parser-2.2.1" sources."jsonfile-6.1.0" sources."jsonpath-plus-7.1.0" sources."jsonpointer-5.0.1" - sources."jsonschema-1.4.1" sources."leven-3.1.0" - sources."locate-path-3.0.0" + sources."locate-path-6.0.0" sources."lodash-4.17.21" sources."lodash.get-4.4.2" sources."lodash.isempty-4.4.0" @@ -88953,13 +87900,17 @@ in sources."lodash.uniq-4.5.0" sources."lodash.uniqby-4.7.0" sources."lodash.uniqwith-4.5.0" - sources."magic-string-0.25.9" - sources."matcher-1.1.1" + sources."loglevel-1.8.1" + sources."loglevel-plugin-prefix-0.8.4" sources."merge-stream-2.0.0" sources."merge2-1.4.1" sources."micromatch-4.0.5" sources."mimic-fn-2.1.0" - sources."minimatch-3.1.2" + (sources."minimatch-6.2.0" // { + dependencies = [ + sources."brace-expansion-2.0.1" + ]; + }) sources."ms-2.1.2" (sources."nimma-0.2.2" // { dependencies = [ @@ -88969,7 +87920,6 @@ in sources."node-fetch-2.7.0" sources."node-fetch-h2-2.3.0" sources."node-readfiles-0.2.0" - sources."node-sarif-builder-2.0.3" sources."normalize-path-3.0.0" sources."npm-run-path-4.0.1" sources."oas-kit-common-1.0.8" @@ -88980,45 +87930,33 @@ in sources."object-inspect-1.13.1" sources."object-keys-1.1.1" sources."object.assign-4.1.4" - sources."once-1.4.0" sources."onetime-5.1.2" - sources."ono-4.0.11" sources."openapi-types-12.1.3" (sources."openapi3-ts-3.2.0" // { dependencies = [ - sources."yaml-2.3.3" + sources."yaml-2.3.4" ]; }) - sources."p-limit-2.3.0" - sources."p-locate-3.0.0" - sources."p-try-2.2.0" - sources."pad-2.3.0" - sources."path-exists-3.0.0" - sources."path-is-absolute-1.0.1" + sources."p-limit-3.1.0" + sources."p-locate-5.0.0" + sources."path-exists-4.0.0" sources."path-key-3.1.1" - sources."path-parse-1.0.7" sources."path-type-4.0.0" sources."picomatch-2.3.1" sources."pony-cause-1.1.1" - sources."printable-characters-1.0.42" sources."punycode-2.3.1" sources."queue-microtask-1.2.3" sources."readdirp-3.6.0" sources."reftools-1.1.9" sources."regexp.prototype.flags-1.5.1" - sources."require-all-3.0.0" sources."require-directory-2.1.1" sources."require-from-string-2.0.2" - sources."reserved-0.1.2" - sources."resolve-1.22.8" sources."reusify-1.0.4" - sources."rollup-2.79.1" sources."run-parallel-1.2.0" sources."safe-array-concat-1.0.1" sources."safe-regex-test-1.0.0" sources."safe-stable-stringify-1.1.1" sources."safer-buffer-2.1.2" - sources."semver-5.7.2" sources."set-function-length-1.1.1" sources."set-function-name-2.0.1" sources."shebang-command-2.0.0" @@ -89033,10 +87971,7 @@ in sources."signal-exit-3.0.7" sources."simple-eval-1.0.0" sources."slash-3.0.0" - sources."source-map-0.6.1" - sources."sourcemap-codec-1.4.8" sources."sprintf-js-1.0.3" - sources."stacktracey-2.1.8" sources."string-argv-0.3.2" sources."string-width-4.2.3" sources."string.prototype.trim-1.2.8" @@ -89045,9 +87980,7 @@ in sources."strip-ansi-6.0.1" sources."strip-final-newline-2.0.0" sources."supports-color-7.2.0" - sources."supports-preserve-symlinks-flag-1.0.0" sources."swagger2openapi-7.0.8" - sources."text-table-0.2.0" sources."to-regex-range-5.0.1" sources."tr46-0.0.3" sources."tsconfck-2.1.2" @@ -89063,20 +87996,16 @@ in sources."uri-js-4.4.1" sources."urijs-1.19.11" sources."utility-types-3.10.0" - sources."validate-npm-package-name-3.0.0" sources."validator-13.11.0" - sources."wcwidth-1.0.1" sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" sources."which-2.0.2" sources."which-boxed-primitive-1.0.2" sources."which-typed-array-1.1.13" sources."wrap-ansi-7.0.0" - sources."wrappy-1.0.2" sources."y18n-5.0.8" sources."yaml-1.10.2" - sources."yaml-js-0.2.3" - sources."yargs-17.3.1" + sources."yargs-17.7.2" sources."yargs-parser-21.1.1" sources."yocto-queue-0.1.0" ]; @@ -89117,7 +88046,7 @@ in sources."@jridgewell/sourcemap-codec-1.4.15" sources."@jridgewell/trace-mapping-0.3.20" sources."@lezer/common-1.1.0" - sources."@lezer/lr-1.3.13" + sources."@lezer/lr-1.3.14" sources."@lmdb/lmdb-darwin-arm64-2.8.5" sources."@lmdb/lmdb-darwin-x64-2.8.5" sources."@lmdb/lmdb-linux-arm-2.8.5" @@ -89211,7 +88140,7 @@ in sources."@parcel/watcher-win32-ia32-2.3.0" sources."@parcel/watcher-win32-x64-2.3.0" sources."@parcel/workers-2.10.2" - sources."@swc/core-1.3.95" + sources."@swc/core-1.3.96" sources."@swc/counter-0.1.2" sources."@swc/helpers-0.5.3" sources."@swc/types-0.1.5" @@ -89246,7 +88175,7 @@ in sources."buffer-from-1.1.2" sources."callsites-3.1.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001559" + sources."caniuse-lite-1.0.30001561" sources."caseless-0.12.0" (sources."chalk-4.1.2" // { dependencies = [ @@ -89296,7 +88225,7 @@ in sources."dotenv-7.0.0" sources."dotenv-expand-5.1.0" sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.4.574" + sources."electron-to-chromium-1.4.579" sources."entities-4.5.0" sources."error-ex-1.3.2" sources."escalade-3.1.1" @@ -89325,7 +88254,7 @@ in sources."html-tags-1.2.0" (sources."htmlnano-2.1.0" // { dependencies = [ - sources."svgo-3.0.2" + sources."svgo-3.0.3" ]; }) (sources."htmlparser2-7.2.0" // { @@ -89370,20 +88299,11 @@ in sources."json5-2.2.3" sources."jsprim-1.4.2" sources."levn-0.3.0" - (sources."lightningcss-1.22.0" // { + (sources."lightningcss-1.22.1" // { dependencies = [ sources."detect-libc-1.0.3" ]; }) - sources."lightningcss-darwin-arm64-1.22.0" - sources."lightningcss-darwin-x64-1.22.0" - sources."lightningcss-freebsd-x64-1.22.0" - sources."lightningcss-linux-arm-gnueabihf-1.22.0" - sources."lightningcss-linux-arm64-gnu-1.22.0" - sources."lightningcss-linux-arm64-musl-1.22.0" - sources."lightningcss-linux-x64-gnu-1.22.0" - sources."lightningcss-linux-x64-musl-1.22.0" - sources."lightningcss-win32-x64-msvc-1.22.0" sources."lilconfig-2.1.0" sources."lines-and-columns-1.2.4" sources."lmdb-2.8.5" @@ -89398,7 +88318,7 @@ in sources."mime-types-2.1.35" sources."minimatch-5.1.6" sources."msgpackr-1.9.9" - sources."nanoid-3.3.6" + sources."nanoid-3.3.7" sources."node-addon-api-6.1.0" sources."node-gyp-build-optional-packages-5.1.1" sources."node-releases-2.0.13" @@ -89447,7 +88367,7 @@ in sources."postcss-selector-parser-6.0.13" (sources."postcss-svgo-6.0.0" // { dependencies = [ - sources."svgo-3.0.2" + sources."svgo-3.0.3" ]; }) sources."postcss-unique-selectors-6.0.0" @@ -89913,7 +88833,7 @@ in sources."which-2.0.2" sources."wrappy-1.0.2" sources."yallist-4.0.0" - sources."yaml-2.3.3" + sources."yaml-2.3.4" ]; buildInputs = globalBuildInputs; meta = { @@ -90002,7 +88922,7 @@ in sources."debug-2.6.9" sources."decamelize-1.2.0" sources."decompress-response-3.3.0" - sources."deep-equal-1.1.1" + sources."deep-equal-1.1.2" sources."deep-extend-0.6.0" sources."define-data-property-1.1.1" sources."define-properties-1.2.1" @@ -90659,15 +89579,16 @@ in src = ../../tools/networking/pgrok/build-deps; dependencies = [ sources."@aashutoshrathi/word-wrap-1.2.6" - sources."@adobe/css-tools-4.2.0" + sources."@adobe/css-tools-4.3.1" sources."@alloc/quick-lru-5.2.0" sources."@ampproject/remapping-2.2.1" sources."@babel/code-frame-7.22.13" - sources."@babel/compat-data-7.23.2" - (sources."@babel/core-7.23.2" // { + sources."@babel/compat-data-7.23.3" + (sources."@babel/core-7.23.3" // { dependencies = [ - sources."@babel/generator-7.23.0" - sources."@babel/types-7.23.0" + sources."@babel/generator-7.23.3" + sources."@babel/traverse-7.23.3" + sources."@babel/types-7.23.3" sources."semver-6.3.1" ]; }) @@ -90682,29 +89603,29 @@ in sources."@babel/helper-environment-visitor-7.22.20" (sources."@babel/helper-function-name-7.23.0" // { dependencies = [ - sources."@babel/types-7.23.0" + sources."@babel/types-7.23.3" ]; }) (sources."@babel/helper-hoist-variables-7.22.5" // { dependencies = [ - sources."@babel/types-7.23.0" + sources."@babel/types-7.23.3" ]; }) (sources."@babel/helper-module-imports-7.22.15" // { dependencies = [ - sources."@babel/types-7.23.0" + sources."@babel/types-7.23.3" ]; }) - sources."@babel/helper-module-transforms-7.23.0" + sources."@babel/helper-module-transforms-7.23.3" sources."@babel/helper-plugin-utils-7.22.5" (sources."@babel/helper-simple-access-7.22.5" // { dependencies = [ - sources."@babel/types-7.23.0" + sources."@babel/types-7.23.3" ]; }) (sources."@babel/helper-split-export-declaration-7.22.6" // { dependencies = [ - sources."@babel/types-7.23.0" + sources."@babel/types-7.23.3" ]; }) sources."@babel/helper-string-parser-7.22.5" @@ -90712,22 +89633,22 @@ in sources."@babel/helper-validator-option-7.22.15" (sources."@babel/helpers-7.23.2" // { dependencies = [ - sources."@babel/types-7.23.0" + sources."@babel/types-7.23.3" ]; }) sources."@babel/highlight-7.22.20" - sources."@babel/parser-7.23.0" - sources."@babel/plugin-transform-react-jsx-self-7.22.5" - sources."@babel/plugin-transform-react-jsx-source-7.22.5" + sources."@babel/parser-7.23.3" + sources."@babel/plugin-transform-react-jsx-self-7.23.3" + sources."@babel/plugin-transform-react-jsx-source-7.23.3" (sources."@babel/template-7.22.15" // { dependencies = [ - sources."@babel/types-7.23.0" + sources."@babel/types-7.23.3" ]; }) (sources."@babel/traverse-7.23.2" // { dependencies = [ - sources."@babel/generator-7.23.0" - sources."@babel/types-7.23.0" + sources."@babel/generator-7.23.3" + sources."@babel/types-7.23.3" ]; }) sources."@babel/types-7.17.0" @@ -90760,7 +89681,7 @@ in sources."@esbuild/win32-x64-0.18.20" sources."@eslint-community/eslint-utils-4.4.0" sources."@eslint-community/regexpp-4.10.0" - (sources."@eslint/eslintrc-2.1.2" // { + (sources."@eslint/eslintrc-2.1.3" // { dependencies = [ sources."globals-13.23.0" ]; @@ -90781,26 +89702,26 @@ in sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" sources."@remix-run/router-1.8.0" - sources."@swc/core-1.3.95" + sources."@swc/core-1.3.96" sources."@swc/counter-0.1.2" sources."@swc/helpers-0.5.3" sources."@swc/types-0.1.5" - sources."@swc/wasm-1.3.95" + sources."@swc/wasm-1.3.97" sources."@tailwindcss/forms-0.5.6" sources."@trivago/prettier-plugin-sort-imports-4.2.1" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.4" - sources."@types/json-schema-7.0.14" + sources."@types/json-schema-7.0.15" sources."@types/json5-0.0.29" sources."@types/node-20.5.9" - sources."@types/normalize-package-data-2.4.3" - sources."@types/prop-types-15.7.9" - sources."@types/react-18.2.34" - sources."@types/react-dom-18.2.14" - sources."@types/scheduler-0.16.5" - sources."@types/semver-7.5.4" + sources."@types/normalize-package-data-2.4.4" + sources."@types/prop-types-15.7.10" + sources."@types/react-18.2.37" + sources."@types/react-dom-18.2.15" + sources."@types/scheduler-0.16.6" + sources."@types/semver-7.5.5" sources."@typescript-eslint/eslint-plugin-6.0.0" sources."@typescript-eslint/parser-6.0.0" sources."@typescript-eslint/scope-manager-6.0.0" @@ -90810,12 +89731,12 @@ in sources."@typescript-eslint/utils-6.0.0" sources."@typescript-eslint/visitor-keys-6.0.0" sources."@vitejs/plugin-react-4.0.4" - sources."@vue/compiler-core-3.3.7" - sources."@vue/compiler-dom-3.3.7" - sources."@vue/compiler-sfc-3.3.7" - sources."@vue/compiler-ssr-3.3.7" - sources."@vue/reactivity-transform-3.3.7" - sources."@vue/shared-3.3.7" + sources."@vue/compiler-core-3.3.8" + sources."@vue/compiler-dom-3.3.8" + sources."@vue/compiler-sfc-3.3.8" + sources."@vue/compiler-ssr-3.3.8" + sources."@vue/reactivity-transform-3.3.8" + sources."@vue/shared-3.3.8" sources."acorn-8.11.2" sources."acorn-jsx-5.3.2" sources."acorn-walk-8.3.0" @@ -90850,7 +89771,7 @@ in sources."call-bind-1.0.5" sources."callsites-3.1.0" sources."camelcase-css-2.0.1" - sources."caniuse-lite-1.0.30001559" + sources."caniuse-lite-1.0.30001561" sources."chalk-2.4.2" sources."chokidar-3.5.3" sources."ci-info-3.9.0" @@ -90898,7 +89819,7 @@ in sources."dir-glob-3.0.1" sources."dlv-1.1.3" sources."doctrine-3.0.0" - sources."electron-to-chromium-1.4.574" + sources."electron-to-chromium-1.4.579" sources."errno-0.1.8" sources."error-ex-1.3.2" sources."es-abstract-1.22.3" @@ -90973,7 +89894,7 @@ in sources."estree-walker-2.0.2" sources."esutils-2.0.3" sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.3.1" + sources."fast-glob-3.3.2" sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" sources."fastq-1.15.0" @@ -91072,16 +89993,7 @@ in ]; }) sources."levn-0.4.1" - sources."lightningcss-1.22.0" - sources."lightningcss-darwin-arm64-1.22.0" - sources."lightningcss-darwin-x64-1.22.0" - sources."lightningcss-freebsd-x64-1.22.0" - sources."lightningcss-linux-arm-gnueabihf-1.22.0" - sources."lightningcss-linux-arm64-gnu-1.22.0" - sources."lightningcss-linux-arm64-musl-1.22.0" - sources."lightningcss-linux-x64-gnu-1.22.0" - sources."lightningcss-linux-x64-musl-1.22.0" - sources."lightningcss-win32-x64-msvc-1.22.0" + sources."lightningcss-1.22.1" sources."lilconfig-2.1.0" sources."lines-and-columns-1.2.4" sources."locate-path-6.0.0" @@ -91109,7 +90021,7 @@ in sources."mkdirp-0.5.6" sources."ms-2.1.2" sources."mz-2.7.0" - sources."nanoid-3.3.6" + sources."nanoid-3.3.7" sources."natural-compare-1.4.0" sources."natural-compare-lite-1.4.0" (sources."needle-3.2.0" // { @@ -91240,9 +90152,8 @@ in sources."strip-bom-3.0.0" sources."strip-indent-3.0.0" sources."strip-json-comments-3.1.1" - (sources."stylus-0.60.0" // { + (sources."stylus-0.61.0" // { dependencies = [ - sources."sax-1.2.4" sources."source-map-0.7.4" ]; }) @@ -91305,7 +90216,7 @@ in sources."which-typed-array-1.1.13" sources."wrappy-1.0.2" sources."yallist-4.0.0" - sources."yaml-2.3.3" + sources."yaml-2.3.4" sources."yn-3.1.1" sources."yocto-queue-0.1.0" ]; @@ -91368,7 +90279,7 @@ in ]; }) sources."ast-types-0.13.4" - sources."async-3.2.4" + sources."async-3.2.5" (sources."async-listener-0.6.10" // { dependencies = [ sources."semver-5.7.2" @@ -91507,7 +90418,7 @@ in sources."sprintf-js-1.1.2" sources."supports-color-7.2.0" sources."supports-preserve-symlinks-flag-1.0.0" - sources."systeminformation-5.21.15" + sources."systeminformation-5.21.16" sources."to-regex-range-5.0.1" sources."tslib-2.6.2" sources."tv4-1.3.0" @@ -91590,7 +90501,7 @@ in sha512 = "PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ=="; }; dependencies = [ - sources."nanoid-3.3.6" + sources."nanoid-3.3.7" sources."picocolors-1.0.0" sources."source-map-js-1.0.2" ]; @@ -91620,16 +90531,16 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@swc/core-1.3.95" + sources."@swc/core-1.3.96" sources."@swc/counter-0.1.2" sources."@swc/helpers-0.5.3" sources."@swc/types-0.1.5" - sources."@swc/wasm-1.3.95" + sources."@swc/wasm-1.3.97" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.4" - sources."@types/node-20.8.10" + sources."@types/node-20.9.0" sources."acorn-8.11.2" sources."acorn-walk-8.3.0" sources."ansi-regex-5.0.1" @@ -91648,7 +90559,7 @@ in sources."dir-glob-3.0.1" sources."emoji-regex-8.0.0" sources."escalade-3.1.1" - sources."fast-glob-3.3.1" + sources."fast-glob-3.3.2" sources."fastq-1.15.0" sources."fill-range-7.0.1" sources."fs-extra-11.1.1" @@ -91673,7 +90584,7 @@ in sources."make-error-1.3.6" sources."merge2-1.4.1" sources."micromatch-4.0.5" - sources."nanoid-3.3.6" + sources."nanoid-3.3.7" sources."normalize-path-3.0.0" sources."path-type-4.0.0" sources."picocolors-1.0.0" @@ -91703,7 +90614,7 @@ in sources."v8-compile-cache-lib-3.0.1" sources."wrap-ansi-7.0.0" sources."y18n-5.0.8" - sources."yaml-2.3.3" + sources."yaml-2.3.4" sources."yargs-17.7.2" sources."yargs-parser-21.1.1" sources."yn-3.1.1" @@ -91854,19 +90765,19 @@ in dependencies = [ sources."@ampproject/remapping-2.2.1" sources."@babel/code-frame-7.22.13" - sources."@babel/compat-data-7.23.2" - (sources."@babel/core-7.23.2" // { + sources."@babel/compat-data-7.23.3" + (sources."@babel/core-7.23.3" // { dependencies = [ sources."convert-source-map-2.0.0" ]; }) - sources."@babel/generator-7.23.0" + sources."@babel/generator-7.23.3" sources."@babel/helper-compilation-targets-7.22.15" sources."@babel/helper-environment-visitor-7.22.20" sources."@babel/helper-function-name-7.23.0" sources."@babel/helper-hoist-variables-7.22.5" sources."@babel/helper-module-imports-7.22.15" - sources."@babel/helper-module-transforms-7.23.0" + sources."@babel/helper-module-transforms-7.23.3" 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" @@ -91874,10 +90785,10 @@ in sources."@babel/helper-validator-option-7.22.15" sources."@babel/helpers-7.23.2" sources."@babel/highlight-7.22.20" - sources."@babel/parser-7.23.0" + sources."@babel/parser-7.23.3" sources."@babel/template-7.22.15" - sources."@babel/traverse-7.23.2" - sources."@babel/types-7.23.0" + sources."@babel/traverse-7.23.3" + sources."@babel/types-7.23.3" sources."@istanbuljs/load-nyc-config-1.1.0" sources."@istanbuljs/schema-0.1.3" sources."@jridgewell/gen-mapping-0.3.3" @@ -91898,7 +90809,7 @@ in sources."browserslist-4.22.1" sources."caching-transform-4.0.0" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001559" + sources."caniuse-lite-1.0.30001561" sources."chalk-2.4.2" sources."clean-stack-2.2.0" sources."cliui-6.0.0" @@ -91911,7 +90822,7 @@ in sources."debug-4.3.4" sources."decamelize-1.2.0" sources."default-require-extensions-3.0.1" - sources."electron-to-chromium-1.4.574" + sources."electron-to-chromium-1.4.579" sources."emoji-regex-8.0.0" sources."es6-error-4.1.1" sources."escalade-3.1.1" @@ -91940,7 +90851,7 @@ in sources."is-typedarray-1.0.0" sources."is-windows-1.0.2" sources."isexe-2.0.0" - sources."istanbul-lib-coverage-3.2.0" + sources."istanbul-lib-coverage-3.2.2" sources."istanbul-lib-hook-3.0.0" sources."istanbul-lib-instrument-4.0.3" sources."istanbul-lib-processinfo-2.0.3" @@ -92500,10 +91411,10 @@ in pyright = nodeEnv.buildNodePackage { name = "pyright"; packageName = "pyright"; - version = "1.1.334"; + version = "1.1.335"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.334.tgz"; - sha512 = "EJoW78gXPeAWd0e86P8kSIbY1pO3JJxNYu2BRlv/ZflcMvCY+zpyamuQC5EcXxXtr1WzBdcQwfo/NIBqtQPEow=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.335.tgz"; + sha512 = "4iI9JPJP1YRAv4q99l0arfv3uAqQBkuqUOrmQLq7Iv6rt9HmU00R1908DqwaiePRT6HgyXCMbMmVTcs2UyKnAA=="; }; buildInputs = globalBuildInputs; meta = { @@ -92524,9 +91435,9 @@ in sha512 = "QxvCtwgDBTeBC9V+niO9WPrnNKVEIa0osvdKhw2JkhOjFY0PK/vcFL5jrj7di6GurLIzdweXJgTWnQz2VljdQQ=="; }; dependencies = [ - sources."@types/prop-types-15.7.9" - sources."@types/react-18.2.34" - sources."@types/scheduler-0.16.5" + sources."@types/prop-types-15.7.10" + sources."@types/react-18.2.37" + sources."@types/scheduler-0.16.6" sources."@types/yoga-layout-1.9.2" sources."ansi-escapes-4.3.2" sources."ansi-regex-5.0.1" @@ -92663,10 +91574,10 @@ in "reveal.js" = nodeEnv.buildNodePackage { name = "reveal.js"; packageName = "reveal.js"; - version = "5.0.1"; + version = "5.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/reveal.js/-/reveal.js-5.0.1.tgz"; - sha512 = "cgbEasV/Yh8QIRyCCiOHRtio6uxAwmOAhyr80vegX2P69/iwE1FX77EXJ9NAPvcODxoIyYrgvxAaPxR5TKcsFw=="; + url = "https://registry.npmjs.org/reveal.js/-/reveal.js-5.0.2.tgz"; + sha512 = "G5dhsr/2wormdrYPtZBfRamvnPrHc/8TtYVH3EpIzfMyKSiTprFwn61nFZbcmeK4iKKdLq2MMiiMNqlRmkBU4A=="; }; buildInputs = globalBuildInputs; meta = { @@ -92747,10 +91658,10 @@ in rollup = nodeEnv.buildNodePackage { name = "rollup"; packageName = "rollup"; - version = "4.2.0"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-4.2.0.tgz"; - sha512 = "deaMa9Z+jPVeBD2dKXv+h7EbdKte9++V2potc/ADqvVgEr6DEJ3ia9u0joarjC2lX/ubaCRYz3QVx0TzuVqAJA=="; + url = "https://registry.npmjs.org/rollup/-/rollup-4.3.0.tgz"; + sha512 = "scIi1NrKLDIYSPK66jjECtII7vIgdAMFmFo8h6qm++I6nN9qDSV35Ku6erzGVqYjx+lj+j5wkusRMr++8SyDZg=="; }; buildInputs = globalBuildInputs; meta = { @@ -92771,14 +91682,14 @@ in sources."@aashutoshrathi/word-wrap-1.2.6" sources."@eslint-community/eslint-utils-4.4.0" sources."@eslint-community/regexpp-4.10.0" - (sources."@eslint/eslintrc-2.1.2" // { + (sources."@eslint/eslintrc-2.1.3" // { dependencies = [ sources."brace-expansion-1.1.11" sources."minimatch-3.1.2" sources."strip-json-comments-3.1.1" ]; }) - sources."@eslint/js-8.52.0" + sources."@eslint/js-8.53.0" sources."@hpcc-js/wasm-2.14.1" (sources."@humanwhocodes/config-array-0.11.13" // { dependencies = [ @@ -92793,18 +91704,18 @@ in sources."@nodelib/fs.walk-1.2.8" sources."@tootallnate/once-1.1.2" sources."@tsconfig/strictest-2.0.2" - sources."@types/json-schema-7.0.14" + sources."@types/json-schema-7.0.15" sources."@types/node-16.11.68" - sources."@types/semver-7.5.4" + sources."@types/semver-7.5.5" sources."@types/vscode-1.75.1" - sources."@typescript-eslint/eslint-plugin-6.9.1" - sources."@typescript-eslint/parser-6.9.1" - sources."@typescript-eslint/scope-manager-6.9.1" - sources."@typescript-eslint/type-utils-6.9.1" - sources."@typescript-eslint/types-6.9.1" - sources."@typescript-eslint/typescript-estree-6.9.1" - sources."@typescript-eslint/utils-6.9.1" - sources."@typescript-eslint/visitor-keys-6.9.1" + sources."@typescript-eslint/eslint-plugin-6.10.0" + sources."@typescript-eslint/parser-6.10.0" + sources."@typescript-eslint/scope-manager-6.10.0" + sources."@typescript-eslint/type-utils-6.10.0" + sources."@typescript-eslint/types-6.10.0" + sources."@typescript-eslint/typescript-estree-6.10.0" + sources."@typescript-eslint/utils-6.10.0" + sources."@typescript-eslint/visitor-keys-6.10.0" sources."@ungap/structured-clone-1.2.0" sources."@vscode/test-electron-2.3.6" (sources."@vscode/vsce-2.22.0" // { @@ -92874,11 +91785,7 @@ in sources."d3-force-3.0.0" sources."d3-format-3.1.0" sources."d3-geo-3.1.0" - (sources."d3-graphviz-5.1.0" // { - dependencies = [ - sources."@hpcc-js/wasm-2.13.1" - ]; - }) + sources."d3-graphviz-5.2.0" sources."d3-hierarchy-3.1.2" sources."d3-interpolate-3.0.1" sources."d3-path-3.1.0" @@ -92912,7 +91819,7 @@ in sources."entities-4.5.0" sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" - (sources."eslint-8.52.0" // { + (sources."eslint-8.53.0" // { dependencies = [ sources."brace-expansion-1.1.11" sources."chalk-4.1.2" @@ -92933,7 +91840,7 @@ in sources."esutils-2.0.3" sources."expand-template-2.0.3" sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.3.1" + sources."fast-glob-3.3.2" sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" sources."fastq-1.15.0" @@ -93356,19 +92263,19 @@ in sources."tslib-1.14.1" ]; }) - (sources."@aws-sdk/client-cloudformation-3.441.0" // { + (sources."@aws-sdk/client-cloudformation-3.445.0" // { dependencies = [ sources."uuid-8.3.2" ]; }) - sources."@aws-sdk/client-sso-3.441.0" - sources."@aws-sdk/client-sts-3.441.0" - sources."@aws-sdk/core-3.441.0" + sources."@aws-sdk/client-sso-3.445.0" + sources."@aws-sdk/client-sts-3.445.0" + sources."@aws-sdk/core-3.445.0" sources."@aws-sdk/credential-provider-env-3.433.0" - sources."@aws-sdk/credential-provider-ini-3.441.0" - sources."@aws-sdk/credential-provider-node-3.441.0" + sources."@aws-sdk/credential-provider-ini-3.445.0" + sources."@aws-sdk/credential-provider-node-3.445.0" sources."@aws-sdk/credential-provider-process-3.433.0" - sources."@aws-sdk/credential-provider-sso-3.441.0" + sources."@aws-sdk/credential-provider-sso-3.445.0" sources."@aws-sdk/credential-provider-web-identity-3.433.0" sources."@aws-sdk/middleware-host-header-3.433.0" sources."@aws-sdk/middleware-logger-3.433.0" @@ -93460,12 +92367,12 @@ in sources."@szmarczak/http-timer-4.0.6" sources."@tokenizer/token-0.3.0" sources."@types/cacheable-request-6.0.3" - sources."@types/http-cache-semantics-4.0.3" + sources."@types/http-cache-semantics-4.0.4" sources."@types/keyv-3.1.4" - sources."@types/lodash-4.14.200" - sources."@types/node-20.8.10" - sources."@types/responselike-1.0.2" - sources."@types/ws-8.5.8" + sources."@types/lodash-4.14.201" + sources."@types/node-20.9.0" + sources."@types/responselike-1.0.3" + sources."@types/ws-8.5.9" sources."abort-controller-3.0.0" sources."adm-zip-0.5.10" sources."agent-base-6.0.2" @@ -93489,12 +92396,12 @@ in sources."argparse-1.0.10" sources."array-union-2.1.0" sources."asap-2.0.6" - sources."async-3.2.4" + sources."async-3.2.5" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" sources."available-typed-arrays-1.0.5" - sources."aws-crt-1.18.3" - (sources."aws-sdk-2.1486.0" // { + sources."aws-crt-1.19.0" + (sources."aws-sdk-2.1492.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -93502,7 +92409,7 @@ in sources."uuid-8.0.0" ]; }) - sources."axios-0.24.0" + sources."axios-1.6.1" sources."balanced-match-1.0.2" sources."base64-js-1.5.1" sources."binary-extensions-2.2.0" @@ -93673,7 +92580,7 @@ in sources."ext-name-5.0.0" sources."external-editor-3.1.0" sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.3.1" + sources."fast-glob-3.3.2" sources."fast-safe-stringify-2.1.1" sources."fast-xml-parser-4.2.5" sources."fastest-levenshtein-1.0.16" @@ -93867,6 +92774,7 @@ in sources."process-nextick-args-2.0.1" sources."process-utils-4.0.0" sources."promise-queue-2.2.5" + sources."proxy-from-env-1.1.0" sources."pump-3.0.0" sources."punycode-2.3.1" sources."qs-6.11.2" @@ -94274,7 +93182,7 @@ in sha512 = "fKmMA8q5OyeZpFCxBa3FuFywQcziQXKBw9B8jwDJ/Ra3H/pkZpQJl9g5s3MIjUo2jwUDHUnaxXgVXObXFdiJBw=="; }; dependencies = [ - sources."async-3.2.4" + sources."async-3.2.5" sources."cli-table-0.3.11" sources."colors-1.0.3" sources."commander-11.1.0" @@ -94455,15 +93363,15 @@ in dependencies = [ sources."@socket.io/component-emitter-3.1.0" sources."@types/cookie-0.4.1" - sources."@types/cors-2.8.15" - sources."@types/node-20.8.10" + sources."@types/cors-2.8.16" + sources."@types/node-20.9.0" sources."accepts-1.3.8" sources."base64id-2.0.0" sources."bufferutil-4.0.8" sources."cookie-0.4.2" sources."cors-2.8.5" sources."debug-4.3.4" - sources."engine.io-6.5.3" + sources."engine.io-6.5.4" sources."engine.io-parser-5.2.1" sources."mime-db-1.52.0" sources."mime-types-2.1.35" @@ -94518,8 +93426,8 @@ in sources."supports-color-5.5.0" ]; }) - sources."@types/minimist-1.2.4" - sources."@types/normalize-package-data-2.4.3" + sources."@types/minimist-1.2.5" + sources."@types/normalize-package-data-2.4.4" sources."agent-base-4.3.0" sources."ansi-escapes-5.0.0" sources."ansi-regex-6.0.1" @@ -94718,15 +93626,15 @@ in dependencies = [ sources."@ampproject/remapping-2.2.1" sources."@babel/code-frame-7.22.13" - sources."@babel/compat-data-7.23.2" - sources."@babel/core-7.23.2" - sources."@babel/generator-7.23.0" + sources."@babel/compat-data-7.23.3" + sources."@babel/core-7.23.3" + sources."@babel/generator-7.23.3" sources."@babel/helper-compilation-targets-7.22.15" sources."@babel/helper-environment-visitor-7.22.20" sources."@babel/helper-function-name-7.23.0" sources."@babel/helper-hoist-variables-7.22.5" sources."@babel/helper-module-imports-7.22.15" - sources."@babel/helper-module-transforms-7.23.0" + sources."@babel/helper-module-transforms-7.23.3" 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" @@ -94734,10 +93642,10 @@ in sources."@babel/helper-validator-option-7.22.15" sources."@babel/helpers-7.23.2" sources."@babel/highlight-7.22.20" - sources."@babel/parser-7.23.0" + sources."@babel/parser-7.23.3" sources."@babel/template-7.22.15" - sources."@babel/traverse-7.23.2" - sources."@babel/types-7.23.0" + sources."@babel/traverse-7.23.3" + sources."@babel/types-7.23.3" (sources."@cspotcode/source-map-support-0.8.1" // { dependencies = [ sources."@jridgewell/trace-mapping-0.3.9" @@ -94751,18 +93659,18 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@swc/core-1.3.95" + sources."@swc/core-1.3.96" sources."@swc/counter-0.1.2" sources."@swc/helpers-0.5.3" sources."@swc/types-0.1.5" - sources."@swc/wasm-1.3.95" + sources."@swc/wasm-1.3.97" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.4" - sources."@types/estree-1.0.4" - sources."@types/node-20.8.10" - sources."@types/pug-2.0.8" + sources."@types/estree-1.0.5" + sources."@types/node-20.9.0" + sources."@types/pug-2.0.9" sources."acorn-8.11.2" sources."acorn-walk-8.3.0" sources."ansi-styles-3.2.1" @@ -94782,7 +93690,7 @@ in sources."buffer-crc32-0.2.13" sources."call-bind-1.0.5" sources."callsites-3.1.0" - sources."caniuse-lite-1.0.30001559" + sources."caniuse-lite-1.0.30001561" sources."chalk-2.4.2" sources."character-parser-2.2.0" sources."chokidar-3.5.3" @@ -94804,13 +93712,13 @@ in sources."detect-indent-6.1.0" sources."diff-4.0.2" sources."doctypes-1.1.0" - sources."electron-to-chromium-1.4.574" + sources."electron-to-chromium-1.4.579" sources."errno-0.1.8" sources."es6-promise-3.3.1" sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" sources."estree-walker-3.0.3" - sources."fast-glob-3.3.1" + sources."fast-glob-3.3.2" sources."fastq-1.15.0" sources."fill-range-7.0.1" sources."fs.realpath-1.0.0" @@ -94875,7 +93783,7 @@ in sources."mkdirp-0.5.6" sources."mri-1.2.0" sources."ms-2.1.2" - sources."nanoid-3.3.6" + sources."nanoid-3.3.7" (sources."needle-3.2.0" // { dependencies = [ sources."debug-3.2.7" @@ -94959,7 +93867,7 @@ in sources."with-7.0.2" sources."wrappy-1.0.2" sources."yallist-3.1.1" - sources."yaml-2.3.3" + sources."yaml-2.3.4" sources."yn-3.1.1" ]; buildInputs = globalBuildInputs; @@ -94983,15 +93891,15 @@ in dependencies = [ sources."@ampproject/remapping-2.2.1" sources."@babel/code-frame-7.22.13" - sources."@babel/compat-data-7.23.2" - sources."@babel/core-7.23.2" - sources."@babel/generator-7.23.0" + sources."@babel/compat-data-7.23.3" + sources."@babel/core-7.23.3" + sources."@babel/generator-7.23.3" sources."@babel/helper-compilation-targets-7.22.15" sources."@babel/helper-environment-visitor-7.22.20" sources."@babel/helper-function-name-7.23.0" sources."@babel/helper-hoist-variables-7.22.5" sources."@babel/helper-module-imports-7.22.15" - sources."@babel/helper-module-transforms-7.23.0" + sources."@babel/helper-module-transforms-7.23.3" 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" @@ -94999,10 +93907,10 @@ in sources."@babel/helper-validator-option-7.22.15" sources."@babel/helpers-7.23.2" sources."@babel/highlight-7.22.20" - sources."@babel/parser-7.23.0" + sources."@babel/parser-7.23.3" sources."@babel/template-7.22.15" - sources."@babel/traverse-7.23.2" - sources."@babel/types-7.23.0" + sources."@babel/traverse-7.23.3" + sources."@babel/types-7.23.3" (sources."@cspotcode/source-map-support-0.8.1" // { dependencies = [ sources."@jridgewell/trace-mapping-0.3.9" @@ -95019,17 +93927,17 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@swc/core-1.3.95" + sources."@swc/core-1.3.96" sources."@swc/counter-0.1.2" sources."@swc/helpers-0.5.3" sources."@swc/types-0.1.5" - sources."@swc/wasm-1.3.95" + sources."@swc/wasm-1.3.97" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.4" - sources."@types/node-20.8.10" - sources."@types/pug-2.0.8" + sources."@types/node-20.9.0" + sources."@types/pug-2.0.9" (sources."@vscode/emmet-helper-2.8.4" // { dependencies = [ sources."vscode-uri-2.1.2" @@ -95052,7 +93960,7 @@ in sources."browserslist-4.22.1" sources."buffer-crc32-0.2.13" sources."call-bind-1.0.5" - sources."caniuse-lite-1.0.30001559" + sources."caniuse-lite-1.0.30001561" sources."chalk-2.4.2" sources."character-parser-2.2.0" sources."chokidar-3.5.3" @@ -95072,14 +93980,14 @@ in sources."detect-indent-6.1.0" sources."diff-4.0.2" sources."doctypes-1.1.0" - sources."electron-to-chromium-1.4.574" + sources."electron-to-chromium-1.4.579" sources."emmet-2.4.6" sources."errno-0.1.8" sources."es6-promise-3.3.1" sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" sources."estree-walker-2.0.2" - sources."fast-glob-3.3.1" + sources."fast-glob-3.3.2" sources."fastq-1.15.0" sources."fill-range-7.0.1" sources."fs.realpath-1.0.0" @@ -95142,7 +94050,7 @@ in sources."minimist-1.2.8" sources."mkdirp-0.5.6" sources."ms-2.1.2" - sources."nanoid-3.3.6" + sources."nanoid-3.3.7" (sources."needle-3.2.0" // { dependencies = [ sources."debug-3.2.7" @@ -95240,7 +94148,7 @@ in sources."with-7.0.2" sources."wrappy-1.0.2" sources."yallist-3.1.1" - sources."yaml-2.3.3" + sources."yaml-2.3.4" sources."yn-3.1.1" ]; buildInputs = globalBuildInputs; @@ -95256,10 +94164,10 @@ in svgo = nodeEnv.buildNodePackage { name = "svgo"; packageName = "svgo"; - version = "3.0.2"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/svgo/-/svgo-3.0.2.tgz"; - sha512 = "Z706C1U2pb1+JGP48fbazf3KxHrWOsLme6Rv7imFBn5EnuanDW1GPaA/P1/dvObE670JDePC3mnj0k0B7P0jjQ=="; + url = "https://registry.npmjs.org/svgo/-/svgo-3.0.3.tgz"; + sha512 = "X4UZvLhOglD5Xrp834HzGHf8RKUW0Ahigg/08yRO1no9t2NxffOkMiQ0WmaMIbaGlVTlSst2zWANsdhz5ybXgA=="; }; dependencies = [ sources."@trysound/sax-0.2.0" @@ -95287,7 +94195,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Nodejs-based tool for optimizing SVG vector graphics files"; - homepage = "https://github.com/svg/svgo"; + homepage = "https://svgo.dev"; license = "MIT"; }; production = true; @@ -95313,16 +94221,16 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@swc/core-1.3.95" + sources."@swc/core-1.3.96" sources."@swc/counter-0.1.2" sources."@swc/helpers-0.5.3" sources."@swc/types-0.1.5" - sources."@swc/wasm-1.3.95" + sources."@swc/wasm-1.3.97" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.4" - sources."@types/node-20.8.10" + sources."@types/node-20.9.0" sources."acorn-8.11.2" sources."acorn-walk-8.3.0" sources."any-promise-1.3.0" @@ -95345,7 +94253,7 @@ in sources."didyoumean-1.2.2" sources."diff-4.0.2" sources."dlv-1.1.3" - (sources."fast-glob-3.3.1" // { + (sources."fast-glob-3.3.2" // { dependencies = [ sources."glob-parent-5.1.2" ]; @@ -95373,7 +94281,7 @@ in sources."micromatch-4.0.5" sources."minimatch-3.1.2" sources."mz-2.7.0" - sources."nanoid-3.3.6" + sources."nanoid-3.3.7" sources."normalize-path-3.0.0" sources."object-assign-4.1.1" sources."object-hash-3.0.0" @@ -95415,7 +94323,7 @@ in sources."util-deprecate-1.0.2" sources."v8-compile-cache-lib-3.0.1" sources."wrappy-1.0.2" - sources."yaml-2.3.3" + sources."yaml-2.3.4" sources."yn-3.1.1" ]; buildInputs = globalBuildInputs; @@ -95504,33 +94412,33 @@ in textlint = nodeEnv.buildNodePackage { name = "textlint"; packageName = "textlint"; - version = "13.3.3"; + version = "13.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/textlint/-/textlint-13.3.3.tgz"; - sha512 = "1LhJTNBFVNYtl4C6IJXt1XwAJANvquyDuP4NrhcG+1DwT3S7kiUR9vLo5yo046X83VT7ownzS97Q/yC6A7bZXg=="; + url = "https://registry.npmjs.org/textlint/-/textlint-13.4.0.tgz"; + sha512 = "Op3Tt6J7yOJY8hbYkU6Pakw2tb37SlyS1F/KAVNSKHSeW9Kp/GF+9O6HDmdaM8dhGldy2vVBhxm9/nlXTU1p0w=="; }; dependencies = [ sources."@aashutoshrathi/word-wrap-1.2.6" sources."@azu/format-text-1.0.2" sources."@azu/style-format-1.0.1" - sources."@textlint/ast-node-types-13.3.3" - sources."@textlint/ast-tester-13.3.3" - sources."@textlint/ast-traverse-13.3.3" - sources."@textlint/config-loader-13.3.3" - sources."@textlint/feature-flag-13.3.3" - sources."@textlint/fixer-formatter-13.3.3" - sources."@textlint/kernel-13.3.3" - sources."@textlint/linter-formatter-13.3.3" - sources."@textlint/markdown-to-ast-13.3.3" - sources."@textlint/module-interop-13.3.3" - sources."@textlint/source-code-fixer-13.3.3" - sources."@textlint/text-to-ast-13.3.3" - sources."@textlint/textlint-plugin-markdown-13.3.3" - sources."@textlint/textlint-plugin-text-13.3.3" - sources."@textlint/types-13.3.3" - sources."@textlint/utils-13.3.3" - sources."@types/mdast-3.0.14" - sources."@types/unist-2.0.9" + sources."@textlint/ast-node-types-13.4.0" + sources."@textlint/ast-tester-13.4.0" + sources."@textlint/ast-traverse-13.4.0" + sources."@textlint/config-loader-13.4.0" + sources."@textlint/feature-flag-13.4.0" + sources."@textlint/fixer-formatter-13.4.0" + sources."@textlint/kernel-13.4.0" + sources."@textlint/linter-formatter-13.4.0" + sources."@textlint/markdown-to-ast-13.4.0" + sources."@textlint/module-interop-13.4.0" + sources."@textlint/source-code-fixer-13.4.0" + sources."@textlint/text-to-ast-13.4.0" + sources."@textlint/textlint-plugin-markdown-13.4.0" + sources."@textlint/textlint-plugin-text-13.4.0" + sources."@textlint/types-13.4.0" + sources."@textlint/utils-13.4.0" + sources."@types/mdast-3.0.15" + sources."@types/unist-2.0.10" sources."ajv-8.12.0" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" @@ -95639,7 +94547,7 @@ in sources."path-exists-3.0.0" sources."path-is-absolute-1.0.1" sources."path-parse-1.0.7" - sources."path-to-glob-pattern-1.0.2" + sources."path-to-glob-pattern-2.0.1" sources."path-type-1.1.0" sources."pify-2.3.0" sources."pinkie-2.0.4" @@ -95775,291 +94683,401 @@ in textlint-rule-alex = nodeEnv.buildNodePackage { name = "textlint-rule-alex"; packageName = "textlint-rule-alex"; - version = "3.0.0"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/textlint-rule-alex/-/textlint-rule-alex-3.0.0.tgz"; - sha512 = "z/Xo1WHxAn7eueUbRLXoMNew+R3dzGENPG/yiCt/KT2WgAfRuQ7GeF855kLcnCCqdTnl6W7sYq8TKy+/DLpiqQ=="; + url = "https://registry.npmjs.org/textlint-rule-alex/-/textlint-rule-alex-4.0.0.tgz"; + sha512 = "WdDWGMuwqvj2HzFi7qZ/kyMFEH0wu7FlwXItZZBsH67azzmigMih3X8xxr3Gw5SBqQ4SZoqM/KJErqQ1jSCCBA=="; }; dependencies = [ sources."@babel/code-frame-7.22.13" sources."@babel/helper-validator-identifier-7.22.20" sources."@babel/highlight-7.22.20" - sources."@sindresorhus/is-0.14.0" - sources."@szmarczak/http-timer-1.1.2" - sources."@textlint/ast-node-types-13.3.3" - sources."@types/hast-2.3.7" - sources."@types/minimist-1.2.4" - sources."@types/normalize-package-data-2.4.3" - sources."@types/parse5-5.0.3" - sources."@types/unist-2.0.9" - sources."alex-9.1.1" - sources."ansi-align-3.0.1" + sources."@isaacs/cliui-8.0.2" + sources."@npmcli/config-6.4.0" + (sources."@npmcli/map-workspaces-3.0.4" // { + dependencies = [ + sources."glob-10.3.10" + sources."minimatch-9.0.3" + ]; + }) + sources."@npmcli/name-from-folder-2.0.0" + sources."@pnpm/config.env-replace-1.1.0" + (sources."@pnpm/network.ca-file-1.0.2" // { + dependencies = [ + sources."graceful-fs-4.2.10" + ]; + }) + sources."@pnpm/npm-conf-2.2.2" + sources."@sindresorhus/is-5.6.0" + sources."@szmarczak/http-timer-5.0.1" + sources."@textlint/ast-node-types-13.4.0" + sources."@types/acorn-4.0.6" + sources."@types/concat-stream-2.0.2" + sources."@types/debug-4.1.12" + sources."@types/estree-1.0.5" + sources."@types/estree-jsx-1.0.3" + sources."@types/hast-2.3.8" + sources."@types/http-cache-semantics-4.0.4" + sources."@types/is-empty-1.2.3" + sources."@types/mdast-3.0.15" + sources."@types/minimist-1.2.5" + sources."@types/ms-0.7.34" + sources."@types/nlcst-1.0.4" + sources."@types/node-18.18.9" + sources."@types/normalize-package-data-2.4.4" + sources."@types/supports-color-8.1.3" + sources."@types/unist-2.0.10" + sources."abbrev-2.0.0" + sources."acorn-8.11.2" + sources."acorn-jsx-5.3.2" + sources."alex-11.0.1" + (sources."ansi-align-3.0.1" // { + dependencies = [ + sources."emoji-regex-8.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" + ]; + }) sources."ansi-regex-5.0.1" sources."ansi-styles-3.2.1" - sources."argparse-1.0.10" - sources."array-iterate-1.1.4" + sources."array-iterate-2.0.1" sources."arrify-1.0.1" - sources."bail-1.0.5" + sources."bail-2.0.2" sources."balanced-match-1.0.2" sources."boundary-2.0.0" - (sources."boxen-4.2.0" // { + (sources."boxen-7.1.1" // { dependencies = [ - sources."ansi-styles-4.3.0" - sources."chalk-3.0.0" - 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."type-fest-0.8.1" + sources."chalk-5.3.0" + sources."type-fest-2.19.0" ]; }) - sources."brace-expansion-1.1.11" + sources."brace-expansion-2.0.1" sources."bubble-stream-error-1.0.0" sources."buffer-from-1.1.2" - (sources."cacheable-request-6.1.0" // { + sources."cacheable-lookup-7.0.0" + sources."cacheable-request-10.2.14" + sources."camelcase-7.0.1" + (sources."camelcase-keys-8.0.2" // { dependencies = [ - sources."get-stream-5.2.0" - sources."lowercase-keys-2.0.0" - sources."pump-3.0.0" + sources."type-fest-2.19.0" ]; }) - sources."camelcase-5.3.1" - sources."camelcase-keys-6.2.2" - sources."ccount-1.1.0" + sources."ccount-2.0.1" sources."chalk-2.4.2" - sources."character-entities-1.2.4" - sources."character-entities-html4-1.1.4" - sources."character-entities-legacy-1.1.4" - sources."character-reference-invalid-1.1.4" - sources."ci-info-2.0.0" - sources."cli-boxes-2.2.1" - sources."clone-response-1.0.3" - sources."collapse-white-space-1.0.6" + sources."character-entities-2.0.2" + sources."character-entities-html4-2.1.0" + sources."character-entities-legacy-3.0.0" + sources."character-reference-invalid-2.0.1" + sources."ci-info-3.9.0" + sources."cli-boxes-3.0.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."comma-separated-tokens-1.0.8" - sources."concat-map-0.0.1" + sources."comma-separated-tokens-2.0.3" (sources."concat-stream-2.0.0" // { dependencies = [ sources."readable-stream-3.6.2" sources."string_decoder-1.3.0" ]; }) - sources."configstore-5.0.1" + (sources."config-chain-1.1.13" // { + dependencies = [ + sources."ini-1.3.8" + ]; + }) + sources."configstore-6.0.0" sources."core-util-is-1.0.3" - sources."crypto-random-string-2.0.0" - sources."cuss-1.21.0" + sources."cross-spawn-7.0.3" + (sources."crypto-random-string-4.0.0" // { + dependencies = [ + sources."type-fest-1.4.0" + ]; + }) + sources."cuss-2.2.0" sources."debug-4.3.4" - sources."decamelize-1.2.0" + sources."decamelize-6.0.0" (sources."decamelize-keys-1.1.1" // { dependencies = [ + sources."decamelize-1.2.0" sources."map-obj-1.0.1" ]; }) - sources."decompress-response-3.3.0" + sources."decode-named-character-reference-1.0.2" + (sources."decompress-response-6.0.0" // { + dependencies = [ + sources."mimic-response-3.1.0" + ]; + }) sources."deep-extend-0.6.0" - sources."defer-to-connect-1.1.3" - sources."dot-prop-5.3.0" + sources."defer-to-connect-2.0.1" + sources."dequal-2.0.3" + sources."diff-5.1.0" + sources."dot-prop-6.0.1" sources."duplexer-0.1.2" - sources."duplexer3-0.1.5" - sources."emoji-regex-8.0.0" + sources."eastasianwidth-0.2.0" + sources."emoji-regex-9.2.2" sources."end-of-stream-1.4.4" sources."error-ex-1.3.2" - sources."escape-goat-2.1.1" + sources."escape-goat-4.0.0" sources."escape-string-regexp-1.0.5" - sources."esprima-4.0.1" + sources."estree-util-is-identifier-name-2.1.0" + sources."estree-util-visit-1.2.1" sources."event-stream-3.1.7" sources."extend-3.0.2" - sources."fault-1.0.4" - sources."figgy-pudding-3.5.2" - sources."figures-3.2.0" - sources."find-up-4.1.0" + sources."fault-2.0.1" + sources."find-up-6.3.0" + sources."foreground-child-3.1.1" + sources."form-data-encoder-2.1.4" sources."format-0.2.2" sources."from-0.1.7" sources."fs.realpath-1.0.0" sources."function-bind-1.1.2" - (sources."get-stream-4.1.0" // { - dependencies = [ - sources."pump-3.0.0" - ]; - }) + sources."get-stream-6.0.1" sources."git-diff-tree-1.1.0" sources."git-spawned-stream-1.0.1" - sources."glob-7.2.3" - (sources."global-dirs-2.1.0" // { + sources."glob-8.1.0" + (sources."global-dirs-3.0.1" // { dependencies = [ - sources."ini-1.3.7" + sources."ini-2.0.0" ]; }) - sources."got-9.6.0" + sources."got-12.6.1" sources."graceful-fs-4.2.11" sources."hard-rejection-2.1.0" sources."has-flag-3.0.0" - sources."has-yarn-2.1.0" + sources."has-yarn-3.0.0" sources."hasown-2.0.0" - sources."hast-util-embedded-1.0.6" - sources."hast-util-from-parse5-6.0.1" - sources."hast-util-has-property-1.0.4" - sources."hast-util-is-body-ok-link-1.0.4" - sources."hast-util-is-element-1.1.0" - sources."hast-util-parse-selector-2.2.5" - sources."hast-util-phrasing-1.0.5" - sources."hast-util-to-nlcst-1.2.8" - sources."hast-util-to-string-1.0.4" - sources."hast-util-whitespace-1.0.4" - sources."hastscript-6.0.0" - sources."hosted-git-info-2.8.9" + sources."hast-util-embedded-2.0.1" + sources."hast-util-from-parse5-7.1.2" + sources."hast-util-has-property-2.0.1" + sources."hast-util-is-body-ok-link-2.0.0" + sources."hast-util-is-element-2.1.3" + sources."hast-util-parse-selector-3.1.1" + sources."hast-util-phrasing-2.0.2" + sources."hast-util-to-nlcst-2.2.0" + sources."hast-util-to-string-2.0.0" + sources."hast-util-whitespace-2.0.1" + sources."hastscript-7.2.0" + sources."hosted-git-info-5.2.1" sources."http-cache-semantics-4.1.1" + (sources."http2-wrapper-2.2.0" // { + dependencies = [ + sources."quick-lru-5.1.1" + ]; + }) sources."ignore-5.2.4" - sources."import-lazy-2.1.0" + sources."import-lazy-4.0.0" + sources."import-meta-resolve-2.2.2" sources."imurmurhash-0.1.4" - sources."indent-string-4.0.0" + sources."indent-string-5.0.0" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."ini-1.3.8" - sources."is-alphabetical-1.0.4" - sources."is-alphanumeric-1.0.0" - sources."is-alphanumerical-1.0.4" + sources."ini-4.1.1" + sources."is-alphabetical-2.0.1" + sources."is-alphanumerical-2.0.1" sources."is-arrayish-0.2.1" sources."is-buffer-2.0.5" - sources."is-ci-2.0.0" + sources."is-ci-3.0.1" sources."is-core-module-2.13.1" - sources."is-decimal-1.0.4" + sources."is-decimal-2.0.1" sources."is-empty-1.2.0" sources."is-fullwidth-code-point-3.0.0" - sources."is-hexadecimal-1.0.4" - sources."is-installed-globally-0.3.2" - sources."is-npm-4.0.0" + sources."is-hexadecimal-2.0.1" + sources."is-installed-globally-0.4.0" + sources."is-npm-6.0.0" sources."is-obj-2.0.0" sources."is-path-inside-3.0.3" sources."is-plain-obj-1.1.0" sources."is-typedarray-1.0.0" - sources."is-whitespace-character-1.0.4" - sources."is-word-character-1.0.4" - sources."is-yarn-global-0.3.0" + sources."is-yarn-global-0.4.1" sources."isarray-0.0.1" + sources."isexe-2.0.0" + sources."jackspeak-2.3.6" sources."js-tokens-4.0.0" - sources."js-yaml-3.14.1" - sources."json-buffer-3.0.0" + sources."json-buffer-3.0.1" sources."json-parse-even-better-errors-2.3.1" - sources."keyv-3.1.0" + sources."keyv-4.5.4" sources."kind-of-6.0.3" - sources."latest-version-5.1.0" - (sources."libnpmconfig-1.2.1" // { - dependencies = [ - sources."find-up-3.0.0" - sources."locate-path-3.0.0" - sources."p-locate-3.0.0" - sources."path-exists-3.0.0" - ]; - }) + sources."kleur-4.1.5" + sources."latest-version-7.0.0" sources."limit-spawn-0.0.3" sources."lines-and-columns-1.2.4" - sources."load-plugin-3.0.0" - sources."locate-path-5.0.0" - sources."lodash.difference-4.5.0" - sources."lodash.intersection-4.4.0" - sources."longest-streak-2.0.4" - sources."lowercase-keys-1.0.1" - (sources."make-dir-3.1.0" // { + sources."load-plugin-5.1.0" + sources."locate-path-7.2.0" + sources."longest-streak-3.1.0" + sources."lowercase-keys-3.0.0" + sources."lru-cache-7.18.3" + sources."map-obj-4.3.0" + sources."map-stream-0.1.0" + sources."markdown-table-3.0.3" + sources."mdast-comment-marker-2.1.2" + (sources."mdast-util-find-and-replace-2.2.2" // { dependencies = [ - sources."semver-6.3.1" + sources."escape-string-regexp-5.0.0" ]; }) - sources."map-obj-4.3.0" - sources."map-stream-0.1.0" - sources."markdown-escapes-1.0.4" - sources."markdown-table-2.0.0" - sources."mdast-comment-marker-1.1.2" - sources."mdast-util-compact-2.0.1" - sources."mdast-util-to-nlcst-4.0.1" - sources."meow-7.1.1" - sources."mimic-response-1.0.1" + sources."mdast-util-from-markdown-1.3.1" + sources."mdast-util-frontmatter-1.0.1" + sources."mdast-util-gfm-2.0.2" + sources."mdast-util-gfm-autolink-literal-1.0.3" + sources."mdast-util-gfm-footnote-1.0.2" + sources."mdast-util-gfm-strikethrough-1.0.3" + sources."mdast-util-gfm-table-1.0.7" + sources."mdast-util-gfm-task-list-item-1.0.2" + sources."mdast-util-mdx-2.0.1" + sources."mdast-util-mdx-expression-1.3.2" + sources."mdast-util-mdx-jsx-2.1.4" + sources."mdast-util-mdxjs-esm-1.3.1" + sources."mdast-util-phrasing-3.0.1" + sources."mdast-util-to-markdown-1.5.0" + sources."mdast-util-to-nlcst-5.2.1" + sources."mdast-util-to-string-3.2.0" + sources."meow-11.0.0" + sources."micromark-3.2.0" + sources."micromark-core-commonmark-1.1.0" + sources."micromark-extension-frontmatter-1.1.1" + sources."micromark-extension-gfm-2.0.3" + sources."micromark-extension-gfm-autolink-literal-1.0.5" + sources."micromark-extension-gfm-footnote-1.1.2" + sources."micromark-extension-gfm-strikethrough-1.0.7" + sources."micromark-extension-gfm-table-1.0.7" + sources."micromark-extension-gfm-tagfilter-1.0.2" + sources."micromark-extension-gfm-task-list-item-1.0.5" + sources."micromark-extension-mdx-expression-1.0.8" + sources."micromark-extension-mdx-jsx-1.0.5" + sources."micromark-extension-mdx-md-1.0.1" + sources."micromark-extension-mdxjs-1.0.1" + sources."micromark-extension-mdxjs-esm-1.0.5" + sources."micromark-factory-destination-1.1.0" + sources."micromark-factory-label-1.1.0" + sources."micromark-factory-mdx-expression-1.0.9" + sources."micromark-factory-space-1.1.0" + sources."micromark-factory-title-1.1.0" + sources."micromark-factory-whitespace-1.1.0" + sources."micromark-util-character-1.2.0" + sources."micromark-util-chunked-1.1.0" + sources."micromark-util-classify-character-1.1.0" + sources."micromark-util-combine-extensions-1.1.0" + sources."micromark-util-decode-numeric-character-reference-1.1.0" + sources."micromark-util-decode-string-1.1.0" + sources."micromark-util-encode-1.1.0" + sources."micromark-util-events-to-acorn-1.2.3" + sources."micromark-util-html-tag-name-1.2.0" + sources."micromark-util-normalize-identifier-1.1.0" + sources."micromark-util-resolve-all-1.1.0" + sources."micromark-util-sanitize-uri-1.2.0" + sources."micromark-util-subtokenize-1.1.0" + sources."micromark-util-symbol-1.1.0" + sources."micromark-util-types-1.1.0" + sources."mimic-response-4.0.0" sources."min-indent-1.0.1" - sources."minimatch-3.1.2" + sources."minimatch-5.1.6" sources."minimist-1.2.8" sources."minimist-options-4.1.0" + sources."minipass-7.0.4" + sources."mri-1.2.0" sources."ms-2.1.2" - sources."nlcst-is-literal-1.2.2" - sources."nlcst-normalize-2.1.5" - sources."nlcst-search-2.0.0" - sources."nlcst-to-string-2.0.4" - sources."normalize-package-data-2.5.0" - sources."normalize-url-4.5.1" - sources."object-keys-1.1.1" + sources."nlcst-is-literal-2.1.1" + sources."nlcst-normalize-3.1.1" + sources."nlcst-search-3.1.1" + sources."nlcst-to-string-3.1.1" + sources."nopt-7.2.0" + sources."normalize-package-data-4.0.1" + sources."normalize-url-8.0.0" + sources."npm-normalize-package-bin-3.0.1" + sources."object-keys-0.4.0" sources."once-1.4.0" - sources."p-cancelable-1.1.0" - sources."p-limit-2.3.0" - sources."p-locate-4.1.0" - sources."p-try-2.2.0" - (sources."package-json-6.5.0" // { + sources."p-cancelable-3.0.0" + sources."p-limit-4.0.0" + sources."p-locate-6.0.0" + sources."package-json-8.1.1" + (sources."parse-english-5.0.0" // { dependencies = [ - sources."semver-6.3.1" + sources."nlcst-to-string-2.0.4" ]; }) - sources."parse-english-4.2.0" - sources."parse-entities-2.0.0" + sources."parse-entities-4.0.1" sources."parse-json-5.2.0" - sources."parse-latin-4.3.0" + (sources."parse-latin-5.0.1" // { + dependencies = [ + sources."unist-util-modify-children-3.1.1" + sources."unist-util-visit-children-2.0.2" + ]; + }) sources."parse5-6.0.1" - sources."path-exists-4.0.0" - sources."path-is-absolute-1.0.1" - sources."path-parse-1.0.7" + sources."path-exists-5.0.0" + sources."path-key-3.1.1" + (sources."path-scurry-1.10.1" // { + dependencies = [ + sources."lru-cache-10.0.1" + ]; + }) sources."pause-stream-0.0.11" sources."pluralize-8.0.0" - sources."prepend-http-2.0.0" + sources."proc-log-3.0.0" sources."process-nextick-args-1.0.7" - sources."property-information-5.6.0" + sources."property-information-6.4.0" + sources."proto-list-1.2.4" sources."pump-1.0.3" sources."pump-chain-1.0.0" - sources."pupa-2.1.1" - sources."quick-lru-4.0.1" - sources."quotation-1.1.3" - sources."rc-1.2.8" - (sources."read-pkg-5.2.0" // { + sources."pupa-3.1.0" + sources."quick-lru-6.1.2" + sources."quotation-2.0.2" + (sources."rc-1.2.8" // { dependencies = [ - sources."type-fest-0.6.0" + sources."ini-1.3.8" ]; }) - (sources."read-pkg-up-7.0.1" // { + (sources."read-package-json-fast-3.0.2" // { dependencies = [ - sources."type-fest-0.8.1" + sources."json-parse-even-better-errors-3.0.0" + ]; + }) + (sources."read-pkg-7.1.0" // { + dependencies = [ + sources."hosted-git-info-4.1.0" + sources."lru-cache-6.0.0" + sources."normalize-package-data-3.0.3" + sources."type-fest-2.19.0" + ]; + }) + (sources."read-pkg-up-9.1.0" // { + dependencies = [ + sources."type-fest-2.19.0" ]; }) sources."readable-stream-1.0.34" - sources."redent-3.0.0" - sources."registry-auth-token-4.2.2" - sources."registry-url-5.1.0" - sources."rehype-parse-7.0.1" - sources."rehype-retext-2.0.4" - sources."remark-frontmatter-2.0.0" - sources."remark-mdx-2.0.0-next.7" - sources."remark-message-control-6.0.0" - sources."remark-parse-8.0.3" - sources."remark-retext-4.0.0" - sources."remark-stringify-8.1.1" - sources."repeat-string-1.6.1" - sources."resolve-1.22.8" - sources."resolve-from-5.0.0" - sources."responselike-1.0.2" - sources."retext-english-3.0.4" - sources."retext-equality-5.5.0" - sources."retext-profanities-6.1.0" + sources."redent-4.0.0" + sources."registry-auth-token-5.0.2" + sources."registry-url-6.0.1" + sources."rehype-parse-8.0.5" + sources."rehype-retext-3.0.2" + sources."remark-frontmatter-4.0.1" + sources."remark-gfm-3.0.1" + sources."remark-mdx-2.0.0" + sources."remark-message-control-7.1.1" + sources."remark-parse-10.0.2" + sources."remark-retext-5.0.1" + sources."resolve-alpn-1.2.1" + sources."responselike-3.0.0" + sources."retext-english-4.1.0" + sources."retext-equality-6.6.0" + sources."retext-profanities-7.2.2" + sources."sade-1.8.1" sources."safe-buffer-5.2.1" - sources."semver-5.7.2" - (sources."semver-diff-3.1.1" // { + (sources."semver-7.5.4" // { dependencies = [ - sources."semver-6.3.1" + sources."lru-cache-6.0.0" ]; }) - sources."signal-exit-3.0.7" + sources."semver-diff-4.0.0" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" + sources."signal-exit-4.1.0" sources."sliced-1.0.1" - sources."space-separated-tokens-1.1.5" + sources."space-separated-tokens-2.0.2" (sources."spawn-to-readstream-0.1.3" // { dependencies = [ - sources."object-keys-0.4.0" sources."through2-0.4.2" - sources."xtend-2.1.2" ]; }) sources."spdx-correct-3.2.0" @@ -96070,95 +95088,137 @@ in (sources."split-transform-stream-0.1.1" // { dependencies = [ sources."bubble-stream-error-0.0.1" - sources."object-keys-0.4.0" sources."through2-0.4.2" - sources."xtend-2.1.2" ]; }) - sources."sprintf-js-1.0.3" - sources."state-toggle-1.0.3" sources."stream-combiner-0.0.4" - sources."string-width-4.2.3" + sources."string-width-5.1.2" + (sources."string-width-cjs-4.2.3" // { + dependencies = [ + sources."emoji-regex-8.0.0" + sources."strip-ansi-6.0.1" + ]; + }) sources."string_decoder-0.10.31" - sources."stringify-entities-3.1.0" - sources."strip-ansi-6.0.1" - sources."strip-indent-3.0.0" + sources."stringify-entities-4.0.3" + (sources."strip-ansi-7.1.0" // { + dependencies = [ + sources."ansi-regex-6.0.1" + ]; + }) + sources."strip-ansi-cjs-6.0.1" + sources."strip-indent-4.0.0" sources."strip-json-comments-2.0.1" sources."structured-source-4.0.0" sources."supports-color-5.5.0" - sources."supports-preserve-symlinks-flag-1.0.0" - sources."term-size-2.2.1" - sources."textlint-rule-helper-2.3.0" + (sources."textlint-rule-helper-2.3.0" // { + dependencies = [ + sources."unist-util-is-4.1.0" + sources."unist-util-visit-2.0.3" + sources."unist-util-visit-parents-3.1.1" + ]; + }) sources."through-2.3.8" (sources."through2-2.0.0" // { dependencies = [ sources."isarray-1.0.0" sources."readable-stream-2.0.6" + sources."xtend-4.0.2" ]; }) - sources."to-readable-stream-1.0.0" - sources."to-vfile-6.1.0" - sources."trim-0.0.1" - sources."trim-newlines-3.0.1" - sources."trim-trailing-lines-1.1.4" - sources."trough-1.0.5" - sources."type-fest-0.13.1" + sources."to-vfile-7.2.4" + sources."trim-newlines-4.1.1" + sources."trough-2.1.0" + sources."type-fest-3.13.1" sources."typedarray-0.0.6" sources."typedarray-to-buffer-3.1.5" - sources."unherit-1.1.3" - (sources."unified-9.2.2" // { + sources."undici-types-5.26.5" + sources."unherit-3.0.1" + (sources."unified-10.1.2" // { + dependencies = [ + sources."is-plain-obj-4.1.0" + ]; + }) + sources."unified-diff-4.0.1" + (sources."unified-engine-10.1.0" // { dependencies = [ - sources."is-plain-obj-2.1.0" + sources."is-plain-obj-4.1.0" + sources."lines-and-columns-2.0.4" + sources."parse-json-6.0.2" ]; }) - sources."unified-diff-3.1.0" - (sources."unified-engine-8.2.0" // { + (sources."unified-message-control-4.0.0" // { dependencies = [ - sources."is-plain-obj-2.1.0" + sources."unist-util-visit-3.1.0" + sources."unist-util-visit-parents-4.1.1" ]; }) - sources."unified-message-control-3.0.3" - sources."unique-string-2.0.0" - sources."unist-util-inspect-5.0.1" - sources."unist-util-is-4.1.0" - sources."unist-util-modify-children-2.0.0" - sources."unist-util-position-3.1.0" - sources."unist-util-remove-position-2.0.1" - sources."unist-util-stringify-position-2.0.3" - sources."unist-util-visit-2.0.3" + sources."unique-string-3.0.0" + sources."unist-util-inspect-7.0.2" + sources."unist-util-is-5.2.1" + (sources."unist-util-modify-children-2.0.0" // { + dependencies = [ + sources."array-iterate-1.1.4" + ]; + }) + sources."unist-util-position-4.0.4" + sources."unist-util-position-from-estree-1.1.2" + sources."unist-util-remove-position-4.0.2" + sources."unist-util-stringify-position-3.0.3" + sources."unist-util-visit-4.1.2" sources."unist-util-visit-children-1.1.4" - sources."unist-util-visit-parents-3.1.1" - (sources."update-notifier-4.1.3" // { + sources."unist-util-visit-parents-5.1.3" + (sources."update-notifier-6.0.2" // { dependencies = [ - sources."ansi-styles-4.3.0" - sources."chalk-3.0.0" - 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."chalk-5.3.0" ]; }) - sources."url-parse-lax-3.0.0" sources."util-deprecate-1.0.2" + sources."uvu-0.5.6" sources."validate-npm-package-license-3.0.4" - sources."vfile-4.2.1" - sources."vfile-find-up-5.0.1" - sources."vfile-location-3.2.0" - sources."vfile-message-2.0.4" - (sources."vfile-reporter-6.0.2" // { + sources."vfile-5.3.7" + sources."vfile-find-up-6.1.0" + sources."vfile-location-4.1.0" + sources."vfile-message-3.1.4" + (sources."vfile-reporter-7.0.5" // { dependencies = [ - sources."supports-color-6.1.0" + sources."supports-color-9.4.0" + ]; + }) + sources."vfile-sort-3.0.1" + sources."vfile-statistics-2.0.1" + sources."walk-up-path-3.0.1" + sources."web-namespaces-2.0.1" + sources."which-2.0.2" + sources."widest-line-4.0.1" + (sources."wrap-ansi-8.1.0" // { + dependencies = [ + sources."ansi-styles-6.2.1" + ]; + }) + (sources."wrap-ansi-cjs-7.0.0" // { + dependencies = [ + sources."ansi-styles-4.3.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."emoji-regex-8.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" ]; }) - sources."vfile-sort-2.2.2" - sources."vfile-statistics-1.1.4" - sources."web-namespaces-1.1.4" - sources."widest-line-3.1.0" sources."wrappy-1.0.2" - sources."write-file-atomic-3.0.3" - sources."xdg-basedir-4.0.0" - sources."xtend-4.0.2" - sources."yargs-parser-18.1.3" + (sources."write-file-atomic-3.0.3" // { + dependencies = [ + sources."signal-exit-3.0.7" + ]; + }) + sources."xdg-basedir-5.1.0" + sources."xtend-2.1.2" + sources."yallist-4.0.0" + sources."yaml-2.3.4" + sources."yargs-parser-21.1.1" + sources."yocto-queue-1.0.0" + sources."zwitch-2.0.4" ]; buildInputs = globalBuildInputs; meta = { @@ -96226,8 +95286,8 @@ in sha512 = "gZMxUU+/O8QIchBQoo50QryknmMKahb2vBj89wVvk+Dhvp70nAJKSkpt2vjZVYBWCxpIKysQlwheBjrFZWpkfg=="; }; dependencies = [ - sources."@textlint/ast-node-types-13.3.3" - sources."@types/unist-2.0.9" + sources."@textlint/ast-node-types-13.4.0" + sources."@types/unist-2.0.10" sources."bail-1.0.5" sources."boundary-2.0.0" sources."ccount-1.1.0" @@ -96272,8 +95332,8 @@ in sha512 = "VMht14U0+gxRhEnT3/Rfv7yUDF3YGhsSSODwXGnnicwe54Czs2CYALAZIlWA79R4LLqcYFc9pP1i8DeGWvaHeA=="; }; dependencies = [ - sources."@textlint/ast-node-types-13.3.3" - sources."@types/unist-2.0.9" + sources."@textlint/ast-node-types-13.4.0" + sources."@types/unist-2.0.10" sources."bail-1.0.5" sources."boundary-2.0.0" sources."ccount-1.1.0" @@ -96319,7 +95379,7 @@ in }; dependencies = [ sources."@textlint/ast-node-types-4.4.3" - sources."@types/unist-2.0.9" + sources."@types/unist-2.0.10" sources."boundary-1.0.1" sources."buffer-from-1.1.2" sources."concat-stream-2.0.0" @@ -96333,7 +95393,7 @@ in sources."structured-source-3.0.2" (sources."textlint-rule-helper-2.3.0" // { dependencies = [ - sources."@textlint/ast-node-types-13.3.3" + sources."@textlint/ast-node-types-13.4.0" sources."boundary-2.0.0" sources."structured-source-4.0.0" ]; @@ -96385,8 +95445,8 @@ in sha512 = "vP99cbTyapn+Hviom2doO3pJtjlhKlZvlHTf21zoB22CxJx2w3S7Ie169neB5U4Xsei+NodHf5tnwT933mO19A=="; }; dependencies = [ - sources."@textlint/ast-node-types-13.3.3" - sources."@types/unist-2.0.9" + sources."@textlint/ast-node-types-13.4.0" + sources."@types/unist-2.0.10" sources."boundary-2.0.0" sources."lodash-4.17.21" sources."split-lines-2.1.0" @@ -96409,14 +95469,14 @@ in textlint-rule-terminology = nodeEnv.buildNodePackage { name = "textlint-rule-terminology"; packageName = "textlint-rule-terminology"; - version = "4.0.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/textlint-rule-terminology/-/textlint-rule-terminology-4.0.0.tgz"; - sha512 = "tbNpzDNLTVsqtDIMXEZNX2i1dvOqryME8Hknopq6Ze3TAjij5N0wBtG63frZLxJ9auE9fZse15sTi4Qe3arNZA=="; + url = "https://registry.npmjs.org/textlint-rule-terminology/-/textlint-rule-terminology-4.0.1.tgz"; + sha512 = "wKiVhc2B9HP2MFU4x7ZDx+oM5u43ETpKWTLHKvdhPRZ0+davi4M8mFmkZVovDIMO7igsGjixikcvFmnCMg3kmQ=="; }; dependencies = [ - sources."@textlint/ast-node-types-13.3.3" - sources."@types/unist-2.0.9" + sources."@textlint/ast-node-types-13.4.0" + sources."@types/unist-2.0.10" sources."boundary-2.0.0" sources."lodash-4.17.21" sources."strip-json-comments-3.1.1" @@ -96524,8 +95584,8 @@ in sha512 = "yvOJavJD+PgyUzvsoLDDzDtgCVBva/HNhEvsFnYVugrWz0qy2hr+/4B4wkzjro4wfPbwz20GQe5h13N4DeUEeA=="; }; dependencies = [ - sources."@textlint/ast-node-types-13.3.3" - sources."@types/unist-2.0.9" + sources."@textlint/ast-node-types-13.4.0" + sources."@types/unist-2.0.10" sources."adverb-where-0.2.6" sources."boundary-2.0.0" sources."commander-2.20.3" @@ -96572,11 +95632,11 @@ in sources."@tootallnate/once-1.1.2" sources."@types/cacheable-request-6.0.3" sources."@types/cookie-0.4.1" - sources."@types/cors-2.8.15" - sources."@types/http-cache-semantics-4.0.3" + sources."@types/cors-2.8.16" + sources."@types/http-cache-semantics-4.0.4" sources."@types/keyv-3.1.4" - sources."@types/node-20.8.10" - sources."@types/responselike-1.0.2" + sources."@types/node-20.9.0" + sources."@types/responselike-1.0.3" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" sources."accepts-1.3.8" @@ -97663,10 +96723,10 @@ in sources."@szmarczak/http-timer-4.0.6" sources."@tokenizer/token-0.3.0" sources."@types/cacheable-request-6.0.3" - sources."@types/http-cache-semantics-4.0.3" + sources."@types/http-cache-semantics-4.0.4" sources."@types/keyv-3.1.4" - sources."@types/node-20.8.10" - sources."@types/responselike-1.0.2" + sources."@types/node-20.9.0" + sources."@types/responselike-1.0.3" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" (sources."accepts-1.3.8" // { @@ -98132,10 +97192,10 @@ in sources."@szmarczak/http-timer-4.0.6" sources."@tokenizer/token-0.3.0" sources."@types/cacheable-request-6.0.3" - sources."@types/http-cache-semantics-4.0.3" + sources."@types/http-cache-semantics-4.0.4" sources."@types/keyv-3.1.4" - sources."@types/node-20.8.10" - sources."@types/responselike-1.0.2" + sources."@types/node-20.9.0" + sources."@types/responselike-1.0.3" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" (sources."accepts-1.3.8" // { @@ -99065,16 +98125,16 @@ in sources."@jridgewell/resolve-uri-3.1.1" sources."@jridgewell/sourcemap-codec-1.4.15" sources."@jridgewell/trace-mapping-0.3.9" - sources."@swc/core-1.3.95" + sources."@swc/core-1.3.96" sources."@swc/counter-0.1.2" sources."@swc/helpers-0.5.3" sources."@swc/types-0.1.5" - sources."@swc/wasm-1.3.95" + sources."@swc/wasm-1.3.97" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.4" - sources."@types/node-20.8.10" + sources."@types/node-20.9.0" sources."acorn-8.11.2" sources."acorn-walk-8.3.0" sources."arg-4.1.3" @@ -99121,10 +98181,10 @@ in typescript-language-server = nodeEnv.buildNodePackage { name = "typescript-language-server"; packageName = "typescript-language-server"; - version = "4.0.0"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/typescript-language-server/-/typescript-language-server-4.0.0.tgz"; - sha512 = "u6GLfWtHzOfGNpn0XuUYFg8Jv3oXWKzY6o5/Lt6LbWE6Ux965z2lP+vM0AN8Z2EobnlrDzzdcKusUx46j2eP3A=="; + url = "https://registry.npmjs.org/typescript-language-server/-/typescript-language-server-4.1.0.tgz"; + sha512 = "VbEw1U0jKKQ7pIYRtfQzBl7BroRBWSuS8x483jY0n4sQc0A8P7PgeSb3OycRbaj1rkfsTXZhsxKmsRYmoXAbdw=="; }; buildInputs = globalBuildInputs; meta = { @@ -99187,13 +98247,13 @@ in sources."@npmcli/config-6.4.0" sources."@npmcli/map-workspaces-3.0.4" sources."@npmcli/name-from-folder-2.0.0" - sources."@types/concat-stream-2.0.1" - sources."@types/debug-4.1.10" - sources."@types/is-empty-1.2.2" - sources."@types/ms-0.7.33" - sources."@types/node-20.8.10" - sources."@types/supports-color-8.1.2" - sources."@types/unist-3.0.1" + sources."@types/concat-stream-2.0.2" + sources."@types/debug-4.1.12" + sources."@types/is-empty-1.2.3" + sources."@types/ms-0.7.34" + sources."@types/node-20.9.0" + sources."@types/supports-color-8.1.3" + sources."@types/unist-3.0.2" sources."@ungap/structured-clone-1.2.0" sources."abbrev-2.0.0" sources."ansi-regex-5.0.1" @@ -99234,7 +98294,7 @@ in sources."jackspeak-2.3.6" sources."js-tokens-4.0.0" sources."json-parse-even-better-errors-3.0.0" - sources."lines-and-columns-2.0.3" + sources."lines-and-columns-2.0.4" sources."load-plugin-5.1.0" sources."locate-path-7.2.0" sources."lru-cache-10.0.1" @@ -99280,7 +98340,13 @@ in sources."type-fest-3.13.1" sources."typedarray-0.0.6" sources."undici-types-5.26.5" - sources."unified-engine-11.1.0" + (sources."unified-engine-11.1.1" // { + dependencies = [ + sources."@npmcli/config-8.0.1" + sources."import-meta-resolve-4.0.0" + sources."load-plugin-6.0.1" + ]; + }) sources."unist-util-inspect-8.0.0" sources."unist-util-lsp-2.1.0" sources."unist-util-stringify-position-4.0.0" @@ -99313,7 +98379,7 @@ in ]; }) sources."yallist-4.0.0" - sources."yaml-2.3.3" + sources."yaml-2.3.4" sources."yocto-queue-1.0.0" ]; buildInputs = globalBuildInputs; @@ -99329,14 +98395,14 @@ in vega-cli = nodeEnv.buildNodePackage { name = "vega-cli"; packageName = "vega-cli"; - version = "5.25.0"; + version = "5.26.0"; src = fetchurl { - url = "https://registry.npmjs.org/vega-cli/-/vega-cli-5.25.0.tgz"; - sha512 = "2rVTQY8ryM8/Z9WZ5AxOvYwBjSkfohuJ6j5nwLd9wxMetKlyaOuyts3ezIrScda4dThjPvokPJx9843E2mQ04g=="; + url = "https://registry.npmjs.org/vega-cli/-/vega-cli-5.26.0.tgz"; + sha512 = "UsRZ91+0YKAHtp9mryqgiVbGdBpb5F20HhYXHNAJfDw/uCsYbbLixLGzgTqWIRBYXgr890XMbL4HLbQPqnZC9w=="; }; dependencies = [ sources."@mapbox/node-pre-gyp-1.0.11" - sources."@types/estree-1.0.4" + sources."@types/estree-1.0.5" sources."@types/geojson-7946.0.4" sources."abbrev-1.1.1" sources."agent-base-6.0.2" @@ -99443,7 +98509,7 @@ in }) sources."tr46-0.0.3" sources."util-deprecate-1.0.2" - sources."vega-5.25.0" + sources."vega-5.26.0" sources."vega-canvas-1.2.7" sources."vega-crossfilter-4.1.1" sources."vega-dataflow-5.7.5" @@ -99452,30 +98518,26 @@ in sources."vega-expression-5.1.0" sources."vega-force-4.2.0" sources."vega-format-1.1.1" - sources."vega-functions-5.13.2" + sources."vega-functions-5.14.0" sources."vega-geo-4.4.1" sources."vega-hierarchy-4.1.1" sources."vega-label-1.2.1" sources."vega-loader-4.5.1" - sources."vega-parser-6.2.0" + sources."vega-parser-6.2.1" sources."vega-projection-1.6.0" sources."vega-regression-1.2.0" sources."vega-runtime-6.1.4" - sources."vega-scale-7.3.0" - sources."vega-scenegraph-4.10.2" - (sources."vega-selections-5.4.1" // { - dependencies = [ - sources."d3-array-3.2.2" - ]; - }) + sources."vega-scale-7.3.1" + sources."vega-scenegraph-4.11.0" + sources."vega-selections-5.4.2" sources."vega-statistics-1.9.0" sources."vega-time-2.1.1" - sources."vega-transforms-4.10.2" - sources."vega-typings-0.24.2" + sources."vega-transforms-4.11.0" + sources."vega-typings-1.0.0" sources."vega-util-1.17.2" sources."vega-view-5.11.1" sources."vega-view-transforms-4.5.9" - sources."vega-voronoi-4.2.1" + sources."vega-voronoi-4.2.2" sources."vega-wordcloud-4.1.4" sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" @@ -99500,13 +98562,13 @@ in vega-lite = nodeEnv.buildNodePackage { name = "vega-lite"; packageName = "vega-lite"; - version = "5.16.1"; + version = "5.16.2"; src = fetchurl { - url = "https://registry.npmjs.org/vega-lite/-/vega-lite-5.16.1.tgz"; - sha512 = "3iXmzdAVZCGHrvdh6hIM8OY55auXA1EIDzFLaYdq27e99Dr+WXTEa00ilqQUPdrpS0sE1ZqK4Ikhgg5x8SOtLw=="; + url = "https://registry.npmjs.org/vega-lite/-/vega-lite-5.16.2.tgz"; + sha512 = "lC+yx7bD8EyBu4CHNr7kLfPZ8+uU01xJZyOxNB1XSMdW0oNTKewLrA5be3W6mHgNDl60i4uZ5l463jfFGQ290A=="; }; dependencies = [ - sources."@types/estree-1.0.4" + sources."@types/estree-1.0.5" sources."@types/geojson-7946.0.4" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" @@ -99555,7 +98617,7 @@ in }) sources."tr46-0.0.3" sources."tslib-2.6.2" - sources."vega-5.25.0" + sources."vega-5.26.0" sources."vega-canvas-1.2.7" sources."vega-crossfilter-4.1.1" sources."vega-dataflow-5.7.5" @@ -99564,30 +98626,26 @@ in sources."vega-expression-5.1.0" sources."vega-force-4.2.0" sources."vega-format-1.1.1" - sources."vega-functions-5.13.2" + sources."vega-functions-5.14.0" sources."vega-geo-4.4.1" sources."vega-hierarchy-4.1.1" sources."vega-label-1.2.1" sources."vega-loader-4.5.1" - sources."vega-parser-6.2.0" + sources."vega-parser-6.2.1" sources."vega-projection-1.6.0" sources."vega-regression-1.2.0" sources."vega-runtime-6.1.4" - sources."vega-scale-7.3.0" - sources."vega-scenegraph-4.10.2" - (sources."vega-selections-5.4.1" // { - dependencies = [ - sources."d3-array-3.2.2" - ]; - }) + sources."vega-scale-7.3.1" + sources."vega-scenegraph-4.11.0" + sources."vega-selections-5.4.2" sources."vega-statistics-1.9.0" sources."vega-time-2.1.1" - sources."vega-transforms-4.10.2" - sources."vega-typings-0.24.2" + sources."vega-transforms-4.11.0" + sources."vega-typings-1.0.0" sources."vega-util-1.17.2" sources."vega-view-5.11.1" sources."vega-view-transforms-4.5.9" - sources."vega-voronoi-4.2.1" + sources."vega-voronoi-4.2.2" sources."vega-wordcloud-4.1.4" sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" @@ -99609,18 +98667,20 @@ in vercel = nodeEnv.buildNodePackage { name = "vercel"; packageName = "vercel"; - version = "32.5.0"; + version = "32.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/vercel/-/vercel-32.5.0.tgz"; - sha512 = "Bx4v3yxEpyKhkyhmQNQyfbUHxC+C3Yug99Q14EZAvGMZiijggungC3ZFxpXWO0tCcmLJgknOWxsYE7+ctPi0zw=="; + url = "https://registry.npmjs.org/vercel/-/vercel-32.5.3.tgz"; + sha512 = "fK5n0qSmckJlzPgZ7yD3Q1+L13o2FeN9hsZbJcr/kIglA0zRj7OoSEK30LWlxJ44T/Uw0MOgVpK8vkAl+Aqpdw=="; }; dependencies = [ sources."@cspotcode/source-map-support-0.8.1" sources."@edge-runtime/cookies-3.4.1" sources."@edge-runtime/format-2.2.0" sources."@edge-runtime/node-utils-2.2.1" - sources."@edge-runtime/primitives-3.1.1" - sources."@edge-runtime/vm-3.1.1" + sources."@edge-runtime/ponyfill-2.4.1" + sources."@edge-runtime/primitives-4.0.5" + sources."@edge-runtime/vm-3.1.7" + sources."@fastify/busboy-2.0.0" sources."@jridgewell/resolve-uri-3.1.1" sources."@jridgewell/sourcemap-codec-1.4.15" sources."@jridgewell/trace-mapping-0.3.9" @@ -99647,11 +98707,11 @@ in sources."@nodelib/fs.walk-1.2.8" sources."@rollup/pluginutils-4.2.1" sources."@sinclair/typebox-0.25.24" - sources."@swc/core-1.3.95" + sources."@swc/core-1.3.96" sources."@swc/counter-0.1.2" sources."@swc/helpers-0.5.3" sources."@swc/types-0.1.5" - sources."@swc/wasm-1.3.95" + sources."@swc/wasm-1.3.97" sources."@tootallnate/once-2.0.0" (sources."@ts-morph/common-0.11.1" // { dependencies = [ @@ -99662,13 +98722,13 @@ in sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.4" - sources."@types/json-schema-7.0.14" + sources."@types/json-schema-7.0.15" sources."@types/node-14.18.33" - sources."@vercel/build-utils-7.2.2" - sources."@vercel/error-utils-2.0.1" + sources."@vercel/build-utils-7.2.3" + sources."@vercel/error-utils-2.0.2" sources."@vercel/fun-1.1.0" sources."@vercel/gatsby-plugin-vercel-analytics-1.0.11" - (sources."@vercel/gatsby-plugin-vercel-builder-2.0.8" // { + (sources."@vercel/gatsby-plugin-vercel-builder-2.0.9" // { dependencies = [ sources."fs-extra-11.1.0" sources."jsonfile-6.1.0" @@ -99677,9 +98737,9 @@ in }) sources."@vercel/go-3.0.3" sources."@vercel/hydrogen-1.0.1" - sources."@vercel/next-4.0.11" + sources."@vercel/next-4.0.14" sources."@vercel/nft-0.24.2" - (sources."@vercel/node-3.0.7" // { + (sources."@vercel/node-3.0.9" // { dependencies = [ sources."async-listen-3.0.0" sources."node-fetch-2.6.9" @@ -99692,7 +98752,7 @@ in sources."semver-6.3.1" ]; }) - sources."@vercel/remix-builder-2.0.10" + sources."@vercel/remix-builder-2.0.11" (sources."@vercel/routing-utils-3.1.0" // { dependencies = [ sources."ajv-6.12.6" @@ -99701,7 +98761,7 @@ in ]; }) sources."@vercel/ruby-2.0.2" - sources."@vercel/static-build-2.0.9" + sources."@vercel/static-build-2.0.10" sources."@vercel/static-config-3.0.0" sources."abbrev-1.1.1" sources."acorn-8.11.2" @@ -99722,7 +98782,6 @@ in sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."buffer-crc32-0.2.13" - sources."busboy-1.6.0" sources."bytes-3.1.0" sources."chokidar-3.3.1" sources."chownr-1.1.4" @@ -99739,7 +98798,7 @@ in sources."depd-1.1.2" sources."detect-libc-2.0.2" sources."diff-4.0.2" - (sources."edge-runtime-2.5.1" // { + (sources."edge-runtime-2.5.7" // { dependencies = [ sources."async-listen-3.0.1" sources."signal-exit-4.0.2" @@ -99779,7 +98838,7 @@ in sources."execa-3.2.0" sources."exit-hook-2.2.1" sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.3.1" + sources."fast-glob-3.3.2" sources."fast-json-stable-stringify-2.1.0" sources."fastq-1.15.0" sources."fd-slicer-1.1.0" @@ -99861,7 +98920,6 @@ in sources."pend-1.2.0" sources."picocolors-1.0.0" sources."picomatch-2.3.1" - sources."pretty-bytes-5.6.0" sources."pretty-ms-7.0.1" sources."promisepipe-3.0.0" sources."pump-3.0.0" @@ -99892,7 +98950,6 @@ in sources."once-1.3.3" ]; }) - sources."streamsearch-1.1.0" sources."string-width-4.2.3" sources."string_decoder-1.3.0" sources."strip-ansi-6.0.1" @@ -99913,7 +98970,7 @@ in sources."tslib-2.6.2" sources."typescript-4.9.5" sources."uid-promise-1.0.0" - sources."undici-5.23.0" + sources."undici-5.26.5" sources."universalify-0.1.2" sources."unpipe-1.0.0" sources."uri-js-4.4.1" @@ -99997,8 +99054,8 @@ in }) sources."@eslint-community/eslint-utils-4.4.0" sources."@eslint-community/regexpp-4.10.0" - sources."@eslint/eslintrc-2.1.2" - sources."@eslint/js-8.52.0" + sources."@eslint/eslintrc-2.1.3" + sources."@eslint/js-8.53.0" sources."@humanwhocodes/config-array-0.11.13" sources."@humanwhocodes/module-importer-1.0.1" sources."@humanwhocodes/object-schema-2.0.1" @@ -100032,7 +99089,7 @@ in sources."diff-4.0.2" sources."doctrine-3.0.0" sources."escape-string-regexp-4.0.0" - sources."eslint-8.52.0" + sources."eslint-8.53.0" sources."eslint-plugin-vue-9.18.1" sources."eslint-scope-7.2.2" sources."eslint-visitor-keys-3.4.3" @@ -100497,11 +99554,11 @@ in sources."@jridgewell/source-map-0.3.5" sources."@jridgewell/sourcemap-codec-1.4.15" sources."@jridgewell/trace-mapping-0.3.20" - sources."@types/eslint-8.44.6" - sources."@types/eslint-scope-3.7.6" - sources."@types/estree-1.0.4" - sources."@types/json-schema-7.0.14" - sources."@types/node-20.8.10" + sources."@types/eslint-8.44.7" + sources."@types/eslint-scope-3.7.7" + sources."@types/estree-1.0.5" + sources."@types/json-schema-7.0.15" + sources."@types/node-20.9.0" sources."@webassemblyjs/ast-1.11.6" sources."@webassemblyjs/floating-point-hex-parser-1.11.6" sources."@webassemblyjs/helper-api-error-1.11.6" @@ -100525,10 +99582,10 @@ in sources."ajv-keywords-3.5.2" sources."browserslist-4.22.1" sources."buffer-from-1.1.2" - sources."caniuse-lite-1.0.30001559" + sources."caniuse-lite-1.0.30001561" sources."chrome-trace-event-1.0.3" sources."commander-2.20.3" - sources."electron-to-chromium-1.4.574" + sources."electron-to-chromium-1.4.580" sources."enhanced-resolve-5.15.0" sources."es-module-lexer-1.3.1" sources."escalade-3.1.1" @@ -100599,11 +99656,11 @@ in sources."@jridgewell/source-map-0.3.5" sources."@jridgewell/sourcemap-codec-1.4.15" sources."@jridgewell/trace-mapping-0.3.20" - sources."@types/eslint-8.44.6" - sources."@types/eslint-scope-3.7.6" - sources."@types/estree-1.0.4" - sources."@types/json-schema-7.0.14" - sources."@types/node-20.8.10" + sources."@types/eslint-8.44.7" + sources."@types/eslint-scope-3.7.7" + sources."@types/estree-1.0.5" + sources."@types/json-schema-7.0.15" + sources."@types/node-20.9.0" sources."@webassemblyjs/ast-1.11.6" sources."@webassemblyjs/floating-point-hex-parser-1.11.6" sources."@webassemblyjs/helper-api-error-1.11.6" @@ -100630,13 +99687,13 @@ in sources."ajv-keywords-3.5.2" sources."browserslist-4.22.1" sources."buffer-from-1.1.2" - sources."caniuse-lite-1.0.30001559" + sources."caniuse-lite-1.0.30001561" sources."chrome-trace-event-1.0.3" sources."clone-deep-4.0.1" sources."colorette-2.0.20" sources."commander-10.0.1" sources."cross-spawn-7.0.3" - sources."electron-to-chromium-1.4.574" + sources."electron-to-chromium-1.4.580" sources."enhanced-resolve-5.15.0" sources."envinfo-7.11.0" sources."es-module-lexer-1.3.1" @@ -100744,29 +99801,29 @@ in sources."@jridgewell/sourcemap-codec-1.4.15" sources."@jridgewell/trace-mapping-0.3.20" sources."@leichtgewicht/ip-codec-2.0.4" - sources."@types/body-parser-1.19.4" - sources."@types/bonjour-3.5.12" - sources."@types/connect-3.4.37" - sources."@types/connect-history-api-fallback-1.5.2" - sources."@types/eslint-8.44.6" - sources."@types/eslint-scope-3.7.6" - sources."@types/estree-1.0.4" - sources."@types/express-4.17.20" - sources."@types/express-serve-static-core-4.17.39" - sources."@types/http-errors-2.0.3" - sources."@types/http-proxy-1.17.13" - sources."@types/json-schema-7.0.14" - sources."@types/mime-1.3.4" - sources."@types/node-20.8.10" - sources."@types/node-forge-1.3.8" - sources."@types/qs-6.9.9" - sources."@types/range-parser-1.2.6" + sources."@types/body-parser-1.19.5" + sources."@types/bonjour-3.5.13" + sources."@types/connect-3.4.38" + sources."@types/connect-history-api-fallback-1.5.3" + sources."@types/eslint-8.44.7" + sources."@types/eslint-scope-3.7.7" + sources."@types/estree-1.0.5" + sources."@types/express-4.17.21" + sources."@types/express-serve-static-core-4.17.41" + sources."@types/http-errors-2.0.4" + sources."@types/http-proxy-1.17.14" + sources."@types/json-schema-7.0.15" + sources."@types/mime-1.3.5" + sources."@types/node-20.9.0" + sources."@types/node-forge-1.3.9" + sources."@types/qs-6.9.10" + sources."@types/range-parser-1.2.7" sources."@types/retry-0.12.0" - sources."@types/send-0.17.3" - sources."@types/serve-index-1.9.3" - sources."@types/serve-static-1.15.4" - sources."@types/sockjs-0.3.35" - sources."@types/ws-8.5.8" + sources."@types/send-0.17.4" + sources."@types/serve-index-1.9.4" + sources."@types/serve-static-1.15.5" + sources."@types/sockjs-0.3.36" + sources."@types/ws-8.5.9" sources."@webassemblyjs/ast-1.11.6" sources."@webassemblyjs/floating-point-hex-parser-1.11.6" sources."@webassemblyjs/helper-api-error-1.11.6" @@ -100809,7 +99866,7 @@ in sources."bufferutil-4.0.8" sources."bytes-3.0.0" sources."call-bind-1.0.5" - sources."caniuse-lite-1.0.30001559" + sources."caniuse-lite-1.0.30001561" sources."chokidar-3.5.3" sources."chrome-trace-event-1.0.3" sources."colorette-2.0.20" @@ -100838,7 +99895,7 @@ in sources."dns-equal-1.0.0" sources."dns-packet-5.6.1" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.574" + sources."electron-to-chromium-1.4.580" sources."encodeurl-1.0.2" sources."enhanced-resolve-5.15.0" sources."es-module-lexer-1.3.1" @@ -101089,11 +100146,11 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@types/eslint-8.44.6" - sources."@types/eslint-scope-3.7.6" - sources."@types/estree-1.0.4" - sources."@types/json-schema-7.0.14" - sources."@types/node-20.8.10" + sources."@types/eslint-8.44.7" + sources."@types/eslint-scope-3.7.7" + sources."@types/estree-1.0.5" + sources."@types/json-schema-7.0.15" + sources."@types/node-20.9.0" sources."@webassemblyjs/ast-1.11.6" sources."@webassemblyjs/floating-point-hex-parser-1.11.6" sources."@webassemblyjs/helper-api-error-1.11.6" @@ -101119,11 +100176,11 @@ in sources."braces-3.0.2" sources."browserslist-4.22.1" sources."buffer-from-1.1.2" - sources."caniuse-lite-1.0.30001559" + sources."caniuse-lite-1.0.30001561" sources."chrome-trace-event-1.0.3" sources."commander-2.20.3" sources."dir-glob-3.0.1" - sources."electron-to-chromium-1.4.574" + sources."electron-to-chromium-1.4.580" sources."enhanced-resolve-5.15.0" sources."es-module-lexer-1.3.1" sources."escalade-3.1.1" @@ -101136,7 +100193,7 @@ in sources."estraverse-4.3.0" sources."events-3.3.0" sources."fast-deep-equal-3.1.3" - (sources."fast-glob-3.3.1" // { + (sources."fast-glob-3.3.2" // { dependencies = [ sources."glob-parent-5.1.2" ]; @@ -101237,7 +100294,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.2" - sources."@types/node-20.8.10" + sources."@types/node-20.9.0" sources."@webtorrent/http-node-1.3.0" sources."addr-to-ip-port-1.5.4" sources."airplay-js-0.3.0" @@ -101628,10 +100685,10 @@ in "@withgraphite/graphite-cli" = nodeEnv.buildNodePackage { name = "_at_withgraphite_slash_graphite-cli"; packageName = "@withgraphite/graphite-cli"; - version = "1.0.7"; + version = "1.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@withgraphite/graphite-cli/-/graphite-cli-1.0.7.tgz"; - sha512 = "JkAPKk8hk7IcOF2EYu5N/TsueSb0GOP+R1uXAw5gZaJkfJlLuhbGFf4vHWvdrmjbUDm3swwXAJY2e9v4ZETwjw=="; + url = "https://registry.npmjs.org/@withgraphite/graphite-cli/-/graphite-cli-1.0.9.tgz"; + sha512 = "RQj9MouC+o746pXW7p9IvYg2iehYQsd1xxi42BCR5MvSEPf7TQNmmAuxDsB1pthkL40e+bXktitXUtRFeKg/9g=="; }; dependencies = [ sources."ansi-regex-5.0.1" @@ -101702,8 +100759,8 @@ in sources."@esbuild/win32-ia32-0.17.19" sources."@esbuild/win32-x64-0.17.19" sources."@fastify/busboy-2.0.0" - sources."@types/node-20.8.10" - sources."@types/node-forge-1.3.8" + sources."@types/node-20.9.0" + sources."@types/node-forge-1.3.9" sources."acorn-8.11.2" sources."acorn-walk-8.3.0" sources."anymatch-3.1.3" @@ -101736,7 +100793,7 @@ in sources."miniflare-3.20231025.0" sources."ms-2.1.2" sources."mustache-4.2.0" - sources."nanoid-3.3.6" + sources."nanoid-3.3.7" sources."node-forge-1.3.1" sources."node-gyp-build-4.6.1" sources."normalize-path-3.0.0" @@ -101756,13 +100813,13 @@ in sources."stoppable-1.1.0" sources."to-regex-range-5.0.1" sources."tslib-2.6.2" - sources."undici-5.27.0" + sources."undici-5.27.2" sources."undici-types-5.26.5" sources."utf-8-validate-6.0.3" sources."workerd-1.20231025.0" sources."ws-8.14.2" sources."xxhash-wasm-1.0.2" - sources."youch-3.3.2" + sources."youch-3.3.3" sources."zod-3.22.4" ]; buildInputs = globalBuildInputs; diff --git a/pkgs/development/ocaml-modules/cooltt/default.nix b/pkgs/development/ocaml-modules/cooltt/default.nix index c9e25045426..7cf63e5c0b1 100644 --- a/pkgs/development/ocaml-modules/cooltt/default.nix +++ b/pkgs/development/ocaml-modules/cooltt/default.nix @@ -106,6 +106,6 @@ buildDunePackage { homepage = "https://github.com/RedPRL/cooltt"; description = "A cool implementation of normalization by evaluation (nbe) & elaboration for Cartesian cubical type theory"; license = licenses.asl20; - maintainers = with maintainers; [ fortuneteller2k ]; + maintainers = with maintainers; [ moni ]; }; } diff --git a/pkgs/development/ocaml-modules/cry/default.nix b/pkgs/development/ocaml-modules/cry/default.nix index 60ecb885d80..8e475a7987c 100644 --- a/pkgs/development/ocaml-modules/cry/default.nix +++ b/pkgs/development/ocaml-modules/cry/default.nix @@ -2,19 +2,21 @@ buildDunePackage rec { pname = "cry"; - version = "0.6.7"; + version = "1.0.1"; src = fetchFromGitHub { owner = "savonet"; repo = "ocaml-cry"; rev = "v${version}"; - sha256 = "sha256-1Omp3LBKGTPVwEBd530H0Djn3xiEjOHLqso6S8yIJSQ="; + sha256 = "sha256-wn9hLqbydzFTdYsJ1e76dmDLtwcZ7CGjbzFe5o9veYQ="; }; postPatch = '' substituteInPlace src/dune --replace bytes "" ''; + minimalOCamlVersion = "4.12"; + meta = with lib; { homepage = "https://github.com/savonet/ocaml-cry"; description = "OCaml client for the various icecast & shoutcast source protocols"; diff --git a/pkgs/development/ocaml-modules/ffmpeg/base.nix b/pkgs/development/ocaml-modules/ffmpeg/base.nix index 59405349130..e8bb6128db6 100644 --- a/pkgs/development/ocaml-modules/ffmpeg/base.nix +++ b/pkgs/development/ocaml-modules/ffmpeg/base.nix @@ -1,15 +1,13 @@ { lib, fetchFromGitHub }: rec { - version = "1.1.7"; - - duneVersion = "3"; + version = "1.1.8"; src = fetchFromGitHub { owner = "savonet"; repo = "ocaml-ffmpeg"; rev = "v${version}"; - sha256 = "sha256-0QDy0ZUAtojYIuNliiDV2uywBnWxtKUhZ/LPqkfSOZ4="; + sha256 = "sha256-XqZATaxpW0lEdrRTXVTc0laQAx437+eoa/zOzZV1kHk="; }; meta = with lib; { diff --git a/pkgs/development/ocaml-modules/ffmpeg/default.nix b/pkgs/development/ocaml-modules/ffmpeg/default.nix index f3364cb548a..10e837dcd62 100644 --- a/pkgs/development/ocaml-modules/ffmpeg/default.nix +++ b/pkgs/development/ocaml-modules/ffmpeg/default.nix @@ -14,7 +14,7 @@ buildDunePackage { minimalOCamlVersion = "4.08"; - inherit (ffmpeg-base) version src duneVersion; + inherit (ffmpeg-base) version src; propagatedBuildInputs = [ ffmpeg-avutil diff --git a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-av.nix b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-av.nix index 73b8ed0f6ae..b902f72bc1e 100644 --- a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-av.nix +++ b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-av.nix @@ -11,7 +11,7 @@ buildDunePackage { minimalOCamlVersion = "4.08"; - inherit (ffmpeg-base) version src duneVersion; + inherit (ffmpeg-base) version src; nativeBuildInputs = [ pkg-config ]; buildInputs = [ dune-configurator ] ++ lib.optionals stdenv.isDarwin [ AudioToolbox VideoToolbox ]; diff --git a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avcodec.nix b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avcodec.nix index 1ff5a89ee30..bce592a8a2c 100644 --- a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avcodec.nix +++ b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avcodec.nix @@ -11,7 +11,7 @@ buildDunePackage { minimalOCamlVersion = "4.08"; - inherit (ffmpeg-base) version src duneVersion; + inherit (ffmpeg-base) version src; nativeBuildInputs = [ pkg-config ]; buildInputs = [ dune-configurator ] diff --git a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avdevice.nix b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avdevice.nix index b2537bd25be..3d27ab80315 100644 --- a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avdevice.nix +++ b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avdevice.nix @@ -17,7 +17,7 @@ buildDunePackage { minimalOCamlVersion = "4.08"; - inherit (ffmpeg-base) version src duneVersion; + inherit (ffmpeg-base) version src; nativeBuildInputs = [ pkg-config ]; buildInputs = [ dune-configurator ] diff --git a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avfilter.nix b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avfilter.nix index 32342860d13..524bc600093 100644 --- a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avfilter.nix +++ b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avfilter.nix @@ -13,7 +13,7 @@ buildDunePackage { minimalOCamlVersion = "4.08"; - inherit (ffmpeg-base) version src duneVersion; + inherit (ffmpeg-base) version src; nativeBuildInputs = [ pkg-config ]; buildInputs = [ dune-configurator ] diff --git a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avutil.nix b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avutil.nix index a271b984d14..6cd71ebd58e 100644 --- a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avutil.nix +++ b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-avutil.nix @@ -9,7 +9,7 @@ buildDunePackage { minimalOCamlVersion = "4.08"; - inherit (ffmpeg-base) version src duneVersion; + inherit (ffmpeg-base) version src; nativeBuildInputs = [ pkg-config ]; buildInputs = [ dune-configurator ] ++ lib.optionals stdenv.isDarwin [ AudioToolbox VideoToolbox ]; diff --git a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swresample.nix b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swresample.nix index fb6fbda58d2..a6012a44171 100644 --- a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swresample.nix +++ b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swresample.nix @@ -10,7 +10,7 @@ buildDunePackage { minimalOCamlVersion = "4.08"; - inherit (ffmpeg-base) version src duneVersion; + inherit (ffmpeg-base) version src; nativeBuildInputs = [ pkg-config ]; buildInputs = [ dune-configurator ] ++ lib.optionals stdenv.isDarwin [ VideoToolbox ]; diff --git a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swscale.nix b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swscale.nix index a085795831b..773b10ee168 100644 --- a/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swscale.nix +++ b/pkgs/development/ocaml-modules/ffmpeg/ffmpeg-swscale.nix @@ -10,7 +10,7 @@ buildDunePackage { minimalOCamlVersion = "4.08"; - inherit (ffmpeg-base) version src duneVersion; + inherit (ffmpeg-base) version src; nativeBuildInputs = [ pkg-config ]; buildInputs = [ dune-configurator ] ++ lib.optionals stdenv.isDarwin [ VideoToolbox ]; diff --git a/pkgs/development/ocaml-modules/flac/default.nix b/pkgs/development/ocaml-modules/flac/default.nix index d79416b7053..c30236e0e2c 100644 --- a/pkgs/development/ocaml-modules/flac/default.nix +++ b/pkgs/development/ocaml-modules/flac/default.nix @@ -2,13 +2,13 @@ buildDunePackage rec { pname = "flac"; - version = "0.3.1"; + version = "0.5.0"; src = fetchFromGitHub { owner = "savonet"; repo = "ocaml-flac"; rev = "v${version}"; - sha256 = "sha256-oMmxZtphEX/OPfyTumjkWQJidAjSRqriygaTjVJTCG0="; + sha256 = "sha256-HRRQd//e6Eh2HuyO+U00ILu5FoBT9jf/nRJzDOie70A="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/ocaml-modules/getopt/default.nix b/pkgs/development/ocaml-modules/getopt/default.nix index e3bf2fb5d64..db03f7b0793 100644 --- a/pkgs/development/ocaml-modules/getopt/default.nix +++ b/pkgs/development/ocaml-modules/getopt/default.nix @@ -1,28 +1,22 @@ -{ lib, fetchzip, stdenv, ocaml, findlib, ocamlbuild }: +{ lib, fetchFromGitHub, buildDunePackage }: -stdenv.mkDerivation rec { - pname = "ocaml${ocaml.version}-getopt"; - version = "20120615"; +buildDunePackage rec { + pname = "getopt"; + version = "20230213"; - src = fetchzip { - url = "https://download.ocamlcore.org/ocaml-getopt/ocaml-getopt/${version}/ocaml-getopt-${version}.tar.gz"; - sha256 = "0bng2mmdixpmj23xn8krlnaq66k22iclwz46r8zjrsrq3wcn1xgn"; - }; - - nativeBuildInputs = [ - ocaml - findlib - ocamlbuild - ]; + minimalOCamlVersion = "4.07"; - strictDeps = true; + src = fetchFromGitHub { + owner = "scemama"; + repo = "ocaml-getopt"; + rev = version; + hash = "sha256-oYDm945LgjIW+8x7UrO4FlbHywnu8480aiEVvnjBxc8="; + }; doCheck = true; - createFindlibDestdir = true; meta = { - inherit (ocaml.meta) platforms; - homepage = "https://github.com/gildor478/ocaml-getopt"; + homepage = "https://github.com/scemama/ocaml-getopt"; description = "Parsing of command line arguments (similar to GNU GetOpt) for OCaml"; license = lib.licenses.mit; maintainers = [ lib.maintainers.ulrikstrid ]; diff --git a/pkgs/development/ocaml-modules/metadata/default.nix b/pkgs/development/ocaml-modules/metadata/default.nix new file mode 100644 index 00000000000..789825175e4 --- /dev/null +++ b/pkgs/development/ocaml-modules/metadata/default.nix @@ -0,0 +1,22 @@ +{ lib, buildDunePackage, fetchFromGitHub, dune-configurator, pkg-config, ogg, flac }: + +buildDunePackage rec { + pname = "metadata"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "savonet"; + repo = "ocaml-metadata"; + rev = "v${version}"; + sha256 = "sha256-sSekkyJ8D6mCCmxIyd+pBk/khaehA3BcpUQl2Gln+Ic="; + }; + + minimalOCamlVersion = "4.14"; + + meta = with lib; { + homepage = "https://github.com/savonet/ocaml-metadata"; + description = "Library to read metadata from files in various formats. "; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dandellion ]; + }; +} diff --git a/pkgs/development/ocaml-modules/mldoc/default.nix b/pkgs/development/ocaml-modules/mldoc/default.nix index 7a7e83d3c65..b55faf222cf 100644 --- a/pkgs/development/ocaml-modules/mldoc/default.nix +++ b/pkgs/development/ocaml-modules/mldoc/default.nix @@ -29,7 +29,7 @@ let in buildDunePackage rec { pname = "mldoc"; - version = "1.5.6"; + version = "1.5.8"; minimalOCamlVersion = "4.10"; @@ -38,8 +38,8 @@ buildDunePackage rec { src = fetchFromGitHub { owner = "logseq"; repo = "mldoc"; - rev = "2a700b2e4797e47505f423fd47dc07372bd7b04e"; # version not tagged - hash = "sha256-OS06fb/Nz8grztFEVwWiqsQQt2PQjqcgQFxQuAEYC54="; + rev = "v${version}"; + hash = "sha256-7uuNUFMSQEgakTKfpYixp43gnfpQSW++snBzgr0Ni0Y="; }; buildInputs = [ diff --git a/pkgs/development/ocaml-modules/riot/default.nix b/pkgs/development/ocaml-modules/riot/default.nix new file mode 100644 index 00000000000..e03ac2c209e --- /dev/null +++ b/pkgs/development/ocaml-modules/riot/default.nix @@ -0,0 +1,37 @@ +{ lib +, bigstringaf +, buildDunePackage +, fetchurl +, iomux +, ptime +, uri +}: + +buildDunePackage rec { + pname = "riot"; + version = "0.0.2"; + + minimalOCamlVersion = "5.1"; + + src = fetchurl { + url = "https://github.com/leostera/riot/releases/download/${version}/riot-${version}.tbz"; + hash = "sha256-ck/tr5o0nKF4WNgjPODHg1/tlaKv1JtuYgqYfIIZ78Q="; + }; + + propagatedBuildInputs = [ + bigstringaf + iomux + ptime + uri + ]; + + doCheck = true; + + meta = { + description = "An actor-model multi-core scheduler for OCaml 5"; + homepage = "https://github.com/leostera/riot"; + changelog = "https://github.com/leostera/riot/blob/${version}/CHANGES.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ marsam ]; + }; +} diff --git a/pkgs/development/ocaml-modules/yaml/default.nix b/pkgs/development/ocaml-modules/yaml/default.nix index 416438dafbd..99b6fb245a2 100644 --- a/pkgs/development/ocaml-modules/yaml/default.nix +++ b/pkgs/development/ocaml-modules/yaml/default.nix @@ -6,15 +6,14 @@ buildDunePackage rec { pname = "yaml"; - version = "3.1.0"; + version = "3.2.0"; src = fetchurl { url = "https://github.com/avsm/ocaml-yaml/releases/download/v${version}/yaml-${version}.tbz"; - hash = "sha256-0KngriGEpp5tcgK/43B9EEOdMacSQYYCNLGfAgRS7Mc="; + hash = "sha256-xQ0qyii5+WZ5K3HhYDNR5dJO2k39PkRT+9UDZqOggic="; }; minimalOCamlVersion = "4.13"; - duneVersion = "3"; buildInputs = [ dune-configurator ]; propagatedBuildInputs = [ bos ctypes ]; diff --git a/pkgs/development/ocaml-modules/yaml/yaml-sexp.nix b/pkgs/development/ocaml-modules/yaml/yaml-sexp.nix index aa8566ea608..e0cc9fac177 100644 --- a/pkgs/development/ocaml-modules/yaml/yaml-sexp.nix +++ b/pkgs/development/ocaml-modules/yaml/yaml-sexp.nix @@ -1,14 +1,17 @@ -{ lib, fetchurl, buildDunePackage, yaml, dune-configurator, ppx_sexp_conv, sexplib }: +{ lib, fetchurl, buildDunePackage, yaml, dune-configurator, ppx_sexp_conv, sexplib +, junit_alcotest +}: buildDunePackage rec { pname = "yaml-sexp"; inherit (yaml) version src; - duneVersion = "3"; - propagatedBuildInputs = [ yaml ppx_sexp_conv sexplib ]; + doCheck = true; + checkInputs = [ junit_alcotest ]; + meta = yaml.meta // { description = "ocaml-yaml with sexp support"; }; diff --git a/pkgs/development/perl-modules/Gtk2-fix-incompatible-pointer-conversion.patch b/pkgs/development/perl-modules/Gtk2-fix-incompatible-pointer-conversion.patch new file mode 100644 index 00000000000..1ac68ee19d0 --- /dev/null +++ b/pkgs/development/perl-modules/Gtk2-fix-incompatible-pointer-conversion.patch @@ -0,0 +1,86 @@ +diff -ur a/gdk.typemap b/gdk.typemap +--- a/gdk.typemap 2017-05-21 15:02:54.000000000 -0400 ++++ b/gdk.typemap 2023-11-03 13:17:43.717890172 -0400 +@@ -23,6 +23,7 @@ + TYPEMAP + + # can be either a pointer or an integer, this handles both cases ++uintptr_t T_UV + GdkNativeWindow T_UV + + # GdkBitmap doesn't get its own type id, but needs to be treated separately. +diff -ur a/xs/GdkDnd.xs b/xs/GdkDnd.xs +--- a/xs/GdkDnd.xs 2017-05-21 15:02:54.000000000 -0400 ++++ b/xs/GdkDnd.xs 2023-11-03 13:23:22.478329089 -0400 +@@ -142,12 +142,12 @@ + void + gdk_drag_get_protocol_for_display (class, display, xid) + GdkDisplay *display +- guint32 xid ++ uintptr_t xid + PREINIT: + GdkDragProtocol protocol; +- guint32 ret; ++ uintptr_t ret; + PPCODE: +- ret = gdk_drag_get_protocol_for_display (display, xid, &protocol); ++ ret = (uintptr_t)gdk_drag_get_protocol_for_display (display, INT2PTR(GdkNativeWindow, xid), &protocol); + XPUSHs (sv_2mortal (newSVuv (ret))); + XPUSHs (sv_2mortal (ret + ? newSVGdkDragProtocol (protocol) +@@ -184,12 +184,12 @@ + =cut + void + gdk_drag_get_protocol (class, xid) +- guint32 xid ++ uintptr_t xid + PREINIT: + GdkDragProtocol protocol; +- guint32 ret; ++ uintptr_t ret; + PPCODE: +- ret = gdk_drag_get_protocol (xid, &protocol); ++ ret = (uintptr_t)gdk_drag_get_protocol (INT2PTR(GdkNativeWindow, xid), &protocol); + XPUSHs (sv_2mortal (newSVuv (ret))); + XPUSHs (sv_2mortal (newSVGdkDragProtocol (protocol))); + +diff -ur a/xs/GdkSelection.xs b/xs/GdkSelection.xs +--- a/xs/GdkSelection.xs 2017-05-21 15:02:54.000000000 -0400 ++++ b/xs/GdkSelection.xs 2023-11-03 13:26:58.976888906 -0400 +@@ -147,7 +147,7 @@ + ## void gdk_selection_send_notify (guint32 requestor, GdkAtom selection, GdkAtom target, GdkAtom property, guint32 time_) + void + gdk_selection_send_notify (class, requestor, selection, target, property, time_) +- guint32 requestor ++ GdkNativeWindow requestor + GdkAtom selection + GdkAtom target + GdkAtom property +@@ -161,7 +161,7 @@ + void + gdk_selection_send_notify_for_display (class, display, requestor, selection, target, property, time_) + GdkDisplay *display +- guint32 requestor ++ GdkNativeWindow requestor + GdkAtom selection + GdkAtom target + GdkAtom property +diff -ur a/xs/GtkWindow.xs b/xs/GtkWindow.xs +--- a/xs/GtkWindow.xs 2017-05-21 15:02:54.000000000 -0400 ++++ b/xs/GtkWindow.xs 2023-11-03 13:32:53.673168678 -0400 +@@ -581,13 +581,13 @@ + void + gtk_window_remove_embedded_xid (window, xid) + GtkWindow * window +- guint xid ++ GdkNativeWindow xid + + ## void gtk_window_add_embedded_xid (GtkWindow *window, guint xid) + void + gtk_window_add_embedded_xid (window, xid) + GtkWindow * window +- guint xid ++ GdkNativeWindow xid + + ##void gtk_window_reshow_with_initial_size (GtkWindow *window) + void diff --git a/pkgs/development/perl-modules/IO-Tty-fix-makefile.patch b/pkgs/development/perl-modules/IO-Tty-fix-makefile.patch new file mode 100644 index 00000000000..65c6d238bdb --- /dev/null +++ b/pkgs/development/perl-modules/IO-Tty-fix-makefile.patch @@ -0,0 +1,13 @@ +diff --git a/Makefile.PL b/Makefile.PL +index eaf47e0..32766d7 100644 +--- a/Makefile.PL ++++ b/Makefile.PL +@@ -146,7 +146,7 @@ extern "C" + /* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ + char $f (); +-char (*f) (); ++char f; + + #ifdef F77_DUMMY_MAIN + # ifdef __cplusplus diff --git a/pkgs/development/perl-modules/MouseX-Getopt-gld-tests.patch b/pkgs/development/perl-modules/MouseX-Getopt-gld-tests.patch new file mode 100644 index 00000000000..6ca6e830946 --- /dev/null +++ b/pkgs/development/perl-modules/MouseX-Getopt-gld-tests.patch @@ -0,0 +1,143 @@ +From c1d1eed00099af8d858536b659864b7ccea41974 Mon Sep 17 00:00:00 2001 +From: Paul Howarth <paul@city-fan.org> +Date: Sat, 13 Mar 2021 17:46:57 +0000 +Subject: [PATCH 1/2] Update for Getopt-Long-Descriptive 0.106 + +GLD is now outputting text with wrapping depending on the terminal +width. This update is enough to get the tests to pass when running +within "expect", which provides a PTY. It's almost certainly not +enough for general use. +--- + t/104_override_usage.t | 8 ++++++++ + t/107_no_auto_help.t | 2 +- + t/109_help_flag.t | 2 +- + t/110_sort_usage_by_attr_order.t | 12 ++++++++++++ + 4 files changed, 22 insertions(+), 2 deletions(-) + +diff --git a/t/104_override_usage.t b/t/104_override_usage.t +index bc45029..6641540 100644 +--- a/t/104_override_usage.t ++++ b/t/104_override_usage.t +@@ -61,9 +61,17 @@ use Test::Exception; + \t--foo INT A foo + } + : ++ $Getopt::Long::Descriptive::VERSION < 0.106 ? + qq{usage: 104_override_usage.t [-?] [long options...] + \t-? --[no-]usage --[no-]help Prints this usage information. + \t--foo INT A foo ++} ++ : ++ qq{usage: 104_override_usage.t [-?] [long options...] ++\t--[no-]help (or -?) Prints ++\t this usage information. ++\t aka --usage ++\t--foo INT A foo + } + + ]; +diff --git a/t/107_no_auto_help.t b/t/107_no_auto_help.t +index 27f87f5..103df43 100644 +--- a/t/107_no_auto_help.t ++++ b/t/107_no_auto_help.t +@@ -60,7 +60,7 @@ END { + warning_like { + throws_ok { Class->new_with_options } + #usage: 107_no_auto_help.t [-?] [long options...] +- qr/^usage: [\d\w]+\Q.t [-?] [long options...]\E.\s+\Q-? --\E(\[no-\])?usage --(\[no-\])?\Qhelp\E\s+\QPrints this usage information.\E.\s+--configfile/ms, ++ qr/^usage: [\d\w]+\Q.t [-?] [long options...]\E.\s+(\Q-? --\E(\[no-\])?usage )?--(\[no-\])?\Qhelp\E(\Q (or -?)\E)?\s+\QPrints this usage information.\E.(\s+\Qaka --usage\E.)?\s+--configfile/ms, + 'usage information looks good'; + } + qr/^Specified configfile \'this_value_unimportant\' does not exist, is empty, or is not readable$/, +diff --git a/t/109_help_flag.t b/t/109_help_flag.t +index 8c658e2..58dbca6 100644 +--- a/t/109_help_flag.t ++++ b/t/109_help_flag.t +@@ -40,7 +40,7 @@ foreach my $args ( ['--help'], ['--usage'], ['--?'], ['-?'] ) + local @ARGV = @$args; + + throws_ok { MyClass->new_with_options() } +- qr/^usage: (?:[\d\w]+)\Q.t [-?] [long options...]\E.^\t\Q-? --\E(\[no-\])?usage --(\[no-\])?help\s+\QPrints this usage information.\E$/ms, ++ qr/^usage: (?:[\d\w]+)\Q.t [-?] [long options...]\E.^\s+(\Q-? --\E(\[no-\])?usage )?--(\[no-\])?help(\Q (or -?)\E)?\s+Prints ?(.\s+)?\Qthis usage information.\E.(\s+\Qaka --usage\E.)?$/ms, + 'Help request detected; usage information properly printed'; + } + +diff --git a/t/110_sort_usage_by_attr_order.t b/t/110_sort_usage_by_attr_order.t +index e7dd177..7ec0c99 100644 +--- a/t/110_sort_usage_by_attr_order.t ++++ b/t/110_sort_usage_by_attr_order.t +@@ -64,6 +64,18 @@ usage: 110_sort_usage_by_attr_order.t [-?] [long options...] + --baz STR Documentation for "baz" + USAGE + } ++if ( $Getopt::Long::Descriptive::VERSION >= 0.106 ) ++{ ++$expected = <<'USAGE'; ++usage: 110_sort_usage_by_attr_order.t [-?] [long options...] ++ --[no-]help (or -?) Prints ++ this usage information. ++ aka --usage ++ --foo STR Documentation for "foo" ++ --bar STR Documentation for "bar" ++ --baz STR Documentation for "baz" ++USAGE ++} + $expected =~ s/^[ ]{4}/\t/xmsg; + is($obj->usage->text, $expected, 'Usage text has nicely sorted options'); + + +From 45ae6aaabc5413e985860fbfcc8da3bdc929a054 Mon Sep 17 00:00:00 2001 +From: Paul Howarth <paul@city-fan.org> +Date: Mon, 15 Mar 2021 10:43:14 +0000 +Subject: [PATCH 2/2] Update for Getopt-Long-Descriptive 0.107 + +GLD's use of Term::ReadKey has been reverted, so this update should now +work reliably. Use with GLD 0.106 is not supported. +--- + t/104_override_usage.t | 6 +++--- + t/110_sort_usage_by_attr_order.t | 6 +++--- + 2 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/t/104_override_usage.t b/t/104_override_usage.t +index 6641540..f7c6a31 100644 +--- a/t/104_override_usage.t ++++ b/t/104_override_usage.t +@@ -61,15 +61,15 @@ use Test::Exception; + \t--foo INT A foo + } + : +- $Getopt::Long::Descriptive::VERSION < 0.106 ? ++ # Note: Getopt::Long::Descriptive 0.106 not supported ++ $Getopt::Long::Descriptive::VERSION < 0.107 ? + qq{usage: 104_override_usage.t [-?] [long options...] + \t-? --[no-]usage --[no-]help Prints this usage information. + \t--foo INT A foo + } + : + qq{usage: 104_override_usage.t [-?] [long options...] +-\t--[no-]help (or -?) Prints +-\t this usage information. ++\t--[no-]help (or -?) Prints this usage information. + \t aka --usage + \t--foo INT A foo + } +diff --git a/t/110_sort_usage_by_attr_order.t b/t/110_sort_usage_by_attr_order.t +index 7ec0c99..16cdaa1 100644 +--- a/t/110_sort_usage_by_attr_order.t ++++ b/t/110_sort_usage_by_attr_order.t +@@ -64,12 +64,12 @@ usage: 110_sort_usage_by_attr_order.t [-?] [long options...] + --baz STR Documentation for "baz" + USAGE + } +-if ( $Getopt::Long::Descriptive::VERSION >= 0.106 ) ++# Note: Getopt::Long::Descriptive 0.106 not supported ++if ( $Getopt::Long::Descriptive::VERSION >= 0.107 ) + { + $expected = <<'USAGE'; + usage: 110_sort_usage_by_attr_order.t [-?] [long options...] +- --[no-]help (or -?) Prints +- this usage information. ++ --[no-]help (or -?) Prints this usage information. + aka --usage + --foo STR Documentation for "foo" + --bar STR Documentation for "bar" diff --git a/pkgs/development/perl-modules/Paranoid-blessed-path.patch b/pkgs/development/perl-modules/Paranoid-blessed-path.patch index 5e800250110..99bd6973074 100644 --- a/pkgs/development/perl-modules/Paranoid-blessed-path.patch +++ b/pkgs/development/perl-modules/Paranoid-blessed-path.patch @@ -1,23 +1,22 @@ -diff -ru Paranoid-2.05/lib/Paranoid.pm /tmp/Paranoid-2.05/lib/Paranoid.pm ---- Paranoid-2.05/lib/Paranoid.pm 2017-02-06 05:48:57.000000000 -0500 -+++ /tmp/Paranoid-2.05/lib/Paranoid.pm 2018-05-10 06:40:35.286313299 -0400 -@@ -61,7 +61,7 @@ +diff '--color=auto' -ur Paranoid-2.10/lib/Paranoid.pm Paranoid-2.10-patched/lib/Paranoid.pm +--- Paranoid-2.10/lib/Paranoid.pm 2022-03-08 10:01:04.000000000 +0100 ++++ Paranoid-2.10-patched/lib/Paranoid.pm 2023-10-20 16:57:54.025754755 +0200 +@@ -47,7 +47,7 @@ + %EXPORT_TAGS = ( all => [@EXPORT_OK], ); - my $path = shift; + use constant PTRUE_ZERO => '0 but true'; +-use constant DEFAULT_PATH => '/bin:/sbin:/usr/bin:/usr/sbin'; ++use constant DEFAULT_PATH => '__BLESSED_PATH__'; -- $path = '/bin:/usr/bin' unless defined $path; -+ $path = '__BLESSED_PATH__' unless defined $path; - - delete @ENV{qw(IFS CDPATH ENV BASH_ENV)}; - $ENV{PATH} = $path; -Binary files Paranoid-2.05/lib/.Paranoid.pm.swp and /tmp/Paranoid-2.05/lib/.Paranoid.pm.swp differ -diff -ru Paranoid-2.05/t/01_init_core.t /tmp/Paranoid-2.05/t/01_init_core.t ---- Paranoid-2.05/t/01_init_core.t 2016-07-12 04:49:33.000000000 -0400 -+++ /tmp/Paranoid-2.05/t/01_init_core.t 2018-05-10 06:43:41.323183381 -0400 -@@ -35,5 +35,5 @@ + ##################################################################### + # +diff '--color=auto' -ur Paranoid-2.10/t/01_init_core.t Paranoid-2.10-patched/t/01_init_core.t +--- Paranoid-2.10/t/01_init_core.t 2022-01-24 10:30:20.000000000 +0100 ++++ Paranoid-2.10-patched/t/01_init_core.t 2023-10-20 16:58:16.856288407 +0200 +@@ -35,5 +35,4 @@ ok( psecureEnv('/bin:/sbin'), 'psecureEnv 1' ); is( $ENV{PATH}, '/bin:/sbin', 'Validated PATH' ); ok( psecureEnv(), 'psecureEnv 2' ); --is( $ENV{PATH}, '/bin:/usr/bin', 'Validated PATH' ); +-is( $ENV{PATH}, '/bin:/sbin:/usr/bin:/usr/sbin', 'Validated PATH' ); +- +is( $ENV{PATH}, '__BLESSED_PATH__', 'Validated PATH' ); - diff --git a/pkgs/development/perl-modules/XML-LibXML-clang16.patch b/pkgs/development/perl-modules/XML-LibXML-clang16.patch new file mode 100644 index 00000000000..9a19e32bc40 --- /dev/null +++ b/pkgs/development/perl-modules/XML-LibXML-clang16.patch @@ -0,0 +1,47 @@ +From 8751785951fbde48ffa16a476da3e4adb2bbcde5 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 16 Jan 2023 18:50:10 -0800 +Subject: [PATCH] libxml-mm: Fix function prototypes in function pointers + +This is now detected with latest clang16+ + +Fixes +error: incompatible function pointer types passing 'void (void *, void *, xmlChar *)' (aka 'void (void *, void *, unsigned char *)') to parameter of type 'xmlHashScanner' (aka 'void (*)(void *, void *, const unsigned char *)') [-Wincompatible-function-pointer-types] + xmlHashScan(r, PmmRegistryDumpHashScanner, NULL); + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + perl-libxml-mm.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/perl-libxml-mm.c b/perl-libxml-mm.c +index a3e78a2..ec2b5ea 100644 +--- a/perl-libxml-mm.c ++++ b/perl-libxml-mm.c +@@ -121,7 +121,7 @@ PmmFreeHashTable(xmlHashTablePtr table) + extern SV* PROXY_NODE_REGISTRY_MUTEX; + + /* Utility method used by PmmDumpRegistry */ +-void PmmRegistryDumpHashScanner(void * payload, void * data, xmlChar * name) ++void PmmRegistryDumpHashScanner(void * payload, void * data, const xmlChar * name) + { + LocalProxyNodePtr lp = (LocalProxyNodePtr) payload; + ProxyNodePtr node = (ProxyNodePtr) lp->proxy; +@@ -215,7 +215,7 @@ PmmRegisterProxyNode(ProxyNodePtr proxy) + /* PP: originally this was static inline void, but on AIX the compiler + did not chew it, so I'm removing the inline */ + static void +-PmmRegistryHashDeallocator(void *payload, xmlChar *name) ++PmmRegistryHashDeallocator(void *payload, const xmlChar *name) + { + Safefree((LocalProxyNodePtr) payload); + } +@@ -279,7 +279,7 @@ PmmRegistryREFCNT_dec(ProxyNodePtr proxy) + * internal, used by PmmCloneProxyNodes + */ + void * +-PmmRegistryHashCopier(void *payload, xmlChar *name) ++PmmRegistryHashCopier(void *payload, const xmlChar *name) + { + ProxyNodePtr proxy = ((LocalProxyNodePtr) payload)->proxy; + LocalProxyNodePtr lp; diff --git a/pkgs/development/perl-modules/generic/builder.sh b/pkgs/development/perl-modules/generic/builder.sh index 110094ad8a4..4da9f7a9821 100644 --- a/pkgs/development/perl-modules/generic/builder.sh +++ b/pkgs/development/perl-modules/generic/builder.sh @@ -1,4 +1,4 @@ -if [ -e .attrs.sh ]; then source .attrs.sh; fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi source $stdenv/setup PERL5LIB="$PERL5LIB${PERL5LIB:+:}$out/lib/perl5/site_perl" diff --git a/pkgs/development/perl-modules/lwp-protocol-https-cert-file.patch b/pkgs/development/perl-modules/lwp-protocol-https-cert-file.patch index e9b501c29e2..3b6156d3a7c 100644 --- a/pkgs/development/perl-modules/lwp-protocol-https-cert-file.patch +++ b/pkgs/development/perl-modules/lwp-protocol-https-cert-file.patch @@ -1,31 +1,14 @@ -From 321401098f2c86a6f68e186cfc06e030b09484b6 Mon Sep 17 00:00:00 2001 -From: Tyson Whitehead <twhitehead@gmail.com> -Date: Fri, 29 Jun 2018 15:47:00 -0400 -Subject: [PATCH] Respect NIX_SSL_CERT_FILE and SSL_CERT_FILE (in that order) - ---- - lib/LWP/Protocol/https.pm | 8 ++++++++ - 1 file changed, 8 insertions(+) - diff --git a/lib/LWP/Protocol/https.pm b/lib/LWP/Protocol/https.pm -index f7230e2..c78b9ce 100644 +index 645e828..7098f64 100644 --- a/lib/LWP/Protocol/https.pm +++ b/lib/LWP/Protocol/https.pm -@@ -23,6 +23,14 @@ sub _extra_sock_opts - $ssl_opts{SSL_verify_mode} = 0; +@@ -29,6 +29,9 @@ sub _extra_sock_opts + } } if ($ssl_opts{SSL_verify_mode}) { -+ unless (exists $ssl_opts{SSL_ca_file} || exists $ssl_opts{SSL_ca_path}) { -+ $ssl_opts{SSL_ca_file} = $ENV{'NIX_SSL_CERT_FILE'} -+ if !defined $ssl_opts{SSL_ca_file}; -+ $ssl_opts{SSL_ca_file} = $ENV{'SSL_CERT_FILE'} -+ if !defined $ssl_opts{SSL_ca_file}; -+ $ssl_opts{SSL_ca_file} = "/etc/ssl/certs/ca-certificates.crt" -+ if !defined $ssl_opts{SSL_ca_file} && -e "/etc/ssl/certs/ca-certificates.crt"; -+ } - unless (exists $ssl_opts{SSL_ca_file} || exists $ssl_opts{SSL_ca_path}) { - eval { - require Mozilla::CA; --- -2.14.0 - ++ if ($ENV{NIX_SSL_CERT_FILE}) { ++ $ssl_opts{SSL_ca_file} //= $ENV{NIX_SSL_CERT_FILE}; ++ } + unless (exists $ssl_opts{SSL_ca_file} || exists $ssl_opts{SSL_ca_path}) { + if ($Net::HTTPS::SSL_SOCKET_CLASS eq 'IO::Socket::SSL' + && defined &IO::Socket::SSL::default_ca diff --git a/pkgs/development/perl-modules/mhonarc.patch b/pkgs/development/perl-modules/mhonarc.patch deleted file mode 100644 index 12b8cc2931b..00000000000 --- a/pkgs/development/perl-modules/mhonarc.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/lib/mhamain.pl b/lib/mhamain.pl -index 80980a2..c1259ce 100644 ---- a/lib/mhamain.pl -+++ b/lib/mhamain.pl -@@ -1562,7 +1562,7 @@ sub signal_catch { - ## - sub defineIndex2MsgId { - no warnings qw(deprecated); -- if (!defined(%Index2MsgId)) { -+ unless (%Index2MsgId) { - foreach (keys %MsgId) { - $Index2MsgId{$MsgId{$_}} = $_; - } -diff --git a/lib/mhopt.pl b/lib/mhopt.pl -index 02fb05e..939109b 100644 ---- a/lib/mhopt.pl -+++ b/lib/mhopt.pl -@@ -865,7 +865,7 @@ sub update_data_1_to_2 { - sub update_data_2_1_to_later { - no warnings qw(deprecated); - # we can preserve filter arguments -- if (defined(%main::MIMEFiltersArgs)) { -+ if (%main::MIMEFiltersArgs) { - warn qq/ preserving MIMEARGS...\n/; - %readmail::MIMEFiltersArgs = %main::MIMEFiltersArgs; - $IsDefault{'MIMEARGS'} = 0; diff --git a/pkgs/development/pharo/default.nix b/pkgs/development/pharo/default.nix index 2cf98d49369..3c17b2bd793 100644 --- a/pkgs/development/pharo/default.nix +++ b/pkgs/development/pharo/default.nix @@ -23,8 +23,8 @@ let pharo-sources = fetchurl { # It is necessary to download from there instead of from the repository because that archive # also contains artifacts necessary for the bootstrapping. - url = "https://files.pharo.org/vm/pharo-spur64-headless/Linux-x86_64/source/PharoVM-10.0.5-2757766-Linux-x86_64-c-src.zip"; - hash = "sha256-i6WwhdVdyzmqGlx1Fn12mCq5+HnRORT65HEiJo0joCE="; + url = "https://files.pharo.org/vm/pharo-spur64-headless/Linux-x86_64/source/PharoVM-10.0.8-b323c5f-Linux-x86_64-c-src.zip"; + hash = "sha256-5IHymk6yl3pMLG3FeM4nqos0yLYMa3B2+hYW08Yo1V0="; }; library_path = makeLibraryPath [ libgit2 @@ -35,7 +35,7 @@ let in stdenv.mkDerivation { pname = "pharo"; - version = "10.0.5"; + version = "10.0.8"; src = pharo-sources; buildInputs = [ @@ -64,6 +64,8 @@ stdenv.mkDerivation { cmakeFlags = [ # Necessary to perform the bootstrapping without already having Pharo available. "-DGENERATED_SOURCE_DIR=." + "-DALWAYS_INTERACTIVE=ON" + "-DBUILD_IS_RELEASE=ON" "-DGENERATE_SOURCES=OFF" # Prevents CMake from trying to download stuff. "-DBUILD_BUNDLE=OFF" diff --git a/pkgs/development/php-packages/datadog_trace/default.nix b/pkgs/development/php-packages/datadog_trace/default.nix index a9b92d99755..7e9d3164ccf 100644 --- a/pkgs/development/php-packages/datadog_trace/default.nix +++ b/pkgs/development/php-packages/datadog_trace/default.nix @@ -47,9 +47,8 @@ buildPecl rec { curl pcre2 ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk_11_0.frameworks.CoreFoundation - darwin.apple_sdk_11_0.frameworks.Security - darwin.apple_sdk_11_0.Libsystem + darwin.apple_sdk.frameworks.CoreFoundation + darwin.apple_sdk.frameworks.Security libiconv ]; diff --git a/pkgs/development/python-modules/accuweather/default.nix b/pkgs/development/python-modules/accuweather/default.nix index 7e83d5a6b9a..8aa2719385a 100644 --- a/pkgs/development/python-modules/accuweather/default.nix +++ b/pkgs/development/python-modules/accuweather/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "accuweather"; - version = "2.0.0"; + version = "2.1.0"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "bieniu"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-elpVclH/sVQHEp3kTiwbDproJcB85F7m5sEjXwSEtNk="; + hash = "sha256-7uCR/xUARUakODeLVdI13D9ZksvN9c63o3Q0MlJp8cs="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/acoustics/default.nix b/pkgs/development/python-modules/acoustics/default.nix index d38f67d8c4d..174fd9c2237 100644 --- a/pkgs/development/python-modules/acoustics/default.nix +++ b/pkgs/development/python-modules/acoustics/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , flit-core , matplotlib , numpy @@ -13,15 +13,17 @@ buildPythonPackage rec { pname = "acoustics"; - version = "0.2.6"; + version = "0.2.6-unstable-2023-08-20"; + pyproject = true; disabled = pythonOlder "3.6"; - src = fetchPypi { - inherit pname version; - hash = "sha256-0CvMhCUc+i7dPiHH+IXdlj+OjFh/l1wvnU4dmxQrzFI="; + src = fetchFromGitHub { + owner = "python-acoustics"; + repo = "python-acoustics"; + rev = "99d79206159b822ea2f4e9d27c8b2fbfeb704d38"; + hash = "sha256-/4bVjlhj8ihpAFHEWPaZ/xBILi3rb8f0NmwAexJCg+o="; }; - format = "pyproject"; nativeBuildInputs = [ flit-core ]; @@ -47,11 +49,6 @@ buildPythonPackage rec { "-Wignore::DeprecationWarning" ]; - disabledTestPaths = [ - # ValueError: Unknown window type: "hanning" - "tests/standards/test_iso_1996_2_2007.py" - ]; - pythonImportsCheck = [ "acoustics" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/acquire/default.nix b/pkgs/development/python-modules/acquire/default.nix index 4426f930b0d..87e1ef29307 100644 --- a/pkgs/development/python-modules/acquire/default.nix +++ b/pkgs/development/python-modules/acquire/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "acquire"; - version = "3.9"; + version = "3.10"; pyproject = true; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "acquire"; rev = "refs/tags/${version}"; - hash = "sha256-ppkfnPJEvCImTA0+NjYD8r6SHcx9eBN9GBvo0IZYcjY="; + hash = "sha256-8fvVK/mH+pgPaaxNKvKOw1qU0ElWAmNVP6YAqvBTwio="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/pkgs/development/python-modules/adafruit-platformdetect/default.nix index e7ed02bbe04..97966e6bb33 100644 --- a/pkgs/development/python-modules/adafruit-platformdetect/default.nix +++ b/pkgs/development/python-modules/adafruit-platformdetect/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "adafruit-platformdetect"; - version = "3.53.0"; + version = "3.54.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "Adafruit-PlatformDetect"; inherit version; - hash = "sha256-P6oR9Aszj2yj2w+2hAjCMDwngJ+uuUNLpgZooYImzyk="; + hash = "sha256-P+f7eBqD0/KIEry/807dQQCvtokB2cYu4i0H6CTYIWg="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/aggdraw/default.nix b/pkgs/development/python-modules/aggdraw/default.nix index 9d1e0ee96ba..ef44979c439 100644 --- a/pkgs/development/python-modules/aggdraw/default.nix +++ b/pkgs/development/python-modules/aggdraw/default.nix @@ -1,5 +1,6 @@ { lib , fetchFromGitHub +, fetchpatch , buildPythonPackage , packaging , setuptools @@ -23,6 +24,14 @@ buildPythonPackage rec { hash = "sha256-2yajhuRyQ7BqghbSgPClW3inpw4TW2DhgQbomcRFx94="; }; + patches = [ + # Removes `register` storage class specifier, which is not allowed in C++17. + (fetchpatch { + url = "https://github.com/pytroll/aggdraw/commit/157ed49803567e8c3eeb7dfeff4c116db35747f7.patch"; + hash = "sha256-QSzpO90u5oSBWUzehRFbXgZ1ApEfLlfp11MUx6w11aI="; + }) + ]; + nativeBuildInputs = [ packaging setuptools diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix index e433aa42599..d669fa98384 100644 --- a/pkgs/development/python-modules/ailment/default.nix +++ b/pkgs/development/python-modules/ailment/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.2.76"; + version = "9.2.77"; pyproject = true; disabled = pythonOlder "3.11"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-RIYGWPvQ2n+NgZHw2pGEvgWAtbpb/rdyb6/K4JClRxM="; + hash = "sha256-Bff44LSWdoXrijTAjnlsaN5iqDbHjfmYqe0FR4dmZxU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aiobotocore/default.nix b/pkgs/development/python-modules/aiobotocore/default.nix index 9de5593a256..5f226d26018 100644 --- a/pkgs/development/python-modules/aiobotocore/default.nix +++ b/pkgs/development/python-modules/aiobotocore/default.nix @@ -5,6 +5,8 @@ , buildPythonPackage , dill , fetchFromGitHub +, flask +, flask-cors , moto , pytest-asyncio , pytestCheckHook @@ -41,6 +43,8 @@ buildPythonPackage rec { nativeCheckInputs = [ dill + flask + flask-cors moto pytest-asyncio pytestCheckHook diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix index 9af84e2ff91..b22090a7593 100644 --- a/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "aioesphomeapi"; - version = "18.4.0"; + version = "18.5.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "esphome"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-jSPoVMtGRtqpDFagjvLTxps5plcN92Mp9vjtQlmqyGg="; + hash = "sha256-kj4FHsNsGsMxK+EI1jgqBfvldkyAoBkCTGT1yiZMmzY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix index f01b17639e8..ebbcf6ea82a 100644 --- a/pkgs/development/python-modules/aiohttp/default.nix +++ b/pkgs/development/python-modules/aiohttp/default.nix @@ -31,25 +31,23 @@ buildPythonPackage rec { pname = "aiohttp"; - version = "3.8.5"; + version = "3.8.6"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-uVUuxSzBR9vxlErHrJivdgLlHqLc0HbtGUyjwNHH0Lw="; + hash = "sha256-sM8qRQG/+TMKilJItM6VGFHkFb3M6dwVjnbP1V4VCFw="; }; patches = [ (fetchpatch { # https://github.com/aio-libs/aiohttp/pull/7260 - # Merged upstream, should likely be dropped post-3.8.5 + # Merged upstream, should be dropped once updated to 3.9.0 url = "https://github.com/aio-libs/aiohttp/commit/7dcc235cafe0c4521bbbf92f76aecc82fee33e8b.patch"; hash = "sha256-ZzhlE50bmA+e2XX2RH1FuWQHZIAa6Dk/hZjxPoX5t4g="; }) - # https://github.com/aio-libs/aiohttp/pull/7454 but does not merge cleanly - ./setuptools-67.5.0-compatibility.diff ]; postPatch = '' diff --git a/pkgs/development/python-modules/aiohttp/setuptools-67.5.0-compatibility.diff b/pkgs/development/python-modules/aiohttp/setuptools-67.5.0-compatibility.diff deleted file mode 100644 index 2f75b6b4c13..00000000000 --- a/pkgs/development/python-modules/aiohttp/setuptools-67.5.0-compatibility.diff +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/setup.cfg b/setup.cfg -index 6944b7e2..dfa65d69 100644 ---- a/setup.cfg -+++ b/setup.cfg -@@ -128,6 +128,7 @@ filterwarnings = - ignore:Creating a LegacyVersion has been deprecated and will be removed in the next major release:DeprecationWarning:: - ignore:module 'sre_constants' is deprecated:DeprecationWarning:pkg_resources._vendor.pyparsing - ignore:path is deprecated. Use files.. instead. Refer to https.//importlib-resources.readthedocs.io/en/latest/using.html#migrating-from-legacy for migration advice.:DeprecationWarning:certifi.core -+ ignore:pkg_resources is deprecated as an API:DeprecationWarning - junit_suite_name = aiohttp_test_suite - norecursedirs = dist docs build .tox .eggs - minversion = 3.8.2 -diff --git a/tests/test_circular_imports.py b/tests/test_circular_imports.py -index 22e5ea47..a655fd1d 100644 ---- a/tests/test_circular_imports.py -+++ b/tests/test_circular_imports.py -@@ -113,6 +113,10 @@ def test_no_warnings(import_path: str) -> None: - "-W", - "ignore:Creating a LegacyVersion has been deprecated and will " - "be removed in the next major release:DeprecationWarning:", -+ # Deprecation warning emitted by setuptools v67.5.0+ triggered by importing -+ # `gunicorn.util`. -+ "-W", "ignore:pkg_resources is deprecated as an API:" -+ "DeprecationWarning", - "-c", f"import {import_path!s}", - # fmt: on - ) diff --git a/pkgs/development/python-modules/aiomisc/default.nix b/pkgs/development/python-modules/aiomisc/default.nix index 77016c323d9..671cce69c6f 100644 --- a/pkgs/development/python-modules/aiomisc/default.nix +++ b/pkgs/development/python-modules/aiomisc/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "aiomisc"; - version = "17.3.23"; + version = "17.3.25"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-9Df/eGMnXFdv3RUh4LmlPm7STlUcVBw4flfH+bZ6q9Q="; + hash = "sha256-EPEfBK/1nbwcajqyv5lFX+02WMvbyFnij2w5J91+UK8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index e3d0f027114..1c26f847f62 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pname = "angr"; - version = "9.2.76"; + version = "9.2.77"; pyproject = true; disabled = pythonOlder "3.11"; @@ -41,7 +41,7 @@ buildPythonPackage rec { owner = "angr"; repo = "angr"; rev = "refs/tags/v${version}"; - hash = "sha256-B3oYh0okbIeEvBjBHvY29QTqPyR2TTzLmz6fMsIRcs0="; + hash = "sha256-EslJnwgZUUN+EtyjGi/7a4Upr2/vbfNXpkc7I+/ZrU8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ansible/default.nix b/pkgs/development/python-modules/ansible/default.nix index 71bd13c7ab4..5c08a0f5bf0 100644 --- a/pkgs/development/python-modules/ansible/default.nix +++ b/pkgs/development/python-modules/ansible/default.nix @@ -21,7 +21,7 @@ let pname = "ansible"; - version = "8.4.0"; + version = "8.6.0"; in buildPythonPackage { inherit pname version; @@ -31,7 +31,7 @@ buildPythonPackage { src = fetchPypi { inherit pname version; - hash = "sha256-8zxJJpBZL60SaE6Yl/beLaFcn24ey3kTdwOgZHCvLOY="; + hash = "sha256-lfTlkydNWdU/NvYiB1NbfScq3CcBrHoO169qbYFjemA="; }; postPatch = '' diff --git a/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix b/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix index 8b72b5e8e99..463518ef2f9 100644 --- a/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix +++ b/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix @@ -17,8 +17,8 @@ buildPythonPackage rec { pname = "appthreat-vulnerability-db"; - version = "5.5.1"; - format = "pyproject"; + version = "5.5.3"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "AppThreat"; repo = "vulnerability-db"; rev = "refs/tags/v${version}"; - hash = "sha256-URDVNuUrxWoQjeNRPrSJz8aiEozn5BzRTvhqc4bihA0="; + hash = "sha256-6kfkHLW5PftzrhKjywc670HpKCrrU0POEiJ3u2doBTk="; }; postPatch = '' diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix index 2e5ebe9e8e0..c8383ecc9af 100644 --- a/pkgs/development/python-modules/archinfo/default.nix +++ b/pkgs/development/python-modules/archinfo/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.2.76"; + version = "9.2.77"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-g1qlcaSByXhF+6ffxwbV/0tXFdmLySH3TcDuok4y6xw="; + hash = "sha256-uTkPDhk4Ugyb9HV/0PMwWpuNajpzfTn1dg7gsQnc/zg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/argcomplete/default.nix b/pkgs/development/python-modules/argcomplete/default.nix index 5eec27d6782..765a7848ac5 100644 --- a/pkgs/development/python-modules/argcomplete/default.nix +++ b/pkgs/development/python-modules/argcomplete/default.nix @@ -8,8 +8,8 @@ buildPythonPackage rec { pname = "argcomplete"; - version = "3.1.2"; - format = "pyproject"; + version = "3.1.6"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "kislyuk"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-vKXHmCcZZTjVBwQZWtyRjJT4tTuIiK5Qos9yJT/mpag="; + hash = "sha256-Akwa6dsf8w/Sw0ydUrqKEP5+dzHYX4hS8vcl7Gw4ePc="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -35,9 +35,10 @@ buildPythonPackage rec { ]; meta = with lib; { + changelog = "https://github.com/kislyuk/argcomplete/blob/v${version}/Changes.rst"; description = "Bash tab completion for argparse"; + downloadPage = "https://github.com/kislyuk/argcomplete"; homepage = "https://kislyuk.github.io/argcomplete/"; - changelog = "https://github.com/kislyuk/argcomplete/blob/v${version}/Changes.rst"; license = licenses.asl20; maintainers = with maintainers; [ womfoo ]; }; diff --git a/pkgs/development/python-modules/argilla/default.nix b/pkgs/development/python-modules/argilla/default.nix index 6f6ba426687..26a527eb4f8 100644 --- a/pkgs/development/python-modules/argilla/default.nix +++ b/pkgs/development/python-modules/argilla/default.nix @@ -65,7 +65,7 @@ }: let pname = "argilla"; - version = "1.18.0"; + version = "1.19.0"; optional-dependencies = { server = [ fastapi @@ -126,7 +126,7 @@ buildPythonPackage { owner = "argilla-io"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-2VWzmNMdd4WXSBrMSmclpjSZ9jDKNG7GbndUh8zLmgQ="; + hash = "sha256-Idl5Tm1XWgBLVgHPbXiyt9MW4J5wZdPb2J7iIDBnorg="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/asyncua/default.nix b/pkgs/development/python-modules/asyncua/default.nix index c17bae7c80f..a4904cdb5e9 100644 --- a/pkgs/development/python-modules/asyncua/default.nix +++ b/pkgs/development/python-modules/asyncua/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "asyncua"; - version = "1.0.4"; + version = "1.0.5"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "FreeOpcUa"; repo = "opcua-asyncio"; rev = "refs/tags/v${version}"; - hash = "sha256-gAyvo+VJPdS/UpXN/h8LqbIRyx84fifSUsW2GUzLgfo="; + hash = "sha256-eDrnDDiijkr5377BVWVAc5QEQCCDBoFynuT4MncCx9g="; fetchSubmodules = true; }; diff --git a/pkgs/development/python-modules/authcaptureproxy/default.nix b/pkgs/development/python-modules/authcaptureproxy/default.nix index a73403518b4..e18375c1f5d 100644 --- a/pkgs/development/python-modules/authcaptureproxy/default.nix +++ b/pkgs/development/python-modules/authcaptureproxy/default.nix @@ -44,6 +44,16 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + # test fails with frequency 1/200 + # https://github.com/alandtse/auth_capture_proxy/issues/25 + "test_return_timer_countdown_refresh_html" + ]; + + pythonImportsCheck = [ + "authcaptureproxy" + ]; + meta = with lib; { changelog = "https://github.com/alandtse/auth_capture_proxy/releases/tag/v${version}"; description = "A proxy to capture authentication information from a webpage"; diff --git a/pkgs/development/python-modules/aws-sam-translator/default.nix b/pkgs/development/python-modules/aws-sam-translator/default.nix index 5a7b1af3e8f..32a8baa4486 100644 --- a/pkgs/development/python-modules/aws-sam-translator/default.nix +++ b/pkgs/development/python-modules/aws-sam-translator/default.nix @@ -2,7 +2,6 @@ , boto3 , buildPythonPackage , fetchFromGitHub -, fetchpatch , jsonschema , parameterized , pydantic @@ -17,7 +16,7 @@ buildPythonPackage rec { pname = "aws-sam-translator"; - version = "1.74.0"; + version = "1.78.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -26,16 +25,9 @@ buildPythonPackage rec { owner = "aws"; repo = "serverless-application-model"; rev = "refs/tags/v${version}"; - hash = "sha256-uOfBR0bvLVyBcfSAkSqOx4KjmSYbfktpJlxKjipfj50="; + hash = "sha256-hSXJBEntj3k3Kml+Yuvn19X7YXL+Y1hXBkb8iZ7DxR4="; }; - patches = [ - (fetchpatch { - url = "https://github.com/aws/serverless-application-model/commit/e41b0f02204635a655100b68dd38220af32a2728.patch"; - hash = "sha256-V6KXdXQUr9fvLzxI6sUMrSRnGX5SrAaDygcaQ87FaQ8="; - }) - ]; - postPatch = '' substituteInPlace pytest.ini \ --replace " --cov samtranslator --cov-report term-missing --cov-fail-under 95" "" @@ -87,7 +79,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library to transform SAM templates into AWS CloudFormation templates"; - homepage = "https://github.com/awslabs/serverless-application-model"; + homepage = "https://github.com/aws/serverless-application-model"; changelog = "https://github.com/aws/serverless-application-model/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/python-modules/azure-monitor-ingestion/default.nix b/pkgs/development/python-modules/azure-monitor-ingestion/default.nix index dccdda1d27a..7058a1bddbe 100644 --- a/pkgs/development/python-modules/azure-monitor-ingestion/default.nix +++ b/pkgs/development/python-modules/azure-monitor-ingestion/default.nix @@ -10,16 +10,14 @@ buildPythonPackage rec { pname = "azure-monitor-ingestion"; - version = "1.0.2"; + version = "1.0.3"; + pyproject = true; disabled = pythonOlder "3.7"; - pyproject = true; - src = fetchPypi { inherit pname version; - extension = "zip"; - hash = "sha256-xNpYsD1bMIM0Bxy8KtR4rYy4tzfddtoPnEzHfO44At8="; + hash = "sha256-idAEqP+HaZs/0fzyBaqO8enTTySg88w3TSIUceiYdDs="; }; nativeBuildInputs = [ @@ -40,11 +38,11 @@ buildPythonPackage rec { # requires checkout from mono-repo and a mock account doCheck = false; - meta = { + meta = with lib; { changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-monitor-ingestion_${version}/sdk/monitor/azure-monitor-ingestion/CHANGELOG.md"; description = "Send custom logs to Azure Monitor using the Logs Ingestion API"; homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/monitor/azure-monitor-ingestion"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ dotlambda ]; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; }; } diff --git a/pkgs/development/python-modules/azure-servicebus/default.nix b/pkgs/development/python-modules/azure-servicebus/default.nix index aba7d2a29df..562340f93e4 100644 --- a/pkgs/development/python-modules/azure-servicebus/default.nix +++ b/pkgs/development/python-modules/azure-servicebus/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "azure-servicebus"; - version = "7.11.3"; + version = "7.11.4"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-lNZfL9yV56kSxT/qz4iH+w6QWGEmwBU+Ivrg+2UNH8o="; + hash = "sha256-970pd5G2pXfONqOeoKuxCqD4dba7DTFSLtntK7AojUw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/bbox/default.nix b/pkgs/development/python-modules/bbox/default.nix index 4f1d0cef7fd..df28d568b01 100644 --- a/pkgs/development/python-modules/bbox/default.nix +++ b/pkgs/development/python-modules/bbox/default.nix @@ -1,23 +1,40 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub +, pytestCheckHook , pythonOlder -, pyquaternion +, matplotlib , numpy +, pendulum +, pillow +, poetry-core +, pyquaternion }: buildPythonPackage rec { pname = "bbox"; version = "0.9.4"; + pyproject = true; disabled = pythonOlder "3.6"; - src = fetchPypi { - inherit pname version; - hash = "sha256-GGQhKkdwmrYPEhtldPY3WUInSniU/B40NZvt1gXEuzg="; + src = fetchFromGitHub { + owner = "varunagrawal"; + repo = pname; + # matches 0.9.4 on PyPi + tests + rev = "d3f07ed0e38b6015cf4181e3b3edae6a263f8565"; + hash = "sha256-FrJ8FhlqwmnEB/QvPlkDfqZncNGPhwY9aagM9yv1LGs="; }; propagatedBuildInputs = [ pyquaternion numpy ]; + buildInputs = [ poetry-core ]; + + nativeCheckInputs = [ + matplotlib + pendulum + pillow + pytestCheckHook + ]; pythonImportsCheck = [ "bbox" ]; diff --git a/pkgs/development/python-modules/bentoml/default.nix b/pkgs/development/python-modules/bentoml/default.nix index a5bf6608fe0..5d435d94882 100644 --- a/pkgs/development/python-modules/bentoml/default.nix +++ b/pkgs/development/python-modules/bentoml/default.nix @@ -29,7 +29,7 @@ , pip-tools , prometheus-client , psutil -, pynvml +, nvidia-ml-py , python-dateutil , python-json-logger , python-multipart @@ -69,7 +69,7 @@ }: let - version = "1.1.7"; + version = "1.1.9"; aws = [ fs-s3fs ]; grpc = [ grpcio @@ -105,7 +105,7 @@ buildPythonPackage { owner = "bentoml"; repo = "BentoML"; rev = "refs/tags/v${version}"; - hash = "sha256-xuUfdVa0d4TzJqPBNJvUikIPsjSgn+VdhdZidHMnAxA="; + hash = "sha256-+5enRlk05IGdsNY6KIzYgh7vGRua0duI57o/AIevcdM="; }; # https://github.com/bentoml/BentoML/pull/4227 should fix this test @@ -150,7 +150,7 @@ buildPythonPackage { pip-tools prometheus-client psutil - pynvml + nvidia-ml-py python-dateutil python-json-logger python-multipart diff --git a/pkgs/development/python-modules/bitarray/default.nix b/pkgs/development/python-modules/bitarray/default.nix index 55f709c0e3d..e69b31b118f 100644 --- a/pkgs/development/python-modules/bitarray/default.nix +++ b/pkgs/development/python-modules/bitarray/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "bitarray"; - version = "2.8.2"; + version = "2.8.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-+QsvRLWyM2TV+63iw0ZS4Vsfz+gTxG+CjgCPaKcJFg8="; + hash = "sha256-4VWHsr3xjTLrO6JfX1pRvt0NwGsxEqTFPated1O8ZYg="; }; checkPhase = '' diff --git a/pkgs/development/python-modules/bitstruct/default.nix b/pkgs/development/python-modules/bitstruct/default.nix index d83eb87baff..e16a6d7a38c 100644 --- a/pkgs/development/python-modules/bitstruct/default.nix +++ b/pkgs/development/python-modules/bitstruct/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "bitstruct"; - version = "8.17.0"; + version = "8.19.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-65S0DkIYojqo+QQGuDap5u2D5IuNESzj+WQIRjvRuHQ="; + hash = "sha256-11up3e2FwX6IWiCaAOuOJI7kB2IUny8qeTYMqFdGfaw="; }; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/bork/default.nix b/pkgs/development/python-modules/bork/default.nix index 5cd247cf287..2b3b27108d1 100644 --- a/pkgs/development/python-modules/bork/default.nix +++ b/pkgs/development/python-modules/bork/default.nix @@ -1,11 +1,13 @@ { lib , buildPythonPackage , fetchFromGitHub +, pytestCheckHook , pythonOlder , build , coloredlogs , packaging +, pip , toml , twine , wheel @@ -13,21 +15,22 @@ buildPythonPackage rec { pname = "bork"; - version = "7.0.0"; + version = "7.0.1"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "duckinator"; repo = pname; - rev = "v${version}"; - hash = "sha256-frwkU2YesYK0RJNz9yqiXj1XeTZ8jg5oClri4hEYokg="; + rev = "refs/tags/v${version}"; + hash = "sha256-y/p2uuU+QKgJSdJmMt3oebm/zcuatYWTW8Jl79YxA3g="; }; propagatedBuildInputs = [ build coloredlogs packaging + pip toml twine wheel @@ -39,6 +42,13 @@ buildPythonPackage rec { "bork.cli" ]; + nativeCheckInputs = [ + pytestCheckHook + ]; + pytestFlagsArray = [ + "-m 'not network'" + ]; + meta = with lib; { description = "Python build and release management tool"; homepage = "https://github.com/duckinator/bork"; diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix index e6ac07612c4..779871db10e 100644 --- a/pkgs/development/python-modules/boto3/default.nix +++ b/pkgs/development/python-modules/boto3/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "boto3"; - version = "1.28.9"; # N.B: if you change this, change botocore and awscli to a matching version + version = "1.28.57"; # N.B: if you change this, change botocore and awscli to a matching version format = "pyproject"; src = fetchFromGitHub { owner = "boto"; repo = pname; rev = version; - hash = "sha256-NkNHA20yn1Q7uoq/EL1Wn8F1fpi1waQujutGIKsnxlI="; + hash = "sha256-+kuILCUK10tvpfTEAHZGvKKmpw6Pgn+v2kQkwCkPMKg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix index 3dac327a48b..ddb9d35d05f 100644 --- a/pkgs/development/python-modules/botocore/default.nix +++ b/pkgs/development/python-modules/botocore/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "botocore"; - version = "1.31.48"; # N.B: if you change this, change boto3 and awscli to a matching version + version = "1.31.57"; # N.B: if you change this, change boto3 and awscli to a matching version format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-btFvZqpu1gcP7SbWl2TLFMd1nkzAscGRKDzEiwXWXek="; + hash = "sha256-MBQ2F0Y1vsc5siW4QPw2XKAOXBpj5bKhnuZ50gTgG3g="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/breathe/default.nix b/pkgs/development/python-modules/breathe/default.nix index 81068d4c079..121777da32d 100644 --- a/pkgs/development/python-modules/breathe/default.nix +++ b/pkgs/development/python-modules/breathe/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , docutils , fetchFromGitHub +, fetchpatch , pytestCheckHook , pythonOlder , sphinx @@ -21,6 +22,15 @@ buildPythonPackage rec { hash = "sha256-LJXvtScyWRL8zfj877bJ4xuIbLV9IN3Sn9KPUTLMjMI="; }; + patches = [ + (fetchpatch { + # sphinx 7.2 support https://github.com/breathe-doc/breathe/pull/956 + name = "breathe-sphinx7.2-support.patch"; + url = "https://github.com/breathe-doc/breathe/commit/46abd77157a2a57e81586e4f8765ae8f1a09d167.patch"; + hash = "sha256-zGFO/Ndk/9Yv2dbo8fpEoB/vchZP5vRceoC1E3sUny8="; + }) + ]; + propagatedBuildInputs = [ docutils sphinx diff --git a/pkgs/development/python-modules/brian2/default.nix b/pkgs/development/python-modules/brian2/default.nix index 2b3bcbff507..a85e26b485f 100644 --- a/pkgs/development/python-modules/brian2/default.nix +++ b/pkgs/development/python-modules/brian2/default.nix @@ -22,12 +22,6 @@ buildPythonPackage rec { hash = "sha256-XMXSOwcH8fLgzXCcT+grjYxhBdtF4H/Vr+S7J4GYZSw="; }; - patches = [ - # Fix deprecated numpy types - # https://sources.debian.org/data/main/b/brian/2.5.1-3/debian/patches/numpy1.24.patch - ./numpy1.24.patch - ]; - propagatedBuildInputs = [ cython jinja2 diff --git a/pkgs/development/python-modules/brian2/numpy1.24.patch b/pkgs/development/python-modules/brian2/numpy1.24.patch deleted file mode 100644 index 01af8f77c0e..00000000000 --- a/pkgs/development/python-modules/brian2/numpy1.24.patch +++ /dev/null @@ -1,18 +0,0 @@ -Description: Remove deprecated use of np.float -Author: Marcel Stimberg <marcel.stimberg@inserm.fr> -Bug-Debian: https://bugs.debian.org/1027193 -Applied-Upstream: 61ef84b316a3d0a892298adf51abd8ac50900758 -Last-Update: 2023-01-06 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- brian.orig/brian2/units/fundamentalunits.py -+++ brian/brian2/units/fundamentalunits.py -@@ -1597,7 +1597,7 @@ - unitless = np.array(self / best_unit, copy=False) - threshold = np.get_printoptions()['threshold'] // 100 - if unitless.ndim == 0: -- sympy_quantity = np.float(unitless) -+ sympy_quantity = float(unitless) - elif unitless.ndim == 1: - array_str = np.array2string(unitless, separator=" & ", threshold=threshold, - max_line_width=sys.maxsize) diff --git a/pkgs/development/python-modules/canals/default.nix b/pkgs/development/python-modules/canals/default.nix index 2b3af3e5702..f06975bbfc1 100644 --- a/pkgs/development/python-modules/canals/default.nix +++ b/pkgs/development/python-modules/canals/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "canals"; - version = "0.9.0"; + version = "0.10.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "deepset-ai"; repo = "canals"; rev = "refs/tags/v${version}"; - hash = "sha256-5pRrpi1qxkFgGqcw7Nfc5rnOTra27H31DLKCglkPf6s="; + hash = "sha256-zTC9zaY2WQ4Sx/1YeEaw23UH0hoP/ktMwzH8x/rER00="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/cantools/default.nix b/pkgs/development/python-modules/cantools/default.nix index 3cb260dd8d1..f5ad88fb5b1 100644 --- a/pkgs/development/python-modules/cantools/default.nix +++ b/pkgs/development/python-modules/cantools/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, setuptools-scm +, setuptools , argparse-addons , bitstruct , can @@ -16,18 +16,18 @@ buildPythonPackage rec { pname = "cantools"; - version = "38.0.2"; - format = "setuptools"; + version = "39.3.0"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-k7/m9L1lLzaXY+qRYrAnpi9CSoQA8kI9QRN5GM5oxo4="; + hash = "sha256-LD0IGSJZG8FhHJ8f9S1sivHQMxT4xyTMEU2FbMVVzCg="; }; nativeBuildInputs = [ - setuptools-scm + setuptools ]; propagatedBuildInputs = [ @@ -50,8 +50,9 @@ buildPythonPackage rec { ]; meta = with lib; { + description = "Tools to work with CAN bus"; homepage = "https://github.com/cantools/cantools"; - description = "CAN bus tools."; + changelog = "https://github.com/cantools/cantools/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ gray-heron ]; }; diff --git a/pkgs/development/python-modules/cffi/darwin-use-libffi-closures.diff b/pkgs/development/python-modules/cffi/darwin-use-libffi-closures.diff index c48c8090dd4..fdbec4f6fe4 100644 --- a/pkgs/development/python-modules/cffi/darwin-use-libffi-closures.diff +++ b/pkgs/development/python-modules/cffi/darwin-use-libffi-closures.diff @@ -1,7 +1,8 @@ -diff -r bac92fcfe4d7 c/_cffi_backend.c ---- a/c/_cffi_backend.c Mon Jul 18 15:58:34 2022 +0200 -+++ b/c/_cffi_backend.c Sat Aug 20 12:38:31 2022 -0700 -@@ -96,7 +96,7 @@ +diff --git a/src/c/_cffi_backend.c b/src/c/_cffi_backend.c +index 537271f..9c3bf94 100644 +--- a/src/c/_cffi_backend.c ++++ b/src/c/_cffi_backend.c +@@ -103,7 +103,7 @@ # define CFFI_CHECK_FFI_PREP_CIF_VAR 0 # define CFFI_CHECK_FFI_PREP_CIF_VAR_MAYBE 0 @@ -10,7 +11,7 @@ diff -r bac92fcfe4d7 c/_cffi_backend.c # define CFFI_CHECK_FFI_CLOSURE_ALLOC __builtin_available(macos 10.15, ios 13, watchos 6, tvos 13, *) # define CFFI_CHECK_FFI_CLOSURE_ALLOC_MAYBE 1 -@@ -6413,7 +6413,7 @@ +@@ -6422,7 +6422,7 @@ static PyObject *b_callback(PyObject *self, PyObject *args) else #endif { diff --git a/pkgs/development/python-modules/cffi/default.nix b/pkgs/development/python-modules/cffi/default.nix index 0d93941b974..7b2547afff1 100644 --- a/pkgs/development/python-modules/cffi/default.nix +++ b/pkgs/development/python-modules/cffi/default.nix @@ -3,7 +3,7 @@ , buildPythonPackage , isPyPy , fetchPypi -, fetchpatch +, setuptools , pytestCheckHook , libffi , pkg-config @@ -13,11 +13,12 @@ if isPyPy then null else buildPythonPackage rec { pname = "cffi"; - version = "1.15.1"; + version = "1.16.0"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-1AC/uaN7E1ElPLQCZxzqfom97MKU6AFqcH9tHYrJNPk="; + hash = "sha256-vLPvQ+WGZbvaL7GYaY/K5ndkg+DEpjGqVkeAbCXgLMA="; }; patches = [ @@ -32,38 +33,12 @@ if isPyPy then null else buildPythonPackage rec { # deemed safe to trust in cffi. # ./darwin-use-libffi-closures.diff - (fetchpatch { - # Drop py.code usage from tests, no longer depend on the deprecated py package - url = "https://foss.heptapod.net/pypy/cffi/-/commit/9c7d865e17ec16a847090a3e0d1498b698b99756.patch"; - excludes = [ - "README.md" - "requirements.txt" - ]; - hash = "sha256-HSuLLIYXXGGCPccMNLV7o1G3ppn2P0FGCrPjqDv2e7k="; - }) - (fetchpatch { - # Replace py.test usage with pytest - url = "https://foss.heptapod.net/pypy/cffi/-/commit/bd02e1b122612baa74a126e428bacebc7889e897.patch"; - excludes = [ - "README.md" - "requirements.txt" - ]; - hash = "sha256-+2daRTvxtyrCPimOEAmVbiVm1Bso9hxGbaAbd03E+ws="; - }) ] ++ lib.optionals (stdenv.cc.isClang && lib.versionAtLeast (lib.getVersion stdenv.cc) "13") [ # -Wnull-pointer-subtraction is enabled with -Wextra. Suppress it to allow the following tests # to run and pass when cffi is built with newer versions of clang: # - testing/cffi1/test_verify1.py::test_enum_usage # - testing/cffi1/test_verify1.py::test_named_pointer_as_argument ./clang-pointer-substraction-warning.diff - ] ++ lib.optionals (pythonAtLeast "3.11") [ - # Fix test that failed because python seems to have changed the exception format in the - # final release. This patch should be included in the next version and can be removed when - # it is released. - (fetchpatch { - url = "https://foss.heptapod.net/pypy/cffi/-/commit/8a3c2c816d789639b49d3ae867213393ed7abdff.diff"; - hash = "sha256-3wpZeBqN4D8IP+47QDGK7qh/9Z0Ag4lAe+H0R5xCb1E="; - }) ]; postPatch = lib.optionalString stdenv.isDarwin '' @@ -74,11 +49,18 @@ if isPyPy then null else buildPythonPackage rec { --replace '/usr/include/libffi' '${lib.getDev libffi}/include' ''; - buildInputs = [ libffi ]; + nativeBuildInputs = [ + pkg-config + setuptools + ]; - nativeBuildInputs = [ pkg-config ]; + buildInputs = [ + libffi + ]; - propagatedBuildInputs = [ pycparser ]; + propagatedBuildInputs = [ + pycparser + ]; # The tests use -Werror but with python3.6 clang detects some unreachable code. env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang @@ -86,18 +68,16 @@ if isPyPy then null else buildPythonPackage rec { doCheck = !stdenv.hostPlatform.isMusl; - nativeCheckInputs = [ pytestCheckHook ]; - - disabledTests = lib.optionals stdenv.isDarwin [ - # AssertionError: cannot seem to get an int[10] not completely cleared - # https://foss.heptapod.net/pypy/cffi/-/issues/556 - "test_ffi_new_allocator_1" + nativeCheckInputs = [ + pytestCheckHook ]; meta = with lib; { - maintainers = with maintainers; [ domenkozar lnl7 ]; + changelog = "https://github.com/python-cffi/cffi/releases/tag/v${version}"; + description = "Foreign Function Interface for Python calling C code"; + downloadPage = "https://github.com/python-cffi/cffi"; homepage = "https://cffi.readthedocs.org/"; license = licenses.mit; - description = "Foreign Function Interface for Python calling C code"; + maintainers = teams.python.members; }; } diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix index c185d1148bd..52a3bf6482d 100644 --- a/pkgs/development/python-modules/claripy/default.nix +++ b/pkgs/development/python-modules/claripy/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.2.76"; + version = "9.2.77"; pyproject = true; disabled = pythonOlder "3.11"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "angr"; repo = "claripy"; rev = "refs/tags/v${version}"; - hash = "sha256-BwhM5J+20ZvP0d+9TAqy0AgRuPU6XoLKgM88WJdf3Qg="; + hash = "sha256-YLa70xxLDyOOKQg/PzFO90JzS5SyvgcJ2+Nltz0q6T8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix index efc5c616819..6b56defb4cb 100644 --- a/pkgs/development/python-modules/cle/default.nix +++ b/pkgs/development/python-modules/cle/default.nix @@ -16,14 +16,14 @@ let # The binaries are following the argr projects release cycle - version = "9.2.76"; + version = "9.2.77"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { owner = "angr"; repo = "binaries"; rev = "refs/tags/v${version}"; - hash = "sha256-01Y4UKTkaO6bYtVTvv4KFzkEdj4qKiWKaC80/iKa/Eg="; + hash = "sha256-YPxdKwR+pq0S1B9GltE8r3bFWDPpCU8OQ05w+kp4lAs="; }; in @@ -38,7 +38,7 @@ buildPythonPackage rec { owner = "angr"; repo = "cle"; rev = "refs/tags/v${version}"; - hash = "sha256-uMT9LvDkXl3SueR80pgGJRkWbymDRmGEn8HV93K/VNc="; + hash = "sha256-tdfV+DoDcRO+8TjiBc0u1huA+etF4MY5uYj670lqudY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/coinmetrics-api-client/default.nix b/pkgs/development/python-modules/coinmetrics-api-client/default.nix index 91484fe6a7f..f2d2cc7ca97 100644 --- a/pkgs/development/python-modules/coinmetrics-api-client/default.nix +++ b/pkgs/development/python-modules/coinmetrics-api-client/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "coinmetrics-api-client"; - version = "2023.10.30.13"; + version = "2023.11.13.14"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -28,7 +28,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "coinmetrics_api_client"; - hash = "sha256-Kb6iVLV///X0UKby/7/wfbSGUFLw6HQX3SUwPX79QD0="; + hash = "sha256-+hX1msvm4hRl3luhMWgXcmpV2DmGI1oCknSP4QEWtxM="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/colorzero/default.nix b/pkgs/development/python-modules/colorzero/default.nix index 01936cefd2c..e2383dddf4d 100644 --- a/pkgs/development/python-modules/colorzero/default.nix +++ b/pkgs/development/python-modules/colorzero/default.nix @@ -2,8 +2,6 @@ , buildPythonPackage , fetchFromGitHub , pkginfo -, sphinxHook -, sphinx-rtd-theme , pytestCheckHook }: @@ -25,15 +23,8 @@ buildPythonPackage rec { --replace "--cov" "" ''; - outputs = [ - "out" - "doc" - ]; - nativeBuildInputs = [ pkginfo - sphinx-rtd-theme - sphinxHook ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/dasbus/default.nix b/pkgs/development/python-modules/dasbus/default.nix index a7e0b754273..dceb2e74ca8 100644 --- a/pkgs/development/python-modules/dasbus/default.nix +++ b/pkgs/development/python-modules/dasbus/default.nix @@ -20,6 +20,6 @@ buildPythonPackage rec { homepage = "https://github.com/rhinstaller/dasbus"; description = "DBus library in Python3"; license = licenses.lgpl21Only; - maintainers = with maintainers; [ fortuneteller2k ]; + maintainers = with maintainers; [ moni ]; }; } diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix index fcf2e03ad59..63a13d77991 100644 --- a/pkgs/development/python-modules/dask/default.nix +++ b/pkgs/development/python-modules/dask/default.nix @@ -133,6 +133,10 @@ buildPythonPackage rec { "test_auto_blocksize_csv" # AttributeError: 'str' object has no attribute 'decode' "test_read_dir_nometa" + ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + # concurrent.futures.process.BrokenProcessPool: A process in the process pool terminated abpruptly... + "test_foldby_tree_reduction" + "test_to_bag" ] ++ [ # https://github.com/dask/dask/issues/10347#issuecomment-1589683941 "test_concat_categorical" diff --git a/pkgs/development/python-modules/deal/default.nix b/pkgs/development/python-modules/deal/default.nix index 0333bb37ce3..13704b20939 100644 --- a/pkgs/development/python-modules/deal/default.nix +++ b/pkgs/development/python-modules/deal/default.nix @@ -77,13 +77,17 @@ buildPythonPackage rec { "test_scheme_contract_is_satisfied_when_setting_arg" "test_scheme_contract_is_satisfied_within_chain" "test_scheme_errors_rewrite_message" - # broken since pytest > 7.1.3 - "test_exception_hook" + # assert errors + "test_doctest" + "test_no_violations" ]; disabledTestPaths = [ # needs internet access "tests/test_runtime/test_offline.py" + # depends on typeguard <4.0.0 for tests, but >=4.0.0 seems fine for runtime + # https://github.com/life4/deal/blob/9be70fa1c5a0635880619b2cea83a9f6631eb236/pyproject.toml#L40 + "tests/test_testing.py" ]; pythonImportsCheck = [ "deal" ]; diff --git a/pkgs/development/python-modules/dissect-fat/default.nix b/pkgs/development/python-modules/dissect-fat/default.nix index 9fa9457b284..0a22c7b8b7b 100644 --- a/pkgs/development/python-modules/dissect-fat/default.nix +++ b/pkgs/development/python-modules/dissect-fat/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "dissect-fat"; - version = "3.6"; + version = "3.7"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.fat"; rev = "refs/tags/${version}"; - hash = "sha256-3Zyjo7yoSLtAnC5lOLzjWsqMRoJxsrw2LKjQ2Qy38sg="; + hash = "sha256-YfWshytfj4p2MqLpzE3b1/RtrL1/+Xd/5+RNbrH/Jfc="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/dissect-hypervisor/default.nix b/pkgs/development/python-modules/dissect-hypervisor/default.nix index 55ce876fe21..e7f17cb0286 100644 --- a/pkgs/development/python-modules/dissect-hypervisor/default.nix +++ b/pkgs/development/python-modules/dissect-hypervisor/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "dissect-hypervisor"; - version = "3.9"; + version = "3.10"; pyproject = true; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.hypervisor"; rev = "refs/tags/${version}"; - hash = "sha256-AcDlyLKrRyt1mhh7nb9Oln/cjVKw8s1g78J8sgE2p2g="; + hash = "sha256-Ml5U7yc4iqqilL6Y9qF3VU+pa0AXnYVQjVas90TpG30="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/dissect-regf/default.nix b/pkgs/development/python-modules/dissect-regf/default.nix index 9671bb33c8a..94881ca3ca4 100644 --- a/pkgs/development/python-modules/dissect-regf/default.nix +++ b/pkgs/development/python-modules/dissect-regf/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dissect-regf"; - version = "3.7"; + version = "3.8"; pyproject = true; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.regf"; rev = "refs/tags/${version}"; - hash = "sha256-WUrND1RnXTeN3WosR+m+yVJLe/imBTx7nmUZrSIc1E0="; + hash = "sha256-4tKu7oPkpNcWr2XJvZg94yZZcbTeeXBphPCLoZYzg6U="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/dissect-sql/default.nix b/pkgs/development/python-modules/dissect-sql/default.nix index c7192854fcf..173170396f7 100644 --- a/pkgs/development/python-modules/dissect-sql/default.nix +++ b/pkgs/development/python-modules/dissect-sql/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dissect-sql"; - version = "3.6"; + version = "3.7"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.sql"; rev = "refs/tags/${version}"; - hash = "sha256-CMUXMSkrutziAIYjUFbLEpsYpCZUiPmV16puXneGeHE="; + hash = "sha256-BHwm88IPtfg/bi5veFGnciQeH4s0asVnxiMVsIi8vV8="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/distlib/default.nix b/pkgs/development/python-modules/distlib/default.nix index ca91e77a667..cf31574e6fd 100644 --- a/pkgs/development/python-modules/distlib/default.nix +++ b/pkgs/development/python-modules/distlib/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { setuptools ]; - postFixup = lib.optionalString (!stdenv.targetPlatform.isWindows) '' + postFixup = lib.optionalString (!stdenv.hostPlatform.isWindows) '' find $out -name '*.exe' -delete ''; diff --git a/pkgs/development/python-modules/django-crontab/default.nix b/pkgs/development/python-modules/django-crontab/default.nix new file mode 100644 index 00000000000..27ecce4a1dd --- /dev/null +++ b/pkgs/development/python-modules/django-crontab/default.nix @@ -0,0 +1,52 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, django +, setuptools +, pytestCheckHook +, pytest-django +, mock +, nose +}: + +buildPythonPackage rec { + pname = "django-crontab"; + version = "0.7.1"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "kraiz"; + repo = "django-crontab"; + rev = "refs/tags/${version}"; + hash = "sha256-qX+N3SMUyhMWoWluRCeOPGYKCMBnjg61P281HXHkfJk="; + }; + + propagatedBuildInputs = [ + django + setuptools + ]; + + nativeCheckInputs = [ + django + mock + nose + pytestCheckHook + pytest-django + ]; + + # Tests currently fail with: RuntimeError: setup_test_environment() was + # already called and can't be called again without first calling + # teardown_test_environment() + doCheck = false; + + DJANGO_SETTINGS_MODULE = "tests.settings"; + + pythonImportsCheck = [ "django_crontab" ]; + + meta = with lib; { + description = "Simple crontab powered job scheduling for Django"; + homepage = "https://github.com/kraiz/django-crontab"; + license = licenses.mit; + maintainers = with maintainers; [ onny ]; + }; +} diff --git a/pkgs/development/python-modules/django/3.nix b/pkgs/development/python-modules/django/3.nix index 7796c31ebd0..077ea73bd8b 100644 --- a/pkgs/development/python-modules/django/3.nix +++ b/pkgs/development/python-modules/django/3.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "django"; - version = "3.2.22"; + version = "3.2.23"; disabled = pythonOlder "3.7"; src = fetchPypi { pname = "Django"; inherit version; - hash = "sha256-g7bWawbkhIB9d4Jj/cf5GG1NwYYvz6ZQeDBEasawYLo="; + hash = "sha256-gpaPNkDinvSnc68sKESPX3oI0AHGrAWzLQKu7mUJUIs="; }; patches = [ diff --git a/pkgs/development/python-modules/django/4.nix b/pkgs/development/python-modules/django/4.nix index 582a2fab79c..69c438739f2 100644 --- a/pkgs/development/python-modules/django/4.nix +++ b/pkgs/development/python-modules/django/4.nix @@ -42,14 +42,14 @@ buildPythonPackage rec { pname = "Django"; - version = "4.2.6"; + version = "4.2.7"; format = "pyproject"; disabled = pythonOlder "3.10"; src = fetchPypi { inherit pname version; - hash = "sha256-CPQfRotjM1rqDZBMVyngJQMA9qGQe/KTplSZSWzbxo8="; + hash = "sha256-jg8cLCeGtcDjn+GvziTJJgQPrUfI6orTCq8RiN8p/EE="; }; patches = [ diff --git a/pkgs/development/python-modules/dramatiq/default.nix b/pkgs/development/python-modules/dramatiq/default.nix index 8b7300d786f..84da4beadd7 100644 --- a/pkgs/development/python-modules/dramatiq/default.nix +++ b/pkgs/development/python-modules/dramatiq/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "dramatiq"; - version = "1.14.2"; + version = "1.15.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,8 +23,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Bogdanp"; repo = "dramatiq"; - rev = "v${version}"; - hash = "sha256-yv6HUJI7wsAQdBJ5QNv7qXhtzPvCsrF1389kyemAV7Y="; + rev = "refs/tags/v${version}"; + hash = "sha256-uhradhLIyfHf1meAr7ChuGnvm62mX/lkQQ2Pe7hBWtY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/duo-client/default.nix b/pkgs/development/python-modules/duo-client/default.nix index 05f9f0c9a40..129ec14cd0a 100644 --- a/pkgs/development/python-modules/duo-client/default.nix +++ b/pkgs/development/python-modules/duo-client/default.nix @@ -3,7 +3,8 @@ , fetchFromGitHub , freezegun , mock -, nose2 +, pytestCheckHook +, pythonOlder , pytz , setuptools , six @@ -12,6 +13,9 @@ buildPythonPackage rec { pname = "duo-client"; version = "5.0.1"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "duosecurity"; @@ -26,15 +30,18 @@ buildPythonPackage rec { --replace "flake8" "" ''; - propagatedBuildInputs = [ + nativeBuildInputs = [ setuptools + ]; + + propagatedBuildInputs = [ six ]; nativeCheckInputs = [ freezegun mock - nose2 + pytestCheckHook pytz ]; @@ -42,6 +49,12 @@ buildPythonPackage rec { "duo_client" ]; + disabledTests = [ + # Tests require network access + "test_server_hostname" + "test_server_hostname_with_port" + ]; + meta = with lib; { description = "Python library for interacting with the Duo Auth, Admin, and Accounts APIs"; homepage = "https://github.com/duosecurity/duo_client_python"; diff --git a/pkgs/development/python-modules/dvc-data/default.nix b/pkgs/development/python-modules/dvc-data/default.nix index 4290d581d10..8f1da6914af 100644 --- a/pkgs/development/python-modules/dvc-data/default.nix +++ b/pkgs/development/python-modules/dvc-data/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "dvc-data"; - version = "2.20.0"; + version = "2.21.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-CtTagSfAYrEOkEZaeeQ71Dn0RvFpHwH552RpAy+kjlg="; + hash = "sha256-2RLf2HBkb/vwbr9JecQQfO68ifVgcBIwmRQkXGJh0Fs="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/dvc/default.nix b/pkgs/development/python-modules/dvc/default.nix index ccaf67aadd2..2c8ea267210 100644 --- a/pkgs/development/python-modules/dvc/default.nix +++ b/pkgs/development/python-modules/dvc/default.nix @@ -55,14 +55,14 @@ buildPythonPackage rec { pname = "dvc"; - version = "3.28.0"; + version = "3.30.0"; format = "pyproject"; src = fetchFromGitHub { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-oCNszhLGNXNGiQtp91wT4GfuNzDhbZrVR55K41Ykhdg="; + hash = "sha256-ZAOuXK1snsDZETnpyyDZT65ZWu47Qxtv7l8Blqg2Qtw="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/dvclive/default.nix b/pkgs/development/python-modules/dvclive/default.nix index 406ccadea89..628afaaac4d 100644 --- a/pkgs/development/python-modules/dvclive/default.nix +++ b/pkgs/development/python-modules/dvclive/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "dvclive"; - version = "3.2.0"; + version = "3.3.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-Z1Nxdz4/45uSypufuwDGiCeUwl+izRGIDA2s9F+jT1Q="; + hash = "sha256-esvDCAsGoaB4t4hiTmoQa69Sgg5crqJyiom/iXxpZow="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/edalize/default.nix b/pkgs/development/python-modules/edalize/default.nix index 9455cdc1b81..0005a4cb2e6 100644 --- a/pkgs/development/python-modules/edalize/default.nix +++ b/pkgs/development/python-modules/edalize/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "edalize"; - version = "0.5.0"; + version = "0.5.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "olofk"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-jsrJr/iuezh9/KL0PykWB1XKev4Wr5QeDh0ZWNMZSp8="; + hash = "sha256-foq1CwIe86d+s7PlhLlGpnJCwrpOyr+uf5/RMLASSJU="; }; postPatch = '' @@ -52,6 +52,21 @@ buildPythonPackage rec { "edalize" ]; + disabledTests = [ + # disable failures related to pandas 2.1.0 apply(...,errors="ignore") + # behavior change. upstream pins pandas to 2.0.3 as of 2023-10-10 + # https://github.com/olofk/edalize/commit/2a3db6658752f97c61048664b478ebfe65a909f8 + "test_picorv32_artix7_summary" + "test_picorv32_artix7_resources" + "test_picorv32_artix7_timing" + "test_picorv32_kusp_summary" + "test_picorv32_kusp_resources" + "test_picorv32_kusp_timing" + "test_linux_on_litex_vexriscv_arty_a7_summary" + "test_linux_on_litex_vexriscv_arty_a7_resources" + "test_linux_on_litex_vexriscv_arty_a7_timing" + ]; + disabledTestPaths = [ "tests/test_questa_formal.py" "tests/test_slang.py" diff --git a/pkgs/development/python-modules/equinox/default.nix b/pkgs/development/python-modules/equinox/default.nix index d8342f054bc..974bb21392b 100644 --- a/pkgs/development/python-modules/equinox/default.nix +++ b/pkgs/development/python-modules/equinox/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "equinox"; - version = "0.11.1"; + version = "0.11.2"; pyproject = true; src = fetchFromGitHub { owner = "patrick-kidger"; repo = "equinox"; rev = "refs/tags/v${version}"; - hash = "sha256-iYVAbUIZG90kgWger+M+DZmS/kQ3nEPXQFU+90lHgK0="; + hash = "sha256-qFTKiY/t2LCCWJBOSfaX0hYQInrpXgfhTc+J4iuyVbM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/euclid3/default.nix b/pkgs/development/python-modules/euclid3/default.nix new file mode 100644 index 00000000000..3d723eca565 --- /dev/null +++ b/pkgs/development/python-modules/euclid3/default.nix @@ -0,0 +1,25 @@ +{ buildPythonPackage +, lib +, fetchPypi +}: +buildPythonPackage rec { + pname = "euclid3"; + version = "0.01"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-JbgnpXrb/Zo/qGJeQ6vD6Qf2HeYiND5+U4SC75tG/Qs="; + }; + + pythonImportsCheck = [ + "euclid3" + ]; + + meta = with lib; { + description = "2D and 3D vector, matrix, quaternion and geometry module."; + homepage = "http://code.google.com/p/pyeuclid/"; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ jfly matusf ]; + }; +} diff --git a/pkgs/development/python-modules/fastapi/default.nix b/pkgs/development/python-modules/fastapi/default.nix index 553f313bd0b..428cf9f8d91 100644 --- a/pkgs/development/python-modules/fastapi/default.nix +++ b/pkgs/development/python-modules/fastapi/default.nix @@ -80,7 +80,8 @@ buildPythonPackage rec { python-jose trio sqlalchemy - ] ++ passthru.optional-dependencies.all; + ] ++ passthru.optional-dependencies.all + ++ python-jose.optional-dependencies.cryptography; pytestFlagsArray = [ # ignoring deprecation warnings to avoid test failure from diff --git a/pkgs/development/python-modules/flask-admin/default.nix b/pkgs/development/python-modules/flask-admin/default.nix index 685c4e80945..c4d686c0147 100644 --- a/pkgs/development/python-modules/flask-admin/default.nix +++ b/pkgs/development/python-modules/flask-admin/default.nix @@ -107,6 +107,8 @@ buildPythonPackage rec { "flask_admin/tests/sqla/test_translation.py" # RuntimeError: Working outside of application context. "flask_admin/tests/sqla/test_multi_pk.py" + # Broken test + "flask_admin/tests/fileadmin/test_fileadmin.py" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/flask-cors/default.nix b/pkgs/development/python-modules/flask-cors/default.nix index 4ea6857cbd3..abc90cdbb0e 100644 --- a/pkgs/development/python-modules/flask-cors/default.nix +++ b/pkgs/development/python-modules/flask-cors/default.nix @@ -1,27 +1,42 @@ -{ lib, fetchPypi, buildPythonPackage -, nose, flask, six, packaging }: +{ lib +, fetchFromGitHub +, buildPythonPackage +, flask +, packaging +, pytestCheckHook +, setuptools +}: buildPythonPackage rec { - pname = "Flask-Cors"; - version = "3.0.10"; + pname = "flask-cors"; + version = "4.0.0"; + pyproject = true; - src = fetchPypi { - inherit pname version; - sha256 = "b60839393f3b84a0f3746f6cdca56c1ad7426aa738b70d6c61375857823181de"; + src = fetchFromGitHub { + owner = "corydolphin"; + repo = "flask-cors"; + rev = "refs/tags/${version}"; + hash = "sha256-o//ulROKKBv/CBJIGPBFP/+T0TpMHUVjr23Y5g1V05g="; }; - nativeCheckInputs = [ nose packaging ]; - propagatedBuildInputs = [ flask six ]; + nativeBuildInputs = [ + setuptools + ]; - # Exclude test_acl_uncaught_exception_500 test case because is not compatible - # with Flask>=1.1.0. See: https://github.com/corydolphin/flask-cors/issues/253 - checkPhase = '' - nosetests --exclude test_acl_uncaught_exception_500 - ''; + propagatedBuildInputs = [ + flask + ]; + + nativeCheckInputs = [ + pytestCheckHook + packaging + ]; meta = with lib; { description = "A Flask extension adding a decorator for CORS support"; homepage = "https://github.com/corydolphin/flask-cors"; + changelog = "https://github.com/corydolphin/flask-cors/releases/tag/v${version}"; license = with licenses; [ mit ]; + maintainers = with maintainers; [ nickcao ]; }; } diff --git a/pkgs/development/python-modules/flask-mongoengine/default.nix b/pkgs/development/python-modules/flask-mongoengine/default.nix index 32a275177c2..dad4b6ddb87 100644 --- a/pkgs/development/python-modules/flask-mongoengine/default.nix +++ b/pkgs/development/python-modules/flask-mongoengine/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "flask-mongoengine"; - version = "1.0.0"; + version = "1.0.0-unstable-2022-08-16"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -23,10 +23,12 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "MongoEngine"; repo = pname; - rev = "refs/tags/v${version}"; - hash = "sha256-YqEtW02VvEeUsLIHLz6+V6juMtWPEIk2tLoKTUdY6YE="; + rev = "d4526139cb1e2e94111ab7de96bb629d574c1690"; + hash = "sha256-oMQU9Z8boc0q+0KzIQAZ8qSyxiITDY0M9FCg75S9MEY="; }; + env.SETUPTOOLS_SCM_PRETEND_VERSION = "1.0.0"; + nativeBuildInputs = [ setuptools setuptools-scm diff --git a/pkgs/development/python-modules/flow-record/default.nix b/pkgs/development/python-modules/flow-record/default.nix index 1562600a231..2c8de577dc2 100644 --- a/pkgs/development/python-modules/flow-record/default.nix +++ b/pkgs/development/python-modules/flow-record/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "flow-record"; - version = "3.12"; + version = "3.13"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "flow.record"; rev = "refs/tags/${version}"; - hash = "sha256-b9MCgs3Imo0DHtPyvQuRgYvsLWe8N2Y9TIWdU1E04L8="; + hash = "sha256-Yg42nA0dRjHormpmpbOuZYuvBpNz9XEpf84XI2iJpYY="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/geopandas/default.nix b/pkgs/development/python-modules/geopandas/default.nix index e176a614e8d..e075700ce1f 100644 --- a/pkgs/development/python-modules/geopandas/default.nix +++ b/pkgs/development/python-modules/geopandas/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "geopandas"; - version = "0.14.0"; + version = "0.14.1"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "geopandas"; repo = "geopandas"; rev = "refs/tags/v${version}"; - hash = "sha256-lhQXYSY2JrY3+GgMnfTJugnOD/g3VjG0tgw+cEgpIP8="; + hash = "sha256-mQ13fjhtFXvUnBok5bDz+zkbgfXEUmwiv77rBpYS5oo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/glances-api/default.nix b/pkgs/development/python-modules/glances-api/default.nix index b0f54b53dc6..fc8d2edac2b 100644 --- a/pkgs/development/python-modules/glances-api/default.nix +++ b/pkgs/development/python-modules/glances-api/default.nix @@ -11,16 +11,16 @@ buildPythonPackage rec { pname = "glances-api"; - version = "0.4.3"; - format = "pyproject"; + version = "0.5.0"; + pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "home-assistant-ecosystem"; repo = "python-glances-api"; rev = "refs/tags/${version}"; - hash = "sha256-VfiAJuSmzFVgDTThtsTy7/caRmJKZuD5YwHjMspeB0A="; + hash = "sha256-DUTZLLWO4xUeUlxHGGVr/MD5uKqRxUf+p0crYsELgzw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/globus-sdk/default.nix b/pkgs/development/python-modules/globus-sdk/default.nix index 47289fff596..f497821e07d 100644 --- a/pkgs/development/python-modules/globus-sdk/default.nix +++ b/pkgs/development/python-modules/globus-sdk/default.nix @@ -56,6 +56,5 @@ buildPythonPackage rec { homepage = "https://github.com/globus/globus-sdk-python"; changelog = "https://github.com/globus/globus-sdk-python/releases/tag/${version}"; license = licenses.asl20; - maintainers = with maintainers; [ ixxie ]; }; } diff --git a/pkgs/development/python-modules/google-cloud-artifact-registry/default.nix b/pkgs/development/python-modules/google-cloud-artifact-registry/default.nix index 59fbcd9002c..f778b745cb4 100644 --- a/pkgs/development/python-modules/google-cloud-artifact-registry/default.nix +++ b/pkgs/development/python-modules/google-cloud-artifact-registry/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "google-cloud-artifact-registry"; - version = "1.8.3"; + version = "1.9.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-kgbSwGR5ObkMbup4p4ePXnxl7uRn0nYeGCOU1LMPZSE="; + hash = "sha256-NITSosBPrfpIC+FqVU0B5H5MT0taEjzTcl6GW03X8yU="; }; propagatedBuildInputs = [ @@ -24,7 +24,9 @@ buildPythonPackage rec { grpc-google-iam-v1 ] ++ google-api-core.optional-dependencies.grpc; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + ]; pythonImportsCheck = [ "google.cloud.artifactregistry" @@ -34,7 +36,8 @@ buildPythonPackage rec { meta = with lib; { description = "Google Cloud Artifact Registry API client library"; - homepage = "https://github.com/googleapis/google-cloud-python"; + homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-artifact-registry"; + changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-artifact-registry-v${version}/packages/google-cloud-artifact-registry/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ samuela ]; }; diff --git a/pkgs/development/python-modules/google-cloud-org-policy/default.nix b/pkgs/development/python-modules/google-cloud-org-policy/default.nix index 2aa7834ace8..2e91f2704c7 100644 --- a/pkgs/development/python-modules/google-cloud-org-policy/default.nix +++ b/pkgs/development/python-modules/google-cloud-org-policy/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "google-cloud-org-policy"; - version = "1.8.2"; + version = "1.8.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-SJpjS72keOf9QF1imsWLbgMSzxCDloO4tuc4vUy8ZBk="; + hash = "sha256-VU+vB+x2DElwzl1cO7qTdV91Mn1i2Dsq2safnMrwuqI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/greenlet/default.nix b/pkgs/development/python-modules/greenlet/default.nix index 3c5049a8a61..8b885133cf2 100644 --- a/pkgs/development/python-modules/greenlet/default.nix +++ b/pkgs/development/python-modules/greenlet/default.nix @@ -1,32 +1,56 @@ { lib , buildPythonPackage , fetchPypi -, isPyPy + +# build-system +, setuptools + +# tests , objgraph , psutil -, pytestCheckHook +, python +, unittestCheckHook }: - -buildPythonPackage rec { +let greenlet = buildPythonPackage rec { pname = "greenlet"; - version = "2.0.2"; - format = "setuptools"; + version = "3.0.1"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-58jcE699sJe+1koFHS3Unp8K9JXCaZXACp7oQmkNNMA="; + hash = "sha256-gWvZSIqUy6eNk+GrtYAA6CZvqcwqqczdbrBpasskAFs="; }; + nativeBuildInputs = [ + setuptools + ]; + + # tests in passthru, infinite recursion via objgraph/graphviz + doCheck = false; + nativeCheckInputs = [ objgraph psutil - pytestCheckHook + unittestCheckHook ]; - doCheck = false; # installed tests need to be executed, not sure how to accomplish that + preCheck = '' + pushd ${placeholder "out"}/${python.sitePackages} + ''; + + unittestFlagsArray = [ + "greenlet.tests" + ]; + + postCheck = '' + popd + ''; + + passthru.tests.pytest = greenlet.overridePythonAttrs (_: { doCheck = true; }); meta = with lib; { + changelog = "https://github.com/python-greenlet/greenlet/blob/${version}/CHANGES.rst"; homepage = "https://github.com/python-greenlet/greenlet"; description = "Module for lightweight in-process concurrent programming"; license = with licenses; [ @@ -34,4 +58,5 @@ buildPythonPackage rec { mit ]; }; -} +}; +in greenlet diff --git a/pkgs/development/python-modules/griffe/default.nix b/pkgs/development/python-modules/griffe/default.nix index 314a2249cdb..63d985326ef 100644 --- a/pkgs/development/python-modules/griffe/default.nix +++ b/pkgs/development/python-modules/griffe/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "griffe"; - version = "0.36.9"; + version = "0.38.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "mkdocstrings"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-5j6boIy2LnB3Y0ZzheTdflON8KaQkeQS5vkaPIsETGk="; + hash = "sha256-GhohFO5tHb9ByISPUf4U2MrDATE4WjuekcC9QZaP2Ls="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/grpcio-health-checking/default.nix b/pkgs/development/python-modules/grpcio-health-checking/default.nix index ce1a78f02cf..4c028e4ec71 100644 --- a/pkgs/development/python-modules/grpcio-health-checking/default.nix +++ b/pkgs/development/python-modules/grpcio-health-checking/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "grpcio-health-checking"; - version = "1.58.0"; + version = "1.59.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-B9WGI/J77PGGyGLLrn39elS9Y/SzdZTHfIuPyTPxHC8="; + hash = "sha256-4CIcpupsITlhQXmAi4+LMjA30LG977D8TN2agUmZVx4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/grpcio-status/default.nix b/pkgs/development/python-modules/grpcio-status/default.nix index c03c1faa9d4..e7d6fd55095 100644 --- a/pkgs/development/python-modules/grpcio-status/default.nix +++ b/pkgs/development/python-modules/grpcio-status/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "grpcio-status"; - version = "1.58.0"; + version = "1.59.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-C0LnDAQFpmqC2emGf6JV/lnmGJZKYJmyBWjDHdkJl2Y="; + hash = "sha256-+TucM+CiYWLvhDG/z/zD4fshfM2Ne1swYbbp+BPmmLU="; }; postPatch = '' diff --git a/pkgs/development/python-modules/grpcio-testing/default.nix b/pkgs/development/python-modules/grpcio-testing/default.nix index 904c0b24a0a..bb3024d4407 100644 --- a/pkgs/development/python-modules/grpcio-testing/default.nix +++ b/pkgs/development/python-modules/grpcio-testing/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "grpcio-testing"; - version = "1.58.0"; + version = "1.59.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ABZMp+VTsyf2HE50cnHf9wdCOeGlAqpbuMWlbsWE/qY="; + hash = "sha256-YiqbhlOsyoAT/uYNPbLQK5c2T8cYGEDXVkAPIzCaOQ4="; }; postPatch = '' diff --git a/pkgs/development/python-modules/grpcio-tools/default.nix b/pkgs/development/python-modules/grpcio-tools/default.nix index 285f3477dea..cd0b0abcb12 100644 --- a/pkgs/development/python-modules/grpcio-tools/default.nix +++ b/pkgs/development/python-modules/grpcio-tools/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "grpcio-tools"; - version = "1.58.0"; + version = "1.59.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-b02AzrWR4xyk3O7HR9vlYTLhOSoKm7HI/gAdG1ysiYo="; + hash = "sha256-qkAY8thmKsTZgwRF09JToRs+CW6K/iCGVUcTeqEWDpM="; }; postPatch = '' diff --git a/pkgs/development/python-modules/gvm-tools/default.nix b/pkgs/development/python-modules/gvm-tools/default.nix index 47096022d1f..7cb78248c17 100644 --- a/pkgs/development/python-modules/gvm-tools/default.nix +++ b/pkgs/development/python-modules/gvm-tools/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "gvm-tools"; - version = "23.10.0"; + version = "23.11.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "greenbone"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-+D9gl2Q1NybL8Na9qDZpDZOBStzJcfE6IUKFwjzr1J0="; + hash = "sha256-ZwImkTYYSscmGJYCpMWmZjToi41XjT4Znpo8j66BKIs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/hcloud/default.nix b/pkgs/development/python-modules/hcloud/default.nix index 336f8ed962c..1e460fa3c7f 100644 --- a/pkgs/development/python-modules/hcloud/default.nix +++ b/pkgs/development/python-modules/hcloud/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "hcloud"; - version = "1.31.0"; + version = "1.32.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-hF+gptNLAeLtpZGrwOezwFeihDt1smCp4QkK5lENMHo="; + hash = "sha256-vX85fDFNGJ8zJe6YCPn7VFOdvPkT35VbM3Do+cP2b/Y="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/hdbscan/default.nix b/pkgs/development/python-modules/hdbscan/default.nix index 75d8a4a990c..89f01e29d46 100644 --- a/pkgs/development/python-modules/hdbscan/default.nix +++ b/pkgs/development/python-modules/hdbscan/default.nix @@ -59,6 +59,5 @@ buildPythonPackage rec { description = "Hierarchical Density-Based Spatial Clustering of Applications with Noise, a clustering algorithm with a scikit-learn compatible API"; homepage = "https://github.com/scikit-learn-contrib/hdbscan"; license = licenses.bsd3; - maintainers = with maintainers; [ ixxie ]; }; } diff --git a/pkgs/development/python-modules/hledger-utils/default.nix b/pkgs/development/python-modules/hledger-utils/default.nix index 92966821d4b..cea6592b42b 100644 --- a/pkgs/development/python-modules/hledger-utils/default.nix +++ b/pkgs/development/python-modules/hledger-utils/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "hledger-utils"; - version = "1.13.2"; + version = "1.14.0"; format = "pyproject"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "nobodyinperson"; repo = "hledger-utils"; rev = "refs/tags/v${version}"; - hash = "sha256-E++gHvXspPodLW2hEESKjg+R5aV39UJpDP8JYQX9iBw="; + hash = "sha256-Qu4nUcAGTACmLhwc7fkLxITOyFnUHv85qMhtViFumVs="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/iceportal/default.nix b/pkgs/development/python-modules/iceportal/default.nix index 251f1372789..ffc0335761b 100644 --- a/pkgs/development/python-modules/iceportal/default.nix +++ b/pkgs/development/python-modules/iceportal/default.nix @@ -11,8 +11,8 @@ buildPythonPackage rec { pname = "iceportal"; - version = "1.1.1"; - format = "pyproject"; + version = "1.1.2"; + pyproject = true; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "home-assistant-ecosystem"; repo = "python-iceportal"; rev = "refs/tags/${version}"; - hash = "sha256-edG4tF5nYaEOCcbunetYNL9moi9vA75IOkorDuLEx1c="; + hash = "sha256-s+jEpxKsa3eIV4a/Ltso51jqZC4jzsvPLTjDFMV9FIA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/icontract/default.nix b/pkgs/development/python-modules/icontract/default.nix index 77565311efb..76e1814dddd 100644 --- a/pkgs/development/python-modules/icontract/default.nix +++ b/pkgs/development/python-modules/icontract/default.nix @@ -50,6 +50,13 @@ buildPythonPackage rec { # mypy decorator checks don't pass. For some reason mypy # doesn't check the python file provided in the test. "tests/test_mypy_decorators.py" + # those tests seems to simply re-run some typeguard tests + "tests/test_typeguard.py" + ]; + + pytestFlagsArray = [ + # RuntimeWarning: coroutine '*' was never awaited + "-W" "ignore::RuntimeWarning" ]; pythonImportsCheck = [ "icontract" ]; diff --git a/pkgs/development/python-modules/imageio/default.nix b/pkgs/development/python-modules/imageio/default.nix index 083170fd438..7a5aaaf81e6 100644 --- a/pkgs/development/python-modules/imageio/default.nix +++ b/pkgs/development/python-modules/imageio/default.nix @@ -3,48 +3,104 @@ , buildPythonPackage , pythonOlder , fetchPypi +, fetchpatch +, isPyPy , substituteAll -, imageio-ffmpeg + +# build-system +, setuptools + +# native dependencies +, libGL + +# dependencies , numpy , pillow + +# optional-dependencies +, astropy +, av +, imageio-ffmpeg +, pillow-heif , psutil -, pytestCheckHook , tifffile + +# tests +, pytestCheckHook , fsspec -, libGL }: buildPythonPackage rec { pname = "imageio"; - version = "2.31.3"; - format = "setuptools"; + version = "2.32.0"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-dMaoMtgbetWoqAl23qWO4DPT4rmaVJkMvXibTLCzFGE="; + hash = "sha256-5CWtNsYFMI2eptk+2nsJh5JgWbi4YiDhQqWZp5dRKN0="; }; - patches = lib.optionals (!stdenv.isDarwin) [ + patches = [ + # pillow 10.1.0 compat + (fetchpatch { + name = "imageio-pillow-10.1.0-compat.patch"; + url = "https://github.com/imageio/imageio/commit/f58379c1ae7fbd1da8689937b39e499e2d225740.patch"; + hash = "sha256-jPSl/EUe69Dizkv8CqWpnm+TDPtF3VX2DkHOCEuYTLA="; + }) + ] ++ lib.optionals (!stdenv.isDarwin) [ (substituteAll { src = ./libgl-path.patch; libgl = "${libGL.out}/lib/libGL${stdenv.hostPlatform.extensions.sharedLibrary}"; }) ]; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ - imageio-ffmpeg numpy pillow ]; + passthru.optional-dependencies = { + bsdf = []; + dicom = []; + feisem = []; + ffmpeg = [ + imageio-ffmpeg + psutil + ]; + fits = lib.optionals (!isPyPy) [ + astropy + ]; + freeimage = []; + lytro = []; + numpy = []; + pillow = []; + simpleitk = []; + spe = []; + swf = []; + tifffile = [ + tifffile + ]; + pyav = [ + av + ]; + heif = [ + pillow-heif + ]; + }; + nativeCheckInputs = [ fsspec psutil pytestCheckHook - tifffile - ]; + ] + ++ fsspec.optional-dependencies.github + ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); pytestFlagsArray = [ "-m 'not needs_internet'" diff --git a/pkgs/development/python-modules/jax/default.nix b/pkgs/development/python-modules/jax/default.nix index d9293e07348..203aa49db8f 100644 --- a/pkgs/development/python-modules/jax/default.nix +++ b/pkgs/development/python-modules/jax/default.nix @@ -27,7 +27,7 @@ let in buildPythonPackage rec { pname = "jax"; - version = "0.4.19"; + version = "0.4.20"; pyproject = true; disabled = pythonOlder "3.9"; @@ -37,7 +37,7 @@ buildPythonPackage rec { repo = "jax"; # google/jax contains tags for jax and jaxlib. Only use jax tags! rev = "refs/tags/${pname}-v${version}"; - hash = "sha256-l5uLPqhg/hqtO9oJSaioow5cH/0jKHDVziGezkfnVcc="; + hash = "sha256-WLYXUtchOaA6SGnKuVhN9CmV06xMCLQTEuEtL13ttZU="; }; nativeBuildInputs = [ @@ -108,6 +108,10 @@ buildPythonPackage rec { "test_device_put" "test_make_array_from_callback" "test_make_array_from_single_device_arrays" + + # Fails on some hardware due to some numerical error + # See https://github.com/google/jax/issues/18535 + "testQdwhWithOnRankDeficientInput5" ]; disabledTestPaths = lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ diff --git a/pkgs/development/python-modules/jaxlib/bin.nix b/pkgs/development/python-modules/jaxlib/bin.nix index ba3a6adffb7..4030bd5e404 100644 --- a/pkgs/development/python-modules/jaxlib/bin.nix +++ b/pkgs/development/python-modules/jaxlib/bin.nix @@ -39,7 +39,7 @@ in assert cudaSupport -> lib.versionAtLeast cudatoolkit.version "11.1" && lib.versionAtLeast cudnn.version "8.2" && stdenv.isLinux; let - version = "0.4.19"; + version = "0.4.20"; inherit (python) pythonVersion; @@ -60,65 +60,65 @@ let "3.9-x86_64-linux" = getSrcFromPypi { platform = "manylinux2014_x86_64"; dist = "cp39"; - hash = "sha256-8bTrWutuK0qVnbkcwMfgBf414YdaLc3GK5IsCm/JNPE="; + hash = "sha256-eIE+rz5x5BEkO85zncIWE8p/wDPxV8bnVJdHiknS998="; }; "3.9-aarch64-darwin" = getSrcFromPypi { platform = "macosx_11_0_arm64"; dist = "cp39"; - hash = "sha256-Tmv2iOqlNbZqw/rYjef6GmM0N18EA5JTt6T3lQe+4Rs="; + hash = "sha256-dxInv8/aQiHsN7DpScuZao2ZyHDjF0AaTqUDA0qqg/M="; }; "3.9-x86_64-darwin" = getSrcFromPypi { platform = "macosx_10_14_x86_64"; dist = "cp39"; - hash = "sha256-mDT1INLqPdCkxtMMFR0qHLOIZdWEy8Iuzw1/vOoECsA="; + hash = "sha256-wva6LkSokEHN+WQLCancVC7YBIxfImPsQpB1LzFcyqM="; }; "3.10-x86_64-linux" = getSrcFromPypi { platform = "manylinux2014_x86_64"; dist = "cp310"; - hash = "sha256-ksnY+CPEstact5lKjbSg+ZSPJtSt0Y0NFWEFufBCByk="; + hash = "sha256-Yo2TYnkIelyy4vb5+nC/yY8SjV34i/jJvCe/VRQppmo="; }; "3.10-aarch64-darwin" = getSrcFromPypi { platform = "macosx_11_0_arm64"; dist = "cp310"; - hash = "sha256-O7dHvdKLKfNELGfF4TKy7N5EX6Ca7Zu8OtLXWvFykR8="; + hash = "sha256-ufA/ACE4s4R/Fiq5SN7T44SVEN1Z5OfkJ/98lKxRFmo="; }; "3.10-x86_64-darwin" = getSrcFromPypi { platform = "macosx_10_14_x86_64"; dist = "cp310"; - hash = "sha256-gqKMUZSXrt8sQtTAoQbzAfCzO8gM9Y1/tZpuJVWyN0Y="; + hash = "sha256-hBSrYQyOGMn0BexRWQKYnJdEYYlzHUWuWGHmjVT10TE="; }; "3.11-x86_64-linux" = getSrcFromPypi { platform = "manylinux2014_x86_64"; dist = "cp311"; - hash = "sha256-m+NDzwXMNboNjDl2nLY+vqAoN2dQJZVWb1UQDpqqDPw="; + hash = "sha256-5N0nghTBrsa7d8kt8hZC2ghqlxCNC7U8ApD0PG7DHn8="; }; "3.11-aarch64-darwin" = getSrcFromPypi { platform = "macosx_11_0_arm64"; dist = "cp311"; - hash = "sha256-zCOAjaWWCQT9Jnm1jjc1Rh5gemqy7ACtTKLM0MqSJzM="; + hash = "sha256-j13Br64cKe0hFh/cMBbOMuTXqauAvSKE+KzEmN7U6RA="; }; "3.11-x86_64-darwin" = getSrcFromPypi { platform = "macosx_10_14_x86_64"; dist = "cp311"; - hash = "sha256-gOLIxkk+2hew2GqWu1WgMVEx1YEutx7Zod7QbwsuUVQ="; + hash = "sha256-nTnyawU4Ngq9VTE6oDuEfR6iJPRy+E/VLt98cU6eW4M="; }; "3.12-x86_64-linux" = getSrcFromPypi { platform = "manylinux2014_x86_64"; dist = "cp312"; - hash = "sha256-BZTmkgNuV4nWtfbY4t/19aP43szZQEdgpFXh5qwGRXk="; + hash = "sha256-qPMoa7cso7DRBWuCJQoiOEzLPL3m76MPZZMYmZUj400="; }; "3.12-aarch64-darwin" = getSrcFromPypi { platform = "macosx_11_0_arm64"; dist = "cp312"; - hash = "sha256-aAMTrLXU9EYwPv+kdeyI88/D7b4NANB39Fn8vuXUqFA="; + hash = "sha256-VqTC5egDHaDIvwVa3sAc9Sdtd0CwEFcXjDU/i54h844="; }; "3.12-x86_64-darwin" = getSrcFromPypi { platform = "macosx_10_14_x86_64"; dist = "cp312"; - hash = "sha256-KHzlIfa9KtYcHX+i/F/SKaYTpD4/XjHVu5j3BdRTUmc="; + hash = "sha256-1F98Je2rMJJKrksI/EVAsX9n+dOpmDehUeAaMq/BY7o="; }; }; @@ -128,19 +128,19 @@ let gpuSrcs = { "3.9" = fetchurl { url = "https://storage.googleapis.com/jax-releases/cuda12/jaxlib-${version}+cuda12.cudnn89-cp39-cp39-manylinux2014_x86_64.whl"; - hash = "sha256-WB5Vbr/XeYKXCP/3DIXF20jR6/1xE3huX1h5ow8ETl0="; + hash = "sha256-VM2HuyMnG+hzrsTQEB5KJpqpBXyyp+eV1LVxmY1ZCGU="; }; "3.10" = fetchurl { url = "https://storage.googleapis.com/jax-releases/cuda12/jaxlib-${version}+cuda12.cudnn89-cp310-cp310-manylinux2014_x86_64.whl"; - hash = "sha256-zfN0n31+5GohwBkeQrqHus4qOyhM/GEdqG6KUupCZ4o="; + hash = "sha256-TLq3z3T2fjTcO3ESahboKG33mrOpjtj9C92f4d4nJKo="; }; "3.11" = fetchurl { url = "https://storage.googleapis.com/jax-releases/cuda12/jaxlib-${version}+cuda12.cudnn89-cp311-cp311-manylinux2014_x86_64.whl"; - hash = "sha256-Q8ZtF2GCrG30GFbCeCZTWPmW2TBybeXzh2u+NRiYpx4="; + hash = "sha256-CUXwyJq0HOo2j3Sw+NguBCnFkDuJpc3wfZUc90yyhOY="; }; "3.12" = fetchurl { url = "https://storage.googleapis.com/jax-releases/cuda12/jaxlib-${version}+cuda12.cudnn89-cp312-cp312-manylinux2014_x86_64.whl"; - hash = "sha256-lphkSDOJ9SwbO0hp/xC1bYn5fWgth9A9Iwsc9zV0buI="; + hash = "sha256-bAR8FLtiqufU+rL2a1q9c61CjH1eXxGTNGnDUkHlDBA="; }; }; diff --git a/pkgs/development/python-modules/jaxlib/default.nix b/pkgs/development/python-modules/jaxlib/default.nix index f1cda9c58ea..c70ab0ac2b3 100644 --- a/pkgs/development/python-modules/jaxlib/default.nix +++ b/pkgs/development/python-modules/jaxlib/default.nix @@ -54,7 +54,7 @@ let inherit (cudaPackages) backendStdenv cudatoolkit cudaFlags cudnn nccl; pname = "jaxlib"; - version = "0.4.19"; + version = "0.4.20"; meta = with lib; { description = "JAX is Autograd and XLA, brought together for high-performance machine learning research."; @@ -95,7 +95,6 @@ let "absl_py" "astor_archive" "astunparse_archive" - "boringssl" # Not packaged in nixpkgs # "com_github_googleapis_googleapis" # "com_github_googlecloudplatform_google_cloud_cpp" @@ -137,8 +136,8 @@ let arch = # KeyError: ('Linux', 'arm64') - if stdenv.targetPlatform.isLinux && stdenv.targetPlatform.linuxArch == "arm64" then "aarch64" - else stdenv.targetPlatform.linuxArch; + if stdenv.hostPlatform.isLinux && stdenv.hostPlatform.linuxArch == "arm64" then "aarch64" + else stdenv.hostPlatform.linuxArch; bazel-build = buildBazelPackage rec { name = "bazel-build-${pname}-${version}"; @@ -151,7 +150,7 @@ let repo = "jax"; # google/jax contains tags for jax and jaxlib. Only use jaxlib tags! rev = "refs/tags/${pname}-v${version}"; - hash = "sha256-l5uLPqhg/hqtO9oJSaioow5cH/0jKHDVziGezkfnVcc="; + hash = "sha256-WLYXUtchOaA6SGnKuVhN9CmV06xMCLQTEuEtL13ttZU="; }; nativeBuildInputs = [ @@ -220,7 +219,7 @@ let build --python_path="${python}/bin/python" build --distinct_host_configuration=false build --define PROTOBUF_INCLUDE_PATH="${pkgs.protobuf}/include" - '' + lib.optionalString (stdenv.targetPlatform.avxSupport && stdenv.targetPlatform.isUnix) '' + '' + lib.optionalString (stdenv.hostPlatform.avxSupport && stdenv.hostPlatform.isUnix) '' build --config=avx_posix '' + lib.optionalString mklSupport '' build --config=mkl_open_source_only @@ -264,10 +263,10 @@ let ]; sha256 = (if cudaSupport then { - x86_64-linux = "sha256-Hw4uFvltH7nlNN3qAEcQ+IR2FAOjRkvwyWA3rCPi7Vo="; + x86_64-linux = "sha256-QczClHxHElLZCqIZlHc3z3DXJ7rZQJaMs2XIb+lxarI="; } else { - x86_64-linux = "sha256-LEugnFwTV3EyeTZWgMvXzHbgeDPdmuT3daXCXJRMYVY="; - aarch64-linux = "sha256-59rv/3RjD8pnveBDZ33xZoNQxLmnhMocsKMgVfYoO70="; + x86_64-linux = "sha256-mqiJe4u0NYh1PKCbQfbo0U2e9/kYiBqj98d+BPHFSxQ="; + aarch64-linux = "sha256-EuLqamVBJ+qoVMCFIYUT846AghltZolfLGdtO9UeXSM="; }).${stdenv.system} or (throw "jaxlib: unsupported system: ${stdenv.system}"); }; @@ -293,25 +292,19 @@ let --replace "/usr/bin/install_name_tool" "${cctools}/bin/install_name_tool" substituteInPlace ../output/external/rules_cc/cc/private/toolchain/unix_cc_configure.bzl \ --replace "/usr/bin/libtool" "${cctools}/bin/libtool" - '' + (if stdenv.cc.isGNU then '' - sed -i 's@-lprotobuf@-l:libprotobuf.a@' ../output/external/xla/third_party/systemlibs/protobuf.BUILD - sed -i 's@-lprotoc@-l:libprotoc.a@' ../output/external/xla/third_party/systemlibs/protobuf.BUILD - '' else if stdenv.cc.isClang then '' - sed -i 's@-lprotobuf@${pkgs.protobuf}/lib/libprotobuf.a@' ../output/external/xla/third_party/systemlibs/protobuf.BUILD - sed -i 's@-lprotoc@${pkgs.protobuf}/lib/libprotoc.a@' ../output/external/xla/third_party/systemlibs/protobuf.BUILD - '' else throw "Unsupported stdenv.cc: ${stdenv.cc}"); + ''; }; inherit meta; }; platformTag = - if stdenv.targetPlatform.isLinux then + if stdenv.hostPlatform.isLinux then "manylinux2014_${arch}" else if stdenv.system == "x86_64-darwin" then "macosx_10_9_${arch}" else if stdenv.system == "aarch64-darwin" then "macosx_11_0_${arch}" - else throw "Unsupported target platform: ${stdenv.targetPlatform}"; + else throw "Unsupported target platform: ${stdenv.hostPlatform}"; in buildPythonPackage { diff --git a/pkgs/development/python-modules/jedi/default.nix b/pkgs/development/python-modules/jedi/default.nix index 5f802767c83..eb90d3c907e 100644 --- a/pkgs/development/python-modules/jedi/default.nix +++ b/pkgs/development/python-modules/jedi/default.nix @@ -3,16 +3,22 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub + +# build-system +, setuptools + +# dependencies +, parso + +# tests , attrs -, django_3 , pytestCheckHook -, parso }: buildPythonPackage rec { pname = "jedi"; - version = "0.19.0"; - format = "setuptools"; + version = "0.19.1"; + pyproject = true; disabled = pythonOlder "3.6"; @@ -20,15 +26,20 @@ buildPythonPackage rec { owner = "davidhalter"; repo = "jedi"; rev = "v${version}"; - hash = "sha256-Hw0+KQkB9ICWbBJDQQmHyKngzJlJ8e3wlpe4aSrlkvo="; + hash = "sha256-MD7lIKwAwULZp7yLE6jiao2PU6h6RIl0SQ/6b4Lq+9I="; fetchSubmodules = true; }; - propagatedBuildInputs = [ parso ]; + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + parso + ]; nativeCheckInputs = [ attrs - django_3 pytestCheckHook ]; diff --git a/pkgs/development/python-modules/jupyterhub-ldapauthenticator/default.nix b/pkgs/development/python-modules/jupyterhub-ldapauthenticator/default.nix index 4d0831ff979..7283eaed443 100644 --- a/pkgs/development/python-modules/jupyterhub-ldapauthenticator/default.nix +++ b/pkgs/development/python-modules/jupyterhub-ldapauthenticator/default.nix @@ -23,6 +23,5 @@ buildPythonPackage rec { description = "Simple LDAP Authenticator Plugin for JupyterHub"; homepage = "https://github.com/jupyterhub/ldapauthenticator"; license = licenses.bsd3; - maintainers = with maintainers; [ ixxie ]; }; } diff --git a/pkgs/development/python-modules/jupyterhub/default.nix b/pkgs/development/python-modules/jupyterhub/default.nix index 06f5cc6bbd9..62613039812 100644 --- a/pkgs/development/python-modules/jupyterhub/default.nix +++ b/pkgs/development/python-modules/jupyterhub/default.nix @@ -205,7 +205,6 @@ buildPythonPackage rec { homepage = "https://jupyter.org/"; changelog = "https://github.com/jupyterhub/jupyterhub/blob/${version}/docs/source/reference/changelog.md"; license = licenses.bsd3; - maintainers = with maintainers; [ ixxie ]; # darwin: E OSError: dlopen(/nix/store/43zml0mlr17r5jsagxr00xxx91hz9lky-openpam-20170430/lib/libpam.so, 6): image not found broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; }; diff --git a/pkgs/development/python-modules/langcodes/default.nix b/pkgs/development/python-modules/langcodes/default.nix index eb99c9b2b89..555cc9e4795 100644 --- a/pkgs/development/python-modules/langcodes/default.nix +++ b/pkgs/development/python-modules/langcodes/default.nix @@ -48,6 +48,5 @@ buildPythonPackage rec { description = "Python toolkit for working with and comparing the standardized codes for languages"; homepage = "https://github.com/LuminosoInsight/langcodes"; license = licenses.mit; - maintainers = with maintainers; [ ixxie ]; }; } diff --git a/pkgs/development/python-modules/libclang/default.nix b/pkgs/development/python-modules/libclang/default.nix new file mode 100644 index 00000000000..24d0e287ea0 --- /dev/null +++ b/pkgs/development/python-modules/libclang/default.nix @@ -0,0 +1,56 @@ +{ lib +, buildPythonPackage +, llvmPackages +, setuptools +, writeText +}: + +let + libclang = llvmPackages.libclang; + + pyproject_toml = writeText "pyproject.toml" '' + [build-system] + requires = ["setuptools>=42", "wheel"] + build-backend = "setuptools.build_meta" + ''; + + setup_cfg = writeText "setup.cfg" '' + [metadata] + name = clang + version = ${libclang.version} + + [options] + packages = clang + ''; +in buildPythonPackage { + pname = "libclang"; + format = "pyproject"; + + inherit (libclang) version src; + + buildInputs = [ setuptools ]; + + postUnpack = '' + # set source root to python bindings + if [ -e "$sourceRoot/clang/bindings/python" ]; then + # LLVM 13+ puts clang sources in subdirectory instead of plain tarball + sourceRoot="$sourceRoot/clang/bindings/python" + else + sourceRoot="$sourceRoot/bindings/python" + fi + ''; + + postPatch = '' + # link in our own build info to build as a python package + ln -s ${pyproject_toml} ./pyproject.toml + ln -s ${setup_cfg} ./setup.cfg + + # set passed libclang for runtime + echo 'Config.set_library_path("${lib.getLib libclang}/lib")' >>./clang/cindex.py + ''; + + meta = libclang.meta // { + description = "Python bindings for the C language family frontend for LLVM"; + maintainers = with lib.maintainers; [ lilyinstarlight ]; + }; +} diff --git a/pkgs/development/python-modules/linknlink/default.nix b/pkgs/development/python-modules/linknlink/default.nix new file mode 100644 index 00000000000..59c02c46609 --- /dev/null +++ b/pkgs/development/python-modules/linknlink/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, cryptography +, fetchFromGitHub +, pythonOlder +, setuptools +}: + +buildPythonPackage rec { + pname = "linknlink"; + version = "0.1.1"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "xuanxuan000"; + repo = "python-linknlink"; + rev = "refs/tags/${version}"; + hash = "sha256-pr0FwNweg7hFcvaOHQyXjIzH1L6Q4q/1llwfdl9k0Sk="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + cryptography + ]; + + pythonImportsCheck = [ + "linknlink" + ]; + + # Module has no test + doCheck = false; + + meta = with lib; { + description = "Module and CLI for controlling Linklink devices locally"; + homepage = "https://github.com/xuanxuan000/python-linknlink"; + changelog = ""; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/llm/001-disable-install-uninstall-commands.patch b/pkgs/development/python-modules/llm/001-disable-install-uninstall-commands.patch new file mode 100644 index 00000000000..cef7fba1334 --- /dev/null +++ b/pkgs/development/python-modules/llm/001-disable-install-uninstall-commands.patch @@ -0,0 +1,34 @@ +diff --git a/llm/cli.py b/llm/cli.py +index af37feb..18b078a 100644 +--- a/llm/cli.py ++++ b/llm/cli.py +@@ -1014,18 +1014,7 @@ def templates_path(): + ) + def install(packages, upgrade, editable, force_reinstall, no_cache_dir): + """Install packages from PyPI into the same environment as LLM""" +- args = ["pip", "install"] +- if upgrade: +- args += ["--upgrade"] +- if editable: +- args += ["--editable", editable] +- if force_reinstall: +- args += ["--force-reinstall"] +- if no_cache_dir: +- args += ["--no-cache-dir"] +- args += list(packages) +- sys.argv = args +- run_module("pip", run_name="__main__") ++ click.echo("Install command has been disabled for Nix. If you want to install extra llm plugins, use llm.withPlugins([]) expression.") + + + @cli.command() +@@ -1033,8 +1022,7 @@ def install(packages, upgrade, editable, force_reinstall, no_cache_dir): + @click.option("-y", "--yes", is_flag=True, help="Don't ask for confirmation") + def uninstall(packages, yes): + """Uninstall Python packages from the LLM environment""" +- sys.argv = ["pip", "uninstall"] + list(packages) + (["-y"] if yes else []) +- run_module("pip", run_name="__main__") ++ click.echo("Uninstall command has been disabled for Nix. If you want to uninstall extra llm plugins, just remove them from llm.withPlugins([]) list expression.") + + + @cli.command() diff --git a/pkgs/development/python-modules/llm/default.nix b/pkgs/development/python-modules/llm/default.nix new file mode 100644 index 00000000000..318f6735330 --- /dev/null +++ b/pkgs/development/python-modules/llm/default.nix @@ -0,0 +1,107 @@ +{ + buildPythonApplication, + buildPythonPackage, + fetchFromGitHub, + lib, + makeWrapper, + pytestCheckHook, + python3, + pythonOlder, + ruff, + setuptools, +}: let + llm = buildPythonPackage rec { + pname = "llm"; + version = "0.12"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "simonw"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-aCqdw2co/cXrBwVY/k/aSLl3C22nlH5LvU2yir1/NnQ="; + }; + + patches = [ + ./001-disable-install-uninstall-commands.patch + ]; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = with python3.pkgs; [ + click-default-group + numpy + openai + pluggy + pydantic + python-ulid + pyyaml + setuptools # for pkg_resources + sqlite-migrate + sqlite-utils + ]; + + nativeCheckInputs = with python3.pkgs; [ + cogapp + numpy + pytestCheckHook + requests-mock + ]; + + doCheck = true; + + pytestFlagsArray = [ + "-svv" + "tests/" + ]; + + pythonImportsCheck = [ + "llm" + ]; + + passthru = {inherit withPlugins;}; + + meta = with lib; { + homepage = "https://github.com/simonw/llm"; + description = "Access large language models from the command-line"; + changelog = "https://github.com/simonw/llm/releases/tag/${version}"; + license = licenses.asl20; + mainProgram = "llm"; + maintainers = with maintainers; [aldoborrero]; + }; + }; + + withPlugins = plugins: buildPythonApplication { + inherit (llm) pname version; + format = "other"; + + disabled = pythonOlder "3.8"; + + dontUnpack = true; + dontBuild = true; + doCheck = false; + + nativeBuildInputs = [ + makeWrapper + ]; + + installPhase = '' + makeWrapper ${llm}/bin/llm $out/bin/llm \ + --prefix PYTHONPATH : "${llm}/${python3.sitePackages}:$PYTHONPATH" + ln -sfv ${llm}/lib $out/lib + ''; + + propagatedBuildInputs = llm.propagatedBuildInputs ++ plugins; + + passthru = llm.passthru // { + withPlugins = morePlugins: withPlugins (morePlugins ++ plugins); + }; + + inherit (llm) meta; + }; +in + llm diff --git a/pkgs/development/python-modules/mahotas/default.nix b/pkgs/development/python-modules/mahotas/default.nix index fa711c1b4cc..2f234cc6354 100644 --- a/pkgs/development/python-modules/mahotas/default.nix +++ b/pkgs/development/python-modules/mahotas/default.nix @@ -38,6 +38,11 @@ buildPythonPackage rec { --replace 'ctypes.CDLL(libname)' 'np.ctypeslib.load_library("libfreeimage", "${freeimage}/lib")' ''; + # mahotas/_morph.cpp:864:10: error: no member named 'random_shuffle' in namespace 'std' + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = "-std=c++14"; + }; + # tests must be run in the build directory preCheck = '' cd build/lib* diff --git a/pkgs/development/python-modules/marisa-trie/default.nix b/pkgs/development/python-modules/marisa-trie/default.nix index 587dc99080a..8b069fd235a 100644 --- a/pkgs/development/python-modules/marisa-trie/default.nix +++ b/pkgs/development/python-modules/marisa-trie/default.nix @@ -66,6 +66,5 @@ buildPythonPackage rec { 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/pkgs/development/python-modules/markdown-macros/default.nix b/pkgs/development/python-modules/markdown-macros/default.nix index e95cbe3c4c1..e0e41bf3d0a 100644 --- a/pkgs/development/python-modules/markdown-macros/default.nix +++ b/pkgs/development/python-modules/markdown-macros/default.nix @@ -16,8 +16,10 @@ buildPythonPackage rec { patches = [ # Fixes a bug with markdown>2.4 + # https://github.com/wnielson/markdown-macros/pull/1 (fetchpatch { - url = "https://github.com/wnielson/markdown-macros/pull/1.patch"; + name = "wnielson-markdown-macros-pull-1.patch"; + url = "https://github.com/wnielson/markdown-macros/commit/e38cba9acb6789cc128f6fe9ca427ba71815a20f.patch"; sha256 = "17njbgq2srzkf03ar6yn92frnsbda3g45cdi529fdh0x8mmyxci0"; }) ]; diff --git a/pkgs/development/python-modules/mayavi/default.nix b/pkgs/development/python-modules/mayavi/default.nix index dc786ac6d7d..a34f98cdae3 100644 --- a/pkgs/development/python-modules/mayavi/default.nix +++ b/pkgs/development/python-modules/mayavi/default.nix @@ -3,6 +3,7 @@ , buildPythonPackage , envisage , fetchPypi +, fetchpatch , numpy , packaging , pyface @@ -26,6 +27,24 @@ buildPythonPackage rec { hash = "sha256-n0J+8spska542S02ibpr7KJMhGDicG2KHJuEKJrT/Z4="; }; + patches = [ + # Adds compatibility with Python 3.11. + # https://github.com/enthought/mayavi/pull/1199 + (fetchpatch { + name = "python311-compat.patch"; + url = "https://github.com/enthought/mayavi/commit/50c0cbfcf97560be69c84b7c924635a558ebf92f.patch"; + hash = "sha256-zZOT6on/f5cEjnDBrNGog/wPQh7rBkaFqrxkBYDUQu0="; + includes = [ "tvtk/src/*" ]; + }) + # Fixes an incompatible function pointer conversion error + # https://github.com/enthought/mayavi/pull/1266 + (fetchpatch { + name = "incompatible-pointer-conversion.patch"; + url = "https://github.com/enthought/mayavi/commit/887adc8fe2b076a368070f5b1d564745b03b1964.patch"; + hash = "sha256-88H1NNotd4pO0Zw1oLrYk5WNuuVrmTU01HJgsTRfKlo="; + }) + ]; + postPatch = '' # building the docs fails with the usual Qt xcb error, so skip: substituteInPlace setup.py \ diff --git a/pkgs/development/python-modules/md-toc/default.nix b/pkgs/development/python-modules/md-toc/default.nix index 800fc6227b0..18aeac19b3c 100644 --- a/pkgs/development/python-modules/md-toc/default.nix +++ b/pkgs/development/python-modules/md-toc/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "md-toc"; - version = "8.2.0"; + version = "8.2.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "frnmst"; repo = pname; rev = version; - hash = "sha256-7Udmon/5E741+v2vBHHL7h31r91RR33hN1WhL3FiDQc="; + hash = "sha256-fL3JlZWTEEinYILNeHw0cuvVza27atLLxjrBZkVLRiU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mecab-python3/default.nix b/pkgs/development/python-modules/mecab-python3/default.nix index 878f85600dd..e347aa107d7 100644 --- a/pkgs/development/python-modules/mecab-python3/default.nix +++ b/pkgs/development/python-modules/mecab-python3/default.nix @@ -40,6 +40,5 @@ buildPythonPackage rec { homepage = "https://github.com/SamuraiT/mecab-python3"; changelog = "https://github.com/SamuraiT/mecab-python3/releases/tag/v${version}"; license = with licenses; [ gpl2 lgpl21 bsd3 ]; # any of the three - maintainers = with maintainers; [ ixxie ]; }; } diff --git a/pkgs/development/python-modules/meraki/default.nix b/pkgs/development/python-modules/meraki/default.nix index c97624c73c8..0720a290cb9 100644 --- a/pkgs/development/python-modules/meraki/default.nix +++ b/pkgs/development/python-modules/meraki/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "meraki"; - version = "1.38.0"; + version = "1.39.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-LYwjcm4qZfzrDSujQ9eaxjPN9z0qWDSfT+IU1f32cY0="; + hash = "sha256-B3+2KnRXWkB83Sy/NH9kJwgSha9L17tx37fFwBjT3Mw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mido/default.nix b/pkgs/development/python-modules/mido/default.nix index 65702b23c7a..84fe78a5947 100644 --- a/pkgs/development/python-modules/mido/default.nix +++ b/pkgs/development/python-modules/mido/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { patches = [ (substituteAll { src = ./libportmidi-cdll.patch; - libportmidi = "${portmidi.out}/lib/libportmidi${stdenv.targetPlatform.extensions.sharedLibrary}"; + libportmidi = "${portmidi.out}/lib/libportmidi${stdenv.hostPlatform.extensions.sharedLibrary}"; }) ]; diff --git a/pkgs/development/python-modules/mocket/default.nix b/pkgs/development/python-modules/mocket/default.nix index 49125a286e9..41789a796dd 100644 --- a/pkgs/development/python-modules/mocket/default.nix +++ b/pkgs/development/python-modules/mocket/default.nix @@ -1,37 +1,51 @@ { lib -, aiohttp -, asgiref , buildPythonPackage +, fetchPypi +, pythonOlder +, stdenv + +# build-system +, hatchling + +# dependencies , decorator +, httptools +, python-magic +, urllib3 + +# optional-dependencies +, xxhash +, pook + +# tests +, aiohttp +, asgiref , fastapi -, fetchPypi , gevent -, httptools , httpx -, isPy3k -, pook -, pytest-mock +, pytest-asyncio , pytestCheckHook -, python-magic -, pythonOlder , redis +, redis-server , requests , sure -, urllib3 + }: buildPythonPackage rec { pname = "mocket"; - version = "3.11.1"; - format = "setuptools"; - - disabled = pythonOlder "3.7"; + version = "3.12.0"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-sEPLUN9nod4AKYcoCNQZ4FBblUCLCPV1dFOrNC6xDWo="; + hash = "sha256-brvBWwTWT2F/usVBRr7wz9L0kct4X1Fddl4mu5LUENA="; }; + nativeBuildInputs = [ + hatchling + ]; + propagatedBuildInputs = [ decorator httptools @@ -43,52 +57,58 @@ buildPythonPackage rec { pook = [ pook ]; + speedups = [ + xxhash + ]; }; nativeCheckInputs = [ - aiohttp asgiref fastapi gevent httpx - pytest-mock + pytest-asyncio pytestCheckHook redis requests sure - ] ++ passthru.optional-dependencies.pook; + ] ++ lib.optionals (pythonOlder "3.12") [ + aiohttp + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); - # Skip http tests - SKIP_TRUE_HTTP = true; + preCheck = lib.optionalString stdenv.isLinux '' + ${redis-server}/bin/redis-server & + REDIS_PID=$! + ''; - disabledTestPaths = [ - # Requires a live Redis instance - "tests/main/test_redis.py" - ]; + postCheck = lib.optionalString stdenv.isLinux '' + kill $REDIS_PID + ''; + + # Skip http tests, they require network access + env.SKIP_TRUE_HTTP = true; + + _darwinAllowLocalNetworking = true; disabledTests = [ # tests that require network access (like DNS lookups) - "test_truesendall" - "test_truesendall_with_chunk_recording" - "test_truesendall_with_gzip_recording" - "test_truesendall_with_recording" - "test_wrongpath_truesendall" "test_truesendall_with_dump_from_recording" - "test_truesendall_with_recording_https" - "test_truesendall_after_mocket_session" - "test_real_request_session" "test_asyncio_record_replay" "test_gethostbyname" ]; + disabledTestPaths = lib.optionals stdenv.isDarwin [ + "tests/main/test_redis.py" + ]; + pythonImportsCheck = [ "mocket" ]; meta = with lib; { + changelog = "https://github.com/mindflayer/python-mocket/releases/tag/${version}"; description = "A socket mock framework for all kinds of sockets including web-clients"; homepage = "https://github.com/mindflayer/python-mocket"; - changelog = "https://github.com/mindflayer/python-mocket/releases/tag/${version}"; license = licenses.bsd3; maintainers = with maintainers; [ hexa ]; }; diff --git a/pkgs/development/python-modules/mopeka-iot-ble/default.nix b/pkgs/development/python-modules/mopeka-iot-ble/default.nix index 318bd9a00bb..a5bb698aa1a 100644 --- a/pkgs/development/python-modules/mopeka-iot-ble/default.nix +++ b/pkgs/development/python-modules/mopeka-iot-ble/default.nix @@ -12,8 +12,8 @@ buildPythonPackage rec { pname = "mopeka-iot-ble"; - version = "0.4.1"; - format = "pyproject"; + version = "0.5.0"; + pyproject = true; disabled = pythonOlder "3.9"; @@ -21,9 +21,14 @@ buildPythonPackage rec { owner = "bluetooth-devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-x/cKg2NC6kssUQeBuQH4yghlRDgs/fJ0bWWL+qnHgcM="; + hash = "sha256-m27As3tB77JbgY0kDDJ6kmYFTv2O/Sh6y9tFiKDIjbI="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace " --cov=mopeka_iot_ble --cov-report=term-missing:skip-covered" "" + ''; + nativeBuildInputs = [ poetry-core ]; @@ -39,11 +44,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace " --cov=mopeka_iot_ble --cov-report=term-missing:skip-covered" "" - ''; - pythonImportsCheck = [ "mopeka_iot_ble" ]; diff --git a/pkgs/development/python-modules/moto/default.nix b/pkgs/development/python-modules/moto/default.nix index 73e95a6e1ea..2dc5bd55ee7 100644 --- a/pkgs/development/python-modules/moto/default.nix +++ b/pkgs/development/python-modules/moto/default.nix @@ -1,54 +1,55 @@ { lib -, stdenv , buildPythonPackage , fetchPypi , pythonOlder -# build +# build-system , setuptools -# runtime -, aws-xray-sdk +# dependencies , boto3 , botocore -, cfn-lint , cryptography +, jinja2 +, python-dateutil +, requests +, responses +, werkzeug +, xmltodict + +# optional-dependencies +, aws-xray-sdk +, cfn-lint , docker +, ecdsa , flask , flask-cors , graphql-core -, idna -, jinja2 , jsondiff +, multipart , openapi-spec-validator +, py-partiql-parser , pyparsing -, python-dateutil , python-jose , pyyaml -, requests -, responses , sshpubkeys -, werkzeug -, xmltodict # tests , freezegun -, py-partiql-parser , pytestCheckHook , pytest-xdist -, sure }: buildPythonPackage rec { pname = "moto"; - version = "4.2.2"; - format = "pyproject"; + version = "4.2.6"; + pyproject = true; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-7jTEw/U5ANlTGAlGkgyduhJ6SD4u1A5tv5PUri52Dnw="; + hash = "sha256-zgpV1+dWxZpaQ5LHCXqlylPgCqLdP3AACTNWvhXnrvk="; }; nativeBuildInputs = [ @@ -56,114 +57,91 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - aws-xray-sdk boto3 botocore - cfn-lint cryptography - docker - flask - flask-cors - graphql-core - idna - jinja2 - jsondiff - openapi-spec-validator - pyparsing - python-dateutil - python-jose - pyyaml requests - responses - sshpubkeys - werkzeug xmltodict + werkzeug + python-dateutil + responses + jinja2 ]; + passthru.optional-dependencies = { + # non-exhaustive list of extras, that was cobbled together for testing + all = [ + aws-xray-sdk + cfn-lint + docker + ecdsa + flask + flask-cors + graphql-core + jsondiff + multipart + openapi-spec-validator + py-partiql-parser + pyparsing + python-jose + pyyaml + setuptools + sshpubkeys + ] ++ python-jose.optional-dependencies.cryptography; + }; + __darwinAllowLocalNetworking = true; nativeCheckInputs = [ freezegun - py-partiql-parser pytestCheckHook - sure - ]; + pytest-xdist + ] ++ passthru.optional-dependencies.all; pytestFlagsArray = [ - # Disable tests that try to access the network - "--deselect=tests/test_cloudformation/test_cloudformation_custom_resources.py::test_create_custom_lambda_resource__verify_cfnresponse_failed" - "--deselect=tests/test_cloudformation/test_server.py::test_cloudformation_server_get" - "--deselect=tests/test_core/test_decorator_calls.py::test_context_manager" - "--deselect=tests/test_core/test_decorator_calls.py::test_decorator_start_and_stop" - "--deselect=tests/test_core/test_request_mocking.py::test_passthrough_requests" - "--deselect=tests/test_firehose/test_firehose_put.py::test_put_record_batch_http_destination" - "--deselect=tests/test_firehose/test_firehose_put.py::test_put_record_http_destination" - "--deselect=tests/test_logs/test_integration.py::test_put_subscription_filter_with_lambda" - "--deselect=tests/test_sqs/test_integration.py::test_invoke_function_from_sqs_exception" - "--deselect=tests/test_sqs/test_sqs_integration.py::test_invoke_function_from_sqs_exception" - "--deselect=tests/test_stepfunctions/test_stepfunctions.py::test_state_machine_creation_fails_with_invalid_names" - "--deselect=tests/test_stepfunctions/test_stepfunctions.py::test_state_machine_list_executions_with_pagination" - "--deselect=tests/test_iotdata/test_iotdata.py::test_update" - "--deselect=tests/test_iotdata/test_iotdata.py::test_basic" - "--deselect=tests/test_iotdata/test_iotdata.py::test_delete_field_from_device_shadow" - "--deselect=tests/test_iotdata/test_iotdata.py::test_publish" - "--deselect=tests/test_moto_api/recorder/test_recorder.py::TestRecorder::test_s3_upload_data" - "--deselect=tests/test_moto_api/recorder/test_recorder.py::TestRecorder::test_s3_upload_file_using_requests" + "-m" "'not network and not requires_docker'" + + # Fails at local name resolution "--deselect=tests/test_s3/test_multiple_accounts_server.py::TestAccountIdResolution::test_with_custom_request_header" - "--deselect=tests/test_s3/test_s3.py::test_presigned_put_url_with_approved_headers" - "--deselect=tests/test_s3/test_s3.py::test_presigned_put_url_with_custom_headers" - "--deselect=tests/test_s3/test_s3.py::test_put_chunked_with_v4_signature_in_body" - "--deselect=tests/test_s3/test_s3.py::test_upload_from_file_to_presigned_url" - "--deselect=tests/test_s3/test_server.py::test_s3_server_bucket_versioning" "--deselect=tests/test_s3/test_server.py::test_s3_server_post_cors_multiple_origins" - # Disable tests that require docker daemon - "--deselect=tests/test_core/test_docker.py::test_docker_is_running_and_available" - "--deselect=tests/test_events/test_events_lambdatriggers_integration.py::test_creating_bucket__invokes_lambda" - "--deselect=tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda" - "--deselect=tests/test_sqs/test_sqs_integration.py" - - # json.decoder.JSONDecodeError: Expecting value: line 1 column 1 (char 0) - "--deselect=tests/test_cloudformation/test_cloudformation_stack_integration.py::test_lambda_function" + # Fails at resolving google.com + "--deselect=tests/test_firehose/test_firehose_put.py::test_put_record_http_destination" + "--deselect=tests/test_firehose/test_firehose_put.py::test_put_record_batch_http_destination" - # AssertionError: CloudWatch log event was not found. - "--deselect=tests/test_logs/test_integration.py::test_subscription_filter_applies_to_new_streams" + # Download recordings returns faulty JSON + "--deselect=tests/test_moto_api/recorder/test_recorder.py::TestRecorder::test_ec2_instance_creation_recording_on" + "--deselect=tests/test_moto_api/recorder/test_recorder.py::TestRecorder::test_ec2_instance_creation__recording_off" - # KeyError: 'global' - "--deselect=tests/test_iotdata/test_server.py::test_iotdata_list" - "--deselect=tests/test_iotdata/test_server.py::test_publish" + # Connection Reset by Peer, when connecting to localhost:5678 + "--deselect=tests/test_moto_api/recorder/test_recorder.py::TestRecorder::test_replay" - # Blocks test execution - "--deselect=tests/test_utilities/test_threaded_server.py::TestThreadedMotoServer::test_load_data_from_inmemory_client" - ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ - "--deselect=tests/test_utilities/test_threaded_server.py::test_threaded_moto_server__different_port" - "--deselect=tests/test_utilities/test_threaded_server.py::TestThreadedMotoServer::test_server_can_handle_multiple_services" - "--deselect=tests/test_utilities/test_threaded_server.py::TestThreadedMotoServer::test_server_is_reachable" + # Requires docker, but isn't marked + # https://github.com/getmoto/moto/pull/6938 + "--deselect=tests/test_awslambda/test_lambda_layers_invoked.py::test_invoke_local_lambda_layers" - # AssertionError: expected `{0}` to be greater than `{1}` + # Racy, expects two timestamp two differ + # https://github.com/getmoto/moto/issues/6946 "--deselect=tests/test_databrew/test_databrew_recipes.py::test_publish_recipe" ]; disabledTestPaths = [ - # xml.parsers.expat.ExpatError: out of memory: line 1, column 0 - "tests/test_sts/test_sts.py" + # Requires pytest-ordering, which is unmaintained + # https://github.com/getmoto/moto/issues/6937 # botocore.exceptions.NoCredentialsError: Unable to locate credentials + "tests/test_dynamodb/test_dynamodb_statements.py" + "tests/test_lakeformation/test_resource_tags_integration.py" "tests/test_redshiftdata/test_redshiftdata.py" + "tests/test_s3/test_s3_file_handles.py" + "tests/test_s3/test_s3.py" + "tests/test_s3/test_s3_select.py" + # Tries to access the network - "tests/test_appsync/test_appsync_schema.py" - "tests/test_awslambda/test_lambda_eventsourcemapping.py" - "tests/test_awslambda/test_lambda_invoke.py" "tests/test_batch/test_batch_jobs.py" - "tests/test_kinesis/test_kinesis.py" - "tests/test_kinesis/test_kinesis_stream_consumers.py" - ]; - disabledTests = [ - # only appears in aarch64 currently, but best to be safe - "test_state_machine_list_executions_with_filter" - # tests fail with 404 after Werkzeug 2.2 upgrade, see https://github.com/spulec/moto/issues/5341#issuecomment-1206995825 - "test_appsync_list_tags_for_resource" - "test_s3_server_post_to_bucket_redirect" + # Threading tests regularly blocks test execution + "tests/test_utilities/test_threaded_server.py" + "tests/test_s3/test_s3_bucket_policy.py" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/mpv/default.nix b/pkgs/development/python-modules/mpv/default.nix index c956bb90aa8..3763e25660a 100644 --- a/pkgs/development/python-modules/mpv/default.nix +++ b/pkgs/development/python-modules/mpv/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace mpv.py \ --replace "sofile = ctypes.util.find_library('mpv')" \ - 'sofile = "${mpv}/lib/libmpv${stdenv.targetPlatform.extensions.sharedLibrary}"' + 'sofile = "${mpv}/lib/libmpv${stdenv.hostPlatform.extensions.sharedLibrary}"' ''; # tests impure, will error if it can't load libmpv.so diff --git a/pkgs/development/python-modules/msprime/default.nix b/pkgs/development/python-modules/msprime/default.nix index 008ce7f2711..2ec32c255df 100644 --- a/pkgs/development/python-modules/msprime/default.nix +++ b/pkgs/development/python-modules/msprime/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, fetchpatch , oldest-supported-numpy , setuptools-scm , wheel @@ -26,6 +27,16 @@ buildPythonPackage rec { hash = "sha256-YAJa2f0w2CenKubnYLbP8HodDhabLB2hAkyw/CPkp6o="; }; + patches = [ + # upstream patch fixes 2 failing unittests. remove on update + (fetchpatch { + name = "python311.patch"; + url = "https://github.com/tskit-dev/msprime/commit/639125ec942cb898cf4a80638f229e11ce393fbc.patch"; + hash = "sha256-peli4tdu8Bv21xIa5H8SRdfjQnTMO72IPFqybmSBSO8="; + includes = [ "tests/test_ancestry.py" ]; + }) + ]; + nativeBuildInputs = [ gsl oldest-supported-numpy diff --git a/pkgs/development/python-modules/mwoauth/default.nix b/pkgs/development/python-modules/mwoauth/default.nix index 1fcd7123ea7..2e92fade6d4 100644 --- a/pkgs/development/python-modules/mwoauth/default.nix +++ b/pkgs/development/python-modules/mwoauth/default.nix @@ -41,6 +41,5 @@ buildPythonPackage rec { description = "Python library to perform OAuth handshakes with a MediaWiki installation"; homepage = "https://github.com/mediawiki-utilities/python-mwoauth"; license = licenses.mit; - maintainers = with maintainers; [ ixxie ]; }; } diff --git a/pkgs/development/python-modules/mysql-connector/default.nix b/pkgs/development/python-modules/mysql-connector/default.nix index ba963ff0d5d..575c438eb55 100644 --- a/pkgs/development/python-modules/mysql-connector/default.nix +++ b/pkgs/development/python-modules/mysql-connector/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { patches = [ # mysql-connector overrides MACOSX_DEPLOYMENT_TARGET to 11. # This makes the installation with nixpkgs fail. I suspect, that's - # because stdenv.targetPlatform.darwinSdkVersion is (currently) set to + # because stdenv.hostPlatform.darwinSdkVersion is (currently) set to # 10.12. The patch reverts # https://github.com/mysql/mysql-connector-python/commit/d1e89fd3d7391084cdf35b0806cb5d2a4b413654 ./0001-Revert-Fix-MacOS-wheels-platform-tag.patch diff --git a/pkgs/development/python-modules/myst-parser/default.nix b/pkgs/development/python-modules/myst-parser/default.nix index 0e6b2204ddb..e485b768a75 100644 --- a/pkgs/development/python-modules/myst-parser/default.nix +++ b/pkgs/development/python-modules/myst-parser/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, fetchpatch , flit-core , pythonOlder , docutils @@ -31,6 +32,14 @@ buildPythonPackage rec { hash = "sha256-1BW7Z+0rs5Up+VZ3vDygnhLzE9Y2BqEMnTnflboweu0="; }; + patches = [ + (fetchpatch { + name = "myst-parser-sphinx7.2-compat.patch"; + url = "https://github.com/executablebooks/MyST-Parser/commit/4f670fc04c438b57a9d4014be74e9a62cc0deba4.patch"; + hash = "sha256-FCvFSsD7qQwqWjSW7R4Gx+E2jaGkifSZqaRbAglt9Yw="; + }) + ]; + nativeBuildInputs = [ flit-core ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/netcdf4/default.nix b/pkgs/development/python-modules/netcdf4/default.nix index 9f00a33fdf6..f181a7d4c4f 100644 --- a/pkgs/development/python-modules/netcdf4/default.nix +++ b/pkgs/development/python-modules/netcdf4/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , fetchPypi , isPyPy @@ -50,12 +51,16 @@ buildPythonPackage rec { NO_NET=1 NO_CDL=1 ${python.interpreter} run_all.py ''; - # Variables used to configure the build process - USE_NCCONFIG = "0"; - HDF5_DIR = lib.getDev hdf5; - NETCDF4_DIR = netcdf; - CURL_DIR = curl.dev; - JPEG_DIR = libjpeg.dev; + env = { + # Variables used to configure the build process + USE_NCCONFIG = "0"; + HDF5_DIR = lib.getDev hdf5; + NETCDF4_DIR = netcdf; + CURL_DIR = curl.dev; + JPEG_DIR = libjpeg.dev; + } // lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = "-Wno-error=int-conversion"; + }; pythonImportsCheck = [ "netCDF4" ]; diff --git a/pkgs/development/python-modules/newversion/default.nix b/pkgs/development/python-modules/newversion/default.nix index e3283a4eb9e..76975016366 100644 --- a/pkgs/development/python-modules/newversion/default.nix +++ b/pkgs/development/python-modules/newversion/default.nix @@ -1,45 +1,32 @@ { lib , buildPythonPackage , fetchFromGitHub -, fetchpatch , packaging , poetry-core , pytestCheckHook , pythonOlder -, typing-extensions }: buildPythonPackage rec { pname = "newversion"; - version = "1.8.2"; + version = "2.0.0"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "vemel"; - repo = pname; - rev = version; - hash = "sha256-27HWMzSzyAbiOW7OUhlupRWIVJG6DrpXObXmxlCsmxU="; + repo = "newversion"; + rev = "refs/tags/${version}"; + hash = "sha256-v9hfk2/hBkWtOobQdaYXNOZTTcEqnMV6JYqtjjoidOs="; }; - patches = [ - # https://github.com/vemel/newversion/pull/9 - (fetchpatch { - name = "remove-setuptools-dependency.patch"; - url = "https://github.com/vemel/newversion/commit/b50562671029dd6834bc7a8ad0dd3f9e0fbdfc1d.patch"; - hash = "sha256-6dXVQ9Hk0/EfSwPbW19ZV8MAFcSx+ZRO5G94kbh23GM="; - }) - ]; - nativeBuildInputs = [ poetry-core ]; propagatedBuildInputs = [ packaging - ] ++ lib.optionals (pythonOlder "3.8") [ - typing-extensions ]; nativeCheckInputs = [ @@ -53,6 +40,7 @@ buildPythonPackage rec { meta = with lib; { description = "PEP 440 version manager"; homepage = "https://github.com/vemel/newversion"; + changelog = "https://github.com/vemel/newversion/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/nose2/default.nix b/pkgs/development/python-modules/nose2/default.nix index 81fcdce60d1..b49900e1576 100644 --- a/pkgs/development/python-modules/nose2/default.nix +++ b/pkgs/development/python-modules/nose2/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "nose2"; - version = "0.13.0"; + version = "0.14.0"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-V8aK1nbvS4i1BpSTfrUvSUOqHKJhB0tJCbbhYwRrRvA="; + hash = "sha256-XCjXcKC5pwKGK9bDdVuizS95lN1RjJguXOKY1/N0ZqQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/nose3/default.nix b/pkgs/development/python-modules/nose3/default.nix index 280f36cc2e6..f9966b24660 100644 --- a/pkgs/development/python-modules/nose3/default.nix +++ b/pkgs/development/python-modules/nose3/default.nix @@ -5,6 +5,7 @@ , isPyPy , isPy311 , python +, pythonAtLeast , stdenv }: @@ -12,6 +13,9 @@ buildPythonPackage rec { pname = "nose3"; version = "1.3.8"; + # https://github.com/jayvdb/nose3/issues/5 + disabled = pythonAtLeast "3.12"; + src = fetchPypi { inherit pname version; hash = "sha256-diquIsrbiYsAudT0u7n46H+ODd5sSaiM0MVU9OWSW3Y="; diff --git a/pkgs/development/python-modules/numba/default.nix b/pkgs/development/python-modules/numba/default.nix index 51a043b8d7f..cbf8fa40d78 100644 --- a/pkgs/development/python-modules/numba/default.nix +++ b/pkgs/development/python-modules/numba/default.nix @@ -28,9 +28,9 @@ let in buildPythonPackage rec { # Using an untagged version, with numpy 1.25 support, when it's released # also drop the versioneer patch in postPatch - version = "0.58.0rc2"; + version = "0.58.1"; pname = "numba"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.8" || pythonAtLeast "3.12"; @@ -50,7 +50,7 @@ in buildPythonPackage rec { # use `forceFetchGit = true;`.` If in the future we'll observe the hash # changes too often, we can always use forceFetchGit, and inject the # relevant strings ourselves, using `sed` commands, in extraPostFetch. - hash = "sha256-ktFBjzd2vEahdr86lhVLVFEadCIhPP3hRF/EuZhHCC4="; + hash = "sha256-1Tj2GFoUwRRCWBFxhreF+0Mr+Tjyb7+X4peO+T0qGNs="; }; env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${lib.getDev libcxx}/include/c++/v1"; diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix index d2d85bddf3b..82ceee47d06 100644 --- a/pkgs/development/python-modules/numpy/default.nix +++ b/pkgs/development/python-modules/numpy/default.nix @@ -2,17 +2,28 @@ , stdenv , fetchPypi , python +, pythonAtLeast +, pythonOlder , buildPythonPackage +, writeTextFile + +# build-system +, cython_3 , gfortran +, meson-python +, pkg-config +, xcbuild + +# native dependencies +, blas +, lapack + +# tests , hypothesis +, pytest-xdist , pytestCheckHook +, setuptools , typing-extensions -, blas -, lapack -, writeTextFile -, cython -, pythonAtLeast -, pythonOlder }: assert (!blas.isILP64) && (!lapack.isILP64); @@ -41,14 +52,14 @@ let }; in buildPythonPackage rec { pname = "numpy"; - version = "1.25.2"; - format = "setuptools"; - disabled = pythonOlder "3.9" || pythonAtLeast "3.12"; + version = "1.26.1"; + pyproject = true; + disabled = pythonOlder "3.9" || pythonAtLeast "3.13"; src = fetchPypi { inherit pname version; extension = "tar.gz"; - hash = "sha256-/WCOGcjXxVAh3/1Dv+VJL6uMwQXMiYb4E/jDwEizh2A="; + hash = "sha256-yMbHLUqfgx8yjvsTEmQqHK+vqoiYHZq3Y2jVDQfZPL4="; }; patches = [ @@ -70,10 +81,23 @@ in buildPythonPackage rec { # error: option --single-version-externally-managed not recognized # TypeError: dist must be a Distribution instance rm numpy/core/tests/test_cython.py + + patchShebangs numpy/_build_utils/*.py ''; - nativeBuildInputs = [ gfortran cython ]; - buildInputs = [ blas lapack ]; + nativeBuildInputs = [ + cython_3 + gfortran + meson-python + pkg-config + ] ++ lib.optionals (stdenv.isDarwin) [ + xcbuild.xcrun + ]; + + buildInputs = [ + blas + lapack + ]; # Causes `error: argument unused during compilation: '-fno-strict-overflow'` due to `-Werror`. hardeningDisable = lib.optionals stdenv.cc.isClang [ "strictoverflow" ]; @@ -83,7 +107,6 @@ in buildPythonPackage rec { # see https://github.com/xianyi/OpenBLAS/issues/2993 preConfigure = '' sed -i 's/-faltivec//' numpy/distutils/system_info.py - export NPY_NUM_BUILD_JOBS=$NIX_BUILD_CORES export OMP_NUM_THREADS=$((NIX_BUILD_CORES > 64 ? 64 : NIX_BUILD_CORES)) ''; @@ -94,8 +117,10 @@ in buildPythonPackage rec { enableParallelBuilding = true; nativeCheckInputs = [ + pytest-xdist pytestCheckHook hypothesis + setuptools typing-extensions ]; @@ -138,9 +163,10 @@ in buildPythonPackage rec { # Disable test # - test_large_file_support: takes a long time and can cause the machine to run out of disk space - NOSE_EXCLUDE="test_large_file_support"; + env.NOSE_EXCLUDE = "test_large_file_support"; meta = { + changelog = "https://github.com/numpy/numpy/releases/tag/v${version}"; description = "Scientific tools for Python"; homepage = "https://numpy.org/"; license = lib.licenses.bsd3; diff --git a/pkgs/development/python-modules/oauthenticator/default.nix b/pkgs/development/python-modules/oauthenticator/default.nix index b2a8329538e..7b1a3c60d62 100644 --- a/pkgs/development/python-modules/oauthenticator/default.nix +++ b/pkgs/development/python-modules/oauthenticator/default.nix @@ -67,6 +67,5 @@ buildPythonPackage rec { homepage = "https://github.com/jupyterhub/oauthenticator"; changelog = "https://github.com/jupyterhub/oauthenticator/blob/${version}/docs/source/reference/changelog.md"; license = licenses.bsd3; - maintainers = with maintainers; [ ixxie ]; }; } diff --git a/pkgs/development/python-modules/onnx/default.nix b/pkgs/development/python-modules/onnx/default.nix index df15ebe77e4..d0866f6c0a8 100644 --- a/pkgs/development/python-modules/onnx/default.nix +++ b/pkgs/development/python-modules/onnx/default.nix @@ -66,14 +66,10 @@ in buildPythonPackage rec { --replace 'include(googletest)' "" substituteInPlace cmake/unittest.cmake \ --replace 'googletest)' ')' - '' + lib.optionalString stdenv.isLinux '' + '' + '' # remove this override in 1.15 that will enable to set the CMAKE_CXX_STANDARD with cmakeFlags substituteInPlace CMakeLists.txt \ --replace 'CMAKE_CXX_STANDARD 11' 'CMAKE_CXX_STANDARD 17' - '' + lib.optionalString stdenv.isDarwin '' - # remove this override in 1.15 that will enable to set the CMAKE_CXX_STANDARD with cmakeFlags - substituteInPlace CMakeLists.txt \ - --replace 'CMAKE_CXX_STANDARD 11' 'CMAKE_CXX_STANDARD 14' ''; preConfigure = '' diff --git a/pkgs/development/python-modules/opensearch-py/default.nix b/pkgs/development/python-modules/opensearch-py/default.nix index ce61a587cd6..3f2c965cbbc 100644 --- a/pkgs/development/python-modules/opensearch-py/default.nix +++ b/pkgs/development/python-modules/opensearch-py/default.nix @@ -1,53 +1,81 @@ -{ aiohttp -, botocore +{ lib , buildPythonPackage -, certifi , fetchFromGitHub -, lib + +# build-system +, setuptools + +# dependencies +, certifi +, python-dateutil +, requests +, six +, urllib3 + +# optional-dependencies +, aiohttp + +# tests +, botocore , mock , pytest-asyncio +, pytest-mock , pytestCheckHook , pyyaml -, requests -, urllib3 +, pytz }: buildPythonPackage rec { pname = "opensearch-py"; - version = "2.3.2"; - format = "setuptools"; + version = "2.4.1"; + pyproject = true; src = fetchFromGitHub { owner = "opensearch-project"; repo = "opensearch-py"; rev = "refs/tags/v${version}"; - hash = "sha256-MkrYCi/iz1OqqrwCZknfcZSEyZNPj+CZFiMycJQk+aQ="; + hash = "sha256-nfKUJjB3yAUGiCSLK3xXHQmtDenVZpLjgICR2hMv1aA="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ - botocore certifi + python-dateutil requests + six urllib3 ]; + passthru.optional-dependencies.async = [ + aiohttp + ]; + nativeCheckInputs = [ + botocore mock pytest-asyncio + pytest-mock pytestCheckHook pyyaml + pytz ] ++ passthru.optional-dependencies.async; disabledTestPaths = [ # require network "test_opensearchpy/test_async/test_connection.py" "test_opensearchpy/test_async/test_server" - "test_opensearchpy/test_connection.py" "test_opensearchpy/test_server" "test_opensearchpy/test_server_secured" ]; - passthru.optional-dependencies.async = [ aiohttp ]; + disabledTests = [ + # finds our ca-bundle, but expects something else (/path/to/clientcert/dir or None) + "test_ca_certs_ssl_cert_dir" + "test_no_ca_certs" + ]; meta = { description = "Python low-level client for OpenSearch"; diff --git a/pkgs/development/python-modules/opensensemap-api/default.nix b/pkgs/development/python-modules/opensensemap-api/default.nix index 4cce64c4300..326f7d2aced 100644 --- a/pkgs/development/python-modules/opensensemap-api/default.nix +++ b/pkgs/development/python-modules/opensensemap-api/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "opensensemap-api"; - version = "0.3.0"; + version = "0.3.1"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-lz2G7vXUadhTFgfHpIq9kHfojf+iytjitFZZ7rgqeO8="; + hash = "sha256-UrgQjZYw7TlFvhnaI7wFUpuUYeVKO5hsnx8h1OKfV8w="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/orjson/default.nix b/pkgs/development/python-modules/orjson/default.nix index 5297cb920d3..fb81938bc09 100644 --- a/pkgs/development/python-modules/orjson/default.nix +++ b/pkgs/development/python-modules/orjson/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "orjson"; - version = "3.9.7"; + version = "3.9.10"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,13 +25,13 @@ buildPythonPackage rec { owner = "ijl"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-VkCwvksUtgvFLSMy2fHLxrpZjcWYhincSM4fX/Gwl0I="; + hash = "sha256-MkcuayNDt7/GcswXoFTvzuaZzhQEQV+V7OfKqgJwVIQ="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-IwWbd7LE/t1UEo/bdC0bXl2K8hYyvDPbyHLBIurfb/8="; + hash = "sha256-2eRV+oZQvsWWJ4AUTeuE0CHtTHC6jNZiX/y5uXuwvns="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/oslo-log/default.nix b/pkgs/development/python-modules/oslo-log/default.nix index 85f92e47835..64df3dc82e4 100644 --- a/pkgs/development/python-modules/oslo-log/default.nix +++ b/pkgs/development/python-modules/oslo-log/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "oslo-log"; - version = "5.3.0"; + version = "5.4.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "oslo.log"; inherit version; - hash = "sha256-zJSqvbUOHiVxxsvEs5lpSgVBV2c1kIqYSgIjqeH72z4="; + hash = "sha256-LrNVtYVw8lgR2nb6gUU7h1x8lEoZoj0sMFtKTf670iM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/owslib/default.nix b/pkgs/development/python-modules/owslib/default.nix index d902af2c26f..5e5e5a07b9c 100644 --- a/pkgs/development/python-modules/owslib/default.nix +++ b/pkgs/development/python-modules/owslib/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "owslib"; - version = "0.29.2"; + version = "0.29.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "geopython"; repo = "OWSLib"; rev = "refs/tags/${version}"; - hash = "sha256-dbL4VdnPszwiDO+UjluuyqeBRMKojTnZPEFKEYiIWS0="; + hash = "sha256-yAJXknSsGXcerzaOVSrFO4j5E6B/4/0JfoSxZ+Szmws="; }; postPatch = '' @@ -63,6 +63,8 @@ buildPythonPackage rec { "test_wmts_example_informatievlaanderen" "test_opensearch_creodias" ] ++ lib.optionals stdenv.isDarwin [ + "test_ogcapi_processes_pygeoapi" + "test_ogcapi_records_pycsw" "test_ogcapi_records_pygeoapi" "test_wms_getfeatureinfo_130" ]; @@ -70,7 +72,7 @@ buildPythonPackage rec { meta = with lib; { description = "Client for Open Geospatial Consortium web service interface standards"; homepage = "https://www.osgeo.org/projects/owslib/"; - changelog = "https://github.com/geopython/OWSLib/blob/${version}/CHANGES.rst"; + changelog = "https://github.com/geopython/OWSLib/releases/tag/${version}"; license = licenses.bsd3; maintainers = teams.geospatial.members; }; diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix index d044c76ae8d..588dae7b784 100644 --- a/pkgs/development/python-modules/pandas/default.nix +++ b/pkgs/development/python-modules/pandas/default.nix @@ -65,27 +65,22 @@ buildPythonPackage rec { pname = "pandas"; - version = "2.1.0"; - format = "pyproject"; + version = "2.1.1"; + pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "pandas-dev"; repo = "pandas"; rev = "refs/tags/v${version}"; - hash = "sha256-QwMW/qc1n51DaVhUnIaG0bdOvDitvvPh6ftoDawiYlc="; + hash = "sha256-6SgW4BtO7EFnS8P8LL4AGk5EdPwOQ0+is0wXgqsm9w0="; }; - patches = [ - # https://github.com/pandas-dev/pandas/issues/54888#issuecomment-1701186809 - ./installer-fix.patch - ]; - postPatch = '' substituteInPlace pyproject.toml \ --replace "meson-python==0.13.1" "meson-python>=0.13.1" \ - --replace "meson==1.0.1" "meson>=1.0.1" + --replace "meson==1.2.1" "meson>=1.2.1" ''; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pandas/installer-fix.patch b/pkgs/development/python-modules/pandas/installer-fix.patch deleted file mode 100644 index b1659c9dbb3..00000000000 --- a/pkgs/development/python-modules/pandas/installer-fix.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/pandas/_libs/meson.build b/pandas/_libs/meson.build -index f302c649bc..ddce9ea2d6 100644 ---- a/pandas/_libs/meson.build -+++ b/pandas/_libs/meson.build -@@ -113,8 +113,4 @@ foreach ext_name, ext_dict : libs_sources - ) - endforeach - --py.install_sources('__init__.py', -- pure: false, -- subdir: 'pandas/_libs') -- - subdir('window') -diff --git a/pandas/_libs/tslibs/meson.build b/pandas/_libs/tslibs/meson.build -index 14d2eef46d..a862345c3a 100644 ---- a/pandas/_libs/tslibs/meson.build -+++ b/pandas/_libs/tslibs/meson.build -@@ -30,7 +30,3 @@ foreach ext_name, ext_dict : tslibs_sources - install: true - ) - endforeach -- --py.install_sources('__init__.py', -- pure: false, -- subdir: 'pandas/_libs/tslibs') diff --git a/pkgs/development/python-modules/pcbnew-transition/default.nix b/pkgs/development/python-modules/pcbnew-transition/default.nix new file mode 100644 index 00000000000..2ac478308cd --- /dev/null +++ b/pkgs/development/python-modules/pcbnew-transition/default.nix @@ -0,0 +1,39 @@ +{ pythonOlder +, buildPythonPackage +, fetchPypi +, lib +, kicad +, versioneer +}: +buildPythonPackage rec { + pname = "pcbnewTransition"; + version = "0.3.4"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-3CJUG1kd63Lg0r9HpJRIvttHS5s2EuZRoxeXrqsJ/kQ="; + }; + + propagatedBuildInputs = [ + kicad + ]; + + nativeBuildInputs = [ + versioneer + ]; + + pythonImportsCheck = [ + "pcbnewTransition" + ]; + + meta = with lib; { + description = "Library that allows you to support both, KiCad 5, 6 and 7 in your plugins"; + homepage = "https://github.com/yaqwsx/pcbnewTransition"; + changelog = "https://github.com/yaqwsx/pcbnewTransition/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ jfly matusf ]; + }; +} diff --git a/pkgs/development/python-modules/pegen/default.nix b/pkgs/development/python-modules/pegen/default.nix index d002cda74d8..2a7a3062741 100644 --- a/pkgs/development/python-modules/pegen/default.nix +++ b/pkgs/development/python-modules/pegen/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pegen"; - version = "0.2.0"; + version = "0.3.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "we-like-parsers"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-5nxOMgkDAkHtVFSNXf0SPoag6/E7b97eVnFoAqyJE3g="; + hash = "sha256-P4zX8za9lBlXhNPkQe9p136ggZEJh6fHfBr+DQKvtTg="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/pikepdf/default.nix b/pkgs/development/python-modules/pikepdf/default.nix index 01884677f26..0891ad28ec3 100644 --- a/pkgs/development/python-modules/pikepdf/default.nix +++ b/pkgs/development/python-modules/pikepdf/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "pikepdf"; - version = "8.3.0"; + version = "8.4.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -39,7 +39,7 @@ buildPythonPackage rec { postFetch = '' rm "$out/.git_archival.txt" ''; - hash = "sha256-d76s4iJFwhzWSySXTS53PQQuWfWIboIRecEyjzobsME="; + hash = "sha256-48tb5bhmBdKVjMld07303qIi5C16yaf+5TpRPVC6EQk="; }; patches = [ diff --git a/pkgs/development/python-modules/pillow-heif/default.nix b/pkgs/development/python-modules/pillow-heif/default.nix index 198e7ff2ff3..1d0505e22ed 100644 --- a/pkgs/development/python-modules/pillow-heif/default.nix +++ b/pkgs/development/python-modules/pillow-heif/default.nix @@ -35,6 +35,10 @@ buildPythonPackage rec { hash = "sha256-GbOW29rGpLMS7AfShuO6UCzcspdHtFS7hyNKori0otI="; }; + postPatch = '' + sed -i '/addopts/d' pyproject.toml + ''; + nativeBuildInputs = [ cmake nasm @@ -68,6 +72,15 @@ buildPythonPackage rec { # https://github.com/bigcat88/pillow_heif/issues/89 # not reproducible in nixpkgs "test_opencv_crash" + ] ++ lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ + # RuntimeError: Encoder plugin generated an error: Unsupported bit depth: Bit depth not supported by x265 + "test_open_heif_compare_non_standard_modes_data" + "test_open_save_disable_16bit" + "test_save_bgr_16bit_to_10_12_bit" + "test_save_bgra_16bit_to_10_12_bit" + "test_premultiplied_alpha" + "test_hdr_save" + "test_I_color_modes_to_10_12_bit" ]; meta = { diff --git a/pkgs/development/python-modules/pillow/default.nix b/pkgs/development/python-modules/pillow/default.nix index ebfcdd8d557..3b5dffb42cf 100644 --- a/pkgs/development/python-modules/pillow/default.nix +++ b/pkgs/development/python-modules/pillow/default.nix @@ -12,7 +12,7 @@ import ./generic.nix (rec { pname = "pillow"; - version = "10.0.1"; + version = "10.1.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ import ./generic.nix (rec { src = fetchPypi { pname = "Pillow"; inherit version; - hash = "sha256-1ylnsGvpMA/tXPvItbr87sSL983H2rZrHSVJA1KHGR0="; + hash = "sha256-5r+N5sNu2WyG6jtuHVJzxT9G71GKBiRkzX713Sz5Ljg="; }; passthru.tests = { diff --git a/pkgs/development/python-modules/pixel-ring/default.nix b/pkgs/development/python-modules/pixel-ring/default.nix new file mode 100644 index 00000000000..c88715270bd --- /dev/null +++ b/pkgs/development/python-modules/pixel-ring/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, wheel +, pyusb +, spidev +}: + +buildPythonPackage rec { + pname = "pixel-ring"; + version = "0.1.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "respeaker"; + repo = "pixel_ring"; + rev = version; + hash = "sha256-J9kScjD6Xon0YWGxFU881bIbjmDpY7cnWzJ8G0SOKaw="; + }; + + nativeBuildInputs = [ + setuptools + wheel + ]; + + propagatedBuildInputs = [ + pyusb + spidev + ]; + + dontUsePythonImportsCheck = true; # requires SPI access + + doCheck = false; # no tests + + meta = with lib; { + description = "RGB LED library for ReSpeaker 4 Mic Array, ReSpeaker V2 & ReSpeaker USB 6+1 Mic Array"; + homepage = "https://github.com/respeaker/pixel_ring/tree/master"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/development/python-modules/pkgconfig/default.nix b/pkgs/development/python-modules/pkgconfig/default.nix index b5fc0c4499c..89fc2fd32f7 100644 --- a/pkgs/development/python-modules/pkgconfig/default.nix +++ b/pkgs/development/python-modules/pkgconfig/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, pythonOlder , poetry-core , pkg-config , pytestCheckHook @@ -37,6 +38,10 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry-core ]; + # ModuleNotFoundError: No module named 'distutils' + # https://github.com/matze/pkgconfig/issues/64 + doCheck = pythonOlder "3.12"; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "pkgconfig" ]; diff --git a/pkgs/development/python-modules/plexapi/default.nix b/pkgs/development/python-modules/plexapi/default.nix index fc177fc433c..47ce92cc68f 100644 --- a/pkgs/development/python-modules/plexapi/default.nix +++ b/pkgs/development/python-modules/plexapi/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "plexapi"; - version = "4.15.5"; + version = "4.15.6"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "pkkid"; repo = "python-plexapi"; rev = "refs/tags/${version}"; - hash = "sha256-kguy8sZtc8vHuWWqQqPPuDE5DgyWs/H62yxjv5VabFY="; + hash = "sha256-VU1HVAxAOraTd4VQIqG/MLkw77xciCICIh1zbzGn/dQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pluggy/default.nix b/pkgs/development/python-modules/pluggy/default.nix index e6473e98a28..1128d1c69ea 100644 --- a/pkgs/development/python-modules/pluggy/default.nix +++ b/pkgs/development/python-modules/pluggy/default.nix @@ -9,24 +9,23 @@ buildPythonPackage rec { pname = "pluggy"; - version = "1.2.0"; + version = "1.3.0"; + + disabled = pythonOlder "3.8"; + format = "pyproject"; src = fetchFromGitHub { owner = "pytest-dev"; repo = "pluggy"; rev = "refs/tags/${version}"; - hash = "sha256-SzJu7ITdmUgusn8sz6fRBpxTMQncWIViP5NCAj4q4GM="; + hash = "sha256-jLasnqmATIOoheGu90Wo1+iTCwslYzNOKckqHIZDJec="; }; nativeBuildInputs = [ setuptools-scm ]; env.SETUPTOOLS_SCM_PRETEND_VERSION = version; - propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ - importlib-metadata - ]; - # To prevent infinite recursion with pytest doCheck = false; passthru.tests = { diff --git a/pkgs/development/python-modules/plugwise/default.nix b/pkgs/development/python-modules/plugwise/default.nix index 0802156dcd3..14e77c816b8 100644 --- a/pkgs/development/python-modules/plugwise/default.nix +++ b/pkgs/development/python-modules/plugwise/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "plugwise"; - version = "0.34.5"; + version = "0.35.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = pname; repo = "python-plugwise"; rev = "refs/tags/v${version}"; - hash = "sha256-Lg8oNFb0nc6T8E0fksv2w/bkHB/7PPXipMDGC0i8Kc0="; + hash = "sha256-eHJQXLiuWmJo/Eo4B8gEo44rwpPA7ASjxKSmdu6Tv9M="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/protobuf/3.nix b/pkgs/development/python-modules/protobuf/3.nix new file mode 100644 index 00000000000..d9e3cce5f91 --- /dev/null +++ b/pkgs/development/python-modules/protobuf/3.nix @@ -0,0 +1,90 @@ +{ buildPackages +, buildPythonPackage +, fetchpatch +, isPyPy +, lib +, protobuf +, pytestCheckHook +, pythonAtLeast +, tzdata +}: + +assert lib.versionAtLeast protobuf.version "3.21" -> throw "Protobuf 3.20 or older required"; + +buildPythonPackage { + inherit (protobuf) pname src; + + version = protobuf.version; + + sourceRoot = "${protobuf.src.name}/python"; + + patches = lib.optionals (pythonAtLeast "3.11") [ + (fetchpatch { + name = "support-python311.patch"; + url = "https://github.com/protocolbuffers/protobuf/commit/2206b63c4649cf2e8a06b66c9191c8ef862ca519.diff"; + stripLen = 1; # because sourceRoot above + hash = "sha256-3GaoEyZIhS3QONq8LEvJCH5TdO9PKnOgcQF0GlEiwFo="; + }) + ]; + + prePatch = '' + if [[ "$(<../version.json)" != *'"python": "'"$version"'"'* ]]; then + echo "Python library version mismatch. Derivation version: $version, actual: $(<../version.json)" + exit 1 + fi + ''; + + # Remove the line in setup.py that forces compiling with C++14. Upstream's + # CMake build has been updated to support compiling with other versions of + # C++, but the Python build has not. Without this, we observe compile-time + # errors using GCC. + # + # Fedora appears to do the same, per this comment: + # + # https://github.com/protocolbuffers/protobuf/issues/12104#issuecomment-1542543967 + # + postPatch = '' + sed -i "/extra_compile_args.append('-std=c++14')/d" setup.py + ''; + + nativeBuildInputs = lib.optional isPyPy tzdata; + + buildInputs = [ protobuf ]; + + propagatedNativeBuildInputs = [ + # For protoc of the same version. + buildPackages."protobuf${lib.versions.major protobuf.version}_${lib.versions.minor protobuf.version}" + ]; + + setupPyGlobalFlags = [ "--cpp_implementation" ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + disabledTests = lib.optionals isPyPy [ + # error message differs + "testInvalidTimestamp" + # requires tracemalloc which pypy does not implement + # https://foss.heptapod.net/pypy/pypy/-/issues/3048 + "testUnknownFieldsNoMemoryLeak" + # assertion is not raised for some reason + "testStrictUtf8Check" + ]; + + pythonImportsCheck = [ + "google.protobuf" + "google.protobuf.internal._api_implementation" # Verify that --cpp_implementation worked + ]; + + passthru = { + inherit protobuf; + }; + + meta = with lib; { + description = "Protocol Buffers are Google's data interchange format"; + homepage = "https://developers.google.com/protocol-buffers/"; + license = licenses.bsd3; + maintainers = with maintainers; [ knedlsepp ]; + }; +} diff --git a/pkgs/development/python-modules/protobuf/default.nix b/pkgs/development/python-modules/protobuf/default.nix index 2676dc90d68..3a42754de77 100644 --- a/pkgs/development/python-modules/protobuf/default.nix +++ b/pkgs/development/python-modules/protobuf/default.nix @@ -11,30 +11,28 @@ , tzdata }: +assert lib.versionOlder protobuf.version "21" -> throw "Protobuf 21 or newer required"; + let - versionMajor = lib.versions.major protobuf.version; - versionMinor = lib.versions.minor protobuf.version; - versionPatch = lib.versions.patch protobuf.version; + protobufVersionMajor = lib.versions.major protobuf.version; + protobufVersionMinor = lib.versions.minor protobuf.version; in buildPythonPackage { inherit (protobuf) pname src; - # protobuf 3.21 corresponds with its python library 4.21 - version = - if lib.versionAtLeast protobuf.version "3.21" - then "${toString (lib.toInt versionMajor + 1)}.${versionMinor}.${versionPatch}" - else protobuf.version; + # protobuf 21 corresponds with its python library 4.21 + version = "4.${protobufVersionMajor}.${protobufVersionMinor}"; sourceRoot = "${protobuf.src.name}/python"; - patches = lib.optionals (lib.versionAtLeast protobuf.version "3.22") [ + patches = lib.optionals (lib.versionAtLeast protobuf.version "22") [ # Replace the vendored abseil-cpp with nixpkgs' (substituteAll { src = ./use-nixpkgs-abseil-cpp.patch; abseil_cpp_include_path = "${lib.getDev protobuf.abseil-cpp}/include"; }) ] - ++ lib.optionals (pythonAtLeast "3.11" && lib.versionOlder protobuf.version "3.22") [ + ++ lib.optionals (pythonAtLeast "3.11" && lib.versionOlder protobuf.version "22") [ (fetchpatch { name = "support-python311.patch"; url = "https://github.com/protocolbuffers/protobuf/commit/2206b63c4649cf2e8a06b66c9191c8ef862ca519.diff"; @@ -69,14 +67,14 @@ buildPythonPackage { propagatedNativeBuildInputs = [ # For protoc of the same version. - buildPackages."protobuf${lib.versions.major protobuf.version}_${lib.versions.minor protobuf.version}" + buildPackages."protobuf_${protobufVersionMajor}" ]; setupPyGlobalFlags = [ "--cpp_implementation" ]; nativeCheckInputs = [ pytestCheckHook - ] ++ lib.optionals (lib.versionAtLeast protobuf.version "3.22") [ + ] ++ lib.optionals (lib.versionAtLeast protobuf.version "22") [ numpy ]; @@ -90,7 +88,7 @@ buildPythonPackage { "testStrictUtf8Check" ]; - disabledTestPaths = lib.optionals (lib.versionAtLeast protobuf.version "3.23") [ + disabledTestPaths = lib.optionals (lib.versionAtLeast protobuf.version "23") [ # The following commit (I think) added some internal test logic for Google # that broke generator_test.py. There is a new proto file that setup.py is # not generating into a .py file. However, adding this breaks a bunch of diff --git a/pkgs/development/python-modules/psutil/default.nix b/pkgs/development/python-modules/psutil/default.nix index 015e82de857..a08ff4c7a69 100644 --- a/pkgs/development/python-modules/psutil/default.nix +++ b/pkgs/development/python-modules/psutil/default.nix @@ -11,14 +11,16 @@ buildPythonPackage rec { pname = "psutil"; - version = "5.9.5"; + version = "5.9.6"; format = "setuptools"; + inherit stdenv; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-VBBjjk3znFTZV/xRzgMEis2ObWCrwPUQevUeX7Vm6zw="; + hash = "sha256-5Lkt3NfdTN0/kAGA6h4QSTLHvOI0+4iXbio7KWRBIlo="; }; buildInputs = diff --git a/pkgs/development/python-modules/psycopg/default.nix b/pkgs/development/python-modules/psycopg/default.nix index 65156543e87..24063596918 100644 --- a/pkgs/development/python-modules/psycopg/default.nix +++ b/pkgs/development/python-modules/psycopg/default.nix @@ -50,6 +50,14 @@ let libpq = "${postgresql.lib}/lib/libpq${stdenv.hostPlatform.extensions.sharedLibrary}"; libc = "${stdenv.cc.libc}/lib/libc.so.6"; }) + + # https://github.com/psycopg/psycopg/pull/669 + # mark some tests as timing remove on next version update + (fetchpatch { + name = "mark_tests_as_timing.patch"; + url = "https://github.com/psycopg/psycopg/commit/00a3c640dd836328ba15931b400b012171f648c2.patch"; + hash = "sha256-DoVZv1yy9gHOKl0AdVLir+C+UztJZVjboLhS5af2944="; + }) ]; baseMeta = { diff --git a/pkgs/development/python-modules/psycopg2/default.nix b/pkgs/development/python-modules/psycopg2/default.nix index bfe33e1ec3a..43a06e5a9e4 100644 --- a/pkgs/development/python-modules/psycopg2/default.nix +++ b/pkgs/development/python-modules/psycopg2/default.nix @@ -8,6 +8,7 @@ , openssl , sphinxHook , sphinx-better-theme +, buildPackages }: buildPythonPackage rec { @@ -19,20 +20,29 @@ buildPythonPackage rec { # c.f. https://github.com/NixOS/nixpkgs/pull/104151#issuecomment-729750892 disabled = pythonOlder "3.6" || isPyPy; + outputs = [ "out" "doc" ]; + src = fetchPypi { inherit pname version; hash = "sha256-8AzDW9cRnx/tF7hb0QB4VRlN3iy9jeAauOuxdIdECtg="; }; - outputs = [ "out" "doc" ]; + postPatch = '' + # Preferably upstream would not depend on pg_config because config scripts are incompatible with cross-compilation, however postgresql's pc file is lacking information. + # some linker flags are added but the linker ignores them because they're incompatible + # https://github.com/psycopg/psycopg2/blob/89005ac5b849c6428c05660b23c5a266c96e677d/setup.py + substituteInPlace setup.py \ + --replace "self.pg_config_exe = self.build_ext.pg_config" 'self.pg_config_exe = "${lib.getExe' buildPackages.postgresql "pg_config"}"' + ''; nativeBuildInputs = [ - postgresql sphinxHook sphinx-better-theme ]; - buildInputs = lib.optionals stdenv.isDarwin [ + buildInputs = [ + postgresql + ] ++ lib.optionals stdenv.isDarwin [ openssl ]; @@ -45,6 +55,8 @@ buildPythonPackage rec { "psycopg2" ]; + disallowedReferences = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ buildPackages.postgresql ]; + meta = with lib; { description = "PostgreSQL database adapter for the Python programming language"; homepage = "https://www.psycopg.org"; diff --git a/pkgs/development/python-modules/psygnal/default.nix b/pkgs/development/python-modules/psygnal/default.nix index f9ea8ec99dc..36ae22a67b6 100644 --- a/pkgs/development/python-modules/psygnal/default.nix +++ b/pkgs/development/python-modules/psygnal/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "psygnal"; - version = "0.9.4"; + version = "0.9.5"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "pyapp-kit"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-1oy0gXHDAoCIPXAitQv6MRb3p2j89zBaZvpUni6wT8A="; + hash = "sha256-eDfGWmTKJrkkzRy1I3wl3WYPCxtPHSRzqAoOiO7QQ9Y="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/py-partiql-parser/default.nix b/pkgs/development/python-modules/py-partiql-parser/default.nix index 07855f6b328..56036d21c10 100644 --- a/pkgs/development/python-modules/py-partiql-parser/default.nix +++ b/pkgs/development/python-modules/py-partiql-parser/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "py-partiql-parser"; - version = "0.3.8"; + version = "0.4.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "getmoto"; repo = "py-partiql-parser"; rev = "refs/tags/${version}"; - hash = "sha256-uIO06RRuUuE9qCEg/tTcn68i7vaFAAeFhxdxW9WAbuw="; + hash = "sha256-gxoBc7PjS4EQix38VNX6u9cwy4FCjENcUN1euOJJLCo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/py-stringmatching/default.nix b/pkgs/development/python-modules/py-stringmatching/default.nix index 9a1af7c13cf..b5bdffca759 100644 --- a/pkgs/development/python-modules/py-stringmatching/default.nix +++ b/pkgs/development/python-modules/py-stringmatching/default.nix @@ -47,6 +47,5 @@ buildPythonPackage rec { homepage = "https://github.com/anhaidgroup/py_stringmatching"; changelog = "https://github.com/anhaidgroup/py_stringmatching/blob/v${version}/CHANGES.txt"; license = licenses.bsd3; - maintainers = with maintainers; [ ixxie ]; }; } diff --git a/pkgs/development/python-modules/pybars3/default.nix b/pkgs/development/python-modules/pybars3/default.nix new file mode 100644 index 00000000000..ad7294fd635 --- /dev/null +++ b/pkgs/development/python-modules/pybars3/default.nix @@ -0,0 +1,38 @@ +{ python3 +, fetchPypi +, lib +, pymeta3 +, buildPythonPackage +}: +buildPythonPackage rec { + pname = "pybars3"; + version = "0.9.7"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-ashH6QXlO5xbk2rxEskQR14nv3Z/efRSjBb5rx7A4lI="; + }; + + propagatedBuildInputs = [ + pymeta3 + ]; + + checkPhase = '' + runHook preCheck + ${python3.interpreter} tests.py + runHook postCheck + ''; + + pythonImportsCheck = [ + "pybars" + ]; + + meta = with lib; { + description = "Handlebars.js template support for Python 3 and 2"; + homepage = "https://github.com/wbond/pybars3"; + changelog = "https://github.com/wbond/pybars3/releases/tag/${version}"; + license = licenses.lgpl3Only; + maintainers = with maintainers; [ jfly matusf ]; + }; +} diff --git a/pkgs/development/python-modules/pybind11/default.nix b/pkgs/development/python-modules/pybind11/default.nix index e2b216d1724..186dca2c17d 100644 --- a/pkgs/development/python-modules/pybind11/default.nix +++ b/pkgs/development/python-modules/pybind11/default.nix @@ -12,6 +12,7 @@ , pytestCheckHook , libxcrypt , makeSetupHook +, darwin }: let setupHook = makeSetupHook { name = "pybind11-setup-hook"; @@ -22,6 +23,19 @@ pythonSitePackages = "${python}/${python.sitePackages}"; }; } ./setup-hook.sh; + + # clang 16 defaults to C++17, which results in the use of aligned allocations by pybind11. + # libc++ supports aligned allocations via `posix_memalign`, which is available since 10.6, + # but clang has a check hard-coded requiring 10.13 because that’s when Apple first shipped a + # support for C++17 aligned allocations on macOS. + # Tell clang we’re targeting 10.13 on x86_64-darwin while continuing to use the default SDK. + stdenv' = if stdenv.isDarwin && stdenv.isx86_64 + then python.stdenv.override (oldStdenv: { + buildPlatform = oldStdenv.buildPlatform // { darwinMinVersion = "10.13"; }; + targetPlatform = oldStdenv.targetPlatform // { darwinMinVersion = "10.13"; }; + hostPlatform = oldStdenv.hostPlatform // { darwinMinVersion = "10.13"; }; + }) + else python.stdenv; in buildPythonPackage rec { pname = "pybind11"; version = "2.11.1"; @@ -41,6 +55,8 @@ in buildPythonPackage rec { buildInputs = lib.optionals (pythonOlder "3.9") [ libxcrypt ]; propagatedBuildInputs = [ setupHook ]; + stdenv = stdenv'; + dontUseCmakeBuildDir = true; # Don't build tests if not needed, read the doInstallCheck value at runtime diff --git a/pkgs/development/python-modules/pycyphal/default.nix b/pkgs/development/python-modules/pycyphal/default.nix new file mode 100644 index 00000000000..b5516bc144e --- /dev/null +++ b/pkgs/development/python-modules/pycyphal/default.nix @@ -0,0 +1,49 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, can +, cobs +, libpcap +, nunavut +, numpy +, pyserial +}: + +buildPythonPackage rec { + pname = "pycyphal"; + version = "1.15.2"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-KVX+DwcJp1sjpcG1Utl9me1LwWDZPof+O6hoUt1xlXA="; + }; + + propagatedBuildInputs = [ + can + cobs + libpcap + numpy + nunavut + pyserial + ]; + + # Can't seem to run the tests on nix + doCheck = false; + pythonImportsCheck = [ + "pycyphal" + ]; + + meta = with lib; { + description = "A full-featured implementation of the Cyphal protocol stack in Python"; + longDescription = '' + Cyphal is an open technology for real-time intravehicular distributed computing and communication based on modern networking standards (Ethernet, CAN FD, etc.). + ''; + homepage = "https://opencyphal.org/"; + license = licenses.mit; + maintainers = [ teams.ororatech ]; + }; +} diff --git a/pkgs/development/python-modules/pydicom/default.nix b/pkgs/development/python-modules/pydicom/default.nix index 11114257714..ddb4482ef3e 100644 --- a/pkgs/development/python-modules/pydicom/default.nix +++ b/pkgs/development/python-modules/pydicom/default.nix @@ -36,6 +36,11 @@ buildPythonPackage { format = "setuptools"; + patches = [ + # backport of https://github.com/pydicom/pydicom/commit/2513a20cc41743a42bdb86f4cbb4873899b7823c + ./pillow-10.1.0-compat.patch + ]; + propagatedBuildInputs = [ numpy pillow diff --git a/pkgs/development/python-modules/pydicom/pillow-10.1.0-compat.patch b/pkgs/development/python-modules/pydicom/pillow-10.1.0-compat.patch new file mode 100644 index 00000000000..2599f955f7d --- /dev/null +++ b/pkgs/development/python-modules/pydicom/pillow-10.1.0-compat.patch @@ -0,0 +1,29 @@ +diff --git a/pydicom/pixel_data_handlers/pillow_handler.py b/pydicom/pixel_data_handlers/pillow_handler.py +index ff781025d..a44eb9a41 100644 +--- a/pydicom/pixel_data_handlers/pillow_handler.py ++++ b/pydicom/pixel_data_handlers/pillow_handler.py +@@ -119,18 +119,12 @@ def _decompress_single_frame( + # space prior to compression, setting the value of "mode" to YCbCr + # signals Pillow to not apply any color transformation upon + # decompression. +- if (transfer_syntax in PillowJPEGTransferSyntaxes and +- photometric_interpretation == 'RGB'): +- if 'adobe_transform' not in image.info: +- color_mode = 'YCbCr' +- image.tile = [( +- 'jpeg', +- image.tile[0][1], +- image.tile[0][2], +- (color_mode, ''), +- )] +- image.mode = color_mode +- image.rawmode = color_mode ++ if ( ++ transfer_syntax in PillowJPEGTransferSyntaxes ++ and photometric_interpretation == 'RGB' ++ and "adobe_transform" not in image.info ++ ): ++ image.draft("YCbCr", image.size) + return image + + diff --git a/pkgs/development/python-modules/pygame/default.nix b/pkgs/development/python-modules/pygame/default.nix index 5352ef65d7f..ad506999d59 100644 --- a/pkgs/development/python-modules/pygame/default.nix +++ b/pkgs/development/python-modules/pygame/default.nix @@ -60,6 +60,10 @@ buildPythonPackage rec { ${python.pythonOnBuildForHost.interpreter} buildconfig/config.py ''; + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-function-pointer-types"; + }; + checkPhase = '' runHook preCheck diff --git a/pkgs/development/python-modules/pygobject-stubs/default.nix b/pkgs/development/python-modules/pygobject-stubs/default.nix index f2c2668f404..9dde5d01222 100644 --- a/pkgs/development/python-modules/pygobject-stubs/default.nix +++ b/pkgs/development/python-modules/pygobject-stubs/default.nix @@ -1,25 +1,23 @@ { lib , buildPythonPackage , fetchFromGitHub -, setuptools -, black -, codespell -, isort -, mypy -, pre-commit , pygobject3 +, pythonOlder +, setuptools }: buildPythonPackage rec { pname = "pygobject-stubs"; - version = "2.9.0"; - format = "pyproject"; + version = "2.10.0"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "pygobject"; repo = "pygobject-stubs"; rev = "refs/tags/v${version}"; - hash = "sha256-A28vH5S5xxY7VIJORbgQ7jAi/wG4WiffNGryiumHWf0="; + hash = "sha256-fz+qzFWl9JJu9CEVkeiV6XUIPDvwWgrfhTo/nj1EH5c="; }; nativeBuildInputs = [ @@ -32,7 +30,7 @@ buildPythonPackage rec { meta = with lib; { description = "PEP 561 Typing Stubs for PyGObject"; homepage = "https://github.com/pygobject/pygobject-stubs"; - changelog = "https://github.com/pygobject/pygobject-stubs/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/pygobject/pygobject-stubs/blob/${version}/CHANGELOG.md"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ hacker1024 ]; }; diff --git a/pkgs/development/python-modules/pyinfra/default.nix b/pkgs/development/python-modules/pyinfra/default.nix index 57886181414..d21fcddc42e 100644 --- a/pkgs/development/python-modules/pyinfra/default.nix +++ b/pkgs/development/python-modules/pyinfra/default.nix @@ -5,6 +5,7 @@ , configparser , distro , fetchFromGitHub +, fetchpatch , gevent , jinja2 , paramiko @@ -30,6 +31,15 @@ buildPythonPackage rec { hash = "sha256-BYd2UYQJD/HsmpnlQjZvjfg17ShPuA3j4rtv6fTQK/A="; }; + patches = [ + # https://github.com/Fizzadar/pyinfra/pull/1018 + (fetchpatch { + name = "bump-paramiko-major-version.patch"; + url = "https://github.com/Fizzadar/pyinfra/commit/62a8f081279779c4f1eed246139f615cf5fed642.patch"; + hash = "sha256-aT9SeSqXOD76LFzf6R/MWTtavcW6fZT7chkVg9aXiBg="; + }) + ]; + propagatedBuildInputs = [ click colorama diff --git a/pkgs/development/python-modules/pyinsteon/default.nix b/pkgs/development/python-modules/pyinsteon/default.nix index 8980da8e24b..176e9fcd154 100644 --- a/pkgs/development/python-modules/pyinsteon/default.nix +++ b/pkgs/development/python-modules/pyinsteon/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pyinsteon"; - version = "1.5.1"; + version = "1.5.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-H2rgPA0GW6neFIHZVZxmAP50HJUPCWDZcJ90QxLGXJ8="; + hash = "sha256-7iiB/a8E8E2TSkGuAWR08ESExDz8DKTMjqp4Xnp3wHU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pymeta3/default.nix b/pkgs/development/python-modules/pymeta3/default.nix new file mode 100644 index 00000000000..f0350c4153b --- /dev/null +++ b/pkgs/development/python-modules/pymeta3/default.nix @@ -0,0 +1,29 @@ +{ buildPythonPackage +, fetchPypi +, lib +}: +buildPythonPackage rec { + pname = "pymeta3"; + version = "0.5.1"; + format = "setuptools"; + + src = fetchPypi { + inherit version; + pname = "PyMeta3"; + hash = "sha256-GL2jJtmpu/WHv8DuC8loZJZNeLBnKIvPVdTZhoHQW8s="; + }; + + doCheck = false; # Tests do not support Python3 + + pythonImportsCheck = [ + "pymeta" + ]; + + meta = with lib; { + description = "Pattern-matching language based on OMeta for Python 3 and 2"; + homepage = "https://github.com/wbond/pymeta3"; + changelog = "https://github.com/wbond/pymeta3/releases/tag/${version}"; + license = licenses.mit; + maintainers = with maintainers; [ jfly matusf ]; + }; +} diff --git a/pkgs/development/python-modules/pympler/default.nix b/pkgs/development/python-modules/pympler/default.nix index 9b801e42c8a..463de728aea 100644 --- a/pkgs/development/python-modules/pympler/default.nix +++ b/pkgs/development/python-modules/pympler/default.nix @@ -19,9 +19,10 @@ buildPythonPackage rec { patches = [ # Fixes a TypeError on Python 3.11 # (see https://github.com/pympler/pympler/issues/148) + # https://github.com/pympler/pympler/pull/149 (fetchpatch { name = "${pname}-python-3.11-compat.patch"; - url = "https://github.com/pympler/pympler/pull/149.patch"; + url = "https://github.com/pympler/pympler/commit/0fd8ad8da39207bd0dcb28bdac0407e04744c965.patch"; hash = "sha256-6MK0AuhVhQkUzlk29HUh1+mSbfsVTBJ1YBtYNIFhh7U="; }) ]; diff --git a/pkgs/development/python-modules/pymupdf/default.nix b/pkgs/development/python-modules/pymupdf/default.nix index d7e69706e51..1c21e6b90c1 100644 --- a/pkgs/development/python-modules/pymupdf/default.nix +++ b/pkgs/development/python-modules/pymupdf/default.nix @@ -2,9 +2,10 @@ , stdenv , buildPythonPackage , pythonOlder -, fetchPypi +, fetchFromGitHub +, pytestCheckHook +, python , swig -, xcbuild , mupdf , freetype , harfbuzz @@ -13,33 +14,32 @@ , libjpeg_turbo , gumbo , memstreamHook +, fonttools }: -buildPythonPackage rec { +let + # PyMuPDF needs the C++ bindings generated + mupdf-cxx = mupdf.override { enableOcr = true; enableCxx = true; enablePython = true; python3 = python; }; +in buildPythonPackage rec { pname = "pymupdf"; - version = "1.23.3"; + version = "1.23.6"; format = "setuptools"; disabled = pythonOlder "3.7"; - src = fetchPypi { - pname = "PyMuPDF"; - inherit version; - hash = "sha256-AhR4rmx26IWSQdu5cGEskIColX2L1pe7oLRTHcHPT4c="; + src = fetchFromGitHub { + owner = "pymupdf"; + repo = "PyMuPDF"; + rev = version; + hash = "sha256-60KT5+EGP+s7HD4UIeaf9x2QVNU9IUbC5WKEJbrIBCI="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace '/usr/include/mupdf' ${mupdf.dev}/include/mupdf - ''; nativeBuildInputs = [ + pytestCheckHook swig - ] ++ lib.optionals stdenv.isDarwin [ - xcbuild ]; buildInputs = [ - mupdf freetype harfbuzz openjpeg @@ -50,10 +50,40 @@ buildPythonPackage rec { memstreamHook ]; - doCheck = false; + propagatedBuildInputs = [ + mupdf-cxx + ]; + + env = { + # force using system MuPDF (must be defined in environment and empty) + PYMUPDF_SETUP_MUPDF_BUILD = ""; + # provide MuPDF paths + PYMUPDF_MUPDF_LIB = "${lib.getLib mupdf-cxx}/lib"; + PYMUPDF_MUPDF_INCLUDE = "${lib.getDev mupdf-cxx}/include"; + }; + + # TODO: manually add mupdf rpath until upstream fixes it + postInstall = lib.optionalString stdenv.isDarwin '' + for lib in */*.so $out/${python.sitePackages}/*/*.so; do + install_name_tool -add_rpath ${lib.getLib mupdf-cxx}/lib "$lib" + done + ''; + + checkInputs = [ + fonttools + ]; + + disabledTests = [ + # fails for indeterminate reasons + "test_color_count" + ] ++ lib.optionals stdenv.isDarwin [ + # darwin does not support OCR right now + "test_tesseract" + ]; pythonImportsCheck = [ "fitz" + "fitz_new" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/pyngrok/default.nix b/pkgs/development/python-modules/pyngrok/default.nix index 251c08f0260..bd3931e4f1d 100644 --- a/pkgs/development/python-modules/pyngrok/default.nix +++ b/pkgs/development/python-modules/pyngrok/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pyngrok"; - version = "7.0.0"; + version = "7.0.1"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-YOE9t/W4LsZqBFMbJRbyB6oQqrqW02iecqQYR6yZfV8="; + hash = "sha256-wTK0DnsZBbB9nHMe8hUQjMl3sbv0RaFGiU4NSJshPrY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pynvim-pp/default.nix b/pkgs/development/python-modules/pynvim-pp/default.nix index af2dbc27d63..0f69b51e65d 100644 --- a/pkgs/development/python-modules/pynvim-pp/default.nix +++ b/pkgs/development/python-modules/pynvim-pp/default.nix @@ -7,15 +7,14 @@ buildPythonPackage { pname = "pynvim-pp"; - version = "unstable-2023-07-09"; - - format = "pyproject"; + version = "unstable-2023-08-03"; + pyproject = true; src = fetchFromGitHub { owner = "ms-jpq"; repo = "pynvim_pp"; - rev = "93aa25bf3ee039c4eb85f402d6adf6977033013b"; - hash = "sha256-gZvIiFpP+eMLD8/xodY7ywWxhWXtethXviVRedW/bgo="; + rev = "40d0f6053ddbba61f53505eebb0290cfb661661b"; + hash = "sha256-4jeYE9HL+PQZuJq5nyf9CgL4UrRWm3ifLL/vfygLOwc="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyopenssl/default.nix b/pkgs/development/python-modules/pyopenssl/default.nix index 4e67fd0783d..bc841cc2fd4 100644 --- a/pkgs/development/python-modules/pyopenssl/default.nix +++ b/pkgs/development/python-modules/pyopenssl/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { postPatch = '' # remove cryptography pin - sed "/cryptography/ s/,<[0-9]*//g" setup.py + sed -i "/cryptography/ s/,<[0-9]*//g" setup.py ''; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyoverkiz/default.nix b/pkgs/development/python-modules/pyoverkiz/default.nix index 29c131a12f9..31d8adb3b62 100644 --- a/pkgs/development/python-modules/pyoverkiz/default.nix +++ b/pkgs/development/python-modules/pyoverkiz/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pyoverkiz"; - version = "1.13.1"; + version = "1.13.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "iMicknl"; repo = "python-overkiz-api"; rev = "refs/tags/v${version}"; - hash = "sha256-55oqrVjvbdwNn5S3YQVU3saWtFHhoUCcyW9VzXs87YM="; + hash = "sha256-WGFRZhnlTDC9uv9N4sKznIdgjBwpnuT9Gsa8hdlnPAE="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pyperf/default.nix b/pkgs/development/python-modules/pyperf/default.nix index fc87620c6b9..16ff853422b 100644 --- a/pkgs/development/python-modules/pyperf/default.nix +++ b/pkgs/development/python-modules/pyperf/default.nix @@ -1,30 +1,26 @@ { lib , buildPythonPackage , fetchPypi -, fetchpatch , pythonOlder , psutil , unittestCheckHook +, setuptools }: buildPythonPackage rec { pname = "pyperf"; - version = "2.6.1"; - format = "setuptools"; + version = "2.6.2"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-Fxrqabjv3mEhDlEhZth2Tndlqcdni3aAUhdLAfNJ8kc="; + hash = "sha256-ZNj63OanT0ePKYMsHqoqBIVmVev/FyktUjf8gxfDo8U="; }; - patches = [ - (fetchpatch { - name = "fix-pythonpath-in-tests.patch"; - url = "https://github.com/psf/pyperf/commit/d373c5e56c0257d2d7abd705b676bea25cf66566.patch"; - hash = "sha256-2q1fTf+uU3qj3BG8P5otX4f7mSTnQxm4sfmmgIUuszA="; - }) + nativeBuildInputs = [ + setuptools ]; propagatedBuildInputs = [ @@ -35,12 +31,21 @@ buildPythonPackage rec { unittestCheckHook ]; - unittestFlagsArray = [ "-s" "pyperf/tests/" "-v" ]; + unittestFlagsArray = [ + "-s" + "pyperf/tests/" + "-v" + ]; + + pythonImportsCheck = [ + "pyperf" + ]; meta = with lib; { description = "Python module to generate and modify perf"; homepage = "https://pyperf.readthedocs.io/"; + changelog = "https://github.com/psf/pyperf/releases/tag/${version}"; license = licenses.mit; - maintainers = [ ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/pyproj/default.nix b/pkgs/development/python-modules/pyproj/default.nix index 0d77ed937cf..576688accc0 100644 --- a/pkgs/development/python-modules/pyproj/default.nix +++ b/pkgs/development/python-modules/pyproj/default.nix @@ -100,11 +100,11 @@ buildPythonPackage rec { "pyproj.exceptions" ]; - meta = { + meta = with lib; { description = "Python interface to PROJ library"; homepage = "https://github.com/pyproj4/pyproj"; changelog = "https://github.com/pyproj4/pyproj/blob/${src.rev}/docs/history.rst"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ lsix dotlambda ]; + license = licenses.mit; + maintainers = with maintainers; teams.geospatial.members ++ [ lsix dotlambda ]; }; } diff --git a/pkgs/development/python-modules/pyscard/default.nix b/pkgs/development/python-modules/pyscard/default.nix index cfa2f64c38b..6e7a1ec29cb 100644 --- a/pkgs/development/python-modules/pyscard/default.nix +++ b/pkgs/development/python-modules/pyscard/default.nix @@ -1,10 +1,13 @@ { lib , stdenv -, fetchPypi +, fetchFromGitHub , buildPythonPackage +, setuptools +, pkg-config , swig , pcsclite , PCSC +, pytestCheckHook }: let @@ -15,27 +18,44 @@ in buildPythonPackage rec { version = "2.0.7"; pname = "pyscard"; + pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-J4BUUl+nX76LEEYNh+3NA6cK2U1oixE0Xkc5mH+Fwb8="; + src = fetchFromGitHub { + owner = "LudovicRousseau"; + repo = "pyscard"; + rev = "refs/tags/${version}"; + hash = "sha256-nkDI1OPQ4SsNhWkg53ZTsG7j0+mvpkJI7dsyaOl1a/8="; }; - postPatch = if withApplePCSC then '' - substituteInPlace smartcard/scard/winscarddll.c \ - --replace "/System/Library/Frameworks/PCSC.framework/PCSC" \ - "${PCSC}/Library/Frameworks/PCSC.framework/PCSC" - '' else '' - substituteInPlace smartcard/scard/winscarddll.c \ - --replace "libpcsclite.so.1" \ - "${lib.getLib pcsclite}/lib/libpcsclite${stdenv.hostPlatform.extensions.sharedLibrary}" - ''; + nativeBuildInputs = [ + setuptools + swig + ] ++ lib.optionals (!withApplePCSC) [ + pkg-config + ]; + + buildInputs = if withApplePCSC then [ PCSC ] else [ pcsclite ]; - env.NIX_CFLAGS_COMPILE = lib.optionalString (! withApplePCSC) - "-I ${lib.getDev pcsclite}/include/PCSC"; + nativeCheckInputs = [ + pytestCheckHook + ]; - propagatedBuildInputs = if withApplePCSC then [ PCSC ] else [ pcsclite ]; - nativeBuildInputs = [ swig ]; + postPatch = + if withApplePCSC then '' + substituteInPlace smartcard/scard/winscarddll.c \ + --replace "/System/Library/Frameworks/PCSC.framework/PCSC" \ + "${PCSC}/Library/Frameworks/PCSC.framework/PCSC" + '' else '' + substituteInPlace setup.py --replace "pkg-config" "$PKG_CONFIG" + substituteInPlace smartcard/scard/winscarddll.c \ + --replace "libpcsclite.so.1" \ + "${lib.getLib pcsclite}/lib/libpcsclite${stdenv.hostPlatform.extensions.sharedLibrary}" + ''; + + preCheck = '' + # remove src module, so tests use the installed module instead + rm -r smartcard + ''; meta = with lib; { homepage = "https://pyscard.sourceforge.io/"; diff --git a/pkgs/development/python-modules/pysuez/default.nix b/pkgs/development/python-modules/pysuez/default.nix new file mode 100644 index 00000000000..34f6de51926 --- /dev/null +++ b/pkgs/development/python-modules/pysuez/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, requests +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pysuez"; + version = "0.2.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "ooii"; + repo = "pySuez"; + rev = "refs/tags/v${version}"; + hash = "sha256-Xgd0E/oFO2yyytBjuwr1vDJfKWC0Iw8P6GStCuCni/g="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + requests + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "pysuez" + ]; + + meta = with lib; { + description = "Module to get water consumption data from Suez"; + homepage = "https://github.com/ooii/pySuez"; + changelog = "https://github.com/ooii/pySuez/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pytest-datadir/default.nix b/pkgs/development/python-modules/pytest-datadir/default.nix index bca05a0010a..90b7e6f55e2 100644 --- a/pkgs/development/python-modules/pytest-datadir/default.nix +++ b/pkgs/development/python-modules/pytest-datadir/default.nix @@ -1,30 +1,41 @@ { lib , buildPythonPackage +, pythonOlder , fetchFromGitHub +, setuptools , setuptools-scm , pytestCheckHook }: buildPythonPackage rec { pname = "pytest-datadir"; - version = "1.4.1"; + version = "1.5.0"; format = "pyproject"; + disabled = pythonOlder "3.8"; + src = fetchFromGitHub { owner = "gabrielcnr"; repo = "pytest-datadir"; - rev = "refs/tags/${version}"; - hash = "sha256-HyJ0rU1nHqRv8SHFS8m3GZ5409+JZIkoDgIVjy4ol54="; + rev = "refs/tags/v${version}"; + hash = "sha256-sRLqL+8Jf5Kz+qscuG3hClUuPA+33PQa+ob1ht/7CJE="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools-scm ]; + + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; + nativeCheckInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ "pytest_datadir" ]; meta = with lib; { description = "Pytest plugin for manipulating test data directories and files"; homepage = "https://github.com/gabrielcnr/pytest-datadir"; + changelog = "https://github.com/gabrielcnr/pytest-datadir/blob/v${version}/CHANGELOG.rst"; license = licenses.mit; maintainers = with maintainers; [ kira-bruneau ]; }; diff --git a/pkgs/development/python-modules/pytest-tornado/default.nix b/pkgs/development/python-modules/pytest-tornado/default.nix index bd1ce2a597b..b1e46802b45 100644 --- a/pkgs/development/python-modules/pytest-tornado/default.nix +++ b/pkgs/development/python-modules/pytest-tornado/default.nix @@ -25,6 +25,5 @@ buildPythonPackage rec { description = "A py.test plugin providing fixtures and markers to simplify testing of asynchronous tornado applications."; homepage = "https://github.com/eugeniy/pytest-tornado"; license = licenses.asl20; - maintainers = with maintainers; [ ixxie ]; }; } diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix index d557bcf15e9..a00b59c425b 100644 --- a/pkgs/development/python-modules/pytest/default.nix +++ b/pkgs/development/python-modules/pytest/default.nix @@ -3,10 +3,10 @@ , callPackage , pythonOlder , fetchPypi -, isPyPy , writeText # build +, setuptools , setuptools-scm # propagates @@ -21,12 +21,12 @@ buildPythonPackage rec { pname = "pytest"; - version = "7.4.2"; - format = "pyproject"; + version = "7.4.3"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-p2YlnPq1ZKKtUssarhuIGnXD6340yjd5aXwj7UfEcGk="; + hash = "sha256-2YnRNpgt5OOynavMg4rVgcZOjtUsEfvobd69naCBjNU="; }; outputs = [ @@ -35,6 +35,7 @@ buildPythonPackage rec { ]; nativeBuildInputs = [ + setuptools setuptools-scm ]; diff --git a/pkgs/development/python-modules/python-gvm/default.nix b/pkgs/development/python-modules/python-gvm/default.nix index fe81dda8939..98cc6109ae7 100644 --- a/pkgs/development/python-modules/python-gvm/default.nix +++ b/pkgs/development/python-modules/python-gvm/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "python-gvm"; - version = "23.10.1"; + version = "23.11.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "greenbone"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-OG45mKYqWrgyDyTlWPz95VXQDKAx4QeU1ZZGmHhbviI="; + hash = "sha256-7HneedqHbNB9ZYFUCCQ/puLtA1QlIkTKqji0py9hwBE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/python-jose/default.nix b/pkgs/development/python-modules/python-jose/default.nix index 68150935da9..6e3f406fe5a 100644 --- a/pkgs/development/python-modules/python-jose/default.nix +++ b/pkgs/development/python-modules/python-jose/default.nix @@ -1,18 +1,28 @@ { lib , buildPythonPackage , fetchFromGitHub + +# build-system +, setuptools + +# dependencies , ecdsa , rsa -, pycrypto , pyasn1 -, pycryptodome + +# optional-dependencies , cryptography +, pycrypto +, pycryptodome + +# tests , pytestCheckHook }: buildPythonPackage rec { pname = "python-jose"; version = "3.3.0"; + pyproject = true; src = fetchFromGitHub { owner = "mpdavis"; @@ -21,27 +31,43 @@ buildPythonPackage rec { hash = "sha256-6VGC6M5oyGCOiXcYp6mpyhL+JlcYZKIqOQU9Sm/TkKM="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace '"pytest-runner",' "" + ''; + + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ - cryptography ecdsa pyasn1 - pycrypto - pycryptodome rsa ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + passthru.optional-dependencies = { + cryptography = [ + cryptography + ]; + pycrypto = [ + pycrypto + ]; + pycryptodome = [ + pycryptodome + ]; + }; - postPatch = '' - substituteInPlace setup.py \ - --replace '"pytest-runner",' "" - ''; + pythonImportsCheck = [ + "jose" + ]; - pythonImportsCheck = [ "jose" ]; + nativeCheckInputs = [ + pytestCheckHook + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); meta = with lib; { + changelog = "https://github.com/mpdavis/python-jose/releases/tag/${version}"; homepage = "https://github.com/mpdavis/python-jose"; description = "A JOSE implementation in Python"; license = licenses.mit; diff --git a/pkgs/development/python-modules/python-ldap/default.nix b/pkgs/development/python-modules/python-ldap/default.nix index db9565607a6..5bc9f3fecfc 100644 --- a/pkgs/development/python-modules/python-ldap/default.nix +++ b/pkgs/development/python-modules/python-ldap/default.nix @@ -2,27 +2,41 @@ , stdenv , buildPythonPackage , fetchFromGitHub -, pyasn1 -, pyasn1-modules -, pythonAtLeast , pythonOlder -, pytestCheckHook + +# build-system +, setuptools + +# native dependencies , openldap , cyrus_sasl + +# dependencies +, pyasn1 +, pyasn1-modules + +# tests +, pytestCheckHook }: buildPythonPackage rec { pname = "python-ldap"; - version = "3.4.3"; + version = "3.4.4"; + pyproject = true; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { - owner = pname; - repo = pname; + owner = "python-ldap"; + repo = "python-ldap"; rev = "refs/tags/python-ldap-${version}"; - hash = "sha256-/ehvSs2qjuTPhaaOP0agPbWyyRugBpUlPq/Ny9t2C58="; + hash = "sha256-v1cWoRGxbvvFnHqnwoIfmiQQcxfaA8Bf3+M5bE5PtuU="; }; + nativeBuildInputs = [ + setuptools + ]; + buildInputs = [ openldap cyrus_sasl @@ -53,7 +67,9 @@ buildPythonPackage rec { doCheck = !stdenv.isDarwin; meta = with lib; { + changelog = "https://github.com/python-ldap/python-ldap/releases/tag/python-ldap-${version}"; description = "Python modules for implementing LDAP clients"; + downloadPage = "https://github.com/python-ldap/python-ldap"; homepage = "https://www.python-ldap.org/"; license = licenses.psfl; }; diff --git a/pkgs/development/python-modules/python-oauth2/default.nix b/pkgs/development/python-modules/python-oauth2/default.nix index bc3c13478e6..cd45cbe7d28 100644 --- a/pkgs/development/python-modules/python-oauth2/default.nix +++ b/pkgs/development/python-modules/python-oauth2/default.nix @@ -18,6 +18,5 @@ buildPythonPackage rec { description = "Framework that aims at making it easy to provide authentication via OAuth 2.0 within an application stack"; homepage = "https://github.com/wndhydrnt/python-oauth2"; license = licenses.mit; - maintainers = with maintainers; [ ixxie ]; }; } diff --git a/pkgs/development/python-modules/python-smarttub/default.nix b/pkgs/development/python-modules/python-smarttub/default.nix index 4f65f7edcb2..afe1451042b 100644 --- a/pkgs/development/python-modules/python-smarttub/default.nix +++ b/pkgs/development/python-modules/python-smarttub/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "python-smarttub"; - version = "0.0.35"; + version = "0.0.36"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "mdz"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-8Z4wZRJJV4TED6foM2Db+Ghl+EHrfGXoXZm3KsNh8OQ="; + hash = "sha256-cng19NW5Eq3arysl0B3dfK2Hy6lQFBFh7g2hxvxeklU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyudev/default.nix b/pkgs/development/python-modules/pyudev/default.nix index 29b1e5f8d53..8c3c0d86f3b 100644 --- a/pkgs/development/python-modules/pyudev/default.nix +++ b/pkgs/development/python-modules/pyudev/default.nix @@ -1,5 +1,13 @@ -{ lib, fetchPypi, buildPythonPackage -, six, udev, pytest, mock, hypothesis, docutils +{ lib +, fetchPypi +, buildPythonPackage +, six +, udev +, pytest +, mock +, hypothesis +, docutils +, stdenvNoCC }: buildPythonPackage rec { @@ -11,7 +19,7 @@ buildPythonPackage rec { hash = "sha256-deVNNyGPWsRbDaHw/ZzF5SajysPvHPrUEM96sziwFHE="; }; - postPatch = '' + postPatch = lib.optionalString stdenvNoCC.isLinux '' substituteInPlace src/pyudev/_ctypeslib/utils.py \ --replace "find_library(name)" "'${lib.getLib udev}/lib/libudev.so'" ''; @@ -27,9 +35,10 @@ buildPythonPackage rec { # https://github.com/pyudev/pyudev/issues/187 doCheck = false; - meta = { + meta = with lib; { homepage = "https://pyudev.readthedocs.org/"; description = "Pure Python libudev binding"; - license = lib.licenses.lgpl21Plus; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ frogamic ]; }; } diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index c2af4be8df8..59f1c4233ab 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.2.76"; + version = "9.2.77"; pyproject = true; disabled = pythonOlder "3.11"; src = fetchPypi { inherit pname version; - hash = "sha256-JlwqxKJaJ3sk2mROUOaF0N5d4V7LM43VqEXnuSO45BY="; + hash = "sha256-kVMhzdTYwra8G/4gg1G853vUr7YHxxt/zXus/SXMkXc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyvips/default.nix b/pkgs/development/python-modules/pyvips/default.nix index 71fe7601ce9..70272d54ac8 100644 --- a/pkgs/development/python-modules/pyvips/default.nix +++ b/pkgs/development/python-modules/pyvips/default.nix @@ -1,5 +1,6 @@ { stdenv , buildPythonPackage +, pythonOlder , fetchFromGitHub , pytestCheckHook , glib @@ -13,6 +14,8 @@ buildPythonPackage rec { pname = "pyvips"; version = "2.2.1"; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "libvips"; repo = "pyvips"; @@ -26,6 +29,10 @@ buildPythonPackage rec { propagatedBuildInputs = [ cffi ]; + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-function-pointer-types"; + }; + nativeCheckInputs = [ pytestCheckHook ]; postPatch = '' @@ -41,6 +48,7 @@ buildPythonPackage rec { meta = with lib; { description = "A python wrapper for libvips"; homepage = "https://github.com/libvips/pyvips"; + changelog = "https://github.com/libvips/pyvips/blob/v${version}/CHANGELOG.rst"; license = licenses.mit; maintainers = with maintainers; [ ccellado anthonyroussel ]; }; diff --git a/pkgs/development/python-modules/qcelemental/default.nix b/pkgs/development/python-modules/qcelemental/default.nix index 72d1a9f43a8..59c8f47eea3 100644 --- a/pkgs/development/python-modules/qcelemental/default.nix +++ b/pkgs/development/python-modules/qcelemental/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "qcelemental"; - version = "0.27.0"; + version = "0.27.1"; pyproject = true; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-5VLNGD4glAIGgtt+q8YvwyAQvJU9mfyTpngwVr6gOYg="; + hash = "sha256-dlcfIUKAg6yc4S3RXVJ1sKM29E1ZvHY82kjx1CM8/08="; }; nativeBuildInputs = [ @@ -46,7 +46,8 @@ buildPythonPackage rec { meta = with lib; { broken = stdenv.isDarwin; description = "Periodic table, physical constants and molecule parsing for quantum chemistry"; - homepage = "http://docs.qcarchive.molssi.org/projects/qcelemental/"; + homepage = "https://github.com/MolSSI/QCElemental"; + changelog = "https://github.com/MolSSI/QCElemental/blob/v${version}/docs/changelog.rst"; license = licenses.bsd3; maintainers = with maintainers; [ sheepforce ]; }; diff --git a/pkgs/development/python-modules/rapidfuzz/default.nix b/pkgs/development/python-modules/rapidfuzz/default.nix index f640012d9a5..80094a1a350 100644 --- a/pkgs/development/python-modules/rapidfuzz/default.nix +++ b/pkgs/development/python-modules/rapidfuzz/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "rapidfuzz"; - version = "3.3.1"; + version = "3.4.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "maxbachmann"; repo = "RapidFuzz"; rev = "refs/tags/v${version}"; - hash = "sha256-C+jQN0QXZzH0IKdC3O5uPNAEd+XSffi3nkwFSv2HqPY="; + hash = "sha256-JgTmhnKVzv9m8//GMQjvCFPNJQM/7dalCD5bk6fWBPc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/ring-doorbell/default.nix b/pkgs/development/python-modules/ring-doorbell/default.nix index e7ed8996ba6..674c508696b 100644 --- a/pkgs/development/python-modules/ring-doorbell/default.nix +++ b/pkgs/development/python-modules/ring-doorbell/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "ring-doorbell"; - version = "0.7.7"; + version = "0.8.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "ring_doorbell"; inherit version; - hash = "sha256-chhZj9yr/MCbvh3wo8RTqtyyt1Mj22ku4aRMK2c8Efc="; + hash = "sha256-A7FQeeYym0nAQlkbpejpZqd5ZgX2cw3/DbshDxlrivw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/rns/default.nix b/pkgs/development/python-modules/rns/default.nix index 4eea1c1ab67..0640ce63db3 100644 --- a/pkgs/development/python-modules/rns/default.nix +++ b/pkgs/development/python-modules/rns/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "rns"; - version = "0.6.7"; + version = "0.6.8"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "markqvist"; repo = "Reticulum"; rev = "refs/tags/${version}"; - hash = "sha256-u5GMCM9HyrblGbmIvfDWTfIAV8Zpn8tF0oOaolFtQMk="; + hash = "sha256-MDD0Vs5XIWqxKHbrAa0vXJRd8uYZDlr//hP1NBf4b7U="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/rocket-errbot/default.nix b/pkgs/development/python-modules/rocket-errbot/default.nix index 29970e7fd28..65b7c62b9e3 100644 --- a/pkgs/development/python-modules/rocket-errbot/default.nix +++ b/pkgs/development/python-modules/rocket-errbot/default.nix @@ -11,7 +11,9 @@ buildPythonPackage rec { # remove with 1.2.6 patches = [ (fetchpatch { - url = "https://github.com/errbotio/rocket/pull/1.patch"; + # https://github.com/errbotio/rocket/pull/1 + name = "errbotio-rocket-pull-1.patch"; + url = "https://github.com/errbotio/rocket/compare/f1a52fe17164f83bccce5e6a1935fc5071c2265f...d69adcd49de5d78bd80f952a2ee31e6a0bac4e3d.patch"; sha256 = "1s668yv5b86b78vbqwhcl44k2l16c9bhk3199yy9hayf0vkxnwif"; }) ]; diff --git a/pkgs/development/python-modules/s3transfer/default.nix b/pkgs/development/python-modules/s3transfer/default.nix index 36176481860..748b6abecf4 100644 --- a/pkgs/development/python-modules/s3transfer/default.nix +++ b/pkgs/development/python-modules/s3transfer/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "s3transfer"; - version = "0.6.2"; + version = "0.7.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "boto"; repo = pname; rev = version; - hash = "sha256-hoHNblnCSZteHmI5sJN72WrX7tveNFZqmL1jFKQmdag="; + hash = "sha256-EvLqRvm9E1Taf+JvbhQbfJqIlbu2a+rB2MX0IO90x98="; }; propagatedBuildInputs = [ botocore ]; @@ -39,6 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for managing Amazon S3 transfers"; homepage = "https://github.com/boto/s3transfer"; + changelog = "https://github.com/boto/s3transfer/blob/${version}/CHANGELOG.rst"; license = licenses.asl20; maintainers = with maintainers; [ nickcao ]; }; diff --git a/pkgs/development/python-modules/selenium/default.nix b/pkgs/development/python-modules/selenium/default.nix index fdb052a4749..086c5310897 100644 --- a/pkgs/development/python-modules/selenium/default.nix +++ b/pkgs/development/python-modules/selenium/default.nix @@ -8,12 +8,15 @@ , trio , trio-websocket , urllib3 +, pytest-trio , nixosTests +, stdenv +, python }: buildPythonPackage rec { pname = "selenium"; - version = "4.12.0"; + version = "4.14.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,18 +26,30 @@ buildPythonPackage rec { repo = "selenium"; # check if there is a newer tag with or without -python suffix rev = "refs/tags/selenium-${version}"; - hash = "sha256-A2lI40bPSIri/0yp6C3aJZBX5p6ON1fWGfJTcul9/2o="; + hash = "sha256-cTMCKfFLUlJDbTUQA3Z/pKCE1RQQRMb4K8hKKn9HqvU="; }; - postPatch = '' - substituteInPlace py/selenium/webdriver/firefox/service.py \ - --replace 'DEFAULT_EXECUTABLE_PATH = "geckodriver"' 'DEFAULT_EXECUTABLE_PATH = "${geckodriver}/bin/geckodriver"' - ''; - preConfigure = '' cd py ''; + postInstall = '' + DST_PREFIX=$out/lib/${python.libPrefix}/site-packages/selenium/webdriver/ + DST_REMOTE=$DST_PREFIX/remote/ + DST_FF=$DST_PREFIX/firefox + cp ../rb/lib/selenium/webdriver/atoms/getAttribute.js $DST_REMOTE + cp ../rb/lib/selenium/webdriver/atoms/isDisplayed.js $DST_REMOTE + cp ../rb/lib/selenium/webdriver/atoms/findElements.js $DST_REMOTE + cp ../javascript/cdp-support/mutation-listener.js $DST_REMOTE + cp ../third_party/js/selenium/webdriver.json $DST_FF/webdriver_prefs.json + '' + lib.optionalString stdenv.isDarwin '' + mkdir -p $DST_PREFIX/common/macos + cp ../common/manager/macos/selenium-manager $DST_PREFIX/common/macos + '' + lib.optionalString stdenv.isLinux '' + mkdir -p $DST_PREFIX/common/linux/ + cp ../common/manager/linux/selenium-manager $DST_PREFIX/common/linux/ + ''; + propagatedBuildInputs = [ certifi trio @@ -44,6 +59,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook + pytest-trio ]; passthru.tests = { diff --git a/pkgs/development/python-modules/sentry-sdk/default.nix b/pkgs/development/python-modules/sentry-sdk/default.nix index d138bcb2940..b389da6f1c9 100644 --- a/pkgs/development/python-modules/sentry-sdk/default.nix +++ b/pkgs/development/python-modules/sentry-sdk/default.nix @@ -24,6 +24,7 @@ , pyramid , pyrsistent , pyspark +, pysocks , pytest-forked , pytest-localserver , pytest-watch @@ -40,7 +41,7 @@ buildPythonPackage rec { pname = "sentry-sdk"; - version = "1.33.1"; + version = "1.35.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -49,7 +50,7 @@ buildPythonPackage rec { owner = "getsentry"; repo = "sentry-python"; rev = "refs/tags/${version}"; - hash = "sha256-a73SZssiS1i3pfble0dMw6st5Hq4AIdJA+dnT617kXg="; + hash = "sha256-wV38DW5YfY+f5Qg/I7JPQ5R8TyqqdjwHKfr5XjT2vFA="; }; propagatedBuildInputs = [ @@ -120,6 +121,7 @@ buildPythonPackage rec { mock pure-eval pyrsistent + pysocks pytest-forked pytest-localserver pytest-watch diff --git a/pkgs/development/python-modules/shapely/default.nix b/pkgs/development/python-modules/shapely/default.nix index 488e936abb8..7f87ddf6bef 100644 --- a/pkgs/development/python-modules/shapely/default.nix +++ b/pkgs/development/python-modules/shapely/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "shapely"; - version = "2.0.1"; + version = "2.0.2"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Zqaxo+cuzpf8hVNqKBR2+bd5TeLmRsqKRRfi48FEaJM="; + hash = "sha256-FxPMBMFxuv/Fslm6hTHFiswqMBcHt/Ah2IoV7QkGSec="; }; nativeBuildInputs = [ @@ -44,8 +44,10 @@ buildPythonPackage rec { pytestCheckHook ]; + # Fix a ModuleNotFoundError. Investigated at: + # https://github.com/NixOS/nixpkgs/issues/255262 preCheck = '' - rm -r shapely # prevent import of local shapely + cd $out ''; disabledTests = lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ diff --git a/pkgs/development/python-modules/shiboken2/default.nix b/pkgs/development/python-modules/shiboken2/default.nix index 4afa930cac0..593a7b7d82e 100644 --- a/pkgs/development/python-modules/shiboken2/default.nix +++ b/pkgs/development/python-modules/shiboken2/default.nix @@ -5,7 +5,7 @@ , cmake , qt5 , libxcrypt -, llvmPackages +, llvmPackages_15 }: stdenv.mkDerivation { @@ -21,12 +21,12 @@ stdenv.mkDerivation { cd sources/shiboken2 ''; - CLANG_INSTALL_DIR = llvmPackages.libclang.out; + CLANG_INSTALL_DIR = llvmPackages_15.libclang.out; nativeBuildInputs = [ cmake ]; buildInputs = [ - llvmPackages.libclang + llvmPackages_15.libclang python python.pkgs.setuptools qt5.qtbase diff --git a/pkgs/development/python-modules/simple-salesforce/default.nix b/pkgs/development/python-modules/simple-salesforce/default.nix index 5da242e7b4c..10d5f64385a 100644 --- a/pkgs/development/python-modules/simple-salesforce/default.nix +++ b/pkgs/development/python-modules/simple-salesforce/default.nix @@ -1,49 +1,52 @@ { lib -, fetchFromGitHub , buildPythonPackage -, authlib -, requests -, nose +, cryptography +, fetchFromGitHub +, more-itertools +, pendulum , pyjwt +, pytestCheckHook , pythonOlder , pytz +, requests , responses +, setuptools , zeep }: buildPythonPackage rec { pname = "simple-salesforce"; version = "1.12.5"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { - owner = pname; - repo = pname; + owner = "simple-salesforce"; + repo = "simple-salesforce"; rev = "refs/tags/v${version}"; hash = "sha256-mj7lbBGEybsEzWo4TYmPrN3mBXItdo/JomVIYmzIDAY="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ - authlib + cryptography + more-itertools + pendulum pyjwt requests zeep ]; nativeCheckInputs = [ - nose + pytestCheckHook pytz responses ]; - checkPhase = '' - runHook preCheck - nosetests -v - runHook postCheck - ''; - pythonImportsCheck = [ "simple_salesforce" ]; diff --git a/pkgs/development/python-modules/simplejson/default.nix b/pkgs/development/python-modules/simplejson/default.nix index f495e463864..b136d9e94da 100644 --- a/pkgs/development/python-modules/simplejson/default.nix +++ b/pkgs/development/python-modules/simplejson/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "simplejson"; - version = "3.19.1"; + version = "3.19.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-LUD0Eoj7fDGiR0yhIZOto6kn7Ud0TXyDTO1UTbRMJiQ="; + hash = "sha256-+HHtU6sxxwISciLxiwa5m1zj7h/SLDmRxOZNqW5FQSY="; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/slack-sdk/default.nix b/pkgs/development/python-modules/slack-sdk/default.nix index 58372e493ac..66c1a734c8b 100644 --- a/pkgs/development/python-modules/slack-sdk/default.nix +++ b/pkgs/development/python-modules/slack-sdk/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "slack-sdk"; - version = "3.23.0"; + version = "3.23.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "slackapi"; repo = "python-slack-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-OsPwLOnmN3kvPmbM6lOaiTWwWvy7b9pgn1X536dCkWk="; + hash = "sha256-lqB4eljM/JLyvVHeT7LnYgjG3AP3i9le2IxUI31aK6o="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/somajo/default.nix b/pkgs/development/python-modules/somajo/default.nix index 14530ec68ab..0c953e20c5f 100644 --- a/pkgs/development/python-modules/somajo/default.nix +++ b/pkgs/development/python-modules/somajo/default.nix @@ -3,13 +3,14 @@ , fetchFromGitHub , buildPythonPackage , pythonOlder +, setuptools , regex }: buildPythonPackage rec { pname = "somajo"; - version = "2.3.0"; - format = "setuptools"; + version = "2.3.1"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -17,9 +18,13 @@ buildPythonPackage rec { owner = "tsproisl"; repo = "SoMaJo"; rev = "refs/tags/v${version}"; - hash = "sha256-CNGSol77Q3uAZPLeV43NhIffO31tnZoMYOsevkZh3pc="; + hash = "sha256-3A2et4pl92LsRtEx2Ki8Soz3n1nZEGQGPc3ZIBDojNM="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ regex ]; diff --git a/pkgs/development/python-modules/sphinx-notfound-page/default.nix b/pkgs/development/python-modules/sphinx-notfound-page/default.nix index edc8e2ce6b0..e9f5d9c4519 100644 --- a/pkgs/development/python-modules/sphinx-notfound-page/default.nix +++ b/pkgs/development/python-modules/sphinx-notfound-page/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "sphinx-notfound-page"; - version = "0.8.3"; + version = "1.0.0"; format = "pyproject"; outputs = [ "out" "doc" ]; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "readthedocs"; repo = "sphinx-notfound-page"; rev = version; - hash = "sha256-9iP6X2dqtMC3+CIrNI3fGDLL8xyXVAWNhN90DlMa9JU="; + hash = "sha256-tG71UuYbdlWNgq6Y5xRH3aWc9/eTr/RlsRNWSUjrbBE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/sphinx-pytest/default.nix b/pkgs/development/python-modules/sphinx-pytest/default.nix index a034b2b3f01..7bc41418fe4 100644 --- a/pkgs/development/python-modules/sphinx-pytest/default.nix +++ b/pkgs/development/python-modules/sphinx-pytest/default.nix @@ -9,18 +9,19 @@ buildPythonPackage rec { pname = "sphinx-pytest"; - version = "0.1.1"; + version = "0.2.0"; + pyproject = true; src = fetchFromGitHub { owner = "chrisjsewell"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-26cV6mfNos/1YLhz5aVQVb54qsiyHWdcHtvmmSzMurk="; + hash = "sha256-oSBBt+hSMs4mvGqibQHoYHXr2j/bpsGOnIMfwfTfWKQ="; }; - format = "pyproject"; - - nativeBuildInputs = [ flit-core ]; + nativeBuildInputs = [ + flit-core + ]; propagatedBuildInputs = [ sphinx @@ -30,13 +31,16 @@ buildPythonPackage rec { pytest ]; - pythonImportsCheck = [ "sphinx_pytest" ]; + pythonImportsCheck = [ + "sphinx_pytest" + ]; nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { + changelog = "https://github.com/sphinx-extensions2/sphinx-pytest/releases/tag/v${version}"; description = "Helpful pytest fixtures for Sphinx extensions"; homepage = "https://github.com/chrisjsewell/sphinx-pytest"; license = licenses.mit; diff --git a/pkgs/development/python-modules/sphinx-sitemap/default.nix b/pkgs/development/python-modules/sphinx-sitemap/default.nix index ecb477980c1..b14d669a10c 100644 --- a/pkgs/development/python-modules/sphinx-sitemap/default.nix +++ b/pkgs/development/python-modules/sphinx-sitemap/default.nix @@ -1,7 +1,10 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub +, setuptools , sphinx +, sphinx-pytest +, pytestCheckHook }: let pname = "sphinx-sitemap"; @@ -11,18 +14,25 @@ buildPythonPackage { inherit pname version; pyproject = true; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-mEvvBou9vCbPriCai2E5LpaBq8kZG0d80w2kBuOmDuU="; + src = fetchFromGitHub { + owner = "jdillard"; + repo = "sphinx-sitemap"; + rev = "refs/tags/v${version}"; + hash = "sha256-R8nAaEPd2vQs9Z0Fa5yvTP0KP3O+DnIJLPeISZ10Xtk="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ sphinx ]; - # Latest tests do not pass on Sphinx5, although it is supported - # Ref: https://github.com/jdillard/sphinx-sitemap/blob/ce244e9e1e05f09c566432f6a89bcd6f6ebe83bf/tox.ini#L18C25-L18C25 - doCheck = false; + nativeCheckInputs = [ + pytestCheckHook + sphinx-pytest + ]; meta = with lib; { changelog = "https://github.com/jdillard/sphinx-sitemap/releases/tag/v${version}"; diff --git a/pkgs/development/python-modules/sphinx/0001-test-images-Use-normalization-equivalent-character.patch b/pkgs/development/python-modules/sphinx/0001-test-images-Use-normalization-equivalent-character.patch deleted file mode 100644 index 805e724d0c8..00000000000 --- a/pkgs/development/python-modules/sphinx/0001-test-images-Use-normalization-equivalent-character.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 181617387841b695ee77b162babf9fb177002fcb Mon Sep 17 00:00:00 2001 -From: toonn <toonn@toonn.io> -Date: Mon, 20 Sep 2021 11:39:46 +0200 -Subject: [PATCH] test-images: Use normalization equivalent character -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -One of the test images used a combining character `ä` that can be -encoded multiple ways. This means the file's name can end up encoded -differently depending on whether/which normal form the filesystem uses. - -For Nix this causes a different hash for a FOD depending on the -filesystem where it is evaluated. This is problematic because hashes -fail to match up when evaluating the FOD across multiple platforms. ---- - tests/roots/test-images/index.rst | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tests/roots/test-images/index.rst b/tests/roots/test-images/index.rst -index 14a2987..219842e 100644 ---- a/tests/roots/test-images/index.rst -+++ b/tests/roots/test-images/index.rst -@@ -13,7 +13,7 @@ test-image - - The caption of img - --.. image:: testimäge.png -+.. image:: testimæge.png - - .. image:: rimg.png - :target: https://www.sphinx-doc.org/ --- -2.17.2 (Apple Git-113) - diff --git a/pkgs/development/python-modules/sphinx/default.nix b/pkgs/development/python-modules/sphinx/default.nix index eb559c41486..6dac59106f5 100644 --- a/pkgs/development/python-modules/sphinx/default.nix +++ b/pkgs/development/python-modules/sphinx/default.nix @@ -1,5 +1,5 @@ -{ stdenv -, lib +{ lib +, stdenv , buildPythonPackage , pythonOlder , fetchFromGitHub @@ -30,29 +30,29 @@ # check phase , cython +, filelock , html5lib , pytestCheckHook -, typed-ast }: buildPythonPackage rec { pname = "sphinx"; - version = "5.3.0"; + version = "7.2.6"; format = "pyproject"; - - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "sphinx-doc"; - repo = pname; + repo = "sphinx"; rev = "refs/tags/v${version}"; - hash = "sha256-80bVg1rfBebgSOKbWkzP84vpm39iLgM8lWlVD64nSsQ="; postFetch = '' - cd $out - mv tests/roots/test-images/testimäge.png \ - tests/roots/test-images/testimæge.png - patch -p1 < ${./0001-test-images-Use-normalization-equivalent-character.patch} + # Change ä to æ in file names, since ä can be encoded multiple ways on different + # filesystems, leading to different hashes on different platforms. + cd "$out"; + mv tests/roots/test-images/{testimäge,testimæge}.png + sed -i 's/testimäge/testimæge/g' tests/{test_build*.py,roots/test-images/index.rst} ''; + hash = "sha256-IjpRGeGpGfzrEvwIKtuu2l1S74w8W+AbqDOGnWwtRck="; }; nativeBuildInputs = [ @@ -60,8 +60,8 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - babel alabaster + babel docutils imagesize jinja2 @@ -84,66 +84,22 @@ buildPythonPackage rec { importlib-metadata ]; + __darwinAllowLocalNetworking = true; + nativeCheckInputs = [ cython + filelock html5lib pytestCheckHook - ] ++ lib.optionals (pythonOlder "3.8") [ - typed-ast ]; preCheck = '' - export HOME=$(mktemp -d) + export HOME=$TMPDIR ''; disabledTests = [ # requires network access - "test_anchors_ignored" - "test_defaults" - "test_defaults_json" "test_latex_images" - - # requires imagemagick (increases build closure size), doesn't - # test anything substantial - "test_ext_imgconverter" - - # fails with pygments 2.14 - # TODO remove for sphinx 6 - "test_viewcode" - "test_additional_targets_should_be_translated" - "test_additional_targets_should_not_be_translated" - - # sphinx.errors.VersionRequirementError: The alabaster extension - # used by this project needs at least Sphinx v1.6; it therefore - # cannot be built with this version. - "test_needs_sphinx" - - # Likely due to pygments 2.14 update - # AssertionError: assert '5:11:17\u202fAM' == '5:11:17 AM' - "test_format_date" - ] ++ lib.optionals stdenv.isDarwin [ - # Due to lack of network sandboxing can't guarantee port 7777 isn't bound - "test_inspect_main_url" - "test_auth_header_uses_first_match" - "test_linkcheck_allowed_redirects" - "test_linkcheck_request_headers" - "test_linkcheck_request_headers_no_slash" - "test_follows_redirects_on_HEAD" - "test_get_after_head_raises_connection_error" - "test_invalid_ssl" - "test_connect_to_selfsigned_with_tls_verify_false" - "test_connect_to_selfsigned_with_tls_cacerts" - "test_connect_to_selfsigned_with_requests_env_var" - "test_connect_to_selfsigned_nonexistent_cert_file" - "test_TooManyRedirects_on_HEAD" - "test_too_many_requests_retry_after_int_del" - "test_too_many_requests_retry_after_HTTP_date" - "test_too_many_requests_retry_after_without_header" - "test_too_many_requests_user_timeout" - "test_raises_for_invalid_status" - "test_auth_header_no_match" - "test_follows_redirects_on_GET" - "test_connect_to_selfsigned_fails" ] ++ lib.optionals isPyPy [ # PyPy has not __builtins__ which get asserted # https://doc.pypy.org/en/latest/cpython_differences.html#miscellaneous @@ -159,14 +115,39 @@ buildPythonPackage rec { "test_partialfunction" ]; - meta = with lib; { + meta = { description = "Python documentation generator"; longDescription = '' - A tool that makes it easy to create intelligent and beautiful - documentation for Python projects + Sphinx makes it easy to create intelligent and beautiful documentation. + + Here are some of Sphinx’s major features: + - Output formats: HTML (including Windows HTML Help), LaTeX (for printable + PDF versions), ePub, Texinfo, manual pages, plain text + - Extensive cross-references: semantic markup and automatic links for + functions, classes, citations, glossary terms and similar pieces of + information + - Hierarchical structure: easy definition of a document tree, with + automatic links to siblings, parents and children + - Automatic indices: general index as well as a language-specific module + indices + - Code handling: automatic highlighting using the Pygments highlighter + - Extensions: automatic testing of code snippets, inclusion of docstrings + from Python modules (API docs) via built-in extensions, and much more + functionality via third-party extensions. + - Themes: modify the look and feel of outputs via creating themes, and + re-use many third-party themes. + - Contributed extensions: dozens of extensions contributed by users; most + of them installable from PyPI. + + Sphinx uses the reStructuredText markup language by default, and can read + MyST markdown via third-party extensions. Both of these are powerful and + straightforward to use, and have functionality for complex documentation + and publishing workflows. They both build upon Docutils to parse and write + documents. ''; homepage = "https://www.sphinx-doc.org"; - license = licenses.bsd3; - maintainers = teams.sphinx.members; + changelog = "https://www.sphinx-doc.org/en/master/changes.html"; + license = lib.licenses.bsd3; + maintainers = lib.teams.sphinx.members; }; } diff --git a/pkgs/development/python-modules/sphinxcontrib-actdiag/default.nix b/pkgs/development/python-modules/sphinxcontrib-actdiag/default.nix index 32470e98b4e..bfe5739b2a7 100644 --- a/pkgs/development/python-modules/sphinxcontrib-actdiag/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-actdiag/default.nix @@ -29,6 +29,8 @@ buildPythonPackage rec { "sphinxcontrib.actdiag" ]; + pythonNamespaces = [ "sphinxcontrib" ]; + meta = with lib; { description = "Sphinx actdiag extension"; homepage = "https://github.com/blockdiag/sphinxcontrib-actdiag"; diff --git a/pkgs/development/python-modules/sphinxcontrib-apidoc/default.nix b/pkgs/development/python-modules/sphinxcontrib-apidoc/default.nix index ad89521a5b5..77fe8929b2f 100644 --- a/pkgs/development/python-modules/sphinxcontrib-apidoc/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-apidoc/default.nix @@ -25,6 +25,8 @@ buildPythonPackage rec { # Check is disabled due to circular dependency of sphinx doCheck = false; + pythonNamespaces = [ "sphinxcontrib" ]; + meta = with lib; { description = "Sphinx extension for running sphinx-apidoc on each build"; homepage = "https://github.com/sphinx-contrib/apidoc"; diff --git a/pkgs/development/python-modules/sphinxcontrib-applehelp/default.nix b/pkgs/development/python-modules/sphinxcontrib-applehelp/default.nix index ef7a50382c6..3e8fe11d192 100644 --- a/pkgs/development/python-modules/sphinxcontrib-applehelp/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-applehelp/default.nix @@ -1,26 +1,36 @@ { lib , buildPythonPackage , fetchPypi -, isPy27 +, pythonOlder +, flit-core }: buildPythonPackage rec { pname = "sphinxcontrib-applehelp"; - version = "1.0.2"; - disabled = isPy27; + version = "1.0.7"; + pyproject = true; + + disabled = pythonOlder "3.9"; src = fetchPypi { - inherit pname version; - sha256 = "a072735ec80e7675e3f432fcae8610ecf509c5f1869d17e2eecff44389cdbc58"; + pname = "sphinxcontrib_applehelp"; + inherit version; + hash = "sha256-Of3I12LTOwGn2PAmo7fXFWPqO3J4fV8ArYRlvZ1t+/o="; }; + nativeBuildInputs = [ + flit-core + ]; + # Check is disabled due to circular dependency of sphinx doCheck = false; + pythonNamespaces = [ "sphinxcontrib" ]; + meta = with lib; { description = "sphinxcontrib-applehelp is a sphinx extension which outputs Apple help books"; homepage = "https://github.com/sphinx-doc/sphinxcontrib-applehelp"; - license = licenses.bsd0; + license = licenses.bsd2; maintainers = teams.sphinx.members; }; } diff --git a/pkgs/development/python-modules/sphinxcontrib-asyncio/default.nix b/pkgs/development/python-modules/sphinxcontrib-asyncio/default.nix index 2da9c2d92f6..597dac22a01 100644 --- a/pkgs/development/python-modules/sphinxcontrib-asyncio/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-asyncio/default.nix @@ -24,6 +24,8 @@ buildPythonPackage rec { "sphinxcontrib.asyncio" ]; + pythonNamespaces = [ "sphinxcontrib" ]; + meta = with lib; { description = "Sphinx extension to add asyncio-specific markups"; homepage = "https://github.com/aio-libs/sphinxcontrib-asyncio"; diff --git a/pkgs/development/python-modules/sphinxcontrib-bayesnet/default.nix b/pkgs/development/python-modules/sphinxcontrib-bayesnet/default.nix index 8589689ec8d..ca968f3f232 100644 --- a/pkgs/development/python-modules/sphinxcontrib-bayesnet/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-bayesnet/default.nix @@ -21,6 +21,8 @@ buildPythonPackage rec { doCheck = false; pythonImportsCheck = [ "sphinxcontrib.bayesnet" ]; + pythonNamespaces = [ "sphinxcontrib" ]; + meta = with lib; { homepage = "https://github.com/jluttine/sphinx-bayesnet"; description = "Bayesian networks and factor graphs in Sphinx using TikZ syntax"; diff --git a/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix b/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix index 8c7cd9b966a..2d8dca99129 100644 --- a/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix @@ -32,6 +32,8 @@ buildPythonPackage rec { "sphinxcontrib.bibtex" ]; + pythonNamespaces = [ "sphinxcontrib" ]; + meta = with lib; { description = "A Sphinx extension for BibTeX style citations"; homepage = "https://github.com/mcmtroffaes/sphinxcontrib-bibtex"; diff --git a/pkgs/development/python-modules/sphinxcontrib-blockdiag/default.nix b/pkgs/development/python-modules/sphinxcontrib-blockdiag/default.nix index 8d22c580676..44c4de9570d 100644 --- a/pkgs/development/python-modules/sphinxcontrib-blockdiag/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-blockdiag/default.nix @@ -27,6 +27,8 @@ buildPythonPackage rec { unittestFlagsArray = [ "-s" "tests" ]; + pythonNamespaces = [ "sphinxcontrib" ]; + meta = with lib; { description = "Sphinx blockdiag extension"; homepage = "https://github.com/blockdiag/sphinxcontrib-blockdiag"; diff --git a/pkgs/development/python-modules/sphinxcontrib-confluencebuilder/default.nix b/pkgs/development/python-modules/sphinxcontrib-confluencebuilder/default.nix index 111db7922b4..dc7798015cb 100644 --- a/pkgs/development/python-modules/sphinxcontrib-confluencebuilder/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-confluencebuilder/default.nix @@ -37,6 +37,8 @@ buildPythonPackage rec { "sphinxcontrib.confluencebuilder" ]; + pythonNamespaces = [ "sphinxcontrib" ]; + meta = with lib; { description = "Confluence builder for sphinx"; homepage = "https://github.com/sphinx-contrib/confluencebuilder"; diff --git a/pkgs/development/python-modules/sphinxcontrib-devhelp/default.nix b/pkgs/development/python-modules/sphinxcontrib-devhelp/default.nix index 293f4c856ef..b254d4b6432 100644 --- a/pkgs/development/python-modules/sphinxcontrib-devhelp/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-devhelp/default.nix @@ -1,24 +1,36 @@ { lib , buildPythonPackage , fetchPypi +, pythonOlder +, flit-core }: buildPythonPackage rec { pname = "sphinxcontrib-devhelp"; - version = "1.0.2"; + version = "1.0.5"; + pyproject = true; + + disabled = pythonOlder "3.9"; src = fetchPypi { - inherit pname version; - sha256 = "ff7f1afa7b9642e7060379360a67e9c41e8f3121f2ce9164266f61b9f4b338e4"; + pname = "sphinxcontrib_devhelp"; + inherit version; + hash = "sha256-Y7QeDTggfKQOu+q89NjlH3bAPnjNYavhGM9ENcc9QhI="; }; + nativeBuildInputs = [ + flit-core + ]; + # Check is disabled due to circular dependency of sphinx doCheck = false; + pythonNamespaces = [ "sphinxcontrib" ]; + meta = with lib; { description = "sphinxcontrib-devhelp is a sphinx extension which outputs Devhelp document."; homepage = "https://github.com/sphinx-doc/sphinxcontrib-devhelp"; - license = licenses.bsd0; + license = licenses.bsd2; maintainers = teams.sphinx.members; }; } diff --git a/pkgs/development/python-modules/sphinxcontrib-excel-table/default.nix b/pkgs/development/python-modules/sphinxcontrib-excel-table/default.nix index e48b24c3644..d7cea5a6418 100644 --- a/pkgs/development/python-modules/sphinxcontrib-excel-table/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-excel-table/default.nix @@ -21,6 +21,8 @@ buildPythonPackage rec { # No tests present upstream doCheck = false; + pythonNamespaces = [ "sphinxcontrib" ]; + meta = with lib; { description = "Sphinx excel-table extension"; homepage = "https://github.com/hackerain/sphinxcontrib-excel-table"; diff --git a/pkgs/development/python-modules/sphinxcontrib-fulltoc/default.nix b/pkgs/development/python-modules/sphinxcontrib-fulltoc/default.nix index 57535c6f137..79a32615007 100644 --- a/pkgs/development/python-modules/sphinxcontrib-fulltoc/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-fulltoc/default.nix @@ -21,6 +21,8 @@ buildPythonPackage rec { # Ensure package importing works pythonImportsCheck = [ "sphinxcontrib.fulltoc" ]; + pythonNamespaces = [ "sphinxcontrib" ]; + meta = with lib; { description = "Include a full table of contents in your Sphinx HTML sidebar"; homepage = "https://sphinxcontrib-fulltoc.readthedocs.org/"; diff --git a/pkgs/development/python-modules/sphinxcontrib-htmlhelp/default.nix b/pkgs/development/python-modules/sphinxcontrib-htmlhelp/default.nix index 901132176ed..56fae964eca 100644 --- a/pkgs/development/python-modules/sphinxcontrib-htmlhelp/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-htmlhelp/default.nix @@ -1,26 +1,36 @@ { lib , buildPythonPackage , fetchPypi -, isPy27 +, pythonOlder +, flit-core }: buildPythonPackage rec { pname = "sphinxcontrib-htmlhelp"; - version = "2.0.0"; - disabled = isPy27; + version = "2.0.4"; + pyproject = true; + + disabled = pythonOlder "3.9"; src = fetchPypi { - inherit pname version; - sha256 = "f5f8bb2d0d629f398bf47d0d69c07bc13b65f75a81ad9e2f71a63d4b7a2f6db2"; + pname = "sphinxcontrib_htmlhelp"; + inherit version; + hash = "sha256-bCahGKBbdgAHOEKbckoFaNveW3I5GmiFd9oI8RiRCSo="; }; + nativeBuildInputs = [ + flit-core + ]; + # Check is disabled due to circular dependency of sphinx doCheck = false; + pythonNamespaces = [ "sphinxcontrib" ]; + meta = with lib; { description = "Sphinx extension which renders HTML help files"; homepage = "https://github.com/sphinx-doc/sphinxcontrib-htmlhelp"; - license = licenses.bsd0; + license = licenses.bsd2; maintainers = teams.sphinx.members; }; } diff --git a/pkgs/development/python-modules/sphinxcontrib_httpdomain/default.nix b/pkgs/development/python-modules/sphinxcontrib-httpdomain/default.nix index ae4a571f0bb..96dad44be8b 100644 --- a/pkgs/development/python-modules/sphinxcontrib_httpdomain/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-httpdomain/default.nix @@ -19,6 +19,8 @@ buildPythonPackage rec { # https://bitbucket.org/pypa/setuptools/issue/137/typeerror-unorderable-types-str-nonetype doCheck = false; + pythonNamespaces = [ "sphinxcontrib" ]; + meta = with lib; { description = "Provides a Sphinx domain for describing RESTful HTTP APIs"; homepage = "https://bitbucket.org/birkenfeld/sphinx-contrib"; diff --git a/pkgs/development/python-modules/sphinxcontrib-jquery/default.nix b/pkgs/development/python-modules/sphinxcontrib-jquery/default.nix index 1905659b25f..16c57f5886b 100644 --- a/pkgs/development/python-modules/sphinxcontrib-jquery/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-jquery/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, fetchpatch , flit-core , pytestCheckHook , sphinx @@ -8,16 +9,29 @@ buildPythonPackage rec { pname = "sphinxcontrib-jquery"; - version = "3.0.0"; + version = "4.1"; format = "pyproject"; src = fetchFromGitHub { owner = "sphinx-contrib"; repo = "jquery"; rev = "refs/tags/v${version}"; - hash = "sha256-argG+jMUqLiWo4lKWAmHmUxotHl+ddJuJZ/zcUl9u5Q="; + hash = "sha256-ZQGQcVmhWREFa2KyaOKdTz5W2AS2ur7pFp8qZ2IkxSE="; }; + patches = [ + (fetchpatch { + name = "fix-tests-with-sphinx7.1.patch"; + url = "https://github.com/sphinx-contrib/jquery/commit/ac97ce5202b05ddb6bf4e5b77151a8964b6bf632.patch"; + hash = "sha256-dc9bhr/af3NmrIfoVabM1lNpXbGVsJoj7jq0E1BAtHw="; + }) + (fetchpatch { + name = "fix-tests-with-sphinx7.2.patch"; + url = "https://github.com/sphinx-contrib/jquery/commit/03f1595b3793e087a407933fbcb757bdd3f558fc.patch"; + hash = "sha256-4gNG1DL/63N2FwXDy5fMApZpf/AGOGBruwPuVqgnVkc="; + }) + ]; + nativeBuildInputs = [ flit-core ]; @@ -31,6 +45,8 @@ buildPythonPackage rec { sphinx ]; + pythonNamespaces = [ "sphinxcontrib" ]; + meta = with lib; { description = "Extension to include jQuery on newer Sphinx releases"; longDescription = '' diff --git a/pkgs/development/python-modules/sphinxcontrib-jsmath/default.nix b/pkgs/development/python-modules/sphinxcontrib-jsmath/default.nix index da630c6ee96..2b8c2cd7582 100644 --- a/pkgs/development/python-modules/sphinxcontrib-jsmath/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-jsmath/default.nix @@ -17,6 +17,8 @@ buildPythonPackage rec { # Check is disabled due to circular dependency of sphinx doCheck = false; + pythonNamespaces = [ "sphinxcontrib" ]; + meta = with lib; { description = "sphinxcontrib-jsmath is a sphinx extension which renders display math in HTML via JavaScript."; homepage = "https://github.com/sphinx-doc/sphinxcontrib-jsmath"; diff --git a/pkgs/development/python-modules/sphinxcontrib-katex/default.nix b/pkgs/development/python-modules/sphinxcontrib-katex/default.nix index 248030c241b..30c94a088fb 100644 --- a/pkgs/development/python-modules/sphinxcontrib-katex/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-katex/default.nix @@ -28,6 +28,8 @@ buildPythonPackage rec { "sphinxcontrib.katex" ]; + pythonNamespaces = [ "sphinxcontrib" ]; + meta = with lib; { description = "Sphinx extension using KaTeX to render math in HTML"; homepage = "https://github.com/hagenw/sphinxcontrib-katex"; diff --git a/pkgs/development/python-modules/sphinxcontrib-log-cabinet/default.nix b/pkgs/development/python-modules/sphinxcontrib-log-cabinet/default.nix index 867d5acc9ba..2dfc743a60f 100644 --- a/pkgs/development/python-modules/sphinxcontrib-log-cabinet/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-log-cabinet/default.nix @@ -18,6 +18,8 @@ buildPythonPackage rec { doCheck = false; # no tests + pythonNamespaces = [ "sphinxcontrib" ]; + meta = with lib; { homepage = "https://github.com/davidism/sphinxcontrib-log-cabinet"; description = "Sphinx extension to organize changelogs"; diff --git a/pkgs/development/python-modules/sphinxcontrib-mscgen/default.nix b/pkgs/development/python-modules/sphinxcontrib-mscgen/default.nix index 0a283dd81a4..7350b837a7f 100644 --- a/pkgs/development/python-modules/sphinxcontrib-mscgen/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-mscgen/default.nix @@ -30,6 +30,8 @@ buildPythonPackage rec { "sphinxcontrib.mscgen" ]; + pythonNamespaces = [ "sphinxcontrib" ]; + meta = with lib; { description = "Sphinx extension using mscgen to render diagrams"; homepage = "https://github.com/sphinx-contrib/mscgen"; diff --git a/pkgs/development/python-modules/sphinxcontrib_newsfeed/default.nix b/pkgs/development/python-modules/sphinxcontrib-newsfeed/default.nix index a298025f8ba..ee9661d954e 100644 --- a/pkgs/development/python-modules/sphinxcontrib_newsfeed/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-newsfeed/default.nix @@ -1,23 +1,33 @@ { lib , buildPythonPackage , fetchPypi +, setuptools , sphinx }: buildPythonPackage rec { pname = "sphinxcontrib-newsfeed"; version = "0.1.4"; + pyproject = true; src = fetchPypi { inherit pname version; sha256 = "1d7gam3mn8v4in4p16yn3v10vps7nnaz6ilw99j4klij39dqd37p"; }; - propagatedBuildInputs = [ sphinx ]; + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + sphinx + ]; + + pythonNamespaces = [ "sphinxcontrib" ]; meta = with lib; { description = "Extension for adding a simple Blog, News or Announcements section to a Sphinx website"; - homepage = "https://bitbucket.org/prometheus/sphinxcontrib-newsfeed"; + homepage = "https://github.com/prometheusresearch/sphinxcontrib-newsfeed"; license = licenses.bsd2; }; diff --git a/pkgs/development/python-modules/sphinxcontrib-nwdiag/default.nix b/pkgs/development/python-modules/sphinxcontrib-nwdiag/default.nix index 47573ad609a..de4ebf723bf 100644 --- a/pkgs/development/python-modules/sphinxcontrib-nwdiag/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-nwdiag/default.nix @@ -29,6 +29,8 @@ buildPythonPackage rec { "sphinxcontrib.nwdiag" ]; + pythonNamespaces = [ "sphinxcontrib" ]; + meta = with lib; { description = "Sphinx nwdiag extension"; homepage = "https://github.com/blockdiag/sphinxcontrib-nwdiag"; diff --git a/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix b/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix index 0ed95a19b98..6e3279b4de9 100644 --- a/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix @@ -9,7 +9,7 @@ , picobox , pyyaml , sphinx-mdinclude -, sphinxcontrib_httpdomain +, sphinxcontrib-httpdomain }: buildPythonPackage rec { @@ -29,13 +29,15 @@ buildPythonPackage rec { picobox pyyaml sphinx-mdinclude - sphinxcontrib_httpdomain + sphinxcontrib-httpdomain ]; SETUPTOOLS_SCM_PRETEND_VERSION = version; doCheck = false; + pythonNamespaces = [ "sphinxcontrib" ]; + meta = with lib; { homepage = "https://github.com/ikalnytskyi/sphinxcontrib-openapi"; description = "OpenAPI (fka Swagger) spec renderer for Sphinx"; diff --git a/pkgs/development/python-modules/sphinxcontrib-plantuml/default.nix b/pkgs/development/python-modules/sphinxcontrib-plantuml/default.nix index aabc1c49d0c..d6c588c8d02 100644 --- a/pkgs/development/python-modules/sphinxcontrib-plantuml/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-plantuml/default.nix @@ -26,6 +26,8 @@ buildPythonPackage rec { # No tests included. doCheck = false; + pythonNamespaces = [ "sphinxcontrib" ]; + meta = with lib; { description = "Provides a Sphinx domain for embedding UML diagram with PlantUML"; homepage = "https://github.com/sphinx-contrib/plantuml/"; diff --git a/pkgs/development/python-modules/sphinxcontrib-programoutput/default.nix b/pkgs/development/python-modules/sphinxcontrib-programoutput/default.nix index 17f2d5dcbe6..67d7d9b587f 100644 --- a/pkgs/development/python-modules/sphinxcontrib-programoutput/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-programoutput/default.nix @@ -23,6 +23,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "sphinxcontrib.programoutput" ]; + pythonNamespaces = [ "sphinxcontrib" ]; + meta = with lib; { description = "Sphinx extension to include program output"; homepage = "https://github.com/NextThought/sphinxcontrib-programoutput"; diff --git a/pkgs/development/python-modules/sphinxcontrib-qthelp/default.nix b/pkgs/development/python-modules/sphinxcontrib-qthelp/default.nix index 4364fcb99dc..d526f8aad8e 100644 --- a/pkgs/development/python-modules/sphinxcontrib-qthelp/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-qthelp/default.nix @@ -1,26 +1,36 @@ { lib , buildPythonPackage , fetchPypi -, isPy27 +, pythonOlder +, flit-core }: buildPythonPackage rec { pname = "sphinxcontrib-qthelp"; - version = "1.0.3"; - disabled = isPy27; + version = "1.0.6"; + pyproject = true; + + disabled = pythonOlder "3.9"; src = fetchPypi { - inherit pname version; - sha256 = "4c33767ee058b70dba89a6fc5c1892c0d57a54be67ddd3e7875a18d14cba5a72"; + pname = "sphinxcontrib_qthelp"; + inherit version; + hash = "sha256-YrnRoYarf17jNW2Qb2SMrLemvblNIB7nrfJttVCSmC0="; }; + nativeBuildInputs = [ + flit-core + ]; + # Check is disabled due to circular dependency of sphinx doCheck = false; + pythonNamespaces = [ "sphinxcontrib" ]; + meta = with lib; { description = "sphinxcontrib-qthelp is a sphinx extension which outputs QtHelp document."; homepage = "https://github.com/sphinx-doc/sphinxcontrib-qthelp"; - license = licenses.bsd0; + license = licenses.bsd2; maintainers = teams.sphinx.members; }; } diff --git a/pkgs/development/python-modules/sphinxcontrib-seqdiag/default.nix b/pkgs/development/python-modules/sphinxcontrib-seqdiag/default.nix index cc3a96086e4..085cb573054 100644 --- a/pkgs/development/python-modules/sphinxcontrib-seqdiag/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-seqdiag/default.nix @@ -29,6 +29,8 @@ buildPythonPackage rec { "sphinxcontrib.seqdiag" ]; + pythonNamespaces = [ "sphinxcontrib" ]; + meta = with lib; { description = "Sphinx seqdiag extension"; homepage = "https://github.com/blockdiag/sphinxcontrib-seqdiag"; diff --git a/pkgs/development/python-modules/sphinxcontrib-serializinghtml/default.nix b/pkgs/development/python-modules/sphinxcontrib-serializinghtml/default.nix index 85ed3cdc596..4604eec5f18 100644 --- a/pkgs/development/python-modules/sphinxcontrib-serializinghtml/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-serializinghtml/default.nix @@ -1,26 +1,36 @@ { lib , buildPythonPackage , fetchPypi -, isPy27 +, pythonOlder +, flit-core }: buildPythonPackage rec { pname = "sphinxcontrib-serializinghtml"; - version = "1.1.5"; - disabled = isPy27; + version = "1.1.9"; + pyproject = true; + + disabled = pythonOlder "3.9"; src = fetchPypi { - inherit pname version; - sha256 = "aa5f6de5dfdf809ef505c4895e51ef5c9eac17d0f287933eb49ec495280b6952"; + pname = "sphinxcontrib_serializinghtml"; + inherit version; + hash = "sha256-DGT/iYM54frCmr0r9fEQePPsQTz+nARtMSDXymVTC1Q="; }; + nativeBuildInputs = [ + flit-core + ]; + # Check is disabled due to circular dependency of sphinx doCheck = false; + pythonNamespaces = [ "sphinxcontrib" ]; + meta = with lib; { description = "sphinxcontrib-serializinghtml is a sphinx extension which outputs \"serialized\" HTML files (json and pickle)."; homepage = "https://github.com/sphinx-doc/sphinxcontrib-serializinghtml"; - license = licenses.bsd0; + license = licenses.bsd2; maintainers = teams.sphinx.members; }; } diff --git a/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix b/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix index 2a8085de7c2..b7a71f891c3 100644 --- a/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix @@ -42,6 +42,8 @@ buildPythonPackage rec { "sphinxcontrib.spelling" ]; + pythonNamespaces = [ "sphinxcontrib" ]; + meta = with lib; { description = "Sphinx spelling extension"; homepage = "https://github.com/sphinx-contrib/spelling"; diff --git a/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix b/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix index 4e47298c806..dd83acb3d20 100644 --- a/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix @@ -28,6 +28,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "sphinxcontrib.tikz" ]; + pythonNamespaces = [ "sphinxcontrib" ]; + meta = with lib; { description = "TikZ extension for Sphinx"; homepage = "https://bitbucket.org/philexander/tikz"; diff --git a/pkgs/development/python-modules/sphinxcontrib-websupport/default.nix b/pkgs/development/python-modules/sphinxcontrib-websupport/default.nix index ad800984ee4..bd9ae779c08 100644 --- a/pkgs/development/python-modules/sphinxcontrib-websupport/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-websupport/default.nix @@ -28,6 +28,8 @@ buildPythonPackage rec { doCheck = false; + pythonNamespaces = [ "sphinxcontrib" ]; + meta = { description = "Sphinx API for Web Apps"; homepage = "http://sphinx-doc.org/"; diff --git a/pkgs/development/python-modules/sphinxcontrib-youtube/default.nix b/pkgs/development/python-modules/sphinxcontrib-youtube/default.nix index 67249bd8828..ab48066dc6a 100644 --- a/pkgs/development/python-modules/sphinxcontrib-youtube/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-youtube/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "sphinxcontrib-youtube"; - version = "1.3.0"; + version = "1.4.1"; format = "pyproject"; nativeBuildInputs = [ flit-core ]; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "sphinx-contrib"; repo = "youtube"; rev = "refs/tags/v${version}"; - hash = "sha256-/mu/OGMc+iP7DV36fmE8pb5y6MMOQ0fmzT8R7RP/tjM="; + hash = "sha256-XuOfZ77tg9akmgTuMQN20OhgkFbn/6YzT46vpTsXxC8="; }; propagatedBuildInputs = [ sphinx requests ]; @@ -27,6 +27,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "sphinxcontrib.youtube" ]; + pythonNamespaces = [ "sphinxcontrib" ]; + meta = with lib; { description = "Youtube extension for Sphinx"; homepage = "https://github.com/sphinx-contrib/youtube"; diff --git a/pkgs/development/python-modules/sphinxext-opengraph/default.nix b/pkgs/development/python-modules/sphinxext-opengraph/default.nix index dc66c1c44f4..85a736bd880 100644 --- a/pkgs/development/python-modules/sphinxext-opengraph/default.nix +++ b/pkgs/development/python-modules/sphinxext-opengraph/default.nix @@ -11,16 +11,16 @@ buildPythonPackage rec { pname = "sphinxext-opengraph"; - version = "0.8.2"; + version = "0.9.0"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "wpilibsuite"; repo = "sphinxext-opengraph"; rev = "refs/tags/v${version}"; - hash = "sha256-SrZTtVzEp4E87fzisWKHl8iRP49PWt5kkJq62CqXrBc="; + hash = "sha256-ZLIxbFgayG+WVvSXu74eZJ/PbSHg6dzkkIr1OBry4DE="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -29,15 +29,20 @@ buildPythonPackage rec { setuptools-scm ]; + passthru.optional-dependencies = { + social_cards_generation = [ + matplotlib + ]; + }; + propagatedBuildInputs = [ sphinx - matplotlib ]; nativeCheckInputs = [ pytestCheckHook beautifulsoup4 - ]; + ] ++ passthru.optional-dependencies.social_cards_generation; pythonImportsCheck = [ "sphinxext.opengraph" ]; diff --git a/pkgs/development/python-modules/sqids/default.nix b/pkgs/development/python-modules/sqids/default.nix index dc6befc1799..a9d5fe37295 100644 --- a/pkgs/development/python-modules/sqids/default.nix +++ b/pkgs/development/python-modules/sqids/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "sqids"; - version = "0.4.0"; + version = "0.4.1"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-U9nVpRc9PIM1ZO+bcL3RGIfAdlUMf+uFw/SpPTAjdnA="; + hash = "sha256-/8P7/vY0kb7ouUCpgGU4g0Xb77BtSeQVt6nkdcogD50="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/sqlalchemy-migrate/default.nix b/pkgs/development/python-modules/sqlalchemy-migrate/default.nix index ecfa57be2e3..c71172764af 100644 --- a/pkgs/development/python-modules/sqlalchemy-migrate/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-migrate/default.nix @@ -26,8 +26,9 @@ buildPythonPackage rec { patches = [ # See: https://review.openstack.org/#/c/608382/ + # https://github.com/openstack/sqlalchemy-migrate/pull/18 (fetchpatch { - url = "https://github.com/openstack/sqlalchemy-migrate/pull/18.patch"; + url = "https://github.com/openstack/sqlalchemy-migrate/commit/a5d69a17d9354ec1a792493280f96484740cf7ff.patch"; sha256 = "1qyfq2m7w7xqf0r9bc2x42qcra4r9k9l9g1jy5j0fvlb6bvvjj07"; }) ./python3.11-comp.diff diff --git a/pkgs/development/python-modules/std2/default.nix b/pkgs/development/python-modules/std2/default.nix index 2b51f9caaec..8e117b10e77 100644 --- a/pkgs/development/python-modules/std2/default.nix +++ b/pkgs/development/python-modules/std2/default.nix @@ -6,15 +6,14 @@ buildPythonPackage { pname = "std2"; - version = "unstable-2023-07-09"; - - format = "pyproject"; + version = "unstable-2023-10-07"; + pyproject = true; src = fetchFromGitHub { owner = "ms-jpq"; repo = "std2"; - rev = "2d5594b40585ecae60ce5175bee68cc8b3085ee6"; - hash = "sha256-phGIWow7PGOtS1Pre1Gz0Xg6izGp6BiUTmze5jI/BwY="; + rev = "6332e559ee51c3a7c956804afdd7e1cc6ad47965"; + hash = "sha256-huN7P/Ws6anrFXDG7L5xxMenS25BHquV9cMi1s7WFJ4="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/syrupy/default.nix b/pkgs/development/python-modules/syrupy/default.nix index 8759f356259..84bc944317e 100644 --- a/pkgs/development/python-modules/syrupy/default.nix +++ b/pkgs/development/python-modules/syrupy/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "syrupy"; - version = "4.5.0"; + version = "4.6.0"; format = "pyproject"; disabled = lib.versionOlder python.version "3.8.1"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "tophat"; repo = "syrupy"; rev = "refs/tags/v${version}"; - hash = "sha256-HRCURqnFzo1l+PjX1LtXTSVZGA36OaRgmy4xKizeuOg="; + hash = "sha256-FjDGwSOKvDWx+LwUCNGEOBKV3rFG+09gtFpLLi0xgD4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/testpath/default.nix b/pkgs/development/python-modules/testpath/default.nix index 5635a615615..eb66bea56f5 100644 --- a/pkgs/development/python-modules/testpath/default.nix +++ b/pkgs/development/python-modules/testpath/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { # exe are only required when testpath is used on windows # https://github.com/jupyter/testpath/blob/de8ca59539eb23b9781e55848b7d2646c8c61df9/testpath/commands.py#L128 - preBuild = lib.optionalString (!stdenv.targetPlatform.isWindows) '' + preBuild = lib.optionalString (!stdenv.hostPlatform.isWindows) '' rm testpath/cli-32.exe testpath/cli-64.exe ''; diff --git a/pkgs/development/python-modules/textual-dev/default.nix b/pkgs/development/python-modules/textual-dev/default.nix new file mode 100644 index 00000000000..16b77ffabc4 --- /dev/null +++ b/pkgs/development/python-modules/textual-dev/default.nix @@ -0,0 +1,59 @@ +{ lib +, aiohttp +, buildPythonPackage +, click +, fetchFromGitHub +, msgpack +, poetry-core +, pytest-aiohttp +, pytestCheckHook +, pythonOlder +, textual +, time-machine +, typing-extensions +}: + +buildPythonPackage rec { + pname = "textual-dev"; + version = "1.2.1"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "Textualize"; + repo = "textual-dev"; + # we use rev instead of tag since upstream doesn't use tags + rev = "6afa9013a42cb18e9105e49d6a56874097f7c812"; + hash = "sha256-ef35389ZMU/zih7Se3KkMGECf5o2i5y6up64/1AECas="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + aiohttp + click + msgpack + textual + typing-extensions + ]; + + nativeCheckInputs = [ + pytest-aiohttp + pytestCheckHook + time-machine + ]; + + pythonImportsCheck = [ + "textual_dev" + ]; + + meta = with lib; { + description = "Development tools for Textual"; + homepage = "https://github.com/Textualize/textual-dev"; + license = licenses.mit; + maintainers = with maintainers; [ yannip ]; + }; +} diff --git a/pkgs/development/python-modules/tokenizers/Cargo.lock b/pkgs/development/python-modules/tokenizers/Cargo.lock index 841e6b5e095..ced7f153873 100644 --- a/pkgs/development/python-modules/tokenizers/Cargo.lock +++ b/pkgs/development/python-modules/tokenizers/Cargo.lock @@ -4,20 +4,59 @@ version = 3 [[package]] name = "aho-corasick" -version = "0.7.20" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" +checksum = "ea5d730647d4fadd988536d06fecce94b7b4f2a7efdae548f1cf4b63205518ab" dependencies = [ "memchr", ] [[package]] -name = "aho-corasick" -version = "1.0.5" +name = "anstream" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c378d78423fdad8089616f827526ee33c19f2fddbd5de1629152c9593ba4783" +checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44" dependencies = [ - "memchr", + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" + +[[package]] +name = "anstyle-parse" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "317b9a89c1868f5ea6ff1d9539a69f45dffc21ce321ac1fd1160dfa48c8e2140" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" +dependencies = [ + "windows-sys 0.48.0", +] + +[[package]] +name = "anstyle-wincon" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628" +dependencies = [ + "anstyle", + "windows-sys 0.48.0", ] [[package]] @@ -46,12 +85,9 @@ checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" [[package]] name = "cc" -version = "1.0.83" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" -dependencies = [ - "libc", -] +checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" [[package]] name = "cfg-if" @@ -60,13 +96,62 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] -name = "crossbeam-channel" -version = "0.5.8" +name = "clap" +version = "4.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" +checksum = "d04704f56c2cde07f43e8e2c154b43f216dc5c92fc98ada720177362f953b956" dependencies = [ - "cfg-if", - "crossbeam-utils", + "clap_builder", + "clap_derive", +] + +[[package]] +name = "clap_builder" +version = "4.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e231faeaca65ebd1ea3c737966bf858971cd38c3849107aa3ea7de90a804e45" +dependencies = [ + "anstream", + "anstyle", + "clap_lex", + "strsim", +] + +[[package]] +name = "clap_derive" +version = "4.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0862016ff20d69b84ef8247369fabf5c008a7417002411897d40ee1f4532b873" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn 2.0.25", +] + +[[package]] +name = "clap_lex" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961" + +[[package]] +name = "colorchoice" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" + +[[package]] +name = "console" +version = "0.15.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c926e00cc70edefdc64d3a5ff31cc65bb97a3460097762bd23afb4d8145fccf8" +dependencies = [ + "encode_unicode", + "lazy_static", + "libc", + "unicode-width", + "windows-sys 0.45.0", ] [[package]] @@ -170,9 +255,15 @@ dependencies = [ [[package]] name = "either" -version = "1.9.0" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" + +[[package]] +name = "encode_unicode" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" +checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" [[package]] name = "env_logger" @@ -189,13 +280,13 @@ dependencies = [ [[package]] name = "errno" -version = "0.3.3" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd" +checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" dependencies = [ "errno-dragonfly", "libc", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -210,15 +301,18 @@ dependencies = [ [[package]] name = "esaxx-rs" -version = "0.1.8" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f748b253ceca9fed5f42f8b5ceb3851e93102199bc25b64b65369f76e5c0a35" +checksum = "d817e038c30374a4bcb22f94d0a8a0e216958d4c3dcde369b1439fec4bdda6e6" +dependencies = [ + "cc", +] [[package]] name = "fastrand" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" [[package]] name = "fnv" @@ -238,6 +332,12 @@ dependencies = [ ] [[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + +[[package]] name = "hermit-abi" version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -256,45 +356,58 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" [[package]] +name = "indicatif" +version = "0.17.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb28741c9db9a713d93deb3bb9515c20788cef5815265bee4980e87bde7e0f25" +dependencies = [ + "console", + "instant", + "number_prefix", + "portable-atomic", + "unicode-width", +] + +[[package]] name = "indoc" version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfa799dd5ed20a7e349f3b4639aa80d74549c81716d9ec4f994c9b5815598306" [[package]] -name = "is-terminal" -version = "0.4.9" +name = "instant" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" dependencies = [ - "hermit-abi", - "rustix", - "windows-sys", + "cfg-if", ] [[package]] -name = "itertools" -version = "0.8.2" +name = "is-terminal" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f56a2d0bc861f9165be4eb3442afd3c236d8a98afd426f65d92324ae1091a484" +checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ - "either", + "hermit-abi", + "rustix", + "windows-sys 0.48.0", ] [[package]] name = "itertools" -version = "0.9.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b" +checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" dependencies = [ "either", ] [[package]] name = "itoa" -version = "1.0.9" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" +checksum = "62b02a5381cc465bd3041d84623d0fa3b66738b52b8e2fc3bab8ad63ab032f4a" [[package]] name = "lazy_static" @@ -310,9 +423,9 @@ checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" [[package]] name = "linux-raw-sys" -version = "0.4.5" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503" +checksum = "3852614a3bd9ca9804678ba6be5e3b8ce76dfc902cae004e3e0c44051b6e88db" [[package]] name = "lock_api" @@ -326,15 +439,15 @@ dependencies = [ [[package]] name = "log" -version = "0.4.20" +version = "0.4.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" [[package]] name = "macro_rules_attribute" -version = "0.1.3" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf0c9b980bf4f3a37fd7b1c066941dd1b1d0152ce6ee6e8fe8c49b9f6810d862" +checksum = "8a82271f7bc033d84bbca59a3ce3e4159938cb08a9c3aebbe54d215131518a13" dependencies = [ "macro_rules_attribute-proc_macro", "paste", @@ -342,18 +455,9 @@ dependencies = [ [[package]] name = "macro_rules_attribute-proc_macro" -version = "0.1.3" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58093314a45e00c77d5c508f76e77c3396afbbc0d01506e7fae47b018bac2b1d" - -[[package]] -name = "matrixmultiply" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "916806ba0031cd542105d916a97c8572e1fa6dd79c9c51e7eb43a09ec2dd84c1" -dependencies = [ - "rawpointer", -] +checksum = "b8dd856d451cc0da70e2ef2ce95a18e39a93b7558bedf10201ad28503f918568" [[package]] name = "matrixmultiply" @@ -367,9 +471,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.6.3" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c" +checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" [[package]] name = "memoffset" @@ -404,20 +508,7 @@ checksum = "371717c0a5543d6a800cac822eac735aa7d2d2fbb41002e9856a4089532dbdce" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", -] - -[[package]] -name = "ndarray" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac06db03ec2f46ee0ecdca1a1c34a99c0d188a0d83439b84bf0cb4b386e4ab09" -dependencies = [ - "matrixmultiply 0.2.4", - "num-complex 0.2.4", - "num-integer", - "num-traits", - "rawpointer", + "syn 2.0.25", ] [[package]] @@ -426,8 +517,8 @@ version = "0.15.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "adb12d4e967ec485a5f71c6311fe28158e9d6f4bc4a447b474184d0f91a8fa32" dependencies = [ - "matrixmultiply 0.3.7", - "num-complex 0.4.4", + "matrixmultiply", + "num-complex", "num-integer", "num-traits", "rawpointer", @@ -445,19 +536,9 @@ dependencies = [ [[package]] name = "num-complex" -version = "0.2.4" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6b19411a9719e753aff12e5187b74d60d3dc449ec3f4dc21e3989c3f554bc95" -dependencies = [ - "autocfg", - "num-traits", -] - -[[package]] -name = "num-complex" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214" +checksum = "02e0d21255c828d6f128a1e41534206671e8c3ea0c62f32291e808dc82cff17d" dependencies = [ "num-traits", ] @@ -474,22 +555,18 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.16" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" +checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" dependencies = [ "autocfg", ] [[package]] -name = "num_cpus" -version = "1.16.0" +name = "number_prefix" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" -dependencies = [ - "hermit-abi", - "libc", -] +checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" [[package]] name = "numpy" @@ -498,8 +575,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "437213adf41bbccf4aeae535fbfcdad0f6fed241e1ae182ebe97fa1f3ce19389" dependencies = [ "libc", - "ndarray 0.15.6", - "num-complex 0.4.4", + "ndarray", + "num-complex", "num-integer", "num-traits", "pyo3", @@ -554,7 +631,7 @@ dependencies = [ "libc", "redox_syscall", "smallvec", - "windows-targets", + "windows-targets 0.48.1", ] [[package]] @@ -570,6 +647,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" [[package]] +name = "portable-atomic" +version = "1.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31114a898e107c51bb1609ffaf55a0e011cf6a4d7f1170d0015a165082c0338b" + +[[package]] name = "ppv-lite86" version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -577,9 +660,9 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "proc-macro2" -version = "1.0.66" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" +checksum = "78803b62cbf1f46fde80d7c0e803111524b9877184cfe7c3033659490ac7a7da" dependencies = [ "unicode-ident", ] @@ -646,9 +729,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.33" +version = "1.0.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "573015e8ab27661678357f27dc26460738fd2b6c86e46f386fde94cb5d913105" dependencies = [ "proc-macro2", ] @@ -691,9 +774,9 @@ checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3" [[package]] name = "rayon" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" +checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" dependencies = [ "either", "rayon-core", @@ -701,25 +784,23 @@ dependencies = [ [[package]] name = "rayon-cond" -version = "0.1.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd1259362c9065e5ea39a789ef40b1e3fd934c94beb7b5ab3ac6629d3b5e7cb7" +checksum = "059f538b55efd2309c9794130bc149c6a553db90e9d99c2030785c82f0bd7df9" dependencies = [ "either", - "itertools 0.8.2", + "itertools", "rayon", ] [[package]] name = "rayon-core" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" +checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" dependencies = [ - "crossbeam-channel", "crossbeam-deque", "crossbeam-utils", - "num_cpus", ] [[package]] @@ -733,11 +814,11 @@ dependencies = [ [[package]] name = "regex" -version = "1.9.5" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47" +checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575" dependencies = [ - "aho-corasick 1.0.5", + "aho-corasick", "memchr", "regex-automata", "regex-syntax", @@ -745,20 +826,20 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.8" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795" +checksum = "39354c10dd07468c2e73926b23bb9c2caca74c5501e38a35da70406f1d923310" dependencies = [ - "aho-corasick 1.0.5", + "aho-corasick", "memchr", "regex-syntax", ] [[package]] name = "regex-syntax" -version = "0.7.5" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" +checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" [[package]] name = "rustc-hash" @@ -768,54 +849,54 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustix" -version = "0.38.11" +version = "0.38.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0c3dde1fc030af041adc40e79c0e7fbcf431dd24870053d187d7c66e4b87453" +checksum = "d7db8590df6dfcd144d22afd1b83b36c21a18d7cbc1dc4bb5295a8712e9eb662" dependencies = [ "bitflags 2.4.0", "errno", "libc", "linux-raw-sys", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] name = "ryu" -version = "1.0.15" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" +checksum = "fe232bdf6be8c8de797b22184ee71118d63780ea42ac85b61d1baa6d3b782ae9" [[package]] name = "scopeguard" -version = "1.2.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" +checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] name = "serde" -version = "1.0.188" +version = "1.0.171" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" +checksum = "30e27d1e4fd7659406c492fd6cfaf2066ba8773de45ca75e855590f856dc34a9" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.188" +version = "1.0.171" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" +checksum = "389894603bd18c46fa56231694f8d827779c0951a667087194cf9de94ed24682" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.25", ] [[package]] name = "serde_json" -version = "1.0.105" +version = "1.0.102" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360" +checksum = "b5062a995d481b2308b6064e9af76011f2921c35f97b0468811ed9f6cd91dfed" dependencies = [ "itoa", "ryu", @@ -859,9 +940,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.31" +version = "2.0.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "718fa2415bcb8d8bd775917a1bf12a7931b6dfa890753378538118181e0cb398" +checksum = "15e3fc8c0c74267e2df136e5e5fb656a464158aa57624053375eb9c8c6e25ae2" dependencies = [ "proc-macro2", "quote", @@ -870,9 +951,9 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.11" +version = "0.12.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d0e916b1148c8e263850e1ebcbd046f333e0683c724876bb0da63ea4373dc8a" +checksum = "df8e77cb757a61f51b947ec4a7e3646efd825b73561db1c232a8ccb639e611a0" [[package]] name = "tempfile" @@ -884,7 +965,7 @@ dependencies = [ "fastrand", "redox_syscall", "rustix", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -898,33 +979,35 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.48" +version = "1.0.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d6d7a740b8a666a7e828dd00da9c0dc290dff53154ea77ac109281de90589b7" +checksum = "1177e8c6d7ede7afde3585fd2513e611227efd6481bd78d2e82ba1ce16557ed4" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.48" +version = "1.0.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35" +checksum = "10712f02019e9288794769fba95cd6847df9874d49d871d062172f9dd41bc4cc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.25", ] [[package]] name = "tokenizers" -version = "0.14.0" +version = "0.14.1" dependencies = [ - "aho-corasick 0.7.20", + "aho-corasick", + "clap", "derive_builder", "esaxx-rs", "getrandom", - "itertools 0.9.0", + "indicatif", + "itertools", "lazy_static", "log", "macro_rules_attribute", @@ -947,12 +1030,12 @@ dependencies = [ [[package]] name = "tokenizers-python" -version = "0.14.0" +version = "0.14.1" dependencies = [ "env_logger", - "itertools 0.9.0", + "itertools", "libc", - "ndarray 0.13.1", + "ndarray", "numpy", "onig", "pyo3", @@ -965,9 +1048,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.11" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" +checksum = "22049a19f4a68748a168c0fc439f9516686aa045927ff767eca0a85101fb6e73" [[package]] name = "unicode-normalization-alignments" @@ -985,6 +1068,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" [[package]] +name = "unicode-width" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" + +[[package]] name = "unicode_categories" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -997,6 +1086,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1766d682d402817b5ac4490b3c3002d91dfa0d22812f341609f97b08757359c" [[package]] +name = "utf8parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" + +[[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1035,66 +1130,132 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows-sys" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets 0.42.2", +] + +[[package]] +name = "windows-sys" version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets", + "windows-targets 0.48.1", ] [[package]] name = "windows-targets" -version = "0.48.5" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", ] [[package]] +name = "windows-targets" +version = "0.48.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" +dependencies = [ + "windows_aarch64_gnullvm 0.48.0", + "windows_aarch64_msvc 0.48.0", + "windows_i686_gnu 0.48.0", + "windows_i686_msvc 0.48.0", + "windows_x86_64_gnu 0.48.0", + "windows_x86_64_gnullvm 0.48.0", + "windows_x86_64_msvc 0.48.0", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" + +[[package]] name = "windows_aarch64_gnullvm" -version = "0.48.5" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" +checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" [[package]] name = "windows_aarch64_msvc" -version = "0.48.5" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" + +[[package]] +name = "windows_i686_gnu" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" [[package]] name = "windows_i686_gnu" -version = "0.48.5" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" + +[[package]] +name = "windows_i686_msvc" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" [[package]] name = "windows_i686_msvc" -version = "0.48.5" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" [[package]] name = "windows_x86_64_gnu" -version = "0.48.5" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" [[package]] name = "windows_x86_64_gnullvm" -version = "0.48.5" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" +checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" [[package]] name = "windows_x86_64_msvc" -version = "0.48.5" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" +checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" diff --git a/pkgs/development/python-modules/tokenizers/default.nix b/pkgs/development/python-modules/tokenizers/default.nix index 149f86a284f..d8a731825fe 100644 --- a/pkgs/development/python-modules/tokenizers/default.nix +++ b/pkgs/development/python-modules/tokenizers/default.nix @@ -60,7 +60,7 @@ let in buildPythonPackage rec { pname = "tokenizers"; - version = "0.14.0"; + version = "0.14.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -69,7 +69,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = pname; rev = "v${version}"; - hash = "sha256-zCpKNMzIdQ0lLWdn4cENtBEMTA7+fg+N6wQGvio9llE="; + hash = "sha256-cq7dQLttNkV5UUhXujxKKMuzhD7hz+zTTKxUKlvz1s0="; }; cargoDeps = rustPlatform.importCargoLock { diff --git a/pkgs/development/python-modules/torch/default.nix b/pkgs/development/python-modules/torch/default.nix index 64c8d833a3f..f89fed489f8 100644 --- a/pkgs/development/python-modules/torch/default.nix +++ b/pkgs/development/python-modules/torch/default.nix @@ -16,9 +16,10 @@ filelock, jinja2, networkx, - openai-triton, sympy, numpy, pyyaml, cffi, click, typing-extensions, + # ROCm build and `torch.compile` requires `openai-triton` + tritonSupport ? (!stdenv.isDarwin), openai-triton, # Unit tests hypothesis, psutil, @@ -34,16 +35,15 @@ # ninja (https://ninja-build.org) must be available to run C++ extensions tests, ninja, - linuxHeaders_5_19, - # dependencies for torch.utils.tensorboard pillow, six, future, tensorboard, protobuf, pythonOlder, # ROCm dependencies - rocmSupport ? false, - gpuTargets ? [ ], rocmPackages + rocmSupport ? config.rocmSupport, + rocmPackages, + gpuTargets ? [ ] }: let @@ -190,7 +190,7 @@ in buildPythonPackage rec { '' # error: no member named 'aligned_alloc' in the global namespace; did you mean simply 'aligned_alloc' # This lib overrided aligned_alloc hence the error message. Tltr: his function is linkable but not in header. - + lib.optionalString (stdenv.isDarwin && lib.versionOlder stdenv.targetPlatform.darwinSdkVersion "11.0") '' + + lib.optionalString (stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinSdkVersion "11.0") '' substituteInPlace third_party/pocketfft/pocketfft_hdronly.h --replace '#if __cplusplus >= 201703L inline void *aligned_alloc(size_t align, size_t size)' '#if __cplusplus >= 201703L && 0 inline void *aligned_alloc(size_t align, size_t size)' @@ -287,6 +287,30 @@ in buildPythonPackage rec { # ... called on pointer ‘<unknown>’ with nonzero offset [1, 9223372036854775800] [-Werror=free-nonheap-object] ++ lib.optionals (stdenv.cc.isGNU && lib.versions.major stdenv.cc.version == "12" ) [ "-Wno-error=free-nonheap-object" + ] + # .../source/torch/csrc/autograd/generated/python_functions_0.cpp:85:3: + # error: cast from ... to ... converts to incompatible function type [-Werror,-Wcast-function-type-strict] + ++ lib.optionals (stdenv.cc.isClang && lib.versionAtLeast stdenv.cc.version "16") [ + "-Wno-error=cast-function-type-strict" + # Suppresses the most spammy warnings. + # This is mainly to fix https://github.com/NixOS/nixpkgs/issues/266895. + ] ++ lib.optionals rocmSupport [ + "-Wno-#warnings" + "-Wno-cpp" + "-Wno-unknown-warning-option" + "-Wno-ignored-attributes" + "-Wno-deprecated-declarations" + "-Wno-defaulted-function-deleted" + "-Wno-pass-failed" + ] ++ [ + "-Wno-unused-command-line-argument" + "-Wno-uninitialized" + "-Wno-array-bounds" + "-Wno-free-nonheap-object" + "-Wno-unused-result" + ] ++ lib.optionals stdenv.cc.isGNU [ + "-Wno-maybe-uninitialized" + "-Wno-stringop-overflow" ])); nativeBuildInputs = [ @@ -303,7 +327,6 @@ in buildPythonPackage rec { ++ lib.optionals rocmSupport [ rocmtoolkit_joined ]; buildInputs = [ blas blas.provider ] - ++ lib.optionals stdenv.isLinux [ linuxHeaders_5_19 ] # TMP: avoid "flexible array member" errors for now ++ lib.optionals cudaSupport (with cudaPackages; [ cuda_cccl.dev # <thrust/*> cuda_cudart # cuda_runtime.h and libraries @@ -356,12 +379,10 @@ in buildPythonPackage rec { # the following are required for tensorboard support pillow six future tensorboard protobuf - # ROCm build and `torch.compile` requires openai-triton - openai-triton - # torch/csrc requires `pybind11` at runtime pybind11 ] + ++ lib.optionals tritonSupport [ openai-triton ] ++ lib.optionals MPISupport [ mpi ] ++ lib.optionals rocmSupport [ rocmtoolkit_joined ]; diff --git a/pkgs/development/python-modules/total-connect-client/default.nix b/pkgs/development/python-modules/total-connect-client/default.nix index 5ce5deace5d..fb510b7e764 100644 --- a/pkgs/development/python-modules/total-connect-client/default.nix +++ b/pkgs/development/python-modules/total-connect-client/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "total-connect-client"; - version = "2023.7"; + version = "2023.11"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "craigjmidwinter"; repo = "total-connect-client"; rev = "refs/tags/${version}"; - hash = "sha256-sx4KfWQCvGS+w83tECJSyLLWU9GkwYpo39gt4EKndPk="; + hash = "sha256-UTMYuSKNn5ACKg9BmeUf1SFhDV1jknbxggkmCgzB/xk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/towncrier/default.nix b/pkgs/development/python-modules/towncrier/default.nix index 03b91688343..e90648ec081 100644 --- a/pkgs/development/python-modules/towncrier/default.nix +++ b/pkgs/development/python-modules/towncrier/default.nix @@ -1,38 +1,48 @@ { lib , buildPythonPackage -, fetchPypi -, pythonOlder , click -, click-default-group +, fetchPypi +, git # shells out to git +, hatchling +, importlib-resources , incremental , jinja2 , mock , pytestCheckHook -, toml +, pythonOlder +, tomli , twisted -, setuptools -, git # shells out to git }: buildPythonPackage rec { pname = "towncrier"; - version = "23.6.0"; - format = "setuptools"; + version = "23.11.0"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-/Cm9WrRyfI2s++Y29/tdxTuZgFti2hyWshSDYVn/cME="; + hash = "sha256-E5N8JH4/iuIKxE2JXPX5amCtRs/cwWcXWVMNeDfZ7l0="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "hatchling ~= 1.17.1" "hatchling" + ''; + + nativeBuildInputs = [ + hatchling + ]; + propagatedBuildInputs = [ click - click-default-group incremental jinja2 - toml - setuptools + ] ++ lib.optionals (pythonOlder "3.10") [ + importlib-resources + ] ++ lib.optionals (pythonOlder "3.11") [ + tomli ]; preCheck = '' diff --git a/pkgs/development/python-modules/trainer/default.nix b/pkgs/development/python-modules/trainer/default.nix index 466d6db8da5..734bc324e26 100644 --- a/pkgs/development/python-modules/trainer/default.nix +++ b/pkgs/development/python-modules/trainer/default.nix @@ -4,19 +4,19 @@ , coqpit , fsspec -, torch-bin +, torch , tensorboard , protobuf , psutil , pytestCheckHook , soundfile -, torchvision-bin +, torchvision }: let pname = "trainer"; - version = "0.0.31"; + version = "0.0.32"; in buildPythonPackage { inherit pname version; @@ -26,7 +26,7 @@ buildPythonPackage { owner = "coqui-ai"; repo = "Trainer"; rev = "refs/tags/v${version}"; - hash = "sha256-avZuujeWG/UGkj7fcGB99Fw7KYktJPIDf8oB4wjoiD4="; + hash = "sha256-lSfkokPFB09KZBHe/Qkon2gUsA82AK52WNK1bJfzCNc="; }; postPatch = '' @@ -40,7 +40,7 @@ buildPythonPackage { psutil soundfile tensorboard - torch-bin + torch ]; # only one test and that requires training data from the internet @@ -48,7 +48,7 @@ buildPythonPackage { nativeCheckInputs = [ pytestCheckHook - torchvision-bin + torchvision ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/transformers/default.nix b/pkgs/development/python-modules/transformers/default.nix index 3c4fda87976..efee6e3d1fa 100644 --- a/pkgs/development/python-modules/transformers/default.nix +++ b/pkgs/development/python-modules/transformers/default.nix @@ -51,7 +51,7 @@ buildPythonPackage rec { pname = "transformers"; - version = "4.35.0"; + version = "4.35.2"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -60,7 +60,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = "transformers"; rev = "refs/tags/v${version}"; - hash = "sha256-f66Y6kcAm//Z2UyCl/iEBDP+6nm3QJ5EtwpAnBn4gbc="; + hash = "sha256-h1RMSEcuali05AWeTm1wyZQJz6XrHamCF1eHrSnFnfM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/typeguard/default.nix b/pkgs/development/python-modules/typeguard/default.nix index 7fd258e9123..23e3bdc5b54 100644 --- a/pkgs/development/python-modules/typeguard/default.nix +++ b/pkgs/development/python-modules/typeguard/default.nix @@ -54,8 +54,12 @@ buildPythonPackage rec { ]; disabledTests = [ - # not compatible with python3.10 - "test_typed_dict" + # AssertionError: 'type of argument "x" must be ' != 'None' + "TestPrecondition::test_precondition_ok_and_typeguard_fails" + # AttributeError: 'C' object has no attribute 'x' + "TestInvariant::test_invariant_ok_and_typeguard_fails" + # AttributeError: 'D' object has no attribute 'x' + "TestInheritance::test_invariant_ok_and_typeguard_fails" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/types-awscrt/default.nix b/pkgs/development/python-modules/types-awscrt/default.nix index 41e92d025d3..3c406d07451 100644 --- a/pkgs/development/python-modules/types-awscrt/default.nix +++ b/pkgs/development/python-modules/types-awscrt/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "types-awscrt"; - version = "0.19.10"; + version = "0.19.12"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "types_awscrt"; inherit version; - hash = "sha256-YowjnLt7eCBzBfklBOEEDRClp/ToA3KLi+xuftUoti4="; + hash = "sha256-KbJBIVxl622kZPEeIyiTEEky/DxKShyJGSFYv2YEveY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/uamqp/clang-fix-incompatible-function-pointer-conversion.patch b/pkgs/development/python-modules/uamqp/clang-fix-incompatible-function-pointer-conversion.patch new file mode 100644 index 00000000000..ed177797da0 --- /dev/null +++ b/pkgs/development/python-modules/uamqp/clang-fix-incompatible-function-pointer-conversion.patch @@ -0,0 +1,13 @@ +diff --git a/src/message_receiver.pyx b/src/message_receiver.pyx +index b99647c..479cc9c 100644 +--- a/src/message_receiver.pyx ++++ b/src/message_receiver.pyx +@@ -120,7 +120,7 @@ cdef class cMessageReceiver(StructBase): + + #### Callbacks (context is a MessageReceiver instance) + +-cdef void on_message_receiver_state_changed(void* context, c_message_receiver.MESSAGE_RECEIVER_STATE_TAG new_state, c_message_receiver.MESSAGE_RECEIVER_STATE_TAG previous_state): ++cdef void on_message_receiver_state_changed(const void* context, c_message_receiver.MESSAGE_RECEIVER_STATE_TAG new_state, c_message_receiver.MESSAGE_RECEIVER_STATE_TAG previous_state): + if context != NULL: + context_pyobj = <PyObject*>context + if context_pyobj.ob_refcnt == 0: # context is being garbage collected, skip the callback diff --git a/pkgs/development/python-modules/uamqp/default.nix b/pkgs/development/python-modules/uamqp/default.nix index 207ad3d4372..c306068f7fd 100644 --- a/pkgs/development/python-modules/uamqp/default.nix +++ b/pkgs/development/python-modules/uamqp/default.nix @@ -27,6 +27,9 @@ buildPythonPackage rec { patches = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ ./darwin-azure-c-shared-utility-corefoundation.patch + ] ++ [ + # Fix incompatible function pointer conversion error with clang 16. + ./clang-fix-incompatible-function-pointer-conversion.patch ]; postPatch = lib.optionalString (stdenv.isDarwin && !stdenv.isx86_64) '' diff --git a/pkgs/development/python-modules/udatetime/default.nix b/pkgs/development/python-modules/udatetime/default.nix index 49b56c5f1e3..9eef1512490 100644 --- a/pkgs/development/python-modules/udatetime/default.nix +++ b/pkgs/development/python-modules/udatetime/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchPypi -, fetchpatch }: buildPythonPackage rec { @@ -13,14 +12,6 @@ buildPythonPackage rec { hash = "sha256-sQvFVwaZpDinLitaZOdr2MKO4779FvIJOHpVB/oLgwE="; }; - patches = [ - # fix build with python 3.9 - (fetchpatch { - url = "https://github.com/freach/udatetime/pull/33.patch"; - sha256 = "02wm7ivkv1viqn2wflgd10dgpddfqfrwacmrldigb1mwb79n554j"; - }) - ]; - # tests not included on pypi doCheck = false; diff --git a/pkgs/development/python-modules/urllib3/default.nix b/pkgs/development/python-modules/urllib3/default.nix index a5a3e6b8b64..7a374f7c0c2 100644 --- a/pkgs/development/python-modules/urllib3/default.nix +++ b/pkgs/development/python-modules/urllib3/default.nix @@ -1,4 +1,5 @@ { lib +, backports-zoneinfo , brotli , brotlicffi , buildPythonPackage @@ -8,44 +9,55 @@ , hatchling , idna , isPyPy -, mock , pyopenssl , pysocks -, pytest-freezegun , pytest-timeout , pytestCheckHook -, python-dateutil +, pythonOlder , tornado , trustme }: -buildPythonPackage rec { +let self = buildPythonPackage rec { pname = "urllib3"; - version = "2.0.5"; - format = "pyproject"; + version = "2.0.7"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-E6vzc4LqLOb7dE1NrWeDjuyFfJ9PVwCYkYBeC14SNZQ="; + hash = "sha256-yX394fe9Q6ccjSpY42npsr9pLRM06p+crlWt19DdD4Q="; }; nativeBuildInputs = [ hatchling ]; - # FIXME: remove backwards compatbility hack - propagatedBuildInputs = passthru.optional-dependencies.brotli - ++ passthru.optional-dependencies.socks; + passthru.optional-dependencies = { + brotli = if isPyPy then [ + brotlicffi + ] else [ + brotli + ]; + # Use carefully since pyopenssl is not supported aarch64-darwin + secure = [ + certifi + cryptography + idna + pyopenssl + ]; + socks = [ + pysocks + ]; + }; nativeCheckInputs = [ - python-dateutil - mock - pytest-freezegun pytest-timeout pytestCheckHook tornado trustme - ]; + ] ++ lib.optionals (pythonOlder "3.9") [ + backports-zoneinfo + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); # Tests in urllib3 are mostly timeout-based instead of event-based and # are therefore inherently flaky. On your own machine, the tests will @@ -60,6 +72,8 @@ buildPythonPackage rec { # Still, failures can occur and for that reason tests are disabled. doCheck = false; + passthru.tests.pytest = self.overridePythonAttrs (_: { doCheck = true; }); + preCheck = '' export CI # Increases LONG_TIMEOUT ''; @@ -68,29 +82,12 @@ buildPythonPackage rec { "urllib3" ]; - passthru.optional-dependencies = { - brotli = if isPyPy then [ - brotlicffi - ] else [ - brotli - ]; - # Use carefully since pyopenssl is not supported aarch64-darwin - secure = [ - certifi - cryptography - idna - pyopenssl - ]; - socks = [ - pysocks - ]; - }; - meta = with lib; { - description = "Powerful, sanity-friendly HTTP client for Python"; - homepage = "https://github.com/shazow/urllib3"; + description = "Powerful, user-friendly HTTP client for Python"; + homepage = "https://github.com/urllib3/urllib3"; changelog = "https://github.com/urllib3/urllib3/blob/${version}/CHANGES.rst"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; -} +}; +in self diff --git a/pkgs/development/python-modules/uvloop/default.nix b/pkgs/development/python-modules/uvloop/default.nix index 38283c71acd..9ee7fec9194 100644 --- a/pkgs/development/python-modules/uvloop/default.nix +++ b/pkgs/development/python-modules/uvloop/default.nix @@ -3,34 +3,42 @@ , buildPythonPackage , pythonOlder , fetchPypi + +# build-system , cython +, setuptools + +# native dependencies , libuv , CoreServices , ApplicationServices -# Check Inputs +# tests , aiohttp , psutil , pyopenssl -, pytest-forked , pytestCheckHook }: buildPythonPackage rec { pname = "uvloop"; - version = "0.17.0"; - format = "setuptools"; - disabled = pythonOlder "3.7"; + version = "0.19.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-Dd9rr5zxGhoixxSH858Vss9461vefltF+7meip2RueE="; + hash = "sha256-Akb0/Rvyv3AuBrDUXukWd+5cMSQvOaq06m/gxRrt0P0="; }; nativeBuildInputs = [ cython + setuptools ]; + env.LIBUV_CONFIGURE_HOST = stdenv.hostPlatform.config; + buildInputs = [ libuv ] ++ lib.optionals stdenv.isDarwin [ @@ -38,45 +46,25 @@ buildPythonPackage rec { ApplicationServices ]; - dontUseSetuptoolsCheck = true; nativeCheckInputs = [ - pytest-forked + aiohttp + pyopenssl pytestCheckHook psutil - ] ++ lib.optionals (pythonOlder "3.11") [ - aiohttp ]; - LIBUV_CONFIGURE_HOST = stdenv.hostPlatform.config; - pytestFlagsArray = [ - # from pytest.ini, these are NECESSARY to prevent failures - "--capture=no" - "--assert=plain" - "--strict" - "--tb=native" - # Depend on pyopenssl - "--deselect=tests/test_tcp.py::Test_UV_TCPSSL::test_flush_before_shutdown" - "--deselect=tests/test_tcp.py::Test_UV_TCPSSL::test_renegotiation" - # test gets stuck in epoll_pwait on hydras aarch64 builders - # https://github.com/MagicStack/uvloop/issues/412 - "--deselect=tests/test_tcp.py::Test_AIO_TCPSSL::test_remote_shutdown_receives_trailing_data" - # Tries to import cythonized file for which the .pyx file is not shipped via PyPi - "--deselect=tests/test_libuv_api.py::Test_UV_libuv::test_libuv_get_loop_t_ptr" - # Tries to run "env", but fails to find it + # Tries to run "env", but fails to find it, even with coreutils provided "--deselect=tests/test_process.py::Test_UV_Process::test_process_env_2" "--deselect=tests/test_process.py::Test_AIO_Process::test_process_env_2" # AssertionError: b'' != b'out\n' "--deselect=tests/test_process.py::Test_UV_Process::test_process_streams_redirect" "--deselect=tests/test_process.py::Test_AIO_Process::test_process_streams_redirect" - ] ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + ] ++ lib.optionals (stdenv.isDarwin) [ # Segmentation fault "--deselect=tests/test_fs_event.py::Test_UV_FS_EVENT_RENAME::test_fs_event_rename" - ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ # Broken: https://github.com/NixOS/nixpkgs/issues/160904 "--deselect=tests/test_context.py::Test_UV_Context::test_create_ssl_server_manual_connection_lost" - # Segmentation fault - "--deselect=tests/test_fs_event.py::Test_UV_FS_EVENT_RENAME::test_fs_event_rename" ]; disabledTestPaths = [ @@ -84,23 +72,13 @@ buildPythonPackage rec { "tests/test_sourcecode.py" ]; - preCheck = lib.optionalString stdenv.isDarwin '' + preCheck = '' + # force using installed/compiled uvloop + rm -rf uvloop + '' + lib.optionalString stdenv.isDarwin '' # Work around "OSError: AF_UNIX path too long" # https://github.com/MagicStack/uvloop/issues/463 export TMPDIR="/tmp" - '' + '' - # pyopenssl is not well supported by upstream - # https://github.com/NixOS/nixpkgs/issues/175875 - substituteInPlace tests/test_tcp.py \ - --replace "from OpenSSL import SSL as openssl_ssl" "" - # force using installed/compiled uvloop vs source by moving tests to temp dir - export TEST_DIR=$(mktemp -d) - cp -r tests $TEST_DIR - pushd $TEST_DIR - ''; - - postCheck = '' - popd ''; pythonImportsCheck = [ @@ -112,6 +90,7 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; meta = with lib; { + changelog = "https://github.com/MagicStack/uvloop/releases/tag/v${version}"; description = "Fast implementation of asyncio event loop on top of libuv"; homepage = "https://github.com/MagicStack/uvloop"; license = licenses.mit; diff --git a/pkgs/development/python-modules/versioneer/default.nix b/pkgs/development/python-modules/versioneer/default.nix index 3962b608ca3..bbd43887025 100644 --- a/pkgs/development/python-modules/versioneer/default.nix +++ b/pkgs/development/python-modules/versioneer/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "python-versioneer"; repo = "python-versioneer"; rev = "refs/tags/${version}"; - hash = "sha256-seYT/v691QB0LUzeI4MraegbNILU3tLO//9UbZIfe+A="; + hash = "sha256-3b7Wfhd24Vym5XCeN/M1832Q1VzvlWi3quTRaZrID2s="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/wakeonlan/default.nix b/pkgs/development/python-modules/wakeonlan/default.nix index 801b108e504..97ceedec0d2 100644 --- a/pkgs/development/python-modules/wakeonlan/default.nix +++ b/pkgs/development/python-modules/wakeonlan/default.nix @@ -8,15 +8,16 @@ buildPythonPackage rec { pname = "wakeonlan"; - version = "3.0.0"; - disabled = pythonOlder "3.6"; - format = "pyproject"; + version = "3.1.0"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "remcohaszing"; repo = "pywakeonlan"; rev = "refs/tags/${version}"; - hash = "sha256-7BDE7TmTT8rSaG0rEn5QwH+izGWA2PeQzxpGiv7+3fo="; + hash = "sha256-VPdklyD3GVn0cex4I6zV61I0bUr4KQp8DdMKAM/r4io="; }; nativeBuildInputs = [ @@ -38,6 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module for wake on lan"; homepage = "https://github.com/remcohaszing/pywakeonlan"; + changelog = "https://github.com/remcohaszing/pywakeonlan/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ peterhoeg ]; }; diff --git a/pkgs/development/python-modules/web-cache/default.nix b/pkgs/development/python-modules/web-cache/default.nix index 9246b2b571e..dba9d91875c 100644 --- a/pkgs/development/python-modules/web-cache/default.nix +++ b/pkgs/development/python-modules/web-cache/default.nix @@ -20,6 +20,6 @@ buildPythonPackage rec { description = "Simple Python key-value storage backed up by sqlite3 database"; homepage = "https://github.com/desbma/web_cache"; license = licenses.lgpl2Plus; - maintainers = with maintainers; [ fortuneteller2k ]; + maintainers = with maintainers; [ moni ]; }; } diff --git a/pkgs/development/python-modules/webdav4/default.nix b/pkgs/development/python-modules/webdav4/default.nix index 2237f80f3b9..22c1ea8a964 100644 --- a/pkgs/development/python-modules/webdav4/default.nix +++ b/pkgs/development/python-modules/webdav4/default.nix @@ -17,19 +17,24 @@ buildPythonPackage rec { pname = "webdav4"; version = "0.9.8"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "skshetry"; - repo = pname; + repo = "webdav4"; rev = "refs/tags/v${version}"; hash = "sha256-Le/gABaUxMmSW2SjgucsBKqjxOq1h9UCAWl5YyUsCPk="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace " --cov" "" + ''; + nativeBuildInputs = [ hatch-vcs hatchling @@ -61,11 +66,6 @@ buildPythonPackage rec { ]; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace " --cov" "" - ''; - pythonImportsCheck = [ "webdav4" ]; @@ -80,12 +80,14 @@ buildPythonPackage rec { "test_cp_cli" "test_mv_cli" "test_sync_remote_to_local" + ]; disabledTestPaths = [ # Tests requires network access "tests/test_client.py" "tests/test_fsspec.py" + "tests/test_cli.py" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/weconnect-mqtt/default.nix b/pkgs/development/python-modules/weconnect-mqtt/default.nix index c99e89944c4..3f85f806489 100644 --- a/pkgs/development/python-modules/weconnect-mqtt/default.nix +++ b/pkgs/development/python-modules/weconnect-mqtt/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "weconnect-mqtt"; - version = "0.48.2"; + version = "0.48.3"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "tillsteinbach"; repo = "WeConnect-mqtt"; rev = "refs/tags/v${version}"; - hash = "sha256-8JJBWF53VOmTD/uetCURFaTkfSTax/YeafKsZtA1xAA="; + hash = "sha256-Pja9BP0gbWXTgOokEngNS364tJp1oWJYNKcTxyYJHGw="; }; postPatch = '' diff --git a/pkgs/development/python-modules/weconnect/default.nix b/pkgs/development/python-modules/weconnect/default.nix index e3bb7c34b5b..e9f4877110e 100644 --- a/pkgs/development/python-modules/weconnect/default.nix +++ b/pkgs/development/python-modules/weconnect/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "weconnect"; - version = "0.59.4"; + version = "0.59.5"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "tillsteinbach"; repo = "WeConnect-python"; rev = "refs/tags/v${version}"; - hash = "sha256-Z9tiK6oDyyMcXhgUUxSDL9URYDp6Uz8rFPART3qxd+s="; + hash = "sha256-ujIA98QD8ds2/iLLeJqn88nY9tZuuOSnOwGvRznA8PQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/wordfreq/default.nix b/pkgs/development/python-modules/wordfreq/default.nix index 5f77c34f98a..2b98674fb57 100644 --- a/pkgs/development/python-modules/wordfreq/default.nix +++ b/pkgs/development/python-modules/wordfreq/default.nix @@ -51,6 +51,5 @@ buildPythonPackage rec { description = "A library for looking up the frequencies of words in many languages, based on many sources of data"; homepage = "https://github.com/rspeer/wordfreq/"; license = licenses.mit; - maintainers = with maintainers; [ ixxie ]; }; } diff --git a/pkgs/development/python-modules/xapian/default.nix b/pkgs/development/python-modules/xapian/default.nix index cafc66dab9e..2daf4045497 100644 --- a/pkgs/development/python-modules/xapian/default.nix +++ b/pkgs/development/python-modules/xapian/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchurl { url = "https://oligarchy.co.uk/xapian/${version}/xapian-bindings-${version}.tar.xz"; - hash = "sha256-a1RUgzrFKj4ywLs6cpClorUEiNiRjypFJpVX5N6aMeU="; + hash = "sha256-UT1XhIgnkZis4TrUl1ENKyIgTV15S2QUPQW3vpdOts8="; }; configureFlags = [ diff --git a/pkgs/development/python-modules/xnd/default.nix b/pkgs/development/python-modules/xnd/default.nix index 3657997f5a7..eac1153b4f5 100644 --- a/pkgs/development/python-modules/xnd/default.nix +++ b/pkgs/development/python-modules/xnd/default.nix @@ -1,5 +1,6 @@ { lib , stdenv +, fetchpatch , buildPythonPackage , python , ndtypes @@ -15,6 +16,17 @@ buildPythonPackage { propagatedBuildInputs = [ ndtypes ]; + buildInputs = [ libndtypes ]; + + patches = [ + # python311 fixes which are on main. remove on update + (fetchpatch { + name = "python311.patch"; + url = "https://github.com/xnd-project/xnd/commit/e1a06d9f6175f4f4e1da369b7e907ad6b2952c00.patch"; + hash = "sha256-xzrap+FL5be13bVdsJ3zeV7t57ZC4iyhuZhuLsOzHyE="; + }) + ]; + postPatch = '' substituteInPlace setup.py \ --replace 'include_dirs = ["libxnd", "ndtypes/python/ndtypes"] + INCLUDES' \ diff --git a/pkgs/development/ruby-modules/bundler/default.nix b/pkgs/development/ruby-modules/bundler/default.nix index cb907556727..c4c3cd8b8d2 100644 --- a/pkgs/development/ruby-modules/bundler/default.nix +++ b/pkgs/development/ruby-modules/bundler/default.nix @@ -4,8 +4,8 @@ buildRubyGem rec { inherit ruby; name = "${gemName}-${version}"; gemName = "bundler"; - version = "2.4.20"; - source.sha256 = "sha256-dEsrGVHaYTryr2hU98H54W3ZC0tmzZrxonqfRIx2G+4="; + version = "2.4.22"; + source.sha256 = "sha256-dHulCw5n3yXL07SPlYMad6TVOlgdVfBjly/LFG0ULF8="; dontPatchShebangs = true; postFixup = '' diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index cd814e4b414..a380f9734bf 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -22,7 +22,7 @@ , pkg-config , ncurses, xapian, gpgme, util-linux, tzdata, icu, libffi , cmake, libssh2, openssl, openssl_1_1, libmysqlclient, git, perl, pcre, pcre2, gecode_3, curl , msgpack, libsodium, snappy, libossp_uuid, lxc, libpcap, xorg, gtk2, buildRubyGem -, cairo, re2, rake, gobject-introspection, gdk-pixbuf, zeromq, czmq, graphicsmagick, libcxx +, cairo, expat, re2, rake, gobject-introspection, gdk-pixbuf, zeromq, czmq, graphicsmagick, libcxx , file, libvirt, glib, vips, taglib, libopus, linux-pam, libidn, protobuf, fribidi, harfbuzz , bison, flex, pango, python3, patchelf, binutils, freetds, wrapGAppsHook, atk , bundler, libsass, dart-sass, libexif, libselinux, libsepol, shared-mime-info, libthai, libdatrie @@ -76,7 +76,7 @@ in cairo-gobject = attrs: { nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.isDarwin [ DarwinTools ]; - buildInputs = [ cairo pcre2 xorg.libpthreadstubs xorg.libXdmcp ]; + buildInputs = [ cairo expat pcre2 xorg.libpthreadstubs xorg.libXdmcp ]; }; charlock_holmes = attrs: { @@ -376,7 +376,12 @@ in }; iconv = attrs: { + dontBuild = false; buildFlags = lib.optional stdenv.isDarwin "--with-iconv-dir=${libiconv}"; + patches = [ + # Fix incompatible function pointer conversion errors with clang 16 + ./iconv-fix-incompatible-function-pointer-conversions.patch + ]; }; idn-ruby = attrs: { diff --git a/pkgs/development/ruby-modules/gem-config/iconv-fix-incompatible-function-pointer-conversions.patch b/pkgs/development/ruby-modules/gem-config/iconv-fix-incompatible-function-pointer-conversions.patch new file mode 100644 index 00000000000..1cc38cbae13 --- /dev/null +++ b/pkgs/development/ruby-modules/gem-config/iconv-fix-incompatible-function-pointer-conversions.patch @@ -0,0 +1,51 @@ +diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c +index 2801049..77fae7e 100644 +--- a/ext/iconv/iconv.c ++++ b/ext/iconv/iconv.c +@@ -188,7 +188,7 @@ static VALUE iconv_convert _((iconv_t cd, VALUE str, long start, long length, in + static VALUE iconv_s_allocate _((VALUE klass)); + static VALUE iconv_initialize _((int argc, VALUE *argv, VALUE self)); + static VALUE iconv_s_open _((int argc, VALUE *argv, VALUE self)); +-static VALUE iconv_s_convert _((struct iconv_env_t* env)); ++static VALUE iconv_s_convert _((VALUE env)); + static VALUE iconv_s_iconv _((int argc, VALUE *argv, VALUE self)); + static VALUE iconv_init_state _((VALUE cd)); + static VALUE iconv_finish _((VALUE self)); +@@ -204,7 +204,7 @@ static VALUE charset_map; + * Returns the map from canonical name to system dependent name. + */ + static VALUE +-charset_map_get(void) ++charset_map_get(VALUE klass) + { + return charset_map; + } +@@ -642,7 +642,7 @@ iconv_s_allocate(VALUE klass) + } + + static VALUE +-get_iconv_opt_i(VALUE i, VALUE arg) ++get_iconv_opt_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, arg)) + { + VALUE name; + #if defined ICONV_SET_TRANSLITERATE || defined ICONV_SET_DISCARD_ILSEQ +@@ -784,8 +784,9 @@ iconv_s_open(int argc, VALUE *argv, VALUE self) + } + + static VALUE +-iconv_s_convert(struct iconv_env_t* env) ++iconv_s_convert(VALUE env_value) + { ++ struct iconv_env_t* env = (struct iconv_env_t*)env_value; + VALUE last = 0; + + for (; env->argc > 0; --env->argc, ++env->argv) { +@@ -906,7 +907,7 @@ list_iconv(unsigned int namescount, const char *const *names, void *data) + + #if defined(HAVE_ICONVLIST) || defined(HAVE___ICONV_FREE_LIST) + static VALUE +-iconv_s_list(void) ++iconv_s_list(VALUE klass) + { + #ifdef HAVE_ICONVLIST + int state; diff --git a/pkgs/development/tools/algolia-cli/default.nix b/pkgs/development/tools/algolia-cli/default.nix index b9d0a663aaf..0e15bec58de 100644 --- a/pkgs/development/tools/algolia-cli/default.nix +++ b/pkgs/development/tools/algolia-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "algolia-cli"; - version = "1.4.1"; + version = "1.4.2"; src = fetchFromGitHub { owner = "algolia"; repo = "cli"; rev = "v${version}"; - hash = "sha256-zwlDn545R7A5l6m7lsFSSf3rW96FND6/HRgeykvVCH0="; + hash = "sha256-T7LklR+NUuB5nDwEedG3eD+qSK+mjUiS/EXerqCAroE="; }; vendorHash = "sha256-cNuBTH7L2K4TgD0H9FZ9CjhE5AGXADaniGLD9Lhrtrk="; diff --git a/pkgs/development/tools/altair-graphql-client/default.nix b/pkgs/development/tools/altair-graphql-client/default.nix index 6d774258146..33fed022b03 100644 --- a/pkgs/development/tools/altair-graphql-client/default.nix +++ b/pkgs/development/tools/altair-graphql-client/default.nix @@ -2,11 +2,11 @@ let pname = "altair"; - version = "5.2.5"; + version = "5.2.6"; src = fetchurl { url = "https://github.com/imolorhe/altair/releases/download/v${version}/altair_${version}_x86_64_linux.AppImage"; - sha256 = "sha256-KpAfPZqDfbf3LLBhTZ/rFftGf42onJnFMvnO2jzxqmo="; + sha256 = "sha256-SNXUARAu4szX7otyAKy3F/piNhxlPVNN6Dj2UwevL8A="; }; appimageContents = appimageTools.extract { inherit pname version src; }; diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 1e45079aa78..25e04817643 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "checkov"; - version = "3.0.32"; + version = "3.0.38"; pyproject = true; src = fetchFromGitHub { owner = "bridgecrewio"; repo = "checkov"; rev = "refs/tags/${version}"; - hash = "sha256-YOZ7F/bxbnBh3mhiFL3cMMAc3qeOMab48LcvYeJgfrg="; + hash = "sha256-2ObPi+wrxvoVWjASmp0KSPMLFuIGdWNWK4jRrZC9ODE="; }; patches = [ diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix index d6c6740e2a2..96bd017e777 100644 --- a/pkgs/development/tools/analysis/checkstyle/default.nix +++ b/pkgs/development/tools/analysis/checkstyle/default.nix @@ -1,12 +1,12 @@ { lib, stdenvNoCC, fetchurl, makeBinaryWrapper, jre }: stdenvNoCC.mkDerivation rec { - version = "10.12.4"; + version = "10.12.5"; pname = "checkstyle"; src = fetchurl { url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar"; - sha256 = "sha256-ecWTB/4Lc7zgkQI6nN5VvKfRizeMEdyGUyL0fxiAHhk="; + sha256 = "sha256-DAUPngTL9c2MePG5ISLul+iRvnwqChg04fo63aKAee0="; }; nativeBuildInputs = [ makeBinaryWrapper ]; diff --git a/pkgs/development/tools/analysis/rr/default.nix b/pkgs/development/tools/analysis/rr/default.nix index d5bcd116dc2..412b62593d2 100644 --- a/pkgs/development/tools/analysis/rr/default.nix +++ b/pkgs/development/tools/analysis/rr/default.nix @@ -36,7 +36,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config which makeWrapper ]; buildInputs = [ libpfm zlib python3Packages.python python3Packages.pexpect procps gdb capnproto - libpfm zlib python3Packages.python python3Packages.pexpect procps capnproto ]; cmakeFlags = [ "-Ddisable32bit=ON" diff --git a/pkgs/development/tools/analysis/snyk/default.nix b/pkgs/development/tools/analysis/snyk/default.nix index 09222eb1d6f..9cc58cf405d 100644 --- a/pkgs/development/tools/analysis/snyk/default.nix +++ b/pkgs/development/tools/analysis/snyk/default.nix @@ -12,9 +12,6 @@ buildNpmPackage rec { }; npmDepsHash = "sha256-j3lMQh8++pb/00d9H2v7QBkpxIJdsuRQoFkNiQbvnF4="; - - nativeBuildInputs = [ nodePackages.node-gyp python3 ]; - npmBuildScript = "build:prod"; meta = with lib; { diff --git a/pkgs/development/tools/analysis/valgrind/default.nix b/pkgs/development/tools/analysis/valgrind/default.nix index a43520ecb4b..c8046b68cd9 100644 --- a/pkgs/development/tools/analysis/valgrind/default.nix +++ b/pkgs/development/tools/analysis/valgrind/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "valgrind"; - version = "3.21.0"; + version = "3.22.0"; src = fetchurl { url = "https://sourceware.org/pub/${pname}/${pname}-${version}.tar.bz2"; - hash = "sha256-EM4WGLs+M/rRbreVUrCj4SEXYkSKDX/OEcimJDuayXE="; + hash = "sha256-yBHbWt0sX3KZRMr0fE56Zdyqu5Rh5HK1eHZd179tLUw="; }; patches = [ diff --git a/pkgs/development/tools/argc/default.nix b/pkgs/development/tools/argc/default.nix index 9aff7365d76..b36331e8126 100644 --- a/pkgs/development/tools/argc/default.nix +++ b/pkgs/development/tools/argc/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "argc"; - version = "1.11.0"; + version = "1.12.0"; src = fetchFromGitHub { owner = "sigoden"; repo = pname; rev = "v${version}"; - hash = "sha256-BpTborNURfLdw4eyPbGMyNOSvtePB+lcCrCKTl0LoGQ="; + hash = "sha256-bF+NTiPrqWD1B/v44+XuxXotOPhUBCYyg6h+T/ydmGM="; }; - cargoHash = "sha256-1FdimBQZ4SvAnrYzNnyulUT8b8bTnJfnWRNosfQqSco="; + cargoHash = "sha256-T6NfjlHQhHwfcAnmr8R2WWXVKgMZZXFq6IvlvWOVACg="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/ats-acc/default.nix b/pkgs/development/tools/ats-acc/default.nix index 5a3cd9c6401..b8eef344f20 100644 --- a/pkgs/development/tools/ats-acc/default.nix +++ b/pkgs/development/tools/ats-acc/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Pretty-print error messages of the ATS Compiler"; homepage = "https://github.com/sparverius/ats-acc"; - maintainers = with maintainers; [ fortuneteller2k ]; + maintainers = with maintainers; [ moni ]; license = licenses.unfree; # Upstream has no license }; } diff --git a/pkgs/development/tools/azcopy/default.nix b/pkgs/development/tools/azcopy/default.nix index c39dca4e28d..3c60d0e25e2 100644 --- a/pkgs/development/tools/azcopy/default.nix +++ b/pkgs/development/tools/azcopy/default.nix @@ -1,19 +1,23 @@ -{ stdenv, lib, fetchFromGitHub, buildGoModule }: +{ lib +, stdenv +, fetchFromGitHub +, buildGoModule +}: buildGoModule rec { pname = "azure-storage-azcopy"; - version = "10.20.1"; + version = "10.21.1"; src = fetchFromGitHub { owner = "Azure"; repo = "azure-storage-azcopy"; - rev = "v${version}"; - sha256 = "sha256-pfbSNFKZubgebx90zL5sVva36wXS+0NQvvMxPI8kV3Y="; + rev = "refs/tags/v${version}"; + hash = "sha256-FdiDxWmCRkSOa+6A9XgKeyFGk/ba+BgFm3/ChERkYvk="; }; subPackages = [ "." ]; - vendorHash = "sha256-byFroeXRMepN9RYak2++tT9IE8ZbT+0qJAyipHkE5WE="; + vendorHash = "sha256-F5YMPwdS2A5FAwuG1gfiAqBKapZ24VIGzJXnwojoDk0="; doCheck = false; @@ -22,8 +26,10 @@ buildGoModule rec { ''; meta = with lib; { - maintainers = with maintainers; [ colemickens kashw2 ]; - license = licenses.mit; description = "The new Azure Storage data transfer utility - AzCopy v10"; + homepage = "https://github.com/Azure/azure-storage-azcopy"; + changelog = "https://github.com/Azure/azure-storage-azcopy/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ colemickens kashw2 ]; }; } diff --git a/pkgs/development/tools/azure-functions-core-tools/default.nix b/pkgs/development/tools/azure-functions-core-tools/default.nix index e187dbf6b39..cf039c5758f 100644 --- a/pkgs/development/tools/azure-functions-core-tools/default.nix +++ b/pkgs/development/tools/azure-functions-core-tools/default.nix @@ -27,7 +27,7 @@ }; }; - platformInfo = builtins.getAttr stdenv.targetPlatform.system platforms; + platformInfo = builtins.getAttr stdenv.hostPlatform.system platforms; in stdenv.mkDerivation rec { pname = "azure-functions-core-tools"; diff --git a/pkgs/development/tools/azure-static-sites-client/default.nix b/pkgs/development/tools/azure-static-sites-client/default.nix index 5ac8f971cf3..441496ed435 100644 --- a/pkgs/development/tools/azure-static-sites-client/default.nix +++ b/pkgs/development/tools/azure-static-sites-client/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { pname = "StaticSitesClient-${versionFlavor}"; version = flavor.buildId; - src = sources.${stdenv.targetPlatform.system} or (throw "Unsupported platform"); + src = sources.${stdenv.hostPlatform.system} or (throw "Unsupported platform"); nativeBuildInputs = [ autoPatchelfHook diff --git a/pkgs/development/tools/azure-static-sites-client/versions.json b/pkgs/development/tools/azure-static-sites-client/versions.json index 88d31f718ef..55c30a12add 100644 --- a/pkgs/development/tools/azure-static-sites-client/versions.json +++ b/pkgs/development/tools/azure-static-sites-client/versions.json @@ -1,58 +1,58 @@ [ { "version": "latest", - "buildId": "1.0.024871", - "publishDate": "2023-10-24T04:09:23.7109231Z", + "buildId": "1.0.024941", + "publishDate": "2023-10-31T04:54:50.5527205Z", "files": { "linux-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.024871/linux/StaticSitesClient", - "sha": "13d1c02e43dec373be04152f7f8e71974f080440cb9480c3ccb4f83c8c6f036a" + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.024941/linux/StaticSitesClient", + "sha": "bea23499732d615698baf4c9dcafe717fdd4ba8344f2d96740233b0380df79b6" }, "win-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.024871/windows/StaticSitesClient.exe", - "sha": "868f221ea77b13cea8c6c41edbecea53bf5171d42dc9376f34615e544a3874f0" + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.024941/windows/StaticSitesClient.exe", + "sha": "a93aa5ec2a17280f3c9c8252948f8c68050c8852770322758ffa3187b6bce1dd" }, "osx-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.024871/macOS/StaticSitesClient", - "sha": "63c9027a7b5e597ae9e0ad8311b31a587bd977ed758555784d08cc3ff35e80a4" + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.024941/macOS/StaticSitesClient", + "sha": "57ea66c930aafbf4dea82216e51128b3315ec2db3ab385d41e8d912a3adab2c0" } } }, { "version": "stable", - "buildId": "1.0.024741", - "publishDate": "2023-10-10T20:13:22.904778Z", + "buildId": "1.0.024941", + "publishDate": "2023-10-31T04:54:50.5527205Z", "files": { "linux-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.024741/linux/StaticSitesClient", - "sha": "0e174b1551a495dbb751240201b8d264f86264c704d66678c189fe4d94f53502" + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.024941/linux/StaticSitesClient", + "sha": "bea23499732d615698baf4c9dcafe717fdd4ba8344f2d96740233b0380df79b6" }, "win-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.024741/windows/StaticSitesClient.exe", - "sha": "cb8d6e7cf83ab7ee394627b088f42de6e63fa77ed5c56eb79a088a1de02163ff" + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.024941/windows/StaticSitesClient.exe", + "sha": "a93aa5ec2a17280f3c9c8252948f8c68050c8852770322758ffa3187b6bce1dd" }, "osx-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.024741/macOS/StaticSitesClient", - "sha": "1ef4292cad223972ed820921d29f6b844e18edd732c99c183269e86b150a8224" + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.024941/macOS/StaticSitesClient", + "sha": "57ea66c930aafbf4dea82216e51128b3315ec2db3ab385d41e8d912a3adab2c0" } } }, { "version": "backup", - "buildId": "1.0.024671", - "publishDate": "2023-10-04T00:20:16.1747762Z", + "buildId": "1.0.024871", + "publishDate": "2023-10-24T04:09:23.7109231Z", "files": { "linux-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.024671/linux/StaticSitesClient", - "sha": "82b8181bb5ea47e1d449c1c56e622bd350513dd97f27ac4abd25bd139fde92e2" + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.024871/linux/StaticSitesClient", + "sha": "13d1c02e43dec373be04152f7f8e71974f080440cb9480c3ccb4f83c8c6f036a" }, "win-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.024671/windows/StaticSitesClient.exe", - "sha": "a7660746d9dbed8814259547da7f96122d01ae90de6f8aa5ccf7b07b58f59f19" + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.024871/windows/StaticSitesClient.exe", + "sha": "868f221ea77b13cea8c6c41edbecea53bf5171d42dc9376f34615e544a3874f0" }, "osx-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.024671/macOS/StaticSitesClient", - "sha": "7584bea04c7d9e685216d4248063226d5a230cc955e560885a48737d1abd385e" + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.024871/macOS/StaticSitesClient", + "sha": "63c9027a7b5e597ae9e0ad8311b31a587bd977ed758555784d08cc3ff35e80a4" } } } diff --git a/pkgs/development/tools/bearer/default.nix b/pkgs/development/tools/bearer/default.nix index 05b7d61f858..3aa78a18ecd 100644 --- a/pkgs/development/tools/bearer/default.nix +++ b/pkgs/development/tools/bearer/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "bearer"; - version = "1.27.1"; + version = "1.29.0"; src = fetchFromGitHub { owner = "bearer"; repo = "bearer"; rev = "refs/tags/v${version}"; - hash = "sha256-3kJPBvw12iyAu9WVIZgyUrsW6XQ0AqpDmDl1E72vyuE="; + hash = "sha256-18kXDdkwT0bINpwQ5sG+ic0ZFJS/vBMidzo67/C/fbM="; }; - vendorHash = "sha256-ikrpFnn+CTuhttd3gVyoKU3RIBRR/zL8YjvE0tjIH6I="; + vendorHash = "sha256-UbXKMeia6j5xARzO8GjRiDn6GGYz7gjEIdP8ylvJGT4="; subPackages = [ "cmd/bearer" diff --git a/pkgs/development/tools/build-managers/bazel/buildtools/default.nix b/pkgs/development/tools/build-managers/bazel/buildtools/default.nix index 8c46b2456ee..f22e7c3c22a 100644 --- a/pkgs/development/tools/build-managers/bazel/buildtools/default.nix +++ b/pkgs/development/tools/build-managers/bazel/buildtools/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "bazel-buildtools"; - version = "6.3.3"; + version = "6.4.0"; src = fetchFromGitHub { owner = "bazelbuild"; repo = "buildtools"; rev = "v${version}"; - hash = "sha256-eGX1W3Nc26aw31dWm1hvcUzFh1efL4Vd86dK6Hs2BJc="; + hash = "sha256-k4qbveJ1BORnwjOIZcJLWIGVMRjCAqVhISggQ/VTzA4="; }; vendorHash = "sha256-DigTREfI6I48wxRpGp/bfH1NbUZ4E1B5UTQXpI0LY1A="; diff --git a/pkgs/development/tools/build-managers/boot/builder.sh b/pkgs/development/tools/build-managers/boot/builder.sh index e007cbac958..4506e3f0f86 100644 --- a/pkgs/development/tools/build-managers/boot/builder.sh +++ b/pkgs/development/tools/build-managers/boot/builder.sh @@ -1,4 +1,4 @@ -if [ -e .attrs.sh ]; then source .attrs.sh; fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi source $stdenv/setup boot_bin=$out/bin/boot diff --git a/pkgs/development/tools/build-managers/cmake/001-search-path.diff b/pkgs/development/tools/build-managers/cmake/001-search-path.diff deleted file mode 100644 index 04ab0847a70..00000000000 --- a/pkgs/development/tools/build-managers/cmake/001-search-path.diff +++ /dev/null @@ -1,95 +0,0 @@ -diff --git a/Modules/Platform/UnixPaths.cmake b/Modules/Platform/UnixPaths.cmake -index b9381c3d7d..5e944640b5 100644 ---- a/Modules/Platform/UnixPaths.cmake -+++ b/Modules/Platform/UnixPaths.cmake -@@ -26,9 +26,6 @@ get_filename_component(_CMAKE_INSTALL_DIR "${_CMAKE_INSTALL_DIR}" PATH) - # please make sure to keep Help/variable/CMAKE_SYSTEM_PREFIX_PATH.rst - # synchronized - list(APPEND CMAKE_SYSTEM_PREFIX_PATH -- # Standard -- /usr/local /usr / -- - # CMake install location - "${_CMAKE_INSTALL_DIR}" - ) -@@ -47,48 +44,49 @@ endif() - - # Non "standard" but common install prefixes - list(APPEND CMAKE_SYSTEM_PREFIX_PATH -- /usr/X11R6 -- /usr/pkg -- /opt - ) - - # List common include file locations not under the common prefixes. -+if(DEFINED ENV{NIX_CC} -+ AND IS_DIRECTORY "$ENV{NIX_CC}" -+ AND EXISTS "$ENV{NIX_CC}/nix-support/orig-libc" -+ AND EXISTS "$ENV{NIX_CC}/nix-support/orig-libc-dev") -+ file(STRINGS "$ENV{NIX_CC}/nix-support/orig-libc" _nix_cmake_libc) -+ file(STRINGS "$ENV{NIX_CC}/nix-support/orig-libc-dev" _nix_cmake_libc_dev) -+else() -+ set(_nix_cmake_libc @libc_lib@) -+ set(_nix_cmake_libc_dev @libc_dev@) -+endif() -+ - list(APPEND CMAKE_SYSTEM_INCLUDE_PATH -- # X11 -- /usr/include/X11 -+ "${_nix_cmake_libc_dev}/include" - ) - - list(APPEND CMAKE_SYSTEM_LIBRARY_PATH -- # X11 -- /usr/lib/X11 -+ "${_nix_cmake_libc}/lib" - ) - - list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES -- /lib /lib32 /lib64 /usr/lib /usr/lib32 /usr/lib64 -+ "${_nix_cmake_libc}/lib" - ) - --if(CMAKE_SYSROOT_COMPILE) -- set(_cmake_sysroot_compile "${CMAKE_SYSROOT_COMPILE}") --else() -- set(_cmake_sysroot_compile "${CMAKE_SYSROOT}") --endif() -- - # Default per-language values. These may be later replaced after - # parsing the implicit directory information from compiler output. - set(_CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES_INIT - ${CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES} -- "${_cmake_sysroot_compile}/usr/include" -+ "${_nix_cmake_libc_dev}/include" - ) - set(_CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES_INIT - ${CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES} -- "${_cmake_sysroot_compile}/usr/include" -+ "${_nix_cmake_libc_dev}/include" - ) - set(_CMAKE_CUDA_IMPLICIT_INCLUDE_DIRECTORIES_INIT - ${CMAKE_CUDA_IMPLICIT_INCLUDE_DIRECTORIES} -- "${_cmake_sysroot_compile}/usr/include" -+ "${_nix_cmake_libc_dev}/include" - ) - --unset(_cmake_sysroot_compile) -+unset(_nix_cmake_libc) -+unset(_nix_cmake_libc_dev) - - # Reminder when adding new locations computed from environment variables - # please make sure to keep Help/variable/CMAKE_SYSTEM_PREFIX_PATH.rst -diff --git a/Modules/Platform/WindowsPaths.cmake b/Modules/Platform/WindowsPaths.cmake -index b9e2f17979..ab517cd4a7 100644 ---- a/Modules/Platform/WindowsPaths.cmake -+++ b/Modules/Platform/WindowsPaths.cmake -@@ -70,7 +70,7 @@ endif() - - if(CMAKE_CROSSCOMPILING AND NOT CMAKE_HOST_SYSTEM_NAME MATCHES "Windows") - # MinGW (useful when cross compiling from linux with CMAKE_FIND_ROOT_PATH set) -- list(APPEND CMAKE_SYSTEM_PREFIX_PATH /) -+ # list(APPEND CMAKE_SYSTEM_PREFIX_PATH /) - endif() - - list(APPEND CMAKE_SYSTEM_INCLUDE_PATH diff --git a/pkgs/development/tools/build-managers/cmake/002-application-services.diff b/pkgs/development/tools/build-managers/cmake/002-application-services.diff deleted file mode 100644 index 56f7cd266b7..00000000000 --- a/pkgs/development/tools/build-managers/cmake/002-application-services.diff +++ /dev/null @@ -1,39 +0,0 @@ -diff -Naur cmake-3.25.1-old/Source/CMakeLists.txt cmake-3.25.1-new/Source/CMakeLists.txt ---- cmake-3.25.1-old/Source/CMakeLists.txt 2022-11-30 10:57:03.000000000 -0300 -+++ cmake-3.25.1-new/Source/CMakeLists.txt 2022-12-19 01:00:08.412064304 -0300 -@@ -916,7 +916,6 @@ - # On Apple we need CoreFoundation and CoreServices - if(APPLE) - target_link_libraries(CMakeLib PUBLIC "-framework CoreFoundation") -- target_link_libraries(CMakeLib PUBLIC "-framework CoreServices") - endif() - - if(WIN32 AND NOT UNIX) -diff -Naur cmake-3.25.1-old/Source/cmGlobalXCodeGenerator.cxx cmake-3.25.1-new/Source/cmGlobalXCodeGenerator.cxx ---- cmake-3.25.1-old/Source/cmGlobalXCodeGenerator.cxx 2022-11-30 10:57:03.000000000 -0300 -+++ cmake-3.25.1-new/Source/cmGlobalXCodeGenerator.cxx 2022-12-19 01:00:56.065135169 -0300 -@@ -56,10 +56,6 @@ - - #if !defined(CMAKE_BOOTSTRAP) && defined(__APPLE__) - # include <CoreFoundation/CoreFoundation.h> --# if !TARGET_OS_IPHONE --# define HAVE_APPLICATION_SERVICES --# include <ApplicationServices/ApplicationServices.h> --# endif - #endif - - #if !defined(CMAKE_BOOTSTRAP) -diff -Naur cmake-3.25.1-old/Utilities/cmlibarchive/CMakeLists.txt cmake-3.25.1-new/Utilities/cmlibarchive/CMakeLists.txt ---- cmake-3.25.1-old/Utilities/cmlibarchive/CMakeLists.txt 2022-11-30 10:57:03.000000000 -0300 -+++ cmake-3.25.1-new/Utilities/cmlibarchive/CMakeLists.txt 2022-12-19 01:01:43.392205981 -0300 -@@ -2041,10 +2041,6 @@ - ADD_CUSTOM_TARGET(run_all_tests) - ENDIF(ENABLE_TEST) - --# We need CoreServices on Mac OS. --IF(APPLE) -- LIST(APPEND ADDITIONAL_LIBS "-framework CoreServices") --ENDIF(APPLE) - - add_subdirectory(libarchive) - IF(0) # CMake does not build libarchive's command-line tools. diff --git a/pkgs/development/tools/build-managers/cmake/003-libuv-application-services.diff b/pkgs/development/tools/build-managers/cmake/003-libuv-application-services.diff deleted file mode 100644 index 6607a9c6ed1..00000000000 --- a/pkgs/development/tools/build-managers/cmake/003-libuv-application-services.diff +++ /dev/null @@ -1,55 +0,0 @@ -diff --git a/Utilities/cmlibuv/CMakeLists.txt b/Utilities/cmlibuv/CMakeLists.txt -index 7625cf65d9..167903e309 100644 ---- a/Utilities/cmlibuv/CMakeLists.txt -+++ b/Utilities/cmlibuv/CMakeLists.txt -@@ -193,6 +193,22 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") - src/unix/kqueue.c - src/unix/proctitle.c - ) -+ -+ include(CheckIncludeFile) -+ -+ check_include_file("ApplicationServices/ApplicationServices.h" HAVE_ApplicationServices) -+ if (HAVE_ApplicationServices) -+ list(APPEND uv_defines -+ HAVE_APPLICATIONSERVICES_APPLICATIONSERVICES_H=1 -+ ) -+ endif() -+ -+ check_include_file("CoreServices/CoreServices.h" HAVE_CoreServices) -+ if (HAVE_CoreServices) -+ list(APPEND uv_defines -+ HAVE_CORESERVICES_CORESERVICES_H=1 -+ ) -+ endif() - endif() - - if(CMAKE_SYSTEM_NAME STREQUAL "Linux") -diff --git a/Utilities/cmlibuv/src/unix/fsevents.c b/Utilities/cmlibuv/src/unix/fsevents.c -index a51f29b3f6..3f6bf01968 100644 ---- a/Utilities/cmlibuv/src/unix/fsevents.c -+++ b/Utilities/cmlibuv/src/unix/fsevents.c -@@ -21,7 +21,7 @@ - #include "uv.h" - #include "internal.h" - --#if TARGET_OS_IPHONE || MAC_OS_X_VERSION_MAX_ALLOWED < 1070 -+#if !HAVE_CORESERVICES_CORESERVICES_H || MAC_OS_X_VERSION_MAX_ALLOWED < 1070 - - /* iOS (currently) doesn't provide the FSEvents-API (nor CoreServices) */ - /* macOS prior to 10.7 doesn't provide the full FSEvents API so use kqueue */ -@@ -39,7 +39,7 @@ int uv__fsevents_close(uv_fs_event_t* handle) { - void uv__fsevents_loop_delete(uv_loop_t* loop) { - } - --#else /* TARGET_OS_IPHONE */ -+#else /* !HAVE_CORESERVICES_CORESERVICES_H */ - - #include "darwin-stub.h" - -@@ -920,4 +920,4 @@ int uv__fsevents_close(uv_fs_event_t* handle) { - return 0; - } - --#endif /* TARGET_OS_IPHONE */ -+#endif /* !HAVE_CORESERVICES_CORESERVICES_H */ diff --git a/pkgs/development/tools/build-managers/cmake/004-cygwin.diff b/pkgs/development/tools/build-managers/cmake/004-cygwin.diff deleted file mode 100644 index 982aba17e87..00000000000 --- a/pkgs/development/tools/build-managers/cmake/004-cygwin.diff +++ /dev/null @@ -1,274 +0,0 @@ ---- cmake-3.2.2/Source/cmFileCommand.cxx 2015-04-13 19:09:00.000000000 +0200 -+++ cmake-3.2.2/Source/ccmFileCommand.cxx 2015-06-10 11:02:27.345598700 +0200 -@@ -1179,7 +1179,7 @@ - MatchProperties CollectMatchProperties(const char* file) - { - // Match rules are case-insensitive on some platforms. --#if defined(_WIN32) || defined(__APPLE__) || defined(__CYGWIN__) -+#if defined(_WIN32) || defined(__APPLE__) - std::string lower = cmSystemTools::LowerCase(file); - const char* file_to_match = lower.c_str(); - #else ---- cmake-3.2.2/Source/cmInstallCommand.cxx 2015-04-13 19:09:00.000000000 +0200 -+++ cmake-3.2.2/Source/cmInstallCommand.cxx 2015-06-10 11:04:19.257935200 +0200 -@@ -1138,7 +1138,7 @@ - { - literal_args += " REGEX \""; - // Match rules are case-insensitive on some platforms. --#if defined(_WIN32) || defined(__APPLE__) || defined(__CYGWIN__) -+#if defined(_WIN32) || defined(__APPLE__) - std::string regex = cmSystemTools::LowerCase(args[i]); - #else - std::string regex = args[i]; ---- cmake-3.2.2/Source/kwsys/Glob.cxx 2015-04-13 19:09:00.000000000 +0200 -+++ cmake-3.2.2/Source/kwsys/Glob.cxx 2015-06-10 11:05:51.602674000 +0200 -@@ -37,7 +37,7 @@ - #include <string.h> - namespace KWSYS_NAMESPACE - { --#if defined(_WIN32) || defined(__APPLE__) || defined(__CYGWIN__) -+#if defined(_WIN32) || defined(__APPLE__) - // On Windows and apple, no difference between lower and upper case - # define KWSYS_GLOB_CASE_INDEPENDENT - #endif ---- cmake-3.2.2/Source/kwsys/SystemInformation.cxx 2015-04-13 19:09:00.000000000 +0200 -+++ cmake-3.2.2/Source/kwsys/SystemInformation.cxx 2015-06-10 11:13:00.308303500 +0200 -@@ -911,7 +911,7 @@ - // Hide implementation details in an anonymous namespace. - namespace { - // ***************************************************************************** --#if defined(__linux) || defined(__APPLE__) -+#if defined(__linux) || defined(__APPLE__) || defined(__CYGWIN__) - int LoadLines( - FILE *file, - kwsys_stl::vector<kwsys_stl::string> &lines) -@@ -947,7 +947,7 @@ - return nRead; - } - --# if defined(__linux) -+# if defined(__linux) || defined(__CYGWIN__) - // ***************************************************************************** - int LoadLines( - const char *fileName, -@@ -986,7 +986,7 @@ - } - #endif - --#if defined(__linux) -+#if defined(__linux) || defined(__CYGWIN__) - // **************************************************************************** - template<typename T> - int GetFieldsFromFile( -@@ -3132,7 +3132,6 @@ - pos = buffer.find("processor\t",pos+1); - } - --#ifdef __linux - // Find the largest physical id. - int maxId = -1; - kwsys_stl::string idc = -@@ -3165,14 +3164,6 @@ - atoi(this->ExtractValueFromCpuInfoFile(buffer,"ncpus active").c_str()); - } - --#else // __CYGWIN__ -- // does not have "physical id" entries, neither "cpu cores" -- // this has to be fixed for hyper-threading. -- kwsys_stl::string cpucount = -- this->ExtractValueFromCpuInfoFile(buffer,"cpu count"); -- this->NumberOfPhysicalCPU= -- this->NumberOfLogicalCPU = atoi(cpucount.c_str()); --#endif - // gotta have one, and if this is 0 then we get a / by 0n - // better to have a bad answer than a crash - if(this->NumberOfPhysicalCPU <= 0) -@@ -3370,7 +3361,7 @@ - GlobalMemoryStatusEx(&statex); - return statex.ullTotalPhys/1024; - # endif --#elif defined(__linux) -+#elif defined(__linux) || defined(__CYGWIN__) - SystemInformation::LongLong memTotal=0; - int ierr=GetFieldFromFile("/proc/meminfo","MemTotal:",memTotal); - if (ierr) -@@ -3501,7 +3492,7 @@ - GlobalMemoryStatusEx(&statex); - return (statex.ullTotalPhys - statex.ullAvailPhys)/1024; - # endif --#elif defined(__linux) -+#elif defined(__linux) || defined(__CYGWIN__) - const char *names[3]={"MemTotal:","MemFree:",NULL}; - SystemInformation::LongLong values[2]={SystemInformation::LongLong(0)}; - int ierr=GetFieldsFromFile("/proc/meminfo",names,values); -@@ -3560,7 +3551,7 @@ - return -2; - } - return pmc.WorkingSetSize/1024; --#elif defined(__linux) -+#elif defined(__linux) || defined(__CYGWIN__) - SystemInformation::LongLong memUsed=0; - int ierr=GetFieldFromFile("/proc/self/status","VmRSS:",memUsed); - if (ierr) -@@ -3612,7 +3603,7 @@ - { - #if defined(_WIN32) - return GetCurrentProcessId(); --#elif defined(__linux) || defined(__APPLE__) -+#elif defined(__linux) || defined(__APPLE__) || defined(__CYGWIN__) - return getpid(); - #else - return -1; ---- cmake-3.2.2/Source/kwsys/SystemTools.cxx 2015-04-13 19:09:00.000000000 +0200 -+++ cmake-3.2.2/Source/kwsys/SystemTools.cxx 2015-06-10 11:21:58.980443200 +0200 -@@ -93,19 +93,12 @@ - # if defined(_MSC_VER) && _MSC_VER >= 1800 - # define KWSYS_WINDOWS_DEPRECATED_GetVersionEx - # endif --#elif defined (__CYGWIN__) --# include <windows.h> --# undef _WIN32 - #endif - - #if !KWSYS_CXX_HAS_ENVIRON_IN_STDLIB_H - extern char **environ; - #endif - --#ifdef __CYGWIN__ --# include <sys/cygwin.h> --#endif -- - // getpwnam doesn't exist on Windows and Cray Xt3/Catamount - // same for TIOCGWINSZ - #if defined(_WIN32) || defined (__LIBCATAMOUNT__) -@@ -1148,15 +1141,7 @@ - { - return false; - } --#if defined(__CYGWIN__) -- // Convert filename to native windows path if possible. -- char winpath[MAX_PATH]; -- if(SystemTools::PathCygwinToWin32(filename.c_str(), winpath)) -- { -- return (GetFileAttributesA(winpath) != INVALID_FILE_ATTRIBUTES); -- } -- return access(filename.c_str(), R_OK) == 0; --#elif defined(_WIN32) -+#if defined(_WIN32) - return (GetFileAttributesW( - SystemTools::ConvertToWindowsExtendedPath(filename).c_str()) - != INVALID_FILE_ATTRIBUTES); -@@ -1190,28 +1175,6 @@ - } - - //---------------------------------------------------------------------------- --#ifdef __CYGWIN__ --bool SystemTools::PathCygwinToWin32(const char *path, char *win32_path) --{ -- SystemToolsTranslationMap::iterator i = -- SystemTools::Cyg2Win32Map->find(path); -- -- if (i != SystemTools::Cyg2Win32Map->end()) -- { -- strncpy(win32_path, i->second.c_str(), MAX_PATH); -- } -- else -- { -- if(cygwin_conv_path(CCP_POSIX_TO_WIN_A, path, win32_path, MAX_PATH) != 0) -- { -- win32_path[0] = 0; -- } -- SystemToolsTranslationMap::value_type entry(path, win32_path); -- SystemTools::Cyg2Win32Map->insert(entry); -- } -- return win32_path[0] != 0; --} --#endif - - bool SystemTools::Touch(const kwsys_stl::string& filename, bool create) - { -@@ -4307,7 +4270,7 @@ - - bool SystemTools::FileIsFullPath(const char* in_name, size_t len) - { --#if defined(_WIN32) || defined(__CYGWIN__) -+#if defined(_WIN32) - // On Windows, the name must be at least two characters long. - if(len < 2) - { -@@ -5078,9 +5041,6 @@ - static unsigned int SystemToolsManagerCount; - SystemToolsTranslationMap *SystemTools::TranslationMap; - SystemToolsTranslationMap *SystemTools::LongPathMap; --#ifdef __CYGWIN__ --SystemToolsTranslationMap *SystemTools::Cyg2Win32Map; --#endif - - // SystemToolsManager manages the SystemTools singleton. - // SystemToolsManager should be included in any translation unit -@@ -5126,9 +5086,6 @@ - // Allocate the translation map first. - SystemTools::TranslationMap = new SystemToolsTranslationMap; - SystemTools::LongPathMap = new SystemToolsTranslationMap; --#ifdef __CYGWIN__ -- SystemTools::Cyg2Win32Map = new SystemToolsTranslationMap; --#endif - - // Add some special translation paths for unix. These are not added - // for windows because drive letters need to be maintained. Also, -@@ -5183,9 +5140,6 @@ - { - delete SystemTools::TranslationMap; - delete SystemTools::LongPathMap; --#ifdef __CYGWIN__ -- delete SystemTools::Cyg2Win32Map; --#endif - } - - ---- cmake-3.2.2/Source/kwsys/SystemTools.hxx.in 2015-04-13 19:09:00.000000000 +0200 -+++ cmake-3.2.2/Source/kwsys/SystemTools.hxx.in 2015-06-10 11:24:24.271286600 +0200 -@@ -298,15 +298,6 @@ - static bool FileExists(const kwsys_stl::string& filename); - - /** -- * Converts Cygwin path to Win32 path. Uses dictionary container for -- * caching and calls to cygwin_conv_to_win32_path from Cygwin dll -- * for actual translation. Returns true on success, else false. -- */ --#ifdef __CYGWIN__ -- static bool PathCygwinToWin32(const char *path, char *win32_path); --#endif -- -- /** - * Return file length - */ - static unsigned long FileLength(const kwsys_stl::string& filename); -@@ -942,9 +933,6 @@ - */ - static SystemToolsTranslationMap *TranslationMap; - static SystemToolsTranslationMap *LongPathMap; --#ifdef __CYGWIN__ -- static SystemToolsTranslationMap *Cyg2Win32Map; --#endif - friend class SystemToolsManager; - }; - ---- cmake-3.2.2/Modules/FindCurses.cmake 2015-04-13 19:09:00.000000000 +0200 -+++ cmake-3.2.2/Modules/FindCurses.cmake 2015-06-10 12:10:19.682030300 +0200 -@@ -60,15 +60,6 @@ - if(CURSES_NCURSES_LIBRARY AND ((NOT CURSES_CURSES_LIBRARY) OR CURSES_NEED_NCURSES)) - set(CURSES_USE_NCURSES TRUE) - endif() --# http://cygwin.com/ml/cygwin-announce/2010-01/msg00002.html --# cygwin ncurses stopped providing curses.h symlinks see above --# message. Cygwin is an ncurses package, so force ncurses on --# cygwin if the curses.h is missing --if(CYGWIN) -- if(NOT EXISTS /usr/include/curses.h) -- set(CURSES_USE_NCURSES TRUE) -- endif() --endif() - - - # Not sure the logic is correct here. diff --git a/pkgs/development/tools/build-managers/cmake/005-remove-systemconfiguration-dep.diff b/pkgs/development/tools/build-managers/cmake/005-remove-systemconfiguration-dep.diff deleted file mode 100644 index 76aa91cff92..00000000000 --- a/pkgs/development/tools/build-managers/cmake/005-remove-systemconfiguration-dep.diff +++ /dev/null @@ -1,67 +0,0 @@ ---- a/Utilities/cmcurl/CMakeLists.txt -+++ b/Utilities/cmcurl/CMakeLists.txt -@@ -391,13 +391,6 @@ if(ENABLE_IPV6 AND NOT WIN32) - - if(CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND NOT ENABLE_ARES) - set(use_core_foundation ON) -- -- find_library(SYSTEMCONFIGURATION_FRAMEWORK "SystemConfiguration") -- if(NOT SYSTEMCONFIGURATION_FRAMEWORK) -- message(FATAL_ERROR "SystemConfiguration framework not found") -- endif() -- -- list(APPEND CURL_LIBS "-framework SystemConfiguration") - endif() - endif() - ---- a/Utilities/cmcurl/lib/curl_setup.h -+++ b/Utilities/cmcurl/lib/curl_setup.h -@@ -257,11 +257,7 @@ - * performing this task will result in a synthesized IPv6 address. - */ - #if defined(__APPLE__) && !defined(USE_ARES) --#include <TargetConditionals.h> - #define USE_RESOLVE_ON_IPS 1 --# if defined(TARGET_OS_OSX) && TARGET_OS_OSX --# define CURL_OSX_CALL_COPYPROXIES 1 --# endif - #endif - - #ifdef USE_LWIPSOCK ---- a/Utilities/cmcurl/lib/hostip.c -+++ b/Utilities/cmcurl/lib/hostip.c -@@ -68,10 +68,6 @@ - #include "curl_memory.h" - #include "memdebug.h" - --#if defined(ENABLE_IPV6) && defined(CURL_OSX_CALL_COPYPROXIES) --#include <SystemConfiguration/SCDynamicStoreCopySpecific.h> --#endif -- - #if defined(CURLRES_SYNCH) && \ - defined(HAVE_ALARM) && defined(SIGALRM) && defined(HAVE_SIGSETJMP) - /* alarm-based timeouts can only be used with all the dependencies satisfied */ -@@ -661,23 +657,6 @@ enum resolve_t Curl_resolv(struct Curl_easy *data, - return CURLRESOLV_ERROR; - } - --#if defined(ENABLE_IPV6) && defined(CURL_OSX_CALL_COPYPROXIES) -- { -- /* -- * The automagic conversion from IPv4 literals to IPv6 literals only -- * works if the SCDynamicStoreCopyProxies system function gets called -- * first. As Curl currently doesn't support system-wide HTTP proxies, we -- * therefore don't use any value this function might return. -- * -- * This function is only available on a macOS and is not needed for -- * IPv4-only builds, hence the conditions above. -- */ -- CFDictionaryRef dict = SCDynamicStoreCopyProxies(NULL); -- if(dict) -- CFRelease(dict); -- } --#endif -- - #ifndef USE_RESOLVE_ON_IPS - /* First check if this is an IPv4 address string */ - if(Curl_inet_pton(AF_INET, hostname, &in) > 0) diff --git a/pkgs/development/tools/build-managers/cmake/006-darwin-always-set-runtime-c-flag.diff b/pkgs/development/tools/build-managers/cmake/006-darwin-always-set-runtime-c-flag.diff deleted file mode 100644 index dc10e6b3423..00000000000 --- a/pkgs/development/tools/build-managers/cmake/006-darwin-always-set-runtime-c-flag.diff +++ /dev/null @@ -1,14 +0,0 @@ -Revert of commit 1af23c4de2c7d58c06171d70b37794b5c860d5f4. ---- b/Modules/Platform/Darwin.cmake -+++ a/Modules/Platform/Darwin.cmake -@@ -47,9 +47,7 @@ - set(CMAKE_SHARED_MODULE_SUFFIX ".so") - set(CMAKE_MODULE_EXISTS 1) - set(CMAKE_DL_LIBS "") -+set(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "-Wl,-rpath,") --if(NOT "${_CURRENT_OSX_VERSION}" VERSION_LESS "10.5") -- set(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "-Wl,-rpath,") --endif() - - foreach(lang C CXX OBJC OBJCXX) - set(CMAKE_${lang}_OSX_COMPATIBILITY_VERSION_FLAG "-compatibility_version ") diff --git a/pkgs/development/tools/build-managers/cmake/check-pc-files-hook.sh b/pkgs/development/tools/build-managers/cmake/check-pc-files-hook.sh deleted file mode 100644 index 94d1b7b5355..00000000000 --- a/pkgs/development/tools/build-managers/cmake/check-pc-files-hook.sh +++ /dev/null @@ -1,18 +0,0 @@ -cmakePcfileCheckPhase() { - while IFS= read -rd $'\0' file; do - grepout=$(grep --line-number '}//nix/store' "$file" || true) - if [ -n "$grepout" ]; then - { - echo "Broken paths found in a .pc file! $file" - echo "The following lines have issues (specifically '//' in paths)." - echo "$grepout" - echo "It is very likely that paths are being joined improperly." - echo 'ex: "${prefix}/@CMAKE_INSTALL_LIBDIR@" should be "@CMAKE_INSTALL_FULL_LIBDIR@"' - echo "Please see https://github.com/NixOS/nixpkgs/issues/144170 for more details." - exit 1 - } 1>&2 - fi - done < <(find "${!outputDev}" -iname "*.pc" -print0) -} - -postFixupHooks+=(cmakePcfileCheckPhase) diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix deleted file mode 100644 index 00715130a00..00000000000 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ /dev/null @@ -1,173 +0,0 @@ -{ lib -, stdenv -, fetchurl -, buildPackages -, bzip2 -, curlMinimal -, expat -, libarchive -, libuv -, ncurses -, openssl -, pkg-config -, ps -, rhash -, sphinx -, texinfo -, xz -, zlib -, isBootstrap ? false -, useOpenSSL ? !isBootstrap -, useSharedLibraries ? (!isBootstrap && !stdenv.isCygwin) -, uiToolkits ? [] # can contain "ncurses" and/or "qt5" -, buildDocs ? !(isBootstrap || (uiToolkits == [])) -, darwin -, libsForQt5 -}: - -let - inherit (darwin.apple_sdk.frameworks) SystemConfiguration; - inherit (libsForQt5) qtbase wrapQtAppsHook; - cursesUI = lib.elem "ncurses" uiToolkits; - qt5UI = lib.elem "qt5" uiToolkits; -in -# Accepts only "ncurses" and "qt5" as possible uiToolkits -assert lib.subtractLists [ "ncurses" "qt5" ] uiToolkits == []; -# Minimal, bootstrap cmake does not have toolkits -assert isBootstrap -> (uiToolkits == []); -stdenv.mkDerivation (finalAttrs: { - pname = "cmake" - + lib.optionalString isBootstrap "-boot" - + lib.optionalString cursesUI "-cursesUI" - + lib.optionalString qt5UI "-qt5UI"; - version = "3.26.4"; - - src = fetchurl { - url = "https://cmake.org/files/v${lib.versions.majorMinor finalAttrs.version}/cmake-${finalAttrs.version}.tar.gz"; - hash = "sha256-MTtogMKRvU/jHAqlHW5iZZKCpSHmlfMNXMDSWrvVwgg="; - }; - - patches = [ - # Don't search in non-Nix locations such as /usr, but do search in our libc. - ./001-search-path.diff - # Don't depend on frameworks. - ./002-application-services.diff - # Derived from https://github.com/libuv/libuv/commit/1a5d4f08238dd532c3718e210078de1186a5920d - ./003-libuv-application-services.diff - ] - ++ lib.optional stdenv.isCygwin ./004-cygwin.diff - # Derived from https://github.com/curl/curl/commit/31f631a142d855f069242f3e0c643beec25d1b51 - ++ lib.optional (stdenv.isDarwin && isBootstrap) ./005-remove-systemconfiguration-dep.diff - # On Darwin, always set CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG. - ++ lib.optional stdenv.isDarwin ./006-darwin-always-set-runtime-c-flag.diff; - - outputs = [ "out" ] ++ lib.optionals buildDocs [ "man" "info" ]; - setOutputFlags = false; - - setupHooks = [ - ./setup-hook.sh - ./check-pc-files-hook.sh - ]; - - depsBuildBuild = [ buildPackages.stdenv.cc ]; - - nativeBuildInputs = finalAttrs.setupHooks ++ [ - pkg-config - ] - ++ lib.optionals buildDocs [ texinfo ] - ++ lib.optionals qt5UI [ wrapQtAppsHook ]; - - buildInputs = lib.optionals useSharedLibraries [ - bzip2 - curlMinimal - expat - libarchive - xz - zlib - libuv - rhash - ] - ++ lib.optional useOpenSSL openssl - ++ lib.optional cursesUI ncurses - ++ lib.optional qt5UI qtbase - ++ lib.optional (stdenv.isDarwin && !isBootstrap) SystemConfiguration; - - propagatedBuildInputs = lib.optional stdenv.isDarwin ps; - - preConfigure = '' - fixCmakeFiles . - substituteInPlace Modules/Platform/UnixPaths.cmake \ - --subst-var-by libc_bin ${lib.getBin stdenv.cc.libc} \ - --subst-var-by libc_dev ${lib.getDev stdenv.cc.libc} \ - --subst-var-by libc_lib ${lib.getLib stdenv.cc.libc} - # CC_FOR_BUILD and CXX_FOR_BUILD are used to bootstrap cmake - configureFlags="--parallel=''${NIX_BUILD_CORES:-1} CC=$CC_FOR_BUILD CXX=$CXX_FOR_BUILD $configureFlags" - ''; - - configureFlags = [ - "CXXFLAGS=-Wno-elaborated-enum-base" - "--docdir=share/doc/${finalAttrs.pname}-${finalAttrs.version}" - ] ++ (if useSharedLibraries - then [ "--no-system-jsoncpp" "--system-libs" ] - else [ "--no-system-libs" ]) # FIXME: cleanup - ++ lib.optional qt5UI "--qt-gui" - ++ lib.optionals buildDocs [ - "--sphinx-build=${sphinx}/bin/sphinx-build" - "--sphinx-info" - "--sphinx-man" - ] - # Workaround https://gitlab.kitware.com/cmake/cmake/-/issues/20568 - ++ lib.optionals stdenv.hostPlatform.is32bit [ - "CFLAGS=-D_FILE_OFFSET_BITS=64" - "CXXFLAGS=-D_FILE_OFFSET_BITS=64" - ] - ++ [ - "--" - # We should set the proper `CMAKE_SYSTEM_NAME`. - # http://www.cmake.org/Wiki/CMake_Cross_Compiling - # - # Unfortunately cmake seems to expect absolute paths for ar, ranlib, and - # strip. Otherwise they are taken to be relative to the source root of the - # package being built. - "-DCMAKE_CXX_COMPILER=${stdenv.cc.targetPrefix}c++" - "-DCMAKE_C_COMPILER=${stdenv.cc.targetPrefix}cc" - "-DCMAKE_AR=${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ar" - "-DCMAKE_RANLIB=${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ranlib" - "-DCMAKE_STRIP=${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}strip" - - "-DCMAKE_USE_OPENSSL=${if useOpenSSL then "ON" else "OFF"}" - # Avoid depending on frameworks. - "-DBUILD_CursesDialog=${if cursesUI then "ON" else "OFF"}" - ]; - - # make install attempts to use the just-built cmake - preInstall = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' - sed -i 's|bin/cmake|${buildPackages.cmakeMinimal}/bin/cmake|g' Makefile - ''; - - dontUseCmakeConfigure = true; - enableParallelBuilding = true; - - # This isn't an autoconf configure script; triples are passed via - # CMAKE_SYSTEM_NAME, etc. - configurePlatforms = [ ]; - - doCheck = false; # fails - - meta = { - homepage = "https://cmake.org/"; - description = "Cross-platform, open-source build system generator"; - longDescription = '' - CMake is an open-source, cross-platform family of tools designed to build, - test and package software. CMake is used to control the software - compilation process using simple platform and compiler independent - configuration files, and generate native makefiles and workspaces that can - be used in the compiler environment of your choice. - ''; - changelog = "https://cmake.org/cmake/help/v${lib.versions.majorMinor finalAttrs.version}/release/${lib.versions.majorMinor finalAttrs.version}.html"; - license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ ttuegel lnl7 AndersonTorres ]; - platforms = lib.platforms.all; - broken = (qt5UI && stdenv.isDarwin); - }; -}) diff --git a/pkgs/development/tools/build-managers/cmake/setup-hook.sh b/pkgs/development/tools/build-managers/cmake/setup-hook.sh deleted file mode 100755 index b28ed42b689..00000000000 --- a/pkgs/development/tools/build-managers/cmake/setup-hook.sh +++ /dev/null @@ -1,184 +0,0 @@ -addCMakeParams() { - addToSearchPath CMAKE_PREFIX_PATH $1 -} - -fixCmakeFiles() { - # Replace occurences of /usr and /opt by /var/empty. - echo "fixing cmake files..." - find "$1" \( -type f -name "*.cmake" -o -name "*.cmake.in" -o -name CMakeLists.txt \) -print | - while read fn; do - sed -e 's^/usr\([ /]\|$\)^/var/empty\1^g' -e 's^/opt\([ /]\|$\)^/var/empty\1^g' < "$fn" > "$fn.tmp" - mv "$fn.tmp" "$fn" - done -} - -cmakeConfigurePhase() { - runHook preConfigure - - # default to CMake defaults if unset - : ${cmakeBuildDir:=build} - - export CTEST_OUTPUT_ON_FAILURE=1 - if [ -n "${enableParallelChecking-1}" ]; then - export CTEST_PARALLEL_LEVEL=$NIX_BUILD_CORES - fi - - if [ -z "${dontFixCmake-}" ]; then - fixCmakeFiles . - fi - - if [ -z "${dontUseCmakeBuildDir-}" ]; then - mkdir -p "$cmakeBuildDir" - cd "$cmakeBuildDir" - : ${cmakeDir:=..} - else - : ${cmakeDir:=.} - fi - - if [ -z "${dontAddPrefix-}" ]; then - cmakeFlags="-DCMAKE_INSTALL_PREFIX=$prefix $cmakeFlags" - fi - - # We should set the proper `CMAKE_SYSTEM_NAME`. - # http://www.cmake.org/Wiki/CMake_Cross_Compiling - # - # Unfortunately cmake seems to expect absolute paths for ar, ranlib, and - # strip. Otherwise they are taken to be relative to the source root of the - # package being built. - cmakeFlags="-DCMAKE_CXX_COMPILER=$CXX $cmakeFlags" - cmakeFlags="-DCMAKE_C_COMPILER=$CC $cmakeFlags" - cmakeFlags="-DCMAKE_AR=$(command -v $AR) $cmakeFlags" - cmakeFlags="-DCMAKE_RANLIB=$(command -v $RANLIB) $cmakeFlags" - cmakeFlags="-DCMAKE_STRIP=$(command -v $STRIP) $cmakeFlags" - - # on macOS we want to prefer Unix-style headers to Frameworks - # because we usually do not package the framework - cmakeFlags="-DCMAKE_FIND_FRAMEWORK=LAST $cmakeFlags" - - # we never want to use the global macOS SDK - cmakeFlags="-DCMAKE_OSX_SYSROOT= $cmakeFlags" - - # correctly detect our clang compiler - cmakeFlags="-DCMAKE_POLICY_DEFAULT_CMP0025=NEW $cmakeFlags" - - # This installs shared libraries with a fully-specified install - # name. By default, cmake installs shared libraries with just the - # basename as the install name, which means that, on Darwin, they - # can only be found by an executable at runtime if the shared - # libraries are in a system path or in the same directory as the - # executable. This flag makes the shared library accessible from its - # nix/store directory. - cmakeFlags="-DCMAKE_INSTALL_NAME_DIR=${!outputLib}/lib $cmakeFlags" - - # The docdir flag needs to include PROJECT_NAME as per GNU guidelines, - # try to extract it from CMakeLists.txt. - if [[ -z "$shareDocName" ]]; then - local cmakeLists="${cmakeDir}/CMakeLists.txt" - if [[ -f "$cmakeLists" ]]; then - local shareDocName="$(grep --only-matching --perl-regexp --ignore-case '\bproject\s*\(\s*"?\K([^[:space:]")]+)' < "$cmakeLists" | head -n1)" - fi - # The argument sometimes contains garbage or variable interpolation. - # When that is the case, let’s fall back to the derivation name. - if [[ -z "$shareDocName" ]] || echo "$shareDocName" | grep -q '[^a-zA-Z0-9_+-]'; then - if [[ -n "${pname-}" ]]; then - shareDocName="$pname" - else - shareDocName="$(echo "$name" | sed 's/-[^a-zA-Z].*//')" - fi - fi - fi - - # This ensures correct paths with multiple output derivations - # It requires the project to use variables from GNUInstallDirs module - # https://cmake.org/cmake/help/latest/module/GNUInstallDirs.html - cmakeFlags="-DCMAKE_INSTALL_BINDIR=${!outputBin}/bin $cmakeFlags" - cmakeFlags="-DCMAKE_INSTALL_SBINDIR=${!outputBin}/sbin $cmakeFlags" - cmakeFlags="-DCMAKE_INSTALL_INCLUDEDIR=${!outputInclude}/include $cmakeFlags" - cmakeFlags="-DCMAKE_INSTALL_OLDINCLUDEDIR=${!outputInclude}/include $cmakeFlags" - cmakeFlags="-DCMAKE_INSTALL_MANDIR=${!outputMan}/share/man $cmakeFlags" - cmakeFlags="-DCMAKE_INSTALL_INFODIR=${!outputInfo}/share/info $cmakeFlags" - cmakeFlags="-DCMAKE_INSTALL_DOCDIR=${!outputDoc}/share/doc/${shareDocName} $cmakeFlags" - cmakeFlags="-DCMAKE_INSTALL_LIBDIR=${!outputLib}/lib $cmakeFlags" - cmakeFlags="-DCMAKE_INSTALL_LIBEXECDIR=${!outputLib}/libexec $cmakeFlags" - cmakeFlags="-DCMAKE_INSTALL_LOCALEDIR=${!outputLib}/share/locale $cmakeFlags" - - # Don’t build tests when doCheck = false - if [ -z "${doCheck-}" ]; then - cmakeFlags="-DBUILD_TESTING=OFF $cmakeFlags" - fi - - # Always build Release, to ensure optimisation flags - cmakeFlags="-DCMAKE_BUILD_TYPE=${cmakeBuildType:-Release} $cmakeFlags" - - # Disable user package registry to avoid potential side effects - # and unecessary attempts to access non-existent home folder - # https://cmake.org/cmake/help/latest/manual/cmake-packages.7.html#disabling-the-package-registry - cmakeFlags="-DCMAKE_EXPORT_NO_PACKAGE_REGISTRY=ON $cmakeFlags" - cmakeFlags="-DCMAKE_FIND_USE_PACKAGE_REGISTRY=OFF $cmakeFlags" - cmakeFlags="-DCMAKE_FIND_USE_SYSTEM_PACKAGE_REGISTRY=OFF $cmakeFlags" - - if [ "${buildPhase-}" = ninjaBuildPhase ]; then - cmakeFlags="-GNinja $cmakeFlags" - fi - - echo "cmake flags: $cmakeFlags ${cmakeFlagsArray[@]}" - - cmake "$cmakeDir" $cmakeFlags "${cmakeFlagsArray[@]}" - - if ! [[ -v enableParallelBuilding ]]; then - enableParallelBuilding=1 - echo "cmake: enabled parallel building" - fi - - if ! [[ -v enableParallelInstalling ]]; then - enableParallelInstalling=1 - echo "cmake: enabled parallel installing" - fi - - runHook postConfigure -} - -if [ -z "${dontUseCmakeConfigure-}" -a -z "${configurePhase-}" ]; then - setOutputFlags= - configurePhase=cmakeConfigurePhase -fi - -addEnvHooks "$targetOffset" addCMakeParams - -makeCmakeFindLibs(){ - isystem_seen= - iframework_seen= - for flag in ${NIX_CFLAGS_COMPILE-} ${NIX_LDFLAGS-}; do - if test -n "$isystem_seen" && test -d "$flag"; then - isystem_seen= - export CMAKE_INCLUDE_PATH="${CMAKE_INCLUDE_PATH-}${CMAKE_INCLUDE_PATH:+:}${flag}" - elif test -n "$iframework_seen" && test -d "$flag"; then - iframework_seen= - export CMAKE_FRAMEWORK_PATH="${CMAKE_FRAMEWORK_PATH-}${CMAKE_FRAMEWORK_PATH:+:}${flag}" - else - isystem_seen= - iframework_seen= - case $flag in - -I*) - export CMAKE_INCLUDE_PATH="${CMAKE_INCLUDE_PATH-}${CMAKE_INCLUDE_PATH:+:}${flag:2}" - ;; - -L*) - export CMAKE_LIBRARY_PATH="${CMAKE_LIBRARY_PATH-}${CMAKE_LIBRARY_PATH:+:}${flag:2}" - ;; - -F*) - export CMAKE_FRAMEWORK_PATH="${CMAKE_FRAMEWORK_PATH-}${CMAKE_FRAMEWORK_PATH:+:}${flag:2}" - ;; - -isystem) - isystem_seen=1 - ;; - -iframework) - iframework_seen=1 - ;; - esac - fi - done -} - -# not using setupHook, because it could be a setupHook adding additional -# include flags to NIX_CFLAGS_COMPILE -postHooks+=(makeCmakeFindLibs) diff --git a/pkgs/development/tools/build-managers/meson/boost-Do-not-add-system-paths-on-nix.patch b/pkgs/development/tools/build-managers/meson/boost-Do-not-add-system-paths-on-nix.patch deleted file mode 100644 index 0a2eda9de9a..00000000000 --- a/pkgs/development/tools/build-managers/meson/boost-Do-not-add-system-paths-on-nix.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -Naur meson-0.60.2-old/mesonbuild/dependencies/boost.py meson-0.60.2-new/mesonbuild/dependencies/boost.py ---- meson-0.60.2-old/mesonbuild/dependencies/boost.py 2021-11-02 16:58:07.000000000 -0300 -+++ meson-0.60.2-new/mesonbuild/dependencies/boost.py 2021-12-12 19:21:27.895705897 -0300 -@@ -682,16 +682,7 @@ - else: - tmp = [] # type: T.List[Path] - -- # Add some default system paths -- tmp += [Path('/opt/local')] -- tmp += [Path('/usr/local/opt/boost')] -- tmp += [Path('/usr/local')] -- tmp += [Path('/usr')] -- -- # Cleanup paths -- tmp = [x for x in tmp if x.is_dir()] -- tmp = [x.resolve() for x in tmp] -- roots += tmp -+ # Remove such spurious, non-explicit "system" paths for Nix&Nixpkgs - - self.check_and_set_roots(roots, use_system=True) - diff --git a/pkgs/development/tools/build-managers/meson/clear-old-rpath.patch b/pkgs/development/tools/build-managers/meson/clear-old-rpath.patch deleted file mode 100644 index f1e3c76e8b5..00000000000 --- a/pkgs/development/tools/build-managers/meson/clear-old-rpath.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/mesonbuild/scripts/depfixer.py b/mesonbuild/scripts/depfixer.py -index 4176b9a03..faaabf616 100644 ---- a/mesonbuild/scripts/depfixer.py -+++ b/mesonbuild/scripts/depfixer.py -@@ -336,6 +336,15 @@ class Elf(DataSizes): - if not new_rpath: - self.remove_rpath_entry(entrynum) - else: -+ # Clear old rpath to avoid stale references, -+ # not heeding the warning above about de-duplication -+ # since it does not seem to cause issues for us -+ # and not doing so trips up Nix’s reference checker. -+ # See https://github.com/NixOS/nixpkgs/pull/46020 -+ # and https://github.com/NixOS/nixpkgs/issues/95163 -+ self.bf.seek(rp_off) -+ self.bf.write(b'\0'*len(old_rpath)) -+ - self.bf.seek(rp_off) - self.bf.write(new_rpath) - self.bf.write(b'\0') diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix deleted file mode 100644 index 8758afea821..00000000000 --- a/pkgs/development/tools/build-managers/meson/default.nix +++ /dev/null @@ -1,148 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, fetchpatch -, installShellFiles -, ninja -, pkg-config -, python3 -, zlib -, coreutils -, substituteAll -, Foundation -, OpenGL -, AppKit -, Cocoa -, libxcrypt -}: - -python3.pkgs.buildPythonApplication rec { - pname = "meson"; - version = "1.2.1"; - - src = fetchFromGitHub { - owner = "mesonbuild"; - repo = "meson"; - rev = "refs/tags/${version}"; - hash = "sha256-x2VN/6Kg/n6BW5S4nLKfG67dYrSR/G+Aowf6d2Vbc+0="; - }; - - patches = [ - # Meson is currently inspecting fewer variables than autoconf does, which - # makes it harder for us to use setup hooks, etc. Taken from - # https://github.com/mesonbuild/meson/pull/6827 - ./more-env-vars.patch - - # Unlike libtool, vanilla Meson does not pass any information - # about the path library will be installed to to g-ir-scanner, - # breaking the GIR when path other than ${!outputLib}/lib is used. - # We patch Meson to add a --fallback-library-path argument with - # library install_dir to g-ir-scanner. - ./gir-fallback-path.patch - - # In common distributions, RPATH is only needed for internal libraries so - # meson removes everything else. With Nix, the locations of libraries - # are not as predictable, therefore we need to keep them in the RPATH. - # At the moment we are keeping the paths starting with /nix/store. - # https://github.com/NixOS/nixpkgs/issues/31222#issuecomment-365811634 - (substituteAll { - src = ./fix-rpath.patch; - inherit (builtins) storeDir; - }) - - # When Meson removes build_rpath from DT_RUNPATH entry, it just writes - # the shorter NUL-terminated new rpath over the old one to reduce - # the risk of potentially breaking the ELF files. - # But this can cause much bigger problem for Nix as it can produce - # cut-in-half-by-\0 store path references. - # Let’s just clear the whole rpath and hope for the best. - ./clear-old-rpath.patch - - # Patch out default boost search paths to avoid impure builds on - # unsandboxed non-NixOS builds, see: - # https://github.com/NixOS/nixpkgs/issues/86131#issuecomment-711051774 - ./boost-Do-not-add-system-paths-on-nix.patch - - # Nixpkgs cctools does not have bitcode support. - ./disable-bitcode.patch - - # Fix passing multiple --define-variable arguments to pkg-config. - # https://github.com/mesonbuild/meson/pull/10670 - (fetchpatch { - url = "https://github.com/mesonbuild/meson/commit/d5252c5d4cf1c1931fef0c1c98dd66c000891d21.patch"; - sha256 = "GiUNVul1N5Fl8mfqM7vA/r1FdKqImiDYLXMVDt77gvw="; - excludes = [ - "docs/yaml/objects/dep.yaml" - ]; - }) - ]; - - setupHook = ./setup-hook.sh; - - nativeCheckInputs = [ ninja pkg-config ]; - checkInputs = [ zlib ] - ++ lib.optionals stdenv.isDarwin [ Foundation OpenGL AppKit Cocoa ]; - checkPhase = '' - runHook preCheck - - patchShebangs 'test cases' - substituteInPlace 'test cases/native/8 external program shebang parsing/script.int.in' \ - --replace /usr/bin/env ${coreutils}/bin/env - # requires git, creating cyclic dependency - rm -r 'test cases/common/66 vcstag' - # requires glib, creating cyclic dependency - rm -r 'test cases/linuxlike/6 subdir include order' - rm -r 'test cases/linuxlike/9 compiler checks with dependencies' - # requires static zlib, see #66461 - rm -r 'test cases/linuxlike/14 static dynamic linkage' - # Nixpkgs cctools does not have bitcode support. - rm -r 'test cases/osx/7 bitcode' - HOME="$TMPDIR" python ./run_project_tests.py - - runHook postCheck - ''; - - postFixup = '' - pushd $out/bin - # undo shell wrapper as meson tools are called with python - for i in *; do - mv ".$i-wrapped" "$i" - done - popd - - # Do not propagate Python - rm $out/nix-support/propagated-build-inputs - - substituteInPlace "$out/share/bash-completion/completions/meson" \ - --replace "python3 -c " "${python3.interpreter} -c " - ''; - - buildInputs = lib.optionals (python3.pythonOlder "3.9") [ - libxcrypt - ]; - - nativeBuildInputs = [ installShellFiles ]; - - postInstall = '' - installShellCompletion --zsh data/shell-completions/zsh/_meson - installShellCompletion --bash data/shell-completions/bash/meson - ''; - - meta = with lib; { - homepage = "https://mesonbuild.com"; - description = "An open source, fast and friendly build system made in Python"; - longDescription = '' - Meson is an open source build system meant to be both extremely fast, and, - even more importantly, as user friendly as possible. - - The main design point of Meson is that every moment a developer spends - writing or debugging build definitions is a second wasted. So is every - second spent waiting for the build system to actually start compiling - code. - ''; - license = licenses.asl20; - maintainers = with maintainers; [ mbe AndersonTorres ]; - inherit (python3.meta) platforms; - }; -} -# TODO: a more Nixpkgs-tailoired test suite diff --git a/pkgs/development/tools/build-managers/meson/disable-bitcode.patch b/pkgs/development/tools/build-managers/meson/disable-bitcode.patch deleted file mode 100644 index a72997c1043..00000000000 --- a/pkgs/development/tools/build-managers/meson/disable-bitcode.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- a/mesonbuild/compilers/mixins/clang.py -+++ b/mesonbuild/compilers/mixins/clang.py -@@ -56,10 +56,6 @@ class ClangCompiler(GnuLikeCompiler): - {OptionKey('b_colorout'), OptionKey('b_lto_threads'), OptionKey('b_lto_mode'), OptionKey('b_thinlto_cache'), - OptionKey('b_thinlto_cache_dir')}) - -- # TODO: this really should be part of the linker base_options, but -- # linkers don't have base_options. -- if isinstance(self.linker, AppleDynamicLinker): -- self.base_options.add(OptionKey('b_bitcode')) - # All Clang backends can also do LLVM IR - self.can_compile_suffixes.add('ll') - ---- a/mesonbuild/linkers/linkers.py -+++ b/mesonbuild/linkers/linkers.py -@@ -785,7 +785,7 @@ class AppleDynamicLinker(PosixDynamicLinkerMixin, DynamicLinker): - return self._apply_prefix('-headerpad_max_install_names') - - def bitcode_args(self) -> T.List[str]: -- return self._apply_prefix('-bitcode_bundle') -+ raise MesonException('Nixpkgs cctools does not support bitcode bundles') - - def fatal_warnings(self) -> T.List[str]: - return self._apply_prefix('-fatal_warnings') diff --git a/pkgs/development/tools/build-managers/meson/emulator-hook.sh b/pkgs/development/tools/build-managers/meson/emulator-hook.sh deleted file mode 100644 index 4f08087cf5f..00000000000 --- a/pkgs/development/tools/build-managers/meson/emulator-hook.sh +++ /dev/null @@ -1,5 +0,0 @@ -add_meson_exe_wrapper_cross_flag() { - mesonFlagsArray+=(--cross-file=@crossFile@) -} - -preConfigureHooks+=(add_meson_exe_wrapper_cross_flag) diff --git a/pkgs/development/tools/build-managers/meson/fix-rpath.patch b/pkgs/development/tools/build-managers/meson/fix-rpath.patch deleted file mode 100644 index 29bec7903ca..00000000000 --- a/pkgs/development/tools/build-managers/meson/fix-rpath.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- a/mesonbuild/backend/backends.py -+++ b/mesonbuild/backend/backends.py -@@ -723,6 +723,21 @@ - @staticmethod - def get_rpath_dirs_from_link_args(args: T.List[str]) -> T.Set[str]: - dirs: T.Set[str] = set() -+ -+ nix_ldflags = os.environ.get('NIX_LDFLAGS', '').split() -+ next_is_path = False -+ # Try to add rpaths set by user or ld-wrapper so that they are not removed. -+ # Based on https://github.com/NixOS/nixpkgs/blob/69711a2f5ffe8cda208163be5258266172ff527f/pkgs/build-support/bintools-wrapper/ld-wrapper.sh#L148-L177 -+ for flag in nix_ldflags: -+ if flag == '-rpath' or flag == '-L': -+ next_is_path = True -+ elif next_is_path or flag.startswith('-L/'): -+ if flag.startswith('-L/'): -+ flag = flag[2:] -+ if flag.startswith('@storeDir@'): -+ dirs.add(flag) -+ next_is_path = False -+ - # Match rpath formats: - # -Wl,-rpath= - # -Wl,-rpath, diff --git a/pkgs/development/tools/build-managers/meson/gir-fallback-path.patch b/pkgs/development/tools/build-managers/meson/gir-fallback-path.patch deleted file mode 100644 index e6d74026527..00000000000 --- a/pkgs/development/tools/build-managers/meson/gir-fallback-path.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py -index 1c6952df7..9466a0b7d 100644 ---- a/mesonbuild/modules/gnome.py -+++ b/mesonbuild/modules/gnome.py -@@ -923,6 +923,16 @@ class GnomeModule(ExtensionModule): - if fatal_warnings: - scan_command.append('--warn-error') - -+ if len(set(girtarget.get_custom_install_dir()[0] for girtarget in girtargets if girtarget.get_custom_install_dir())) > 1: -+ raise MesonException('generate_gir tries to build multiple libraries with different install_dir at once: {}'.format(','.join([str(girtarget) for girtarget in girtargets]))) -+ -+ if girtargets[0].get_custom_install_dir(): -+ fallback_libpath = girtargets[0].get_custom_install_dir()[0] -+ else: -+ fallback_libpath = None -+ if fallback_libpath is not None and isinstance(fallback_libpath, str) and len(fallback_libpath) > 0 and fallback_libpath[0] == "/": -+ scan_command += ['--fallback-library-path=' + fallback_libpath] -+ - generated_files = [f for f in libsources if isinstance(f, (GeneratedList, CustomTarget, CustomTargetIndex))] - - scan_target = self._make_gir_target(state, girfile, scan_command, generated_files, depends, kwargs) diff --git a/pkgs/development/tools/build-managers/meson/more-env-vars.patch b/pkgs/development/tools/build-managers/meson/more-env-vars.patch deleted file mode 100644 index e4ad4355042..00000000000 --- a/pkgs/development/tools/build-managers/meson/more-env-vars.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur meson-0.60.2-old/mesonbuild/environment.py meson-0.60.2-new/mesonbuild/environment.py ---- meson-0.60.2-old/mesonbuild/environment.py 2021-11-02 16:58:13.000000000 -0300 -+++ meson-0.60.2-new/mesonbuild/environment.py 2021-12-12 17:44:00.350499307 -0300 -@@ -68,7 +68,7 @@ - # compiling we fall back on the unprefixed host version. This - # allows native builds to never need to worry about the 'BUILD_*' - # ones. -- ([var_name + '_FOR_BUILD'] if is_cross else [var_name]), -+ [var_name + '_FOR_BUILD'] + ([] if is_cross else [var_name]), - # Always just the unprefixed host versions - [var_name] - )[for_machine] diff --git a/pkgs/development/tools/build-managers/meson/setup-hook.sh b/pkgs/development/tools/build-managers/meson/setup-hook.sh deleted file mode 100644 index 6305a405af2..00000000000 --- a/pkgs/development/tools/build-managers/meson/setup-hook.sh +++ /dev/null @@ -1,42 +0,0 @@ -mesonConfigurePhase() { - runHook preConfigure - - if [ -z "${dontAddPrefix-}" ]; then - mesonFlags="--prefix=$prefix $mesonFlags" - fi - - # See multiple-outputs.sh and meson’s coredata.py - mesonFlags="\ - --libdir=${!outputLib}/lib --libexecdir=${!outputLib}/libexec \ - --bindir=${!outputBin}/bin --sbindir=${!outputBin}/sbin \ - --includedir=${!outputInclude}/include \ - --mandir=${!outputMan}/share/man --infodir=${!outputInfo}/share/info \ - --localedir=${!outputLib}/share/locale \ - -Dauto_features=${mesonAutoFeatures:-enabled} \ - -Dwrap_mode=${mesonWrapMode:-nodownload} \ - $mesonFlags" - - mesonFlags="${crossMesonFlags+$crossMesonFlags }--buildtype=${mesonBuildType:-plain} $mesonFlags" - - echo "meson flags: $mesonFlags ${mesonFlagsArray[@]}" - - meson setup build $mesonFlags "${mesonFlagsArray[@]}" - cd build - - if ! [[ -v enableParallelBuilding ]]; then - enableParallelBuilding=1 - echo "meson: enabled parallel building" - fi - - if ! [[ -v enableParallelInstalling ]]; then - enableParallelInstalling=1 - echo "meson: enabled parallel installing" - fi - - runHook postConfigure -} - -if [ -z "${dontUseMesonConfigure-}" -a -z "${configurePhase-}" ]; then - setOutputFlags= - configurePhase=mesonConfigurePhase -fi diff --git a/pkgs/development/tools/build-managers/sbt-extras/default.nix b/pkgs/development/tools/build-managers/sbt-extras/default.nix index 993e955df4e..bd6b512f284 100644 --- a/pkgs/development/tools/build-managers/sbt-extras/default.nix +++ b/pkgs/development/tools/build-managers/sbt-extras/default.nix @@ -3,14 +3,14 @@ stdenv.mkDerivation rec { pname = "sbt-extras"; - rev = "7b70bbfc1cbe04172b5299ac092050d78d615a5a"; - version = "2023-09-18"; + rev = "85c92ae7ebeeeb04cce7e405ad6096ea5fd67b22"; + version = "2023-10-24"; src = fetchFromGitHub { owner = "paulp"; repo = "sbt-extras"; inherit rev; - sha256 = "Uu1eyshAWkc9VgxPHa6V0+o4At/hDS/OuIJluHlxZjE="; + sha256 = "7T0Fw1sfftxRF9cbQRC3sk87cFM/k1yqDHAkemYbIx8="; }; dontBuild = true; diff --git a/pkgs/development/tools/build-managers/scons/3.1.2.nix b/pkgs/development/tools/build-managers/scons/3.1.2.nix new file mode 100644 index 00000000000..097a8ffd519 --- /dev/null +++ b/pkgs/development/tools/build-managers/scons/3.1.2.nix @@ -0,0 +1,38 @@ +{ lib, fetchurl, python3 }: + +let + pname = "scons"; + version = "3.1.2"; + src = fetchurl { + url = "mirror://sourceforge/scons/scons-${version}.tar.gz"; + hash = "sha256-eAHz9i9lRSjict94C+EMDpM36JdlC2Ldzunzn94T+Ps="; + }; +in +python3.pkgs.buildPythonApplication { + inherit pname version src; + + setupHook = ./setup-hook.sh; + + doCheck = true; + + passthru = { + # expose the used python version so tools using this (and extensing scos + # with other python modules) can use the exact same python version. + inherit python3; + python = python3; + }; + + meta = { + description = "An improved, cross-platform substitute for Make"; + longDescription = '' + SCons is an Open Source software construction tool. Think of SCons as an + improved, cross-platform substitute for the classic Make utility with + integrated functionality similar to autoconf/automake and compiler caches + such as ccache. In short, SCons is an easier, more reliable and faster way + to build software. + ''; + homepage = "https://scons.org/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ AndersonTorres ]; + }; +} diff --git a/pkgs/development/tools/build-managers/scons/4.1.0.nix b/pkgs/development/tools/build-managers/scons/4.1.0.nix new file mode 100644 index 00000000000..65499280c2c --- /dev/null +++ b/pkgs/development/tools/build-managers/scons/4.1.0.nix @@ -0,0 +1,50 @@ +{ lib, fetchurl, python3 }: + +let + pname = "scons"; + version = "4.1.0"; + src = fetchurl { + url = "mirror://sourceforge/scons/scons-${version}.tar.gz"; + hash = "sha256-ctKNdi4hJnh/Fz49WeCJI5+LL06e8xFNV/ELEgaYXYU="; + }; +in +python3.pkgs.buildPythonApplication { + inherit pname version src; + + postPatch = '' + substituteInPlace setup.cfg \ + --replace "build/dist" "dist" \ + --replace "build/doc/man/" "" + ''; + + postInstall = '' + mkdir -p "$out/share/man/man1" + mv "$out/"*.1 "$out/share/man/man1/" + ''; + + setupHook = ./setup-hook.sh; + + # The release tarballs don't contain any tests (runtest.py and test/*): + doCheck = false; + + passthru = { + # expose the used python version so tools using this (and extensing scos + # with other python modules) can use the exact same python version. + inherit python3; + python = python3; + }; + + meta = { + description = "An improved, cross-platform substitute for Make"; + longDescription = '' + SCons is an Open Source software construction tool. Think of SCons as an + improved, cross-platform substitute for the classic Make utility with + integrated functionality similar to autoconf/automake and compiler caches + such as ccache. In short, SCons is an easier, more reliable and faster way + to build software. + ''; + homepage = "https://scons.org/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ AndersonTorres ]; + }; +} diff --git a/pkgs/development/tools/build-managers/scons/4.5.2.nix b/pkgs/development/tools/build-managers/scons/4.5.2.nix new file mode 100644 index 00000000000..61d1719642e --- /dev/null +++ b/pkgs/development/tools/build-managers/scons/4.5.2.nix @@ -0,0 +1,54 @@ +{ lib, fetchurl, python3 }: + +let + pname = "scons"; + version = "4.5.2"; + src = fetchurl { + url = "mirror://sourceforge/project/scons/scons/${version}/SCons-${version}.tar.gz"; + hash = "sha256-ziaqyV01CnmkGSGWsL6sPLJPTMq84BI+so0zcPV28HI="; + }; +in +python3.pkgs.buildPythonApplication { + inherit pname version src; + + patches = [ + ./env.patch + ]; + + postPatch = '' + substituteInPlace setup.cfg \ + --replace "build/dist" "dist" \ + --replace "build/doc/man/" "" + ''; + + postInstall = '' + mkdir -p "$out/share/man/man1" + mv "$out/"*.1 "$out/share/man/man1/" + ''; + + setupHook = ./setup-hook.sh; + + # The release tarballs don't contain any tests (runtest.py and test/*): + doCheck = false; + + passthru = { + # expose the used python version so tools using this (and extensing scos + # with other python modules) can use the exact same python version. + inherit python3; + python = python3; + }; + + meta = { + description = "An improved, cross-platform substitute for Make"; + longDescription = '' + SCons is an Open Source software construction tool. Think of SCons as an + improved, cross-platform substitute for the classic Make utility with + integrated functionality similar to autoconf/automake and compiler caches + such as ccache. In short, SCons is an easier, more reliable and faster way + to build software. + ''; + homepage = "https://scons.org/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ AndersonTorres ]; + }; +} diff --git a/pkgs/development/tools/build-managers/scons/common.nix b/pkgs/development/tools/build-managers/scons/common.nix deleted file mode 100644 index 64890d12cea..00000000000 --- a/pkgs/development/tools/build-managers/scons/common.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ version, sha256 }: - -{ fetchurl, python, lib }: - -python.pkgs.buildPythonApplication rec { - pname = "scons"; - inherit version; - - src = fetchurl { - url = - if lib.versionAtLeast version "4.3.0" then - "mirror://sourceforge/project/scons/scons/${version}/SCons-${version}.tar.gz" - else - "mirror://sourceforge/scons/scons-${version}.tar.gz"; - inherit sha256; - }; - - setupHook = ./setup-hook.sh; - - patches = lib.optionals (lib.versionAtLeast version "4.3.0") [ - ./env.patch - ]; - - postPatch = lib.optionalString (lib.versionAtLeast version "4.0.0") '' - substituteInPlace setup.cfg \ - --replace "build/dist" "dist" - '' + lib.optionalString (lib.versionAtLeast version "4.1.0") '' - substituteInPlace setup.cfg \ - --replace "build/doc/man/" "" - ''; - - # The release tarballs don't contain any tests (runtest.py and test/*): - doCheck = lib.versionOlder version "4.0.0"; - - postInstall = lib.optionalString (lib.versionAtLeast version "4.1.0") '' - mkdir -p "$out/share/man/man1" - mv "$out/"*.1 "$out/share/man/man1/" - ''; - - passthru = { - # expose the used python version so tools using this (and extensing scos with other python modules) - # can use the exact same python version. - inherit python; - }; - - meta = with lib; { - description = "An improved, cross-platform substitute for Make"; - longDescription = '' - SCons is an Open Source software construction tool. Think of - SCons as an improved, cross-platform substitute for the classic - Make utility with integrated functionality similar to - autoconf/automake and compiler caches such as ccache. In short, - SCons is an easier, more reliable and faster way to build - software. - ''; - homepage = "https://scons.org/"; - changelog = "https://raw.githubusercontent.com/SConsProject/scons/rel_${version}/src/CHANGES.txt"; - license = licenses.mit; - platforms = platforms.all; - maintainers = with lib.maintainers; [ AndersonTorres ]; - }; -} diff --git a/pkgs/development/tools/build-managers/scons/default.nix b/pkgs/development/tools/build-managers/scons/default.nix deleted file mode 100644 index f338d346a70..00000000000 --- a/pkgs/development/tools/build-managers/scons/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ callPackage, python2, python3 }: - -let - mkScons = args: callPackage (import ./common.nix args) { - python = python3; - }; -in { - scons_3_1_2 = (mkScons { - version = "3.1.2"; - sha256 = "1yzq2gg9zwz9rvfn42v5jzl3g4qf1khhny6zfbi2hib55zvg60bq"; - }); - scons_4_1_0 = mkScons { - version = "4.1.0"; - sha256 = "11axk03142ziax6i3wwy9qpqp7r3i7h5jg9y2xzph9i15rv8vlkj"; - }; - scons_latest = mkScons { - version = "4.5.2"; - sha256 = "sha256-ziaqyV01CnmkGSGWsL6sPLJPTMq84BI+so0zcPV28HI="; - }; -} diff --git a/pkgs/development/tools/changie/default.nix b/pkgs/development/tools/changie/default.nix index b8ab1367ab1..2aca42bbb26 100644 --- a/pkgs/development/tools/changie/default.nix +++ b/pkgs/development/tools/changie/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "changie"; - version = "1.15.1"; + version = "1.16.0"; src = fetchFromGitHub { owner = "miniscruff"; repo = "changie"; rev = "v${version}"; - hash = "sha256-pjeqaLCxWq2maz+C4jCNNRhYhclvcABi6zC+Qxy2GPw="; + hash = "sha256-lFe59ITcPJ69x0COV+WlX500Hl96XqWLCz5gJMqX6qQ="; }; - vendorHash = "sha256-pBRU/eWuI14uDmTPo593hW0YAye5Y1Fm1axd/+X7nS8="; + vendorHash = "sha256-JmK7bcS8UYCOUvJGs0PAYPNc8iwvCSFzjLlkBEVUa40="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/development/tools/codespell/default.nix b/pkgs/development/tools/codespell/default.nix index 859ce0a7468..aff3646340e 100644 --- a/pkgs/development/tools/codespell/default.nix +++ b/pkgs/development/tools/codespell/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "codespell"; - version = "2.2.5"; + version = "2.2.6"; format = "pyproject"; src = fetchFromGitHub { owner = "codespell-project"; repo = "codespell"; rev = "v${version}"; - sha256 = "sha256-Cu1bbLzVOAvPNzTavaMUfW2SCnQHc9mOM+IHAgVHhT4="; + sha256 = "sha256-esewCJw4o4SfSst5ALZ90X3XgOuOAsaxytpotvFeHB0="; }; postPatch = '' diff --git a/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix b/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix index 62856ffd389..5dfec9c11a8 100644 --- a/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix +++ b/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "cirrus-cli"; - version = "0.106.1"; + version = "0.107.1"; src = fetchFromGitHub { owner = "cirruslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-W+3sqWPYpMkbmA8dGEodZy+pZGRBLJdthicBFdkn6oU="; + sha256 = "sha256-PaIjeqL32CADE+m6kq7VIDXMBvEEMVW8eSlXiIwNEJ4="; }; - vendorHash = "sha256-+cxh3/TQqm6n7hUYhW2B3pdfdtzRuepZmLNSGVPA3H0="; + vendorHash = "sha256-OHeoa3SXmDiUROxFiprlq/gfnqMjha6PQ8tlkr7Pd00="; ldflags = [ "-X github.com/cirruslabs/cirrus-cli/internal/version.Version=v${version}" diff --git a/pkgs/development/tools/continuous-integration/github-runner/default.nix b/pkgs/development/tools/continuous-integration/github-runner/default.nix index 57a78dbb310..c0c15a12173 100644 --- a/pkgs/development/tools/continuous-integration/github-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/github-runner/default.nix @@ -15,12 +15,11 @@ , 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; +assert builtins.all (x: builtins.elem x [ "node20" ]) nodeRuntimes; buildDotnetModule rec { pname = "github-runner"; @@ -210,8 +209,6 @@ buildDotnetModule rec { 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 ''; @@ -250,8 +247,6 @@ buildDotnetModule rec { # 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 '' + '' diff --git a/pkgs/development/tools/database/atlas/default.nix b/pkgs/development/tools/database/atlas/default.nix index 337f0393dca..7afa8b43a85 100644 --- a/pkgs/development/tools/database/atlas/default.nix +++ b/pkgs/development/tools/database/atlas/default.nix @@ -1,24 +1,23 @@ -{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles, testers, atlas }: buildGoModule rec { pname = "atlas"; - version = "0.14.1"; + version = "0.15.0"; src = fetchFromGitHub { owner = "ariga"; repo = "atlas"; rev = "v${version}"; - hash = "sha256-dOqL/9sJUbaHqF3N5PEL7f6LxQQWNL0FvaH5BxQp4Xg="; + hash = "sha256-qEui+Y7auNFJwLSUT90jJH7IPgNW06phbJel9y3C1bk="; }; modRoot = "cmd/atlas"; - vendorHash = "sha256-1Hhl2TzJWWXk4du9nbJTPXdYuss4TWfUIOw2DaAJQis="; + proxyVendor = true; + vendorHash = "sha256-BJB+ZwrfZsYlyVX0G3qNQW8KexxMmc1Y9m2TRbOX6Tc="; nativeBuildInputs = [ installShellFiles ]; - env.GOWORK = "off"; - ldflags = [ "-s" "-w" "-X ariga.io/atlas/cmd/atlas/internal/cmdapi.version=v${version}" ]; subPackages = [ "." ]; @@ -30,6 +29,12 @@ buildGoModule rec { --zsh <($out/bin/atlas completion zsh) ''; + passthru.tests.version = testers.testVersion { + package = atlas; + command = "atlas version"; + version = "v${version}"; + }; + meta = with lib; { description = "A modern tool for managing database schemas"; homepage = "https://atlasgo.io/"; diff --git a/pkgs/development/tools/database/litestream/default.nix b/pkgs/development/tools/database/litestream/default.nix index 83b1fb0c9f7..27b37eff489 100644 --- a/pkgs/development/tools/database/litestream/default.nix +++ b/pkgs/development/tools/database/litestream/default.nix @@ -4,13 +4,13 @@ }: buildGoModule rec { pname = "litestream"; - version = "0.3.12"; + version = "0.3.13"; src = fetchFromGitHub { owner = "benbjohnson"; repo = pname; rev = "v${version}"; - sha256 = "sha256-uao8I3b38JZWpO5iM+qvV4CDxWg1ueYm7BoaW/+FOkA="; + sha256 = "sha256-p858gK+ICKDQ+/LUiBaxF/kfrZzQAXnYMZDFU8kNCJ4="; }; ldflags = [ diff --git a/pkgs/development/tools/devpod/default.nix b/pkgs/development/tools/devpod/default.nix index b7e24e34ac3..6ddb483e03c 100644 --- a/pkgs/development/tools/devpod/default.nix +++ b/pkgs/development/tools/devpod/default.nix @@ -23,13 +23,13 @@ let pname = "devpod"; - version = "0.4.1"; + version = "0.4.2"; src = fetchFromGitHub { owner = "loft-sh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-8ED74Cqq2fw+TpkJyipxlBpKq60ScZinlPj0hEX13/0="; + sha256 = "sha256-e9sa9LniG5fj3S+x9T91v6ILPI0CD2y3QnZxXcKy6Ik="; }; meta = with lib; { diff --git a/pkgs/development/tools/faas-cli/default.nix b/pkgs/development/tools/faas-cli/default.nix index 383ca092944..026dbbcc548 100644 --- a/pkgs/development/tools/faas-cli/default.nix +++ b/pkgs/development/tools/faas-cli/default.nix @@ -37,7 +37,7 @@ buildGoModule rec { "-s" "-w" "-X github.com/openfaas/faas-cli/version.GitCommit=ref/tags/${version}" "-X github.com/openfaas/faas-cli/version.Version=${version}" - "-X github.com/openfaas/faas-cli/commands.Platform=${faasPlatform stdenv.targetPlatform}" + "-X github.com/openfaas/faas-cli/commands.Platform=${faasPlatform stdenv.hostPlatform}" ]; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/pkgs/development/tools/fsautocomplete/default.nix b/pkgs/development/tools/fsautocomplete/default.nix index a8d8c7348b0..b6ff7cc91c2 100644 --- a/pkgs/development/tools/fsautocomplete/default.nix +++ b/pkgs/development/tools/fsautocomplete/default.nix @@ -5,13 +5,13 @@ let in buildDotnetModule rec { pname = "fsautocomplete"; - version = "0.67.0"; + version = "0.68.0"; src = fetchFromGitHub { owner = "fsharp"; repo = "FsAutoComplete"; rev = "v${version}"; - sha256 = "sha256-txHkQDLyIejsEZGpfIGqeiJ8EUePZq1btxfd+EZD4aM="; + sha256 = "sha256-wAPTJXD2CxZQA2EG4rQCM9v3dIu6hn3q23K7Vv9wkAk="; }; nugetDeps = ./deps.nix; diff --git a/pkgs/development/tools/fsautocomplete/deps.nix b/pkgs/development/tools/fsautocomplete/deps.nix index dab6f0aa4fb..a04c8a9e14e 100644 --- a/pkgs/development/tools/fsautocomplete/deps.nix +++ b/pkgs/development/tools/fsautocomplete/deps.nix @@ -15,7 +15,6 @@ (fetchNuGet { pname = "DotNet.ReproducibleBuilds"; version = "1.1.1"; sha256 = "0wa0xwbwv1lzjmqwg1vq06vrpb9kkbv3xw5nq50savj0dzhqakzq"; }) (fetchNuGet { pname = "Expecto"; version = "10.1.0"; sha256 = "127yy5i0p2lybhm5xcy2wa6j1rcahk61mb1nbym687b23pgizrq9"; }) (fetchNuGet { pname = "Expecto.Diff"; version = "9.0.4"; sha256 = "06g6nbr5kdr7hyayh24ry6xfghxpcfkqc8kma5qa5lcvhmy56f7j"; }) - (fetchNuGet { pname = "fake-cli"; version = "5.23.0"; sha256 = "1bmw5kyc9q1sqd08pamibgk0qm5xwylawc5nfrnfx3pl1pifd71y"; }) (fetchNuGet { pname = "Fake.Api.GitHub"; version = "5.20.4"; sha256 = "1hgzqin7bm5fm0n97w7s9cq3zcxyncjmd6xk2da3p12wi7kghx0v"; }) (fetchNuGet { pname = "Fake.Core.CommandLineParsing"; version = "5.23.1"; sha256 = "10zlkri6w2xly19v4qqvg9vii5mjwbjqfynn525swzwyna9jws76"; }) (fetchNuGet { pname = "Fake.Core.Context"; version = "5.23.1"; sha256 = "1z3a77d53f5084sai9r9w9cdnyp4xn3x0262nhsi0znx52vizppl"; }) @@ -39,17 +38,17 @@ (fetchNuGet { pname = "Fake.IO.Zip"; version = "5.23.1"; sha256 = "0iac86jlxb5bwgiich3zzvr7bz5aw8xq53ly263mwxhv9lrsd815"; }) (fetchNuGet { pname = "Fake.Net.Http"; version = "5.23.1"; sha256 = "1g0dpxi5b78qh7myz09pmjxzb0iblj3rqx5mpaammbppbbazvzdk"; }) (fetchNuGet { pname = "Fake.Tools.Git"; version = "5.23.1"; sha256 = "0cg1sbp7zl1d18cjhbs94ix8580hr6gyaxjw17q246lbaj9bfg8l"; }) - (fetchNuGet { pname = "fantomas"; version = "6.2.0"; sha256 = "0jmr63c2a4maf1blcsiyxz9najrc31xk1ignc7j7l2sswis6hx7k"; }) + (fetchNuGet { pname = "fantomas"; version = "6.2.2"; sha256 = "1ln1czswz8njwn1wgsq0psh7dcw6smjcilqxg8978mq05ki7i4dg"; }) (fetchNuGet { pname = "Fantomas.Client"; version = "0.9.0"; sha256 = "1zixwk61fyk7y9q6f8266kwxi6byr8fmyp1lf57qhbbvhq2waj9d"; }) (fetchNuGet { pname = "Fantomas.Core"; version = "6.2.0"; sha256 = "07yl2hr06zk1nl66scm24di3nf1zbrnd6329prwirnv370rz4q92"; }) (fetchNuGet { pname = "Fantomas.FCS"; version = "6.2.0"; sha256 = "1hhsa7hbxsm2d8ap4sqzwlzjmf4wsgg74i731rprr0nshjvd8ic7"; }) (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.400"; sha256 = "1sdc63vyplw02s5wzrly1kdsmhb144arj57q22yggigmsrhzqlag"; }) + (fetchNuGet { pname = "FSharp.Compiler.Service"; version = "43.8.100"; sha256 = "0lk8pqasbxkqp37fsnnidw8556l1k6s8w9qhq51w8zfnp7nw1xwm"; }) (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.400"; sha256 = "1pl6iqqcpm9djfn7f6ms5j1xbcyz00nb808qd6pmsjrnylflalgp"; }) + (fetchNuGet { pname = "FSharp.Core"; version = "8.0.100"; sha256 = "06z3vg8yj7i83x6gmnzl2lka1bp4hzc07h6mrydpilxswnmy2a0l"; }) (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"; }) @@ -67,19 +66,19 @@ (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.4"; sha256 = "0584bbld25f6hzglzsah1n215658d4lwnzwxcazrwzyy25rmansl"; }) + (fetchNuGet { pname = "IcedTasks"; version = "0.9.2"; sha256 = "1i4sg398qvxyrprca9jssn4lccwn67zndbg1a3a37cmsms5rlbvj"; }) (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.19"; sha256 = "1n910ipbscr7b3cr873cr5zh40ysn0n9z47dlqlndbq0g3kl6vi5"; }) + (fetchNuGet { pname = "Ionide.LanguageServerProtocol"; version = "0.4.20"; sha256 = "08ym8lljnkqk638f2djw3c0p6h0nzxycifz1dqhzzd2my5ss46zf"; }) (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 = "MessagePack"; version = "2.5.108"; sha256 = "0cnaz28lhrdmavnxjkakl9q8p2yv8mricvp1b0wxdfnz8v41gwzs"; }) + (fetchNuGet { pname = "MessagePack.Annotations"; version = "2.5.108"; sha256 = "0nb1fx8dwl7304kw0bc375bvlhb7pg351l4cl3vqqd7d8zqjwx5v"; }) + (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "7.0.0"; sha256 = "1waiggh3g1cclc81gmjrqbh128kwfjky3z79ma4bd2ms9pa3gvfm"; }) (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"; }) @@ -131,36 +130,36 @@ (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.4.1"; sha256 = "0s68wf9yphm4hni9p6kwfk0mjld85f4hkrs93qbk5lzf6vv3kba1"; }) (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.4.1"; sha256 = "1n9ilq8n5rhyxcri06njkxb0h2818dbmzddwd2rrvav91647m2s4"; }) (fetchNuGet { pname = "Microsoft.VisualStudio.Setup.Configuration.Interop"; version = "3.6.2115"; sha256 = "0924lvb8i1y1majjph1hczi8p72mxlvkk3b7apdqgv5hmbn9sdxq"; }) - (fetchNuGet { pname = "Microsoft.VisualStudio.Threading"; version = "17.3.44"; sha256 = "07w5ca1jwmiynpznb36xhxpf42y97v9flj6rxsmg4gqsh1h430i1"; }) - (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.VisualStudio.Threading"; version = "17.6.40"; sha256 = "1iv67ndrvls7qa3wrh7mnswqbhx8ggr0w1hi7md1grfm4f0nqyz4"; }) + (fetchNuGet { pname = "Microsoft.VisualStudio.Threading.Analyzers"; version = "17.6.40"; sha256 = "0ba9r9y3jsx3s3j190mv4gg47ibyl44s58whwvas9c64hhs4n22s"; }) + (fetchNuGet { pname = "Microsoft.VisualStudio.Validation"; version = "17.6.11"; sha256 = "0qx4nzsx28galgzzjkgf541254d433dgxcaf7y2y1qyyxgsfjj1f"; }) (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "5.0.0"; sha256 = "102hvhq2gmlcbq8y2cb7hdr2dnmjzfp2k3asr1ycwrfacwyaak7n"; }) (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.844"; sha256 = "0fp2gng4gk63ac0wz231zwbnpy6a35mq04gy8fc81gra6px4sy5v"; }) - (fetchNuGet { pname = "Nerdbank.Streams"; version = "2.8.61"; sha256 = "1wxhrqlhb8wq1x5kn3wacylicznl3fgmfdqvx6r3s97yv89zyzy4"; }) + (fetchNuGet { pname = "Nerdbank.Streams"; version = "2.10.66"; sha256 = "04p4vd2v3mj1g315jj0fcb9ajwdr6clnbnl80mn6nyj3wmjb56nz"; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.2"; sha256 = "1p9splg1min274dpz7xdfgzrwkyfd3xlkygwpr1xgjvvyjvs6b0i"; }) - (fetchNuGet { pname = "NuGet.Common"; version = "6.3.0"; sha256 = "0j4ahrzakkrqqppp465bqi39bf4wn31020b96n4zl3j2zvppc0bg"; }) - (fetchNuGet { pname = "NuGet.Configuration"; version = "6.3.0"; sha256 = "0adafjzzrbm285hhdfn2nd57xzn4r5ldm1zm2w9yaj97cdqd228f"; }) + (fetchNuGet { pname = "NuGet.Common"; version = "6.7.0"; sha256 = "0h6k5ywqmnl3mn30d6hhvzzk0344f0cy3ks2rxvjfas1822hbpz9"; }) + (fetchNuGet { pname = "NuGet.Configuration"; version = "6.7.0"; sha256 = "0bskqxz2b4z1f9m8kak6my9l08ngd8r0cnd7ac1h6pbf39iwfq0a"; }) (fetchNuGet { pname = "NuGet.Frameworks"; version = "6.3.0"; sha256 = "05mqbfgkif9qa5hg1sjmcvx69ifdhiqs2xjplqjrvrj9ybmd5i0c"; }) - (fetchNuGet { pname = "NuGet.Packaging"; version = "6.3.0"; sha256 = "0gw2r7iajdk8c52vv0g2bgwlnx79zsacy5n7yv5g2niggxrbm82x"; }) - (fetchNuGet { pname = "NuGet.Protocol"; version = "6.3.0"; sha256 = "0vv8wbwrgvr02niv5dclcbhykxyw0mxhkmpnlh9i8rvajn0gfb0a"; }) - (fetchNuGet { pname = "NuGet.Versioning"; version = "6.3.0"; sha256 = "1fimxklifac8ahdf02gq01533k502izay6plxcd1j8rg24xrjz6p"; }) + (fetchNuGet { pname = "NuGet.Frameworks"; version = "6.7.0"; sha256 = "02sg1qa00dq4hfrj4zrrlccpbrmr1ymac8vcp48q9ffsx5wx6895"; }) + (fetchNuGet { pname = "NuGet.Packaging"; version = "6.7.0"; sha256 = "0q1q21cl6987f3q73g9549h637gm2qal3x1wy81qbag4aaxfqpb0"; }) + (fetchNuGet { pname = "NuGet.Protocol"; version = "6.7.0"; sha256 = "1v5ibnq2mp801vw68zyj169hkj3xm7h55824i33n1jxxj2vs3vbk"; }) + (fetchNuGet { pname = "NuGet.Versioning"; version = "6.7.0"; sha256 = "1k9dzgm3a9ahalykdvjnnd47940py8lqkfrjd1k9lkiczn1bkqmi"; }) (fetchNuGet { pname = "Octokit"; version = "0.48.0"; sha256 = "17ria1shx04rb6knbaswpqndmwam6v3r3lsfsd486q584798ccn8"; }) - (fetchNuGet { pname = "octonav"; version = "0.0.1"; sha256 = "1zzv8nqgrrrh3ay4rvwx3npx3q0xvnsqib5q3xww5h17a6lzcbni"; }) (fetchNuGet { pname = "OpenTelemetry"; version = "1.3.2"; sha256 = "1v9ipc75ipwjhhz4mkyjygw85i6ba5flcbhyspmf90vfi2nk7b79"; }) (fetchNuGet { pname = "OpenTelemetry.Api"; version = "1.3.2"; sha256 = "0fgl99k6nm3n47vv9mx6y36pnljj2b5g641cs2zsw6l86n57qwv1"; }) (fetchNuGet { pname = "OpenTelemetry.Exporter.OpenTelemetryProtocol"; version = "1.3.2"; sha256 = "14p6rn68mqrch3ani17vwyl4ggjz680nxkw1nf65xmf1ljlkb4iq"; }) - (fetchNuGet { pname = "Paket"; version = "7.2.1"; sha256 = "1d3ic5kw1yxb7ja07hzrsfjcv8vky6x60han5h6rjm0qbsnwb6xj"; }) + (fetchNuGet { pname = "Paket"; version = "8.0.0-alpha002"; sha256 = "1c2kdndyb04plgwvqp78224zwk26dkicjy94pqh7shc9ifskrvsb"; }) (fetchNuGet { pname = "Perfolizer"; version = "0.2.1"; sha256 = "012aqqi3y3nfikqmn26yajpwd52c04zlzp0p91iyslw7mf26qncy"; }) (fetchNuGet { pname = "SemanticVersioning"; version = "2.0.2"; sha256 = "025l5akirkd9g7d5g5wydvkn1wabglcyvbfshkmly7j3r0k596vp"; }) (fetchNuGet { pname = "Serilog"; version = "2.11.0"; sha256 = "1nvd3hm615xlcdmw1i7llkd3xvwvpv66c4y4s28npv47v3yci3lh"; }) (fetchNuGet { pname = "Serilog.Sinks.Async"; version = "1.5.0"; sha256 = "0bcb3n6lmg5wfj806mziybfmbb8gyiszrivs3swf0msy8w505gyg"; }) (fetchNuGet { pname = "Serilog.Sinks.Console"; version = "4.0.1"; sha256 = "080vh9kcyn9lx4j7p34146kp9byvhqlaz5jn9wzx70ql9cwd0hlz"; }) (fetchNuGet { pname = "Serilog.Sinks.File"; version = "5.0.0"; sha256 = "097rngmgcrdfy7jy8j7dq3xaq2qky8ijwg0ws6bfv5lx0f3vvb0q"; }) - (fetchNuGet { pname = "StreamJsonRpc"; version = "2.12.27"; sha256 = "15k0z6y3dsgipzfaa73irf5xjddr5mj9z26k27s8p6viay608cxc"; }) + (fetchNuGet { pname = "StreamJsonRpc"; version = "2.16.36"; sha256 = "1bwbbzd8rg1mjsig046ihs53gn8ywf5j9mjfy32axfziisqr1c2w"; }) (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 = "7.0.0"; sha256 = "1n9122cy6v3qhsisc9lzwa1m1j62b8pi2678nsmnlyvfpk0zdagm"; }) @@ -178,7 +177,8 @@ (fetchNuGet { pname = "System.Diagnostics.EventLog"; version = "7.0.0"; sha256 = "16p8z975dnzmncfifa9gw9n3k9ycpr2qvz7lglpghsvx0fava8k9"; }) (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"; }) + (fetchNuGet { pname = "System.Formats.Asn1"; version = "7.0.0"; sha256 = "1a14kgpqz4k7jhi7bs2gpgf67ym5wpj99203zxgwjypj7x47xhbq"; }) + (fetchNuGet { pname = "System.IO.Pipelines"; version = "7.0.0"; sha256 = "1ila2vgi1w435j7g2y7ykp2pdbh9c5a02vm85vql89az93b7qvav"; }) (fetchNuGet { pname = "System.Management"; version = "6.0.0"; sha256 = "0ra1g75ykapg6i5y0za721kpjd6xcq6dalijkdm6fsxxmz8iz4dr"; }) (fetchNuGet { pname = "System.Memory"; version = "4.5.5"; sha256 = "08jsfwimcarfzrhlyvjjid61j02irx6xsklf32rv57x2aaikvx0h"; }) (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.5.0"; sha256 = "1kzrj37yzawf1b19jq0253rcs8hsq1l2q8g69d7ipnhzb0h97m59"; }) @@ -194,7 +194,8 @@ (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; sha256 = "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc"; }) (fetchNuGet { pname = "System.Security.AccessControl"; version = "6.0.0"; sha256 = "0a678bzj8yxxiffyzy60z2w1nczzpi8v97igr4ip3byd2q89dv58"; }) (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "5.0.0"; sha256 = "06hkx2za8jifpslkh491dfwzm5dxrsyxzj5lsc0achb6yzg4zqlw"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Pkcs"; version = "6.0.1"; sha256 = "0wswhbvm3gh06azg9k1zfvmhicpzlh7v71qzd4x5zwizq4khv7iq"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Pkcs"; version = "6.0.4"; sha256 = "0hh5h38pnxmlrnvs72f2hzzpz4b2caiiv6xf8y7fzdg84r3imvfr"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Pkcs"; version = "7.0.3"; sha256 = "0gw07qhch88jvx393m7ibl4g3dml60s42f3pa8a9f3v88ckkaxws"; }) (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"; }) @@ -203,9 +204,12 @@ (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "6.0.0"; sha256 = "0gm2kiz2ndm9xyzxgi0jhazgwslcs427waxgfa30m7yqll1kcrww"; }) (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "7.0.0"; sha256 = "0sn6hxdjm7bw3xgsmg041ccchsa4sp02aa27cislw3x61dbr68kq"; }) (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "6.0.0"; sha256 = "06n9ql3fmhpjl32g3492sj181zjml5dlcc5l76xq2h38c4f87sai"; }) + (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "7.0.0"; sha256 = "1151hbyrcf8kyg1jz8k9awpbic98lwz9x129rg7zk1wrs6vjlpxl"; }) (fetchNuGet { pname = "System.Text.Json"; version = "6.0.5"; sha256 = "12fg196sdq3gcjcz365kypfkkmdrprpcw2fvjnww9jqa4yn8v99l"; }) + (fetchNuGet { pname = "System.Text.Json"; version = "7.0.3"; sha256 = "0zjrnc9lshagm6kdb9bdh45dmlnkpwcpyssa896sda93ngbmj8k9"; }) (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.Dataflow"; version = "7.0.0"; sha256 = "0ham9l8xrmlq2qwin53n82iz1wanci2h695i3cq83jcw4n28qdr9"; }) (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; sha256 = "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153"; }) (fetchNuGet { pname = "System.Windows.Extensions"; version = "7.0.0"; sha256 = "11r9f0v7qp365bdpq5ax023yra4qvygljz18dlqs650d44iay669"; }) (fetchNuGet { pname = "YoloDev.Expecto.TestSdk"; version = "0.14.2"; sha256 = "1877gr3f8wl1x3njhgss9psxm21xpqv6cpg625f2mvvak79fzrra"; }) diff --git a/pkgs/development/tools/fusee-launcher/default.nix b/pkgs/development/tools/fusee-launcher/default.nix index 08cf6caae3e..117bd0c9450 100644 --- a/pkgs/development/tools/fusee-launcher/default.nix +++ b/pkgs/development/tools/fusee-launcher/default.nix @@ -6,6 +6,10 @@ , makeWrapper } : +let + arm-embedded-cc = pkgsCross.arm-embedded.buildPackages.gcc; +in + stdenv.mkDerivation { pname = "fusee-launcher"; version = "unstable-2018-07-14"; @@ -17,6 +21,10 @@ stdenv.mkDerivation { sha256 = "1pqkgw5bk0xcz9x7pc1f0r0b9nsc8jnnvcs1315d8ml8mx23fshm"; }; + makeFlags = [ + "CROSS_COMPILE=${arm-embedded-cc.targetPrefix}" + ]; + installPhase = '' mkdir -p $out/bin $out/share cp fusee-launcher.py $out/bin/fusee-launcher @@ -28,7 +36,7 @@ stdenv.mkDerivation { --prefix PYTHONPATH : "$PYTHONPATH:$(toPythonPath $out)" ''; - nativeBuildInputs = [ pkgsCross.arm-embedded.buildPackages.gcc makeWrapper python3Packages.wrapPython ]; + nativeBuildInputs = [ arm-embedded-cc makeWrapper python3Packages.wrapPython ]; buildInputs = [ python3 python3Packages.pyusb ]; pythonPath = with python3Packages; [ pyusb ]; diff --git a/pkgs/development/tools/ginkgo/default.nix b/pkgs/development/tools/ginkgo/default.nix index daf27a1d2af..73f0bc8093a 100644 --- a/pkgs/development/tools/ginkgo/default.nix +++ b/pkgs/development/tools/ginkgo/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "ginkgo"; - version = "2.13.0"; + version = "2.13.1"; src = fetchFromGitHub { owner = "onsi"; repo = "ginkgo"; rev = "v${version}"; - sha256 = "sha256-N+O8qjSOBv7UVcFZ4BOUFoj+qfN0d2rBHO7d8FBtayY="; + sha256 = "sha256-r2tAYH8E1j/gC+IRwcOv0Frcgd2RKEZjVzmuzOOhR7A="; }; - vendorHash = "sha256-wUpWvq6iiS9HkCi4ztXLNs1nCgAomyUo8YaFcElnfeI="; + vendorHash = "sha256-5dEKb+KnUZTxSSoaOH1GpqMmYdLcXKMs2nq0SvR2pUs="; # integration tests expect more file changes # types tests are missing CodeLocation diff --git a/pkgs/development/tools/github/bump/default.nix b/pkgs/development/tools/github/bump/default.nix index 163b4e95496..2ba546699f1 100644 --- a/pkgs/development/tools/github/bump/default.nix +++ b/pkgs/development/tools/github/bump/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "bump"; - version = "0.2.3"; + version = "0.2.4"; src = fetchFromGitHub { owner = "mroth"; repo = pname; rev = "v${version}"; - sha256 = "sha256-tgTG/QlDxX1Ns0WpcNjwr/tvsdtgap7RcxX/JuYcxw8="; + sha256 = "sha256-DFgNx0H9/hZ+wUdPkEybRCIjnLsmuoYWruYgbDuFRhU="; }; - vendorHash = "sha256-ZeKokW6jMiKrXLfnxwEBF+wLuFQufnPUnA/EnuhvrwI="; + vendorHash = "sha256-AiXbCS3RXd6KZwIo7qzz3yM28cJloLRR+gdWqEpyims="; doCheck = false; diff --git a/pkgs/development/tools/godot/4/default.nix b/pkgs/development/tools/godot/4/default.nix index b7dc3b04ac5..e99d4cb6a84 100644 --- a/pkgs/development/tools/godot/4/default.nix +++ b/pkgs/development/tools/godot/4/default.nix @@ -147,7 +147,7 @@ stdenv.mkDerivation rec { description = "Free and Open Source 2D and 3D game engine"; license = licenses.mit; platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" ]; - maintainers = with maintainers; [ twey shiryel ]; + maintainers = with maintainers; [ shiryel ]; mainProgram = "godot4"; }; } diff --git a/pkgs/development/tools/hotdoc/default.nix b/pkgs/development/tools/hotdoc/default.nix index b649310214f..6758f1b44e9 100644 --- a/pkgs/development/tools/hotdoc/default.nix +++ b/pkgs/development/tools/hotdoc/default.nix @@ -22,7 +22,7 @@ , setuptools , toposort , wheezy-template -, libclang +, llvmPackages , gst_all_1 }: @@ -100,9 +100,9 @@ buildPythonApplication rec { postPatch = '' substituteInPlace hotdoc/extensions/c/c_extension.py \ --replace "shutil.which('llvm-config')" 'True' \ - --replace "subprocess.check_output(['llvm-config', '--version']).strip().decode()" '"${libclang.version}"' \ - --replace "subprocess.check_output(['llvm-config', '--prefix']).strip().decode()" '"${libclang.lib}"' \ - --replace "subprocess.check_output(['llvm-config', '--libdir']).strip().decode()" '"${libclang.lib}/lib"' + --replace "subprocess.check_output(['llvm-config', '--version']).strip().decode()" '"${llvmPackages.libclang.version}"' \ + --replace "subprocess.check_output(['llvm-config', '--prefix']).strip().decode()" '"${llvmPackages.libclang.lib}"' \ + --replace "subprocess.check_output(['llvm-config', '--libdir']).strip().decode()" '"${llvmPackages.libclang.lib}/lib"' ''; # Make pytest run from a temp dir to have it pick up installed package for cmark diff --git a/pkgs/development/tools/ko/default.nix b/pkgs/development/tools/ko/default.nix index 66a196ab02d..3f9bc4c0b3f 100644 --- a/pkgs/development/tools/ko/default.nix +++ b/pkgs/development/tools/ko/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "ko"; - version = "0.15.0"; + version = "0.15.1"; src = fetchFromGitHub { owner = "ko-build"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-z0VemNdN35p5fA+cenXil7Vonl+ryu1ruKxzWFwMPfI="; + hash = "sha256-BEKsa5mzJplcyR65/4T0MizrYxEk8/ON8SDFt8ZxqMU="; }; vendorHash = null; diff --git a/pkgs/development/tools/lalrpop/default.nix b/pkgs/development/tools/lalrpop/default.nix index 0bc8bddefbd..32e6ec7a35b 100644 --- a/pkgs/development/tools/lalrpop/default.nix +++ b/pkgs/development/tools/lalrpop/default.nix @@ -1,6 +1,5 @@ { lib , rustPlatform -, rust , fetchFromGitHub , substituteAll , stdenv @@ -24,7 +23,7 @@ rustPlatform.buildRustPackage rec { patches = [ (substituteAll { src = ./use-correct-binary-path-in-tests.patch; - target_triple = rust.toRustTarget stdenv.hostPlatform; + target_triple = stdenv.hostPlatform.rust.rustcTarget; }) ]; diff --git a/pkgs/development/tools/language-servers/lua-language-server/default.nix b/pkgs/development/tools/language-servers/lua-language-server/default.nix index faf66298106..c6eec2aff59 100644 --- a/pkgs/development/tools/language-servers/lua-language-server/default.nix +++ b/pkgs/development/tools/language-servers/lua-language-server/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "lua-language-server"; - version = "3.7.0"; + version = "3.7.3"; src = fetchFromGitHub { owner = "luals"; repo = "lua-language-server"; rev = version; - sha256 = "sha256-kUtiMNwJJN7ZAktSC7tZriAcTDFhvcfSwBE6KFzceMg="; + hash = "sha256-iAxRGG7/zaUbJ/PWgmjxGS0UTq9/OXc8RWzlpUTUftc="; fetchSubmodules = true; }; @@ -80,7 +80,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/luals/lua-language-server"; changelog = "https://github.com/LuaLS/lua-language-server/blob/${version}/changelog.md"; license = licenses.mit; - maintainers = with maintainers; [ figsoda sei40kr ]; + maintainers = with maintainers; [ figsoda gepbird sei40kr ]; mainProgram = "lua-language-server"; platforms = platforms.linux ++ platforms.darwin; }; diff --git a/pkgs/development/tools/language-servers/zls/default.nix b/pkgs/development/tools/language-servers/zls/default.nix index 9fda43915ca..2188af2a116 100644 --- a/pkgs/development/tools/language-servers/zls/default.nix +++ b/pkgs/development/tools/language-servers/zls/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/zigtools/zls/releases/tag/${finalAttrs.version}"; homepage = "https://github.com/zigtools/zls"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ figsoda fortuneteller2k ]; + maintainers = with lib.maintainers; [ figsoda moni ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/development/tools/misc/act/default.nix b/pkgs/development/tools/misc/act/default.nix index a001f9f6d3a..567e93efd67 100644 --- a/pkgs/development/tools/misc/act/default.nix +++ b/pkgs/development/tools/misc/act/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "act"; - version = "0.2.53"; + version = "0.2.54"; src = fetchFromGitHub { owner = "nektos"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-p2ujmHWIBUcH5UpHHO72ddqSb1C0gWAyKUIT9E6Oyxk="; + hash = "sha256-1DYK47pucEh423ySyBy3hwi6QeB/nNQvwapEJZYRX8E="; }; - vendorHash = "sha256-W50NodoaKY7s4x7Goyvydxd5Q2lz9m9pFwgcQ9wRGVM="; + vendorHash = "sha256-45UPm7ThTSRTgzaD4tXoTaeT4hRlMKn01mvgJS1I7zI="; doCheck = false; diff --git a/pkgs/development/tools/misc/automake/builder.sh b/pkgs/development/tools/misc/automake/builder.sh index 0cb1d5d61e3..b08e7251e9e 100644 --- a/pkgs/development/tools/misc/automake/builder.sh +++ b/pkgs/development/tools/misc/automake/builder.sh @@ -1,4 +1,4 @@ -if [ -e .attrs.sh ]; then source .attrs.sh; fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi source $stdenv/setup # Wrap the given `aclocal' program, appending extra `-I' flags diff --git a/pkgs/development/tools/misc/complgen/default.nix b/pkgs/development/tools/misc/complgen/default.nix index 81cf9c120ed..6c0cdb3c5bb 100644 --- a/pkgs/development/tools/misc/complgen/default.nix +++ b/pkgs/development/tools/misc/complgen/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "complgen"; - version = "0.1.6"; + version = "0.1.7"; src = fetchFromGitHub { owner = "adaszko"; repo = "complgen"; rev = "v${version}"; - hash = "sha256-FetiopX4k58JQP67zTh0ssy1HFJHmi0Op9h9vjH1pLE="; + hash = "sha256-B7ydYz9nui3B/IC3obVTiJZvzTD/lCQyf+tREwFJERg="; }; - cargoHash = "sha256-2EJuxoed+6LGpxxqkdFxbntilA2SihQScliUFYgjYmU="; + cargoHash = "sha256-CXvaGrE4sQlc7K6FVQqGU8EKPfHr8EIV5YFq+VMoBWg="; meta = with lib; { description = "Generate {bash,fish,zsh} completions from a single EBNF-like grammar"; diff --git a/pkgs/development/tools/misc/cvise/default.nix b/pkgs/development/tools/misc/cvise/default.nix index 56bd85b7721..f65b0386cfd 100644 --- a/pkgs/development/tools/misc/cvise/default.nix +++ b/pkgs/development/tools/misc/cvise/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonApplication , fetchFromGitHub +, fetchpatch , bash , cmake , colordiff @@ -29,6 +30,14 @@ buildPythonApplication rec { patches = [ # Refer to unifdef by absolute path. ./unifdef.patch + + # Refer to shell via /usr/bin/env: + # https://github.com/marxin/cvise/pull/121 + (fetchpatch { + name = "env-shell.patch"; + url = "https://github.com/marxin/cvise/commit/6a416eb590be978a2ad25c610974fdde84e88651.patch"; + hash = "sha256-Kn6+TXP+wJpMs6jrgsa9OwjXf6vmIgGzny8jg3dfKWA="; + }) ]; postPatch = '' @@ -37,10 +46,6 @@ buildPythonApplication rec { substituteInPlace CMakeLists.txt \ --replace " -Werror " " " - # 'cvise --command=...' generates a script with hardcoded shebang. - substituteInPlace cvise.py \ - --replace "#!/bin/bash" "#!${bash}/bin/bash" - substituteInPlace cvise/utils/testing.py \ --replace "'colordiff --version'" "'${colordiff}/bin/colordiff --version'" \ --replace "'colordiff'" "'${colordiff}/bin/colordiff'" diff --git a/pkgs/development/tools/misc/elfutils/default.nix b/pkgs/development/tools/misc/elfutils/default.nix index 83a30f3e6f1..d61cf961615 100644 --- a/pkgs/development/tools/misc/elfutils/default.nix +++ b/pkgs/development/tools/misc/elfutils/default.nix @@ -8,11 +8,11 @@ # TODO: Look at the hardcoded paths to kernel, modules etc. stdenv.mkDerivation rec { pname = "elfutils"; - version = "0.189"; + version = "0.190"; src = fetchurl { url = "https://sourceware.org/elfutils/ftp/${version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-Ob2PGjOOK3zUq8P/EaDt3G5pD2lXildHjYF5tBSHCMg="; + hash = "sha256-jgCjqbXwS8HcJzroYoHS0m7UEgILOR/8wjGY8QIx1pI="; }; patches = [ diff --git a/pkgs/development/tools/misc/gengetopt/default.nix b/pkgs/development/tools/misc/gengetopt/default.nix index d24d4b66d66..6420d56bba2 100644 --- a/pkgs/development/tools/misc/gengetopt/default.nix +++ b/pkgs/development/tools/misc/gengetopt/default.nix @@ -27,6 +27,10 @@ stdenv.mkDerivation rec { 'set +o posix' ''; + env = lib.optionalAttrs stdenv.cc.isClang { + CXXFLAGS = "-std=c++14"; + }; + meta = { description = "Command-line option parser generator"; diff --git a/pkgs/development/tools/misc/hydra/unstable.nix b/pkgs/development/tools/misc/hydra/unstable.nix index 410bad35251..02774ac4105 100644 --- a/pkgs/development/tools/misc/hydra/unstable.nix +++ b/pkgs/development/tools/misc/hydra/unstable.nix @@ -123,13 +123,13 @@ let in stdenv.mkDerivation rec { pname = "hydra"; - version = "2023-08-23"; + version = "2023-10-20"; src = fetchFromGitHub { owner = "NixOS"; repo = "hydra"; - rev = "00d30874da759eb0f44f446415b2469920ff41b5"; - sha256 = "sha256-e+68WCN1e1h2rf1pmwNNukTt5EBtF9KQNXhqJtoyJzo="; + rev = "33f8a36736ea52d0cc31b947dc7e500134866a92"; + hash = "sha256-ovt2GZQ4Ia+q6D0XboBNIdXrzy1rWC52UYzxmcMlgYk="; }; buildInputs = [ diff --git a/pkgs/development/tools/misc/indent/default.nix b/pkgs/development/tools/misc/indent/default.nix index 0d4c272e414..8e6ba9b70c0 100644 --- a/pkgs/development/tools/misc/indent/default.nix +++ b/pkgs/development/tools/misc/indent/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { strictDeps = true; nativeBuildInputs = [ texinfo ]; buildInputs = [ libintl ]; - pkgsBuildBuild = [ buildPackages.stdenv.cc ]; # needed when cross-compiling + depsBuildBuild = [ buildPackages.stdenv.cc ]; # needed when cross-compiling env.NIX_CFLAGS_COMPILE = toString ( lib.optional stdenv.cc.isClang "-Wno-implicit-function-declaration" diff --git a/pkgs/development/tools/misc/kibana/7.x.nix b/pkgs/development/tools/misc/kibana/7.x.nix deleted file mode 100644 index a4faa31a421..00000000000 --- a/pkgs/development/tools/misc/kibana/7.x.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ elk7Version -, enableUnfree ? true -, lib -, stdenv -, makeWrapper -, fetchurl -, nodejs_16 -, coreutils -, which -}: - -let - nodejs = nodejs_16; - inherit (builtins) elemAt; - info = lib.splitString "-" stdenv.hostPlatform.system; - arch = elemAt info 0; - plat = elemAt info 1; - hashes = - { - x86_64-linux = "sha512-09XokG5krjxGnk34DhxpLOGRLjb2jd82uZtwGfrzSuuqMpBhkEptK2oySGxuGdHF8uowwlR5p5YO2TvBwMsWkQ=="; - x86_64-darwin = "sha512-cqRJnvu730Jfkr6vwbHUFuZube1g522cmvnDwTzhGGK6VN/7+9XL3vavqtUPDVdTLTUk+DrNiIQK7MaJH3SHMg=="; - aarch64-linux = "sha512-zhtYThz5j4+w5gI1JWSnHv709Tk23eegVsrtYmdaYhZiTw2yvCTYI5uNAfBjBr8XPdp6CKF4e6Bh2wHKDYg1mg=="; - aarch64-darwin = "sha512-cqRJnvu730Jfkr6vwbHUFuZube1g522cmvnDwTzhGGK6VN/7+9XL3vavqtUPDVdTLTUk+DrNiIQK7MaJH3SHMg=="; - }; - -in stdenv.mkDerivation rec { - pname = "kibana"; - version = elk7Version; - - src = fetchurl { - url = "https://artifacts.elastic.co/downloads/kibana/${pname}-${version}-${plat}-${arch}.tar.gz"; - hash = hashes.${stdenv.hostPlatform.system} or (throw "Unknown architecture"); - }; - - patches = [ - # Kibana specifies it specifically needs nodejs 10.15.2 but nodejs in nixpkgs is at 10.15.3. - # The <nixpkgs/nixos/tests/elk.nix> test succeeds with this newer version so lets just - # disable the version check. - ./disable-nodejs-version-check-7.patch - ]; - - nativeBuildInputs = [ makeWrapper ]; - - installPhase = '' - mkdir -p $out/libexec/kibana $out/bin - mv * $out/libexec/kibana/ - rm -r $out/libexec/kibana/node - makeWrapper $out/libexec/kibana/bin/kibana $out/bin/kibana \ - --prefix PATH : "${lib.makeBinPath [ nodejs coreutils which ]}" - sed -i 's@NODE=.*@NODE=${nodejs}/bin/node@' $out/libexec/kibana/bin/kibana - ''; - - meta = with lib; { - description = "Visualize logs and time-stamped data"; - homepage = "http://www.elasticsearch.org/overview/kibana"; - license = licenses.elastic20; - maintainers = with maintainers; [ offline basvandijk ]; - platforms = with platforms; unix; - }; -} diff --git a/pkgs/development/tools/misc/kibana/disable-nodejs-version-check-7.patch b/pkgs/development/tools/misc/kibana/disable-nodejs-version-check-7.patch deleted file mode 100644 index ef4c207764c..00000000000 --- a/pkgs/development/tools/misc/kibana/disable-nodejs-version-check-7.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/src/setup_node_env/node_version_validator.js b/src/setup_node_env/node_version_validator.js -index 3f611e5a..f5c60c85 100644 ---- a/src/setup_node_env/node_version_validator.js -+++ b/src/setup_node_env/node_version_validator.js -@@ -25,11 +25,11 @@ var pkg = require('../../package.json'); // Note: This is written in ES5 so we c - var currentVersion = process && process.version || null; - var rawRequiredVersion = pkg && pkg.engines && pkg.engines.node || null; - var requiredVersion = rawRequiredVersion ? 'v' + rawRequiredVersion : rawRequiredVersion; --var isVersionValid = !!currentVersion && !!requiredVersion && currentVersion === requiredVersion; // Validates current the NodeJS version compatibility when Kibana starts. -+var isVersionValid = !!currentVersion && !!requiredVersion; // Validates current the NodeJS version compatibility when Kibana starts. - - if (!isVersionValid) { - var errorMessage = 'Kibana does not support the current Node.js version ' + currentVersion + '. Please use Node.js ' + requiredVersion + '.'; // Actions to apply when validation fails: error report + exit. - - console.error(errorMessage); - process.exit(1); --} -\ No newline at end of file -+} diff --git a/pkgs/development/tools/misc/lttng-ust/default.nix b/pkgs/development/tools/misc/lttng-ust/default.nix index 3bace16de56..0c19b59c5c3 100644 --- a/pkgs/development/tools/misc/lttng-ust/default.nix +++ b/pkgs/development/tools/misc/lttng-ust/default.nix @@ -1,4 +1,4 @@ import ./generic.nix { - version = "2.13.1"; - sha256 = "sha256-Vme/Amnh5i4tnLl0xFb/huBAG9eqO/yNX9uXIzJJ7dw="; + version = "2.13.6"; + sha256 = "sha256-5+BFlt1zrHqpnifNAA+UnbsP7VG9KQmfmwiiXB3wztU="; } diff --git a/pkgs/development/tools/misc/luarocks/luarocks-nix.nix b/pkgs/development/tools/misc/luarocks/luarocks-nix.nix index 941a582cead..20acab5a858 100644 --- a/pkgs/development/tools/misc/luarocks/luarocks-nix.nix +++ b/pkgs/development/tools/misc/luarocks/luarocks-nix.nix @@ -2,13 +2,13 @@ luarocks.overrideAttrs (old: { pname = "luarocks-nix"; - version = "unstable-2023-02-26"; + version = "unstable-2023-10-19"; src = fetchFromGitHub { owner = "nix-community"; repo = "luarocks-nix"; - rev = "4cfea3d5d826db4cfbc809ef8bb5f0a9f3a18919"; - sha256 = "sha256-7L8B+/C7Kzt25Ec+OsM2rliYB2/wyZQ3OT63V7AaOxo="; + rev = "4240b25b95d7165cde66fc2acaf5a0f9ad40fd0c"; + sha256 = "sha256-dqFFYehBgK0RqH0/1GtZXq7XLGCcc3Kfadq8ICYNCWk="; }; patches = [ ]; diff --git a/pkgs/development/tools/misc/saleae-logic-2/default.nix b/pkgs/development/tools/misc/saleae-logic-2/default.nix index bd12125d83b..c15e7f6451b 100644 --- a/pkgs/development/tools/misc/saleae-logic-2/default.nix +++ b/pkgs/development/tools/misc/saleae-logic-2/default.nix @@ -1,10 +1,10 @@ { lib, fetchurl, makeDesktopItem, appimageTools }: let name = "saleae-logic-2"; - version = "2.4.9"; + version = "2.4.12"; src = fetchurl { url = "https://downloads.saleae.com/logic2/Logic-${version}-linux-x64.AppImage"; - hash = "sha256-zM5XztFv+A7cNMqNPGAO5i0B45w6AMyRL4OR+tG03JY="; + hash = "sha256-QqGtozLZtrS5UgnLmsKWxqbcTykLhlossVxuN4WNYzo="; }; desktopItem = makeDesktopItem { inherit name; diff --git a/pkgs/development/tools/misc/sccache/default.nix b/pkgs/development/tools/misc/sccache/default.nix index 138765bb228..47ae36c77ea 100644 --- a/pkgs/development/tools/misc/sccache/default.nix +++ b/pkgs/development/tools/misc/sccache/default.nix @@ -1,17 +1,17 @@ { lib, fetchFromGitHub, rustPlatform, pkg-config, openssl, stdenv, Security }: rustPlatform.buildRustPackage rec { - version = "0.6.0"; + version = "0.7.2"; pname = "sccache"; src = fetchFromGitHub { owner = "mozilla"; repo = "sccache"; rev = "v${version}"; - sha256 = "sha256-/H4QhkWsvq6UvrxuNhRPwlUi/spSYB78h8yUvdCJ2Ws="; + sha256 = "sha256-hup9FM2KEBXRx6NleDGR01C0whJgR1KYyIrcIv2UE80="; }; - cargoSha256 = "sha256-wFkVGKa00WQjk59KSBdOJ9Zfj8MwzC4XOhT9p4yvJM0="; + cargoSha256 = "sha256-Od1uaKZVAZaIDrsNheR1kYIjnmpnThlU7k3EIKdOjzM="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; diff --git a/pkgs/development/tools/misc/slint-lsp/default.nix b/pkgs/development/tools/misc/slint-lsp/default.nix index 0eb55d14c00..36145a05e59 100644 --- a/pkgs/development/tools/misc/slint-lsp/default.nix +++ b/pkgs/development/tools/misc/slint-lsp/default.nix @@ -25,14 +25,14 @@ let in rustPlatform.buildRustPackage rec { pname = "slint-lsp"; - version = "1.2.2"; + version = "1.3.0"; src = fetchCrate { inherit pname version; - sha256 = "sha256-+1nuezax7aV9b+L11zzIouA8QEWduqBzPiT6jvCGMac="; + sha256 = "sha256-ikOKpQHMLPCC2IfqWvW0I1auiCdyIZZMu6nMGle/bE0="; }; - cargoHash = "sha256-o7HDhNtjA0/JybJCiEejR8PcRIdJim+/wq4q8xj9A5Q="; + cargoHash = "sha256-tprtlG/M2ItE7Ay/9QWrZQHdVEPYD9hDJ+uPR8pq1Xk="; nativeBuildInputs = [ cmake pkg-config fontconfig ]; buildInputs = rpathLibs ++ [ xorg.libxcb.dev ] diff --git a/pkgs/development/tools/misc/uncrustify/default.nix b/pkgs/development/tools/misc/uncrustify/default.nix index 6899c590e95..0929aa5286b 100644 --- a/pkgs/development/tools/misc/uncrustify/default.nix +++ b/pkgs/development/tools/misc/uncrustify/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "uncrustify"; - version = "0.77.1"; + version = "0.78.0"; src = fetchFromGitHub { owner = "uncrustify"; repo = "uncrustify"; rev = "uncrustify-${version}"; - sha256 = "sha256-9U6PTeU/LVFL9XzP9XSFjDx18CR3athThEz+h2+5qZ8="; + sha256 = "sha256-wuwZFTa8XGMN3dlpdaMYiKvyS3DJMUgqRgaDtj/s7vI="; }; nativeBuildInputs = [ cmake python3 ]; diff --git a/pkgs/development/tools/misc/yakut/default.nix b/pkgs/development/tools/misc/yakut/default.nix new file mode 100644 index 00000000000..4c993c19cdc --- /dev/null +++ b/pkgs/development/tools/misc/yakut/default.nix @@ -0,0 +1,51 @@ +{ lib +, buildPythonApplication +, fetchPypi +, stdenv +, click +, coloredlogs +, psutil +, pycyphal +, pyserial +, ruamel-yaml +, requests +, scipy +, simplejson +}: + +buildPythonApplication rec { + pname = "yakut"; + version = "0.13.0"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-MBVSt01D36rBPW2bopujyu8Opwwavmm7S3tdaWp5ACw="; + }; + + buildInputs = [ + stdenv.cc.cc.lib + click + coloredlogs + psutil + pycyphal + pyserial + ruamel-yaml + requests + scipy + simplejson + ]; + + # Can't seem to run the tests on nix + doCheck = false; + + meta = with lib; { + description = "Simple CLI tool for diagnostics and debugging of Cyphal networks"; + longDescription = '' + Yakút is a simple cross-platform command-line interface (CLI) tool for diagnostics and debugging of Cyphal networks. By virtue of being based on PyCyphal, Yakut supports all Cyphal transports (UDP, serial, CAN, ...) and is compatible with all major features of the protocol. It is designed to be usable with GNU/Linux, Windows, and macOS. + ''; + homepage = "https://github.com/OpenCyphal/yakut/"; + license = licenses.mit; + maintainers = [ teams.ororatech ]; + }; +} diff --git a/pkgs/development/tools/mold/default.nix b/pkgs/development/tools/mold/default.nix index 4f483fd5f3b..d8edce696a7 100644 --- a/pkgs/development/tools/mold/default.nix +++ b/pkgs/development/tools/mold/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "mold"; - version = "2.3.2"; + version = "2.3.3"; src = fetchFromGitHub { owner = "rui314"; repo = "mold"; rev = "v${version}"; - hash = "sha256-eX76LRzhAk2n96eMtvbnm4Id99jRCDo3gMlrr5hI3Nw="; + hash = "sha256-YXFfjJp4dSxzEyAtrEi/ONQZKD7QAU/MZ62l4QCcbwE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/ocaml/camlidl/default.nix b/pkgs/development/tools/ocaml/camlidl/default.nix index a97ce8499b2..22104d3d4dc 100644 --- a/pkgs/development/tools/ocaml/camlidl/default.nix +++ b/pkgs/development/tools/ocaml/camlidl/default.nix @@ -5,13 +5,13 @@ lib.throwIfNot (lib.versionAtLeast ocaml.version "4.03") stdenv.mkDerivation rec { pname = "ocaml${ocaml.version}-camlidl"; - version = "1.11"; + version = "1.12"; src = fetchFromGitHub { owner = "xavierleroy"; repo = "camlidl"; - rev = "camlidl111"; - sha256 = "sha256-8m0zem/6nvpEJtjJNP/+vafeVLlMvNQGdl8lyf/OeBg="; + rev = "camlidl112"; + hash = "sha256-ONPQMDFaU2OzFa5jgMVKx+ZRKk8ZgBZyk42vDvbM7E0="; }; nativeBuildInputs = [ ocaml ]; @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { substituteInPlace config/Makefile --replace BINDIR=/usr/local/bin BINDIR=$out substituteInPlace config/Makefile --replace 'OCAMLLIB=$(shell $(OCAMLC) -where)' OCAMLLIB=$out/lib/ocaml/${ocaml.version}/site-lib/camlidl substituteInPlace config/Makefile --replace CPP=cpp CPP=${stdenv.cc}/bin/cpp + substituteInPlace lib/Makefile --replace '$(OCAMLLIB)/Makefile.config' "${ocaml}/lib/ocaml/Makefile.config" mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/camlidl/caml mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/camlidl/stublibs ''; diff --git a/pkgs/development/tools/okteto/default.nix b/pkgs/development/tools/okteto/default.nix index 724ea73e6b1..428f3d91864 100644 --- a/pkgs/development/tools/okteto/default.nix +++ b/pkgs/development/tools/okteto/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "okteto"; - version = "2.21.0"; + version = "2.22.0"; src = fetchFromGitHub { owner = "okteto"; repo = "okteto"; rev = version; - hash = "sha256-4arcK/g9j/lv1HWP7rvhAXJpYRMKgmSbGPZjy2UkhyE="; + hash = "sha256-HqMnZireYw8k7TXkR+M+Ct97OISaBUNCABR0nYqljjQ="; }; - vendorHash = "sha256-u1oMX2ZplmDGx7ePfA5vKHUuDmWYVCJrYh2HQ23dTfU="; + vendorHash = "sha256-z4ERIfwLPYIMpSetepDx0U2WUA+9RXjoQICMbp+qS3k="; postPatch = '' # Disable some tests that need file system & network access. diff --git a/pkgs/development/tools/open-policy-agent/default.nix b/pkgs/development/tools/open-policy-agent/default.nix index 7b7da31ad1d..aa8b4ae20f7 100644 --- a/pkgs/development/tools/open-policy-agent/default.nix +++ b/pkgs/development/tools/open-policy-agent/default.nix @@ -11,14 +11,15 @@ assert enableWasmEval && stdenv.isDarwin -> builtins.throw "building with wasm o buildGoModule rec { pname = "open-policy-agent"; - version = "0.55.0"; + version = "0.58.0"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "opa"; rev = "v${version}"; - hash = "sha256-piQ8Cig2zG6UhzVbiDCTruAXNis8P5HUja4xiiol9jA="; + hash = "sha256-zDTL/kP0ldPiZhLqLQmpIoDaq979KNDVJyXp93sPZAk="; }; + vendorHash = null; nativeBuildInputs = [ installShellFiles ]; @@ -34,6 +35,10 @@ buildGoModule rec { + "`opa build` does not need this feature.") "opa_wasm"); + checkFlags = lib.optionals (!enableWasmEval) [ + "-skip=TestRegoTargetWasmAndTargetPluginDisablesIndexingTopdownStages" + ]; + preCheck = '' # Feed in all but the e2e tests for testing # This is because subPackages above limits what is built to just what we diff --git a/pkgs/development/tools/packcc/default.nix b/pkgs/development/tools/packcc/default.nix index b16b0491c9b..4f618665573 100644 --- a/pkgs/development/tools/packcc/default.nix +++ b/pkgs/development/tools/packcc/default.nix @@ -35,6 +35,8 @@ stdenv.mkDerivation rec { # Disable a failing test. rm -rf ../../tests/style.d + '' + lib.optionalString stdenv.cc.isClang '' + export NIX_CFLAGS_COMPILE+=' -Wno-error=strict-prototypes -Wno-error=int-conversion' ''; installPhase = '' diff --git a/pkgs/development/tools/parsing/antlr/builder.sh b/pkgs/development/tools/parsing/antlr/builder.sh index 55259b93212..c1d20845e6b 100644 --- a/pkgs/development/tools/parsing/antlr/builder.sh +++ b/pkgs/development/tools/parsing/antlr/builder.sh @@ -1,4 +1,4 @@ -if [ -e .attrs.sh ]; then source .attrs.sh; fi +if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi source $stdenv/setup tar zxvf $src diff --git a/pkgs/development/tools/parsing/spicy/default.nix b/pkgs/development/tools/parsing/spicy/default.nix index bd7c8c4db0a..4b6db0adb73 100644 --- a/pkgs/development/tools/parsing/spicy/default.nix +++ b/pkgs/development/tools/parsing/spicy/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { pname = "spicy"; - version = "1.8.1"; + version = "1.9.0"; strictDeps = true; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { owner = "zeek"; repo = "spicy"; rev = "v${version}"; - hash = "sha256-Cb+HYUObL3So3ZcG4Iy276rdO0TC9rholwEBIYA5BNU="; + hash = "sha256-nVHm0JJsFXGnYlBBlcR5zBS46PZuALle3ik3GMTPYTQ="; fetchSubmodules = true; }; diff --git a/pkgs/development/tools/railway/default.nix b/pkgs/development/tools/railway/default.nix index 688a475a140..151c489de6b 100644 --- a/pkgs/development/tools/railway/default.nix +++ b/pkgs/development/tools/railway/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "railway"; - version = "3.5.0"; + version = "3.5.1"; src = fetchFromGitHub { owner = "railwayapp"; repo = "cli"; rev = "v${version}"; - hash = "sha256-I32DC0hzVM/LCSqS878sZd+UYZ0NfBuzBgd9Aed/Sq0="; + hash = "sha256-XzDxfjXY7Mu6qDZ66r3c0/RDBQF7wCONZTpfQ0j1B1c="; }; - cargoHash = "sha256-CYy0YEWK9sHAr0yFIH9yzxPnzG6x/EcE8ZLkueYgSiE="; + cargoHash = "sha256-J/ecoC8efv0IfAta7Ug0g7N/2jGV+DOACgbhXVfNK3k="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/rust/cargo-benchcmp/default.nix b/pkgs/development/tools/rust/cargo-benchcmp/default.nix index 4aa3c411f12..d46a57355d7 100644 --- a/pkgs/development/tools/rust/cargo-benchcmp/default.nix +++ b/pkgs/development/tools/rust/cargo-benchcmp/default.nix @@ -2,7 +2,6 @@ , rustPlatform , fetchFromGitHub , substituteAll -, rust , stdenv }: @@ -23,7 +22,7 @@ rustPlatform.buildRustPackage rec { # patch the binary path so tests can find the binary when `--target` is present (substituteAll { src = ./fix-test-binary-path.patch; - shortTarget = rust.toRustTarget stdenv.hostPlatform; + shortTarget = stdenv.hostPlatform.rust.rustcTarget; }) ]; diff --git a/pkgs/development/tools/rust/cargo-codspeed/default.nix b/pkgs/development/tools/rust/cargo-codspeed/default.nix index 5805d605835..d1f5c7d26f9 100644 --- a/pkgs/development/tools/rust/cargo-codspeed/default.nix +++ b/pkgs/development/tools/rust/cargo-codspeed/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-codspeed"; - version = "2.3.1"; + version = "2.3.2"; src = fetchFromGitHub { owner = "CodSpeedHQ"; repo = "codspeed-rust"; rev = "v${version}"; - hash = "sha256-QEqWSCqX00aMF9kM6xyClJjMiEGmscEWZu0W/MmSj2M="; + hash = "sha256-TjK84A/hoG5TyXbXgr4SPolUBT9tMqz/Mn9pMK6BQE4="; }; - cargoHash = "sha256-kZjQFoP5aZyVt0EcMtUUXc1wUZQxUwONMzzN6iLUAbM="; + cargoHash = "sha256-Nfd8YBh+5HlLbxKajptJEH3NFbtBH2V6668c3DHc13g="; nativeBuildInputs = [ curl @@ -34,7 +34,7 @@ rustPlatform.buildRustPackage rec { openssl zlib ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk_11_0.frameworks.Security + darwin.apple_sdk.frameworks.Security ]; cargoBuildFlags = [ "-p=cargo-codspeed" ]; diff --git a/pkgs/development/tools/rust/cargo-crev/default.nix b/pkgs/development/tools/rust/cargo-crev/default.nix index cbfa86c69ef..30a2fd44eab 100644 --- a/pkgs/development/tools/rust/cargo-crev/default.nix +++ b/pkgs/development/tools/rust/cargo-crev/default.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-crev"; - version = "0.25.3"; + version = "0.25.4"; src = fetchFromGitHub { owner = "crev-dev"; repo = "cargo-crev"; rev = "v${version}"; - sha256 = "sha256-tyNbBG2okxoLmu8mwoeR3Ud0nIpqkwVmFHT0Gi1Pibs="; + sha256 = "sha256-cXGZhTLIxR9VHrQT+unbl69AviiQ6FCOJTdOP/4fRYI="; }; - cargoHash = "sha256-sKQw4Bak3JY07TYKkThKTFhh3H5GB2lDcfcGE4cRHDY="; + cargoHash = "sha256-H/5OZCnshGOUKVaBTbFAiMpYdsNC/96gV+rOgiuwDYc="; preCheck = '' export HOME=$(mktemp -d) diff --git a/pkgs/development/tools/rust/cargo-leptos/Cargo.lock b/pkgs/development/tools/rust/cargo-leptos/Cargo.lock index 963294460ab..7e0abac242a 100644 --- a/pkgs/development/tools/rust/cargo-leptos/Cargo.lock +++ b/pkgs/development/tools/rust/cargo-leptos/Cargo.lock @@ -305,9 +305,9 @@ dependencies = [ [[package]] name = "brotli-decompressor" -version = "2.5.0" +version = "2.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da74e2b81409b1b743f8f0c62cc6254afefb8b8e50bbfe3735550f7aeefa3448" +checksum = "4e2e4afe60d7dd600fdd3de8d0f08c2b7ec039712e3b6137ff98b7004e82de4f" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -389,7 +389,7 @@ dependencies = [ [[package]] name = "cargo-leptos" -version = "0.2.1" +version = "0.2.2" dependencies = [ "ansi_term", "anyhow", @@ -1306,9 +1306,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.0.2" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897" +checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" dependencies = [ "equivalent", "hashbrown 0.14.2", @@ -1400,9 +1400,9 @@ checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[package]] name = "js-sys" -version = "0.3.64" +version = "0.3.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" +checksum = "54c0c35952f67de54bb584e9fd912b3023117cbafc0a77d8f3dee1fb5f572fe8" dependencies = [ "wasm-bindgen", ] @@ -1443,7 +1443,7 @@ checksum = "a6902fabee84955a85a6cdebf8ddfbfb134091087b172e32ebb26e571d4640ca" dependencies = [ "anyhow", "camino", - "indexmap 2.0.2", + "indexmap 2.1.0", "parking_lot", "proc-macro2", "quote", @@ -1746,9 +1746,9 @@ checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "openssl" -version = "0.10.57" +version = "0.10.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bac25ee399abb46215765b1cb35bc0212377e58a061560d8b29b024fd0430e7c" +checksum = "a9dfc0783362704e97ef3bd24261995a699468440099ef95d869b4d9732f829a" dependencies = [ "bitflags 2.4.1", "cfg-if 1.0.0", @@ -1778,9 +1778,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.93" +version = "0.9.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db4d56a4c0478783083cfafcc42493dd4a981d41669da64b4572a2a089b51b1d" +checksum = "2f55da20b29f956fb01f0add8683eb26ee13ebe3ebd935e49898717c6b4b2830" dependencies = [ "cc", "libc", @@ -2437,9 +2437,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.107" +version = "1.0.108" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" +checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" dependencies = [ "itoa", "ryu", @@ -2986,9 +2986,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" +checksum = "7daec296f25a1bae309c0cd5c29c4b260e510e6d813c286b19eaadf409d40fce" dependencies = [ "cfg-if 1.0.0", "wasm-bindgen-macro", @@ -2996,9 +2996,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" +checksum = "e397f4664c0e4e428e8313a469aaa58310d302159845980fd23b0f22a847f217" dependencies = [ "bumpalo", "log", @@ -3011,9 +3011,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-cli-support" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d21c60239a09bf9bab8dfa752be4e6c637db22296b9ded493800090448692da9" +checksum = "f2252adf46913da7b729caf556b81cedd1335165576e6446d84618e8835d89dd" dependencies = [ "anyhow", "base64 0.9.3", @@ -3033,9 +3033,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-externref-xform" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bafbe1984f67cc12645f12ab65e6145e8ddce1ab265d0be58435f25bb0ce2608" +checksum = "43f3b73cf8fcb86da78c6649c74acef205723f57af99b9f549b2609c83fe7815" dependencies = [ "anyhow", "walrus", @@ -3043,9 +3043,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.37" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03" +checksum = "9afec9963e3d0994cac82455b2b3502b81a7f40f9a0d32181f7528d9f4b43e02" dependencies = [ "cfg-if 1.0.0", "js-sys", @@ -3055,9 +3055,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" +checksum = "5961017b3b08ad5f3fe39f1e79877f8ee7c23c5e5fd5eb80de95abc41f1f16b2" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -3065,9 +3065,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" +checksum = "c5353b8dab669f5e10f5bd76df26a9360c748f054f862ff5f3f8aae0c7fb3907" dependencies = [ "proc-macro2", "quote", @@ -3078,9 +3078,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-multi-value-xform" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "581419e3995571a1d2d066e360ca1c0c09da097f5a53c98e6f00d96eddaf0ffe" +checksum = "930dd8e8226379aebb7d512f31b9241a3c59a1801452932e5a15bebfd3b708fb" dependencies = [ "anyhow", "walrus", @@ -3088,15 +3088,15 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" +checksum = "0d046c5d029ba91a1ed14da14dca44b68bf2f124cfbaf741c54151fdb3e0750b" [[package]] name = "wasm-bindgen-threads-xform" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e05d272073981137e8426cf2a6830d43d1f84f988a050b2f8b210f0e266b8983" +checksum = "759b1e9784f903a7890bcf147aa7c8c529a6318a2db05f88c054194a3e6c6d57" dependencies = [ "anyhow", "walrus", @@ -3105,9 +3105,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-wasm-conventions" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e9c65b1ff5041ea824ca24c519948aec16fb6611c617d601623c0657dfcd47b" +checksum = "2dc12bc175c837239520b8aa9dcfb68a025fcf56a718a02551a75a972711c816" dependencies = [ "anyhow", "walrus", @@ -3115,9 +3115,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-wasm-interpreter" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c5c796220738ab5d44666f37205728a74141c0039d1166bcf8110b26bafaa1e" +checksum = "6a5510ab88377b4e3160a7e5d90a876d0a1da2d9b9b67495f437246714c0980f" dependencies = [ "anyhow", "log", @@ -3133,9 +3133,9 @@ checksum = "5fe3d5405e9ea6c1317a656d6e0820912d8b7b3607823a7596117c8f666daf6f" [[package]] name = "web-sys" -version = "0.3.64" +version = "0.3.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" +checksum = "5db499c5f66323272151db0e666cd34f78617522fb0c1604d31a27c50c206a85" dependencies = [ "js-sys", "wasm-bindgen", @@ -3392,18 +3392,18 @@ checksum = "1367295b8f788d371ce2dbc842c7b709c73ee1364d30351dd300ec2203b12377" [[package]] name = "zerocopy" -version = "0.7.16" +version = "0.7.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c552e97c5a9b90bc8ddc545b5106e798807376356688ebaa3aee36f44f8c4b9e" +checksum = "686b7e407015242119c33dab17b8f61ba6843534de936d94368856528eae4dcc" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.16" +version = "0.7.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "964bc0588d7ac1c0243d0427ef08482618313702bbb014806cb7ab3da34d3d99" +checksum = "020f3dfe25dfc38dfea49ce62d5d45ecdd7f0d8a724fa63eb36b6eba4ec76806" dependencies = [ "proc-macro2", "quote", diff --git a/pkgs/development/tools/rust/cargo-leptos/default.nix b/pkgs/development/tools/rust/cargo-leptos/default.nix index 4d11eb8b1c0..a1e1ca03071 100644 --- a/pkgs/development/tools/rust/cargo-leptos/default.nix +++ b/pkgs/development/tools/rust/cargo-leptos/default.nix @@ -15,13 +15,13 @@ let in rustPlatform.buildRustPackage rec { pname = "cargo-leptos"; - version = "0.2.1"; + version = "0.2.2"; src = fetchFromGitHub { owner = "leptos-rs"; repo = pname; - rev = "${version}"; - hash = "sha256-XoTXVzhBW+oUHu2TBZC+sFqMAVZCOJeuymqmsxTWpZ0="; + rev = "e98b478b0c82af1469151eff30f4246b9af4a539"; + hash = "sha256-7o/yQanBBSA+MmMiGCYSjar4hZ8TRZoPiUniF5ELzXU="; }; cargoLock = { @@ -44,6 +44,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "A build tool for the Leptos web framework"; homepage = "https://github.com/leptos-rs/cargo-leptos"; + changelog = "https://github.com/leptos-rs/cargo-leptos/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ benwis ]; }; diff --git a/pkgs/development/tools/rust/cargo-llvm-cov/default.nix b/pkgs/development/tools/rust/cargo-llvm-cov/default.nix index f591540785c..0da95637741 100644 --- a/pkgs/development/tools/rust/cargo-llvm-cov/default.nix +++ b/pkgs/development/tools/rust/cargo-llvm-cov/default.nix @@ -21,11 +21,12 @@ , fetchFromGitHub , rustPlatform , rustc +, git }: let pname = "cargo-llvm-cov"; - version = "0.5.33"; + version = "0.5.37"; owner = "taiki-e"; homepage = "https://github.com/${owner}/${pname}"; @@ -36,7 +37,7 @@ let cargoLock = fetchurl { name = "Cargo.lock"; url = "https://crates.io/api/v1/crates/${pname}/${version}/download"; - sha256 = "sha256-FDr1Yx2k9yTqnQbtkT8h8DErPe54/lswfbzZKM0Knpk="; + sha256 = "sha256-UJXZ7FhbkIcVAv4PymO4sCqhJ0KFORCCO3w0w9W46qQ="; downloadToTemp = true; postFetch = '' tar xzf $downloadedFile ${pname}-${version}/Cargo.lock @@ -54,7 +55,8 @@ rustPlatform.buildRustPackage { inherit owner; repo = pname; rev = "v${version}"; - sha256 = "sha256-nlrQIzQc63XdUqWiHFXqjwzzNhgpEba7Rw4VE1d0yBU="; + sha256 = "sha256-aJIMG2gaotu1XdNxcE2xJS78qAqlNzF3p2RMvqBraTk="; + leaveDotGit = true; }; # Upstream doesn't include the lockfile so we need to add it back @@ -62,13 +64,24 @@ rustPlatform.buildRustPackage { cp ${cargoLock} source/Cargo.lock ''; - cargoSha256 = "sha256-etMpCnbdSzaZnlzGlVnTL84VxInYFpuA4xrt8qNqbsQ="; + cargoSha256 = "sha256-dbC8OcH/Ae98SUx9d4rsBdhYQfzsWZpiGqJoIGPDSbY="; # `cargo-llvm-cov` reads these environment variables to find these binaries, # which are needed to run the tests LLVM_COV = "${llvm}/bin/llvm-cov"; LLVM_PROFDATA = "${llvm}/bin/llvm-profdata"; + nativeCheckInputs = [ + git + ]; + + preCheck = '' + # `cargo-llvm-cov`'s tests rely on `git ls-files` so the staging area needs + # to not have everything staged as deleted, which is how `leaveDotGit` in + # `fetchFromGitHub` leaves the staging area for reproducibility reasons. + git restore --staged . + ''; + meta = { inherit homepage; changelog = homepage + "/blob/v${version}/CHANGELOG.md"; diff --git a/pkgs/development/tools/rust/cargo-mutants/default.nix b/pkgs/development/tools/rust/cargo-mutants/default.nix index fefa6bb21fb..a3d97ff4439 100644 --- a/pkgs/development/tools/rust/cargo-mutants/default.nix +++ b/pkgs/development/tools/rust/cargo-mutants/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-mutants"; - version = "23.10.0"; + version = "23.11.1"; src = fetchFromGitHub { owner = "sourcefrog"; repo = "cargo-mutants"; rev = "v${version}"; - hash = "sha256-AJcteYaEm1pJ2tn1mydZAhrhqoMtEVJUrfGY/Vt71Ks="; + hash = "sha256-UZ4agGxJfkqERrl354RjQb6x+FDMbrrXCjZBp6Gzu/c="; }; - cargoHash = "sha256-0NLP8KtzeX3jjWjSXBKku4c1LzKmoJce1RPUB+aO804="; + cargoHash = "sha256-0zezsxZPCt0jtV/4RrSQ6rriWvuwzztHFEUONvW1ZOs="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration diff --git a/pkgs/development/tools/rust/cargo-nextest/default.nix b/pkgs/development/tools/rust/cargo-nextest/default.nix index f911f5ee587..92e382071df 100644 --- a/pkgs/development/tools/rust/cargo-nextest/default.nix +++ b/pkgs/development/tools/rust/cargo-nextest/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-nextest"; - version = "0.9.61"; + version = "0.9.62"; src = fetchFromGitHub { owner = "nextest-rs"; repo = "nextest"; rev = "cargo-nextest-${version}"; - hash = "sha256-kVADlW5XqKAuQ2n0lmEin67CXGkhTVWgJaPMKpvS5Gs="; + hash = "sha256-GxDURkXmZvxaX9RLq/hlqtX1woWm2JKtv5x5goCY4ZU="; }; - cargoHash = "sha256-IU2oW00VzEV8p3BpqIJZwXvdcaeweAF9nGHwtX+98vY="; + cargoHash = "sha256-zQB8sPeKT43qC5JjrHa7E41NyDyiQ3PGvBqgszs+tBI="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration diff --git a/pkgs/development/tools/rust/cargo-watch/default.nix b/pkgs/development/tools/rust/cargo-watch/default.nix index fda47b5070a..63217b655ac 100644 --- a/pkgs/development/tools/rust/cargo-watch/default.nix +++ b/pkgs/development/tools/rust/cargo-watch/default.nix @@ -5,7 +5,6 @@ , Cocoa , CoreServices , Foundation -, rust , libiconv }: @@ -27,7 +26,7 @@ rustPlatform.buildRustPackage rec { # `test with_cargo` tries to call cargo-watch as a cargo subcommand # (calling cargo-watch with command `cargo watch`) preCheck = '' - export PATH="$(pwd)/target/${rust.toRustTarget stdenv.hostPlatform}/release:$PATH" + export PATH="$(pwd)/target/${stdenv.hostPlatform.rust.rustcTarget}/release:$PATH" ''; meta = with lib; { diff --git a/pkgs/development/tools/rust/maturin/default.nix b/pkgs/development/tools/rust/maturin/default.nix index 4b66ecfa467..37cec14ee4c 100644 --- a/pkgs/development/tools/rust/maturin/default.nix +++ b/pkgs/development/tools/rust/maturin/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "maturin"; - version = "1.2.3"; + version = "1.3.0"; src = fetchFromGitHub { owner = "PyO3"; repo = "maturin"; rev = "v${version}"; - hash = "sha256-hxtT5cL1PTXkTXGB0nVPhMI8Vlqrk4q2MHW0KGosFwc="; + hash = "sha256-MVmu9m+9XhWuPBEEoaYmsSbMFziSZaM5Gg5kOr1DT54="; }; - cargoHash = "sha256-IZWh/Bp9TdB+flc1PXVkwrIdOr83TFk6X6O5M0FVaO4="; + cargoHash = "sha256-hrdrGFtL2vGczINnvDa4rclkXsNWnEqtTt3NVaRay8w="; buildInputs = lib.optionals stdenv.isDarwin [ Security libiconv ]; diff --git a/pkgs/development/tools/rust/rust-analyzer/default.nix b/pkgs/development/tools/rust/rust-analyzer/default.nix index 9c2117111c7..b159e014978 100644 --- a/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -13,14 +13,14 @@ rustPlatform.buildRustPackage rec { pname = "rust-analyzer-unwrapped"; - version = "2023-10-16"; - cargoSha256 = "sha256-hs5Mn+BU1BszgAHOZaZBQdpjeBx39Lbm+3EWSucrzak="; + version = "2023-11-13"; + cargoSha256 = "sha256-Nrq8si+myWLmhaJrvxK+Ki599A5VddNcCd5kQZWTnNs="; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust-analyzer"; rev = version; - sha256 = "sha256-9ScvChrqG35GXwO6cFzZOgsq/5PdrUZDCTBRgkhoShk="; + sha256 = "sha256-gjMqmlCvLVlptL35HHvALrOKrFyxjg5hryXbbpVyoeY="; }; cargoBuildFlags = [ "--bin" "rust-analyzer" "--bin" "rust-analyzer-proc-macro-srv" ]; diff --git a/pkgs/development/tools/selene/default.nix b/pkgs/development/tools/selene/default.nix index 87c4a0f3ee7..dbaeb264b35 100644 --- a/pkgs/development/tools/selene/default.nix +++ b/pkgs/development/tools/selene/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "selene"; - version = "0.25.0"; + version = "0.26.1"; src = fetchFromGitHub { owner = "kampfkarren"; repo = pname; rev = version; - sha256 = "sha256-aKU+1eoLm/h5Rj/vAZOyAnyl5/TpStL5g8PPdYCJ8o0="; + sha256 = "sha256-0imHwZNyhJXFai1J5tHqnQ6Ta10nETQ5TILGH0bHc8Y="; }; - cargoSha256 = "sha256-y2BoV59oJPMBf9rUgMhHu87teurwPSNowRbuPfXubGA="; + cargoHash = "sha256-Lm3agCnxDxcj7op17uiokK8Y790oMxwHJStvP/9DsI0="; nativeBuildInputs = lib.optionals robloxSupport [ pkg-config diff --git a/pkgs/development/tools/skaffold/default.nix b/pkgs/development/tools/skaffold/default.nix index a80cb9ac1b6..32007909951 100644 --- a/pkgs/development/tools/skaffold/default.nix +++ b/pkgs/development/tools/skaffold/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "skaffold"; - version = "2.8.0"; + version = "2.9.0"; src = fetchFromGitHub { owner = "GoogleContainerTools"; repo = "skaffold"; rev = "v${version}"; - hash = "sha256-Ng+JMhGnbZEum+nmuA/omgDhg5U1UpcOZ9+avUZeTK8="; + hash = "sha256-ddb1+h4mcQ1Uu4UvCL4IL4sjEbI70HZ4B/MMsUHbhSk="; }; vendorHash = null; diff --git a/pkgs/development/tools/spirv-tools/default.nix b/pkgs/development/tools/spirv-tools/default.nix index 274aff3f4e1..8827d6b709e 100644 --- a/pkgs/development/tools/spirv-tools/default.nix +++ b/pkgs/development/tools/spirv-tools/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "spirv-tools"; - version = "1.3.261.0"; + version = "1.3.268.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Tools"; - rev = "sdk-${version}"; - hash = "sha256-K7cv0mMNrXYOlJsxAPwz3rVX5FnsnBNvaU33k9hYnQc="; + rev = "vulkan-sdk-${version}"; + hash = "sha256-Bned5Pa6zCFByfNvqD0M5t3l4uAJYkDlpe6wu8e7a3U="; }; # The cmake options are sufficient for turning on static building, but not diff --git a/pkgs/development/tools/sqldef/default.nix b/pkgs/development/tools/sqldef/default.nix index f5fcdd76236..92c1c0037f2 100644 --- a/pkgs/development/tools/sqldef/default.nix +++ b/pkgs/development/tools/sqldef/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "sqldef"; - version = "0.16.9"; + version = "0.16.10"; src = fetchFromGitHub { owner = "k0kubun"; repo = "sqldef"; rev = "v${version}"; - hash = "sha256-Y4H8tPUHaRMMZaZt1VjkZT5JJgEIY/dhocNccvoHf1Y="; + hash = "sha256-NwSQLpqgOuVBH+EYjSch3h0BMJZPK3/FcKO4iUnNt+E="; }; proxyVendor = true; - vendorHash = "sha256-Qn10+uTAo68OTQp592H/T7D99LNIvG76aG/ye+xx2sk="; + vendorHash = "sha256-2MwibiWT9rrbNVva61wR1OPrG+fZkxTDznC2pdm3CKE="; ldflags = [ "-s" "-w" "-X main.version=${version}" ]; diff --git a/pkgs/development/tools/stylua/default.nix b/pkgs/development/tools/stylua/default.nix index 1afb444c323..23fac8ddac7 100644 --- a/pkgs/development/tools/stylua/default.nix +++ b/pkgs/development/tools/stylua/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "stylua"; - version = "0.18.2"; + version = "0.19.1"; src = fetchFromGitHub { owner = "johnnymorganz"; repo = pname; rev = "v${version}"; - sha256 = "sha256-f4U3vzgvFF1N6X8f8zwtqSaQfiwNX7CecpcJ0GKx2P0="; + sha256 = "sha256-Bw9+BUvZC4sRLFyU5K6FHsWVZ3PTlMAonRmTSwV5AwU="; }; - cargoSha256 = "sha256-az5j0qvP3mZXRJZOmslDb40MSMS+iAvXYVNGw8vt7gg="; + cargoSha256 = "sha256-bainEM4eRMNyecSBi5k1ifjDULWdXed6GP6i10IVA+w="; # remove cargo config so it can find the linker on aarch64-unknown-linux-gnu postPatch = '' diff --git a/pkgs/development/tools/supabase-cli/default.nix b/pkgs/development/tools/supabase-cli/default.nix index ccdd0ff05cb..77217a8acda 100644 --- a/pkgs/development/tools/supabase-cli/default.nix +++ b/pkgs/development/tools/supabase-cli/default.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "supabase-cli"; - version = "1.107.0"; + version = "1.112.0"; src = fetchFromGitHub { owner = "supabase"; repo = "cli"; rev = "v${version}"; - hash = "sha256-uR7Iu1PdnzWp9+IJ5szUR6r+qKckyD6LFgsY5YQxT5c="; + hash = "sha256-2Cw+TQMKWwjWUgsif+Ot9OZ1kIlancoT4TfJ343mnLY="; }; - vendorHash = "sha256-gWGoRKlSo0C1gFU/kC4DcgOl0Mp5LCTpSZ1Yav0ZL9c="; + vendorHash = "sha256-vseD7Oov7Gi1lEnF1hEAChoPByFa8T82njWBINC/Ea4="; ldflags = [ "-s" diff --git a/pkgs/development/tools/symfony-cli/default.nix b/pkgs/development/tools/symfony-cli/default.nix index 1c795fe35ac..f150ebc0d45 100644 --- a/pkgs/development/tools/symfony-cli/default.nix +++ b/pkgs/development/tools/symfony-cli/default.nix @@ -7,14 +7,14 @@ buildGoModule rec { pname = "symfony-cli"; - version = "5.7.2"; + version = "5.7.3"; vendorHash = "sha256-xC5EHP4Zb9lgvbxVkoVBxdQ4+f34zqRf4XapntZMTTc="; src = fetchFromGitHub { owner = "symfony-cli"; repo = "symfony-cli"; rev = "v${version}"; - hash = "sha256-2/2Hx+9MnnY4GMm/Zt6ssCTdtYgcP1gPRXe1yQMgXTE="; + hash = "sha256-mxyGdyR1yZY+YOyf9ngk6P2oBmUL+IbwLWaCvZziSIM="; }; ldflags = [ diff --git a/pkgs/development/tools/tailwindcss/default.nix b/pkgs/development/tools/tailwindcss/default.nix index c05fbdc0c5f..59564cec7f6 100644 --- a/pkgs/development/tools/tailwindcss/default.nix +++ b/pkgs/development/tools/tailwindcss/default.nix @@ -18,16 +18,16 @@ let }.${system} or throwSystem; hash = { - aarch64-darwin = "sha256-tlsAztU6Rk7xq1T3NNDlB0Gt3iRpvAk72VO+gGuYEps="; - aarch64-linux = "sha256-bYe/QJ7UuMq5tDhhof/83gfUN0DbenQu/wbrvLylKeM="; - armv7l-linux = "sha256-d0kK0clkSUW4ARTNUVWpmJidXwxLucjC4Vwu924YB1E="; - x86_64-darwin = "sha256-4cvrHklkQ0fo7fVi1aRKOMhX4ky7dENwGh2jqTneQLo="; - x86_64-linux = "sha256-FX0N1WmV9pixd3ZoBXnSdBSSDBqj//S8e5nEaQuEdxc="; + aarch64-darwin = "sha256-VAJypHejh3ZW2x3fPNvuFw3VkmBbsSTnmBHuqU3hXVY="; + aarch64-linux = "sha256-Yxw6DIP8j3JANgvN870socG0aNX76d3c0z12ePbuFSs="; + armv7l-linux = "sha256-yS8LDmUit5pM4WrMjhqUJD4e0fWKWf8cr4w1PACj+8g="; + x86_64-darwin = "sha256-cTIp7HesR9Ae6yFpUy0H1hrqtHSSReIKZmKE06XCsWU="; + x86_64-linux = "sha256-Z3Co095akfV/11UWvpc0WAp3gdUrpjVskUw1v01Eifs="; }.${system} or throwSystem; in stdenv.mkDerivation rec { pname = "tailwindcss"; - version = "3.3.3"; + version = "3.3.5"; src = fetchurl { url = "https://github.com/tailwindlabs/tailwindcss/releases/download/v${version}/tailwindcss-${plat}"; diff --git a/pkgs/development/tools/turso-cli/default.nix b/pkgs/development/tools/turso-cli/default.nix index 2a72686cf96..0cf07a9c29c 100644 --- a/pkgs/development/tools/turso-cli/default.nix +++ b/pkgs/development/tools/turso-cli/default.nix @@ -8,16 +8,16 @@ }: buildGo121Module rec { pname = "turso-cli"; - version = "0.87.1"; + version = "0.87.2"; src = fetchFromGitHub { owner = "tursodatabase"; repo = "turso-cli"; rev = "v${version}"; - hash = "sha256-wPL4fYFkk1rtHIYIVOGk5GG6S/pmOpg6WcbnpleDkUA="; + hash = "sha256-EZSVKmOIzwokCKreLnZj4DWEhjjXo3TFhieGVR7w7NM="; }; - vendorHash = "sha256-Jf2ZLzODPnvNrED8ST0u7rHGWivPwcyptkJbu8mdnoA="; + vendorHash = "sha256-3IV0MgDe71lqLQ6tB2NM2kYokXGWvR+hh4lvxw5QWjA="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/vulkan-validation-layers/default.nix b/pkgs/development/tools/vulkan-validation-layers/default.nix index 754b2d4a5e0..09a11cef84f 100644 --- a/pkgs/development/tools/vulkan-validation-layers/default.nix +++ b/pkgs/development/tools/vulkan-validation-layers/default.nix @@ -23,18 +23,13 @@ let in stdenv.mkDerivation rec { pname = "vulkan-validation-layers"; - version = "1.3.261"; - - # If we were to use "dev" here instead of headers, the setupHook would be - # placed in that output instead of "out". - outputs = ["out" "headers"]; - outputInclude = "headers"; + version = "1.3.268.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-ValidationLayers"; - rev = "v${version}"; - hash = "sha256-4kE3pkyYu6hnbv19fHhON+hI2HU4vLm31tNlp5fhndM="; + rev = "vulkan-sdk-${version}"; + hash = "sha256-DwkSUclStYKe54tC1H3jMv1KOSScgqf25tR5ajQZ6os="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/vultr-cli/default.nix b/pkgs/development/tools/vultr-cli/default.nix index 4130c52ce16..43b82060161 100644 --- a/pkgs/development/tools/vultr-cli/default.nix +++ b/pkgs/development/tools/vultr-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "vultr-cli"; - version = "2.19.0"; + version = "2.20.0"; src = fetchFromGitHub { owner = "vultr"; repo = pname; rev = "v${version}"; - hash = "sha256-RLJtDzG3dKaJkppJO/cAggvgB9egCxCWd1mbQ91KPuY="; + hash = "sha256-3Zd507yAymmQRgybm96VD413kId0/kMxIHbmUh8j6Kk="; }; - vendorHash = "sha256-lVZcmqEC4InZr2zcgI4WVg6Pl3Cv/crTWuLSnqY3Vyk="; + vendorHash = "sha256-OVoOCExAU6cDyWhSpk4hkhBZpWehH+4/vU/X81w9XgA="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/web/bun/default.nix b/pkgs/development/web/bun/default.nix index f0f8a345455..01496458182 100644 --- a/pkgs/development/web/bun/default.nix +++ b/pkgs/development/web/bun/default.nix @@ -12,7 +12,7 @@ }: stdenvNoCC.mkDerivation rec { - version = "1.0.11"; + version = "1.0.12"; pname = "bun"; src = passthru.sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}"); @@ -51,19 +51,19 @@ stdenvNoCC.mkDerivation rec { sources = { "aarch64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-aarch64.zip"; - hash = "sha256-yZp/AFlOVRtZ60865utrtVv0zlerwFMhpqBh26WnfL8="; + hash = "sha256-tGQQEEPBrMx3AuIsJbN0i/xoa7HSf4rNrE6km3NWjHQ="; }; "aarch64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-aarch64.zip"; - hash = "sha256-/9MKD2iRogrOIiKlCCPUX5KoDD0rM7K8+jVLx9xxs5s="; + hash = "sha256-xMmNBK0t+e/BLXnE3wOxbANXlwpQ/rczTK/7E80T6cw="; }; "x86_64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-x64.zip"; - hash = "sha256-9wE3GL+EGvPHtVgfMx09Jn+WU/VoUf5x/QrrdlhePa8="; + hash = "sha256-/3qLt3duJt0x0aI7xwWIEt8kAzLqSAlwC3C539vZ/aI="; }; "x86_64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-x64.zip"; - hash = "sha256-pT9+GchNC3vmeFgTF0GzzyLzWBrCQcR/DFRVK2CnHCw="; + hash = "sha256-+EWt1/YtGzJm/lRBPrf1RM5xdMVFMWurRNBQACALcSA="; }; }; updateScript = writeShellScript "update-bun" '' diff --git a/pkgs/development/web/deno/default.nix b/pkgs/development/web/deno/default.nix index 603c9bf5d9e..27303fb8602 100644 --- a/pkgs/development/web/deno/default.nix +++ b/pkgs/development/web/deno/default.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage rec { pname = "deno"; - version = "1.38.0"; + version = "1.38.2"; src = fetchFromGitHub { owner = "denoland"; repo = pname; rev = "v${version}"; - hash = "sha256-x01KggCu/sJnVvfJW/NZ+ARcl2Nl9LKn9dPBVmZcLi4="; + hash = "sha256-DLVeI1pnHpUya8muVUP6VNXiLmlaedOOPPef3tHNOng="; }; - cargoHash = "sha256-PEKdQoAYhPpeHfv2pKGTsNaA1EANpf/GJw/3s+6TCoA="; + cargoHash = "sha256-qTvPpUBinPm3eQ5PLcqdCcZEG5Q6kGyt35mL914K9jk="; postPatch = '' # upstream uses lld on aarch64-darwin for faster builds @@ -44,6 +44,9 @@ rustPlatform.buildRustPackage rec { (with darwin.apple_sdk.frameworks; [ Security CoreServices Metal Foundation QuartzCore ]) ); + # work around "error: unknown warning group '-Wunused-but-set-parameter'" + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-unknown-warning-option"; + buildAndTestSubdir = "cli"; # The v8 package will try to download a `librusty_v8.a` release at build time to our read-only filesystem diff --git a/pkgs/development/web/deno/librusty_v8.nix b/pkgs/development/web/deno/librusty_v8.nix index 20fd20a5b98..e4d2a2fec70 100644 --- a/pkgs/development/web/deno/librusty_v8.nix +++ b/pkgs/development/web/deno/librusty_v8.nix @@ -1,11 +1,10 @@ # auto-generated file -- DO NOT EDIT! -{ rust, stdenv, fetchurl }: +{ stdenv, fetchurl }: let - arch = rust.toRustTarget stdenv.hostPlatform; fetch_librusty_v8 = args: fetchurl { name = "librusty_v8-${args.version}"; - url = "https://github.com/denoland/rusty_v8/releases/download/v${args.version}/librusty_v8_release_${arch}.a"; + url = "https://github.com/denoland/rusty_v8/releases/download/v${args.version}/librusty_v8_release_${stdenv.hostPlatform.rust.rustcTarget}.a"; sha256 = args.shas.${stdenv.hostPlatform.system}; meta = { inherit (args) version; }; }; diff --git a/pkgs/development/web/deno/update/librusty_v8.ts b/pkgs/development/web/deno/update/librusty_v8.ts index b38e0a28f1a..39831f6ea27 100644 --- a/pkgs/development/web/deno/update/librusty_v8.ts +++ b/pkgs/development/web/deno/update/librusty_v8.ts @@ -40,13 +40,12 @@ fetchurl { const templateDeps = (version: string, deps: PrefetchResult[]) => `# auto-generated file -- DO NOT EDIT! -{ rust, stdenv, fetchurl }: +{ stdenv, fetchurl }: let - arch = rust.toRustTarget stdenv.hostPlatform; fetch_librusty_v8 = args: fetchurl { name = "librusty_v8-\${args.version}"; - url = "https://github.com/denoland/rusty_v8/releases/download/v\${args.version}/librusty_v8_release_\${arch}.a"; + url = "https://github.com/denoland/rusty_v8/releases/download/v\${args.version}/librusty_v8_release_\${stdenv.hostPlatform.rust.rustcTarget}.a"; sha256 = args.shas.\${stdenv.hostPlatform.system}; meta = { inherit (args) version; }; }; diff --git a/pkgs/development/web/edge-runtime/librusty_v8.nix b/pkgs/development/web/edge-runtime/librusty_v8.nix index 6e9fc0a669f..1e0a306c13b 100644 --- a/pkgs/development/web/edge-runtime/librusty_v8.nix +++ b/pkgs/development/web/edge-runtime/librusty_v8.nix @@ -1,11 +1,10 @@ # auto-generated file -- DO NOT EDIT! -{ rust, stdenv, fetchurl }: +{ stdenv, fetchurl }: let - arch = rust.toRustTarget stdenv.hostPlatform; fetch_librusty_v8 = args: fetchurl { name = "librusty_v8-${args.version}"; - url = "https://github.com/denoland/rusty_v8/releases/download/v${args.version}/librusty_v8_release_${arch}.a"; + url = "https://github.com/denoland/rusty_v8/releases/download/v${args.version}/librusty_v8_release_${stdenv.hostPlatform.rust.rustcTarget}.a"; sha256 = args.shas.${stdenv.hostPlatform.system}; meta = { inherit (args) version; }; }; diff --git a/pkgs/development/web/mailcatcher/default.nix b/pkgs/development/web/mailcatcher/default.nix index df6ed0a5233..17d25378d8c 100644 --- a/pkgs/development/web/mailcatcher/default.nix +++ b/pkgs/development/web/mailcatcher/default.nix @@ -1,10 +1,10 @@ -{ pkgs, lib, bundlerApp, bundlerUpdateScript }: +{ ruby_3_2, lib, bundlerApp, bundlerUpdateScript }: bundlerApp { pname = "mailcatcher"; gemdir = ./.; exes = [ "mailcatcher" "catchmail" ]; - ruby = pkgs.ruby_3_0; + ruby = ruby_3_2; passthru.updateScript = bundlerUpdateScript "mailcatcher"; diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix index 8b615a55dd3..b1bd0ae912d 100644 --- a/pkgs/development/web/nodejs/nodejs.nix +++ b/pkgs/development/web/nodejs/nodejs.nix @@ -34,6 +34,7 @@ let */ ]) (builtins.attrNames sharedLibDeps) ++ [ "--with-intl=system-icu" + "--openssl-use-def-ca-store" ]; copyLibHeaders = @@ -52,6 +53,12 @@ let strictDeps = true; + env = lib.optionalAttrs (stdenv.isDarwin && stdenv.isx86_64) { + # Make sure libc++ uses `posix_memalign` instead of `aligned_alloc` on x86_64-darwin. + # Otherwise, nodejs would require the 11.0 SDK and macOS 10.15+. + NIX_CFLAGS_COMPILE = "-D__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__=101300"; + }; + CC_host = "cc"; CXX_host = "c++"; depsBuildBuild = [ buildPackages.stdenv.cc openssl libuv zlib icu ]; diff --git a/pkgs/development/web/nodejs/v14.nix b/pkgs/development/web/nodejs/v14.nix deleted file mode 100644 index e7dec1c12f6..00000000000 --- a/pkgs/development/web/nodejs/v14.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ callPackage, python3, lib, stdenv, openssl, enableNpm ? true }: - -let - buildNodejs = callPackage ./nodejs.nix { - inherit openssl; - python = python3; - }; -in - buildNodejs { - inherit enableNpm; - version = "14.21.3"; - sha256 = "sha256-RY7AkuYK1wDdzwectj1DXBXaTHuz0/mbmo5YqZ5UB14="; - patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff; - } diff --git a/pkgs/development/web/nodejs/v16.nix b/pkgs/development/web/nodejs/v16.nix deleted file mode 100644 index d4bb94c07d3..00000000000 --- a/pkgs/development/web/nodejs/v16.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ callPackage, openssl, python3, fetchpatch, enableNpm ? true }: - -let - buildNodejs = callPackage ./nodejs.nix { - inherit openssl; - python = python3; - }; - - npmPatches = callPackage ./npm-patches.nix { }; -in - buildNodejs { - inherit enableNpm; - # If you do upgrade here, please update in pkgs/top-level/release.nix - # the permitted insecure version to ensure it gets cached for our users - # and backport this to stable release (23.05). - version = "16.20.2"; - sha256 = "sha256-V28aA8RV5JGo0TK1h+trO4RlH8iXS7NjhDPdRNIsj0k="; - patches = [ - ./disable-darwin-v8-system-instrumentation.patch - ./bypass-darwin-xcrun-node16.patch - ./node-npm-build-npm-package-logic-node16.patch - ] ++ npmPatches; - } diff --git a/pkgs/development/web/nodejs/v18.nix b/pkgs/development/web/nodejs/v18.nix index 3c8abbb2918..b36e8e3d0f3 100644 --- a/pkgs/development/web/nodejs/v18.nix +++ b/pkgs/development/web/nodejs/v18.nix @@ -1,8 +1,20 @@ -{ callPackage, fetchpatch, openssl, python3, enableNpm ? true }: +{ callPackage, lib, overrideCC, pkgs, buildPackages, fetchpatch, openssl, python3, enableNpm ? true }: let + # Clang 16+ cannot build Node v18 due to -Wenum-constexpr-conversion errors. + # Use an older version of clang with the current libc++ for compatibility (e.g., with icu). + ensureCompatibleCC = packages: + if packages.stdenv.cc.isClang && lib.versionAtLeast (lib.getVersion packages.stdenv.cc.cc) "16" + then overrideCC packages.llvmPackages_15.stdenv (packages.llvmPackages_15.stdenv.cc.override { + inherit (packages.llvmPackages) libcxx; + extraPackages = [ packages.llvmPackages.libcxxabi ]; + }) + else packages.stdenv; + buildNodejs = callPackage ./nodejs.nix { inherit openssl; + stdenv = ensureCompatibleCC pkgs; + buildPackages = buildPackages // { stdenv = ensureCompatibleCC buildPackages; }; python = python3; }; in diff --git a/pkgs/development/web/nodejs/v21.nix b/pkgs/development/web/nodejs/v21.nix index 904bff2fef8..af3af652fb7 100644 --- a/pkgs/development/web/nodejs/v21.nix +++ b/pkgs/development/web/nodejs/v21.nix @@ -8,8 +8,8 @@ let in buildNodejs { inherit enableNpm; - version = "21.1.0"; - sha256 = "sha256-kaxy5ERMXlq0tEgDCmH/qVrNNdNKnTHS0iDuK+0BuSU="; + version = "21.2.0"; + sha256 = "sha256-1Xyc6jlHZPodmvUeUsdEn3EZPp1ExKgfvt7GU+yCdwc="; patches = [ ./revert-arm64-pointer-auth.patch ./disable-darwin-v8-system-instrumentation-node19.patch diff --git a/pkgs/development/web/playwright-test/default.nix b/pkgs/development/web/playwright-test/default.nix index b795f708f18..d9c0daef783 100644 --- a/pkgs/development/web/playwright-test/default.nix +++ b/pkgs/development/web/playwright-test/default.nix @@ -2,7 +2,7 @@ {pkgs ? import <nixpkgs> { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_14"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_18"}: let nodeEnv = import ./node-env.nix { |