diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-10-28 18:01:29 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-28 18:01:29 +0000 |
| commit | 6e5f43a5bd212b24f777dcda49875fb72b73401c (patch) | |
| tree | a8297871f7aa4b92034829cad9dc41663481d768 | |
| parent | 44026c97c35bd7d5b507d49d3d580594c83d189f (diff) | |
| parent | 2dad0f86ada2f90bcec2b33be655d25f84c45416 (diff) | |
| download | nixpkgs-6e5f43a5bd212b24f777dcda49875fb72b73401c.tar nixpkgs-6e5f43a5bd212b24f777dcda49875fb72b73401c.tar.gz nixpkgs-6e5f43a5bd212b24f777dcda49875fb72b73401c.tar.bz2 nixpkgs-6e5f43a5bd212b24f777dcda49875fb72b73401c.tar.lz nixpkgs-6e5f43a5bd212b24f777dcda49875fb72b73401c.tar.xz nixpkgs-6e5f43a5bd212b24f777dcda49875fb72b73401c.tar.zst nixpkgs-6e5f43a5bd212b24f777dcda49875fb72b73401c.zip | |
Merge master into staging-next
35 files changed, 721 insertions, 1195 deletions
diff --git a/nixos/lib/systemd-lib.nix b/nixos/lib/systemd-lib.nix index 65356634655..4c52643446e 100644 --- a/nixos/lib/systemd-lib.nix +++ b/nixos/lib/systemd-lib.nix @@ -187,11 +187,14 @@ in rec { done done - # Symlink all units defined by systemd.units. If these are also - # provided by systemd or systemd.packages, then add them as + # Symlink units defined by systemd.units where override strategy + # shall be automatically detected. If these are also provided by + # systemd or systemd.packages, then add them as # <unit-name>.d/overrides.conf, which makes them extend the # upstream unit. - for i in ${toString (mapAttrsToList (n: v: v.unit) units)}; do + for i in ${toString (mapAttrsToList + (n: v: v.unit) + (lib.filterAttrs (n: v: (attrByPath [ "overrideStrategy" ] "asDropinIfExists" v) == "asDropinIfExists") units))}; do fn=$(basename $i/*) if [ -e $out/$fn ]; then if [ "$(readlink -f $i/$fn)" = /dev/null ]; then @@ -210,6 +213,16 @@ in rec { fi done + # Symlink units defined by systemd.units which shall be + # treated as drop-in file. + for i in ${toString (mapAttrsToList + (n: v: v.unit) + (lib.filterAttrs (n: v: v ? overrideStrategy && v.overrideStrategy == "asDropin") units))}; do + fn=$(basename $i/*) + mkdir -p $out/$fn.d + ln -s $i/$fn $out/$fn.d/overrides.conf + done + # Create service aliases from aliases option. ${concatStrings (mapAttrsToList (name: unit: concatMapStrings (name2: '' @@ -340,7 +353,7 @@ in rec { ''; targetToUnit = name: def: - { inherit (def) aliases wantedBy requiredBy enable; + { inherit (def) aliases wantedBy requiredBy enable overrideStrategy; text = '' [Unit] @@ -349,7 +362,7 @@ in rec { }; serviceToUnit = name: def: - { inherit (def) aliases wantedBy requiredBy enable; + { inherit (def) aliases wantedBy requiredBy enable overrideStrategy; text = commonUnitText def + '' [Service] @@ -371,7 +384,7 @@ in rec { }; socketToUnit = name: def: - { inherit (def) aliases wantedBy requiredBy enable; + { inherit (def) aliases wantedBy requiredBy enable overrideStrategy; text = commonUnitText def + '' [Socket] @@ -382,7 +395,7 @@ in rec { }; timerToUnit = name: def: - { inherit (def) aliases wantedBy requiredBy enable; + { inherit (def) aliases wantedBy requiredBy enable overrideStrategy; text = commonUnitText def + '' [Timer] @@ -391,7 +404,7 @@ in rec { }; pathToUnit = name: def: - { inherit (def) aliases wantedBy requiredBy enable; + { inherit (def) aliases wantedBy requiredBy enable overrideStrategy; text = commonUnitText def + '' [Path] @@ -400,7 +413,7 @@ in rec { }; mountToUnit = name: def: - { inherit (def) aliases wantedBy requiredBy enable; + { inherit (def) aliases wantedBy requiredBy enable overrideStrategy; text = commonUnitText def + '' [Mount] @@ -409,7 +422,7 @@ in rec { }; automountToUnit = name: def: - { inherit (def) aliases wantedBy requiredBy enable; + { inherit (def) aliases wantedBy requiredBy enable overrideStrategy; text = commonUnitText def + '' [Automount] @@ -418,7 +431,7 @@ in rec { }; sliceToUnit = name: def: - { inherit (def) aliases wantedBy requiredBy enable; + { inherit (def) aliases wantedBy requiredBy enable overrideStrategy; text = commonUnitText def + '' [Slice] diff --git a/nixos/lib/systemd-unit-options.nix b/nixos/lib/systemd-unit-options.nix index 1c56b1b9aa0..79c01921781 100644 --- a/nixos/lib/systemd-unit-options.nix +++ b/nixos/lib/systemd-unit-options.nix @@ -48,6 +48,22 @@ in rec { ''; }; + overrideStrategy = mkOption { + default = "asDropinIfExists"; + type = types.enum [ "asDropinIfExists" "asDropin" ]; + description = lib.mdDoc '' + Defines how unit configuration is provided for systemd: + + `asDropinIfExists` creates a unit file when no unit file is provided by the package + otherwise a drop-in file name `overrides.conf`. + + `asDropin` creates a drop-in file named `overrides.conf`. + Mainly needed to define instances for systemd template units (e.g. `systemd-nspawn@mycontainer.service`). + + See also systemd.unit(1). + ''; + }; + requiredBy = mkOption { default = []; type = types.listOf unitNameType; diff --git a/nixos/modules/services/networking/mosquitto.nix b/nixos/modules/services/networking/mosquitto.nix index 5ada92adc9b..6543eb34b4b 100644 --- a/nixos/modules/services/networking/mosquitto.nix +++ b/nixos/modules/services/networking/mosquitto.nix @@ -56,8 +56,10 @@ let default = null; description = mdDoc '' Specifies the hashed password for the MQTT User. - To generate hashed password install `mosquitto` - package and use `mosquitto_passwd`. + To generate hashed password install the `mosquitto` + package and use `mosquitto_passwd`, then extract + the second field (after the `:`) from the generated + file. ''; }; @@ -68,8 +70,9 @@ let description = mdDoc '' Specifies the path to a file containing the hashed password for the MQTT user. - To generate hashed password install `mosquitto` - package and use `mosquitto_passwd`. + To generate hashed password install the `mosquitto` + package and use `mosquitto_passwd`, then remove the + `username:` prefix from the generated file. ''; }; diff --git a/nixos/tests/mosquitto.nix b/nixos/tests/mosquitto.nix index d516d3373d9..70eecc89278 100644 --- a/nixos/tests/mosquitto.nix +++ b/nixos/tests/mosquitto.nix @@ -4,7 +4,7 @@ let port = 1888; tlsPort = 1889; anonPort = 1890; - bindTestPort = 1891; + bindTestPort = 18910; password = "VERY_secret"; hashedPassword = "$7$101$/WJc4Mp+I+uYE9sR$o7z9rD1EYXHPwEP5GqQj6A7k4W1yVbePlb8TqNcuOLV9WNCiDgwHOB0JHC1WCtdkssqTBduBNUnUGd6kmZvDSw=="; topic = "test/foo"; @@ -165,6 +165,10 @@ in { for t in threads: t.start() for t in threads: t.join() + def wait_uuid(uuid): + server.wait_for_console_text(uuid) + return None + start_all() server.wait_for_unit("mosquitto.service") @@ -203,14 +207,14 @@ in { parallel( lambda: client1.succeed(subscribe("-i 3688cdd7-aa07-42a4-be22-cb9352917e40", "reader")), lambda: [ - server.wait_for_console_text("3688cdd7-aa07-42a4-be22-cb9352917e40"), + wait_uuid("3688cdd7-aa07-42a4-be22-cb9352917e40"), client2.succeed(publish("-m test", "writer")) ]) parallel( lambda: client1.fail(subscribe("-i 24ff16a2-ae33-4a51-9098-1b417153c712", "reader")), lambda: [ - server.wait_for_console_text("24ff16a2-ae33-4a51-9098-1b417153c712"), + wait_uuid("24ff16a2-ae33-4a51-9098-1b417153c712"), client2.succeed(publish("-m test", "reader")) ]) @@ -229,7 +233,7 @@ in { lambda: client1.succeed(subscribe("-i fd56032c-d9cb-4813-a3b4-6be0e04c8fc3", "anonReader", port=${toString anonPort})), lambda: [ - server.wait_for_console_text("fd56032c-d9cb-4813-a3b4-6be0e04c8fc3"), + wait_uuid("fd56032c-d9cb-4813-a3b4-6be0e04c8fc3"), client2.succeed(publish("-m test", "anonWriter", port=${toString anonPort})) ]) ''; diff --git a/nixos/tests/systemd-machinectl.nix b/nixos/tests/systemd-machinectl.nix index fa5c81599eb..b8ed0c33e8e 100644 --- a/nixos/tests/systemd-machinectl.nix +++ b/nixos/tests/systemd-machinectl.nix @@ -44,6 +44,14 @@ import ./make-test-python.nix ({ pkgs, ... }: # not needed, but we want to test the nspawn file generation systemd.nspawn.${containerName} = { }; + + systemd.services."systemd-nspawn@${containerName}" = { + serviceConfig.Environment = [ + # Disable tmpfs for /tmp + "SYSTEMD_NSPAWN_TMPFS_TMP=0" + ]; + overrideStrategy = "asDropin"; + }; }; testScript = '' @@ -95,6 +103,9 @@ import ./make-test-python.nix ({ pkgs, ... }: machine.succeed("machinectl stop ${containerName}"); machine.wait_until_succeeds("test $(systemctl is-active systemd-nspawn@${containerName}) = inactive"); + # Test tmpfs for /tmp + machine.fail("mountpoint /tmp"); + # Show to to delete the container machine.succeed("chattr -i ${containerRoot}/var/empty"); machine.succeed("rm -rf ${containerRoot}"); diff --git a/pkgs/applications/audio/mmtc/default.nix b/pkgs/applications/audio/mmtc/default.nix index e1cb2a1eb23..db6e0d27be7 100644 --- a/pkgs/applications/audio/mmtc/default.nix +++ b/pkgs/applications/audio/mmtc/default.nix @@ -2,25 +2,25 @@ rustPlatform.buildRustPackage rec { pname = "mmtc"; - version = "0.2.15"; + version = "0.3.0"; src = fetchFromGitHub { owner = "figsoda"; repo = pname; rev = "v${version}"; - sha256 = "sha256-GQ1SoZE74o8fsXHVdjdEMbdUeefyPb4FXxidcHCy180="; + sha256 = "sha256-fWd349IDlN6XNv7MrqJeLwkmevZoKXLSz8a09YWsNcI="; }; - cargoSha256 = "sha256-2IcOwjYTRl2tCB/YAuDACpgaRKZ/21IKWpVs+koYH3k="; + cargoSha256 = "sha256-WrEC3zWwY1plOn8DrspbJFI3R/fE6yDQT2u2lVubbQU="; nativeBuildInputs = [ installShellFiles ]; - preFixup = '' - completions=($releaseDir/build/mmtc-*/out/completions) - installShellCompletion $completions/mmtc.{bash,fish} --zsh $completions/_mmtc + postInstall = '' + installManPage artifacts/mmtc.1 + installShellCompletion artifacts/mmtc.{bash,fish} --zsh artifacts/_mmtc ''; - GEN_COMPLETIONS = 1; + GEN_ARTIFACTS = "artifacts"; meta = with lib; { description = "Minimal mpd terminal client that aims to be simple yet highly configurable"; diff --git a/pkgs/applications/editors/emacs/elisp-packages/emacspeak/default.nix b/pkgs/applications/editors/emacs/elisp-packages/emacspeak/default.nix index 54805d43b24..927605676cf 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/emacspeak/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/emacspeak/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "emacspeak"; - version = "54.0"; + version = "56.0"; src = fetchFromGitHub { owner = "tvraman"; repo = pname; rev = version; - hash= "sha256-aOZ8PmkASJKETPhXhE9WQXyJS7SPe+d97fK/piqqzqc="; + hash= "sha256-juy+nQ7DrG818/uTH6Dv/lrrzu8qzPWwi0sX7JrhHK8="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/plover/default.nix b/pkgs/applications/misc/plover/default.nix index 6bd4ee6b3c1..eadd7672bec 100644 --- a/pkgs/applications/misc/plover/default.nix +++ b/pkgs/applications/misc/plover/default.nix @@ -1,5 +1,4 @@ -{ lib, fetchFromGitHub, python27Packages, python3Packages, wmctrl, - qtbase, mkDerivationWith }: +{ lib, fetchFromGitHub, python3Packages, wmctrl, qtbase, mkDerivationWith }: { stable = throw "plover.stable was removed because it used Python 2. Use plover.dev instead."; # added 2022-06-05 diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index cee8eafbc9c..f78aba44f23 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -3,7 +3,7 @@ let versions = if stdenv.isLinux then { stable = "0.0.21"; ptb = "0.0.34"; - canary = "0.0.140"; + canary = "0.0.142"; } else { stable = "0.0.264"; ptb = "0.0.59"; @@ -22,7 +22,7 @@ let }; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; - sha256 = "sha256-AEbjkAMeOJ48RVgbVj35Rp26klCsCsDCX+VD5u1xCM0="; + sha256 = "sha256-/EWJC3hFIBqwHa9z4nMWR7CpoaqYY+pvw+1vcq4F0LU="; }; }; aarch64-darwin = { diff --git a/pkgs/applications/networking/n8n/node-packages.nix b/pkgs/applications/networking/n8n/node-packages.nix index fb578d0d05e..6836e00c7e0 100644 --- a/pkgs/applications/networking/n8n/node-packages.nix +++ b/pkgs/applications/networking/n8n/node-packages.nix @@ -166,49 +166,121 @@ let sha512 = "UA/8dgLy3+ZiwJjAZHxL4MUB14fFQPkaAOZ94jsTW/Z6WmoOeny2+cLk0+dyIX/iH6qSrEWKwbStEeB970B9pA=="; }; }; - "@azure/msal-browser-2.29.0" = { + "@azure/msal-browser-2.30.0" = { name = "_at_azure_slash_msal-browser"; packageName = "@azure/msal-browser"; - version = "2.29.0"; + version = "2.30.0"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/msal-browser/-/msal-browser-2.29.0.tgz"; - sha512 = "ezrB0qL1WsJSNgvLmAN5vKr/4pH28UYLe8JUZeHzB6Z408JU8qYXXGnHAhDPzpDg0g91eG05IdIVrLwxk/i15g=="; + url = "https://registry.npmjs.org/@azure/msal-browser/-/msal-browser-2.30.0.tgz"; + sha512 = "4Y9+rjJiTFP7KEmuq1btmIrBgk0ImNyKsXj6A6NHZALd1X0M6W7L7kxpH6F+d1tEkMv8bYnZdn7IcauXbL8Llw=="; }; }; - "@azure/msal-common-7.5.0" = { + "@azure/msal-common-7.6.0" = { name = "_at_azure_slash_msal-common"; packageName = "@azure/msal-common"; - version = "7.5.0"; + version = "7.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/msal-common/-/msal-common-7.5.0.tgz"; - sha512 = "W+SIsGSjkUAyDggA/6QVMKErttQ/8Bq9l/7ADr7GJwt9JFsc+XNBdQDsOsUvZ7YCVkZcSgzJw2MZJLIBqfQtQA=="; + url = "https://registry.npmjs.org/@azure/msal-common/-/msal-common-7.6.0.tgz"; + sha512 = "XqfbglUTVLdkHQ8F9UQJtKseRr3sSnr9ysboxtoswvaMVaEfvyLtMoHv9XdKUfOc0qKGzNgRFd9yRjIWVepl6Q=="; }; }; - "@azure/msal-node-1.14.1" = { + "@azure/msal-node-1.14.2" = { name = "_at_azure_slash_msal-node"; packageName = "@azure/msal-node"; - version = "1.14.1"; + version = "1.14.2"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/msal-node/-/msal-node-1.14.1.tgz"; - sha512 = "RftjLd35xlafh5cPT17zrzpYdcsbHKJal7R/FTbThpbetSk8y8vQHUzNwWNhBM6GFFiyMS4IQ+zs+z8bgJ4sKQ=="; + url = "https://registry.npmjs.org/@azure/msal-node/-/msal-node-1.14.2.tgz"; + sha512 = "t3whVhhLdZVVeDEtUPD2Wqfa8BDi3EDMnpWp8dbuRW0GhUpikBfs4AQU0Fe6P9zS87n9LpmUTLrIcPEEuzkvfA=="; }; }; - "@azure/storage-blob-12.11.0" = { + "@azure/storage-blob-12.12.0" = { name = "_at_azure_slash_storage-blob"; packageName = "@azure/storage-blob"; - version = "12.11.0"; + version = "12.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/storage-blob/-/storage-blob-12.11.0.tgz"; - sha512 = "na+FisoARuaOWaHWpmdtk3FeuTWf2VWamdJ9/TJJzj5ZdXPLC3juoDgFs6XVuJIoK30yuBpyFBEDXVRK4pB7Tg=="; + url = "https://registry.npmjs.org/@azure/storage-blob/-/storage-blob-12.12.0.tgz"; + sha512 = "o/Mf6lkyYG/eBW4/hXB9864RxVNmAkcKHjsGR6Inlp5hupa3exjSyH2KjO3tLO//YGA+tS+17hM2bxRl9Sn16g=="; }; }; - "@babel/runtime-7.19.4" = { + "@babel/parser-7.20.0" = { + name = "_at_babel_slash_parser"; + packageName = "@babel/parser"; + version = "7.20.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.20.0.tgz"; + sha512 = "G9VgAhEaICnz8iiJeGJQyVl6J2nTjbW0xeisva0PK6XcKsga7BIaqm4ZF8Rg1Wbaqmy6znspNqhPaPkyukujzg=="; + }; + }; + "@babel/runtime-7.20.0" = { name = "_at_babel_slash_runtime"; packageName = "@babel/runtime"; - version = "7.19.4"; + version = "7.20.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.20.0.tgz"; + sha512 = "NDYdls71fTXoU8TZHfbBWg7DiZfNzClcKui/+kyi6ppD2L1qnWW3VV6CjtaBXSUGGhiTWJ6ereOIkUvenif66Q=="; + }; + }; + "@codemirror/autocomplete-6.3.0" = { + name = "_at_codemirror_slash_autocomplete"; + packageName = "@codemirror/autocomplete"; + version = "6.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@codemirror/autocomplete/-/autocomplete-6.3.0.tgz"; + sha512 = "4jEvh3AjJZTDKazd10J6ZsCIqaYxDMCeua5ouQxY8hlFIml+nr7le0SgBhT3SIytFBmdzPK3AUhXGuW3T79nVg=="; + }; + }; + "@codemirror/commands-6.1.2" = { + name = "_at_codemirror_slash_commands"; + packageName = "@codemirror/commands"; + version = "6.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@codemirror/commands/-/commands-6.1.2.tgz"; + sha512 = "sO3jdX1s0pam6lIdeSJLMN3DQ6mPEbM4yLvyKkdqtmd/UDwhXA5+AwFJ89rRXm6vTeOXBsE5cAmlos/t7MJdgg=="; + }; + }; + "@codemirror/lang-javascript-6.1.1" = { + name = "_at_codemirror_slash_lang-javascript"; + packageName = "@codemirror/lang-javascript"; + version = "6.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@codemirror/lang-javascript/-/lang-javascript-6.1.1.tgz"; + sha512 = "F4+kiuC5d5dUSJmff96tJQwpEXs/tX/4bapMRnZWW6bHKK1Fx6MunTzopkCUWRa9bF87GPmb9m7Qtg7Yv8f3uQ=="; + }; + }; + "@codemirror/language-6.3.0" = { + name = "_at_codemirror_slash_language"; + packageName = "@codemirror/language"; + version = "6.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.19.4.tgz"; - sha512 = "EXpLCrk55f+cYqmHsSR+yD/0gAIMxxA9QK9lnQWzhMCvt+YmoBN7Zx94s++Kv0+unHk39vxNO8t+CMA2WSS3wA=="; + url = "https://registry.npmjs.org/@codemirror/language/-/language-6.3.0.tgz"; + sha512 = "6jOE5DEt6sKD46SXhn3xPbBehn+l48ACcA6Uxs2k+E2YNH9XGF5WdGMTYr2DlggfK4h0QZBK6zEb5S7lkTriWA=="; + }; + }; + "@codemirror/lint-6.0.0" = { + name = "_at_codemirror_slash_lint"; + packageName = "@codemirror/lint"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@codemirror/lint/-/lint-6.0.0.tgz"; + sha512 = "nUUXcJW1Xp54kNs+a1ToPLK8MadO0rMTnJB8Zk4Z8gBdrN0kqV7uvUraU/T2yqg+grDNR38Vmy/MrhQN/RgwiA=="; + }; + }; + "@codemirror/state-6.1.2" = { + name = "_at_codemirror_slash_state"; + packageName = "@codemirror/state"; + version = "6.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@codemirror/state/-/state-6.1.2.tgz"; + sha512 = "Mxff85Hp5va+zuj+H748KbubXjrinX/k28lj43H14T2D0+4kuvEFIEIO7hCEcvBT8ubZyIelt9yGOjj2MWOEQA=="; + }; + }; + "@codemirror/view-6.4.0" = { + name = "_at_codemirror_slash_view"; + packageName = "@codemirror/view"; + version = "6.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@codemirror/view/-/view-6.4.0.tgz"; + sha512 = "Kv32b6Tn7QVwFbj/EDswTLSocjk5kgggF6zzBFAL4o4hZ/vmtFD155+EjH1pVlbfoDyVC2M6SedPsMrwYscgNg=="; }; }; "@colors/colors-1.5.0" = { @@ -247,13 +319,13 @@ let sha512 = "hrlQOIi7hAfzsMqlGSFyVucrx38O+j6wiGOf//H2ecvIEqYN4ADBSS2iLMh5UFyDunCNniUIPk/q3riFv45xRA=="; }; }; - "@fontsource/open-sans-4.5.12" = { + "@fontsource/open-sans-4.5.13" = { name = "_at_fontsource_slash_open-sans"; packageName = "@fontsource/open-sans"; - version = "4.5.12"; + version = "4.5.13"; src = fetchurl { - url = "https://registry.npmjs.org/@fontsource/open-sans/-/open-sans-4.5.12.tgz"; - sha512 = "WKCexsVbOECJUSOgG7GnrUxe+3ds4Sa1yhsTjSnszI+0TaJvMZnDnn5YDKwA/KwLbkZqCaV3nvMTH97jJuxWNA=="; + url = "https://registry.npmjs.org/@fontsource/open-sans/-/open-sans-4.5.13.tgz"; + sha512 = "/UzqP7ZFk145XAq8KG4pvFPP7UQhtreDGXgqXZjagCDreKxcrhwn/x7DYz9rPcycWkLUVApIybcoczGZiM0cRg=="; }; }; "@fortawesome/fontawesome-common-types-0.2.36" = { @@ -337,13 +409,13 @@ let sha512 = "RxSa9VjcDWgWCYsaLdZItdCnJj7p4LxggaEk+Y3MP0dHKoxez8ioG07DVekVbZZqccsrL+oPB/N9AzVPxj4blg=="; }; }; - "@js-joda/core-5.4.1" = { + "@js-joda/core-5.4.2" = { name = "_at_js-joda_slash_core"; packageName = "@js-joda/core"; - version = "5.4.1"; + version = "5.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/@js-joda/core/-/core-5.4.1.tgz"; - sha512 = "+uMco2Xm9VYJ81XYWwrvgsM9xEvqs9JvLNrN4/fOg7YJKk4yeqAg+O/cpoFPTGxvfL2Zy0mUcnKlIz9UV0Cadw=="; + url = "https://registry.npmjs.org/@js-joda/core/-/core-5.4.2.tgz"; + sha512 = "QIDIZ9a0NfDStgD47VaTgwiPjlw1p4QPLwjOB/9+/DqIztoQopPNNAd+HdtQMHgE+ibP3dJacd8/TVL/A1RaaA=="; }; }; "@jsdevtools/ono-7.1.3" = { @@ -382,6 +454,42 @@ let sha512 = "GaHYm+c0O9MjZRu0ongGBRbinu8gVAMd2UZjji6jVmqKtZluZnptXGWhz1E8j8D2HJ3f/yMxKAUC0b+57wncIw=="; }; }; + "@lezer/common-1.0.1" = { + name = "_at_lezer_slash_common"; + packageName = "@lezer/common"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@lezer/common/-/common-1.0.1.tgz"; + sha512 = "8TR5++Q/F//tpDsLd5zkrvEX5xxeemafEaek7mUp7Y+bI8cKQXdSqhzTOBaOogETcMOVr0pT3BBPXp13477ciw=="; + }; + }; + "@lezer/highlight-1.1.2" = { + name = "_at_lezer_slash_highlight"; + packageName = "@lezer/highlight"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@lezer/highlight/-/highlight-1.1.2.tgz"; + sha512 = "CAun1WR1glxG9ZdOokTZwXbcwB7PXkIEyZRUMFBVwSrhTcogWq634/ByNImrkUnQhjju6xsIaOBIxvcRJtplXQ=="; + }; + }; + "@lezer/javascript-1.0.2" = { + name = "_at_lezer_slash_javascript"; + packageName = "@lezer/javascript"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@lezer/javascript/-/javascript-1.0.2.tgz"; + sha512 = "IjOVeIRhM8IuafWNnk+UzRz7p4/JSOKBNINLYLsdSGuJS9Ju7vFdc82AlTt0jgtV5D8eBZf4g0vK4d3ttBNz7A=="; + }; + }; + "@lezer/lr-1.2.3" = { + name = "_at_lezer_slash_lr"; + packageName = "@lezer/lr"; + version = "1.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@lezer/lr/-/lr-1.2.3.tgz"; + sha512 = "qpB7rBzH8f6Mzjv2AVZRahcm+2Cf7nbIH++uXbvVOL1yIRvVWQ3HAM/saeBLCyz/togB7LGo76qdJYL1uKQlqA=="; + }; + }; "@mapbox/node-pre-gyp-1.0.10" = { name = "_at_mapbox_slash_node-pre-gyp"; packageName = "@mapbox/node-pre-gyp"; @@ -463,13 +571,13 @@ let sha512 = "R6dBedaUVn5jtAh79aaRm7jezx4l3V7Im9NORlLmudz5BL1foMeuXEvnqm+bMiejyexVA+oi9mto6YKZPzo/5Q=="; }; }; - "@oclif/core-1.16.5" = { + "@oclif/core-1.19.2" = { name = "_at_oclif_slash_core"; packageName = "@oclif/core"; - version = "1.16.5"; + version = "1.19.2"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/core/-/core-1.16.5.tgz"; - sha512 = "Jb58K79AALkLmY0PNU1Jx4Z+/JIWtpgtRbei92PIIBx+TaAmYgVySNI1beInZFNOpGo2fhxVBp+yr3DZ38z3kQ=="; + url = "https://registry.npmjs.org/@oclif/core/-/core-1.19.2.tgz"; + sha512 = "n5ni/NNR6+I0IQXVGoLKdrdw6IS3WH/R/hw6WX8ERfLMZACrNSuJFD9EmBZkztyRkmiQ2L06ULazW5bJn5Shog=="; }; }; "@oclif/errors-1.3.6" = { @@ -535,13 +643,13 @@ let sha512 = "kJYCXv6fRFbQrAp3hMsgRCnAa7RUBdbiGLBT9PcpQURi0VwHmD7mk3Ja7U4HDnL0EHXYJpPyx3oSonkklmPJ9Q=="; }; }; - "@sap/hana-client-2.14.18" = { + "@sap/hana-client-2.14.22" = { name = "_at_sap_slash_hana-client"; packageName = "@sap/hana-client"; - version = "2.14.18"; + version = "2.14.22"; src = fetchurl { - url = "https://registry.npmjs.org/@sap/hana-client/-/hana-client-2.14.18.tgz"; - sha512 = "9TfoDuxWZyUYIwISVVMPguX9iirZrD0cI6rI0xXg6URRaqk71GZ5U0ueomeZapSY1nni2Yf+th1ZjU+jSUw/9g=="; + url = "https://registry.npmjs.org/@sap/hana-client/-/hana-client-2.14.22.tgz"; + sha512 = "Do1VnybxssI5kAg/ti4GoEOhgU7p7R9T9/v9amzDNZMg7rC7C4LVno+x++ERTWv81pzSaSrYKkr2O/MP7OE1hA=="; }; }; "@segment/loosely-validate-event-2.0.0" = { @@ -571,13 +679,13 @@ let sha512 = "sBSO19KzdrJCM3gdx6eIxV8M9Gxfgg6iDQmH5TIAGaUu+X9VDdsINXJOnoiZ1Kx3TrHdH4bt5UVglkjsEGBcvw=="; }; }; - "@sqltools/formatter-1.2.3" = { + "@sqltools/formatter-1.2.5" = { name = "_at_sqltools_slash_formatter"; packageName = "@sqltools/formatter"; - version = "1.2.3"; + version = "1.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/@sqltools/formatter/-/formatter-1.2.3.tgz"; - sha512 = "O3uyB/JbkAEMZaP3YqyHH7TMnex7tWyCbCI4EfJdOCoN6HIhqdJBWTM6aCCiWQ/5f5wxjgU735QAIpJbjDvmzg=="; + url = "https://registry.npmjs.org/@sqltools/formatter/-/formatter-1.2.5.tgz"; + sha512 = "Uy0+khmZqUrUGm5dmMqVlnvufZRSK0FbYzVgp0UMstm+F5+W2/jnEEQyc9vo1ZR/E5ZI/B1WjjoTqBqwJL6Krw=="; }; }; "@techteamer/ocsp-1.0.0" = { @@ -679,22 +787,22 @@ let sha512 = "DxMhY+NAsTwMMFHBTtJFNp5qiHKJ7TeqOo23zVEM9alT1Ml27Q3xcTH0xwxn7Q0BbMcVEJOs/7aQtUWupUQN3Q=="; }; }; - "@types/express-unless-0.5.3" = { + "@types/express-unless-2.0.1" = { name = "_at_types_slash_express-unless"; packageName = "@types/express-unless"; - version = "0.5.3"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/express-unless/-/express-unless-0.5.3.tgz"; - sha512 = "TyPLQaF6w8UlWdv4gj8i46B+INBVzURBNRahCozCSXfsK2VTlL1wNyTlMKw817VHygBtlcl5jfnPadlydr06Yw=="; + url = "https://registry.npmjs.org/@types/express-unless/-/express-unless-2.0.1.tgz"; + sha512 = "PJLiNw03EjkWDkQbhNjIXXDLObC3eMQhFASDV+WakFbT8eL7YdjlbV6MXd3Av5Lejq499d6pFuV1jyK+EHyG3Q=="; }; }; - "@types/js-nacl-1.3.0" = { + "@types/js-nacl-1.3.1" = { name = "_at_types_slash_js-nacl"; packageName = "@types/js-nacl"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/js-nacl/-/js-nacl-1.3.0.tgz"; - sha512 = "juUvxo444ZfwDSwWyhssMxSN+snqTdiUoOVXZF+/ffVrGHq3rAf1fmczWn3z9TCEAuRbaTmgAcYlZ9MutyyOkQ=="; + url = "https://registry.npmjs.org/@types/js-nacl/-/js-nacl-1.3.1.tgz"; + sha512 = "flSA1xio62MepOtcglW7s+V7jFoJqGAAQXFRKZ3NkLbw36LEoQYQQ2jighvbr7DB1g6bCFB4YOx+x/CNQj1TsA=="; }; }; "@types/json-schema-7.0.11" = { @@ -742,13 +850,13 @@ let sha512 = "J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ=="; }; }; - "@types/node-18.8.3" = { + "@types/node-18.11.7" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "18.8.3"; + version = "18.11.7"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-18.8.3.tgz"; - sha512 = "0os9vz6BpGwxGe9LOhgP/ncvYN5Tx1fNcd2TM3rD/aCGBkysb+ZWpXEocG24h6ZzOi13+VB8HndAQFezsSOw1w=="; + url = "https://registry.npmjs.org/@types/node/-/node-18.11.7.tgz"; + sha512 = "LhFTglglr63mNXUSRYD8A+ZAIu5sFqNJ4Y2fPuY7UlrySJH87rRRlhtVmMHplmfk5WkoJGmDjE9oiTfyX94CpQ=="; }; }; "@types/node-fetch-2.6.2" = { @@ -832,13 +940,22 @@ let sha512 = "FtQu10RWgn3D9U4aazdwIE2yzphmTJREDqNdODHrbrZmmMqI0vMheC/6NE/J1Yveaj8H+ela+YwWTjq5PGmuhA=="; }; }; - "@xmldom/xmldom-0.7.5" = { + "@vue/compiler-sfc-2.7.13" = { + name = "_at_vue_slash_compiler-sfc"; + packageName = "@vue/compiler-sfc"; + version = "2.7.13"; + src = fetchurl { + url = "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-2.7.13.tgz"; + sha512 = "zzu2rLRZlgIU+OT3Atbr7Y6PG+LW4wVQpPfNRrGDH3dM9PsrcVfa+1pKb8bW467bGM3aDOvAnsYLWVpYIv3GRg=="; + }; + }; + "@xmldom/xmldom-0.7.6" = { name = "_at_xmldom_slash_xmldom"; packageName = "@xmldom/xmldom"; - version = "0.7.5"; + version = "0.7.6"; src = fetchurl { - url = "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.7.5.tgz"; - sha512 = "V3BIhmY36fXZ1OtVcI9W+FxQqxVLsPKcNjWigIaa81dLC9IolJl5Mt4Cvhmr0flUnjSpTdrbMTSbXqYqV5dT6A=="; + url = "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.7.6.tgz"; + sha512 = "HHXP9hskkFQHy8QxxUXkS7946FFIhYVfGqsk0WLwllmexN9x/+R4UBLvurHEuyXRfVEObVR8APuQehykLviwSQ=="; }; }; "a-sync-waterfall-1.0.1" = { @@ -886,13 +1003,13 @@ let sha512 = "H5aqjkogmFxfaOrfn/e42vyspHVXuJ8er63KuljJXpOyJ1ZO/U5CrHfO8BLKIy2w7mBM02L5quL0vbfQqrGQbA=="; }; }; - "acorn-8.8.0" = { + "acorn-8.8.1" = { name = "acorn"; packageName = "acorn"; - version = "8.8.0"; + version = "8.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-8.8.0.tgz"; - sha512 = "QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w=="; + url = "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz"; + sha512 = "7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA=="; }; }; "acorn-walk-8.2.0" = { @@ -913,15 +1030,6 @@ let sha512 = "gMKr8RuYEYvsj7jyfCv/4BfKToQThz20SP71N3AtFn3ia3yAR8Qt2T3aVQhuJzunWs2b38ZsQV0qsZPdwZr7VQ=="; }; }; - "address-1.2.1" = { - name = "address"; - packageName = "address"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/address/-/address-1.2.1.tgz"; - sha512 = "B+6bi5D34+fDYENiH5qOlA0cV2rAGKuWZ9LeyUUehbXy8e0VS9e498yO0Jeeh+iM+6KbfudHTFjXw2MmJD4QRA=="; - }; - }; "adler-32-1.2.0" = { name = "adler-32"; packageName = "adler-32"; @@ -1300,13 +1408,13 @@ let sha512 = "jyn9tfd9J3h7pgJSk4qQ/1c1Tk5qiXrvmdCDON2UjcFplqRu/KpmKmpi+Ess8ZKmmqK12U4Y3VHrfwQs1xSMZA=="; }; }; - "aws-sdk-2.1231.0" = { + "aws-sdk-2.1242.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.1231.0"; + version = "2.1242.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1231.0.tgz"; - sha512 = "ONBuRsOxsu0zL8u/Vmz49tPWi9D4ls2pjb6szdfSx9VQef7bOnWe9gJpWoA94OTzcjOWsvjsG7UgjvQJkIuPBg=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1242.0.tgz"; + sha512 = "qVpaMafIHw3Mn3Mo7zTY4Xq8lHkTxIRQJFV5ronsi4lTLqhqF1rANoPKSlVWxUPRyG5so/we+ZUIog5wpjSgiw=="; }; }; "aws-sign2-0.7.0" = { @@ -1525,13 +1633,13 @@ let sha512 = "1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w=="; }; }; - "bl-5.0.0" = { + "bl-5.1.0" = { name = "bl"; packageName = "bl"; - version = "5.0.0"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/bl/-/bl-5.0.0.tgz"; - sha512 = "8vxFNZ0pflFfi0WXA3WQXlj6CaMEwsmh63I1CNp0q+wWv8sD0ARx1KovSQd0l2GkwrMIOyedq0EF1FxI+RCZLQ=="; + url = "https://registry.npmjs.org/bl/-/bl-5.1.0.tgz"; + sha512 = "tv1ZJHLfTDnXE6tMHv73YgSJaWR2AFuPwMntBe7XL/GBFHnT0CLnsHMogfk5+GzCDC5ZWarSCYaIGATZt9dNsQ=="; }; }; "bluebird-2.11.0" = { @@ -1705,13 +1813,13 @@ let sha512 = "a7ZpuTZU1TRtnwyCNW3I5dc0wWNC3VR9S++Ewyk2HHZdrO3CQJqSpd+95Us590V6AL7JqUAH2IwZ/398PmNFgw=="; }; }; - "bufferutil-4.0.6" = { + "bufferutil-4.0.7" = { name = "bufferutil"; packageName = "bufferutil"; - version = "4.0.6"; + version = "4.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/bufferutil/-/bufferutil-4.0.6.tgz"; - sha512 = "jduaYOYtnio4aIAyc6UbvPCVcgq7nYpVnucyxr6eCYg/Woad9Hf/oxxBRDnGGjPfjUm6j5O/uBWhIu4iLebFaw=="; + url = "https://registry.npmjs.org/bufferutil/-/bufferutil-4.0.7.tgz"; + sha512 = "kukuqc39WOHtdxtw4UScxF/WVnMFVSQVKhtx3AjZJzhd0RGZZldcrfSEbVsWWe6KNH253574cq5F+wpv0G9pJw=="; }; }; "bull-3.29.3" = { @@ -2371,13 +2479,13 @@ let sha512 = "Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ=="; }; }; - "core-js-3.25.5" = { + "core-js-3.26.0" = { name = "core-js"; packageName = "core-js"; - version = "3.25.5"; + version = "3.26.0"; src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-3.25.5.tgz"; - sha512 = "nbm6eZSjm+ZuBQxCUPQKQCoUEfFOXjUZ8dTTyikyKaWrTYmAVbykQfwsKE5dBK88u3QCkCrzsx/PPlKfhsvgpw=="; + url = "https://registry.npmjs.org/core-js/-/core-js-3.26.0.tgz"; + sha512 = "+DkDrhoR4Y0PxDz6rurahuB+I45OsEUv8E1maPTB6OuHRohMMcznBq9TMpdpDMm/hUPob/mJJS3PqgbHpMTQgw=="; }; }; "core-util-is-1.0.2" = { @@ -2407,6 +2515,15 @@ let sha512 = "ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ=="; }; }; + "crelt-1.0.5" = { + name = "crelt"; + packageName = "crelt"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/crelt/-/crelt-1.0.5.tgz"; + sha512 = "+BO9wPPi+DWTDcNYhr/W90myha8ptzftZT+LwcmUbbok0rcP/fequmFYCw8NMoH7pkAZQzU78b3kYrlua5a9eA=="; + }; + }; "cron-1.7.2" = { name = "cron"; packageName = "cron"; @@ -2479,6 +2596,15 @@ let sha512 = "wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ=="; }; }; + "css-select-5.1.0" = { + name = "css-select"; + packageName = "css-select"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/css-select/-/css-select-5.1.0.tgz"; + sha512 = "nwoRF1rvRRnnCqqY7updORDsuqKzqYJ28+oSMaJMMgOauh3fvwHqMS7EZpIPqK8GL+g9mKxF1vP/ZjSeNjEVHg=="; + }; + }; "css-what-6.1.0" = { name = "css-what"; packageName = "css-what"; @@ -2497,6 +2623,15 @@ let sha512 = "FAaLDaplstoRsDR8XGYH51znUN0UY7nMc6Z9/fvE8EXGwvJE9hu7W2vHwx1+bd6gCYnln9nLbzxFTrcO9YQDZw=="; }; }; + "csstype-3.1.1" = { + name = "csstype"; + packageName = "csstype"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/csstype/-/csstype-3.1.1.tgz"; + sha512 = "DJR/VvkAvSZW9bTouZue2sSxDwdTN92uHjqeKVm+0dAqdfNykRzQ95tay8aXMBAAPpUiq4Qcug2L7neoRh2Egw=="; + }; + }; "curlconverter-3.21.0" = { name = "curlconverter"; packageName = "curlconverter"; @@ -2821,13 +2956,13 @@ let sha512 = "9YVwmMb0wQHQNr5J9m6BSj6fk4pfGITGQOOs+D9Fl+INODWFOfvhIU1hNv6GgR1RBoC/9NJcwu77zShxV0kT7w=="; }; }; - "digest-header-0.0.1" = { + "digest-header-1.0.0" = { name = "digest-header"; packageName = "digest-header"; - version = "0.0.1"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/digest-header/-/digest-header-0.0.1.tgz"; - sha512 = "Qi0KOZgRnkQJuvMWbs1ZRRajEnbsMU8xlJI4rHIbPC+skHQ30heO5cIHpUFT4jAvAe+zPtdavLSAxASqoyZ3cg=="; + url = "https://registry.npmjs.org/digest-header/-/digest-header-1.0.0.tgz"; + sha512 = "sRTuakZ2PkOUCuAaVv+SLjhr/hRf8ldZP0XnGEQ69RFGxmll5fVaMsnRXWKKK4XsUTnJf8+eRPSFNgE/lWa9wQ=="; }; }; "dir-glob-3.0.1" = { @@ -2866,6 +3001,15 @@ let sha512 = "VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag=="; }; }; + "dom-serializer-2.0.0" = { + name = "dom-serializer"; + packageName = "dom-serializer"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz"; + sha512 = "wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg=="; + }; + }; "domelementtype-2.3.0" = { name = "domelementtype"; packageName = "domelementtype"; @@ -2884,6 +3028,15 @@ let sha512 = "GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ=="; }; }; + "domhandler-5.0.3" = { + name = "domhandler"; + packageName = "domhandler"; + version = "5.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/domhandler/-/domhandler-5.0.3.tgz"; + sha512 = "cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w=="; + }; + }; "domutils-2.8.0" = { name = "domutils"; packageName = "domutils"; @@ -2893,6 +3046,15 @@ let sha512 = "w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A=="; }; }; + "domutils-3.0.1" = { + name = "domutils"; + packageName = "domutils"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/domutils/-/domutils-3.0.1.tgz"; + sha512 = "z08c1l761iKhDFtfXO04C7kTdPBLi41zwOZl00WS8b5eiaebNpY00HKbztwBq+e3vyqWNwWF3mP9YLUeqIrF+Q=="; + }; + }; "dot-case-3.0.4" = { name = "dot-case"; packageName = "dot-case"; @@ -3046,6 +3208,15 @@ let sha512 = "p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A=="; }; }; + "entities-4.4.0" = { + name = "entities"; + packageName = "entities"; + version = "4.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/entities/-/entities-4.4.0.tgz"; + sha512 = "oYp7156SP8LkeGD0GF85ad1X9Ai79WtRsZ2gxJqtBuzH+98YUV6jkHEKlZkMbcrjJjIVJNIDP/3WL9wQkoPbWA=="; + }; + }; "env-paths-2.2.1" = { name = "env-paths"; packageName = "env-paths"; @@ -3316,6 +3487,15 @@ let sha512 = "89/sdkq+BKBuIyykaMl/vR9grFc3WFUPTjFo0THHbu+5g+q8rA7fKeoMfz+h84yOQIBcztmJ5ZJdk5uhEls31A=="; }; }; + "express-unless-2.1.3" = { + name = "express-unless"; + packageName = "express-unless"; + version = "2.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/express-unless/-/express-unless-2.1.3.tgz"; + sha512 = "wj4tLMyCVYuIIKHGt0FhCtIViBcwzWejX0EjNxveAa6dG+0XBCQhMbx+PnkLkFCxLC69qoFrxds4pIyL88inaQ=="; + }; + }; "extend-3.0.2" = { name = "extend"; packageName = "extend"; @@ -4198,13 +4378,13 @@ let sha512 = "4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw=="; }; }; - "ics-2.40.0" = { + "ics-2.41.0" = { name = "ics"; packageName = "ics"; - version = "2.40.0"; + version = "2.41.0"; src = fetchurl { - url = "https://registry.npmjs.org/ics/-/ics-2.40.0.tgz"; - sha512 = "PPkE9ij60sGhqdTxZZzsXQPB/TCXAB/dD3NqUf1I/GkbJzPeJHHMzaoMQiYAsm1pFaHRp2OIhFDgUBihkk8s/w=="; + url = "https://registry.npmjs.org/ics/-/ics-2.41.0.tgz"; + sha512 = "6oleMfOpdBIrZGMNrTutwW7eFwua8lOkymDNxMXlsVF00HghqH+I3S6frt3a2rfjXTlkI0qiY2rnsKP2JQ9vJA=="; }; }; "ieee754-1.1.13" = { @@ -4450,13 +4630,13 @@ let sha512 = "1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA=="; }; }; - "is-core-module-2.10.0" = { + "is-core-module-2.11.0" = { name = "is-core-module"; packageName = "is-core-module"; - version = "2.10.0"; + version = "2.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.10.0.tgz"; - sha512 = "Erxj2n/LDAZ7H8WNJXd9tw38GYM3dv8rk8Zcs+jJuxYTW7sozH+SS8NtrSjVL1/vpLvWi1hxy96IzjJ3EHTJJg=="; + url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.11.0.tgz"; + sha512 = "RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw=="; }; }; "is-date-object-1.0.5" = { @@ -4792,13 +4972,13 @@ let sha512 = "xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw=="; }; }; - "isbot-3.6.1" = { + "isbot-3.6.2" = { name = "isbot"; packageName = "isbot"; - version = "3.6.1"; + version = "3.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/isbot/-/isbot-3.6.1.tgz"; - sha512 = "e1RmjWns87x60QyiHberWWMJGutL3+Ad0nZ8cz735iDEDDS6ApPfKSFo4EMj0PmMZ0m0ntpWIM0ADdqDFvUJPQ=="; + url = "https://registry.npmjs.org/isbot/-/isbot-3.6.2.tgz"; + sha512 = "jk8IRbrvyTJC2f4VpxXQ4ff+xVJgsXHygtpc5Sl6m9PWuF8oXVcpEmcZKR88j5WOoqpHTxrOKccCpxdAgW7Afw=="; }; }; "isexe-2.0.0" = { @@ -5161,13 +5341,13 @@ let sha512 = "xOqorG21Va+3CjpFOfFTU7SWohHH2uIX9ZY4Byz6J+lvpfvc486tOAT/G9GfbrKtJ9O7NCX9o0aC2lxqbnZ9EA=="; }; }; - "libphonenumber-js-1.10.13" = { + "libphonenumber-js-1.10.14" = { name = "libphonenumber-js"; packageName = "libphonenumber-js"; - version = "1.10.13"; + version = "1.10.14"; src = fetchurl { - url = "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.10.13.tgz"; - sha512 = "b74iyWmwb4GprAUPjPkJ11GTC7KX4Pd3onpJfKxYyY8y9Rbb4ERY47LvCMEDM09WD3thiLDMXtkfDK/AX+zT7Q=="; + url = "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.10.14.tgz"; + sha512 = "McGS7GV/WjJ2KjfOGhJU1oJn29RYeo7Q+RpANRbUNMQ9gj5XArpbjurSuyYPTejFwbaUojstQ4XyWCrAzGOUXw=="; }; }; "libpq-1.8.12" = { @@ -5557,13 +5737,13 @@ let sha512 = "IXAq50s4qwrOBrXJklY+KhgZF+5y98PDaNo0gi/v2KQBFLyWr+JyFvijZXkGKjQj/h9c0OwoE+JZbwUXce76hQ=="; }; }; - "luxon-2.5.0" = { + "luxon-2.3.2" = { name = "luxon"; packageName = "luxon"; - version = "2.5.0"; + version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/luxon/-/luxon-2.5.0.tgz"; - sha512 = "IDkEPB80Rb6gCAU+FEib0t4FeJ4uVOuX1CQ9GsvU3O+JAGIgu0J7sf1OarXKaKDygTZIoJyU6YdZzTFRu+YR0A=="; + url = "https://registry.npmjs.org/luxon/-/luxon-2.3.2.tgz"; + sha512 = "MlAQQVMFhGk4WUA6gpfsy0QycnKP0+NlCBJRVRNPxxSIbjrCbQ65nrpJD3FVyJNZLuJ0uoqL57ye6BmDYgHaSw=="; }; }; "mailparser-3.5.0" = { @@ -5791,13 +5971,13 @@ let sha512 = "9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg=="; }; }; - "minimist-1.2.6" = { + "minimist-1.2.7" = { name = "minimist"; packageName = "minimist"; - version = "1.2.6"; + version = "1.2.7"; src = fetchurl { - url = "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz"; - sha512 = "Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q=="; + url = "https://registry.npmjs.org/minimist/-/minimist-1.2.7.tgz"; + sha512 = "bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g=="; }; }; "minipass-3.3.5" = { @@ -5908,13 +6088,13 @@ let sha512 = "5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w=="; }; }; - "moment-timezone-0.5.37" = { + "moment-timezone-0.5.38" = { name = "moment-timezone"; packageName = "moment-timezone"; - version = "0.5.37"; + version = "0.5.38"; src = fetchurl { - url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.37.tgz"; - sha512 = "uEDzDNFhfaywRl+vwXxffjjq1q0Vzr+fcQpQ1bU0kbzorfS7zVtZnCnGc8mhWmF39d4g4YriF6kwA75mJKE/Zg=="; + url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.38.tgz"; + sha512 = "nMIrzGah4+oYZPflDvLZUgoVUO4fvAqHstvG3xAUnMolWncuAiLDWNnJZj6EwJGMGfb1ZcuTFE6GI3hNOVWI/Q=="; }; }; "monaco-editor-0.30.1" = { @@ -5935,13 +6115,13 @@ let sha512 = "Psm+g3/wHXhjBEktkxXsFMZvd3nemI0r3IPsE0bU+4//PnvNWKkzhZcEsbPcYiWqe8XqXJJEg4Tgtr7Raw67Yw=="; }; }; - "mongodb-4.10.0" = { + "mongodb-4.11.0" = { name = "mongodb"; packageName = "mongodb"; - version = "4.10.0"; + version = "4.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/mongodb/-/mongodb-4.10.0.tgz"; - sha512 = "My2QxLTw0Cc1O9gih0mz4mqo145Jq4rLAQx0Glk/Ha9iYBzYpt4I2QFNRIh35uNFNfe8KFQcdwY1/HKxXBkinw=="; + url = "https://registry.npmjs.org/mongodb/-/mongodb-4.11.0.tgz"; + sha512 = "9l9n4Nk2BYZzljW3vHah3Z0rfS5npKw6ktnkmFgTcnzaXH1DRm3pDl6VMHu84EVb1lzmSaJC4OzWZqTkB5i2wg=="; }; }; "mongodb-connection-string-url-2.5.4" = { @@ -6061,49 +6241,49 @@ let sha512 = "z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q=="; }; }; - "n8n-core-0.137.0" = { + "n8n-core-0.140.1" = { name = "n8n-core"; packageName = "n8n-core"; - version = "0.137.0"; + version = "0.140.1"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.137.0.tgz"; - sha512 = "qNFzL20TDG7kdtW7rt46DEf6eAWi9MrYmCjmrliJqDOGp2CHtpwlQM8dsIDXuzHoLRX4vuYXDA4kEKA/8kPvlw=="; + url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.140.1.tgz"; + sha512 = "a0fNyYhL8VsxQPUz0Jya0OOFy0eIFkiK40405XkAkonah+wBBBA01g46QSDdBCn3UMeDZ/LkfY+pzypkrmjMQQ=="; }; }; - "n8n-design-system-0.37.0" = { + "n8n-design-system-0.40.0" = { name = "n8n-design-system"; packageName = "n8n-design-system"; - version = "0.37.0"; + version = "0.40.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-design-system/-/n8n-design-system-0.37.0.tgz"; - sha512 = "P17+YgT5NjjuaBfqLD+CyTEaLM89q3UyuSDJgmyQdTmsg0tKwaWmVXL455a6L6syLILjwMDg77lTFKKMedBhtg=="; + url = "https://registry.npmjs.org/n8n-design-system/-/n8n-design-system-0.40.0.tgz"; + sha512 = "P9ZubxZzNNMiXC58L2fyAAm4R4L3dJPZ+NMjKEZbu9+11XMX9SVX1+5t2NEWz1MsgVHGRLfc3mjPr7mnn05BQQ=="; }; }; - "n8n-editor-ui-0.163.1" = { + "n8n-editor-ui-0.166.1" = { name = "n8n-editor-ui"; packageName = "n8n-editor-ui"; - version = "0.163.1"; + version = "0.166.1"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.163.1.tgz"; - sha512 = "bKn6DkK4GuFdjW9rcaBewYZE2wF5g5zfb5zamp+I4TlJXMAsR1bSHpiq8Z8BRyGg0bR76Ny35MQvmXCbvKTejQ=="; + url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.166.1.tgz"; + sha512 = "AxGb+Rkq/TTytKjef60Q7Tmtyu+I4l0639aMrxg7ObqurqCjGL0WkJXaoGrb1H6pBHRSL3jU7ZuD/QfiGN93IQ=="; }; }; - "n8n-nodes-base-0.195.1" = { + "n8n-nodes-base-0.198.1" = { name = "n8n-nodes-base"; packageName = "n8n-nodes-base"; - version = "0.195.1"; + version = "0.198.1"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.195.1.tgz"; - sha512 = "EfTySsb3sc1RzGe8Da/FClXVkCwUIErDfOjl6me8ikRGntjf7Sco6FXS6Ib0iLi6XGbXbyKlJ1c9+Phe9A1I4g=="; + url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.198.1.tgz"; + sha512 = "kM5L/zib1Db5LG1qIYQeEDUM05kd/pQXvxxClCs+qs8RuCMVLnjWDua48NbpiINcnpEY0GI5Hzd0mDHCMjirpA=="; }; }; - "n8n-workflow-0.119.0" = { + "n8n-workflow-0.122.1" = { name = "n8n-workflow"; packageName = "n8n-workflow"; - version = "0.119.0"; + version = "0.122.1"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.119.0.tgz"; - sha512 = "BcSIBSbX1NZ9i8eFFk4Wp0k7esmzH6m8j0RDZK5KwhD4hla4mpx6z6i7kKmAOCuLWjKuY0OMQPEYFWrDEjt0fA=="; + url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.122.1.tgz"; + sha512 = "8lJuN5AFBEhIBcS8MRt0XuwZ4KXbRGwOA9InlnBoYWFloBdDh+1zDOIxiKJH94xjtihLU9tk3c9mnYPEJqnvDQ=="; }; }; "named-placeholders-1.1.2" = { @@ -6115,13 +6295,13 @@ let sha512 = "wiFWqxoLL3PGVReSZpjLVxyJ1bRqe+KKJVbr4hGs1KWfTZTQyezHFBbuKj9hsizHyGV2ne7EMjHdxEGAybD5SA=="; }; }; - "nan-2.16.0" = { + "nan-2.17.0" = { name = "nan"; packageName = "nan"; - version = "2.16.0"; + version = "2.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/nan/-/nan-2.16.0.tgz"; - sha512 = "UdAqHyFngu7TfQKsCBgAA6pWDkT8MAO7d0jyOecVhN5354xbLqdn8mV9Tat9gepAupm0bt2DbeaSC8vS52MuFA=="; + url = "https://registry.npmjs.org/nan/-/nan-2.17.0.tgz"; + sha512 = "2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ=="; }; }; "nanoclone-0.2.1" = { @@ -6223,13 +6403,13 @@ let sha512 = "fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg=="; }; }; - "node-abi-3.26.0" = { + "node-abi-3.28.0" = { name = "node-abi"; packageName = "node-abi"; - version = "3.26.0"; + version = "3.28.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-abi/-/node-abi-3.26.0.tgz"; - sha512 = "jRVtMFTChbi2i/jqo/i2iP9634KMe+7K1v35mIdj3Mn59i5q27ZYhn+sW6npISM/PQg7HrP2kwtRBMmh5Uvzdg=="; + url = "https://registry.npmjs.org/node-abi/-/node-abi-3.28.0.tgz"; + sha512 = "fRlDb4I0eLcQeUvGq7IY3xHrSb0c9ummdvDSYWfT9+LKP+3jCKw/tKoqaM7r1BAoiAC6GtwyjaGnOz6B3OtF+A=="; }; }; "node-abort-controller-3.0.1" = { @@ -6286,22 +6466,22 @@ let sha512 = "2iGbaQBV+ITgCz76ZEjmhUKAKVf7xfY1sRl4UiKQspfZMH2h06SyhNsnSVy50cwkFQDGLyif6m/6uFXHkOZ6rg=="; }; }; - "node-html-markdown-1.2.0" = { + "node-html-markdown-1.2.2" = { name = "node-html-markdown"; packageName = "node-html-markdown"; - version = "1.2.0"; + version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/node-html-markdown/-/node-html-markdown-1.2.0.tgz"; - sha512 = "mGA53bSqo7j62PjmMuFPdO0efNT9pqiGYhQTNVCWkY7PdduRIECJF7n7NOrr5cb+d/js1GdYRLpoTYDwawRk6A=="; + url = "https://registry.npmjs.org/node-html-markdown/-/node-html-markdown-1.2.2.tgz"; + sha512 = "VkiTJ2Y9BWscRY0yLm9OYTREvXobmlK7YehdDwIYfDj9VW6MefaFNaQkMTk94U0zyAuCsfLdBsOld54fsNhP9A=="; }; }; - "node-html-parser-5.4.2" = { + "node-html-parser-6.1.1" = { name = "node-html-parser"; packageName = "node-html-parser"; - version = "5.4.2"; + version = "6.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/node-html-parser/-/node-html-parser-5.4.2.tgz"; - sha512 = "RaBPP3+51hPne/OolXxcz89iYvQvKOydaqoePpOgXcrOKZhjVIzmpKZz+Hd/RBO2/zN2q6CNJhQzucVz+u3Jyw=="; + url = "https://registry.npmjs.org/node-html-parser/-/node-html-parser-6.1.1.tgz"; + sha512 = "eYYblUeoMg0nR6cYGM4GRb1XncNa9FXEftuKAU1qyMIr6rXVtNyUKduvzZtkqFqSHVByq2lLjC7WO8tz7VDmnA=="; }; }; "node-ssh-12.0.5" = { @@ -7051,13 +7231,13 @@ let sha512 = "His3Fh17Z4eg7oANLob6ZvH8xIVen3phEZh2QuyrIl4dQSDVEabNducv6ysROKpDNPSD+12tONZVWfSgMvDD9w=="; }; }; - "pg-promise-10.12.0" = { + "pg-promise-10.12.1" = { name = "pg-promise"; packageName = "pg-promise"; - version = "10.12.0"; + version = "10.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/pg-promise/-/pg-promise-10.12.0.tgz"; - sha512 = "7uN64iEHrhtRcOaU/AT3925S20JzQJG2nWVK2IUz5SlhB1eNdkXjAYoQtei+5kLJo81mOWcFq7x9J9VRldp0ig=="; + url = "https://registry.npmjs.org/pg-promise/-/pg-promise-10.12.1.tgz"; + sha512 = "SiJkBUDGq7PNfJFJbWferodsSH+vLrhte0Q0kVgQbwlNYeKmp9Hhkr+357+5DWEuBGOHhSu1UQffSSf5HVqRtA=="; }; }; "pg-protocol-1.5.0" = { @@ -7186,13 +7366,13 @@ let sha512 = "epKaq3TTfTzXcxBxjpoKYMcTTcAX8Rykus6QZu77XNhJuRHSRxMd+JJrbX/3PFI0opFGSN0BabbAYCbGxbu0mA=="; }; }; - "postcss-8.4.17" = { + "postcss-8.4.18" = { name = "postcss"; packageName = "postcss"; - version = "8.4.17"; + version = "8.4.18"; src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-8.4.17.tgz"; - sha512 = "UNxNOLQydcOFi41yHNMcKRZ39NeXlr8AxGuZJsdub8vIb12fHzcq37DTU/QtbI6WLxNg2gF9Z+8qtRwTj1UI1Q=="; + url = "https://registry.npmjs.org/postcss/-/postcss-8.4.18.tgz"; + sha512 = "Wi8mWhncLJm11GATDaQKobXSNEYGUHeQLiQqDFG1qQ5UTDPTEvKw0Xt5NsTpktGTwLps3ByrWsBrG0rB8YQ9oA=="; }; }; "postgres-array-1.0.3" = { @@ -7753,13 +7933,13 @@ let sha512 = "MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg=="; }; }; - "regenerator-runtime-0.13.9" = { + "regenerator-runtime-0.13.10" = { name = "regenerator-runtime"; packageName = "regenerator-runtime"; - version = "0.13.9"; + version = "0.13.10"; src = fetchurl { - url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz"; - sha512 = "p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA=="; + url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.10.tgz"; + sha512 = "KepLsg4dU12hryUO7bp/axHAKvwGOCV0sGloQtpagJ12ai+ojVDqkeGSiRX1zlq+kjIMZ1t7gpze+26QqtdGqw=="; }; }; "regexp.prototype.flags-1.4.3" = { @@ -8005,13 +8185,13 @@ let sha512 = "JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA=="; }; }; - "safe-stable-stringify-2.4.0" = { + "safe-stable-stringify-2.4.1" = { name = "safe-stable-stringify"; packageName = "safe-stable-stringify"; - version = "2.4.0"; + version = "2.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/safe-stable-stringify/-/safe-stable-stringify-2.4.0.tgz"; - sha512 = "eehKHKpab6E741ud7ZIMcXhKcP6TSIezPkNZhy5U8xC6+VvrRdUA2tMgxGxaGl4cz7c2Ew5+mg5+wNB16KQqrA=="; + url = "https://registry.npmjs.org/safe-stable-stringify/-/safe-stable-stringify-2.4.1.tgz"; + sha512 = "dVHE6bMtS/bnL2mwualjc6IxEv1F+OCUpA46pKUj6F8uDbUM0jCCulPqRNPSnWwGNKx5etqMjZYdXtrm5KJZGA=="; }; }; "safer-buffer-2.1.2" = { @@ -8707,6 +8887,15 @@ let sha512 = "fZtbhtvI9I48xDSywd/somNqgUHl2L2cstmXCCif0itOf96jeW18MBSyrLuNicYQVkvpOxkZtkzujiTJ9LW5Jw=="; }; }; + "style-mod-4.0.0" = { + name = "style-mod"; + packageName = "style-mod"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/style-mod/-/style-mod-4.0.0.tgz"; + sha512 = "OPhtyEjyyN9x3nhPsu76f52yUGXiZcgvsrFVtvTkyGRQJ0XK+GPc6ov1z+lRpbeabka+MYEQxOYRnt5nF30aMw=="; + }; + }; "supports-color-7.2.0" = { name = "supports-color"; packageName = "supports-color"; @@ -8743,13 +8932,13 @@ let sha512 = "ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w=="; }; }; - "swagger-ui-dist-4.14.2" = { + "swagger-ui-dist-4.15.2" = { name = "swagger-ui-dist"; packageName = "swagger-ui-dist"; - version = "4.14.2"; + version = "4.15.2"; src = fetchurl { - url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-4.14.2.tgz"; - sha512 = "kOIU7Ts3TrXDLb3/c9jRe4qGp8O3bRT19FFJA8wJfrRFkcK/4atPn3krhtBVJ57ZkNNofworXHxuYwmaisXBdg=="; + url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-4.15.2.tgz"; + sha512 = "sanLAioshpa+Q0PpPxD86uo4labSqeIxtjLoC7xoce3HTnECPoQwY7PUVOiGMZ4dnEnROZPLUTloCEM86jZc1Q=="; }; }; "swagger-ui-express-4.5.0" = { @@ -9346,22 +9535,22 @@ let sha512 = "WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ=="; }; }; - "urllib-2.39.1" = { + "urllib-2.40.0" = { name = "urllib"; packageName = "urllib"; - version = "2.39.1"; + version = "2.40.0"; src = fetchurl { - url = "https://registry.npmjs.org/urllib/-/urllib-2.39.1.tgz"; - sha512 = "c3sLtY8uhc/WoyJt/nNcEwO4fFC9sFYMQmU5NKoUz9OqUYrPSbYFPflocZCA5oCTavky9weK+YA2EHjsva9AwQ=="; + url = "https://registry.npmjs.org/urllib/-/urllib-2.40.0.tgz"; + sha512 = "XDZjoijtzsbkXTXgM+A/sJM002nwoYsc46YOYr6MNH2jUUw1nCBf2ywT1WaPsVEWJX4Yr+9isGmYj4+yofFn9g=="; }; }; - "utf-8-validate-5.0.9" = { + "utf-8-validate-5.0.10" = { name = "utf-8-validate"; packageName = "utf-8-validate"; - version = "5.0.9"; + version = "5.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-5.0.9.tgz"; - sha512 = "Yek7dAy0v3Kl0orwMlvi7TPtiCNrdfHNd7Gcc/pLq4BLXqfAmd0J7OWMizUQnTTJsyjKn02mU7anqwfmUP4J8Q=="; + url = "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-5.0.10.tgz"; + sha512 = "Z6czzLq4u8fPOyx7TU6X3dvUZVvoJmxSQ+IcrlmagKhilxlhZgxPK6C5Jqbkw1IDUmFTM+cz9QDnnLTwDz/2gQ=="; }; }; "utf7-1.0.2" = { @@ -9382,13 +9571,13 @@ let sha512 = "QXo+O/QkLP/x1nyi54uQiG0XrODxdysuQvE5dtVqv7F5K2Qb6FsN+qbr6KhF5wQ20tfcV3VQp0/2x1e1MRSPWg=="; }; }; - "util-0.12.4" = { + "util-0.12.5" = { name = "util"; packageName = "util"; - version = "0.12.4"; + version = "0.12.5"; src = fetchurl { - url = "https://registry.npmjs.org/util/-/util-0.12.4.tgz"; - sha512 = "bxZ9qtSlGUWSOy9Qa9Xgk11kSslpuZwaxCg4sNIDj6FLucDab2JxnHwyNTCpHMtK1MjoQiWQ6DiUMZYbSrO+Sw=="; + url = "https://registry.npmjs.org/util/-/util-0.12.5.tgz"; + sha512 = "kZf/K6hEIrWHI6XqOFUiiMa+79wE/D8Q+NCNAWclkyg3b4d2k7s0QGepNjiABc+aR3N1PAyHL7p6UcLY6LmrnA=="; }; }; "util-deprecate-1.0.2" = { @@ -9409,15 +9598,6 @@ let sha512 = "/s3UsZUrIfa6xDhr7zZhnE9SLQ5RIXyYfiVnMMyMDzOc8WhWN4Nbh36H842OyurKbCDAesZOJaVyvmSl6fhGQw=="; }; }; - "utility-0.1.11" = { - name = "utility"; - packageName = "utility"; - version = "0.1.11"; - src = fetchurl { - url = "https://registry.npmjs.org/utility/-/utility-0.1.11.tgz"; - sha512 = "epFsJ71+/yC7MKMX7CM9azP31QBIQhywkiBUj74i/T3Y2TXtEor26QBkat7lGamrrNTr5CBI1imd/8F0Bmqw4g=="; - }; - }; "utility-1.17.0" = { name = "utility"; packageName = "utility"; @@ -9517,13 +9697,13 @@ let sha512 = "PFG8iJRSjvvBdisowQ7iVF580DXb1uCIiGaXgm7tynMR1uTBlv7UJlB1zdv5KJ+Tmq1f0Upnj3fayoEOPpCBKg=="; }; }; - "vue-2.6.14" = { + "vue-2.7.13" = { name = "vue"; packageName = "vue"; - version = "2.6.14"; + version = "2.7.13"; src = fetchurl { - url = "https://registry.npmjs.org/vue/-/vue-2.6.14.tgz"; - sha512 = "x2284lgYvjOMj3Za7kqzRcUSxBboHqtgRE2zlos1qWaOye5yUmHn42LB1250NJBLRwEcdrB0JRwyPTEPhfQjiQ=="; + url = "https://registry.npmjs.org/vue/-/vue-2.7.13.tgz"; + sha512 = "QnM6ULTNnPmn71eUO+4hdjfBIA3H0GLsBnchnI/kS678tjI45GOUZhXd0oP/gX9isikXz1PAzSnkPspp9EUNfQ=="; }; }; "vue-agile-2.0.0" = { @@ -9589,13 +9769,13 @@ let sha512 = "VYXZQLtjuvKxxcshuRAwjHnciqZVoXAjTjcqBTz4rKc8qih9g9pI3hbDjmqXaHdgL3v8pV6P8Z335XvHzESxLQ=="; }; }; - "vue-template-compiler-2.6.14" = { + "vue-template-compiler-2.7.13" = { name = "vue-template-compiler"; packageName = "vue-template-compiler"; - version = "2.6.14"; + version = "2.7.13"; src = fetchurl { - url = "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.6.14.tgz"; - sha512 = "ODQS1SyMbjKoO1JBJZojSw6FE4qnh9rIpUZn2EUT86FKizx9uH5z6uXiIrm4/Nb/gwxTi/o17ZDEGWAXHvtC7g=="; + url = "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.7.13.tgz"; + sha512 = "jYM6TClwDS9YqP48gYrtAtaOhRKkbYmbzE+Q51gX5YDr777n7tNI/IZk4QV4l/PjQPNh/FVa/E92sh/RqKMrog=="; }; }; "vue-typed-mixins-0.2.0" = { @@ -9643,6 +9823,15 @@ let sha512 = "ETW44IqCgBpVomy520DT5jf8n0zoCac+sxWnn+hMe/CzaSejb/eVw2YToiXYX+Ex/AuHHia28vWTq4goAexFbw=="; }; }; + "w3c-keyname-2.2.6" = { + name = "w3c-keyname"; + packageName = "w3c-keyname"; + version = "2.2.6"; + src = fetchurl { + url = "https://registry.npmjs.org/w3c-keyname/-/w3c-keyname-2.2.6.tgz"; + sha512 = "f+fciywl1SJEniZHD6H+kUO8gOnwIr7f4ijKA6+ZvJFjeGi1r4PDLl53Ayud9O/rk64RqgoQine0feoeOU0kXg=="; + }; + }; "webidl-conversions-3.0.1" = { name = "webidl-conversions"; packageName = "webidl-conversions"; @@ -10027,10 +10216,10 @@ in n8n = nodeEnv.buildNodePackage { name = "n8n"; packageName = "n8n"; - version = "0.197.1"; + version = "0.200.1"; src = fetchurl { - url = "https://registry.npmjs.org/n8n/-/n8n-0.197.1.tgz"; - sha512 = "uswTJAfyDqMSBT0HZrNFFVKQ/s/FiaQl97+Pdl/MdrC74scPNSTBUrS/L2X08LR0UADO6ByPpB7uOrj+w29pdg=="; + url = "https://registry.npmjs.org/n8n/-/n8n-0.200.1.tgz"; + sha512 = "g6RFonJAuvaNyQ6t3DfDHnV4T5NT4obfkRzELJ4S0DnT5jq68n1UsYmbPII8rhmdZJsK+d67prGlKUsnyZ3VxQ=="; }; dependencies = [ (sources."@apidevtools/json-schema-ref-parser-9.0.9" // { @@ -10115,16 +10304,24 @@ in ]; }) sources."@azure/ms-rest-nodeauth-3.1.1" - sources."@azure/msal-browser-2.29.0" - sources."@azure/msal-common-7.5.0" - sources."@azure/msal-node-1.14.1" - (sources."@azure/storage-blob-12.11.0" // { + sources."@azure/msal-browser-2.30.0" + sources."@azure/msal-common-7.6.0" + sources."@azure/msal-node-1.14.2" + (sources."@azure/storage-blob-12.12.0" // { dependencies = [ sources."@azure/core-tracing-1.0.0-preview.13" sources."tslib-2.4.0" ]; }) - sources."@babel/runtime-7.19.4" + sources."@babel/parser-7.20.0" + sources."@babel/runtime-7.20.0" + sources."@codemirror/autocomplete-6.3.0" + sources."@codemirror/commands-6.1.2" + sources."@codemirror/lang-javascript-6.1.1" + sources."@codemirror/language-6.3.0" + sources."@codemirror/lint-6.0.0" + sources."@codemirror/state-6.1.2" + sources."@codemirror/view-6.4.0" sources."@colors/colors-1.5.0" sources."@curlconverter/yargs-0.0.2" sources."@curlconverter/yargs-parser-0.0.1" @@ -10134,7 +10331,7 @@ in sources."kuler-2.0.0" ]; }) - sources."@fontsource/open-sans-4.5.12" + sources."@fontsource/open-sans-4.5.13" sources."@fortawesome/fontawesome-common-types-0.3.0" sources."@fortawesome/fontawesome-svg-core-1.3.0" (sources."@fortawesome/free-regular-svg-icons-6.2.0" // { @@ -10156,11 +10353,15 @@ in sources."string_decoder-0.10.31" ]; }) - sources."@js-joda/core-5.4.1" + sources."@js-joda/core-5.4.2" sources."@jsdevtools/ono-7.1.3" sources."@kafkajs/confluent-schema-registry-1.0.6" sources."@kwsites/file-exists-1.1.1" sources."@kwsites/promise-deferred-1.1.1" + sources."@lezer/common-1.0.1" + sources."@lezer/highlight-1.1.2" + sources."@lezer/javascript-1.0.2" + sources."@lezer/lr-1.2.3" sources."@mapbox/node-pre-gyp-1.0.10" sources."@n8n_io/riot-tmpl-1.0.1" sources."@nodelib/fs.scandir-2.1.5" @@ -10178,7 +10379,7 @@ in sources."tslib-2.4.0" ]; }) - (sources."@oclif/core-1.16.5" // { + (sources."@oclif/core-1.19.2" // { dependencies = [ sources."supports-color-8.1.1" sources."tslib-2.4.0" @@ -10203,7 +10404,7 @@ in sources."@oclif/screen-3.0.2" sources."@opentelemetry/api-1.2.0" sources."@rudderstack/rudder-sdk-node-1.0.6" - (sources."@sap/hana-client-2.14.18" // { + (sources."@sap/hana-client-2.14.22" // { dependencies = [ sources."debug-3.1.0" sources."ms-2.0.0" @@ -10212,7 +10413,7 @@ in sources."@segment/loosely-validate-event-2.0.0" sources."@selderee/plugin-htmlparser2-0.6.0" sources."@servie/events-1.0.0" - sources."@sqltools/formatter-1.2.3" + sources."@sqltools/formatter-1.2.5" sources."@techteamer/ocsp-1.0.0" sources."@tediousjs/connection-string-0.3.0" sources."@tokenizer/token-0.3.0" @@ -10223,13 +10424,13 @@ in sources."@types/express-4.17.14" sources."@types/express-jwt-0.0.42" sources."@types/express-serve-static-core-4.17.31" - sources."@types/express-unless-0.5.3" - sources."@types/js-nacl-1.3.0" + sources."@types/express-unless-2.0.1" + sources."@types/js-nacl-1.3.1" sources."@types/json-schema-7.0.11" sources."@types/lodash-4.14.186" sources."@types/mime-3.0.1" sources."@types/multer-1.4.7" - sources."@types/node-18.8.3" + sources."@types/node-18.11.7" (sources."@types/node-fetch-2.6.2" // { dependencies = [ sources."form-data-3.0.1" @@ -10243,13 +10444,14 @@ in sources."@types/tunnel-0.0.3" sources."@types/webidl-conversions-7.0.0" sources."@types/whatwg-url-8.2.2" - sources."@xmldom/xmldom-0.7.5" + sources."@vue/compiler-sfc-2.7.13" + sources."@xmldom/xmldom-0.7.6" sources."a-sync-waterfall-1.0.1" sources."abbrev-1.1.1" sources."abort-controller-3.0.0" sources."accepts-1.3.8" sources."access-control-1.0.1" - sources."acorn-8.8.0" + sources."acorn-8.8.1" sources."acorn-walk-8.2.0" (sources."adal-node-0.2.3" // { dependencies = [ @@ -10257,7 +10459,6 @@ in sources."uuid-3.4.0" ]; }) - sources."address-1.2.1" sources."adler-32-1.2.0" sources."agent-base-6.0.2" (sources."agentkeepalive-4.2.1" // { @@ -10321,7 +10522,7 @@ in }) sources."available-typed-arrays-1.0.5" sources."avsc-5.7.6" - (sources."aws-sdk-2.1231.0" // { + (sources."aws-sdk-2.1242.0" // { dependencies = [ sources."buffer-4.9.2" sources."events-1.1.1" @@ -10395,7 +10596,7 @@ in sources."buffer-from-1.1.2" sources."buffer-more-ints-1.0.0" sources."buffer-writer-2.0.0" - sources."bufferutil-4.0.6" + sources."bufferutil-4.0.7" sources."bull-3.29.3" sources."busboy-1.6.0" sources."byte-length-1.0.2" @@ -10504,9 +10705,10 @@ in sources."cookie-parser-1.4.6" sources."cookie-signature-1.0.6" sources."copy-to-2.0.1" - sources."core-js-3.25.5" + sources."core-js-3.26.0" sources."core-util-is-1.0.3" sources."crc-32-1.2.2" + sources."crelt-1.0.5" sources."cron-1.7.2" sources."cron-parser-2.18.0" (sources."cross-spawn-6.0.5" // { @@ -10520,6 +10722,7 @@ in sources."css-select-4.3.0" sources."css-what-6.1.0" sources."cssfilter-0.0.10" + sources."csstype-3.1.1" sources."curlconverter-3.21.0" sources."currency-codes-2.1.0" sources."dashdash-1.14.1" @@ -10552,11 +10755,7 @@ in sources."detect-libc-2.0.1" sources."diagnostics-1.1.1" sources."difflib-0.2.4" - (sources."digest-header-0.0.1" // { - dependencies = [ - sources."utility-0.1.11" - ]; - }) + sources."digest-header-1.0.0" sources."dir-glob-3.0.1" sources."discontinuous-range-1.0.0" sources."dom-iterator-1.0.0" @@ -10626,6 +10825,7 @@ in sources."path-to-regexp-6.2.1" ]; }) + sources."express-unless-2.1.3" sources."extend-3.0.2" sources."extend-shallow-2.0.1" (sources."external-editor-3.1.0" // { @@ -10766,7 +10966,7 @@ in sources."humanize-ms-1.2.1" sources."hyperlinker-1.0.0" sources."iconv-lite-0.6.3" - sources."ics-2.40.0" + sources."ics-2.41.0" sources."ieee754-1.2.1" sources."ignore-5.2.0" (sources."imap-0.8.19" // { @@ -10802,7 +11002,7 @@ in sources."is-boolean-object-1.1.2" sources."is-buffer-1.1.6" sources."is-callable-1.2.7" - sources."is-core-module-2.10.0" + sources."is-core-module-2.11.0" sources."is-date-object-1.0.5" sources."is-docker-2.2.1" sources."is-extendable-0.1.1" @@ -10837,7 +11037,7 @@ in sources."is-windows-1.0.2" sources."is-wsl-2.2.0" sources."isarray-1.0.0" - sources."isbot-3.6.1" + sources."isbot-3.6.2" sources."isexe-2.0.0" sources."iso-639-1-2.1.15" sources."isstream-0.1.2" @@ -10880,7 +11080,7 @@ in sources."levn-0.3.0" sources."libbase64-1.2.1" sources."libmime-5.1.0" - sources."libphonenumber-js-1.10.13" + sources."libphonenumber-js-1.10.14" sources."libpq-1.8.12" sources."libqp-1.1.0" sources."limiter-1.1.5" @@ -10934,7 +11134,7 @@ in sources."yallist-2.1.2" ]; }) - sources."luxon-2.5.0" + sources."luxon-2.3.2" (sources."mailparser-3.5.0" // { dependencies = [ sources."nodemailer-6.7.3" @@ -10973,7 +11173,7 @@ in sources."brace-expansion-1.1.11" ]; }) - sources."minimist-1.2.6" + sources."minimist-1.2.7" sources."minipass-3.3.5" sources."minipass-collect-1.0.2" sources."minipass-fetch-1.4.1" @@ -10990,9 +11190,9 @@ in ]; }) sources."moment-2.29.4" - sources."moment-timezone-0.5.37" + sources."moment-timezone-0.5.38" sources."monaco-editor-0.30.1" - (sources."mongodb-4.10.0" // { + (sources."mongodb-4.11.0" // { dependencies = [ sources."denque-2.1.0" ]; @@ -11026,22 +11226,22 @@ in ]; }) sources."mz-2.7.0" - sources."n8n-core-0.137.0" - sources."n8n-design-system-0.37.0" - sources."n8n-editor-ui-0.163.1" - (sources."n8n-nodes-base-0.195.1" // { + sources."n8n-core-0.140.1" + sources."n8n-design-system-0.40.0" + sources."n8n-editor-ui-0.166.1" + (sources."n8n-nodes-base-0.198.1" // { dependencies = [ sources."chokidar-3.5.2" ]; }) - sources."n8n-workflow-0.119.0" + sources."n8n-workflow-0.122.1" (sources."named-placeholders-1.1.2" // { dependencies = [ sources."lru-cache-4.1.5" sources."yallist-2.1.2" ]; }) - sources."nan-2.16.0" + sources."nan-2.17.0" sources."nanoclone-0.2.1" sources."nanoid-3.3.4" sources."napi-build-utils-1.0.2" @@ -11061,7 +11261,7 @@ in sources."tslib-2.4.0" ]; }) - sources."node-abi-3.26.0" + sources."node-abi-3.28.0" sources."node-abort-controller-3.0.1" sources."node-addon-api-4.3.0" sources."node-ensure-0.0.0" @@ -11076,8 +11276,16 @@ in ]; }) sources."node-gyp-build-4.5.0" - sources."node-html-markdown-1.2.0" - sources."node-html-parser-5.4.2" + sources."node-html-markdown-1.2.2" + (sources."node-html-parser-6.1.1" // { + dependencies = [ + sources."css-select-5.1.0" + sources."dom-serializer-2.0.0" + sources."domhandler-5.0.3" + sources."domutils-3.0.1" + sources."entities-4.4.0" + ]; + }) sources."node-ssh-12.0.5" sources."nodeify-1.0.1" sources."nodemailer-6.8.0" @@ -11186,7 +11394,7 @@ in ]; }) sources."pg-pool-3.5.2" - sources."pg-promise-10.12.0" + sources."pg-promise-10.12.1" sources."pg-protocol-1.5.0" sources."pg-query-stream-4.2.4" sources."pg-types-2.2.0" @@ -11204,7 +11412,7 @@ in sources."popsicle-transport-http-1.2.1" sources."popsicle-transport-xhr-2.0.0" sources."popsicle-user-agent-1.0.0" - sources."postcss-8.4.17" + sources."postcss-8.4.18" sources."postgres-array-2.0.0" sources."postgres-bytea-1.0.0" sources."postgres-date-1.0.7" @@ -11293,7 +11501,7 @@ in sources."redis-errors-1.2.0" sources."redis-parser-3.0.0" sources."reflect-metadata-0.1.13" - sources."regenerator-runtime-0.13.9" + sources."regenerator-runtime-0.13.10" sources."regexp.prototype.flags-1.4.3" sources."reinterval-1.1.0" sources."remove-trailing-separator-1.1.0" @@ -11335,7 +11543,7 @@ in sources."rxjs-6.6.7" sources."safe-buffer-5.2.1" sources."safe-regex-test-1.0.0" - sources."safe-stable-stringify-2.4.0" + sources."safe-stable-stringify-2.4.1" sources."safer-buffer-2.1.2" (sources."sanitize-html-2.7.0" // { dependencies = [ @@ -11450,10 +11658,11 @@ in sources."strip-ansi-6.0.1" sources."strip-json-comments-2.0.1" sources."strtok3-6.3.0" + sources."style-mod-4.0.0" sources."supports-color-7.2.0" sources."supports-hyperlinks-2.3.0" sources."supports-preserve-symlinks-flag-1.0.0" - sources."swagger-ui-dist-4.14.2" + sources."swagger-ui-dist-4.15.2" sources."swagger-ui-express-4.5.0" (sources."tar-6.1.11" // { dependencies = [ @@ -11474,7 +11683,7 @@ in sources."tdigest-0.1.2" (sources."tedious-14.7.0" // { dependencies = [ - sources."bl-5.0.0" + sources."bl-5.1.0" sources."buffer-6.0.3" sources."readable-stream-3.6.0" sources."sprintf-js-1.1.2" @@ -11569,7 +11778,7 @@ in ]; }) sources."url-parse-1.5.10" - (sources."urllib-2.39.1" // { + (sources."urllib-2.40.0" // { dependencies = [ sources."debug-2.6.9" sources."iconv-lite-0.4.24" @@ -11578,14 +11787,14 @@ in sources."statuses-1.5.0" ]; }) - sources."utf-8-validate-5.0.9" + sources."utf-8-validate-5.0.10" (sources."utf7-1.0.2" // { dependencies = [ sources."semver-5.3.0" ]; }) sources."utf8-2.1.2" - sources."util-0.12.4" + sources."util-0.12.5" sources."util-deprecate-1.0.2" sources."util.promisify-1.1.1" sources."utility-1.17.0" @@ -11601,7 +11810,7 @@ in ]; }) sources."vm2-3.9.11" - sources."vue-2.6.14" + sources."vue-2.7.13" sources."vue-agile-2.0.0" sources."vue-color-2.8.1" sources."vue-fragment-1.5.1" @@ -11609,12 +11818,13 @@ in sources."vue-json-pretty-1.9.2" sources."vue-prism-editor-0.3.0" sources."vue-router-3.6.5" - sources."vue-template-compiler-2.6.14" + sources."vue-template-compiler-2.7.13" sources."vue-typed-mixins-0.2.0" sources."vue2-boring-avatars-0.3.4" sources."vue2-teleport-1.0.1" sources."vue2-touch-events-3.2.2" sources."vuex-3.6.2" + sources."w3c-keyname-2.2.6" sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" sources."which-1.3.1" diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix index d75337631a8..809ca5eaae5 100644 --- a/pkgs/applications/version-management/git-repo/default.nix +++ b/pkgs/applications/version-management/git-repo/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "git-repo"; - version = "2.29.4"; + version = "2.29.5"; src = fetchFromGitHub { owner = "android"; repo = "tools_repo"; rev = "v${version}"; - sha256 = "sha256-oUPY10B6JHixdfgi5BHzrg9nZ1DlFUhQyuXJj2fCSM4="; + sha256 = "sha256-eMuQ0cVVbLvpDsGCob8s7D1Q+52Q2gOHTg7anP5KVAc="; }; # Fix 'NameError: name 'ssl' is not defined' diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 188f0b29ddd..12f9c50535d 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -33,9 +33,12 @@ }: let pythonPackages = let ensurePythonModules = items: let + exceptions = [ + stdenv + ]; providesSetupHook = lib.attrByPath [ "provides" "setupHook"] false; - notValid = value: (lib.isDerivation value) && !((pythonPackages.hasPythonModule value) || (providesSetupHook value)); - func = name: value: if !(notValid value) then value else throw "${name} should use `buildPythonPackage` or `toPythonModule` if it is to be part of the Python packages set."; + valid = value: !((lib.isDerivation value) && !((pythonPackages.hasPythonModule value) || (providesSetupHook value))) || (lib.elem value exceptions); + func = name: value: if (valid value) then value else throw "${name} should use `buildPythonPackage` or `toPythonModule` if it is to be part of the Python packages set."; in lib.mapAttrs func items; in ensurePythonModules (callPackage # Function that when called diff --git a/pkgs/development/libraries/cxxtest/default.nix b/pkgs/development/libraries/cxxtest/default.nix index 3469cda3fc7..3b8d470d17f 100644 --- a/pkgs/development/libraries/cxxtest/default.nix +++ b/pkgs/development/libraries/cxxtest/default.nix @@ -1,6 +1,6 @@ -{ lib, buildPythonApplication, fetchFromGitHub }: +{ lib, python3Packages, fetchFromGitHub }: -buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "cxxtest"; version = "4.4"; @@ -13,15 +13,26 @@ buildPythonApplication rec { sourceRoot = "source/python"; + checkInputs = [ python3Packages.ply ]; + + preCheck = '' + cd ../ + ''; + postCheck = '' - python scripts/cxxtestgen --error-printer -o build/GoodSuite.cpp ../test/GoodSuite.h - $CXX -I.. -o build/GoodSuite build/GoodSuite.cpp + cd python3 + python scripts/cxxtestgen --error-printer -o build/GoodSuite.cpp ../../test/GoodSuite.h + $CXX -I../../ -o build/GoodSuite build/GoodSuite.cpp build/GoodSuite ''; + preInstall = '' + cd python3 + ''; + postInstall = '' mkdir -p "$out/include" - cp -r ../cxxtest "$out/include" + cp -r ../../cxxtest "$out/include" ''; dontWrapPythonPrograms = true; @@ -29,8 +40,8 @@ buildPythonApplication rec { meta = with lib; { homepage = "http://cxxtest.com"; description = "Unit testing framework for C++"; - platforms = platforms.unix; license = licenses.lgpl3; - maintainers = [ maintainers.juliendehos ]; + platforms = platforms.unix; + maintainers = with maintainers; [ juliendehos ]; }; } diff --git a/pkgs/development/node-packages/overrides.nix b/pkgs/development/node-packages/overrides.nix index 496e80c175a..29050e61c39 100644 --- a/pkgs/development/node-packages/overrides.nix +++ b/pkgs/development/node-packages/overrides.nix @@ -191,6 +191,12 @@ final: prev: { graphite-cli = prev."@withgraphite/graphite-cli".override { name = "graphite-cli"; + nativeBuildInputs = [ pkgs.installShellFiles ]; + postInstall = '' + installShellCompletion --cmd gt \ + --bash <($out/bin/gt completion) \ + --zsh <($out/bin/gt completion) + ''; }; graphql-language-service-cli = prev.graphql-language-service-cli.override { diff --git a/pkgs/development/python-modules/fastbencode/default.nix b/pkgs/development/python-modules/fastbencode/default.nix index 039418dc3bc..2b63ee846b8 100644 --- a/pkgs/development/python-modules/fastbencode/default.nix +++ b/pkgs/development/python-modules/fastbencode/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "fastbencode"; - version = "0.0.15"; + version = "0.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-A1XfgjNV9k4iA3HYf0HlA1CvpwzFh52OaN7f6YLgU+I="; + hash = "sha256-wal451pQSLuoM9kNbnSKVZUMqLWfEukXwqLI58p+tvU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/flask-testing/default.nix b/pkgs/development/python-modules/flask-testing/default.nix index e17662e7ca6..c66fe9bbfd1 100644 --- a/pkgs/development/python-modules/flask-testing/default.nix +++ b/pkgs/development/python-modules/flask-testing/default.nix @@ -38,6 +38,8 @@ buildPythonPackage rec { "test_assert_redirects" "test_server_listening" "test_server_process_is_spawned" + # change in repr(template) in recent flask + "test_assert_template_rendered_signal_sent" ]; disabledTestPaths = [ diff --git a/pkgs/development/python-modules/rpyc/default.nix b/pkgs/development/python-modules/rpyc/default.nix index a8849fd17cd..d9b81ddf580 100644 --- a/pkgs/development/python-modules/rpyc/default.nix +++ b/pkgs/development/python-modules/rpyc/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, hatchling , plumbum , pytestCheckHook , pythonOlder @@ -8,18 +9,22 @@ buildPythonPackage rec { pname = "rpyc"; - version = "5.1.0"; - format = "setuptools"; + version = "5.2.3"; + format = "pyproject"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "tomerfiliba"; repo = pname; rev = version; - sha256 = "sha256-Xeot4QEgTZjvdO0ydmKjccp6zwC93Yp/HkRlSgyDf8k="; + hash = "sha256-SDt6Oh+8qRIdM02FEFM+Xw1y/bBn66D6KbOrhGVs6ng="; }; + nativeBuildInputs = [ + hatchling + ]; + propagatedBuildInputs = [ plumbum ]; @@ -31,6 +36,9 @@ buildPythonPackage rec { disabledTests = [ # Disable tests that requires network access "test_api" + "test_close_timeout" + "test_deploy" + "test_listing" "test_pruning" "test_rpyc" # Test is outdated diff --git a/pkgs/development/python-modules/tubeup/default.nix b/pkgs/development/python-modules/tubeup/default.nix index 3c6690bd39e..045780219d4 100644 --- a/pkgs/development/python-modules/tubeup/default.nix +++ b/pkgs/development/python-modules/tubeup/default.nix @@ -9,19 +9,19 @@ buildPythonPackage rec { pname = "tubeup"; - version = "0.0.33"; + version = "0.0.34"; + format = "setuptools"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "sha256-RFM0vZeA5PDXf9KzlJ8RTSfM7bz50bpwwszU0gjV1DY="; + sha256 = "ae1e606b243fd70742f8b5871c497628d258ee9f416caa46544aca9a5fbfbca0"; }; postPatch = '' substituteInPlace setup.py \ - --replace "docopt==0.6.2" "docopt" \ - --replace "internetarchive==2.0.3" "internetarchive" + --replace "docopt==0.6.2" "docopt" ''; propagatedBuildInputs = [ internetarchive docopt yt-dlp ]; diff --git a/pkgs/development/tools/flyway/default.nix b/pkgs/development/tools/flyway/default.nix index 89f178e4bb9..80610cbffab 100644 --- a/pkgs/development/tools/flyway/default.nix +++ b/pkgs/development/tools/flyway/default.nix @@ -1,10 +1,10 @@ { lib, stdenv, fetchurl, jre_headless, makeWrapper }: stdenv.mkDerivation rec{ pname = "flyway"; - version = "9.5.1"; + version = "9.6.0"; src = fetchurl { url = "mirror://maven/org/flywaydb/flyway-commandline/${version}/flyway-commandline-${version}.tar.gz"; - sha256 = "sha256-ieGRP9SGI8w42f3BNcO5mv/DB3E4Hzxe0q1P5EaBxK8="; + sha256 = "sha256-mf9u4FzKMBXoQ7PLUYZaYpVTuWNdSfplmzu+dKvABl8="; }; nativeBuildInputs = [ makeWrapper ]; dontBuild = true; diff --git a/pkgs/development/tools/just/default.nix b/pkgs/development/tools/just/default.nix index 65b80e3d915..c332cc61b43 100644 --- a/pkgs/development/tools/just/default.nix +++ b/pkgs/development/tools/just/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "just"; - version = "1.6.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = "casey"; repo = pname; rev = version; - hash = "sha256-4ilq/ptDYjfXmkLqky8z8iwfvg9JgdP+uADcv/zeHWs="; + hash = "sha256-W8ko9hzZmgF8XEqzbPtCJp5J38m0pAz5wTp3VRUmZOQ="; }; - cargoSha256 = "sha256-rugnbuzynQ4lBy977e04xAvueUbViIuFSzXlQkiwM00="; + cargoSha256 = "sha256-rC+PcLQHjnaGSEELod6IF9NTCl0tnXvOOkHF0z77Lao="; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; diff --git a/pkgs/development/tools/millet/default.nix b/pkgs/development/tools/millet/default.nix index b7f9d0e50e5..6322e5b2bc5 100644 --- a/pkgs/development/tools/millet/default.nix +++ b/pkgs/development/tools/millet/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "millet"; - version = "0.5.6"; + version = "0.5.8"; src = fetchFromGitHub { owner = "azdavis"; repo = pname; rev = "v${version}"; - sha256 = "sha256-figP1PgM84jIbjuYzcklzYshedO5UXbxm9sbEXWkLzs="; + sha256 = "sha256-AsI0n76ZWzW326/kpzP+6zjVA42WrhPqnid02OJ5fEo="; }; - cargoSha256 = "sha256-PF1NxUypOBevGwj5bFySQluhNh7PD1NFXfJvYuKHixQ="; + cargoSha256 = "sha256-tHa/DXcWLdOlMlauerSiLsLImYrbnslN6R991mSTyvs="; postPatch = '' rm .cargo/config.toml diff --git a/pkgs/development/tools/rust/cargo-nextest/default.nix b/pkgs/development/tools/rust/cargo-nextest/default.nix index afd31db8c54..ade42dd4e90 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.39"; + version = "0.9.40"; src = fetchFromGitHub { owner = "nextest-rs"; repo = "nextest"; rev = "cargo-nextest-${version}"; - sha256 = "sha256-8BPKH5dfLALU1WaiinZx7IHVcUmL2wPckMDU+FVfgBs="; + sha256 = "sha256-w6YTnd+v4kvv7e/Zdo4oa1AGfW86Lmjyk4jMeFs/wUE="; }; - cargoSha256 = "sha256-GYryj+evMuDsridRD1GaeaTWyD5yQi6pRhpPOrW24nI="; + cargoSha256 = "sha256-UhxC3Bv8wohO83k+ndhK9yOK2nQpeVYbc1CW5wpb2B4="; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; diff --git a/pkgs/development/web/deno/default.nix b/pkgs/development/web/deno/default.nix index ff73625e0a5..1610d70cb60 100644 --- a/pkgs/development/web/deno/default.nix +++ b/pkgs/development/web/deno/default.nix @@ -17,15 +17,15 @@ rustPlatform.buildRustPackage rec { pname = "deno"; - version = "1.26.2"; + version = "1.27.0"; src = fetchFromGitHub { owner = "denoland"; repo = pname; rev = "v${version}"; - sha256 = "sha256-/t1UG8F5sWJ+Zf9+r8oiAFF4pS+tLmXMDlTeY7+2qDQ="; + sha256 = "sha256-nvQimTCzcmTI37hFqf0aZvVUS01dy6alxkTTkY9nNPU="; }; - cargoSha256 = "sha256-8CauLXX/ARAyqtQLQKgxuQWcmjSzSindCLkVk+wV/Nk="; + cargoSha256 = "sha256-1TrzF9h6OHfDzkKL+zQTf5dIMzB820WFtFi9pFQIgig="; postPatch = '' # upstream uses lld on aarch64-darwin for faster builds diff --git a/pkgs/development/web/deno/librusty_v8.nix b/pkgs/development/web/deno/librusty_v8.nix index 91e20fb41b1..eeafb988c09 100644 --- a/pkgs/development/web/deno/librusty_v8.nix +++ b/pkgs/development/web/deno/librusty_v8.nix @@ -11,11 +11,11 @@ let }; in fetch_librusty_v8 { - version = "0.53.1"; + version = "0.54.0"; shas = { - x86_64-linux = "sha256-jMOzvvjnmauVmyeBlTOeVpQB1TcQ0K8D7xXsgjLcp3M="; - aarch64-linux = "sha256-aRcKpPlliO26xJe2zBym5/+hNmJUIrWu3qXJa9R3Irg="; - x86_64-darwin = "sha256-JsEx2t8d33xRlh+pmJtk5jvDktfW6nFGdw6oqJ3uYSU="; - aarch64-darwin = "sha256-ju/qr65m33IyXFL2VQXhvtL7PsxSpi8RrGteIb9dQTU="; + x86_64-linux = "sha256-V7xBGdKtLZRRNoRyvY/8a3Cvw12zo8tz76ZR72xmG6U="; + aarch64-linux = "sha256-/KIZ2Feli7VNdgFUU+MC5QZ8dQJ88TKfjz/SOoux1zg="; + x86_64-darwin = "sha256-xBDMDvWFZPMwJb3alQe7ZuboTm2aFOh9F7memuHo180="; + aarch64-darwin = "sha256-Z62rnm8X0cro7HBBv5pbkvQJd+AW+wF2tthH1+5a0nU="; }; } diff --git a/pkgs/games/fheroes2/default.nix b/pkgs/games/fheroes2/default.nix index 5f3bb86d51d..628ebcb28ab 100644 --- a/pkgs/games/fheroes2/default.nix +++ b/pkgs/games/fheroes2/default.nix @@ -1,8 +1,7 @@ { stdenv, lib, fetchFromGitHub , gettext, glibcLocalesUtf8, libpng, SDL2, SDL2_image, SDL2_mixer, SDL2_ttf, zlib -# updater only -, nix-update-script +, gitUpdater }: stdenv.mkDerivation rec { @@ -43,8 +42,8 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = nix-update-script { - attrPath = pname; + updateScript = gitUpdater { + url = "https://github.com/ihhub/fheroes2.git"; }; }; diff --git a/pkgs/games/sil-q/default.nix b/pkgs/games/sil-q/default.nix index e4299bd8aca..6d7fe884ed5 100644 --- a/pkgs/games/sil-q/default.nix +++ b/pkgs/games/sil-q/default.nix @@ -41,7 +41,7 @@ in stdenv.mkDerivation rec { mkdir -p $out/bin cp sil $out/bin/sil-q wrapProgram $out/bin/sil-q \ - --run "export ANGBAND_PATH=\$HOME/.sil" \ + --run "export ANGBAND_PATH=\$HOME/.sil-q" \ --run "${setup} ${src}/lib" runHook postInstall @@ -50,7 +50,7 @@ in stdenv.mkDerivation rec { passthru.tests = { saveDirCreation = pkgs.runCommand "save-dir-creation" {} '' HOME=$(pwd) ${lib.getExe pkgs.sil-q} --help - test -d .sil && touch $out + test -d .sil-q && touch $out ''; }; diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index 26ec3ecc960..4bbf619da36 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -9,13 +9,13 @@ buildDotnetModule rec { pname = "jackett"; - version = "0.20.2169"; + version = "0.20.2171"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "D1q2nzDxlsFrxZRmZJTiJSWQ/BihuEDUVirv2qKgsnI="; + sha256 = "FW/3CkkLeHWw8KrBctAChRE9DMoooOmPkHZVBKp91Jk="; }; projectFile = "src/Jackett.Server/Jackett.Server.csproj"; diff --git a/pkgs/servers/roon-bridge/default.nix b/pkgs/servers/roon-bridge/default.nix index 5d4393bae56..865dbd63f7a 100644 --- a/pkgs/servers/roon-bridge/default.nix +++ b/pkgs/servers/roon-bridge/default.nix @@ -9,25 +9,23 @@ , stdenv , zlib }: -stdenv.mkDerivation rec { +let + version = "1.8-1125"; + urlVersion = builtins.replaceStrings [ "." "-" ] [ "00" "0" ] version; + host = stdenv.hostPlatform.system; + system = if host == "x86_64-linux" then "linuxx64" + else if host == "aarch64-linux" then "linuxarmv8" + else throw "Unsupported platform ${host}"; + src = fetchurl { + url = "https://download.roonlabs.com/updates/stable/RoonBridge_${system}_${urlVersion}.tar.bz2"; + hash = if system == "linuxx64" then "sha256-DbtKPFEz2WIoKTxP+zoehzz+BjfsLZ2ZQk/FMh+zFBM=" + else if system == "linuxarmv8" then "sha256-+przEj96R+f1z4ewETFarF4oY6tT2VW/ukSTgUBLiYk=" + else throw "Unsupported platform ${host}"; + }; +in +stdenv.mkDerivation { pname = "roon-bridge"; - version = "1.8-943"; - - src = - let - urlVersion = builtins.replaceStrings [ "." "-" ] [ "00" "00" ] version; - inherit (stdenv.targetPlatform) system; - in - { - x86_64-linux = fetchurl { - url = "http://download.roonlabs.com/builds/RoonBridge_linuxx64_${urlVersion}.tar.bz2"; - hash = "sha256-knmy2zlRh+ehvYKHC7UN60pMCt8bYPuo9kTz2m0pOW0"; - }; - aarch64-linux = fetchurl { - url = "http://download.roonlabs.com/builds/RoonBridge_linuxarmv8_${urlVersion}.tar.bz2"; - hash = "sha256-urMhtBUjP4HpV9EDZOLLnfnMqhmsWPx0M2+Xdvc8YnU="; - }; - }.${system} or (throw "Unsupposed system: ${system}"); + inherit src version; dontConfigure = true; dontBuild = true; diff --git a/pkgs/servers/roon-server/default.nix b/pkgs/servers/roon-server/default.nix index 5beeb9b6011..e01a9eb220f 100644 --- a/pkgs/servers/roon-server/default.nix +++ b/pkgs/servers/roon-server/default.nix @@ -15,7 +15,7 @@ , stdenv }: let - version = "2.0-1128"; + version = "2.0-1143"; urlVersion = builtins.replaceStrings [ "." "-" ] [ "00" "0" ] version; in stdenv.mkDerivation { @@ -24,7 +24,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://download.roonlabs.com/updates/production/RoonServer_linuxx64_${urlVersion}.tar.bz2"; - hash = "sha256-PR3LR7u9X6eUAyoAW1tXv3LzqoVz3RQ0MZwdF0iAXJ8="; + hash = "sha256-qSqSiqO3SzVmRacbbAphVLp0ablQCjR4Zn2HIQaqSPs="; }; dontConfigure = true; diff --git a/pkgs/tools/misc/android-tools/default.nix b/pkgs/tools/misc/android-tools/default.nix index 030486aab33..4d5eff546cc 100644 --- a/pkgs/tools/misc/android-tools/default.nix +++ b/pkgs/tools/misc/android-tools/default.nix @@ -28,6 +28,14 @@ stdenv.mkDerivation rec { ./android-tools-kernel-headers-6.0.diff ]; + postPatch = lib.optionalString stdenv.isDarwin '' + sed -i 's/usb_linux/usb_osx/g' vendor/CMakeLists.{adb,fastboot}.txt + sed -i 's/libselinux libsepol/ /g;s#selinux/libselinux/include##g' vendor/CMakeLists.{fastboot,mke2fs}.txt + sed -z -i 's/add_library(libselinux.*selinux\/libsepol\/include)//g' vendor/CMakeLists.fastboot.txt + sed -i 's/e2fsdroid//g' vendor/CMakeLists.txt + sed -z -i 's/add_executable(e2fsdroid.*e2fsprogs\/misc)//g' vendor/CMakeLists.mke2fs.txt + ''; + nativeBuildInputs = [ cmake perl go ]; buildInputs = [ protobuf zlib gtest brotli lz4 zstd libusb1 pcre2 fmt_7 ]; propagatedBuildInputs = [ pythonEnv ]; @@ -35,6 +43,15 @@ stdenv.mkDerivation rec { # Don't try to fetch any Go modules via the network: GOFLAGS = [ "-mod=vendor" ]; + NIX_CFLAGS_COMPILE = lib.optionals stdenv.isDarwin [ + "-D_DARWIN_C_SOURCE" + ]; + + NIX_LDFLAGS = lib.optionals stdenv.isDarwin [ + "-framework CoreFoundation" + "-framework IOKit" + ]; + preConfigure = '' export GOCACHE=$TMPDIR/go-cache ''; @@ -63,7 +80,7 @@ stdenv.mkDerivation rec { # https://developer.android.com/studio/releases/platform-tools homepage = "https://github.com/nmeum/android-tools"; license = with licenses; [ asl20 unicode-dfs-2015 ]; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ primeos ]; }; } diff --git a/pkgs/tools/nix/nix-store-gcs-proxy/default.nix b/pkgs/tools/nix/nix-store-gcs-proxy/default.nix index c782607da85..9f2fe3fe715 100644 --- a/pkgs/tools/nix/nix-store-gcs-proxy/default.nix +++ b/pkgs/tools/nix/nix-store-gcs-proxy/default.nix @@ -1,5 +1,5 @@ -{ lib, buildGoPackage, fetchFromGitHub }: -buildGoPackage rec { +{ lib, buildGoModule, fetchFromGitHub }: +buildGoModule rec { pname = "nix-store-gcs-proxy"; version = "0.1.0"; @@ -10,9 +10,9 @@ buildGoPackage rec { sha256 = "0804p65px4wd7gzxggpdxsazkd1hbz1p15zzaxf9ygc6sh26ncln"; }; - goPackagePath = "github.com/tweag/nix-store-gcs-proxy"; + vendorSha256 = "sha256-Bm3yFzm2LXOPYWQDk/UBusV0lPfc/BCKIb3pPlWgDFo="; - goDeps = ./deps.nix; + ldflags = [ "-s" "-w" ]; meta = { description = "A HTTP nix store that proxies requests to Google Storage"; diff --git a/pkgs/tools/nix/nix-store-gcs-proxy/deps.nix b/pkgs/tools/nix/nix-store-gcs-proxy/deps.nix deleted file mode 100644 index b5ae542876d..00000000000 --- a/pkgs/tools/nix/nix-store-gcs-proxy/deps.nix +++ /dev/null @@ -1,813 +0,0 @@ -# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) -[ - { - goPackagePath = "cloud.google.com/go"; - fetch = { - type = "git"; - url = "https://code.googlesource.com/gocloud"; - rev = "v0.37.2"; - sha256 = "1w6crdxy9vzd8vm672hng22spwld6d60z58kbr28dkiiz694wqvs"; - }; - } - { - goPackagePath = "github.com/BurntSushi/toml"; - fetch = { - type = "git"; - url = "https://github.com/BurntSushi/toml"; - rev = "v0.3.1"; - sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6"; - }; - } - { - goPackagePath = "github.com/Shopify/sarama"; - fetch = { - type = "git"; - url = "https://github.com/Shopify/sarama"; - rev = "v1.19.0"; - sha256 = "0q1z3pvcd011yprwzws2s293v4cjvsszhai6vnfrahjcbsz79q0z"; - }; - } - { - goPackagePath = "github.com/Shopify/toxiproxy"; - fetch = { - type = "git"; - url = "https://github.com/Shopify/toxiproxy"; - rev = "v2.1.4"; - sha256 = "07yhsvscdv1qjfc2fyyh9qsrrdwrrw04wadk5gaq4qddcway7vig"; - }; - } - { - goPackagePath = "github.com/alecthomas/template"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/template"; - rev = "a0175ee3bccc"; - sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj"; - }; - } - { - goPackagePath = "github.com/alecthomas/units"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/units"; - rev = "2efee857e7cf"; - sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl"; - }; - } - { - goPackagePath = "github.com/anmitsu/go-shlex"; - fetch = { - type = "git"; - url = "https://github.com/anmitsu/go-shlex"; - rev = "648efa622239"; - sha256 = "10rgdp5d106iisgz25ic8k6f44s9adh4sjh6fyxq9ccm21gw49b7"; - }; - } - { - goPackagePath = "github.com/apache/thrift"; - fetch = { - type = "git"; - url = "https://github.com/apache/thrift"; - rev = "v0.12.0"; - sha256 = "0g2g61rs189nimg3631wxfwdx12dsdz70qvncczlyvn34pcj7yby"; - }; - } - { - goPackagePath = "github.com/beorn7/perks"; - fetch = { - type = "git"; - url = "https://github.com/beorn7/perks"; - rev = "3a771d992973"; - sha256 = "1l2lns4f5jabp61201sh88zf3b0q793w4zdgp9nll7mmfcxxjif3"; - }; - } - { - goPackagePath = "github.com/bradfitz/go-smtpd"; - fetch = { - type = "git"; - url = "https://github.com/bradfitz/go-smtpd"; - rev = "deb6d6237625"; - sha256 = "1i33brqd44h0a9hbdnclka0hfg0f6qi5xy23f0ap9yixkhj4k9p6"; - }; - } - { - goPackagePath = "github.com/client9/misspell"; - fetch = { - type = "git"; - url = "https://github.com/client9/misspell"; - rev = "v0.3.4"; - sha256 = "1vwf33wsc4la25zk9nylpbp9px3svlmldkm0bha4hp56jws4q9cs"; - }; - } - { - goPackagePath = "github.com/coreos/go-systemd"; - fetch = { - type = "git"; - url = "https://github.com/coreos/go-systemd"; - rev = "c6f51f82210d"; - sha256 = "1vnccmnkjl6n539l4cliz6sznpqn6igf5v7mbmsgahb838742clb"; - }; - } - { - goPackagePath = "github.com/davecgh/go-spew"; - fetch = { - type = "git"; - url = "https://github.com/davecgh/go-spew"; - rev = "v1.1.1"; - sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; - }; - } - { - goPackagePath = "github.com/eapache/go-resiliency"; - fetch = { - type = "git"; - url = "https://github.com/eapache/go-resiliency"; - rev = "v1.1.0"; - sha256 = "1zmgw3c4w5r6m2r340n4jc5l5ll3m3nbszqrmrgbqc2xixxyk2gx"; - }; - } - { - goPackagePath = "github.com/eapache/go-xerial-snappy"; - fetch = { - type = "git"; - url = "https://github.com/eapache/go-xerial-snappy"; - rev = "776d5712da21"; - sha256 = "0ncc41dv7xwb1znyzmzh7cvs6j5fzz0f1n8h1v3grl9ma6s1si9d"; - }; - } - { - goPackagePath = "github.com/eapache/queue"; - fetch = { - type = "git"; - url = "https://github.com/eapache/queue"; - rev = "v1.1.0"; - sha256 = "07dp54n94gn3gsvdcki56yqh7py7wqqigxbamhxwgbr05n61fqyg"; - }; - } - { - goPackagePath = "github.com/flynn/go-shlex"; - fetch = { - type = "git"; - url = "https://github.com/flynn/go-shlex"; - rev = "3f9db97f8568"; - sha256 = "1j743lysygkpa2s2gii2xr32j7bxgc15zv4113b0q9jhn676ysia"; - }; - } - { - goPackagePath = "github.com/fsnotify/fsnotify"; - fetch = { - type = "git"; - url = "https://github.com/fsnotify/fsnotify"; - rev = "v1.4.7"; - sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; - }; - } - { - goPackagePath = "github.com/gliderlabs/ssh"; - fetch = { - type = "git"; - url = "https://github.com/gliderlabs/ssh"; - rev = "v0.1.1"; - sha256 = "0bylkc7yg8bxxffhchikcnzwli5n95cfmbji6v2a4mn1h5n36mdm"; - }; - } - { - goPackagePath = "github.com/go-kit/kit"; - fetch = { - type = "git"; - url = "https://github.com/go-kit/kit"; - rev = "v0.8.0"; - sha256 = "1rcywbc2pvab06qyf8pc2rdfjv7r6kxdv2v4wnpqnjhz225wqvc0"; - }; - } - { - goPackagePath = "github.com/go-logfmt/logfmt"; - fetch = { - type = "git"; - url = "https://github.com/go-logfmt/logfmt"; - rev = "v0.3.0"; - sha256 = "1gkgh3k5w1xwb2qbjq52p6azq3h1c1rr6pfwjlwj1zrijpzn2xb9"; - }; - } - { - goPackagePath = "github.com/go-stack/stack"; - fetch = { - type = "git"; - url = "https://github.com/go-stack/stack"; - rev = "v1.8.0"; - sha256 = "0wk25751ryyvxclyp8jdk5c3ar0cmfr8lrjb66qbg4808x66b96v"; - }; - } - { - goPackagePath = "github.com/gogo/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/gogo/protobuf"; - rev = "v1.2.0"; - sha256 = "1c3y5m08mvrgvlw0kb9pldh3kkqcj99pa8gqmk1g3hp8ih3b2dv0"; - }; - } - { - goPackagePath = "github.com/golang/glog"; - fetch = { - type = "git"; - url = "https://github.com/golang/glog"; - rev = "23def4e6c14b"; - sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30"; - }; - } - { - goPackagePath = "github.com/golang/mock"; - fetch = { - type = "git"; - url = "https://github.com/golang/mock"; - rev = "v1.2.0"; - sha256 = "12ddj2g8ab87id6n2n67vnbhq6p8dvgsq1pzpqfriym4dk8w54fg"; - }; - } - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "v1.2.0"; - sha256 = "0kf4b59rcbb1cchfny2dm9jyznp8ri2hsb14n8iak1q8986xa0ab"; - }; - } - { - goPackagePath = "github.com/golang/snappy"; - fetch = { - type = "git"; - url = "https://github.com/golang/snappy"; - rev = "2e65f85255db"; - sha256 = "05w6mpc4qcy0pv8a2bzng8nf4s5rf5phfang4jwy9rgf808q0nxf"; - }; - } - { - goPackagePath = "github.com/google/btree"; - fetch = { - type = "git"; - url = "https://github.com/google/btree"; - rev = "4030bb1f1f0c"; - sha256 = "0ba430m9fbnagacp57krgidsyrgp3ycw5r7dj71brgp5r52g82p6"; - }; - } - { - goPackagePath = "github.com/google/go-cmp"; - fetch = { - type = "git"; - url = "https://github.com/google/go-cmp"; - rev = "v0.2.0"; - sha256 = "1fbv0x27k9sn8svafc0hjwsnckk864lv4yi7bvzrxvmd3d5hskds"; - }; - } - { - goPackagePath = "github.com/google/go-github"; - fetch = { - type = "git"; - url = "https://github.com/google/go-github"; - rev = "v17.0.0"; - sha256 = "1kvw95l77a5n5rgal9n1xjh58zxb3a40ij1j722b1h4z8yg9jhg4"; - }; - } - { - goPackagePath = "github.com/google/go-querystring"; - fetch = { - type = "git"; - url = "https://github.com/google/go-querystring"; - rev = "v1.0.0"; - sha256 = "0xl12bqyvmn4xcnf8p9ksj9rmnr7s40pvppsdmy8n9bzw1db0iwz"; - }; - } - { - goPackagePath = "github.com/google/martian"; - fetch = { - type = "git"; - url = "https://github.com/google/martian"; - rev = "v2.1.0"; - sha256 = "197hil6vrjk50b9wvwyzf61csid83whsjj6ik8mc9r2lryxlyyrp"; - }; - } - { - goPackagePath = "github.com/google/pprof"; - fetch = { - type = "git"; - url = "https://github.com/google/pprof"; - rev = "3ea8567a2e57"; - sha256 = "09rhjn3ms0a72dw0yzbp237p7yhqma772zspddn6mgkh3gi3kn4c"; - }; - } - { - goPackagePath = "github.com/googleapis/gax-go"; - fetch = { - type = "git"; - url = "https://github.com/googleapis/gax-go"; - rev = "v2.0.4"; - sha256 = "1iwnm6ky1x53lgs44mw3hpdkjzrm5qd0kfs50m0qcq2ml5m1cwdm"; - }; - } - { - goPackagePath = "github.com/gorilla/context"; - fetch = { - type = "git"; - url = "https://github.com/gorilla/context"; - rev = "v1.1.1"; - sha256 = "03p4hn87vcmfih0p9w663qbx9lpsf7i7j3lc7yl7n84la3yz63m4"; - }; - } - { - goPackagePath = "github.com/gorilla/mux"; - fetch = { - type = "git"; - url = "https://github.com/gorilla/mux"; - rev = "v1.6.2"; - sha256 = "0pvzm23hklxysspnz52mih6h1q74vfrdhjfm1l3sa9r8hhqmmld2"; - }; - } - { - goPackagePath = "github.com/gregjones/httpcache"; - fetch = { - type = "git"; - url = "https://github.com/gregjones/httpcache"; - rev = "9cad4c3443a7"; - sha256 = "0wjdwcwqqcx2d5y68qvhg6qyj977il5ijmnn9h9cd6wjbdy0ay6s"; - }; - } - { - goPackagePath = "github.com/hashicorp/golang-lru"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/golang-lru"; - rev = "v0.5.0"; - sha256 = "12k2cp2k615fjvfa5hyb9k2alian77wivds8s65diwshwv41939f"; - }; - } - { - goPackagePath = "github.com/hpcloud/tail"; - fetch = { - type = "git"; - url = "https://github.com/hpcloud/tail"; - rev = "v1.0.0"; - sha256 = "1njpzc0pi1acg5zx9y6vj9xi6ksbsc5d387rd6904hy6rh2m6kn0"; - }; - } - { - goPackagePath = "github.com/jellevandenhooff/dkim"; - fetch = { - type = "git"; - url = "https://github.com/jellevandenhooff/dkim"; - rev = "f50fe3d243e1"; - sha256 = "0qf5pypxfpciivj0v728i24rfjwhnwm07945mj6p3cw4gdphqhm0"; - }; - } - { - goPackagePath = "github.com/jstemmer/go-junit-report"; - fetch = { - type = "git"; - url = "https://github.com/jstemmer/go-junit-report"; - rev = "af01ea7f8024"; - sha256 = "1lp3n94ris12hac02wi31f3whs88lcrzwgdg43a5j6cafg9p1d0s"; - }; - } - { - goPackagePath = "github.com/julienschmidt/httprouter"; - fetch = { - type = "git"; - url = "https://github.com/julienschmidt/httprouter"; - rev = "v1.2.0"; - sha256 = "1k8bylc9s4vpvf5xhqh9h246dl1snxrzzz0614zz88cdh8yzs666"; - }; - } - { - goPackagePath = "github.com/konsorten/go-windows-terminal-sequences"; - fetch = { - type = "git"; - url = "https://github.com/konsorten/go-windows-terminal-sequences"; - rev = "v1.0.1"; - sha256 = "1lchgf27n276vma6iyxa0v1xds68n2g8lih5lavqnx5x6q5pw2ip"; - }; - } - { - goPackagePath = "github.com/kr/logfmt"; - fetch = { - type = "git"; - url = "https://github.com/kr/logfmt"; - rev = "b84e30acd515"; - sha256 = "02ldzxgznrfdzvghfraslhgp19la1fczcbzh7wm2zdc6lmpd1qq9"; - }; - } - { - goPackagePath = "github.com/kr/pty"; - fetch = { - type = "git"; - url = "https://github.com/kr/pty"; - rev = "v1.1.3"; - sha256 = "0knzlvndfgjm2k23vhp2xj1cv3fm31vbg5b20gdl1vnxk7rh549h"; - }; - } - { - goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; - fetch = { - type = "git"; - url = "https://github.com/matttproud/golang_protobuf_extensions"; - rev = "v1.0.1"; - sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya"; - }; - } - { - goPackagePath = "github.com/mwitkow/go-conntrack"; - fetch = { - type = "git"; - url = "https://github.com/mwitkow/go-conntrack"; - rev = "cc309e4a2223"; - sha256 = "0nbrnpk7bkmqg9mzwsxlm0y8m7s9qd9phr1q30qlx2qmdmz7c1mf"; - }; - } - { - goPackagePath = "github.com/onsi/ginkgo"; - fetch = { - type = "git"; - url = "https://github.com/onsi/ginkgo"; - rev = "v1.7.0"; - sha256 = "14wgpdrvpc35rdz3859bz53sc1g4vpr1fysy15wy3ff9gmqs14yg"; - }; - } - { - goPackagePath = "github.com/onsi/gomega"; - fetch = { - type = "git"; - url = "https://github.com/onsi/gomega"; - rev = "v1.4.3"; - sha256 = "1c8rqg5i2hz3snmq7s41yar1zjnzilb0fyiyhkg83v97afcfx79v"; - }; - } - { - goPackagePath = "github.com/openzipkin/zipkin-go"; - fetch = { - type = "git"; - url = "https://github.com/openzipkin/zipkin-go"; - rev = "v0.1.6"; - sha256 = "0fyf69w66khj3dxdpqydwjdhhhyhlh3caxa5ybnd1h2f6b5gbvvv"; - }; - } - { - goPackagePath = "github.com/pierrec/lz4"; - fetch = { - type = "git"; - url = "https://github.com/pierrec/lz4"; - rev = "v2.0.5"; - sha256 = "0y5rh7z01zycd59nnjpkqq0ydyjmcg9j1xw15q1i600l9j9g617p"; - }; - } - { - goPackagePath = "github.com/pkg/errors"; - fetch = { - type = "git"; - url = "https://github.com/pkg/errors"; - rev = "v0.8.0"; - sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; - }; - } - { - goPackagePath = "github.com/pmezard/go-difflib"; - fetch = { - type = "git"; - url = "https://github.com/pmezard/go-difflib"; - rev = "v1.0.0"; - sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; - }; - } - { - goPackagePath = "github.com/prometheus/client_golang"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_golang"; - rev = "3c4408c8b829"; - sha256 = "06d9cxxxkglks8fpfg3spxscyrq4lw7fckm4p6f0wshq65am2lxw"; - }; - } - { - goPackagePath = "github.com/prometheus/client_model"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_model"; - rev = "56726106282f"; - sha256 = "19y4qs9mkxiiab5sh3b7cccjpl3xbp6sy8812ig9f1zg8vzkzj7j"; - }; - } - { - goPackagePath = "github.com/prometheus/common"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/common"; - rev = "v0.2.0"; - sha256 = "02kym6lcfnlq23qbv277jr0q1n7jj0r14gqg93c7wn7gc44jv3vp"; - }; - } - { - goPackagePath = "github.com/prometheus/procfs"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/procfs"; - rev = "bf6a532e95b1"; - sha256 = "0k65i2ikf3jp6863mpc1raf928i78r8jd7zn9djx6f4izls6l6j1"; - }; - } - { - goPackagePath = "github.com/rcrowley/go-metrics"; - fetch = { - type = "git"; - url = "https://github.com/rcrowley/go-metrics"; - rev = "3113b8401b8a"; - sha256 = "1m5q5dsvkqz809aag6dyan74wdrp69g2mb9killbv7z4ls2mlfr3"; - }; - } - { - goPackagePath = "github.com/sirupsen/logrus"; - fetch = { - type = "git"; - url = "https://github.com/sirupsen/logrus"; - rev = "v1.2.0"; - sha256 = "0r6334x2bls8ddznvzaldx4g88msjjns4mlks95rqrrg7h0ijigg"; - }; - } - { - goPackagePath = "github.com/stretchr/objx"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/objx"; - rev = "v0.1.1"; - sha256 = "0iph0qmpyqg4kwv8jsx6a56a7hhqq8swrazv40ycxk9rzr0s8yls"; - }; - } - { - goPackagePath = "github.com/stretchr/testify"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/testify"; - rev = "v1.2.2"; - sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs"; - }; - } - { - goPackagePath = "github.com/tarm/serial"; - fetch = { - type = "git"; - url = "https://github.com/tarm/serial"; - rev = "98f6abe2eb07"; - sha256 = "1yj4jiv2f3x3iawxdflrlmdan0k9xsbnccgc9yz658rmif1ag3pb"; - }; - } - { - goPackagePath = "github.com/urfave/cli"; - fetch = { - type = "git"; - url = "https://github.com/urfave/cli"; - rev = "v1.20.0"; - sha256 = "0y6f4sbzkiiwrxbl15biivj8c7qwxnvm3zl2dd3mw4wzg4x10ygj"; - }; - } - { - goPackagePath = "github.com/urfave/negroni"; - fetch = { - type = "git"; - url = "https://github.com/urfave/negroni"; - rev = "v1.0.0"; - sha256 = "1gp6j74adi1cn8fq5v3wzlzhwl4zg43n2746m4fzdcdimihk3ccp"; - }; - } - { - goPackagePath = "go.opencensus.io"; - fetch = { - type = "git"; - url = "https://github.com/census-instrumentation/opencensus-go"; - rev = "v0.19.2"; - sha256 = "1vlik5xwwrhcyy9yx2yc3y02y6hp9q80591hbhncv9c8wwfg9gjc"; - }; - } - { - goPackagePath = "go4.org"; - fetch = { - type = "git"; - url = "https://github.com/go4org/go4"; - rev = "417644f6feb5"; - sha256 = "013cvdg4fj15l9xg84br0vkb2d99j04s5b4g7zssqhng8dkwgr37"; - }; - } - { - goPackagePath = "golang.org/x/build"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/build"; - rev = "5284462c4bec"; - sha256 = "0w649zbs4n64b6rjx92hy7vc1y9sv4khhk5igbz8w7sxvz8778ij"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "c2843e01d9a2"; - sha256 = "01xgxbj5r79nmisdvpq48zfy8pzaaj90bn6ngd4nf33j9ar1dp8r"; - }; - } - { - goPackagePath = "golang.org/x/exp"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/exp"; - rev = "509febef88a4"; - sha256 = "02isrh39z8znrp5znplzy0dip2gnrl3jm1355raliyvhnhg04j6q"; - }; - } - { - goPackagePath = "golang.org/x/lint"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/lint"; - rev = "5614ed5bae6f"; - sha256 = "0fzn0zjv0x92xvfdq3a0v9w5sgkhr7hxkfy9zaqi8i57807z8bnx"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "d8887717615a"; - sha256 = "1wfm6ngxjyj7v5a2dqib6lw8bb2rdnf1kl48diykxjrsddn0s163"; - }; - } - { - goPackagePath = "golang.org/x/oauth2"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/oauth2"; - rev = "e64efc72b421"; - sha256 = "0djvwz2avx7knsjbl434vw1wqbrg53xp1kh599gfixn5icrggz4m"; - }; - } - { - goPackagePath = "golang.org/x/perf"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/perf"; - rev = "6e6d33e29852"; - sha256 = "1cyiy459bkjqnzgk051lsksz46hdkjc34q33zf946kiv3hilp1v2"; - }; - } - { - goPackagePath = "golang.org/x/sync"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sync"; - rev = "e225da77a7e6"; - sha256 = "0bh3583smcfw6jw3w6lp0za93rz7hpxfdz8vhxng75b7a6vdlw4p"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "d0b11bdaac8a"; - sha256 = "18yfsmw622l7gc5sqriv5qmck6903vvhivpzp8i3xfy3z33dybdl"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "17ff2d5776d2"; - sha256 = "1rrh2mnmyxr45nsvy42zq3w3ly6gw6rl993knwvf1w71kyv0jjnj"; - }; - } - { - goPackagePath = "golang.org/x/time"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/time"; - rev = "85acf8d2951c"; - sha256 = "0yqnxsrarjk4qkda8kcxzmk7y90kkkxzx9iwryzrk7bzs87ky3xc"; - }; - } - { - goPackagePath = "golang.org/x/tools"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/tools"; - rev = "e65039ee4138"; - sha256 = "0c094599cf70wdrms49a3879qkq122pqlp2av444gs2pvc8apdcx"; - }; - } - { - goPackagePath = "google.golang.org/api"; - fetch = { - type = "git"; - url = "https://code.googlesource.com/google-api-go-client"; - rev = "v0.3.0"; - sha256 = "1vvrhiq2zs677iz2j6s9iv4q3j3nhxz5ci9y4zrak248lrdln0zk"; - }; - } - { - goPackagePath = "google.golang.org/appengine"; - fetch = { - type = "git"; - url = "https://github.com/golang/appengine"; - rev = "v1.4.0"; - sha256 = "06zl7w4sxgdq2pl94wy9ncii6h0z3szl4xpqds0sv3b3wbdlhbnn"; - }; - } - { - goPackagePath = "google.golang.org/genproto"; - fetch = { - type = "git"; - url = "https://github.com/google/go-genproto"; - rev = "5fe7a883aa19"; - sha256 = "0qjkwig0r42q0j2qv57s4ahsgmmp41dz3ih3rnaqg0619n5w7lbs"; - }; - } - { - goPackagePath = "google.golang.org/grpc"; - fetch = { - type = "git"; - url = "https://github.com/grpc/grpc-go"; - rev = "v1.19.0"; - sha256 = "1znqwpj7ix3dpzx4zch0q70sdl3z5lvbb7v3q4i8sf8kas3yv71v"; - }; - } - { - goPackagePath = "gopkg.in/alecthomas/kingpin.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/alecthomas/kingpin.v2"; - rev = "v2.2.6"; - sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r"; - }; - } - { - goPackagePath = "gopkg.in/check.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/check.v1"; - rev = "788fd7840127"; - sha256 = "0v3bim0j375z81zrpr5qv42knqs0y2qv2vkjiqi5axvb78slki1a"; - }; - } - { - goPackagePath = "gopkg.in/fsnotify.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/fsnotify.v1"; - rev = "v1.4.7"; - sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; - }; - } - { - goPackagePath = "gopkg.in/inf.v0"; - fetch = { - type = "git"; - url = "https://gopkg.in/inf.v0"; - rev = "v0.9.1"; - sha256 = "00k5iqjcp371fllqxncv7jkf80hn1zww92zm78cclbcn4ybigkng"; - }; - } - { - goPackagePath = "gopkg.in/tomb.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/tomb.v1"; - rev = "dd632973f1e7"; - sha256 = "1lqmq1ag7s4b3gc3ddvr792c5xb5k6sfn0cchr3i2s7f1c231zjv"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "v2.2.2"; - sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa"; - }; - } - { - goPackagePath = "grpc.go4.org"; - fetch = { - type = "git"; - url = "https://github.com/go4org/grpc"; - rev = "11d0a25b4919"; - sha256 = "1d6akp2b3aa2viwbikc3jndhiljgjj87r4z7mg5b03f97f2wmz4f"; - }; - } - { - goPackagePath = "honnef.co/go/tools"; - fetch = { - type = "git"; - url = "https://github.com/dominikh/go-tools"; - rev = "3f1c8253044a"; - sha256 = "0d3vgh0fgfj1z7i648g1s6x2pwxd07sxfjwg1xn3yagr9h06jh3h"; - }; - } -] diff --git a/pkgs/tools/security/cie-middleware-linux/default.nix b/pkgs/tools/security/cie-middleware-linux/default.nix index 30a0352db70..45a79029d20 100644 --- a/pkgs/tools/security/cie-middleware-linux/default.nix +++ b/pkgs/tools/security/cie-middleware-linux/default.nix @@ -20,14 +20,13 @@ let pname = "cie-middleware-linux"; - version = "1.4.3.3"; + version = "1.4.4.0"; src = fetchFromGitHub { owner = "M0rf30"; repo = pname; - # use the podofo-vanilla branch - rev = "531acc54609eaeccbdd4ef881d7d7e7e0fe0af17"; - sha256 = "sha256-hUpEkiEQu0R+aCo4bfZfVLLib0o6v2RQJVIte3n+IAk="; + rev = "${version}-podofo"; + sha256 = "sha256-Kyr9OTiY6roJ/wVJS/1aWfrrzDNQbuRTJQqo0akbMUU="; }; # Shared libraries needed by the Java application @@ -59,7 +58,7 @@ let outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "sha256-gsb4aH/au7IDh1PX/qY+8o7CmjKJUHpmEa0vYhbAnP0="; + outputHash = "sha256-WzT5vYF9yCMU2A7EkLZyjgWrN3gD7pnkPXc3hDFqpD8="; }; in diff --git a/pkgs/tools/security/grype/default.nix b/pkgs/tools/security/grype/default.nix index 182df4ceb96..12b21d28034 100644 --- a/pkgs/tools/security/grype/default.nix +++ b/pkgs/tools/security/grype/default.nix @@ -1,19 +1,20 @@ { lib -, stdenv , buildGoModule , fetchFromGitHub , installShellFiles + +, openssl }: buildGoModule rec { pname = "grype"; - version = "0.49.0"; + version = "0.51.0"; src = fetchFromGitHub { owner = "anchore"; repo = pname; rev = "v${version}"; - sha256 = "sha256-MShlKtrorqXRInQ01dEzVeLDRDua9PISkficF02PrBI="; + sha256 = "sha256-WTDUkC+TFVkT/D36hDusqxwidy6O+iMInBpTumdCaw4="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -25,13 +26,15 @@ buildGoModule rec { find "$out" -name .git -print0 | xargs -0 rm -rf ''; }; - - vendorSha256 = "sha256-MusEvYNaMM0kqHSDdenPKo4IrIFmvPHSCRzciKMFiew="; + vendorSha256 = "sha256-bpWUo6YA0TkIyDg27mv88X1fh+1Wal362Sqi7loo/Zs="; nativeBuildInputs = [ installShellFiles ]; + subPackages = [ "." ]; + excludedPackages = "test/integration"; + ldflags = [ "-s" "-w" @@ -49,8 +52,44 @@ buildGoModule rec { ldflags+=" -X github.com/anchore/grype/internal/version.buildDate=$(cat SOURCE_DATE_EPOCH)" ''; - # Tests require a running Docker instance - doCheck = false; + checkInputs = [ openssl ]; + preCheck = '' + # test all dirs (except excluded) + unset subPackages + # test goldenfiles expect no version + unset ldflags + + # patch utility script + patchShebangs grype/db/test-fixtures/tls/generate-x509-cert-pair.sh + + # remove tests that depend on docker + substituteInPlace test/cli/cmd_test.go \ + --replace "TestCmd" "SkipCmd" + substituteInPlace grype/pkg/provider_test.go \ + --replace "TestSyftLocationExcludes" "SkipSyftLocationExcludes" + substituteInPlace grype/presenter/cyclonedx/presenter_test.go \ + --replace "TestCycloneDxPresenterImage" "SkipCycloneDxPresenterImage" + substituteInPlace grype/presenter/cyclonedxvex/presenter_test.go \ + --replace "TestCycloneDxPresenterImage" "SkipCycloneDxPresenterImage" + substituteInPlace grype/presenter/sarif/presenter_test.go \ + --replace "Test_imageToSarifReport" "Skip_imageToSarifReport" \ + --replace "TestSarifPresenterImage" "SkipSarifPresenterImage" + + # remove tests that depend on git + substituteInPlace test/cli/db_validations_test.go \ + --replace "TestDBValidations" "SkipDBValidations" + substituteInPlace test/cli/registry_auth_test.go \ + --replace "TestRegistryAuth" "SkipRegistryAuth" + substituteInPlace test/cli/sbom_input_test.go \ + --replace "TestSBOMInput_FromStdin" "SkipSBOMInput_FromStdin" \ + --replace "TestSBOMInput_AsArgument" "SkipSBOMInput_AsArgument" \ + --replace "TestAttestationInput_AsArgument" "SkipAttestationInput_AsArgument" + substituteInPlace test/cli/subprocess_test.go \ + --replace "TestSubprocessStdin" "SkipSubprocessStdin" + + # segfault + rm grype/db/v5/namespace/cpe/namespace_test.go + ''; postInstall = '' installShellCompletion --cmd grype \ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index add7d61521d..1c923c46989 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2029,9 +2029,10 @@ with pkgs; android-backup-extractor = callPackage ../tools/backup/android-backup-extractor {}; - android-tools = lowPrio (callPackage ../tools/misc/android-tools { - stdenv = if stdenv.targetPlatform.isAarch64 then gcc10Stdenv else stdenv; - }); + android-tools = lowPrio (darwin.apple_sdk_11_0.callPackage ../tools/misc/android-tools + (lib.optionalAttrs (stdenv.targetPlatform.isAarch64 && stdenv.targetPlatform.isLinux) { + stdenv = gcc10Stdenv; + })); anewer = callPackage ../tools/text/anewer { }; @@ -18377,7 +18378,7 @@ with pkgs; cxxopts = callPackage ../development/libraries/cxxopts { }; - cxxtest = python2Packages.callPackage ../development/libraries/cxxtest { }; + cxxtest = python3Packages.callPackage ../development/libraries/cxxtest { }; cypress = callPackage ../development/web/cypress { }; |