diff options
Diffstat (limited to 'pkgs')
91 files changed, 1441 insertions, 869 deletions
diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix index aff62e96576ae..481f151ed5617 100644 --- a/pkgs/applications/audio/picard/default.nix +++ b/pkgs/applications/audio/picard/default.nix @@ -18,13 +18,13 @@ let in pythonPackages.buildPythonApplication rec { pname = "picard"; - version = "2.8"; + version = "2.8.1"; src = fetchFromGitHub { owner = "metabrainz"; repo = pname; rev = "refs/tags/release-${version}"; - sha256 = "sha256-DG5b3mw6AL4HSF3diGXOqIeH/eXGqLOsbcnPbD6kznE="; + sha256 = "sha256-KEKOouTNmmZiPyKo8xCQv6Zkreidtz2DaEbHjuwJJvY="; }; nativeBuildInputs = [ gettext qt5.wrapQtAppsHook qt5.qtbase ] diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index ad934c7054408..aae268df3f540 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -2364,8 +2364,8 @@ let mktplcRef = { name = "vspacecode"; publisher = "VSpaceCode"; - version = "0.10.1"; - sha256 = "sha256-H7SCC/ZhDswMQjLX+qpQa6A1N83MobJRPC4pyIbZ1kA="; + version = "0.10.9"; + sha256 = "sha256-16oC2BghY7mB/W0niTDtKGMAC9pt6m0utSOJ0lgbpAU="; }; meta = { license = lib.licenses.mit; diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index 75bfe5cff93d2..4a6e28c3cf07a 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -5,7 +5,6 @@ , cairo , cmake , fetchurl -, fetchpatch , gettext , ghostscript , glib @@ -44,20 +43,25 @@ let python3Env = python3.withPackages (ps: with ps; [ + appdirs + beautifulsoup4 + cachecontrol numpy lxml pillow scour pyserial - ]); + requests + pygobject3 + ] ++ inkex.propagatedBuildInputs); in stdenv.mkDerivation rec { pname = "inkscape"; - version = "1.1.2"; + version = "1.2"; src = fetchurl { - url = "https://media.inkscape.org/dl/resources/file/${pname}-${version}.tar.xz"; - sha256 = "sha256-P/5UoG0LJaTNi260JFNu8e0gW+E0Q6Oc1DfIx7ibltE="; + url = "https://media.inkscape.org/dl/resources/file/inkscape-${version}.tar.xz"; + sha256 = "jZsxFCVUlFZk7f7+LWtVkQpQmXZfcXanEQfDTx3N5q0="; }; # Inkscape hits the ARGMAX when linking on macOS. It appears to be @@ -73,20 +77,6 @@ stdenv.mkDerivation rec { # e.g., those from the "Effects" menu. python3 = "${python3Env}/bin/python"; }) - - # Fix build with poppler 22.03 - # https://gitlab.com/inkscape/inkscape/-/merge_requests/4187 - (fetchpatch { - url = "https://gitlab.com/inkscape/inkscape/-/commit/a18c57ffff313fd08bc8a44f6b6bf0b01d7e9b75.patch"; - sha256 = "UZb8ZTtfA5667uo5ZlVQ5vPowiSgd4ItAJ9U1BOsRQg="; - }) - - # Fix build with poppler 22.04 - # https://gitlab.com/inkscape/inkscape/-/merge_requests/4266 - (fetchpatch { - url = "https://gitlab.com/inkscape/inkscape/-/commit/d989cdf1059c78bc3bb6414330242073768d640b.patch"; - sha256 = "2cJZdunbRgPIwhJgz1dQoQRw3ZYZ2Fp6c3hpVBV2PbE="; - }) ]; postPatch = '' diff --git a/pkgs/applications/misc/feedbackd/default.nix b/pkgs/applications/misc/feedbackd/default.nix index 0892f2e2d02c1..ad1660173159c 100644 --- a/pkgs/applications/misc/feedbackd/default.nix +++ b/pkgs/applications/misc/feedbackd/default.nix @@ -32,7 +32,9 @@ stdenv.mkDerivation rec { # only a Debian package release that is tagged in the upstream repo version = "0.0.0+git20220520"; - outputs = [ "out" "dev" "devdoc" ]; + outputs = [ "out" "dev" ] + # remove if cross-compiling gobject-introspection works + ++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [ "devdoc" ]; src = fetchFromGitLab { domain = "source.puri.sm"; @@ -61,7 +63,13 @@ stdenv.mkDerivation rec { libgudev ]; - mesonFlags = [ "-Dgtk_doc=true" "-Dman=true" ]; + mesonFlags = [ + "-Dgtk_doc=${lib.boolToString (stdenv.buildPlatform == stdenv.hostPlatform)}" + "-Dman=true" + # TODO(mindavi): introspection broken due to https://github.com/NixOS/nixpkgs/issues/72868 + # can be removed if cross-compiling gobject-introspection works. + "-Dintrospection=${if (stdenv.buildPlatform == stdenv.hostPlatform) then "enabled" else "disabled"}" + ]; checkInputs = [ dbus diff --git a/pkgs/applications/misc/stw/default.nix b/pkgs/applications/misc/stw/default.nix new file mode 100644 index 0000000000000..e7c11fd4b9a5c --- /dev/null +++ b/pkgs/applications/misc/stw/default.nix @@ -0,0 +1,32 @@ +{ lib +, stdenv +, fetchFromGitHub +, libX11 +, fontconfig +, libXft +, libXrender +}: + +stdenv.mkDerivation rec { + pname = "stw"; + version = "unstable-2022-02-04"; + + src = fetchFromGitHub { + owner = "sineemore"; + repo = pname; + rev = "c034e04ac912c157f9faa35cb769ba93d92486a0"; + sha256 = "sha256-YohHF1O0lm6QWJv/wkS4RVJvWaOjcYSZNls6tt4hbqo=="; + }; + + buildInputs = [ libX11 fontconfig libXft libXrender ]; + + makeFlags = [ "CC:=$(CC)" "PREFIX=$(out)" ]; + + meta = with lib; { + description = "A simple text widget for X resembling the watch(1) command"; + license = licenses.mit; + maintainers = with maintainers; [ somasis ]; + platforms = platforms.unix; + broken = stdenv.isDarwin; + }; +} diff --git a/pkgs/applications/misc/sway-launcher-desktop/default.nix b/pkgs/applications/misc/sway-launcher-desktop/default.nix index 7955e5c8ce1d2..b67122965234a 100644 --- a/pkgs/applications/misc/sway-launcher-desktop/default.nix +++ b/pkgs/applications/misc/sway-launcher-desktop/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { changelog = "https://github.com/Biont/sway-launcher-desktop/releases/tag/v${version}"; license = licenses.gpl3; platforms = platforms.linux; - maintainers = [ maintainers.mrhedgehog ]; + maintainers = [ maintainers.thehedgeh0g ]; mainProgram = "${pname}"; }; } diff --git a/pkgs/applications/misc/ydict/default.nix b/pkgs/applications/misc/ydict/default.nix index 49370870f692a..9440c23681007 100644 --- a/pkgs/applications/misc/ydict/default.nix +++ b/pkgs/applications/misc/ydict/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "ydict"; - version = "2.2.0"; + version = "2.2.1"; src = fetchFromGitHub { owner = "TimothyYe"; repo = "ydict"; rev = "v${version}"; - sha256 = "sha256-zhjsXZsRk0UNijjqjGjZh4TiPxAM5p+ic3JMx2wrPeY="; + sha256 = "sha256-qrGOrqI+PXsDNCmgcCPDNn6qUYu2emhYSkYsz4sj27M="; }; - vendorSha256 = "sha256-O6czDfKD18rGVMIZv6II09oQu1w0ijQRuZRGt2gj9Cs="; + vendorSha256 = "sha256-c5nQVQd4n978kFAAKcx5mX2Jz16ZOhS8iL/oxS1o5xs="; ldflags = [ "-s" "-w" "-X=main.Version=${version}" ]; diff --git a/pkgs/applications/networking/cluster/talosctl/default.nix b/pkgs/applications/networking/cluster/talosctl/default.nix index 8476fc810ba43..da240b337bfc2 100644 --- a/pkgs/applications/networking/cluster/talosctl/default.nix +++ b/pkgs/applications/networking/cluster/talosctl/default.nix @@ -1,11 +1,11 @@ { lib, buildGoModule, fetchFromGitHub, installShellFiles }: let # look for GO_LDFLAGS getting set in the Makefile - version = "1.0.5"; - sha256 = "sha256-xgzIbhgV1AAUa0tooYtzUMqK4Co3PvWQ0YbZuf0JgFE="; - vendorSha256 = "sha256-Gp30qCGV+EaJ1lvfleZHRWVL6rdSj0mvpumWsqr9IT0="; - pkgsVersion = "v1.0.0-17-g7567bf4"; - extrasVersion = "v1.0.0-3-g6327c36"; + version = "1.0.6"; + sha256 = "sha256-4cUaQWqVndp06eFgqInOMMGITbTdZO5BOqXW2XEpuWU="; + vendorSha256 = "sha256-7q35d+jbIDe7fAy6nL5FWdSovBb/f64HYLHGL+zE6bI="; + pkgsVersion = "v1.0.0-25-gcf9709e"; + extrasVersion = "v1.0.0-4-g05b0920"; in buildGoModule rec { pname = "talosctl"; diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 2df294449f8be..0532dd84868b8 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -196,7 +196,10 @@ rec { sha256 = "sha256-LkRCumyNHVBSsXRp1ovNMGCeidK/jVCjh9H1HSE1Lm8="; vendorSha256 = "sha256-CVgAmPM0nt0Wx+N0qs+IO5KwCWnbfif70EHjBi0bIsQ="; patches = [ ./provider-path-0_15.patch ]; - passthru = { inherit plugins; }; + passthru = { + inherit plugins; + tests = { inherit terraform_plugins_test; }; + }; }; # Tests that the plugins are being used. Terraform looks at the specific diff --git a/pkgs/applications/networking/cluster/tgswitch/default.nix b/pkgs/applications/networking/cluster/tgswitch/default.nix index 5f669a6b9d8a3..44c16bd4668df 100644 --- a/pkgs/applications/networking/cluster/tgswitch/default.nix +++ b/pkgs/applications/networking/cluster/tgswitch/default.nix @@ -1,5 +1,5 @@ -{ buildGoPackage, lib, fetchFromGitHub }: -buildGoPackage rec { +{ buildGoModule, lib, fetchFromGitHub }: +buildGoModule rec { pname = "tgswitch"; version = "0.5.389"; @@ -10,7 +10,14 @@ buildGoPackage rec { sha256 = "sha256-6hErfI7LEJFgOoJR8IF9jTSBwqbQYeGiwdeJShqxVQ0="; }; - goPackagePath = "github.com/warrensbox/tgswitch"; + vendorSha256 = null; + + ldflags = [ "-s" "-w" ]; + + # There are many modifications need to be done to make tests run. For example: + # 1. Network access + # 2. Operation on `/var/empty` not permitted on macOS + doCheck= false; meta = with lib; { description = "A command line tool to switch between different versions of terragrunt"; @@ -19,3 +26,4 @@ buildGoPackage rec { maintainers = with maintainers; [ psibi ]; }; } + diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 287c23401e064..ab471ef47fb78 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -2,7 +2,7 @@ let inherit (pkgs) callPackage fetchurl; versions = if stdenv.isLinux then { - stable = "0.0.17"; + stable = "0.0.18"; ptb = "0.0.29"; canary = "0.0.135"; } else { @@ -21,7 +21,7 @@ let stable = fetchurl { url = "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz"; - sha256 = "058k0cmbm4y572jqw83bayb2zzl2fw2aaz0zj1gvg6sxblp76qil"; + sha256 = "1hl01rf3l6kblx5v7rwnwms30iz8zw6dwlkjsx2f1iipljgkh5q4"; }; ptb = fetchurl { url = diff --git a/pkgs/applications/networking/n8n/node-packages.nix b/pkgs/applications/networking/n8n/node-packages.nix index 579398c111028..106107899bb22 100644 --- a/pkgs/applications/networking/n8n/node-packages.nix +++ b/pkgs/applications/networking/n8n/node-packages.nix @@ -4,6 +4,60 @@ let sources = { + "@apidevtools/json-schema-ref-parser-8.0.0" = { + name = "_at_apidevtools_slash_json-schema-ref-parser"; + packageName = "@apidevtools/json-schema-ref-parser"; + version = "8.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@apidevtools/json-schema-ref-parser/-/json-schema-ref-parser-8.0.0.tgz"; + sha512 = "n4YBtwQhdpLto1BaUCyAeflizmIbaloGShsPyRtFf5qdFJxfssj+GgLavczgKJFa3Bq+3St2CKcpRJdjtB4EBw=="; + }; + }; + "@apidevtools/json-schema-ref-parser-9.0.9" = { + name = "_at_apidevtools_slash_json-schema-ref-parser"; + packageName = "@apidevtools/json-schema-ref-parser"; + version = "9.0.9"; + src = fetchurl { + url = "https://registry.npmjs.org/@apidevtools/json-schema-ref-parser/-/json-schema-ref-parser-9.0.9.tgz"; + sha512 = "GBD2Le9w2+lVFoc4vswGI/TjkNIZSVp7+9xPf+X3uidBfWnAeUWmquteSyt0+VCrhNMWj/FTABISQrD3Z/YA+w=="; + }; + }; + "@apidevtools/openapi-schemas-2.1.0" = { + name = "_at_apidevtools_slash_openapi-schemas"; + packageName = "@apidevtools/openapi-schemas"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@apidevtools/openapi-schemas/-/openapi-schemas-2.1.0.tgz"; + sha512 = "Zc1AlqrJlX3SlpupFGpiLi2EbteyP7fXmUOGup6/DnkRgjP9bgMM/ag+n91rsv0U1Gpz0H3VILA/o3bW7Ua6BQ=="; + }; + }; + "@apidevtools/swagger-cli-4.0.0" = { + name = "_at_apidevtools_slash_swagger-cli"; + packageName = "@apidevtools/swagger-cli"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@apidevtools/swagger-cli/-/swagger-cli-4.0.0.tgz"; + sha512 = "8jDHtZxEkxFNMfqeNhyHjxiS9P3BlSj1WpetsMExs4N+PIa3d0vSNch4Fk9OlgT/2oClCK0YSc+dmmdVpHh0hg=="; + }; + }; + "@apidevtools/swagger-methods-3.0.2" = { + name = "_at_apidevtools_slash_swagger-methods"; + packageName = "@apidevtools/swagger-methods"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@apidevtools/swagger-methods/-/swagger-methods-3.0.2.tgz"; + sha512 = "QAkD5kK2b1WfjDS/UQn/qQkbwF31uqRjPTrsCs5ZG9BQGAkjwvqGFjjPqAuzac/IYzpPtRzjCP1WrTuAIjMrXg=="; + }; + }; + "@apidevtools/swagger-parser-9.0.1" = { + name = "_at_apidevtools_slash_swagger-parser"; + packageName = "@apidevtools/swagger-parser"; + version = "9.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@apidevtools/swagger-parser/-/swagger-parser-9.0.1.tgz"; + sha512 = "Irqybg4dQrcHhZcxJc/UM4vO7Ksoj1Id5e+K94XUOzllqX1n47HEA50EKiXTCQbykxuJ4cYGIivjx/MRSTC5OA=="; + }; + }; "@azure/abort-controller-1.1.0" = { name = "_at_azure_slash_abort-controller"; packageName = "@azure/abort-controller"; @@ -166,6 +220,15 @@ let sha512 = "RxSa9VjcDWgWCYsaLdZItdCnJj7p4LxggaEk+Y3MP0dHKoxez8ioG07DVekVbZZqccsrL+oPB/N9AzVPxj4blg=="; }; }; + "@jsdevtools/ono-7.1.3" = { + name = "_at_jsdevtools_slash_ono"; + packageName = "@jsdevtools/ono"; + version = "7.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@jsdevtools/ono/-/ono-7.1.3.tgz"; + sha512 = "4JQNk+3mVzK3xh2rqd6RB4J46qUR19azEHBneZyTZM+c456qOrbbM/5xcR8huNCCcbVt7+UmizG6GuUvPvKUYg=="; + }; + }; "@kafkajs/confluent-schema-registry-1.0.6" = { name = "_at_kafkajs_slash_confluent-schema-registry"; packageName = "@kafkajs/confluent-schema-registry"; @@ -472,6 +535,15 @@ let sha512 = "2oqXStJYYLDHCciNAClY277Ti3kXT+JLvPD7lLm/490i+B7g0GR6M4qiW+bd2V5vpB+yMKY8IelbsHMAYX1D0A=="; }; }; + "@types/json-schema-7.0.11" = { + name = "_at_types_slash_json-schema"; + packageName = "@types/json-schema"; + version = "7.0.11"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz"; + sha512 = "wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ=="; + }; + }; "@types/jsonwebtoken-8.5.8" = { name = "_at_types_slash_jsonwebtoken"; packageName = "@types/jsonwebtoken"; @@ -508,22 +580,31 @@ let sha512 = "YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw=="; }; }; - "@types/node-12.20.52" = { + "@types/multer-1.4.7" = { + name = "_at_types_slash_multer"; + packageName = "@types/multer"; + version = "1.4.7"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/multer/-/multer-1.4.7.tgz"; + sha512 = "/SNsDidUFCvqqcWDwxv2feww/yqhNeTRL5CVoL3jU4Goc4kKEL10T7Eye65ZqPNi4HRx8sAEX59pV1aEH7drNA=="; + }; + }; + "@types/node-12.20.55" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "12.20.52"; + version = "12.20.55"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-12.20.52.tgz"; - sha512 = "cfkwWw72849SNYp3Zx0IcIs25vABmFh73xicxhCkTcvtZQeIez15PpwQN8fY3RD7gv1Wrxlc9MEtfMORZDEsGw=="; + url = "https://registry.npmjs.org/@types/node/-/node-12.20.55.tgz"; + sha512 = "J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ=="; }; }; - "@types/node-17.0.36" = { + "@types/node-17.0.41" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "17.0.36"; + version = "17.0.41"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-17.0.36.tgz"; - sha512 = "V3orv+ggDsWVHP99K3JlwtH20R7J4IhI1Kksgc+64q5VxgfRkQG8Ws3MFm/FZOKDYGy9feGFlZ70/HpCNe9QaA=="; + url = "https://registry.npmjs.org/@types/node/-/node-17.0.41.tgz"; + sha512 = "xA6drNNeqb5YyV5fO3OAEsnXLfO7uF0whiOfPTz5AeDo8KeZFmODKnvwPymMNO8qE/an8pVY/O50tig2SQCrGw=="; }; }; "@types/node-fetch-2.6.1" = { @@ -589,13 +670,22 @@ let sha512 = "nCkHGI4w7ZgAdNkrEu0bv+4xNV/XDqW+DydknebMOQwkpDGx8G+HTlj7R7ABI8i8nKxVw0wtKPi1D+lPOkh4YQ=="; }; }; - "@types/snowflake-sdk-1.6.6" = { + "@types/snowflake-sdk-1.6.7" = { name = "_at_types_slash_snowflake-sdk"; packageName = "@types/snowflake-sdk"; - version = "1.6.6"; + version = "1.6.7"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/snowflake-sdk/-/snowflake-sdk-1.6.7.tgz"; + sha512 = "qFObD4B02XTgVX1LsAdehdoxzhvJIn2WB5I7oJBr53JC+1X/0AzaUXm7tenuf53FWg6wyVuBgG79yxxBIJpKFA=="; + }; + }; + "@types/swagger-ui-express-4.1.3" = { + name = "_at_types_slash_swagger-ui-express"; + packageName = "@types/swagger-ui-express"; + version = "4.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/snowflake-sdk/-/snowflake-sdk-1.6.6.tgz"; - sha512 = "oGdzQJONiv5UxaSsrIS49IvdcQRoPt6HTqIM8c0JTCIqEwGrsuqBq317PdLntM9SVc8BcDOYeAZTNdlISSSzwQ=="; + url = "https://registry.npmjs.org/@types/swagger-ui-express/-/swagger-ui-express-4.1.3.tgz"; + sha512 = "jqCjGU/tGEaqIplPy3WyQg+Nrp6y80DCFnDEAvVKWkJyv0VivSSDCChkppHRHAablvInZe6pijDFMnavtN0vqA=="; }; }; "@types/tough-cookie-2.3.8" = { @@ -616,6 +706,15 @@ let sha512 = "sOUTGn6h1SfQ+gbgqC364jLFBw2lnFqkgF3q0WovEHRLMrVD1sd5aufqi/aJObLekJO+Aq5z646U4Oxy6shXMA=="; }; }; + "@types/yamljs-0.2.31" = { + name = "_at_types_slash_yamljs"; + packageName = "@types/yamljs"; + version = "0.2.31"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/yamljs/-/yamljs-0.2.31.tgz"; + sha512 = "QcJ5ZczaXAqbVD3o8mw/mEBhRvO5UAdTtbvgwL/OgoWubvNBh6/MxLBAigtcgIFaq3shon9m3POIxQaLQt4fxQ=="; + }; + }; "@xmldom/xmldom-0.7.5" = { name = "_at_xmldom_slash_xmldom"; packageName = "@xmldom/xmldom"; @@ -805,6 +904,15 @@ let sha512 = "qMcx+Gy2UZynHjOHOIXPNvpf+9cjvk3cWrBBK7zg4gH9+clobJRb9NGzcT7mQTcV/6Gm/1WelUtqxVXnNlrwcw=="; }; }; + "append-field-1.0.0" = { + name = "append-field"; + packageName = "append-field"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/append-field/-/append-field-1.0.0.tgz"; + sha512 = "klpgFSWLW1ZEs8svjfb7g4qWY0YS5imI82dTg+QahUvJ8YqAY0P10Uk8tTyh9ZGuYEZEMaeJYCF5BFuX552hsw=="; + }; + }; "aproba-2.0.0" = { name = "aproba"; packageName = "aproba"; @@ -832,6 +940,15 @@ let sha512 = "o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg=="; }; }; + "argparse-2.0.1" = { + name = "argparse"; + packageName = "argparse"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz"; + sha512 = "8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="; + }; + }; "array-flatten-1.1.1" = { name = "array-flatten"; packageName = "array-flatten"; @@ -940,13 +1057,13 @@ let sha512 = "mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA=="; }; }; - "async-3.2.3" = { + "async-3.2.4" = { name = "async"; packageName = "async"; - version = "3.2.3"; + version = "3.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-3.2.3.tgz"; - sha512 = "spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g=="; + url = "https://registry.npmjs.org/async/-/async-3.2.4.tgz"; + sha512 = "iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ=="; }; }; "async-validator-1.8.5" = { @@ -985,13 +1102,13 @@ let sha512 = "z4oo33lmnvvNRqfUe3YjDGGpqu/L2+wXBIhMtwq6oqZ+exOUAkQYM6zd2VWKF7AIlajOF8ZZuPFfryTG9iLC/w=="; }; }; - "aws-sdk-2.1145.0" = { + "aws-sdk-2.1151.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.1145.0"; + version = "2.1151.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1145.0.tgz"; - sha512 = "bjZJGFxHJadnp2kbg1etKw7ID1QmmKk1ivML0Xtt6S6GnGSfX8zVuLMkJZaxPMjlyZ6xeilGwzk2F9igxBCPCQ=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1151.0.tgz"; + sha512 = "VvyzXAmWrX+klvwzA+9gSTY7blDnZOTl0UTKrqmFL4K7tOLieGLYTUkpUegcPxCjYgEg7JwvYolYUnUKiHa4oA=="; }; }; "aws-sign2-0.7.0" = { @@ -1336,6 +1453,15 @@ let sha512 = "MOqV1dKLy1YQgP9m3lFolyMxaU+1+o4afzYYf0H4wNM+x/S0I1QPQfkgGlLiH00EyFrvSmeubeCYFP47rTfpjg=="; }; }; + "busboy-1.6.0" = { + name = "busboy"; + packageName = "busboy"; + version = "1.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/busboy/-/busboy-1.6.0.tgz"; + sha512 = "8SFQbg/0hQ9xy3UNTB0YEnsNBbWfhf7RtnzpL7TkBiTBRfrQ9Fxcnz7VJsleJpyp6rVLvXiuORqjlHi5q+PYuA=="; + }; + }; "byte-length-1.0.2" = { name = "byte-length"; packageName = "byte-length"; @@ -1372,6 +1498,15 @@ let sha512 = "7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA=="; }; }; + "call-me-maybe-1.0.1" = { + name = "call-me-maybe"; + packageName = "call-me-maybe"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/call-me-maybe/-/call-me-maybe-1.0.1.tgz"; + sha512 = "wCyFsDQkKPwwF8BDwOiWNx/9K45L/hvggQiDbve+viMNMQnWhrlYIuBk09offfwCRtCO9P6XwUttufzU11WCVw=="; + }; + }; "callback-stream-1.1.0" = { name = "callback-stream"; packageName = "callback-stream"; @@ -1399,6 +1534,15 @@ let sha512 = "gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw=="; }; }; + "camelcase-5.3.1" = { + name = "camelcase"; + packageName = "camelcase"; + version = "5.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz"; + sha512 = "L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="; + }; + }; "capital-case-1.0.4" = { name = "capital-case"; packageName = "capital-case"; @@ -1435,6 +1579,15 @@ let sha512 = "U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A=="; }; }; + "chalk-3.0.0" = { + name = "chalk"; + packageName = "chalk"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz"; + sha512 = "4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg=="; + }; + }; "chalk-4.1.2" = { name = "chalk"; packageName = "chalk"; @@ -1579,6 +1732,15 @@ let sha512 = "k8AvUYJon0vv75ufoVo4nALYb/qwFFicO3I0+39C6xEdflqVtr+f9cy+0ZxAduoVSTfhP5DX2tY2XICAd5hy6Q=="; }; }; + "cliui-6.0.0" = { + name = "cliui"; + packageName = "cliui"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz"; + sha512 = "t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ=="; + }; + }; "cliui-7.0.4" = { name = "cliui"; packageName = "cliui"; @@ -1768,6 +1930,15 @@ let sha512 = "/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="; }; }; + "concat-stream-1.6.2" = { + name = "concat-stream"; + packageName = "concat-stream"; + version = "1.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz"; + sha512 = "27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw=="; + }; + }; "concat-stream-2.0.0" = { name = "concat-stream"; packageName = "concat-stream"; @@ -1876,13 +2047,13 @@ let sha512 = "Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ=="; }; }; - "core-js-3.22.7" = { + "core-js-3.22.8" = { name = "core-js"; packageName = "core-js"; - version = "3.22.7"; + version = "3.22.8"; src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-3.22.7.tgz"; - sha512 = "Jt8SReuDKVNZnZEzyEQT5eK6T2RRCXkfTq7Lo09kpm+fHjgGewSbNjV+Wt4yZMhPDdzz2x1ulI5z/w4nxpBseg=="; + url = "https://registry.npmjs.org/core-js/-/core-js-3.22.8.tgz"; + sha512 = "UoGQ/cfzGYIuiq6Z7vWL1HfkE9U9IZ4Ub+0XSiJTCzvbZzgPA69oDF2f+lgJ6dFFLEdjW5O6svvoKzXX23xFkA=="; }; }; "core-util-is-1.0.2" = { @@ -1894,6 +2065,15 @@ let sha512 = "3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ=="; }; }; + "core-util-is-1.0.3" = { + name = "core-util-is"; + packageName = "core-util-is"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz"; + sha512 = "ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ=="; + }; + }; "crc-32-1.2.2" = { name = "crc-32"; packageName = "crc-32"; @@ -2047,6 +2227,15 @@ let sha512 = "syBZ+rnAK3EgMsH2aYEOLUW7mZSY9Gb+0wUMCFsZvcmiz+HigA0LOcq/HoQqVuGG+EKykunc7QG2bzrponfaSw=="; }; }; + "decamelize-1.2.0" = { + name = "decamelize"; + packageName = "decamelize"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz"; + sha512 = "z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA=="; + }; + }; "deepmerge-1.5.2" = { name = "deepmerge"; packageName = "deepmerge"; @@ -2272,13 +2461,13 @@ let sha512 = "WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="; }; }; - "element-ui-2.15.8" = { + "element-ui-2.15.9" = { name = "element-ui"; packageName = "element-ui"; - version = "2.15.8"; + version = "2.15.9"; src = fetchurl { - url = "https://registry.npmjs.org/element-ui/-/element-ui-2.15.8.tgz"; - sha512 = "N54zxosRFqpYax3APY3GeRmtOZwIls6Z756WM0kdPZ5Q92PIeKHnZgF1StlamIg9bLxP1k+qdhTZvIeQlim09A=="; + url = "https://registry.npmjs.org/element-ui/-/element-ui-2.15.9.tgz"; + sha512 = "dx45nQLt4Hn87/Z9eRr3ex6KFZbxlFAwEU3QoW3wA5EsYftvHTyL9Pq7VnXXD7hu1Eiaup2jcs6kp+/VSFmXuA=="; }; }; "emoji-regex-8.0.0" = { @@ -2524,6 +2713,15 @@ let sha512 = "zZBcOX9TfehHQhtupq57OF8lFZ3UZi08Y97dwFCkD8p9d/d2Y3M+ykKcwaMDEL+4qyUolgBDX6AblpR3fL212Q=="; }; }; + "express-openapi-validator-4.13.8" = { + name = "express-openapi-validator"; + packageName = "express-openapi-validator"; + version = "4.13.8"; + src = fetchurl { + url = "https://registry.npmjs.org/express-openapi-validator/-/express-openapi-validator-4.13.8.tgz"; + sha512 = "89/sdkq+BKBuIyykaMl/vR9grFc3WFUPTjFo0THHbu+5g+q8rA7fKeoMfz+h84yOQIBcztmJ5ZJdk5uhEls31A=="; + }; + }; "extend-3.0.2" = { name = "extend"; packageName = "extend"; @@ -2650,6 +2848,15 @@ let sha512 = "5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg=="; }; }; + "find-up-4.1.0" = { + name = "find-up"; + packageName = "find-up"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz"; + sha512 = "PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw=="; + }; + }; "flatted-3.2.5" = { name = "flatted"; packageName = "flatted"; @@ -2866,13 +3073,13 @@ let sha512 = "DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="; }; }; - "get-intrinsic-1.1.1" = { + "get-intrinsic-1.1.2" = { name = "get-intrinsic"; packageName = "get-intrinsic"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz"; - sha512 = "kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q=="; + url = "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.2.tgz"; + sha512 = "Jfm3OyCxHh9DJyc28qGk+JmfkpO41A4XkneDSujN9MDXrm4oDKdHvndhZ2dN94+ERNfkYJWDclW6k2L/ZGHjXA=="; }; }; "get-port-5.1.1" = { @@ -3676,13 +3883,13 @@ let sha512 = "RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="; }; }; - "iso-639-1-2.1.13" = { + "iso-639-1-2.1.14" = { name = "iso-639-1"; packageName = "iso-639-1"; - version = "2.1.13"; + version = "2.1.14"; src = fetchurl { - url = "https://registry.npmjs.org/iso-639-1/-/iso-639-1-2.1.13.tgz"; - sha512 = "stYt3u6OnVDNcK4IWARGXmTOOY5Wa5g4bUmBsttZp/55ZiEjDUibR3C59ZnorKoSS0tfJmFuGMST3ksnY1zu7Q=="; + url = "https://registry.npmjs.org/iso-639-1/-/iso-639-1-2.1.14.tgz"; + sha512 = "nekI+mmtSpYySPXIXJtWhv/s+06nAU9wQzq4QPu3YSEMmjnkOoippPY+MEdqDP0Pie8/LsOFEuPbUHslLanDag=="; }; }; "isstream-0.1.2" = { @@ -3721,6 +3928,15 @@ let sha512 = "okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g=="; }; }; + "js-yaml-4.1.0" = { + name = "js-yaml"; + packageName = "js-yaml"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz"; + sha512 = "wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA=="; + }; + }; "jsbi-3.2.5" = { name = "jsbi"; packageName = "jsbi"; @@ -3757,6 +3973,15 @@ let sha512 = "es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA=="; }; }; + "json-schema-ref-parser-9.0.9" = { + name = "json-schema-ref-parser"; + packageName = "json-schema-ref-parser"; + version = "9.0.9"; + src = fetchurl { + url = "https://registry.npmjs.org/json-schema-ref-parser/-/json-schema-ref-parser-9.0.9.tgz"; + sha512 = "qcP2lmGy+JUoQJ4DOQeLaZDqH9qSkeGCK3suKWxJXS82dg728Mn3j97azDMaOUmJAN4uCq91LdPx4K7E8F1a7Q=="; + }; + }; "json-schema-traverse-0.4.1" = { name = "json-schema-traverse"; packageName = "json-schema-traverse"; @@ -3793,6 +4018,15 @@ let sha512 = "m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg=="; }; }; + "jsonschema-1.4.1" = { + name = "jsonschema"; + packageName = "jsonschema"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jsonschema/-/jsonschema-1.4.1.tgz"; + sha512 = "S6cATIPVv1z0IlxdN+zUk5EPjkGCdnhN4wVSBlvoUO1tOLJootbo9CquNJmbIh4yikWHiUedhRYrNPn1arpEmQ=="; + }; + }; "jsonwebtoken-8.5.1" = { name = "jsonwebtoken"; packageName = "jsonwebtoken"; @@ -3937,6 +4171,15 @@ let sha512 = "n418Cn5ynvJd7m/N1d9WVJISLJF/ellZnfsLnx8WBWGzxv/ntNcFkJ1o6se5quUhCplfLGBNL5tYHiq5WF3Nug=="; }; }; + "locate-path-5.0.0" = { + name = "locate-path"; + packageName = "locate-path"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz"; + sha512 = "t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g=="; + }; + }; "lodash-4.17.21" = { name = "lodash"; packageName = "lodash"; @@ -4099,6 +4342,15 @@ let sha512 = "wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ=="; }; }; + "lodash.uniq-4.5.0" = { + name = "lodash.uniq"; + packageName = "lodash.uniq"; + version = "4.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz"; + sha512 = "xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ=="; + }; + }; "lodash.uniqby-4.7.0" = { name = "lodash.uniqby"; packageName = "lodash.uniqby"; @@ -4117,6 +4369,15 @@ let sha512 = "bwKX88k2JhCV9D1vtE8+naDKlLiGrSmf8zi/Y9ivFHwbmRfA8RxS/aVJ+sIht2XOwqoNr4xUPUkGZpc1sHFEKg=="; }; }; + "lodash.zipobject-4.1.3" = { + name = "lodash.zipobject"; + packageName = "lodash.zipobject"; + version = "4.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.zipobject/-/lodash.zipobject-4.1.3.tgz"; + sha512 = "A9SzX4hMKWS25MyalwcOnNoplyHbkNVsjidhTp8ru0Sj23wY9GWBKS8gAIGDSAqeWjIjvE4KBEl24XXAs+v4wQ=="; + }; + }; "logform-2.4.0" = { name = "logform"; packageName = "logform"; @@ -4276,7 +4537,16 @@ let version = "0.3.0"; src = fetchurl { url = "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz"; - sha1 = "8710d7af0aa626f8fffa1ce00168545263255748"; + sha512 = "dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ=="; + }; + }; + "media-typer-1.1.0" = { + name = "media-typer"; + packageName = "media-typer"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/media-typer/-/media-typer-1.1.0.tgz"; + sha512 = "aisnrDP4GNe06UcKFnV5bfMNPBUw4jsLGaWwWfnH3v02GnBuXX2MCVn5RbrWo0j3pczUilYblq7fQ7Nw2t5XKw=="; }; }; "merge-descriptors-1.0.1" = { @@ -4285,7 +4555,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz"; - sha1 = "b00aaa556dd8b44568150ec9d1b953f3f90cbb61"; + sha512 = "cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w=="; }; }; "merge2-1.4.1" = { @@ -4303,7 +4573,7 @@ let version = "1.1.2"; src = fetchurl { url = "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz"; - sha1 = "5529a4d67654134edcc5266656835b0f851afcee"; + sha512 = "iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w=="; }; }; "micromatch-4.0.5" = { @@ -4321,7 +4591,7 @@ let version = "0.1.2"; src = fetchurl { url = "https://registry.npmjs.org/millisecond/-/millisecond-0.1.2.tgz"; - sha1 = "6cc5ad386241cab8e78aff964f87028eec92dac5"; + sha512 = "BJ8XtxY+woL+5TkP6uS6XvOArm0JVrX2otkgtWZseHpIax0oOOPW3cnwhOjRqbEJg7YRO/BDF7fO/PTWNT3T9Q=="; }; }; "mime-1.6.0" = { @@ -4387,13 +4657,13 @@ let sha512 = "Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q=="; }; }; - "minipass-3.1.6" = { + "minipass-3.2.0" = { name = "minipass"; packageName = "minipass"; - version = "3.1.6"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/minipass/-/minipass-3.1.6.tgz"; - sha512 = "rty5kpw9/z8SX9dmxblFA6edItUmwJgMeYDZRrwlIVN27i8gysGbznJwUggw2V/FVqFSDdWy040ZPS811DYAqQ=="; + url = "https://registry.npmjs.org/minipass/-/minipass-3.2.0.tgz"; + sha512 = "rosVvUUjMkTW1UoqXVHzNw937MAKv1ewomUBIqYk0IXPYk+LpVCOV1+kBpzAiQrKGjG3Ta81ZNzk/EcL28zABw=="; }; }; "minizlib-2.1.2" = { @@ -4405,6 +4675,15 @@ let sha512 = "bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg=="; }; }; + "mkdirp-0.5.6" = { + name = "mkdirp"; + packageName = "mkdirp"; + version = "0.5.6"; + src = fetchurl { + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz"; + sha512 = "FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw=="; + }; + }; "mkdirp-1.0.4" = { name = "mkdirp"; packageName = "mkdirp"; @@ -4492,7 +4771,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz"; - sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8"; + sha512 = "Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="; }; }; "ms-2.1.2" = { @@ -4522,6 +4801,15 @@ let sha512 = "G1I7mM0gfxcH5TGSNoVmxq13Mve5YnQgRAlonqaMlHEjHjMn1g04bsrIQbVHFRdI6++dw/FGWlh8GoItJMoUDw=="; }; }; + "multer-1.4.5-lts.1" = { + name = "multer"; + packageName = "multer"; + version = "1.4.5-lts.1"; + src = fetchurl { + url = "https://registry.npmjs.org/multer/-/multer-1.4.5-lts.1.tgz"; + sha512 = "ywPWvcDMeH+z9gQq5qYHCCy+ethsk4goepZ45GLD63fOu0YcNecQxi64nDs3qluZB+murG3/D4dJ7+dGctcCQQ=="; + }; + }; "mute-stream-0.0.8" = { name = "mute-stream"; packageName = "mute-stream"; @@ -4549,49 +4837,49 @@ let sha512 = "z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q=="; }; }; - "n8n-core-0.119.0" = { + "n8n-core-0.121.0" = { name = "n8n-core"; packageName = "n8n-core"; - version = "0.119.0"; + version = "0.121.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.119.0.tgz"; - sha512 = "NdjFdQTIm8yn7UHV3DxA8xXceYBIWNGL58UVUfHws4BtxEO6EoAHmOpyIgTgE4FNmfna+/Bo2NNPruM9sG1UIw=="; + url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.121.0.tgz"; + sha512 = "dPCj0mVw1KkS+GDNIuvleJh8T0NDDQ62QKUh2YXSdQl7mvtAitKS1qqix3P8HnHYYCWBMjG20mLcnqPAzuA3QQ=="; }; }; - "n8n-design-system-0.22.0" = { + "n8n-design-system-0.23.0" = { name = "n8n-design-system"; packageName = "n8n-design-system"; - version = "0.22.0"; + version = "0.23.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-design-system/-/n8n-design-system-0.22.0.tgz"; - sha512 = "z6Vgtzvz0zxCVKGMym7sU5bgcaRhBSGaTT8ibJgblkQYNFRbSQjLjEki+Igc1SXSD8MopZoDRP9AkbMZRjJv/g=="; + url = "https://registry.npmjs.org/n8n-design-system/-/n8n-design-system-0.23.0.tgz"; + sha512 = "3VD+YUPWJ9andodTS3hqxBzLAvr289JDhX5fcS8F0SZD9PU01coUrfl/H5QZwwW9djVvDVdovGweOviAT6w15A=="; }; }; - "n8n-editor-ui-0.145.0" = { + "n8n-editor-ui-0.147.0" = { name = "n8n-editor-ui"; packageName = "n8n-editor-ui"; - version = "0.145.0"; + version = "0.147.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.145.0.tgz"; - sha512 = "+EMtb2yEvfmN8oSQBevrPEKssqX4jyblMRajixVsUn43XMXLt8N+94by2TsaEakWCqxFbOOq1MGBNX+0dSvNGA=="; + url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.147.0.tgz"; + sha512 = "yjyDFue+ObPDTqp0x5iaAo2vi7nSDqD9ts9DHSUzZgmryMuwdWsukb5YJL7JkoFv8qjtsCp3+fhuD37t7/XymA=="; }; }; - "n8n-nodes-base-0.177.0" = { + "n8n-nodes-base-0.179.0" = { name = "n8n-nodes-base"; packageName = "n8n-nodes-base"; - version = "0.177.0"; + version = "0.179.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.177.0.tgz"; - sha512 = "Q+MBYjsqF/WdfGlMwlS6se9cJsuD3OHPVGI4GhBPlVPeb/L/WYga9V7jV5HKf/27HZD1uGxqL8O4Gkwerx9gFw=="; + url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.179.0.tgz"; + sha512 = "UM9O5O9i4N/kf0bXIxEAJgNxFxPCym/63MfXPUFy96OzGbNNfreMg2gNFbyTnJuAAEXSjSu3+tCqBfY1Q472bg=="; }; }; - "n8n-workflow-0.101.0" = { + "n8n-workflow-0.103.0" = { name = "n8n-workflow"; packageName = "n8n-workflow"; - version = "0.101.0"; + version = "0.103.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.101.0.tgz"; - sha512 = "kl/ODNZcE/sDSWXlBj2QN304G+FLG7PZy9JNHX36/DrRDkxTjQ+KIRCIUR3lEfXLp1RGrcH2GJ5qt0WwV4bW9g=="; + url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.103.0.tgz"; + sha512 = "DNt9CzF50zlcSWE4h/ZFolIRJS5jAIAFUeJdgsmAsVMB0vwg1PA01sX3mWJwcRTdhfLKj03tp/C7El6zpF7mvw=="; }; }; "named-placeholders-1.1.2" = { @@ -4627,7 +4915,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/native-duplexpair/-/native-duplexpair-1.0.0.tgz"; - sha1 = "7899078e64bf3c8a3d732601b3d40ff05db58fa0"; + sha512 = "E7QQoM+3jvNtlmyfqRZ0/U75VFgCls+fSkbml2MpgWkWyz3ox8Y58gNhfuziuQYGNNQAbFZJQck55LHCnCK6CA=="; }; }; "nearley-2.20.1" = { @@ -4681,7 +4969,7 @@ let version = "0.0.0"; src = fetchurl { url = "https://registry.npmjs.org/node-ensure/-/node-ensure-0.0.0.tgz"; - sha1 = "ecae764150de99861ec5c810fd5d096b183932a7"; + sha512 = "DRI60hzo2oKN1ma0ckc6nQWlHU69RH6xN0sjQTjMpChPfTYvKZdcQFfdYK2RWbJcKyUizSIy/l8OTGxMAM1QDw=="; }; }; "node-fetch-2.6.7" = { @@ -4726,7 +5014,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/nodeify/-/nodeify-1.0.1.tgz"; - sha1 = "64ab69a7bdbaf03ce107b4f0335c87c0b9e91b1d"; + sha512 = "n7C2NyEze8GCo/z73KdbjRsBiLbv6eBn1FxwYKQ23IqGo7pQY3mhQan61Sv7eEDJCiyUjTVrVkXTzJCo1dW7Aw=="; }; }; "nodemailer-6.7.3" = { @@ -4762,7 +5050,7 @@ let version = "2.1.1"; src = fetchurl { url = "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz"; - sha1 = "1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"; + sha512 = "3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w=="; }; }; "normalize-path-3.0.0" = { @@ -4780,7 +5068,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/normalize-wheel/-/normalize-wheel-1.0.1.tgz"; - sha1 = "aec886affdb045070d856447df62ecf86146ec45"; + sha512 = "1OnlAPZ3zgrk8B91HyRj+eVv+kS5u+Z0SCsak6Xil/kmgEia50ga7zfkumayonZrImffAxPU/5WcyGhzetHNPA=="; }; }; "npmlog-5.0.1" = { @@ -4825,7 +5113,7 @@ let version = "4.1.1"; src = fetchurl { url = "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz"; - sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863"; + sha512 = "rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg=="; }; }; "object-inspect-1.12.2" = { @@ -4888,7 +5176,7 @@ let version = "1.4.0"; src = fetchurl { url = "https://registry.npmjs.org/once/-/once-1.4.0.tgz"; - sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; + sha512 = "lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w=="; }; }; "one-time-1.0.0" = { @@ -4909,6 +5197,15 @@ let sha512 = "kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg=="; }; }; + "ono-7.1.3" = { + name = "ono"; + packageName = "ono"; + version = "7.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/ono/-/ono-7.1.3.tgz"; + sha512 = "9jnfVriq7uJM4o5ganUY54ntUm+5EK21EGaQ5NWnkWg3zz5ywbbonlBguRcnmF1/HDiIe3zxNxXcO1YPBmPcQQ=="; + }; + }; "open-7.4.2" = { name = "open"; packageName = "open"; @@ -4918,13 +5215,31 @@ let sha512 = "MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q=="; }; }; + "openapi-types-1.3.5" = { + name = "openapi-types"; + packageName = "openapi-types"; + version = "1.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/openapi-types/-/openapi-types-1.3.5.tgz"; + sha512 = "11oi4zYorsgvg5yBarZplAqbpev5HkuVNPlZaPTknPDzAynq+lnJdXAmruGWP0s+dNYZS7bjM+xrTpJw7184Fg=="; + }; + }; + "openapi-types-10.0.0" = { + name = "openapi-types"; + packageName = "openapi-types"; + version = "10.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/openapi-types/-/openapi-types-10.0.0.tgz"; + sha512 = "Y8xOCT2eiKGYDzMW9R4x5cmfc3vGaaI4EL2pwhDmodWw1HlK18YcZ4uJxc7Rdp7/gGzAygzH9SXr6GKYIXbRcQ=="; + }; + }; "openurl-1.1.1" = { name = "openurl"; packageName = "openurl"; version = "1.1.1"; src = fetchurl { url = "https://registry.npmjs.org/openurl/-/openurl-1.1.1.tgz"; - sha1 = "3875b4b0ef7a52c156f0db41d4609dbb0f94b387"; + sha512 = "d/gTkTb1i1GKz5k3XE3XFV/PxQ1k45zDqGP2OA7YhgsaLoqm6qRvARAZOFer1fcXritWlGBRCu/UgeS4HAnXAA=="; }; }; "optional-require-1.1.8" = { @@ -4942,7 +5257,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-1.0.1.tgz"; - sha1 = "77c0cb37c41525d64166d990ffad7ec6a0e1363e"; + sha512 = "Z87aSjx3r5c0ZB7bcJqIgIRX5bxR7A4aSzvIbaxd0oTkWBCOoKfuGHiKj60CHVUgg1Phm5yMZzBdt8XqRs73Mw=="; }; }; "os-tmpdir-1.0.2" = { @@ -4951,7 +5266,7 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz"; - sha1 = "bbe67406c79aa85c5cfec766fe5734555dfa1274"; + sha512 = "D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g=="; }; }; "p-cancelable-2.1.1" = { @@ -4969,7 +5284,25 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz"; - sha1 = "3fbcfb15b899a44123b34b6dcc18b724336a2cae"; + sha512 = "LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow=="; + }; + }; + "p-limit-2.3.0" = { + name = "p-limit"; + packageName = "p-limit"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz"; + sha512 = "//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w=="; + }; + }; + "p-locate-4.1.0" = { + name = "p-locate"; + packageName = "p-locate"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz"; + sha512 = "R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A=="; }; }; "p-map-2.1.0" = { @@ -4990,6 +5323,15 @@ let sha512 = "rhIwUycgwwKcP9yTOOFK/AKsAopjjCakVqLHePO3CC6Mir1Z99xT+R63jZxAT5lFZLa2inS5h+ZS2GvR99/FBg=="; }; }; + "p-try-2.2.0" = { + name = "p-try"; + packageName = "p-try"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz"; + sha512 = "R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="; + }; + }; "packet-reader-1.0.0" = { name = "packet-reader"; packageName = "packet-reader"; @@ -5014,7 +5356,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/parent-require/-/parent-require-1.0.0.tgz"; - sha1 = "746a167638083a860b0eef6732cb27ed46c32977"; + sha512 = "2MXDNZC4aXdkkap+rBBMv0lUsfJqvX5/2FiYYnfCnorZt3Pk06/IOR5KeaoghgS2w07MLWgjbsnyaq6PdHn2LQ=="; }; }; "parse-github-url-1.0.2" = { @@ -5032,7 +5374,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz"; - sha1 = "6d5b934a456993b23d37f40a382d6f1666a8e5c6"; + sha512 = "1Y1A//QUXEZK7YKz+rD9WydcE1+EuPr6ZBgKecAB8tmoW6UFv0NREVJe1p+jRxtThkcbbKkfwIbWJe/IeE6m2Q=="; }; }; "parse-srcset-1.0.2" = { @@ -5041,7 +5383,7 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/parse-srcset/-/parse-srcset-1.0.2.tgz"; - sha1 = "f2bd221f6cc970a938d88556abc589caaaa2bde1"; + sha512 = "/2qh0lav6CmI15FzA3i/2Bzk2zCgQhGMkvhOhKNcBVQ1ldgpbfiNTVslmooUmWJcADi1f1kIeynbDRVzNlfR6Q=="; }; }; "parse5-5.1.1" = { @@ -5131,7 +5473,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/passport-strategy/-/passport-strategy-1.0.0.tgz"; - sha1 = "b5539aa8fc225a3d1ad179476ddf236b440f52e4"; + sha512 = "CB97UUvDKJde2V0KDWWB3lyf6PC3FaZP7YxZ2G8OAtn9p4HI9j9JLP9qjOGZFvyl8uwNT8qM+hGnz/n16NI7oA=="; }; }; "path-case-3.0.4" = { @@ -5149,7 +5491,16 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz"; - sha1 = "cc33d24d525e099a5388c0336c6e32b9160609e0"; + sha512 = "ALzNPpyNq9AqXMBjeymIjFDAkAFH06mHJH/cSBHAgU0s4vfpBn6b2nf8tiRLvagKD8RbTpq2FKTBg7cl9l3c7Q=="; + }; + }; + "path-exists-4.0.0" = { + name = "path-exists"; + packageName = "path-exists"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz"; + sha512 = "ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w=="; }; }; "path-is-absolute-1.0.1" = { @@ -5158,7 +5509,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"; - sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"; + sha512 = "AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg=="; }; }; "path-to-regexp-0.1.7" = { @@ -5167,7 +5518,16 @@ let version = "0.1.7"; src = fetchurl { url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz"; - sha1 = "df604178005f522f15eb4490e7247a1bfaa67f8c"; + sha512 = "5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ=="; + }; + }; + "path-to-regexp-6.2.1" = { + name = "path-to-regexp"; + packageName = "path-to-regexp"; + version = "6.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-6.2.1.tgz"; + sha512 = "JLyh7xT1kizaEvcaXOQwOc2/Yhw6KZOvPf1S8401UyLk86CU79LN3vl7ztXGm/pZ+YjoyAJ4rxmHwbkBXJX+yw=="; }; }; "path-type-4.0.0" = { @@ -5185,7 +5545,7 @@ let version = "0.0.1"; src = fetchurl { url = "https://registry.npmjs.org/pause/-/pause-0.0.1.tgz"; - sha1 = "1d408b3fdb76923b9543d96fb4c9dfd535d9cb5d"; + sha512 = "KG8UEiEVkR3wGEb4m5yZkVCzigAD+cVEJck2CzYZO37ZGJfctvVptVO192MwrtPhzONn6go8ylnOdMhKqi4nfg=="; }; }; "pdf-parse-1.1.1" = { @@ -5212,7 +5572,7 @@ let version = "2.1.0"; src = fetchurl { url = "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz"; - sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"; + sha512 = "7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow=="; }; }; "pg-8.7.1" = { @@ -5410,7 +5770,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/postgres-bytea/-/postgres-bytea-1.0.0.tgz"; - sha1 = "027b533c0aa890e26d172d47cf9ccecc521acd35"; + sha512 = "xy3pmLuQqRBZBXDULy7KbaitYqLcmxigw14Q5sj8QBVLqEwXfeybIKVWiqAXTlcvdvb0+xkOtDbfQMOf4lST1w=="; }; }; "postgres-date-1.0.7" = { @@ -5446,7 +5806,7 @@ let version = "0.11.10"; src = fetchurl { url = "https://registry.npmjs.org/process/-/process-0.11.10.tgz"; - sha1 = "7332300e840161bda3e69a1d1d91a7d4bc16f182"; + sha512 = "cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A=="; }; }; "process-nextick-args-2.0.1" = { @@ -5473,7 +5833,7 @@ let version = "1.3.0"; src = fetchurl { url = "https://registry.npmjs.org/promise/-/promise-1.3.0.tgz"; - sha1 = "e5cc9a4c8278e4664ffedc01c7da84842b040175"; + sha512 = "R9WrbTF3EPkVtWjp7B7umQGVndpsi+rsDAfrR4xAALQpFLa/+2OriecLhawxzvii2gd9+DZFwROWDuUUaqS5yA=="; }; }; "promise-ftp-1.3.5" = { @@ -5491,7 +5851,7 @@ let version = "1.1.5"; src = fetchurl { url = "https://registry.npmjs.org/promise-ftp-common/-/promise-ftp-common-1.1.5.tgz"; - sha1 = "b4f8082a74035647703506763edb14230d9865da"; + sha512 = "a84F/zM2Z0Ry/ht3nXfV6Ze7BISOQlWrct/YObrluJn8qy2LVeeQ+IJ7jD4bkmM0N2xfXYy5nurz4L1KEj+rJg=="; }; }; "promise-retry-2.0.1" = { @@ -5545,7 +5905,7 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz"; - sha1 = "f052a28da70e618917ef0a8ac34c1ae5a68286b3"; + sha512 = "b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ=="; }; }; "psl-1.8.0" = { @@ -5590,7 +5950,7 @@ let version = "1.3.2"; src = fetchurl { url = "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz"; - sha1 = "9653a036fb7c1ee42342f2325cceefea3926c48d"; + sha512 = "RofWgt/7fL5wP1Y7fxE7/EmTLzQVnB0ycyibJ0OOHIlJqTNzglYFxVwETOcIoJqJmpDXJ9xImDv+Fq34F/d4Dw=="; }; }; "punycode-2.1.1" = { @@ -5635,7 +5995,7 @@ let version = "0.2.0"; src = fetchurl { url = "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz"; - sha1 = "b209849203bb25df820da756e747005878521620"; + sha512 = "X/xY82scca2tau62i9mDyU9K+I+djTMUsvwf7xnUX5GLvVzgJybOJf4Y6o9Zx3oJK/LSXg5tTZBjwzqVPaPO2g=="; }; }; "querystringify-2.2.0" = { @@ -5662,7 +6022,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/quoted-printable/-/quoted-printable-1.0.1.tgz"; - sha1 = "9eebf5eb3d11eef022b264fd2d2b6b2bb3b84cc3"; + sha512 = "cihC68OcGiQOjGiXuo5Jk6XHANTHl1K4JLk/xlEJRTIXfy19Sg6XzB95XonYgr+1rB88bCpr7WZE7D7AlZow4g=="; }; }; "railroad-diagrams-1.0.0" = { @@ -5671,7 +6031,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/railroad-diagrams/-/railroad-diagrams-1.0.0.tgz"; - sha1 = "eb7e6267548ddedfb899c1b90e57374559cddb7e"; + sha512 = "cz93DjNeLY0idrCNOH6PviZGRN9GJhsdm9hpn1YCS879fj4W+x5IFJhhkRZcwVgMmFF7R82UA/7Oh+R8lLZg6A=="; }; }; "randexp-0.4.6" = { @@ -5689,7 +6049,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/random-bytes/-/random-bytes-1.0.0.tgz"; - sha1 = "4f68a1dc0ae58bd3fb95848c30324db75d64360b"; + sha512 = "iv7LhNVO047HzYR3InF6pUcUsPQiHTM1Qal51DcGSuZFBil1aBBWG5eHPNek7bvILMaYJ/8RU1e8w1AMdHmLQQ=="; }; }; "randombytes-2.1.0" = { @@ -5725,7 +6085,7 @@ let version = "1.1.14"; src = fetchurl { url = "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz"; - sha1 = "7cf4c54ef648e3813084c636dd2079e166c081d9"; + sha512 = "+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ=="; }; }; "readable-stream-2.3.7" = { @@ -5788,7 +6148,7 @@ let version = "1.2.0"; src = fetchurl { url = "https://registry.npmjs.org/redis-errors/-/redis-errors-1.2.0.tgz"; - sha1 = "eb62d2adb15e4eaf4610c04afe1529384250abad"; + sha512 = "1qny3OExCf0UvUV/5wpYKf2YwPcOqXzkwKKSmKHiE6ZMQs5heeE/c8eXK+PNllPvmjgAbfnsbpkGZWy8cBpn9w=="; }; }; "redis-parser-3.0.0" = { @@ -5797,7 +6157,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/redis-parser/-/redis-parser-3.0.0.tgz"; - sha1 = "b66d828cdcafe6b4b8a428a7def4c6bcac31c8b4"; + sha512 = "DJnGAeenTdpMEH6uAJRK/uiyEIH9WVsUmoLwzudwGJUwZPp80PDBWPHXSAGNPwNvIXAbe7MSUB1zQFugFml66A=="; }; }; "reflect-metadata-0.1.13" = { @@ -5842,7 +6202,7 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/reinterval/-/reinterval-1.1.0.tgz"; - sha1 = "3361ecfa3ca6c18283380dd0bb9546f390f5ece7"; + sha512 = "QIRet3SYrGp0HUHO88jVskiG6seqUGC5iAG7AwI/BV4ypGcuqk9Du6YQBUOUqm9c8pw1eyLoIaONifRua1lsEQ=="; }; }; "remove-trailing-separator-1.1.0" = { @@ -5851,7 +6211,7 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz"; - sha1 = "c24bce2a283adad5bc3f58e0d48249b92379d8ef"; + sha512 = "/hS+Y0u3aOfIETiaiirUFwDBDzmXPvO+jAfKTitUngIPzdKc6Z0LoFjM/CK5PL4C+eKwHohlHAb6H0VFfmmUsw=="; }; }; "remove-trailing-slash-0.1.1" = { @@ -5914,7 +6274,16 @@ let version = "2.1.1"; src = fetchurl { url = "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz"; - sha1 = "8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"; + sha512 = "fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q=="; + }; + }; + "require-main-filename-2.0.0" = { + name = "require-main-filename"; + packageName = "require-main-filename"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz"; + sha512 = "NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg=="; }; }; "requires-port-1.0.0" = { @@ -5923,7 +6292,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz"; - sha1 = "925d2601d39ac485e091cf0da5c6e694dc3dcaff"; + sha512 = "KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ=="; }; }; "resize-observer-polyfill-1.5.1" = { @@ -5959,7 +6328,7 @@ let version = "0.12.0"; src = fetchurl { url = "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz"; - sha1 = "1b42a6266a21f07421d1b0b54b7dc167b01c013b"; + sha512 = "9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow=="; }; }; "reusify-1.0.4" = { @@ -5995,7 +6364,7 @@ let version = "3.0.8"; src = fetchurl { url = "https://registry.npmjs.org/riot-tmpl/-/riot-tmpl-3.0.8.tgz"; - sha1 = "dd654e72a3a1520cb009cbef70c73856ded584a6"; + sha512 = "ngv48VQ58LMtuNrXnELxODsRUJ3NxcGQkL2yJPj5cy8WAgGgK+rarEFwfLoRdAfh76ipWiPrYL4nZ2nfW87lJw=="; }; }; "rndm-1.2.0" = { @@ -6004,7 +6373,7 @@ let version = "1.2.0"; src = fetchurl { url = "https://registry.npmjs.org/rndm/-/rndm-1.2.0.tgz"; - sha1 = "f33fe9cfb52bbfd520aa18323bc65db110a1b76c"; + sha512 = "fJhQQI5tLrQvYIYFpOnFinzv9dwmR7hRnUz1XqP3OJ1jIweTNOd6aTO4jwQSgcBSFUB+/KHJxuGneime+FdzOw=="; }; }; "rss-parser-3.12.0" = { @@ -6094,7 +6463,7 @@ let version = "1.2.1"; src = fetchurl { url = "https://registry.npmjs.org/sax/-/sax-1.2.1.tgz"; - sha1 = "7b8e656190b228e81a66aea748480d828cd2d37a"; + sha512 = "8I2a3LovHTOpm7NV5yOyO8IHqgVsfK4+UuySrXU8YXkSRX7k6hCV9b3HrkKCr3nMpgj+0bmocaJJWpvp1oc7ZA=="; }; }; "sax-1.2.4" = { @@ -6139,7 +6508,7 @@ let version = "5.3.0"; src = fetchurl { url = "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz"; - sha1 = "9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"; + sha512 = "mfmm3/H9+67MCVix1h+IXTpDwL6710LyHuk7+cWC9T1mE0qz4iHhh6r4hU2wrIT9iTsAAC2XQRvfblL028cpLw=="; }; }; "semver-5.7.1" = { @@ -6193,7 +6562,7 @@ let version = "0.0.5"; src = fetchurl { url = "https://registry.npmjs.org/seq-queue/-/seq-queue-0.0.5.tgz"; - sha1 = "d56812e1c017a6e4e7c3e3a37a1da6d78dd3c93e"; + sha512 = "hr3Wtp/GZIc/6DAGPDcV4/9WoZhjrkXsi5B/07QgX8tsdc6ilr7BFM6PM6rbdAX1kFSDYeZGLipIZZKyQP0O5Q=="; }; }; "serialize-javascript-5.0.1" = { @@ -6229,7 +6598,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz"; - sha1 = "045f9782d011ae9a6803ddd382b24392b3d890f7"; + sha512 = "KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw=="; }; }; "setheader-1.0.2" = { @@ -6265,7 +6634,7 @@ let version = "0.2.0"; src = fetchurl { url = "https://registry.npmjs.org/shell-escape/-/shell-escape-0.2.0.tgz"; - sha1 = "68fd025eb0490b4f567a027f0bf22480b5f84133"; + sha512 = "uRRBT2MfEOyxuECseCZd28jC1AJ8hmqqneWQ4VWUTgCAFvb3wKU1jLqj6egC4Exrr88ogg3dp+zroH4wJuaXzw=="; }; }; "showdown-2.1.0" = { @@ -6310,7 +6679,7 @@ let version = "0.0.2"; src = fetchurl { url = "https://registry.npmjs.org/simple-lru-cache/-/simple-lru-cache-0.0.2.tgz"; - sha1 = "d59cc3a193c1a5d0320f84ee732f6e4713e511dd"; + sha512 = "uEv/AFO0ADI7d99OHDmh1QfYzQk/izT1vCmu/riQfh7qjBVUUgRT87E5s5h7CxWCA/+YoZerykpEthzVrW3LIw=="; }; }; "simple-swizzle-0.2.2" = { @@ -6319,7 +6688,7 @@ let version = "0.2.2"; src = fetchurl { url = "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz"; - sha1 = "a4da6b635ffcccca33f70d17cb92592de95e557a"; + sha512 = "JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg=="; }; }; "slash-3.0.0" = { @@ -6400,7 +6769,7 @@ let version = "1.0.3"; src = fetchurl { url = "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz"; - sha1 = "04e6926f662895354f3dd015203633b857297e2c"; + sha512 = "D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g=="; }; }; "sprintf-js-1.1.2" = { @@ -6481,7 +6850,7 @@ let version = "0.0.10"; src = fetchurl { url = "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz"; - sha1 = "547c70b347e8d32b4e108ea1a2a159e5fdde19c0"; + sha512 = "KGzahc7puUKkzyMt+IqAep+TVNbKP+k2Lmwhub39m1AsTSkaDutx56aDCo+HLDzf/D26BIHTJWNiTG1KAJiQCg=="; }; }; "standard-as-callback-2.1.0" = { @@ -6508,7 +6877,7 @@ let version = "1.1.1"; src = fetchurl { url = "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz"; - sha1 = "35b09875b4ff49f26a777e509b3090a3226bf24b"; + sha512 = "ZnWpYnYugiOVEY5GkcuJK1io5V8QmNYChG62gSit9pQVGErXtrKuPC55ITaVSukmMta5qpMU7vqLt2Lnni4f/g=="; }; }; "stream-shift-1.0.1" = { @@ -6520,6 +6889,15 @@ let sha512 = "AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ=="; }; }; + "streamsearch-1.1.0" = { + name = "streamsearch"; + packageName = "streamsearch"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/streamsearch/-/streamsearch-1.1.0.tgz"; + sha512 = "Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg=="; + }; + }; "string-similarity-4.0.4" = { name = "string-similarity"; packageName = "string-similarity"; @@ -6562,7 +6940,7 @@ let version = "0.10.31"; src = fetchurl { url = "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"; - sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94"; + sha512 = "ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ=="; }; }; "string_decoder-1.1.1" = { @@ -6574,22 +6952,13 @@ let sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg=="; }; }; - "string_decoder-1.3.0" = { - name = "string_decoder"; - packageName = "string_decoder"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz"; - sha512 = "hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA=="; - }; - }; "strip-ansi-3.0.1" = { name = "strip-ansi"; packageName = "strip-ansi"; version = "3.0.1"; src = fetchurl { url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz"; - sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"; + sha512 = "VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg=="; }; }; "strip-ansi-6.0.1" = { @@ -6628,6 +6997,24 @@ let sha512 = "qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw=="; }; }; + "swagger-ui-dist-4.12.0" = { + name = "swagger-ui-dist"; + packageName = "swagger-ui-dist"; + version = "4.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-4.12.0.tgz"; + sha512 = "B0Iy2ueXtbByE6OOyHTi3lFQkpPi/L7kFOKFeKTr44za7dJIELa9kzaca6GkndCgpK1QTjArnoXG+aUy0XQp1w=="; + }; + }; + "swagger-ui-express-4.4.0" = { + name = "swagger-ui-express"; + packageName = "swagger-ui-express"; + version = "4.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/swagger-ui-express/-/swagger-ui-express-4.4.0.tgz"; + sha512 = "1CzRkHG386VQMVZK406jcpgnW2a9A5A/NiAjKhsFTQqUBWRF+uGbXTU/mA7WSV3mTzyOQDvjBdWP/c2qd5lqKw=="; + }; + }; "tar-6.1.11" = { name = "tar"; packageName = "tar"; @@ -7033,13 +7420,13 @@ let sha1 = "e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa"; }; }; - "underscore-1.13.3" = { + "underscore-1.13.4" = { name = "underscore"; packageName = "underscore"; - version = "1.13.3"; + version = "1.13.4"; src = fetchurl { - url = "https://registry.npmjs.org/underscore/-/underscore-1.13.3.tgz"; - sha512 = "QvjkYpiD+dJJraRA8+dGAU4i7aBbb2s0S3jA45TFOvg2VgqvdCDd/3N6CqA8gluk1W91GLoXg5enMUx560QzuA=="; + url = "https://registry.npmjs.org/underscore/-/underscore-1.13.4.tgz"; + sha512 = "BQFnUDuAQ4Yf/cYY5LNrK9NCJFKriaRbD9uR1fTeXnBeoa97W0i41qkZfGO9pSo8I5KzjAcSY2XYtdf0oKd7KQ=="; }; }; "unique-stream-2.3.1" = { @@ -7168,22 +7555,22 @@ let sha1 = "c8d50370885663879385ab37e333c7e8e3b0218c"; }; }; - "uuid-3.3.2" = { + "uuid-3.4.0" = { name = "uuid"; packageName = "uuid"; - version = "3.3.2"; + version = "3.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz"; - sha512 = "yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA=="; + url = "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz"; + sha512 = "HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="; }; }; - "uuid-3.4.0" = { + "uuid-8.0.0" = { name = "uuid"; packageName = "uuid"; - version = "3.4.0"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz"; - sha512 = "HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="; + url = "https://registry.npmjs.org/uuid/-/uuid-8.0.0.tgz"; + sha512 = "jOXGuXZAWdsTH7eZLtyXMqUb9EcWMGZNbL9YcGBJl4MH4nrxHmZJhEHvyLFrkxo+28uLb/NYRcStH48fnD0Vzw=="; }; }; "uuid-8.3.2" = { @@ -7258,13 +7645,13 @@ let sha512 = "BoLCEHisXi2QgwlhZBg9UepvzZZmi4176vbr+31Shen5WWZwSLVgdScEPcB+yrAtuHAz42309C0A4+WiL9lNBw=="; }; }; - "vue-fragment-1.5.2" = { + "vue-fragment-1.6.0" = { name = "vue-fragment"; packageName = "vue-fragment"; - version = "1.5.2"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/vue-fragment/-/vue-fragment-1.5.2.tgz"; - sha512 = "KEW0gkeNOLJjtXN4jqJhTazez5jtrwimHkE5Few/VxblH4F9EcvJiEsahrV5kg5uKd5U8du4ORKS6QjGE0piYA=="; + url = "https://registry.npmjs.org/vue-fragment/-/vue-fragment-1.6.0.tgz"; + sha512 = "a5T8ZZZK/EQzgVShEl374HbobUJ0a7v12BzOzS6Z/wd/5EE/5SffcyHC+7bf9hP3L7Yc0hhY/GhMdwFQ25O/8A=="; }; }; "vue-i18n-8.27.1" = { @@ -7321,6 +7708,15 @@ let sha512 = "bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg=="; }; }; + "which-module-2.0.0" = { + name = "which-module"; + packageName = "which-module"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz"; + sha1 = "d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"; + }; + }; "wide-align-1.1.5" = { name = "wide-align"; packageName = "wide-align"; @@ -7483,13 +7879,13 @@ let sha1 = "52a63e56ca0b84a7f3a5f3d61872f126ad7a5943"; }; }; - "xss-1.0.11" = { + "xss-1.0.13" = { name = "xss"; packageName = "xss"; - version = "1.0.11"; + version = "1.0.13"; src = fetchurl { - url = "https://registry.npmjs.org/xss/-/xss-1.0.11.tgz"; - sha512 = "EimjrjThZeK2MO7WKR9mN5ZC1CSqivSl55wvUK5EtU6acf0rzEE1pN+9ZDrFXJ82BRp3JL38pPE6S4o/rpp1zQ=="; + url = "https://registry.npmjs.org/xss/-/xss-1.0.13.tgz"; + sha512 = "clu7dxTm1e8Mo5fz3n/oW3UCXBfV89xZ72jM8yzo1vR/pIS0w3sgB3XV2H8Vm6zfGnHL0FzvLJPJEBhd86/z4Q=="; }; }; "xtend-4.0.2" = { @@ -7501,6 +7897,15 @@ let sha512 = "LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ=="; }; }; + "y18n-4.0.3" = { + name = "y18n"; + packageName = "y18n"; + version = "4.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz"; + sha512 = "JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ=="; + }; + }; "y18n-5.0.8" = { name = "y18n"; packageName = "y18n"; @@ -7528,6 +7933,15 @@ let sha512 = "3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="; }; }; + "yamljs-0.3.0" = { + name = "yamljs"; + packageName = "yamljs"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yamljs/-/yamljs-0.3.0.tgz"; + sha512 = "C/FsVVhht4iPQYXOInoxUM/1ELSf9EsgKH34FofQOp6hwCPrW4vG4w5++TED3xRUo8gD7l0P1J1dLlDYzODsTQ=="; + }; + }; "yargonaut-1.1.4" = { name = "yargonaut"; packageName = "yargonaut"; @@ -7537,6 +7951,15 @@ let sha512 = "rHgFmbgXAAzl+1nngqOcwEljqHGG9uUZoPjsdZEs1w5JW9RXYzrSvH/u70C1JE5qFi0qjsdhnUX/dJRpWqitSA=="; }; }; + "yargs-15.4.1" = { + name = "yargs"; + packageName = "yargs"; + version = "15.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz"; + sha512 = "aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A=="; + }; + }; "yargs-16.2.0" = { name = "yargs"; packageName = "yargs"; @@ -7555,6 +7978,15 @@ let sha512 = "c2k48R0PwKIqKhPMWjeiF6y2xY/gPMUlro0sgxqXpbOIohWiLNXWslsootttv7E1e73QPAMQSg5FeySbVcpsPQ=="; }; }; + "yargs-parser-18.1.3" = { + name = "yargs-parser"; + packageName = "yargs-parser"; + version = "18.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz"; + sha512 = "o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ=="; + }; + }; "yargs-parser-20.2.9" = { name = "yargs-parser"; packageName = "yargs-parser"; @@ -7573,18 +8005,36 @@ let sha512 = "Z2Fe1bn+eLstG8DRR6FTavGD+MeAwyfmouhHsIUgaADz8jvFKbO/fXc2trJKZg+5EBjh4gGm3iU/t3onKlXHIg=="; }; }; + "z-schema-4.2.4" = { + name = "z-schema"; + packageName = "z-schema"; + version = "4.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/z-schema/-/z-schema-4.2.4.tgz"; + sha512 = "YvBeW5RGNeNzKOUJs3rTL4+9rpcvHXt5I051FJbOcitV8bl40pEfcG0Q+dWSwS0/BIYrMZ/9HHoqLllMkFhD0w=="; + }; + }; }; in { n8n = nodeEnv.buildNodePackage { name = "n8n"; packageName = "n8n"; - version = "0.179.0"; + version = "0.181.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n/-/n8n-0.179.0.tgz"; - sha512 = "S6AtNNN3c5rWpPPs1iK23j9eeg2rF8RxuumKtE302ed6m3c0iEIMlZpVWFTJCfE+vi13drBUwffd89C2McVhUA=="; + url = "https://registry.npmjs.org/n8n/-/n8n-0.181.0.tgz"; + sha512 = "6hYVCqKmnrssazcosXwCAPtz2HGzWJG15jdxrQ/ZRq2XnmdK0cgC9B60/yohIDdtFtvB4F9Tn18CC7HOlUYTJg=="; }; dependencies = [ + sources."@apidevtools/json-schema-ref-parser-8.0.0" + sources."@apidevtools/openapi-schemas-2.1.0" + sources."@apidevtools/swagger-cli-4.0.0" + sources."@apidevtools/swagger-methods-3.0.2" + (sources."@apidevtools/swagger-parser-9.0.1" // { + dependencies = [ + sources."openapi-types-1.3.5" + ]; + }) (sources."@azure/abort-controller-1.1.0" // { dependencies = [ sources."tslib-2.4.0" @@ -7644,7 +8094,14 @@ in sources."@fontsource/open-sans-4.5.10" sources."@fortawesome/fontawesome-common-types-6.1.1" sources."@fortawesome/free-regular-svg-icons-6.1.1" - sources."@icetee/ftp-0.3.15" + (sources."@icetee/ftp-0.3.15" // { + dependencies = [ + sources."isarray-0.0.1" + sources."readable-stream-1.1.14" + sources."string_decoder-0.10.31" + ]; + }) + 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" @@ -7666,12 +8123,14 @@ in (sources."@oclif/help-1.0.1" // { dependencies = [ sources."@oclif/config-1.18.2" + sources."chalk-4.1.2" sources."tslib-2.4.0" ]; }) sources."@oclif/linewrap-1.0.0" (sources."@oclif/parser-3.8.7" // { dependencies = [ + sources."chalk-4.1.2" sources."tslib-2.4.0" ]; }) @@ -7683,7 +8142,7 @@ in sources."@sqltools/formatter-1.2.2" (sources."@techteamer/ocsp-1.0.0" // { dependencies = [ - sources."async-3.2.3" + sources."async-3.2.4" ]; }) sources."@tokenizer/token-0.3.0" @@ -7698,11 +8157,13 @@ in sources."@types/ftp-0.3.33" sources."@types/generic-pool-3.1.10" sources."@types/json-diff-0.5.2" + sources."@types/json-schema-7.0.11" sources."@types/jsonwebtoken-8.5.8" sources."@types/lodash-4.14.182" sources."@types/lossless-json-1.0.1" sources."@types/mime-1.3.2" - sources."@types/node-17.0.36" + sources."@types/multer-1.4.7" + sources."@types/node-17.0.41" (sources."@types/node-fetch-2.6.1" // { dependencies = [ sources."form-data-3.0.1" @@ -7714,9 +8175,11 @@ in sources."@types/range-parser-1.2.4" sources."@types/readable-stream-2.3.13" sources."@types/serve-static-1.13.10" - sources."@types/snowflake-sdk-1.6.6" + sources."@types/snowflake-sdk-1.6.7" + sources."@types/swagger-ui-express-4.1.3" sources."@types/tough-cookie-2.3.8" sources."@types/tunnel-0.0.3" + sources."@types/yamljs-0.2.31" sources."@xmldom/xmldom-0.7.5" sources."abbrev-1.1.1" sources."abort-controller-3.0.0" @@ -7732,25 +8195,27 @@ in sources."adler-32-1.2.0" sources."agent-base-6.0.2" sources."ajv-6.12.6" - sources."amqplib-0.8.0" + (sources."amqplib-0.8.0" // { + dependencies = [ + sources."isarray-0.0.1" + sources."readable-stream-1.1.14" + sources."string_decoder-0.10.31" + ]; + }) sources."ansi-escapes-4.3.2" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" sources."any-promise-1.3.0" sources."anymatch-3.1.2" sources."app-root-path-3.0.0" + sources."append-field-1.0.0" sources."aproba-2.0.0" (sources."are-we-there-yet-2.0.0" // { dependencies = [ sources."readable-stream-3.6.0" - sources."string_decoder-1.3.0" - ]; - }) - (sources."argparse-1.0.10" // { - dependencies = [ - sources."sprintf-js-1.0.3" ]; }) + sources."argparse-1.0.10" sources."array-flatten-1.1.1" sources."array-parallel-0.1.3" sources."array-series-0.1.5" @@ -7771,14 +8236,13 @@ in ]; }) sources."avsc-5.7.4" - (sources."aws-sdk-2.1145.0" // { + (sources."aws-sdk-2.1151.0" // { dependencies = [ sources."buffer-4.9.2" sources."events-1.1.1" sources."ieee754-1.1.13" - sources."isarray-1.0.0" sources."sax-1.2.1" - sources."uuid-3.3.2" + sources."uuid-8.0.0" sources."xml2js-0.4.19" sources."xmlbuilder-9.0.7" ]; @@ -7815,21 +8279,7 @@ in sources."safe-buffer-5.1.2" ]; }) - (sources."bl-2.2.1" // { - dependencies = [ - sources."isarray-1.0.0" - (sources."readable-stream-2.3.7" // { - dependencies = [ - sources."safe-buffer-5.1.2" - ]; - }) - (sources."string_decoder-1.1.1" // { - dependencies = [ - sources."safe-buffer-5.1.2" - ]; - }) - ]; - }) + sources."bl-2.2.1" sources."bluebird-3.7.2" sources."bn.js-4.12.0" (sources."body-parser-1.20.0" // { @@ -7850,9 +8300,11 @@ in sources."buffer-more-ints-1.0.0" sources."buffer-writer-2.0.0" sources."bull-3.29.3" + sources."busboy-1.6.0" sources."byte-length-1.0.2" sources."bytes-3.1.2" sources."call-bind-1.0.2" + sources."call-me-maybe-1.0.1" sources."callback-stream-1.1.0" sources."callsites-3.1.0" (sources."camel-case-4.1.2" // { @@ -7860,6 +8312,7 @@ in sources."tslib-2.4.0" ]; }) + sources."camelcase-5.3.1" (sources."capital-case-1.0.4" // { dependencies = [ sources."tslib-2.4.0" @@ -7871,7 +8324,7 @@ in sources."adler-32-1.3.1" ]; }) - sources."chalk-4.1.2" + sources."chalk-3.0.0" (sources."change-case-4.1.2" // { dependencies = [ sources."tslib-2.4.0" @@ -7890,17 +8343,18 @@ in sources."cli-cursor-3.1.0" (sources."cli-highlight-2.1.11" // { dependencies = [ + sources."chalk-4.1.2" + sources."cliui-7.0.4" sources."parse5-5.1.1" + sources."wrap-ansi-7.0.0" + sources."y18n-5.0.8" sources."yargs-16.2.0" + sources."yargs-parser-20.2.9" ]; }) sources."cli-width-3.0.0" sources."client-oauth2-4.3.3" - (sources."cliui-7.0.4" // { - dependencies = [ - sources."wrap-ansi-7.0.0" - ]; - }) + sources."cliui-6.0.0" sources."cluster-key-slot-1.1.0" sources."codepage-1.15.0" (sources."color-3.2.1" // { @@ -7929,12 +8383,7 @@ in ]; }) sources."concat-map-0.0.1" - (sources."concat-stream-2.0.0" // { - dependencies = [ - sources."readable-stream-3.6.0" - sources."string_decoder-1.3.0" - ]; - }) + sources."concat-stream-1.6.2" sources."connect-history-api-fallback-1.6.0" sources."console-control-strings-1.1.0" (sources."constant-case-3.0.4" // { @@ -7944,12 +8393,16 @@ in }) sources."content-disposition-0.5.4" sources."content-type-1.0.4" - sources."convict-6.2.3" + (sources."convict-6.2.3" // { + dependencies = [ + sources."yargs-parser-20.2.9" + ]; + }) sources."cookie-0.4.1" sources."cookie-parser-1.4.6" sources."cookie-signature-1.0.6" - sources."core-js-3.22.7" - sources."core-util-is-1.0.2" + sources."core-js-3.22.8" + sources."core-util-is-1.0.3" sources."crc-32-1.2.2" sources."cron-1.7.2" sources."cron-parser-2.18.0" @@ -7969,6 +8422,7 @@ in sources."date-utils-1.2.21" sources."debug-4.3.4" sources."debuglog-1.0.1" + sources."decamelize-1.2.0" sources."deepmerge-1.5.2" sources."define-properties-1.1.4" sources."delayed-stream-1.0.0" @@ -7992,18 +8446,11 @@ in }) sources."dotenv-8.6.0" sources."dreamopt-0.6.0" - (sources."duplexify-3.7.1" // { - dependencies = [ - sources."isarray-1.0.0" - sources."readable-stream-2.3.7" - sources."safe-buffer-5.1.2" - sources."string_decoder-1.1.1" - ]; - }) + sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" sources."ecdsa-sig-formatter-1.0.11" sources."ee-first-1.1.1" - sources."element-ui-2.15.8" + sources."element-ui-2.15.9" sources."emoji-regex-8.0.0" sources."enabled-1.0.2" sources."encodeurl-1.0.2" @@ -8034,6 +8481,12 @@ in sources."ms-2.0.0" ]; }) + (sources."express-openapi-validator-4.13.8" // { + dependencies = [ + sources."media-typer-1.1.0" + sources."path-to-regexp-6.2.1" + ]; + }) sources."extend-3.0.2" sources."external-editor-3.1.0" sources."extsprintf-1.3.0" @@ -8057,6 +8510,7 @@ in sources."ms-2.0.0" ]; }) + sources."find-up-4.1.0" sources."flatted-3.2.5" sources."fn.name-1.1.0" sources."follow-redirects-1.15.1" @@ -8077,7 +8531,7 @@ in sources."generate-function-2.3.1" sources."generic-pool-3.8.2" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.1.1" + sources."get-intrinsic-1.1.2" sources."get-port-5.1.1" sources."get-symbol-description-1.0.0" sources."get-system-fonts-2.0.2" @@ -8088,10 +8542,6 @@ in dependencies = [ sources."glob-parent-3.1.0" sources."is-glob-3.1.0" - sources."isarray-1.0.0" - sources."readable-stream-2.3.7" - sources."safe-buffer-5.1.2" - sources."string_decoder-1.1.1" ]; }) sources."globby-11.1.0" @@ -8141,12 +8591,22 @@ in sources."ics-2.35.0" sources."ieee754-1.2.1" sources."ignore-5.2.0" - sources."imap-0.8.19" + (sources."imap-0.8.19" // { + dependencies = [ + sources."isarray-0.0.1" + sources."readable-stream-1.1.14" + sources."string_decoder-0.10.31" + ]; + }) sources."imap-simple-4.3.0" sources."indent-string-4.0.0" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."inquirer-7.3.3" + (sources."inquirer-7.3.3" // { + dependencies = [ + sources."chalk-4.1.2" + ]; + }) sources."internal-slot-1.0.3" sources."ioredis-4.28.5" sources."ip-regex-2.1.0" @@ -8183,10 +8643,10 @@ in sources."is-weakref-1.0.2" sources."is-windows-1.0.2" sources."is-wsl-2.2.0" - sources."isarray-0.0.1" + sources."isarray-1.0.0" sources."isbot-3.5.0" sources."isexe-2.0.0" - sources."iso-639-1-2.1.13" + sources."iso-639-1-2.1.14" sources."isstream-0.1.2" sources."jmespath-0.16.0" sources."join-component-1.1.0" @@ -8195,10 +8655,18 @@ in sources."jsbn-0.1.1" sources."json-diff-0.5.5" sources."json-schema-0.4.0" + (sources."json-schema-ref-parser-9.0.9" // { + dependencies = [ + sources."@apidevtools/json-schema-ref-parser-9.0.9" + sources."argparse-2.0.1" + sources."js-yaml-4.1.0" + ]; + }) sources."json-schema-traverse-0.4.1" sources."json-stable-stringify-without-jsonify-1.0.1" sources."json-stringify-safe-5.0.1" sources."jsonfile-4.0.0" + sources."jsonschema-1.4.1" (sources."jsonwebtoken-8.5.1" // { dependencies = [ sources."semver-5.7.1" @@ -8223,9 +8691,15 @@ in sources."linkify-it-4.0.0" (sources."localtunnel-2.0.2" // { dependencies = [ + sources."cliui-7.0.4" sources."debug-4.3.2" + sources."wrap-ansi-7.0.0" + sources."y18n-5.0.8" + sources."yargs-17.1.1" + sources."yargs-parser-20.2.9" ]; }) + sources."locate-path-5.0.0" sources."lodash-4.17.21" sources."lodash-es-4.17.21" sources."lodash.clonedeep-4.5.0" @@ -8244,8 +8718,10 @@ in sources."lodash.once-4.1.1" sources."lodash.set-4.3.2" sources."lodash.throttle-4.1.1" + sources."lodash.uniq-4.5.0" sources."lodash.uniqby-4.7.0" sources."lodash.unset-4.5.2" + sources."lodash.zipobject-4.1.3" sources."logform-2.4.0" sources."long-4.0.0" sources."lossless-json-1.0.5" @@ -8292,9 +8768,9 @@ in sources."minimalistic-assert-1.0.1" sources."minimatch-3.1.2" sources."minimist-1.2.6" - sources."minipass-3.1.6" + sources."minipass-3.2.0" sources."minizlib-2.1.2" - sources."mkdirp-1.0.4" + sources."mkdirp-0.5.6" (sources."mock-require-3.0.3" // { dependencies = [ sources."get-caller-file-1.0.3" @@ -8308,19 +8784,19 @@ in sources."moo-0.5.1" (sources."mqtt-4.2.6" // { dependencies = [ + sources."concat-stream-2.0.0" sources."readable-stream-3.6.0" - sources."string_decoder-1.3.0" ]; }) (sources."mqtt-packet-6.10.0" // { dependencies = [ sources."bl-4.1.0" sources."readable-stream-3.6.0" - sources."string_decoder-1.3.0" ]; }) sources."ms-2.1.2" sources."mssql-6.4.1" + sources."multer-1.4.5-lts.1" sources."mute-stream-0.0.8" (sources."mysql2-2.3.3" // { dependencies = [ @@ -8329,15 +8805,15 @@ in ]; }) sources."mz-2.7.0" - sources."n8n-core-0.119.0" - sources."n8n-design-system-0.22.0" - sources."n8n-editor-ui-0.145.0" - (sources."n8n-nodes-base-0.177.0" // { + sources."n8n-core-0.121.0" + sources."n8n-design-system-0.23.0" + sources."n8n-editor-ui-0.147.0" + (sources."n8n-nodes-base-0.179.0" // { dependencies = [ sources."iconv-lite-0.6.3" ]; }) - sources."n8n-workflow-0.101.0" + sources."n8n-workflow-0.103.0" (sources."named-placeholders-1.1.2" // { dependencies = [ sources."lru-cache-4.1.5" @@ -8384,22 +8860,20 @@ in sources."once-1.4.0" sources."one-time-1.0.0" sources."onetime-5.1.2" + sources."ono-7.1.3" sources."open-7.4.2" + sources."openapi-types-10.0.0" sources."openurl-1.1.1" sources."optional-require-1.1.8" - (sources."ordered-read-streams-1.0.1" // { - dependencies = [ - sources."isarray-1.0.0" - sources."readable-stream-2.3.7" - sources."safe-buffer-5.1.2" - sources."string_decoder-1.1.1" - ]; - }) + sources."ordered-read-streams-1.0.1" sources."os-tmpdir-1.0.2" sources."p-cancelable-2.1.1" sources."p-finally-1.0.0" + sources."p-limit-2.3.0" + sources."p-locate-4.1.0" sources."p-map-2.1.0" sources."p-timeout-3.2.0" + sources."p-try-2.2.0" sources."packet-reader-1.0.0" (sources."param-case-3.0.4" // { dependencies = [ @@ -8429,6 +8903,7 @@ in ]; }) sources."path-dirname-1.0.2" + sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" sources."path-to-regexp-0.1.7" sources."path-type-4.0.0" @@ -8508,7 +8983,11 @@ in sources."randombytes-2.1.0" sources."range-parser-1.2.1" sources."raw-body-2.5.1" - sources."readable-stream-1.1.14" + (sources."readable-stream-2.3.7" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) sources."readable-web-to-node-stream-2.0.0" sources."readdirp-3.6.0" sources."redis-3.1.2" @@ -8538,6 +9017,7 @@ in sources."requestretry-7.1.0" sources."require-at-1.0.6" sources."require-directory-2.1.1" + sources."require-main-filename-2.0.0" sources."requires-port-1.0.0" sources."resize-observer-polyfill-1.5.1" sources."restore-cursor-3.1.0" @@ -8613,6 +9093,7 @@ in dependencies = [ sources."axios-0.27.2" sources."debug-3.2.7" + sources."mkdirp-1.0.4" sources."tmp-0.2.1" sources."uuid-3.4.0" ]; @@ -8623,40 +9104,55 @@ in (sources."split2-3.2.2" // { dependencies = [ sources."readable-stream-3.6.0" - sources."string_decoder-1.3.0" ]; }) - sources."sprintf-js-1.1.2" + sources."sprintf-js-1.0.3" sources."sqlite3-5.0.8" sources."sqlstring-2.3.3" sources."sse-channel-3.1.1" sources."ssf-0.11.2" sources."ssh2-1.10.0" - sources."ssh2-sftp-client-7.2.3" + (sources."ssh2-sftp-client-7.2.3" // { + dependencies = [ + sources."concat-stream-2.0.0" + sources."readable-stream-3.6.0" + ]; + }) sources."sshpk-1.17.0" sources."stack-trace-0.0.10" sources."standard-as-callback-2.1.0" sources."statuses-2.0.1" sources."stealthy-require-1.1.1" sources."stream-shift-1.0.1" + sources."streamsearch-1.1.0" sources."string-similarity-4.0.4" sources."string-width-4.2.3" sources."string.prototype.trimend-1.0.5" sources."string.prototype.trimstart-1.0.5" - sources."string_decoder-0.10.31" + (sources."string_decoder-1.1.1" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) sources."strip-ansi-6.0.1" sources."strtok3-6.3.0" sources."supports-color-7.2.0" - sources."tar-6.1.11" + sources."swagger-ui-dist-4.12.0" + sources."swagger-ui-express-4.4.0" + (sources."tar-6.1.11" // { + dependencies = [ + sources."mkdirp-1.0.4" + ]; + }) sources."tarn-1.1.5" sources."tdigest-0.1.2" (sources."tedious-6.7.1" // { dependencies = [ - sources."@types/node-12.20.52" + sources."@types/node-12.20.55" sources."bl-3.0.1" sources."iconv-lite-0.5.2" sources."readable-stream-3.6.0" - sources."string_decoder-1.3.0" + sources."sprintf-js-1.1.2" ]; }) sources."test-console-2.0.0" @@ -8665,14 +9161,7 @@ in sources."thenify-all-1.6.0" sources."throttle-debounce-1.1.0" sources."through-2.3.8" - (sources."through2-2.0.5" // { - dependencies = [ - sources."isarray-1.0.0" - sources."readable-stream-2.3.7" - sources."safe-buffer-5.1.2" - sources."string_decoder-1.1.1" - ]; - }) + sources."through2-2.0.5" sources."through2-filter-3.0.0" sources."throwback-4.1.0" sources."timeago.js-4.0.2" @@ -8708,14 +9197,20 @@ in sources."typedarray-to-buffer-3.1.5" (sources."typeorm-0.2.30" // { dependencies = [ + sources."chalk-4.1.2" + sources."cliui-7.0.4" + sources."mkdirp-1.0.4" + sources."wrap-ansi-7.0.0" + sources."y18n-5.0.8" sources."yargs-16.2.0" + sources."yargs-parser-20.2.9" ]; }) sources."uc.micro-1.0.6" sources."uid-safe-2.1.5" sources."unbox-primitive-1.0.2" sources."unc-path-regex-0.1.2" - sources."underscore-1.13.3" + sources."underscore-1.13.4" sources."unique-stream-2.3.1" sources."universalify-0.1.2" sources."unpipe-1.0.0" @@ -8750,30 +9245,33 @@ in sources."v-click-outside-3.2.0" sources."validator-13.7.0" sources."vary-1.1.2" - sources."verror-1.10.0" + (sources."verror-1.10.0" // { + dependencies = [ + sources."core-util-is-1.0.2" + ]; + }) sources."vm2-3.9.9" sources."vue-2.6.14" sources."vue-color-2.8.1" - sources."vue-fragment-1.5.2" + sources."vue-fragment-1.6.0" sources."vue-i18n-8.27.1" sources."vue2-boring-avatars-0.3.4" sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" sources."which-1.3.1" sources."which-boxed-primitive-1.0.2" + sources."which-module-2.0.0" sources."wide-align-1.1.5" sources."widest-line-3.1.0" (sources."winston-3.7.2" // { dependencies = [ - sources."async-3.2.3" + sources."async-3.2.4" sources."readable-stream-3.6.0" - sources."string_decoder-1.3.0" ]; }) (sources."winston-transport-4.5.0" // { dependencies = [ sources."readable-stream-3.6.0" - sources."string_decoder-1.3.0" ]; }) sources."wmf-1.0.2" @@ -8787,14 +9285,15 @@ in sources."xmlbuilder-11.0.1" sources."xpath.js-1.1.0" sources."xregexp-2.0.0" - (sources."xss-1.0.11" // { + (sources."xss-1.0.13" // { dependencies = [ sources."commander-2.20.3" ]; }) sources."xtend-4.0.2" - sources."y18n-5.0.8" + sources."y18n-4.0.3" sources."yallist-4.0.0" + sources."yamljs-0.3.0" (sources."yargonaut-1.1.4" // { dependencies = [ sources."ansi-regex-2.1.1" @@ -8805,9 +9304,10 @@ in sources."supports-color-2.0.0" ]; }) - sources."yargs-17.1.1" - sources."yargs-parser-20.2.9" + sources."yargs-15.4.1" + sources."yargs-parser-18.1.3" sources."yup-0.32.11" + sources."z-schema-4.2.4" ]; buildInputs = globalBuildInputs; meta = { diff --git a/pkgs/applications/office/appflowy/default.nix b/pkgs/applications/office/appflowy/default.nix index abc8e33fd3701..821447fdfa265 100644 --- a/pkgs/applications/office/appflowy/default.nix +++ b/pkgs/applications/office/appflowy/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "appflowy"; - version = "0.0.3"; + version = "0.0.4"; src = fetchzip { url = "https://github.com/AppFlowy-IO/appflowy/releases/download/${version}/AppFlowy-linux-x86.tar.gz"; - sha256 = "sha256-m9vfgytSKnWLf6hwKjIGcU/7OCmIBiF4hJ/yIRBdSpQ="; + sha256 = "sha256-ke3cuRi+ZlBSWawg66cGrV928dOBp0EniNakitmgUso="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/astronomy/gpredict/default.nix b/pkgs/applications/science/astronomy/gpredict/default.nix index 3f82ff7b52a87..1fd2d4ac2adce 100644 --- a/pkgs/applications/science/astronomy/gpredict/default.nix +++ b/pkgs/applications/science/astronomy/gpredict/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, intltool +{ lib, stdenv, fetchurl, fetchpatch, pkg-config, intltool , gtk3, glib, curl, goocanvas2, gpsd , hamlib, wrapGAppsHook }: @@ -14,6 +14,16 @@ in stdenv.mkDerivation { sha256 = "0hwf97kng1zy8rxyglw04x89p0bg07zq30hgghm20yxiw2xc8ng7"; }; + patches = [ + # Pull upstream fix for -fno-common toolchains: + # https://github.com/csete/gpredict/issues/195 + (fetchpatch { + name = "fno-common.patch"; + url = "https://github.com/csete/gpredict/commit/c565bb3d48777bfe17114b5d01cd81150521f056.patch"; + sha256 = "1jhy9hpqlachq32bkij60q3dxkgi1kkr80rm29jjxqpmambf406a"; + }) + ]; + nativeBuildInputs = [ pkg-config intltool wrapGAppsHook ]; buildInputs = [ curl glib gtk3 goocanvas2 gpsd hamlib ]; diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index c85bcd21a0cc8..f91b336cbf6f3 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -49,6 +49,7 @@ let "8.15.0".sha256 = "sha256:1ma76wfrpfsl72yh10w1ys2a0vi0mdc2jc79kdc8nrmxkhpw1nxx"; "8.15.1".sha256 = "sha256:1dsa04jzkx5pw69pmxn0l55q4w88lg6fvz7clbga0bazzsfnsgd6"; "8.15.2".sha256 = "sha256:0gn8dz69scxnxaq6ycb3x34bjfk9wlp1y2xn8w69kg9fm4b6gkc7"; + "8.16+rc1".sha256 = "sha256-dU+E0Mz7MVntbQIeG9I59ANBaHaXXSrjCRdoqZ5TO60="; }; releaseRev = v: "V${v}"; fetched = import ../../../../build-support/coq/meta-fetch/default.nix diff --git a/pkgs/applications/version-management/git-and-tools/gh/default.nix b/pkgs/applications/version-management/git-and-tools/gh/default.nix index 3290763468810..295e0e4ac8196 100644 --- a/pkgs/applications/version-management/git-and-tools/gh/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gh/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gh"; - version = "2.11.3"; + version = "2.12.0"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-b00bP0usTpYr5EShyckmZ+a1Mw48payU/KllSck47fI="; + sha256 = "sha256-gJwSnaOJc7W5zA/7D8tmXi3g+or5cNIlJ2J6gS51D6I="; }; - vendorSha256 = "sha256-soNQXtpQ217scP606UA05+r9WIrUAMOCDBsfLKrVD+Q="; + vendorSha256 = "sha256-du4IQNQPwM245yr0dSe1C7TU6gaFgvZhxaXi3xsKuWY="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/version-management/sourcehut/builds.nix b/pkgs/applications/version-management/sourcehut/builds.nix index 350afd07fe196..b8f9a0f1522a3 100644 --- a/pkgs/applications/version-management/sourcehut/builds.nix +++ b/pkgs/applications/version-management/sourcehut/builds.nix @@ -1,7 +1,7 @@ { lib , fetchFromSourcehut -, buildPythonPackage , buildGoModule +, buildPythonPackage , srht , redis , celery @@ -9,21 +9,29 @@ , markdown , ansi2html , python +, unzip }: let - version = "0.75.2"; + version = "0.81.0"; src = fetchFromSourcehut { owner = "~sircmpwn"; repo = "builds.sr.ht"; rev = version; - sha256 = "sha256-SwyxMzmp9baRQ0vceuEn/OpfIv7z7jwq/l67hdOHXjM="; + sha256 = "sha256-oUSzanRFZ2dQTgm/VuNhqUaUAPq7ffxR7OtBKtE61DE="; }; - buildWorker = src: buildGoModule { + buildsrht-api = buildGoModule ({ inherit src version; - pname = "builds-sr-ht-worker"; + pname = "buildsrht-api"; + modRoot = "api"; + vendorSha256 = "sha256-roTwqtg4Y846PNtLdRN/LV3Jd0LVElqjFy3DJcrwoaI="; + } // import ./fix-gqlgen-trimpath.nix { inherit unzip; }); + buildsrht-worker = buildGoModule { + inherit src version; + sourceRoot = "source/worker"; + pname = "buildsrht-worker"; vendorSha256 = "sha256-Pf1M9a43eK4jr6QMi6kRHA8DodXQU0pqq9ua5VC3ER0="; }; in @@ -31,10 +39,10 @@ buildPythonPackage rec { inherit src version; pname = "buildsrht"; - patches = [ - # Revert change breaking Unix socket support for Redis - patches/redis-socket/build/0001-Revert-Add-build-submission-and-queue-monitoring.patch - ]; + postPatch = '' + substituteInPlace Makefile \ + --replace "all: api worker" "" + ''; nativeBuildInputs = srht.nativeBuildInputs; @@ -58,7 +66,8 @@ buildPythonPackage rec { cp -r images $out/lib cp contrib/submit_image_build $out/bin/builds.sr.ht - cp ${buildWorker "${src}/worker"}/bin/worker $out/bin/builds.sr.ht-worker + ln -s ${buildsrht-api}/bin/api $out/bin/buildsrht-api + ln -s ${buildsrht-worker}/bin/worker $out/bin/buildsrht-worker ''; pythonImportsCheck = [ "buildsrht" ]; diff --git a/pkgs/applications/version-management/sourcehut/core.nix b/pkgs/applications/version-management/sourcehut/core.nix index 805da8c32821f..ff56c62c62e99 100644 --- a/pkgs/applications/version-management/sourcehut/core.nix +++ b/pkgs/applications/version-management/sourcehut/core.nix @@ -1,5 +1,5 @@ { lib -, fetchgit +, fetchFromSourcehut , fetchNodeModules , buildPythonPackage , pgpy @@ -29,12 +29,13 @@ buildPythonPackage rec { pname = "srht"; - version = "0.68.14"; + version = "0.69.0"; - src = fetchgit { - url = "https://git.sr.ht/~sircmpwn/core.sr.ht"; + src = fetchFromSourcehut { + owner = "~sircmpwn"; + repo = "core.sr.ht"; rev = version; - sha256 = "sha256-BY3W2rwrg0mhH3CltgUqg6Xv8Ve5VZNY/lI1cfbAjYM="; + sha256 = "sha256-s/I0wxtPggjTkkTZnhm77PxdQjiT0Vq2MIk7JMvdupc="; fetchSubmodules = true; }; @@ -47,6 +48,8 @@ buildPythonPackage rec { patches = [ # Disable check for npm ./disable-npm-install.patch + # Fix Unix socket support in RedisQueueCollector + patches/redis-socket/core/0001-Fix-Unix-socket-support-in-RedisQueueCollector.patch ]; nativeBuildInputs = [ diff --git a/pkgs/applications/version-management/sourcehut/default.nix b/pkgs/applications/version-management/sourcehut/default.nix index 00810f208cc57..aee65dee3bbb8 100644 --- a/pkgs/applications/version-management/sourcehut/default.nix +++ b/pkgs/applications/version-management/sourcehut/default.nix @@ -2,6 +2,7 @@ , openssl , callPackage , recurseIntoAttrs +, nixosTests }: # To expose the *srht modules, they have to be a python module so we use `buildPythonModule` @@ -44,4 +45,7 @@ with python.pkgs; recurseIntoAttrs { pagessrht = pagessrht; pastesrht = toPythonApplication pastesrht; todosrht = toPythonApplication todosrht; + passthru.tests = { + nixos-sourcehut = nixosTests.sourcehut; + }; } diff --git a/pkgs/applications/version-management/sourcehut/fix-gqlgen-trimpath.nix b/pkgs/applications/version-management/sourcehut/fix-gqlgen-trimpath.nix new file mode 100644 index 0000000000000..629d767a1caf8 --- /dev/null +++ b/pkgs/applications/version-management/sourcehut/fix-gqlgen-trimpath.nix @@ -0,0 +1,32 @@ +{ unzip +, gqlgenVersion ? "0.17.2" +}: +{ + overrideModAttrs = (_: { + # No need to workaround -trimpath: it's not used in go-modules, + # but do download `go generate`'s dependencies nonetheless. + preBuild = '' + go generate ./loaders + go generate ./graph + ''; + }); + + # Workaround this error: + # go: git.sr.ht/~emersion/go-emailthreads@v0.0.0-20220412093310-4fd792e343ba: module lookup disabled by GOPROXY=off + # tidy failed: go mod tidy failed: exit status 1 + # graph/generate.go:10: running "go": exit status 1 + proxyVendor = true; + + nativeBuildInputs = [ unzip ]; + + # Workaround -trimpath in the package derivation: + # https://github.com/99designs/gqlgen/issues/1537 + # This is to give `go generate ./graph` access to gqlgen's *.gotpl files + # If it fails, the gqlgenVersion may have to be updated. + preBuild = '' + unzip ''${GOPROXY#"file://"}/github.com/99designs/gqlgen/@v/v${gqlgenVersion}.zip + go generate ./loaders + go generate ./graph + rm -rf github.com + ''; +} diff --git a/pkgs/applications/version-management/sourcehut/git.nix b/pkgs/applications/version-management/sourcehut/git.nix index 318bee4cf5177..1f76e5cb65f8f 100644 --- a/pkgs/applications/version-management/sourcehut/git.nix +++ b/pkgs/applications/version-management/sourcehut/git.nix @@ -1,57 +1,67 @@ { lib , fetchFromSourcehut -, buildPythonPackage , buildGoModule +, buildPythonPackage , python , srht , pygit2 , scmsrht +, unzip }: let - version = "0.77.3"; + version = "0.78.20"; src = fetchFromSourcehut { owner = "~sircmpwn"; repo = "git.sr.ht"; rev = version; - sha256 = "sha256-eJvXCcmdiUzTK0EqNJkLEZsAfr6toD/378HObnMbOWM="; + sha256 = "sha256-rZsTtHobsgRVmMOjPa1fiKrPsNyFu/gOsmO0cTl5MqQ="; }; - buildShell = src: buildGoModule { + gitApi = buildGoModule ({ inherit src version; - pname = "gitsrht-shell"; - vendorSha256 = "sha256-aqUFICp0C2reqb2p6JCPAUIRsxzSv0t9BHoNWrTYfqk="; - }; + pname = "gitsrht-api"; + modRoot = "api"; + vendorSha256 = "sha256-cCs9FUBusaAou9w4TDOg8GKxhRcsPbSNcQpxvFH/+so="; + } // import ./fix-gqlgen-trimpath.nix { inherit unzip; }); - buildDispatcher = src: buildGoModule { + gitDispatch = buildGoModule { inherit src version; - pname = "gitsrht-dispatcher"; + pname = "gitsrht-dispatch"; + modRoot = "gitsrht-dispatch"; vendorSha256 = "sha256-qWXPHo86s6iuRBhRMtmD5jxnAWKdrWHtA/iSUkdw89M="; }; - buildKeys = src: buildGoModule { + gitKeys = buildGoModule { inherit src version; pname = "gitsrht-keys"; + modRoot = "gitsrht-keys"; vendorSha256 = "sha256-9pojS69HCKVHUceyOpGtv9ewcxFD4WsOVsEzkmWJkF4="; }; - buildUpdateHook = src: buildGoModule { + gitShell = buildGoModule { inherit src version; - pname = "gitsrht-update-hook"; - vendorSha256 = "sha256-sBlG7EFqdDm7CkAHVX50Mf4N3sl1rPNmWExG/bfbfGA="; + pname = "gitsrht-shell"; + modRoot = "gitsrht-shell"; + vendorSha256 = "sha256-WqfvSPuVsOHA//86u33atMfeA11+DJhjLmWy8Ivq0NI="; }; - updateHook = buildUpdateHook "${src}/gitsrht-update-hook"; + gitUpdateHook = buildGoModule { + inherit src version; + pname = "gitsrht-update-hook"; + modRoot = "gitsrht-update-hook"; + vendorSha256 = "sha256-Bc3yPabS2S+qiroHFKrtkII/CfzBDYQ6xWxKHAME+Tc="; + }; in buildPythonPackage rec { inherit src version; pname = "gitsrht"; - patches = [ - # Revert change breaking Unix socket support for Redis - patches/redis-socket/git/0001-Revert-Add-webhook-queue-monitoring.patch - ]; + postPatch = '' + substituteInPlace Makefile \ + --replace "all: api gitsrht-dispatch gitsrht-keys gitsrht-shell gitsrht-update-hook" "" + ''; nativeBuildInputs = srht.nativeBuildInputs; @@ -68,14 +78,12 @@ buildPythonPackage rec { postInstall = '' mkdir -p $out/bin - cp ${buildShell "${src}/gitsrht-shell"}/bin/gitsrht-shell $out/bin/gitsrht-shell - cp ${buildDispatcher "${src}/gitsrht-dispatch"}/bin/gitsrht-dispatch $out/bin/gitsrht-dispatch - cp ${buildKeys "${src}/gitsrht-keys"}/bin/gitsrht-keys $out/bin/gitsrht-keys - cp ${updateHook}/bin/gitsrht-update-hook $out/bin/gitsrht-update-hook + ln -s ${gitApi}/bin/api $out/bin/gitsrht-api + ln -s ${gitDispatch}/bin/gitsrht-dispatch $out/bin/gitsrht-dispatch + ln -s ${gitKeys}/bin/gitsrht-keys $out/bin/gitsrht-keys + ln -s ${gitShell}/bin/gitsrht-shell $out/bin/gitsrht-shell + ln -s ${gitUpdateHook}/bin/gitsrht-update-hook $out/bin/gitsrht-update-hook ''; - passthru = { - inherit updateHook; - }; pythonImportsCheck = [ "gitsrht" ]; diff --git a/pkgs/applications/version-management/sourcehut/hg.nix b/pkgs/applications/version-management/sourcehut/hg.nix index f3e778b2f31bc..c1470c3fc5c6d 100644 --- a/pkgs/applications/version-management/sourcehut/hg.nix +++ b/pkgs/applications/version-management/sourcehut/hg.nix @@ -1,21 +1,44 @@ { lib -, fetchhg +, fetchFromSourcehut +, buildGoModule , buildPythonPackage , srht , hglib , scmsrht , unidiff , python +, unzip }: buildPythonPackage rec { pname = "hgsrht"; - version = "0.29.4"; + version = "0.31.3"; - src = fetchhg { - url = "https://hg.sr.ht/~sircmpwn/hg.sr.ht"; + src = fetchFromSourcehut { + owner = "~sircmpwn"; + repo = "hg.sr.ht"; rev = version; - sha256 = "Jn9M/R5tJK/GeJDWGo3LWCK2nwsfI9zh+/yo2M+X6Sk="; + sha256 = "4Qe08gqsSTMQVQBchFPEUXuxM8ZAAQGJT1EOcDjkZa0="; + vc = "hg"; + }; + + postPatch = '' + substituteInPlace Makefile \ + --replace "all: api hgsrht-keys" "" + ''; + + hgsrht-api = buildGoModule ({ + inherit src version; + pname = "hgsrht-api"; + modRoot = "api"; + vendorSha256 = "sha256-uIP3W7UJkP68HJUF33kz5xfg/KBiaSwMozFYmQJQkys="; + } // import ./fix-gqlgen-trimpath.nix { inherit unzip; }); + + hgsrht-keys = buildGoModule { + inherit src version; + pname = "hgsrht-keys"; + modRoot = "hgsrht-keys"; + vendorSha256 = "sha256-7ti8xCjSrxsslF7/1X/GY4FDl+69hPL4UwCDfjxmJLU="; }; nativeBuildInputs = srht.nativeBuildInputs; @@ -32,6 +55,11 @@ buildPythonPackage rec { export SRHT_PATH=${srht}/${python.sitePackages}/srht ''; + postInstall = '' + ln -s ${hgsrht-api}/bin/api $out/bin/hgsrht-api + ln -s ${hgsrht-keys}/bin/hgsrht-keys $out/bin/hgsrht-keys + ''; + pythonImportsCheck = [ "hgsrht" ]; meta = with lib; { diff --git a/pkgs/applications/version-management/sourcehut/hub.nix b/pkgs/applications/version-management/sourcehut/hub.nix index 511ec359fc4b0..75d9efe5bd93d 100644 --- a/pkgs/applications/version-management/sourcehut/hub.nix +++ b/pkgs/applications/version-management/sourcehut/hub.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "hubsrht"; - version = "0.14.4"; + version = "0.14.14"; src = fetchFromSourcehut { owner = "~sircmpwn"; repo = "hub.sr.ht"; rev = version; - sha256 = "sha256-7HF+jykWGqzPWA0YtJZQZU7pnID1yexcqLkEf2HpnSs="; + sha256 = "sha256-4n6oQ+AAvdJY/5KflxAp62chjyrlSUkmt319DKZk33w="; }; nativeBuildInputs = srht.nativeBuildInputs; diff --git a/pkgs/applications/version-management/sourcehut/lists.nix b/pkgs/applications/version-management/sourcehut/lists.nix index 3ba6375a91380..d981598a7b19a 100644 --- a/pkgs/applications/version-management/sourcehut/lists.nix +++ b/pkgs/applications/version-management/sourcehut/lists.nix @@ -1,5 +1,6 @@ { lib , fetchFromSourcehut +, buildGoModule , buildPythonPackage , srht , asyncpg @@ -8,23 +9,31 @@ , emailthreads , redis , python +, unzip }: buildPythonPackage rec { pname = "listssrht"; - version = "0.51.7"; + version = "0.51.11"; src = fetchFromSourcehut { owner = "~sircmpwn"; repo = "lists.sr.ht"; rev = version; - sha256 = "sha256-oNY5A98oVoL2JKO0fU/8YVl8u7ywmHb/RHD8A6z9yIM="; + sha256 = "sha256-Qb70oOazZfmHpC5r0oMYCFdvfAeKbq3mQA8+M56YYnY="; }; - patches = [ - # Revert change breaking Unix socket support for Redis - patches/redis-socket/lists/0001-Revert-Add-webhook-queue-monitoring.patch - ]; + listssrht-api = buildGoModule ({ + inherit src version; + pname = "listssrht-api"; + modRoot = "api"; + vendorSha256 = "sha256-xnmMkRSokbhWD+kz0XQ9AinYdm6/50FRBISURPvlzD0="; + } // import ./fix-gqlgen-trimpath.nix { inherit unzip;}); + + postPatch = '' + substituteInPlace Makefile \ + --replace "all: api" "" + ''; nativeBuildInputs = srht.nativeBuildInputs; @@ -42,6 +51,10 @@ buildPythonPackage rec { export SRHT_PATH=${srht}/${python.sitePackages}/srht ''; + postInstall = '' + ln -s ${listssrht-api}/bin/api $out/bin/listssrht-api + ''; + pythonImportsCheck = [ "listssrht" ]; meta = with lib; { diff --git a/pkgs/applications/version-management/sourcehut/man.nix b/pkgs/applications/version-management/sourcehut/man.nix index 8d43f297a4f88..530101d573520 100644 --- a/pkgs/applications/version-management/sourcehut/man.nix +++ b/pkgs/applications/version-management/sourcehut/man.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "mansrht"; - version = "0.15.23"; + version = "0.15.26"; src = fetchFromSourcehut { owner = "~sircmpwn"; repo = "man.sr.ht"; rev = version; - sha256 = "sha256-xrBptXdwMee+YkPup/BYL/iXBhCzSUQ5htSHIw/1Ncc="; + sha256 = "sha256-5xZH6DrTXMdWd26OGICp7lZ/QDjACIa7zNUJHB7jzGo="; }; nativeBuildInputs = srht.nativeBuildInputs; diff --git a/pkgs/applications/version-management/sourcehut/meta.nix b/pkgs/applications/version-management/sourcehut/meta.nix index ab19cc88d25ee..4572fc81b2889 100644 --- a/pkgs/applications/version-management/sourcehut/meta.nix +++ b/pkgs/applications/version-management/sourcehut/meta.nix @@ -16,32 +16,34 @@ , weasyprint , prometheus-client , python +, unzip }: let - version = "0.57.5"; + version = "0.58.18"; src = fetchFromSourcehut { owner = "~sircmpwn"; repo = "meta.sr.ht"; rev = version; - sha256 = "sha256-qsCwZaCiqvY445U053OCWD98jlIUi9NB2jWVP2oW3Vk="; + sha256 = "sha256-OjbQHAzG2nZwpJUIvhKaCJWZbhZDC2R6C+SkbKUpk8o="; }; - buildApi = src: buildGoModule { + metasrht-api = buildGoModule ({ inherit src version; pname = "metasrht-api"; - vendorSha256 = "sha256-8Ubrr9qRlgW2wsLHrPHwulSWLz+gp4VPcTvOZpg8TYM="; - }; + modRoot = "api"; + vendorSha256 = "sha256-kiEuEYZFbwJ6SbKFtxH4SiRaZmqYriRHPoHdTX28+d0="; + } // import ./fix-gqlgen-trimpath.nix { inherit unzip; }); in buildPythonPackage rec { pname = "metasrht"; inherit version src; - patches = [ - # Revert change breaking Unix socket support for Redis - patches/redis-socket/meta/0001-Revert-Add-webhook-queue-monitoring.patch - ]; + postPatch = '' + substituteInPlace Makefile \ + --replace "all: api" "" + ''; nativeBuildInputs = srht.nativeBuildInputs; @@ -68,7 +70,7 @@ buildPythonPackage rec { postInstall = '' mkdir -p $out/bin - cp ${buildApi "${src}/api/"}/bin/api $out/bin/metasrht-api + ln -s ${metasrht-api}/bin/api $out/bin/metasrht-api ''; pythonImportsCheck = [ "metasrht" ]; diff --git a/pkgs/applications/version-management/sourcehut/pages.nix b/pkgs/applications/version-management/sourcehut/pages.nix index b6a18b5bda770..edb9379c6ded1 100644 --- a/pkgs/applications/version-management/sourcehut/pages.nix +++ b/pkgs/applications/version-management/sourcehut/pages.nix @@ -1,20 +1,26 @@ { lib , fetchFromSourcehut , buildGoModule +, unzip }: -buildGoModule rec { +buildGoModule (rec { pname = "pagessrht"; - version = "0.6.2"; + version = "0.7.4"; src = fetchFromSourcehut { owner = "~sircmpwn"; repo = "pages.sr.ht"; rev = version; - sha256 = "sha256-ob0+t9V2o8lhVC6fXbi1rNm0Mnbs+GoyAmhBqVZ13PA="; + sha256 = "sha256-WM9T2LS8yIqaR0PQQRgMk/tiMYcw8DZVPMqMWkj/5RY="; }; - vendorSha256 = "sha256-b0sHSH0jkKoIVq045N96wszuLJDegkkj0v50nuDFleU="; + postPatch = '' + substituteInPlace Makefile \ + --replace "all: server" "" + ''; + + vendorSha256 = "sha256-VOqY/nStqGyfWOXnJSZX8UYyp2kzcibQM2NRNysHYEc="; postInstall = '' mkdir -p $out/share/sql/ @@ -27,4 +33,6 @@ buildGoModule rec { license = licenses.agpl3Only; maintainers = with maintainers; [ eadwu ]; }; -} + # There is no ./loaders but this does not cause troubles + # to go generate +} // import ./fix-gqlgen-trimpath.nix { inherit unzip; gqlgenVersion= "0.17.9"; }) diff --git a/pkgs/applications/version-management/sourcehut/paste.nix b/pkgs/applications/version-management/sourcehut/paste.nix index c411f8e8c954a..e31473bd34361 100644 --- a/pkgs/applications/version-management/sourcehut/paste.nix +++ b/pkgs/applications/version-management/sourcehut/paste.nix @@ -8,15 +8,20 @@ buildPythonPackage rec { pname = "pastesrht"; - version = "0.13.6"; + version = "0.13.8"; src = fetchFromSourcehut { owner = "~sircmpwn"; repo = "paste.sr.ht"; rev = version; - sha256 = "sha256-Khcqk86iD9nxiKXN3+8mSLNoDau2qXNFOrLdkVu+rH8="; + sha256 = "sha256-Zji9FyYUtsklYz4qyLbtduusteC7WujLCMmvZKcqYis="; }; + postPatch = '' + substituteInPlace Makefile \ + --replace "all: api" "" + ''; + nativeBuildInputs = srht.nativeBuildInputs; propagatedBuildInputs = [ diff --git a/pkgs/applications/version-management/sourcehut/patches/redis-socket/build/0001-Revert-Add-build-submission-and-queue-monitoring.patch b/pkgs/applications/version-management/sourcehut/patches/redis-socket/build/0001-Revert-Add-build-submission-and-queue-monitoring.patch deleted file mode 100644 index ae8e95ddc0c2f..0000000000000 --- a/pkgs/applications/version-management/sourcehut/patches/redis-socket/build/0001-Revert-Add-build-submission-and-queue-monitoring.patch +++ /dev/null @@ -1,69 +0,0 @@ -From 069b03f85847ed4a9223183b62ee53f420838911 Mon Sep 17 00:00:00 2001 -From: Julien Moutinho <julm+srht@sourcephile.fr> -Date: Thu, 16 Dec 2021 04:54:24 +0100 -Subject: [PATCH builds.sr.ht] Revert "Add build submission and queue - monitoring" - -This reverts commit 690f1aa16c77e418dc40109cd5e8fdf4a7ed947a. - -This has broken Unix socket support for Redis -See https://lists.sr.ht/~sircmpwn/sr.ht-dev/%3C20211208082636.65665-1-me%40ignaskiela.eu%3E#%3C20211216033723.wefibfulfjhqnhem@sourcephile.fr%3E ---- - buildsrht/app.py | 3 --- - buildsrht/runner.py | 9 +-------- - 2 files changed, 1 insertion(+), 11 deletions(-) - -diff --git a/buildsrht/app.py b/buildsrht/app.py -index e5321a2..7c9977c 100644 ---- a/buildsrht/app.py -+++ b/buildsrht/app.py -@@ -36,9 +36,6 @@ class BuildApp(SrhtFlask): - self.register_blueprint(secrets) - self.register_blueprint(gql_blueprint) - -- from buildsrht.runner import builds_queue_metrics_collector -- self.metrics_registry.register(builds_queue_metrics_collector) -- - @self.context_processor - def inject(): - return { -diff --git a/buildsrht/runner.py b/buildsrht/runner.py -index 7773452..0389c8e 100644 ---- a/buildsrht/runner.py -+++ b/buildsrht/runner.py -@@ -5,13 +5,10 @@ from srht.config import cfg - from srht.database import db - from srht.email import send_email - from srht.oauth import UserType --from srht.metrics import RedisQueueCollector --from prometheus_client import Counter - - allow_free = cfg("builds.sr.ht", "allow-free", default="no") == "yes" - --builds_broker = cfg("builds.sr.ht", "redis") --runner = Celery('builds', broker=builds_broker, config_source={ -+runner = Celery('builds', broker=cfg("builds.sr.ht", "redis"), config_source={ - "CELERY_TASK_SERIALIZER": "json", - "CELERY_ACCEPT_CONTENT": ["json"], - "CELERY_RESULT_SERIALIZER": "json", -@@ -19,9 +16,6 @@ runner = Celery('builds', broker=builds_broker, config_source={ - "CELERY_TASK_PROTOCOL": 1 - }) - --builds_queue_metrics_collector = RedisQueueCollector(builds_broker, "buildsrht_builds", "Number of builds currently in queue") --builds_submitted = Counter("buildsrht_builds_submited", "Number of builds submitted") -- - def queue_build(job, manifest): - from buildsrht.types import JobStatus - job.status = JobStatus.queued -@@ -34,7 +28,6 @@ def queue_build(job, manifest): - cfg("sr.ht", "owner-email"), - "Cryptocurrency mining attempt on builds.sr.ht") - else: -- builds_submitted.inc() - run_build.delay(job.id, manifest.to_dict()) - - def requires_payment(user): --- -2.34.0 - diff --git a/pkgs/applications/version-management/sourcehut/patches/redis-socket/core/0001-Fix-Unix-socket-support-in-RedisQueueCollector.patch b/pkgs/applications/version-management/sourcehut/patches/redis-socket/core/0001-Fix-Unix-socket-support-in-RedisQueueCollector.patch new file mode 100644 index 0000000000000..889331f3e07ff --- /dev/null +++ b/pkgs/applications/version-management/sourcehut/patches/redis-socket/core/0001-Fix-Unix-socket-support-in-RedisQueueCollector.patch @@ -0,0 +1,42 @@ +From 76dd636151735671be74ba9d55f773e190e22827 Mon Sep 17 00:00:00 2001 +From: Julien Moutinho <julm+srht@sourcephile.fr> +Date: Fri, 13 May 2022 22:40:46 +0200 +Subject: [PATCH core.sr.ht] Fix Unix socket support in RedisQueueCollector + +The broker URL is not necessarily in the format expected by Redis.from_url + +Especially, Redis.from_url supports this format for Unix sockets: + unix:///run/redis-sourcehut-metasrht/redis.sock?db=0 +See https://redis-py.readthedocs.io/en/stable/#redis.ConnectionPool.from_url + +Whereas Celery+Kombu support Redis but also other transports +and thus expect another scheme: + redis+socket:///run/redis-sourcehut-metasrht/redis.sock?virtual_host=1 +See https://docs.celeryproject.org/en/stable/userguide/configuration.html#redis-backend-settings +and https://github.com/celery/celery/blob/e5d99801e4b56a02af4a2e183879c767228d2817/celery/backends/redis.py#L299-L352 +and https://github.com/celery/kombu/blob/master/kombu/utils/url.py +--- + srht/metrics.py | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/srht/metrics.py b/srht/metrics.py +index 68caf8e..2df5777 100644 +--- a/srht/metrics.py ++++ b/srht/metrics.py +@@ -1,11 +1,12 @@ + import time ++from celery import Celery + from prometheus_client.metrics_core import GaugeMetricFamily + from redis import Redis, ResponseError + + + class RedisQueueCollector: + def __init__(self, broker, name, documentation, queue_name="celery"): +- self.redis = Redis.from_url(broker) ++ self.redis = Celery("collector", broker=broker).connection_for_read().channel().client + self.queue_name = queue_name + self.name = name + self.documentation = documentation +-- +2.35.1 + diff --git a/pkgs/applications/version-management/sourcehut/patches/redis-socket/git/0001-Revert-Add-webhook-queue-monitoring.patch b/pkgs/applications/version-management/sourcehut/patches/redis-socket/git/0001-Revert-Add-webhook-queue-monitoring.patch deleted file mode 100644 index 4c526dd23e119..0000000000000 --- a/pkgs/applications/version-management/sourcehut/patches/redis-socket/git/0001-Revert-Add-webhook-queue-monitoring.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 5ccb5386304c26f25b0a9eb10ce9edb6da32f91a Mon Sep 17 00:00:00 2001 -From: Julien Moutinho <julm+srht@sourcephile.fr> -Date: Sat, 12 Feb 2022 00:11:59 +0100 -Subject: [PATCH git.sr.ht] Revert "Add webhook queue monitoring" - -This reverts commit 7ea630b776947ab82438d0ffa263b0f9d33ebff3. - -Which has broken Unix socket support for Redis. -See https://lists.sr.ht/~sircmpwn/sr.ht-dev/%3C20211208082636.65665-1-me%40ignaskiela.eu%3E#%3C20211216033723.wefibfulfjhqnhem@sourcephile.fr%3E ---- - gitsrht/app.py | 3 --- - gitsrht/webhooks.py | 5 +---- - 2 files changed, 1 insertion(+), 7 deletions(-) - -diff --git a/gitsrht/app.py b/gitsrht/app.py -index e9ccb56..4928851 100644 ---- a/gitsrht/app.py -+++ b/gitsrht/app.py -@@ -48,9 +48,6 @@ class GitApp(ScmSrhtFlask): - self.add_template_filter(url_quote) - self.add_template_filter(commit_links) - -- from gitsrht.webhooks import webhook_metrics_collector -- self.metrics_registry.register(webhook_metrics_collector) -- - @self.context_processor - def inject(): - notice = session.get("notice") -diff --git a/gitsrht/webhooks.py b/gitsrht/webhooks.py -index 8a203fe..6240d50 100644 ---- a/gitsrht/webhooks.py -+++ b/gitsrht/webhooks.py -@@ -7,13 +7,10 @@ if not hasattr(db, "session"): - db.init() - from srht.webhook import Event - from srht.webhook.celery import CeleryWebhook, make_worker --from srht.metrics import RedisQueueCollector - from scmsrht.webhooks import UserWebhook - import sqlalchemy as sa - --webhook_broker = cfg("git.sr.ht", "webhooks") --worker = make_worker(broker=webhook_broker) --webhook_metrics_collector = RedisQueueCollector(webhook_broker, "srht_webhooks", "Webhook queue length") -+worker = make_worker(broker=cfg("git.sr.ht", "webhooks")) - - class RepoWebhook(CeleryWebhook): - events = [ --- -2.34.1 - diff --git a/pkgs/applications/version-management/sourcehut/patches/redis-socket/lists/0001-Revert-Add-webhook-queue-monitoring.patch b/pkgs/applications/version-management/sourcehut/patches/redis-socket/lists/0001-Revert-Add-webhook-queue-monitoring.patch deleted file mode 100644 index 872d285b9bb07..0000000000000 --- a/pkgs/applications/version-management/sourcehut/patches/redis-socket/lists/0001-Revert-Add-webhook-queue-monitoring.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 730e090f31b150d42be4b4722751f8e4610835b0 Mon Sep 17 00:00:00 2001 -From: Julien Moutinho <julm+srht@sourcephile.fr> -Date: Sat, 12 Feb 2022 00:38:12 +0100 -Subject: [PATCH lists.sr.ht] Revert "Add webhook queue monitoring" - -This reverts commit e74e344808e8d523a9786cefcbf64c9a247d7a0e. - -Which has broken Unix socket support for Redis. -See https://lists.sr.ht/~sircmpwn/sr.ht-dev/%3C20211208082636.65665-1-me%40ignaskiela.eu%3E#%3C20211216033723.wefibfulfjhqnhem@sourcephile.fr%3E ---- - listssrht/app.py | 3 --- - listssrht/webhooks.py | 5 +---- - 2 files changed, 1 insertion(+), 7 deletions(-) - -diff --git a/listssrht/app.py b/listssrht/app.py -index aec59f3..83a355d 100644 ---- a/listssrht/app.py -+++ b/listssrht/app.py -@@ -29,9 +29,6 @@ class ListsApp(SrhtFlask): - self.register_blueprint(user) - self.register_blueprint(gql_blueprint) - -- from listssrht.webhooks import webhook_metrics_collector -- self.metrics_registry.register(webhook_metrics_collector) -- - @self.context_processor - def inject(): - from listssrht.types import ListAccess -diff --git a/listssrht/webhooks.py b/listssrht/webhooks.py -index ae5b1cb..86421ba 100644 ---- a/listssrht/webhooks.py -+++ b/listssrht/webhooks.py -@@ -8,11 +8,8 @@ if not hasattr(db, "session"): - db.init() - from srht.webhook import Event - from srht.webhook.celery import CeleryWebhook, make_worker --from srht.metrics import RedisQueueCollector - --webhook_broker = cfg("lists.sr.ht", "webhooks") --worker = make_worker(broker=webhook_broker) --webhook_metrics_collector = RedisQueueCollector(webhook_broker, "srht_webhooks", "Webhook queue length") -+worker = make_worker(broker=cfg("lists.sr.ht", "webhooks")) - - class ListWebhook(CeleryWebhook): - events = [ --- -2.34.1 - diff --git a/pkgs/applications/version-management/sourcehut/patches/redis-socket/meta/0001-Revert-Add-webhook-queue-monitoring.patch b/pkgs/applications/version-management/sourcehut/patches/redis-socket/meta/0001-Revert-Add-webhook-queue-monitoring.patch deleted file mode 100644 index 9ec37670b0600..0000000000000 --- a/pkgs/applications/version-management/sourcehut/patches/redis-socket/meta/0001-Revert-Add-webhook-queue-monitoring.patch +++ /dev/null @@ -1,48 +0,0 @@ -From d88bee195797c6c294320617ff14798da94cd0f3 Mon Sep 17 00:00:00 2001 -From: Julien Moutinho <julm+srht@sourcephile.fr> -Date: Thu, 16 Dec 2021 04:52:08 +0100 -Subject: [PATCH meta.sr.ht] Revert "Add webhook queue monitoring" - -This reverts commit 9931df3c23094af5179df9ef019ca732b8125dac. - -This has broken Unix socket support for Redis. -See https://lists.sr.ht/~sircmpwn/sr.ht-dev/%3C20211208082636.65665-1-me%40ignaskiela.eu%3E#%3C20211216033723.wefibfulfjhqnhem@sourcephile.fr%3E ---- - metasrht/app.py | 3 --- - metasrht/webhooks.py | 5 +---- - 2 files changed, 1 insertion(+), 7 deletions(-) - -diff --git a/metasrht/app.py b/metasrht/app.py -index b190875..89c59bc 100644 ---- a/metasrht/app.py -+++ b/metasrht/app.py -@@ -49,9 +49,6 @@ class MetaApp(SrhtFlask): - from metasrht.blueprints.billing import billing - self.register_blueprint(billing) - -- from metasrht.webhooks import webhook_metrics_collector -- self.metrics_registry.register(webhook_metrics_collector) -- - @self.context_processor - def inject(): - return { -diff --git a/metasrht/webhooks.py b/metasrht/webhooks.py -index 3e1149e..3f0ba01 100644 ---- a/metasrht/webhooks.py -+++ b/metasrht/webhooks.py -@@ -7,11 +7,8 @@ if not hasattr(db, "session"): - db.init() - from srht.webhook import Event - from srht.webhook.celery import CeleryWebhook, make_worker --from srht.metrics import RedisQueueCollector - --webhook_broker = cfg("meta.sr.ht", "webhooks", "redis://") --worker = make_worker(broker=webhook_broker) --webhook_metrics_collector = RedisQueueCollector(webhook_broker, "srht_webhooks", "Webhook queue length") -+worker = make_worker(broker=cfg("meta.sr.ht", "webhooks", "redis://")) - - class UserWebhook(CeleryWebhook): - events = [ --- -2.34.0 - diff --git a/pkgs/applications/version-management/sourcehut/patches/redis-socket/todo/0001-Revert-Add-webhook-queue-monitoring.patch b/pkgs/applications/version-management/sourcehut/patches/redis-socket/todo/0001-Revert-Add-webhook-queue-monitoring.patch deleted file mode 100644 index 861608c11843e..0000000000000 --- a/pkgs/applications/version-management/sourcehut/patches/redis-socket/todo/0001-Revert-Add-webhook-queue-monitoring.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 42a27ea60d8454552d54e1f51f1b976d1067fc32 Mon Sep 17 00:00:00 2001 -From: Julien Moutinho <julm+srht@sourcephile.fr> -Date: Sat, 12 Feb 2022 00:30:29 +0100 -Subject: [PATCH todo.sr.ht] Revert "Add webhook queue monitoring" - -This reverts commit 320a5e8f7cd16ca43928c36f0320593f84d986fa. - -Which has broken Unix socket support for Redis. -See https://lists.sr.ht/~sircmpwn/sr.ht-dev/%3C20211208082636.65665-1-me%40ignaskiela.eu%3E#%3C20211216033723.wefibfulfjhqnhem@sourcephile.fr%3E ---- - todosrht/flask.py | 3 --- - todosrht/webhooks.py | 6 +----- - 2 files changed, 1 insertion(+), 8 deletions(-) - -diff --git a/todosrht/flask.py b/todosrht/flask.py -index 5e8ac66..9d0fd27 100644 ---- a/todosrht/flask.py -+++ b/todosrht/flask.py -@@ -43,9 +43,6 @@ class TodoApp(SrhtFlask): - self.add_template_filter(urls.tracker_url) - self.add_template_filter(urls.user_url) - -- from todosrht.webhooks import webhook_metrics_collector -- self.metrics_registry.register(webhook_metrics_collector) -- - @self.context_processor - def inject(): - return { -diff --git a/todosrht/webhooks.py b/todosrht/webhooks.py -index eb8e08a..950047f 100644 ---- a/todosrht/webhooks.py -+++ b/todosrht/webhooks.py -@@ -7,13 +7,9 @@ if not hasattr(db, "session"): - db.init() - from srht.webhook import Event - from srht.webhook.celery import CeleryWebhook, make_worker --from srht.metrics import RedisQueueCollector - import sqlalchemy as sa - -- --webhooks_broker = cfg("todo.sr.ht", "webhooks") --worker = make_worker(broker=webhooks_broker) --webhook_metrics_collector = RedisQueueCollector(webhooks_broker, "srht_webhooks", "Webhook queue length") -+worker = make_worker(broker=cfg("todo.sr.ht", "webhooks")) - - import todosrht.tracker_import - --- -2.34.1 - diff --git a/pkgs/applications/version-management/sourcehut/scm.nix b/pkgs/applications/version-management/sourcehut/scm.nix index 10da3018843ae..49eea05a7a7a2 100644 --- a/pkgs/applications/version-management/sourcehut/scm.nix +++ b/pkgs/applications/version-management/sourcehut/scm.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "scmsrht"; - version = "0.22.19"; # Untagged version + version = "0.22.22"; src = fetchFromSourcehut { owner = "~sircmpwn"; repo = "scm.sr.ht"; rev = version; - sha256 = "sha256-/QryPjWJ2S0Ov9DTdrwbM81HYucHiYcLh0oKacflywI="; + sha256 = "sha256-iSzzyI8HZOpOb4dyt520MV/wds14fNag2+UOF09KS7w="; }; nativeBuildInputs = srht.nativeBuildInputs; diff --git a/pkgs/applications/version-management/sourcehut/todo.nix b/pkgs/applications/version-management/sourcehut/todo.nix index 1446e68fa69dc..0278fb6bd1738 100644 --- a/pkgs/applications/version-management/sourcehut/todo.nix +++ b/pkgs/applications/version-management/sourcehut/todo.nix @@ -1,5 +1,6 @@ { lib , fetchFromSourcehut +, buildGoModule , buildPythonPackage , srht , redis @@ -8,23 +9,31 @@ , pytest , factory_boy , python +, unzip }: buildPythonPackage rec { pname = "todosrht"; - version = "0.67.2"; + version = "0.72.2"; src = fetchFromSourcehut { owner = "~sircmpwn"; repo = "todo.sr.ht"; rev = version; - sha256 = "sha256-/QHsMlhzyah85ubZyx8j4GDUoITuWcLDJKosbZGeOZU="; + sha256 = "sha256-FLjVO8Y/9s2gFfMXwcY7Rj3WNzPEBYs1AEjiVZFWsT8="; }; - patches = [ - # Revert change breaking Unix socket support for Redis - patches/redis-socket/todo/0001-Revert-Add-webhook-queue-monitoring.patch - ]; + postPatch = '' + substituteInPlace Makefile \ + --replace "all: api" "" + ''; + + todosrht-api = buildGoModule ({ + inherit src version; + pname = "todosrht-api"; + modRoot = "api"; + vendorSha256 = "sha256-LB1H4jwnvoEyaaYJ09NI/M6IkgZwRet/fkso6b9EPV0="; + } // import ./fix-gqlgen-trimpath.nix {inherit unzip;}); nativeBuildInputs = srht.nativeBuildInputs; @@ -40,6 +49,10 @@ buildPythonPackage rec { export SRHT_PATH=${srht}/${python.sitePackages}/srht ''; + postInstall = '' + ln -s ${todosrht-api}/bin/api $out/bin/todosrht-api + ''; + # pytest tests fail checkInputs = [ pytest diff --git a/pkgs/applications/version-management/sourcehut/update.sh b/pkgs/applications/version-management/sourcehut/update.sh index 97509397aef52..e13ce09da4c71 100755 --- a/pkgs/applications/version-management/sourcehut/update.sh +++ b/pkgs/applications/version-management/sourcehut/update.sh @@ -16,7 +16,7 @@ version() { } src_url() { - nix-instantiate --eval --strict --expr " with import $root {}; let src = sourcehut.python.pkgs.$1.drvAttrs.src; in src.url or src.meta.homepage" | tr -d '"' + nix-instantiate --eval --strict --expr " with import $root {}; let src = sourcehut.python.pkgs.$1.drvAttrs.src; in src.meta.homepage" | tr -d '"' } get_latest_version() { diff --git a/pkgs/applications/window-managers/fbpanel/default.nix b/pkgs/applications/window-managers/fbpanel/default.nix index 1a87f29f67cd9..33a313eb8eec5 100644 --- a/pkgs/applications/window-managers/fbpanel/default.nix +++ b/pkgs/applications/window-managers/fbpanel/default.nix @@ -19,6 +19,10 @@ stdenv.mkDerivation rec { --replace "CFLAGSX =" "CFLAGSX = -I${gdk-pixbuf-xlib.dev}/include/gdk-pixbuf-2.0" ''; + # Workaround build failure on -fno-common toolchains like upstream + # gcc-10. Otherwise build fails as: + # ld: plugin.o:(.bss+0x0): multiple definition of `stam'; panel.o:(.bss+0x20): first defined here + NIX_CFLAGS_COMPILE = "-fcommon"; NIX_LDFLAGS="-lX11"; meta = with lib; { diff --git a/pkgs/development/compilers/gcl/default.nix b/pkgs/development/compilers/gcl/default.nix index 6d0471dacbb50..e6ccc2598035b 100644 --- a/pkgs/development/compilers/gcl/default.nix +++ b/pkgs/development/compilers/gcl/default.nix @@ -40,7 +40,10 @@ stdenv.mkDerivation rec { hardeningDisable = [ "pic" "bindnow" ]; - NIX_CFLAGS_COMPILE = "-fgnu89-inline"; + # -fcommon: workaround build failure on -fno-common toolchains: + # ld: ./libgclp.a(user_match.o):(.bss+0x18): multiple definition of + # `tf'; ./libpre_gcl.a(main.o):(.bss+0x326d90): first defined here + NIX_CFLAGS_COMPILE = "-fgnu89-inline -fcommon"; meta = with lib; { description = "GNU Common Lisp compiler working via GCC"; diff --git a/pkgs/development/compilers/gmqcc/default.nix b/pkgs/development/compilers/gmqcc/default.nix new file mode 100644 index 0000000000000..f3b25e2dbd4ad --- /dev/null +++ b/pkgs/development/compilers/gmqcc/default.nix @@ -0,0 +1,43 @@ +{ lib +, pkgs +, stdenv +, fetchFromGitHub +}: + +stdenv.mkDerivation rec { + pname = "gmqcc"; + version = "unstable-2021-07-09"; + + src = fetchFromGitHub { + owner = "graphitemaster"; + repo = "gmqcc"; + rev = "297eab9e5e2c9cc4f41201b68821593a5cf9a725"; + sha256 = "1hl2qn7402ia03kjkblj4q4wfypxkil99sivsyk2vrnwwpdp4nzx"; + }; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + install -m755 gmqcc $out/bin + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://graphitemaster.github.io/gmqcc/"; + description = "A modern QuakeC compiler"; + longDescription = '' + For an enduring period of time the options for a decent compiler for + the Quake C programming language were confined to a specific compiler + known as QCC. Attempts were made to extend and improve upon the design + of QCC, but many foreseen the consequences of building on a broken + foundation. The solution was obvious, a new compiler; one born from + the NIH realm of sarcastic wit. + We welcome you. You won't find a better Quake C compiler. + ''; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ necrophcodr ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/coq-modules/bignums/default.nix b/pkgs/development/coq-modules/bignums/default.nix index a53b8199fe96e..798ea04368f85 100644 --- a/pkgs/development/coq-modules/bignums/default.nix +++ b/pkgs/development/coq-modules/bignums/default.nix @@ -8,6 +8,7 @@ with lib; mkCoqDerivation { defaultVersion = if versions.isGe "8.6" coq.coq-version then "${coq.coq-version}.0" else null; + release."8.16.0".sha256 = "sha256-DH3iWwatPlhhCVYVlgL2WLkvneSVzSXUiKo2e0+1zR4="; release."8.15.0".sha256 = "093klwlhclgyrba1iv18dyz1qp5f0lwiaa7y0qwvgmai8rll5fns"; release."8.14.0".sha256 = "0jsgdvj0ddhkls32krprp34r64y1rb5mwxl34fgaxk2k4664yq06"; release."8.13.0".sha256 = "1n66i7hd9222b2ks606mak7m4f0dgy02xgygjskmmav6h7g2sx7y"; diff --git a/pkgs/development/libraries/libnftnl/default.nix b/pkgs/development/libraries/libnftnl/default.nix index 66134eaffe094..e136fc1a5585c 100644 --- a/pkgs/development/libraries/libnftnl/default.nix +++ b/pkgs/development/libraries/libnftnl/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, pkg-config, libmnl }: stdenv.mkDerivation rec { - version = "1.2.1"; + version = "1.2.2"; pname = "libnftnl"; src = fetchurl { url = "https://netfilter.org/projects/${pname}/files/${pname}-${version}.tar.bz2"; - sha256 = "0z4khm2mnys9mcl8ckwf19cw20jgrv8650nfncy3xcgs2k2aa23m"; + hash = "sha256-nvwAT50VkY1o+emOGU1V4DAWjzO7Z8PnpUW3QMntbQo="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/libraries/libosinfo/default.nix b/pkgs/development/libraries/libosinfo/default.nix index a1dd23357decd..894aee90ff4b8 100644 --- a/pkgs/development/libraries/libosinfo/default.nix +++ b/pkgs/development/libraries/libosinfo/default.nix @@ -30,7 +30,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-olLgD8WA3rIdoNqMCqA7jDHoRAuESMi5gUP6tHfTIwU="; }; - outputs = [ "out" "dev" "devdoc" ]; + outputs = [ "out" "dev" ] + ++ lib.optional (stdenv.hostPlatform == stdenv.buildPlatform) "devdoc"; nativeBuildInputs = [ pkg-config diff --git a/pkgs/development/libraries/libqalculate/default.nix b/pkgs/development/libraries/libqalculate/default.nix index d83a4e0a707a6..da3bc925c820c 100644 --- a/pkgs/development/libraries/libqalculate/default.nix +++ b/pkgs/development/libraries/libqalculate/default.nix @@ -1,5 +1,10 @@ -{ lib, stdenv, fetchFromGitHub, mpfr, libxml2, intltool, pkg-config, doxygen, - autoreconfHook, readline, libiconv, icu, curl, gnuplot, gettext }: +{ lib, stdenv, fetchFromGitHub +, mpfr, gnuplot +, readline +, libxml2, curl +, intltool, libiconv, icu, gettext +, pkg-config, doxygen, autoreconfHook, buildPackages +}: stdenv.mkDerivation rec { pname = "libqalculate"; @@ -16,6 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ intltool pkg-config autoreconfHook doxygen ]; buildInputs = [ curl gettext libiconv readline ]; + depsBuildBuild = [ buildPackages.stdenv.cc ]; propagatedBuildInputs = [ libxml2 mpfr icu ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/libzim/default.nix b/pkgs/development/libraries/libzim/default.nix index 5191da60ce261..3f290d4ffa3ca 100644 --- a/pkgs/development/libraries/libzim/default.nix +++ b/pkgs/development/libraries/libzim/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "libzim"; - version = "7.2.0"; + version = "7.2.2"; src = fetchFromGitHub { owner = "openzim"; repo = pname; rev = version; - sha256 = "sha256-H4YUAbH4X6oJIZyhI23LemngtOtKNrHHl3KSU1ilAmo="; + sha256 = "sha256-AEhhjinnnMA4NbYL7NVHYeRZX/zfNiidbY/VeFjZuQs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/sptk/default.nix b/pkgs/development/libraries/sptk/default.nix new file mode 100644 index 0000000000000..6b62b831cb98c --- /dev/null +++ b/pkgs/development/libraries/sptk/default.nix @@ -0,0 +1,31 @@ +{ lib +, stdenv +, cmake +, fetchFromGitHub +}: + +stdenv.mkDerivation rec { + pname = "sptk"; + version = "4.0"; + + src = fetchFromGitHub { + owner = "sp-nitech"; + repo = "SPTK"; + rev = "v${version}"; + hash = "sha256-Be3Pbg+vt/P3FplZN7yBL+HVq/BmzaBcwKOBsbH7r9g="; + }; + + nativeBuildInputs = [ + cmake + ]; + + doCheck = true; + + meta = with lib; { + changelog = "https://github.com/sp-nitech/SPTK/releases/tag/v${version}"; + description = "Suite of speech signal processing tools"; + homepage = "https://github.com/sp-nitech/SPTK"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/ocaml-modules/wasm/default.nix b/pkgs/development/ocaml-modules/wasm/default.nix index 5d53d6db4186c..3af1bd00a19b4 100644 --- a/pkgs/development/ocaml-modules/wasm/default.nix +++ b/pkgs/development/ocaml-modules/wasm/default.nix @@ -1,19 +1,18 @@ { stdenv, lib, fetchFromGitHub, ocaml, findlib, ocamlbuild }: -if lib.versionOlder ocaml.version "4.03" -|| lib.versionOlder "4.13" ocaml.version +if lib.versionOlder ocaml.version "4.08" then throw "wasm is not available for OCaml ${ocaml.version}" else stdenv.mkDerivation rec { pname = "ocaml${ocaml.version}-wasm"; - version = "1.1.1"; + version = "2.0.0"; src = fetchFromGitHub { owner = "WebAssembly"; repo = "spec"; rev = "opam-${version}"; - sha256 = "1kp72yv4k176i94np0m09g10cviqp2pnpm7jmiq6ik7fmmbknk7c"; + sha256 = "sha256:09s0v79x0ymzcp2114zkm3phxavdfnkkq67qz1ndnknbkziwqf3v"; }; nativeBuildInputs = [ ocaml findlib ocamlbuild ]; diff --git a/pkgs/development/python-modules/black/default.nix b/pkgs/development/python-modules/black/default.nix index dd0a4662ce7cb..ea5cd735577e9 100644 --- a/pkgs/development/python-modules/black/default.nix +++ b/pkgs/development/python-modules/black/default.nix @@ -60,10 +60,9 @@ buildPythonPackage rec { # Fail on Hydra, see https://github.com/NixOS/nixpkgs/pull/130785 "test_bpo_2142_workaround" "test_skip_magic_trailing_comma" - ] ++ lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ - # exceeds max open files on hydra builders - "test_blackd_supported_version" ]; + # multiple tests exceed max open files on hydra builders + doCheck = !(stdenv.isLinux && stdenv.isAarch64); propagatedBuildInputs = [ aiohttp diff --git a/pkgs/development/python-modules/canonicaljson/default.nix b/pkgs/development/python-modules/canonicaljson/default.nix index d613bb9e89700..e5ecff7837f94 100644 --- a/pkgs/development/python-modules/canonicaljson/default.nix +++ b/pkgs/development/python-modules/canonicaljson/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "canonicaljson"; - version = "1.6.1"; + version = "1.6.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-qTZk9phVbb1Lq5w/xPs1g0zyU12h6gC2t3WNj+K7uCQ="; + hash = "sha256-rwC+jOnFiYV98Xa7lFlPDUOw4CfwJ6jXz4l4/bgZAko="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/dash/default.nix b/pkgs/development/python-modules/dash/default.nix index 6aaabe3c744a5..eb2e641910915 100644 --- a/pkgs/development/python-modules/dash/default.nix +++ b/pkgs/development/python-modules/dash/default.nix @@ -1,22 +1,27 @@ { lib , buildPythonPackage -, fetchFromGitHub -, plotly -, flask -, flask-compress +, celery , dash-core-components , dash-html-components , dash-table -, pytest-mock +, diskcache +, fetchFromGitHub +, flask +, flask-compress , mock -, pyyaml +, multiprocess +, plotly +, psutil +, pytest-mock , pytestCheckHook , pythonOlder +, pyyaml +, redis }: buildPythonPackage rec { pname = "dash"; - version = "2.4.1"; + version = "2.5.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -25,7 +30,7 @@ buildPythonPackage rec { owner = "plotly"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-7B1LEcEgUGJ/gDCDD4oURqli8I5YTJo9jl7l4E1aLVQ="; + hash = "sha256-Qh5oOkTxEbxXXDX+g9TDa5DiYBlMpnx0yKsn/XMfMF0="; }; propagatedBuildInputs = [ @@ -37,6 +42,18 @@ buildPythonPackage rec { dash-table ]; + passthru.optional-dependencies = { + celery = [ + celery + redis + ]; + diskcache = [ + diskcache + multiprocess + psutil + ]; + }; + checkInputs = [ pytestCheckHook pytest-mock @@ -50,12 +67,14 @@ buildPythonPackage rec { "tests/integration" ]; - pythonImportsCheck = [ "dash" ]; + pythonImportsCheck = [ + "dash" + ]; meta = with lib; { description = "Python framework for building analytical web applications"; homepage = "https://dash.plot.ly/"; license = licenses.mit; - maintainers = [ maintainers.antoinerg ]; + maintainers = with maintainers; [ antoinerg ]; }; } diff --git a/pkgs/development/python-modules/docopt-ng/default.nix b/pkgs/development/python-modules/docopt-ng/default.nix index 7a18bfbc7cfa2..60d14fa8e98f8 100644 --- a/pkgs/development/python-modules/docopt-ng/default.nix +++ b/pkgs/development/python-modules/docopt-ng/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "docopt-ng"; - version = "0.7.2"; + version = "0.8.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-hs7qAy8M+lnmB3brDPOKxzZTWBAihyMg9H3IdGeNckQ="; + sha256 = "sha256-6mphooj8hk7uayLW/iiqIC1Z/Ib60F8W/145zE6n9uM="; }; pythonImportsCheck = [ "docopt" ]; diff --git a/pkgs/development/python-modules/dulwich/default.nix b/pkgs/development/python-modules/dulwich/default.nix index 570598e1a993a..ccd816753a9ac 100644 --- a/pkgs/development/python-modules/dulwich/default.nix +++ b/pkgs/development/python-modules/dulwich/default.nix @@ -17,7 +17,7 @@ }: buildPythonPackage rec { - version = "0.20.42"; + version = "0.20.43"; pname = "dulwich"; format = "setuptools"; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-cro7YK5qVU0TMrO0CjRf6+FuxGnPYBS7RDtxmQLjPvA="; + hash = "sha256-/MIWTgE7OQqe46EJ1+97ldjeKDsueJuwfpSqMRXjKeo="; }; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/development/python-modules/fastapi-mail/default.nix b/pkgs/development/python-modules/fastapi-mail/default.nix index fabc324126696..9ce21b794927b 100644 --- a/pkgs/development/python-modules/fastapi-mail/default.nix +++ b/pkgs/development/python-modules/fastapi-mail/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "fastapi-mail"; - version = "1.0.8"; + version = "1.0.9"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -27,8 +27,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "sabuhish"; repo = pname; - rev = version; - hash = "sha256-PkA7qkdDUd7mrtvb6IbCzFRq6X0M3iKY+FKuNConJ5A="; + rev = "refs/tags/${version}"; + hash = "sha256-2Nb+FzmhsKvauT/yOCLHCEld8r+6niu9kV6EmjhC6S0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/fido2/default.nix b/pkgs/development/python-modules/fido2/default.nix index e550fe89ec78a..129d18639234e 100644 --- a/pkgs/development/python-modules/fido2/default.nix +++ b/pkgs/development/python-modules/fido2/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "fido2"; - version = "0.9.3"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "b45e89a6109cfcb7f1bb513776aa2d6408e95c4822f83a253918b944083466ec"; + sha256 = "sha256-JQmklYtmbXR/1XVN+pNX2i2BtS7cDs/3W2jOqTkVTAI="; }; propagatedBuildInputs = [ six cryptography ]; diff --git a/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix b/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix index c6f17c8d8b007..ec355d51fd076 100644 --- a/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix +++ b/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-cloud-appengine-logging"; - version = "1.1.1"; + version = "1.1.2"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-NhRQ7X17/Y79DvJT4haArrb23zzwV+XoJT9YUfjLvKc="; + hash = "sha256-undhXBAPB+3akWVu3ht0ZZBwErhmOq18TnXvloeZQjc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/inkex/default.nix b/pkgs/development/python-modules/inkex/default.nix index c1c5479dfd8ff..3f8bc99eeb6b7 100644 --- a/pkgs/development/python-modules/inkex/default.nix +++ b/pkgs/development/python-modules/inkex/default.nix @@ -1,6 +1,9 @@ { buildPythonPackage , inkscape +, cssselect , lxml +, numpy +, pygobject3 , python }: @@ -11,7 +14,10 @@ buildPythonPackage { format = "other"; propagatedBuildInputs = [ + cssselect lxml + numpy + pygobject3 ]; # We just copy the files. diff --git a/pkgs/development/python-modules/peaqevcore/default.nix b/pkgs/development/python-modules/peaqevcore/default.nix index 6f89cd6157439..519084e073e95 100644 --- a/pkgs/development/python-modules/peaqevcore/default.nix +++ b/pkgs/development/python-modules/peaqevcore/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "peaqevcore"; - version = "0.2.0"; + version = "0.3.4"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-M7jBwpo9yMggd81xiWH9SSJ1axGXiC5uQo/jnRcQ3/4="; + hash = "sha256-s2OPHA3uBoWFnEz51itif3icErYkXhayvQ3+0b6jyjE="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pre-commit-hooks/default.nix b/pkgs/development/python-modules/pre-commit-hooks/default.nix index db598b368c5b6..282dd59a05c0f 100644 --- a/pkgs/development/python-modules/pre-commit-hooks/default.nix +++ b/pkgs/development/python-modules/pre-commit-hooks/default.nix @@ -11,16 +11,16 @@ buildPythonPackage rec { pname = "pre-commit-hooks"; - version = "4.2.0"; + version = "4.3.0"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "pre-commit"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-jSu4LutEgpeAbCgSHgk6VXQKLZo00T3TrQVZxsNU1co="; + sha256 = "sha256-qdsSM+7ScSfxhmLAqwi1iraGHrhb5NBee/j+TKr2WUA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pulumi/default.nix b/pkgs/development/python-modules/pulumi/default.nix index e38157c69071c..3fb33af88958f 100644 --- a/pkgs/development/python-modules/pulumi/default.nix +++ b/pkgs/development/python-modules/pulumi/default.nix @@ -66,20 +66,19 @@ buildPythonPackage rec { black ]; - pythonImportsCheck = ["pulumi"]; - + sourceRoot="source/sdk/python/lib"; + # we apply the modifications done in the pulumi/sdk/python/Makefile + # but without the venv code postPatch = '' - cp README.md sdk/python/lib - patchShebangs . - cd sdk/python/lib - - substituteInPlace setup.py \ - --replace "{VERSION}" "${version}" + cp ../../README.md . + sed -i "s/\''${VERSION}/${version}/g" setup.py ''; # disabled because tests try to fetch go packages from the net doCheck = false; + pythonImportsCheck = ["pulumi"]; + meta = with lib; { description = "Modern Infrastructure as Code. Any cloud, any language"; homepage = "https://github.com/pulumi/pulumi"; diff --git a/pkgs/development/python-modules/pyshark/default.nix b/pkgs/development/python-modules/pyshark/default.nix index ded9bcbbc4eda..a0ba11a4a3703 100644 --- a/pkgs/development/python-modules/pyshark/default.nix +++ b/pkgs/development/python-modules/pyshark/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pyshark"; - version = "0.4.5"; + version = "0.4.6"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,8 +21,8 @@ buildPythonPackage rec { repo = pname; # 0.4.5 was the last release which was tagged # https://github.com/KimiNewt/pyshark/issues/541 - rev = "8f8f13aba6ae716aa0a48175255063fe542fdc3b"; - hash = "sha256-v9CC9hgTABAiJ0qiFZ/9/zMmHzJXKq3neGtTq/ucnT4="; + rev = "refs/tags/v${version}"; + hash = "sha256-yEpUFihETKta3+Xb8eSyTZ1uSi7ao4OqWzsCgDLLhe8="; }; sourceRoot = "${src.name}/src"; diff --git a/pkgs/development/python-modules/quantum-gateway/default.nix b/pkgs/development/python-modules/quantum-gateway/default.nix index 19b9ae22264a3..272899a6bbbde 100644 --- a/pkgs/development/python-modules/quantum-gateway/default.nix +++ b/pkgs/development/python-modules/quantum-gateway/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "quantum-gateway"; - version = "0.0.6"; + version = "0.0.8"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "cisasteelersfan"; repo = "quantum_gateway"; rev = version; - sha256 = "f2LYOr9xJSfbA/1aHfll5lg7r05o855Zkkk9HuRamP8="; + hash = "sha256-jwLfth+UaisPR0p+UHfm6qMXT2eSYWnsYEp0BqyeI9U="; }; propagatedBuildInputs = [ @@ -39,6 +39,11 @@ buildPythonPackage rec { "quantum_gateway" ]; + disabledTests = [ + # Tests require network features + "TestGateway3100" + ]; + meta = with lib; { description = "Python library for interacting with Verizon Fios Quantum gateway devices"; homepage = "https://github.com/cisasteelersfan/quantum_gateway"; diff --git a/pkgs/development/python-modules/rollbar/default.nix b/pkgs/development/python-modules/rollbar/default.nix index 7ce7dd9a950ce..93a0349b9bdc8 100644 --- a/pkgs/development/python-modules/rollbar/default.nix +++ b/pkgs/development/python-modules/rollbar/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "rollbar"; - version = "0.16.2"; + version = "0.16.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "aa3b570062dd8dfb0e11537ba858f9e1633a604680e062a525434b8245540f87"; + sha256 = "sha256-AjE9/GBxDsc2qwM9D4yWnYV6i5kc1n4MGpFiDooE7eI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix index 40bd609520f6a..ee8b773c8b853 100644 --- a/pkgs/development/python-modules/spacy/default.nix +++ b/pkgs/development/python-modules/spacy/default.nix @@ -31,14 +31,14 @@ buildPythonPackage rec { pname = "spacy"; - version = "3.3.0"; + version = "3.3.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-xJ1Q++NxWtxXQUGTZ7OaRo0lVmSEIvELb8Tt846uLLM="; + hash = "sha256-f4fb2xBNhRrmul/Tp2ouFOIuBIE1kD6YuvCFcaOqgcA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/staticjinja/default.nix b/pkgs/development/python-modules/staticjinja/default.nix index 0c1a698aa63c0..e8621d8e954dd 100644 --- a/pkgs/development/python-modules/staticjinja/default.nix +++ b/pkgs/development/python-modules/staticjinja/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "staticjinja"; - version = "4.1.2"; + version = "4.1.3"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "staticjinja"; repo = pname; rev = version; - sha256 = "0qqyadhqsn66b7qrpfj08qc899pjwfa2byqqzh73xq1n22i4cy30"; + sha256 = "sha256-w6ge5MQXNRHCM43jKnagTlbquJJys7mprgBOS2uuwHQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix index d277bf2970c2e..b070b9f117de4 100644 --- a/pkgs/development/python-modules/stripe/default.nix +++ b/pkgs/development/python-modules/stripe/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "stripe"; - version = "3.2.0"; + version = "3.3.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-2aR959ljz2mogPPQSWG3ksQPRWx04Jh4VRVV3jwiYfA="; + hash = "sha256-2sYMEC+2eorJqhZWmwr9DWO5bGK+BkCIUZ4cZhs/Ofo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/vertica-python/default.nix b/pkgs/development/python-modules/vertica-python/default.nix index 0fdd4ed6d9625..5836069d99927 100644 --- a/pkgs/development/python-modules/vertica-python/default.nix +++ b/pkgs/development/python-modules/vertica-python/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "vertica-python"; - version = "1.0.5"; + version = "1.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-m9r6P8GTehx33QO/aCuKArrpJ/ycVHWPkQ9sPc3tmeo="; + hash = "sha256-XccIN5lmrRTNAmK52XeMBZzuNOxSvXFK7COLh5lacDY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/yolink-api/default.nix b/pkgs/development/python-modules/yolink-api/default.nix index 5dcfb9030550f..17cd0d345fafd 100644 --- a/pkgs/development/python-modules/yolink-api/default.nix +++ b/pkgs/development/python-modules/yolink-api/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "yolink-api"; - version = "0.0.7"; + version = "0.0.8"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "YoSmart-Inc"; repo = pname; rev = "v${version}"; - hash = "sha256-zdCHKckt28abeJ6PQjX50e/4wOl/xx0TKFEQaUIqrYo="; + hash = "sha256-jKyugylgV9B8+PxUPsz4YtQjCfhB8NA2BYMxJOqkIP8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 886cca2de9c72..d0695e44f0fa6 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -32,14 +32,14 @@ with py.pkgs; buildPythonApplication rec { pname = "checkov"; - version = "2.0.1201"; + version = "2.0.1204"; format = "setuptools"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = version; - hash = "sha256-ZQCUYnoCaVZkXr5rZ/vkEOlADMQmj6OfZ12KBerXdmQ="; + hash = "sha256-qqTqEn11DM1W48ZYoiCacsSCA4xPLxPil43xiByEy5g="; }; nativeBuildInputs = with py.pkgs; [ diff --git a/pkgs/development/tools/apksigner/default.nix b/pkgs/development/tools/apksigner/default.nix index e7afa7189c22d..854e913dd58e8 100644 --- a/pkgs/development/tools/apksigner/default.nix +++ b/pkgs/development/tools/apksigner/default.nix @@ -23,6 +23,7 @@ stdenv.mkDerivation rec { cat >> build.gradle <<EOF apply plugin: 'application' + mainClassName = "com.android.apksigner.ApkSignerTool" sourceSets.main.java.srcDirs = [ 'src/apksigner/java', 'src/main/java' ] jar { manifest { attributes "Main-Class": "com.android.apksigner.ApkSignerTool" } diff --git a/pkgs/development/tools/goresym/default.nix b/pkgs/development/tools/goresym/default.nix index b418116896753..199d3f468f05e 100644 --- a/pkgs/development/tools/goresym/default.nix +++ b/pkgs/development/tools/goresym/default.nix @@ -21,6 +21,6 @@ buildGoModule rec { description = "Go symbol recovery tool"; homepage = "https://github.com/mandiant/GoReSym"; license = licenses.mit; - maintainers = with maintainers; [ mrhedgehog ]; + maintainers = with maintainers; [ thehedgeh0g ]; }; } diff --git a/pkgs/development/tools/metals/default.nix b/pkgs/development/tools/metals/default.nix index 4281a1d9e3916..45ea829299a08 100644 --- a/pkgs/development/tools/metals/default.nix +++ b/pkgs/development/tools/metals/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "metals"; - version = "0.11.5"; + version = "0.11.6"; deps = stdenv.mkDerivation { name = "${pname}-deps-${version}"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "sha256-kw+8688E1b7XjEb7AqOExSVu88NqPprKaCuINWqL2wk="; + outputHash = "sha256-/tFc7xAuUtx2JgEMLhGaq2FXpt7KQNMi82ODr/gTfhM="; }; nativeBuildInputs = [ makeWrapper setJavaClassPath ]; diff --git a/pkgs/development/tools/misc/kibana/6.x.nix b/pkgs/development/tools/misc/kibana/6.x.nix deleted file mode 100644 index cd81975ee4452..0000000000000 --- a/pkgs/development/tools/misc/kibana/6.x.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ elk6Version -, enableUnfree ? true -, lib, stdenv -, makeWrapper -, fetchurl -, nodejs-10_x -, coreutils -, which -}: - -with lib; -let - nodejs = nodejs-10_x; - inherit (builtins) elemAt; - info = splitString "-" stdenv.hostPlatform.system; - arch = elemAt info 0; - plat = elemAt info 1; - shas = - if enableUnfree - then { - x86_64-linux = "1a501lavxhckb3l93sbrbqyshicwkk6p89frry4x8p037xcfpy0x"; - x86_64-darwin = "0zm45af30shhcg3mdhcma6rms1hyrx62rm5jzwnz9kxv4d30skbw"; - } - else { - x86_64-linux = "0wfdipf21apyily7mvlqgyc7m5jpr96zgrryzwa854z3xb2vw8zg"; - x86_64-darwin = "1nklfx4yz6hsxlljvnvwjy7pncv9mzngl84710xad5jlyras3sdj"; - }; - -in stdenv.mkDerivation rec { - pname = "kibana${optionalString (!enableUnfree) "-oss"}"; - version = elk6Version; - - src = fetchurl { - url = "https://artifacts.elastic.co/downloads/kibana/${pname}-${version}-${plat}-${arch}.tar.gz"; - sha256 = shas.${stdenv.hostPlatform.system} or (throw "Unknown architecture"); - }; - - patches = [ - # Kibana specifies it specifically needs nodejs 10.15.2 but nodejs in nixpkgs is at 10.15.3. - # The <nixpkgs/nixos/tests/elk.nix> test succeeds with this newer version so lets just - # disable the version check. - ./disable-nodejs-version-check.patch - ]; - - nativeBuildInputs = [ makeWrapper ]; - - installPhase = '' - mkdir -p $out/libexec/kibana $out/bin - mv * $out/libexec/kibana/ - rm -r $out/libexec/kibana/node - makeWrapper $out/libexec/kibana/bin/kibana $out/bin/kibana \ - --prefix PATH : "${lib.makeBinPath [ nodejs coreutils which ]}" - sed -i 's@NODE=.*@NODE=${nodejs}/bin/node@' $out/libexec/kibana/bin/kibana - ''; - - meta = { - description = "Visualize logs and time-stamped data"; - homepage = "http://www.elasticsearch.org/overview/kibana"; - license = if enableUnfree then licenses.elastic else licenses.asl20; - maintainers = with maintainers; [ offline basvandijk ]; - platforms = with platforms; unix; - }; -} diff --git a/pkgs/development/tools/misc/pwninit/default.nix b/pkgs/development/tools/misc/pwninit/default.nix new file mode 100644 index 0000000000000..7d3808f554c08 --- /dev/null +++ b/pkgs/development/tools/misc/pwninit/default.nix @@ -0,0 +1,35 @@ +{ lib +, stdenv +, fetchFromGitHub +, rustPlatform +, openssl +, pkg-config +, xz +, Security +}: + +rustPlatform.buildRustPackage rec { + pname = "pwninit"; + version = "3.2.0"; + + src = fetchFromGitHub { + owner = "io12"; + repo = "pwninit"; + rev = version; + sha256 = "sha256-XKDYJH2SG3TkwL+FN6rXDap8la07icR0GPFiYcnOHeI="; + }; + + buildInputs = [ openssl xz ] ++ lib.optionals stdenv.isDarwin [ Security ]; + nativeBuildInputs = [ pkg-config ]; + doCheck = false; # there are no tests to run + + cargoSha256 = "sha256-2HCHiU309hbdwohUKVT3TEfGvOfxQWtEGj7FIS8OS7s="; + + meta = { + description = "Automate starting binary exploit challenges"; + homepage = "https://github.com/io12/pwninit"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.scoder12 ]; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/development/web/nodejs/v10.nix b/pkgs/development/web/nodejs/v10.nix deleted file mode 100644 index 5c107b20f4a4c..0000000000000 --- a/pkgs/development/web/nodejs/v10.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ callPackage, openssl, icu, python2, lib, stdenv, enableNpm ? true }: - -let - buildNodejs = callPackage ./nodejs.nix { - inherit openssl icu; - python = python2; - }; -in - buildNodejs { - inherit enableNpm; - version = "10.24.1"; - sha256 = "032801kg24j04xmf09m0vxzlcz86sv21s24lv9l4cfv08k1c4byp"; - patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff; - } diff --git a/pkgs/os-specific/linux/firejail/default.nix b/pkgs/os-specific/linux/firejail/default.nix index bbb3a1daab698..a8188caf18be9 100644 --- a/pkgs/os-specific/linux/firejail/default.nix +++ b/pkgs/os-specific/linux/firejail/default.nix @@ -53,6 +53,29 @@ stdenv.mkDerivation rec { # Upstream fix: https://github.com/netblue30/firejail/pull/5132 # Hopefully fixed upstream in version > 0.9.68 ./fix-opengl-support.patch + + # Fix CVE-2022-31214 by patching in 4 commits from upstream + # https://seclists.org/oss-sec/2022/q2/188 + (fetchpatch { + name = "CVE-2022-31214-patch1"; # "fixing CVE-2022-31214" + url = "https://github.com/netblue30/firejail/commit/27cde3d7d1e4e16d4190932347c7151dc2a84c50.patch"; + sha256 = "sha256-XXmnYCn4TPUvU43HifZDk4tEZQvOho9/7ehU6889nN4="; + }) + (fetchpatch { + name = "CVE-2022-31214-patch2"; # "shutdown testing" + url = "https://github.com/netblue30/firejail/commit/04ff0edf74395ddcbbcec955279c74ed9a6c0f86.patch"; + sha256 = "sha256-PV73hRlvYEQihuljSCQMNO34KJ0hDVFexhirpHcTK1I="; + }) + (fetchpatch { + name = "CVE-2022-31214-patch3"; # "CVE-2022-31214: fixing the fix" + url = "https://github.com/netblue30/firejail/commit/dab835e7a0eb287822016f5ae4e87f46e1d363e7.patch"; + sha256 = "sha256-6plBIliW/nLKR7TdGeB88eQ65JHEasnaRsP3HPXAFyA="; + }) + (fetchpatch { + name = "CVE-2022-31214-patch4"; # "CVE-2022-31214: fixing the fix, one more time " + url = "https://github.com/netblue30/firejail/commit/1884ea22a90d225950d81c804f1771b42ae55f54.patch"; + sha256 = "sha256-inkpcdC5rl5w+CTAwwQVBOELlHTXb8UGlpU+8kMY95s="; + }) ]; prePatch = '' diff --git a/pkgs/os-specific/linux/nftables/default.nix b/pkgs/os-specific/linux/nftables/default.nix index 051ca1963051b..8339eabb495ae 100644 --- a/pkgs/os-specific/linux/nftables/default.nix +++ b/pkgs/os-specific/linux/nftables/default.nix @@ -1,25 +1,25 @@ -{ lib, stdenv, fetchurl, pkg-config, bison, file, flex +{ lib, stdenv, fetchurl, pkg-config, bison, flex , asciidoc, libxslt, findXMLCatalogs, docbook_xml_dtd_45, docbook_xsl , libmnl, libnftnl, libpcap , gmp, jansson, libedit -, autoreconfHook, fetchpatch +, autoreconfHook , withDebugSymbols ? false , withPython ? false , python3 , withXtables ? true , iptables }: stdenv.mkDerivation rec { - version = "1.0.2"; + version = "1.0.4"; pname = "nftables"; src = fetchurl { url = "https://netfilter.org/projects/nftables/files/${pname}-${version}.tar.bz2"; - sha256 = "00jcjn1pl7qyqpg8pd4yhlkys7wbj4vkzgg73n27nmplzips6a0b"; + hash = "sha256-kn+x/qH2haMowQz3ketlXX4e1J0xDupcsxAd/Y1sujU="; }; nativeBuildInputs = [ autoreconfHook - pkg-config bison file flex + pkg-config bison flex asciidoc docbook_xml_dtd_45 docbook_xsl findXMLCatalogs libxslt ]; @@ -29,18 +29,6 @@ stdenv.mkDerivation rec { ] ++ lib.optional withXtables iptables ++ lib.optional withPython python3; - preConfigure = '' - substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file - ''; - - patches = [ - # fix build after 1.0.2 release, drop when updating to a newer release - (fetchpatch { - url = "https://git.netfilter.org/nftables/patch/?id=18a08fb7f0443f8bde83393bd6f69e23a04246b3"; - sha256 = "03dzhd7fhg0d20ly4rffk4ra7wlxp731892dhp8zw67jwhys9ywz"; - }) - ]; - configureFlags = [ "--with-json" "--with-cli=editline" diff --git a/pkgs/servers/dendrite/default.nix b/pkgs/servers/dendrite/default.nix index 71843ee8c7639..9a8a1a369843b 100644 --- a/pkgs/servers/dendrite/default.nix +++ b/pkgs/servers/dendrite/default.nix @@ -3,16 +3,16 @@ buildGoModule rec { pname = "matrix-dendrite"; - version = "0.8.5"; + version = "0.8.7"; src = fetchFromGitHub { owner = "matrix-org"; repo = "dendrite"; rev = "v${version}"; - sha256 = "sha256-MPWvBUI6Mqt3f5UY6lpTBwPpihW+QSNq1M3FnIff+mM="; + sha256 = "sha256-grMMD85hiJ6Ka8KU0fIAcpflFyZrPEZSZxFsGls5NEI="; }; - vendorSha256 = "sha256-OXy2xuwTLPNvBnVB6wj/YRW/XMiekjTubRRPVX9bxdQ="; + vendorSha256 = "sha256-yTlg1K0Pf1AmF227ca73gLDx12ea5yMamnOUksKGN4U="; checkInputs = [ postgresqlTestHook diff --git a/pkgs/servers/monitoring/prometheus/nats-exporter.nix b/pkgs/servers/monitoring/prometheus/nats-exporter.nix new file mode 100644 index 0000000000000..e6a838a6b017c --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/nats-exporter.nix @@ -0,0 +1,22 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "prometheus-nats-exporter"; + version = "0.9.3"; + + src = fetchFromGitHub { + owner = "nats-io"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-2+nkWwa5n7DyVitnJ8gt7b72Y6XiiLM7ddTM2Cp9/LQ="; + }; + + vendorSha256 = "sha256-bsk6htRnb4NiaJXTHNjPGN9NEy8owRJujancK3nVIsA="; + + meta = with lib; { + description = "Exporter for NATS metrics"; + homepage = "https://github.com/nats-io/prometheus-nats-exporter"; + license = licenses.asl20; + maintainers = with maintainers; [ bbigras ]; + }; +} diff --git a/pkgs/shells/fish/plugins/hydro.nix b/pkgs/shells/fish/plugins/hydro.nix index eddb88a225d20..cd8705d547166 100644 --- a/pkgs/shells/fish/plugins/hydro.nix +++ b/pkgs/shells/fish/plugins/hydro.nix @@ -15,6 +15,6 @@ buildFishPlugin rec { description = "Ultra-pure, lag-free prompt with async Git status"; homepage = "https://github.com/jorgebucaran/hydro"; license = licenses.mit; - maintainers = with maintainers; [ mrhedgehog ]; + maintainers = with maintainers; [ thehedgeh0g ]; }; } diff --git a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix index 02eb112451bd4..2665330206e1c 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix @@ -1,11 +1,16 @@ {system ? builtins.currentSystem}: let + inherit (releaseLib) lib; + releaseLib = import ../../top-level/release-lib.nix { + # We're not using any functions from release-lib.nix that look at + # supportedSystems. + supportedSystems = []; + }; + make = crossSystem: import ./make-bootstrap-tools.nix { - localSystem = { inherit system; }; - inherit crossSystem; + pkgs = releaseLib.pkgsForCross crossSystem system; }; - lib = import ../../../lib; in lib.mapAttrs (n: make) (with lib.systems.examples; { armv5tel = sheevaplug; pogoplug4 = pogoplug4; diff --git a/pkgs/tools/filesystems/xfsprogs/default.nix b/pkgs/tools/filesystems/xfsprogs/default.nix index c44157a2f026f..d24e418a08651 100644 --- a/pkgs/tools/filesystems/xfsprogs/default.nix +++ b/pkgs/tools/filesystems/xfsprogs/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "xfsprogs"; - version = "5.16.0"; + version = "5.18.0"; src = fetchurl { url = "mirror://kernel/linux/utils/fs/xfs/xfsprogs/${pname}-${version}.tar.xz"; - hash = "sha256-eLjImZmb1pBEHLU9fAKrZxKUlAMZxpT/fILiPo5Gu58="; + hash = "sha256-Ho2IAb3sjNTK02DOO70Sw1qX8ryPfIyVgNGQOw6Mw1s="; }; outputs = [ "bin" "dev" "out" "doc" ]; diff --git a/pkgs/tools/misc/mprocs/default.nix b/pkgs/tools/misc/mprocs/default.nix index 2a14f252f4ad4..a91b2a4d6acbc 100644 --- a/pkgs/tools/misc/mprocs/default.nix +++ b/pkgs/tools/misc/mprocs/default.nix @@ -2,21 +2,21 @@ rustPlatform.buildRustPackage rec { pname = "mprocs"; - version = "0.2.2"; + version = "0.4.0"; src = fetchFromGitHub { owner = "pvolok"; repo = pname; rev = "v${version}"; - sha256 = "sha256-9wac2jlh8MLggcYuEHVUPYPjhfzGN+4o1XT8B9pj4f8="; + sha256 = "sha256-IzaXcEm4eUpLWsn59ZSiIJ0mCegLhBiA3ONKI1Djemk="; }; - cargoSha256 = "sha256-vGhoM5VMJO+ppLk8DetNZ8UteU6ifdtRe1HNJ0dSB+0="; + cargoSha256 = "sha256-nTFCFmmS3IIm+D2PjvDxUKQGTn2h0ajXtxLuosa9rRY="; meta = with lib; { description = "A TUI tool to run multiple commands in parallel and show the output of each command separately"; homepage = "https://github.com/pvolok/mprocs"; license = licenses.mit; - maintainers = [ maintainers.GaetanLepage ]; + maintainers = with maintainers; [ GaetanLepage thehedgeh0g ]; }; } diff --git a/pkgs/tools/misc/zellij/default.nix b/pkgs/tools/misc/zellij/default.nix index 421c7d21d305b..a97402e7ba90a 100644 --- a/pkgs/tools/misc/zellij/default.nix +++ b/pkgs/tools/misc/zellij/default.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "zellij"; - version = "0.29.1"; + version = "0.30.0"; src = fetchFromGitHub { owner = "zellij-org"; repo = "zellij"; rev = "v${version}"; - sha256 = "sha256-KuelmMQdCazwTlolH5xvvNXZfzHQDUV6rrlk037GFb8="; + sha256 = "sha256-T2mkkE7z6AhHnn/77HcrvbY+32EOwE8jjh+veVOE1CY="; }; - cargoSha256 = "sha256-He8rMY8n15ZSF/GcbuYTx2JfZgqQnsZLfqP+lUYxnzw="; + cargoSha256 = "sha256-XTaQbMK7R43CE03niUaBzlYN4xRo7pUFdNYvUeA+MwA="; nativeBuildInputs = [ mandown @@ -61,6 +61,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://zellij.dev/"; changelog = "https://github.com/zellij-org/zellij/blob/v${version}/Changelog.md"; license = with licenses; [ mit ]; - maintainers = with maintainers; [ therealansh _0x4A6F abbe ]; + maintainers = with maintainers; [ therealansh _0x4A6F abbe thehedgeh0g ]; }; } diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index b91ee5c9ee600..1d2928f3ad6e9 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -86,16 +86,8 @@ in lib.makeExtensible (self: { }; nix_2_9 = common { - version = "2.9.0"; - sha256 = "sha256-W6aTsTpCTb+vXQEXDjnKqetOuJmEfSuK2CXvAMqwo74="; - patches = [ - # can be removed when updated to 2.9.1 - (fetchpatch { - name = "fix-segfault-in-git-fetcher"; - url = "https://github.com/NixOS/nix/commit/bc4759345538c89e1f045aaabcc0cafe4ecca12a.patch"; - sha256 = "sha256-UrfH4M7a02yfE9X3tA1Pwhw4RacBW+rShYkl7ybG64I="; - }) - ]; + version = "2.9.1"; + sha256 = "sha256-qNL3lQPBsnStkru3j1ajN/H+knXI+X3dku8/dBfSw3g="; }; stable = self.nix_2_9; diff --git a/pkgs/tools/package-management/nixpkgs-review/default.nix b/pkgs/tools/package-management/nixpkgs-review/default.nix index d21c9b3c568f8..e65d28a6af9b8 100644 --- a/pkgs/tools/package-management/nixpkgs-review/default.nix +++ b/pkgs/tools/package-management/nixpkgs-review/default.nix @@ -1,24 +1,36 @@ { lib , python3 , fetchFromGitHub -, nix + +, bubblewrap +, cacert , git +, nix + +, withSandboxSupport ? false }: python3.pkgs.buildPythonApplication rec { pname = "nixpkgs-review"; - version = "2.6.4"; + version = "2.7.0"; src = fetchFromGitHub { owner = "Mic92"; repo = "nixpkgs-review"; rev = version; - sha256 = "sha256-6vKMaCTilPXd8K3AuLqtYInVyyFhdun0o9cX1WRMmWo="; + sha256 = "sha256-hGOcLrVPb+bSNA72ZfKE9Mjm2dr/qnuaCkjveHXPcws="; }; - makeWrapperArgs = [ - "--prefix" "PATH" ":" "${lib.makeBinPath [ nix git ]}" - ]; + makeWrapperArgs = + let + binPath = [ nix git ] ++ lib.optional withSandboxSupport bubblewrap; + in + [ + "--prefix PATH : ${lib.makeBinPath binPath}" + "--set NIX_SSL_CERT_FILE ${cacert}/etc/ssl/certs/ca-bundle.crt" + # we don't have any runtime deps but nix-review shells might inject unwanted dependencies + "--unset PYTHONPATH" + ]; doCheck = false; diff --git a/pkgs/tools/security/nuclei/default.nix b/pkgs/tools/security/nuclei/default.nix index 076b907d880e8..8487d8a260509 100644 --- a/pkgs/tools/security/nuclei/default.nix +++ b/pkgs/tools/security/nuclei/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "nuclei"; - version = "2.7.1"; + version = "2.7.2"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ra8BxM+zpe5UKlJ28wc8yE5ta4ro4o2OHfmu9fBqFTA="; + sha256 = "sha256-knpsoDVDGxG85YiD7pc+XDV7BgCSpNRFRuN+qM3Gv/U="; }; - vendorSha256 = "sha256-4E9nHBaojkOwnSPxRn2JGFcQTF4WowTOtzE5zRjkqhk="; + vendorSha256 = "sha256-e17QpSXttso1crvBj0vrfuJliIDcXoXJzWt87ulSZXQ="; modRoot = "./v2"; subPackages = [ diff --git a/pkgs/tools/text/ispell/default.nix b/pkgs/tools/text/ispell/default.nix index 9a3f37cc64a55..6a004253a4f08 100644 --- a/pkgs/tools/text/ispell/default.nix +++ b/pkgs/tools/text/ispell/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ispell"; - version = "3.4.04"; + version = "3.4.05"; src = fetchurl { url = "https://www.cs.hmc.edu/~geoff/tars/${pname}-${version}.tar.gz"; - sha256 = "sha256-h7zW8FIdhaCjp4NCFZVtdOvEkxRMx8eR+HvmhyzP4T4="; + sha256 = "sha256-zwxt7eP9JfraQ3XYasr+WDy5bY/lRt50apLrtt+JVgI="; }; buildInputs = [ bison ncurses ]; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 1fc44abf1ab8b..7dfa2c64b476f 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -936,6 +936,7 @@ mapAliases ({ nmap-unfree = nmap; # Added 2021-04-06 nmap-graphical = throw "nmap graphical support has been removed due to its python2 dependency"; # Added 2022-04-26 nmap_graphical = throw "nmap graphical support has been removed due to its python2 dependency"; # Modified 2022-04-26 + nodejs-10_x = throw "nodejs-10_X has been removed. Use a newer version instead."; # Added 2022-05-31 nologin = throw "'nologin' has been renamed to/replaced by 'shadow'"; # Converted to throw 2022-02-22 nomad_1_1 = throw "nomad_1_1 has been removed because it's outdated. Use a a newer version instead"; # Added 2022-05-22 nordic-polar = throw "nordic-polar was removed on 2021-05-27, now integrated in nordic"; # Added 2021-05-27 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a3f93bdfe181c..c87c30f2b092e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7472,13 +7472,8 @@ with pkgs; kfctl = callPackage ../applications/networking/cluster/kfctl { }; - kibana6 = callPackage ../development/tools/misc/kibana/6.x.nix { }; - kibana6-oss = callPackage ../development/tools/misc/kibana/6.x.nix { - enableUnfree = false; - }; kibana7 = callPackage ../development/tools/misc/kibana/7.x.nix { }; - kibana = kibana6; - kibana-oss = kibana6-oss; + kibana = kibana7; kibi = callPackage ../applications/editors/kibi { }; @@ -7858,14 +7853,6 @@ with pkgs; nodejs-slim = nodejs-slim-16_x; - - nodejs-10_x = callPackage ../development/web/nodejs/v10.nix { - icu = icu67; - }; - nodejs-slim-10_x = callPackage ../development/web/nodejs/v10.nix { - enableNpm = false; - icu = icu67; - }; nodejs-12_x = callPackage ../development/web/nodejs/v12.nix { }; nodejs-slim-12_x = callPackage ../development/web/nodejs/v12.nix { enableNpm = false; @@ -9615,6 +9602,10 @@ with pkgs; pwndbg = callPackage ../development/tools/misc/pwndbg { }; + pwninit = callPackage ../development/tools/misc/pwninit { + inherit (darwin.apple_sdk.frameworks) Security; + }; + pycflow2dot = with python3.pkgs; toPythonApplication pycflow2dot; pydf = callPackage ../applications/misc/pydf { }; @@ -13023,6 +13014,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; + gmqcc = callPackage ../development/compilers/gmqcc {}; + gtk-server = callPackage ../development/interpreters/gtk-server {}; # Haskell and GHC @@ -22448,6 +22441,7 @@ with pkgs; prometheus-minio-exporter = callPackage ../servers/monitoring/prometheus/minio-exporter { }; prometheus-modemmanager-exporter = callPackage ../servers/monitoring/prometheus/modemmanager-exporter.nix { }; prometheus-mysqld-exporter = callPackage ../servers/monitoring/prometheus/mysqld-exporter.nix { }; + prometheus-nats-exporter = callPackage ../servers/monitoring/prometheus/nats-exporter.nix { }; prometheus-nextcloud-exporter = callPackage ../servers/monitoring/prometheus/nextcloud-exporter.nix { }; prometheus-nginx-exporter = callPackage ../servers/monitoring/prometheus/nginx-exporter.nix { }; prometheus-nginxlog-exporter = callPackage ../servers/monitoring/prometheus/nginxlog-exporter.nix { }; @@ -29571,10 +29565,14 @@ with pkgs; sptlrx = callPackage ../applications/audio/sptlrx { }; + sptk = callPackage ../development/libraries/sptk { }; + squishyball = callPackage ../applications/audio/squishyball { ncurses = ncurses5; }; + stw = callPackage ../applications/misc/stw { }; + styx = callPackage ../applications/misc/styx { }; sway-launcher-desktop = callPackage ../applications/misc/sway-launcher-desktop { }; @@ -33247,6 +33245,7 @@ with pkgs; coqPackages_8_13 coq_8_13 coqPackages_8_14 coq_8_14 coqPackages_8_15 coq_8_15 + coqPackages_8_16 coq_8_16 coqPackages coq ; diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index 6cfd34aa279b4..91894bfaa9e7f 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -151,6 +151,7 @@ in rec { coq_8_13 = mkCoq "8.13"; coq_8_14 = mkCoq "8.14"; coq_8_15 = mkCoq "8.15"; + coq_8_16 = mkCoq "8.16"; coqPackages_8_5 = mkCoqPackages coq_8_5; coqPackages_8_6 = mkCoqPackages coq_8_6; @@ -163,6 +164,7 @@ in rec { coqPackages_8_13 = mkCoqPackages coq_8_13; coqPackages_8_14 = mkCoqPackages coq_8_14; coqPackages_8_15 = mkCoqPackages coq_8_15; + coqPackages_8_16 = mkCoqPackages coq_8_16; coqPackages = recurseIntoAttrs coqPackages_8_15; coq = coqPackages.coq; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index f24b11399206f..a548d11563ae1 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -22117,10 +22117,10 @@ let TestLWPUserAgent = buildPerlPackage { pname = "Test-LWP-UserAgent"; - version = "0.034"; + version = "0.036"; src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETHER/Test-LWP-UserAgent-0.034.tar.gz"; - sha256 = "1ybhl9zpxkz77d25h96kbgh16zy9f27n95p6j9jg52kvdg0r2lbp"; + url = "mirror://cpan/authors/id/E/ET/ETHER/Test-LWP-UserAgent-0.036.tar.gz"; + sha256 = "sha256-BTJ1MNNGuAphpulD+9dJmGvcqJIRpOswHAjC0XkxThE="; }; propagatedBuildInputs = [ LWP SafeIsa namespaceclean ]; buildInputs = [ PathTiny Plack TestDeep TestFatal TestNeeds TestRequiresInternet TestWarnings ]; @@ -22128,7 +22128,6 @@ let description = "A LWP::UserAgent suitable for simulating and testing network calls"; license = with lib.licenses; [ artistic1 gpl1Plus ]; homepage = "https://github.com/karenetheridge/Test-LWP-UserAgent"; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.TestLWPUserAgent.x86_64-darwin }; }; |