diff options
89 files changed, 1080 insertions, 919 deletions
diff --git a/doc/contributing/submitting-changes.chapter.md b/doc/contributing/submitting-changes.chapter.md index ca3532ea83d..09ffba3dc6f 100644 --- a/doc/contributing/submitting-changes.chapter.md +++ b/doc/contributing/submitting-changes.chapter.md @@ -246,11 +246,21 @@ If the branch is already in a broken state, please refrain from adding extra new ### Stable release branches {#submitting-changes-stable-release-branches} -For cherry-picking a commit to a stable release branch (“backporting”), use `git cherry-pick -x <original commit>` so that the original commit id is included in the commit. +The same staging workflow applies to stable release branches, but the main branch is called `release-*` instead of `master`. -Add a reason for the backport by using `git cherry-pick -xe <original commit>` instead when it is not obvious from the original commit message. It is not needed when it's a minor version update that includes security and bug fixes but don't add new features or when the commit fixes an otherwise broken package. +Example branch names: `release-21.11`, `staging-21.11`, `staging-next-21.11`. -For backporting Pull Requests to stable branches, assign label `backport <branch>` to the original Pull Requests and automation should take care of the rest once the Pull Requests is merged. +Most changes added to the stable release branches are cherry-picked (“backported”) from the `master` and staging branches. + +#### Automatically backporting a Pull Request {#submitting-changes-stable-release-branches-automatic-backports} + +Assign label `backport <branch>` (e.g. `backport release-21.11`) to the PR and a backport PR is automatically created after the PR is merged. + +#### Manually backporting changes {#submitting-changes-stable-release-branches-manual-backports} + +Cherry-pick changes via `git cherry-pick -x <original commit>` so that the original commit id is included in the commit message. + +Add a reason for the backport when it is not obvious from the original commit message. You can do this by cherry picking with `git cherry-pick -xe <original commit>`, which allows editing the commit message. This is not needed for minor version updates that include security and bug fixes but don't add new features or when the commit fixes an otherwise broken package. Here is an example of a cherry-picked commit message with good reason description: diff --git a/pkgs/applications/blockchains/btcpayserver/default.nix b/pkgs/applications/blockchains/btcpayserver/default.nix index 725bc8f2e9c..691979c4de5 100644 --- a/pkgs/applications/blockchains/btcpayserver/default.nix +++ b/pkgs/applications/blockchains/btcpayserver/default.nix @@ -3,13 +3,13 @@ buildDotnetModule rec { pname = "btcpayserver"; - version = "1.3.6"; + version = "1.3.7"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-8SWbbdPx/cC7EWTkSbB/YqR13jaL76fFIjHPGL4rFyk="; + sha256 = "sha256-W8WRw42hMNUaQZlfrl73REGIvLcj6Vso9Axx53ENkx0="; }; projectFile = "BTCPayServer/BTCPayServer.csproj"; diff --git a/pkgs/applications/blockchains/go-ethereum/default.nix b/pkgs/applications/blockchains/go-ethereum/default.nix index 4353352ef09..e1dc572e117 100644 --- a/pkgs/applications/blockchains/go-ethereum/default.nix +++ b/pkgs/applications/blockchains/go-ethereum/default.nix @@ -9,13 +9,13 @@ let in buildGoModule rec { pname = "go-ethereum"; - version = "1.10.11"; + version = "1.10.14"; src = fetchFromGitHub { owner = "ethereum"; repo = pname; rev = "v${version}"; - sha256 = "sha256-8kPaa2wRKUQBn4LFDnc7tEbLR62f99NS1HIVDeHHzto="; + sha256 = "sha256-0DQrcei3FM+X4BYokou7dPNVCcJTbY05YsTvzdtsas8="; }; runVend = true; diff --git a/pkgs/applications/blockchains/lightning-loop/default.nix b/pkgs/applications/blockchains/lightning-loop/default.nix index f33b005cdd9..85ec49f3be5 100644 --- a/pkgs/applications/blockchains/lightning-loop/default.nix +++ b/pkgs/applications/blockchains/lightning-loop/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "lightning-loop"; - version = "0.15.0-beta"; + version = "0.16.0-beta"; src = fetchFromGitHub { owner = "lightninglabs"; repo = "loop"; rev = "v${version}"; - sha256 = "1yjc04jiam3836w7vn3b1jqj1dq1k8wwfnccir0vh29cn6v0cf63"; + sha256 = "0q4lk338mr30frilgnjr43gd55z7ryj2s260437b4pnp03hmbf10"; }; - vendorSha256 = "0c3ly0s438sr9iql2ps4biaswphp7dfxshddyw5fcm0ajqzvhrmw"; + vendorSha256 = "14862603rrss14p537j9i7iwflaaprwrnslmqm9hpb7hj52bxqfv"; subPackages = [ "cmd/loop" "cmd/loopd" ]; diff --git a/pkgs/applications/blockchains/lightning-pool/default.nix b/pkgs/applications/blockchains/lightning-pool/default.nix index f33ede49398..ccb65fb0fd8 100644 --- a/pkgs/applications/blockchains/lightning-pool/default.nix +++ b/pkgs/applications/blockchains/lightning-pool/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "lightning-pool"; - version = "0.5.1-alpha"; + version = "0.5.3-alpha"; src = fetchFromGitHub { owner = "lightninglabs"; repo = "pool"; rev = "v${version}"; - sha256 = "147s0p4arfxl2akzm267p8zfy6hgssym5rwxv78kp8i39mfinpkn"; + sha256 = "1nc3hksk9qcxrsyqpz9vcfc8x093rc8yx8ppfk177j9fhdnn8bk7"; }; - vendorSha256 = "0zd3bwqi0hnk0562x9hd62cwjw1xj386m83jagg41kzz0cpcr7zl"; + vendorSha256 = "09yxaa74814l1rp0arqhqpplr2j0p8dj81zqcbxlwp5ckjv9r2za"; subPackages = [ "cmd/pool" "cmd/poold" ]; diff --git a/pkgs/applications/blockchains/nbxplorer/util/update-common.sh b/pkgs/applications/blockchains/nbxplorer/util/update-common.sh index ed507622240..8899bdd181d 100755 --- a/pkgs/applications/blockchains/nbxplorer/util/update-common.sh +++ b/pkgs/applications/blockchains/nbxplorer/util/update-common.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p coreutils curl jq common-updater-scripts dotnet-sdk_3 git gnupg nix +#!nix-shell -i bash -p coreutils curl jq common-updater-scripts dotnet-sdk_3 git gnupg nixFlakes set -euo pipefail # This script uses the following env vars: @@ -17,7 +17,7 @@ scriptDir=$(cd "${BASH_SOURCE[0]%/*}" && pwd) nixpkgs=$(realpath "$scriptDir"/../../../../..) evalNixpkgs() { - nix eval --raw "(with import \"$nixpkgs\" {}; $1)" + nix eval --impure --raw --expr "(with import \"$nixpkgs\" {}; $1)" } getRepo() { diff --git a/pkgs/applications/misc/openrgb/default.nix b/pkgs/applications/misc/openrgb/default.nix index eeff215679a..284339b13ee 100644 --- a/pkgs/applications/misc/openrgb/default.nix +++ b/pkgs/applications/misc/openrgb/default.nix @@ -1,18 +1,18 @@ -{ lib, mkDerivation, fetchFromGitLab, qmake, libusb1, hidapi, pkg-config, coreutils }: +{ lib, mkDerivation, fetchFromGitLab, qmake, libusb1, hidapi, pkg-config, coreutils, mbedtls }: mkDerivation rec { pname = "openrgb"; - version = "0.6"; + version = "0.7"; src = fetchFromGitLab { owner = "CalcProgrammer1"; repo = "OpenRGB"; rev = "release_${version}"; - sha256 = "sha256-x/wGD39Jm/kmcTEZP3BnLXxyv/jkPOJd6mLCO0dp5wM="; + sha256 = "0xhfaz0b74nfnh7il2cz5c0338xlzay00g6hc2h3lsncarj8d5n7"; }; nativeBuildInputs = [ qmake pkg-config ]; - buildInputs = [ libusb1 hidapi ]; + buildInputs = [ libusb1 hidapi mbedtls ]; installPhase = '' runHook preInstall diff --git a/pkgs/applications/networking/browsers/elinks/default.nix b/pkgs/applications/networking/browsers/elinks/default.nix index dbe25ea06a9..84f46f1b60d 100644 --- a/pkgs/applications/networking/browsers/elinks/default.nix +++ b/pkgs/applications/networking/browsers/elinks/default.nix @@ -13,13 +13,13 @@ assert enablePython -> python != null; stdenv.mkDerivation rec { pname = "elinks"; - version = "0.14.3"; + version = "0.15.0"; src = fetchFromGitHub { owner = "rkd77"; repo = "felinks"; rev = "v${version}"; - sha256 = "sha256-vyzuMU2Qfz8DMRP0+QQmSx8J40ADTMJqg2jQOZJQxUA="; + sha256 = "sha256-2TF0rbmjwhwV2AVUXjfzoprzpeqrETis3AFhMftpaZQ="; }; buildInputs = [ diff --git a/pkgs/applications/networking/cluster/kubeone/default.nix b/pkgs/applications/networking/cluster/kubeone/default.nix index 2a507f41430..2b9ca9df049 100644 --- a/pkgs/applications/networking/cluster/kubeone/default.nix +++ b/pkgs/applications/networking/cluster/kubeone/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "kubeone"; - version = "1.3.2"; + version = "1.3.3"; src = fetchFromGitHub { owner = "kubermatic"; repo = "kubeone"; rev = "v${version}"; - sha256 = "sha256-Y0IlTOAfwEp8WkFpXSS02vEhCM4+juAY+Nx/e9Vv0F0="; + sha256 = "sha256-IgV1ULxwL17ECsm7MdRfQERcEVy9cEft2L7fHP3XCKo="; }; vendorSha256 = "sha256-/rhV7JHuqejCTizcjKIkaJlbRcx7AfMcGqQYo6dlg48="; diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index c5dc39c69d7..293192908b2 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -10,7 +10,7 @@ assert withQt -> qt5 != null; with lib; let - version = "3.4.10"; + version = "3.6.1"; variant = if withQt then "qt" else "cli"; in stdenv.mkDerivation { @@ -20,7 +20,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "https://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz"; - sha256 = "sha256-iqfvSkSuYruNtGPPdh4swDuXMF4Od+1b5T+oNykYfO8="; + sha256 = "sha256-BDTtqPtr+I4rQqZ+tdHeJUpn1QW+w7tR/unXyteSWjg="; }; cmakeFlags = [ @@ -67,18 +67,18 @@ in stdenv.mkDerivation { done done '' else optionalString withQt '' - install -Dm644 -t $out/share/applications ../wireshark.desktop + install -Dm644 -t $out/share/applications ../org.wireshark.Wireshark.desktop install -Dm644 ../image/wsicon.svg $out/share/icons/wireshark.svg - mkdir $dev/include/{epan/{wmem,ftypes,dfilter},wsutil,wiretap} -pv + mkdir $dev/include/{epan/{wmem,ftypes,dfilter},wsutil/wmem,wiretap} -pv cp config.h $dev/include/wireshark/ cp ../ws_*.h $dev/include cp ../epan/*.h $dev/include/epan/ - cp ../epan/wmem/*.h $dev/include/epan/wmem/ cp ../epan/ftypes/*.h $dev/include/epan/ftypes/ cp ../epan/dfilter/*.h $dev/include/epan/dfilter/ cp ../wsutil/*.h $dev/include/wsutil/ + cp ../wsutil/wmem/*.h $dev/include/wsutil/wmem/ cp ../wiretap/*.h $dev/include/wiretap ''); diff --git a/pkgs/applications/networking/sniffers/wireshark/wireshark-lookup-dumpcap-in-path.patch b/pkgs/applications/networking/sniffers/wireshark/wireshark-lookup-dumpcap-in-path.patch index 549da5436e6..5829457375f 100644 --- a/pkgs/applications/networking/sniffers/wireshark/wireshark-lookup-dumpcap-in-path.patch +++ b/pkgs/applications/networking/sniffers/wireshark/wireshark-lookup-dumpcap-in-path.patch @@ -11,16 +11,18 @@ Also change execv() to execvp() because we've set argv[0] to "dumpcap" and have to enable PATH lookup. Wireshark is not a setuid program, so looking in PATH is not a security issue. +EDITED by teto for wireshark 3.6 + Signed-off-by: Franz Pletz <fpletz@fnordicwalking.de> --- capchild/capture_sync.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/capchild/capture_sync.c b/capchild/capture_sync.c -index 970688e..49914d5 100644 ---- a/capchild/capture_sync.c -+++ b/capchild/capture_sync.c -@@ -332,7 +332,18 @@ init_pipe_args(int *argc) { +index f31914886a..df29b6f0ab 100644 +--- a/capture/capture_sync.c ++++ b/capture/capture_sync.c +@@ -187,7 +187,18 @@ init_pipe_args(int *argc) { #ifdef _WIN32 exename = g_strdup_printf("%s\\dumpcap.exe", progfile_dir); #else @@ -40,7 +42,7 @@ index 970688e..49914d5 100644 #endif /* Make that the first argument in the argument list (argv[0]). */ -@@ -729,7 +740,7 @@ sync_pipe_start(capture_options *capture_opts, capture_session *cap_session, voi +@@ -572,7 +583,7 @@ sync_pipe_start(capture_options *capture_opts, capture_session *cap_session, inf */ dup2(sync_pipe[PIPE_WRITE], 2); ws_close(sync_pipe[PIPE_READ]); @@ -49,7 +51,7 @@ index 970688e..49914d5 100644 g_snprintf(errmsg, sizeof errmsg, "Couldn't run %s in child process: %s", argv[0], g_strerror(errno)); sync_pipe_errmsg_to_parent(2, errmsg, ""); -@@ -997,7 +1008,7 @@ sync_pipe_open_command(char** argv, int *data_read_fd, +@@ -811,7 +822,7 @@ sync_pipe_open_command(char* const argv[], int *data_read_fd, dup2(sync_pipe[PIPE_WRITE], 2); ws_close(sync_pipe[PIPE_READ]); ws_close(sync_pipe[PIPE_WRITE]); @@ -58,6 +60,3 @@ index 970688e..49914d5 100644 g_snprintf(errmsg, sizeof errmsg, "Couldn't run %s in child process: %s", argv[0], g_strerror(errno)); sync_pipe_errmsg_to_parent(2, errmsg, ""); --- -2.6.3 - diff --git a/pkgs/applications/radio/gqrx/default.nix b/pkgs/applications/radio/gqrx/default.nix index 3e19dc2befb..a653762b538 100644 --- a/pkgs/applications/radio/gqrx/default.nix +++ b/pkgs/applications/radio/gqrx/default.nix @@ -24,13 +24,13 @@ assert !(pulseaudioSupport && portaudioSupport); gnuradio3_8Minimal.pkgs.mkDerivation rec { pname = "gqrx"; - version = "2.15"; + version = "2.15.1"; src = fetchFromGitHub { owner = "gqrx-sdr"; repo = "gqrx"; rev = "v${version}"; - sha256 = "sha256-m3YV5Hbu5+3eS+LOy+x6HjpdiJo1iObbeEKuQXXmAak="; + sha256 = "sha256-OL83l3A27rggfGbfLT1CUaPAQHEKXgoGS1jYJZ9eHPQ="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix index f54dcb94e23..0963b4c17e0 100644 --- a/pkgs/applications/science/astronomy/stellarium/default.nix +++ b/pkgs/applications/science/astronomy/stellarium/default.nix @@ -6,13 +6,13 @@ mkDerivation rec { pname = "stellarium"; - version = "0.21.2"; + version = "0.21.3"; src = fetchFromGitHub { owner = "Stellarium"; repo = "stellarium"; rev = "v${version}"; - sha256 = "sha256-bh00o++l3sqELX5kgRhiCcQOLVqvjEyEMcJTnnVPNU8="; + sha256 = "sha256-TQMLy5ziBF7YqPDzPwgjY5FHxxMUe7MXo/TGxQ1nGcg="; }; nativeBuildInputs = [ cmake perl wrapQtAppsHook ]; diff --git a/pkgs/applications/science/chemistry/jmol/default.nix b/pkgs/applications/science/chemistry/jmol/default.nix index b379439916f..20b665792ac 100644 --- a/pkgs/applications/science/chemistry/jmol/default.nix +++ b/pkgs/applications/science/chemistry/jmol/default.nix @@ -17,14 +17,14 @@ let }; in stdenv.mkDerivation rec { - version = "14.32.2"; + version = "14.32.6"; pname = "jmol"; src = let baseVersion = "${lib.versions.major version}.${lib.versions.minor version}"; in fetchurl { url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz"; - sha256 = "sha256-JETS1mxlDyWPC8ngtmYujmfWIdrW9HzkqpX/VZpIMBE="; + sha256 = "sha256-b9E/IJfqeA8rBSQogb/ZVBMW3y9bc2dBj/BIl0HWFR8="; }; patchPhase = '' diff --git a/pkgs/applications/science/math/singular/default.nix b/pkgs/applications/science/math/singular/default.nix index df298aab211..b543252e871 100644 --- a/pkgs/applications/science/math/singular/default.nix +++ b/pkgs/applications/science/math/singular/default.nix @@ -47,12 +47,13 @@ stdenv.mkDerivation rec { }; patches = [ + # fix timeouts when docbuilding with >= 64 cpus + # https://github.com/Singular/Singular/issues/1117 + ./vspace-MAX_PROCESS.patch + # add aarch64 support to cpu-check.m4. copied from redhat. ./redhat-aarch64.patch - # vspace causes hangs in modstd and other libraries on aarch64 - ./disable-vspace-on-aarch64.patch - # the newest version of ax-prog-cc-for-build.m4 seems to trigger # linker errors. see # https://github.com/alsa-project/alsa-firmware/issues/3 for a diff --git a/pkgs/applications/science/math/singular/disable-vspace-on-aarch64.patch b/pkgs/applications/science/math/singular/disable-vspace-on-aarch64.patch deleted file mode 100644 index 3e51b7fb2ce..00000000000 --- a/pkgs/applications/science/math/singular/disable-vspace-on-aarch64.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/kernel/mod2.h b/kernel/mod2.h -index 867fcae47..2abd84f23 100644 ---- a/kernel/mod2.h -+++ b/kernel/mod2.h -@@ -60,8 +60,10 @@ - - /* define for parallel processes with shared memory */ - #ifndef __CCYGWIN__ -+#ifndef SI_CPU_AARCH64 - #define HAVE_VSPACE 1 - #endif -+#endif - - /*#define PROFILING*/ - #ifdef PROFILING diff --git a/pkgs/applications/science/math/singular/vspace-MAX_PROCESS.patch b/pkgs/applications/science/math/singular/vspace-MAX_PROCESS.patch new file mode 100644 index 00000000000..78d658f926e --- /dev/null +++ b/pkgs/applications/science/math/singular/vspace-MAX_PROCESS.patch @@ -0,0 +1,35 @@ +diff --git a/kernel/GBEngine/kChinese.cc b/kernel/GBEngine/kChinese.cc +index 829a66609..84655caf2 100644 +--- a/kernel/GBEngine/kChinese.cc ++++ b/kernel/GBEngine/kChinese.cc +@@ -209,6 +209,8 @@ ideal id_ChineseRemainder_0(ideal *xx, number *q, int rl, const ring r) + return NULL; + } + int cpus=(int)(long)feOptValue(FE_OPT_CPUS); ++ if (cpus>=vspace::internals::MAX_PROCESS) ++ cpus=vspace::internals::MAX_PROCESS-1; + if ((cpus==1) || (2*cpus>=cnt)) + /* at least 2 polys for each process, or switch to seriell version */ + return id_ChineseRemainder(xx,q,rl,r); +@@ -295,6 +297,8 @@ ideal id_Farey_0(ideal x, number N, const ring r) + { + int cnt=IDELEMS(x)*x->nrows; + int cpus=(int)(long)feOptValue(FE_OPT_CPUS); ++ if (cpus>=vspace::internals::MAX_PROCESS) ++ cpus=vspace::internals::MAX_PROCESS-1; + if (2*cpus>=cnt) /* at least 2 polys for each process, + or switch to seriell version */ + return id_Farey(x,N,r); +diff --git a/kernel/GBEngine/kverify.cc b/kernel/GBEngine/kverify.cc +index 909d84994..aa06d6624 100644 +--- a/kernel/GBEngine/kverify.cc ++++ b/kernel/GBEngine/kverify.cc +@@ -176,6 +176,8 @@ BOOLEAN kVerify2(ideal F, ideal Q) + /*---------------------------------------------------------------------*/ + BOOLEAN all_okay=TRUE; + int cpus=(int)(long)feOptValue(FE_OPT_CPUS); ++ if (cpus>=vspace::internals::MAX_PROCESS) ++ cpus=vspace::internals::MAX_PROCESS-1; + int parent_pid=getpid(); + using namespace vspace; + vmem_init(); diff --git a/pkgs/applications/version-management/git-and-tools/git-chglog/default.nix b/pkgs/applications/version-management/git-and-tools/git-chglog/default.nix index 143ab6cac9d..b427acf960e 100644 --- a/pkgs/applications/version-management/git-and-tools/git-chglog/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-chglog/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "git-chglog"; - version = "0.15.0"; + version = "0.15.1"; src = fetchFromGitHub { owner = "git-chglog"; repo = "git-chglog"; rev = "v${version}"; - sha256 = "sha256-BiTnPCgymfpPxuy0i8u7JbpbEBeaSIJaikjwsPSA3qc="; + sha256 = "sha256-UlhJ004ceXpdB/9296cL2sbBYsjV8D+3YS1vmFgnko8="; }; - vendorSha256 = "sha256-jIq+oacyT71m78iMZwWOBsBVAY/WxgyH9zRr8GiMGTU="; + vendorSha256 = "sha256-FLFPcmkrhZ+/UX1xpexsDv3cgC/Ocj4qTFJOX+rmdyQ="; ldflags = [ "-s" "-w" "-X=main.Version=v${version}" ]; diff --git a/pkgs/applications/video/kodi/addons/inputstream-rtmp/default.nix b/pkgs/applications/video/kodi/addons/inputstream-rtmp/default.nix index eb53aee68bb..0e3d06c3be5 100644 --- a/pkgs/applications/video/kodi/addons/inputstream-rtmp/default.nix +++ b/pkgs/applications/video/kodi/addons/inputstream-rtmp/default.nix @@ -3,13 +3,13 @@ buildKodiBinaryAddon rec { pname = "inputstream-rtmp"; namespace = "inputstream.rtmp"; - version = "19.0.0"; + version = "19.0.1"; src = fetchFromGitHub { owner = "xbmc"; repo = "inputstream.rtmp"; rev = "${version}-${rel}"; - sha256 = "sha256-76yGttcLJJ5XJKsFJ3GnEuPs9+9J0Tr8Znm45676OI8="; + sha256 = "sha256-BNc9HJ4Yq1WTxTr7AUHBB9yDz8oefy2EtFRwVYVGcaY="; }; extraBuildInputs = [ openssl rtmpdump zlib ]; diff --git a/pkgs/applications/video/xine-ui/default.nix b/pkgs/applications/video/xine-ui/default.nix index 87b975e80fb..3d44796f78c 100644 --- a/pkgs/applications/video/xine-ui/default.nix +++ b/pkgs/applications/video/xine-ui/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { pname = "xine-ui"; - version = "0.99.12"; + version = "0.99.13"; src = fetchurl { url = "mirror://sourceforge/xine/${pname}-${version}.tar.xz"; - sha256 = "10zmmss3hm8gjjyra20qhdc0lb1m6sym2nb2w62bmfk8isfw9gsl"; + sha256 = "sha256-sjgtB1xysbEAOeDpAxDMhsjZEDWMU1We2C09WEIB9cU="; }; nativeBuildInputs = [ diff --git a/pkgs/build-support/build-dotnet-module/default.nix b/pkgs/build-support/build-dotnet-module/default.nix index c8b65f546ac..0a5b17a4a36 100644 --- a/pkgs/build-support/build-dotnet-module/default.nix +++ b/pkgs/build-support/build-dotnet-module/default.nix @@ -117,40 +117,42 @@ let DOTNET_NOLOGO = true; # This disables the welcome message. DOTNET_CLI_TELEMETRY_OPTOUT = true; - passthru.fetch-deps = args.passthru.fetch-deps or writeScript "fetch-${args.pname}-deps" '' - set -euo pipefail - cd "$(dirname "''${BASH_SOURCE[0]}")" - - export HOME=$(mktemp -d) - deps_file="/tmp/${args.pname}-deps.nix" - - store_src="${package.src}" - src="$(mktemp -d /tmp/${args.pname}.XXX)" - cp -rT "$store_src" "$src" - chmod -R +w "$src" - - trap "rm -rf $src $HOME" EXIT - pushd "$src" - - export DOTNET_NOLOGO=1 - export DOTNET_CLI_TELEMETRY_OPTOUT=1 - - mkdir -p "$HOME/nuget_pkgs" - - for project in "${lib.concatStringsSep "\" \"" ((lib.toList projectFile) ++ lib.optionals (testProjectFile != "") (lib.toList testProjectFile))}"; do - ${dotnet-sdk}/bin/dotnet restore "$project" \ - ${lib.optionalString (!enableParallelBuilding) "--disable-parallel"} \ - -p:ContinuousIntegrationBuild=true \ - -p:Deterministic=true \ - --packages "$HOME/nuget_pkgs" \ - "''${dotnetRestoreFlags[@]}" \ - "''${dotnetFlags[@]}" - done - - echo "Writing lockfile..." - ${nuget-to-nix}/bin/nuget-to-nix "$HOME/nuget_pkgs" > "$deps_file" - echo "Succesfully wrote lockfile to: $deps_file" - ''; + passthru = { + fetch-deps = writeScript "fetch-${args.pname}-deps" '' + set -euo pipefail + cd "$(dirname "''${BASH_SOURCE[0]}")" + + export HOME=$(mktemp -d) + deps_file="/tmp/${args.pname}-deps.nix" + + store_src="${package.src}" + src="$(mktemp -d /tmp/${args.pname}.XXX)" + cp -rT "$store_src" "$src" + chmod -R +w "$src" + + trap "rm -rf $src $HOME" EXIT + pushd "$src" + + export DOTNET_NOLOGO=1 + export DOTNET_CLI_TELEMETRY_OPTOUT=1 + + mkdir -p "$HOME/nuget_pkgs" + + for project in "${lib.concatStringsSep "\" \"" ((lib.toList projectFile) ++ lib.optionals (testProjectFile != "") (lib.toList testProjectFile))}"; do + ${dotnet-sdk}/bin/dotnet restore "$project" \ + ${lib.optionalString (!enableParallelBuilding) "--disable-parallel"} \ + -p:ContinuousIntegrationBuild=true \ + -p:Deterministic=true \ + --packages "$HOME/nuget_pkgs" \ + "''${dotnetRestoreFlags[@]}" \ + "''${dotnetFlags[@]}" + done + + echo "Writing lockfile..." + ${nuget-to-nix}/bin/nuget-to-nix "$HOME/nuget_pkgs" > "$deps_file" + echo "Succesfully wrote lockfile to: $deps_file" + ''; + } // args.passthru or {}; configurePhase = args.configurePhase or '' runHook preConfigure diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix index d63c6ff0596..11b5f58a12d 100644 --- a/pkgs/development/compilers/elm/default.nix +++ b/pkgs/development/compilers/elm/default.nix @@ -1,10 +1,13 @@ { lib, stdenv, pkgs -, haskell, haskellPackages, nodejs +, haskell, haskellPackages, nodejs-14_x , fetchurl, fetchpatch, makeWrapper, writeScriptBin # Rust dependecies , curl, rustPlatform, openssl, pkg-config, Security, darwin }: let + # To controll nodejs version we pass down + nodejs = nodejs-14_x; + fetchElmDeps = import ./fetchElmDeps.nix { inherit stdenv lib fetchurl; }; hsPkgs = haskellPackages.override { diff --git a/pkgs/development/compilers/elm/packages/generate-node-packages.sh b/pkgs/development/compilers/elm/packages/generate-node-packages.sh index 0ffa56eae90..49e697e43e8 100755 --- a/pkgs/development/compilers/elm/packages/generate-node-packages.sh +++ b/pkgs/development/compilers/elm/packages/generate-node-packages.sh @@ -4,9 +4,7 @@ ROOT="$(realpath "$(dirname -- "$(readlink -f -- "${BASH_SOURCE[0]}")")"/../../. set -eu -o pipefail -rm -f node-env.nix $(nix-build $ROOT -A nodePackages.node2nix --no-out-link)/bin/node2nix \ - --nodejs-12 \ -i node-packages.json \ -o node-packages.nix \ -c node-composition.nix \ diff --git a/pkgs/development/compilers/elm/packages/node-packages.nix b/pkgs/development/compilers/elm/packages/node-packages.nix index c2b5c5a07dc..083ab8530d8 100644 --- a/pkgs/development/compilers/elm/packages/node-packages.nix +++ b/pkgs/development/compilers/elm/packages/node-packages.nix @@ -49,13 +49,13 @@ let sha512 = "eTAlQKq65zHfkHZV0sIVODCPGVgoo1HdBlbSLi9CqOzuZanMv2ihzY+4paiKr1mH+XmYESMAmJ/dpZ68eN6d8w=="; }; }; - "@babel/generator-7.16.0" = { + "@babel/generator-7.16.5" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; - version = "7.16.0"; + version = "7.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.16.0.tgz"; - sha512 = "RR8hUCfRQn9j9RPKEVXo9LiwoxLPYn6hNZlvUOR8tSnaxlD0p0+la00ZP9/SnRt6HchKr+X0fO2r8vrETiJGew=="; + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.16.5.tgz"; + sha512 = "kIvCdjZqcdKqoDbVVdt5R99icaRtrtYhYK/xux5qiWCBmfdvEYMFZ68QCrpE5cbFM1JsuArUNs1ZkuKtTtUcZA=="; }; }; "@babel/helper-annotate-as-pure-7.16.0" = { @@ -67,13 +67,13 @@ let sha512 = "ItmYF9vR4zA8cByDocY05o0LGUkp1zhbTQOH1NFyl5xXEqlTJQCEJjieriw+aFpxo16swMxUnUiKS7a/r4vtHg=="; }; }; - "@babel/helper-builder-binary-assignment-operator-visitor-7.16.0" = { + "@babel/helper-builder-binary-assignment-operator-visitor-7.16.5" = { name = "_at_babel_slash_helper-builder-binary-assignment-operator-visitor"; packageName = "@babel/helper-builder-binary-assignment-operator-visitor"; - version = "7.16.0"; + version = "7.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.16.0.tgz"; - sha512 = "9KuleLT0e77wFUku6TUkqZzCEymBdtuQQ27MhEKzf9UOOJu3cYj98kyaDAzxpC7lV6DGiZFuC8XqDsq8/Kl6aQ=="; + url = "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.16.5.tgz"; + sha512 = "3JEA9G5dmmnIWdzaT9d0NmFRgYnWUThLsDaL7982H0XqqWr56lRrsmwheXFMjR+TMl7QMBb6mzy9kvgr1lRLUA=="; }; }; "@babel/helper-compilation-targets-7.16.3" = { @@ -85,13 +85,13 @@ let sha512 = "vKsoSQAyBmxS35JUOOt+07cLc6Nk/2ljLIHwmq2/NM6hdioUaqEXq/S+nXvbvXbZkNDlWOymPanJGOc4CBjSJA=="; }; }; - "@babel/helper-create-class-features-plugin-7.16.0" = { + "@babel/helper-create-class-features-plugin-7.16.5" = { name = "_at_babel_slash_helper-create-class-features-plugin"; packageName = "@babel/helper-create-class-features-plugin"; - version = "7.16.0"; + version = "7.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.16.0.tgz"; - sha512 = "XLwWvqEaq19zFlF5PTgOod4bUA+XbkR4WLQBct1bkzmxJGB0ZEJaoKF4c8cgH9oBtCDuYJ8BP5NB9uFiEgO5QA=="; + url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.16.5.tgz"; + sha512 = "NEohnYA7mkB8L5JhU7BLwcBdU3j83IziR9aseMueWGeAjblbul3zzb8UvJ3a1zuBiqCMObzCJHFqKIQE6hTVmg=="; }; }; "@babel/helper-create-regexp-features-plugin-7.16.0" = { @@ -103,6 +103,15 @@ let sha512 = "3DyG0zAFAZKcOp7aVr33ddwkxJ0Z0Jr5V99y3I690eYLpukJsJvAbzTy1ewoCqsML8SbIrjH14Jc/nSQ4TvNPA=="; }; }; + "@babel/helper-environment-visitor-7.16.5" = { + name = "_at_babel_slash_helper-environment-visitor"; + packageName = "@babel/helper-environment-visitor"; + version = "7.16.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.16.5.tgz"; + sha512 = "ODQyc5AnxmZWm/R2W7fzhamOk1ey8gSguo5SGvF0zcB3uUzRpTRmM/jmLSm9bDMyPlvbyJ+PwPEK0BWIoZ9wjg=="; + }; + }; "@babel/helper-explode-assignable-expression-7.16.0" = { name = "_at_babel_slash_helper-explode-assignable-expression"; packageName = "@babel/helper-explode-assignable-expression"; @@ -139,13 +148,13 @@ let sha512 = "1AZlpazjUR0EQZQv3sgRNfM9mEVWPK3M6vlalczA+EECcPz3XPh6VplbErL5UoMpChhSck5wAJHthlj1bYpcmg=="; }; }; - "@babel/helper-member-expression-to-functions-7.16.0" = { + "@babel/helper-member-expression-to-functions-7.16.5" = { name = "_at_babel_slash_helper-member-expression-to-functions"; packageName = "@babel/helper-member-expression-to-functions"; - version = "7.16.0"; + version = "7.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.16.0.tgz"; - sha512 = "bsjlBFPuWT6IWhl28EdrQ+gTvSvj5tqVP5Xeftp07SEuz5pLnsXZuDkDD3Rfcxy0IsHmbZ+7B2/9SHzxO0T+sQ=="; + url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.16.5.tgz"; + sha512 = "7fecSXq7ZrLE+TWshbGT+HyCLkxloWNhTbU2QM1NTI/tDqyf0oZiMcEfYtDuUDCo528EOlt39G1rftea4bRZIw=="; }; }; "@babel/helper-module-imports-7.16.0" = { @@ -157,13 +166,13 @@ let sha512 = "kkH7sWzKPq0xt3H1n+ghb4xEMP8k0U7XV3kkB+ZGy69kDk2ySFW1qPi06sjKzFY3t1j6XbJSqr4mF9L7CYVyhg=="; }; }; - "@babel/helper-module-transforms-7.16.0" = { + "@babel/helper-module-transforms-7.16.5" = { name = "_at_babel_slash_helper-module-transforms"; packageName = "@babel/helper-module-transforms"; - version = "7.16.0"; + version = "7.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.16.0.tgz"; - sha512 = "My4cr9ATcaBbmaEa8M0dZNA74cfI6gitvUAskgDtAFmAqyFKDSHQo5YstxPbN+lzHl2D9l/YOEFqb2mtUh4gfA=="; + url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.16.5.tgz"; + sha512 = "CkvMxgV4ZyyioElFwcuWnDCcNIeyqTkCm9BxXZi73RR1ozqlpboqsbGUNvRTflgZtFbbJ1v5Emvm+lkjMYY/LQ=="; }; }; "@babel/helper-optimise-call-expression-7.16.0" = { @@ -175,31 +184,31 @@ let sha512 = "SuI467Gi2V8fkofm2JPnZzB/SUuXoJA5zXe/xzyPP2M04686RzFKFHPK6HDVN6JvWBIEW8tt9hPR7fXdn2Lgpw=="; }; }; - "@babel/helper-plugin-utils-7.14.5" = { + "@babel/helper-plugin-utils-7.16.5" = { name = "_at_babel_slash_helper-plugin-utils"; packageName = "@babel/helper-plugin-utils"; - version = "7.14.5"; + version = "7.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.14.5.tgz"; - sha512 = "/37qQCE3K0vvZKwoK4XU/irIJQdIfCJuhU5eKnNxpFDsOkgFaUAwbv+RYw6eYgsC0E4hS7r5KqGULUogqui0fQ=="; + url = "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.16.5.tgz"; + sha512 = "59KHWHXxVA9K4HNF4sbHCf+eJeFe0Te/ZFGqBT4OjXhrwvA04sGfaEGsVTdsjoszq0YTP49RC9UKe5g8uN2RwQ=="; }; }; - "@babel/helper-remap-async-to-generator-7.16.4" = { + "@babel/helper-remap-async-to-generator-7.16.5" = { name = "_at_babel_slash_helper-remap-async-to-generator"; packageName = "@babel/helper-remap-async-to-generator"; - version = "7.16.4"; + version = "7.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.16.4.tgz"; - sha512 = "vGERmmhR+s7eH5Y/cp8PCVzj4XEjerq8jooMfxFdA5xVtAk9Sh4AQsrWgiErUEBjtGrBtOFKDUcWQFW4/dFwMA=="; + url = "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.16.5.tgz"; + sha512 = "X+aAJldyxrOmN9v3FKp+Hu1NO69VWgYgDGq6YDykwRPzxs5f2N+X988CBXS7EQahDU+Vpet5QYMqLk+nsp+Qxw=="; }; }; - "@babel/helper-replace-supers-7.16.0" = { + "@babel/helper-replace-supers-7.16.5" = { name = "_at_babel_slash_helper-replace-supers"; packageName = "@babel/helper-replace-supers"; - version = "7.16.0"; + version = "7.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.16.0.tgz"; - sha512 = "TQxuQfSCdoha7cpRNJvfaYxxxzmbxXw/+6cS7V02eeDYyhxderSoMVALvwupA54/pZcOTtVeJ0xccp1nGWladA=="; + url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.16.5.tgz"; + sha512 = "ao3seGVa/FZCMCCNDuBcqnBFSbdr8N2EW35mzojx3TwfIbdPmNK+JV6+2d5bR0Z71W5ocLnQp9en/cTF7pBJiQ=="; }; }; "@babel/helper-simple-access-7.16.0" = { @@ -247,22 +256,22 @@ let sha512 = "OX8D5eeX4XwcroVW45NMvoYaIuFI+GQpA2a8Gi+X/U/cDUIRsV37qQfF905F0htTRCREQIB4KqPeaveRJUl3Ow=="; }; }; - "@babel/helper-wrap-function-7.16.0" = { + "@babel/helper-wrap-function-7.16.5" = { name = "_at_babel_slash_helper-wrap-function"; packageName = "@babel/helper-wrap-function"; - version = "7.16.0"; + version = "7.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.16.0.tgz"; - sha512 = "VVMGzYY3vkWgCJML+qVLvGIam902mJW0FvT7Avj1zEe0Gn7D93aWdLblYARTxEw+6DhZmtzhBM2zv0ekE5zg1g=="; + url = "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.16.5.tgz"; + sha512 = "2J2pmLBqUqVdJw78U0KPNdeE2qeuIyKoG4mKV7wAq3mc4jJG282UgjZw4ZYDnqiWQuS3Y3IYdF/AQ6CpyBV3VA=="; }; }; - "@babel/helpers-7.16.3" = { + "@babel/helpers-7.16.5" = { name = "_at_babel_slash_helpers"; packageName = "@babel/helpers"; - version = "7.16.3"; + version = "7.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.16.3.tgz"; - sha512 = "Xn8IhDlBPhvYTvgewPKawhADichOsbkZuzN7qz2BusOM0brChsyXMDJvldWaYMMUNiCQdQzNEioXTp3sC8Nt8w=="; + url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.16.5.tgz"; + sha512 = "TLgi6Lh71vvMZGEkFuIxzaPsyeYCHQ5jJOOX1f0xXn0uciFuE8cEk0wyBquMcCxBXZ5BJhE2aUB7pnWTD150Tw=="; }; }; "@babel/highlight-7.16.0" = { @@ -274,130 +283,130 @@ let sha512 = "t8MH41kUQylBtu2+4IQA3atqevA2lRgqA2wyVB/YiWmsDSuylZZuXOUy9ric30hfzauEFfdsuk/eXTRrGrfd0g=="; }; }; - "@babel/parser-7.16.4" = { + "@babel/parser-7.16.6" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.16.4"; + version = "7.16.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.16.4.tgz"; - sha512 = "6V0qdPUaiVHH3RtZeLIsc+6pDhbYzHR8ogA8w+f+Wc77DuXto19g2QUwveINoS34Uw+W8/hQDGJCx+i4n7xcng=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.16.6.tgz"; + sha512 = "Gr86ujcNuPDnNOY8mi383Hvi8IYrJVJYuf3XcuBM/Dgd+bINn/7tHqsj+tKkoreMbmGsFLsltI/JJd8fOFWGDQ=="; }; }; - "@babel/plugin-proposal-async-generator-functions-7.16.4" = { + "@babel/plugin-proposal-async-generator-functions-7.16.5" = { name = "_at_babel_slash_plugin-proposal-async-generator-functions"; packageName = "@babel/plugin-proposal-async-generator-functions"; - version = "7.16.4"; + version = "7.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.16.4.tgz"; - sha512 = "/CUekqaAaZCQHleSK/9HajvcD/zdnJiKRiuUFq8ITE+0HsPzquf53cpFiqAwl/UfmJbR6n5uGPQSPdrmKOvHHg=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.16.5.tgz"; + sha512 = "C/FX+3HNLV6sz7AqbTQqEo1L9/kfrKjxcVtgyBCmvIgOjvuBVUWooDoi7trsLxOzCEo5FccjRvKHkfDsJFZlfA=="; }; }; - "@babel/plugin-proposal-class-properties-7.16.0" = { + "@babel/plugin-proposal-class-properties-7.16.5" = { name = "_at_babel_slash_plugin-proposal-class-properties"; packageName = "@babel/plugin-proposal-class-properties"; - version = "7.16.0"; + version = "7.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.16.0.tgz"; - sha512 = "mCF3HcuZSY9Fcx56Lbn+CGdT44ioBMMvjNVldpKtj8tpniETdLjnxdHI1+sDWXIM1nNt+EanJOZ3IG9lzVjs7A=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.16.5.tgz"; + sha512 = "pJD3HjgRv83s5dv1sTnDbZOaTjghKEz8KUn1Kbh2eAIRhGuyQ1XSeI4xVXU3UlIEVA3DAyIdxqT1eRn7Wcn55A=="; }; }; - "@babel/plugin-proposal-dynamic-import-7.16.0" = { + "@babel/plugin-proposal-dynamic-import-7.16.5" = { name = "_at_babel_slash_plugin-proposal-dynamic-import"; packageName = "@babel/plugin-proposal-dynamic-import"; - version = "7.16.0"; + version = "7.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.16.0.tgz"; - sha512 = "QGSA6ExWk95jFQgwz5GQ2Dr95cf7eI7TKutIXXTb7B1gCLTCz5hTjFTQGfLFBBiC5WSNi7udNwWsqbbMh1c4yQ=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.16.5.tgz"; + sha512 = "P05/SJZTTvHz79LNYTF8ff5xXge0kk5sIIWAypcWgX4BTRUgyHc8wRxJ/Hk+mU0KXldgOOslKaeqnhthcDJCJQ=="; }; }; - "@babel/plugin-proposal-export-namespace-from-7.16.0" = { + "@babel/plugin-proposal-export-namespace-from-7.16.5" = { name = "_at_babel_slash_plugin-proposal-export-namespace-from"; packageName = "@babel/plugin-proposal-export-namespace-from"; - version = "7.16.0"; + version = "7.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.16.0.tgz"; - sha512 = "CjI4nxM/D+5wCnhD11MHB1AwRSAYeDT+h8gCdcVJZ/OK7+wRzFsf7PFPWVpVpNRkHMmMkQWAHpTq+15IXQ1diA=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.16.5.tgz"; + sha512 = "i+sltzEShH1vsVydvNaTRsgvq2vZsfyrd7K7vPLUU/KgS0D5yZMe6uipM0+izminnkKrEfdUnz7CxMRb6oHZWw=="; }; }; - "@babel/plugin-proposal-json-strings-7.16.0" = { + "@babel/plugin-proposal-json-strings-7.16.5" = { name = "_at_babel_slash_plugin-proposal-json-strings"; packageName = "@babel/plugin-proposal-json-strings"; - version = "7.16.0"; + version = "7.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.16.0.tgz"; - sha512 = "kouIPuiv8mSi5JkEhzApg5Gn6hFyKPnlkO0a9YSzqRurH8wYzSlf6RJdzluAsbqecdW5pBvDJDfyDIUR/vLxvg=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.16.5.tgz"; + sha512 = "QQJueTFa0y9E4qHANqIvMsuxM/qcLQmKttBACtPCQzGUEizsXDACGonlPiSwynHfOa3vNw0FPMVvQzbuXwh4SQ=="; }; }; - "@babel/plugin-proposal-logical-assignment-operators-7.16.0" = { + "@babel/plugin-proposal-logical-assignment-operators-7.16.5" = { name = "_at_babel_slash_plugin-proposal-logical-assignment-operators"; packageName = "@babel/plugin-proposal-logical-assignment-operators"; - version = "7.16.0"; + version = "7.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.16.0.tgz"; - sha512 = "pbW0fE30sVTYXXm9lpVQQ/Vc+iTeQKiXlaNRZPPN2A2VdlWyAtsUrsQ3xydSlDW00TFMK7a8m3cDTkBF5WnV3Q=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.16.5.tgz"; + sha512 = "xqibl7ISO2vjuQM+MzR3rkd0zfNWltk7n9QhaD8ghMmMceVguYrNDt7MikRyj4J4v3QehpnrU8RYLnC7z/gZLA=="; }; }; - "@babel/plugin-proposal-nullish-coalescing-operator-7.16.0" = { + "@babel/plugin-proposal-nullish-coalescing-operator-7.16.5" = { name = "_at_babel_slash_plugin-proposal-nullish-coalescing-operator"; packageName = "@babel/plugin-proposal-nullish-coalescing-operator"; - version = "7.16.0"; + version = "7.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.16.0.tgz"; - sha512 = "3bnHA8CAFm7cG93v8loghDYyQ8r97Qydf63BeYiGgYbjKKB/XP53W15wfRC7dvKfoiJ34f6Rbyyx2btExc8XsQ=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.16.5.tgz"; + sha512 = "YwMsTp/oOviSBhrjwi0vzCUycseCYwoXnLiXIL3YNjHSMBHicGTz7GjVU/IGgz4DtOEXBdCNG72pvCX22ehfqg=="; }; }; - "@babel/plugin-proposal-numeric-separator-7.16.0" = { + "@babel/plugin-proposal-numeric-separator-7.16.5" = { name = "_at_babel_slash_plugin-proposal-numeric-separator"; packageName = "@babel/plugin-proposal-numeric-separator"; - version = "7.16.0"; + version = "7.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.16.0.tgz"; - sha512 = "FAhE2I6mjispy+vwwd6xWPyEx3NYFS13pikDBWUAFGZvq6POGs5eNchw8+1CYoEgBl9n11I3NkzD7ghn25PQ9Q=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.16.5.tgz"; + sha512 = "DvB9l/TcsCRvsIV9v4jxR/jVP45cslTVC0PMVHvaJhhNuhn2Y1SOhCSFlPK777qLB5wb8rVDaNoqMTyOqtY5Iw=="; }; }; - "@babel/plugin-proposal-object-rest-spread-7.16.0" = { + "@babel/plugin-proposal-object-rest-spread-7.16.5" = { name = "_at_babel_slash_plugin-proposal-object-rest-spread"; packageName = "@babel/plugin-proposal-object-rest-spread"; - version = "7.16.0"; + version = "7.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.16.0.tgz"; - sha512 = "LU/+jp89efe5HuWJLmMmFG0+xbz+I2rSI7iLc1AlaeSMDMOGzWlc5yJrMN1d04osXN4sSfpo4O+azkBNBes0jg=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.16.5.tgz"; + sha512 = "UEd6KpChoyPhCoE840KRHOlGhEZFutdPDMGj+0I56yuTTOaT51GzmnEl/0uT41fB/vD2nT+Pci2KjezyE3HmUw=="; }; }; - "@babel/plugin-proposal-optional-catch-binding-7.16.0" = { + "@babel/plugin-proposal-optional-catch-binding-7.16.5" = { name = "_at_babel_slash_plugin-proposal-optional-catch-binding"; packageName = "@babel/plugin-proposal-optional-catch-binding"; - version = "7.16.0"; + version = "7.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.16.0.tgz"; - sha512 = "kicDo0A/5J0nrsCPbn89mTG3Bm4XgYi0CZtvex9Oyw7gGZE3HXGD0zpQNH+mo+tEfbo8wbmMvJftOwpmPy7aVw=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.16.5.tgz"; + sha512 = "ihCMxY1Iljmx4bWy/PIMJGXN4NS4oUj1MKynwO07kiKms23pNvIn1DMB92DNB2R0EA882sw0VXIelYGdtF7xEQ=="; }; }; - "@babel/plugin-proposal-optional-chaining-7.16.0" = { + "@babel/plugin-proposal-optional-chaining-7.16.5" = { name = "_at_babel_slash_plugin-proposal-optional-chaining"; packageName = "@babel/plugin-proposal-optional-chaining"; - version = "7.16.0"; + version = "7.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.16.0.tgz"; - sha512 = "Y4rFpkZODfHrVo70Uaj6cC1JJOt3Pp0MdWSwIKtb8z1/lsjl9AmnB7ErRFV+QNGIfcY1Eruc2UMx5KaRnXjMyg=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.16.5.tgz"; + sha512 = "kzdHgnaXRonttiTfKYnSVafbWngPPr2qKw9BWYBESl91W54e+9R5pP70LtWxV56g0f05f/SQrwHYkfvbwcdQ/A=="; }; }; - "@babel/plugin-proposal-private-methods-7.16.0" = { + "@babel/plugin-proposal-private-methods-7.16.5" = { name = "_at_babel_slash_plugin-proposal-private-methods"; packageName = "@babel/plugin-proposal-private-methods"; - version = "7.16.0"; + version = "7.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.16.0.tgz"; - sha512 = "IvHmcTHDFztQGnn6aWq4t12QaBXTKr1whF/dgp9kz84X6GUcwq9utj7z2wFCUfeOup/QKnOlt2k0zxkGFx9ubg=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.16.5.tgz"; + sha512 = "+yFMO4BGT3sgzXo+lrq7orX5mAZt57DwUK6seqII6AcJnJOIhBJ8pzKH47/ql/d426uQ7YhN8DpUFirQzqYSUA=="; }; }; - "@babel/plugin-proposal-unicode-property-regex-7.16.0" = { + "@babel/plugin-proposal-unicode-property-regex-7.16.5" = { name = "_at_babel_slash_plugin-proposal-unicode-property-regex"; packageName = "@babel/plugin-proposal-unicode-property-regex"; - version = "7.16.0"; + version = "7.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.16.0.tgz"; - sha512 = "ti7IdM54NXv29cA4+bNNKEMS4jLMCbJgl+Drv+FgYy0erJLAxNAIXcNjNjrRZEcWq0xJHsNVwQezskMFpF8N9g=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.16.5.tgz"; + sha512 = "s5sKtlKQyFSatt781HQwv1hoM5BQ9qRH30r+dK56OLDsHmV74mzwJNX7R1yMuE7VZKG5O6q/gmOGSAO6ikTudg=="; }; }; "@babel/plugin-syntax-async-generators-7.8.4" = { @@ -508,229 +517,229 @@ let sha512 = "hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw=="; }; }; - "@babel/plugin-transform-arrow-functions-7.16.0" = { + "@babel/plugin-transform-arrow-functions-7.16.5" = { name = "_at_babel_slash_plugin-transform-arrow-functions"; packageName = "@babel/plugin-transform-arrow-functions"; - version = "7.16.0"; + version = "7.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.16.0.tgz"; - sha512 = "vIFb5250Rbh7roWARvCLvIJ/PtAU5Lhv7BtZ1u24COwpI9Ypjsh+bZcKk6rlIyalK+r0jOc1XQ8I4ovNxNrWrA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.16.5.tgz"; + sha512 = "8bTHiiZyMOyfZFULjsCnYOWG059FVMes0iljEHSfARhNgFfpsqE92OrCffv3veSw9rwMkYcFe9bj0ZoXU2IGtQ=="; }; }; - "@babel/plugin-transform-async-to-generator-7.16.0" = { + "@babel/plugin-transform-async-to-generator-7.16.5" = { name = "_at_babel_slash_plugin-transform-async-to-generator"; packageName = "@babel/plugin-transform-async-to-generator"; - version = "7.16.0"; + version = "7.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.16.0.tgz"; - sha512 = "PbIr7G9kR8tdH6g8Wouir5uVjklETk91GMVSUq+VaOgiinbCkBP6Q7NN/suM/QutZkMJMvcyAriogcYAdhg8Gw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.16.5.tgz"; + sha512 = "TMXgfioJnkXU+XRoj7P2ED7rUm5jbnDWwlCuFVTpQboMfbSya5WrmubNBAMlk7KXvywpo8rd8WuYZkis1o2H8w=="; }; }; - "@babel/plugin-transform-block-scoped-functions-7.16.0" = { + "@babel/plugin-transform-block-scoped-functions-7.16.5" = { name = "_at_babel_slash_plugin-transform-block-scoped-functions"; packageName = "@babel/plugin-transform-block-scoped-functions"; - version = "7.16.0"; + version = "7.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.16.0.tgz"; - sha512 = "V14As3haUOP4ZWrLJ3VVx5rCnrYhMSHN/jX7z6FAt5hjRkLsb0snPCmJwSOML5oxkKO4FNoNv7V5hw/y2bjuvg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.16.5.tgz"; + sha512 = "BxmIyKLjUGksJ99+hJyL/HIxLIGnLKtw772zYDER7UuycDZ+Xvzs98ZQw6NGgM2ss4/hlFAaGiZmMNKvValEjw=="; }; }; - "@babel/plugin-transform-block-scoping-7.16.0" = { + "@babel/plugin-transform-block-scoping-7.16.5" = { name = "_at_babel_slash_plugin-transform-block-scoping"; packageName = "@babel/plugin-transform-block-scoping"; - version = "7.16.0"; + version = "7.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.16.0.tgz"; - sha512 = "27n3l67/R3UrXfizlvHGuTwsRIFyce3D/6a37GRxn28iyTPvNXaW4XvznexRh1zUNLPjbLL22Id0XQElV94ruw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.16.5.tgz"; + sha512 = "JxjSPNZSiOtmxjX7PBRBeRJTUKTyJ607YUYeT0QJCNdsedOe+/rXITjP08eG8xUpsLfPirgzdCFN+h0w6RI+pQ=="; }; }; - "@babel/plugin-transform-classes-7.16.0" = { + "@babel/plugin-transform-classes-7.16.5" = { name = "_at_babel_slash_plugin-transform-classes"; packageName = "@babel/plugin-transform-classes"; - version = "7.16.0"; + version = "7.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.16.0.tgz"; - sha512 = "HUxMvy6GtAdd+GKBNYDWCIA776byUQH8zjnfjxwT1P1ARv/wFu8eBDpmXQcLS/IwRtrxIReGiplOwMeyO7nsDQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.16.5.tgz"; + sha512 = "DzJ1vYf/7TaCYy57J3SJ9rV+JEuvmlnvvyvYKFbk5u46oQbBvuB9/0w+YsVsxkOv8zVWKpDmUoj4T5ILHoXevA=="; }; }; - "@babel/plugin-transform-computed-properties-7.16.0" = { + "@babel/plugin-transform-computed-properties-7.16.5" = { name = "_at_babel_slash_plugin-transform-computed-properties"; packageName = "@babel/plugin-transform-computed-properties"; - version = "7.16.0"; + version = "7.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.16.0.tgz"; - sha512 = "63l1dRXday6S8V3WFY5mXJwcRAnPYxvFfTlt67bwV1rTyVTM5zrp0DBBb13Kl7+ehkCVwIZPumPpFP/4u70+Tw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.16.5.tgz"; + sha512 = "n1+O7xtU5lSLraRzX88CNcpl7vtGdPakKzww74bVwpAIRgz9JVLJJpOLb0uYqcOaXVM0TL6X0RVeIJGD2CnCkg=="; }; }; - "@babel/plugin-transform-destructuring-7.16.0" = { + "@babel/plugin-transform-destructuring-7.16.5" = { name = "_at_babel_slash_plugin-transform-destructuring"; packageName = "@babel/plugin-transform-destructuring"; - version = "7.16.0"; + version = "7.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.16.0.tgz"; - sha512 = "Q7tBUwjxLTsHEoqktemHBMtb3NYwyJPTJdM+wDwb0g8PZ3kQUIzNvwD5lPaqW/p54TXBc/MXZu9Jr7tbUEUM8Q=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.16.5.tgz"; + sha512 = "GuRVAsjq+c9YPK6NeTkRLWyQskDC099XkBSVO+6QzbnOnH2d/4mBVXYStaPrZD3dFRfg00I6BFJ9Atsjfs8mlg=="; }; }; - "@babel/plugin-transform-dotall-regex-7.16.0" = { + "@babel/plugin-transform-dotall-regex-7.16.5" = { name = "_at_babel_slash_plugin-transform-dotall-regex"; packageName = "@babel/plugin-transform-dotall-regex"; - version = "7.16.0"; + version = "7.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.16.0.tgz"; - sha512 = "FXlDZfQeLILfJlC6I1qyEwcHK5UpRCFkaoVyA1nk9A1L1Yu583YO4un2KsLBsu3IJb4CUbctZks8tD9xPQubLw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.16.5.tgz"; + sha512 = "iQiEMt8Q4/5aRGHpGVK2Zc7a6mx7qEAO7qehgSug3SDImnuMzgmm/wtJALXaz25zUj1PmnNHtShjFgk4PDx4nw=="; }; }; - "@babel/plugin-transform-duplicate-keys-7.16.0" = { + "@babel/plugin-transform-duplicate-keys-7.16.5" = { name = "_at_babel_slash_plugin-transform-duplicate-keys"; packageName = "@babel/plugin-transform-duplicate-keys"; - version = "7.16.0"; + version = "7.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.16.0.tgz"; - sha512 = "LIe2kcHKAZOJDNxujvmp6z3mfN6V9lJxubU4fJIGoQCkKe3Ec2OcbdlYP+vW++4MpxwG0d1wSDOJtQW5kLnkZQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.16.5.tgz"; + sha512 = "81tijpDg2a6I1Yhj4aWY1l3O1J4Cg/Pd7LfvuaH2VVInAkXtzibz9+zSPdUM1WvuUi128ksstAP0hM5w48vQgg=="; }; }; - "@babel/plugin-transform-exponentiation-operator-7.16.0" = { + "@babel/plugin-transform-exponentiation-operator-7.16.5" = { name = "_at_babel_slash_plugin-transform-exponentiation-operator"; packageName = "@babel/plugin-transform-exponentiation-operator"; - version = "7.16.0"; + version = "7.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.16.0.tgz"; - sha512 = "OwYEvzFI38hXklsrbNivzpO3fh87skzx8Pnqi4LoSYeav0xHlueSoCJrSgTPfnbyzopo5b3YVAJkFIcUpK2wsw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.16.5.tgz"; + sha512 = "12rba2HwemQPa7BLIKCzm1pT2/RuQHtSFHdNl41cFiC6oi4tcrp7gjB07pxQvFpcADojQywSjblQth6gJyE6CA=="; }; }; - "@babel/plugin-transform-for-of-7.16.0" = { + "@babel/plugin-transform-for-of-7.16.5" = { name = "_at_babel_slash_plugin-transform-for-of"; packageName = "@babel/plugin-transform-for-of"; - version = "7.16.0"; + version = "7.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.16.0.tgz"; - sha512 = "5QKUw2kO+GVmKr2wMYSATCTTnHyscl6sxFRAY+rvN7h7WB0lcG0o4NoV6ZQU32OZGVsYUsfLGgPQpDFdkfjlJQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.16.5.tgz"; + sha512 = "+DpCAJFPAvViR17PIMi9x2AE34dll5wNlXO43wagAX2YcRGgEVHCNFC4azG85b4YyyFarvkc/iD5NPrz4Oneqw=="; }; }; - "@babel/plugin-transform-function-name-7.16.0" = { + "@babel/plugin-transform-function-name-7.16.5" = { name = "_at_babel_slash_plugin-transform-function-name"; packageName = "@babel/plugin-transform-function-name"; - version = "7.16.0"; + version = "7.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.16.0.tgz"; - sha512 = "lBzMle9jcOXtSOXUpc7tvvTpENu/NuekNJVova5lCCWCV9/U1ho2HH2y0p6mBg8fPm/syEAbfaaemYGOHCY3mg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.16.5.tgz"; + sha512 = "Fuec/KPSpVLbGo6z1RPw4EE1X+z9gZk1uQmnYy7v4xr4TO9p41v1AoUuXEtyqAI7H+xNJYSICzRqZBhDEkd3kQ=="; }; }; - "@babel/plugin-transform-literals-7.16.0" = { + "@babel/plugin-transform-literals-7.16.5" = { name = "_at_babel_slash_plugin-transform-literals"; packageName = "@babel/plugin-transform-literals"; - version = "7.16.0"; + version = "7.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.16.0.tgz"; - sha512 = "gQDlsSF1iv9RU04clgXqRjrPyyoJMTclFt3K1cjLmTKikc0s/6vE3hlDeEVC71wLTRu72Fq7650kABrdTc2wMQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.16.5.tgz"; + sha512 = "B1j9C/IfvshnPcklsc93AVLTrNVa69iSqztylZH6qnmiAsDDOmmjEYqOm3Ts2lGSgTSywnBNiqC949VdD0/gfw=="; }; }; - "@babel/plugin-transform-member-expression-literals-7.16.0" = { + "@babel/plugin-transform-member-expression-literals-7.16.5" = { name = "_at_babel_slash_plugin-transform-member-expression-literals"; packageName = "@babel/plugin-transform-member-expression-literals"; - version = "7.16.0"; + version = "7.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.16.0.tgz"; - sha512 = "WRpw5HL4Jhnxw8QARzRvwojp9MIE7Tdk3ez6vRyUk1MwgjJN0aNpRoXainLR5SgxmoXx/vsXGZ6OthP6t/RbUg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.16.5.tgz"; + sha512 = "d57i3vPHWgIde/9Y8W/xSFUndhvhZN5Wu2TjRrN1MVz5KzdUihKnfDVlfP1U7mS5DNj/WHHhaE4/tTi4hIyHwQ=="; }; }; - "@babel/plugin-transform-modules-amd-7.16.0" = { + "@babel/plugin-transform-modules-amd-7.16.5" = { name = "_at_babel_slash_plugin-transform-modules-amd"; packageName = "@babel/plugin-transform-modules-amd"; - version = "7.16.0"; + version = "7.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.16.0.tgz"; - sha512 = "rWFhWbCJ9Wdmzln1NmSCqn7P0RAD+ogXG/bd9Kg5c7PKWkJtkiXmYsMBeXjDlzHpVTJ4I/hnjs45zX4dEv81xw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.16.5.tgz"; + sha512 = "oHI15S/hdJuSCfnwIz+4lm6wu/wBn7oJ8+QrkzPPwSFGXk8kgdI/AIKcbR/XnD1nQVMg/i6eNaXpszbGuwYDRQ=="; }; }; - "@babel/plugin-transform-modules-commonjs-7.16.0" = { + "@babel/plugin-transform-modules-commonjs-7.16.5" = { name = "_at_babel_slash_plugin-transform-modules-commonjs"; packageName = "@babel/plugin-transform-modules-commonjs"; - version = "7.16.0"; + version = "7.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.16.0.tgz"; - sha512 = "Dzi+NWqyEotgzk/sb7kgQPJQf7AJkQBWsVp1N6JWc1lBVo0vkElUnGdr1PzUBmfsCCN5OOFya3RtpeHk15oLKQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.16.5.tgz"; + sha512 = "ABhUkxvoQyqhCWyb8xXtfwqNMJD7tx+irIRnUh6lmyFud7Jln1WzONXKlax1fg/ey178EXbs4bSGNd6PngO+SQ=="; }; }; - "@babel/plugin-transform-modules-systemjs-7.16.0" = { + "@babel/plugin-transform-modules-systemjs-7.16.5" = { name = "_at_babel_slash_plugin-transform-modules-systemjs"; packageName = "@babel/plugin-transform-modules-systemjs"; - version = "7.16.0"; + version = "7.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.16.0.tgz"; - sha512 = "yuGBaHS3lF1m/5R+6fjIke64ii5luRUg97N2wr+z1sF0V+sNSXPxXDdEEL/iYLszsN5VKxVB1IPfEqhzVpiqvg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.16.5.tgz"; + sha512 = "53gmLdScNN28XpjEVIm7LbWnD/b/TpbwKbLk6KV4KqC9WyU6rq1jnNmVG6UgAdQZVVGZVoik3DqHNxk4/EvrjA=="; }; }; - "@babel/plugin-transform-modules-umd-7.16.0" = { + "@babel/plugin-transform-modules-umd-7.16.5" = { name = "_at_babel_slash_plugin-transform-modules-umd"; packageName = "@babel/plugin-transform-modules-umd"; - version = "7.16.0"; + version = "7.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.16.0.tgz"; - sha512 = "nx4f6no57himWiHhxDM5pjwhae5vLpTK2zCnDH8+wNLJy0TVER/LJRHl2bkt6w9Aad2sPD5iNNoUpY3X9sTGDg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.16.5.tgz"; + sha512 = "qTFnpxHMoenNHkS3VoWRdwrcJ3FhX567GvDA3hRZKF0Dj8Fmg0UzySZp3AP2mShl/bzcywb/UWAMQIjA1bhXvw=="; }; }; - "@babel/plugin-transform-named-capturing-groups-regex-7.16.0" = { + "@babel/plugin-transform-named-capturing-groups-regex-7.16.5" = { name = "_at_babel_slash_plugin-transform-named-capturing-groups-regex"; packageName = "@babel/plugin-transform-named-capturing-groups-regex"; - version = "7.16.0"; + version = "7.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.16.0.tgz"; - sha512 = "LogN88uO+7EhxWc8WZuQ8vxdSyVGxhkh8WTC3tzlT8LccMuQdA81e9SGV6zY7kY2LjDhhDOFdQVxdGwPyBCnvg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.16.5.tgz"; + sha512 = "/wqGDgvFUeKELW6ex6QB7dLVRkd5ehjw34tpXu1nhKC0sFfmaLabIswnpf8JgDyV2NeDmZiwoOb0rAmxciNfjA=="; }; }; - "@babel/plugin-transform-new-target-7.16.0" = { + "@babel/plugin-transform-new-target-7.16.5" = { name = "_at_babel_slash_plugin-transform-new-target"; packageName = "@babel/plugin-transform-new-target"; - version = "7.16.0"; + version = "7.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.16.0.tgz"; - sha512 = "fhjrDEYv2DBsGN/P6rlqakwRwIp7rBGLPbrKxwh7oVt5NNkIhZVOY2GRV+ULLsQri1bDqwDWnU3vhlmx5B2aCw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.16.5.tgz"; + sha512 = "ZaIrnXF08ZC8jnKR4/5g7YakGVL6go6V9ql6Jl3ecO8PQaQqFE74CuM384kezju7Z9nGCCA20BqZaR1tJ/WvHg=="; }; }; - "@babel/plugin-transform-object-super-7.16.0" = { + "@babel/plugin-transform-object-super-7.16.5" = { name = "_at_babel_slash_plugin-transform-object-super"; packageName = "@babel/plugin-transform-object-super"; - version = "7.16.0"; + version = "7.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.16.0.tgz"; - sha512 = "fds+puedQHn4cPLshoHcR1DTMN0q1V9ou0mUjm8whx9pGcNvDrVVrgw+KJzzCaiTdaYhldtrUps8DWVMgrSEyg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.16.5.tgz"; + sha512 = "tded+yZEXuxt9Jdtkc1RraW1zMF/GalVxaVVxh41IYwirdRgyAxxxCKZ9XB7LxZqmsjfjALxupNE1MIz9KH+Zg=="; }; }; - "@babel/plugin-transform-parameters-7.16.3" = { + "@babel/plugin-transform-parameters-7.16.5" = { name = "_at_babel_slash_plugin-transform-parameters"; packageName = "@babel/plugin-transform-parameters"; - version = "7.16.3"; + version = "7.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.16.3.tgz"; - sha512 = "3MaDpJrOXT1MZ/WCmkOFo7EtmVVC8H4EUZVrHvFOsmwkk4lOjQj8rzv8JKUZV4YoQKeoIgk07GO+acPU9IMu/w=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.16.5.tgz"; + sha512 = "B3O6AL5oPop1jAVg8CV+haeUte9oFuY85zu0jwnRNZZi3tVAbJriu5tag/oaO2kGaQM/7q7aGPBlTI5/sr9enA=="; }; }; - "@babel/plugin-transform-property-literals-7.16.0" = { + "@babel/plugin-transform-property-literals-7.16.5" = { name = "_at_babel_slash_plugin-transform-property-literals"; packageName = "@babel/plugin-transform-property-literals"; - version = "7.16.0"; + version = "7.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.16.0.tgz"; - sha512 = "XLldD4V8+pOqX2hwfWhgwXzGdnDOThxaNTgqagOcpBgIxbUvpgU2FMvo5E1RyHbk756WYgdbS0T8y0Cj9FKkWQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.16.5.tgz"; + sha512 = "+IRcVW71VdF9pEH/2R/Apab4a19LVvdVsr/gEeotH00vSDVlKD+XgfSIw+cgGWsjDB/ziqGv/pGoQZBIiQVXHg=="; }; }; - "@babel/plugin-transform-regenerator-7.16.0" = { + "@babel/plugin-transform-regenerator-7.16.5" = { name = "_at_babel_slash_plugin-transform-regenerator"; packageName = "@babel/plugin-transform-regenerator"; - version = "7.16.0"; + version = "7.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.16.0.tgz"; - sha512 = "JAvGxgKuwS2PihiSFaDrp94XOzzTUeDeOQlcKzVAyaPap7BnZXK/lvMDiubkPTdotPKOIZq9xWXWnggUMYiExg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.16.5.tgz"; + sha512 = "2z+it2eVWU8TtQQRauvGUqZwLy4+7rTfo6wO4npr+fvvN1SW30ZF3O/ZRCNmTuu4F5MIP8OJhXAhRV5QMJOuYg=="; }; }; - "@babel/plugin-transform-reserved-words-7.16.0" = { + "@babel/plugin-transform-reserved-words-7.16.5" = { name = "_at_babel_slash_plugin-transform-reserved-words"; packageName = "@babel/plugin-transform-reserved-words"; - version = "7.16.0"; + version = "7.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.16.0.tgz"; - sha512 = "Dgs8NNCehHSvXdhEhln8u/TtJxfVwGYCgP2OOr5Z3Ar+B+zXicEOKNTyc+eca2cuEOMtjW6m9P9ijOt8QdqWkg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.16.5.tgz"; + sha512 = "aIB16u8lNcf7drkhXJRoggOxSTUAuihTSTfAcpynowGJOZiGf+Yvi7RuTwFzVYSYPmWyARsPqUGoZWWWxLiknw=="; }; }; "@babel/plugin-transform-runtime-7.12.10" = { @@ -742,67 +751,67 @@ let sha512 = "xOrUfzPxw7+WDm9igMgQCbO3cJKymX7dFdsgRr1eu9n3KjjyU4pptIXbXPseQDquw+W+RuJEJMHKHNsPNNm3CA=="; }; }; - "@babel/plugin-transform-shorthand-properties-7.16.0" = { + "@babel/plugin-transform-shorthand-properties-7.16.5" = { name = "_at_babel_slash_plugin-transform-shorthand-properties"; packageName = "@babel/plugin-transform-shorthand-properties"; - version = "7.16.0"; + version = "7.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.16.0.tgz"; - sha512 = "iVb1mTcD8fuhSv3k99+5tlXu5N0v8/DPm2mO3WACLG6al1CGZH7v09HJyUb1TtYl/Z+KrM6pHSIJdZxP5A+xow=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.16.5.tgz"; + sha512 = "ZbuWVcY+MAXJuuW7qDoCwoxDUNClfZxoo7/4swVbOW1s/qYLOMHlm9YRWMsxMFuLs44eXsv4op1vAaBaBaDMVg=="; }; }; - "@babel/plugin-transform-spread-7.16.0" = { + "@babel/plugin-transform-spread-7.16.5" = { name = "_at_babel_slash_plugin-transform-spread"; packageName = "@babel/plugin-transform-spread"; - version = "7.16.0"; + version = "7.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.16.0.tgz"; - sha512 = "Ao4MSYRaLAQczZVp9/7E7QHsCuK92yHRrmVNRe/SlEJjhzivq0BSn8mEraimL8wizHZ3fuaHxKH0iwzI13GyGg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.16.5.tgz"; + sha512 = "5d6l/cnG7Lw4tGHEoga4xSkYp1euP7LAtrah1h1PgJ3JY7yNsjybsxQAnVK4JbtReZ/8z6ASVmd3QhYYKLaKZw=="; }; }; - "@babel/plugin-transform-sticky-regex-7.16.0" = { + "@babel/plugin-transform-sticky-regex-7.16.5" = { name = "_at_babel_slash_plugin-transform-sticky-regex"; packageName = "@babel/plugin-transform-sticky-regex"; - version = "7.16.0"; + version = "7.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.16.0.tgz"; - sha512 = "/ntT2NljR9foobKk4E/YyOSwcGUXtYWv5tinMK/3RkypyNBNdhHUaq6Orw5DWq9ZcNlS03BIlEALFeQgeVAo4Q=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.16.5.tgz"; + sha512 = "usYsuO1ID2LXxzuUxifgWtJemP7wL2uZtyrTVM4PKqsmJycdS4U4mGovL5xXkfUheds10Dd2PjoQLXw6zCsCbg=="; }; }; - "@babel/plugin-transform-template-literals-7.16.0" = { + "@babel/plugin-transform-template-literals-7.16.5" = { name = "_at_babel_slash_plugin-transform-template-literals"; packageName = "@babel/plugin-transform-template-literals"; - version = "7.16.0"; + version = "7.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.16.0.tgz"; - sha512 = "Rd4Ic89hA/f7xUSJQk5PnC+4so50vBoBfxjdQAdvngwidM8jYIBVxBZ/sARxD4e0yMXRbJVDrYf7dyRtIIKT6Q=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.16.5.tgz"; + sha512 = "gnyKy9RyFhkovex4BjKWL3BVYzUDG6zC0gba7VMLbQoDuqMfJ1SDXs8k/XK41Mmt1Hyp4qNAvGFb9hKzdCqBRQ=="; }; }; - "@babel/plugin-transform-typeof-symbol-7.16.0" = { + "@babel/plugin-transform-typeof-symbol-7.16.5" = { name = "_at_babel_slash_plugin-transform-typeof-symbol"; packageName = "@babel/plugin-transform-typeof-symbol"; - version = "7.16.0"; + version = "7.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.16.0.tgz"; - sha512 = "++V2L8Bdf4vcaHi2raILnptTBjGEFxn5315YU+e8+EqXIucA+q349qWngCLpUYqqv233suJ6NOienIVUpS9cqg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.16.5.tgz"; + sha512 = "ldxCkW180qbrvyCVDzAUZqB0TAeF8W/vGJoRcaf75awm6By+PxfJKvuqVAnq8N9wz5Xa6mSpM19OfVKKVmGHSQ=="; }; }; - "@babel/plugin-transform-unicode-escapes-7.16.0" = { + "@babel/plugin-transform-unicode-escapes-7.16.5" = { name = "_at_babel_slash_plugin-transform-unicode-escapes"; packageName = "@babel/plugin-transform-unicode-escapes"; - version = "7.16.0"; + version = "7.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.16.0.tgz"; - sha512 = "VFi4dhgJM7Bpk8lRc5CMaRGlKZ29W9C3geZjt9beuzSUrlJxsNwX7ReLwaL6WEvsOf2EQkyIJEPtF8EXjB/g2A=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.16.5.tgz"; + sha512 = "shiCBHTIIChGLdyojsKQjoAyB8MBwat25lKM7MJjbe1hE0bgIppD+LX9afr41lLHOhqceqeWl4FkLp+Bgn9o1Q=="; }; }; - "@babel/plugin-transform-unicode-regex-7.16.0" = { + "@babel/plugin-transform-unicode-regex-7.16.5" = { name = "_at_babel_slash_plugin-transform-unicode-regex"; packageName = "@babel/plugin-transform-unicode-regex"; - version = "7.16.0"; + version = "7.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.16.0.tgz"; - sha512 = "jHLK4LxhHjvCeZDWyA9c+P9XH1sOxRd1RO9xMtDVRAOND/PczPqizEtVdx4TQF/wyPaewqpT+tgQFYMnN/P94A=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.16.5.tgz"; + sha512 = "GTJ4IW012tiPEMMubd7sD07iU9O/LOo8Q/oU4xNhcaq0Xn8+6TcUQaHtC8YxySo1T+ErQ8RaWogIEeFhKGNPzw=="; }; }; "@babel/preset-env-7.12.10" = { @@ -841,13 +850,13 @@ let sha512 = "MnZdpFD/ZdYhXwiunMqqgyZyucaYsbL0IrjoGjaVhGilz+x8YB++kRfygSOIj1yOtWKPlx7NBp+9I1RQSgsd5A=="; }; }; - "@babel/traverse-7.16.3" = { + "@babel/traverse-7.16.5" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.16.3"; + version = "7.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.16.3.tgz"; - sha512 = "eolumr1vVMjqevCpwVO99yN/LoGL0EyHiLO5I043aYQvwOJ9eR5UsZSClHVCzfhBduMAsSzgA/6AyqPjNayJag=="; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.16.5.tgz"; + sha512 = "FOCODAzqUMROikDYLYxl4nmwiLlu85rNqBML/A5hKRVXG2LV8d0iMqgPzdYTcIpjZEBB7D6UDU9vxRZiriASdQ=="; }; }; "@babel/types-7.16.0" = { @@ -1021,13 +1030,13 @@ let sha512 = "SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ=="; }; }; - "@types/http-proxy-1.17.7" = { + "@types/http-proxy-1.17.8" = { name = "_at_types_slash_http-proxy"; packageName = "@types/http-proxy"; - version = "1.17.7"; + version = "1.17.8"; src = fetchurl { - url = "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.7.tgz"; - sha512 = "9hdj6iXH64tHSLTY+Vt2eYOGzSogC+JQ2H7bdPWkuh7KXP5qLllWx++t+K9Wk556c3dkDdPws/SpMRi0sdCT1w=="; + url = "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.8.tgz"; + sha512 = "5kPLG5BKpWYkw/LVOGWpiq3nEVqxiN32rTgI53Sk12/xHFQ2rG3ehI9IO+O3W2QoKeyB92dJkoka8SUm6BX1pA=="; }; }; "@types/json-schema-7.0.9" = { @@ -1057,13 +1066,13 @@ let sha512 = "Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ=="; }; }; - "@types/node-16.11.12" = { + "@types/node-17.0.5" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "16.11.12"; + version = "17.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-16.11.12.tgz"; - sha512 = "+2Iggwg7PxoO5Kyhvsq9VarmPbIelXP070HMImEpbtGCoyWNINQj4wzjbQCXzdHTRXnqufutJb5KAURZANNBAw=="; + url = "https://registry.npmjs.org/@types/node/-/node-17.0.5.tgz"; + sha512 = "w3mrvNXLeDYV1GKTZorGJQivK6XLCoGwpnyJFbJVK/aTBQUxOCaa/GlFAAN3OTDFcb7h5tiFG+YXCO2By+riZw=="; }; }; "@types/parse-json-4.0.0" = { @@ -2047,6 +2056,15 @@ let sha512 = "dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw=="; }; }; + "body-parser-1.19.1" = { + name = "body-parser"; + packageName = "body-parser"; + version = "1.19.1"; + src = fetchurl { + url = "https://registry.npmjs.org/body-parser/-/body-parser-1.19.1.tgz"; + sha512 = "8ljfQi5eBk8EJfECMrgqNGWPEY5jWP+1IzkzkGdFFEwFQZZyaZ21UqdaHktgiMlH0xLHqIFtE/u2OYE5dOtViA=="; + }; + }; "bonjour-3.5.0" = { name = "bonjour"; packageName = "bonjour"; @@ -2164,13 +2182,13 @@ let sha512 = "VBorw+tgpOtZ1BYhrVSVTzTt/3+vSE3eFUh0N2GCFK1HffceOaf32YS/bs6WiFhjDAblAFrx85jMy3BG9fBK2Q=="; }; }; - "browserslist-4.18.1" = { + "browserslist-4.19.1" = { name = "browserslist"; packageName = "browserslist"; - version = "4.18.1"; + version = "4.19.1"; src = fetchurl { - url = "https://registry.npmjs.org/browserslist/-/browserslist-4.18.1.tgz"; - sha512 = "8ScCzdpPwR2wQh8IT82CA2VgDwjHyqMovPBZSNH54+tm4Jk2pCuv90gmAdH6J84OCRWi0b4gMe6O6XPXuJnjgQ=="; + url = "https://registry.npmjs.org/browserslist/-/browserslist-4.19.1.tgz"; + sha512 = "u2tbbG5PdKRTUoctO3NBD8FQ5HdPh1ZXPHzp1rwaa5jTc+RV9/+RlWiAIKmjRPQF+xbGM9Kklj5bZQFa2s/38A=="; }; }; "buffer-4.9.2" = { @@ -2254,6 +2272,15 @@ let sha512 = "zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg=="; }; }; + "bytes-3.1.1" = { + name = "bytes"; + packageName = "bytes"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/bytes/-/bytes-3.1.1.tgz"; + sha512 = "dWe4nWO/ruEOY7HkUJ5gFt1DCFV9zPRoJr8pV0/ASQermOZjtq8jMjOprC0Kd10GLN+l7xaUPvxzJFWtxGu8Fg=="; + }; + }; "cacache-10.0.4" = { name = "cacache"; packageName = "cacache"; @@ -2407,13 +2434,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001286" = { + "caniuse-lite-1.0.30001294" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001286"; + version = "1.0.30001294"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001286.tgz"; - sha512 = "zaEMRH6xg8ESMi2eQ3R4eZ5qw/hJiVsO/HlLwniIwErij0JDr9P+8V4dtx1l+kLq6j3yy8l8W4fst1lBnat5wQ=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001294.tgz"; + sha512 = "LiMlrs1nSKZ8qkNhpUf5KD0Al1KCBE3zaT7OLOwEkagXMEDij98SiOovn9wxVGQpklk9vVC/pUSqgYmkmKOS8g=="; }; }; "case-sensitive-paths-webpack-plugin-2.3.0" = { @@ -3001,13 +3028,13 @@ let sha1 = "0cf68bb9ddf5f2be7961c3a85178cb85dba78cb4"; }; }; - "content-disposition-0.5.3" = { + "content-disposition-0.5.4" = { name = "content-disposition"; packageName = "content-disposition"; - version = "0.5.3"; + version = "0.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz"; - sha512 = "ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g=="; + url = "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz"; + sha512 = "FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ=="; }; }; "content-type-1.0.4" = { @@ -3037,13 +3064,13 @@ let sha1 = "e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb"; }; }; - "cookie-0.4.0" = { + "cookie-0.4.1" = { name = "cookie"; packageName = "cookie"; - version = "0.4.0"; + version = "0.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz"; - sha512 = "+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg=="; + url = "https://registry.npmjs.org/cookie/-/cookie-0.4.1.tgz"; + sha512 = "ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA=="; }; }; "cookie-signature-1.0.6" = { @@ -3091,13 +3118,13 @@ let sha512 = "Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ=="; }; }; - "core-js-compat-3.19.3" = { + "core-js-compat-3.20.1" = { name = "core-js-compat"; packageName = "core-js-compat"; - version = "3.19.3"; + version = "3.20.1"; src = fetchurl { - url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.19.3.tgz"; - sha512 = "59tYzuWgEEVU9r+SRgceIGXSSUn47JknoiXW6Oq7RW8QHjXWz3/vp8pa7dbtuVu40sewz3OP3JmQEcDdztrLhA=="; + url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.20.1.tgz"; + sha512 = "AVhKZNpqMV3Jz8hU0YEXXE06qoxtQGsAqU0u1neUngz5IusDJRX/ZJ6t3i7mS7QxNyEONbCo14GprkBrxPlTZA=="; }; }; "core-util-is-1.0.2" = { @@ -3271,13 +3298,13 @@ let sha512 = "Dqk7LQKpwLoH3VovzZnkzegqNSuAziQyNZUcrdDM401iY+R5NkGBXGmtO05/yaXQziALuPogeG0b7UAgjnTJTQ=="; }; }; - "css-select-4.1.3" = { + "css-select-4.2.1" = { name = "css-select"; packageName = "css-select"; - version = "4.1.3"; + version = "4.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/css-select/-/css-select-4.1.3.tgz"; - sha512 = "gT3wBNd9Nj49rAbmtFHj1cljIAOLYSX1nZ8CB7TBO3INYckygm5B7LISU/szY//YmdiSLbJvDLOx9VnMVpMBxA=="; + url = "https://registry.npmjs.org/css-select/-/css-select-4.2.1.tgz"; + sha512 = "/aUslKhzkTNCQUB2qTX84lVmfia9NyjP3WpDGtj/WxhwBzWBYUV3DgUpurHTme8UTPcPlAD1DJ+b0nN/t50zDQ=="; }; }; "css-select-base-adapter-0.1.1" = { @@ -3865,13 +3892,13 @@ let sha1 = "590c61156b0ae2f4f0255732a158b266bc56b21d"; }; }; - "electron-to-chromium-1.4.16" = { + "electron-to-chromium-1.4.30" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.4.16"; + version = "1.4.30"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.16.tgz"; - sha512 = "BQb7FgYwnu6haWLU63/CdVW+9xhmHls3RCQUFiV4lvw3wimEHTVcUk2hkuZo76QhR8nnDdfZE7evJIZqijwPdA=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.30.tgz"; + sha512 = "609z9sIMxDHg+TcR/VB3MXwH+uwtrYyeAwWc/orhnr90ixs6WVGSrt85CDLGUdNnLqCA7liv426V20EecjvflQ=="; }; }; "elliptic-6.5.4" = { @@ -4306,13 +4333,13 @@ let sha1 = "6af8a502350db3246ecc4becf6b5a34d22f7ed53"; }; }; - "express-4.17.1" = { + "express-4.17.2" = { name = "express"; packageName = "express"; - version = "4.17.1"; + version = "4.17.2"; src = fetchurl { - url = "https://registry.npmjs.org/express/-/express-4.17.1.tgz"; - sha512 = "mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g=="; + url = "https://registry.npmjs.org/express/-/express-4.17.2.tgz"; + sha512 = "oxlxJxcQlYwqPWKVJJtvQiwHgosH/LrLSPA+H4UxpyvSS6jC5aH+5MoHFM+KABgTOt0APue4w66Ha8jCUo9QGg=="; }; }; "express-ws-2.0.0" = { @@ -5521,6 +5548,15 @@ let sha512 = "ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw=="; }; }; + "http-errors-1.8.1" = { + name = "http-errors"; + packageName = "http-errors"; + version = "1.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/http-errors/-/http-errors-1.8.1.tgz"; + sha512 = "Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g=="; + }; + }; "http-parser-js-0.5.5" = { name = "http-parser-js"; packageName = "http-parser-js"; @@ -5656,13 +5692,13 @@ let sha512 = "Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug=="; }; }; - "ignore-5.1.9" = { + "ignore-5.2.0" = { name = "ignore"; packageName = "ignore"; - version = "5.1.9"; + version = "5.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/ignore/-/ignore-5.1.9.tgz"; - sha512 = "2zeMQpbKz5dhZ9IwL0gbxSW5w0NK/MSAMtNuhgIHEPmaU3vPdKPL0UdvUCXs5SS4JAwsBxysK5sFMW8ocFiVjQ=="; + url = "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz"; + sha512 = "CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ=="; }; }; "immer-1.7.2" = { @@ -7411,6 +7447,15 @@ let sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="; }; }; + "ms-2.1.3" = { + name = "ms"; + packageName = "ms"; + version = "2.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz"; + sha512 = "6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="; + }; + }; "multicast-dns-6.2.3" = { name = "multicast-dns"; packageName = "multicast-dns"; @@ -7762,13 +7807,13 @@ let sha1 = "7e7d858b781bd7c991a41ba975ed3812754e998c"; }; }; - "object-inspect-1.11.1" = { + "object-inspect-1.12.0" = { name = "object-inspect"; packageName = "object-inspect"; - version = "1.11.1"; + version = "1.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.11.1.tgz"; - sha512 = "If7BjFlpkzzBeV1cqgT3OSWT3azyoxDGajR+iGnFBfVV2EWyDyWaZZW2ERDjUaY2QM8i5jI3Sj7mhsM4DDAqWA=="; + url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz"; + sha512 = "Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g=="; }; }; "object-is-1.1.5" = { @@ -8563,13 +8608,13 @@ let sha512 = "yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA=="; }; }; - "postcss-8.4.4" = { + "postcss-8.4.5" = { name = "postcss"; packageName = "postcss"; - version = "8.4.4"; + version = "8.4.5"; src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-8.4.4.tgz"; - sha512 = "joU6fBsN6EIer28Lj6GDFoC/5yOZzLCfn0zHAn/MYXI7aPt4m4hK5KC5ovEZXy+lnCjmYIbQWngvju2ddyEr8Q=="; + url = "https://registry.npmjs.org/postcss/-/postcss-8.4.5.tgz"; + sha512 = "jBDboWM8qpaqwkMwItqTQTiFikhs/67OYVvblFFTM7MrZjt6yMKd6r2kgXizEbTTljacm4NldIlZnhbjr84QYg=="; }; }; "postcss-calc-7.0.5" = { @@ -8869,13 +8914,13 @@ let sha512 = "h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA=="; }; }; - "postcss-selector-parser-6.0.7" = { + "postcss-selector-parser-6.0.8" = { name = "postcss-selector-parser"; packageName = "postcss-selector-parser"; - version = "6.0.7"; + version = "6.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.7.tgz"; - sha512 = "U+b/Deoi4I/UmE6KOVPpnhS7I7AYdKbhGcat+qTQ27gycvaACvNEw11ba6RrkwVmDVRW7sigWgLj4/KbbJjeDA=="; + url = "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.8.tgz"; + sha512 = "D5PG53d209Z1Uhcc0qAZ5U3t5HagH3cxu+WLZ22jt3gLUpXM4eXXfiO14jiDWST3NNooX/E8wISfOhZ9eIjGTQ=="; }; }; "postcss-svgo-4.0.3" = { @@ -9157,6 +9202,15 @@ let sha512 = "VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ=="; }; }; + "qs-6.9.6" = { + name = "qs"; + packageName = "qs"; + version = "6.9.6"; + src = fetchurl { + url = "https://registry.npmjs.org/qs/-/qs-6.9.6.tgz"; + sha512 = "TIRk4aqYLNoJUbd+g2lEdz5kLWIuTMRagAXxl78Q0RiVjAOugHmeKNGdd3cwo/ktpf9aL9epCfFqWDEKysUlLQ=="; + }; + }; "query-string-4.3.4" = { name = "query-string"; packageName = "query-string"; @@ -9247,6 +9301,15 @@ let sha512 = "4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q=="; }; }; + "raw-body-2.4.2" = { + name = "raw-body"; + packageName = "raw-body"; + version = "2.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/raw-body/-/raw-body-2.4.2.tgz"; + sha512 = "RPMAFUJP19WIet/99ngh6Iv8fzAbqum4Li7AD6DtGaW2RpMB/11xDoalPiJMTbu6I3hkbMVkATvZrqb9EEqeeQ=="; + }; + }; "rc-1.2.8" = { name = "rc"; packageName = "rc"; @@ -10021,6 +10084,15 @@ let sha512 = "BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg=="; }; }; + "send-0.17.2" = { + name = "send"; + packageName = "send"; + version = "0.17.2"; + src = fetchurl { + url = "https://registry.npmjs.org/send/-/send-0.17.2.tgz"; + sha512 = "UJYB6wFSJE3G00nEivR5rgWp8c2xXvJ3OPWPhmuteU0IKj8nKbG3DrjiOmLwpnHGYWAVwA69zmTm++YG0Hmwww=="; + }; + }; "serialize-javascript-1.9.1" = { name = "serialize-javascript"; packageName = "serialize-javascript"; @@ -10066,6 +10138,15 @@ let sha512 = "JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg=="; }; }; + "serve-static-1.14.2" = { + name = "serve-static"; + packageName = "serve-static"; + version = "1.14.2"; + src = fetchurl { + url = "https://registry.npmjs.org/serve-static/-/serve-static-1.14.2.tgz"; + sha512 = "+TMNA9AFxUEGuC0z2mevogSnn9MXKb4fa7ngeRMJaaGv8vTwnIEkKi+QGvPt33HSnf8pRS+WGM0EbMtCJLKMBQ=="; + }; + }; "set-blocking-2.0.0" = { name = "set-blocking"; packageName = "set-blocking"; @@ -10120,6 +10201,15 @@ let sha512 = "JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw=="; }; }; + "setprototypeof-1.2.0" = { + name = "setprototypeof"; + packageName = "setprototypeof"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz"; + sha512 = "E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="; + }; + }; "sha.js-2.4.11" = { name = "sha.js"; packageName = "sha.js"; @@ -11128,6 +11218,15 @@ let sha512 = "yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw=="; }; }; + "toidentifier-1.0.1" = { + name = "toidentifier"; + packageName = "toidentifier"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz"; + sha512 = "o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA=="; + }; + }; "touch-3.1.0" = { name = "touch"; packageName = "touch"; @@ -11524,13 +11623,13 @@ let sha512 = "3BTV812+AVHHOJQO8O5MkWgZ5aosP7GnROJwvzLS9hWDj00lZ6Z0wNak423Lp9PBZN05N+Jk/N5Si8jRAlGyWA=="; }; }; - "url-parse-1.5.3" = { + "url-parse-1.5.4" = { name = "url-parse"; packageName = "url-parse"; - version = "1.5.3"; + version = "1.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/url-parse/-/url-parse-1.5.3.tgz"; - sha512 = "IIORyIQD9rvj0A4CLWsHkBBJuNqWpFQe224b6j9t/ABmquIS0qDU2pY6kl6AuOrL5OkCXHMCFNe1jBcuAggjvQ=="; + url = "https://registry.npmjs.org/url-parse/-/url-parse-1.5.4.tgz"; + sha512 = "ITeAByWWoqutFClc/lRZnFplgXgEZr3WJ6XngMM/N9DMIm4K8zXPCZ1Jdu0rERwO84w1WC5wkle2ubwTA4NTBg=="; }; }; "url-parse-lax-3.0.0" = { @@ -11722,13 +11821,13 @@ let sha512 = "k8luDIWJWyenLc5ToFQQMaSrqCHiLwyKPHKPQZ5zz21vM+vIVUSvsRpcbiECH4WR88K2XZqc4ScRcZ7nk/jbeA=="; }; }; - "vscode-uri-3.0.2" = { + "vscode-uri-3.0.3" = { name = "vscode-uri"; packageName = "vscode-uri"; - version = "3.0.2"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.0.2.tgz"; - sha512 = "jkjy6pjU1fxUvI51P+gCsxg1u2n8LSt0W6KrCNQceaziKzff74GoWmjVG46KieVzybO1sttPQmYfrwSHey7GUA=="; + url = "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.0.3.tgz"; + sha512 = "EcswR2S8bpR7fD0YPeS7r2xXExrScVMxg4MedACaWHEtx9ftCF/qHG1xGkolzTPcEmjTavCQgbVzHUIdTMzFGA=="; }; }; "watchpack-1.7.5" = { @@ -12784,10 +12883,10 @@ in sources."balanced-match-1.0.2" sources."batch-0.6.1" sources."binary-extensions-2.2.0" - sources."body-parser-1.19.0" + sources."body-parser-1.19.1" sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."bytes-3.1.0" + sources."bytes-3.1.1" (sources."cacheable-request-6.1.0" // { dependencies = [ sources."get-stream-5.2.0" @@ -12801,9 +12900,9 @@ in sources."color-name-1.1.4" sources."commander-5.1.0" sources."concat-map-0.0.1" - sources."content-disposition-0.5.3" + sources."content-disposition-0.5.4" sources."content-type-1.0.4" - sources."cookie-0.4.0" + sources."cookie-0.4.1" sources."cookie-signature-1.0.6" sources."cross-spawn-7.0.3" sources."debug-2.6.9" @@ -12818,7 +12917,7 @@ in sources."end-of-stream-1.4.4" sources."escape-html-1.0.3" sources."etag-1.8.1" - sources."express-4.17.1" + sources."express-4.17.2" (sources."express-ws-4.0.0" // { dependencies = [ sources."ws-5.2.3" @@ -12836,10 +12935,10 @@ in sources."got-9.6.0" sources."has-flag-4.0.0" sources."http-cache-semantics-4.1.0" - sources."http-errors-1.7.2" + sources."http-errors-1.8.1" sources."iconv-lite-0.4.24" sources."inflight-1.0.6" - sources."inherits-2.0.3" + sources."inherits-2.0.4" sources."ini-1.3.8" sources."ipaddr.js-1.9.1" sources."is-binary-path-2.1.0" @@ -12879,31 +12978,32 @@ in sources."prepend-http-2.0.0" sources."proxy-addr-2.0.7" sources."pump-3.0.0" - sources."qs-6.7.0" + sources."qs-6.9.6" sources."range-parser-1.2.1" - sources."raw-body-2.4.0" + sources."raw-body-2.4.2" sources."rc-1.2.8" sources."readdirp-3.6.0" sources."registry-auth-token-4.2.1" sources."registry-url-5.1.0" sources."responselike-1.0.2" sources."rimraf-2.7.1" - sources."safe-buffer-5.1.2" + sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."semver-6.3.0" - (sources."send-0.17.1" // { + (sources."send-0.17.2" // { dependencies = [ - sources."ms-2.1.1" + sources."ms-2.1.3" ]; }) (sources."serve-index-1.9.1" // { dependencies = [ sources."http-errors-1.6.3" + sources."inherits-2.0.3" sources."setprototypeof-1.1.0" ]; }) - sources."serve-static-1.14.1" - sources."setprototypeof-1.1.1" + sources."serve-static-1.14.2" + sources."setprototypeof-1.2.0" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."statuses-1.5.0" @@ -12912,7 +13012,7 @@ in sources."tmp-0.1.0" sources."to-readable-stream-1.0.0" sources."to-regex-range-5.0.1" - sources."toidentifier-1.0.0" + sources."toidentifier-1.0.1" sources."type-is-1.6.18" sources."unpipe-1.0.0" sources."url-parse-lax-3.0.0" @@ -12962,7 +13062,7 @@ in sources."glob-parent-5.1.2" sources."globby-11.0.4" sources."human-signals-2.1.0" - sources."ignore-5.1.9" + sources."ignore-5.2.0" sources."is-binary-path-2.1.0" sources."is-extglob-2.1.1" sources."is-glob-4.0.3" @@ -12999,7 +13099,7 @@ in sources."vscode-languageserver-protocol-3.16.0" sources."vscode-languageserver-textdocument-1.0.2" sources."vscode-languageserver-types-3.16.0" - sources."vscode-uri-3.0.2" + sources."vscode-uri-3.0.3" sources."web-tree-sitter-0.19.4" sources."which-2.0.2" ]; @@ -13209,7 +13309,7 @@ in sources."@types/cacheable-request-6.0.2" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.3" - sources."@types/node-16.11.12" + sources."@types/node-17.0.5" sources."@types/responselike-1.0.0" sources."cacheable-lookup-2.0.1" sources."cacheable-request-7.0.2" @@ -13528,49 +13628,50 @@ in sources."@babel/code-frame-7.16.0" sources."@babel/compat-data-7.16.4" sources."@babel/core-7.12.10" - sources."@babel/generator-7.16.0" + sources."@babel/generator-7.16.5" sources."@babel/helper-annotate-as-pure-7.16.0" - sources."@babel/helper-builder-binary-assignment-operator-visitor-7.16.0" + sources."@babel/helper-builder-binary-assignment-operator-visitor-7.16.5" (sources."@babel/helper-compilation-targets-7.16.3" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/helper-create-class-features-plugin-7.16.0" + sources."@babel/helper-create-class-features-plugin-7.16.5" sources."@babel/helper-create-regexp-features-plugin-7.16.0" + sources."@babel/helper-environment-visitor-7.16.5" sources."@babel/helper-explode-assignable-expression-7.16.0" sources."@babel/helper-function-name-7.16.0" sources."@babel/helper-get-function-arity-7.16.0" sources."@babel/helper-hoist-variables-7.16.0" - sources."@babel/helper-member-expression-to-functions-7.16.0" + sources."@babel/helper-member-expression-to-functions-7.16.5" sources."@babel/helper-module-imports-7.16.0" - sources."@babel/helper-module-transforms-7.16.0" + sources."@babel/helper-module-transforms-7.16.5" sources."@babel/helper-optimise-call-expression-7.16.0" - sources."@babel/helper-plugin-utils-7.14.5" - sources."@babel/helper-remap-async-to-generator-7.16.4" - sources."@babel/helper-replace-supers-7.16.0" + sources."@babel/helper-plugin-utils-7.16.5" + sources."@babel/helper-remap-async-to-generator-7.16.5" + sources."@babel/helper-replace-supers-7.16.5" sources."@babel/helper-simple-access-7.16.0" sources."@babel/helper-skip-transparent-expression-wrappers-7.16.0" sources."@babel/helper-split-export-declaration-7.16.0" sources."@babel/helper-validator-identifier-7.15.7" sources."@babel/helper-validator-option-7.14.5" - sources."@babel/helper-wrap-function-7.16.0" - sources."@babel/helpers-7.16.3" + sources."@babel/helper-wrap-function-7.16.5" + sources."@babel/helpers-7.16.5" sources."@babel/highlight-7.16.0" - sources."@babel/parser-7.16.4" - sources."@babel/plugin-proposal-async-generator-functions-7.16.4" - sources."@babel/plugin-proposal-class-properties-7.16.0" - sources."@babel/plugin-proposal-dynamic-import-7.16.0" - sources."@babel/plugin-proposal-export-namespace-from-7.16.0" - sources."@babel/plugin-proposal-json-strings-7.16.0" - sources."@babel/plugin-proposal-logical-assignment-operators-7.16.0" - sources."@babel/plugin-proposal-nullish-coalescing-operator-7.16.0" - sources."@babel/plugin-proposal-numeric-separator-7.16.0" - sources."@babel/plugin-proposal-object-rest-spread-7.16.0" - sources."@babel/plugin-proposal-optional-catch-binding-7.16.0" - sources."@babel/plugin-proposal-optional-chaining-7.16.0" - sources."@babel/plugin-proposal-private-methods-7.16.0" - sources."@babel/plugin-proposal-unicode-property-regex-7.16.0" + sources."@babel/parser-7.16.6" + sources."@babel/plugin-proposal-async-generator-functions-7.16.5" + sources."@babel/plugin-proposal-class-properties-7.16.5" + sources."@babel/plugin-proposal-dynamic-import-7.16.5" + sources."@babel/plugin-proposal-export-namespace-from-7.16.5" + sources."@babel/plugin-proposal-json-strings-7.16.5" + sources."@babel/plugin-proposal-logical-assignment-operators-7.16.5" + sources."@babel/plugin-proposal-nullish-coalescing-operator-7.16.5" + sources."@babel/plugin-proposal-numeric-separator-7.16.5" + sources."@babel/plugin-proposal-object-rest-spread-7.16.5" + sources."@babel/plugin-proposal-optional-catch-binding-7.16.5" + sources."@babel/plugin-proposal-optional-chaining-7.16.5" + sources."@babel/plugin-proposal-private-methods-7.16.5" + sources."@babel/plugin-proposal-unicode-property-regex-7.16.5" sources."@babel/plugin-syntax-async-generators-7.8.4" sources."@babel/plugin-syntax-class-properties-7.12.13" sources."@babel/plugin-syntax-dynamic-import-7.8.3" @@ -13583,44 +13684,44 @@ in sources."@babel/plugin-syntax-optional-catch-binding-7.8.3" sources."@babel/plugin-syntax-optional-chaining-7.8.3" sources."@babel/plugin-syntax-top-level-await-7.14.5" - sources."@babel/plugin-transform-arrow-functions-7.16.0" - sources."@babel/plugin-transform-async-to-generator-7.16.0" - sources."@babel/plugin-transform-block-scoped-functions-7.16.0" - sources."@babel/plugin-transform-block-scoping-7.16.0" - sources."@babel/plugin-transform-classes-7.16.0" - sources."@babel/plugin-transform-computed-properties-7.16.0" - sources."@babel/plugin-transform-destructuring-7.16.0" - sources."@babel/plugin-transform-dotall-regex-7.16.0" - sources."@babel/plugin-transform-duplicate-keys-7.16.0" - sources."@babel/plugin-transform-exponentiation-operator-7.16.0" - sources."@babel/plugin-transform-for-of-7.16.0" - sources."@babel/plugin-transform-function-name-7.16.0" - sources."@babel/plugin-transform-literals-7.16.0" - sources."@babel/plugin-transform-member-expression-literals-7.16.0" - sources."@babel/plugin-transform-modules-amd-7.16.0" - sources."@babel/plugin-transform-modules-commonjs-7.16.0" - sources."@babel/plugin-transform-modules-systemjs-7.16.0" - sources."@babel/plugin-transform-modules-umd-7.16.0" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.16.0" - sources."@babel/plugin-transform-new-target-7.16.0" - sources."@babel/plugin-transform-object-super-7.16.0" - sources."@babel/plugin-transform-parameters-7.16.3" - sources."@babel/plugin-transform-property-literals-7.16.0" - sources."@babel/plugin-transform-regenerator-7.16.0" - sources."@babel/plugin-transform-reserved-words-7.16.0" + sources."@babel/plugin-transform-arrow-functions-7.16.5" + sources."@babel/plugin-transform-async-to-generator-7.16.5" + sources."@babel/plugin-transform-block-scoped-functions-7.16.5" + sources."@babel/plugin-transform-block-scoping-7.16.5" + sources."@babel/plugin-transform-classes-7.16.5" + sources."@babel/plugin-transform-computed-properties-7.16.5" + sources."@babel/plugin-transform-destructuring-7.16.5" + sources."@babel/plugin-transform-dotall-regex-7.16.5" + sources."@babel/plugin-transform-duplicate-keys-7.16.5" + sources."@babel/plugin-transform-exponentiation-operator-7.16.5" + sources."@babel/plugin-transform-for-of-7.16.5" + sources."@babel/plugin-transform-function-name-7.16.5" + sources."@babel/plugin-transform-literals-7.16.5" + sources."@babel/plugin-transform-member-expression-literals-7.16.5" + sources."@babel/plugin-transform-modules-amd-7.16.5" + sources."@babel/plugin-transform-modules-commonjs-7.16.5" + sources."@babel/plugin-transform-modules-systemjs-7.16.5" + sources."@babel/plugin-transform-modules-umd-7.16.5" + sources."@babel/plugin-transform-named-capturing-groups-regex-7.16.5" + sources."@babel/plugin-transform-new-target-7.16.5" + sources."@babel/plugin-transform-object-super-7.16.5" + sources."@babel/plugin-transform-parameters-7.16.5" + sources."@babel/plugin-transform-property-literals-7.16.5" + sources."@babel/plugin-transform-regenerator-7.16.5" + sources."@babel/plugin-transform-reserved-words-7.16.5" sources."@babel/plugin-transform-runtime-7.12.10" - sources."@babel/plugin-transform-shorthand-properties-7.16.0" - sources."@babel/plugin-transform-spread-7.16.0" - sources."@babel/plugin-transform-sticky-regex-7.16.0" - sources."@babel/plugin-transform-template-literals-7.16.0" - sources."@babel/plugin-transform-typeof-symbol-7.16.0" - sources."@babel/plugin-transform-unicode-escapes-7.16.0" - sources."@babel/plugin-transform-unicode-regex-7.16.0" + sources."@babel/plugin-transform-shorthand-properties-7.16.5" + sources."@babel/plugin-transform-spread-7.16.5" + sources."@babel/plugin-transform-sticky-regex-7.16.5" + sources."@babel/plugin-transform-template-literals-7.16.5" + sources."@babel/plugin-transform-typeof-symbol-7.16.5" + sources."@babel/plugin-transform-unicode-escapes-7.16.5" + sources."@babel/plugin-transform-unicode-regex-7.16.5" sources."@babel/preset-env-7.12.10" sources."@babel/preset-modules-0.1.5" sources."@babel/runtime-7.12.5" sources."@babel/template-7.16.0" - sources."@babel/traverse-7.16.3" + sources."@babel/traverse-7.16.5" sources."@babel/types-7.16.0" sources."@hapi/address-2.1.4" sources."@hapi/bourne-1.3.2" @@ -13631,10 +13732,10 @@ in sources."@nodelib/fs.stat-1.1.3" sources."@types/glob-7.2.0" sources."@types/html-minifier-terser-5.1.2" - sources."@types/http-proxy-1.17.7" + sources."@types/http-proxy-1.17.8" sources."@types/json-schema-7.0.9" sources."@types/minimatch-3.0.5" - sources."@types/node-16.11.12" + sources."@types/node-17.0.5" sources."@types/parse-json-4.0.0" sources."@types/q-1.5.5" sources."@types/source-list-map-0.1.2" @@ -13757,12 +13858,12 @@ in sources."bindings-1.5.0" sources."bluebird-3.7.2" sources."bn.js-5.2.0" - (sources."body-parser-1.19.0" // { + (sources."body-parser-1.19.1" // { dependencies = [ - sources."bytes-3.1.0" + sources."bytes-3.1.1" sources."debug-2.6.9" sources."ms-2.0.0" - sources."qs-6.7.0" + sources."qs-6.9.6" ]; }) (sources."bonjour-3.5.0" // { @@ -13785,7 +13886,7 @@ in ]; }) sources."browserify-zlib-0.2.0" - sources."browserslist-4.18.1" + sources."browserslist-4.19.1" sources."buffer-4.9.2" sources."buffer-from-1.1.2" sources."buffer-indexof-1.1.1" @@ -13802,7 +13903,7 @@ in sources."camel-case-4.1.2" sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001286" + sources."caniuse-lite-1.0.30001294" sources."case-sensitive-paths-webpack-plugin-2.3.0" sources."caseless-0.12.0" (sources."chalk-2.4.2" // { @@ -13878,10 +13979,14 @@ in sources."connect-history-api-fallback-1.6.0" sources."console-browserify-1.2.0" sources."constants-browserify-1.0.0" - sources."content-disposition-0.5.3" + (sources."content-disposition-0.5.4" // { + dependencies = [ + sources."safe-buffer-5.2.1" + ]; + }) sources."content-type-1.0.4" sources."convert-source-map-1.8.0" - sources."cookie-0.4.0" + sources."cookie-0.4.1" sources."cookie-signature-1.0.6" sources."copy-concurrently-1.0.5" sources."copy-descriptor-0.1.1" @@ -13897,7 +14002,7 @@ in ]; }) sources."core-js-2.6.12" - (sources."core-js-compat-3.19.3" // { + (sources."core-js-compat-3.20.1" // { dependencies = [ sources."semver-7.0.0" ]; @@ -13924,7 +14029,7 @@ in sources."yallist-4.0.0" ]; }) - sources."css-select-4.1.3" + sources."css-select-4.2.1" sources."css-select-base-adapter-0.1.1" (sources."css-tree-1.0.0-alpha.37" // { dependencies = [ @@ -13998,7 +14103,7 @@ in sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.16" + sources."electron-to-chromium-1.4.30" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -14083,12 +14188,13 @@ in ]; }) sources."expand-tilde-2.0.2" - (sources."express-4.17.1" // { + (sources."express-4.17.2" // { dependencies = [ sources."array-flatten-1.1.1" sources."debug-2.6.9" sources."ms-2.0.0" - sources."qs-6.7.0" + sources."qs-6.9.6" + sources."safe-buffer-5.2.1" ]; }) sources."extend-3.0.2" @@ -14249,11 +14355,7 @@ in sources."html-webpack-plugin-4.5.0" sources."htmlparser2-6.1.0" sources."http-deceiver-1.2.7" - (sources."http-errors-1.7.2" // { - dependencies = [ - sources."inherits-2.0.3" - ]; - }) + sources."http-errors-1.8.1" sources."http-parser-js-0.5.5" sources."http-proxy-1.18.1" sources."http-proxy-middleware-0.21.0" @@ -14476,7 +14578,7 @@ in sources."kind-of-3.2.2" ]; }) - sources."object-inspect-1.11.1" + sources."object-inspect-1.12.0" sources."object-is-1.1.5" sources."object-keys-1.1.1" sources."object-visit-1.0.1" @@ -14681,10 +14783,10 @@ in }) (sources."postcss-safe-parser-5.0.2" // { dependencies = [ - sources."postcss-8.4.4" + sources."postcss-8.4.5" ]; }) - sources."postcss-selector-parser-6.0.7" + sources."postcss-selector-parser-6.0.8" (sources."postcss-svgo-4.0.3" // { dependencies = [ sources."postcss-value-parser-3.3.1" @@ -14725,9 +14827,9 @@ in sources."randombytes-2.1.0" sources."randomfill-1.0.4" sources."range-parser-1.2.1" - (sources."raw-body-2.4.0" // { + (sources."raw-body-2.4.2" // { dependencies = [ - sources."bytes-3.1.0" + sources."bytes-3.1.1" ]; }) (sources."react-dev-utils-6.1.1" // { @@ -14833,14 +14935,14 @@ in sources."select-hose-2.0.0" sources."selfsigned-1.10.11" sources."semver-5.7.1" - (sources."send-0.17.1" // { + (sources."send-0.17.2" // { dependencies = [ (sources."debug-2.6.9" // { dependencies = [ sources."ms-2.0.0" ]; }) - sources."ms-2.1.1" + sources."ms-2.1.3" ]; }) sources."serialize-javascript-4.0.0" @@ -14853,7 +14955,7 @@ in sources."setprototypeof-1.1.0" ]; }) - sources."serve-static-1.14.1" + sources."serve-static-1.14.2" sources."set-blocking-2.0.0" (sources."set-value-2.0.1" // { dependencies = [ @@ -14861,7 +14963,7 @@ in ]; }) sources."setimmediate-1.0.5" - sources."setprototypeof-1.1.1" + sources."setprototypeof-1.2.0" sources."sha.js-2.4.11" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" @@ -15050,7 +15152,7 @@ in }) sources."to-regex-3.0.2" sources."to-regex-range-5.0.1" - sources."toidentifier-1.0.0" + sources."toidentifier-1.0.1" sources."tough-cookie-2.5.0" sources."tslib-2.3.1" sources."tty-browserify-0.0.0" @@ -15124,7 +15226,7 @@ in sources."schema-utils-3.1.1" ]; }) - sources."url-parse-1.5.3" + sources."url-parse-1.5.4" sources."use-3.1.1" (sources."util-0.11.1" // { dependencies = [ @@ -15394,7 +15496,7 @@ in sources."@types/cacheable-request-6.0.2" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.3" - sources."@types/node-16.11.12" + sources."@types/node-17.0.5" sources."@types/responselike-1.0.0" (sources."ansi-escapes-4.3.2" // { dependencies = [ diff --git a/pkgs/development/compilers/fstar/default.nix b/pkgs/development/compilers/fstar/default.nix index 97fa1dbe3d6..43bdbda8184 100644 --- a/pkgs/development/compilers/fstar/default.nix +++ b/pkgs/development/compilers/fstar/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fstar"; - version = "2021.11.27"; + version = "2021.12.25"; src = fetchFromGitHub { owner = "FStarLang"; repo = "FStar"; rev = "v${version}"; - sha256 = "sha256-OpY7vDb37ym4srsmD+deXiuofUJKRyKXG7g3zsJKvHo="; + sha256 = "RmXKv/admC1w26z/ClNhH11J8n87WTfDr2lYOF6Fx7I="; }; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/pkgs/development/compilers/gleam/default.nix b/pkgs/development/compilers/gleam/default.nix index f9f0396ef07..e766683f022 100644 --- a/pkgs/development/compilers/gleam/default.nix +++ b/pkgs/development/compilers/gleam/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "gleam"; - version = "0.18.0"; + version = "0.18.2"; src = fetchFromGitHub { owner = "gleam-lang"; repo = pname; rev = "v${version}"; - sha256 = "sha256-S7PYN0iiSXEApIG0Tyb/PJmKjHzjz3S+ToDy+pwPK18="; + sha256 = "sha256-uakZmaIkBgC/FTQ7us58pJT6IzpcF1cQxBfehlB3bWk="; }; nativeBuildInputs = [ pkg-config ]; @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security libiconv ]; - cargoSha256 = "sha256-Q5WyKQ4HFOIL1KAQ0QvAbZfy+WRAWf9HxSvSabSz4W4="; + cargoSha256 = "sha256-NogDrd7YWl/CV0aCd1jfYWYB9VZG7u890VLEktI3sOQ="; meta = with lib; { description = "A statically typed language for the Erlang VM"; diff --git a/pkgs/development/interpreters/clojure/babashka.nix b/pkgs/development/interpreters/clojure/babashka.nix index ffb33713a91..93755e83a3d 100644 --- a/pkgs/development/interpreters/clojure/babashka.nix +++ b/pkgs/development/interpreters/clojure/babashka.nix @@ -2,11 +2,11 @@ buildGraalvmNativeImage rec { pname = "babashka"; - version = "0.7.0"; + version = "0.7.3"; src = fetchurl { url = "https://github.com/babashka/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; - sha256 = "sha256-zSjiHacetJ68U0GciIbuGET9I/51EM8JnPPUGemDfEI="; + sha256 = "sha256-zbxFMc02hbsU2ERlUzqMBHwHYfORB7TkMINrKC52PPU="; }; executable = "bb"; diff --git a/pkgs/development/interpreters/kona/default.nix b/pkgs/development/interpreters/kona/default.nix index ff5929745ba..24e10eb7306 100644 --- a/pkgs/development/interpreters/kona/default.nix +++ b/pkgs/development/interpreters/kona/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "kona"; - version = "20201009"; + version = "20211225"; src = fetchFromGitHub { owner = "kevinlawler"; repo = "kona"; rev = "Win64-${version}"; - sha256 = "0v252zds61y01cf29hxznz1zc1724vxmzy059k9jiri4r73k679v"; + sha256 = "sha256-m3a9conyKN0qHSSAG8zAb3kx8ir+7dqgxm1XGjCQcfk="; }; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/development/libraries/intel-gmmlib/default.nix b/pkgs/development/libraries/intel-gmmlib/default.nix index 59aaeb6ad92..644975ca66c 100644 --- a/pkgs/development/libraries/intel-gmmlib/default.nix +++ b/pkgs/development/libraries/intel-gmmlib/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "intel-gmmlib"; - version = "21.3.3"; + version = "22.0.1"; src = fetchFromGitHub { owner = "intel"; repo = "gmmlib"; rev = "intel-gmmlib-${version}"; - sha256 = "0hvly3fykhy4m7mzaa7xadaz7jz8krnfgj3zgzl2a2rpzja6frdn"; + sha256 = "1s46vwcs26hdlsa8h51gq4fyi9i8k5hrcx5ffbv9g7v3x706nplf"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/intel-media-driver/default.nix b/pkgs/development/libraries/intel-media-driver/default.nix index 689a70a320d..d76a58fc633 100644 --- a/pkgs/development/libraries/intel-media-driver/default.nix +++ b/pkgs/development/libraries/intel-media-driver/default.nix @@ -7,13 +7,14 @@ , libva , libpciaccess , intel-gmmlib +, libdrm , enableX11 ? stdenv.isLinux , libX11 }: stdenv.mkDerivation rec { pname = "intel-media-driver"; - version = "21.4.3"; + version = "22.1.0"; outputs = [ "out" "dev" ]; @@ -21,7 +22,7 @@ stdenv.mkDerivation rec { owner = "intel"; repo = "media-driver"; rev = "intel-media-${version}"; - sha256 = "04r03f48j1nly0j6aq8017va9m3yrnscv6lbrvf3a98fpwk9gc1l"; + sha256 = "0giba5274kzpjb5rp3d9bbnvcz7fp8ybi4s3hha2idxk0l5yamf1"; }; patches = [ @@ -43,7 +44,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ libva libpciaccess intel-gmmlib ] + buildInputs = [ libva libpciaccess intel-gmmlib libdrm ] ++ lib.optional enableX11 libX11; postFixup = lib.optionalString enableX11 '' diff --git a/pkgs/development/libraries/jemalloc/common.nix b/pkgs/development/libraries/jemalloc/common.nix deleted file mode 100644 index 5abde13a2e6..00000000000 --- a/pkgs/development/libraries/jemalloc/common.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ version, sha256 }: -{ lib, stdenv, fetchurl -, fetchpatch -# By default, jemalloc puts a je_ prefix onto all its symbols on OSX, which -# then stops downstream builds (mariadb in particular) from detecting it. This -# option should remove the prefix and give us a working jemalloc. -# Causes segfaults with some software (ex. rustc), but defaults to true for backward -# compatibility. -, stripPrefix ? stdenv.hostPlatform.isDarwin -, disableInitExecTls ? false -}: - -with lib; - -stdenv.mkDerivation rec { - pname = "jemalloc"; - inherit version; - - src = fetchurl { - url = "https://github.com/jemalloc/jemalloc/releases/download/${version}/${pname}-${version}.tar.bz2"; - inherit sha256; - }; - - patches = [ - # workaround https://github.com/jemalloc/jemalloc/issues/2091 - (fetchpatch { - url = "https://github.com/jemalloc/jemalloc/commit/3b4a03b92b2e415415a08f0150fdb9eeb659cd52.diff"; - sha256 = "sha256-6AYtADREhfj93ZLk9xnXtjc6vHDU0EKLLOvLd6YdJeI="; - }) - ]; - - # see the comment on stripPrefix - configureFlags = [] - ++ optional stripPrefix "--with-jemalloc-prefix=" - ++ optional disableInitExecTls "--disable-initial-exec-tls" - # jemalloc is unable to correctly detect transparent hugepage support on - # ARM (https://github.com/jemalloc/jemalloc/issues/526), and the default - # kernel ARMv6/7 kernel does not enable it, so we explicitly disable support - ++ optionals (stdenv.isAarch32 && versionOlder version "5") [ - "--disable-thp" - "je_cv_thp=no" - ] - ; - - doCheck = true; - - enableParallelBuilding = true; - - meta = with lib; { - homepage = "http://jemalloc.net"; - description = "General purpose malloc(3) implementation"; - longDescription = '' - malloc(3)-compatible memory allocator that emphasizes fragmentation - avoidance and scalable concurrency support. - ''; - license = licenses.bsd2; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/jemalloc/default.nix b/pkgs/development/libraries/jemalloc/default.nix index 9324279ed10..8ed9219fb7b 100644 --- a/pkgs/development/libraries/jemalloc/default.nix +++ b/pkgs/development/libraries/jemalloc/default.nix @@ -1,4 +1,58 @@ -import ./common.nix { +{ lib +, stdenv +, fetchurl +, fetchpatch +# By default, jemalloc puts a je_ prefix onto all its symbols on OSX, which +# then stops downstream builds (mariadb in particular) from detecting it. This +# option should remove the prefix and give us a working jemalloc. +# Causes segfaults with some software (ex. rustc), but defaults to true for backward +# compatibility. +, stripPrefix ? stdenv.hostPlatform.isDarwin +, disableInitExecTls ? false +}: + +stdenv.mkDerivation rec { + pname = "jemalloc"; version = "5.2.1"; - sha256 = "1xl7z0vwbn5iycg7amka9jd6hxd8nmfk7nahi4p9w2bnw9f0wcrl"; + + src = fetchurl { + url = "https://github.com/jemalloc/jemalloc/releases/download/${version}/${pname}-${version}.tar.bz2"; + sha256 = "1xl7z0vwbn5iycg7amka9jd6hxd8nmfk7nahi4p9w2bnw9f0wcrl"; + }; + + patches = [ + # workaround https://github.com/jemalloc/jemalloc/issues/2091 + (fetchpatch { + url = "https://github.com/jemalloc/jemalloc/commit/3b4a03b92b2e415415a08f0150fdb9eeb659cd52.diff"; + sha256 = "sha256-6AYtADREhfj93ZLk9xnXtjc6vHDU0EKLLOvLd6YdJeI="; + }) + ]; + + # see the comment on stripPrefix + configureFlags = [] + ++ lib.optional stripPrefix "--with-jemalloc-prefix=" + ++ lib.optional disableInitExecTls "--disable-initial-exec-tls" + # jemalloc is unable to correctly detect transparent hugepage support on + # ARM (https://github.com/jemalloc/jemalloc/issues/526), and the default + # kernel ARMv6/7 kernel does not enable it, so we explicitly disable support + ++ lib.optionals (stdenv.isAarch32 && lib.versionOlder version "5") [ + "--disable-thp" + "je_cv_thp=no" + ] + ; + + doCheck = true; + + enableParallelBuilding = true; + + meta = with lib; { + homepage = "http://jemalloc.net"; + description = "General purpose malloc(3) implementation"; + longDescription = '' + malloc(3)-compatible memory allocator that emphasizes fragmentation + avoidance and scalable concurrency support. + ''; + license = licenses.bsd2; + platforms = platforms.all; + }; } diff --git a/pkgs/development/libraries/jemalloc/jemalloc450.nix b/pkgs/development/libraries/jemalloc/jemalloc450.nix deleted file mode 100644 index 85b4fb100f7..00000000000 --- a/pkgs/development/libraries/jemalloc/jemalloc450.nix +++ /dev/null @@ -1,4 +0,0 @@ -import ./common.nix { - version = "4.5.0"; - sha256 = "10373xhpc10pgmai9fkc1z0rs029qlcb3c0qfnvkbwdlcibdh2cl"; -} diff --git a/pkgs/development/libraries/libplctag/default.nix b/pkgs/development/libraries/libplctag/default.nix index 5276b8523d6..334fc61fc3d 100644 --- a/pkgs/development/libraries/libplctag/default.nix +++ b/pkgs/development/libraries/libplctag/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "libplctag"; - version = "2.4.7"; + version = "2.4.8"; src = fetchFromGitHub { owner = "libplctag"; repo = "libplctag"; rev = "v${version}"; - sha256 = "sha256-DLx9VBmyn5L30i6qPK4LD+3cOo7zG2YLOui6+krU9So="; + sha256 = "sha256-GVYG+ioqGo0k6ClrJu2mijtuBBFc9l6dNexNDNyh5+8="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/v8/plv8_6_x.nix b/pkgs/development/libraries/v8/plv8_6_x.nix deleted file mode 100644 index 71e14a82c3e..00000000000 --- a/pkgs/development/libraries/v8/plv8_6_x.nix +++ /dev/null @@ -1,189 +0,0 @@ -# NOTE: this expression is NOT exported from the top-level of all-packages.nix, -# it is exclusively used by the 'plv8' PostgreSQL extension. -# Since plv8 2.3.2, plv8 no longer requires this specific version, but as of -# 2019-08-29, nixpkgs does not have v8 6.x, and v8_5 is bumped to 5.4.232, which -# is a bit outdated. plv8 3.x is planned to support v8 7.x - -{ stdenv, lib, fetchgit, fetchFromGitHub, gn, ninja, python, glib, pkg-config -, doCheck ? false -, snapshot ? true -}: - -let - arch = if stdenv.isAarch32 - then if stdenv.is64bit - then"arm64" - else "arm" - else if stdenv.is64bit - then"x64" - else "ia32"; - git_url = "https://chromium.googlesource.com"; - - # This data is from the DEPS file in the root of a V8 checkout - deps = { - "base/trace_event/common" = fetchgit { - url = "${git_url}/chromium/src/base/trace_event/common.git"; - rev = "0e9a47d74970bee1bbfc063c47215406f8918699"; - sha256 = "07rbzrlscp8adh4z86yl5jxdnvgkc3xs950xldpk318wf9i3bh6c"; - }; - build = fetchgit { - url = "${git_url}/chromium/src/build.git"; - rev = "9338ce52d0b9bcef34c38285fbd5023b62739fac"; - sha256 = "1s2sa8dy3waidsirjylc82ggb18l1108bczjc8z0v4ywyj4k0cvh"; - }; - buildtools = fetchgit { - url = "${git_url}/chromium/buildtools.git"; - rev = "505de88083136eefd056e5ee4ca0f01fe9b33de8"; - sha256 = "0vj216nhb803bggsl0hnyagj8njrm96pn8sim6xcnqb7nhz1vabw"; - }; - "test/benchmarks/data" = fetchgit { - url = "${git_url}/v8/deps/third_party/benchmarks.git"; - rev = "05d7188267b4560491ff9155c5ee13e207ecd65f"; - sha256 = "0ad2ay14bn67d61ks4dmzadfnhkj9bw28r4yjdjjyzck7qbnzchl"; - }; - "test/mozilla/data" = fetchgit { - url = "${git_url}/v8/deps/third_party/mozilla-tests.git"; - rev = "f6c578a10ea707b1a8ab0b88943fe5115ce2b9be"; - sha256 = "0rfdan76yfawqxbwwb35aa57b723j3z9fx5a2w16nls02yk2kqyn"; - }; - "test/test262/data" = fetchgit { - url = "${git_url}/external/github.com/tc39/test262.git"; - rev = "5d4c667b271a9b39d0de73aef5ffe6879c6f8811"; - sha256 = "0q9iwb2nkybf9np95wgf5m372aw2lhx9wlsw41a2a80kbkvb2kqg"; - }; - "test/test262/harness" = fetchgit { - url = "${git_url}/external/github.com/test262-utils/test262-harness-py.git"; - rev = "0f2acdd882c84cff43b9d60df7574a1901e2cdcd"; - sha256 = "00brj5avp43yamc92kinba2mg3a2x1rcd7wnm7z093l73idprvkp"; - }; - "test/wasm-js" = fetchgit { - url = "${git_url}/external/github.com/WebAssembly/spec.git"; - rev = "a7e226a92e660a3d5413cfea4269824f513259d2"; - sha256 = "0z3aybj3ykajwh2bv5fwd6pwqjjsq8dnwrqc2wncb6r9xcjwbgxp"; - }; - "testing/gtest" = fetchgit { - url = "${git_url}/external/github.com/google/googletest.git"; - rev = "6f8a66431cb592dad629028a50b3dd418a408c87"; - sha256 = "0bdba2lr6pg15bla9600zg0r0vm4lnrx0wqz84p376wfdxra24vw"; - }; - "third_party/icu" = fetchgit { - url = "${git_url}/chromium/deps/icu.git"; - rev = "741688ebf328da9adc52505248bf4e2ef868722c"; - sha256 = "02ifm18qjlrkn5nm2rxkf9yz9bdlyq7c65jfjndv63vi1drqh1r9"; - }; - "third_party/instrumented_libraries" = fetchgit { - url = "${git_url}/chromium/src/third_party/instrumented_libraries.git"; - rev = "28417458ac4dc79f68915079d0f283f682504cc0"; - sha256 = "1qf5c2946n37p843yriv7xawi6ss6samabghq43s49cgd4wq8dc3"; - }; - "third_party/jinja2" = fetchgit { - url = "${git_url}/chromium/src/third_party/jinja2.git"; - rev = "d34383206fa42d52faa10bb9931d6d538f3a57e0"; - sha256 = "0d9hyw0bvp3p0dbwy833cm9vdqxcam0qbm9jc561ynphddxlkmgd"; - }; - "third_party/markupsafe" = fetchgit { - url = "${git_url}/chromium/src/third_party/markupsafe.git"; - rev = "8f45f5cfa0009d2a70589bcda0349b8cb2b72783"; - sha256 = "168ppjmicfdh4i1l0l25s86mdbrz9fgxmiq1rx33x79mph41scfz"; - }; - "tools/clang" = fetchgit { - url = "${git_url}/chromium/src/tools/clang.git"; - rev = "8688d267571de76a56746324dcc249bf4232b85a"; - sha256 = "0krq4zz1vnwp064bm517gwr2napy18wyccdh8w5s4qgkjwwxd63s"; - }; - "tools/gyp" = fetchgit { - url = "${git_url}/external/gyp.git"; - rev = "d61a9397e668fa9843c4aa7da9e79460fe590bfb"; - sha256 = "1z081h72mjy285jb1kj5xd0pb4p12n9blvsimsavyn3ldmswv0r0"; - }; - "tools/luci-go" = fetchgit { - url = "${git_url}/chromium/src/tools/luci-go.git"; - rev = "45a8a51fda92e123619a69e7644d9c64a320b0c1"; - sha256 = "0r7736gqk7r0i7ig0b5ib10d9q8a8xzsmc0f0fbkm9k78v847vpj"; - }; - "tools/swarming_client" = fetchgit { - url = "${git_url}/infra/luci/client-py.git"; - rev = "4bd9152f8a975d57c972c071dfb4ddf668e02200"; - sha256 = "03zk91gzvqv01g1vbl8d7h8al7vs4ymrrdc8ipg9wpq52yh65smh"; - }; - }; - -in - -stdenv.mkDerivation rec { - pname = "v8"; - version = "6.4.388.40"; - - inherit doCheck; - - src = fetchFromGitHub { - owner = "v8"; - repo = "v8"; - rev = version; - sha256 = "1lq239cgqyidrynz8g3wbdv70ymzv6s0ppad8s219gb3jnizm16a"; - }; - - postUnpack = '' - ${lib.concatStringsSep "\n" ( - lib.mapAttrsToList (n: v: '' - mkdir -p $sourceRoot/${n} - cp -r ${v}/* $sourceRoot/${n} - '') deps)} - ''; - - prePatch = '' - # use our gn, not the bundled one - sed -i -e 's#gn_path = .*#gn_path = "${gn}/bin/gn"#' tools/mb/mb.py - - # disable tests - if [ "$doCheck" = "" ]; then sed -i -e '/"test:gn_all",/d' BUILD.gn; fi - - # disable sysroot usage - chmod u+w build/config build/config/sysroot.gni - sed -i build/config/sysroot.gni \ - -e '/use_sysroot =/ { s#\(use_sysroot =\).*#\1 false#; :a n; /current_cpu/ { s/^/#/; ba }; }' - - # patch shebangs (/usr/bin/env) - patchShebangs tools/dev/v8gen.py - ''; - - configurePhase = '' - tools/dev/v8gen.py -vv ${arch}.release -- \ - is_component_build=true \ - ${if snapshot then "v8_use_external_startup_data=false" else "v8_use_snapshot=false"} \ - is_clang=false \ - linux_use_bundled_binutils=false \ - treat_warnings_as_errors=false \ - use_custom_libcxx=false \ - use_custom_libcxx_for_host=false - ''; - - nativeBuildInputs = [ gn ninja pkg-config ]; - buildInputs = [ python glib ]; - - buildPhase = '' - ninja -C out.gn/${arch}.release/ - ''; - - enableParallelBuilding = true; - - installPhase = '' - install -vD out.gn/${arch}.release/d8 "$out/bin/d8" - install -vD out.gn/${arch}.release/mksnapshot "$out/bin/mksnapshot" - mkdir -p "$out/lib" - for f in libicui18n.so libicuuc.so libv8_libbase.so libv8_libplatform.so libv8.so; do - install -vD out.gn/${arch}.release/$f "$out/lib/$f" - done - install -vD out.gn/${arch}.release/icudtl.dat "$out/lib/icudtl.dat" - mkdir -p "$out/include" - cp -vr include/*.h "$out/include" - cp -vr include/libplatform "$out/include" - ''; - - meta = with lib; { - description = "Google's open source JavaScript engine"; - maintainers = with maintainers; [ cstrahan proglodyte ]; - platforms = platforms.linux; - license = licenses.bsd3; - }; -} diff --git a/pkgs/development/python-modules/Nikola/default.nix b/pkgs/development/python-modules/Nikola/default.nix index 364e50c1024..faa17a83839 100644 --- a/pkgs/development/python-modules/Nikola/default.nix +++ b/pkgs/development/python-modules/Nikola/default.nix @@ -41,12 +41,12 @@ buildPythonPackage rec { pname = "Nikola"; - version = "8.1.3"; + version = "8.2.0"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "05eac356bb4273cdd05d2dd6ad676226133496c457af91987c3f0d40e2fe57ef"; + sha256 = "9998fedfcb932e19e3b54faeb497a49cde8b15163af764c5afe5847fef5ec1ff"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/actdiag/default.nix b/pkgs/development/python-modules/actdiag/default.nix index c1ab1843eb3..dd0a1c20cc7 100644 --- a/pkgs/development/python-modules/actdiag/default.nix +++ b/pkgs/development/python-modules/actdiag/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "actdiag"; - version = "2.0.0"; + version = "3.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "blockdiag"; repo = pname; rev = version; - sha256 = "sha256-pTWunoc6T1m+4SOe0ob0ac4ZwwXsYNZwkdwVtlMZrIo="; + sha256 = "sha256-WmprkHOgvlsOIg8H77P7fzEqxGnj6xaL7Df7urRkg3o="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aiohttp-socks/default.nix b/pkgs/development/python-modules/aiohttp-socks/default.nix index 4e75f56a8da..e782eed49b7 100644 --- a/pkgs/development/python-modules/aiohttp-socks/default.nix +++ b/pkgs/development/python-modules/aiohttp-socks/default.nix @@ -2,18 +2,19 @@ buildPythonPackage rec { pname = "aiohttp-socks"; - version = "0.6.0"; + version = "0.7.1"; src = fetchPypi { inherit version; pname = "aiohttp_socks"; - sha256 = "04w010bvi719ifpc3sshav95k10hf9nq8czn9yglkj206yxcypdr"; + sha256 = "sha256-IhXKxIke8/oUt9YA7TQ+0PCmcMI7EOQUKqhis9sgNBo="; }; propagatedBuildInputs = [ aiohttp attrs python-socks ]; # Checks needs internet access doCheck = false; + pythonImportsCheck = [ "aiohttp_socks" ]; disabled = pythonOlder "3.5.3"; diff --git a/pkgs/development/python-modules/aiomusiccast/default.nix b/pkgs/development/python-modules/aiomusiccast/default.nix index 704315b225e..6d1116bfefa 100644 --- a/pkgs/development/python-modules/aiomusiccast/default.nix +++ b/pkgs/development/python-modules/aiomusiccast/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "aiomusiccast"; - version = "0.14.2"; + version = "0.14.3"; format = "pyproject"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "vigonotion"; repo = "aiomusiccast"; rev = version; - sha256 = "sha256-5xIz36FgNwcaesmkYp3EWTxCe/8RaUJOJW9dqK+eang="; + hash = "sha256-ELdNxeU9dajWr4VeOyuvNrSi7B+ImVJM/BlZsw3tcKE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/av/default.nix b/pkgs/development/python-modules/av/default.nix index bf21025e862..c79dc8b3fcb 100644 --- a/pkgs/development/python-modules/av/default.nix +++ b/pkgs/development/python-modules/av/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "av"; - version = "8.0.3"; + version = "8.1.0"; disabled = isPy27; # setup.py no longer compatible src = fetchPypi { inherit pname version; - sha256 = "521814309c91d526b6b5c9517018aef2dd12bc3d86351037db69aa67730692b8"; + sha256 = "0402169bc27e38e0f44e0e0e1854cf488337e86206b6d25d6dae2bfd7a1a0230"; }; checkInputs = [ numpy ]; diff --git a/pkgs/development/python-modules/blinkpy/default.nix b/pkgs/development/python-modules/blinkpy/default.nix index c427886a032..572dbad932b 100644 --- a/pkgs/development/python-modules/blinkpy/default.nix +++ b/pkgs/development/python-modules/blinkpy/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "blinkpy"; - version = "0.17.1"; + version = "0.18.0"; src = fetchFromGitHub { owner = "fronzbot"; repo = "blinkpy"; rev = "v${version}"; - sha256 = "11h4r2vkrlxwjig1lay1n5wpny5isfgz85f7lsn8ndnqa2wpsymp"; + hash = "sha256-96HoGXVQE5PbUbu0oDOC0es0HXYig4ScTeexiUhGse4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/brother-ql/default.nix b/pkgs/development/python-modules/brother-ql/default.nix new file mode 100644 index 00000000000..891791dfecb --- /dev/null +++ b/pkgs/development/python-modules/brother-ql/default.nix @@ -0,0 +1,37 @@ +{ stdenv +, fetchPypi +, buildPythonPackage +, future +, packbits +, pillow +, pyusb +, pytest +, mock +, click +, attrs +, lib +}: + +buildPythonPackage rec { + pname = "brother-ql"; + version = "0.9.4"; + + src = fetchPypi { + pname = "brother_ql"; + inherit version; + sha256 = "sha256-H1xXoDnwEsnCBDl/RwAB9267dINCHr3phdDLPGFOhmA="; + }; + + propagatedBuildInputs = [ future packbits pillow pyusb click attrs ]; + + meta = with lib; { + description = "Python package for the raster language protocol of the Brother QL series label printers"; + longDescription = '' + Python package for the raster language protocol of the Brother QL series label printers + (QL-500, QL-550, QL-570, QL-700, QL-710W, QL-720NW, QL-800, QL-820NWB, QL-1050 and more) + ''; + homepage = "https://github.com/pklaus/brother_ql"; + license = licenses.gpl3; + maintainers = with maintainers; [ grahamc ]; + }; +} diff --git a/pkgs/development/python-modules/django-statici18n/default.nix b/pkgs/development/python-modules/django-statici18n/default.nix index 7282cf3b987..78c807903c4 100644 --- a/pkgs/development/python-modules/django-statici18n/default.nix +++ b/pkgs/development/python-modules/django-statici18n/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "django-statici18n"; - version = "2.1.1"; + version = "2.2.0"; src = fetchPypi { inherit pname version; - sha256 = "5c85192fa95e3ef3727517ac104add8959fc0a54be3d13440a8a3319fddbc778"; + sha256 = "dbcdac190d93e0b4eabcab8875c8eb68795eceb442f926843ec5cbe1432fe628"; }; propagatedBuildInputs = [ django django_appconf ]; diff --git a/pkgs/development/python-modules/filebrowser_safe/default.nix b/pkgs/development/python-modules/filebrowser_safe/default.nix index 0ffc8a06b52..d571f76f922 100644 --- a/pkgs/development/python-modules/filebrowser_safe/default.nix +++ b/pkgs/development/python-modules/filebrowser_safe/default.nix @@ -5,12 +5,12 @@ }: buildPythonPackage rec { - version = "1.0.0"; + version = "1.1.0"; pname = "filebrowser_safe"; src = fetchPypi { inherit pname version; - sha256 = "1209a26abd5a085a6453e020513fd94e920bde3908a2bcf3fe0ad5e4292b943b"; + sha256 = "14b6e0af9697f1d0f08508cc88bc8459273cd6453636cebe8504dccc80e926e4"; }; buildInputs = [ django ]; diff --git a/pkgs/development/python-modules/goodwe/default.nix b/pkgs/development/python-modules/goodwe/default.nix index 855c7f3f81d..567ffef56e6 100644 --- a/pkgs/development/python-modules/goodwe/default.nix +++ b/pkgs/development/python-modules/goodwe/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "goodwe"; - version = "0.2.8"; + version = "0.2.9"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "marcelblijleven"; repo = pname; rev = "v${version}"; - sha256 = "0ij87hyfv4c93nb4irpxax8p1i6swnm8b6ncs70s6z5sk7ipp663"; + sha256 = "0l895nyq2g7isvim2fx4ivdh3xzhyc10yzqvqnlg3fr56l5srfch"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/greeclimate/default.nix b/pkgs/development/python-modules/greeclimate/default.nix index 3beb08f1bd0..5f72411e9e8 100644 --- a/pkgs/development/python-modules/greeclimate/default.nix +++ b/pkgs/development/python-modules/greeclimate/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "greeclimate"; - version = "1.0.0"; + version = "1.0.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,8 +18,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "cmroche"; repo = "greeclimate"; - rev = version; - sha256 = "sha256-zaa3Z6w1BdmOV1otoewc1Zpvltnn5QDJHkAVldZCQlY="; + rev = "v${version}"; + hash = "sha256-O9SaEveZntb7VWL5k1WjTDK9fXhTWFIsVh5v7NKASnQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/matrix-nio/default.nix b/pkgs/development/python-modules/matrix-nio/default.nix index 96f333fcf8a..69721aeb828 100644 --- a/pkgs/development/python-modules/matrix-nio/default.nix +++ b/pkgs/development/python-modules/matrix-nio/default.nix @@ -41,12 +41,14 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ --replace 'aiofiles = "^0.6.0"' 'aiofiles = "*"' + # Remove after https://github.com/poljar/matrix-nio/pull/288 + substituteInPlace pyproject.toml \ + --replace 'aiohttp-socks = "^0.6.0"' 'aiohttp-socks = "^0.7.0"' ''; nativeBuildInputs = [ git poetry-core - pytestCheckHook ]; propagatedBuildInputs = [ @@ -73,8 +75,11 @@ buildPythonPackage rec { hypothesis pytest-aiohttp pytest-benchmark + pytestCheckHook ]; + pytestFlagsArray = [ "--benchmark-disable" ]; + disabledTests = [ # touches network "test_connect_wrapper" diff --git a/pkgs/development/python-modules/meshtastic/default.nix b/pkgs/development/python-modules/meshtastic/default.nix index 0a76bb815cc..359bed40b1e 100644 --- a/pkgs/development/python-modules/meshtastic/default.nix +++ b/pkgs/development/python-modules/meshtastic/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "meshtastic"; - version = "1.2.47"; + version = "1.2.48"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "meshtastic"; repo = "Meshtastic-python"; rev = version; - sha256 = "sha256-Qa1Rvr4aZuCe1VqfjzoUvFFYOvqmC4HdKQzRPnbJGaM="; + sha256 = "sha256-hf+9WmYLRN53cSipNRA+mRYzSLu6NAO6HSQ3NOeCPM8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mocket/default.nix b/pkgs/development/python-modules/mocket/default.nix index 7225e695c87..9d6c64da215 100644 --- a/pkgs/development/python-modules/mocket/default.nix +++ b/pkgs/development/python-modules/mocket/default.nix @@ -19,12 +19,12 @@ buildPythonPackage rec { pname = "mocket"; - version = "3.10.1"; + version = "3.10.2"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "c77e75432c21108e5a28a529793eb2b82753b6f7050ac9f59fc5d7a72fa74c0f"; + sha256 = "sha256-bb/Uf9xWKRNr27SHzTzI14a0At9Ua5xxBr7XN2d6qfQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/nwdiag/default.nix b/pkgs/development/python-modules/nwdiag/default.nix index 637708e2c15..4579be5c3c1 100644 --- a/pkgs/development/python-modules/nwdiag/default.nix +++ b/pkgs/development/python-modules/nwdiag/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "nwdiag"; - version = "2.0.0"; + version = "3.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "blockdiag"; repo = pname; rev = version; - sha256 = "sha256-PWLFJhXQeuUQQpGkXN2pEJs/1WECpJpUqWbGH3150TI="; + sha256 = "sha256-uKrdkXpL5YBr953sRsHknYg+2/WwrZmyDf8BMA2+0tU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/packbits/default.nix b/pkgs/development/python-modules/packbits/default.nix new file mode 100644 index 00000000000..561903e8f5f --- /dev/null +++ b/pkgs/development/python-modules/packbits/default.nix @@ -0,0 +1,26 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, pyparsing +, six +, pytest +, pretend +, lib +}: + +buildPythonPackage rec { + pname = "packbits"; + version = "0.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "bc6b370bb34e04ac8cfa835e06c0484380affc6d593adb8009dd6c0f7bfff034"; + }; + + meta = with lib; { + description = "PackBits encoder/decoder for Python"; + homepage = "https://github.com/psd-tools/packbits"; + license = [ licenses.mit ]; + maintainers = with maintainers; [ grahamc ]; + }; +} diff --git a/pkgs/development/python-modules/pglast/default.nix b/pkgs/development/python-modules/pglast/default.nix index c3b34b1fc19..673b3c8ffe8 100644 --- a/pkgs/development/python-modules/pglast/default.nix +++ b/pkgs/development/python-modules/pglast/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "pglast"; - version = "3.7"; + version = "3.8"; src = fetchPypi { inherit pname version; - sha256 = "3f0f36cebdb68d5b3aaacb11cbf09db44250194845fbf3b49b0aef93c30991bf"; + sha256 = "31ad29b6a27048b1a26c072992fc5213d2eaf366854679e6c97111e300e0ef01"; }; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/plyvel/default.nix b/pkgs/development/python-modules/plyvel/default.nix index aa247c8e426..d47805bb643 100644 --- a/pkgs/development/python-modules/plyvel/default.nix +++ b/pkgs/development/python-modules/plyvel/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "plyvel"; - version = "1.3.0"; + version = "1.4.0"; src = fetchPypi { inherit pname version; - sha256 = "a7a09033a0fd33ca47094e8bbe01714abfcf644f4b7a337d3970e91a2599e2c4"; + sha256 = "4ea98bea04ebf0f44747bacdfafefc8827787106fbb787f0aedc46482b2dfd53"; }; buildInputs = [ pkgs.leveldb ] ++ lib.optional isPy3k pytest; diff --git a/pkgs/development/python-modules/pykeyatome/default.nix b/pkgs/development/python-modules/pykeyatome/default.nix index b1890388faf..b27ee6b2ece 100644 --- a/pkgs/development/python-modules/pykeyatome/default.nix +++ b/pkgs/development/python-modules/pykeyatome/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pykeyatome"; - version = "1.2.0"; + version = "1.3.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "jugla"; repo = "pyKeyAtome"; rev = "V${version}"; - sha256 = "173bf4nrj4jqp2119gfmbra7rhbr30bkjkd44rw9450nmpfmh7pk"; + sha256 = "1brcfgqj0bana6yii4083kppz822fgk9xf4mg141b0zfvx2gyjw9"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pynetdicom/default.nix b/pkgs/development/python-modules/pynetdicom/default.nix index 49068fec5d5..3afa8fcf865 100644 --- a/pkgs/development/python-modules/pynetdicom/default.nix +++ b/pkgs/development/python-modules/pynetdicom/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pynetdicom"; - version = "2.0.0"; + version = "2.0.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "pydicom"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Kfcfk76au2ymbX+nl0PhuuCd+t6dYRbTurGlW6msv3Y="; + sha256 = "sha256-28SoOdS6sAj3KrfJT8PR2k8XLEY2zh0k9w1eq1y7V8M="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pysimplegui/default.nix b/pkgs/development/python-modules/pysimplegui/default.nix new file mode 100644 index 00000000000..9542ffe1b3b --- /dev/null +++ b/pkgs/development/python-modules/pysimplegui/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildPythonPackage +, fetchPypi +, tkinter +}: +buildPythonPackage rec { + pname = "PySimpleGUI"; + version = "4.55.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-nUDAoMK0w9Luk1hU5I1yT1CK5oEj9LrIByYS3Z5wfew="; + }; + + pythonImportsCheck = [ "PySimpleGUI" ]; + + propagatedBuildInputs = [ + tkinter + ]; + + meta = with lib; { + description = "Python GUIs for Humans."; + homepage = "https://github.com/PySimpleGUI/PySimpleGUI"; + license = licenses.gpl3; + maintainers = with maintainers; [ lucasew ]; + }; +} diff --git a/pkgs/development/python-modules/python-lzo/default.nix b/pkgs/development/python-modules/python-lzo/default.nix index 5025b86361a..dcf55e8e32b 100644 --- a/pkgs/development/python-modules/python-lzo/default.nix +++ b/pkgs/development/python-modules/python-lzo/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "python-lzo"; - version = "1.12"; + version = "1.14"; src = fetchPypi { inherit pname version; - sha256 = "0iakqgd51n1cd7r3lpdylm2rgbmd16y74cra9kcapwg84mlf9a4p"; + sha256 = "83cbd8ecaae284735250e31d6c0ecc18ac08763fab2a8c910dc5a6910db6250c"; }; buildInputs = [ lzo ]; diff --git a/pkgs/development/python-modules/pyweatherflowrest/default.nix b/pkgs/development/python-modules/pyweatherflowrest/default.nix index 070cbe6acd4..d2ecce51970 100644 --- a/pkgs/development/python-modules/pyweatherflowrest/default.nix +++ b/pkgs/development/python-modules/pyweatherflowrest/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pyweatherflowrest"; - version = "1.0.0"; + version = "1.0.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "briis"; repo = pname; rev = "v${version}"; - sha256 = "sha256-LS7vwQQBCVwi098aJd8ZSkEEwZKL1bikvAvjH+XHaok="; + sha256 = "0zvmvhl47wlqgjsznbqb7rqgsnxlyiiv7v3kxbxiz6b0hq4mq146"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/supervisor/default.nix b/pkgs/development/python-modules/supervisor/default.nix index dc722e947d0..3505537f47c 100644 --- a/pkgs/development/python-modules/supervisor/default.nix +++ b/pkgs/development/python-modules/supervisor/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "supervisor"; - version = "4.2.2"; + version = "4.2.3"; src = fetchPypi { inherit pname version; - sha256 = "5b2b8882ec8a3c3733cce6965cc098b6d80b417f21229ab90b18fe551d619f90"; + sha256 = "6472da45fd552184c64713b4b9c0bcc586beec21d22af271e1bf8efe60b08836"; }; # wants to write to /tmp/foo which is likely already owned by another diff --git a/pkgs/development/tools/analysis/tartan/default.nix b/pkgs/development/tools/analysis/tartan/default.nix new file mode 100644 index 00000000000..0ac4bf32528 --- /dev/null +++ b/pkgs/development/tools/analysis/tartan/default.nix @@ -0,0 +1,52 @@ +{ stdenv +, lib +, fetchFromGitLab +, meson +, ninja +, pkg-config +, llvmPackages +, gobject-introspection +, glib +, unstableGitUpdater +}: + +stdenv.mkDerivation rec { + pname = "tartan"; + version = "unstable-2021-12-23"; + + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "tartan"; + repo = "tartan"; + rev = "bd4ea95d8b3ce1258491e9fac7fcc37d2b241a16"; + sha256 = "l3duPt8Kh/JljzOV+Dm26XbS7gZ+mmFfYUYofWSJRyo="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + ]; + + buildInputs = [ + gobject-introspection + glib + llvmPackages.libclang + llvmPackages.libllvm + ]; + + passthru = { + updateScript = unstableGitUpdater { + # The updater tries src.url by default, which does not exist for fetchFromGitLab (fetchurl). + url = "https://gitlab.freedesktop.org/tartan/tartan.git"; + }; + }; + + meta = with lib; { + description = "Tools and Clang plugins for developing code with GLib"; + homepage = "https://freedesktop.org/wiki/Software/tartan"; + license = licenses.gpl3Plus; + platforms = platforms.unix; + maintainers = with maintainers; [ jtojnar ]; + }; +} diff --git a/pkgs/development/tools/continuous-integration/github-runner/default.nix b/pkgs/development/tools/continuous-integration/github-runner/default.nix index 17a0cff31fe..e784e3fe330 100644 --- a/pkgs/development/tools/continuous-integration/github-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/github-runner/default.nix @@ -242,6 +242,11 @@ stdenv.mkDerivation rec { ln -s ${nodejs-12_x} $out/externals/node12 ln -s ${nodejs-16_x} $out/externals/node16 + # Install Nodejs scripts called from workflows + install -D src/Misc/layoutbin/hashFiles/index.js $out/lib/hashFiles/index.js + mkdir -p $out/lib/checkScripts + install src/Misc/layoutbin/checkScripts/* $out/lib/checkScripts/ + runHook postInstall ''; diff --git a/pkgs/development/tools/hjson-go/default.nix b/pkgs/development/tools/hjson-go/default.nix index bbd1f3c0ec0..ce6da30d3b5 100644 --- a/pkgs/development/tools/hjson-go/default.nix +++ b/pkgs/development/tools/hjson-go/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "hjson-go"; - version = "3.1.0"; + version = "3.1.1"; src = fetchFromGitHub { owner = "hjson"; repo = pname; rev = "v${version}"; - sha256 = "sha256-X02NnSefJfKUfagzJpdW1UpOLe84SvRaTN+8GqGKzbU="; + sha256 = "sha256-yU1VkxwQ12CjzITR9X6LLaOfiteN+807rfB/tWcRR1c="; }; goPackagePath = "github.com/hjson/hjson-go"; diff --git a/pkgs/development/tools/metal-cli/default.nix b/pkgs/development/tools/metal-cli/default.nix index c5488cdb900..f88fcd9f429 100644 --- a/pkgs/development/tools/metal-cli/default.nix +++ b/pkgs/development/tools/metal-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "metal-cli"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "equinix"; repo = pname; rev = "v${version}"; - sha256 = "sha256-dGeOFrsqhW0+aQyB4f6pvv4ZBawqKX2+WRskDWoLS7E="; + sha256 = "sha256-Zl0OuyqF+bNsp1AqnS8jhQlY7l4U6OjHHgth7pRPwEc="; }; - vendorSha256 = "sha256-ifSfeJjrZI1Hrsq64zAGBiLVc8GKvq+Ddg26gQooyTs="; + vendorSha256 = "sha256-F8d5i9jvjY11Pv6w0ZXI3jr0Wix++B/w9oRTuJGpQfE="; doCheck = false; diff --git a/pkgs/development/tools/profiling/heaptrack/default.nix b/pkgs/development/tools/profiling/heaptrack/default.nix index fc2937a8b0f..7f42c39cb21 100644 --- a/pkgs/development/tools/profiling/heaptrack/default.nix +++ b/pkgs/development/tools/profiling/heaptrack/default.nix @@ -6,13 +6,13 @@ mkDerivation rec { pname = "heaptrack"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "KDE"; repo = "heaptrack"; rev = "v${version}"; - sha256 = "0pw82c26da014i1qxnaib3fqa52ijhf0m4swhjc3qq4hm2dx9bxj"; + sha256 = "sha256-GXwlauLspbY+h/Y75zlHPoP27pr3xVl05LuDW+WVYxU="; }; nativeBuildInputs = [ cmake extra-cmake-modules ]; diff --git a/pkgs/games/scummvm/default.nix b/pkgs/games/scummvm/default.nix index d7208265e39..8de6206ecd0 100644 --- a/pkgs/games/scummvm/default.nix +++ b/pkgs/games/scummvm/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "scummvm"; - version = "2.5.0"; + version = "2.5.1"; src = fetchurl { url = "http://scummvm.org/frs/scummvm/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256:08ynw1cmld41p4bwrw84gb1nv229va70i91qiqsjr3c2jnqy8zml"; + sha256 = "sha256-n9jbOORFYUS/jDTazffyBOdfGOjkSOwBzgjOgmoDXwE="; }; nativeBuildInputs = [ nasm ]; diff --git a/pkgs/misc/drivers/epson-escpr2/default.nix b/pkgs/misc/drivers/epson-escpr2/default.nix index 395d504e136..44c6e8a4c61 100644 --- a/pkgs/misc/drivers/epson-escpr2/default.nix +++ b/pkgs/misc/drivers/epson-escpr2/default.nix @@ -2,19 +2,15 @@ stdenv.mkDerivation rec { pname = "epson-inkjet-printer-escpr2"; - version = "1.1.42"; + version = "1.1.45"; src = fetchurl { # To find new versions, visit # http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX and search for # some printer like for instance "WF-7210" to get to the most recent # version. - # NOTE: Don't forget to update the webarchive link too! - urls = [ - "https://download3.ebz.epson.net/dsc/f/03/00/13/07/72/df79cc238a167b9526f70cc123459c6bbe1edbad/epson-inkjet-printer-escpr2-1.1.42-1lsb3.2.src.rpm" - "https://web.archive.org/web/20211029093638/https://download3.ebz.epson.net/dsc/f/03/00/13/07/72/df79cc238a167b9526f70cc123459c6bbe1edbad/epson-inkjet-printer-escpr2-1.1.42-1lsb3.2.src.rpm" - ]; - sha256 = "sha256-CsZUurwwoXNWONZKAIkRd0ztmAr5wLWZhirCzJWWqMA="; + url = "https://download3.ebz.epson.net/dsc/f/03/00/13/38/11/01e244e8529c5cbcec8d39220a9512d5e6c08eec/epson-inkjet-printer-escpr2-1.1.45-1lsb3.2.src.rpm"; + sha256 = "sha256-MZXn1fsD3D6W5vlX+NwRkwLtaBRqQwe9lwnJC2L9Lfk="; }; unpackPhase = '' diff --git a/pkgs/os-specific/linux/bcc/absolute-ausyscall.patch b/pkgs/os-specific/linux/bcc/absolute-ausyscall.patch new file mode 100644 index 00000000000..7480e9c5d97 --- /dev/null +++ b/pkgs/os-specific/linux/bcc/absolute-ausyscall.patch @@ -0,0 +1,43 @@ +From 01e793163231c5085afced37471df32b94a313f5 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io> +Date: Thu, 30 Dec 2021 06:34:41 +0100 +Subject: [PATCH] absolute ausyscall +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Jörg Thalheim <joerg@thalheim.io> +--- + libbpf-tools/syscall_helpers.c | 2 +- + src/python/bcc/syscall.py | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/libbpf-tools/syscall_helpers.c b/libbpf-tools/syscall_helpers.c +index e114a08f..62adea78 100644 +--- a/libbpf-tools/syscall_helpers.c ++++ b/libbpf-tools/syscall_helpers.c +@@ -47,7 +47,7 @@ void init_syscall_names(void) + int err; + FILE *f; + +- f = popen("ausyscall --dump 2>/dev/null", "r"); ++ f = popen("@ausyscall@ --dump 2>/dev/null", "r"); + if (!f) { + warn("popen: ausyscall --dump: %s\n", strerror(errno)); + return; +diff --git a/src/python/bcc/syscall.py b/src/python/bcc/syscall.py +index 1346b4e8..e7e29a11 100644 +--- a/src/python/bcc/syscall.py ++++ b/src/python/bcc/syscall.py +@@ -376,7 +376,7 @@ def _parse_syscall(line): + try: + # Skip the first line, which is a header. The rest of the lines are simply + # SYSCALL_NUM\tSYSCALL_NAME pairs. +- out = subprocess.check_output(['ausyscall', '--dump'], stderr=subprocess.STDOUT) ++ out = subprocess.check_output(['@ausyscall@', '--dump'], stderr=subprocess.STDOUT) + # remove the first line of expected output + out = out.split(b'\n',1)[1] + syscalls = dict(map(_parse_syscall, out.strip().split(b'\n'))) +-- +2.34.0 + diff --git a/pkgs/os-specific/linux/bcc/default.nix b/pkgs/os-specific/linux/bcc/default.nix index c87740ed021..caeaed455f7 100644 --- a/pkgs/os-specific/linux/bcc/default.nix +++ b/pkgs/os-specific/linux/bcc/default.nix @@ -2,6 +2,7 @@ , makeWrapper, cmake, llvmPackages , flex, bison, elfutils, python, luajit, netperf, iperf, libelf , bash, libbpf, nixosTests +, audit }: python.pkgs.buildPythonApplication rec { @@ -41,9 +42,16 @@ python.pkgs.buildPythonApplication rec { "-DCMAKE_USE_LIBBPF_PACKAGE=ON" ]; + # to replace this executable path: + # https://github.com/iovisor/bcc/blob/master/src/python/bcc/syscall.py#L384 + ausyscall = "${audit}/bin/ausyscall"; + postPatch = '' substituteAll ${./libbcc-path.patch} ./libbcc-path.patch patch -p1 < libbcc-path.patch + + substituteAll ${./absolute-ausyscall.patch} ./absolute-ausyscall.patch + patch -p1 < absolute-ausyscall.patch ''; postInstall = '' diff --git a/pkgs/servers/nosql/apache-jena/binary.nix b/pkgs/servers/nosql/apache-jena/binary.nix index 0a86d1438c3..e32f31926bc 100644 --- a/pkgs/servers/nosql/apache-jena/binary.nix +++ b/pkgs/servers/nosql/apache-jena/binary.nix @@ -3,10 +3,10 @@ let s = # Generated upstream information rec { baseName="apache-jena"; - version = "4.3.1"; + version = "4.3.2"; name="${baseName}-${version}"; url="https://dlcdn.apache.org/jena/binaries/apache-jena-${version}.tar.gz"; - sha256 = "02asp88smayn68hc019fwp0si9mc79vxn8py7qhx3qzwjk6j9p71"; + sha256 = "sha256-+GNxf79RkmHUXI99e3BZIyboiEj8TiVfVtlgQADku+Y="; }; buildInputs = [ makeWrapper diff --git a/pkgs/servers/sql/postgresql/ext/plv8.nix b/pkgs/servers/sql/postgresql/ext/plv8.nix index a546c3a687f..6f5411340e4 100644 --- a/pkgs/servers/sql/postgresql/ext/plv8.nix +++ b/pkgs/servers/sql/postgresql/ext/plv8.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "plv8"; - version = "2.3.15"; + version = "3.0.0"; nativeBuildInputs = [ perl ]; buildInputs = [ v8 postgresql ]; @@ -11,22 +11,42 @@ stdenv.mkDerivation rec { owner = "plv8"; repo = "plv8"; rev = "v${version}"; - sha256 = "1cv94n49gq2b377gqyq7pjjzw98czv4mwl3sx97y18c20zwp6rk3"; + sha256 = "KJz8wnGcTXnVn6umpP+UquuJTtQrkBTJ33rB/JIH4kU="; }; makefile = "Makefile.shared"; buildFlags = [ "all" ]; + makeFlags = [ + # Nixpkgs build a v8 monolith instead of separate v8_libplatform. + "V8_OUTDIR=${v8}/lib" + ]; + + installFlags = [ + # PGXS only supports installing to postgresql prefix so we need to redirect this + "DESTDIR=${placeholder "out"}" + ]; + preConfigure = '' patchShebangs ./generate_upgrade.sh + substituteInPlace generate_upgrade.sh \ + --replace " 2.3.10)" " 2.3.10 2.3.11 2.3.12 2.3.13 2.3.14 2.3.15)" ''; - installPhase = '' - install -D plv8*.so -t $out/lib - install -D {plls,plcoffee,plv8}{--${version}.sql,.control} -t $out/share/postgresql/extension + postInstall = '' + # Move the redirected to proper directory. + # There appear to be no references to the install directories + # so changing them does not cause issues. + mv "$out/nix/store"/*/* "$out" + rmdir "$out/nix/store"/* "$out/nix/store" "$out/nix" ''; + # Without this, PostgreSQL will crash at runtime. + # The flags are only included in Makefile, not Makefile.shared. + # https://github.com/plv8/plv8/pull/469 + NIX_CFLAGS_COMPILE = "-DJSONB_DIRECT_CONVERSION -DV8_COMPRESS_POINTERS=1 -DV8_31BIT_SMIS_ON_64BIT_ARCH=1"; + meta = with lib; { description = "V8 Engine Javascript Procedural Language add-on for PostgreSQL"; homepage = "https://plv8.github.io/"; diff --git a/pkgs/servers/sql/postgresql/packages.nix b/pkgs/servers/sql/postgresql/packages.nix index 1986ed68199..e751ae621f3 100644 --- a/pkgs/servers/sql/postgresql/packages.nix +++ b/pkgs/servers/sql/postgresql/packages.nix @@ -26,11 +26,7 @@ self: super: { plr = super.callPackage ./ext/plr.nix { }; - plv8 = super.callPackage ./ext/plv8.nix { - v8 = super.callPackage ../../../development/libraries/v8/plv8_6_x.nix { - python = self.python2; - }; - }; + plv8 = super.callPackage ./ext/plv8.nix { }; pgjwt = super.callPackage ./ext/pgjwt.nix { }; diff --git a/pkgs/tools/admin/exoscale-cli/default.nix b/pkgs/tools/admin/exoscale-cli/default.nix index ab8c5813884..182e594084e 100644 --- a/pkgs/tools/admin/exoscale-cli/default.nix +++ b/pkgs/tools/admin/exoscale-cli/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "exoscale-cli"; - version = "1.49.1"; + version = "1.49.2"; src = fetchFromGitHub { owner = "exoscale"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-QBRRx+3ltLlUeckvJBA3rSLna6L44X44ObCMyhBnBhg="; + sha256 = "sha256-8v+U0h0+3NVSXBlulOKY0A5oDlqkgNZPoyflRNycDxU="; }; goPackagePath = "github.com/exoscale/cli"; diff --git a/pkgs/tools/admin/fits-cloudctl/default.nix b/pkgs/tools/admin/fits-cloudctl/default.nix index d5d3124038f..a71f6e8f634 100644 --- a/pkgs/tools/admin/fits-cloudctl/default.nix +++ b/pkgs/tools/admin/fits-cloudctl/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "fits-cloudctl"; - version = "0.10.4"; + version = "0.10.5"; src = fetchFromGitHub { owner = "fi-ts"; repo = "cloudctl"; rev = "v${version}"; - sha256 = "sha256-D5LICE7CAwCqvaHIYfRWC8Te4W0tGhKAETmus2qa0UM="; + sha256 = "sha256-l01c1tjS0L+T/kHreYx3A5/N/oRDuDywXS/GAvUCxSk="; }; - vendorSha256 = "sha256-ImKN3rNotgUkQaKzoetAEG6Q/zlfH8FTK4HTIO0xn4s="; + vendorSha256 = "sha256-iJlNNovsIgTOPfAzwqkumrmCQu2xI/neqH+Z4tvSXeY="; meta = with lib; { description = "Command-line client for FI-TS Finance Cloud Native services"; diff --git a/pkgs/tools/filesystems/cryfs/default.nix b/pkgs/tools/filesystems/cryfs/default.nix index 0f61d47aca9..6d93717dd9c 100644 --- a/pkgs/tools/filesystems/cryfs/default.nix +++ b/pkgs/tools/filesystems/cryfs/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub , cmake, pkg-config, python3 -, boost17x, curl, fuse, openssl, range-v3, spdlog +, boost175, curl, fuse, openssl, range-v3, spdlog # cryptopp and gtest on standby - using the vendored ones for now # see https://github.com/cryfs/cryfs/issues/369 , llvmPackages @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { strictDeps = true; - buildInputs = [ boost17x curl fuse openssl range-v3 spdlog ] + buildInputs = [ boost175 curl fuse openssl range-v3 spdlog ] ++ lib.optional stdenv.cc.isClang llvmPackages.openmp; #checkInputs = [ gtest ]; diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix index b0524e9bc68..dab69649fdc 100644 --- a/pkgs/tools/filesystems/glusterfs/default.nix +++ b/pkgs/tools/filesystems/glusterfs/default.nix @@ -2,7 +2,7 @@ autoconf, automake, libtool, pkg-config, zlib, libaio, libxml2, acl, sqlite, liburcu, liburing, attr, makeWrapper, coreutils, gnused, gnugrep, which, openssh, gawk, findutils, util-linux, lvm2, btrfs-progs, e2fsprogs, xfsprogs, systemd, - rsync, glibc, rpcsvc-proto, libtirpc, gperftools + rsync, glibc, rpcsvc-proto, libtirpc, gperftools, nixosTests }: let # NOTE: On each glusterfs release, it should be checked if gluster added @@ -85,6 +85,7 @@ in stdenv.mkDerivation rec { # but fails when the version is empty. # See upstream GlusterFS bug https://bugzilla.redhat.com/show_bug.cgi?id=1452705 preConfigure = '' + patchShebangs build-aux/pkg-version echo "v${version}" > VERSION ./autogen.sh export PYTHON=${python3}/bin/python @@ -181,6 +182,10 @@ in stdenv.mkDerivation rec { rm -r $out/bin/conf.py ''; + passthru.tests = { + glusterfs = nixosTests.glusterfs; + }; + meta = with lib; { description = "Distributed storage system"; homepage = "https://www.gluster.org"; diff --git a/pkgs/tools/games/joystickwake/default.nix b/pkgs/tools/games/joystickwake/default.nix index 4f324c36d84..f8f962f6eef 100644 --- a/pkgs/tools/games/joystickwake/default.nix +++ b/pkgs/tools/games/joystickwake/default.nix @@ -1,13 +1,13 @@ { lib, python3, fetchFromGitHub }: python3.pkgs.buildPythonApplication rec { pname = "joystickwake"; - version = "0.2.5"; + version = "0.3"; src = fetchFromGitHub { owner = "foresto"; repo = pname; rev = "v${version}"; - sha256 = "1yhzv4gbz0c0ircxk91m1d4ygf14mla137z4nfxggmbvjs0aa4y0"; + sha256 = "0f990bvykjjq2rzzbm158kajnqxigfzcrzap11dc415wkvn25k6q"; }; propagatedBuildInputs = with python3.pkgs; [ pyudev xlib ]; diff --git a/pkgs/tools/games/minecraft/optifine/default.nix b/pkgs/tools/games/minecraft/optifine/default.nix index 06425e6b67e..b7ca74822c4 100644 --- a/pkgs/tools/games/minecraft/optifine/default.nix +++ b/pkgs/tools/games/minecraft/optifine/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "optifine"; - version = "1.16.5_HD_U_G8"; + version = "1.18.1_HD_U_H4"; src = fetchurl { url = "https://optifine.net/download?f=OptiFine_${version}.jar"; - sha256 = "0ks91d6n4vkgb5ykdrc67br2c69nqjr0xhp7rrkybg24xn8bqxiw"; + sha256 = "325168569b21a2dcde82999876f69ec9d8af75202a7021691f2abede4d81dcec"; }; dontUnpack = true; diff --git a/pkgs/tools/misc/vector/default.nix b/pkgs/tools/misc/vector/default.nix index 6fbee9b8e82..379c8962101 100644 --- a/pkgs/tools/misc/vector/default.nix +++ b/pkgs/tools/misc/vector/default.nix @@ -14,6 +14,7 @@ , coreutils , CoreServices , tzdata +, cmake # kafka is optional but one of the most used features , enableKafka ? true # TODO investigate adding "api" "api-client" "vrl-cli" and various "vendor-*" @@ -28,7 +29,7 @@ let pname = "vector"; - version = "0.18.1"; + version = "0.19.0"; in rustPlatform.buildRustPackage { inherit pname version; @@ -37,11 +38,11 @@ rustPlatform.buildRustPackage { owner = "timberio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-OD7lYoTlQNdrWT1f+BAp6zI0N+9W2LOHNNgpvAMXKDM="; + sha256 = "sha256-A+Ok/BNEs0V00B8P6ghSHZ2pQ8tumfpkurplnvjpWZ8="; }; - cargoSha256 = "sha256-BqnXXTNE1TmrF7pSOCQpnHHve0lCb9W6MbJXk2QHAOs="; - nativeBuildInputs = [ pkg-config ]; + cargoSha256 = "sha256-B9z+8TqAl0yFaou1LfNcFsDJjw7qGti6MakDPhz49tc="; + nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ oniguruma openssl protobuf rdkafka zstd ] ++ lib.optionals stdenv.isDarwin [ Security libiconv coreutils CoreServices ]; diff --git a/pkgs/tools/misc/vial/default.nix b/pkgs/tools/misc/vial/default.nix index 5685141e446..7bc78803167 100644 --- a/pkgs/tools/misc/vial/default.nix +++ b/pkgs/tools/misc/vial/default.nix @@ -1,12 +1,12 @@ { lib, fetchurl, appimageTools }: let name = "vial-${version}"; - version = "0.4.1"; + version = "0.4.2"; pname = "Vial"; src = fetchurl { url = "https://github.com/vial-kb/vial-gui/releases/download/v${version}/${pname}-v${version}-x86_64.AppImage"; - sha256 = "sha256-aN0wvgahWPNSXP/JmV1JWaEnARIOTyRdz1ko6eC7Y5s="; + sha256 = "sha256-T3aSwv/qTJHR/Fa6qU1fWbp3duvny4lC+9jBwQzpw2w="; }; appimageContents = appimageTools.extractType2 { inherit name src; }; @@ -24,7 +24,7 @@ appimageTools.wrapType2 { ''; meta = with lib; { - description = "An Open-source cross-platform (Windows, Linux and Mac) GUI and a QMK fork for configuring your keyboard in real time"; + description = "An Open-source QMK GUI fork for configuring your keyboard in real time"; homepage = "https://get.vial.today"; license = licenses.gpl2Plus; maintainers = with maintainers; [ kranzes ]; diff --git a/pkgs/tools/misc/ytfzf/default.nix b/pkgs/tools/misc/ytfzf/default.nix index a35e9200a71..95b4a890723 100644 --- a/pkgs/tools/misc/ytfzf/default.nix +++ b/pkgs/tools/misc/ytfzf/default.nix @@ -2,6 +2,7 @@ , stdenv , fetchFromGitHub , makeWrapper +, chafa , coreutils , curl , dmenu @@ -9,27 +10,21 @@ , gnused , jq , mpv -, ncurses , ueberzug -, youtube-dl +, yt-dlp }: stdenv.mkDerivation rec { pname = "ytfzf"; - version = "1.2.0"; + version = "2.0"; src = fetchFromGitHub { owner = "pystardust"; repo = "ytfzf"; rev = "v${version}"; - sha256 = "sha256-3wbjCtRmnd9tm8kqKaIF6VmMdKsWznhOvQkEsrAJpAE="; + sha256 = "sha256-JuLfFC3oz2FvCaD+XPuL1N8tGKmv4atyZIBeDKWYgT8="; }; - patches = [ - # Updates have to be installed through Nix. - ./no-update.patch - ]; - nativeBuildInputs = [ makeWrapper ]; makeFlags = [ "PREFIX=${placeholder "out"}/bin" ]; @@ -38,8 +33,13 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram "$out/bin/ytfzf" --prefix PATH : ${lib.makeBinPath [ - coreutils curl dmenu fzf gnused jq mpv ncurses ueberzug youtube-dl + chafa coreutils curl dmenu fzf gnused jq mpv ueberzug yt-dlp ]} + + gzip -c docs/man/ytfzf.1 > docs/man/ytfzf.1.gz + gzip -c docs/man/ytfzf.5 > docs/man/ytfzf.5.gz + install -Dt "$out/share/man/man1" docs/man/ytfzf.1.gz + install -Dt "$out/share/man/man5" docs/man/ytfzf.5.gz ''; meta = with lib; { diff --git a/pkgs/tools/misc/ytfzf/no-update.patch b/pkgs/tools/misc/ytfzf/no-update.patch deleted file mode 100644 index e71582f6364..00000000000 --- a/pkgs/tools/misc/ytfzf/no-update.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/ytfzf b/ytfzf -index f4d2e0d..7a3b4b6 100755 ---- a/ytfzf -+++ b/ytfzf -@@ -1260,22 +1260,8 @@ EOF - } - - update_ytfzf () { -- branch="$1" -- updatefile="/tmp/ytfzf-update" -- curl -L "https://raw.githubusercontent.com/pystardust/ytfzf/$branch/ytfzf" -o "$updatefile" -- -- if sed -n '1p' < "$updatefile" | grep -q '#!/bin/sh'; then -- chmod 755 "$updatefile" -- [ "$(uname)" = "Darwin" ] && prefix="/usr/local/bin" || prefix="/usr/bin" -- function_exists "sudo" && doasroot="sudo" || doasroot="doas" -- $doasroot cp "$updatefile" "$prefix/ytfzf" -- unset prefix doasroot -- else -- printf "%bFailed to update ytfzf. Try again later.%b" "$c_red" "$c_reset" -- fi -- -- rm "$updatefile" -- exit 0 -+ printf "%bUpdates have to be installed through Nix.%b\n" "$c_red" "$c_reset" -+ exit 1 - } - - #gives a value to sort by (this will give the unix time the video was uploaded) diff --git a/pkgs/tools/networking/findomain/default.nix b/pkgs/tools/networking/findomain/default.nix index 1383d211c84..09524b80895 100644 --- a/pkgs/tools/networking/findomain/default.nix +++ b/pkgs/tools/networking/findomain/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "findomain"; - version = "5.0.1"; + version = "5.1.1"; src = fetchFromGitHub { owner = "Edu4rdSHL"; repo = pname; rev = version; - sha256 = "sha256-qmXtFVfBXCuXhIac0Y6HrhTPWsIHp5pwrxnOJkoSzm4="; + sha256 = "sha256-nfpVW+Y6+YtMhDepj2DbnzItH11zABlnEs9c0FzfouA="; }; - cargoSha256 = "sha256-CyiBA6XQjExnjGVpMonhtoIwU2W57T5L6glt9G/xwDs="; + cargoSha256 = "sha256-s7xikSZx29zv8TD/YOTckCUh/8MBBIdZOUUwfkVZfx8="; nativeBuildInputs = [ installShellFiles perl ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; diff --git a/pkgs/tools/security/grype/default.nix b/pkgs/tools/security/grype/default.nix index 8241851d532..9d327f37af6 100644 --- a/pkgs/tools/security/grype/default.nix +++ b/pkgs/tools/security/grype/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "grype"; - version = "0.27.3"; + version = "0.28.0"; src = fetchFromGitHub { owner = "anchore"; repo = pname; rev = "v${version}"; - sha256 = "sha256-W1HP+bzsLY8SaZQK+H33mibM7lfxoGnKnOvsStwzv4E="; + sha256 = "sha256-Mc0bO9BDcIXEoHwhQDbX9g84kagcT3gVz8PPxXpG7dw="; }; - vendorSha256 = "sha256-IwEQkdspSjdlm4siwhaBZsIaRz8oKKG6d6PAK1MvHlw="; + vendorSha256 = "sha256-su0dg9Gidd8tQKM5IzX6/GC5jk8SCIO+qsI3UGlvpwg="; propagatedBuildInputs = [ docker ]; diff --git a/pkgs/tools/security/log4j-sniffer/default.nix b/pkgs/tools/security/log4j-sniffer/default.nix index c3c4a0cd086..07d966353ab 100644 --- a/pkgs/tools/security/log4j-sniffer/default.nix +++ b/pkgs/tools/security/log4j-sniffer/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "log4j-sniffer"; - version = "0.8.0"; + version = "1.0.0"; src = fetchFromGitHub { owner = "palantir"; repo = pname; rev = "v${version}"; - sha256 = "sha256-dsuIeNAYe/iuxfezfs+hyyziFrE3M+GRxqYuawYFKDU="; + sha256 = "sha256-2scESCuENM4m3YrxPjoXcPKEkBPTMWOGJR3WenkTNBA="; }; vendorSha256 = null; diff --git a/pkgs/tools/security/log4j-vuln-scanner/default.nix b/pkgs/tools/security/log4j-vuln-scanner/default.nix index 0cd6534f909..67bfa89ad2e 100644 --- a/pkgs/tools/security/log4j-vuln-scanner/default.nix +++ b/pkgs/tools/security/log4j-vuln-scanner/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "log4j-vuln-scanner"; - version = "0.10"; + version = "0.11"; src = fetchFromGitHub { owner = "hillu"; repo = "local-log4j-vuln-scanner"; rev = "v${version}"; - sha256 = "sha256-w3S+OxSTRgmFJOODDOoK33ddckv18LNnZyx7/HBTl9I="; + sha256 = "sha256-YGo2dhfqLPNP8O9gdRJfxKmEK/pKd17WNTXQ2cq78qg="; }; - vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; + vendorSha256 = null; postInstall = '' mv $out/bin/scanner $out/bin/$pname diff --git a/pkgs/tools/system/btop/default.nix b/pkgs/tools/system/btop/default.nix index 9c926381dc4..70b1a78586c 100644 --- a/pkgs/tools/system/btop/default.nix +++ b/pkgs/tools/system/btop/default.nix @@ -1,6 +1,8 @@ { lib , stdenv , fetchFromGitHub +, runCommand +, darwin }: stdenv.mkDerivation rec { @@ -14,6 +16,26 @@ stdenv.mkDerivation rec { sha256 = "sha256-uKR1ogQwEoyxyWBiLnW8BsOsYgTpeIpKrKspq0JwYjY="; }; + hardeningDisable = lib.optionals (stdenv.isAarch64 && stdenv.isDarwin) [ "stackprotector" ]; + + ADDFLAGS = with darwin.apple_sdk.frameworks; + lib.optional stdenv.isDarwin + "-F${IOKit}/Library/Frameworks/"; + + buildInputs = with darwin.apple_sdk; + lib.optionals stdenv.isDarwin [ + frameworks.CoreFoundation + frameworks.IOKit + ] ++ lib.optional (stdenv.isDarwin && stdenv.isx86_64) ( + # Found this explanation for needing to create a header directory for libproc.h alone. + # https://github.com/NixOS/nixpkgs/blob/049e5e93af9bbbe06b4c40fd001a4e138ce1d677/pkgs/development/libraries/webkitgtk/default.nix#L154 + # TL;DR, the other headers in the include path for the macOS SDK is not compatible with the C++ stdlib and causes issues, so we copy + # this to avoid those issues + runCommand "${pname}_headers" { } '' + install -Dm444 "${lib.getDev sdk}"/include/libproc.h "$out"/include/libproc.h + '' + ); + installFlags = [ "PREFIX=$(out)" ]; meta = with lib; { @@ -21,7 +43,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/aristocratos/btop"; changelog = "https://github.com/aristocratos/btop/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ rmcgibbo ]; }; } diff --git a/pkgs/tools/wayland/swayr/default.nix b/pkgs/tools/wayland/swayr/default.nix index 374e1b0e181..9ccc13532c2 100644 --- a/pkgs/tools/wayland/swayr/default.nix +++ b/pkgs/tools/wayland/swayr/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "swayr"; - version = "0.10.1"; + version = "0.11.2"; src = fetchFromSourcehut { owner = "~tsdh"; repo = "swayr"; rev = "v${version}"; - sha256 = "sha256-xkNfdO/3MiI3BhCabGNYWkUXkLcLDQmcf+gd5u7KM6Q="; + sha256 = "sha256-IjOoQbKCiwuoCsh2bOmvcSH3/9KMmavmn1Ib1TLBH8w="; }; - cargoSha256 = "sha256-FAg3vKSTHA0LVqAu7HE6vI9N1Ro58ZIp29qw2KUHpw4="; + cargoSha256 = "sha256-EYaISBnWKplKUAKa9SZufWcykeR/qeApvqwIGB9jt3Q="; patches = [ ./icon-paths.patch diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e136065a1aa..e43ad8707db 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10069,6 +10069,8 @@ with pkgs; tarssh = callPackage ../servers/tarssh { }; + tartan = callPackage ../development/tools/analysis/tartan {}; + tartube = callPackage ../applications/video/tartube { }; tartube-yt-dlp = callPackage ../applications/video/tartube { @@ -16335,7 +16337,9 @@ with pkgs; fflas-ffpack = callPackage ../development/libraries/fflas-ffpack { }; - forge = callPackage ../development/libraries/forge { }; + forge = callPackage ../development/libraries/forge { + cudatoolkit = buildPackages.cudatoolkit_11; + }; linbox = callPackage ../development/libraries/linbox { }; @@ -17292,8 +17296,6 @@ with pkgs; stdenv = if stdenv.cc.isClang then llvmPackages_10.stdenv else stdenv; }; - jemalloc450 = callPackage ../development/libraries/jemalloc/jemalloc450.nix { }; - jose = callPackage ../development/libraries/jose { }; jshon = callPackage ../development/tools/parsing/jshon { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e44ce2f45e8..a8a2a6f0d8b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1320,6 +1320,8 @@ in { brother = callPackage ../development/python-modules/brother { }; + brother-ql = callPackage ../development/python-modules/brother-ql { }; + brotli = callPackage ../development/python-modules/brotli { }; brotlicffi = callPackage ../development/python-modules/brotlicffi { @@ -5642,6 +5644,8 @@ in { packaging = callPackage ../development/python-modules/packaging { }; + packbits = callPackage ../development/python-modules/packbits { }; + packet-python = callPackage ../development/python-modules/packet-python { }; pafy = callPackage ../development/python-modules/pafy { }; @@ -7359,6 +7363,8 @@ in { pysigset = callPackage ../development/python-modules/pysigset { }; + pysimplegui = callPackage ../development/python-modules/pysimplegui { }; + pysingleton = callPackage ../development/python-modules/pysingleton { }; pyslurm = callPackage ../development/python-modules/pyslurm { |