From 39a1adedec043464338a8831b5175b81dbd229d8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 3 Mar 2022 04:47:34 +0000 Subject: [PATCH 001/245] python310Packages.bitbox02: 5.3.0 -> 6.0.0 --- pkgs/development/python-modules/bitbox02/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bitbox02/default.nix b/pkgs/development/python-modules/bitbox02/default.nix index d57d4a6585bd..358a4d163f3e 100644 --- a/pkgs/development/python-modules/bitbox02/default.nix +++ b/pkgs/development/python-modules/bitbox02/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "bitbox02"; - version = "5.3.0"; + version = "6.0.0"; src = fetchPypi { inherit pname version; - sha256 = "fe0e8aeb9b32fd7d76bb3e9838895973a74dfd532a8fb8ac174a1a60214aee26"; + sha256 = "sha256-wTateh3dJycFNozLaQbAzXF0avr2ofBdjlqqcOBLr/0="; }; propagatedBuildInputs = [ base58 ecdsa hidapi noiseprotocol protobuf semver typing-extensions ]; From 9f719ade9c65ef04e4622c9268cdcedbf3bdda1c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 28 Mar 2022 16:21:03 +0200 Subject: [PATCH 002/245] atomEnv: remove pointless GConf dependency GConf has been unmaintained for ages and Electron removed support for it a while ago: https://github.com/electron/electron/issues/2727 --- pkgs/applications/editors/atom/env.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/editors/atom/env.nix b/pkgs/applications/editors/atom/env.nix index e59b03beba85..d0318319caf8 100644 --- a/pkgs/applications/editors/atom/env.nix +++ b/pkgs/applications/editors/atom/env.nix @@ -1,13 +1,13 @@ { stdenv, lib, zlib, glib, alsa-lib, dbus, gtk3, atk, pango, freetype, fontconfig , libgnome-keyring3, gdk-pixbuf, cairo, cups, expat, libgpg-error, nspr -, gconf, nss, xorg, libcap, systemd, libnotify, libsecret, libuuid, at-spi2-atk +, nss, xorg, libcap, systemd, libnotify, libsecret, libuuid, at-spi2-atk , at-spi2-core, libdbusmenu, libdrm, mesa }: let packages = [ stdenv.cc.cc zlib glib dbus gtk3 atk pango freetype libgnome-keyring3 - fontconfig gdk-pixbuf cairo cups expat libgpg-error alsa-lib nspr gconf nss + fontconfig gdk-pixbuf cairo cups expat libgpg-error alsa-lib nspr nss xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr xorg.libXcursor xorg.libxkbfile xorg.libXScrnSaver libcap systemd libnotify diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7889ac2919f8..685cd053c560 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24780,9 +24780,7 @@ with pkgs; atlassian-cli = callPackage ../applications/office/atlassian-cli { }; - atomEnv = callPackage ../applications/editors/atom/env.nix { - gconf = gnome2.GConf; - }; + atomEnv = callPackage ../applications/editors/atom/env.nix { }; atomPackages = dontRecurseIntoAttrs (callPackage ../applications/editors/atom { }); From d76f600c92e9a0d58f94267d3bd3e9cc77a3b4ab Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 28 Mar 2022 16:25:38 +0200 Subject: [PATCH 003/245] atomEnv: remove libgnome-keyring dependency libgnome-keyring has been deprecated for a long time. It has been superseded by libsecret, which allows access to not only GNOME Keyring secret manager but any other service implementing the Secret Service D-Bus API. And libsecret is already in the dependencies so presumably it is supported. --- pkgs/applications/editors/atom/env.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/atom/env.nix b/pkgs/applications/editors/atom/env.nix index d0318319caf8..a5ca5775aae3 100644 --- a/pkgs/applications/editors/atom/env.nix +++ b/pkgs/applications/editors/atom/env.nix @@ -1,12 +1,12 @@ { stdenv, lib, zlib, glib, alsa-lib, dbus, gtk3, atk, pango, freetype, fontconfig -, libgnome-keyring3, gdk-pixbuf, cairo, cups, expat, libgpg-error, nspr +, gdk-pixbuf, cairo, cups, expat, libgpg-error, nspr , nss, xorg, libcap, systemd, libnotify, libsecret, libuuid, at-spi2-atk , at-spi2-core, libdbusmenu, libdrm, mesa }: let packages = [ - stdenv.cc.cc zlib glib dbus gtk3 atk pango freetype libgnome-keyring3 + stdenv.cc.cc zlib glib dbus gtk3 atk pango freetype fontconfig gdk-pixbuf cairo cups expat libgpg-error alsa-lib nspr nss xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr From 0757b37a5395bbda2ab5e4a0e5126ac243110637 Mon Sep 17 00:00:00 2001 From: Devon Mizelle Date: Tue, 19 Apr 2022 14:40:44 -0400 Subject: [PATCH 004/245] kubernetes-controller-tools: 0.6.2 -> 0.8.0 https://github.com/kubernetes-sigs/controller-tools/releases/tag/v0.8.0 --- .../tools/kubernetes-controller-tools/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/kubernetes-controller-tools/default.nix b/pkgs/development/tools/kubernetes-controller-tools/default.nix index e1aacd306738..8e537c7a0e09 100644 --- a/pkgs/development/tools/kubernetes-controller-tools/default.nix +++ b/pkgs/development/tools/kubernetes-controller-tools/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "controller-tools"; - version = "0.6.2"; + version = "0.8.0"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = pname; rev = "v${version}"; - sha256 = "0hbai8pi59yhgsmmmxk3nghhy9hj3ma98jq2d1k46n46gr64a0q5"; + sha256 = "sha256-+nn/lj/MEtmC5NcvPOp1VZE13qJsGG+6eQaG+Yi8FTM="; }; - vendorSha256 = "061qvq8z98d39vyk1gr46fw5ynxra154s90n3pb7k1q7q45rg76j"; + vendorSha256 = "sha256-QCF3sfBUAjiIGb2EFrLKj5wHJ6HxJVqLEjxUTpMiX6E="; doCheck = false; From 44011a050288f2d2d9f31f4fa5c54191df090b58 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 27 May 2022 16:43:31 +0200 Subject: [PATCH 005/245] python310Packages.bravado-core: disable failing tests --- .../python-modules/bravado-core/default.nix | 109 ++++++++++++++---- 1 file changed, 84 insertions(+), 25 deletions(-) diff --git a/pkgs/development/python-modules/bravado-core/default.nix b/pkgs/development/python-modules/bravado-core/default.nix index 24db42b7a74f..04a42e9f18fe 100644 --- a/pkgs/development/python-modules/bravado-core/default.nix +++ b/pkgs/development/python-modules/bravado-core/default.nix @@ -1,47 +1,106 @@ -{ lib, buildPythonPackage, fetchFromGitHub, python-dateutil, jsonref, jsonschema, - pyyaml, simplejson, six, pytz, msgpack, swagger-spec-validator, rfc3987, - strict-rfc3339, webcolors, mypy-extensions, jsonpointer, idna, pytest, mock, - pytest-benchmark, isPy27, enum34 }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, fqdn +, idna +, isoduration +, jsonpointer +, jsonref +, jsonschema +, mock +, msgpack +, mypy-extensions +, pytest-benchmark +, pytestCheckHook +, python-dateutil +, pythonOlder +, pytz +, pyyaml +, rfc3987 +, rfc3339-validator +, simplejson +, six +, strict-rfc3339 +, swagger-spec-validator +, uri-template +, webcolors +}: buildPythonPackage rec { pname = "bravado-core"; version = "5.17.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "Yelp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-okQA4YJq0lyVJuDzD8mMRlOS/K3gf1qRUpw/5M0LlZE="; + hash = "sha256-okQA4YJq0lyVJuDzD8mMRlOS/K3gf1qRUpw/5M0LlZE="; }; + propagatedBuildInputs = [ + jsonref + jsonschema + msgpack + python-dateutil + pytz + pyyaml + simplejson + six + swagger-spec-validator + + # the following packages are included when jsonschema (3.2) is installed + # as jsonschema[format], which reflects what happens in setup.py + fqdn + idna + isoduration + jsonpointer + rfc3987 + rfc3339-validator + strict-rfc3339 + uri-template + webcolors + ]; + checkInputs = [ mypy-extensions - pytest + pytestCheckHook mock pytest-benchmark ]; - checkPhase = "pytest --benchmark-skip"; + pythonImportsCheck = [ + "bravado_core" + ]; - propagatedBuildInputs = [ - python-dateutil - jsonref - jsonschema - pyyaml - simplejson - six - pytz - msgpack - swagger-spec-validator + pytestFlagsArray = [ + "--benchmark-skip" + ]; - # the following 3 packages are included when jsonschema (3.2) is installed - # as jsonschema[format], which reflects what happens in setup.py - rfc3987 - strict-rfc3339 - webcolors - jsonpointer - idna - ] ++ lib.optionals isPy27 [ enum34 ]; + disabledTestPaths = [ + # Tests are out-dated (not supporting later modules releases, e.g., jsonschema) + "tests/_decorators_test.py" + "tests/formatter" + "tests/marshal" + "tests/model" + "tests/operation" + "tests/param" + "tests/request" + "tests/resource" + "tests/response" + "tests/schema" + "tests/security_test.py" + "tests/spec" + "tests/swagger20_validator" + "tests/unmarshal" + "tests/validate" + ]; + + disabledTests = [ + "test_petstore_spec" + ]; meta = with lib; { description = "Library for adding Swagger support to clients and servers"; From efec6c02d593856c3b433fd2b7480b161b0c4684 Mon Sep 17 00:00:00 2001 From: Mauricio Collares Date: Fri, 27 May 2022 15:53:18 -0700 Subject: [PATCH 006/245] glpk: 4.65 -> 5.0 --- pkgs/development/libraries/glpk/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/glpk/default.nix b/pkgs/development/libraries/glpk/default.nix index 7551c15649e6..a98a06118550 100644 --- a/pkgs/development/libraries/glpk/default.nix +++ b/pkgs/development/libraries/glpk/default.nix @@ -14,12 +14,12 @@ assert withGmp -> gmp != null; stdenv.mkDerivation rec { - version = "4.65"; + version = "5.0"; pname = "glpk"; src = fetchurl { url = "mirror://gnu/glpk/${pname}-${version}.tar.gz"; - sha256 = "040sfaa9jclg2nqdh83w71sv9rc1sznpnfiripjdyr48cady50a2"; + sha256 = "sha256-ShAT7rtQ9yj8YBvdgzsLKHAzPDs+WoFu66kh2VvsbxU="; }; buildInputs = @@ -45,8 +45,8 @@ stdenv.mkDerivation rec { # https://trac.sagemath.org/ticket/20710#comment:18 (fetchpatch { name = "error_recovery.patch"; - url = "https://git.sagemath.org/sage.git/plain/build/pkgs/glpk/patches/error_recovery.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; - sha256 = "0z99z9gd31apb6x5n5n26411qzx0ma3s6dnznc4x61x86bhq31qf"; + url = "https://git.sagemath.org/sage.git/plain/build/pkgs/glpk/patches/error_recovery.patch?id=d3c1f607e32f964bf0cab877a63767c86fd00266"; + sha256 = "sha256-2hNtUEoGTFt3JgUvLH3tPWnz+DZcXNhjXzS+/V89toA="; }) ]; From 58d2ebb2831fa3236598398c7dbba8e205d4e91c Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Thu, 26 May 2022 15:48:31 +0200 Subject: [PATCH 007/245] ntfs3g: 2021.8.22 -> 2022.5.17 This is unfortunately more complex than a simple version bump because upstream has not released a dist tarball for this release. This commit switches to using the github source and running autoreconf ourselves. Along the way, stop randomly patching sources and Makefiles and instead switch to upstreamable alternatives. The two (small) build system patches have been sent upstream, see tuxera/ntfs-3g#39. --- .../ntfs-3g/autoconf-sbin-helpers.patch | 98 +++++++++++++++++++ .../ntfs-3g/consistent-sbindir-usage.patch | 48 +++++++++ pkgs/tools/filesystems/ntfs-3g/default.nix | 43 ++++---- 3 files changed, 172 insertions(+), 17 deletions(-) create mode 100644 pkgs/tools/filesystems/ntfs-3g/autoconf-sbin-helpers.patch create mode 100644 pkgs/tools/filesystems/ntfs-3g/consistent-sbindir-usage.patch diff --git a/pkgs/tools/filesystems/ntfs-3g/autoconf-sbin-helpers.patch b/pkgs/tools/filesystems/ntfs-3g/autoconf-sbin-helpers.patch new file mode 100644 index 000000000000..5e896063ba6a --- /dev/null +++ b/pkgs/tools/filesystems/ntfs-3g/autoconf-sbin-helpers.patch @@ -0,0 +1,98 @@ +diff --git a/configure.ac b/configure.ac +index 9aa25bd5..c7c0437b 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -185,6 +185,30 @@ AC_ARG_ENABLE( + ] + ) + ++AC_ARG_WITH( ++ [mount-helper], ++ [AS_HELP_STRING([--with-mount-helper=BIN],[use the specified binary as mount helper @<:@default=/sbin/mount@:>@])], ++ [mount_helper="$withval"], ++ [mount_helper="/sbin/mount"] ++) ++AC_DEFINE_UNQUOTED([MOUNT_HELPER], ["$mount_helper"], [Binary used as mount helper.]) ++ ++AC_ARG_WITH( ++ [umount-helper], ++ [AS_HELP_STRING([--with-umount-helper=BIN],[use the specified binary as umount helper @<:@default=/sbin/umount@:>@])], ++ [umount_helper="$withval"], ++ [umount_helper="/sbin/umount"] ++) ++AC_DEFINE_UNQUOTED([UMOUNT_HELPER], ["$umount_helper"], [Binary used as umount helper.]) ++ ++AC_ARG_WITH( ++ [modprobe-helper], ++ [AS_HELP_STRING([--with-modprobe-helper=BIN],[use the specified binary as modprobe helper @<:@default=/sbin/modprobe@:>@])], ++ [modprobe_helper="$withval"], ++ [modprobe_helper="/sbin/modprobe"] ++) ++AC_DEFINE_UNQUOTED([MODPROBE_HELPER], ["$modprobe_helper"], [Binary used as modprobe helper.]) ++ + # pthread_rwlock_t requires _GNU_SOURCE + AC_GNU_SOURCE + +diff --git a/libfuse-lite/mount_util.c b/libfuse-lite/mount_util.c +index 8b317224..ee75ace6 100644 +--- a/libfuse-lite/mount_util.c ++++ b/libfuse-lite/mount_util.c +@@ -89,10 +89,10 @@ int fuse_mnt_add_mount(const char *progname, const char *fsname, + exit(1); + } + rmdir(tmp); +- execle("/sbin/mount", "/sbin/mount", "-F", type, "-o", opts, ++ execle(MOUNT_HELPER, MOUNT_HELPER, "-F", type, "-o", opts, + fsname, mnt, NULL, &env); +- fprintf(stderr, "%s: failed to execute /sbin/mount: %s\n", progname, +- strerror(errno)); ++ fprintf(stderr, "%s: failed to execute %s: %s\n", progname, ++ MOUNT_HELPER, strerror(errno)); + exit(1); + } + res = waitpid(res, &status, 0); +@@ -126,14 +126,14 @@ int fuse_mnt_umount(const char *progname, const char *mnt, int lazy) + + setuid(geteuid()); + if (lazy) { +- execle("/sbin/umount", "/sbin/umount", mnt, ++ execle(UMOUNT_HELPER, UMOUNT_HELPER, mnt, + NULL, &env); + } else { +- execle("/sbin/umount", "/sbin/umount", "-f", mnt, ++ execle(UMOUNT_HELPER, UMOUNT_HELPER, "-f", mnt, + NULL, &env); + } +- fprintf(stderr, "%s: failed to execute /sbin/umount: %s\n", progname, +- strerror(errno)); ++ fprintf(stderr, "%s: failed to execute %s: %s\n", progname, ++ UMOUNT_HELPER, strerror(errno)); + exit(1); + } + res = waitpid(res, &status, 0); +diff --git a/src/lowntfs-3g.c b/src/lowntfs-3g.c +index 9330500c..dd18a93f 100644 +--- a/src/lowntfs-3g.c ++++ b/src/lowntfs-3g.c +@@ -4463,7 +4463,7 @@ static fuse_fstype load_fuse_module(void) + int i; + struct stat st; + pid_t pid; +- const char *cmd = "/sbin/modprobe"; ++ const char *cmd = MODPROBE_HELPER; + char *env = (char*)NULL; + struct timespec req = { 0, 100000000 }; /* 100 msec */ + fuse_fstype fstype; +diff --git a/src/ntfs-3g.c b/src/ntfs-3g.c +index d8227e71..f5d77252 100644 +--- a/src/ntfs-3g.c ++++ b/src/ntfs-3g.c +@@ -4171,7 +4171,7 @@ static fuse_fstype load_fuse_module(void) + int i; + struct stat st; + pid_t pid; +- const char *cmd = "/sbin/modprobe"; ++ const char *cmd = MODPROBE_HELPER; + char *env = (char*)NULL; + struct timespec req = { 0, 100000000 }; /* 100 msec */ + fuse_fstype fstype; diff --git a/pkgs/tools/filesystems/ntfs-3g/consistent-sbindir-usage.patch b/pkgs/tools/filesystems/ntfs-3g/consistent-sbindir-usage.patch new file mode 100644 index 000000000000..29a35ecb1dd1 --- /dev/null +++ b/pkgs/tools/filesystems/ntfs-3g/consistent-sbindir-usage.patch @@ -0,0 +1,48 @@ +diff --git a/ntfsprogs/Makefile.am b/ntfsprogs/Makefile.am +index 08228322..a390d8c7 100644 +--- a/ntfsprogs/Makefile.am ++++ b/ntfsprogs/Makefile.am +@@ -165,7 +165,7 @@ extras: libs $(EXTRA_PROGRAMS) + + if ENABLE_MOUNT_HELPER + install-exec-hook: +- $(INSTALL) -d $(DESTDIR)/$(sbindir) ++ $(INSTALL) -d $(DESTDIR)$(sbindir) + $(LN_S) -f $(sbindir)/mkntfs $(DESTDIR)$(sbindir)/mkfs.ntfs + + install-data-hook: +@@ -173,7 +173,7 @@ install-data-hook: + $(LN_S) -f mkntfs.8 $(DESTDIR)$(man8dir)/mkfs.ntfs.8 + + uninstall-local: +- $(RM) -f $(DESTDIR)/sbin/mkfs.ntfs ++ $(RM) -f $(DESTDIR)$(sbindir)/mkfs.ntfs + $(RM) -f $(DESTDIR)$(man8dir)/mkfs.ntfs.8 + endif + +diff --git a/src/Makefile.am b/src/Makefile.am +index 8d984083..ea407067 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -66,9 +66,9 @@ endif + + if ENABLE_MOUNT_HELPER + install-exec-local: install-rootbinPROGRAMS +- $(MKDIR_P) "$(DESTDIR)/sbin" +- $(LN_S) -f "$(rootbindir)/ntfs-3g" "$(DESTDIR)/sbin/mount.ntfs-3g" +- $(LN_S) -f "$(rootbindir)/lowntfs-3g" "$(DESTDIR)/sbin/mount.lowntfs-3g" ++ $(MKDIR_P) "$(DESTDIR)$(rootsbindir)" ++ $(LN_S) -f "$(rootbindir)/ntfs-3g" "$(DESTDIR)$(rootsbindir)/mount.ntfs-3g" ++ $(LN_S) -f "$(rootbindir)/lowntfs-3g" "$(DESTDIR)$(rootsbindir)/mount.lowntfs-3g" + + install-data-local: install-man8 + $(LN_S) -f ntfs-3g.8 "$(DESTDIR)$(man8dir)/mount.ntfs-3g.8" +@@ -76,7 +76,7 @@ install-data-local: install-man8 + + uninstall-local: + $(RM) -f "$(DESTDIR)$(man8dir)/mount.ntfs-3g.8" +- $(RM) -f "$(DESTDIR)/sbin/mount.ntfs-3g" "$(DESTDIR)/sbin/mount.lowntfs-3g" ++ $(RM) -f "$(DESTDIR)$(rootsbindir)/mount.ntfs-3g" "$(DESTDIR)$(rootsbindir)/mount.lowntfs-3g" + endif + + endif # ENABLE_NTFS_3G diff --git a/pkgs/tools/filesystems/ntfs-3g/default.nix b/pkgs/tools/filesystems/ntfs-3g/default.nix index de110f61dd81..fe0ae20f557b 100644 --- a/pkgs/tools/filesystems/ntfs-3g/default.nix +++ b/pkgs/tools/filesystems/ntfs-3g/default.nix @@ -1,30 +1,34 @@ -{ lib, stdenv, fetchurl, pkg-config, mount, libuuid -, macfuse-stubs, DiskArbitration +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config +, gettext, mount, libuuid, kmod, macfuse-stubs, DiskArbitration , crypto ? false, libgcrypt, gnutls }: stdenv.mkDerivation rec { pname = "ntfs3g"; - version = "2021.8.22"; + version = "2022.5.17"; outputs = [ "out" "dev" "man" "doc" ]; - buildInputs = [ libuuid ] ++ lib.optionals crypto [ gnutls libgcrypt ] - ++ lib.optionals stdenv.isDarwin [ macfuse-stubs DiskArbitration ]; - nativeBuildInputs = [ pkg-config ]; - - src = fetchurl { - url = "https://tuxera.com/opensource/ntfs-3g_ntfsprogs-${version}.tgz"; - sha256 = "55b883aa05d94b2ec746ef3966cb41e66bed6db99f22ddd41d1b8b94bb202efb"; + src = fetchFromGitHub { + owner = "tuxera"; + repo = "ntfs-3g"; + rev = version; + sha256 = "sha256-xh8cMNIHeJ1rtk5zwOsmcxeedgZ3+MSiWn2UC7y+gtQ="; }; - patchPhase = '' - substituteInPlace src/Makefile.in --replace /sbin '@sbindir@' - substituteInPlace ntfsprogs/Makefile.in --replace /sbin '@sbindir@' - substituteInPlace libfuse-lite/mount_util.c \ - --replace /bin/mount ${mount}/bin/mount \ - --replace /bin/umount ${mount}/bin/umount - ''; + buildInputs = [ gettext libuuid ] + ++ lib.optionals crypto [ gnutls libgcrypt ] + ++ lib.optionals stdenv.isDarwin [ macfuse-stubs DiskArbitration ]; + + # Note: libgcrypt is listed here non-optionally because its m4 macros are + # being used in ntfs-3g's configure.ac. + nativeBuildInputs = [ autoreconfHook libgcrypt pkg-config ]; + + patches = [ + # https://github.com/tuxera/ntfs-3g/pull/39 + ./autoconf-sbin-helpers.patch + ./consistent-sbindir-usage.patch + ]; configureFlags = [ "--disable-ldconfig" @@ -34,6 +38,9 @@ stdenv.mkDerivation rec { "--enable-xattr-mappings" "--${if crypto then "enable" else "disable"}-crypto" "--enable-extras" + "--with-mount-helper=${mount}/bin/mount" + "--with-umount-helper=${mount}/bin/umount" + "--with-modprobe-helper=${kmod}/bin/modprobe" ]; postInstall = @@ -42,6 +49,8 @@ stdenv.mkDerivation rec { ln -sv mount.ntfs-3g $out/sbin/mount.ntfs ''; + enableParallelBuilding = true; + meta = with lib; { homepage = "https://github.com/tuxera/ntfs-3g"; description = "FUSE-based NTFS driver with full write support"; From 924b27e479a3058d23fa1ed12cb389260e3981bc Mon Sep 17 00:00:00 2001 From: "Markus S. Wamser" Date: Tue, 31 May 2022 10:07:21 +0200 Subject: [PATCH 008/245] CONTRIBUTING.md: use 22.05 as target branch for backports --- CONTRIBUTING.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ef620f5bc5c5..fb5e5b545955 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -104,10 +104,10 @@ This also works for PR's that have already been merged, and might take a couple You can also create the backport manually: 1. Take note of the commits in which the change was introduced into `master` branch. -2. Check out the target _release branch_, e.g. `release-21.11`. Do not use a _channel branch_ like `nixos-21.11` or `nixpkgs-21.11-darwin`. +2. Check out the target _release branch_, e.g. `release-22.05`. Do not use a _channel branch_ like `nixos-22.05` or `nixpkgs-22.05-darwin`. 3. Create a branch for your change, e.g. `git checkout -b backport`. 4. When the reason to backport is not obvious from the original commit message, use `git cherry-pick -xe ` and add a reason. Otherwise use `git cherry-pick -x `. That's fine for minor version updates that only include security and bug fixes, commits that fixes an otherwise broken package or similar. Please also ensure the commits exists on the master branch; in the case of squashed or rebased merges, the commit hash will change and the new commits can be found in the merge message at the bottom of the master pull request. -5. Push to GitHub and open a backport pull request. Make sure to select the release branch (e.g. `release-21.11`) as the target branch of the pull request, and link to the pull request in which the original change was comitted to `master`. The pull request title should be the commit title with the release version as prefix, e.g. `[21.11]`. +5. Push to GitHub and open a backport pull request. Make sure to select the release branch (e.g. `release-22.05`) as the target branch of the pull request, and link to the pull request in which the original change was comitted to `master`. The pull request title should be the commit title with the release version as prefix, e.g. `[22.05]`. 6. When the backport pull request is merged and you have the necessary privileges you can also replace the label `9.needs: port to stable` with `8.has: port to stable` on the original pull request. This way maintainers can keep track of missing backports easier. ## Criteria for Backporting changes From 390922654444067b796b70b04bda15d8ca5912d1 Mon Sep 17 00:00:00 2001 From: AmineChikhaoui Date: Tue, 31 May 2022 18:43:58 -0400 Subject: [PATCH 009/245] ec2-amis: add release 22.05 --- .../virtualisation/amazon-ec2-amis.nix | 50 ++++++++++++++++++- 1 file changed, 49 insertions(+), 1 deletion(-) diff --git a/nixos/modules/virtualisation/amazon-ec2-amis.nix b/nixos/modules/virtualisation/amazon-ec2-amis.nix index 91b5237e3371..0324c5332cff 100644 --- a/nixos/modules/virtualisation/amazon-ec2-amis.nix +++ b/nixos/modules/virtualisation/amazon-ec2-amis.nix @@ -440,5 +440,53 @@ let self = { "21.11".ap-east-1.aarch64-linux.hvm-ebs = "ami-0aa3b50a4f2822a00"; "21.11".sa-east-1.aarch64-linux.hvm-ebs = "ami-00f68eff453d3fe69"; - latest = self."21.11"; + # 22.05.342.a634c8f6c1f + + "22.05".eu-west-1.x86_64-linux.hvm-ebs = "ami-00badba5cfa0a0c0d"; + "22.05".af-south-1.x86_64-linux.hvm-ebs = "ami-0d3a6166c1ea4d7b4"; + "22.05".ap-east-1.x86_64-linux.hvm-ebs = "ami-06445325c360470d8"; + "22.05".ap-northeast-1.x86_64-linux.hvm-ebs = "ami-009c422293bcf3721"; + "22.05".ap-northeast-2.x86_64-linux.hvm-ebs = "ami-0bfc0397525a67ed8"; + "22.05".ap-northeast-3.x86_64-linux.hvm-ebs = "ami-0a1fb4d4e08a6065e"; + "22.05".ap-south-1.x86_64-linux.hvm-ebs = "ami-07ad258dcc69239d2"; + "22.05".ap-southeast-1.x86_64-linux.hvm-ebs = "ami-0f59f7f33cba8b1a4"; + "22.05".ap-southeast-2.x86_64-linux.hvm-ebs = "ami-0d1e49fe30aec165d"; + "22.05".ap-southeast-3.x86_64-linux.hvm-ebs = "ami-0f5cb24a1e3fc62dd"; + "22.05".ca-central-1.x86_64-linux.hvm-ebs = "ami-0551a595ba7916462"; + "22.05".eu-central-1.x86_64-linux.hvm-ebs = "ami-0702eee2e75d541d1"; + "22.05".eu-north-1.x86_64-linux.hvm-ebs = "ami-0fc6838942cb7d9cb"; + "22.05".eu-south-1.x86_64-linux.hvm-ebs = "ami-0df9463b8965cdb80"; + "22.05".eu-west-2.x86_64-linux.hvm-ebs = "ami-08f3c1eb533a42ac1"; + "22.05".eu-west-3.x86_64-linux.hvm-ebs = "ami-04b50c79dc4009c97"; + "22.05".me-south-1.x86_64-linux.hvm-ebs = "ami-05c52087afab7024d"; + "22.05".sa-east-1.x86_64-linux.hvm-ebs = "ami-0732aa0f0c28f281b"; + "22.05".us-east-1.x86_64-linux.hvm-ebs = "ami-0223db08811f6fb2d"; + "22.05".us-east-2.x86_64-linux.hvm-ebs = "ami-0a743534fa3e51b41"; + "22.05".us-west-1.x86_64-linux.hvm-ebs = "ami-0d72ab697beab5ea5"; + "22.05".us-west-2.x86_64-linux.hvm-ebs = "ami-034946f0c47088751"; + + "22.05".eu-west-1.aarch64-linux.hvm-ebs = "ami-08114069426233360"; + "22.05".af-south-1.aarch64-linux.hvm-ebs = "ami-0a9b83913abd61694"; + "22.05".ap-east-1.aarch64-linux.hvm-ebs = "ami-03966ad4547f532b7"; + "22.05".ap-northeast-1.aarch64-linux.hvm-ebs = "ami-0eb7e152c8d5aae7d"; + "22.05".ap-northeast-2.aarch64-linux.hvm-ebs = "ami-08369e00c5528762b"; + "22.05".ap-northeast-3.aarch64-linux.hvm-ebs = "ami-0fa14b8d48cdd57c3"; + "22.05".ap-south-1.aarch64-linux.hvm-ebs = "ami-0f2ca3b542ff0913b"; + "22.05".ap-southeast-1.aarch64-linux.hvm-ebs = "ami-087def0511ef2687d"; + "22.05".ap-southeast-2.aarch64-linux.hvm-ebs = "ami-0aa90985199011f04"; + "22.05".ap-southeast-3.aarch64-linux.hvm-ebs = "ami-0c86c52790deefa23"; + "22.05".ca-central-1.aarch64-linux.hvm-ebs = "ami-06e932cc9c20403e4"; + "22.05".eu-central-1.aarch64-linux.hvm-ebs = "ami-07680df1026a9b54c"; + "22.05".eu-north-1.aarch64-linux.hvm-ebs = "ami-0cbe9f2725e4de706"; + "22.05".eu-south-1.aarch64-linux.hvm-ebs = "ami-01a83c3892925765f"; + "22.05".eu-west-2.aarch64-linux.hvm-ebs = "ami-049024d086d039b54"; + "22.05".eu-west-3.aarch64-linux.hvm-ebs = "ami-0c0ebe20ebfc635a1"; + "22.05".me-south-1.aarch64-linux.hvm-ebs = "ami-0d662fcaac553e945"; + "22.05".sa-east-1.aarch64-linux.hvm-ebs = "ami-0888c8f703e00fdb8"; + "22.05".us-east-1.aarch64-linux.hvm-ebs = "ami-03536a13324333073"; + "22.05".us-east-2.aarch64-linux.hvm-ebs = "ami-067611519fa817aaa"; + "22.05".us-west-1.aarch64-linux.hvm-ebs = "ami-0f96be48071c13ab2"; + "22.05".us-west-2.aarch64-linux.hvm-ebs = "ami-084bc5d777585adfb"; + + latest = self."22.05"; }; in self From c9a10a58f33ff927d066df4735a3c057cf7ee2af Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 2 Jun 2022 06:30:51 +0000 Subject: [PATCH 010/245] libmediaart: 1.9.5 -> 1.9.6 --- pkgs/development/libraries/libmediaart/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libmediaart/default.nix b/pkgs/development/libraries/libmediaart/default.nix index 7f9c4d6ac94b..531ff8584fac 100644 --- a/pkgs/development/libraries/libmediaart/default.nix +++ b/pkgs/development/libraries/libmediaart/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libmediaart"; - version = "1.9.5"; + version = "1.9.6"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1mlw1qgj8nkd9ll6b6h54r1gfdy3zp8a8xqz7qfyfaj85jjgbph7"; + sha256 = "w7xQJdfbOAWH+cjrgAxhH2taFta0t4/P+T9ih2pnfxc="; }; nativeBuildInputs = [ meson ninja pkg-config vala gtk-doc docbook_xsl docbook_xml_dtd_412 gobject-introspection ]; From aa9f72b92b6b3dfd848524e9fa64acc3595cfe6c Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Mon, 23 Aug 2021 21:50:33 +0200 Subject: [PATCH 011/245] opencv4: disable hdf5 for cross-compilation This gets us as far as building opencv, but it doesn't completely build yet --- pkgs/development/libraries/opencv/4.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix index 0c6f9fb90c0c..c84740ebcdc9 100644 --- a/pkgs/development/libraries/opencv/4.x.nix +++ b/pkgs/development/libraries/opencv/4.x.nix @@ -244,9 +244,9 @@ stdenv.mkDerivation { echo '"(build info elided)"' > modules/core/version_string.inc ''; - buildInputs = - [ zlib pcre hdf5 boost gflags protobuf ] + buildInputs = [ zlib pcre boost gflags protobuf ] ++ lib.optional enablePython pythonPackages.python + ++ lib.optional (stdenv.buildPlatform == stdenv.hostPlatform) hdf5 ++ lib.optional enableGtk2 gtk2 ++ lib.optional enableGtk3 gtk3 ++ lib.optional enableVtk vtk From 56048394040202e92c5720a03eace36f1dc8d10b Mon Sep 17 00:00:00 2001 From: Filipe Regadas Date: Fri, 3 Jun 2022 16:54:33 +0100 Subject: [PATCH 012/245] metals: 0.11.5 -> 0.11.6 --- pkgs/development/tools/metals/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/metals/default.nix b/pkgs/development/tools/metals/default.nix index 4281a1d9e391..45ea829299a0 100644 --- a/pkgs/development/tools/metals/default.nix +++ b/pkgs/development/tools/metals/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "metals"; - version = "0.11.5"; + version = "0.11.6"; deps = stdenv.mkDerivation { name = "${pname}-deps-${version}"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "sha256-kw+8688E1b7XjEb7AqOExSVu88NqPprKaCuINWqL2wk="; + outputHash = "sha256-/tFc7xAuUtx2JgEMLhGaq2FXpt7KQNMi82ODr/gTfhM="; }; nativeBuildInputs = [ makeWrapper setJavaClassPath ]; From 3a34767c9bcfeea7809be5284202381c1ae3e675 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 4 Jun 2022 04:20:00 +0000 Subject: [PATCH 013/245] smatch: 20120924 -> 1.72 --- .../tools/analysis/smatch/default.nix | 43 +++++++++++-------- pkgs/top-level/all-packages.nix | 5 +-- 2 files changed, 25 insertions(+), 23 deletions(-) diff --git a/pkgs/development/tools/analysis/smatch/default.nix b/pkgs/development/tools/analysis/smatch/default.nix index 82a32504d73a..b22c1c4411fa 100644 --- a/pkgs/development/tools/analysis/smatch/default.nix +++ b/pkgs/development/tools/analysis/smatch/default.nix @@ -1,34 +1,39 @@ -{ lib, stdenv, fetchgit, sqlite, pkg-config, perl -, buildllvmsparse ? true -, buildc2xml ? true -, llvm, libxml2 +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, sqlite +, openssl +, buildllvmsparse ? false +, buildc2xml ? false +, libllvm +, libxml2 }: stdenv.mkDerivation rec { pname = "smatch"; - version = "20120924"; + version = "1.72"; - src = fetchgit { - url = "git://repo.or.cz/${pname}.git"; - rev = "23656e3e578b700cbf96d043f039e6341a3ba5b9"; - sha256 = "0r43qi6vryqg450fj73yjwbb7gzcgx64rhrhb3r1m6a252srijiy"; + src = fetchFromGitHub { + owner = "error27"; + repo = "smatch"; + rev = version; + sha256 = "sha256-XVW4sAgIxaJjAk75bp/O286uddIfgfKtIA2LniUGWBM="; }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ sqlite perl ] - ++ lib.optional buildllvmsparse llvm - ++ lib.optional buildc2xml libxml2; - preBuild = '' - sed -i Makefile \ - -e "s|^PREFIX=.*|PREFIX = $out|g" - ''; + buildInputs = [ sqlite openssl ] + ++ lib.optionals buildllvmsparse [ libllvm ] + ++ lib.optionals buildc2xml [ libxml2.dev ]; + + makeFlags = [ "PREFIX=${placeholder "out"}" "CXX=${stdenv.cc.targetPrefix}c++" ]; meta = with lib; { description = "A semantic analysis tool for C"; homepage = "http://smatch.sourceforge.net/"; - maintainers = with maintainers; []; - license = licenses.free; /* OSL, see http://www.opensource.org */ - platforms = platforms.linux; + maintainers = with maintainers; [ ]; + license = licenses.gpl2Plus; + platforms = platforms.all; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 51b8eb6f2688..1f22502e4e9a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16208,10 +16208,7 @@ with pkgs; sloc = nodePackages.sloc; - smatch = callPackage ../development/tools/analysis/smatch { - buildllvmsparse = false; - buildc2xml = false; - }; + smatch = callPackage ../development/tools/analysis/smatch { }; smc = callPackage ../tools/misc/smc { }; From cb90b5a8e42e674852dbe2c4f864fca2bd84e50a Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 4 Jun 2022 04:20:00 +0000 Subject: [PATCH 014/245] smatch: add marsam to maintainers --- pkgs/development/tools/analysis/smatch/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/analysis/smatch/default.nix b/pkgs/development/tools/analysis/smatch/default.nix index b22c1c4411fa..ff7462091069 100644 --- a/pkgs/development/tools/analysis/smatch/default.nix +++ b/pkgs/development/tools/analysis/smatch/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A semantic analysis tool for C"; homepage = "http://smatch.sourceforge.net/"; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ marsam ]; license = licenses.gpl2Plus; platforms = platforms.all; }; From 473bca4bd27738f487d134e0b3f79305dca09ef0 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 4 Jun 2022 07:47:40 +0100 Subject: [PATCH 015/245] linuxPackages_hardkernel_latest.usbip: pull upstream fix for -fno-common toolchains Without the change builds fails on upstream -gcc-10 as: ld: tools/usb/usbip/libsrc/vhci_driver.c:18: multiple definition of `udev_context'; tools/usb/usbip/libsrc/usbip_host_common.c:38: first defined here --- .../os-specific/linux/kernel/linux-hardkernel-4.14.nix | 10 +++++++++- pkgs/os-specific/linux/usbip/default.nix | 4 ++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix b/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix index 70ac299f1619..69bbdf648d22 100644 --- a/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix @@ -1,4 +1,4 @@ -{ buildPackages, fetchFromGitHub, perl, buildLinux, libelf, util-linux, ... } @ args: +{ buildPackages, fetchFromGitHub, fetchurl, perl, buildLinux, libelf, util-linux, kernelPatches ? [], ... } @ args: buildLinux (args // rec { version = "4.14.180-176"; @@ -16,6 +16,14 @@ buildLinux (args // rec { sha256 = "0n7i7a2bkrm9p1wfr20h54cqm32fbjvwyn703r6zm1f6ivqhk43v"; }; + kernelPatches = args.kernelPatches ++ [{ + name = "usbip-tools-fno-common"; + patch = fetchurl { + url = "https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/patch/?id=d5efc2e6b98fe661dbd8dd0d5d5bfb961728e57a"; + hash = "sha256-1CXYCV5zMLA4YdbCr8cO2N4CHEDzQChS9qbKYHPm3U4="; + }; + }]; + defconfig = "odroidxu4_defconfig"; # This extraConfig is (only) required because the gator module fails to build as-is. diff --git a/pkgs/os-specific/linux/usbip/default.nix b/pkgs/os-specific/linux/usbip/default.nix index 43c22a8fd12a..cadf38b106cc 100644 --- a/pkgs/os-specific/linux/usbip/default.nix +++ b/pkgs/os-specific/linux/usbip/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, kernel, udev, autoconf, automake, libtool, hwdata, kernelOlder }: +{ lib, stdenv, fetchpatch, kernel, udev, autoconf, automake, libtool, hwdata, kernelOlder }: stdenv.mkDerivation { name = "usbip-${kernel.name}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { ./fix-snprintf-truncation.patch # fixes build with gcc9 ./fix-strncpy-truncation.patch - ]; + ] ++ kernel.patches; nativeBuildInputs = [ autoconf automake libtool ]; buildInputs = [ udev ]; From c198b6e76e8d00b565f815bb377cc3d11bfd65d2 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sat, 4 Jun 2022 11:46:19 +0200 Subject: [PATCH 016/245] all-cabal-hashes: 2022-05-29T17:05:02Z -> 2022-06-04T09:01:11Z This commit has been generated by maintainers/scripts/haskell/update-hackage.sh --- pkgs/data/misc/hackage/pin.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/data/misc/hackage/pin.json b/pkgs/data/misc/hackage/pin.json index 5894a522434c..6002f4fc89d4 100644 --- a/pkgs/data/misc/hackage/pin.json +++ b/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "1da63d5bfb88cd1e920fefd1b55650c78edc5539", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/1da63d5bfb88cd1e920fefd1b55650c78edc5539.tar.gz", - "sha256": "1n8qv8ajfwrj73f81m2zj81jyjx1jxxhjljwp8gch2aq8piz74g6", - "msg": "Update from Hackage at 2022-05-29T17:05:02Z" + "commit": "a4be9679c308459b390768e6195f3f08ae5366db", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/a4be9679c308459b390768e6195f3f08ae5366db.tar.gz", + "sha256": "09pr3ag0k1wjiih36p902gcpygxg8f7wqpr5g8j7ka851g0gckqa", + "msg": "Update from Hackage at 2022-06-04T09:01:11Z" } From f2af2587970769d5985eab5a0189dc2160014814 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sat, 4 Jun 2022 11:46:34 +0200 Subject: [PATCH 017/245] haskellPackages: stackage LTS 19.8 -> LTS 19.9 This commit has been generated by maintainers/scripts/haskell/update-stackage.sh --- .../configuration-hackage2nix/stackage.yaml | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml index 5339368c6395..a6a478fb37f4 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml @@ -1,4 +1,4 @@ -# Stackage LTS 19.8 +# Stackage LTS 19.9 # This file is auto-generated by # maintainers/scripts/haskell/update-stackage.sh default-package-overrides: @@ -24,7 +24,7 @@ default-package-overrides: - aeson-casing ==0.2.0.0 - aeson-commit ==1.4 - aeson-compat ==0.3.10 - - aeson-diff ==1.1.0.12 + - aeson-diff ==1.1.0.13 - aeson-extra ==0.5.1 - aeson-generic-compat ==0.0.1.3 - aeson-optics ==1.1.1 @@ -368,7 +368,7 @@ default-package-overrides: - colour ==2.3.6 - columnar ==1.0.0.0 - combinatorial ==0.1.0.1 - - comfort-array ==0.5.1 + - comfort-array ==0.5.1.1 - comfort-array-shape ==0.0 - comfort-fftw ==0.0 - comfort-graph ==0.0.3.2 @@ -399,7 +399,7 @@ default-package-overrides: - conduit-aeson ==0.1.0.1 - conduit-algorithms ==0.0.12.0 - conduit-combinators ==1.3.0 - - conduit-concurrent-map ==0.1.1 + - conduit-concurrent-map ==0.1.3 - conduit-connection ==0.1.0.5 - conduit-extra ==1.3.6 - conduit-parse ==0.2.1.1 @@ -426,7 +426,7 @@ default-package-overrides: - control-dsl ==0.2.1.3 - control-monad-free ==0.6.2 - control-monad-omega ==0.3.2 - - convertible ==1.1.1.0 + - convertible ==1.1.1.1 - cookie ==0.4.5 - copr-api ==0.1.0 - core-data ==0.3.2.2 @@ -604,7 +604,7 @@ default-package-overrides: - doctest-exitcode-stdio ==0.0 - doctest-extract ==0.1 - doctest-lib ==0.1 - - doctest-parallel ==0.2.2 + - doctest-parallel ==0.2.3 - doldol ==0.4.1.2 - do-list ==1.0.1 - domain ==0.1.1.3 @@ -672,7 +672,7 @@ default-package-overrides: - eq ==4.3 - equal-files ==0.0.5.3 - equational-reasoning ==0.7.0.1 - - equivalence ==0.4 + - equivalence ==0.4.0.1 - erf ==2.0.0.0 - errata ==0.4.0.0 - error ==0.3.0.0 @@ -761,7 +761,7 @@ default-package-overrides: - fixed-length ==0.2.3 - fixed-vector ==1.2.1.0 - fixed-vector-hetero ==0.6.1.1 - - fix-whitespace ==0.0.7 + - fix-whitespace ==0.0.8 - flac ==0.2.0 - flac-picture ==0.1.2 - flags-applicative ==0.1.0.3 @@ -1328,7 +1328,7 @@ default-package-overrides: - json-feed ==2.0.0.1 - jsonifier ==0.2.0.1 - jsonpath ==0.2.1.0 - - json-stream ==0.4.3.0 + - json-stream ==0.4.4.1 - JuicyPixels ==3.3.7 - JuicyPixels-blurhash ==0.1.0.3 - JuicyPixels-extra ==0.5.2 @@ -1425,7 +1425,7 @@ default-package-overrides: - linux-file-extents ==0.2.0.0 - linux-namespaces ==0.1.3.0 - List ==0.6.2 - - ListLike ==4.7.6 + - ListLike ==4.7.7 - list-predicate ==0.1.0.1 - listsafe ==0.1.0.1 - list-singleton ==2.0.0.0 @@ -1611,7 +1611,7 @@ default-package-overrides: - mwc-random-monad ==0.7.3.1 - mx-state-codes ==1.0.0.0 - mysql ==0.2.1 - - mysql-simple ==0.4.7.2 + - mysql-simple ==0.4.8 - n2o ==0.11.1 - n2o-nitro ==0.11.2 - nagios-check ==0.3.2 @@ -1622,7 +1622,7 @@ default-package-overrides: - nanospec ==0.2.2 - nanovg ==0.8.0.0 - nats ==1.1.2 - - natural-arithmetic ==0.1.2.0 + - natural-arithmetic ==0.1.3.0 - natural-induction ==0.2.0.0 - natural-sort ==0.1.2 - natural-transformation ==0.4 @@ -1681,9 +1681,9 @@ default-package-overrides: - numbers ==3000.2.0.2 - numeric-extras ==0.1 - numeric-limits ==0.1.0.0 - - numeric-prelude ==0.4.3.3 + - numeric-prelude ==0.4.4 - numeric-quest ==0.2.0.2 - - numhask ==0.10.0.0 + - numhask ==0.10.1.0 - numhask-array ==0.10.0 - numhask-space ==0.10.0.0 - NumInstances ==1.4 @@ -2208,7 +2208,7 @@ default-package-overrides: - shake ==0.19.6 - shake-language-c ==0.12.0 - shake-plus ==0.3.4.0 - - shakespeare ==2.0.27 + - shakespeare ==2.0.29 - shared-memory ==0.2.0.0 - ShellCheck ==0.8.0 - shell-conduit ==5.0.0 @@ -2478,7 +2478,7 @@ default-package-overrides: - text-regex-replace ==0.1.1.4 - text-rope ==0.1 - text-short ==0.1.5 - - text-show ==3.9.6 + - text-show ==3.9.7 - text-show-instances ==3.8.6 - text-zipper ==0.11 - tfp ==1.0.2 @@ -2488,7 +2488,7 @@ default-package-overrides: - th-compat ==0.1.3 - th-constraint-compat ==0.0.1.0 - th-desugar ==1.12 - - th-env ==0.1.0.3 + - th-env ==0.1.1 - these ==1.1.1.1 - these-lens ==1.0.1.2 - these-optics ==1.0.1.2 @@ -2613,7 +2613,7 @@ default-package-overrides: - unicode-show ==0.1.1.1 - unicode-transforms ==0.4.0.1 - unidecode ==0.1.0.4 - - unification-fd ==0.11.1 + - unification-fd ==0.11.2 - union ==0.1.2 - union-angle ==0.1.0.1 - union-find ==0.2 @@ -2632,7 +2632,7 @@ default-package-overrides: - universe-reverse-instances ==1.1.1 - universe-some ==1.2.1 - universum ==1.7.3 - - unix-bytestring ==0.3.7.6 + - unix-bytestring ==0.3.7.7 - unix-compat ==0.5.4 - unix-time ==0.4.7 - unliftio ==0.2.22.0 @@ -2735,7 +2735,7 @@ default-package-overrides: - wai-transformers ==0.1.0 - wai-websockets ==3.0.1.2 - wakame ==0.1.0.0 - - warp ==3.3.20 + - warp ==3.3.21 - warp-tls ==3.3.2 - warp-tls-uid ==0.2.0.6 - wave ==0.2.0 From 305585788bfc5fac4ae1340b144316b9acb942db Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sat, 4 Jun 2022 11:48:07 +0200 Subject: [PATCH 018/245] haskellPackages: regenerate package set based on current config This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh --- .../haskell-modules/hackage-packages.nix | 1544 +++++++++++------ 1 file changed, 967 insertions(+), 577 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 135dd6ef28bd..f186a881ed3a 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -10931,8 +10931,8 @@ self: { pname = "HsOpenSSL"; version = "0.11.7.2"; sha256 = "0ysdfl8ck3nzhx597fa13dqf31jq5gzwajlak6r91jajks9w0dl5"; - revision = "2"; - editedCabalFile = "1wqk9mnzxwphiza6lwg526nvr6mzbwv0l22kwbsd2r9vv1gix1rk"; + revision = "3"; + editedCabalFile = "0nsqxym87s48029laqba4nzwpk7nrk35x7wmpjqfnbrj82ddcshd"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base bytestring network time ]; librarySystemDepends = [ openssl ]; @@ -12898,27 +12898,6 @@ self: { }) {}; "ListLike" = callPackage - ({ mkDerivation, array, base, bytestring, containers, deepseq - , dlist, fmlist, HUnit, QuickCheck, random, text, utf8-string - , vector - }: - mkDerivation { - pname = "ListLike"; - version = "4.7.6"; - sha256 = "08jip0q2f9qc95wcqka2lrqpf8r7sswsi5104w73kyrbmfirqnrd"; - libraryHaskellDepends = [ - array base bytestring containers deepseq dlist fmlist text - utf8-string vector - ]; - testHaskellDepends = [ - array base bytestring containers dlist fmlist HUnit QuickCheck - random text utf8-string vector - ]; - description = "Generalized support for list-like structures"; - license = lib.licenses.bsd3; - }) {}; - - "ListLike_4_7_7" = callPackage ({ mkDerivation, array, base, bytestring, containers, deepseq , dlist, fmlist, HUnit, QuickCheck, random, text, utf8-string , vector @@ -12937,7 +12916,6 @@ self: { ]; description = "Generalized support for list-like structures"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "ListT" = callPackage @@ -13380,26 +13358,26 @@ self: { ({ mkDerivation, abstract-par, array, base, bytestring, cgi , containers, directory, extensible-exceptions, ghc, ghc-paths , hashable, haskell-src, hint, html, monad-par, mtl, mueval - , network, network-uri, pretty, process, random, syb - , template-haskell, tf-random, time, transformers, unix + , network, network-uri, pretty, process, random, splitmix, syb + , template-haskell, time, transformers, unix }: mkDerivation { pname = "MagicHaskeller"; - version = "0.9.6.10"; - sha256 = "04rfddv8hldjavks7pn3s9p80cgpzlz3x9f9d7y6wyz98zcqxpbf"; + version = "0.9.7.1"; + sha256 = "1vdbv8ysn6dfpkj33pxmgpzbwkipk618jq431dxnk6v997vvvscb"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base bytestring containers directory ghc ghc-paths hashable - haskell-src html mtl network network-uri pretty random syb - template-haskell tf-random time transformers + haskell-src html mtl network pretty random splitmix syb + template-haskell time transformers ]; executableHaskellDepends = [ abstract-par array base bytestring cgi containers directory extensible-exceptions ghc ghc-paths hashable haskell-src hint html monad-par mtl mueval network network-uri pretty process random syb - template-haskell tf-random time transformers unix + template-haskell time transformers unix ]; description = "Automatic inductive functional programmer by systematic search"; license = lib.licenses.bsd3; @@ -14007,16 +13985,20 @@ self: { }) {}; "Monadoro" = callPackage - ({ mkDerivation, ansi-terminal, base, doctest, hspec, time }: + ({ mkDerivation, ansi-terminal, base, doctest, hspec, process, time + }: mkDerivation { pname = "Monadoro"; - version = "0.2.6.0"; - sha256 = "0ijiqwx8vy00l1aphbj2kjfdzycsj6hm5828liyj4qig6cr6l1zd"; + version = "0.2.6.3"; + sha256 = "0z2pj6677mgc4pa7wz9j3wnk425flq1y3sw6s2i974p8b5sv4y65"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ ansi-terminal base time ]; - executableHaskellDepends = [ ansi-terminal base time ]; - testHaskellDepends = [ ansi-terminal base doctest hspec time ]; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ ansi-terminal base process time ]; + executableHaskellDepends = [ ansi-terminal base process time ]; + testHaskellDepends = [ + ansi-terminal base doctest hspec process time + ]; description = "A minimalistic CLI Pomodoro timer"; license = lib.licenses.mit; }) {}; @@ -14278,6 +14260,89 @@ self: { broken = true; }) {}; + "NGLess" = callPackage + ({ mkDerivation, aeson, ansi-terminal, async, atomic-write, base + , bytestring, bytestring-lexing, bzlib-conduit, conduit + , conduit-algorithms, conduit-extra, configurator, containers + , convertible, criterion, data-default, deepseq, diagrams-core + , diagrams-lib, diagrams-svg, directory, double-conversion + , edit-distance, either, errors, exceptions, extra, file-embed + , filemanip, filepath, hashable, hashtables, hostname, http-client + , http-conduit, HUnit, inline-c, inline-c-cpp, int-interval-map + , MissingH, mtl, network, optparse-applicative, parsec, primitive + , process, QuickCheck, regex, resourcet, safe, safeio, stm + , stm-chans, stm-conduit, strict, tar, tar-conduit, tasty + , tasty-hunit, tasty-quickcheck, tasty-th, template-haskell, text + , time, transformers, unix, unix-compat, unliftio, unliftio-core + , vector, vector-algorithms, yaml, zlib + }: + mkDerivation { + pname = "NGLess"; + version = "1.4.1"; + sha256 = "1vnf13zc8as8p98rb3zbi1y68ymf65gpshzx2w9mfk4ibd1xwhry"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson ansi-terminal async atomic-write base bytestring + bytestring-lexing bzlib-conduit conduit conduit-algorithms + conduit-extra configurator containers convertible data-default + deepseq diagrams-core diagrams-lib diagrams-svg directory + double-conversion edit-distance either errors exceptions extra + file-embed filemanip filepath hashable hashtables hostname + http-client http-conduit inline-c inline-c-cpp int-interval-map + MissingH mtl network optparse-applicative parsec primitive process + regex resourcet safe safeio stm stm-chans stm-conduit strict tar + tar-conduit template-haskell text time transformers unix + unix-compat unliftio unliftio-core vector vector-algorithms yaml + zlib + ]; + executableHaskellDepends = [ + aeson ansi-terminal async atomic-write base bytestring + bytestring-lexing bzlib-conduit conduit conduit-algorithms + conduit-extra configurator containers convertible data-default + deepseq diagrams-core diagrams-lib diagrams-svg directory + double-conversion edit-distance either errors exceptions extra + file-embed filemanip filepath hashable hashtables hostname + http-client http-conduit inline-c inline-c-cpp int-interval-map + MissingH mtl network optparse-applicative parsec primitive process + regex resourcet safe safeio stm stm-chans stm-conduit strict tar + tar-conduit template-haskell text time transformers unix + unix-compat unliftio unliftio-core vector vector-algorithms yaml + zlib + ]; + testHaskellDepends = [ + aeson ansi-terminal async atomic-write base bytestring + bytestring-lexing bzlib-conduit conduit conduit-algorithms + conduit-extra configurator containers convertible data-default + deepseq diagrams-core diagrams-lib diagrams-svg directory + double-conversion edit-distance either errors exceptions extra + file-embed filemanip filepath hashable hashtables hostname + http-client http-conduit HUnit inline-c inline-c-cpp + int-interval-map MissingH mtl network optparse-applicative parsec + primitive process QuickCheck regex resourcet safe safeio stm + stm-chans stm-conduit strict tar tar-conduit tasty tasty-hunit + tasty-quickcheck tasty-th template-haskell text time transformers + unix unix-compat unliftio unliftio-core vector vector-algorithms + yaml zlib + ]; + benchmarkHaskellDepends = [ + aeson ansi-terminal async atomic-write base bytestring + bytestring-lexing bzlib-conduit conduit conduit-algorithms + conduit-extra configurator containers convertible criterion + data-default deepseq diagrams-core diagrams-lib diagrams-svg + directory double-conversion edit-distance either errors exceptions + extra file-embed filemanip filepath hashable hashtables hostname + http-client http-conduit HUnit inline-c inline-c-cpp + int-interval-map MissingH mtl network optparse-applicative parsec + primitive process regex resourcet safe safeio stm stm-chans + stm-conduit strict tar tar-conduit template-haskell text time + transformers unix unix-compat unliftio unliftio-core vector + vector-algorithms yaml zlib + ]; + description = "NGLess implements ngless, a DSL for processing sequencing data"; + license = lib.licenses.mit; + }) {}; + "NGrams" = callPackage ({ mkDerivation, base, HCL, HTTP, network, regex-compat }: mkDerivation { @@ -15306,8 +15371,8 @@ self: { pname = "OpenGL"; version = "3.0.3.0"; sha256 = "069fg8jcxqq2z9iikynd8vi3jxm2b5y3qywdh4bdviyzab3zy1as"; - revision = "1"; - editedCabalFile = "1748mrb6r9mpf5jbrx436lwbg8w6dadyy8dhxw2dwnrj5z7zf741"; + revision = "2"; + editedCabalFile = "1nhlswxgxn8l1ysjq3fp3w5pvx6651d33036i8dlbqygzrn6iwmh"; libraryHaskellDepends = [ base bytestring containers GLURaw ObjectName OpenGLRaw StateVar text transformers @@ -23428,6 +23493,38 @@ self: { license = lib.licenses.publicDomain; }) {}; + "acid-state_0_16_1_1" = callPackage + ({ mkDerivation, array, base, bytestring, cereal, containers + , criterion, deepseq, directory, filelock, filepath, hedgehog + , hspec, hspec-discover, mtl, network, network-bsd, random + , safecopy, stm, system-fileio, system-filepath, template-haskell + , text, th-expand-syns, time, unix + }: + mkDerivation { + pname = "acid-state"; + version = "0.16.1.1"; + sha256 = "05hcbk5dhwygc29b1jbyh2zzjrxybm44hj02wmv2bhz04b5wldca"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array base bytestring cereal containers directory filelock filepath + mtl network network-bsd safecopy stm template-haskell + th-expand-syns unix + ]; + executableHaskellDepends = [ base directory ]; + testHaskellDepends = [ + base cereal containers deepseq directory hedgehog hspec + hspec-discover mtl network safecopy template-haskell text time + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ + base criterion directory mtl random system-fileio system-filepath + ]; + description = "Add ACID guarantees to any serializable Haskell data structure"; + license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; + }) {}; + "acid-state-dist" = callPackage ({ mkDerivation, acid-state, base, bytestring, cereal , concurrent-extra, containers, criterion, directory, filepath, mtl @@ -24942,32 +25039,6 @@ self: { }) {}; "aeson-diff" = callPackage - ({ mkDerivation, aeson, base, bytestring, Cabal, cabal-doctest - , directory, doctest, edit-distance-vector, filepath, Glob - , optparse-applicative, QuickCheck, scientific, text, vector - }: - mkDerivation { - pname = "aeson-diff"; - version = "1.1.0.12"; - sha256 = "0zr7qjcyklwgg6k9cf12z2cpkyyxb9jkhx7pkb2h31vprzba4b9z"; - isLibrary = true; - isExecutable = true; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - aeson base bytestring edit-distance-vector scientific text vector - ]; - executableHaskellDepends = [ - aeson base bytestring optparse-applicative - ]; - testHaskellDepends = [ - aeson base bytestring directory doctest filepath Glob QuickCheck - vector - ]; - description = "Extract and apply patches to JSON documents"; - license = lib.licenses.bsd3; - }) {}; - - "aeson-diff_1_1_0_13" = callPackage ({ mkDerivation, aeson, base, bytestring, Cabal, cabal-doctest , directory, doctest, edit-distance-vector, filepath, Glob , optparse-applicative, QuickCheck, scientific, text, vector, yaml @@ -24991,7 +25062,6 @@ self: { ]; description = "Extract and apply patches to JSON documents"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "aeson-diff-generic" = callPackage @@ -25717,8 +25787,8 @@ self: { }: mkDerivation { pname = "aeson-value-parser"; - version = "0.19.6"; - sha256 = "0nx0f46vrx94i6jnzh063fxjfwjm1snb9p41q18rlsj5hwgva0xs"; + version = "0.19.7"; + sha256 = "13q6jgmvswybfw3wiwm6zdcm1i6xpbg86qm1kklqvqzwpb4axfnd"; libraryHaskellDepends = [ aeson attoparsec base bytestring hashable megaparsec mtl scientific text transformers unordered-containers vector @@ -31992,21 +32062,22 @@ self: { ({ mkDerivation, aeson, aeson-pretty, alex, array, attoparsec, base , base16-bytestring, base64-bytestring, bytestring , case-insensitive, cborg, containers, criterion, deepseq, happy - , lens, QuickCheck, regex-compat-tdfa, safe, safecopy, scientific - , serialise, tasty, tasty-hunit, tasty-quickcheck, template-haskell - , text, time, unordered-containers, vector + , lens, QuickCheck, regex-base, regex-tdfa, safe, safecopy + , scientific, serialise, tasty, tasty-hunit, tasty-quickcheck + , template-haskell, text, time, unordered-containers, vector }: mkDerivation { pname = "api-tools"; - version = "0.9.0.0"; - sha256 = "04496r4l598i2m14gj1wpz8a976as0gkbw0745h85ap8hy23vfjx"; + version = "0.10.0.0"; + sha256 = "0hz4pa0n4wf9kd8r98xd0c39p790fn9iaqzjj2m653641acjbm0w"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson aeson-pretty array attoparsec base base16-bytestring base64-bytestring bytestring case-insensitive cborg containers - deepseq lens QuickCheck regex-compat-tdfa safe safecopy scientific - serialise template-haskell text time unordered-containers vector + deepseq lens QuickCheck regex-base regex-tdfa safe safecopy + scientific serialise template-haskell text time + unordered-containers vector ]; libraryToolDepends = [ alex happy ]; executableHaskellDepends = [ @@ -38081,6 +38152,26 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "aws-sns-verify" = callPackage + ({ mkDerivation, aeson, aeson-qq, async, base, bytestring, errors + , hspec, http-conduit, http-types, memory, pem, text, wai, warp + , x509, x509-validation + }: + mkDerivation { + pname = "aws-sns-verify"; + version = "0.0.0.1"; + sha256 = "1ayn2176y3011xf4n0axfnlaa9ysy2xdsqszmkhf3yszlkkrhmqi"; + libraryHaskellDepends = [ + aeson base bytestring errors http-conduit memory pem text x509 + x509-validation + ]; + testHaskellDepends = [ + aeson-qq async base hspec http-types text wai warp x509-validation + ]; + description = "Parse and verify AWS SNS messages"; + license = lib.licenses.mit; + }) {}; + "aws-transcribe-ws" = callPackage ({ mkDerivation, aeson, am-test, async, base, base16-bytestring , binary, bytestring, crc, cryptohash-sha256, lens, stm, text, time @@ -45601,8 +45692,8 @@ self: { }: mkDerivation { pname = "bloodhound"; - version = "0.20.0.0"; - sha256 = "175w602jvjrf2j1jaygj4spznyq66ga5mkbpfi6nzrygv609dbrh"; + version = "0.20.0.2"; + sha256 = "1dvs0gbh7wn9bp99b64vdf2as7zr4bcvxrjzpmlkak4vb4g4bqfz"; libraryHaskellDepends = [ aeson base blaze-builder bytestring containers exceptions hashable http-client http-types mtl network-uri scientific semigroups semver @@ -46269,8 +46360,8 @@ self: { ({ mkDerivation, base, containers, time }: mkDerivation { pname = "bookhound"; - version = "0.1.7.0"; - sha256 = "0811day6w7rgpvp22d1pyjz0bdz175kk9qfzl04wg2bmfg577k2d"; + version = "0.1.8.0"; + sha256 = "1rmfhi12p0i6zsw7rlcyb6qdg1asda3n9gxhyh773hh3v99v5qd0"; libraryHaskellDepends = [ base containers time ]; description = "Simple Parser Combinators & Parsers"; license = "LGPL"; @@ -51305,6 +51396,32 @@ self: { broken = true; }) {}; + "cabal2json" = callPackage + ({ mkDerivation, aeson, autodocodec, autodocodec-yaml, base + , bytestring, Cabal, hashable, pretty, pretty-show, sydtest + , sydtest-aeson, sydtest-discover, text, unordered-containers + , utf8-string + }: + mkDerivation { + pname = "cabal2json"; + version = "0.0.0.0"; + sha256 = "19dy7x643243ryqcc4wimz0pm1f1m0bqb0w7as5jhpvnk7rz06zq"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson autodocodec base bytestring Cabal hashable pretty pretty-show + text unordered-containers + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + autodocodec autodocodec-yaml base Cabal sydtest sydtest-aeson + utf8-string + ]; + testToolDepends = [ sydtest-discover ]; + description = "Turn a .cabal file into a .json file"; + license = lib.licenses.mit; + }) {}; + "cabal2nix" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, base, bytestring, Cabal , containers, deepseq, directory, distribution-nixpkgs, filepath @@ -52040,31 +52157,29 @@ self: { }) {}; "calamity" = callPackage - ({ mkDerivation, aeson, async, base, bytestring, calamity-commands - , colour, concurrent-extra, connection, containers - , data-default-class, data-flags, deepseq, deque, df1, di-core - , di-polysemy, exceptions, focus, generic-lens, hashable - , http-api-data, http-client, http-date, http-types, lens - , lens-aeson, megaparsec, mime-types, mtl, polysemy - , polysemy-plugin, PyF, random, reflection, req, safe-exceptions - , scientific, stm, stm-chans, stm-containers, text, text-show, time - , tls, typerep-map, unagi-chan, unboxing-vector + ({ mkDerivation, aeson, aeson-optics, async, base, bytestring + , calamity-commands, colour, concurrent-extra, connection + , containers, data-default-class, data-flags, deepseq, deque, df1 + , di-core, di-polysemy, exceptions, focus, hashable, http-api-data + , http-client, http-date, http-types, megaparsec, mime-types, mtl + , optics, polysemy, polysemy-plugin, PyF, random, reflection, req + , safe-exceptions, scientific, stm, stm-chans, stm-containers, text + , text-show, time, tls, typerep-map, unagi-chan, unboxing-vector , unordered-containers, vector, websockets, x509-system }: mkDerivation { pname = "calamity"; - version = "0.4.0.0"; - sha256 = "1imga81akx5z8f4nyd9minac7bspmjhpymbg9j8zcm2zh8wl7mmx"; + version = "0.5.0.0"; + sha256 = "1sx4dxvk5xcl5x3rnknl5syg65mzrr8shg75yajixsbhimg226zy"; libraryHaskellDepends = [ - aeson async base bytestring calamity-commands colour + aeson aeson-optics async base bytestring calamity-commands colour concurrent-extra connection containers data-default-class data-flags deepseq deque df1 di-core di-polysemy exceptions focus - generic-lens hashable http-api-data http-client http-date - http-types lens lens-aeson megaparsec mime-types mtl polysemy - polysemy-plugin PyF random reflection req safe-exceptions - scientific stm stm-chans stm-containers text text-show time tls - typerep-map unagi-chan unboxing-vector unordered-containers vector - websockets x509-system + hashable http-api-data http-client http-date http-types megaparsec + mime-types mtl optics polysemy polysemy-plugin PyF random + reflection req safe-exceptions scientific stm stm-chans + stm-containers text text-show time tls typerep-map unagi-chan + unboxing-vector unordered-containers vector websockets x509-system ]; description = "A library for writing discord bots in haskell"; license = lib.licenses.mit; @@ -52073,16 +52188,16 @@ self: { }) {}; "calamity-commands" = callPackage - ({ mkDerivation, base, generic-lens, lens, megaparsec, polysemy + ({ mkDerivation, base, megaparsec, optics, polysemy , polysemy-plugin, text, text-show, unordered-containers }: mkDerivation { pname = "calamity-commands"; - version = "0.3.0.0"; - sha256 = "0vngcddhxdd4gzjpjh8iq0qqkkybhs8hrf73kjk21hxr0kldrl4b"; + version = "0.4.0.0"; + sha256 = "10zfq0dnf5yy1dbi0s08c67svm8rln43wnas6mxid9kcql2cmgfb"; libraryHaskellDepends = [ - base generic-lens lens megaparsec polysemy polysemy-plugin text - text-show unordered-containers + base megaparsec optics polysemy polysemy-plugin text text-show + unordered-containers ]; description = "A library for declaring, parsing, and invoking text-input based commands"; license = lib.licenses.mit; @@ -52265,6 +52380,19 @@ self: { broken = true; }) {}; + "call-plantuml" = callPackage + ({ mkDerivation, base, bytestring, filepath, hspec, process }: + mkDerivation { + pname = "call-plantuml"; + version = "0.0.1"; + sha256 = "1bx914719566fkhpxxyc22m3x8aq6c134kgs2a6ipf583883yfzh"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ base bytestring filepath process ]; + testHaskellDepends = [ base bytestring filepath hspec process ]; + description = "A simple library to call PlantUML given a diagram specification"; + license = lib.licenses.mit; + }) {}; + "call-stack" = callPackage ({ mkDerivation, base, filepath, nanospec }: mkDerivation { @@ -52705,8 +52833,8 @@ self: { }: mkDerivation { pname = "capnp"; - version = "0.15.0.0"; - sha256 = "15vywgr01as3avmz9q1zp899w39xf6p9pk95bvvdmh9py2jh4sf4"; + version = "0.16.0.0"; + sha256 = "1pxg8l5lahx8j1wayq665s2as29zpfmjh0kn3962awxj376fhrwf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -56018,6 +56146,29 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "chez-grater" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring + , case-insensitive, containers, file-embed, file-path-th, hashable + , hspec, http-client, http-client-tls, http-types, network-uri + , QuickCheck, scalpel, text, unordered-containers + }: + mkDerivation { + pname = "chez-grater"; + version = "0.0.2"; + sha256 = "1f7v362b6wbjz7j77r7mhi0942qzds7h7aibss8c3w1l6d3d62r2"; + libraryHaskellDepends = [ + aeson attoparsec base case-insensitive containers hashable + http-client http-client-tls http-types network-uri scalpel text + unordered-containers + ]; + testHaskellDepends = [ + attoparsec base bytestring case-insensitive containers file-embed + file-path-th hspec http-client network-uri QuickCheck text + ]; + description = "Parse and scrape recipe blogs"; + license = lib.licenses.mit; + }) {}; + "chiasma" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, composition , composition-extra, conduit, conduit-extra, containers, cornea @@ -59960,8 +60111,8 @@ self: { }: mkDerivation { pname = "cobot-io"; - version = "0.1.4.3"; - sha256 = "1xmdz71ay9jphxabap610qvcm4bcm3dbd06zx6zkhd8xjz1hqsjf"; + version = "0.1.4.4"; + sha256 = "04dizmriis6zs7jfwbagnzrszlmky8xkvrsmxb8wra90fnww8l66"; libraryHaskellDepends = [ array attoparsec base binary bytestring cobot containers data-msgpack deepseq http-conduit hyraxAbif lens linear megaparsec @@ -61343,29 +61494,6 @@ self: { }) {}; "comfort-array" = callPackage - ({ mkDerivation, base, ChasingBottoms, containers, deepseq - , doctest-exitcode-stdio, doctest-lib, guarded-allocation - , non-empty, prelude-compat, primitive, QuickCheck, semigroups - , storable-record, storablevector, tagged, transformers, utility-ht - }: - mkDerivation { - pname = "comfort-array"; - version = "0.5.1"; - sha256 = "0kx4z07a15jrc3dzaxx1335j1wxkgkajmyiraf5wb18l3xyd36b4"; - libraryHaskellDepends = [ - base containers deepseq guarded-allocation non-empty prelude-compat - primitive QuickCheck semigroups storable-record storablevector - tagged transformers utility-ht - ]; - testHaskellDepends = [ - base ChasingBottoms containers doctest-exitcode-stdio doctest-lib - QuickCheck tagged - ]; - description = "Arrays where the index type is a function of the shape type"; - license = lib.licenses.bsd3; - }) {}; - - "comfort-array_0_5_1_1" = callPackage ({ mkDerivation, base, ChasingBottoms, containers, deepseq , doctest-exitcode-stdio, doctest-lib, guarded-allocation , non-empty, prelude-compat, primitive, QuickCheck, semigroups @@ -61386,7 +61514,6 @@ self: { ]; description = "Arrays where the index type is a function of the shape type"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "comfort-array-shape" = callPackage @@ -61642,6 +61769,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "commonmark-extensions_0_2_3_2" = callPackage + ({ mkDerivation, base, commonmark, containers, emojis, filepath + , network-uri, parsec, tasty, tasty-bench, tasty-hunit, text + , transformers + }: + mkDerivation { + pname = "commonmark-extensions"; + version = "0.2.3.2"; + sha256 = "1k5rlh2grg6g1waszhp565m360n1iynjvbkjz8xmap8y234g1bjj"; + libraryHaskellDepends = [ + base commonmark containers emojis filepath network-uri parsec text + transformers + ]; + testHaskellDepends = [ + base commonmark parsec tasty tasty-hunit text + ]; + benchmarkHaskellDepends = [ base commonmark tasty-bench text ]; + description = "Pure Haskell commonmark parser"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "commonmark-pandoc" = callPackage ({ mkDerivation, base, commonmark, commonmark-extensions , pandoc-types, text @@ -63821,22 +63970,6 @@ self: { }) {}; "conduit-concurrent-map" = callPackage - ({ mkDerivation, base, conduit, containers, hspec, HUnit, mtl - , resourcet, say, unliftio, unliftio-core, vector - }: - mkDerivation { - pname = "conduit-concurrent-map"; - version = "0.1.1"; - sha256 = "0rn7sry51xiz00hrs2vvqff18lnmmzyadrd858g1ixga76f44z2j"; - libraryHaskellDepends = [ - base conduit containers mtl resourcet unliftio unliftio-core vector - ]; - testHaskellDepends = [ base conduit hspec HUnit say ]; - description = "Concurrent, order-preserving mapping Conduit"; - license = lib.licenses.mit; - }) {}; - - "conduit-concurrent-map_0_1_3" = callPackage ({ mkDerivation, base, conduit, containers, hspec, HUnit, mtl , QuickCheck, resourcet, say, unliftio, unliftio-core, vector }: @@ -63850,7 +63983,6 @@ self: { testHaskellDepends = [ base conduit hspec HUnit QuickCheck say ]; description = "Concurrent, order-preserving mapping Conduit"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "conduit-connection" = callPackage @@ -66358,25 +66490,6 @@ self: { }) {}; "convertible" = callPackage - ({ mkDerivation, base, bytestring, containers, mtl, old-locale - , old-time, text, time - }: - mkDerivation { - pname = "convertible"; - version = "1.1.1.0"; - sha256 = "0v18ap1mccnndgxmbfgyjdicg8jlss01bd5fq8a576dr0h4sgyg9"; - revision = "1"; - editedCabalFile = "19rz01rlcflyljzkf47g5xs2w1blnji7s8vsh0wimil4c0wahazj"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring containers mtl old-locale old-time text time - ]; - description = "Typeclasses and instances for converting between types"; - license = lib.licenses.bsd3; - }) {}; - - "convertible_1_1_1_1" = callPackage ({ mkDerivation, base, bytestring, containers, mtl, old-time , QuickCheck, text, time }: @@ -66390,7 +66503,6 @@ self: { testHaskellDepends = [ base containers old-time QuickCheck time ]; description = "Typeclasses and instances for converting between types"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "convertible-ascii" = callPackage @@ -66813,8 +66925,8 @@ self: { }: mkDerivation { pname = "core-telemetry"; - version = "0.2.2.0"; - sha256 = "1l2h14x375v5dfamjbmknx28kyi18l2anv46887807bd3yz84552"; + version = "0.2.3.0"; + sha256 = "0ln0xhpdq2jvx5xqva0crmqn7zmnav864f3bb9hb3pcjfiilgavg"; libraryHaskellDepends = [ async base bytestring chronologique core-data core-program core-text exceptions http-streams io-streams mtl network-info @@ -66863,8 +66975,8 @@ self: { }: mkDerivation { pname = "core-webserver-servant"; - version = "0.1.1.0"; - sha256 = "1a5wzw0v5wfkqr856r04pj2l47d0v6n7va7qcx66skkz8q4q3lkl"; + version = "0.1.1.1"; + sha256 = "1mbrpm90i0y63h7mkk3chn4mwwyb1bnbywr6crki0j230cy3b294"; libraryHaskellDepends = [ base core-program core-telemetry core-webserver-warp mtl safe-exceptions servant servant-server vault wai @@ -66881,8 +66993,8 @@ self: { }: mkDerivation { pname = "core-webserver-warp"; - version = "0.1.1.5"; - sha256 = "0i8w0fga1x2hm3hhacyi7xmi86dhglw78786wijghwpqlfgayy9w"; + version = "0.1.1.6"; + sha256 = "05r4y1fywxxf4mi3i319vis67b2kdxf3caxq3nnlpc1ssyw37hc0"; libraryHaskellDepends = [ async base bytestring core-data core-program core-telemetry core-text http-types http2 mtl safe-exceptions vault wai warp @@ -79559,6 +79671,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "direct-sqlite_2_3_27" = callPackage + ({ mkDerivation, base, base16-bytestring, bytestring, directory + , HUnit, temporary, text + }: + mkDerivation { + pname = "direct-sqlite"; + version = "2.3.27"; + sha256 = "0bnq7gkia713w1kc6zhwclxsyxlg100i93qbrz59z18j0xwds683"; + libraryHaskellDepends = [ base bytestring text ]; + testHaskellDepends = [ + base base16-bytestring bytestring directory HUnit temporary text + ]; + description = "Low-level binding to SQLite3. Includes UTF8 and BLOB support."; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "directed-cubical" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, hashable , parallel, QuickCheck, unordered-containers, vector @@ -79879,28 +80008,27 @@ self: { "discord-haskell-voice" = callPackage ({ mkDerivation, aeson, async, base, binary, BoundedChan - , bytestring, conduit, discord-haskell, lens, mtl, network - , optparse-applicative, opus, process, safe-exceptions, saltine - , stm, stm-containers, text, time, unliftio, websockets, wuss + , bytestring, conduit, discord-haskell, microlens, microlens-th + , mtl, network, optparse-applicative, opus, process + , safe-exceptions, saltine, stm, stm-containers, text, time + , unliftio, websockets, wuss }: mkDerivation { pname = "discord-haskell-voice"; - version = "2.2.2"; - sha256 = "0vbp8xdvb9ci49l1ifqghbv6smqx0ll902957yyxym6yj2xjfpmv"; - revision = "3"; - editedCabalFile = "0fpm9ch866d0aispl1priz6knkf1q5b99vhjyz6c4nm5p2gl89mc"; + version = "2.3.0"; + sha256 = "0rzzgggw02rc5pw3wyimimghf3mrxfwhb91fhg2lmzq2dwqghzva"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson async base binary BoundedChan bytestring conduit - discord-haskell lens mtl network opus process safe-exceptions - saltine text time unliftio websockets wuss + discord-haskell microlens microlens-th mtl network opus process + safe-exceptions saltine text time unliftio websockets wuss ]; executableHaskellDepends = [ aeson async base binary BoundedChan bytestring conduit - discord-haskell lens mtl network optparse-applicative opus process - safe-exceptions saltine stm stm-containers text time unliftio - websockets wuss + discord-haskell microlens microlens-th mtl network + optparse-applicative opus process safe-exceptions saltine stm + stm-containers text time unliftio websockets wuss ]; description = "Voice support for discord-haskell"; license = lib.licenses.mit; @@ -82173,36 +82301,6 @@ self: { }) {}; "doctest-parallel" = callPackage - ({ mkDerivation, base, base-compat, Cabal, code-page, containers - , deepseq, directory, exceptions, extra, filepath, ghc, ghc-paths - , Glob, hspec, hspec-core, hspec-discover, HUnit, mockery, pretty - , process, QuickCheck, random, setenv, silently, stringbuilder, syb - , template-haskell, transformers, unordered-containers - }: - mkDerivation { - pname = "doctest-parallel"; - version = "0.2.2"; - sha256 = "0m5xvh8j3v7r1882kxd4r4sc5plw0jprd5mc5cbn5zxmzfj30ffy"; - libraryHaskellDepends = [ - base base-compat Cabal code-page containers deepseq directory - exceptions extra filepath ghc ghc-paths Glob pretty process random - syb template-haskell transformers unordered-containers - ]; - testHaskellDepends = [ - base base-compat code-page containers deepseq directory exceptions - filepath ghc ghc-paths hspec hspec-core hspec-discover HUnit - mockery process QuickCheck setenv silently stringbuilder syb - transformers - ]; - testToolDepends = [ hspec-discover ]; - doHaddock = false; - description = "Test interactive Haskell examples"; - license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; - }) {}; - - "doctest-parallel_0_2_3" = callPackage ({ mkDerivation, base, base-compat, Cabal, code-page, containers , deepseq, directory, exceptions, extra, filepath, ghc, ghc-paths , Glob, hspec, hspec-core, hspec-discover, HUnit, mockery, pretty @@ -88835,25 +88933,6 @@ self: { }) {}; "equivalence" = callPackage - ({ mkDerivation, base, containers, mtl, QuickCheck, STMonadTrans - , template-haskell, transformers, transformers-compat - }: - mkDerivation { - pname = "equivalence"; - version = "0.4"; - sha256 = "0xyj7knshfjknjd13cm7ym9hxllnbr4wvqnz8pgq8154hn7j2f1d"; - libraryHaskellDepends = [ - base containers mtl STMonadTrans transformers transformers-compat - ]; - testHaskellDepends = [ - base containers mtl QuickCheck STMonadTrans template-haskell - transformers transformers-compat - ]; - description = "Maintaining an equivalence relation implemented as union-find using STT"; - license = lib.licenses.bsd3; - }) {}; - - "equivalence_0_4_0_1" = callPackage ({ mkDerivation, base, containers, mtl, QuickCheck, STMonadTrans , template-haskell, transformers, transformers-compat }: @@ -88870,7 +88949,6 @@ self: { ]; description = "Maintaining an equivalence relation implemented as union-find using STT"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "erd" = callPackage @@ -89533,6 +89611,35 @@ self: { license = lib.licenses.bsd3; }) {}; + "esqueleto_3_5_5_0" = callPackage + ({ mkDerivation, aeson, attoparsec, base, blaze-html, bytestring + , conduit, containers, exceptions, hspec, hspec-core, monad-logger + , mtl, mysql, mysql-simple, persistent, persistent-mysql + , persistent-postgresql, persistent-sqlite, postgresql-simple + , QuickCheck, resourcet, tagged, text, time, transformers, unliftio + , unordered-containers + }: + mkDerivation { + pname = "esqueleto"; + version = "3.5.5.0"; + sha256 = "0ba90p3cqyr0l447dw2xzrk2fs6xv5b2c79rqsnj0bchpsigj8a0"; + libraryHaskellDepends = [ + aeson attoparsec base blaze-html bytestring conduit containers + monad-logger persistent resourcet tagged text time transformers + unliftio unordered-containers + ]; + testHaskellDepends = [ + aeson attoparsec base blaze-html bytestring conduit containers + exceptions hspec hspec-core monad-logger mtl mysql mysql-simple + persistent persistent-mysql persistent-postgresql persistent-sqlite + postgresql-simple QuickCheck resourcet tagged text time + transformers unliftio unordered-containers + ]; + description = "Type-safe EDSL for SQL queries on persistent backends"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "esqueleto-pgcrypto" = callPackage ({ mkDerivation, base, esqueleto, hspec, monad-logger, persistent , persistent-postgresql, QuickCheck, text, transformers, unliftio @@ -93808,10 +93915,8 @@ self: { }: mkDerivation { pname = "fbrnch"; - version = "1.1"; - sha256 = "11vhm176dm2i4zy7ipg20rsmp7rdabq8gh29byflqxm5s5wp86y6"; - revision = "1"; - editedCabalFile = "1p0d2nz1xql0nxi23j893x6dr9hy4hy5frfbjrys5b4728vld3y9"; + version = "1.1.1"; + sha256 = "1dgpgphffcy1dxyswg7wvcg9np30gn1h5qa15gqb6p95vm1qlc8b"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -93822,7 +93927,7 @@ self: { rpmbuild-order simple-cmd simple-cmd-args text time typed-process unix utf8-string xdg-basedir ]; - description = "Build and create Fedora package repos and branches"; + description = "Fedora packager tool to build package branches"; license = lib.licenses.gpl2Only; hydraPlatforms = lib.platforms.none; }) {}; @@ -93906,19 +94011,18 @@ self: { }) {}; "fcf-containers" = callPackage - ({ mkDerivation, base, doctest, first-class-families, ghc-prim - , Glob, mtl + ({ mkDerivation, base, doctest, first-class-families, ghc-prim, mtl }: mkDerivation { pname = "fcf-containers"; - version = "0.7.0"; - sha256 = "0ai2hmcva84z29jxr3inngnicx0wn05vnh9lw460fcfckdfxf5xf"; + version = "0.7.1"; + sha256 = "1234vz8ha4wzzbxnw3za5kdhisd37n8v3sd01rdcmnmnhb7fv3qs"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base first-class-families ghc-prim mtl ]; executableHaskellDepends = [ base first-class-families ]; testHaskellDepends = [ - base doctest first-class-families ghc-prim Glob + base doctest first-class-families ghc-prim ]; description = "Data structures and algorithms for first-class-families"; license = lib.licenses.bsd3; @@ -96403,25 +96507,6 @@ self: { }) {}; "fix-whitespace" = callPackage - ({ mkDerivation, base, directory, extra, filepath, filepattern - , text, yaml - }: - mkDerivation { - pname = "fix-whitespace"; - version = "0.0.7"; - sha256 = "1nx56dfgg0i75f007y0r5w0955y3x78drjkvdx278llalyfpc5bg"; - revision = "1"; - editedCabalFile = "17n8sdfcnyjm8ykkpw17apb9ah94r77azz9rzlwpfdps5w81s6gg"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - base directory extra filepath filepattern text yaml - ]; - description = "Fixes whitespace issues"; - license = "unknown"; - }) {}; - - "fix-whitespace_0_0_8" = callPackage ({ mkDerivation, base, directory, extra, filepath, filepattern , text, yaml }: @@ -96436,7 +96521,6 @@ self: { ]; description = "Fixes whitespace issues"; license = "unknown"; - hydraPlatforms = lib.platforms.none; }) {}; "fixed" = callPackage @@ -97123,16 +97207,18 @@ self: { "flatparse" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers, gauge , hspec, HUnit, integer-gmp, megaparsec, parsec, primitive - , QuickCheck, template-haskell + , QuickCheck, quickcheck-instances, template-haskell }: mkDerivation { pname = "flatparse"; - version = "0.3.3.0"; - sha256 = "00ggikjgyb5sivj5aff328gaamxi241y6kign8l9pvrr802xmc0c"; + version = "0.3.4.0"; + sha256 = "0q0pn2dwkril6gqh2lzczb5a15jmnhq21y76aljsmab2r3q9yahm"; libraryHaskellDepends = [ base bytestring containers integer-gmp template-haskell ]; - testHaskellDepends = [ base bytestring hspec HUnit QuickCheck ]; + testHaskellDepends = [ + base bytestring hspec HUnit QuickCheck quickcheck-instances + ]; benchmarkHaskellDepends = [ attoparsec base bytestring gauge integer-gmp megaparsec parsec primitive @@ -99303,31 +99389,33 @@ self: { license = lib.licenses.bsd3; }) {}; - "fourmolu_0_6_0_0" = callPackage + "fourmolu_0_7_0_1" = callPackage ({ mkDerivation, aeson, ansi-terminal, array, base, bytestring , Cabal, containers, Diff, directory, dlist, exceptions, filepath - , ghc-lib-parser, gitrev, hspec, hspec-discover, HsYAML - , HsYAML-aeson, mtl, optparse-applicative, path, path-io, syb - , temporary, text + , ghc-lib-parser, gitrev, hspec, hspec-discover, hspec-megaparsec + , megaparsec, MemoTrie, mtl, optparse-applicative, path, path-io + , pretty, process, QuickCheck, syb, template-haskell, temporary + , text, th-lift-instances, yaml }: mkDerivation { pname = "fourmolu"; - version = "0.6.0.0"; - sha256 = "0yxv3ih2jjnjzdhz31y4a94ly6g3qhddrm3lvflqrb4krk445p67"; + version = "0.7.0.1"; + sha256 = "016lklwcvw6vgpkmv23gfhn31w462w8jd2gl9fy03n9gp8y771ga"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson ansi-terminal array base bytestring Cabal containers Diff - directory dlist exceptions filepath ghc-lib-parser HsYAML - HsYAML-aeson mtl syb text + directory dlist exceptions filepath ghc-lib-parser megaparsec + MemoTrie mtl syb template-haskell text th-lift-instances yaml ]; executableHaskellDepends = [ - base directory filepath ghc-lib-parser gitrev optparse-applicative - text + base containers directory filepath ghc-lib-parser gitrev + optparse-applicative text yaml ]; testHaskellDepends = [ - base containers directory filepath hspec path path-io temporary - text + base containers Diff directory filepath ghc-lib-parser hspec + hspec-megaparsec megaparsec path path-io pretty process QuickCheck + temporary text ]; testToolDepends = [ hspec-discover ]; description = "A formatter for Haskell source code"; @@ -100030,14 +100118,15 @@ self: { "free-vector-spaces" = callPackage ({ mkDerivation, base, lens, linear, MemoTrie, pragmatic-show - , vector, vector-space + , template-haskell, vector, vector-space }: mkDerivation { pname = "free-vector-spaces"; - version = "0.1.5.1"; - sha256 = "14mch3p12sd44y272gg3qr6v0fp689y48fjbvhjbp62lipvxc9i4"; + version = "0.1.5.2"; + sha256 = "0p0flpai3n9ism9dd3kyf1fa8s8rpb4cc00m3bplb9s8zb6aghpb"; libraryHaskellDepends = [ - base lens linear MemoTrie pragmatic-show vector vector-space + base lens linear MemoTrie pragmatic-show template-haskell vector + vector-space ]; description = "Instantiate the classes from the vector-space package with types from linear"; license = lib.licenses.bsd3; @@ -106095,8 +106184,8 @@ self: { ({ mkDerivation, base, clock }: mkDerivation { pname = "ghc-gc-hook"; - version = "0.2.0.0"; - sha256 = "0k7w7imrlg2gdcibkm6b02phk163xv4lnsab316jcfdid53zi7j2"; + version = "0.2.1.0"; + sha256 = "0d98j3wyrwq6rgfdcky5ag3rxx1kzawvhnncr9nab058n2zksi7x"; libraryHaskellDepends = [ base clock ]; testHaskellDepends = [ base clock ]; description = "GHC garbage collection hook"; @@ -107722,8 +107811,8 @@ self: { }: mkDerivation { pname = "ghcprofview"; - version = "0.1.0.1"; - sha256 = "0lk5ky0vrymzhdzfrdvq25kpphg69f1m6524jhr57dnss5syz1iv"; + version = "0.1.0.2"; + sha256 = "077sjwrnpawaq6psp0bbb8psfd6bhqxibhpp2im8hmz1h56ah2c5"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -111073,7 +111162,7 @@ self: { maintainers = with lib.maintainers; [ kiwi ]; }) {}; - "glirc_2_39" = callPackage + "glirc_2_39_0_1" = callPackage ({ mkDerivation, async, attoparsec, base, base64-bytestring , bytestring, Cabal, config-schema, config-value, containers , curve25519, directory, filepath, free, githash, hashable, hookup @@ -111084,8 +111173,8 @@ self: { }: mkDerivation { pname = "glirc"; - version = "2.39"; - sha256 = "1ws5hvz37lkf3bg4wlx4vfk5pdgf5hnkwzdlwgr22pfmr7p5nc2z"; + version = "2.39.0.1"; + sha256 = "0jaywb43jfv6kzyz540k02mxdgw1shc6hn7kia21alssszkilh4r"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal filepath ]; @@ -121723,8 +121812,8 @@ self: { }: mkDerivation { pname = "hapistrano"; - version = "0.4.4.0"; - sha256 = "18nf6ssr3ccd4kyh9az5i9yj9771mzckw100d55rybd5hl1dc7kq"; + version = "0.4.5.0"; + sha256 = "0pjm9flkqkpwmiv6jqgghf3isvq2hqxy2z80jnj4slm7gkm8kq40"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -127545,8 +127634,8 @@ self: { }: mkDerivation { pname = "haskus-utils-variant"; - version = "3.2.1"; - sha256 = "1a15jm4rbvw2gmv5dzzwv0cwsq0qgxnxvq4x3qpr19dmnmq77vn2"; + version = "3.3"; + sha256 = "16z1w07gd3bf7c4566yv21szss08wmjgy7v4i2000nnr1xj6k28a"; libraryHaskellDepends = [ base deepseq exceptions haskus-utils-data haskus-utils-types mtl template-haskell transformers @@ -127750,6 +127839,33 @@ self: { license = lib.licenses.mit; }) {}; + "hasql_1_5_0_3" = callPackage + ({ mkDerivation, attoparsec, base, bytestring + , bytestring-strict-builder, contravariant, contravariant-extras + , dlist, gauge, hashable, hashtables, mtl, postgresql-binary + , postgresql-libpq, profunctors, QuickCheck, quickcheck-instances + , rerebase, tasty, tasty-hunit, tasty-quickcheck, text + , text-builder, transformers, vector + }: + mkDerivation { + pname = "hasql"; + version = "1.5.0.3"; + sha256 = "1ai1vq1l58r4k6ri78gl0zlbc4sgkp3mcyi2dsm37f7ah9r38hsz"; + libraryHaskellDepends = [ + attoparsec base bytestring bytestring-strict-builder contravariant + dlist hashable hashtables mtl postgresql-binary postgresql-libpq + profunctors text text-builder transformers vector + ]; + testHaskellDepends = [ + contravariant-extras QuickCheck quickcheck-instances rerebase tasty + tasty-hunit tasty-quickcheck + ]; + benchmarkHaskellDepends = [ gauge rerebase ]; + description = "An efficient PostgreSQL driver with a flexible mapping API"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "hasql-backend" = callPackage ({ mkDerivation, base, base-prelude, bytestring, either, free , list-t, text, transformers, vector @@ -127973,6 +128089,26 @@ self: { license = lib.licenses.bsd3; }) {}; + "hasql-notifications_0_2_0_1" = callPackage + ({ mkDerivation, base, bytestring, hasql, hasql-pool, hspec + , postgresql-libpq, QuickCheck, text + }: + mkDerivation { + pname = "hasql-notifications"; + version = "0.2.0.1"; + sha256 = "191591sif15khm3qhkkr2y4406fi9ikvhfchhq3jszqxhjmjwpkv"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring hasql hasql-pool postgresql-libpq text + ]; + executableHaskellDepends = [ base hasql ]; + testHaskellDepends = [ base bytestring hasql hspec QuickCheck ]; + description = "LISTEN/NOTIFY support for Hasql"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "hasql-optparse-applicative" = callPackage ({ mkDerivation, base-prelude, hasql, hasql-pool , optparse-applicative @@ -127988,6 +128124,22 @@ self: { license = lib.licenses.mit; }) {}; + "hasql-optparse-applicative_0_4" = callPackage + ({ mkDerivation, base-prelude, hasql, hasql-pool + , optparse-applicative + }: + mkDerivation { + pname = "hasql-optparse-applicative"; + version = "0.4"; + sha256 = "1caw85628qw7vcs34nf74pra1zsc9mxnlgarhc2wam0bfjq2xabw"; + libraryHaskellDepends = [ + base-prelude hasql hasql-pool optparse-applicative + ]; + description = "\"optparse-applicative\" parsers for \"hasql\""; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "hasql-pipes" = callPackage ({ mkDerivation, base, bytestring-tree-builder, hasql, pipes , pipes-safe, protolude @@ -128015,6 +128167,21 @@ self: { license = lib.licenses.mit; }) {}; + "hasql-pool_0_7_1_3" = callPackage + ({ mkDerivation, base, hasql, hspec, rerebase, stm, time + , transformers + }: + mkDerivation { + pname = "hasql-pool"; + version = "0.7.1.3"; + sha256 = "0li8cbpzka85qlrgad5gy0pil9c4i0zvj961i3anmldd9n4f7m3m"; + libraryHaskellDepends = [ base hasql stm time transformers ]; + testHaskellDepends = [ hasql hspec rerebase stm ]; + description = "A pool of connections for Hasql"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "hasql-postgres" = callPackage ({ mkDerivation, aeson, attoparsec, base, base-prelude, bytestring , criterion-plus, deepseq, directory, doctest, either, filepath @@ -131140,19 +131307,17 @@ self: { "helf" = callPackage ({ mkDerivation, alex, array, base, containers, happy, mtl, pretty - , QuickCheck + , QuickCheck, transformers }: mkDerivation { pname = "helf"; - version = "0.2021.8.12"; - sha256 = "020ri4yjlascjmj4ywc2hji05673bszsb3q5frg1a66nbadzbi2h"; - revision = "1"; - editedCabalFile = "1573q8d39hgb4jq1bwpb7glxcv5bxv9vi27smhngk2wxxby9l4w3"; + version = "0.2022.5.30"; + sha256 = "18lskhwsagv5zz6l73qgp9z3k4llf8jfjlkig38z8d061a4rc8k2"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; executableHaskellDepends = [ - array base containers mtl pretty QuickCheck + array base containers mtl pretty QuickCheck transformers ]; executableToolDepends = [ alex happy ]; description = "Typechecking terms of the Edinburgh Logical Framework (LF)"; @@ -133447,26 +133612,26 @@ self: { "hhp" = callPackage ({ mkDerivation, base, Cabal, containers, deepseq, directory - , doctest, filepath, ghc, ghc-boot, hlint, hspec, process, syb + , doctest, exceptions, extra, filepath, ghc, ghc-boot, hlint, hspec + , hspec-discover, process, syb }: mkDerivation { pname = "hhp"; - version = "0.0.3"; - sha256 = "1d9hhsnf21f2v0hcmw5wpj33qdqw6xbcz979lkp2ilk8mxqgwf32"; + version = "1.0.0"; + sha256 = "0jwn10k2v3i8w57mx5w8czvgaw483dp9fdf1w214qr9dz654sb9a"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - base Cabal containers deepseq directory filepath ghc ghc-boot hlint - process syb - ]; - executableHaskellDepends = [ - base containers directory filepath ghc + base Cabal containers deepseq directory exceptions filepath ghc + ghc-boot hlint process syb ]; + executableHaskellDepends = [ base containers directory filepath ]; testHaskellDepends = [ - base Cabal containers deepseq directory doctest filepath ghc - ghc-boot hlint hspec process syb + base Cabal containers deepseq directory doctest exceptions extra + filepath ghc ghc-boot hlint hspec process syb ]; + testToolDepends = [ hspec-discover ]; description = "Happy Haskell Programming"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -155545,6 +155710,27 @@ self: { license = lib.licenses.bsd3; }) {}; + "int-interval-map" = callPackage + ({ mkDerivation, base, containers, deepseq, either, hedgehog + , primitive, tasty, tasty-hedgehog, tasty-hunit, tasty-quickcheck + , tasty-th, vector, vector-algorithms + }: + mkDerivation { + pname = "int-interval-map"; + version = "0.0.1.0"; + sha256 = "03rlqrmz5dgqzanh0flb6n0da26llx8q0l9w2bjhfbw7389kp1yv"; + libraryHaskellDepends = [ + base containers deepseq either primitive vector vector-algorithms + ]; + testHaskellDepends = [ + base containers deepseq either hedgehog primitive tasty + tasty-hedgehog tasty-hunit tasty-quickcheck tasty-th vector + vector-algorithms + ]; + description = "Interval map"; + license = lib.licenses.mit; + }) {}; + "int-like" = callPackage ({ mkDerivation, algebraic-graphs, base, containers, deepseq , hashable, tasty, tasty-hunit @@ -156225,8 +156411,8 @@ self: { }: mkDerivation { pname = "interval-patterns"; - version = "0.1.0.0"; - sha256 = "0h31ajkkiv4j15h655rbf7gqjbnddki1vwl6kcbi8y7s9bh63rz8"; + version = "0.2.0.1"; + sha256 = "1zb83sfiggcl4f23imgbvgprnizdy79s4zh1vr334w8sslc6sy98"; libraryHaskellDepends = [ base containers groups lattices relude semirings time time-compat ]; @@ -157334,8 +157520,8 @@ self: { }: mkDerivation { pname = "irc-core"; - version = "2.10"; - sha256 = "1x1vmpzmgwxkwcza20yzmymgb7bj04f17xiqvcqg29h53pimnvxj"; + version = "2.11"; + sha256 = "13jkfb30kynqd55c2slxjg98lr076rn1ymsxniwp0bssjzizgnfc"; libraryHaskellDepends = [ attoparsec base base64-bytestring bytestring hashable primitive text time vector @@ -159486,6 +159672,8 @@ self: { pname = "jira-wiki-markup"; version = "1.4.0"; sha256 = "0p6axj6km4440ss5naw68r3r85si4qxqgrklp6ssfyapawy0s88w"; + revision = "1"; + editedCabalFile = "043x87s8lyg0ck2krwdn1ncr0sxc7p03jmgykwyvg8c7i56n3m7n"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base mtl parsec text ]; @@ -160942,36 +161130,14 @@ self: { }) {}; "json-stream" = callPackage - ({ mkDerivation, aeson, base, bytestring, directory, hspec - , QuickCheck, quickcheck-unicode, scientific, text - , unordered-containers, vector - }: - mkDerivation { - pname = "json-stream"; - version = "0.4.3.0"; - sha256 = "1bxddz84knxhnh92chg58g66xrnz9cq805p0fs7rpa8v2wgf06yy"; - libraryHaskellDepends = [ - aeson base bytestring scientific text unordered-containers vector - ]; - testHaskellDepends = [ - aeson base bytestring directory hspec QuickCheck quickcheck-unicode - scientific text unordered-containers vector - ]; - description = "Incremental applicative JSON parser"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; - }) {}; - - "json-stream_0_4_4_0" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, hspec , primitive, QuickCheck, quickcheck-unicode, scientific, text , unordered-containers, vector }: mkDerivation { pname = "json-stream"; - version = "0.4.4.0"; - sha256 = "1rjvrkrjmh5kvrajd6n2q3h68dkh1m5jhm7f6hq723zvxzl98wij"; + version = "0.4.4.1"; + sha256 = "1czl29nn2i4li6m1dn151l5rbiwrb3c47njnmlk3pqk138k0czgy"; libraryHaskellDepends = [ aeson base bytestring primitive scientific text unordered-containers vector @@ -161268,6 +161434,27 @@ self: { license = lib.licenses.mit; }) {}; + "jsonifier_0_2_1_1" = callPackage + ({ mkDerivation, aeson, base, buffer-builder, bytestring, gauge + , hedgehog, numeric-limits, ptr-poker, rerebase, scientific, text + , text-builder + }: + mkDerivation { + pname = "jsonifier"; + version = "0.2.1.1"; + sha256 = "0wih0m3g2wj06zwl2wbs9y2bfbc593vmh25imy6hki2iq7wwr3l0"; + libraryHaskellDepends = [ + base bytestring ptr-poker scientific text + ]; + testHaskellDepends = [ aeson hedgehog numeric-limits rerebase ]; + benchmarkHaskellDepends = [ + aeson buffer-builder gauge rerebase text-builder + ]; + description = "Fast and simple JSON encoding toolkit"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "jsonl" = callPackage ({ mkDerivation, aeson, base, bytestring }: mkDerivation { @@ -192256,26 +192443,28 @@ self: { }: mkDerivation { pname = "mysql-simple"; - version = "0.4.7.2"; - sha256 = "0wi4zqgnf4kfw95sm1wrl4260f2v5wz2k9kvgngb640y6sb034mc"; + version = "0.4.8"; + sha256 = "077psr65rszk06bxx67bhvfk8ajmsr56bwynx7d57lqdvzvm4691"; libraryHaskellDepends = [ attoparsec base base16-bytestring blaze-builder bytestring containers mysql old-locale pcre-light text time vector ]; - testHaskellDepends = [ base blaze-builder bytestring hspec text ]; + testHaskellDepends = [ + base blaze-builder bytestring hspec mysql text time + ]; description = "A mid-level MySQL client library"; license = lib.licenses.bsd3; }) {}; - "mysql-simple_0_4_8" = callPackage + "mysql-simple_0_4_8_1" = callPackage ({ mkDerivation, attoparsec, base, base16-bytestring, blaze-builder , bytestring, containers, hspec, mysql, old-locale, pcre-light , text, time, vector }: mkDerivation { pname = "mysql-simple"; - version = "0.4.8"; - sha256 = "077psr65rszk06bxx67bhvfk8ajmsr56bwynx7d57lqdvzvm4691"; + version = "0.4.8.1"; + sha256 = "18w6mp7s1dmvwzqdgdzywhp5li3h4kisrhgxllwi578nddwg2yx3"; libraryHaskellDepends = [ attoparsec base base16-bytestring blaze-builder bytestring containers mysql old-locale pcre-light text time vector @@ -193256,17 +193445,6 @@ self: { }) {}; "natural-arithmetic" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "natural-arithmetic"; - version = "0.1.2.0"; - sha256 = "0zw1dax3a67cpilq57ykbrjybz9kc45qflpr6mwfz79hpx9pcld0"; - libraryHaskellDepends = [ base ]; - description = "Arithmetic of natural numbers"; - license = lib.licenses.bsd3; - }) {}; - - "natural-arithmetic_0_1_3_0" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "natural-arithmetic"; @@ -193275,7 +193453,6 @@ self: { libraryHaskellDepends = [ base ]; description = "Arithmetic of natural numbers"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "natural-induction" = callPackage @@ -198692,29 +198869,6 @@ self: { }) {}; "numeric-prelude" = callPackage - ({ mkDerivation, array, base, containers, deepseq - , doctest-exitcode-stdio, doctest-lib, non-negative, parsec - , QuickCheck, random, semigroups, storable-record, utility-ht - }: - mkDerivation { - pname = "numeric-prelude"; - version = "0.4.3.3"; - sha256 = "0kqz3xzg0j3cqaidmdzmg47h564ivp4iz5ys8zs5g41k2wd06ild"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - array base containers deepseq non-negative parsec QuickCheck random - semigroups storable-record utility-ht - ]; - testHaskellDepends = [ - base doctest-exitcode-stdio doctest-lib QuickCheck random - utility-ht - ]; - description = "An experimental alternative hierarchy of numeric type classes"; - license = lib.licenses.bsd3; - }) {}; - - "numeric-prelude_0_4_4" = callPackage ({ mkDerivation, array, base, containers, deepseq , doctest-exitcode-stdio, doctest-lib, non-negative, parsec , QuickCheck, random, semigroups, storable-record, utility-ht @@ -198735,7 +198889,6 @@ self: { ]; description = "An experimental alternative hierarchy of numeric type classes"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "numeric-qq" = callPackage @@ -198831,18 +198984,6 @@ self: { }) {}; "numhask" = callPackage - ({ mkDerivation, base, QuickCheck }: - mkDerivation { - pname = "numhask"; - version = "0.10.0.0"; - sha256 = "132s0yccg8fhigd6a463lrg2cqx032xfpdirvvfhrczdzirbm7xy"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base QuickCheck ]; - description = "A numeric class hierarchy"; - license = lib.licenses.bsd3; - }) {}; - - "numhask_0_10_1_0" = callPackage ({ mkDerivation, base, QuickCheck }: mkDerivation { pname = "numhask"; @@ -198852,7 +198993,6 @@ self: { testHaskellDepends = [ base QuickCheck ]; description = "A numeric class hierarchy"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "numhask-array" = callPackage @@ -200141,6 +200281,30 @@ self: { hydraPlatforms = lib.platforms.none; }) {OIS = null;}; + "okapi" = callPackage + ({ mkDerivation, aeson, base, base64, bytestring, containers + , http-api-data, http-types, lucid, mmorph, mtl, stm, text + , transformers, unagi-chan, uuid, vault, wai, wai-extra, warp + , warp-tls + }: + mkDerivation { + pname = "okapi"; + version = "0.1.0.2"; + sha256 = "1b1viabmd09phx1nffwply2d6m309blp9wiqcman093wq1hk4ky8"; + libraryHaskellDepends = [ + aeson base base64 bytestring containers http-api-data http-types + lucid mmorph mtl stm text transformers unagi-chan uuid vault wai + wai-extra warp warp-tls + ]; + testHaskellDepends = [ + aeson base base64 bytestring containers http-api-data http-types + lucid mmorph mtl stm text transformers unagi-chan uuid vault wai + wai-extra warp warp-tls + ]; + description = "A microframework based on monadic parsing"; + license = lib.licenses.bsd3; + }) {}; + "old-locale" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -205036,6 +205200,29 @@ self: { license = lib.licenses.mit; }) {}; + "pandoc-lua-marshal_0_1_6" = callPackage + ({ mkDerivation, base, bytestring, containers, exceptions, hslua + , hslua-marshalling, lua, pandoc-types, QuickCheck, safe, tasty + , tasty-hunit, tasty-lua, tasty-quickcheck, text + }: + mkDerivation { + pname = "pandoc-lua-marshal"; + version = "0.1.6"; + sha256 = "1z7hwvqaspapv97l36gq975cmhn11q0z2h1axz33bml7zf2z4bwc"; + libraryHaskellDepends = [ + base bytestring containers exceptions hslua hslua-marshalling lua + pandoc-types safe text + ]; + testHaskellDepends = [ + base bytestring containers exceptions hslua hslua-marshalling lua + pandoc-types QuickCheck safe tasty tasty-hunit tasty-lua + tasty-quickcheck text + ]; + description = "Use pandoc types in Lua"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "pandoc-markdown-ghci-filter" = callPackage ({ mkDerivation, aeson, base, containers, ghcid, pandoc , pandoc-types, QuickCheck, tasty, tasty-hunit, tasty-quickcheck @@ -211264,6 +211451,17 @@ self: { license = lib.licenses.bsd3; }) {}; + "phonetic-languages-basis" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "phonetic-languages-basis"; + version = "0.1.0.0"; + sha256 = "1qdyg9f8hk0cklf15x7akchrvfj7rya7rmzc16i8fk0bl4lyfall"; + libraryHaskellDepends = [ base ]; + description = "A basics of the phonetic-languages functionality"; + license = lib.licenses.mit; + }) {}; + "phonetic-languages-common" = callPackage ({ mkDerivation, base, subG, subG-instances, vector }: mkDerivation { @@ -211426,8 +211624,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-plus"; - version = "0.5.3.0"; - sha256 = "09wqch3ajsxqm4w10k95qg7ljv6s5rznxrniljcnl4pram4xfr8d"; + version = "0.6.0.0"; + sha256 = "03zfn9ql0gfgk2j0rgzkvbp8pd16khbc99hxzbv00ih5rjwyhzn5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -211475,16 +211673,18 @@ self: { }) {}; "phonetic-languages-simplified-base" = callPackage - ({ mkDerivation, base, phonetic-languages-permutations-array, subG + ({ mkDerivation, base, phonetic-languages-basis + , phonetic-languages-permutations-array, subG }: mkDerivation { pname = "phonetic-languages-simplified-base"; - version = "0.4.6.0"; - sha256 = "0pnq92xg0zkbvq8a9jqw75v7zfqazg6r1ja35hjwdr8rl991nvjr"; + version = "0.5.0.0"; + sha256 = "02jxqqwcws8wl5a1s2q97w364bv6vwy4mwrlzmmwh5cp60p3dm20"; libraryHaskellDepends = [ - base phonetic-languages-permutations-array subG + base phonetic-languages-basis phonetic-languages-permutations-array + subG ]; - description = "A basics of the phonetic-languages functionality"; + description = "A basics of the phonetic-languages functionality that can be groupped"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; }) {}; @@ -211508,43 +211708,46 @@ self: { "phonetic-languages-simplified-examples-array" = callPackage ({ mkDerivation, base, cli-arguments, heaps, lists-flines , mmsyn2-array, mmsyn2-array-ukrainian-data, parallel - , phonetic-languages-constraints-array + , phonetic-languages-basis, phonetic-languages-constraints-array , phonetic-languages-filters-array , phonetic-languages-permutations-array, phonetic-languages-plus , phonetic-languages-rhythmicity , phonetic-languages-simplified-base , phonetic-languages-simplified-examples-common , phonetic-languages-simplified-properties-array + , phonetic-languages-simplified-properties-array-common , phonetic-languages-ukrainian-array, string-interpreter, subG , ukrainian-phonetics-basic-array, uniqueness-periods-vector-stats }: mkDerivation { pname = "phonetic-languages-simplified-examples-array"; - version = "0.18.0.2"; - sha256 = "0m79iv739cakgpfbixg613fhwjnvy4nidqvfrvqgq53wn4x9pdm3"; + version = "0.19.0.0"; + sha256 = "0y9mmfjxkbxpw4iggafvm80324zjrljwkc314439gydhf4961sf9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base cli-arguments heaps lists-flines mmsyn2-array - mmsyn2-array-ukrainian-data parallel + mmsyn2-array-ukrainian-data parallel phonetic-languages-basis phonetic-languages-constraints-array phonetic-languages-filters-array phonetic-languages-permutations-array phonetic-languages-plus phonetic-languages-rhythmicity phonetic-languages-simplified-base phonetic-languages-simplified-examples-common phonetic-languages-simplified-properties-array + phonetic-languages-simplified-properties-array-common phonetic-languages-ukrainian-array string-interpreter subG ukrainian-phonetics-basic-array uniqueness-periods-vector-stats ]; executableHaskellDepends = [ base cli-arguments heaps lists-flines mmsyn2-array - mmsyn2-array-ukrainian-data parallel + mmsyn2-array-ukrainian-data parallel phonetic-languages-basis phonetic-languages-constraints-array phonetic-languages-filters-array phonetic-languages-permutations-array phonetic-languages-plus phonetic-languages-rhythmicity phonetic-languages-simplified-base phonetic-languages-simplified-examples-common phonetic-languages-simplified-properties-array + phonetic-languages-simplified-properties-array-common phonetic-languages-ukrainian-array string-interpreter subG ukrainian-phonetics-basic-array uniqueness-periods-vector-stats ]; @@ -211568,7 +211771,7 @@ self: { "phonetic-languages-simplified-generalized-examples-array" = callPackage ({ mkDerivation, base, cli-arguments, foldable-ix, heaps - , mmsyn2-array, mmsyn3, parallel + , mmsyn2-array, mmsyn3, parallel, phonetic-languages-basis , phonetic-languages-constraints-array , phonetic-languages-filters-array , phonetic-languages-permutations-array @@ -211580,11 +211783,11 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-generalized-examples-array"; - version = "0.16.0.0"; - sha256 = "16ia1kd217hy0wpdjd60l1qdz2ivcm1n0sncp106x4dksy4xc1pv"; + version = "0.17.0.0"; + sha256 = "0gm5pn7qass74x7xjgshq1hlyjvdm9jvfjvnwh6g0f607g7zzsrp"; libraryHaskellDepends = [ base cli-arguments foldable-ix heaps mmsyn2-array mmsyn3 parallel - phonetic-languages-constraints-array + phonetic-languages-basis phonetic-languages-constraints-array phonetic-languages-filters-array phonetic-languages-permutations-array phonetic-languages-phonetics-basics phonetic-languages-plus @@ -211614,17 +211817,17 @@ self: { }) {}; "phonetic-languages-simplified-generalized-properties-array" = callPackage - ({ mkDerivation, base, phonetic-languages-phonetics-basics + ({ mkDerivation, base, phonetic-languages-basis + , phonetic-languages-phonetics-basics , phonetic-languages-rhythmicity - , phonetic-languages-simplified-base }: mkDerivation { pname = "phonetic-languages-simplified-generalized-properties-array"; - version = "0.9.0.0"; - sha256 = "17zr8j9slvimjv1vx6bzq1d86n5ap1j17yglxvviyd3xbhnp2qq2"; + version = "0.10.1.0"; + sha256 = "04z1xm1da9rhiajkfdyflsbmd0dqpzsjhh1xl469p4795xfv3k2l"; libraryHaskellDepends = [ - base phonetic-languages-phonetics-basics - phonetic-languages-rhythmicity phonetic-languages-simplified-base + base phonetic-languages-basis phonetic-languages-phonetics-basics + phonetic-languages-rhythmicity ]; description = "Some 'properties' of the phonetic languages approach text"; license = lib.licenses.mit; @@ -211667,23 +211870,63 @@ self: { }) {}; "phonetic-languages-simplified-properties-array" = callPackage - ({ mkDerivation, base, phonetic-languages-rhythmicity + ({ mkDerivation, base, phonetic-languages-basis + , phonetic-languages-rhythmicity , phonetic-languages-simplified-base + , phonetic-languages-simplified-properties-array-common , ukrainian-phonetics-basic-array }: mkDerivation { pname = "phonetic-languages-simplified-properties-array"; - version = "0.13.1.0"; - sha256 = "17p6hpljkvcsjyfc7dpk8pf2ws1rimmnwc93gaa2a473ifk4a1sd"; + version = "0.14.0.0"; + sha256 = "0b8vi0f4phz9jd6n92cv9fravqx6dz8dkfs0gk0qavln13p6nj98"; libraryHaskellDepends = [ - base phonetic-languages-rhythmicity - phonetic-languages-simplified-base ukrainian-phonetics-basic-array + base phonetic-languages-basis phonetic-languages-rhythmicity + phonetic-languages-simplified-base + phonetic-languages-simplified-properties-array-common + ukrainian-phonetics-basic-array ]; description = "Some properties of the data related to rhythmicity"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; }) {}; + "phonetic-languages-simplified-properties-array-common" = callPackage + ({ mkDerivation, base, phonetic-languages-basis + , phonetic-languages-rhythmicity + }: + mkDerivation { + pname = "phonetic-languages-simplified-properties-array-common"; + version = "0.1.0.0"; + sha256 = "19c7y4v5fk3dkxpm1hj6xdw0kgfaqv148ws9if26cyjjhzsqkxl9"; + libraryHaskellDepends = [ + base phonetic-languages-basis phonetic-languages-rhythmicity + ]; + description = "Common functionality for 'with-tuples' and old version of properties"; + license = lib.licenses.mit; + }) {}; + + "phonetic-languages-simplified-properties-array-old" = callPackage + ({ mkDerivation, base, phonetic-languages-basis + , phonetic-languages-rhythmicity + , phonetic-languages-simplified-base + , phonetic-languages-simplified-properties-array-common + , ukrainian-phonetics-basic-array + }: + mkDerivation { + pname = "phonetic-languages-simplified-properties-array-old"; + version = "0.1.0.0"; + sha256 = "0zv3fax6pi7kz6z4bvgmphz0fbkip743d5js3169sbw97mzbn2nc"; + libraryHaskellDepends = [ + base phonetic-languages-basis phonetic-languages-rhythmicity + phonetic-languages-simplified-base + phonetic-languages-simplified-properties-array-common + ukrainian-phonetics-basic-array + ]; + description = "Some properties of the data related to rhythmicity"; + license = lib.licenses.mit; + }) {}; + "phonetic-languages-simplified-properties-lists" = callPackage ({ mkDerivation, base, phonetic-languages-rhythmicity , phonetic-languages-simplified-common, ukrainian-phonetics-basic @@ -215936,6 +216179,27 @@ self: { license = "BSD-2-Clause-Patent"; }) {}; + "polysemy-managed" = callPackage + ({ mkDerivation, base, exceptions, hedgehog, hspec, hspec-discover + , hw-hspec-hedgehog, mtl, polysemy, resourcet, transformers + , unliftio-core + }: + mkDerivation { + pname = "polysemy-managed"; + version = "0.1.0.0"; + sha256 = "1k7f8cmg9r06s3ks38gki85b0ww7ihf3f2kwj3pr06s1zzxcrzzg"; + libraryHaskellDepends = [ + base polysemy resourcet transformers unliftio-core + ]; + testHaskellDepends = [ + base exceptions hedgehog hspec hw-hspec-hedgehog mtl polysemy + resourcet transformers + ]; + testToolDepends = [ hspec-discover ]; + description = "Primitive functions and data types"; + license = lib.licenses.bsd3; + }) {}; + "polysemy-methodology" = callPackage ({ mkDerivation, base, polysemy, polysemy-kvstore, polysemy-several }: @@ -216131,6 +216395,8 @@ self: { pname = "polysemy-req"; version = "0.1.0"; sha256 = "1vji169hk7an0dal8chk3h3jb6yxjh037arp15zkc8y5m0r5wbnm"; + revision = "1"; + editedCabalFile = "1gn5zjms5r8wasw5429zlc2g3mwyjvz9gyn54phldbcgizsvw7s6"; libraryHaskellDepends = [ base polysemy req ]; description = "Polysemy effect for req"; license = lib.licenses.bsd3; @@ -216406,8 +216672,8 @@ self: { pname = "polyvariadic"; version = "0.3.0.4"; sha256 = "17895458cfciv5lkcd26b5a96d9mwklish8xjhn14bd2himyczx0"; - revision = "1"; - editedCabalFile = "1z4wg7cb4akanch7cdmmvr8ibrv7il63gi2mchq8pasqad6150f0"; + revision = "2"; + editedCabalFile = "1n7g0j0gx09l7dw0dqbw1hgx5vnz2gln05mz9j80m5y5nvc8hgd7"; libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base ]; description = "Creation and application of polyvariadic functions"; @@ -218011,8 +218277,8 @@ self: { }: mkDerivation { pname = "postgresql-simple-named"; - version = "0.0.2.0"; - sha256 = "1bk6r67jy533zskwmg251vlb2imzyh60hx9lwag2rqclgb7fgplr"; + version = "0.0.3.0"; + sha256 = "19jyr3ai75hcks342yxrqsb1mklr6rjrzczs3al9666rll8silw9"; libraryHaskellDepends = [ base bytestring mtl postgresql-simple text ]; @@ -222563,16 +222829,16 @@ self: { ({ mkDerivation, base, bytestring, cereal, containers, deepseq , doctest, ghc-prim, hashable, parameterized, primitive, QuickCheck , safe, tasty, tasty-hunit, tasty-quickcheck, text, transformers - , unordered-containers, vector + , unordered-containers, vector, word-compat }: mkDerivation { pname = "proto3-wire"; - version = "1.2.2"; - sha256 = "1fdzml0nsbz1bqf3lskvmfn46pgl5rnrc4b7azq8f0csm0v9ah4d"; + version = "1.3.0"; + sha256 = "1m9yv7cvswkzz32cxm57ay68gh4rdklcz15m3v8rzywp5fqsly26"; libraryHaskellDepends = [ base bytestring cereal containers deepseq ghc-prim hashable parameterized primitive QuickCheck safe text transformers - unordered-containers vector + unordered-containers vector word-compat ]; testHaskellDepends = [ base bytestring cereal doctest QuickCheck tasty tasty-hunit @@ -222774,8 +223040,8 @@ self: { }: mkDerivation { pname = "protolude"; - version = "0.3.0"; - sha256 = "1b6wprbwfdjyvds2bm6na0fbqgzdkj5ikkk33whbkyh3krd3i0s0"; + version = "0.3.1"; + sha256 = "0cwy2apaghbxxf4w3k8gpd8npiy8d9yw0cd6ixqvis28q0b8snvi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -229438,28 +229704,27 @@ self: { ({ mkDerivation, aeson, ansi-terminal, array, attoparsec, base , base64-bytestring, bytestring, cassava, cereal, colour , containers, cryptohash-sha256, cubicbezier, directory, filelock - , filepath, fingertree, fsnotify, geojson, hashable, hgeometry - , hgeometry-combinatorial, JuicyPixels, lens, linear, matrix, mtl - , neat-interpolation, network, open-browser, optparse-applicative - , parallel, process, QuickCheck, random, random-shuffle - , reanimate-svg, split, tasty, tasty-expected-failure, tasty-golden - , tasty-hunit, tasty-quickcheck, tasty-rerun, temporary, text, time - , unix, unordered-containers, vector, vector-space, websockets, xml + , filepath, fingertree, fsnotify, geojson, hashable, JuicyPixels + , lens, linear, matrix, mtl, neat-interpolation, network + , open-browser, optparse-applicative, parallel, process, QuickCheck + , random, random-shuffle, reanimate-svg, split, tasty + , tasty-expected-failure, tasty-golden, tasty-hunit + , tasty-quickcheck, tasty-rerun, temporary, text, time, unix + , unordered-containers, vector, vector-space, websockets, xml }: mkDerivation { pname = "reanimate"; - version = "1.1.5.0"; - sha256 = "0gy5s68d00szs1ljfcyisp19g3vz4i1mlbxpym0mymzc5v723wfa"; + version = "1.1.6.0"; + sha256 = "1c560cm4vqk9zvvzjhns0qs19h09fjhxpinbgw5hzw351669nri7"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson ansi-terminal array attoparsec base base64-bytestring bytestring cassava cereal colour containers cryptohash-sha256 cubicbezier directory filelock filepath fingertree fsnotify geojson - hashable hgeometry hgeometry-combinatorial JuicyPixels lens linear - matrix mtl neat-interpolation network open-browser - optparse-applicative parallel process random random-shuffle - reanimate-svg split temporary text time unix unordered-containers - vector vector-space websockets xml + hashable JuicyPixels lens linear matrix mtl neat-interpolation + network open-browser optparse-applicative parallel process random + random-shuffle reanimate-svg split temporary text time unix + unordered-containers vector vector-space websockets xml ]; testHaskellDepends = [ base bytestring directory filepath linear process QuickCheck tasty @@ -232473,8 +232738,8 @@ self: { }: mkDerivation { pname = "registry-messagepack"; - version = "0.2.0.0"; - sha256 = "0hkz80kbsmvlcvy4py1vwsr4z5blmkcp6b24ay9qzayqdjx03r2w"; + version = "0.3.0.0"; + sha256 = "0fwzbxflrkmg4hj9gydpkfnrj2ah10ln4rrm2qp96z1r7wpscvps"; libraryHaskellDepends = [ base containers msgpack protolude registry template-haskell text transformers vector @@ -234419,6 +234684,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "resource-pool_0_3_0_0" = callPackage + ({ mkDerivation, base, primitive, time }: + mkDerivation { + pname = "resource-pool"; + version = "0.3.0.0"; + sha256 = "04g2hwjd8w5nwxlfkj33rv11n78bb1knr5fwy4l19gsg1nm9j39v"; + libraryHaskellDepends = [ base primitive time ]; + description = "A high-performance striped resource pooling implementation"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "resource-pool-catchio" = callPackage ({ mkDerivation, base, hashable, MonadCatchIO-transformers, stm , time, transformers, transformers-base, vector @@ -234666,8 +234943,8 @@ self: { }: mkDerivation { pname = "rest-rewrite"; - version = "0.2.0"; - sha256 = "05s5c9j6afswy0ix8m543csk1blknncrh4kz2ihyw90yfgpjjb3b"; + version = "0.3.0"; + sha256 = "1j4ja0fv0jgjxbi4yz06pgplw57vfi5d7h8swc0ip2cnkzsi4zjs"; libraryHaskellDepends = [ base containers hashable monad-loops mtl parsec process QuickCheck text time unordered-containers @@ -237836,6 +238113,31 @@ self: { broken = true; }) {}; + "rpmbuild-order_0_4_7" = callPackage + ({ mkDerivation, base, case-insensitive, directory, extra, fgl + , filepath, graphviz, hspec, optparse-applicative, simple-cmd + , simple-cmd-args, unix + }: + mkDerivation { + pname = "rpmbuild-order"; + version = "0.4.7"; + sha256 = "10qwndr8hxvgy386jy4zxkjsw4cj79fr9rh6qivivx6y0q2d2jnr"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base case-insensitive directory extra fgl filepath graphviz + simple-cmd + ]; + executableHaskellDepends = [ + base directory extra fgl optparse-applicative simple-cmd-args + ]; + testHaskellDepends = [ base extra hspec simple-cmd unix ]; + description = "Sort RPM packages in dependency order"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "rrb-vector" = callPackage ({ mkDerivation, base, deepseq, indexed-traversable, primitive , tasty, tasty-bench, tasty-quickcheck @@ -248647,32 +248949,6 @@ self: { }) {}; "shakespeare" = callPackage - ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring - , containers, directory, exceptions, file-embed, ghc-prim, hspec - , HUnit, parsec, process, scientific, template-haskell, text - , th-lift, time, transformers, unordered-containers, vector - }: - mkDerivation { - pname = "shakespeare"; - version = "2.0.27"; - sha256 = "1bnl7m96x8qr2rvkfzjy01d720xb3c55l3vg0zm2lfbz3gpml1jz"; - libraryHaskellDepends = [ - aeson base blaze-html blaze-markup bytestring containers directory - exceptions file-embed ghc-prim parsec process scientific - template-haskell text th-lift time transformers - unordered-containers vector - ]; - testHaskellDepends = [ - aeson base blaze-html blaze-markup bytestring containers directory - exceptions ghc-prim hspec HUnit parsec process template-haskell - text time transformers - ]; - description = "A toolkit for making compile-time interpolated templates"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ psibi ]; - }) {}; - - "shakespeare_2_0_29" = callPackage ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring , containers, directory, exceptions, file-embed, ghc-prim, hspec , HUnit, parsec, process, scientific, template-haskell, text @@ -248695,7 +248971,6 @@ self: { ]; description = "A toolkit for making compile-time interpolated templates"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; maintainers = with lib.maintainers; [ psibi ]; }) {}; @@ -258146,6 +258421,27 @@ self: { license = lib.licenses.bsd3; }) {}; + "sqlite-simple_0_4_18_2" = callPackage + ({ mkDerivation, attoparsec, base, base16-bytestring, blaze-builder + , blaze-textual, bytestring, containers, direct-sqlite, HUnit, Only + , template-haskell, text, time, transformers + }: + mkDerivation { + pname = "sqlite-simple"; + version = "0.4.18.2"; + sha256 = "14axfc9ii08g7yx3j9n5hrfrsmab3pjv7n0cshcg4a2lvnkv25fw"; + libraryHaskellDepends = [ + attoparsec base blaze-builder blaze-textual bytestring containers + direct-sqlite Only template-haskell text time transformers + ]; + testHaskellDepends = [ + base base16-bytestring bytestring direct-sqlite HUnit text time + ]; + description = "Mid-Level SQLite client library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "sqlite-simple-errors" = callPackage ({ mkDerivation, base, mtl, parsec, sqlite-simple, text }: mkDerivation { @@ -258160,6 +258456,23 @@ self: { broken = true; }) {}; + "sqlite-simple-interpolate" = callPackage + ({ mkDerivation, base, haskell-src-meta, mtl, parsec, sqlite-simple + , template-haskell + }: + mkDerivation { + pname = "sqlite-simple-interpolate"; + version = "0.1"; + sha256 = "0cjkk3zy3kasddkicwy8wklcj7i6bg779b82f1liaimsiwnmjpf3"; + revision = "1"; + editedCabalFile = "04dpspiia4mlpwfpdnsnyb24qsvy7da25rcbbyxyavadz3ri44hm"; + libraryHaskellDepends = [ + base haskell-src-meta mtl parsec sqlite-simple template-haskell + ]; + description = "Interpolated SQLite queries via quasiquotation"; + license = lib.licenses.bsd3; + }) {}; + "sqlite-simple-typed" = callPackage ({ mkDerivation, base, haskell-src-meta, sqlite, sqlite-simple , template-haskell, typedquery, utf8-string @@ -263727,16 +264040,22 @@ self: { }) {}; "strongweak" = callPackage - ({ mkDerivation, base, prettyprinter, refined, validation - , vector-sized + ({ mkDerivation, base, either, generic-random, hspec + , hspec-discover, prettyprinter, QuickCheck, quickcheck-instances + , refined, vector, vector-sized }: mkDerivation { pname = "strongweak"; - version = "0.1.0"; - sha256 = "1vr7kb410455mli4iy8dpdvbk2lr1ss4khdkhpnxpi626lbr7khf"; + version = "0.2.0"; + sha256 = "1acx0rf2xrsxbj8b1zla92j46igghlij0s0mjaiwys15w98xg8lx"; libraryHaskellDepends = [ - base prettyprinter refined validation vector-sized + base either prettyprinter refined vector vector-sized ]; + testHaskellDepends = [ + base either generic-random hspec prettyprinter QuickCheck + quickcheck-instances refined vector vector-sized + ]; + testToolDepends = [ hspec-discover ]; description = "Convert between strong and weak representations of types"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; @@ -270883,6 +271202,18 @@ self: { license = lib.licenses.mit; }) {}; + "template-haskell-compat-v0208_0_1_9" = callPackage + ({ mkDerivation, base, template-haskell }: + mkDerivation { + pname = "template-haskell-compat-v0208"; + version = "0.1.9"; + sha256 = "082i7m3chwcxggfx5mgd716w83dxw6l9v8y4gl3p37f8rd2lqbrj"; + libraryHaskellDepends = [ base template-haskell ]; + description = "A backwards compatibility layer for Template Haskell newer than 2.8"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "template-haskell-optics" = callPackage ({ mkDerivation, base, containers, optics-core, template-haskell , th-abstraction @@ -272677,15 +273008,15 @@ self: { license = lib.licenses.gpl2Only; }) {}; - "texmath_0_12_5" = callPackage + "texmath_0_12_5_1" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , mtl, pandoc-types, parsec, pretty-show, split, syb, tagged, tasty , tasty-golden, text, xml }: mkDerivation { pname = "texmath"; - version = "0.12.5"; - sha256 = "16i40va03v04222wn92fz62jri3094mfim6kdqk29335gamn0yk9"; + version = "0.12.5.1"; + sha256 = "1g8zy0hqwjbg5xfp6kf94zhf44xq6g17g0lbf4m7gxa072wwgd59"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -273561,36 +273892,6 @@ self: { }) {}; "text-show" = callPackage - ({ mkDerivation, array, base, base-compat-batteries, base-orphans - , bifunctors, bytestring, bytestring-builder, containers, criterion - , deepseq, deriving-compat, generic-deriving, ghc-boot-th, ghc-prim - , hspec, hspec-discover, QuickCheck, quickcheck-instances - , template-haskell, text, th-abstraction, th-lift, transformers - , transformers-compat - }: - mkDerivation { - pname = "text-show"; - version = "3.9.6"; - sha256 = "1wcnwfshsscwy96jg709m2vrprcy4hi65n7f65a45q9rr81jiriw"; - libraryHaskellDepends = [ - array base base-compat-batteries bifunctors bytestring - bytestring-builder containers generic-deriving ghc-boot-th ghc-prim - template-haskell text th-abstraction th-lift transformers - transformers-compat - ]; - testHaskellDepends = [ - array base base-compat-batteries base-orphans bytestring - bytestring-builder deriving-compat generic-deriving ghc-prim hspec - QuickCheck quickcheck-instances template-haskell text transformers - transformers-compat - ]; - testToolDepends = [ hspec-discover ]; - benchmarkHaskellDepends = [ base criterion deepseq ghc-prim text ]; - description = "Efficient conversion of values into Text"; - license = lib.licenses.bsd3; - }) {}; - - "text-show_3_9_7" = callPackage ({ mkDerivation, array, base, base-compat-batteries, base-orphans , bifunctors, bytestring, bytestring-builder, containers, criterion , deepseq, deriving-compat, generic-deriving, ghc-boot-th, ghc-prim @@ -273618,7 +273919,6 @@ self: { benchmarkHaskellDepends = [ base criterion deepseq ghc-prim text ]; description = "Efficient conversion of values into Text"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "text-show-instances" = callPackage @@ -274235,20 +274535,6 @@ self: { }) {}; "th-env" = callPackage - ({ mkDerivation, base, markdown-unlit, template-haskell, th-compat - }: - mkDerivation { - pname = "th-env"; - version = "0.1.0.3"; - sha256 = "1ksw93npbgr74jy4jhfl4qvbzh4qxy5zvspmfhy1apkl793rs8c1"; - libraryHaskellDepends = [ base template-haskell th-compat ]; - testHaskellDepends = [ base markdown-unlit ]; - testToolDepends = [ markdown-unlit ]; - description = "Template Haskell splice that expands to an environment variable"; - license = lib.licenses.bsd3; - }) {}; - - "th-env_0_1_1" = callPackage ({ mkDerivation, base, markdown-unlit, template-haskell, th-compat }: mkDerivation { @@ -274260,7 +274546,6 @@ self: { testToolDepends = [ markdown-unlit ]; description = "Template Haskell splices that expand to an environment variable"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "th-expand-syns" = callPackage @@ -277336,6 +277621,34 @@ self: { license = lib.licenses.bsd3; }) {}; + "tls_1_5_8" = callPackage + ({ mkDerivation, asn1-encoding, asn1-types, async, base, bytestring + , cereal, cryptonite, data-default-class, gauge, hourglass, memory + , mtl, network, QuickCheck, tasty, tasty-quickcheck, transformers + , x509, x509-store, x509-validation + }: + mkDerivation { + pname = "tls"; + version = "1.5.8"; + sha256 = "0rxdv8ab98kd4nqql7djmmi51k4vayq21s38s43sx3rzn0iyla3b"; + libraryHaskellDepends = [ + asn1-encoding asn1-types async base bytestring cereal cryptonite + data-default-class hourglass memory mtl network transformers x509 + x509-store x509-validation + ]; + testHaskellDepends = [ + asn1-types async base bytestring cryptonite data-default-class + hourglass QuickCheck tasty tasty-quickcheck x509 x509-validation + ]; + benchmarkHaskellDepends = [ + asn1-types async base bytestring cryptonite data-default-class + gauge hourglass QuickCheck tasty-quickcheck x509 x509-validation + ]; + description = "TLS/SSL protocol native implementation (Server and Client)"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "tls-debug" = callPackage ({ mkDerivation, base, bytestring, cryptonite, data-default-class , network, pem, tls, tls-session-manager, x509, x509-store @@ -282861,8 +283174,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "type-safe-avl"; - version = "1.0.0.0"; - sha256 = "0xkv97bzmj89q15hm9kzq7zw2b4y522gnyn4fwxwbsc1368n42q7"; + version = "1.0.0.1"; + sha256 = "0s7qkm6hk5qf0a54jmk3dv1cfzivc4c0jbx7gn20w5pfmv08zj1c"; libraryHaskellDepends = [ base ]; description = "Type safe BST and AVL trees"; license = lib.licenses.gpl3Only; @@ -283191,6 +283504,26 @@ self: { license = lib.licenses.mit; }) {}; + "typed-process_0_2_10_1" = callPackage + ({ mkDerivation, async, base, base64-bytestring, bytestring, hspec + , process, stm, temporary, transformers, unliftio-core + }: + mkDerivation { + pname = "typed-process"; + version = "0.2.10.1"; + sha256 = "17h9jl7gi26v3cxb4jdcksbp755sqqp8w7303q8x8r36rmf8fdp4"; + libraryHaskellDepends = [ + async base bytestring process stm transformers unliftio-core + ]; + testHaskellDepends = [ + async base base64-bytestring bytestring hspec process stm temporary + transformers unliftio-core + ]; + description = "Run external processes, with strong typing of streams"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "typed-spreadsheet" = callPackage ({ mkDerivation, async, base, diagrams-cairo, diagrams-gtk , diagrams-lib, foldl, gtk, microlens, stm, text, transformers @@ -284759,6 +285092,19 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "unfork" = callPackage + ({ mkDerivation, async, base, safe-exceptions, stm }: + mkDerivation { + pname = "unfork"; + version = "1.0.0.0"; + sha256 = "0k770q549f1rcdhx21nb6n1van00za2wv50angdw5gkxihzczcjq"; + revision = "1"; + editedCabalFile = "1vwlyyrczrkma8ggzn29b6vwfbq51h3m1si1jfh6v5c99vajr33y"; + libraryHaskellDepends = [ async base safe-exceptions stm ]; + description = "Make any action thread safe"; + license = lib.licenses.asl20; + }) {}; + "ungadtagger" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -285113,17 +285459,6 @@ self: { }) {}; "unification-fd" = callPackage - ({ mkDerivation, base, containers, logict, mtl }: - mkDerivation { - pname = "unification-fd"; - version = "0.11.1"; - sha256 = "0xvc3xa0yhxjxd1nf6d1cnixlbjaz2ww08hg1vldsf6c1h4lvs05"; - libraryHaskellDepends = [ base containers logict mtl ]; - description = "Simple generic unification algorithms"; - license = lib.licenses.bsd3; - }) {}; - - "unification-fd_0_11_2" = callPackage ({ mkDerivation, base, containers, logict, mtl }: mkDerivation { pname = "unification-fd"; @@ -285132,7 +285467,6 @@ self: { libraryHaskellDepends = [ base containers logict mtl ]; description = "Simple generic unification algorithms"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "uniform-algebras" = callPackage @@ -285635,8 +285969,8 @@ self: { ({ mkDerivation, base, ghc-prim }: mkDerivation { pname = "uniqueness-periods-vector-stats"; - version = "0.2.2.0"; - sha256 = "0j6n6maqjm1jvwl8s08v2ykv23yzkk6cnqkbv2af3p8fnd6m83sy"; + version = "0.3.0.0"; + sha256 = "0vfkjmp730w9f0174fx0mpfrrbd2grwd838wnrrlxnv39y345i6h"; libraryHaskellDepends = [ base ghc-prim ]; description = "A very basic descriptive statistics"; license = lib.licenses.mit; @@ -286032,17 +286366,6 @@ self: { }) {}; "unix-bytestring" = callPackage - ({ mkDerivation, base, bytestring }: - mkDerivation { - pname = "unix-bytestring"; - version = "0.3.7.6"; - sha256 = "1f9hf7blxy8ckakd0klrs16q0hfvxfarbjgyrc7azgbb86m1skb3"; - libraryHaskellDepends = [ base bytestring ]; - description = "Unix/Posix-specific functions for ByteStrings"; - license = lib.licenses.bsd3; - }) {}; - - "unix-bytestring_0_3_7_7" = callPackage ({ mkDerivation, base, bytestring }: mkDerivation { pname = "unix-bytestring"; @@ -286051,7 +286374,6 @@ self: { libraryHaskellDepends = [ base bytestring ]; description = "Unix/Posix-specific functions for ByteStrings"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "unix-compat" = callPackage @@ -292297,20 +292619,25 @@ self: { }) {inherit (pkgs) fcgi;}; "wai-handler-hal" = callPackage - ({ mkDerivation, base, base64-bytestring, bytestring - , case-insensitive, hal, http-types, network, text - , unordered-containers, vault, wai + ({ mkDerivation, aeson, base, base64-bytestring, bytestring + , case-insensitive, hal, http-types, network, pretty-simple, tasty + , tasty-discover, tasty-golden, text, unordered-containers, vault + , wai }: mkDerivation { pname = "wai-handler-hal"; - version = "0.1.1.0"; - sha256 = "1l9adjrh0iffph40pqymikr5h52ldlyp2q9l7qclcamwdwkawmz0"; - revision = "1"; - editedCabalFile = "1lvhld1f6j3ligwc5mpxx8lf9md128v11dadbjalgzwchx0vj53s"; + version = "0.1.2.0"; + sha256 = "05q0aig70yfrhq73q8i79y4kvjkb2hlrbgza5m9sz5g3i0w21l3y"; libraryHaskellDepends = [ base base64-bytestring bytestring case-insensitive hal http-types network text unordered-containers vault wai ]; + testHaskellDepends = [ + aeson base base64-bytestring bytestring case-insensitive hal + http-types network pretty-simple tasty tasty-golden text + unordered-containers vault wai + ]; + testToolDepends = [ tasty-discover ]; description = "Wrap WAI applications to run on AWS Lambda"; license = lib.licenses.bsd3; }) {}; @@ -293992,15 +294319,15 @@ self: { "warp" = callPackage ({ mkDerivation, array, async, auto-update, base, bsb-http-chunked , bytestring, case-insensitive, containers, directory, gauge - , ghc-prim, hashable, hspec, http-client, http-date, http-types - , http2, HUnit, iproute, network, process, QuickCheck + , ghc-prim, hashable, hspec, hspec-discover, http-client, http-date + , http-types, http2, HUnit, iproute, network, process, QuickCheck , simple-sendfile, stm, streaming-commons, text, time, time-manager , unix, unix-compat, unliftio, vault, wai, word8, x509 }: mkDerivation { pname = "warp"; - version = "3.3.20"; - sha256 = "0jkgnb2pzl72q1y5yp6j8ijmaqhnj01b58dm4xs09f692yg4lxlj"; + version = "3.3.21"; + sha256 = "0vrzsj1spa5ygplqpkl4nflqxqbvy641dsjij64ix3n6rzhgqxcg"; libraryHaskellDepends = [ array auto-update base bsb-http-chunked bytestring case-insensitive containers ghc-prim hashable http-date http-types http2 iproute @@ -294014,6 +294341,7 @@ self: { process QuickCheck simple-sendfile stm streaming-commons text time time-manager unix unix-compat unliftio vault wai word8 x509 ]; + testToolDepends = [ hspec-discover ]; benchmarkHaskellDepends = [ auto-update base bytestring containers gauge hashable http-date http-types network time-manager unix unix-compat unliftio x509 @@ -296628,8 +296956,8 @@ self: { }: mkDerivation { pname = "winery"; - version = "1.3.2"; - sha256 = "0ll6zm6zmhl9xmlbhj8is33zny4l7hwvf8lpvgqw0jcvz7j955a2"; + version = "1.4"; + sha256 = "1bgahm8jiwhcn3gq5z809c2mw5wkqpin6gwn9ppajn31ljahvk3f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -296644,7 +296972,7 @@ self: { ]; testHaskellDepends = [ barbies barbies-th base bytestring containers fast-builder - QuickCheck quickcheck-instances scientific text time + prettyprinter QuickCheck quickcheck-instances scientific text time unordered-containers vector ]; benchmarkHaskellDepends = [ @@ -298859,6 +299187,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "x509_1_7_7" = callPackage + ({ mkDerivation, asn1-encoding, asn1-parse, asn1-types, base + , bytestring, containers, cryptonite, hourglass, memory, mtl, pem + , tasty, tasty-quickcheck, transformers + }: + mkDerivation { + pname = "x509"; + version = "1.7.7"; + sha256 = "1zk8lll1hmzl5xvrd16dhyz25151y59xhsqp2mm1wgymwl7r5ijr"; + libraryHaskellDepends = [ + asn1-encoding asn1-parse asn1-types base bytestring containers + cryptonite hourglass memory pem transformers + ]; + testHaskellDepends = [ + asn1-types base bytestring cryptonite hourglass mtl tasty + tasty-quickcheck + ]; + description = "X509 reader and writer"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "x509-store" = callPackage ({ mkDerivation, asn1-encoding, asn1-types, base, bytestring , containers, cryptonite, directory, filepath, mtl, pem, tasty @@ -303173,13 +303523,13 @@ self: { }: mkDerivation { pname = "yesod-auth-oidc"; - version = "0.1.0"; - sha256 = "1kxki50zwyqblpglm8rgmhvf8rm0fr38vzygigxpky4qaraqxpk6"; + version = "0.1.1"; + sha256 = "12x4wypjmqvlz2y59j1p9ckf7pgl1sz3zz45xzhqa6axzzf6ln20"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base base64-bytestring classy-prelude-yesod cryptonite - http-client jose-jwt oidc-client shakespeare text time + aeson base base64-bytestring classy-prelude-yesod containers + cryptonite http-client jose-jwt oidc-client shakespeare text time unordered-containers yesod-auth yesod-core yesod-form ]; executableHaskellDepends = [ @@ -303226,6 +303576,46 @@ self: { broken = true; }) {}; + "yesod-auth-simple" = callPackage + ({ mkDerivation, aeson, base, base16-bytestring, base64-bytestring + , blaze-html, bytestring, classy-prelude, classy-prelude-yesod + , cryptonite, directory, email-validate, fast-logger, hspec + , hspec-discover, http-types, memory, monad-logger, persistent + , persistent-sqlite, scrypt, shakespeare, text, time, vector, wai + , yesod, yesod-auth, yesod-core, yesod-form, yesod-test, zxcvbn-hs + }: + mkDerivation { + pname = "yesod-auth-simple"; + version = "1.1.0"; + sha256 = "1q65a4aya8icz58vmsz25bgjlybhmma5ahvnnyh1pmlsfir89z85"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base base16-bytestring base64-bytestring blaze-html + bytestring classy-prelude classy-prelude-yesod cryptonite + email-validate http-types memory persistent scrypt shakespeare text + time vector wai yesod-auth yesod-core yesod-form zxcvbn-hs + ]; + executableHaskellDepends = [ + aeson base base64-bytestring blaze-html bytestring classy-prelude + classy-prelude-yesod cryptonite directory email-validate + fast-logger hspec http-types memory monad-logger persistent + persistent-sqlite scrypt shakespeare text time vector wai yesod + yesod-auth yesod-core yesod-form yesod-test zxcvbn-hs + ]; + executableToolDepends = [ hspec-discover ]; + testHaskellDepends = [ + aeson base base64-bytestring blaze-html bytestring classy-prelude + classy-prelude-yesod cryptonite directory email-validate + fast-logger hspec http-types memory monad-logger persistent + persistent-sqlite scrypt shakespeare text time vector wai yesod + yesod-auth yesod-core yesod-form yesod-test zxcvbn-hs + ]; + testToolDepends = [ hspec-discover ]; + description = "Traditional email/pass auth for Yesod"; + license = lib.licenses.bsd3; + }) {}; + "yesod-auth-smbclient" = callPackage ({ mkDerivation, base, hamlet, sys-auth-smbclient, text, yesod-auth , yesod-core, yesod-form From 28e9666850a6c7ce2512316d7dec38f878b26560 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sat, 4 Jun 2022 11:56:56 +0200 Subject: [PATCH 019/245] haskell.packages.ghc923.fourmolu: 0.6.0.0 -> 0.7.0.1 --- .../haskell-modules/configuration-ghc-9.2.x.nix | 2 +- pkgs/development/haskell-modules/configuration-nix.nix | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix index ef625d0db9ab..fc5855025bb8 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix @@ -206,7 +206,7 @@ self: super: { regex-rure = doDistribute (markUnbroken super.regex-rure); jacinda = doDistribute super.jacinda; some = doJailbreak super.some; - fourmolu = super.fourmolu_0_6_0_0; + fourmolu = super.fourmolu_0_7_0_1; # hls-fourmolu-plugin in this version has a to strict upper bound of fourmolu <= 0.5.0.0 hls-fourmolu-plugin = assert super.hls-fourmolu-plugin.version == "1.0.3.0"; doJailbreak super.hls-fourmolu-plugin; hls-ormolu-plugin = assert super.hls-ormolu-plugin.version == "1.0.2.1"; doJailbreak super.hls-ormolu-plugin; diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index b7d0911472de..9d93cc84add7 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -941,6 +941,13 @@ self: super: builtins.intersectAttrs super { '' + (drv.postConfigure or ""); }) super.procex; + # Test suite wants to run main executable + fourmolu_0_7_0_1 = overrideCabal (drv: { + preCheck = drv.preCheck or "" + '' + export PATH="$PWD/dist/build/fourmolu:$PATH" + ''; + }) super.fourmolu_0_7_0_1; + # Apply a patch which hardcodes the store path of graphviz instead of using # whatever graphviz is in PATH. graphviz = overrideCabal (drv: { From 2aa6ee92a627fdd39fcf81d7ec6003015d192742 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sat, 4 Jun 2022 13:11:26 +0200 Subject: [PATCH 020/245] glirc: 2.38 -> 2.39 --- .../haskell-modules/configuration-common.nix | 6 +-- .../configuration-hackage2nix/main.yaml | 4 -- .../haskell-modules/hackage-packages.nix | 51 ------------------- 3 files changed, 3 insertions(+), 58 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index e7dceb87370d..b8c9e49a9526 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2485,9 +2485,9 @@ self: super: { ema = assert super.ema.version == "0.6.0.0"; super.ema.overrideScope (self: super: { relude = doJailbreak self.relude_0_7_0_0; }); - # attoparsec bump is on v2 branch, but not released yet - irc-core = assert super.irc-core.version == "2.10"; doJailbreak super.irc-core; - glirc = assert super.irc-core.version == "2.10"; doJailbreak super.glirc; + glirc = super.glirc.override { + vty = self.vty_5_35_1; + }; # 2022-02-25: Unmaintained and to strict upper bounds paths = doJailbreak super.paths; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index dece67d927df..2ddf5c2a534f 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -87,10 +87,6 @@ default-package-overrides: - dhall-nix < 1.1.24 # Temporarily forbid distribution-nixpkgs updates until cabal2nix supports the new version - distribution-nixpkgs < 1.7.0 - # glirc 2.39 is broken: https://github.com/glguy/irc-core/issues/99 - - glirc == 2.38 - # glirc 2.38 requires hookup 0.6 - - hookup == 0.6 extra-packages: - aeson < 2 # required by pantry-0.5.2 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index f186a881ed3a..599b63b8d2da 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -111132,37 +111132,6 @@ self: { }) {}; "glirc" = callPackage - ({ mkDerivation, async, attoparsec, base, base64-bytestring - , bytestring, Cabal, config-schema, config-value, containers - , directory, filepath, free, gitrev, hashable, hookup, HsOpenSSL - , HUnit, irc-core, kan-extensions, lens, network, process, psqueues - , random, regex-tdfa, split, stm, template-haskell, text, time - , transformers, unix, unordered-containers, vector, vty - }: - mkDerivation { - pname = "glirc"; - version = "2.38"; - sha256 = "1azykkb9rc4q97v9xiqfjv0iys0wswa3nsy10smdkpp7yvv4mca7"; - revision = "2"; - editedCabalFile = "082ndcgp9z1w5pa3s5ss7kqhg66y01lbj57k14zq6zs6c54s4b5i"; - isLibrary = true; - isExecutable = true; - setupHaskellDepends = [ base Cabal filepath ]; - libraryHaskellDepends = [ - async attoparsec base base64-bytestring bytestring config-schema - config-value containers directory filepath free gitrev hashable - hookup HsOpenSSL irc-core kan-extensions lens network process - psqueues random regex-tdfa split stm template-haskell text time - transformers unix unordered-containers vector vty - ]; - executableHaskellDepends = [ base lens text vty ]; - testHaskellDepends = [ base HUnit ]; - description = "Console IRC client"; - license = lib.licenses.isc; - maintainers = with lib.maintainers; [ kiwi ]; - }) {}; - - "glirc_2_39_0_1" = callPackage ({ mkDerivation, async, attoparsec, base, base64-bytestring , bytestring, Cabal, config-schema, config-value, containers , curve25519, directory, filepath, free, githash, hashable, hookup @@ -111189,7 +111158,6 @@ self: { testHaskellDepends = [ base HUnit ]; description = "Console IRC client"; license = lib.licenses.isc; - hydraPlatforms = lib.platforms.none; maintainers = with lib.maintainers; [ kiwi ]; }) {}; @@ -138985,24 +138953,6 @@ self: { }) {}; "hookup" = callPackage - ({ mkDerivation, async, attoparsec, base, bytestring, HsOpenSSL - , HsOpenSSL-x509-system, network, stm - }: - mkDerivation { - pname = "hookup"; - version = "0.6"; - sha256 = "09rhsq0j2m1j87qsbsd3l1q3dv2zs4wrhcz2jhn4a6dx273w5528"; - revision = "1"; - editedCabalFile = "0dm7i3g8hlrg0rzfhfcryypgqlil2p8ny12bn49yir2b1qfd47dc"; - libraryHaskellDepends = [ - async attoparsec base bytestring HsOpenSSL HsOpenSSL-x509-system - network stm - ]; - description = "Abstraction over creating network connections with SOCKS5 and TLS"; - license = lib.licenses.isc; - }) {}; - - "hookup_0_7" = callPackage ({ mkDerivation, async, attoparsec, base, bytestring, HsOpenSSL , HsOpenSSL-x509-system, network, stm }: @@ -139016,7 +138966,6 @@ self: { ]; description = "Abstraction over creating network connections with SOCKS5 and TLS"; license = lib.licenses.isc; - hydraPlatforms = lib.platforms.none; }) {}; "hoop" = callPackage From e827840ae56079e55d198f42049da6912506f5b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?PedroHLC=20=E2=98=AD?= Date: Sat, 4 Jun 2022 12:10:07 -0300 Subject: [PATCH 021/245] elasticsearch-plugins: 7.16.1 -> 7.17.4 --- pkgs/servers/search/elasticsearch/plugins.nix | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/servers/search/elasticsearch/plugins.nix b/pkgs/servers/search/elasticsearch/plugins.nix index 03bb24d9a390..cb595de6a13e 100644 --- a/pkgs/servers/search/elasticsearch/plugins.nix +++ b/pkgs/servers/search/elasticsearch/plugins.nix @@ -38,7 +38,7 @@ in src = fetchurl { url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${version}.zip"; sha256 = - if version == "7.16.1" then "1sz858m9963xqr5kzjlwnq7k0a146rn60v6xijyfbp8y3brg618p" + if version == "7.17.4" then "a4e881d86694ae70ab6b18f72ea700415971200145d33d438e57c0374d9fc16f" else if version == "6.8.21" then "06b1pavyggzfp4wwdql0q9nm3r7i9px9cagp4yh4nhxhnk4w5fiq" else throw "unsupported version ${version} for plugin ${pluginName}"; }; @@ -55,7 +55,7 @@ in src = fetchurl { url = "https://github.com/vhyza/elasticsearch-${pluginName}/releases/download/v${version}/elasticsearch-${pluginName}-${version}-plugin.zip"; sha256 = - if version == "7.16.1" then "0yjy9yhw77lmalivxnmv2rq8fk93ddxszkk73lgmpffladx2ikir" + if version == "7.17.3" then "1835f374230cb17193859cee22ac90e3d7a67fb41a55fd4578e840d708287a08" else if version == "6.8.21" then "0m80cn7vkcvk95v4pdmi6vk5ww7p01k0hj2iqb9g870vs6x2qjzv" else throw "unsupported version ${version} for plugin ${pluginName}"; }; @@ -72,7 +72,7 @@ in src = fetchurl { url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${version}.zip"; sha256 = - if version == "7.16.1" then "1w5ndgffqzj5ijglmykifrk1jsgh7qwn8m7sbpiv0r7n3aayhz1x" + if version == "7.17.4" then "1c8175b2dac54277c1f41981fb4a784829e74e6e74268381fe0c27bc6652704b" else if version == "6.8.21" then "07w8s4a5gvr9lzjzf629y8rx3kvs6zd1vl07ksw1paghp42yb354" else throw "unsupported version ${version} for plugin ${pluginName}"; }; @@ -89,7 +89,7 @@ in src = fetchurl { url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${version}.zip"; sha256 = - if version == "7.16.1" then "16mv7b9nl96bcygabvjqidxp2sjk340va19mrmliblpq3mxa2sii" + if version == "7.17.4" then "702e446997bde5cb38af120a1cb4271d976fdd23444be49e53b6be3801d845a9" else if version == "6.8.21" then "1kdpbrasxwr3dn21zjrklp1s389rwa51fairygdwl8px9liwwfa5" else throw "unsupported version ${version} for plugin ${pluginName}"; }; @@ -106,7 +106,7 @@ in src = fetchurl { url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${version}.zip"; sha256 = - if version == "7.16.1" then "0bf8f8cybsp6s2ai3j04yay9kbhsafpgxivxjvzn2iy9qgc84ls4" + if version == "7.17.4" then "7d1574a585a9db0988ee248159d51f62cce5578a8c082096ef3e26efdb24aee7" else if version == "6.8.21" then "0v31yyhjcdlqnjw1f9kihh7z3c6d31whc57hqqd1dn579n4s9rlz" else throw "unsupported version ${version} for plugin ${pluginName}"; }; @@ -123,7 +123,7 @@ in src = fetchurl { url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${esVersion}.zip"; sha256 = - if version == "7.16.1" then "0sfa0ql3hh8jmha230dyhr51bvsvwmazyycf36ngpmxsysm8ccml" + if version == "7.17.4" then "cad923a662db705d40ca29698aa118e9e4cc50ae564c426a76d5acb777a4f57c" else if version == "6.8.21" then "0sfh1az30q4f34zxig2fz8wn9gk53fmmxyg5pbi1svn9761p5awq" else throw "unsupported version ${version} for plugin ${pluginName}"; }; @@ -140,7 +140,7 @@ in src = fetchurl { url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${esVersion}.zip"; sha256 = - if version == "7.16.1" then "1b95hjr4qhiavm7r7k19bwk5c64r00f1g5s0ydnb6gzym9hdb5s1" + if version == "7.17.4" then "a50be4cea5c68ad7615f87d672ba160d027fdfde2be0578bb2dabd6384cc8108" else if version == "6.8.21" then "00lwj00rfdk6850gk1n86chiz2w6afpqn7jn588jdbwv41qh5mrv" else throw "unsupported version ${version} for plugin ${pluginName}"; }; @@ -157,14 +157,14 @@ in pluginName = "search-guard"; version = # https://docs.search-guard.com/latest/search-guard-versions - if esVersion == "7.16.1" then "${esVersion}-52.5.0" + if esVersion == "7.17.3" then "${esVersion}-53.1.0" else if esVersion == "6.8.21" then "${esVersion}-25.6" else throw "unsupported version ${esVersion} for plugin ${pluginName}"; src = - if esVersion == "7.16.1" then + if esVersion == "7.17.3" then fetchurl { url = "https://maven.search-guard.com/search-guard-suite-release/com/floragunn/search-guard-suite-plugin/${version}/search-guard-suite-plugin-${version}.zip"; - sha256 = "1m3nj35qyrkkh3mhmn66nippavima8h8qpaxddalhjsvf70lhnjb"; + sha256 = "b49b24f7b74043cb5bab93f18316ea71656a7668e61bf063ccaa7b0ee2302a31"; } else if esVersion == "6.8.21" then fetchurl { From 4537ba53c00ce2bc072f5c2981f737ed254757be Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sun, 5 Jun 2022 07:32:33 +0800 Subject: [PATCH 022/245] rmfuse: Re-lock dependencies So Pillow is bumped https://pillow.readthedocs.io/en/stable/releasenotes/9.1.1.html. Closes #175600 --- pkgs/tools/filesystems/rmfuse/poetry.lock | 208 +++++++++++----------- 1 file changed, 105 insertions(+), 103 deletions(-) diff --git a/pkgs/tools/filesystems/rmfuse/poetry.lock b/pkgs/tools/filesystems/rmfuse/poetry.lock index 9dd2c1ae80cd..4c588fc99e9f 100644 --- a/pkgs/tools/filesystems/rmfuse/poetry.lock +++ b/pkgs/tools/filesystems/rmfuse/poetry.lock @@ -104,7 +104,7 @@ python-versions = ">=3.5" [[package]] name = "lxml" -version = "4.8.0" +version = "4.9.0" description = "Powerful and Pythonic XML processing library combining libxml2/libxslt with the ElementTree API." category = "main" optional = false @@ -137,7 +137,7 @@ python-versions = "*" [[package]] name = "pillow" -version = "9.1.0" +version = "9.1.1" description = "Python Imaging Library (Fork)" category = "main" optional = false @@ -251,7 +251,7 @@ python-versions = "*" [[package]] name = "svglib" -version = "1.2.1" +version = "1.3.0" description = "A pure-Python library for reading and converting SVG" category = "main" optional = false @@ -401,67 +401,69 @@ idna = [ {file = "idna-3.3.tar.gz", hash = "sha256:9d643ff0a55b762d5cdb124b8eaa99c66322e2157b69160bc32796e824360e6d"}, ] lxml = [ - {file = "lxml-4.8.0-cp27-cp27m-macosx_10_14_x86_64.whl", hash = "sha256:e1ab2fac607842ac36864e358c42feb0960ae62c34aa4caaf12ada0a1fb5d99b"}, - {file = "lxml-4.8.0-cp27-cp27m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:28d1af847786f68bec57961f31221125c29d6f52d9187c01cd34dc14e2b29430"}, - {file = "lxml-4.8.0-cp27-cp27m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:b92d40121dcbd74831b690a75533da703750f7041b4bf951befc657c37e5695a"}, - {file = "lxml-4.8.0-cp27-cp27m-win32.whl", hash = "sha256:e01f9531ba5420838c801c21c1b0f45dbc9607cb22ea2cf132844453bec863a5"}, - {file = "lxml-4.8.0-cp27-cp27m-win_amd64.whl", hash = "sha256:6259b511b0f2527e6d55ad87acc1c07b3cbffc3d5e050d7e7bcfa151b8202df9"}, - {file = "lxml-4.8.0-cp27-cp27mu-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:1010042bfcac2b2dc6098260a2ed022968dbdfaf285fc65a3acf8e4eb1ffd1bc"}, - {file = "lxml-4.8.0-cp27-cp27mu-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:fa56bb08b3dd8eac3a8c5b7d075c94e74f755fd9d8a04543ae8d37b1612dd170"}, - {file = "lxml-4.8.0-cp310-cp310-macosx_10_15_x86_64.whl", hash = "sha256:31ba2cbc64516dcdd6c24418daa7abff989ddf3ba6d3ea6f6ce6f2ed6e754ec9"}, - {file = "lxml-4.8.0-cp310-cp310-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:31499847fc5f73ee17dbe1b8e24c6dafc4e8d5b48803d17d22988976b0171f03"}, - {file = "lxml-4.8.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_24_aarch64.whl", hash = "sha256:5f7d7d9afc7b293147e2d506a4596641d60181a35279ef3aa5778d0d9d9123fe"}, - {file = "lxml-4.8.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:a3c5f1a719aa11866ffc530d54ad965063a8cbbecae6515acbd5f0fae8f48eaa"}, - {file = "lxml-4.8.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:6268e27873a3d191849204d00d03f65c0e343b3bcb518a6eaae05677c95621d1"}, - {file = "lxml-4.8.0-cp310-cp310-win32.whl", hash = "sha256:330bff92c26d4aee79c5bc4d9967858bdbe73fdbdbacb5daf623a03a914fe05b"}, - {file = "lxml-4.8.0-cp310-cp310-win_amd64.whl", hash = "sha256:b2582b238e1658c4061ebe1b4df53c435190d22457642377fd0cb30685cdfb76"}, - {file = "lxml-4.8.0-cp35-cp35m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:a2bfc7e2a0601b475477c954bf167dee6d0f55cb167e3f3e7cefad906e7759f6"}, - {file = "lxml-4.8.0-cp35-cp35m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:a1547ff4b8a833511eeaceacbcd17b043214fcdb385148f9c1bc5556ca9623e2"}, - {file = "lxml-4.8.0-cp35-cp35m-win32.whl", hash = "sha256:a9f1c3489736ff8e1c7652e9dc39f80cff820f23624f23d9eab6e122ac99b150"}, - {file = "lxml-4.8.0-cp35-cp35m-win_amd64.whl", hash = "sha256:530f278849031b0eb12f46cca0e5db01cfe5177ab13bd6878c6e739319bae654"}, - {file = "lxml-4.8.0-cp36-cp36m-macosx_10_14_x86_64.whl", hash = "sha256:078306d19a33920004addeb5f4630781aaeabb6a8d01398045fcde085091a169"}, - {file = "lxml-4.8.0-cp36-cp36m-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:86545e351e879d0b72b620db6a3b96346921fa87b3d366d6c074e5a9a0b8dadb"}, - {file = "lxml-4.8.0-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:24f5c5ae618395ed871b3d8ebfcbb36e3f1091fd847bf54c4de623f9107942f3"}, - {file = "lxml-4.8.0-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:bbab6faf6568484707acc052f4dfc3802bdb0cafe079383fbaa23f1cdae9ecd4"}, - {file = "lxml-4.8.0-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:7993232bd4044392c47779a3c7e8889fea6883be46281d45a81451acfd704d7e"}, - {file = "lxml-4.8.0-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:6d6483b1229470e1d8835e52e0ff3c6973b9b97b24cd1c116dca90b57a2cc613"}, - {file = "lxml-4.8.0-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:ad4332a532e2d5acb231a2e5d33f943750091ee435daffca3fec0a53224e7e33"}, - {file = "lxml-4.8.0-cp36-cp36m-win32.whl", hash = "sha256:db3535733f59e5605a88a706824dfcb9bd06725e709ecb017e165fc1d6e7d429"}, - {file = "lxml-4.8.0-cp36-cp36m-win_amd64.whl", hash = "sha256:5f148b0c6133fb928503cfcdfdba395010f997aa44bcf6474fcdd0c5398d9b63"}, - {file = "lxml-4.8.0-cp37-cp37m-macosx_10_14_x86_64.whl", hash = "sha256:8a31f24e2a0b6317f33aafbb2f0895c0bce772980ae60c2c640d82caac49628a"}, - {file = "lxml-4.8.0-cp37-cp37m-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:719544565c2937c21a6f76d520e6e52b726d132815adb3447ccffbe9f44203c4"}, - {file = "lxml-4.8.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_24_aarch64.whl", hash = "sha256:c0b88ed1ae66777a798dc54f627e32d3b81c8009967c63993c450ee4cbcbec15"}, - {file = "lxml-4.8.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:fa9b7c450be85bfc6cd39f6df8c5b8cbd76b5d6fc1f69efec80203f9894b885f"}, - {file = "lxml-4.8.0-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:e9f84ed9f4d50b74fbc77298ee5c870f67cb7e91dcdc1a6915cb1ff6a317476c"}, - {file = "lxml-4.8.0-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:1d650812b52d98679ed6c6b3b55cbb8fe5a5460a0aef29aeb08dc0b44577df85"}, - {file = "lxml-4.8.0-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:80bbaddf2baab7e6de4bc47405e34948e694a9efe0861c61cdc23aa774fcb141"}, - {file = "lxml-4.8.0-cp37-cp37m-win32.whl", hash = "sha256:6f7b82934c08e28a2d537d870293236b1000d94d0b4583825ab9649aef7ddf63"}, - {file = "lxml-4.8.0-cp37-cp37m-win_amd64.whl", hash = "sha256:e1fd7d2fe11f1cb63d3336d147c852f6d07de0d0020d704c6031b46a30b02ca8"}, - {file = "lxml-4.8.0-cp38-cp38-macosx_10_14_x86_64.whl", hash = "sha256:5045ee1ccd45a89c4daec1160217d363fcd23811e26734688007c26f28c9e9e7"}, - {file = "lxml-4.8.0-cp38-cp38-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:0c1978ff1fd81ed9dcbba4f91cf09faf1f8082c9d72eb122e92294716c605428"}, - {file = "lxml-4.8.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_24_aarch64.whl", hash = "sha256:52cbf2ff155b19dc4d4100f7442f6a697938bf4493f8d3b0c51d45568d5666b5"}, - {file = "lxml-4.8.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:ce13d6291a5f47c1c8dbd375baa78551053bc6b5e5c0e9bb8e39c0a8359fd52f"}, - {file = "lxml-4.8.0-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:e11527dc23d5ef44d76fef11213215c34f36af1608074561fcc561d983aeb870"}, - {file = "lxml-4.8.0-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:60d2f60bd5a2a979df28ab309352cdcf8181bda0cca4529769a945f09aba06f9"}, - {file = "lxml-4.8.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:62f93eac69ec0f4be98d1b96f4d6b964855b8255c345c17ff12c20b93f247b68"}, - {file = "lxml-4.8.0-cp38-cp38-win32.whl", hash = "sha256:20b8a746a026017acf07da39fdb10aa80ad9877046c9182442bf80c84a1c4696"}, - {file = "lxml-4.8.0-cp38-cp38-win_amd64.whl", hash = "sha256:891dc8f522d7059ff0024cd3ae79fd224752676447f9c678f2a5c14b84d9a939"}, - {file = "lxml-4.8.0-cp39-cp39-macosx_10_15_x86_64.whl", hash = "sha256:b6fc2e2fb6f532cf48b5fed57567ef286addcef38c28874458a41b7837a57807"}, - {file = "lxml-4.8.0-cp39-cp39-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:74eb65ec61e3c7c019d7169387d1b6ffcfea1b9ec5894d116a9a903636e4a0b1"}, - {file = "lxml-4.8.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_24_aarch64.whl", hash = "sha256:627e79894770783c129cc5e89b947e52aa26e8e0557c7e205368a809da4b7939"}, - {file = "lxml-4.8.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:545bd39c9481f2e3f2727c78c169425efbfb3fbba6e7db4f46a80ebb249819ca"}, - {file = "lxml-4.8.0-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:5a58d0b12f5053e270510bf12f753a76aaf3d74c453c00942ed7d2c804ca845c"}, - {file = "lxml-4.8.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:ec4b4e75fc68da9dc0ed73dcdb431c25c57775383fec325d23a770a64e7ebc87"}, - {file = "lxml-4.8.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:5804e04feb4e61babf3911c2a974a5b86f66ee227cc5006230b00ac6d285b3a9"}, - {file = "lxml-4.8.0-cp39-cp39-win32.whl", hash = "sha256:aa0cf4922da7a3c905d000b35065df6184c0dc1d866dd3b86fd961905bbad2ea"}, - {file = "lxml-4.8.0-cp39-cp39-win_amd64.whl", hash = "sha256:dd10383f1d6b7edf247d0960a3db274c07e96cf3a3fc7c41c8448f93eac3fb1c"}, - {file = "lxml-4.8.0-pp37-pypy37_pp73-macosx_10_14_x86_64.whl", hash = "sha256:2403a6d6fb61c285969b71f4a3527873fe93fd0abe0832d858a17fe68c8fa507"}, - {file = "lxml-4.8.0-pp37-pypy37_pp73-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:986b7a96228c9b4942ec420eff37556c5777bfba6758edcb95421e4a614b57f9"}, - {file = "lxml-4.8.0-pp37-pypy37_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:6fe4ef4402df0250b75ba876c3795510d782def5c1e63890bde02d622570d39e"}, - {file = "lxml-4.8.0-pp38-pypy38_pp73-macosx_10_14_x86_64.whl", hash = "sha256:f10ce66fcdeb3543df51d423ede7e238be98412232fca5daec3e54bcd16b8da0"}, - {file = "lxml-4.8.0-pp38-pypy38_pp73-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:730766072fd5dcb219dd2b95c4c49752a54f00157f322bc6d71f7d2a31fecd79"}, - {file = "lxml-4.8.0-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:8b99ec73073b37f9ebe8caf399001848fced9c08064effdbfc4da2b5a8d07b93"}, - {file = "lxml-4.8.0.tar.gz", hash = "sha256:f63f62fc60e6228a4ca9abae28228f35e1bd3ce675013d1dfb828688d50c6e23"}, + {file = "lxml-4.9.0-cp27-cp27m-macosx_10_15_x86_64.whl", hash = "sha256:b5031d151d6147eac53366d6ec87da84cd4d8c5e80b1d9948a667a7164116e39"}, + {file = "lxml-4.9.0-cp27-cp27m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:5d52e1173f52020392f593f87a6af2d4055dd800574a5cb0af4ea3878801d307"}, + {file = "lxml-4.9.0-cp27-cp27m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:3af00ee88376022589ceeb8170eb67dacf5f7cd625ea59fa0977d719777d4ae8"}, + {file = "lxml-4.9.0-cp27-cp27m-win32.whl", hash = "sha256:1057356b808d149bc14eb8f37bb89129f237df488661c1e0fc0376ca90e1d2c3"}, + {file = "lxml-4.9.0-cp27-cp27m-win_amd64.whl", hash = "sha256:f6d23a01921b741774f35e924d418a43cf03eca1444f3fdfd7978d35a5aaab8b"}, + {file = "lxml-4.9.0-cp27-cp27mu-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:56e19fb6e4b8bd07fb20028d03d3bc67bcc0621347fbde64f248e44839771756"}, + {file = "lxml-4.9.0-cp27-cp27mu-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:4cd69bca464e892ea4ed544ba6a7850aaff6f8d792f8055a10638db60acbac18"}, + {file = "lxml-4.9.0-cp310-cp310-macosx_10_15_x86_64.whl", hash = "sha256:94b181dd2777890139e49a5336bf3a9a3378ce66132c665fe8db4e8b7683cde2"}, + {file = "lxml-4.9.0-cp310-cp310-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:607224ffae9a0cf0a2f6e14f5f6bce43e83a6fbdaa647891729c103bdd6a5593"}, + {file = "lxml-4.9.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_24_aarch64.whl", hash = "sha256:11d62c97ceff9bab94b6b29c010ea5fb6831743459bb759c917f49ba75601cd0"}, + {file = "lxml-4.9.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:70a198030d26f5e569367f0f04509b63256faa76a22886280eea69a4f535dd40"}, + {file = "lxml-4.9.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:3cf816aed8125cfc9e6e5c6c31ff94278320d591bd7970c4a0233bee0d1c8790"}, + {file = "lxml-4.9.0-cp310-cp310-win32.whl", hash = "sha256:65b3b5f12c6fb5611e79157214f3cd533083f9b058bf2fc8a1c5cc5ee40fdc5a"}, + {file = "lxml-4.9.0-cp310-cp310-win_amd64.whl", hash = "sha256:0aa4cce579512c33373ca4c5e23c21e40c1aa1a33533a75e51b654834fd0e4f2"}, + {file = "lxml-4.9.0-cp35-cp35m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:63419db39df8dc5564f6f103102c4665f7e4d9cb64030e98cf7a74eae5d5760d"}, + {file = "lxml-4.9.0-cp35-cp35m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:d8e5021e770b0a3084c30dda5901d5fce6d4474feaf0ced8f8e5a82702502fbb"}, + {file = "lxml-4.9.0-cp35-cp35m-win32.whl", hash = "sha256:f17b9df97c5ecdfb56c5e85b3c9df9831246df698f8581c6e111ac664c7c656e"}, + {file = "lxml-4.9.0-cp35-cp35m-win_amd64.whl", hash = "sha256:75da29a0752c8f2395df0115ac1681cefbdd4418676015be8178b733704cbff2"}, + {file = "lxml-4.9.0-cp36-cp36m-macosx_10_15_x86_64.whl", hash = "sha256:e4d020ecf3740b7312bacab2cb966bb720fd4d3490562d373b4ad91dd1857c0d"}, + {file = "lxml-4.9.0-cp36-cp36m-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:b71c52d69b91af7d18c13aef1b0cc3baee36b78607c711eb14a52bf3aa7c815e"}, + {file = "lxml-4.9.0-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:28cf04a1a38e961d4a764d2940af9b941b66263ed5584392ef875ee9c1e360a3"}, + {file = "lxml-4.9.0-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:915ecf7d486df17cc65aeefdb680d5ad4390cc8c857cf8db3fe241ed234f856a"}, + {file = "lxml-4.9.0-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:e564d5a771b4015f34166a05ea2165b7e283635c41b1347696117f780084b46d"}, + {file = "lxml-4.9.0-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:c2a57755e366e0ac7ebdb3e9207f159c3bf1afed02392ab18453ce81f5ee92ee"}, + {file = "lxml-4.9.0-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:00f3a6f88fd5f4357844dd91a1abac5f466c6799f1b7f1da2df6665253845b11"}, + {file = "lxml-4.9.0-cp36-cp36m-win32.whl", hash = "sha256:9093a359a86650a3dbd6532c3e4d21a6f58ba2cb60d0e72db0848115d24c10ba"}, + {file = "lxml-4.9.0-cp36-cp36m-win_amd64.whl", hash = "sha256:d1690c4d37674a5f0cdafbc5ed7e360800afcf06928c2a024c779c046891bf09"}, + {file = "lxml-4.9.0-cp37-cp37m-macosx_10_15_x86_64.whl", hash = "sha256:6af7f51a6010748fc1bb71917318d953c9673e4ae3f6d285aaf93ef5b2eb11c1"}, + {file = "lxml-4.9.0-cp37-cp37m-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:eabdbe04ee0a7e760fa6cd9e799d2b020d098c580ba99107d52e1e5e538b1ecb"}, + {file = "lxml-4.9.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_24_aarch64.whl", hash = "sha256:b1e22f3ee4d75ca261b6bffbf64f6f178cb194b1be3191065a09f8d98828daa9"}, + {file = "lxml-4.9.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:53b0410b220766321759f7f9066da67b1d0d4a7f6636a477984cbb1d98483955"}, + {file = "lxml-4.9.0-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:d76da27f5e3e9bc40eba6ed7a9e985f57547e98cf20521d91215707f2fb57e0f"}, + {file = "lxml-4.9.0-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:686565ac77ff94a8965c11829af253d9e2ce3bf0d9225b1d2eb5c4d4666d0dca"}, + {file = "lxml-4.9.0-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:b62d1431b4c40cda43cc986f19b8c86b1d2ae8918cfc00f4776fdf070b65c0c4"}, + {file = "lxml-4.9.0-cp37-cp37m-win32.whl", hash = "sha256:4becd16750ca5c2a1b1588269322b2cebd10c07738f336c922b658dbab96a61c"}, + {file = "lxml-4.9.0-cp37-cp37m-win_amd64.whl", hash = "sha256:e35a298691b9e10e5a5631f8f0ba605b30ebe19208dc8f58b670462f53753641"}, + {file = "lxml-4.9.0-cp38-cp38-macosx_10_15_x86_64.whl", hash = "sha256:aa7447bf7c1a15ef24e2b86a277b585dd3f055e8890ac7f97374d170187daa97"}, + {file = "lxml-4.9.0-cp38-cp38-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:612ef8f2795a89ba3a1d4c8c1af84d8453fd53ee611aa5ad460fdd2cab426fc2"}, + {file = "lxml-4.9.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_24_aarch64.whl", hash = "sha256:1bfb791a8fcdbf55d1d41b8be940393687bec0e9b12733f0796668086d1a23ff"}, + {file = "lxml-4.9.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:024684e0c5cfa121c22140d3a0898a3a9b2ea0f0fd2c229b6658af4bdf1155e5"}, + {file = "lxml-4.9.0-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:81c29c8741fa07ecec8ec7417c3d8d1e2f18cf5a10a280f4e1c3f8c3590228b2"}, + {file = "lxml-4.9.0-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:6467626fa74f96f4d80fc6ec2555799e97fff8f36e0bfc7f67769f83e59cff40"}, + {file = "lxml-4.9.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:9cae837b988f44925d14d048fa6a8c54f197c8b1223fd9ee9c27084f84606143"}, + {file = "lxml-4.9.0-cp38-cp38-win32.whl", hash = "sha256:5a49ad78543925e1a4196e20c9c54492afa4f1502c2a563f73097e2044c75190"}, + {file = "lxml-4.9.0-cp38-cp38-win_amd64.whl", hash = "sha256:bb7c1b029e54e26e01b1d1d912fc21abb65650d16ea9a191d026def4ed0859ed"}, + {file = "lxml-4.9.0-cp39-cp39-macosx_10_15_x86_64.whl", hash = "sha256:d0d03b9636f1326772e6854459728676354d4c7731dae9902b180e2065ba3da6"}, + {file = "lxml-4.9.0-cp39-cp39-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:9af19eb789d674b59a9bee5005779757aab857c40bf9cc313cb01eafac55ce55"}, + {file = "lxml-4.9.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_24_aarch64.whl", hash = "sha256:dd00d28d1ab5fa7627f5abc957f29a6338a7395b724571a8cbff8fbed83aaa82"}, + {file = "lxml-4.9.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:754a1dd04bff8a509a31146bd8f3a5dc8191a8694d582dd5fb71ff09f0722c22"}, + {file = "lxml-4.9.0-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:b7679344f2270840dc5babc9ccbedbc04f7473c1f66d4676bb01680c0db85bcc"}, + {file = "lxml-4.9.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:d882c2f3345261e898b9f604be76b61c901fbfa4ac32e3f51d5dc1edc89da3cb"}, + {file = "lxml-4.9.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:4e97c8fc761ad63909198acc892f34c20f37f3baa2c50a62d5ec5d7f1efc68a1"}, + {file = "lxml-4.9.0-cp39-cp39-win32.whl", hash = "sha256:cf9ec915857d260511399ab87e1e70fa13d6b2972258f8e620a3959468edfc32"}, + {file = "lxml-4.9.0-cp39-cp39-win_amd64.whl", hash = "sha256:1254a79f8a67a3908de725caf59eae62d86738f6387b0a34b32e02abd6ae73db"}, + {file = "lxml-4.9.0-pp37-pypy37_pp73-macosx_10_15_x86_64.whl", hash = "sha256:03370ec37fe562238d385e2c53089076dee53aabf8325cab964fdb04a9130fa0"}, + {file = "lxml-4.9.0-pp37-pypy37_pp73-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:f386def57742aacc3d864169dfce644a8c396f95aa35b41b69df53f558d56dd0"}, + {file = "lxml-4.9.0-pp37-pypy37_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:ea3f2e9eb41f973f73619e88bf7bd950b16b4c2ce73d15f24a11800ce1eaf276"}, + {file = "lxml-4.9.0-pp38-pypy38_pp73-macosx_10_15_x86_64.whl", hash = "sha256:2d10659e6e5c53298e6d718fd126e793285bff904bb71d7239a17218f6a197b7"}, + {file = "lxml-4.9.0-pp38-pypy38_pp73-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:fcdf70191f0d1761d190a436db06a46f05af60e1410e1507935f0332280c9268"}, + {file = "lxml-4.9.0-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:2b9c2341d96926b0d0e132e5c49ef85eb53fa92ae1c3a70f9072f3db0d32bc07"}, + {file = "lxml-4.9.0-pp39-pypy39_pp73-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:615886ee84b6f42f1bdf1852a9669b5fe3b96b6ff27f1a7a330b67ad9911200a"}, + {file = "lxml-4.9.0-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:94f2e45b054dd759bed137b6e14ae8625495f7d90ddd23cf62c7a68f72b62656"}, + {file = "lxml-4.9.0.tar.gz", hash = "sha256:520461c36727268a989790aef08884347cd41f2d8ae855489ccf40b50321d8d7"}, ] outcome = [ {file = "outcome-1.1.0-py2.py3-none-any.whl", hash = "sha256:c7dd9375cfd3c12db9801d080a3b63d4b0a261aa996c4c13152380587288d958"}, @@ -472,44 +474,44 @@ pdfrw = [ {file = "pdfrw-0.4.tar.gz", hash = "sha256:0dc0494a0e6561b268542b28ede2280387c2728114f117d3bb5d8e4787b93ef4"}, ] pillow = [ - {file = "Pillow-9.1.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:af79d3fde1fc2e33561166d62e3b63f0cc3e47b5a3a2e5fea40d4917754734ea"}, - {file = "Pillow-9.1.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:55dd1cf09a1fd7c7b78425967aacae9b0d70125f7d3ab973fadc7b5abc3de652"}, - {file = "Pillow-9.1.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:66822d01e82506a19407d1afc104c3fcea3b81d5eb11485e593ad6b8492f995a"}, - {file = "Pillow-9.1.0-cp310-cp310-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a5eaf3b42df2bcda61c53a742ee2c6e63f777d0e085bbc6b2ab7ed57deb13db7"}, - {file = "Pillow-9.1.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:01ce45deec9df310cbbee11104bae1a2a43308dd9c317f99235b6d3080ddd66e"}, - {file = "Pillow-9.1.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:aea7ce61328e15943d7b9eaca87e81f7c62ff90f669116f857262e9da4057ba3"}, - {file = "Pillow-9.1.0-cp310-cp310-win32.whl", hash = "sha256:7a053bd4d65a3294b153bdd7724dce864a1d548416a5ef61f6d03bf149205160"}, - {file = "Pillow-9.1.0-cp310-cp310-win_amd64.whl", hash = "sha256:97bda660702a856c2c9e12ec26fc6d187631ddfd896ff685814ab21ef0597033"}, - {file = "Pillow-9.1.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:21dee8466b42912335151d24c1665fcf44dc2ee47e021d233a40c3ca5adae59c"}, - {file = "Pillow-9.1.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6b6d4050b208c8ff886fd3db6690bf04f9a48749d78b41b7a5bf24c236ab0165"}, - {file = "Pillow-9.1.0-cp37-cp37m-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:5cfca31ab4c13552a0f354c87fbd7f162a4fafd25e6b521bba93a57fe6a3700a"}, - {file = "Pillow-9.1.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ed742214068efa95e9844c2d9129e209ed63f61baa4d54dbf4cf8b5e2d30ccf2"}, - {file = "Pillow-9.1.0-cp37-cp37m-win32.whl", hash = "sha256:c9efef876c21788366ea1f50ecb39d5d6f65febe25ad1d4c0b8dff98843ac244"}, - {file = "Pillow-9.1.0-cp37-cp37m-win_amd64.whl", hash = "sha256:de344bcf6e2463bb25179d74d6e7989e375f906bcec8cb86edb8b12acbc7dfef"}, - {file = "Pillow-9.1.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:17869489de2fce6c36690a0c721bd3db176194af5f39249c1ac56d0bb0fcc512"}, - {file = "Pillow-9.1.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:25023a6209a4d7c42154073144608c9a71d3512b648a2f5d4465182cb93d3477"}, - {file = "Pillow-9.1.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8782189c796eff29dbb37dd87afa4ad4d40fc90b2742704f94812851b725964b"}, - {file = "Pillow-9.1.0-cp38-cp38-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:463acf531f5d0925ca55904fa668bb3461c3ef6bc779e1d6d8a488092bdee378"}, - {file = "Pillow-9.1.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3f42364485bfdab19c1373b5cd62f7c5ab7cc052e19644862ec8f15bb8af289e"}, - {file = "Pillow-9.1.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:3fddcdb619ba04491e8f771636583a7cc5a5051cd193ff1aa1ee8616d2a692c5"}, - {file = "Pillow-9.1.0-cp38-cp38-win32.whl", hash = "sha256:4fe29a070de394e449fd88ebe1624d1e2d7ddeed4c12e0b31624561b58948d9a"}, - {file = "Pillow-9.1.0-cp38-cp38-win_amd64.whl", hash = "sha256:c24f718f9dd73bb2b31a6201e6db5ea4a61fdd1d1c200f43ee585fc6dcd21b34"}, - {file = "Pillow-9.1.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:fb89397013cf302f282f0fc998bb7abf11d49dcff72c8ecb320f76ea6e2c5717"}, - {file = "Pillow-9.1.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:c870193cce4b76713a2b29be5d8327c8ccbe0d4a49bc22968aa1e680930f5581"}, - {file = "Pillow-9.1.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:69e5ddc609230d4408277af135c5b5c8fe7a54b2bdb8ad7c5100b86b3aab04c6"}, - {file = "Pillow-9.1.0-cp39-cp39-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:35be4a9f65441d9982240e6966c1eaa1c654c4e5e931eaf580130409e31804d4"}, - {file = "Pillow-9.1.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:82283af99c1c3a5ba1da44c67296d5aad19f11c535b551a5ae55328a317ce331"}, - {file = "Pillow-9.1.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:a325ac71914c5c043fa50441b36606e64a10cd262de12f7a179620f579752ff8"}, - {file = "Pillow-9.1.0-cp39-cp39-win32.whl", hash = "sha256:a598d8830f6ef5501002ae85c7dbfcd9c27cc4efc02a1989369303ba85573e58"}, - {file = "Pillow-9.1.0-cp39-cp39-win_amd64.whl", hash = "sha256:0c51cb9edac8a5abd069fd0758ac0a8bfe52c261ee0e330f363548aca6893595"}, - {file = "Pillow-9.1.0-pp37-pypy37_pp73-macosx_10_9_x86_64.whl", hash = "sha256:a336a4f74baf67e26f3acc4d61c913e378e931817cd1e2ef4dfb79d3e051b481"}, - {file = "Pillow-9.1.0-pp37-pypy37_pp73-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:eb1b89b11256b5b6cad5e7593f9061ac4624f7651f7a8eb4dfa37caa1dfaa4d0"}, - {file = "Pillow-9.1.0-pp37-pypy37_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:255c9d69754a4c90b0ee484967fc8818c7ff8311c6dddcc43a4340e10cd1636a"}, - {file = "Pillow-9.1.0-pp38-pypy38_pp73-macosx_10_9_x86_64.whl", hash = "sha256:5a3ecc026ea0e14d0ad7cd990ea7f48bfcb3eb4271034657dc9d06933c6629a7"}, - {file = "Pillow-9.1.0-pp38-pypy38_pp73-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c5b0ff59785d93b3437c3703e3c64c178aabada51dea2a7f2c5eccf1bcf565a3"}, - {file = "Pillow-9.1.0-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c7110ec1701b0bf8df569a7592a196c9d07c764a0a74f65471ea56816f10e2c8"}, - {file = "Pillow-9.1.0-pp38-pypy38_pp73-win_amd64.whl", hash = "sha256:8d79c6f468215d1a8415aa53d9868a6b40c4682165b8cb62a221b1baa47db458"}, - {file = "Pillow-9.1.0.tar.gz", hash = "sha256:f401ed2bbb155e1ade150ccc63db1a4f6c1909d3d378f7d1235a44e90d75fb97"}, + {file = "Pillow-9.1.1-cp310-cp310-macosx_10_10_x86_64.whl", hash = "sha256:42dfefbef90eb67c10c45a73a9bc1599d4dac920f7dfcbf4ec6b80cb620757fe"}, + {file = "Pillow-9.1.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:ffde4c6fabb52891d81606411cbfaf77756e3b561b566efd270b3ed3791fde4e"}, + {file = "Pillow-9.1.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9c857532c719fb30fafabd2371ce9b7031812ff3889d75273827633bca0c4602"}, + {file = "Pillow-9.1.1-cp310-cp310-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:59789a7d06c742e9d13b883d5e3569188c16acb02eeed2510fd3bfdbc1bd1530"}, + {file = "Pillow-9.1.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4d45dbe4b21a9679c3e8b3f7f4f42a45a7d3ddff8a4a16109dff0e1da30a35b2"}, + {file = "Pillow-9.1.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:e9ed59d1b6ee837f4515b9584f3d26cf0388b742a11ecdae0d9237a94505d03a"}, + {file = "Pillow-9.1.1-cp310-cp310-win32.whl", hash = "sha256:b3fe2ff1e1715d4475d7e2c3e8dabd7c025f4410f79513b4ff2de3d51ce0fa9c"}, + {file = "Pillow-9.1.1-cp310-cp310-win_amd64.whl", hash = "sha256:5b650dbbc0969a4e226d98a0b440c2f07a850896aed9266b6fedc0f7e7834108"}, + {file = "Pillow-9.1.1-cp37-cp37m-macosx_10_10_x86_64.whl", hash = "sha256:0b4d5ad2cd3a1f0d1df882d926b37dbb2ab6c823ae21d041b46910c8f8cd844b"}, + {file = "Pillow-9.1.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9370d6744d379f2de5d7fa95cdbd3a4d92f0b0ef29609b4b1687f16bc197063d"}, + {file = "Pillow-9.1.1-cp37-cp37m-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:b761727ed7d593e49671d1827044b942dd2f4caae6e51bab144d4accf8244a84"}, + {file = "Pillow-9.1.1-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8a66fe50386162df2da701b3722781cbe90ce043e7d53c1fd6bd801bca6b48d4"}, + {file = "Pillow-9.1.1-cp37-cp37m-win32.whl", hash = "sha256:2b291cab8a888658d72b575a03e340509b6b050b62db1f5539dd5cd18fd50578"}, + {file = "Pillow-9.1.1-cp37-cp37m-win_amd64.whl", hash = "sha256:1d4331aeb12f6b3791911a6da82de72257a99ad99726ed6b63f481c0184b6fb9"}, + {file = "Pillow-9.1.1-cp38-cp38-macosx_10_10_x86_64.whl", hash = "sha256:8844217cdf66eabe39567118f229e275f0727e9195635a15e0e4b9227458daaf"}, + {file = "Pillow-9.1.1-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:b6617221ff08fbd3b7a811950b5c3f9367f6e941b86259843eab77c8e3d2b56b"}, + {file = "Pillow-9.1.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:20d514c989fa28e73a5adbddd7a171afa5824710d0ab06d4e1234195d2a2e546"}, + {file = "Pillow-9.1.1-cp38-cp38-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:088df396b047477dd1bbc7de6e22f58400dae2f21310d9e2ec2933b2ef7dfa4f"}, + {file = "Pillow-9.1.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:53c27bd452e0f1bc4bfed07ceb235663a1df7c74df08e37fd6b03eb89454946a"}, + {file = "Pillow-9.1.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:3f6c1716c473ebd1649663bf3b42702d0d53e27af8b64642be0dd3598c761fb1"}, + {file = "Pillow-9.1.1-cp38-cp38-win32.whl", hash = "sha256:c67db410508b9de9c4694c57ed754b65a460e4812126e87f5052ecf23a011a54"}, + {file = "Pillow-9.1.1-cp38-cp38-win_amd64.whl", hash = "sha256:f054b020c4d7e9786ae0404278ea318768eb123403b18453e28e47cdb7a0a4bf"}, + {file = "Pillow-9.1.1-cp39-cp39-macosx_10_10_x86_64.whl", hash = "sha256:c17770a62a71718a74b7548098a74cd6880be16bcfff5f937f900ead90ca8e92"}, + {file = "Pillow-9.1.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:f3f6a6034140e9e17e9abc175fc7a266a6e63652028e157750bd98e804a8ed9a"}, + {file = "Pillow-9.1.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f372d0f08eff1475ef426344efe42493f71f377ec52237bf153c5713de987251"}, + {file = "Pillow-9.1.1-cp39-cp39-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:09e67ef6e430f90caa093528bd758b0616f8165e57ed8d8ce014ae32df6a831d"}, + {file = "Pillow-9.1.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:66daa16952d5bf0c9d5389c5e9df562922a59bd16d77e2a276e575d32e38afd1"}, + {file = "Pillow-9.1.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:d78ca526a559fb84faaaf84da2dd4addef5edb109db8b81677c0bb1aad342601"}, + {file = "Pillow-9.1.1-cp39-cp39-win32.whl", hash = "sha256:55e74faf8359ddda43fee01bffbc5bd99d96ea508d8a08c527099e84eb708f45"}, + {file = "Pillow-9.1.1-cp39-cp39-win_amd64.whl", hash = "sha256:7c150dbbb4a94ea4825d1e5f2c5501af7141ea95825fadd7829f9b11c97aaf6c"}, + {file = "Pillow-9.1.1-pp37-pypy37_pp73-macosx_10_10_x86_64.whl", hash = "sha256:769a7f131a2f43752455cc72f9f7a093c3ff3856bf976c5fb53a59d0ccc704f6"}, + {file = "Pillow-9.1.1-pp37-pypy37_pp73-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:488f3383cf5159907d48d32957ac6f9ea85ccdcc296c14eca1a4e396ecc32098"}, + {file = "Pillow-9.1.1-pp37-pypy37_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0b525a356680022b0af53385944026d3486fc8c013638cf9900eb87c866afb4c"}, + {file = "Pillow-9.1.1-pp38-pypy38_pp73-macosx_10_10_x86_64.whl", hash = "sha256:6e760cf01259a1c0a50f3c845f9cad1af30577fd8b670339b1659c6d0e7a41dd"}, + {file = "Pillow-9.1.1-pp38-pypy38_pp73-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a4165205a13b16a29e1ac57efeee6be2dfd5b5408122d59ef2145bc3239fa340"}, + {file = "Pillow-9.1.1-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:937a54e5694684f74dcbf6e24cc453bfc5b33940216ddd8f4cd8f0f79167f765"}, + {file = "Pillow-9.1.1-pp38-pypy38_pp73-win_amd64.whl", hash = "sha256:baf3be0b9446a4083cc0c5bb9f9c964034be5374b5bc09757be89f5d2fa247b8"}, + {file = "Pillow-9.1.1.tar.gz", hash = "sha256:7502539939b53d7565f3d11d87c78e7ec900d3c72945d4ee0e2f250d598309a0"}, ] pycparser = [ {file = "pycparser-2.21-py2.py3-none-any.whl", hash = "sha256:8ee45429555515e1f6b185e78100aea234072576aa43ab53aefcae078162fca9"}, @@ -574,7 +576,7 @@ sortedcontainers = [ {file = "sortedcontainers-2.4.0.tar.gz", hash = "sha256:25caa5a06cc30b6b83d11423433f65d1f9d76c4c6a0c90e3379eaa43b9bfdb88"}, ] svglib = [ - {file = "svglib-1.2.1.tar.gz", hash = "sha256:c77a0702fafd367c0fdca08ca1b7e1ee10058bde3bae252f49a3836e51e54519"}, + {file = "svglib-1.3.0.tar.gz", hash = "sha256:a38998b95d1bb99564dc9dffaf15e4e9453761f2790d2dd4147a4ad5fbac1078"}, ] tinycss2 = [ {file = "tinycss2-1.1.1-py3-none-any.whl", hash = "sha256:fe794ceaadfe3cf3e686b22155d0da5780dd0e273471a51846d0a02bc204fec8"}, From 9feb7fe28aeffd762cdfbc78c98c6f7838905cf5 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Wed, 19 Jan 2022 12:21:45 +0800 Subject: [PATCH 023/245] libosinfo: disable devdoc output when cross compiling --- pkgs/development/libraries/libosinfo/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libosinfo/default.nix b/pkgs/development/libraries/libosinfo/default.nix index a1dd23357dec..894aee90ff4b 100644 --- a/pkgs/development/libraries/libosinfo/default.nix +++ b/pkgs/development/libraries/libosinfo/default.nix @@ -30,7 +30,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-olLgD8WA3rIdoNqMCqA7jDHoRAuESMi5gUP6tHfTIwU="; }; - outputs = [ "out" "dev" "devdoc" ]; + outputs = [ "out" "dev" ] + ++ lib.optional (stdenv.hostPlatform == stdenv.buildPlatform) "devdoc"; nativeBuildInputs = [ pkg-config From a0809c029330540e35ff5a8cd4295b68271e1e19 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Sat, 4 Jun 2022 23:45:46 +0200 Subject: [PATCH 024/245] haskellPackages.hoogleLocal: allow substitutes again This is a follow up to the discussion in https://github.com/NixOS/nixpkgs/pull/165337 --- pkgs/development/haskell-modules/hoogle.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/hoogle.nix b/pkgs/development/haskell-modules/hoogle.nix index 8518a5391de7..4c8bf8c2d282 100644 --- a/pkgs/development/haskell-modules/hoogle.nix +++ b/pkgs/development/haskell-modules/hoogle.nix @@ -49,9 +49,12 @@ buildPackages.stdenv.mkDerivation { # compiling databases takes less time than copying the results # between machines. preferLocalBuild = true; - # Plus, you need a complete database for each possible combination - # of dependencies, caching them does not make sense. - allowSubstitutes = false; + + # we still allow substitutes because a database is relatively small and if it + # is already built downloading is probably faster. The substitution will only + # trigger for users who have already cached the database on a substituter and + # thus probably intend to substitute it. + allowSubstitutes = true; inherit docPackages; From 70d95b25b6c7130563522aed285374b2b20d7464 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 5 Jun 2022 13:47:11 +0200 Subject: [PATCH 025/245] haskellPackages.protolude: drop upstreamed patches --- .../haskell-modules/configuration-common.nix | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index b8c9e49a9526..32c2126fbb5f 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2351,25 +2351,6 @@ self: super: { # Invalid CPP in test suite: https://github.com/cdornan/memory-cd/issues/1 memory-cd = dontCheck super.memory-cd; - protolude = appendPatches [ - # Intermediate Patch, so the next one applies - (fetchpatch { - name = "integer-gmp-only-symbols.patch"; - url = "https://github.com/protolude/protolude/commit/84d228a3b5a2adfe5c8aec23176a0301012e54eb.patch"; - sha256 = "0mk0gxcg8vp73wlz764y24gqmxdrhanp12dfam9xsb6cm34jkjdc"; - }) - # Compat with GHC 9.0 (not merged yet) - (fetchpatch { - name = "protolude-ghc-9.0.patch"; - url = "https://github.com/protolude/protolude/pull/131/commits/1ca4b4564b4d868022d5bab5330e2c7d9cae11a0.patch"; - sha256 = "0jrm6715kc8v7v4isi79b3w1i51rs332bkak25ik6zv3i5lgcg68"; - includes = [ - "protolude.cabal" - "src/**" - ]; - }) - ] super.protolude; - # https://github.com/haskell/fgl/pull/99 fgl = doJailbreak super.fgl; fgl-arbitrary = doJailbreak super.fgl-arbitrary; From d3805f8df5dec0e18fdf983734cfb728476e6dd5 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 5 Jun 2022 13:49:31 +0100 Subject: [PATCH 026/245] darwin.dtrace: add -fcommon workaround Workaround build failure on -fno-common toolchains like upstream clang-11. Otherwise build fails as: duplicate symbol '_kCSRegionMachHeaderName' in: libproc.o dt_module_apple.o --- .../darwin/apple-source-releases/dtrace/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/dtrace/default.nix b/pkgs/os-specific/darwin/apple-source-releases/dtrace/default.nix index 3e7e89642c26..1f13cbef9fc9 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/dtrace/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/dtrace/default.nix @@ -4,7 +4,9 @@ appleDerivation { nativeBuildInputs = [ xcbuildHook flex bison fixDarwinDylibNames ]; buildInputs = [ CoreSymbolication darling xnu ]; - NIX_CFLAGS_COMPILE = "-DCTF_OLD_VERSIONS -DPRIVATE -DYYDEBUG=1 -I${xnu}/Library/Frameworks/System.framework/Headers -Wno-error=implicit-function-declaration"; + # -fcommon: workaround build failure on -fno-common toolchains: + # duplicate symbol '_kCSRegionMachHeaderName' in: libproc.o dt_module_apple.o + NIX_CFLAGS_COMPILE = "-DCTF_OLD_VERSIONS -DPRIVATE -DYYDEBUG=1 -I${xnu}/Library/Frameworks/System.framework/Headers -Wno-error=implicit-function-declaration -fcommon"; NIX_LDFLAGS = "-L./Products/Release"; xcbuildFlags = [ "-target" "dtrace_frameworks" "-target" "dtrace" ]; From e174b463e7f01a32a4347d92f0e7cbc80ea5cd1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 5 Jun 2022 16:51:27 +0000 Subject: [PATCH 027/245] nixops: mark insecure --- pkgs/tools/package-management/nixops/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/tools/package-management/nixops/default.nix b/pkgs/tools/package-management/nixops/default.nix index 2ec98b82c690..21118870bfaf 100644 --- a/pkgs/tools/package-management/nixops/default.nix +++ b/pkgs/tools/package-management/nixops/default.nix @@ -6,6 +6,18 @@ let inherit (poetry2nix.mkPoetryPackages { projectDir = ./python-env; python = python2; + overrides = [ + poetry2nix.defaultPoetryOverrides + (self: super: { + pyjwt = super.pyjwt.overridePythonAttrs (old: { + meta = old.meta // { + knownVulnerabilities = lib.optionals (lib.versionOlder old.version "2.4.0") [ + "CVE-2022-29217" + ]; + }; + }); + }) + ]; }) python; pythonPackages = python.pkgs; From 007ffa606906411323ef32448ea97c005cffe597 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 5 Jun 2022 17:07:25 +0000 Subject: [PATCH 028/245] python2Packages.pyjwt: mark insecure --- pkgs/development/python2-modules/pyjwt/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python2-modules/pyjwt/default.nix b/pkgs/development/python2-modules/pyjwt/default.nix index 9978302d1cc4..011f526e520f 100644 --- a/pkgs/development/python2-modules/pyjwt/default.nix +++ b/pkgs/development/python2-modules/pyjwt/default.nix @@ -40,5 +40,8 @@ buildPythonPackage rec { description = "JSON Web Token implementation in Python"; homepage = "https://github.com/jpadilla/pyjwt"; license = licenses.mit; + knownVulnerabilities = [ + "CVE-2022-29217" + ]; }; } From ac4fc73abc159cd8860ce7b61844306335fb3578 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 5 Jun 2022 17:10:32 +0000 Subject: [PATCH 029/245] python2Packages.urllib3: mark insecure --- pkgs/development/python2-modules/urllib3/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python2-modules/urllib3/default.nix b/pkgs/development/python2-modules/urllib3/default.nix index a52e68eac5e3..c23835ce4dc2 100644 --- a/pkgs/development/python2-modules/urllib3/default.nix +++ b/pkgs/development/python2-modules/urllib3/default.nix @@ -77,5 +77,8 @@ buildPythonPackage rec { homepage = "https://github.com/shazow/urllib3"; license = licenses.mit; maintainers = with maintainers; [ fab ]; + knownVulnerabilities = [ + "CVE-2021-33503" + ]; }; } From b9dcfbbd4dc4a4ca4c40c3a0042e1d121e459eb7 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 5 Jun 2022 18:14:56 +0100 Subject: [PATCH 030/245] cdesktopenv: add -fcommon workaround Workaround build failure on -fno-common toolchains like upstream gcc-10. Otherwise build fails as: ld: raima/startup.o:/build/cde-2.3.2/lib/DtSearch/raima/dbtype.h:408: multiple definition of `__SK__'; raima/alloc.o:/build/cde-2.3.2/lib/DtSearch/raima/dbtype.h:408: first defined here --- pkgs/desktops/cdesktopenv/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/desktops/cdesktopenv/default.nix b/pkgs/desktops/cdesktopenv/default.nix index 8039caa74be6..acb423f44bd3 100644 --- a/pkgs/desktops/cdesktopenv/default.nix +++ b/pkgs/desktops/cdesktopenv/default.nix @@ -49,6 +49,11 @@ in stdenv.mkDerivation rec { # build fails otherwise enableParallelBuilding = false; + # Workaround build failure on -fno-common toolchains: + # ld: raima/startup.o:/build/cde-2.3.2/lib/DtSearch/raima/dbtype.h:408: multiple definition of + # `__SK__'; raima/alloc.o:/build/cde-2.3.2/lib/DtSearch/raima/dbtype.h:408: first defined here + NIX_CFLAGS_COMPILE = "-fcommon"; + makeFlags = [ "World" "BOOTSTRAPCFLAGS=-I${xorgproto}/include/X11" From 46e4f3bd77559fe6edb366551530fe50a774849f Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 5 Jun 2022 18:33:15 +0100 Subject: [PATCH 031/245] cernlib: add -fcommon workaround Workaround build failure on -fno-common toolchains like upstream gcc-10. Otherwise build fails as: ld: libpacklib.a(kedit.o):kuip/klink1.h:11: multiple definition of `klnkaddr'; libzftplib.a(zftpcdf.o):zftp/zftpcdf.c:155: first defined here --- pkgs/development/libraries/physics/cernlib/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/libraries/physics/cernlib/default.nix b/pkgs/development/libraries/physics/cernlib/default.nix index ca328e2bac46..77ad6e201a32 100644 --- a/pkgs/development/libraries/physics/cernlib/default.nix +++ b/pkgs/development/libraries/physics/cernlib/default.nix @@ -53,6 +53,11 @@ stdenv.mkDerivation rec { NIX_CFLAGS = [ "-Wno-return-type" ]; + # Workaround build failure on -fno-common toolchains: + # ld: libpacklib.a(kedit.o):kuip/klink1.h:11: multiple definition of `klnkaddr'; + # libzftplib.a(zftpcdf.o):zftp/zftpcdf.c:155: first defined here + NIX_CFLAGS_COMPILE = "-fcommon"; + makeFlags = [ "FORTRANOPTIONS=$(FFLAGS)" "CCOPTIONS=$(NIX_CFLAGS)" From d7c6d3d063d0671e2ce7fd1c5bc4d93771ec6883 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 5 Jun 2022 18:51:08 +0100 Subject: [PATCH 032/245] coturn: add -fcommon workaround Workaround build failure on -fno-common toolchains like upstream gcc-10. Otherwise build fails as: ld: ...-libprom-0.1.1/include/prom_collector_registry.h:37: multiple definition of `PROM_COLLECTOR_REGISTRY_DEFAULT'; ...-libprom-0.1.1/include/prom_collector_registry.h:37: first defined here --- pkgs/servers/coturn/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/servers/coturn/default.nix b/pkgs/servers/coturn/default.nix index d076f763bf96..695c881e9f66 100644 --- a/pkgs/servers/coturn/default.nix +++ b/pkgs/servers/coturn/default.nix @@ -35,6 +35,13 @@ stdenv.mkDerivation rec { ./pure-configure.patch ]; + # Workaround build failure on -fno-common toolchains like upstream + # gcc-10. Otherwise build fails as: + # ld: ...-libprom-0.1.1/include/prom_collector_registry.h:37: multiple definition of + # `PROM_COLLECTOR_REGISTRY_DEFAULT'; ...-libprom-0.1.1/include/prom_collector_registry.h:37: first defined here + # Should be fixed in libprom-1.2.0 and later: https://github.com/digitalocean/prometheus-client-c/pull/25 + NIX_CFLAGS_COMPILE = "-fcommon"; + passthru.tests.coturn = nixosTests.coturn; meta = with lib; { From 82bb52db8f3f8cb90911e6cb194b5e9602a49c15 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 5 Jun 2022 19:29:49 +0100 Subject: [PATCH 033/245] eresi: pull fix pending upstream inclusion for -fno-common toolchains Without the change build fails on upstream gcc-10 as: ld: stabs-trans.32.o:libedfmt/stabs-trans.c:28: multiple definition of `buf'; dwarf2-trans.32.o:libedfmt/dwarf2-trans.c:22: first defined here --- pkgs/development/tools/analysis/eresi/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/tools/analysis/eresi/default.nix b/pkgs/development/tools/analysis/eresi/default.nix index 158f6545b714..9d1487ea99b6 100644 --- a/pkgs/development/tools/analysis/eresi/default.nix +++ b/pkgs/development/tools/analysis/eresi/default.nix @@ -16,6 +16,13 @@ stdenv.mkDerivation rec { url = "https://github.com/thorkill/eresi/commit/a79406344cc21d594d27fa5ec5922abe9f7475e7.patch"; sha256 = "1mjjc6hj7r06iarvai7prcdvjk9g0k5vwrmkwcm7b8ivd5xzxp2z"; }) + + # Pull patch pending upstream inclusion for -fno-common toolchains: + # https://github.com/thorkill/eresi/pull/166 + (fetchpatch { + url = "https://github.com/thorkill/eresi/commit/bc5b9a75c326f277e5f89e01a3b8f7f0519a99f6.patch"; + sha256 = "0lqwrnkkhhd3vi1r8ngvziyqkk09h98h93rrs3ndqi048a898ys1"; + }) ]; postPatch = '' From c7104a2e5d6334f76a54a20beaae14e68cd09bc1 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 5 Jun 2022 20:04:21 +0100 Subject: [PATCH 034/245] libagar_test: add -fcommon workaround Workaround build failure on -fno-common toolchains like upstream gcc-10. Otherwise build fails as: ld: textdlg.o:(.bss+0x0): multiple definition of `someString'; configsettings.o:(.bss+0x0): first defined here --- pkgs/development/libraries/libagar/libagar_test.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/libraries/libagar/libagar_test.nix b/pkgs/development/libraries/libagar/libagar_test.nix index d4712efd6f1e..19efea263c07 100644 --- a/pkgs/development/libraries/libagar/libagar_test.nix +++ b/pkgs/development/libraries/libagar/libagar_test.nix @@ -7,6 +7,12 @@ stdenv.mkDerivation { sourceRoot = "agar-1.5.0/tests"; + # Workaround build failure on -fno-common toolchains: + # ld: textdlg.o:(.bss+0x0): multiple definition of `someString'; + # configsettings.o:(.bss+0x0): first defined here + # TODO: the workaround can be removed once nixpkgs updates to 1.6.0. + NIX_CFLAGS_COMPILE = "-fcommon"; + preConfigure = '' substituteInPlace configure.in \ --replace '_BSD_SOURCE' '_DEFAULT_SOURCE' From 3586c258e8dfd305b8a6c65dd5c98efabd288e59 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Sun, 5 Jun 2022 23:07:42 +0200 Subject: [PATCH 035/245] haskell.packages.ghc923: pin fourmolu to 0.6.0.0 --- .../configuration-ghc-9.2.x.nix | 6 +++- .../configuration-hackage2nix/main.yaml | 1 + .../haskell-modules/hackage-packages.nix | 32 +++++++++++++++++++ 3 files changed, 38 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix index fc5855025bb8..02fe3d6a61a0 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix @@ -206,9 +206,13 @@ self: super: { regex-rure = doDistribute (markUnbroken super.regex-rure); jacinda = doDistribute super.jacinda; some = doJailbreak super.some; - fourmolu = super.fourmolu_0_7_0_1; + + # 2022-06-05: this is not the latest version of fourmolu because + # hls-fourmolu-plugin 1.0.3.0 doesn‘t support a newer one. + fourmolu = super.fourmolu_0_6_0_0; # hls-fourmolu-plugin in this version has a to strict upper bound of fourmolu <= 0.5.0.0 hls-fourmolu-plugin = assert super.hls-fourmolu-plugin.version == "1.0.3.0"; doJailbreak super.hls-fourmolu-plugin; + hls-ormolu-plugin = assert super.hls-ormolu-plugin.version == "1.0.2.1"; doJailbreak super.hls-ormolu-plugin; implicit-hie-cradle = doJailbreak super.implicit-hie-cradle; # 1.3 introduced support for GHC 9.2.x, so when this assert fails, the jailbreak can be removed diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 2ddf5c2a534f..05ab12f12940 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -134,6 +134,7 @@ extra-packages: - hspec-core < 2.8 # 2022-04-07: Needed for tasty-hspec 1.1.6 - hspec-discover < 2.8 # 2022-04-07: Needed for tasty-hspec 1.1.6 - bower-json == 1.0.0.1 # 2022-05-21: Needed for spago 0.20.9 + - fourmolu == 0.6.0.0 # 2022-06-05: Last fourmolu version compatible with hls 1.7/ hls-fourmolu-plugin 1.0.3.0 package-maintainers: abbradar: diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 599b63b8d2da..7b6fe7c7c045 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -99389,6 +99389,38 @@ self: { license = lib.licenses.bsd3; }) {}; + "fourmolu_0_6_0_0" = callPackage + ({ mkDerivation, aeson, ansi-terminal, array, base, bytestring + , Cabal, containers, Diff, directory, dlist, exceptions, filepath + , ghc-lib-parser, gitrev, hspec, hspec-discover, HsYAML + , HsYAML-aeson, mtl, optparse-applicative, path, path-io, syb + , temporary, text + }: + mkDerivation { + pname = "fourmolu"; + version = "0.6.0.0"; + sha256 = "0yxv3ih2jjnjzdhz31y4a94ly6g3qhddrm3lvflqrb4krk445p67"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson ansi-terminal array base bytestring Cabal containers Diff + directory dlist exceptions filepath ghc-lib-parser HsYAML + HsYAML-aeson mtl syb text + ]; + executableHaskellDepends = [ + base directory filepath ghc-lib-parser gitrev optparse-applicative + text + ]; + testHaskellDepends = [ + base containers directory filepath hspec path path-io temporary + text + ]; + testToolDepends = [ hspec-discover ]; + description = "A formatter for Haskell source code"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "fourmolu_0_7_0_1" = callPackage ({ mkDerivation, aeson, ansi-terminal, array, base, bytestring , Cabal, containers, Diff, directory, dlist, exceptions, filepath From 109e13db243249e26b8b8d861424578400aae882 Mon Sep 17 00:00:00 2001 From: Soham Sen Date: Sun, 5 Jun 2022 22:11:31 +0530 Subject: [PATCH 036/245] dragonflydb: init at 0.1.0 --- .../from_md/release-notes/rl-2211.section.xml | 7 + .../manual/release-notes/rl-2211.section.md | 2 + nixos/modules/module-list.nix | 1 + .../services/databases/dragonflydb.nix | 152 +++++ pkgs/servers/nosql/dragonflydb/default.nix | 109 ++++ pkgs/servers/nosql/dragonflydb/fixes.patch | 132 +++++ pkgs/servers/nosql/dragonflydb/glog.patch | 553 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 8 files changed, 958 insertions(+) create mode 100644 nixos/modules/services/databases/dragonflydb.nix create mode 100644 pkgs/servers/nosql/dragonflydb/default.nix create mode 100644 pkgs/servers/nosql/dragonflydb/fixes.patch create mode 100644 pkgs/servers/nosql/dragonflydb/glog.patch diff --git a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml index 4a7ef8b71686..b350e1fe17d6 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml @@ -48,6 +48,13 @@ virtualisation.appvm. + + + dragonflydb, + a modern replacement for Redis and Memcached. Available as + services.dragonflydb. + + infnoise, diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md index 89a799cafc50..702efcb2dc09 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -25,6 +25,8 @@ In addition to numerous new and upgraded packages, this release has the followin - [appvm](https://github.com/jollheef/appvm), Nix based app VMs. Available as [virtualisation.appvm](options.html#opt-virtualisation.appvm.enable). +- [dragonflydb](https://dragonflydb.io/), a modern replacement for Redis and Memcached. Available as [services.dragonflydb](#opt-services.dragonflydb.enable). + - [infnoise](https://github.com/leetronics/infnoise), a hardware True Random Number Generator dongle. Available as [services.infnoise](options.html#opt-services.infnoise.enable). diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index d59d7bfe40d9..7b1054262f59 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -348,6 +348,7 @@ ./services/databases/clickhouse.nix ./services/databases/cockroachdb.nix ./services/databases/couchdb.nix + ./services/databases/dragonflydb.nix ./services/databases/firebird.nix ./services/databases/foundationdb.nix ./services/databases/hbase.nix diff --git a/nixos/modules/services/databases/dragonflydb.nix b/nixos/modules/services/databases/dragonflydb.nix new file mode 100644 index 000000000000..e72afa9d9089 --- /dev/null +++ b/nixos/modules/services/databases/dragonflydb.nix @@ -0,0 +1,152 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.dragonflydb; + dragonflydb = pkgs.dragonflydb; + + settings = + { + port = cfg.port; + dir = "/var/lib/dragonflydb"; + keys_output_limit = cfg.keysOutputLimit; + } // + (lib.optionalAttrs (cfg.bind != null) { bind = cfg.bind; }) // + (lib.optionalAttrs (cfg.requirePass != null) { requirepass = cfg.requirePass; }) // + (lib.optionalAttrs (cfg.maxMemory != null) { maxmemory = cfg.maxMemory; }) // + (lib.optionalAttrs (cfg.memcachePort != null) { memcache_port = cfg.memcachePort; }) // + (lib.optionalAttrs (cfg.dbNum != null) { dbnum = cfg.dbNum; }) // + (lib.optionalAttrs (cfg.cacheMode != null) { cache_mode = cfg.cacheMode; }); +in +{ + + ###### interface + + options = { + services.dragonflydb = { + enable = mkEnableOption "DragonflyDB"; + + user = mkOption { + type = types.str; + default = "dragonfly"; + description = "The user to run DragonflyDB as"; + }; + + port = mkOption { + type = types.port; + default = 6379; + description = "The TCP port to accept connections."; + }; + + bind = mkOption { + type = with types; nullOr str; + default = "127.0.0.1"; + description = '' + The IP interface to bind to. + null means "all interfaces". + ''; + }; + + requirePass = mkOption { + type = with types; nullOr str; + default = null; + description = "Password for database"; + example = "letmein!"; + }; + + maxMemory = mkOption { + type = with types; nullOr ints.unsigned; + default = null; + description = '' + The maximum amount of memory to use for storage (in bytes). + null means this will be automatically set. + ''; + }; + + memcachePort = mkOption { + type = with types; nullOr port; + default = null; + description = '' + To enable memcached compatible API on this port. + null means disabled. + ''; + }; + + keysOutputLimit = mkOption { + type = types.ints.unsigned; + default = 8192; + description = '' + Maximum number of returned keys in keys command. + keys is a dangerous command. + We truncate its result to avoid blowup in memory when fetching too many keys. + ''; + }; + + dbNum = mkOption { + type = with types; nullOr ints.unsigned; + default = null; + description = "Maximum number of supported databases for select"; + }; + + cacheMode = mkOption { + type = with types; nullOr bool; + default = null; + description = '' + Once this mode is on, Dragonfly will evict items least likely to be stumbled + upon in the future but only when it is near maxmemory limit. + ''; + }; + }; + }; + + ###### implementation + + config = mkIf config.services.dragonflydb.enable { + + users.users = optionalAttrs (cfg.user == "dragonfly") { + dragonfly.description = "DragonflyDB server user"; + dragonfly.isSystemUser = true; + dragonfly.group = "dragonfly"; + }; + users.groups = optionalAttrs (cfg.user == "dragonfly") { dragonfly = { }; }; + + environment.systemPackages = [ dragonflydb ]; + + systemd.services.dragonflydb = { + description = "DragonflyDB server"; + + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + + serviceConfig = { + ExecStart = "${dragonflydb}/bin/dragonfly --alsologtostderr ${builtins.concatStringsSep " " (attrsets.mapAttrsToList (n: v: "--${n} ${strings.escapeShellArg v}") settings)}"; + + User = cfg.user; + + # Filesystem access + ReadWritePaths = [ settings.dir ]; + StateDirectory = "dragonflydb"; + StateDirectoryMode = "0700"; + # Process Properties + LimitMEMLOCK = "infinity"; + # Caps + CapabilityBoundingSet = ""; + NoNewPrivileges = true; + # Sandboxing + ProtectSystem = "strict"; + ProtectHome = true; + PrivateTmp = true; + PrivateDevices = true; + ProtectKernelTunables = true; + ProtectKernelModules = true; + ProtectControlGroups = true; + LockPersonality = true; + RestrictAddressFamilies = [ "AF_INET" "AF_INET6" ]; + RestrictRealtime = true; + PrivateMounts = true; + MemoryDenyWriteExecute = true; + }; + }; + }; +} diff --git a/pkgs/servers/nosql/dragonflydb/default.nix b/pkgs/servers/nosql/dragonflydb/default.nix new file mode 100644 index 000000000000..ff4833cfaa60 --- /dev/null +++ b/pkgs/servers/nosql/dragonflydb/default.nix @@ -0,0 +1,109 @@ +{ fetchFromGitHub +, fetchurl +, lib +, stdenv +, double-conversion +, gperftools +, mimalloc +, rapidjson +, liburing +, xxHash +, abseil-cpp_202111 +, gbenchmark +, glog +, gtest +, jemalloc +, gcc-unwrapped +, autoconf +, autoconf-archive +, automake +, cmake +, ninja +, boost +, libunwind +, libtool +, openssl +}: + +let + pname = "dragonflydb"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = pname; + repo = "dragonfly"; + rev = "v${version}"; + hash = "sha256-P6WMW/n+VezWDXGagT4B+ZYyCp8oufDV6MTrpKpLZcs="; + fetchSubmodules = true; + }; + + # Needed exactly 5.4.4 for patch to work + lua = fetchurl { + url = "https://github.com/lua/lua/archive/refs/tags/v5.4.4.tar.gz"; + hash = "sha256-L/ibvqIqfIuRDWsAb1ukVZ7c9GiiVTfO35mI7ZD2tFA="; + }; +in +stdenv.mkDerivation { + inherit pname version src; + + postPatch = '' + mkdir -p ./build/{third_party,_deps} + ln -s ${double-conversion.src} ./build/third_party/dconv + ln -s ${mimalloc.src} ./build/third_party/mimalloc + ln -s ${rapidjson.src} ./build/third_party/rapidjson + ln -s ${gbenchmark.src} ./build/_deps/benchmark-src + ln -s ${gtest.src} ./build/_deps/gtest-src + cp -R --no-preserve=mode,ownership ${gperftools.src} ./build/third_party/gperf + cp -R --no-preserve=mode,ownership ${liburing.src} ./build/third_party/uring + cp -R --no-preserve=mode,ownership ${xxHash.src} ./build/third_party/xxhash + cp -R --no-preserve=mode,ownership ${abseil-cpp_202111.src} ./build/_deps/abseil_cpp-src + cp -R --no-preserve=mode,ownership ${glog.src} ./build/_deps/glog-src + chmod u+x ./build/third_party/uring/configure + cp ./build/third_party/xxhash/cli/xxhsum.{1,c} ./build/third_party/xxhash + patch -p1 -d ./build/_deps/glog-src < ${./glog.patch} + sed ' + s@REPLACEJEMALLOCURL@file://${jemalloc.src}@ + s@REPLACELUAURL@file://${lua}@ + ' ${./fixes.patch} | patch -p1 + ''; + + nativeBuildInputs = [ + autoconf + autoconf-archive + automake + cmake + ninja + ]; + + buildInputs = [ + boost + libunwind + libtool + openssl + ]; + + cmakeFlags = [ + "-DCMAKE_AR=${gcc-unwrapped}/bin/gcc-ar" + "-DCMAKE_RANLIB=${gcc-unwrapped}/bin/gcc-ranlib" + ]; + + ninjaFlags = "dragonfly"; + + doCheck = false; + dontUseNinjaInstall = true; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin + cp ./dragonfly $out/bin + runHook postInstall + ''; + + meta = with lib; { + description = "A modern replacement for Redis and Memcached"; + homepage = "https://dragonflydb.io/"; + license = licenses.bsl11; + platforms = platforms.linux; + maintainers = with maintainers; [ yureien ]; + }; +} diff --git a/pkgs/servers/nosql/dragonflydb/fixes.patch b/pkgs/servers/nosql/dragonflydb/fixes.patch new file mode 100644 index 000000000000..d2992fbbaf82 --- /dev/null +++ b/pkgs/servers/nosql/dragonflydb/fixes.patch @@ -0,0 +1,132 @@ +diff --git a/helio/cmake/third_party.cmake b/helio/cmake/third_party.cmake +index aeb78d9..e9d4e6b 100644 +--- a/helio/cmake/third_party.cmake ++++ b/helio/cmake/third_party.cmake +@@ -143,7 +143,7 @@ endfunction() + + FetchContent_Declare( + gtest +- URL https://github.com/google/googletest/archive/release-1.11.0.zip ++ DOWNLOAD_COMMAND true + ) + + FetchContent_GetProperties(gtest) +@@ -154,7 +154,7 @@ endif () + + FetchContent_Declare( + benchmark +- URL https://github.com/google/benchmark/archive/v1.6.1.tar.gz ++ DOWNLOAD_COMMAND true + ) + + FetchContent_GetProperties(benchmark) +@@ -169,7 +169,7 @@ endif () + + FetchContent_Declare( + abseil_cpp +- URL https://github.com/abseil/abseil-cpp/archive/20211102.0.tar.gz ++ DOWNLOAD_COMMAND true + PATCH_COMMAND patch -p1 < "${CMAKE_CURRENT_LIST_DIR}/../patches/abseil-20211102.patch" + ) + +@@ -183,11 +183,7 @@ endif() + + FetchContent_Declare( + glog +- GIT_REPOSITORY https://github.com/romange/glog +- GIT_TAG Absl +- +- GIT_PROGRESS TRUE +- GIT_SHALLOW TRUE ++ DOWNLOAD_COMMAND true + ) + + FetchContent_GetProperties(glog) +@@ -233,10 +229,7 @@ endif() + + add_third_party( + gperf +- URL https://github.com/gperftools/gperftools/archive/gperftools-2.9.1.tar.gz +- #GIT_REPOSITORY https://github.com/gperftools/gperftools +- #GIT_TAG gperftools-2.9.1 +- GIT_SHALLOW TRUE ++ DOWNLOAD_COMMAND true + PATCH_COMMAND autoreconf -i # update runs every time for some reason + # CMAKE_PASS_FLAGS "-DGPERFTOOLS_BUILD_HEAP_PROFILER=OFF -DGPERFTOOLS_BUILD_HEAP_CHECKER=OFF \ + # -DGPERFTOOLS_BUILD_DEBUGALLOC=OFF -DBUILD_TESTING=OFF \ +@@ -260,11 +253,12 @@ else() + endif() + + add_third_party(mimalloc +- URL https://github.com/microsoft/mimalloc/archive/refs/tags/v2.0.5.tar.gz ++ DOWNLOAD_COMMAND true + + # Add -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_FLAGS=-O0 to debug + CMAKE_PASS_FLAGS "-DCMAKE_BUILD_TYPE=Release -DMI_BUILD_SHARED=OFF -DMI_BUILD_TESTS=OFF \ +- -DMI_INSTALL_TOPLEVEL=ON -DMI_OVERRIDE=${MI_OVERRIDE} -DCMAKE_C_FLAGS=-g" ++ -DMI_INSTALL_TOPLEVEL=ON -DMI_OVERRIDE=${MI_OVERRIDE} -DCMAKE_C_FLAGS=-g \ ++ -DCMAKE_INSTALL_LIBDIR=${THIRD_PARTY_LIB_DIR}/mimalloc/lib" + + BUILD_COMMAND make -j4 mimalloc-static + INSTALL_COMMAND make install +@@ -274,7 +268,7 @@ add_third_party(mimalloc + ) + + add_third_party(jemalloc +- URL https://github.com/jemalloc/jemalloc/releases/download/5.2.1/jemalloc-5.2.1.tar.bz2 ++ URL REPLACEJEMALLOCURL + PATCH_COMMAND ./autogen.sh + CONFIGURE_COMMAND /configure --prefix=${THIRD_PARTY_LIB_DIR}/jemalloc --with-jemalloc-prefix=je_ --disable-libdl + ) +@@ -282,24 +276,23 @@ add_third_party(jemalloc + + add_third_party( + xxhash +- URL https://github.com/Cyan4973/xxHash/archive/v0.8.0.tar.gz ++ DOWNLOAD_COMMAND true + SOURCE_SUBDIR cmake_unofficial +- CMAKE_PASS_FLAGS "-DCMAKE_POSITION_INDEPENDENT_CODE=ON -DBUILD_SHARED_LIBS=OFF" ++ CMAKE_PASS_FLAGS "-DCMAKE_POSITION_INDEPENDENT_CODE=ON -DBUILD_SHARED_LIBS=OFF \ ++ -DCMAKE_INSTALL_LIBDIR=${THIRD_PARTY_LIB_DIR}/xxhash/lib" + ) + + + add_third_party( + uring +- GIT_REPOSITORY https://github.com/axboe/liburing.git +- GIT_TAG liburing-2.1 ++ DOWNLOAD_COMMAND true + CONFIGURE_COMMAND /configure --prefix=${THIRD_PARTY_LIB_DIR}/uring + BUILD_IN_SOURCE 1 + ) + + add_third_party( + rapidjson +- GIT_REPOSITORY https://github.com/Tencent/rapidjson.git +- GIT_TAG 1a803826f1197b5e30703afe4b9c0e7dd48074f5 ++ DOWNLOAD_COMMAND true + CMAKE_PASS_FLAGS "-DRAPIDJSON_BUILD_TESTS=OFF -DRAPIDJSON_BUILD_EXAMPLES=OFF \ + -DRAPIDJSON_BUILD_DOC=OFF" + LIB "none" +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 0dc0824..d5b38b3 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -1,6 +1,6 @@ + add_third_party( + lua +- URL https://github.com/lua/lua/archive/refs/tags/v5.4.4.tar.gz ++ URL REPLACELUAURL + PATCH_COMMAND patch -p1 -i "${CMAKE_SOURCE_DIR}/patches/lua-v5.4.4.patch" + CONFIGURE_COMMAND echo + BUILD_IN_SOURCE 1 +@@ -11,7 +11,8 @@ add_third_party( + + add_third_party( + dconv +- URL https://github.com/google/double-conversion/archive/refs/tags/v3.2.0.tar.gz ++ DOWNLOAD_COMMAND true ++ CMAKE_PASS_FLAGS "-DCMAKE_INSTALL_LIBDIR=${THIRD_PARTY_LIB_DIR}/dconv/lib" + LIB libdouble-conversion.a + ) + diff --git a/pkgs/servers/nosql/dragonflydb/glog.patch b/pkgs/servers/nosql/dragonflydb/glog.patch new file mode 100644 index 000000000000..2fb9c0733b87 --- /dev/null +++ b/pkgs/servers/nosql/dragonflydb/glog.patch @@ -0,0 +1,553 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 846b4448..b4900ead 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -39,6 +39,7 @@ option (PRINT_UNSYMBOLIZED_STACK_TRACES + "Print file offsets in traces instead of symbolizing" OFF) + option (WITH_CUSTOM_PREFIX "Enable support for user-generated message prefixes" ON) + option (WITH_GFLAGS "Use gflags" ON) ++option (WITH_ABSL "Use absl flags" OFF) + option (WITH_GTEST "Use Google Test" ON) + option (WITH_PKGCONFIG "Enable pkg-config support" ON) + option (WITH_SYMBOLIZE "Enable symbolize module" ON) +@@ -87,6 +88,13 @@ if (WITH_GFLAGS) + endif (gflags_FOUND) + endif (WITH_GFLAGS) + ++if (WITH_ABSL) ++ set (HAVE_ABSL_FLAGS 1) ++ set (ac_cv_have_abslflags 1) ++else (WITH_ABSL) ++set (ac_cv_have_abslflags 0) ++endif (WITH_ABSL) ++ + find_package (Threads) + find_package (Unwind) + +@@ -1025,7 +1033,7 @@ write_basic_package_version_file ( + ${CMAKE_CURRENT_BINARY_DIR}/glog-config-version.cmake + COMPATIBILITY SameMajorVersion) + +-export (TARGETS glog NAMESPACE glog:: FILE glog-targets.cmake) ++# export (TARGETS glog NAMESPACE glog:: FILE glog-targets.cmake) + export (PACKAGE glog) + + get_filename_component (_PREFIX "${CMAKE_INSTALL_PREFIX}" ABSOLUTE) +diff --git a/src/base/commandlineflags.h b/src/base/commandlineflags.h +index bcb12dea..1c9d9294 100644 +--- a/src/base/commandlineflags.h ++++ b/src/base/commandlineflags.h +@@ -57,6 +57,25 @@ + + #include + ++#else ++#ifdef HAVE_ABSL_FLAGS ++#include ++ ++#define FLAG(name) absl::GetFlag(FLAGS_##name) ++ ++#define DEFINE_bool(name, value, meaning) \ ++ ABSL_FLAG(bool, name, value, meaning) ++ ++#define DEFINE_int32(name, value, meaning) \ ++ ABSL_FLAG(GOOGLE_NAMESPACE::int32, name, value, meaning) ++ ++#define DEFINE_uint32(name, value, meaning) \ ++ ABSL_FLAG(GOOGLE_NAMESPACE::uint32, name, value, meaning) ++ ++#define DEFINE_string(name, value, meaning) \ ++ ABSL_FLAG(std::string, name, value, meaning) ++ ++ + #else + + #include +@@ -108,6 +127,7 @@ + } \ + using fLS::FLAGS_##name + ++#endif + #endif // HAVE_LIB_GFLAGS + + // Define GLOG_DEFINE_* using DEFINE_* . By using these macros, we +diff --git a/src/base/mutex.h b/src/base/mutex.h +index e82c597f..a58c1412 100644 +--- a/src/base/mutex.h ++++ b/src/base/mutex.h +@@ -319,11 +319,6 @@ class WriterMutexLock { + void operator=(const WriterMutexLock&); + }; + +-// Catch bug where variable name is omitted, e.g. MutexLock (&mu); +-#define MutexLock(x) COMPILE_ASSERT(0, mutex_lock_decl_missing_var_name) +-#define ReaderMutexLock(x) COMPILE_ASSERT(0, rmutex_lock_decl_missing_var_name) +-#define WriterMutexLock(x) COMPILE_ASSERT(0, wmutex_lock_decl_missing_var_name) +- + } // namespace MUTEX_NAMESPACE + + using namespace MUTEX_NAMESPACE; +diff --git a/src/config.h.cmake.in b/src/config.h.cmake.in +index b225b7ec..a4c58c96 100644 +--- a/src/config.h.cmake.in ++++ b/src/config.h.cmake.in +@@ -34,6 +34,8 @@ + /* define if you have google gflags library */ + #cmakedefine HAVE_LIB_GFLAGS + ++#cmakedefine HAVE_ABSL_FLAGS ++ + /* define if you have google gmock library */ + #cmakedefine HAVE_LIB_GMOCK + +diff --git a/src/glog/logging.h.in b/src/glog/logging.h.in +index 95a573b1..54cd838f 100644 +--- a/src/glog/logging.h.in ++++ b/src/glog/logging.h.in +@@ -89,6 +89,10 @@ + #include + #endif + ++#if @ac_cv_have_abslflags@ ++#include ++#endif ++ + #if @ac_cv_cxx11_atomic@ && __cplusplus >= 201103L + #include + #elif defined(GLOG_OS_WINDOWS) +@@ -395,6 +399,14 @@ typedef void(*CustomPrefixCallback)(std::ostream& s, const LogMessageInfo& l, vo + #undef DECLARE_uint32 + #endif + ++#if @ac_cv_have_abslflags@ ++#define DECLARE_VARIABLE 1 ++#define DECLARE_bool(name) ABSL_DECLARE_FLAG(bool, name) ++#define DECLARE_int32(name) ABSL_DECLARE_FLAG(@ac_google_namespace@::int32, name) ++#define DECLARE_uint32(name) ABSL_DECLARE_FLAG(@ac_google_namespace@::uint32, name) ++#define DECLARE_string(name) ABSL_DECLARE_FLAG(std::string, name) ++#endif ++ + #ifndef DECLARE_VARIABLE + #define DECLARE_VARIABLE(type, shorttype, name, tn) \ + namespace fL##shorttype { \ +diff --git a/src/glog/vlog_is_on.h.in b/src/glog/vlog_is_on.h.in +index 7526fc34..16e60f46 100644 +--- a/src/glog/vlog_is_on.h.in ++++ b/src/glog/vlog_is_on.h.in +@@ -64,6 +64,14 @@ + #include + + #if defined(__GNUC__) ++ ++#if @ac_cv_have_abslflags@ ++ extern int32_t absl_proxy_v; ++ #define VLEVEL (@ac_google_namespace@::absl_proxy_v) ++#else ++ #define VLEVEL (FLAGS_v) ++#endif ++ + // We emit an anonymous static int* variable at every VLOG_IS_ON(n) site. + // (Normally) the first time every VLOG_IS_ON(n) site is hit, + // we determine what variable will dynamically control logging at this site: +@@ -74,7 +82,7 @@ + __extension__ \ + ({ static @ac_google_namespace@::SiteFlag vlocal__ = {NULL, NULL, 0, NULL}; \ + @ac_google_namespace@::int32 verbose_level__ = (verboselevel); \ +- (vlocal__.level == NULL ? @ac_google_namespace@::InitVLOG3__(&vlocal__, &FLAGS_v, \ ++ (vlocal__.level == NULL ? @ac_google_namespace@::InitVLOG3__(&vlocal__, &VLEVEL, \ + __FILE__, verbose_level__) : *vlocal__.level >= verbose_level__); \ + }) + #else +diff --git a/src/logging.cc b/src/logging.cc +index 4028ccc0..fc618d3a 100644 +--- a/src/logging.cc ++++ b/src/logging.cc +@@ -103,7 +103,9 @@ using std::fdopen; + #endif + + // There is no thread annotation support. ++#ifndef EXCLUSIVE_LOCKS_REQUIRED + #define EXCLUSIVE_LOCKS_REQUIRED(mu) ++#endif + + static bool BoolFromEnv(const char *varname, bool defval) { + const char* const valstr = getenv(varname); +@@ -351,8 +353,9 @@ static const char* GetAnsiColorCode(GLogColor color) { + + // Safely get max_log_size, overriding to 1 if it somehow gets defined as 0 + static uint32 MaxLogSize() { +- return (FLAGS_max_log_size > 0 && FLAGS_max_log_size < 4096 +- ? FLAGS_max_log_size ++ uint32 maxlogsize = FLAG(max_log_size); ++ return (maxlogsize > 0 && maxlogsize < 4096 ++ ? maxlogsize + : 1); + } + +@@ -721,7 +724,7 @@ inline void LogDestination::SetStderrLogging(LogSeverity min_severity) { + // Prevent any subtle race conditions by wrapping a mutex lock around + // all this stuff. + MutexLock l(&log_mutex); +- FLAGS_stderrthreshold = min_severity; ++ absl::SetFlag(&FLAGS_stderrthreshold, min_severity); + } + + inline void LogDestination::LogToStderr() { +@@ -747,8 +750,8 @@ static void ColoredWriteToStderrOrStdout(FILE* output, LogSeverity severity, + const char* message, size_t len) { + bool is_stdout = (output == stdout); + const GLogColor color = (LogDestination::terminal_supports_color() && +- ((!is_stdout && FLAGS_colorlogtostderr) || +- (is_stdout && FLAGS_colorlogtostdout))) ++ ((!is_stdout && FLAG(colorlogtostderr)) || ++ (is_stdout && FLAG(colorlogtostdout)))) + ? SeverityToColor(severity) + : COLOR_DEFAULT; + +@@ -789,7 +792,7 @@ static void ColoredWriteToStdout(LogSeverity severity, const char* message, + FILE* output = stdout; + // We also need to send logs to the stderr when the severity is + // higher or equal to the stderr threshold. +- if (severity >= FLAGS_stderrthreshold) { ++ if (severity >= FLAG(stderrthreshold)) { + output = stderr; + } + ColoredWriteToStderrOrStdout(output, severity, message, len); +@@ -808,7 +811,7 @@ static void WriteToStderr(const char* message, size_t len) { + + inline void LogDestination::MaybeLogToStderr(LogSeverity severity, + const char* message, size_t message_len, size_t prefix_len) { +- if ((severity >= FLAGS_stderrthreshold) || FLAGS_alsologtostderr) { ++ if ((severity >= FLAG(stderrthreshold)) || FLAG(alsologtostderr)) { + ColoredWriteToStderr(severity, message, message_len); + #ifdef GLOG_OS_WINDOWS + (void) prefix_len; +@@ -835,8 +838,8 @@ inline void LogDestination::MaybeLogToStderr(LogSeverity severity, + inline void LogDestination::MaybeLogToEmail(LogSeverity severity, + const char* message, size_t len) { + if (severity >= email_logging_severity_ || +- severity >= FLAGS_logemaillevel) { +- string to(FLAGS_alsologtoemail); ++ severity >= FLAG(logemaillevel)) { ++ string to(FLAG(alsologtoemail)); + if (!addresses_.empty()) { + if (!to.empty()) { + to += ","; +@@ -862,7 +865,7 @@ inline void LogDestination::MaybeLogToLogfile(LogSeverity severity, + time_t timestamp, + const char* message, + size_t len) { +- const bool should_flush = severity > FLAGS_logbuflevel; ++ const bool should_flush = severity > FLAG(logbuflevel); + LogDestination* destination = log_destination(severity); + destination->logger_->Write(should_flush, timestamp, message, len); + } +@@ -871,9 +874,9 @@ inline void LogDestination::LogToAllLogfiles(LogSeverity severity, + time_t timestamp, + const char* message, + size_t len) { +- if (FLAGS_logtostdout) { // global flag: never log to file ++ if (FLAG(logtostdout)) { // global flag: never log to file + ColoredWriteToStdout(severity, message, len); +- } else if (FLAGS_logtostderr) { // global flag: never log to file ++ } else if (FLAG(logtostderr)) { // global flag: never log to file + ColoredWriteToStderr(severity, message, len); + } else { + for (int i = severity; i >= 0; --i) { +@@ -1032,25 +1035,25 @@ void LogFileObject::FlushUnlocked(){ + bytes_since_flush_ = 0; + } + // Figure out when we are due for another flush. +- const int64 next = (FLAGS_logbufsecs ++ const int64 next = (FLAG(logbufsecs) + * static_cast(1000000)); // in usec + next_flush_time_ = CycleClock_Now() + UsecToCycles(next); + } + + bool LogFileObject::CreateLogfile(const string& time_pid_string) { + string string_filename = base_filename_; +- if (FLAGS_timestamp_in_logfile_name) { ++ if (FLAG(timestamp_in_logfile_name)) { + string_filename += time_pid_string; + } + string_filename += filename_extension_; + const char* filename = string_filename.c_str(); + //only write to files, create if non-existant. + int flags = O_WRONLY | O_CREAT; +- if (FLAGS_timestamp_in_logfile_name) { ++ if (FLAG(timestamp_in_logfile_name)) { + //demand that the file is unique for our timestamp (fail if it exists). + flags = flags | O_EXCL; + } +- int fd = open(filename, flags, FLAGS_logfile_mode); ++ int fd = open(filename, flags, FLAG(logfile_mode)); + if (fd == -1) return false; + #ifdef HAVE_FCNTL + // Mark the file close-on-exec. We don't really care if this fails +@@ -1083,7 +1086,7 @@ bool LogFileObject::CreateLogfile(const string& time_pid_string) { + file_ = fdopen(fd, "a"); // Make a FILE*. + if (file_ == NULL) { // Man, we're screwed! + close(fd); +- if (FLAGS_timestamp_in_logfile_name) { ++ if (FLAG(timestamp_in_logfile_name)) { + unlink(filename); // Erase the half-baked evidence: an unusable log file, only if we just created it. + } + return false; +@@ -1125,8 +1128,8 @@ bool LogFileObject::CreateLogfile(const string& time_pid_string) { + + // Make an additional link to the log file in a place specified by + // FLAGS_log_link, if indicated +- if (!FLAGS_log_link.empty()) { +- linkpath = FLAGS_log_link + "/" + linkname; ++ if (!FLAG(log_link).empty()) { ++ linkpath = FLAG(log_link) + "/" + linkname; + unlink(linkpath.c_str()); // delete old one if it exists + if (symlink(filename, linkpath.c_str()) != 0) { + // silently ignore failures +@@ -1165,7 +1168,7 @@ void LogFileObject::Write(bool force_flush, + rollover_attempt_ = 0; + + struct ::tm tm_time; +- if (FLAGS_log_utc_time) { ++ if (FLAG(log_utc_time)) { + gmtime_r(×tamp, &tm_time); + } else { + localtime_r(×tamp, &tm_time); +@@ -1253,14 +1256,14 @@ void LogFileObject::Write(bool force_flush, + << ' ' + << setw(2) << tm_time.tm_hour << ':' + << setw(2) << tm_time.tm_min << ':' +- << setw(2) << tm_time.tm_sec << (FLAGS_log_utc_time ? " UTC\n" : "\n") ++ << setw(2) << tm_time.tm_sec << (FLAG(log_utc_time) ? " UTC\n" : "\n") + << "Running on machine: " + << LogDestination::hostname() << '\n'; + + if(!g_application_fingerprint.empty()) { + file_header_stream << "Application fingerprint: " << g_application_fingerprint << '\n'; + } +- const char* const date_time_format = FLAGS_log_year_in_prefix ++ const char* const date_time_format = FLAG(log_year_in_prefix) + ? "yyyymmdd hh:mm:ss.uuuuuu" + : "mmdd hh:mm:ss.uuuuuu"; + file_header_stream << "Running duration (h:mm:ss): " +@@ -1284,7 +1287,7 @@ void LogFileObject::Write(bool force_flush, + // greater than 4096, thereby indicating an error. + errno = 0; + fwrite(message, 1, message_len, file_); +- if ( FLAGS_stop_logging_if_full_disk && ++ if ( FLAG(stop_logging_if_full_disk) && + errno == ENOSPC ) { // disk full, stop writing to disk + stop_writing = true; // until the disk is + return; +@@ -1307,7 +1310,7 @@ void LogFileObject::Write(bool force_flush, + FlushUnlocked(); + #ifdef GLOG_OS_LINUX + // Only consider files >= 3MiB +- if (FLAGS_drop_log_memory && file_length_ >= (3U << 20U)) { ++ if (FLAG(drop_log_memory) && file_length_ >= (3U << 20U)) { + // Don't evict the most recent 1-2MiB so as not to impact a tailer + // of the log file and to avoid page rounding issue on linux < 4.7 + uint32 total_drop_length = +@@ -1348,7 +1351,7 @@ void LogCleaner::Disable() { + } + + void LogCleaner::UpdateCleanUpTime() { +- const int64 next = (FLAGS_logcleansecs ++ const int64 next = (FLAG(logcleansecs) + * 1000000); // in usec + next_cleanup_time_ = CycleClock_Now() + UsecToCycles(next); + } +@@ -1664,7 +1667,7 @@ void LogMessage::Init(const char* file, + // I20201018 160715 f5d4fbb0 logging.cc:1153] + // (log level, GMT year, month, date, time, thread_id, file basename, line) + // We exclude the thread_id for the default thread. +- if (FLAGS_log_prefix && (line != kNoLogPrefix)) { ++ if (FLAG(log_prefix) && (line != kNoLogPrefix)) { + std::ios saved_fmt(NULL); + saved_fmt.copyfmt(stream()); + stream().fill('0'); +@@ -1672,7 +1675,7 @@ void LogMessage::Init(const char* file, + if (custom_prefix_callback == NULL) { + #endif + stream() << LogSeverityNames[severity][0]; +- if (FLAGS_log_year_in_prefix) { ++ if (FLAG(log_year_in_prefix)) { + stream() << setw(4) << 1900 + logmsgtime_.year(); + } + stream() << setw(2) << 1 + logmsgtime_.month() +@@ -1703,11 +1706,11 @@ void LogMessage::Init(const char* file, + } + data_->num_prefix_chars_ = data_->stream_.pcount(); + +- if (!FLAGS_log_backtrace_at.empty()) { ++ if (!FLAG(log_backtrace_at).empty()) { + char fileline[128]; + snprintf(fileline, sizeof(fileline), "%s:%d", data_->basename_, line); + #ifdef HAVE_STACKTRACE +- if (FLAGS_log_backtrace_at == fileline) { ++ if (FLAG(log_backtrace_at) == fileline) { + string stacktrace; + DumpStackTraceToString(&stacktrace); + stream() << " (stacktrace:\n" << stacktrace << ") "; +@@ -1746,7 +1749,7 @@ ostream& LogMessage::stream() { + // Flush buffered message, called by the destructor, or any other function + // that needs to synchronize the log. + void LogMessage::Flush() { +- if (data_->has_been_flushed_ || data_->severity_ < FLAGS_minloglevel) { ++ if (data_->has_been_flushed_ || data_->severity_ < FLAG(minloglevel)) { + return; + } + +@@ -1808,7 +1811,7 @@ static char fatal_message[256]; + void ReprintFatalMessage() { + if (fatal_message[0]) { + const size_t n = strlen(fatal_message); +- if (!FLAGS_logtostderr) { ++ if (!FLAG(logtostderr)) { + // Also write to stderr (don't color to avoid terminal checks) + WriteToStderr(fatal_message, n); + } +@@ -1837,8 +1840,8 @@ void LogMessage::SendToLog() EXCLUSIVE_LOCKS_REQUIRED(log_mutex) { + // global flag: never log to file if set. Also -- don't log to a + // file if we haven't parsed the command line flags to get the + // program name. +- if (FLAGS_logtostderr || FLAGS_logtostdout || !IsGoogleLoggingInitialized()) { +- if (FLAGS_logtostdout) { ++ if (FLAG(logtostderr) || FLAG(logtostdout) || !IsGoogleLoggingInitialized()) { ++ if (FLAG(logtostdout)) { + ColoredWriteToStdout(data_->severity_, data_->message_text_, + data_->num_chars_to_log_); + } else { +@@ -1891,7 +1894,7 @@ void LogMessage::SendToLog() EXCLUSIVE_LOCKS_REQUIRED(log_mutex) { + fatal_time = logmsgtime_.timestamp(); + } + +- if (!FLAGS_logtostderr && !FLAGS_logtostdout) { ++ if (!FLAG(logtostderr) && !FLAG(logtostdout)) { + for (int i = 0; i < NUM_SEVERITIES; ++i) { + if (LogDestination::log_destinations_[i]) { + LogDestination::log_destinations_[i]->logger_->Write(true, 0, "", 0); +@@ -2238,7 +2241,7 @@ static bool SendEmailInternal(const char*dest, const char *subject, + subject, body, dest); + } + +- string logmailer = FLAGS_logmailer; ++ string logmailer = FLAG(logmailer); + if (logmailer.empty()) { + logmailer = "/bin/mail"; + } +@@ -2338,9 +2341,9 @@ const vector& GetLoggingDirectories() { + if (logging_directories_list == NULL) { + logging_directories_list = new vector; + +- if ( !FLAGS_log_dir.empty() ) { ++ if ( !FLAG(log_dir).empty() ) { + // A dir was specified, we should use it +- logging_directories_list->push_back(FLAGS_log_dir); ++ logging_directories_list->push_back(FLAG(log_dir)); + } else { + GetTempDirectories(logging_directories_list); + #ifdef GLOG_OS_WINDOWS +@@ -2654,7 +2657,7 @@ LogMessageTime::LogMessageTime(std::tm t) { + + LogMessageTime::LogMessageTime(std::time_t timestamp, WallTime now) { + std::tm t; +- if (FLAGS_log_utc_time) ++ if (FLAG(log_utc_time)) + gmtime_r(×tamp, &t); + else + localtime_r(×tamp, &t); +@@ -2673,7 +2676,7 @@ void LogMessageTime::init(const std::tm& t, std::time_t timestamp, + void LogMessageTime::CalcGmtOffset() { + std::tm gmt_struct; + int isDst = 0; +- if ( FLAGS_log_utc_time ) { ++ if ( FLAG(log_utc_time )) { + localtime_r(×tamp_, &gmt_struct); + isDst = gmt_struct.tm_isdst; + gmt_struct = time_struct_; +diff --git a/src/raw_logging.cc b/src/raw_logging.cc +index 43159832..8532362b 100644 +--- a/src/raw_logging.cc ++++ b/src/raw_logging.cc +@@ -123,8 +123,8 @@ static char crash_buf[kLogBufSize + 1] = { 0 }; // Will end in '\0' + GLOG_ATTRIBUTE_FORMAT(printf, 4, 5) + void RawLog__(LogSeverity severity, const char* file, int line, + const char* format, ...) { +- if (!(FLAGS_logtostdout || FLAGS_logtostderr || +- severity >= FLAGS_stderrthreshold || FLAGS_alsologtostderr || ++ if (!(FLAG(logtostdout) || FLAG(logtostderr) || ++ severity >= FLAG(stderrthreshold) || FLAG(alsologtostderr) || + !IsGoogleLoggingInitialized())) { + return; // this stderr log message is suppressed + } +diff --git a/src/utilities.cc b/src/utilities.cc +index a332f1a1..a9d5102a 100644 +--- a/src/utilities.cc ++++ b/src/utilities.cc +@@ -141,7 +141,7 @@ static void DumpStackTrace(int skip_count, DebugWriter *writerfn, void *arg) { + int depth = GetStackTrace(stack, ARRAYSIZE(stack), skip_count+1); + for (int i = 0; i < depth; i++) { + #if defined(HAVE_SYMBOLIZE) +- if (FLAGS_symbolize_stacktrace) { ++ if (FLAG(symbolize_stacktrace)) { + DumpPCAndSymbol(writerfn, arg, stack[i], " "); + } else { + DumpPC(writerfn, arg, stack[i], " "); +diff --git a/src/vlog_is_on.cc b/src/vlog_is_on.cc +index e478a366..4b7a5cae 100644 +--- a/src/vlog_is_on.cc ++++ b/src/vlog_is_on.cc +@@ -43,14 +43,24 @@ + #include + #include + #include "base/googleinit.h" ++#include "config.h" + + // glog doesn't have annotation + #define ANNOTATE_BENIGN_RACE(address, description) + + using std::string; + ++#ifdef HAVE_ABSL_FLAGS ++ ++ABSL_FLAG(int32_t, v, 0, "Show all VLOG(m) messages for m <= this." ++" Overridable by --vmodule.").OnUpdate([] { ++ GOOGLE_NAMESPACE::absl_proxy_v = absl::GetFlag(FLAGS_v); ++ }); ++ ++#else + GLOG_DEFINE_int32(v, 0, "Show all VLOG(m) messages for m <= this." + " Overridable by --vmodule."); ++#endif + + GLOG_DEFINE_string(vmodule, "", "per-module verbose level." + " Argument is a comma-separated list of =." +@@ -60,6 +70,8 @@ GLOG_DEFINE_string(vmodule, "", "per-module verbose level." + + _START_GOOGLE_NAMESPACE_ + ++int32_t absl_proxy_v = 0; ++ + namespace glog_internal_namespace_ { + + // Used by logging_unittests.cc so can't make it static here. +@@ -132,7 +144,8 @@ static void VLOG2Initializer() { + // Can now parse --vmodule flag and initialize mapping of module-specific + // logging levels. + inited_vmodule = false; +- const char* vmodule = FLAGS_vmodule.c_str(); ++ string vmodule_str = FLAG(vmodule); ++ const char* vmodule = vmodule_str.c_str(); + const char* sep; + VModuleInfo* head = NULL; + VModuleInfo* tail = NULL; +@@ -164,7 +177,7 @@ static void VLOG2Initializer() { + + // This can be called very early, so we use SpinLock and RAW_VLOG here. + int SetVLOGLevel(const char* module_pattern, int log_level) { +- int result = FLAGS_v; ++ int result = FLAG(v); + size_t const pattern_len = strlen(module_pattern); + bool found = false; + { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a2c3b14d2811..dea8eef8ab5f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25879,6 +25879,8 @@ with pkgs; dr14_tmeter = callPackage ../applications/audio/dr14_tmeter { }; + dragonflydb = callPackage ../servers/nosql/dragonflydb { }; + dragonfly-reverb = callPackage ../applications/audio/dragonfly-reverb { }; drawing = callPackage ../applications/graphics/drawing { }; From 535900e91dab642100660cdecc966dd164b134e3 Mon Sep 17 00:00:00 2001 From: Brian McKenna Date: Mon, 6 Jun 2022 12:27:45 +1000 Subject: [PATCH 037/245] jpegexiforient: fix cross-compilation --- pkgs/tools/graphics/jpegexiforient/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/graphics/jpegexiforient/default.nix b/pkgs/tools/graphics/jpegexiforient/default.nix index 9397f46fd2c5..09d096e7b687 100644 --- a/pkgs/tools/graphics/jpegexiforient/default.nix +++ b/pkgs/tools/graphics/jpegexiforient/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { cp $src jpegexiforient.c ''; buildPhase = '' - cc -o jpegexiforient jpegexiforient.c + $CC -o jpegexiforient jpegexiforient.c ''; installPhase = '' install -Dt $out/bin jpegexiforient From e6299e53681576838fb13380e088afbee3ff7a3d Mon Sep 17 00:00:00 2001 From: Andrew Childs Date: Mon, 6 Jun 2022 13:13:32 +0900 Subject: [PATCH 038/245] ruby: move jemalloc to propagatedBuildInputs Alternative malloc implementations in ruby are not fully encapsulated. Their header files are required when building gems with native extensions, like bcrypt. --- pkgs/development/interpreters/ruby/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index d30a2d2073ea..07349cf4f91d 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -79,13 +79,13 @@ let ++ (op opensslSupport openssl) ++ (op gdbmSupport gdbm) ++ (op yamlSupport libyaml) - ++ (op jemallocSupport jemalloc) # Looks like ruby fails to build on darwin without readline even if curses # support is not enabled, so add readline to the build inputs if curses # support is disabled (if it's enabled, we already have it) and we're # running on darwin ++ op (!cursesSupport && stdenv.isDarwin) readline ++ ops stdenv.isDarwin [ libiconv libobjc libunwind Foundation ]; + propagatedBuildInputs = op jemallocSupport jemalloc; enableParallelBuilding = true; From 20749fc886cf6ade0726d0ab51a6c08428e51c73 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 6 Jun 2022 04:52:17 +0000 Subject: [PATCH 039/245] hidapi: 0.11.2 -> 0.12.0 --- pkgs/development/libraries/hidapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/hidapi/default.nix b/pkgs/development/libraries/hidapi/default.nix index ffe534ede4af..b29b64c2a757 100644 --- a/pkgs/development/libraries/hidapi/default.nix +++ b/pkgs/development/libraries/hidapi/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "hidapi"; - version = "0.11.2"; + version = "0.12.0"; src = fetchFromGitHub { owner = "libusb"; repo = "hidapi"; rev = "${pname}-${version}"; - sha256 = "sha256-zSAhnvnDI3+q8VwZ8fIx/YmvwTpL87PBJ2C1mTmD7Ko="; + sha256 = "sha256-SMhlcB7LcViC6UFVYACjunxsGkvSOKC3mbLBH4XQSzM="; }; nativeBuildInputs = [ cmake pkg-config ]; From 6f0681dd6bb3e3029b78bfc74a812326121bfad6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 6 Jun 2022 12:50:54 +0200 Subject: [PATCH 040/245] checkov: 2.0.1188 -> 2.0.1195 --- pkgs/development/tools/analysis/checkov/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 6638bec4002c..b5977e61acdc 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -32,14 +32,14 @@ with py.pkgs; buildPythonApplication rec { pname = "checkov"; - version = "2.0.1188"; + version = "2.0.1195"; format = "setuptools"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = version; - hash = "sha256-TK2In3FlcjrJjwfS0flgmgbd7nVv4g69v/ZZfWmbkr4="; + hash = "sha256-YzM/YzTeFqNe7ThNH138g13aSzEXK8rzTWit1g27GVw="; }; nativeBuildInputs = with py.pkgs; [ From 113f20488ce644858959c77d58e11d8579e715be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20He=C3=9Felmann?= Date: Mon, 6 Jun 2022 14:40:12 +0200 Subject: [PATCH 041/245] roxctl: 3.69.1 -> 3.70.0 --- pkgs/applications/networking/cluster/roxctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/roxctl/default.nix b/pkgs/applications/networking/cluster/roxctl/default.nix index 4d62dad4af6e..9014ce520257 100644 --- a/pkgs/applications/networking/cluster/roxctl/default.nix +++ b/pkgs/applications/networking/cluster/roxctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "roxctl"; - version = "3.69.1"; + version = "3.70.0"; src = fetchFromGitHub { owner = "stackrox"; repo = "stackrox"; rev = version; - sha256 = "sha256-fB43C+gMtUOg/Ah1fOTnOWOUmS0TjXkNCzw/TKfMzj4="; + sha256 = "sha256-VnnMD2tRixCswO/9nrP3PgXmev6O8QUTbkwmFIpPUyE="; }; - vendorSha256 = "sha256-M+ZueycJEaDVzC2bFwQc5EulCrdz6lvzyD8YCoGyW1g="; + vendorSha256 = "sha256-xh2bgLSWjQHOjHrgDpQri78LvCL4CDbMteQYARyGLgg="; nativeBuildInputs = [ installShellFiles ]; From 6b7b3858d6e2dd27eab7f0e63a22410a9fbf9218 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 6 Jun 2022 14:52:44 +0200 Subject: [PATCH 042/245] python310Packages.pyroute2-core: 0.6.9 -> 0.6.10 --- pkgs/development/python-modules/pyroute2-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyroute2-core/default.nix b/pkgs/development/python-modules/pyroute2-core/default.nix index 7a13dc79aa99..3676ce9a469c 100644 --- a/pkgs/development/python-modules/pyroute2-core/default.nix +++ b/pkgs/development/python-modules/pyroute2-core/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pyroute2-core"; - version = "0.6.9"; + version = "0.6.10"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pyroute2.core"; inherit version; - hash = "sha256-lH0Mi2nR4jqawvpvVfn79U0AflxE8lU1VLKvqAEXDOo="; + hash = "sha256-hwI7sSaR0938VeCShzZ39b2CAU5SJLqui8Ri3CGXPwk="; }; # pyroute2 sub-modules have no tests From b9bbe8bfd872bdd0459b7c73f5c5277652eb262f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 6 Jun 2022 14:52:49 +0200 Subject: [PATCH 043/245] python310Packages.pyroute2-ethtool: 0.6.9 -> 0.6.10 --- pkgs/development/python-modules/pyroute2-ethtool/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyroute2-ethtool/default.nix b/pkgs/development/python-modules/pyroute2-ethtool/default.nix index dae025618b7a..515bdfb2d6d8 100644 --- a/pkgs/development/python-modules/pyroute2-ethtool/default.nix +++ b/pkgs/development/python-modules/pyroute2-ethtool/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pyroute2-ethtool"; - version = "0.6.9"; + version = "0.6.10"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pyroute2.ethtool"; inherit version; - hash = "sha256-6o75plLeSle6ZFgoIZGKLCjx1hg4Z2okOq2RqAT2g8E="; + hash = "sha256-5i1zbKs40RXCQB1cn3jrDOX+Fgl0nknTFLsvI69udxw="; }; propagatedBuildInputs = [ From dfbb3544b616dad5f8d0750939d8beb8da5a279c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 6 Jun 2022 14:52:55 +0200 Subject: [PATCH 044/245] python310Packages.pyroute2-ipdb: 0.6.9 -> 0.6.10 --- pkgs/development/python-modules/pyroute2-ipdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyroute2-ipdb/default.nix b/pkgs/development/python-modules/pyroute2-ipdb/default.nix index 22991fe20268..5a3b4d186556 100644 --- a/pkgs/development/python-modules/pyroute2-ipdb/default.nix +++ b/pkgs/development/python-modules/pyroute2-ipdb/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pyroute2-ipdb"; - version = "0.6.9"; + version = "0.6.10"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pyroute2.ipdb"; inherit version; - hash = "sha256-sJ9Zzlrh9FWVWL7StyHpPPuXo6TtNLz2/lQBCl53Wrk="; + hash = "sha256-emPIh94LqN/QCCLC6Mr+IiVyXtjdsmhduBdPko1V83A="; }; propagatedBuildInputs = [ From f6742c5cf71fd22e22caff0646d1c470674cc6b8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 6 Jun 2022 14:53:00 +0200 Subject: [PATCH 045/245] python310Packages.pyroute2-ndb: 0.6.9 -> 0.6.10 --- pkgs/development/python-modules/pyroute2-ndb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyroute2-ndb/default.nix b/pkgs/development/python-modules/pyroute2-ndb/default.nix index 47c309cbc321..b0e123bc4c4b 100644 --- a/pkgs/development/python-modules/pyroute2-ndb/default.nix +++ b/pkgs/development/python-modules/pyroute2-ndb/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pyroute2-ndb"; - version = "0.6.9"; + version = "0.6.10"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pyroute2.ndb"; inherit version; - hash = "sha256-ASk6ycw3dQNMV4xmaxPAHDL1KtrY1JGQ5yJYcJ+OgUE="; + hash = "sha256-kjgeA7PV6JLvCvaZxe4y984wTo8ExU7Yf1Wr+7jNwu4="; }; propagatedBuildInputs = [ From b38ab26b582da5a48bdd2f948ee58576f2a730d0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 6 Jun 2022 14:53:06 +0200 Subject: [PATCH 046/245] python310Packages.pyroute2-nftables: 0.6.9 -> 0.6.10 --- pkgs/development/python-modules/pyroute2-nftables/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyroute2-nftables/default.nix b/pkgs/development/python-modules/pyroute2-nftables/default.nix index 3c76692016d9..04f9b29bd56f 100644 --- a/pkgs/development/python-modules/pyroute2-nftables/default.nix +++ b/pkgs/development/python-modules/pyroute2-nftables/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "pyroute2-nftables"; - version = "0.6.9"; + version = "0.6.10"; src = fetchPypi { pname = "pyroute2.nftables"; inherit version; - sha256 = "sha256-8BLz8IIobmrGb64PhXz1XWfl3KJTOhOL+j1C4/jlXuI="; + sha256 = "sha256-dUuCTGs7RaEehsAgK7yNw11tE3VGtT5LxDilMVWpCNU="; }; propagatedBuildInputs = [ From c2a307802e8f957fa92079311c3cef6a055e27cc Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 6 Jun 2022 14:53:11 +0200 Subject: [PATCH 047/245] python310Packages.pyroute2-nslink: 0.6.9 -> 0.6.10 --- pkgs/development/python-modules/pyroute2-nslink/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyroute2-nslink/default.nix b/pkgs/development/python-modules/pyroute2-nslink/default.nix index 387a9b403df5..368e9cc9fb55 100644 --- a/pkgs/development/python-modules/pyroute2-nslink/default.nix +++ b/pkgs/development/python-modules/pyroute2-nslink/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pyroute2-nslink"; - version = "0.6.9"; + version = "0.6.10"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pyroute2.nslink"; inherit version; - hash = "sha256-WZjRexKn1FWXj+5KZxqZXB0aZmnd0ECKWt3hvVDdz4w="; + hash = "sha256-PynJRg2pXZIeB4Ucz/tvghdEt1iWAr8azjET9hsnUPE="; }; propagatedBuildInputs = [ From b6bae6fcb2d7a18586d1685aae848f758532ae16 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 6 Jun 2022 14:53:17 +0200 Subject: [PATCH 048/245] python310Packages.pyroute2-protocols: 0.6.9 -> 0.6.10 --- .../development/python-modules/pyroute2-protocols/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyroute2-protocols/default.nix b/pkgs/development/python-modules/pyroute2-protocols/default.nix index 99c146d41e4d..401786f7cd60 100644 --- a/pkgs/development/python-modules/pyroute2-protocols/default.nix +++ b/pkgs/development/python-modules/pyroute2-protocols/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pyroute2-protocols"; - version = "0.6.9"; + version = "0.6.10"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pyroute2.protocols"; inherit version; - hash = "sha256-7vP4rbid2cVGKlYUM5qsmYXQhUfvIWoaDXYnxSUnSJY="; + hash = "sha256-xMTKAJC++X1zO7rm+cUr0IuEDxkllyje00Omv9tLZ6E="; }; propagatedBuildInputs = [ From ea3223f6f840a1139c609d37944dce1261096452 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 6 Jun 2022 14:53:23 +0200 Subject: [PATCH 049/245] python310Packages.pyroute2: 0.6.9 -> 0.6.10 --- pkgs/development/python-modules/pyroute2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyroute2/default.nix b/pkgs/development/python-modules/pyroute2/default.nix index 9b15711ef0f2..54540197f72b 100644 --- a/pkgs/development/python-modules/pyroute2/default.nix +++ b/pkgs/development/python-modules/pyroute2/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "pyroute2"; - version = "0.6.9"; + version = "0.6.10"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-PRxNGnH7VpyrV49V9xNO8C1I6LMYK05+ZrKndWKO2vs="; + hash = "sha256-Vj7W3/yQPYIUFEdvNv3AS9OqddqtISRbcmWUJxc5JiI="; }; propagatedBuildInputs = [ From 27723a19429b2525939543091bbb85fd0e592331 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 6 Jun 2022 14:53:29 +0200 Subject: [PATCH 050/245] python310Packages.pyroute2-ipset: 0.6.9 -> 0.6.10 --- pkgs/development/python-modules/pyroute2-ipset/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyroute2-ipset/default.nix b/pkgs/development/python-modules/pyroute2-ipset/default.nix index 7bf625c08864..783405f0eafc 100644 --- a/pkgs/development/python-modules/pyroute2-ipset/default.nix +++ b/pkgs/development/python-modules/pyroute2-ipset/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pyroute2-ipset"; - version = "0.6.9"; + version = "0.6.10"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pyroute2.ipset"; inherit version; - hash = "sha256-icEMJno03WKUdIYTZ6BIAo9lm43RwMjxNXcoSkYF81M="; + hash = "sha256-1Fk3imqMz9qx1zBcQ/Uyp2eVrTygGIklVF5/QBbuSoI="; }; propagatedBuildInputs = [ From cb104999e59b3c9b2eb31835cfcb209c39cb53cc Mon Sep 17 00:00:00 2001 From: Pavel Borzenkov Date: Wed, 1 Jun 2022 14:43:35 +0200 Subject: [PATCH 051/245] perlPackages.TestLWPUserAgent: 0.034 -> 0.036 Also do not mark it as broken on Darwin as it builds and works just fine. --- pkgs/top-level/perl-packages.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 707dd648496e..366d12c315c5 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -22066,10 +22066,10 @@ let TestLWPUserAgent = buildPerlPackage { pname = "Test-LWP-UserAgent"; - version = "0.034"; + version = "0.036"; src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETHER/Test-LWP-UserAgent-0.034.tar.gz"; - sha256 = "1ybhl9zpxkz77d25h96kbgh16zy9f27n95p6j9jg52kvdg0r2lbp"; + url = "mirror://cpan/authors/id/E/ET/ETHER/Test-LWP-UserAgent-0.036.tar.gz"; + sha256 = "sha256-BTJ1MNNGuAphpulD+9dJmGvcqJIRpOswHAjC0XkxThE="; }; propagatedBuildInputs = [ LWP SafeIsa namespaceclean ]; buildInputs = [ PathTiny Plack TestDeep TestFatal TestNeeds TestRequiresInternet TestWarnings ]; @@ -22077,7 +22077,6 @@ let description = "A LWP::UserAgent suitable for simulating and testing network calls"; license = with lib.licenses; [ artistic1 gpl1Plus ]; homepage = "https://github.com/karenetheridge/Test-LWP-UserAgent"; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/perl534Packages.TestLWPUserAgent.x86_64-darwin }; }; From 2c01c6b3a967caaac12307da234de700c316dbb1 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Sat, 4 Jun 2022 13:39:05 +0000 Subject: [PATCH 052/245] tgswitch: use buildGoModule --- .../networking/cluster/tgswitch/default.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/tgswitch/default.nix b/pkgs/applications/networking/cluster/tgswitch/default.nix index 5f669a6b9d8a..44c16bd4668d 100644 --- a/pkgs/applications/networking/cluster/tgswitch/default.nix +++ b/pkgs/applications/networking/cluster/tgswitch/default.nix @@ -1,5 +1,5 @@ -{ buildGoPackage, lib, fetchFromGitHub }: -buildGoPackage rec { +{ buildGoModule, lib, fetchFromGitHub }: +buildGoModule rec { pname = "tgswitch"; version = "0.5.389"; @@ -10,7 +10,14 @@ buildGoPackage rec { sha256 = "sha256-6hErfI7LEJFgOoJR8IF9jTSBwqbQYeGiwdeJShqxVQ0="; }; - goPackagePath = "github.com/warrensbox/tgswitch"; + vendorSha256 = null; + + ldflags = [ "-s" "-w" ]; + + # There are many modifications need to be done to make tests run. For example: + # 1. Network access + # 2. Operation on `/var/empty` not permitted on macOS + doCheck= false; meta = with lib; { description = "A command line tool to switch between different versions of terragrunt"; @@ -19,3 +26,4 @@ buildGoPackage rec { maintainers = with maintainers; [ psibi ]; }; } + From 0106c4b15908ef927c81c43e00c448eaed71a731 Mon Sep 17 00:00:00 2001 From: DarkOnion0 Date: Mon, 6 Jun 2022 17:57:11 +0200 Subject: [PATCH 053/245] appflowy: 0.0.3 -> 0.0.4 --- pkgs/applications/office/appflowy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/appflowy/default.nix b/pkgs/applications/office/appflowy/default.nix index abc8e33fd370..821447fdfa26 100644 --- a/pkgs/applications/office/appflowy/default.nix +++ b/pkgs/applications/office/appflowy/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "appflowy"; - version = "0.0.3"; + version = "0.0.4"; src = fetchzip { url = "https://github.com/AppFlowy-IO/appflowy/releases/download/${version}/AppFlowy-linux-x86.tar.gz"; - sha256 = "sha256-m9vfgytSKnWLf6hwKjIGcU/7OCmIBiF4hJ/yIRBdSpQ="; + sha256 = "sha256-ke3cuRi+ZlBSWawg66cGrV928dOBp0EniNakitmgUso="; }; nativeBuildInputs = [ From 5a0bdf69987fb65178952c6c01b1c6e329c9268c Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Mon, 6 Jun 2022 17:59:10 +0200 Subject: [PATCH 054/245] adguardhome: 0.107.6 - 0.107.7 --- pkgs/servers/adguardhome/bins.nix | 20 ++++++++++---------- pkgs/servers/adguardhome/default.nix | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/servers/adguardhome/bins.nix b/pkgs/servers/adguardhome/bins.nix index bbcc7cf54897..d2346d7ff5ed 100644 --- a/pkgs/servers/adguardhome/bins.nix +++ b/pkgs/servers/adguardhome/bins.nix @@ -1,23 +1,23 @@ { fetchurl, fetchzip }: { x86_64-darwin = fetchzip { - sha256 = "sha256-vUOdHDyvVg+8GhctW925WfjONi7TnPRfVfXmehOweB4="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.6/AdGuardHome_darwin_amd64.zip"; + sha256 = "sha256-z7QFnx414sdGazUZIenAVA+7LcSZT0tTb/ldv1SGV3Q="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.7/AdGuardHome_darwin_amd64.zip"; }; aarch64-darwin = fetchzip { - sha256 = "sha256-3JmMvxd317Qmyrv7vWyfQsLol+yPuKBXHByt5YRrbX8="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.6/AdGuardHome_darwin_arm64.zip"; + sha256 = "sha256-Pbl7YaDVxdER/ubOiPq54ASB4ILnH0B3GiQlQBe7gFs="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.7/AdGuardHome_darwin_arm64.zip"; }; i686-linux = fetchurl { - sha256 = "sha256-A6IsDRbRHyU0+IUKkrudKvlKiJkVNNs12MrKQ6RlpMQ="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.6/AdGuardHome_linux_386.tar.gz"; + sha256 = "sha256-P2PsSdpW5i2hwBPUKb+viYewlVHTER/eBkwPp3koawo="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.7/AdGuardHome_linux_386.tar.gz"; }; x86_64-linux = fetchurl { - sha256 = "sha256-nPcqAk0m1e9izkylBuNcatHESgvSewR+MKmVdz+HBec="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.6/AdGuardHome_linux_amd64.tar.gz"; + sha256 = "sha256-cbTlVBlGdFgEz2b6pb0SJ7yUf4wFXnZwLCkmvX75FzU="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.7/AdGuardHome_linux_amd64.tar.gz"; }; aarch64-linux = fetchurl { - sha256 = "sha256-ITkZdVU03FG9AUAMgD6nlCyioPJX357wB9m1jYdPlS4="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.6/AdGuardHome_linux_arm64.tar.gz"; + sha256 = "sha256-TKZ3bOM5oq30GtLn9ifNyY6+2Li4nf1+r2L0ExG/10c="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.7/AdGuardHome_linux_arm64.tar.gz"; }; } diff --git a/pkgs/servers/adguardhome/default.nix b/pkgs/servers/adguardhome/default.nix index be3943c9fad8..dbf9e14ebc67 100644 --- a/pkgs/servers/adguardhome/default.nix +++ b/pkgs/servers/adguardhome/default.nix @@ -7,7 +7,7 @@ in stdenv.mkDerivation rec { pname = "adguardhome"; - version = "0.107.6"; + version = "0.107.7"; src = sources.${system} or (throw "Source for ${pname} is not available for ${system}"); installPhase = '' From e2d15bd6fed9a7d2d29599ccf98115090cc53c85 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Mon, 6 Jun 2022 18:04:31 +0100 Subject: [PATCH 055/245] galculator: pull fix pending upstream inclusion for -fno-common toolchains Without the change build fails on upstream gcc-10 as: ld: galculator-config_file.o:src/config_file.c:42: multiple definition of `prefs'; galculator-main.o:src/main.c:52: first defined here --- pkgs/applications/misc/galculator/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/galculator/default.nix b/pkgs/applications/misc/galculator/default.nix index 287a2fca3637..a96cbb566106 100644 --- a/pkgs/applications/misc/galculator/default.nix +++ b/pkgs/applications/misc/galculator/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub, fetchpatch , autoreconfHook, intltool , gtk, pkg-config, flex }: @@ -13,6 +13,16 @@ stdenv.mkDerivation rec { sha256 = "0q0hb62f266709ncyq96bpx4a40a1i6dc5869byvd7x285sx1c2w"; }; + patches = [ + # Pul patch pending upstream inclusion for -fno-common toolchain support: + # https://github.com/galculator/galculator/pull/45 + (fetchpatch { + name = "fno-common.patch"; + url = "https://github.com/galculator/galculator/commit/501a9e3feeb2e56889c0ff98ab6d0ab20348ccd6.patch"; + sha256 = "08c9d2b49a1mizgk7v37dp8r96x389zc13mzv4dcy16x448lhp67"; + }) + ]; + nativeBuildInputs = [ autoreconfHook intltool pkg-config ]; buildInputs = [ gtk flex ]; From e98b73f332ede8df04aa224c607a17e40af7fa01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20St=C3=BChrk?= Date: Mon, 6 Jun 2022 19:37:00 +0200 Subject: [PATCH 056/245] vscode-extensions.vspacecode.vspacecode: 0.10.1 -> 0.10.9 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index ad934c705440..aae268df3f54 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -2364,8 +2364,8 @@ let mktplcRef = { name = "vspacecode"; publisher = "VSpaceCode"; - version = "0.10.1"; - sha256 = "sha256-H7SCC/ZhDswMQjLX+qpQa6A1N83MobJRPC4pyIbZ1kA="; + version = "0.10.9"; + sha256 = "sha256-16oC2BghY7mB/W0niTDtKGMAC9pt6m0utSOJ0lgbpAU="; }; meta = { license = lib.licenses.mit; From d8b2dd91e0bf7aba7328f268b20058e281be443e Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Mon, 6 Jun 2022 18:46:42 +0100 Subject: [PATCH 057/245] gargoyle: add -fcommon workaround Workaround build failure on -fno-common toolchains like upstream gcc-10. Otherwise build fails as: ld: build/linux.release/alan3/Location.o:(.bss+0x0): multiple definition of `logFile'; build/linux.release/alan3/act.o:(.bss+0x0): first defined here --- pkgs/games/gargoyle/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/games/gargoyle/default.nix b/pkgs/games/gargoyle/default.nix index 7058f680f4e2..f5d23091b482 100644 --- a/pkgs/games/gargoyle/default.nix +++ b/pkgs/games/gargoyle/default.nix @@ -35,6 +35,12 @@ stdenv.mkDerivation rec { buildInputs = [ SDL SDL_mixer SDL_sound gtk2 ] ++ lib.optionals stdenv.isDarwin [ smpeg libvorbis ]; + # Workaround build failure on -fno-common toolchains: + # ld: build/linux.release/alan3/Location.o:(.bss+0x0): multiple definition of + # `logFile'; build/linux.release/alan3/act.o:(.bss+0x0): first defined here + # TODO: drop once updated to 2022.1 or later. + NIX_CFLAGS_COMPILE = "-fcommon"; + buildPhase = jamenv + "jam -j$NIX_BUILD_CORES"; installPhase = From 430a0e277ac536f1a41fb26c5bfab9e9bd452894 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Mon, 6 Jun 2022 18:51:02 +0100 Subject: [PATCH 058/245] ifm: add -fcommon workaround Workaround build failure on -fno-common toolchains like upstream gcc-10. Otherwise build fails as: ld: libvars.a(vars-freeze-lex.o):src/libvars/vars-freeze-lex.l:23: multiple definition of `line_number'; ifm-main.o:src/ifm-main.c:46: first defined here --- pkgs/tools/graphics/ifm/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/tools/graphics/ifm/default.nix b/pkgs/tools/graphics/ifm/default.nix index 8478395a874f..7b9d49b1273f 100644 --- a/pkgs/tools/graphics/ifm/default.nix +++ b/pkgs/tools/graphics/ifm/default.nix @@ -13,6 +13,11 @@ stdenv.mkDerivation rec { buildInputs = [ perl tk ]; # perl and wish are not run but written as shebangs. + # Workaround build failure on -fno-common toolchains: + # ld: libvars.a(vars-freeze-lex.o):src/libvars/vars-freeze-lex.l:23: + # multiple definition of `line_number'; ifm-main.o:src/ifm-main.c:46: first defined here + NIX_CFLAGS_COMPILE = "-fcommon"; + enableParallelBuilding = false; # ifm-scan.l:16:10: fatal error: ifm-parse.h: No such file or directory meta = with lib; { From aa080353cf5a41e29ada832da99a957e869a80ac Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Mon, 6 Jun 2022 18:55:51 +0100 Subject: [PATCH 059/245] macopix: add -fcommon workaround Workaround build failure on -fno-common toolchains like upstream gcc-10. Otherwise build fails as: ld: dnd.o:src/main.h:136: multiple definition of `MENU_EXT'; main.o:src/main.h:136: first defined here --- pkgs/games/macopix/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/games/macopix/default.nix b/pkgs/games/macopix/default.nix index 8f226f3cef06..5541b3b9d0fa 100644 --- a/pkgs/games/macopix/default.nix +++ b/pkgs/games/macopix/default.nix @@ -19,6 +19,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + # Workaround build failure on -fno-common toolchains: + # ld: dnd.o:src/main.h:136: multiple definition of + # `MENU_EXT'; main.o:src/main.h:136: first defined here + NIX_CFLAGS_COMPILE = "-fcommon"; + NIX_LDFLAGS = "-lX11"; meta = { From c8f5b17a98b357e24fe0eb5a117820899b363750 Mon Sep 17 00:00:00 2001 From: Artturin Date: Mon, 6 Jun 2022 17:20:14 +0300 Subject: [PATCH 060/245] nixos/nix-daemon: set LimitNOFILE to 1048576 fixes 'too many open files' --- nixos/modules/services/misc/nix-daemon.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index a4d2d10af70f..f6f74d12e106 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -734,7 +734,7 @@ in CPUSchedulingPolicy = cfg.daemonCPUSchedPolicy; IOSchedulingClass = cfg.daemonIOSchedClass; IOSchedulingPriority = cfg.daemonIOSchedPriority; - LimitNOFILE = 4096; + LimitNOFILE = 1048576; }; restartTriggers = [ nixConf ]; From 60d0be36a11c3471ca8fee0ededa17944d187a29 Mon Sep 17 00:00:00 2001 From: DarkOnion0 Date: Mon, 6 Jun 2022 20:27:38 +0200 Subject: [PATCH 061/245] drawio: 19.0.0 -> 19.0.1 --- pkgs/applications/graphics/drawio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/drawio/default.nix b/pkgs/applications/graphics/drawio/default.nix index 5b27f545d71e..d3f854966406 100644 --- a/pkgs/applications/graphics/drawio/default.nix +++ b/pkgs/applications/graphics/drawio/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "drawio"; - version = "19.0.0"; + version = "19.0.1"; src = fetchurl { url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/drawio-x86_64-${version}.rpm"; - sha256 = "aabf2addc3182996c76a01df16024b77ae16a489e52cedf87bcfb14891f72118"; + sha256 = "da9fb38970987b7d5b84fd0d91824f206ba7a3681a7354adc6d6e795c7613828"; }; nativeBuildInputs = [ From eaecf427885347b61618a4e826a0ba100d8e21a5 Mon Sep 17 00:00:00 2001 From: Azat Bahawi Date: Mon, 6 Jun 2022 23:10:36 +0300 Subject: [PATCH 062/245] terraform-lsp: use buildGoModule --- pkgs/development/tools/misc/terraform-lsp/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/misc/terraform-lsp/default.nix b/pkgs/development/tools/misc/terraform-lsp/default.nix index d55367e70658..1f35f7696232 100644 --- a/pkgs/development/tools/misc/terraform-lsp/default.nix +++ b/pkgs/development/tools/misc/terraform-lsp/default.nix @@ -1,6 +1,9 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib +, buildGoModule +, fetchFromGitHub +}: -buildGoPackage rec { +buildGoModule rec { pname = "terraform-lsp"; version = "0.0.12"; @@ -11,7 +14,7 @@ buildGoPackage rec { sha256 = "111350jbq0dp0qhk48j12hrlisd1fwzqpcv357igrbqf6ki7r78q"; }; - goPackagePath = "github.com/juliosueiras/terraform-lsp"; + vendorSha256 = null; ldflags = [ "-s" "-w" "-X main.Version=${version}" "-X main.GitCommit=${src.rev}" ]; @@ -19,6 +22,6 @@ buildGoPackage rec { description = "Language Server Protocol for Terraform"; homepage = "https://github.com/juliosueiras/terraform-lsp"; license = licenses.mit; - maintainers = [ maintainers.marsam ]; + maintainers = with maintainers; [ marsam ]; }; } From ac719acb8a3d8fb6996d7ddf01399934834321bb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 6 Jun 2022 22:11:20 +0200 Subject: [PATCH 063/245] python310Packages.atenpdu: 0.3.2 -> 0.3.3 --- pkgs/development/python-modules/atenpdu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/atenpdu/default.nix b/pkgs/development/python-modules/atenpdu/default.nix index 4a8c0ff0f31a..4eed27b3cfd5 100644 --- a/pkgs/development/python-modules/atenpdu/default.nix +++ b/pkgs/development/python-modules/atenpdu/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "atenpdu"; - version = "0.3.2"; + version = "0.3.3"; src = fetchPypi { inherit pname version; - sha256 = "sha256-hlbrjx6WKVJYaxrMT4fiRXlxKRcQU4AIQUVgA8mbWa8="; + sha256 = "sha256-/duY1hS+RU/UAdcQoHF1+c99XaN74jj/0Hj/86U0kmo="; }; propagatedBuildInputs = [ pysnmp ]; From 602e1cf735128404f2e3312154c07fd6e464419d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 6 Jun 2022 22:29:37 +0200 Subject: [PATCH 064/245] python310Packages.yolink-api: 0.0.6 -> 0.0.7 --- pkgs/development/python-modules/yolink-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yolink-api/default.nix b/pkgs/development/python-modules/yolink-api/default.nix index 44f2572bda57..5dcfb9030550 100644 --- a/pkgs/development/python-modules/yolink-api/default.nix +++ b/pkgs/development/python-modules/yolink-api/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "yolink-api"; - version = "0.0.6"; + version = "0.0.7"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "YoSmart-Inc"; repo = pname; rev = "v${version}"; - hash = "sha256-e0WeQdxQYwaklXOlyUc22NvJraY/eG6HCLsI6/+A6vg="; + hash = "sha256-zdCHKckt28abeJ6PQjX50e/4wOl/xx0TKFEQaUIqrYo="; }; propagatedBuildInputs = [ From 5821939268111b756473c531af325a509df219a3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 6 Jun 2022 22:30:37 +0200 Subject: [PATCH 065/245] python310Packages.twitterapi: 2.7.12 -> 2.7.13 --- pkgs/development/python-modules/twitterapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/twitterapi/default.nix b/pkgs/development/python-modules/twitterapi/default.nix index 313249e50d9c..ce123e5afc41 100644 --- a/pkgs/development/python-modules/twitterapi/default.nix +++ b/pkgs/development/python-modules/twitterapi/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "twitterapi"; - version = "2.7.12"; + version = "2.7.13"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "geduldig"; repo = "TwitterAPI"; rev = "v${version}"; - hash = "sha256-WqeoIZt2OGDXKPAbjm3cHI1kgiCEJC6+ROXXx4TR4b4="; + hash = "sha256-48Gphpo3tPcVEGNOSEb8mQaSQARQDCOGFyhGJ+i4BWI="; }; propagatedBuildInputs = [ From a6f86e33fffb211210b19fabefd68f84c0d4ed7c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 6 Jun 2022 22:57:03 +0200 Subject: [PATCH 066/245] python310Packages.pyeight: 0.2.0 -> 0.3.0 --- pkgs/development/python-modules/pyeight/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyeight/default.nix b/pkgs/development/python-modules/pyeight/default.nix index f84612716975..66cd3ac70c8b 100644 --- a/pkgs/development/python-modules/pyeight/default.nix +++ b/pkgs/development/python-modules/pyeight/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pyeight"; - version = "0.2.0"; + version = "0.3.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "mezz64"; repo = "pyEight"; rev = version; - sha256 = "sha256-ERilZWroFaBCYjTfU7W0vegJaGibmJYVcgt0z84TPEI="; + sha256 = "sha256-H8f7990+ZKoOEzPgeYt4vMHCrcWwIa0X1gMh2qXBAoo="; }; propagatedBuildInputs = [ From 9029cf19cb2b4190af19590426cf15c720eda0c9 Mon Sep 17 00:00:00 2001 From: Patrick Jackson Date: Mon, 6 Jun 2022 14:20:49 -0700 Subject: [PATCH 067/245] maintainers: add patricksjackson --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 3c50a9c5b8d8..05955c00555a 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -9821,6 +9821,12 @@ githubId = 6931743; name = "pasqui23"; }; + patricksjackson = { + email = "patrick@jackson.dev"; + github = "patricksjackson"; + githubId = 160646; + name = "Patrick Jackson"; + }; patryk27 = { email = "pwychowaniec@pm.me"; github = "Patryk27"; From 31dc19919ae1546fb2237169e51114651c73ee9d Mon Sep 17 00:00:00 2001 From: Patrick Jackson Date: Mon, 6 Jun 2022 14:27:40 -0700 Subject: [PATCH 068/245] textadept: Merge back into a single version. --- .../editors/textadept/10/default.nix | 51 ------------------- .../editors/textadept/10/deps.nix | 42 --------------- .../editors/textadept/{11 => }/default.nix | 4 +- .../editors/textadept/{11 => }/deps.nix | 0 pkgs/top-level/all-packages.nix | 4 +- 5 files changed, 3 insertions(+), 98 deletions(-) delete mode 100644 pkgs/applications/editors/textadept/10/default.nix delete mode 100644 pkgs/applications/editors/textadept/10/deps.nix rename pkgs/applications/editors/textadept/{11 => }/default.nix (92%) rename pkgs/applications/editors/textadept/{11 => }/deps.nix (100%) diff --git a/pkgs/applications/editors/textadept/10/default.nix b/pkgs/applications/editors/textadept/10/default.nix deleted file mode 100644 index a45edc6c1a5d..000000000000 --- a/pkgs/applications/editors/textadept/10/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ lib, gcc10Stdenv, fetchhg, fetchurl, gtk2, glib, pkg-config, unzip, ncurses, zip }: - -gcc10Stdenv.mkDerivation rec { - version = "10.8"; - pname = "textadept"; - - nativeBuildInputs = [ pkg-config unzip ]; - buildInputs = [ - gtk2 ncurses glib zip - ]; - - src = fetchhg { - url = "http://foicica.com/hg/textadept"; - rev = "textadept_${version}"; - sha256 = "sha256-dEZSx2tuHTWYhk9q5iGlrWTAvDvKaM8HaHwXcFcv33s="; - }; - - preConfigure = - lib.concatStringsSep "\n" (lib.mapAttrsToList (name: params: - "ln -s ${fetchurl params} $PWD/src/${name}" - ) (import ./deps.nix)) + '' - - cd src - make deps - ''; - - postBuild = '' - make curses - ''; - - preInstall = '' - mkdir -p $out/share/applications - mkdir -p $out/share/pixmaps - ''; - - postInstall = '' - make curses install PREFIX=$out MAKECMDGOALS=curses - ''; - - makeFlags = [ - "PREFIX=$(out) WGET=true PIXMAPS_DIR=$(out)/share/pixmaps" - ]; - - meta = with lib; { - description = "An extensible text editor based on Scintilla with Lua scripting"; - homepage = "http://foicica.com/textadept"; - license = licenses.mit; - maintainers = with maintainers; [ raskin mirrexagon ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/editors/textadept/10/deps.nix b/pkgs/applications/editors/textadept/10/deps.nix deleted file mode 100644 index 3ab778dddb2a..000000000000 --- a/pkgs/applications/editors/textadept/10/deps.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ - "99fa62b828ee.zip" = { - url = "http://foicica.com/hg/scintilla/archive/99fa62b828ee.zip"; - sha256 = "sha256-QO4iGhx72CfB1/0Pp/Qab92qm98VZn/EkrHZGndoHVc="; - }; - "lua-5.3.5.tar.gz" = { - url = "http://www.lua.org/ftp/lua-5.3.5.tar.gz"; - sha256 = "1b2qn2rv96nmbm6zab4l877bd4zq7wpwm8drwjiy2ih4jqzysbhc"; - }; - "lpeg-1.0.2.tar.gz" = { - url = "http://www.inf.puc-rio.br/~roberto/lpeg/lpeg-1.0.2.tar.gz"; - sha256 = "sha256-SNZldgUbbHg4j6rQm3BJMJMmRYj80PJY3aqxzdShX/4="; - }; - "v1_7_0_2.zip" = { - url = "https://github.com/keplerproject/luafilesystem/archive/v1_7_0_2.zip"; - sha256 = "sha256-kXSriR8dOStCpYeyr7c3+VZez4qGDS5aK/9FeFj1hHg="; - }; - "db67f8a489e8.zip" = { - url = "http://foicica.com/hg/gtdialog/archive/db67f8a489e8.zip"; - sha256 = "sha256-UIvjbDrg3jyz7t2tm4y1zzH/TG6Kqaz3LE5y2U6OHuM="; - }; - "cdk-5.0-20150928.tgz" = { - url = "http://invisible-mirror.net/archives/cdk/cdk-5.0-20150928.tgz"; - sha256 = "0j74l874y33i26y5kjg3pf1vswyjif8k93pqhi0iqykpbxfsg382"; - }; - "libtermkey-0.20.tar.gz" = { - url = "http://www.leonerd.org.uk/code/libtermkey/libtermkey-0.20.tar.gz"; - sha256 = "1xfj6lchhfljmbcl6dz8dpakppyy13nbl4ykxiv5x4dr9b4qf3bc"; - }; - "pdcurs36.zip" = { - url = "http://prdownloads.sourceforge.net/pdcurses/pdcurs36.zip"; - sha256 = "0y91zpygrxms7d1l5ksrz42bkvq8jd2xqlj5j7wgyxcl58chcw9b"; - }; - "bombay.zip" = { - url = "http://foicica.com/hg/bombay/archive/b25520cc76bb.zip"; - sha256 = "07spq7jmkfyq20gv67yffara3ln3ns2xi0k02m2mxdms3xm1q36h"; - }; - "cloc-1.60.pl" = { - url = "http://prdownloads.sourceforge.net/cloc/cloc-1.60.pl"; - sha256 = "0p504bi19va3dh274v7lb7giqrydwa5yyry60f7jpz84y6z71a2a"; - }; -} diff --git a/pkgs/applications/editors/textadept/11/default.nix b/pkgs/applications/editors/textadept/default.nix similarity index 92% rename from pkgs/applications/editors/textadept/11/default.nix rename to pkgs/applications/editors/textadept/default.nix index 6b47ba461eb7..74298e059f7c 100644 --- a/pkgs/applications/editors/textadept/11/default.nix +++ b/pkgs/applications/editors/textadept/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "11.3"; - pname = "textadept11"; + pname = "textadept"; nativeBuildInputs = [ pkg-config unzip zip ]; buildInputs = [ @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { description = "An extensible text editor based on Scintilla with Lua scripting."; homepage = "http://foicica.com/textadept"; license = licenses.mit; - maintainers = with maintainers; [ raskin mirrexagon ]; + maintainers = with maintainers; [ raskin mirrexagon patricksjackson ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/editors/textadept/11/deps.nix b/pkgs/applications/editors/textadept/deps.nix similarity index 100% rename from pkgs/applications/editors/textadept/11/deps.nix rename to pkgs/applications/editors/textadept/deps.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 19165528cefc..720b35986b40 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10847,9 +10847,7 @@ with pkgs; texstudio = libsForQt5.callPackage ../applications/editors/texstudio { }; - textadept = callPackage ../applications/editors/textadept/10 { }; - - textadept11 = callPackage ../applications/editors/textadept/11 { stdenv = gcc10StdenvCompat; }; + textadept = callPackage ../applications/editors/textadept { }; texworks = libsForQt5.callPackage ../applications/editors/texworks { }; From 7708f1e48c77d663659b4b961f5976376820293f Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 7 Jun 2022 07:46:04 +1000 Subject: [PATCH 069/245] cri-o: 1.24.0 -> 1.24.1 https://github.com/cri-o/cri-o/releases/tag/v1.24.1 --- pkgs/applications/virtualization/cri-o/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix index 0267a52a61e5..b234354f9fc2 100644 --- a/pkgs/applications/virtualization/cri-o/default.nix +++ b/pkgs/applications/virtualization/cri-o/default.nix @@ -15,13 +15,13 @@ buildGoModule rec { pname = "cri-o"; - version = "1.24.0"; + version = "1.24.1"; src = fetchFromGitHub { owner = "cri-o"; repo = "cri-o"; rev = "v${version}"; - sha256 = "sha256-LbLBG8nvEgSF5KAeAYnp7dM9cbqF078QpVai1iDx63U="; + sha256 = "sha256-/AoZKeUcYF1fyYtllXpB7GNWR/6SWEOy2ffDLYbTp9E="; }; vendorSha256 = null; From 84883861f9f2dd8e85b56e4892072710829be4b6 Mon Sep 17 00:00:00 2001 From: wyndon Date: Tue, 7 Jun 2022 00:07:10 +0200 Subject: [PATCH 070/245] httm: 0.10.16 -> 0.11.1 --- pkgs/tools/filesystems/httm/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/filesystems/httm/default.nix b/pkgs/tools/filesystems/httm/default.nix index 2d26de2375a0..c44e75724c09 100644 --- a/pkgs/tools/filesystems/httm/default.nix +++ b/pkgs/tools/filesystems/httm/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "httm"; - version = "0.10.16"; + version = "0.11.1"; src = fetchFromGitHub { owner = "kimono-koans"; repo = pname; rev = version; - sha256 = "09zdexeMu54Y/4HbieZ0EJLxhwCv7upRJxqVbqr2hUw="; + sha256 = "GNiqWm6MsgLYjrkrbIHgKxtLmE4IJntcLd9GVRu1v2A="; }; - cargoSha256 = "SLEp88KwRg1RN78oX+fMYNR6ia9omrfH2bnJb+PrTAY="; + cargoSha256 = "87BkVAZ3BPtnuNUBTzdR4oiE0ZLIr5CacdYenU4V9qU="; nativeBuildInputs = [ installShellFiles ]; @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec { ''; meta = with lib; { - description = "Interactive, file-level ZFS Time Machine-like tool"; + description = "Interactive, file-level Time Machine-like tool for ZFS/btrfs"; homepage = "https://github.com/kimono-koans/httm"; license = licenses.mpl20; platforms = platforms.unix; From 5970407d19b5f836fe74b9ff427309f63d27e0f1 Mon Sep 17 00:00:00 2001 From: "Berk D. Demir" Date: Mon, 6 Jun 2022 16:58:27 -0700 Subject: [PATCH 071/245] certigo: patch tests and enable checks on Darwin Worked with the upstream project to get the test updated for modern macOS and emulated/virtualized hardware. Bring in unit test fixes in two patches from upstream trunk and re-enable tests on Darwin. --- pkgs/tools/admin/certigo/default.nix | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/admin/certigo/default.nix b/pkgs/tools/admin/certigo/default.nix index 541f23058ef2..d2914dbf95ae 100644 --- a/pkgs/tools/admin/certigo/default.nix +++ b/pkgs/tools/admin/certigo/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub, fetchpatch }: buildGoModule rec { pname = "certigo"; @@ -11,12 +11,21 @@ buildGoModule rec { sha256 = "sha256-XGR6xIXdFLnJTFd+mJneRb/WkLmi0Jscta9Bj3paM1M="; }; - vendorSha256 = "sha256-qS/tIi6umSuQcl43SI4LyL0k5eWfRWs7kVybRPGKcbs="; + patches = [ + (fetchpatch { + name = "backport_TestConnect-Apple-Fixes.patch"; + url = "https://github.com/square/certigo/commit/5332ac7ca20bdea63657cc8319e8b8fda4326938.patch"; + sha256 = "sha256-mSNuiui2dxkXnCrXJ/asIzC8F1mtPecOVOIu6mE5jq4="; + }) - # Go running under Hydra Darwin x86_64 picks CHAPOLY instead of AES-GCM as - # the default TLS ciphersuite, and breaks the arguably flakey `TestConnect` - # test. - doCheck = !(stdenv.isDarwin && stdenv.isx86_64); + (fetchpatch { + name = "backport_TestConnect-Expected-CipherSuite-Fixes.patch"; + url = "https://github.com/square/certigo/commit/7ef0417bde4aafc69cbb72f0dd6d3577a56054a1.patch"; + sha256 = "sha256-TUQ8B23HKheaPUjj4NkvjmZBAAhDNTyo2c8jf4qukds="; + }) + ]; + + vendorSha256 = "sha256-qS/tIi6umSuQcl43SI4LyL0k5eWfRWs7kVybRPGKcbs="; meta = with lib; { description = "A utility to examine and validate certificates in a variety of formats"; From fd326d0d8c73404fc4bba1a299ac64cf81dfc7fb Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 7 Jun 2022 01:05:41 +0200 Subject: [PATCH 072/245] python3Packages.pyialarmxr-homeassistant: rename from pyialarmxr --- .../default.nix | 15 +++++++-------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) rename pkgs/development/python-modules/{pyialarmxr => pyialarmxr-homeassistant}/default.nix (66%) diff --git a/pkgs/development/python-modules/pyialarmxr/default.nix b/pkgs/development/python-modules/pyialarmxr-homeassistant/default.nix similarity index 66% rename from pkgs/development/python-modules/pyialarmxr/default.nix rename to pkgs/development/python-modules/pyialarmxr-homeassistant/default.nix index 0110411a193d..fea638f7a5f8 100644 --- a/pkgs/development/python-modules/pyialarmxr/default.nix +++ b/pkgs/development/python-modules/pyialarmxr-homeassistant/default.nix @@ -1,24 +1,23 @@ { lib , buildPythonPackage -, fetchFromGitHub +, fetchPypi , lxml , pythonOlder , xmltodict }: buildPythonPackage rec { - pname = "pyialarmxr"; + pname = "pyialarmxr-homeassistant"; version = "1.0.18"; format = "setuptools"; disabled = pythonOlder "3.7"; - src = fetchFromGitHub { - owner = "bigmoby"; - repo = pname; - rev = version; - hash = "sha256-Q1NsPLA1W4nxSG/9jlMf6BkC3ZrUrhl8oDX7U4aAjxM="; + src = fetchPypi { + inherit pname version; + hash = "sha256-aQHJiSmaGyABHP17oFH+6JQ9zNJ6pj2+PcE+gsRuhaQ="; }; + propagatedBuildInputs = [ lxml xmltodict @@ -33,7 +32,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library to interface with Antifurto365 iAlarmXR systems"; - homepage = "https://github.com/bigmoby/pyialarmxr"; + homepage = "https://pypi.org/project/pyialarmxr-homeassistant/"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 0e58d7b976c4..c84d0739d31f 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -111,6 +111,7 @@ mapAliases ({ pydrive = throw "pydrive is broken and deprecated and has been replaced with pydrive2."; # added 2022-06-01 pyGtkGlade = throw "Glade support for pygtk has been removed"; # added 2022-01-15 pycallgraph = throw "pycallgraph has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-01-18 + pyialarmxr = pyialarmxr-homeassistant; # added 2022-06-07 pylibgen = throw "pylibgen is unmaintained upstreamed, and removed from nixpkgs"; # added 2020-06-20 pymc3 = pymc; # added 2022-06-05, module was rename starting with 4.0.0 pymssql = throw "pymssql has been abandoned upstream."; # added 2020-05-04 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 23bc0d21ff78..2e553cf8addf 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7448,7 +7448,7 @@ in { pyialarm = callPackage ../development/python-modules/pyialarm { }; - pyialarmxr = callPackage ../development/python-modules/pyialarmxr { }; + pyialarmxr-homeassistant = callPackage ../development/python-modules/pyialarmxr-homeassistant { }; pyicloud = callPackage ../development/python-modules/pyicloud { }; From d82ca8d422b30ff50505ac99eae0b95775e4dcd6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 7 Jun 2022 01:07:22 +0200 Subject: [PATCH 073/245] home-assistant: 2022.6.2 -> 2022.6.3 https://github.com/home-assistant/core/releases/tag/2022.6.3 --- pkgs/servers/home-assistant/component-packages.nix | 4 ++-- pkgs/servers/home-assistant/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index e99a68e1fe5d..9cc272f62a43 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2022.6.2"; + version = "2022.6.3"; components = { "abode" = ps: with ps; [ abodepy @@ -1207,7 +1207,7 @@ pyialarm ]; "ialarm_xr" = ps: with ps; [ - pyialarmxr + pyialarmxr-homeassistant ]; "iammeter" = ps: with ps; [ ]; # missing inputs: iammeter diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index f5664a3b385e..62d996bb9a32 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -166,7 +166,7 @@ let extraPackagesFile = writeText "home-assistant-packages" (lib.concatMapStringsSep "\n" (pkg: pkg.pname) extraBuildInputs); # Don't forget to run parse-requirements.py after updating - hassVersion = "2022.6.2"; + hassVersion = "2022.6.3"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -184,7 +184,7 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - hash = "sha256-M0wBvAdvoGrvJrE96ZM9+X1KMp796vtzbzIo8ScXcy8="; + hash = "sha256-dYJbYrOwjJ2OO+gYT9UmCam+gNvSycFGUEeHBoGTqSM="; }; # leave this in, so users don't have to constantly update their downstream patch handling From 826bef9b514bd5ceb5af55ccd79592778de03277 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Fri, 3 Jun 2022 02:29:53 +0000 Subject: [PATCH 074/245] prometheus-unifi-exporter: remove prometheus-unifi-exporter is deprecated and archived by upstream. --- .../prometheus/unifi-exporter/default.nix | 24 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 1 - 3 files changed, 1 insertion(+), 25 deletions(-) delete mode 100644 pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix diff --git a/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix b/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix deleted file mode 100644 index b9971ab72280..000000000000 --- a/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, buildGoPackage, fetchFromGitHub }: - -buildGoPackage rec { - pname = "unifi-exporter"; - version = "0.4.0+git1"; - rev = "9a4e69fdea91dd0033bda4842998d751b40a6130"; - - goPackagePath = "github.com/mdlayher/unifi_exporter"; - - src= fetchFromGitHub { - inherit rev; - owner = "mdlayher"; - repo = "unifi_exporter"; - sha256 = "08zqvwvdqnc301f8jfh7bdvc138szw6xszx884b2v8w2x38w3rmn"; - }; - - meta = with lib; { - description = "Prometheus exporter that exposes metrics from a Ubiquiti UniFi Controller and UniFi devices"; - homepage = "https://github.com/mdlayher/unifi_exporter"; - license = licenses.mit; - maintainers = with maintainers; [ bachp globin ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 7bfc9bfdc649..82cce1d0482d 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1112,6 +1112,7 @@ mapAliases ({ prometheus-cups-exporter = throw "outdated and broken by design; removed by developer"; # Added 2021-03-16 prometheus-dmarc-exporter = dmarc-metrics-exporter; # added 2022-05-31 prometheus-mesos-exporter = throw "prometheus-mesos-exporter is deprecated and archived by upstream"; # Added 2022-04-05 + prometheus-unifi-exporter = throw "prometheus-unifi-exporter is deprecated and archived by upstream, use unifi-poller instead"; # Added 2022-06-03 proxytunnel = throw "proxytunnel has been removed from nixpkgs, because it has not been update upstream since it was added to nixpkgs in 2008 and has therefore bitrotted."; # added 2021-12-15 pulseaudio-hsphfpd = throw "pulseaudio-hsphfpd upstream has been abandoned"; # Added 2022-03-23 pulseaudio-modules-bt = throw "pulseaudio-modules-bt has been abandoned, and is superseded by pulseaudio's native bt functionality"; # Added 2022-04-01 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 24744e9eefd4..76ba1ea8fe7b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22473,7 +22473,6 @@ with pkgs; prometheus-unbound-exporter = callPackage ../servers/monitoring/prometheus/unbound-exporter.nix { inherit (darwin.apple_sdk.frameworks) Security; }; - prometheus-unifi-exporter = callPackage ../servers/monitoring/prometheus/unifi-exporter { }; prometheus-varnish-exporter = callPackage ../servers/monitoring/prometheus/varnish-exporter.nix { }; prometheus-wireguard-exporter = callPackage ../servers/monitoring/prometheus/wireguard-exporter.nix { inherit (darwin.apple_sdk.frameworks) Security; From 1f9c7f33930a657c0c7b0500a097f8c38d474832 Mon Sep 17 00:00:00 2001 From: "Berk D. Demir" Date: Tue, 7 Jun 2022 00:57:47 +0000 Subject: [PATCH 075/245] runitor: 0.10.0 -> 0.10.1 - New release fixing a nil dereference - Remove patches that are already part of the new rel - Rollback ldflags change from #175973 The -s flag implies -w on every platform but Darwin. --- pkgs/tools/system/runitor/default.nix | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/pkgs/tools/system/runitor/default.nix b/pkgs/tools/system/runitor/default.nix index 965813f6e371..1108362010ca 100644 --- a/pkgs/tools/system/runitor/default.nix +++ b/pkgs/tools/system/runitor/default.nix @@ -2,26 +2,18 @@ buildGoModule rec { pname = "runitor"; - version = "0.10.0"; + version = "0.10.1"; vendorSha256 = null; src = fetchFromGitHub { owner = "bdd"; repo = "runitor"; rev = "v${version}"; - sha256 = "sha256-96WKMeRkkG6en9JXaZjjnqeZOcLSII3knx8cdjTBAKw="; + sha256 = "sha256-qqfaA1WAHkuiyzyQbrSvnmwuRXElArErJ6PtLPOxzsg="; }; ldflags = [ - "-s" "-X main.Version=v${version}" - ]; - - patches = [ - (fetchpatch { - name = "backport_TestPostRetries-timeout-fix.patch"; - url = "https://github.com/bdd/runitor/commit/418142585a8387224825637cca3fe275d3c3d147.patch"; - sha256 = "sha256-cl+KYoiHm2ioFuJVKokZkglIzL/NaEd5JNUuj4g8MUg="; - }) + "-s" "-w" "-X main.Version=v${version}" ]; passthru.tests.version = testers.testVersion { From 411f38ef26f6936a5ecabe1b0edbcfb42045947b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Jun 2022 01:04:15 +0000 Subject: [PATCH 076/245] btrfs-progs: 5.18 -> 5.18.1 --- pkgs/tools/filesystems/btrfs-progs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix index 1a482de62d91..66f5b695287a 100644 --- a/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "btrfs-progs"; - version = "5.18"; + version = "5.18.1"; src = fetchurl { url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; - sha256 = "sha256-HeYQdiKwvi9tdyYfl6K91AKR27aCqsfc4IYy0XH3oTQ="; + sha256 = "sha256-bpinXM/1LpNU2qGtKExhTEkPhEJzovpSTLrJ64QcclU="; }; nativeBuildInputs = [ From f9b9e8b16f26ffd7985a1b4987cd417d295e04cd Mon Sep 17 00:00:00 2001 From: Kylie McClain Date: Tue, 1 Mar 2022 01:18:21 -0500 Subject: [PATCH 077/245] rwc: init at 0.2 --- pkgs/tools/system/rwc/default.nix | 22 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/tools/system/rwc/default.nix diff --git a/pkgs/tools/system/rwc/default.nix b/pkgs/tools/system/rwc/default.nix new file mode 100644 index 000000000000..7180c2554702 --- /dev/null +++ b/pkgs/tools/system/rwc/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchFromGitHub, lib }: + +stdenv.mkDerivation rec { + pname = "rwc"; + version = "0.2"; + + src = fetchFromGitHub { + owner = "leahneukirchen"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-axHBkrbLEcYygCDofhqfIeZ5pv1sR34I5UgFUwVb2rI="; + }; + + makeFlags = [ "PREFIX=$(out)" ]; + + meta = with lib; { + description = "Report when files are changed"; + license = licenses.publicDomain; + platforms = platforms.linux; + maintainers = with maintainers; [ somasis ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6b1c16e735d8..57c5df345c0e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10042,6 +10042,8 @@ with pkgs; rw = callPackage ../tools/misc/rw { }; + rwc = callPackage ../tools/system/rwc { }; + rxp = callPackage ../tools/text/xml/rxp { }; rzip = callPackage ../tools/compression/rzip { }; From 22f30538f29181226cfd6e90cb1b75fd73f95c9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Koz=C5=82owski?= Date: Tue, 7 Jun 2022 04:00:36 +0200 Subject: [PATCH 078/245] scala-cli: 0.1.6 -> 0.1.7 --- .../development/tools/build-managers/scala-cli/sources.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/build-managers/scala-cli/sources.json b/pkgs/development/tools/build-managers/scala-cli/sources.json index eaa53705260a..464675569fd7 100644 --- a/pkgs/development/tools/build-managers/scala-cli/sources.json +++ b/pkgs/development/tools/build-managers/scala-cli/sources.json @@ -1,13 +1,13 @@ { - "version": "0.1.6", + "version": "0.1.7", "assets": { "x86_64-darwin": { "asset": "scala-cli-x86_64-apple-darwin.gz", - "sha256": "1wcm47x0w4gdhkqrqjn0qvgnn36c707mz9m260pdnnffja203vyr" + "sha256": "1sly3s9y742nms8kqwh2cikjkcnbkkafsql8sw2w2zr53z28g10v" }, "x86_64-linux": { "asset": "scala-cli-x86_64-pc-linux.gz", - "sha256": "1jwv67p2r6kxqlz8p2zvk5g5jdswl8cymj822b88lbp78a497kc6" + "sha256": "1lgcbxzhwqfnj6n81w1ssdcrn1j0c93chqgh0zzqi08w8wk3x4j5" } } } From 17b53760f61e2f158024aef79d9aa29e65986301 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Jun 2022 03:15:42 +0000 Subject: [PATCH 079/245] fluxcd: 0.30.2 -> 0.31.0 --- pkgs/applications/networking/cluster/fluxcd/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/cluster/fluxcd/default.nix b/pkgs/applications/networking/cluster/fluxcd/default.nix index 21e2f00c3e2f..abe12ffff1a9 100644 --- a/pkgs/applications/networking/cluster/fluxcd/default.nix +++ b/pkgs/applications/networking/cluster/fluxcd/default.nix @@ -1,9 +1,9 @@ { lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles }: let - version = "0.30.2"; - sha256 = "0z4f0vf2n7vfp6ff0lxcl5qyl65ihd4absad8cd16hncz15nyjgl"; - manifestsSha256 = "04dlxzlrhggq54nkywn9nwdagdn43f0rb7cjkqdn3hlm4hwd07pb"; + version = "0.31.0"; + sha256 = "073ij9mllxvw6rg8nm8pj6b8m5jzgbiihr9kknhhpp788wya155d"; + manifestsSha256 = "0kp75h119l9051p2xcjfwcllk4hilmq25fcrx86bm0646krvk0pk"; manifests = fetchzip { url = @@ -23,7 +23,7 @@ in buildGoModule rec { inherit sha256; }; - vendorSha256 = "sha256-POziJtCdD4klu23WuGmWdt72Ugr4KwCAjXRTCuzikSk="; + vendorSha256 = "sha256-XTtVSSqU2jWRZvudE6G5QaNaZxw3oESiMPnnQzDs/1w="; postUnpack = '' cp -r ${manifests} source/cmd/flux/manifests From 8abfb3fbc60046ab98e8c164991d85d429eb39e4 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 7 Jun 2022 04:20:00 +0000 Subject: [PATCH 080/245] ltex-ls: init at 15.2.0 --- pkgs/tools/text/ltex-ls/default.nix | 34 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/tools/text/ltex-ls/default.nix diff --git a/pkgs/tools/text/ltex-ls/default.nix b/pkgs/tools/text/ltex-ls/default.nix new file mode 100644 index 000000000000..c21ab2e038ab --- /dev/null +++ b/pkgs/tools/text/ltex-ls/default.nix @@ -0,0 +1,34 @@ +{ lib, stdenv, fetchurl, makeBinaryWrapper, jre_headless }: + +stdenv.mkDerivation rec { + pname = "ltex-ls"; + version = "15.2.0"; + + src = fetchurl { + url = "https://github.com/valentjn/ltex-ls/releases/download/${version}/ltex-ls-${version}.tar.gz"; + sha256 = "sha256-ygjCFjYaP9Lc5BLuOHe5+lyaKpfDhicR783skkBgo7I="; + }; + + nativeBuildInputs = [ makeBinaryWrapper ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out + cp -rfv bin/ lib/ $out + rm -fv $out/bin/*.bat + for file in $out/bin/{ltex-ls,ltex-cli}; do + wrapProgram $file --set JAVA_HOME "${jre_headless}" + done + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://valentjn.github.io/ltex/"; + description = "LSP language server for LanguageTool"; + license = licenses.mpl20; + maintainers = [ maintainers.marsam ]; + platforms = jre_headless.meta.platforms; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a53c9dca0590..d4eeed1bca33 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27893,6 +27893,8 @@ with pkgs; lsp-plugins = callPackage ../applications/audio/lsp-plugins { php = php74; }; + ltex-ls = callPackage ../tools/text/ltex-ls { }; + luminanceHDR = libsForQt5.callPackage ../applications/graphics/luminance-hdr { }; lxdvdrip = callPackage ../applications/video/lxdvdrip { }; From 1ee7ec898a9bff60589e9cfdecd7d9de00e1f3d0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Jun 2022 05:51:46 +0000 Subject: [PATCH 081/245] python310Packages.google-cloud-websecurityscanner: 1.7.1 -> 1.7.2 --- .../google-cloud-websecurityscanner/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix b/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix index 2ea8de6f139f..b1d7c8d5da19 100644 --- a/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix +++ b/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-websecurityscanner"; - version = "1.7.1"; + version = "1.7.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-yK4xEu9rfFkA6RDNDjul0V+Xjc8TehJ6f8lv1k2WULc="; + sha256 = "sha256-JDuMhyk1018pMYNOhRVmP7XyF2wsK5temDTP5033Dxk="; }; propagatedBuildInputs = [ google-api-core libcst proto-plus ]; From d29410881e176c7cec7b2cbdcba3251cfe04accc Mon Sep 17 00:00:00 2001 From: Michael Adler Date: Tue, 7 Jun 2022 07:59:50 +0200 Subject: [PATCH 082/245] cargo-generate: 0.12.0 -> 0.14.0 --- pkgs/development/tools/rust/cargo-generate/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-generate/default.nix b/pkgs/development/tools/rust/cargo-generate/default.nix index 0597b7abbecc..64a17d807112 100644 --- a/pkgs/development/tools/rust/cargo-generate/default.nix +++ b/pkgs/development/tools/rust/cargo-generate/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-generate"; - version = "0.12.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "ashleygwilliams"; repo = "cargo-generate"; rev = "v${version}"; - sha256 = "sha256-VMcyBa8bjH4n8hKS+l5xcaQCBYkBVWjDV2uk4JmhxFs="; + sha256 = "sha256-OYYGOB1NfNnOl8bd8KozgMCyW4Gb39LoFtD80DPzpdw="; }; - cargoSha256 = "sha256-9RMzvZLGRFGJ0Bw2is2aeRCoLzHsZZ6LCfoCTrKjHbo="; + cargoSha256 = "sha256-qmRKjPhPLpzVVuTHuoo0iTlX3BnT2Udo1kFXvA3zNQE="; nativeBuildInputs = [ pkg-config ]; From 50cac6ed5ed534f8a1539349863599ade91295e7 Mon Sep 17 00:00:00 2001 From: Daniel Olsen Date: Sun, 31 Oct 2021 04:35:37 +0100 Subject: [PATCH 083/245] ocamlPackages.unix-errno: init at 0.6.1 --- .../ocaml-modules/unix-errno/default.nix | 22 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/development/ocaml-modules/unix-errno/default.nix diff --git a/pkgs/development/ocaml-modules/unix-errno/default.nix b/pkgs/development/ocaml-modules/unix-errno/default.nix new file mode 100644 index 000000000000..2b8deb6621d3 --- /dev/null +++ b/pkgs/development/ocaml-modules/unix-errno/default.nix @@ -0,0 +1,22 @@ +{ lib, buildDunePackage, fetchurl, ctypes, integers, result }: + +buildDunePackage rec { + pname = "unix-errno"; + version = "0.6.1"; + + minimalOCamlVersion = "4.03.0"; # Specified to be 4.01.0, but it's actually 4.03 + + src = fetchurl { + url = "https://github.com/xapi-project/ocaml-unix-errno/releases/download/${version}/unix-errno-${version}.tbz"; + sha256 = "sha256-jZqtHwUKTffjuOP2jdKKQRtEOBKyclhfeiPO96hEj4c="; + }; + + propagatedBuildInputs = [ ctypes integers result ]; + + meta = with lib; { + homepage = "https://github.com/xapi-project/ocaml-unix-errno"; # This is the repo used in the opam package + description = "Unix errno types, maps, and support for OCaml"; + license = with licenses; [ isc lgpl21Only ]; # All the files indicate ISC, but there's an LGPL LICENSE file + maintainers = with maintainers; [ dandellion ]; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index d0c444f9680a..6a31c5524931 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1405,6 +1405,8 @@ let uecc = callPackage ../development/ocaml-modules/uecc { }; + unix-errno = callPackage ../development/ocaml-modules/unix-errno { }; + utop = callPackage ../development/tools/ocaml/utop { }; uuidm = callPackage ../development/ocaml-modules/uuidm { }; From cb26845685076ac02be9b9972a712d500fec9384 Mon Sep 17 00:00:00 2001 From: Daniel Olsen Date: Sun, 31 Oct 2021 04:37:19 +0100 Subject: [PATCH 084/245] ocamlPackages.posix-time2: init at 2.0.0 --- pkgs/development/ocaml-modules/posix/time2.nix | 16 ++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/development/ocaml-modules/posix/time2.nix diff --git a/pkgs/development/ocaml-modules/posix/time2.nix b/pkgs/development/ocaml-modules/posix/time2.nix new file mode 100644 index 000000000000..b4601c162bd1 --- /dev/null +++ b/pkgs/development/ocaml-modules/posix/time2.nix @@ -0,0 +1,16 @@ +{ lib, buildDunePackage, posix-base, posix-types, unix-errno }: + +buildDunePackage { + pname = "posix-time2"; + + inherit (posix-base) version src; + + propagatedBuildInputs = [ posix-base posix-types unix-errno ]; + + doCheck = true; + + meta = posix-base.meta // { + description = "posix-time2 provides the types and bindings for posix time APIs"; + maintainers = with lib.maintainers; [ dandellion ]; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 6a31c5524931..053af5e6677b 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1129,6 +1129,8 @@ let posix-socket = callPackage ../development/ocaml-modules/posix/socket.nix { }; + posix-time2 = callPackage ../development/ocaml-modules/posix/time2.nix { }; + posix-types = callPackage ../development/ocaml-modules/posix/types.nix { }; postgresql = callPackage ../development/ocaml-modules/postgresql { From 7c3c0f1223680d4891df2178860415af3afa34aa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Jun 2022 08:39:14 +0000 Subject: [PATCH 085/245] python310Packages.browser-cookie3: 0.14.1 -> 0.14.2 --- pkgs/development/python-modules/browser-cookie3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/browser-cookie3/default.nix b/pkgs/development/python-modules/browser-cookie3/default.nix index fd0d21cc616a..a8b5d4e01441 100644 --- a/pkgs/development/python-modules/browser-cookie3/default.nix +++ b/pkgs/development/python-modules/browser-cookie3/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "browser-cookie3"; - version = "0.14.1"; + version = "0.14.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-2cMWFyHK+7M99Z9O7PiKue37c5XVBe/n88AF5ax7A2s="; + hash = "sha256-YR5NcDmbLlnhxcDuyM6hjjuL/Ozw79ytbCF4/nmSZmQ="; }; propagatedBuildInputs = [ From ed2c6d7efbac9179a7cadf93f1fb5ad7e17dd4fa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Jun 2022 08:47:31 +0000 Subject: [PATCH 086/245] python310Packages.oauthenticator: 14.2.0 -> 15.0.0 --- pkgs/development/python-modules/oauthenticator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/oauthenticator/default.nix b/pkgs/development/python-modules/oauthenticator/default.nix index 738f7fafca2a..bf2a30fb5b2a 100644 --- a/pkgs/development/python-modules/oauthenticator/default.nix +++ b/pkgs/development/python-modules/oauthenticator/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "oauthenticator"; - version = "14.2.0"; + version = "15.0.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "4baa02ff2c159cbba06f8d07fe11a6e624285ca2f813b1258b4c68766c0ee46b"; + sha256 = "sha256-d1toYgrufnVd10QhJ4nhQqyDRaq4CjWLDjC+7ABNp6Y="; }; propagatedBuildInputs = [ From 6d70d415da5470a1672f3b653ed37559c54b0103 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Jun 2022 08:53:34 +0000 Subject: [PATCH 087/245] python310Packages.aioairzone: 0.4.4 -> 0.4.5 --- pkgs/development/python-modules/aioairzone/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioairzone/default.nix b/pkgs/development/python-modules/aioairzone/default.nix index 5c12501723df..1862c3e6a317 100644 --- a/pkgs/development/python-modules/aioairzone/default.nix +++ b/pkgs/development/python-modules/aioairzone/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "aioairzone"; - version = "0.4.4"; + version = "0.4.5"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "Noltari"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-fYhYqBnwvnfu2GbWUlmMmW/Xon3OE3fh+gGlnQRsCyA="; + hash = "sha256-sNlqG5A8a8AIgKc9xDAEwxBeKJ/HaW847BZR4WdcsrQ="; }; propagatedBuildInputs = [ From be830ea4f7be96141e6ea4108538014f6b9447f3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Jun 2022 08:56:35 +0000 Subject: [PATCH 088/245] python310Packages.google-cloud-runtimeconfig: 0.33.0 -> 0.33.1 --- .../python-modules/google-cloud-runtimeconfig/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix b/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix index fb581ee0c604..0ff3e076f2e9 100644 --- a/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix +++ b/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "google-cloud-runtimeconfig"; - version = "0.33.0"; + version = "0.33.1"; src = fetchPypi { inherit pname version; - sha256 = "cc85e5de7cdb58a27561885021ee6fcf1d9f89e0f0db7c371bdca9c54788dd15"; + sha256 = "sha256-SKinB6fiBh+oe+lb2IGMD6248DDOrG7g3kiFpMGX4BU="; }; propagatedBuildInputs = [ google-api-core google-cloud-core ]; From aa9b237e5d206735924c04a31b496c980b988764 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 7 Jun 2022 11:11:41 +0200 Subject: [PATCH 089/245] python310Packages.luxtronik: 0.3.13 -> 0.3.14 --- pkgs/development/python-modules/luxtronik/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/luxtronik/default.nix b/pkgs/development/python-modules/luxtronik/default.nix index e8c72a5cf4cb..b1e74c9ba606 100644 --- a/pkgs/development/python-modules/luxtronik/default.nix +++ b/pkgs/development/python-modules/luxtronik/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "luxtronik"; - version = "0.3.13"; + version = "0.3.14"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Bouni"; repo = "python-luxtronik"; rev = version; - sha256 = "sha256-ULpi3oNJJe8H9z1C1nCNsR5eMmXQnXtbonrV9Ec2NyY="; + sha256 = "sha256-7TuvqOAb/MUumOF6BKTRLOJuvteqZPmFUXXsuwEpmOM="; }; # Project has no tests From 0e222cc4ec42d8257bae6745fe79903829f41145 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 7 Jun 2022 11:27:48 +0200 Subject: [PATCH 090/245] checkov: 2.0.1195 -> 2.0.1201 --- .../tools/analysis/checkov/default.nix | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index b5977e61acdc..886cca2de9c7 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -32,17 +32,18 @@ with py.pkgs; buildPythonApplication rec { pname = "checkov"; - version = "2.0.1195"; + version = "2.0.1201"; format = "setuptools"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = version; - hash = "sha256-YzM/YzTeFqNe7ThNH138g13aSzEXK8rzTWit1g27GVw="; + hash = "sha256-ZQCUYnoCaVZkXr5rZ/vkEOlADMQmj6OfZ12KBerXdmQ="; }; nativeBuildInputs = with py.pkgs; [ + pythonRelaxDepsHook setuptools-scm ]; @@ -94,12 +95,10 @@ buildPythonApplication rec { responses ]; - postPatch = '' - substituteInPlace setup.py \ - --replace "bc-python-hcl2==" "bc-python-hcl2>=" \ - --replace "prettytable>=3.0.0" "prettytable" \ - --replace "pycep-parser==0.3.6" "pycep-parser" - ''; + pythonRelaxDeps = [ + "bc-python-hcl2" + "pycep-parser" + ]; preCheck = '' export HOME=$(mktemp -d); From 5b9de4e2bba96d26dcd23071ed33a17f47ddc1ff Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 7 Jun 2022 11:33:10 +0200 Subject: [PATCH 091/245] python310Packages.bravado-core: add input --- pkgs/development/python-modules/bravado-core/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/bravado-core/default.nix b/pkgs/development/python-modules/bravado-core/default.nix index f58f42a9670f..eb0e03653e59 100644 --- a/pkgs/development/python-modules/bravado-core/default.nix +++ b/pkgs/development/python-modules/bravado-core/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , fetchFromGitHub , fqdn From 4ac4c526996d6be5d02a609765c37f94d23e20fc Mon Sep 17 00:00:00 2001 From: Daniel Olsen Date: Fri, 3 Jun 2022 23:17:01 +0200 Subject: [PATCH 092/245] liquidsoap: pin srt dependency --- pkgs/tools/audio/liquidsoap/full.nix | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/audio/liquidsoap/full.nix b/pkgs/tools/audio/liquidsoap/full.nix index a9319696a3a0..33e9831416f2 100644 --- a/pkgs/tools/audio/liquidsoap/full.nix +++ b/pkgs/tools/audio/liquidsoap/full.nix @@ -1,5 +1,6 @@ { lib, stdenv, makeWrapper, fetchurl, which, pkg-config , fetchFromGitLab +, fetchFromGitHub , ocamlPackages , libao, portaudio, alsa-lib, libpulseaudio, libjack2 , libsamplerate, libmad, taglib, lame, libogg @@ -24,7 +25,8 @@ in # Liquidsoap 1.4.2 is not compatible with menhir ≥ 20220210 # Locally override menhir to an earlier version -let menhirLib = ocamlPackages.menhirLib.overrideAttrs (o: rec { +let + menhirLib = ocamlPackages.menhirLib.overrideAttrs (o: rec { version = "20211128"; src = fetchFromGitLab { domain = "gitlab.inria.fr"; @@ -41,6 +43,15 @@ let menhirLib = ocamlPackages.menhirLib.overrideAttrs (o: rec { inherit menhirLib menhirSdk; }; + srt = ocamlPackages.srt.overrideAttrs (old: rec { + version = "0.1.1"; + src = fetchFromGitHub { + owner = "savonet"; + repo = "ocaml-srt"; + rev = "v${version}"; + sha256 = "0xh89w4j7lljvpy2n08x6m9kw88f82snmzf23kp0gw637sjnrj6f"; + }; + }); in stdenv.mkDerivation { @@ -82,7 +93,7 @@ stdenv.mkDerivation { ocamlPackages.xmlm ocamlPackages.ocaml_pcre ocamlPackages.camomile ocamlPackages.fdkaac - ocamlPackages.srt ocamlPackages.sedlex menhir menhirLib + srt ocamlPackages.sedlex menhir menhirLib ]; hardeningDisable = [ "format" "fortify" ]; From ab7173f6db30fcffe01a23d85138449fa990cabf Mon Sep 17 00:00:00 2001 From: Daniel Olsen Date: Sat, 30 Oct 2021 22:05:24 +0200 Subject: [PATCH 093/245] ocamlPackages.srt: 0.1.1 -> 0.2.1 --- pkgs/development/ocaml-modules/srt/default.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/development/ocaml-modules/srt/default.nix b/pkgs/development/ocaml-modules/srt/default.nix index 7f0897ae6626..2755b06d9c71 100644 --- a/pkgs/development/ocaml-modules/srt/default.nix +++ b/pkgs/development/ocaml-modules/srt/default.nix @@ -6,25 +6,22 @@ buildDunePackage rec { pname = "srt"; - version = "0.1.1"; + version = "0.2.1"; src = fetchFromGitHub { owner = "savonet"; repo = "ocaml-srt"; rev = "v${version}"; - sha256 = "0xh89w4j7lljvpy2n08x6m9kw88f82snmzf23kp0gw637sjnrj6f"; + sha256 = "sha256-rnM50IzeiKOrpFf79jTHp+fXn0tdx+vrLuD3kzqLh5g="; }; - useDune2 = true; - buildInputs = [ dune-configurator ]; propagatedBuildInputs = [ posix-socket srt ]; - meta = { + meta = with lib; { description = "OCaml bindings for the libsrt library"; license = lib.licenses.gpl2Only; inherit (src.meta) homepage; - maintainers = [ lib.maintainers.vbgl ]; + maintainers = with maintainers; [ vbgl dandellion ]; }; - } From 3c89903ac88953f8cfeef52f2de6319d367d2fcf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Jun 2022 09:46:38 +0000 Subject: [PATCH 094/245] python310Packages.asdf: 2.11.1 -> 2.12.0 --- pkgs/development/python-modules/asdf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/asdf/default.nix b/pkgs/development/python-modules/asdf/default.nix index 658ec10a0ae2..b34001d866eb 100644 --- a/pkgs/development/python-modules/asdf/default.nix +++ b/pkgs/development/python-modules/asdf/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "asdf"; - version = "2.11.1"; + version = "2.12.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-1uDRoS9nyZCLPdbiAQBADoiwqaVBzj1NMpZXdJQYoxQ="; + hash = "sha256-WRSDTQd7o79ouar9xka58nzl5W4cJBFn1GHe5DsQI+k="; }; nativeBuildInputs = [ From d6ade044a4c6befabe7cd6084609c3d28372057d Mon Sep 17 00:00:00 2001 From: happysalada Date: Tue, 7 Jun 2022 02:14:27 -0400 Subject: [PATCH 095/245] oil: 0.9.9 -> 0.10.1 --- pkgs/shells/oil/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/oil/default.nix b/pkgs/shells/oil/default.nix index f99c285a4f0f..ac7ea03084c1 100644 --- a/pkgs/shells/oil/default.nix +++ b/pkgs/shells/oil/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "oil"; - version = "0.9.9"; + version = "0.10.1"; src = fetchurl { url = "https://www.oilshell.org/download/oil-${version}.tar.xz"; - sha256 = "sha256-b2tMS5z4oejh3C/3vznIWhG4cd3anp5RuffhoORrKCQ="; + sha256 = "sha256-jI+QQ+jE3Qzd0b9VishVwBzDlFHCVKv8cZ0BsHnkd0Q="; }; postPatch = '' From f5ef819e24c45331636ad28861bce952f25b2fae Mon Sep 17 00:00:00 2001 From: happysalada Date: Tue, 7 Jun 2022 06:53:15 -0400 Subject: [PATCH 096/245] mimir: switch pname to mimir --- nixos/modules/services/monitoring/mimir.nix | 2 +- nixos/tests/all-tests.nix | 2 +- nixos/tests/{grafana-mimir.nix => mimir.nix} | 2 +- pkgs/servers/monitoring/mimir/default.nix | 2 +- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 +- 6 files changed, 6 insertions(+), 5 deletions(-) rename nixos/tests/{grafana-mimir.nix => mimir.nix} (98%) diff --git a/nixos/modules/services/monitoring/mimir.nix b/nixos/modules/services/monitoring/mimir.nix index f85f3ab02c37..83c0b23c59dd 100644 --- a/nixos/modules/services/monitoring/mimir.nix +++ b/nixos/modules/services/monitoring/mimir.nix @@ -53,7 +53,7 @@ in { else cfg.configFile; in { - ExecStart = "${pkgs.grafana-mimir}/bin/mimir --config.file=${conf}"; + ExecStart = "${pkgs.mimir}/bin/mimir --config.file=${conf}"; DynamicUser = true; Restart = "always"; ProtectSystem = "full"; diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 0f75548ff6fd..1064d62da930 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -170,7 +170,7 @@ in { frr = handleTest ./frr.nix {}; fsck = handleTest ./fsck.nix {}; ft2-clone = handleTest ./ft2-clone.nix {}; - grafana-mimir = handleTest ./grafana-mimir.nix {}; + mimir = handleTest ./mimir.nix {}; gerrit = handleTest ./gerrit.nix {}; geth = handleTest ./geth.nix {}; ghostunnel = handleTest ./ghostunnel.nix {}; diff --git a/nixos/tests/grafana-mimir.nix b/nixos/tests/mimir.nix similarity index 98% rename from nixos/tests/grafana-mimir.nix rename to nixos/tests/mimir.nix index 0aafa956f0be..f1b30d261472 100644 --- a/nixos/tests/grafana-mimir.nix +++ b/nixos/tests/mimir.nix @@ -1,5 +1,5 @@ import ./make-test-python.nix ({ pkgs, ... }: { - name = "grafana-mimir"; + name = "mimir"; nodes = { server = { ... }: { environment.systemPackages = [ pkgs.jq ]; diff --git a/pkgs/servers/monitoring/mimir/default.nix b/pkgs/servers/monitoring/mimir/default.nix index 500ba3154753..9a837073eeed 100644 --- a/pkgs/servers/monitoring/mimir/default.nix +++ b/pkgs/servers/monitoring/mimir/default.nix @@ -18,7 +18,7 @@ buildGoModule rec { ]; passthru.tests = { - inherit (nixosTests) grafana-mimir; + inherit (nixosTests) mimir; }; ldflags = let t = "github.com/grafana/mimir/pkg/util/version"; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 708d76f3da34..39e4a1ba9f39 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -538,6 +538,7 @@ mapAliases ({ graalvm8-ee = throw "graalvm8-ee has been removed because it is unmaintained"; # Added 2022-04-15 graalvm11-ee = throw "graalvm11-ee has been removed because it is unmaintained"; # Added 2022-04-15 gradio = throw "gradio has been removed because it is unmaintained, use shortwave instead"; # Added 2022-06-03 + grafana-mimir = throw "'grafana-mimir' has been renamed to/replaced by 'mimir'"; # Added 2022-06-07 gr-ais = gnuradio3_7.pkgs.ais; # Added 2019-05-27, changed 2020-10-16 grantlee5 = throw "'grantlee5' has been renamed to/replaced by 'libsForQt5.grantlee'"; # Converted to throw 2022-02-22 gr-gsm = gnuradio3_7.pkgs.gsm; # Added 2019-05-27, changed 2020-10-16 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6b1c16e735d8..ea41516e7b25 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21795,7 +21795,7 @@ with pkgs; grafana-loki = callPackage ../servers/monitoring/loki { }; - grafana-mimir = callPackage ../servers/monitoring/mimir { }; + mimir = callPackage ../servers/monitoring/mimir { }; promtail = grafana-loki.overrideAttrs (o: { pname = "promtail"; From 1d4bfa2a9d06ed73f415e8a8e1ad838771f63b9a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 7 Jun 2022 14:07:35 +0200 Subject: [PATCH 097/245] python310Packages.oauthenticator: add format --- .../python-modules/oauthenticator/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/oauthenticator/default.nix b/pkgs/development/python-modules/oauthenticator/default.nix index bf2a30fb5b2a..b3a4c5db7a0e 100644 --- a/pkgs/development/python-modules/oauthenticator/default.nix +++ b/pkgs/development/python-modules/oauthenticator/default.nix @@ -15,11 +15,13 @@ buildPythonPackage rec { pname = "oauthenticator"; version = "15.0.0"; + format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-d1toYgrufnVd10QhJ4nhQqyDRaq4CjWLDjC+7ABNp6Y="; + hash = "sha256-d1toYgrufnVd10QhJ4nhQqyDRaq4CjWLDjC+7ABNp6Y="; }; propagatedBuildInputs = [ @@ -37,12 +39,14 @@ buildPythonPackage rec { ]; disabledTests = [ - # Test are outdated, https://github.com/jupyterhub/oauthenticator/issues/432 + # Tests are outdated, https://github.com/jupyterhub/oauthenticator/issues/432 "test_azuread" "test_mediawiki" ]; - pythonImportsCheck = [ "oauthenticator" ]; + pythonImportsCheck = [ + "oauthenticator" + ]; meta = with lib; { description = "Authenticate JupyterHub users with common OAuth providers, including GitHub, Bitbucket, and more."; From cf594d1f6e2dc1beea416d007b70c38a5e54ba7f Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Mon, 6 Jun 2022 20:54:26 +0200 Subject: [PATCH 098/245] cloud-init: fix missing pyserial dependency and check for all required imports as per requirements.txt While debugging missing metadata in the cloud-init boot local phase in a NixOS VM on SmartOS, the following error was observed: SystemError: Unable to open /dev/ttyS1 Adding the missing pyserial dependency fixes the above error and cloud-init metadata detection now works in NixOS VMs on SmartOS --- pkgs/tools/virtualization/cloud-init/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/virtualization/cloud-init/default.nix b/pkgs/tools/virtualization/cloud-init/default.nix index 9da4290dadde..a2e156f2a10b 100644 --- a/pkgs/tools/virtualization/cloud-init/default.nix +++ b/pkgs/tools/virtualization/cloud-init/default.nix @@ -51,6 +51,7 @@ python3.pkgs.buildPythonApplication rec { jsonschema netifaces oauthlib + pyserial pyyaml requests ]; From 83ad4f2f938ec5daf2cc8d285f28c3ab2857e543 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Jun 2022 13:07:13 +0000 Subject: [PATCH 099/245] python310Packages.deezer-python: 5.3.2 -> 5.3.3 --- pkgs/development/python-modules/deezer-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/deezer-python/default.nix b/pkgs/development/python-modules/deezer-python/default.nix index ef8b091b0c4e..850d47cd026c 100644 --- a/pkgs/development/python-modules/deezer-python/default.nix +++ b/pkgs/development/python-modules/deezer-python/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "deezer-python"; - version = "5.3.2"; + version = "5.3.3"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "browniebroke"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-lOVHSYL57hwzvdC+pJFDkDGFuu29jdZ36BYscw82uDE="; + sha256 = "sha256-eiznL23Pt7bwBLxNG8V3ITSNMnwMBjFdiGgu0cSoSw0="; }; nativeBuildInputs = [ From 0907dc851fa2e56db75ae260a8ecc9880dc7b492 Mon Sep 17 00:00:00 2001 From: Azat Bahawi Date: Sun, 5 Jun 2022 21:27:06 +0300 Subject: [PATCH 100/245] slack-term: use buildGoModule --- .../networking/instant-messengers/slack-term/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/slack-term/default.nix b/pkgs/applications/networking/instant-messengers/slack-term/default.nix index 30cc7396c562..e2135734bd7f 100644 --- a/pkgs/applications/networking/instant-messengers/slack-term/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack-term/default.nix @@ -1,18 +1,16 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { - # https://github.com/erroneousboat/slack-term +buildGoModule rec { pname = "slack-term"; version = "0.5.0"; - goPackagePath = "github.com/erroneousboat/slack-term"; - src = fetchFromGitHub { owner = "erroneousboat"; repo = "slack-term"; rev = "v${version}"; sha256 = "1fbq7bdhy70hlkklppimgdjamnk0v059pg73xm9ax1f4616ki1m6"; }; + vendorSha256 = null; meta = with lib; { description = "Slack client for your terminal"; From 1a3924b8585d08135245df975e182249f8fea925 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 7 Jun 2022 15:46:38 +0200 Subject: [PATCH 101/245] python310Packages.pysigma: 0.5.2 -> 0.6.2 --- pkgs/development/python-modules/pysigma/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pysigma/default.nix b/pkgs/development/python-modules/pysigma/default.nix index 210e90405817..17e6a27ea57d 100644 --- a/pkgs/development/python-modules/pysigma/default.nix +++ b/pkgs/development/python-modules/pysigma/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pysigma"; - version = "0.5.2"; + version = "0.6.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "SigmaHQ"; repo = "pySigma"; rev = "v${version}"; - hash = "sha256-U5jBFnWC73W9tFco5faiqGmk8K+Ig18f9HhXJ4vhhGs="; + hash = "sha256-/SZe4pzlhlkzW84WOjPOibfdznf5uLHL5RsNnT/EL9M="; }; nativeBuildInputs = [ From 0e11ec9a23d6132d86c45deb88b2a32813c48b43 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 7 Jun 2022 15:47:23 +0200 Subject: [PATCH 102/245] python310Packages.pysigma-pipeline-windows: relax pysigma constraint --- .../python-modules/pysigma-pipeline-windows/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/pysigma-pipeline-windows/default.nix b/pkgs/development/python-modules/pysigma-pipeline-windows/default.nix index ef8595fa873c..a9eda723eb2c 100644 --- a/pkgs/development/python-modules/pysigma-pipeline-windows/default.nix +++ b/pkgs/development/python-modules/pysigma-pipeline-windows/default.nix @@ -29,6 +29,11 @@ buildPythonPackage rec { pysigma ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'pysigma = "^0.5.0"' 'pysigma = "^0.6.0"' + ''; + checkInputs = [ pytestCheckHook ]; From 1fb02d2eec4e980553bd4766ff7074ed260962f8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 7 Jun 2022 15:49:05 +0200 Subject: [PATCH 103/245] python310Packages.pysigma-backend-insightidr: 0.1.5 -> 0.1.6 --- .../python-modules/pysigma-backend-insightidr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pysigma-backend-insightidr/default.nix b/pkgs/development/python-modules/pysigma-backend-insightidr/default.nix index 46346f466b20..b9d82584a503 100644 --- a/pkgs/development/python-modules/pysigma-backend-insightidr/default.nix +++ b/pkgs/development/python-modules/pysigma-backend-insightidr/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pysigma-backend-insightidr"; - version = "0.1.5"; + version = "0.1.6"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "SigmaHQ"; repo = "pySigma-backend-insightidr"; rev = "refs/tags/v${version}"; - hash = "sha256-RjBRFNMIpjW/x5vShXUgi25oOmvRlD2zP6mNQJ7sG8M="; + hash = "sha256-Sg+AYoEbCmcqxw5dl8wmQcI+lFrAfFgDnQjiQh6r9Yc="; }; nativeBuildInputs = [ From cd4f6555edd34e95d4427efb51ff6589e68cb0be Mon Sep 17 00:00:00 2001 From: Mr Hedgehog Date: Thu, 2 Jun 2022 12:02:06 -0400 Subject: [PATCH 104/245] goresym: init at 1.2 --- pkgs/development/tools/goresym/default.nix | 26 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/tools/goresym/default.nix diff --git a/pkgs/development/tools/goresym/default.nix b/pkgs/development/tools/goresym/default.nix new file mode 100644 index 000000000000..b41811689675 --- /dev/null +++ b/pkgs/development/tools/goresym/default.nix @@ -0,0 +1,26 @@ +{ stdenv, lib, fetchFromGitHub, buildGoModule }: + +buildGoModule rec { + pname = "goresym"; + version = "1.2"; + + src = fetchFromGitHub { + owner = "mandiant"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-XDy6qALE2xuOVQHuuvU/gOyTRZ/6CWpyjN3i7VmznoI="; + }; + + subPackages = [ "." ]; + + vendorSha256 = "sha256-dnQ/tP4RS6WkACobfW7jTTJSHbLrdlZDy1fmO65743Q="; + + doCheck = true; + + meta = with lib; { + description = "Go symbol recovery tool"; + homepage = "https://github.com/mandiant/GoReSym"; + license = licenses.mit; + maintainers = with maintainers; [ mrhedgehog ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a358298ae7a1..e460cfe8fe57 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23560,6 +23560,8 @@ with pkgs; gore = callPackage ../development/tools/gore { }; + goresym = callPackage ../development/tools/goresym { }; + gotests = callPackage ../development/tools/gotests { }; gotestsum = callPackage ../development/tools/gotestsum { }; From 6f0b4a92dc262f68cdf235ebe231cabff6ef4c5d Mon Sep 17 00:00:00 2001 From: Simon Schoeters Date: Sat, 4 Jun 2022 14:53:26 +0200 Subject: [PATCH 105/245] bluewalker: init at 0.3.0 --- pkgs/tools/bluetooth/bluewalker/default.nix | 29 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/tools/bluetooth/bluewalker/default.nix diff --git a/pkgs/tools/bluetooth/bluewalker/default.nix b/pkgs/tools/bluetooth/bluewalker/default.nix new file mode 100644 index 000000000000..8cdfca94e28e --- /dev/null +++ b/pkgs/tools/bluetooth/bluewalker/default.nix @@ -0,0 +1,29 @@ +{ lib, buildGoModule, fetchFromGitLab }: + +buildGoModule rec { + pname = "bluewalker"; + version = "0.3.0"; + + src = fetchFromGitLab { + owner = "jtaimisto"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-spuJRiNiaBV4EsetUq8vUfR6ejUNZxLhVzS3AZZyrrQ="; + }; + + vendorSha256 = "189qs6vmx63vwsjmc4qgf1y8xjsi7x6l1f5c3kd8j8jnagl26z4h"; + + ldflags = [ # omit some things for a smaller binary + "-w" # omit the DWARF symbol table + "-s" # omit symbol table and debug info + ]; + + meta = with lib; { + description = "Simple command line Bluetooth LE scanner"; + homepage = src.meta.homepage; + changelog = "https://gitlab.com/jtaimisto/${pname}/-/raw/master/CHANGELOG"; + license = licenses.bsd2; + maintainers = with maintainers; [ cimm ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e460cfe8fe57..5716dd88ed2e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2710,6 +2710,8 @@ with pkgs; bluemix-cli = callPackage ../tools/admin/bluemix-cli { }; + bluewalker = callPackage ../tools/bluetooth/bluewalker { }; + blur-effect = callPackage ../tools/graphics/blur-effect { }; bootiso = callPackage ../tools/cd-dvd/bootiso { }; From 55b2904c5ad89529365d957460f5558095ee9937 Mon Sep 17 00:00:00 2001 From: Simon Schoeters Date: Sat, 4 Jun 2022 14:54:35 +0200 Subject: [PATCH 106/245] Maintainers: add cimm --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index fb4b37764e7e..b4c4029925f7 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2334,6 +2334,12 @@ githubId = 3956062; name = "Simon Lackerbauer"; }; + cimm = { + email = "8k9ft8m5gv@astil.be"; + github = "cimm"; + githubId = 68112; + name = "Simon"; + }; cirno-999 = { email = "reverene@protonmail.com"; github = "cirno-999"; From 47d633a96803e6095012b10e16d7bfd50a34a245 Mon Sep 17 00:00:00 2001 From: Simon Schoeters Date: Sat, 4 Jun 2022 14:24:37 +0000 Subject: [PATCH 107/245] Remove obvious comments from ldflags Co-authored-by: Fabian Affolter --- pkgs/tools/bluetooth/bluewalker/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/bluetooth/bluewalker/default.nix b/pkgs/tools/bluetooth/bluewalker/default.nix index 8cdfca94e28e..8aa113f04513 100644 --- a/pkgs/tools/bluetooth/bluewalker/default.nix +++ b/pkgs/tools/bluetooth/bluewalker/default.nix @@ -13,9 +13,9 @@ buildGoModule rec { vendorSha256 = "189qs6vmx63vwsjmc4qgf1y8xjsi7x6l1f5c3kd8j8jnagl26z4h"; - ldflags = [ # omit some things for a smaller binary - "-w" # omit the DWARF symbol table - "-s" # omit symbol table and debug info + ldflags = [ + "-w" + "-s" ]; meta = with lib; { From 2247e925d697cdfe529ccdbb021fc6ac90fe8b92 Mon Sep 17 00:00:00 2001 From: Simon Schoeters Date: Sat, 4 Jun 2022 14:25:22 +0000 Subject: [PATCH 108/245] Add homepage URL instead of variable Co-authored-by: Fabian Affolter --- pkgs/tools/bluetooth/bluewalker/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/bluetooth/bluewalker/default.nix b/pkgs/tools/bluetooth/bluewalker/default.nix index 8aa113f04513..8063355b7059 100644 --- a/pkgs/tools/bluetooth/bluewalker/default.nix +++ b/pkgs/tools/bluetooth/bluewalker/default.nix @@ -20,7 +20,7 @@ buildGoModule rec { meta = with lib; { description = "Simple command line Bluetooth LE scanner"; - homepage = src.meta.homepage; + homepage = "https://gitlab.com/jtaimisto/bluewalker"; changelog = "https://gitlab.com/jtaimisto/${pname}/-/raw/master/CHANGELOG"; license = licenses.bsd2; maintainers = with maintainers; [ cimm ]; From 92e2442544007ab5c341ee7ad31282344f60d2cc Mon Sep 17 00:00:00 2001 From: Simon Schoeters Date: Sat, 4 Jun 2022 14:26:14 +0000 Subject: [PATCH 109/245] Point changelog to tag instead of master Co-authored-by: Fabian Affolter --- pkgs/tools/bluetooth/bluewalker/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/bluetooth/bluewalker/default.nix b/pkgs/tools/bluetooth/bluewalker/default.nix index 8063355b7059..06241b1436ae 100644 --- a/pkgs/tools/bluetooth/bluewalker/default.nix +++ b/pkgs/tools/bluetooth/bluewalker/default.nix @@ -21,7 +21,7 @@ buildGoModule rec { meta = with lib; { description = "Simple command line Bluetooth LE scanner"; homepage = "https://gitlab.com/jtaimisto/bluewalker"; - changelog = "https://gitlab.com/jtaimisto/${pname}/-/raw/master/CHANGELOG"; + changelog = "https://gitlab.com/jtaimisto/bluewalker/-/tags/v${version}"; license = licenses.bsd2; maintainers = with maintainers; [ cimm ]; platforms = platforms.linux; From 90946525f3380bdc03bb8a1f98fc3b5fcb12bc9a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 7 Jun 2022 15:56:28 +0200 Subject: [PATCH 110/245] python310Packages.pysigma-backend-splunk: 0.3.2 -> 0.3.3 --- .../python-modules/pysigma-backend-splunk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pysigma-backend-splunk/default.nix b/pkgs/development/python-modules/pysigma-backend-splunk/default.nix index a8c0b3d6ea67..b270fa79c88d 100644 --- a/pkgs/development/python-modules/pysigma-backend-splunk/default.nix +++ b/pkgs/development/python-modules/pysigma-backend-splunk/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pysigma-backend-splunk"; - version = "0.3.2"; + version = "0.3.3"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "SigmaHQ"; repo = "pySigma-backend-splunk"; rev = "v${version}"; - hash = "sha256-wcAqXFou20V2ZPOXCsF1Nky008q2xkfuI0RbTsatC6k="; + hash = "sha256-VRHrlcty3EpGnQkVJvsNWOJSW6rNE97Lqt36HmMR53A="; }; nativeBuildInputs = [ From 387cb3f84d7cf075fd9686ffc4a8ef1f6c054ed4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 7 Jun 2022 15:58:03 +0200 Subject: [PATCH 111/245] python310Packages.pysigma-pipeline-crowdstrike: 0.1.5 -> 0.1.6 --- .../python-modules/pysigma-pipeline-crowdstrike/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pysigma-pipeline-crowdstrike/default.nix b/pkgs/development/python-modules/pysigma-pipeline-crowdstrike/default.nix index 5ed92014fc2e..14129f148b19 100644 --- a/pkgs/development/python-modules/pysigma-pipeline-crowdstrike/default.nix +++ b/pkgs/development/python-modules/pysigma-pipeline-crowdstrike/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pysigma-pipeline-crowdstrike"; - version = "0.1.5"; + version = "0.1.6"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "SigmaHQ"; repo = "pySigma-pipeline-crowdstrike"; rev = "v${version}"; - hash = "sha256-TmvEWrkNu8gJ8rPFoRWd+uYob2rmmdasqxH1CYmz4Rk="; + hash = "sha256-5xX7NwM+Us0ToJa2miAw9KsCt2T+TqBnqHtwphZNxJI="; }; nativeBuildInputs = [ From 887e366f5380e57809f48d2b143a85dbbefc55b9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 7 Jun 2022 16:02:03 +0200 Subject: [PATCH 112/245] python310Packages.pysigma-pipeline-sysmon: 0.1.5 -> 0.1.6 --- .../python-modules/pysigma-pipeline-sysmon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pysigma-pipeline-sysmon/default.nix b/pkgs/development/python-modules/pysigma-pipeline-sysmon/default.nix index 26f058c3e197..d308d72d805f 100644 --- a/pkgs/development/python-modules/pysigma-pipeline-sysmon/default.nix +++ b/pkgs/development/python-modules/pysigma-pipeline-sysmon/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pysigma-pipeline-sysmon"; - version = "0.1.5"; + version = "0.1.6"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "SigmaHQ"; repo = "pySigma-pipeline-sysmon"; rev = "v${version}"; - hash = "sha256-Bh0Qh+pY22lm/0vtJC4tFIl1KRF3zFQ8vcH0JEfYGAc="; + hash = "sha256-hKXnM3iqt6PnV+cMV3gEleBChd263sy2DovpIKg22fs="; }; nativeBuildInputs = [ From e78c2d05da0cd52fecc82db63a3002ae76859fce Mon Sep 17 00:00:00 2001 From: Daniel Poelzleithner Date: Mon, 16 May 2022 11:10:16 +0200 Subject: [PATCH 113/245] hedgedoc: ensure upload directory exists Upload directory is not created when uploading, but will fail silently. Ensure the upload directory is created. --- nixos/modules/services/web-apps/hedgedoc.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/web-apps/hedgedoc.nix b/nixos/modules/services/web-apps/hedgedoc.nix index 13893cbf005a..22270609dbcc 100644 --- a/nixos/modules/services/web-apps/hedgedoc.nix +++ b/nixos/modules/services/web-apps/hedgedoc.nix @@ -1027,6 +1027,7 @@ in ${pkgs.envsubst}/bin/envsubst \ -o ${cfg.workDir}/config.json \ -i ${prettyJSON cfg.configuration} + mkdir -p ${cfg.configuration.uploadsPath} ''; serviceConfig = { WorkingDirectory = cfg.workDir; From 311f2101d900befde5ff41b4fb71bfc99cf618ba Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 7 Jun 2022 16:14:14 +0200 Subject: [PATCH 114/245] sigma-cli: relax pysigma constraint --- pkgs/tools/security/sigma-cli/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/security/sigma-cli/default.nix b/pkgs/tools/security/sigma-cli/default.nix index 6f2ac26ebdc2..5a3ed90a4182 100644 --- a/pkgs/tools/security/sigma-cli/default.nix +++ b/pkgs/tools/security/sigma-cli/default.nix @@ -36,7 +36,8 @@ python3.pkgs.buildPythonApplication rec { postPatch = '' substituteInPlace pyproject.toml \ - --replace 'prettytable = "^3.1.1"' 'prettytable = "*"' + --replace 'prettytable = "^3.1.1"' 'prettytable = "*"' \ + --replace 'pysigma = "^0.5.0"' 'pysigma = "*"' ''; pythonImportsCheck = [ From 5c43c429b7ac1d006749c10e05a4a5e132885c64 Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Sat, 16 Apr 2022 14:02:54 +0200 Subject: [PATCH 115/245] glances: 3.2.4.2 -> 3.2.5 --- pkgs/applications/system/glances/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/system/glances/default.nix b/pkgs/applications/system/glances/default.nix index b25065c5f1ff..b7e4cad122d7 100644 --- a/pkgs/applications/system/glances/default.nix +++ b/pkgs/applications/system/glances/default.nix @@ -9,14 +9,14 @@ buildPythonApplication rec { pname = "glances"; - version = "3.2.4.2"; + version = "3.2.5"; disabled = isPyPy; src = fetchFromGitHub { owner = "nicolargo"; repo = "glances"; rev = "v${version}"; - sha256 = "0gql61lrav3f7wbsvgc1d6vf8r0xi5xs9rz9d3sqw3wj5m90w0vq"; + sha256 = "sha256-kTnUP7WvmEw4VazjLrGb0FhSdz+/OadzgwDXs1SA02o="; }; # Some tests fail in the sandbox (they e.g. require access to /sys/class/power_supply): From 570d347c2ebf515bce37450bfd0e3bbf3746a9c1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Jun 2022 14:28:49 +0000 Subject: [PATCH 116/245] python310Packages.fakeredis: 1.8 -> 1.8.1 --- pkgs/development/python-modules/fakeredis/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/fakeredis/default.nix b/pkgs/development/python-modules/fakeredis/default.nix index b42ecc5bd261..02f0d4927951 100644 --- a/pkgs/development/python-modules/fakeredis/default.nix +++ b/pkgs/development/python-modules/fakeredis/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "fakeredis"; - version = "1.8"; + version = "1.8.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,8 +24,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "dsoftwareinc"; repo = "fakeredis-py"; - rev = "v${version}"; - hash = "sha256-HWt2EE25h8zUarknrNMBJmizP3rNM9W8IEUMxLyUii8="; + rev = "refs/tags/v${version}"; + hash = "sha256-gmQuQIlpE4PdgZ1J5aucSQkJpfrh1qTJNLfyI+cMCJU="; }; nativeBuildInputs = [ From 56d2f848b141e3c458e8da826e57be974afe420b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81tila=20Saraiva?= Date: Tue, 7 Jun 2022 11:38:00 -0300 Subject: [PATCH 117/245] obsidian: 0.14.6 -> 0.14.15 --- pkgs/applications/misc/obsidian/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/obsidian/default.nix b/pkgs/applications/misc/obsidian/default.nix index 8daf50f82e70..8e7acbe8223d 100644 --- a/pkgs/applications/misc/obsidian/default.nix +++ b/pkgs/applications/misc/obsidian/default.nix @@ -12,7 +12,7 @@ let inherit (stdenv.hostPlatform) system; pname = "obsidian"; - version = "0.14.6"; + version = "0.14.15"; appname = "Obsidian"; meta = with lib; { description = "A powerful knowledge base that works on top of a local folder of plain text Markdown files"; @@ -25,7 +25,7 @@ let filename = if stdenv.isDarwin then "Obsidian-${version}-universal.dmg" else "obsidian-${version}.tar.gz"; src = fetchurl { url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/${filename}"; - sha256 = if stdenv.isDarwin then "1zzccwlim3gi6f5czzyddqjzy1xsk6ayx1hljhw6bmnid72km3q2" else "sha256-KieAE13SIYHDoXTqzk1QY+TPjwF9LRzlfm1yFg9hsTc="; + sha256 = if stdenv.isDarwin then "10c5255nbgqiigcwq6kmhzcgafq91k25wnxj3jxabzc0hs7pn4m5" else "sha256-bSLt4EnlCtxZeKIahr618qMuK9ogUhxn+NKO2GPkjOQ="; }; icon = fetchurl { From e93823409f9e6b8e878edf060b430a14353a28f9 Mon Sep 17 00:00:00 2001 From: Georg Haas Date: Wed, 11 May 2022 11:54:05 +0200 Subject: [PATCH 118/245] wireshark: 3.6.3 -> 3.6.5 Changelogs: - https://www.wireshark.org/docs/relnotes/wireshark-3.6.4.html - https://www.wireshark.org/docs/relnotes/wireshark-3.6.5.html --- pkgs/applications/networking/sniffers/wireshark/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index 0947686144e5..b74905586192 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -11,7 +11,7 @@ assert withQt -> qt5 != null; with lib; let - version = "3.6.3"; + version = "3.6.5"; variant = if withQt then "qt" else "cli"; in stdenv.mkDerivation { @@ -21,7 +21,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "https://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz"; - sha256 = "sha256-tgNkpMAGihCBGrP9B1ymwesOddRGACcbiKIO2Tou9jE="; + sha256 = "sha256-otdB1g/zUWE31LnzjNwH7uVKVuw2BG9MOv7mv7T26qE="; }; cmakeFlags = [ From ee3b1e9a42b4024581fa2233529d06177137e2a5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Jun 2022 14:46:33 +0000 Subject: [PATCH 119/245] python310Packages.google-cloud-os-config: 1.11.1 -> 1.11.2 --- .../python-modules/google-cloud-os-config/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-os-config/default.nix b/pkgs/development/python-modules/google-cloud-os-config/default.nix index 6f6223f1be98..d2235b44cf60 100644 --- a/pkgs/development/python-modules/google-cloud-os-config/default.nix +++ b/pkgs/development/python-modules/google-cloud-os-config/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "google-cloud-os-config"; - version = "1.11.1"; + version = "1.11.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-i4STXwnFyfXauRx4zvYMO1uWMechvNUOxolOcY3Z5us="; + sha256 = "sha256-n3bCKr+fszqHsi6uDmOXSfzoPP8JfpZRAGXIzE3gOVU="; }; propagatedBuildInputs = [ google-api-core libcst proto-plus ]; From 43d4ddf28e0facf1e5b8e8cb3cd86871d250ab03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 7 Jun 2022 16:57:06 +0200 Subject: [PATCH 120/245] treewide: remove usage of runCommandNoCC aliases --- nixos/modules/hardware/gpgsmartcards.nix | 2 +- nixos/modules/programs/captive-browser.nix | 2 +- pkgs/build-support/trivial-builders.nix | 1 - pkgs/development/tools/rust/rust-analyzer/test-neovim-lsp.nix | 4 ++-- pkgs/pkgs-lib/formats.nix | 2 +- 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/nixos/modules/hardware/gpgsmartcards.nix b/nixos/modules/hardware/gpgsmartcards.nix index 6e5fcda6b851..4c1d0cc5b2a3 100644 --- a/nixos/modules/hardware/gpgsmartcards.nix +++ b/nixos/modules/hardware/gpgsmartcards.nix @@ -19,7 +19,7 @@ let # per debian's udev deb hook (https://man7.org/linux/man-pages/man1/dh_installudev.1.html) destination = "60-scdaemon.rules"; - scdaemonUdevRulesPkg = pkgs.runCommandNoCC "scdaemon-udev-rules" {} '' + scdaemonUdevRulesPkg = pkgs.runCommand "scdaemon-udev-rules" {} '' loc="$out/lib/udev/rules.d/" mkdir -p "''${loc}" cp "${scdaemonRules}" "''${loc}/${destination}" diff --git a/nixos/modules/programs/captive-browser.nix b/nixos/modules/programs/captive-browser.nix index aad554c2bd66..1e5c6ff9b244 100644 --- a/nixos/modules/programs/captive-browser.nix +++ b/nixos/modules/programs/captive-browser.nix @@ -98,7 +98,7 @@ in config = mkIf cfg.enable { environment.systemPackages = [ - (pkgs.runCommandNoCC "captive-browser-desktop-item" { } '' + (pkgs.runCommand "captive-browser-desktop-item" { } '' install -Dm444 -t $out/share/applications ${desktopItem}/share/applications/*.desktop '') ]; diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix index 1e04c9b0e293..c889b3865f65 100644 --- a/pkgs/build-support/trivial-builders.nix +++ b/pkgs/build-support/trivial-builders.nix @@ -10,7 +10,6 @@ rec { * * Examples: * runCommand "name" {envVariable = true;} ''echo hello > $out'' - * runCommandNoCC "name" {envVariable = true;} ''echo hello > $out'' # equivalent to prior * runCommandCC "name" {} ''gcc -o myfile myfile.c; cp myfile $out''; * * The `*Local` variants force a derivation to be built locally, diff --git a/pkgs/development/tools/rust/rust-analyzer/test-neovim-lsp.nix b/pkgs/development/tools/rust/rust-analyzer/test-neovim-lsp.nix index 6782a7418a68..963e134075ed 100644 --- a/pkgs/development/tools/rust/rust-analyzer/test-neovim-lsp.nix +++ b/pkgs/development/tools/rust/rust-analyzer/test-neovim-lsp.nix @@ -1,5 +1,5 @@ -{ runCommandNoCC, cargo, neovim, rust-analyzer, rustc }: -runCommandNoCC "test-neovim-rust-analyzer" { +{ runCommand, cargo, neovim, rust-analyzer, rustc }: +runCommand "test-neovim-rust-analyzer" { nativeBuildInputs = [ cargo neovim rust-analyzer rustc ]; testRustSrc = /* rust */ '' diff --git a/pkgs/pkgs-lib/formats.nix b/pkgs/pkgs-lib/formats.nix index cb46b63dd0c4..fc52128a7e99 100644 --- a/pkgs/pkgs-lib/formats.nix +++ b/pkgs/pkgs-lib/formats.nix @@ -357,7 +357,7 @@ rec { } // lib.mapAttrs (_name: type: elixirOr type) lib.types; }; - generate = name: value: pkgs.runCommandNoCC name + generate = name: value: pkgs.runCommand name { value = toConf value; passAsFile = [ "value" ]; From b46f168b21b5568134ec389f6be35c4a05ecf632 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Jun 2022 15:22:45 +0000 Subject: [PATCH 121/245] python310Packages.google-cloud-tasks: 2.9.0 -> 2.9.1 --- .../development/python-modules/google-cloud-tasks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-tasks/default.nix b/pkgs/development/python-modules/google-cloud-tasks/default.nix index 6bc9353262fa..7f4c31419839 100644 --- a/pkgs/development/python-modules/google-cloud-tasks/default.nix +++ b/pkgs/development/python-modules/google-cloud-tasks/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-tasks"; - version = "2.9.0"; + version = "2.9.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-MjXGDlqRDFn2whxnEm1lf0G+vU9U/S3BmNvi47aEJro="; + sha256 = "sha256-wIO22BScrDJdbia6oOEuuXptedxrCehqWKLXmxTJmKE="; }; propagatedBuildInputs = [ google-api-core grpc-google-iam-v1 libcst proto-plus ]; From 3e7621390c2f59a54fef2222f4bfab46cb534936 Mon Sep 17 00:00:00 2001 From: Mr Hedgehog Date: Tue, 7 Jun 2022 11:28:49 -0400 Subject: [PATCH 122/245] maintainers: mrhedgehog -> thehedgeh0g --- maintainers/maintainer-list.nix | 22 +++++++++---------- .../misc/sway-launcher-desktop/default.nix | 2 +- pkgs/development/tools/goresym/default.nix | 2 +- pkgs/shells/fish/plugins/hydro.nix | 2 +- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index b4c4029925f7..38c74580f514 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8799,17 +8799,6 @@ githubId = 3073833; name = "Massimo Redaelli"; }; - mrhedgehog = { - name = "Mr Hedgehog"; - email = "hedgehog@mrhedgehog.xyz"; - matrix = "@mrhedgehog:jupiterbroadcasting.com"; - github = "ModdedGamers"; - githubId = 35778371; - keys = [{ - longkeyid = "rsa4096/0x7D5107866B1C6752"; - fingerprint = "38A0 29B0 4A7E 4C13 A4BB 86C8 7D51 0786 6B1C 6752"; - }]; - }; mrkkrp = { email = "markkarpov92@gmail.com"; github = "mrkkrp"; @@ -12779,6 +12768,17 @@ githubId = 8547242; name = "Stefan Rohrbacher"; }; + thehedgeh0g = { + name = "The Hedgehog"; + email = "hedgehog@mrhedgehog.xyz"; + matrix = "@mrhedgehog:jupiterbroadcasting.com"; + github = "ModdedGamers"; + githubId = 35778371; + keys = [{ + longkeyid = "rsa4096/0x7D5107866B1C6752"; + fingerprint = "38A0 29B0 4A7E 4C13 A4BB 86C8 7D51 0786 6B1C 6752"; + }]; + }; thelegy = { email = "mail+nixos@0jb.de"; github = "thelegy"; diff --git a/pkgs/applications/misc/sway-launcher-desktop/default.nix b/pkgs/applications/misc/sway-launcher-desktop/default.nix index 7955e5c8ce1d..b67122965234 100644 --- a/pkgs/applications/misc/sway-launcher-desktop/default.nix +++ b/pkgs/applications/misc/sway-launcher-desktop/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { changelog = "https://github.com/Biont/sway-launcher-desktop/releases/tag/v${version}"; license = licenses.gpl3; platforms = platforms.linux; - maintainers = [ maintainers.mrhedgehog ]; + maintainers = [ maintainers.thehedgeh0g ]; mainProgram = "${pname}"; }; } diff --git a/pkgs/development/tools/goresym/default.nix b/pkgs/development/tools/goresym/default.nix index b41811689675..199d3f468f05 100644 --- a/pkgs/development/tools/goresym/default.nix +++ b/pkgs/development/tools/goresym/default.nix @@ -21,6 +21,6 @@ buildGoModule rec { description = "Go symbol recovery tool"; homepage = "https://github.com/mandiant/GoReSym"; license = licenses.mit; - maintainers = with maintainers; [ mrhedgehog ]; + maintainers = with maintainers; [ thehedgeh0g ]; }; } diff --git a/pkgs/shells/fish/plugins/hydro.nix b/pkgs/shells/fish/plugins/hydro.nix index eddb88a225d2..cd8705d54716 100644 --- a/pkgs/shells/fish/plugins/hydro.nix +++ b/pkgs/shells/fish/plugins/hydro.nix @@ -15,6 +15,6 @@ buildFishPlugin rec { description = "Ultra-pure, lag-free prompt with async Git status"; homepage = "https://github.com/jorgebucaran/hydro"; license = licenses.mit; - maintainers = with maintainers; [ mrhedgehog ]; + maintainers = with maintainers; [ thehedgeh0g ]; }; } From ae9f904eb26abb6b0ff871437bf8015a80f32e9f Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 7 Jun 2022 17:33:02 +0200 Subject: [PATCH 123/245] =?UTF-8?q?gajim:=201.4.2=20=E2=86=92=201.4.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/instant-messengers/gajim/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index 3f26cfc4f6d3..7c18ebf763c8 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -22,11 +22,11 @@ python3.pkgs.buildPythonApplication rec { pname = "gajim"; - version = "1.4.2"; + version = "1.4.3"; src = fetchurl { url = "https://gajim.org/downloads/${lib.versions.majorMinor version}/gajim-${version}.tar.gz"; - sha256 = "sha256:151lbz9092z8r2yva5039g867chcid3n804jk7hjawrd9vnw81az"; + sha256 = "sha256:0n6v96pwgds8655877fjgsphq4rd4gb9mz7cbqp4nkd4m7kvr3xv"; }; buildInputs = [ From 7881466e3a9a9a13ac7bd02e4c092fc570929503 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Mon, 6 Jun 2022 12:47:46 +0200 Subject: [PATCH 124/245] gnome-secrets: 6.4 -> 6.5 --- pkgs/applications/misc/gnome-secrets/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/gnome-secrets/default.nix b/pkgs/applications/misc/gnome-secrets/default.nix index f937b1230266..6052cf70facb 100644 --- a/pkgs/applications/misc/gnome-secrets/default.nix +++ b/pkgs/applications/misc/gnome-secrets/default.nix @@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec { pname = "gnome-secrets"; - version = "6.4"; + version = "6.5"; format = "other"; strictDeps = false; # https://github.com/NixOS/nixpkgs/issues/56943 @@ -25,7 +25,7 @@ python3Packages.buildPythonApplication rec { owner = "World"; repo = "secrets"; rev = version; - sha256 = "sha256-qO2DJ/Eb9+G1R3un2+n9Tf6oxpGrEuH3SBrajQ9tCPU="; + sha256 = "sha256-Hy2W7cvvzVcKtd/KzTn81awoolnfM3ST0Nm70YBLTYY="; }; nativeBuildInputs = [ From 0922df19a0129eaf345e8c578409024758ab266f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Jun 2022 15:36:16 +0000 Subject: [PATCH 125/245] python310Packages.sagemaker: 2.93.0 -> 2.93.1 --- pkgs/development/python-modules/sagemaker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sagemaker/default.nix b/pkgs/development/python-modules/sagemaker/default.nix index 979eb71d7c4a..2976f89e9c6e 100644 --- a/pkgs/development/python-modules/sagemaker/default.nix +++ b/pkgs/development/python-modules/sagemaker/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "sagemaker"; - version = "2.93.0"; + version = "2.93.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-rVEYiX0e7dP2CQK4ceEPZu395vas69aZkQzJCana53c="; + hash = "sha256-EzIJ9+eo5eaXu4TdsvktHtA/wuqr8HUMqsl2pGyvs40="; }; propagatedBuildInputs = [ From d55e34392a6bafb78e83d839d374b1263321b131 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Jun 2022 15:43:02 +0000 Subject: [PATCH 126/245] python310Packages.google-cloud-texttospeech: 2.11.0 -> 2.11.1 --- .../python-modules/google-cloud-texttospeech/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-texttospeech/default.nix b/pkgs/development/python-modules/google-cloud-texttospeech/default.nix index a7c49f0cabe9..92d2272440e9 100644 --- a/pkgs/development/python-modules/google-cloud-texttospeech/default.nix +++ b/pkgs/development/python-modules/google-cloud-texttospeech/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-texttospeech"; - version = "2.11.0"; + version = "2.11.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-UJSP3a9G6k1arMpoh4/rWrnR4gYtPW6d6LGwWuk5WGg="; + sha256 = "sha256-4I7zmjZMjXjkxjEtwWNbev0ryTOIyOWsVkC46tgRyqc="; }; propagatedBuildInputs = [ libcst google-api-core proto-plus ]; From 44ad98c77b4c2f80ae30904d0f92623ec2462bd4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Jun 2022 15:46:55 +0000 Subject: [PATCH 127/245] python310Packages.google-cloud-asset: 3.9.0 -> 3.9.1 --- .../development/python-modules/google-cloud-asset/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-asset/default.nix b/pkgs/development/python-modules/google-cloud-asset/default.nix index 0e8281f41847..63b989f4faf0 100644 --- a/pkgs/development/python-modules/google-cloud-asset/default.nix +++ b/pkgs/development/python-modules/google-cloud-asset/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "google-cloud-asset"; - version = "3.9.0"; + version = "3.9.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-DMRBAzGlByjcdLr/HnVxFxbNWK1TbYFpYKEjDdzfEeg="; + hash = "sha256-rGN3P4EfSs7bLLca4Y2J1jF1/wPR5Oc1d6iZFjeQHTM="; }; propagatedBuildInputs = [ From bda2cc918684680a4cc6783c741b5fbd311b78aa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Jun 2022 15:51:42 +0000 Subject: [PATCH 128/245] python310Packages.google-cloud-bigquery-datatransfer: 3.6.1 -> 3.6.2 --- .../google-cloud-bigquery-datatransfer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix b/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix index 2717af605ef3..8f1266e92f52 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-bigquery-datatransfer"; - version = "3.6.1"; + version = "3.6.2"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-hR5qHucBpq1LS9pIZeovcPMiVbw3dhSeeJxkYH8xuMk="; + hash = "sha256-y8W0qwm4rTHlDO8L+/fhIJlfW5PonUhAYBU5wLIZJ94="; }; propagatedBuildInputs = [ From c383e4e4d9001ef0939add3bcc4229f56e247834 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Jun 2022 15:55:57 +0000 Subject: [PATCH 129/245] python310Packages.google-cloud-bigquery-logging: 1.0.2 -> 1.0.3 --- .../python-modules/google-cloud-bigquery-logging/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix b/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix index c26d7582c23d..59859e4ccea7 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-bigquery-logging"; - version = "1.0.2"; + version = "1.0.3"; src = fetchPypi { inherit pname version; - sha256 = "sha256-i8Bh39MnQRQtE4WwDNhHdxFX2bGL6txT+sV8RcvXiZw="; + sha256 = "sha256-hIwKcQNPG6AHudqjy2dotACk51IeivwRbJZZaiFweqs="; }; propagatedBuildInputs = [ From bafb8c89c2e93826ad98a78277a95390541f3a94 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Jun 2022 16:00:12 +0000 Subject: [PATCH 130/245] python310Packages.google-cloud-bigquery-storage: 2.13.1 -> 2.13.2 --- .../python-modules/google-cloud-bigquery-storage/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix b/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix index 1b59bc8ddbf8..e013cac9f610 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "google-cloud-bigquery-storage"; - version = "2.13.1"; + version = "2.13.2"; src = fetchPypi { inherit pname version; - sha256 = "7a25148f635a04ca9ff568d47e64be275d3a4a3c90772524879e8f88f270d92d"; + sha256 = "sha256-rEznNOgFrKfnOmlhexTTHmkKETRGE26SKSp04diz47I="; }; propagatedBuildInputs = [ From 0d1a23594c00e0ec9da12fda282d324564178aef Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Jun 2022 16:05:16 +0000 Subject: [PATCH 131/245] python310Packages.google-cloud-container: 2.10.7 -> 2.10.8 --- .../python-modules/google-cloud-container/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-container/default.nix b/pkgs/development/python-modules/google-cloud-container/default.nix index ae3c6a8be74a..41b85f50a43e 100644 --- a/pkgs/development/python-modules/google-cloud-container/default.nix +++ b/pkgs/development/python-modules/google-cloud-container/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-container"; - version = "2.10.7"; + version = "2.10.8"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-I3oYldj915GBCX5VLEZRqGS7jMHWasQGVIvj50EUTK4="; + hash = "sha256-cQ5wFAwgqT2NT+jTfsg13wA7OOq8bk/QIRiIsK2ZyJ0="; }; propagatedBuildInputs = [ From b0e0d8db46b23971a5426104e438daa5f4ef0040 Mon Sep 17 00:00:00 2001 From: Azat Bahawi Date: Tue, 7 Jun 2022 19:06:45 +0300 Subject: [PATCH 132/245] webhook: use buildGoModule --- pkgs/servers/http/webhook/default.nix | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/pkgs/servers/http/webhook/default.nix b/pkgs/servers/http/webhook/default.nix index 0d9fb54396b5..c19866cf8d87 100644 --- a/pkgs/servers/http/webhook/default.nix +++ b/pkgs/servers/http/webhook/default.nix @@ -1,12 +1,12 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib +, buildGoModule +, fetchFromGitHub +}: -buildGoPackage rec { +buildGoModule rec { pname = "webhook"; version = "2.8.0"; - goPackagePath = "github.com/adnanh/webhook"; - excludedPackages = [ "test" ]; - src = fetchFromGitHub { owner = "adnanh"; repo = "webhook"; @@ -14,9 +14,16 @@ buildGoPackage rec { sha256 = "0n03xkgwpzans0cymmzb0iiks8mi2c76xxdak780dk0jbv6qgp5i"; }; + vendorSha256 = null; + + subPackages = [ "." ]; + + doCheck = false; + meta = with lib; { + description = "Incoming webhook server that executes shell commands"; homepage = "https://github.com/adnanh/webhook"; - license = [ licenses.mit ]; - description = "incoming webhook server that executes shell commands"; + license = licenses.mit; + maintainers = with maintainers; [ azahi ]; }; } From cc7252bc3f21b43fa60835630505c5682da40f6b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Jun 2022 16:09:49 +0000 Subject: [PATCH 133/245] python310Packages.google-cloud-datacatalog: 3.8.0 -> 3.8.1 --- .../python-modules/google-cloud-datacatalog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-datacatalog/default.nix b/pkgs/development/python-modules/google-cloud-datacatalog/default.nix index 304899f0c8ae..f38b604ddb39 100644 --- a/pkgs/development/python-modules/google-cloud-datacatalog/default.nix +++ b/pkgs/development/python-modules/google-cloud-datacatalog/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-datacatalog"; - version = "3.8.0"; + version = "3.8.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-kGYfdvAnvdFm/1u0CS+n6rGKhV5GtGhW1zF7SVUu8PY="; + hash = "sha256-t7kFCkyH3/MNGFX8S4OzgWnW/NSomAFDbDPCx9hV40g="; }; propagatedBuildInputs = [ From fac18419430ebf3da016be13bdee23e175960b1e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Jun 2022 16:14:45 +0000 Subject: [PATCH 134/245] python310Packages.google-cloud-dataproc: 4.0.2 -> 4.0.3 --- .../python-modules/google-cloud-dataproc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-dataproc/default.nix b/pkgs/development/python-modules/google-cloud-dataproc/default.nix index 88d4e0bd6620..05b61dd958d2 100644 --- a/pkgs/development/python-modules/google-cloud-dataproc/default.nix +++ b/pkgs/development/python-modules/google-cloud-dataproc/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-cloud-dataproc"; - version = "4.0.2"; + version = "4.0.3"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-C2hAkWSb3h+lFC3pUIHlttme44Ugfae8opmFQbVWYTE="; + sha256 = "sha256-9PqMYqZpcy+Lv/3sh5Ru0X0wQWW5VW7CDsFGgHvErpU="; }; propagatedBuildInputs = [ From f43b25729d7bb4bfb4077468a9e99f99af00de7f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 7 Jun 2022 09:18:37 -0700 Subject: [PATCH 135/245] oh-my-zsh: 2022-06-05 -> 2022-06-06 (#176675) --- pkgs/shells/zsh/oh-my-zsh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index 70e296196b2e..60bf482a82e1 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -5,15 +5,15 @@ , git, nix, nixfmt, jq, coreutils, gnused, curl, cacert, bash }: stdenv.mkDerivation rec { - version = "2022-06-05"; + version = "2022-06-06"; pname = "oh-my-zsh"; - rev = "6622210d7d4afe859f11c5d50c177bd5e500f2c6"; + rev = "d41ca84af1271e8bfbe26f581cebe3b86521d0db"; src = fetchFromGitHub { inherit rev; owner = "ohmyzsh"; repo = "ohmyzsh"; - sha256 = "3+3ekdryhiILou+8yJpq7axS2PEHDCWnBCQ5373m1uo="; + sha256 = "87jAe5cEPj6e1raovj8sD4LZB1sfrSZkCleW8of2HP8="; }; strictDeps = true; From a3bd84cddeb5107def7242950896a1f091341740 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Jun 2022 16:19:21 +0000 Subject: [PATCH 136/245] python310Packages.google-cloud-datastore: 2.6.1 -> 2.6.2 --- .../python-modules/google-cloud-datastore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-datastore/default.nix b/pkgs/development/python-modules/google-cloud-datastore/default.nix index 73c887748a04..2a04cca972f9 100644 --- a/pkgs/development/python-modules/google-cloud-datastore/default.nix +++ b/pkgs/development/python-modules/google-cloud-datastore/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "google-cloud-datastore"; - version = "2.6.1"; + version = "2.6.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-2ItUrY5oMTtWig2UIC2IEOKgaaYsVuy9ralDitzQzdc="; + sha256 = "sha256-Ie/SyTY8AkmDXRKWwZiukD76HpwJEtp7IBusWj+Y4HE="; }; propagatedBuildInputs = [ From 771ec20c06de11939bfe86426aa420fa4d6778a1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Jun 2022 16:23:48 +0000 Subject: [PATCH 137/245] python310Packages.google-cloud-dlp: 3.7.0 -> 3.7.1 --- pkgs/development/python-modules/google-cloud-dlp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-dlp/default.nix b/pkgs/development/python-modules/google-cloud-dlp/default.nix index 5dfc97686530..279893faf33e 100644 --- a/pkgs/development/python-modules/google-cloud-dlp/default.nix +++ b/pkgs/development/python-modules/google-cloud-dlp/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-dlp"; - version = "3.7.0"; + version = "3.7.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-aUabWEz+ou12Lgys7PZnldjHnifPWPPqO8iJqkDgx9U="; + hash = "sha256-q2I3ku8f55rSJQE5oiDttQOJFYtGPjmrW7htrZ+BMPU="; }; propagatedBuildInputs = [ From 879a72800537ee5fef99ec7e8955f6ac43675c57 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Jun 2022 16:28:15 +0000 Subject: [PATCH 138/245] python310Packages.google-cloud-error-reporting: 1.5.2 -> 1.5.3 --- .../python-modules/google-cloud-error-reporting/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-error-reporting/default.nix b/pkgs/development/python-modules/google-cloud-error-reporting/default.nix index 7ae7babaebf5..67351536ad7c 100644 --- a/pkgs/development/python-modules/google-cloud-error-reporting/default.nix +++ b/pkgs/development/python-modules/google-cloud-error-reporting/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-error-reporting"; - version = "1.5.2"; + version = "1.5.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-wjRUPBZwyGP+2528vZ/x4EqiZwqH+9ZvK5rx4ISklHE="; + hash = "sha256-J+MzM6aaVy4xmlNUFhSOgAomT007p3ODYVXN71UmZJA="; }; propagatedBuildInputs = [ From c2d7efbc09691c456c65ef2fd6ce27b5f93d014e Mon Sep 17 00:00:00 2001 From: Patrick Jackson Date: Tue, 7 Jun 2022 08:41:29 -0700 Subject: [PATCH 139/245] textadept11: add alias to textadept --- pkgs/top-level/aliases.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 68dc5bfb37dc..2707fce25485 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1354,6 +1354,7 @@ mapAliases ({ tex-gyre-pagella-math = throw "'tex-gyre-pagella-math' has been renamed to/replaced by 'tex-gyre-math.pagella'"; # Converted to throw 2022-02-22 tex-gyre-schola-math = throw "'tex-gyre-schola-math' has been renamed to/replaced by 'tex-gyre-math.schola'"; # Converted to throw 2022-02-22 tex-gyre-termes-math = throw "'tex-gyre-termes-math' has been renamed to/replaced by 'tex-gyre-math.termes'"; # Converted to throw 2022-02-22 + textadept11 = textadept; # Added 2022-06-07 tftp_hpa = throw "'tftp_hpa' has been renamed to/replaced by 'tftp-hpa'"; # Converted to throw 2022-02-22 thunderbird-68 = throw "Thunderbird 68 reached end of life with its final release 68.12.0 on 2020-08-25"; thunderbird-bin-68 = thunderbird-68; From 6dd563f949e844a6d5935b60f410f1d3581cc84a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Jun 2022 16:32:40 +0000 Subject: [PATCH 140/245] python310Packages.google-cloud-iam: 2.6.1 -> 2.6.2 --- pkgs/development/python-modules/google-cloud-iam/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-iam/default.nix b/pkgs/development/python-modules/google-cloud-iam/default.nix index 26c89af2addb..c1d6152297fb 100644 --- a/pkgs/development/python-modules/google-cloud-iam/default.nix +++ b/pkgs/development/python-modules/google-cloud-iam/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "google-cloud-iam"; - version = "2.6.1"; + version = "2.6.2"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-c1XPE5PBDXRgpiKGBfAhHB6yTPyvby3aZ5nF40+qFiQ="; + sha256 = "sha256-IOl5ZWekpiikOOMQ/afryiP+0lPLt4idSmVARRJj8LE="; }; propagatedBuildInputs = [ google-api-core libcst proto-plus ]; From 20f251ffc862891dd971ec850622e5d3c9648b54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 5 Jun 2022 18:27:08 +0000 Subject: [PATCH 141/245] torchat: remove --- .../instant-messengers/torchat/default.nix | 40 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 3 files changed, 1 insertion(+), 42 deletions(-) delete mode 100644 pkgs/applications/networking/instant-messengers/torchat/default.nix diff --git a/pkgs/applications/networking/instant-messengers/torchat/default.nix b/pkgs/applications/networking/instant-messengers/torchat/default.nix deleted file mode 100644 index 224a70ce9f72..000000000000 --- a/pkgs/applications/networking/instant-messengers/torchat/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, python2, unzip, tor }: - -stdenv.mkDerivation rec { - pname = "torchat"; - version = "0.9.9.553"; - - src = fetchFromGitHub { - owner = "prof7bit"; - repo = "TorChat"; - rev = version; - sha256 = "2LHG9qxZDo5rV6wsputdRo2Y1aHs+irMwt1ucFnXQE0="; - }; - - nativeBuildInputs = [ unzip ]; - buildInputs = with python2.pkgs; [ python wxPython wrapPython ]; - pythonPath = with python2.pkgs; [ wxPython ]; - - preConfigure = "cd torchat/src; rm portable.txt"; - - installPhase = '' - substituteInPlace "Tor/tor.sh" --replace "tor -f" "${tor}/bin/tor -f" - - wrapPythonPrograms - - mkdir -p $out/lib/torchat - cp -rf * $out/lib/torchat - makeWrapper ${python2}/bin/python $out/bin/torchat \ - --set PYTHONPATH $out/lib/torchat:$program_PYTHONPATH \ - --chdir "$out/lib/torchat" \ - --add-flags "-O $out/lib/torchat/torchat.py" - ''; - - meta = with lib; { - homepage = "https://github.com/prof7bit/TorChat"; - description = "Instant messaging application on top of the Tor network and it's location hidden services"; - license = licenses.gpl3; - maintainers = [ ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 68dc5bfb37dc..377b16558ed9 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1587,6 +1587,7 @@ mapAliases ({ todolist = throw "todolist is now ultralist"; # Added 2020-12-27 tor-browser-bundle = throw "tor-browser-bundle was removed because it was out of date and inadequately maintained. Please use tor-browser-bundle-bin instead"; # Added 2020-01-10 tor-browser-unwrapped = throw "tor-browser-unwrapped was removed because it was out of date and inadequately maintained. Please use tor-browser-bundle-bin instead"; # Added 2020-01-10 + torchat = throw "torchat was removed because it was broken and requires Python 2"; # added 2022-06-05 ttyrec = ovh-ttyrec; # Added 2021-01-02 zplugin = zinit; # Added 2021-01-30 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5716dd88ed2e..58f8758fe164 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30073,8 +30073,6 @@ with pkgs; topydo = callPackage ../applications/misc/topydo {}; - torchat = callPackage ../applications/networking/instant-messengers/torchat { }; - torrential = callPackage ../applications/networking/p2p/torrential { }; tortoisehg = callPackage ../applications/version-management/tortoisehg { }; From 4fcb482cf33fb7175703e1b3ffed825188e2e420 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 5 Jun 2022 18:35:56 +0000 Subject: [PATCH 142/245] salut_a_toi: remove --- .../salut-a-toi/default.nix | 60 ----------------- .../salut-a-toi/requirements.nix | 67 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 4 files changed, 1 insertion(+), 129 deletions(-) delete mode 100644 pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix delete mode 100644 pkgs/applications/networking/instant-messengers/salut-a-toi/requirements.nix diff --git a/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix b/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix deleted file mode 100644 index 6a6302e74955..000000000000 --- a/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ lib, stdenv, fetchurl, python27Packages, file }: - -let - inherit (python27Packages) python; - requirements = (import ./requirements.nix { - inherit lib fetchurl; - pythonPackages = python27Packages; - }); - -in - stdenv.mkDerivation rec { - pname = "salut-a-toi"; - version = "0.6.1"; - - src = fetchurl { - url = "ftp://ftp.goffi.org/sat/sat-${version}.tar.bz2"; - sha256 = "0kn9403n8fpzl0hsb9kkzicsmzq2fjl627l31yykbqzc4nsr780d"; - }; - - buildInputs = with python27Packages; - [ - python twisted urwid wxPython pygobject2 - dbus-python wrapPython setuptools file - pycrypto pyxdg - ] ++ (with requirements; [ - pyfeed - wokkel - ]); - - configurePhase = '' - sed -i "/use_setuptools/d" setup.py - sed -e "s@sys.prefix@'$out'@g" -i setup.py - sed -e "1aexport PATH=\"\$PATH\":\"$out/bin\":\"${python27Packages.twisted}/bin\"" -i src/sat.sh - sed -e "1aexport PYTHONPATH=\"\$PYTHONPATHPATH\":\"$PYTHONPATH\":"$out/${python.sitePackages}"" -i src/sat.sh - - echo 'import wokkel.muc' | python - ''; - - buildPhase = '' - ${python.interpreter} setup.py build - ''; - - installPhase = '' - ${python.interpreter} setup.py install --prefix="$out" - - for i in "$out/bin"/*; do - head -n 1 "$i" | grep -E '[/ ]python( |$)' && { - wrapProgram "$i" --prefix PYTHONPATH : "$PYTHONPATH:$out/${python.sitePackages}" - } || true - done - ''; - - meta = with lib; { - homepage = "http://sat.goffi.org/"; - description = "A multi-frontend XMPP client"; - platforms = platforms.linux; - maintainers = [ maintainers.raskin ]; - license = licenses.gpl3Plus; - }; - } diff --git a/pkgs/applications/networking/instant-messengers/salut-a-toi/requirements.nix b/pkgs/applications/networking/instant-messengers/salut-a-toi/requirements.nix deleted file mode 100644 index a8e711c447d5..000000000000 --- a/pkgs/applications/networking/instant-messengers/salut-a-toi/requirements.nix +++ /dev/null @@ -1,67 +0,0 @@ -{ fetchurl -, lib -, pythonPackages -}: - -let - buildPythonPackage = pythonPackages.buildPythonPackage; - - xe = buildPythonPackage rec { - url = "http://www.blarg.net/%7Esteveha/xe-0.7.4.tar.gz"; - name = lib.nameFromURL url ".tar"; - src = fetchurl { - inherit url; - sha256 = "0v9878cl0y9cczdsr6xjy8v9l139lc23h4m5f86p4kpf2wlnpi42"; - }; - - # error: invalid command 'test' - doCheck = false; - - meta = { - homepage = "http://home.blarg.net/~steveha/xe.html"; - description = "XML elements"; - }; - }; - -in { - - pyfeed = (buildPythonPackage rec { - url = "http://www.blarg.net/%7Esteveha/pyfeed-0.7.4.tar.gz"; - - name = lib.nameFromURL url ".tar"; - - src = fetchurl { - inherit url; - sha256 = "1h4msq573m7wm46h3cqlx4rsn99f0l11rhdqgf50lv17j8a8vvy1"; - }; - - propagatedBuildInputs = [ xe ]; - - # error: invalid command 'test' - doCheck = false; - - meta = with lib; { - homepage = "http://home.blarg.net/~steveha/pyfeed.html"; - description = "Tools for syndication feeds"; - }; - - }); - - wokkel = buildPythonPackage (rec { - url = "http://wokkel.ik.nu/releases/0.7.0/wokkel-0.7.0.tar.gz"; - name = lib.nameFromURL url ".tar"; - src = fetchurl { - inherit url; - sha256 = "0rnshrzw8605x05mpd8ndrx3ri8h6cx713mp8sl4f04f4gcrz8ml"; - }; - - propagatedBuildInputs = with pythonPackages; [twisted python-dateutil]; - - meta = with lib; { - description = "Some (mainly XMPP-related) additions to twisted"; - homepage = "http://wokkel.ik.nu/"; - license = licenses.mit; - }; - }); - -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 377b16558ed9..febc01bc550f 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1226,6 +1226,7 @@ mapAliases ({ s6Networking = throw "'s6Networking' has been renamed to/replaced by 's6-networking'"; # Converted to throw 2022-02-22 s6PortableUtils = throw "'s6PortableUtils' has been renamed to/replaced by 's6-portable-utils'"; # Converted to throw 2022-02-22 sagemath = throw "'sagemath' has been renamed to/replaced by 'sage'"; # Converted to throw 2022-02-22 + salut_a_toi = throw "salut_a_toi was removed because it was broken and used Python 2"; # added 2022-06-05 sam = throw "'sam' has been renamed to/replaced by 'deadpixi-sam'"; # Converted to throw 2022-02-22 samsungUnifiedLinuxDriver = throw "'samsungUnifiedLinuxDriver' has been renamed to/replaced by 'samsung-unified-linux-driver'"; # Converted to throw 2022-02-22 sane-backends-git = sane-backends; # Added 2021-02-19 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 58f8758fe164..d3c49c2b4d9d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10104,8 +10104,6 @@ with pkgs; salt = callPackage ../tools/admin/salt {}; - salut_a_toi = callPackage ../applications/networking/instant-messengers/salut-a-toi {}; - samim-fonts = callPackage ../data/fonts/samim-fonts {}; saml2aws = callPackage ../tools/security/saml2aws { From fa289b54cb1164e5d7531329f59e515558c62bd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 5 Jun 2022 18:52:38 +0000 Subject: [PATCH 143/245] cura_stable: remove --- pkgs/applications/misc/cura/stable.nix | 72 -------------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 3 -- 3 files changed, 1 insertion(+), 75 deletions(-) delete mode 100644 pkgs/applications/misc/cura/stable.nix diff --git a/pkgs/applications/misc/cura/stable.nix b/pkgs/applications/misc/cura/stable.nix deleted file mode 100644 index d330a8a5ae28..000000000000 --- a/pkgs/applications/misc/cura/stable.nix +++ /dev/null @@ -1,72 +0,0 @@ -{ lib, stdenv, python27Packages, curaengine, makeDesktopItem, fetchFromGitHub }: - -stdenv.mkDerivation rec { - pname = "cura"; - version = "15.06.03"; - - src = fetchFromGitHub { - owner = "daid"; - repo = "Cura"; - rev = version; - sha256 = "sha256-o1cAi4Wi19WOijlRB9iYwNEpSNnmywUj5Bth8rRhqFA="; - }; - - desktopItem = makeDesktopItem { - name = "Cura"; - exec = "cura"; - icon = "cura"; - comment = "Cura"; - desktopName = "Cura"; - genericName = "3D printing host software"; - categories = [ "GNOME" "GTK" "Utility" ]; - }; - - python_deps = with python27Packages; [ pyopengl pyserial numpy wxPython30 power setuptools ]; - - pythonPath = python_deps; - - propagatedBuildInputs = python_deps; - - buildInputs = [ curaengine python27Packages.wrapPython ]; - - configurePhase = ""; - buildPhase = ""; - - patches = [ ./numpy-cast.patch ]; - - installPhase = '' - # Install Python code. - site_packages=$out/lib/python2.7/site-packages - mkdir -p $site_packages - cp -r Cura $site_packages/ - - # Install resources. - resources=$out/share/cura - mkdir -p $resources - cp -r resources/* $resources/ - sed -i 's|os.path.join(os.path.dirname(__file__), "../../resources")|"'$resources'"|g' $site_packages/Cura/util/resources.py - - # Install executable. - mkdir -p $out/bin - cp Cura/cura.py $out/bin/cura - chmod +x $out/bin/cura - sed -i 's|#!/usr/bin/python|#!/usr/bin/env python|' $out/bin/cura - wrapPythonPrograms - - # Make it find CuraEngine. - echo "def getEngineFilename(): return '${curaengine}/bin/CuraEngine'" >> $site_packages/Cura/util/sliceEngine.py - - # Install desktop item. - mkdir -p "$out"/share/applications - cp "$desktopItem"/share/applications/* "$out"/share/applications/ - mkdir -p "$out"/share/icons - ln -s "$resources/images/c.png" "$out"/share/icons/cura.png - ''; - - meta = with lib; { - description = "3D printing host software"; - homepage = "https://github.com/daid/Cura"; - license = licenses.agpl3; - platforms = platforms.linux; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index febc01bc550f..b98eba42fe42 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -267,6 +267,7 @@ mapAliases ({ cudnn_cudatoolkit_9_0 = throw "cudnn_cudatoolkit_9_0 has been removed in favor of newer versions"; # Added 2021-04-18 cudnn_cudatoolkit_9_1 = throw "cudnn_cudatoolkit_9_1 has been removed in favor of newer versions"; # Added 2021-04-18 cudnn_cudatoolkit_9_2 = throw "cudnn_cudatoolkit_9_2 has been removed in favor of newer versions"; # Added 2021-04-18 + cura_stable = throw "cura_stable was removed because it was broken and used Python 2"; # added 2022-06-05 curl_unix_socket = throw "curl_unix_socket has been dropped due to the lack of maintanence from upstream since 2015"; # Added 2022-06-02 cutensor = throw "cutensor is now part of cudaPackages*"; # Added 2022-04-04 cutensor_cudatoolkit_10 = throw "cutensor* is now part of cudaPackages*"; # Added 2022-04-04 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d3c49c2b4d9d..9a471dbe87fc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29651,9 +29651,6 @@ with pkgs; }; curaengine_stable = callPackage ../applications/misc/curaengine/stable.nix { }; - cura_stable = callPackage ../applications/misc/cura/stable.nix { - curaengine = curaengine_stable; - }; curaengine = callPackage ../applications/misc/curaengine { inherit (python3.pkgs) libarcus; }; From 2cbf885d3085fcaf47a2c66996ff524001c27217 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 5 Jun 2022 19:08:51 +0000 Subject: [PATCH 144/245] plover.stable: remove --- pkgs/applications/misc/plover/default.nix | 25 +---------------------- 1 file changed, 1 insertion(+), 24 deletions(-) diff --git a/pkgs/applications/misc/plover/default.nix b/pkgs/applications/misc/plover/default.nix index 02162a4039e3..6bd4ee6b3c18 100644 --- a/pkgs/applications/misc/plover/default.nix +++ b/pkgs/applications/misc/plover/default.nix @@ -2,30 +2,7 @@ qtbase, mkDerivationWith }: { - stable = with python27Packages; buildPythonPackage rec { - pname = "plover"; - version = "3.1.1"; - - meta = with lib; { - broken = stdenv.isDarwin; - description = "OpenSteno Plover stenography software"; - maintainers = with maintainers; [ twey kovirobi ]; - license = licenses.gpl2; - }; - - src = fetchFromGitHub { - owner = "openstenoproject"; - repo = "plover"; - rev = "v${version}"; - sha256 = "sha256-LIhTwHMphg+xTR9NKvjAZ6p0mmqPNcZd9C4cgnenmYQ="; - }; - - nativeBuildInputs = [ setuptools-scm ]; - buildInputs = [ pytest mock ]; - propagatedBuildInputs = [ - six setuptools pyserial appdirs hidapi wxPython xlib wmctrl dbus-python - ]; - }; + stable = throw "plover.stable was removed because it used Python 2. Use plover.dev instead."; # added 2022-06-05 dev = with python3Packages; mkDerivationWith buildPythonPackage rec { pname = "plover"; From 137d55460ada649ea2703a81a0ffc85dc064e692 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 5 Jun 2022 18:53:28 +0000 Subject: [PATCH 145/245] python2Packages.wxPython: remove --- .../python2-modules/wxPython/default.nix | 91 ------------------- pkgs/top-level/python2-packages.nix | 6 -- 2 files changed, 97 deletions(-) delete mode 100644 pkgs/development/python2-modules/wxPython/default.nix diff --git a/pkgs/development/python2-modules/wxPython/default.nix b/pkgs/development/python2-modules/wxPython/default.nix deleted file mode 100644 index 6649c5f69315..000000000000 --- a/pkgs/development/python2-modules/wxPython/default.nix +++ /dev/null @@ -1,91 +0,0 @@ -{ fetchurl -, lib -, stdenv -, darwin -, openglSupport ? true -, libX11 -, wxGTK -, wxmac -, pkg-config -, buildPythonPackage -, pyopengl -, isPy3k -, isPyPy -, python -, cairo -, pango -}: - -assert wxGTK.unicode; - -buildPythonPackage rec { - pname = "wxPython"; - version = "3.0.2.0"; - - disabled = isPy3k || isPyPy; - doCheck = false; - - src = fetchurl { - url = "mirror://sourceforge/wxpython/wxPython-src-${version}.tar.bz2"; - sha256 = "0qfzx3sqx4mwxv99sfybhsij4b5pc03ricl73h4vhkzazgjjjhfm"; - }; - - dontUseSetuptoolsBuild = true; - dontUsePipInstall = true; - - hardeningDisable = [ "format" ]; - - nativeBuildInputs = [ pkg-config ] - ++ (lib.optionals (!stdenv.isDarwin) [ wxGTK libX11 ]) - ++ (lib.optionals stdenv.isDarwin [ wxmac ]); - - buildInputs = [ ] - ++ (lib.optionals (!stdenv.isDarwin) [ (wxGTK.gtk) ]) - ++ (lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ - ApplicationServices - AudioToolbox - CFNetwork - Carbon - Cocoa - CoreGraphics - CoreServices - CoreText - DiskArbitration - IOKit - ImageIO - OpenGL - Security - ])) - ++ (lib.optional openglSupport pyopengl); - - preConfigure = '' - cd wxPython - # remove wxPython's darwin hack that interference with python-2.7-distutils-C++.patch - substituteInPlace config.py \ - --replace "distutils.unixccompiler.UnixCCompiler = MyUnixCCompiler" "" - # set the WXPREFIX to $out instead of the storepath of wxwidgets - substituteInPlace config.py \ - --replace "WXPREFIX = getWxConfigValue('--prefix')" "WXPREFIX = '$out'" - # this check is supposed to only return false on older systems running non-framework python - substituteInPlace src/osx_cocoa/_core_wrap.cpp \ - --replace "return wxPyTestDisplayAvailable();" "return true;" - '' + lib.optionalString (!stdenv.isDarwin) '' - substituteInPlace wx/lib/wxcairo.py \ - --replace 'cairoLib = None' 'cairoLib = ctypes.CDLL("${cairo}/lib/libcairo.so")' - substituteInPlace wx/lib/wxcairo.py \ - --replace '_dlls = dict()' '_dlls = {k: ctypes.CDLL(v) for k, v in [ - ("gdk", "${wxGTK.gtk}/lib/libgtk-x11-2.0.so"), - ("pangocairo", "${pango.out}/lib/libpangocairo-1.0.so"), - ("appsvc", None) - ]}' - ''; - - buildPhase = ""; - - installPhase = '' - ${python.interpreter} setup.py install WXPORT=${if stdenv.isDarwin then "osx_cocoa" else "gtk2"} NO_HEADERS=0 BUILD_GLCANVAS=${if openglSupport then "1" else "0"} UNICODE=1 --prefix=$out - wrapPythonPrograms - ''; - - passthru = { inherit wxGTK openglSupport; }; -} diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix index c915fc5c8c50..54d51130e752 100644 --- a/pkgs/top-level/python2-packages.nix +++ b/pkgs/top-level/python2-packages.nix @@ -166,12 +166,6 @@ with self; with super; { wsproto = callPackage ../development/python2-modules/wsproto { }; - wxPython30 = callPackage ../development/python2-modules/wxPython { - wxGTK = pkgs.wxGTK30; - }; - - wxPython = self.wxPython30; - vcrpy = callPackage ../development/python2-modules/vcrpy { }; zeek = disabled super.zeek; From 93f430c1562ecc1a11383ae03df3eab50991b6a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 5 Jun 2022 19:05:24 +0000 Subject: [PATCH 146/245] python2Packages.vcrpy: remove --- .../python2-modules/vcrpy/default.nix | 48 ------------------- pkgs/top-level/python2-packages.nix | 2 - 2 files changed, 50 deletions(-) delete mode 100644 pkgs/development/python2-modules/vcrpy/default.nix diff --git a/pkgs/development/python2-modules/vcrpy/default.nix b/pkgs/development/python2-modules/vcrpy/default.nix deleted file mode 100644 index ddd4015aad1e..000000000000 --- a/pkgs/development/python2-modules/vcrpy/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ buildPythonPackage -, lib -, six -, fetchPypi -, pyyaml -, mock -, contextlib2 -, wrapt -, pytest -, pytest-httpbin -, yarl -, pythonOlder -, pythonAtLeast -}: - -buildPythonPackage rec { - pname = "vcrpy"; - version = "3.0.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "21168d5ae14263a833d4b71acfd8278d8841114f24be1b4ab4a5719d0c7f07bc"; - }; - - checkInputs = [ - pytest - pytest-httpbin - ]; - - propagatedBuildInputs = [ - pyyaml - wrapt - six - ] - ++ lib.optionals (pythonOlder "3.3") [ contextlib2 mock ] - ++ lib.optionals (pythonAtLeast "3.4") [ yarl ]; - - checkPhase = '' - py.test --ignore=tests/integration -k "not TestVCRConnection" - ''; - - meta = with lib; { - description = "Automatically mock your HTTP interactions to simplify and speed up testing"; - homepage = "https://github.com/kevin1024/vcrpy"; - license = licenses.mit; - }; -} - diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix index 54d51130e752..c2a6c890d9f1 100644 --- a/pkgs/top-level/python2-packages.nix +++ b/pkgs/top-level/python2-packages.nix @@ -166,8 +166,6 @@ with self; with super; { wsproto = callPackage ../development/python2-modules/wsproto { }; - vcrpy = callPackage ../development/python2-modules/vcrpy { }; - zeek = disabled super.zeek; zipp = callPackage ../development/python2-modules/zipp { }; From ed806bb62747da88316c7924898616dbbaec7db0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 5 Jun 2022 19:16:34 +0000 Subject: [PATCH 147/245] python2Packages.urllib3: remove --- .../python2-modules/urllib3/default.nix | 84 ------------------- pkgs/top-level/python2-packages.nix | 2 - 2 files changed, 86 deletions(-) delete mode 100644 pkgs/development/python2-modules/urllib3/default.nix diff --git a/pkgs/development/python2-modules/urllib3/default.nix b/pkgs/development/python2-modules/urllib3/default.nix deleted file mode 100644 index c23835ce4dc2..000000000000 --- a/pkgs/development/python2-modules/urllib3/default.nix +++ /dev/null @@ -1,84 +0,0 @@ -{ lib -, brotli -, buildPythonPackage -, certifi -, cryptography -, python-dateutil -, fetchpatch -, fetchPypi -, idna -, mock -, pyopenssl -, pysocks -, pytest-freezegun -, pytest-timeout -, pytestCheckHook -, tornado -, trustme -}: - -buildPythonPackage rec { - pname = "urllib3"; - version = "1.26.2"; - - src = fetchPypi { - inherit pname version; - sha256 = "19188f96923873c92ccb987120ec4acaa12f0461fa9ce5d3d0772bc965a39e08"; - }; - - patches = [ - (fetchpatch { - name = "CVE-2021-28363.patch"; - url = "https://github.com/urllib3/urllib3/commit/8d65ea1ecf6e2cdc27d42124e587c1b83a3118b0.patch"; - sha256 = "1lqhrd11p03iv14bp89rh67ynf000swmwsfvr3jpfdycdqr3ka9q"; - }) - ]; - - propagatedBuildInputs = [ - brotli - certifi - cryptography - idna - pyopenssl - pysocks - ]; - - checkInputs = [ - python-dateutil - mock - pytest-freezegun - pytest-timeout - pytestCheckHook - tornado - trustme - ]; - - # Tests in urllib3 are mostly timeout-based instead of event-based and - # are therefore inherently flaky. On your own machine, the tests will - # typically build fine, but on a loaded cluster such as Hydra random - # timeouts will occur. - # - # The urllib3 test suite has two different timeouts in their test suite - # (see `test/__init__.py`): - # - SHORT_TIMEOUT - # - LONG_TIMEOUT - # When CI is in the env, LONG_TIMEOUT will be significantly increased. - # Still, failures can occur and for that reason tests are disabled. - doCheck = false; - - preCheck = '' - export CI # Increases LONG_TIMEOUT - ''; - - pythonImportsCheck = [ "urllib3" ]; - - meta = with lib; { - description = "Powerful, sanity-friendly HTTP client for Python"; - homepage = "https://github.com/shazow/urllib3"; - license = licenses.mit; - maintainers = with maintainers; [ fab ]; - knownVulnerabilities = [ - "CVE-2021-33503" - ]; - }; -} diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix index c2a6c890d9f1..e39ee5e9aad2 100644 --- a/pkgs/top-level/python2-packages.nix +++ b/pkgs/top-level/python2-packages.nix @@ -160,8 +160,6 @@ with self; with super; { typing = callPackage ../development/python2-modules/typing { }; - urllib3 = callPackage ../development/python2-modules/urllib3 { }; - werkzeug = callPackage ../development/python2-modules/werkzeug { }; wsproto = callPackage ../development/python2-modules/wsproto { }; From 608ec38f08a807bbe441e02b8feb2433d9477113 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 5 Jun 2022 19:17:34 +0000 Subject: [PATCH 148/245] python2Packages.pyjwt: remove --- .../python2-modules/pyjwt/default.nix | 47 ------------------- pkgs/top-level/python2-packages.nix | 2 - 2 files changed, 49 deletions(-) delete mode 100644 pkgs/development/python2-modules/pyjwt/default.nix diff --git a/pkgs/development/python2-modules/pyjwt/default.nix b/pkgs/development/python2-modules/pyjwt/default.nix deleted file mode 100644 index 011f526e520f..000000000000 --- a/pkgs/development/python2-modules/pyjwt/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, cryptography -, ecdsa -, pytestCheckHook -, pythonOlder -}: - -buildPythonPackage rec { - pname = "pyjwt"; - version = "1.7.1"; - - src = fetchPypi { - pname = "PyJWT"; - inherit version; - sha256 = "8d59a976fb773f3e6a39c85636357c4f0e242707394cadadd9814f5cbaa20e96"; - }; - - postPatch = '' - sed -i '/^addopts/d' setup.cfg - ''; - - propagatedBuildInputs = [ - cryptography - ecdsa - ]; - - checkInputs = [ - pytestCheckHook - ]; - - disabledTests = [ - "test_ec_verify_should_return_false_if_signature_invalid" - ]; - - pythonImportsCheck = [ "jwt" ]; - - meta = with lib; { - description = "JSON Web Token implementation in Python"; - homepage = "https://github.com/jpadilla/pyjwt"; - license = licenses.mit; - knownVulnerabilities = [ - "CVE-2022-29217" - ]; - }; -} diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix index e39ee5e9aad2..108be5b87952 100644 --- a/pkgs/top-level/python2-packages.nix +++ b/pkgs/top-level/python2-packages.nix @@ -110,8 +110,6 @@ with self; with super; { pygtk = callPackage ../development/python2-modules/pygtk { }; - pyjwt = callPackage ../development/python2-modules/pyjwt { }; - pyparsing = callPackage ../development/python2-modules/pyparsing { }; pyroma = callPackage ../development/python2-modules/pyroma { }; From ed4ec1862bcc7d68e9d70579457fb699561d61d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 6 Jun 2022 18:10:32 +0000 Subject: [PATCH 149/245] privacyidea: update overrides --- .../applications/misc/privacyidea/default.nix | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/privacyidea/default.nix b/pkgs/applications/misc/privacyidea/default.nix index d89364280795..5c3afc301556 100644 --- a/pkgs/applications/misc/privacyidea/default.nix +++ b/pkgs/applications/misc/privacyidea/default.nix @@ -65,18 +65,30 @@ let sha256 = "sha256-WUxngH+xYjizDES99082wCzfItHIzake+KDtjav1Ygo="; }; }); - # Required by flask-babel itsdangerous = super.itsdangerous.overridePythonAttrs (old: rec { - version = "2.0.1"; + version = "1.1.0"; src = old.src.override { inherit version; - sha256 = "sha256-nnJNaPwikCoUNTUfhMP7hiPzA//8xWaky5Ut+MVyz/A="; + sha256 = "321b033d07f2a4136d3ec762eac9f16a10ccd60f53c0c91af90217ace7ba1f19"; + }; + }); + flask = super.flask.overridePythonAttrs (old: rec { + version = "1.1.4"; + src = old.src.override { + inherit version; + sha256 = "0fbeb6180d383a9186d0d6ed954e0042ad9f18e0e8de088b2b419d526927d196"; }; }); - flask = self.callPackage ../../../development/python2-modules/flask { }; sqlsoup = super.sqlsoup.overrideAttrs ({ meta ? {}, ... }: { meta = meta // { broken = false; }; }); + click = super.click.overridePythonAttrs (old: rec { + version = "7.1.2"; + src = old.src.override { + inherit version; + sha256 = "d2b5255c7c6349bc1bd1e59e08cd12acbbd63ce649f2588755783aa94dfb6b1a"; + }; + }); }; }; in From b566290cdbd987d5117c4e955ef85ba4786233b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 6 Jun 2022 18:11:20 +0000 Subject: [PATCH 150/245] python2Packages.flask: remove --- .../python2-modules/flask/default.nix | 28 ------------------- pkgs/top-level/python2-packages.nix | 2 -- 2 files changed, 30 deletions(-) delete mode 100644 pkgs/development/python2-modules/flask/default.nix diff --git a/pkgs/development/python2-modules/flask/default.nix b/pkgs/development/python2-modules/flask/default.nix deleted file mode 100644 index 27f436c3c53c..000000000000 --- a/pkgs/development/python2-modules/flask/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, buildPythonPackage, fetchPypi -, itsdangerous, click, werkzeug, jinja2, pytest }: - -buildPythonPackage rec { - version = "1.1.2"; - pname = "Flask"; - - src = fetchPypi { - inherit pname version; - sha256 = "4efa1ae2d7c9865af48986de8aeb8504bf32c7f3d6fdc9353d34b21f4b127060"; - }; - - checkInputs = [ pytest ]; - propagatedBuildInputs = [ itsdangerous click werkzeug jinja2 ]; - - checkPhase = '' - py.test - ''; - - # Tests require extra dependencies - doCheck = false; - - meta = with lib; { - homepage = "http://flask.pocoo.org/"; - description = "A microframework based on Werkzeug, Jinja 2, and good intentions"; - license = licenses.bsd3; - }; -} diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix index 108be5b87952..776586f46266 100644 --- a/pkgs/top-level/python2-packages.nix +++ b/pkgs/top-level/python2-packages.nix @@ -36,8 +36,6 @@ with self; with super; { filelock = callPackage ../development/python2-modules/filelock { }; - flask = callPackage ../development/python2-modules/flask { }; - freezegun = callPackage ../development/python2-modules/freezegun { }; futures = callPackage ../development/python2-modules/futures { }; From 162b4c10065bb716d09b48ddaa717fe22046c46c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 6 Jun 2022 18:16:24 +0000 Subject: [PATCH 151/245] python2Packages.werkzeug: remove --- .../python2-modules/werkzeug/default.nix | 60 ------------------- pkgs/top-level/python2-packages.nix | 2 - 2 files changed, 62 deletions(-) delete mode 100644 pkgs/development/python2-modules/werkzeug/default.nix diff --git a/pkgs/development/python2-modules/werkzeug/default.nix b/pkgs/development/python2-modules/werkzeug/default.nix deleted file mode 100644 index c03cc6935d2f..000000000000 --- a/pkgs/development/python2-modules/werkzeug/default.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi -, itsdangerous, hypothesis -, pytestCheckHook, requests -, pytest-timeout - }: - -buildPythonPackage rec { - pname = "Werkzeug"; - version = "1.0.1"; - - src = fetchPypi { - inherit pname version; - sha256 = "6c80b1e5ad3665290ea39320b91e1be1e0d5f60652b964a3070216de83d2e47c"; - }; - - propagatedBuildInputs = [ itsdangerous ]; - checkInputs = [ pytestCheckHook requests hypothesis pytest-timeout ]; - - postPatch = '' - # ResourceWarning causes tests to fail - rm tests/test_routing.py - ''; - - disabledTests = [ - "test_save_to_pathlib_dst" - "test_cookie_maxsize" - "test_cookie_samesite_attribute" - "test_cookie_samesite_invalid" - "test_range_parsing" - "test_content_range_parsing" - "test_http_date_lt_1000" - "test_best_match_works" - "test_date_to_unix" - "test_easteregg" - - # Seems to be a problematic test-case: - # - # > warnings.warn(pytest.PytestUnraisableExceptionWarning(msg)) - # E pytest.PytestUnraisableExceptionWarning: Exception ignored in: <_io.FileIO [closed]> - # E - # E Traceback (most recent call last): - # E File "/nix/store/cwv8aj4vsqvimzljw5dxsxy663vjgibj-python3.9-Werkzeug-1.0.1/lib/python3.9/site-packages/werkzeug/formparser.py", line 318, in parse_multipart_headers - # E return Headers(result) - # E ResourceWarning: unclosed file <_io.FileIO name=11 mode='rb+' closefd=True> - "test_basic_routing" - "test_merge_slashes_match" - "test_merge_slashes_build" - "TestMultiPart" - "TestHTTPUtility" - ] ++ lib.optionals stdenv.isDarwin [ - "test_get_machine_id" - ]; - - meta = with lib; { - homepage = "https://palletsprojects.com/p/werkzeug/"; - description = "A WSGI utility library for Python"; - license = licenses.bsd3; - maintainers = [ ]; - }; -} diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix index 776586f46266..1a448d704d80 100644 --- a/pkgs/top-level/python2-packages.nix +++ b/pkgs/top-level/python2-packages.nix @@ -156,8 +156,6 @@ with self; with super; { typing = callPackage ../development/python2-modules/typing { }; - werkzeug = callPackage ../development/python2-modules/werkzeug { }; - wsproto = callPackage ../development/python2-modules/wsproto { }; zeek = disabled super.zeek; From 8ceaa66b5a953cd0f69cfc73a52d7580bdaf5b7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 6 Jun 2022 18:16:53 +0000 Subject: [PATCH 152/245] python2Packages.itsdangerous: remove --- .../python2-modules/itsdangerous/default.nix | 21 ------------------- pkgs/top-level/python2-packages.nix | 2 -- 2 files changed, 23 deletions(-) delete mode 100644 pkgs/development/python2-modules/itsdangerous/default.nix diff --git a/pkgs/development/python2-modules/itsdangerous/default.nix b/pkgs/development/python2-modules/itsdangerous/default.nix deleted file mode 100644 index d1669a1ed5bf..000000000000 --- a/pkgs/development/python2-modules/itsdangerous/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -}: - -buildPythonPackage rec { - pname = "itsdangerous"; - version = "1.1.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "321b033d07f2a4136d3ec762eac9f16a10ccd60f53c0c91af90217ace7ba1f19"; - }; - - meta = with lib; { - description = "Helpers to pass trusted data to untrusted environments and back"; - homepage = "https://pypi.python.org/pypi/itsdangerous/"; - license = licenses.bsd0; - }; - -} diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix index 1a448d704d80..a83960c415f6 100644 --- a/pkgs/top-level/python2-packages.nix +++ b/pkgs/top-level/python2-packages.nix @@ -54,8 +54,6 @@ with self; with super; { ipaddr = callPackage ../development/python2-modules/ipaddr { }; - itsdangerous = callPackage ../development/python2-modules/itsdangerous { }; - jinja2 = callPackage ../development/python2-modules/jinja2 { }; libcloud = callPackage ../development/python2-modules/libcloud { }; From ddcb0e566a627cae763d2e54427a48bdedeb05fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 6 Jun 2022 18:35:32 +0000 Subject: [PATCH 153/245] csvs-to-sqlite: use click 7.1.2 --- pkgs/tools/misc/csvs-to-sqlite/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/csvs-to-sqlite/default.nix b/pkgs/tools/misc/csvs-to-sqlite/default.nix index 1deae6b3f833..736cc1c3dc5a 100644 --- a/pkgs/tools/misc/csvs-to-sqlite/default.nix +++ b/pkgs/tools/misc/csvs-to-sqlite/default.nix @@ -8,7 +8,13 @@ let python = python3.override { packageOverrides = self: super: { # Use click 7 - click = self.callPackage ../../../development/python2-modules/click/default.nix { }; + click = super.click.overridePythonAttrs (old: rec { + version = "7.1.2"; + src = old.src.override { + inherit version; + sha256 = "d2b5255c7c6349bc1bd1e59e08cd12acbbd63ce649f2588755783aa94dfb6b1a"; + }; + }); }; }; in with python.pkgs; buildPythonApplication rec { From 6f432760f6764c40934878aa32384eed3697abd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 6 Jun 2022 18:41:55 +0000 Subject: [PATCH 154/245] haxor-news: use click 7.1.2 --- pkgs/applications/misc/haxor-news/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/haxor-news/default.nix b/pkgs/applications/misc/haxor-news/default.nix index c93d31f66305..9170af04e61c 100644 --- a/pkgs/applications/misc/haxor-news/default.nix +++ b/pkgs/applications/misc/haxor-news/default.nix @@ -16,7 +16,13 @@ let }; }); # Use click 7 - click = self.callPackage ../../../development/python2-modules/click/default.nix { }; + click = super.click.overridePythonAttrs (old: rec { + version = "7.1.2"; + src = old.src.override { + inherit version; + sha256 = "d2b5255c7c6349bc1bd1e59e08cd12acbbd63ce649f2588755783aa94dfb6b1a"; + }; + }); }; }; in From 2f3c0f9a41d9685ddf9ac638621c784ec6f9b090 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 6 Jun 2022 18:30:11 +0000 Subject: [PATCH 155/245] python2Packages.click: remove --- .../python2-modules/click/default.nix | 28 ------------------- pkgs/top-level/python2-packages.nix | 2 -- 2 files changed, 30 deletions(-) delete mode 100644 pkgs/development/python2-modules/click/default.nix diff --git a/pkgs/development/python2-modules/click/default.nix b/pkgs/development/python2-modules/click/default.nix deleted file mode 100644 index fcbd4d0981af..000000000000 --- a/pkgs/development/python2-modules/click/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, buildPythonPackage, fetchPypi, locale, pytestCheckHook }: - -buildPythonPackage rec { - pname = "click"; - version = "7.1.2"; - - src = fetchPypi { - inherit pname version; - sha256 = "d2b5255c7c6349bc1bd1e59e08cd12acbbd63ce649f2588755783aa94dfb6b1a"; - }; - - postPatch = '' - substituteInPlace src/click/_unicodefun.py \ - --replace "'locale'" "'${locale}/bin/locale'" - ''; - - checkInputs = [ pytestCheckHook ]; - - meta = with lib; { - homepage = "https://click.palletsprojects.com/"; - description = "Create beautiful command line interfaces in Python"; - longDescription = '' - A Python package for creating beautiful command line interfaces in a - composable way, with as little code as necessary. - ''; - license = licenses.bsd3; - }; -} diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix index a83960c415f6..77faefaa15b5 100644 --- a/pkgs/top-level/python2-packages.nix +++ b/pkgs/top-level/python2-packages.nix @@ -18,8 +18,6 @@ with self; with super; { cheetah = callPackage ../development/python2-modules/cheetah { }; - click = callPackage ../development/python2-modules/click { }; - configparser = callPackage ../development/python2-modules/configparser { }; construct = callPackage ../development/python2-modules/construct { }; From c1c11045961909ccc876ab0ca25c8c9820b8f410 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 6 Jun 2022 18:30:48 +0000 Subject: [PATCH 156/245] python2Packages.cryptography: remove --- .../python2-modules/cryptography/default.nix | 86 ------------------- .../python2-modules/cryptography/vectors.nix | 24 ------ pkgs/top-level/python2-packages.nix | 2 - 3 files changed, 112 deletions(-) delete mode 100644 pkgs/development/python2-modules/cryptography/default.nix delete mode 100644 pkgs/development/python2-modules/cryptography/vectors.nix diff --git a/pkgs/development/python2-modules/cryptography/default.nix b/pkgs/development/python2-modules/cryptography/default.nix deleted file mode 100644 index 0b4e2ae394cd..000000000000 --- a/pkgs/development/python2-modules/cryptography/default.nix +++ /dev/null @@ -1,86 +0,0 @@ -{ lib -, stdenv -, callPackage -, buildPythonPackage -, fetchPypi -, isPy27 -, ipaddress -, openssl -, darwin -, packaging -, six -, isPyPy -, cffi -, pytest -, pretend -, iso8601 -, pytz -, hypothesis -, enum34 -}: - -let - cryptography-vectors = callPackage ./vectors.nix { }; -in -buildPythonPackage rec { - pname = "cryptography"; - version = "3.3.2"; # Also update the hash in vectors-3.3.nix - - src = fetchPypi { - inherit pname version; - sha256 = "1vcvw4lkw1spiq322pm1256kail8nck6bbgpdxx3pqa905wd6q2s"; - }; - - patches = [ ./cryptography-py27-warning.patch ]; - - outputs = [ "out" "dev" ]; - - nativeBuildInputs = lib.optionals (!isPyPy) [ - cffi - ]; - - buildInputs = [ openssl ] - ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; - propagatedBuildInputs = [ - packaging - six - ] ++ lib.optionals (!isPyPy) [ - cffi - ] ++ lib.optionals isPy27 [ - ipaddress - enum34 - ]; - - checkInputs = [ - cryptography-vectors - hypothesis - iso8601 - pretend - pytest - pytz - ]; - - checkPhase = '' - py.test --disable-pytest-warnings tests - ''; - - # IOKit's dependencies are inconsistent between OSX versions, so this is the best we - # can do until nix 1.11's release - __impureHostDeps = [ "/usr/lib" ]; - - meta = with lib; { - description = "A package which provides cryptographic recipes and primitives"; - longDescription = '' - Cryptography includes both high level recipes and low level interfaces to - common cryptographic algorithms such as symmetric ciphers, message - digests, and key derivation functions. - Our goal is for it to be your "cryptographic standard library". It - supports Python 2.7, Python 3.5+, and PyPy 5.4+. - ''; - homepage = "https://github.com/pyca/cryptography"; - changelog = "https://cryptography.io/en/latest/changelog/#v" - + replaceStrings [ "." ] [ "-" ] version; - license = with licenses; [ asl20 bsd3 psfl ]; - maintainers = with maintainers; [ primeos ]; - }; -} diff --git a/pkgs/development/python2-modules/cryptography/vectors.nix b/pkgs/development/python2-modules/cryptography/vectors.nix deleted file mode 100644 index 4d6214807e73..000000000000 --- a/pkgs/development/python2-modules/cryptography/vectors.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ buildPythonPackage, fetchPypi, lib, cryptography }: - -buildPythonPackage rec { - pname = "cryptography-vectors"; - # The test vectors must have the same version as the cryptography package: - version = cryptography.version; - - src = fetchPypi { - pname = "cryptography_vectors"; - inherit version; - sha256 = "1yhaps0f3h2yjb6lmz953z1l1d84y9swk4k3gj9nqyk4vbx5m7cc"; - }; - - # No tests included - doCheck = false; - - meta = with lib; { - description = "Test vectors for the cryptography package"; - homepage = "https://cryptography.io/en/latest/development/test-vectors/"; - # Source: https://github.com/pyca/cryptography/tree/master/vectors; - license = with licenses; [ asl20 bsd3 ]; - maintainers = with maintainers; [ primeos ]; - }; -} diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix index 77faefaa15b5..4ca1c6dcd63b 100644 --- a/pkgs/top-level/python2-packages.nix +++ b/pkgs/top-level/python2-packages.nix @@ -26,8 +26,6 @@ with self; with super; { coverage = callPackage ../development/python2-modules/coverage { }; - cryptography = callPackage ../development/python2-modules/cryptography { }; - decorator = callPackage ../development/python2-modules/decorator { }; enum = callPackage ../development/python2-modules/enum { }; From 2a54a8357363dce49e3635979eff471cad66cf2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 6 Jun 2022 18:31:33 +0000 Subject: [PATCH 157/245] python2Packages.decorator: remove --- .../python2-modules/decorator/default.nix | 21 ------------------- pkgs/top-level/python2-packages.nix | 2 -- 2 files changed, 23 deletions(-) delete mode 100644 pkgs/development/python2-modules/decorator/default.nix diff --git a/pkgs/development/python2-modules/decorator/default.nix b/pkgs/development/python2-modules/decorator/default.nix deleted file mode 100644 index 8e8fd28f0b54..000000000000 --- a/pkgs/development/python2-modules/decorator/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -}: - -buildPythonPackage rec { - pname = "decorator"; - version = "4.4.2"; - - src = fetchPypi { - inherit pname version; - sha256 = "1rxzhk5zwiggk45hl53zydvy70lk654kg0nc1p54090p402jz9p3"; - }; - - meta = with lib; { - homepage = "https://pypi.python.org/pypi/decorator"; - description = "Better living through Python with decorators"; - license = lib.licenses.mit; - maintainers = [ maintainers.costrouc ]; - }; -} diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix index 4ca1c6dcd63b..707ebf653435 100644 --- a/pkgs/top-level/python2-packages.nix +++ b/pkgs/top-level/python2-packages.nix @@ -26,8 +26,6 @@ with self; with super; { coverage = callPackage ../development/python2-modules/coverage { }; - decorator = callPackage ../development/python2-modules/decorator { }; - enum = callPackage ../development/python2-modules/enum { }; filelock = callPackage ../development/python2-modules/filelock { }; From a9aba22cdc612c4c704ae1f3173c232e63ecaa89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 6 Jun 2022 18:32:39 +0000 Subject: [PATCH 158/245] python2Packages.freezegun: remove --- .../python2-modules/freezegun/default.nix | 29 ------------------- pkgs/top-level/python2-packages.nix | 2 -- 2 files changed, 31 deletions(-) delete mode 100644 pkgs/development/python2-modules/freezegun/default.nix diff --git a/pkgs/development/python2-modules/freezegun/default.nix b/pkgs/development/python2-modules/freezegun/default.nix deleted file mode 100644 index 7f77616f2a4e..000000000000 --- a/pkgs/development/python2-modules/freezegun/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, python-dateutil -, six -, mock -, nose -, pytest -}: - -buildPythonPackage rec { - pname = "freezegun"; - version = "0.3.15"; - - src = fetchPypi { - inherit pname version; - sha256 = "e2062f2c7f95cc276a834c22f1a17179467176b624cc6f936e8bc3be5535ad1b"; - }; - - propagatedBuildInputs = [ python-dateutil six ]; - checkInputs = [ mock nose pytest ]; - - meta = with lib; { - description = "FreezeGun: Let your Python tests travel through time"; - homepage = "https://github.com/spulec/freezegun"; - license = licenses.asl20; - }; - -} diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix index 707ebf653435..1d70793d4d43 100644 --- a/pkgs/top-level/python2-packages.nix +++ b/pkgs/top-level/python2-packages.nix @@ -30,8 +30,6 @@ with self; with super; { filelock = callPackage ../development/python2-modules/filelock { }; - freezegun = callPackage ../development/python2-modules/freezegun { }; - futures = callPackage ../development/python2-modules/futures { }; google-apputils = callPackage ../development/python2-modules/google-apputils { }; From 3367f6e4e69c06a5063d14e62211a8705af8188e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 6 Jun 2022 18:57:50 +0000 Subject: [PATCH 159/245] python2Packages.wsproto: remove --- .../python2-modules/wsproto/default.nix | 25 ------------------- pkgs/top-level/python2-packages.nix | 2 -- 2 files changed, 27 deletions(-) delete mode 100644 pkgs/development/python2-modules/wsproto/default.nix diff --git a/pkgs/development/python2-modules/wsproto/default.nix b/pkgs/development/python2-modules/wsproto/default.nix deleted file mode 100644 index a8488d8c4ab8..000000000000 --- a/pkgs/development/python2-modules/wsproto/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, buildPythonPackage, fetchPypi, h11, enum34, pytest }: - -buildPythonPackage rec { - pname = "wsproto"; - version = "0.14.1"; - - src = fetchPypi { - inherit pname version; - sha256 = "051s127qb5dladxa14n9nqajwq7xki1dz1was5r5v9df5a0jq8pd"; - }; - - propagatedBuildInputs = [ h11 enum34 ]; - - checkInputs = [ pytest ]; - - checkPhase = '' - py.test - ''; - - meta = with lib; { - description = "Pure Python, pure state-machine WebSocket implementation"; - homepage = "https://github.com/python-hyper/wsproto/"; - license = licenses.mit; - }; -} diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix index 1d70793d4d43..82116cc17d9e 100644 --- a/pkgs/top-level/python2-packages.nix +++ b/pkgs/top-level/python2-packages.nix @@ -146,8 +146,6 @@ with self; with super; { typing = callPackage ../development/python2-modules/typing { }; - wsproto = callPackage ../development/python2-modules/wsproto { }; - zeek = disabled super.zeek; zipp = callPackage ../development/python2-modules/zipp { }; From c769a566617a55355252c0c35294d52d439aadc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 6 Jun 2022 19:20:58 +0000 Subject: [PATCH 160/245] python2Packages.ipaddr: remove --- .../python2-modules/ipaddr/default.nix | 23 ------------------- pkgs/top-level/python2-packages.nix | 2 -- 2 files changed, 25 deletions(-) delete mode 100644 pkgs/development/python2-modules/ipaddr/default.nix diff --git a/pkgs/development/python2-modules/ipaddr/default.nix b/pkgs/development/python2-modules/ipaddr/default.nix deleted file mode 100644 index b29ee9179287..000000000000 --- a/pkgs/development/python2-modules/ipaddr/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, isPy3k -}: - -buildPythonPackage rec { - pname = "ipaddr"; - version = "2.2.0"; - disabled = isPy3k; - - src = fetchPypi { - inherit pname version; - sha256 = "1ml8r8z3f0mnn381qs1snbffa920i9ycp6mm2am1d3aqczkdz4j0"; - }; - - meta = with lib; { - description = "Google's IP address manipulation library"; - homepage = "https://github.com/google/ipaddr-py"; - license = licenses.asl20; - }; - -} diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix index 82116cc17d9e..cf493ff43406 100644 --- a/pkgs/top-level/python2-packages.nix +++ b/pkgs/top-level/python2-packages.nix @@ -44,8 +44,6 @@ with self; with super; { importlib-metadata = callPackage ../development/python2-modules/importlib-metadata { }; - ipaddr = callPackage ../development/python2-modules/ipaddr { }; - jinja2 = callPackage ../development/python2-modules/jinja2 { }; libcloud = callPackage ../development/python2-modules/libcloud { }; From f9c76fbaec24afba2797130217c97f962374d742 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 6 Jun 2022 19:22:41 +0000 Subject: [PATCH 161/245] python2Packages.libcloud: remove --- .../python2-modules/libcloud/default.nix | 39 ------------------- pkgs/top-level/python2-packages.nix | 2 - 2 files changed, 41 deletions(-) delete mode 100644 pkgs/development/python2-modules/libcloud/default.nix diff --git a/pkgs/development/python2-modules/libcloud/default.nix b/pkgs/development/python2-modules/libcloud/default.nix deleted file mode 100644 index 504e7753a978..000000000000 --- a/pkgs/development/python2-modules/libcloud/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, isPy27 -, mock -, pycrypto -, requests -, pytest-runner -, pytest -, requests-mock -, typing -, backports_ssl_match_hostname -}: - -buildPythonPackage rec { - pname = "apache-libcloud"; - version = "2.8.3"; - - src = fetchPypi { - inherit pname version; - sha256 = "70096690b24a7832cc5abdfda1954b49fddc1c09a348a1e6caa781ac867ed4c6"; - }; - - checkInputs = [ mock pytest pytest-runner requests-mock ]; - propagatedBuildInputs = [ pycrypto requests ] - ++ lib.optionals isPy27 [ typing backports_ssl_match_hostname ]; - - preConfigure = "cp libcloud/test/secrets.py-dist libcloud/test/secrets.py"; - - # requires a certificates file - doCheck = false; - - meta = with lib; { - description = "A unified interface to many cloud providers"; - homepage = "https://libcloud.apache.org/"; - license = licenses.asl20; - }; - -} diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix index cf493ff43406..8b43c25fb235 100644 --- a/pkgs/top-level/python2-packages.nix +++ b/pkgs/top-level/python2-packages.nix @@ -46,8 +46,6 @@ with self; with super; { jinja2 = callPackage ../development/python2-modules/jinja2 { }; - libcloud = callPackage ../development/python2-modules/libcloud { }; - lpod = callPackage ../development/python2-modules/lpod { }; marisa = callPackage ../development/python2-modules/marisa { From e5dcb4efd2ad2b376949676da1a5203fa7c90603 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 6 Jun 2022 19:23:30 +0000 Subject: [PATCH 162/245] python2Packages.lpod: remove --- .../python2-modules/lpod/default.nix | 31 ------------------- pkgs/top-level/python2-packages.nix | 2 -- 2 files changed, 33 deletions(-) delete mode 100644 pkgs/development/python2-modules/lpod/default.nix diff --git a/pkgs/development/python2-modules/lpod/default.nix b/pkgs/development/python2-modules/lpod/default.nix deleted file mode 100644 index 9c719d234f89..000000000000 --- a/pkgs/development/python2-modules/lpod/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, lxml -, docutils -, pillow -, isPy3k -}: - -buildPythonPackage { - version = "1.1.7"; - pname = "python-lpod"; - # lpod library currently does not support Python 3.x - disabled = isPy3k; - - propagatedBuildInputs = [ lxml docutils pillow ]; - - src = fetchFromGitHub { - owner = "lpod"; - repo = "lpod-python"; - rev = "dee32120ee582ff337b0c52a95a9a87cca71fd67"; - sha256 = "1mikvzp27wxkzpr2lii4wg1hhx8h610agckqynvsrdc8v3nw9ciw"; - }; - - meta = with lib; { - homepage = "https://github.com/lpod/lpod-python/"; - description = "Library implementing the ISO/IEC 26300 OpenDocument Format standard (ODF) "; - license = licenses.gpl3; - }; - -} diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix index 8b43c25fb235..717c16785704 100644 --- a/pkgs/top-level/python2-packages.nix +++ b/pkgs/top-level/python2-packages.nix @@ -46,8 +46,6 @@ with self; with super; { jinja2 = callPackage ../development/python2-modules/jinja2 { }; - lpod = callPackage ../development/python2-modules/lpod { }; - marisa = callPackage ../development/python2-modules/marisa { inherit (pkgs) marisa; }; From 41d0c6f080ca4a71ede96f0ba6de77c7c937af88 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 7 Jun 2022 18:43:17 +0200 Subject: [PATCH 163/245] python310Packages.deezer-python: update disabled --- pkgs/development/python-modules/deezer-python/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/deezer-python/default.nix b/pkgs/development/python-modules/deezer-python/default.nix index 850d47cd026c..c94f3d205ce8 100644 --- a/pkgs/development/python-modules/deezer-python/default.nix +++ b/pkgs/development/python-modules/deezer-python/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { version = "5.3.3"; format = "pyproject"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "browniebroke"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-eiznL23Pt7bwBLxNG8V3ITSNMnwMBjFdiGgu0cSoSw0="; + hash = "sha256-eiznL23Pt7bwBLxNG8V3ITSNMnwMBjFdiGgu0cSoSw0="; }; nativeBuildInputs = [ @@ -46,7 +46,9 @@ buildPythonPackage rec { --replace " --cov=deezer" "" ''; - pythonImportsCheck = [ "deezer" ]; + pythonImportsCheck = [ + "deezer" + ]; meta = with lib; { description = "Python wrapper around the Deezer API"; From d06a2c8e25cfb7af3949b38631140bb0b304dfb9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Jun 2022 16:44:31 +0000 Subject: [PATCH 164/245] python310Packages.google-cloud-iam-logging: 1.0.1 -> 1.0.2 --- .../python-modules/google-cloud-iam-logging/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-iam-logging/default.nix b/pkgs/development/python-modules/google-cloud-iam-logging/default.nix index 017634fd5273..b867c40140ba 100644 --- a/pkgs/development/python-modules/google-cloud-iam-logging/default.nix +++ b/pkgs/development/python-modules/google-cloud-iam-logging/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-cloud-iam-logging"; - version = "1.0.1"; + version = "1.0.2"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-ZmoBaY0OM2pQcqasGCJQIeN6Rmbo4xlYK7LtH7SecgY="; + hash = "sha256-f5ZETn1zLrC+1Gil47zzJGanx7cFBisdoFPoDe1FFwo="; }; propagatedBuildInputs = [ From a0378c15e25ada553df654258475c5b11ad56410 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 7 Jun 2022 16:44:41 +0000 Subject: [PATCH 165/245] libdeltachat: 1.85.0 -> 1.86.0 https://github.com/deltachat/deltachat-core-rust/blob/1.86.0/CHANGELOG.md --- pkgs/development/libraries/libdeltachat/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libdeltachat/default.nix b/pkgs/development/libraries/libdeltachat/default.nix index a8915e92e58a..db7db4cce626 100644 --- a/pkgs/development/libraries/libdeltachat/default.nix +++ b/pkgs/development/libraries/libdeltachat/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "libdeltachat"; - version = "1.85.0"; + version = "1.86.0"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-core-rust"; rev = version; - hash = "sha256-bgx1j2ESAv9cRe3Iv6nYOS7bUAQcXj3Ta4rAC800Nf8="; + hash = "sha256-VLS93Ffeit2rVmXxYkXcnf8eDA3DC2/wKYZTh56QCk0="; }; patches = [ @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-7ZdN/7CKFuFOIReM7BkMsO/E2lPyDnl4ssPhK5BPLh8="; + hash = "sha256-4rpoDQ3o0WdWg/TmazTI+J0hL/MxwHcNMXWMq7GE7Tk="; }; nativeBuildInputs = [ From 0fa2f72a8f68d6d34c7053644277d60b90e0565d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Jun 2022 16:48:53 +0000 Subject: [PATCH 166/245] python310Packages.google-cloud-iot: 2.5.0 -> 2.5.1 --- pkgs/development/python-modules/google-cloud-iot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-iot/default.nix b/pkgs/development/python-modules/google-cloud-iot/default.nix index d00d05f5431e..77dd863f2b52 100644 --- a/pkgs/development/python-modules/google-cloud-iot/default.nix +++ b/pkgs/development/python-modules/google-cloud-iot/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-iot"; - version = "2.5.0"; + version = "2.5.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-bZ2Zn4r+hQ2MfkgXmJPYWbKy3tYlTkYh6ohmWQA/75U="; + sha256 = "sha256-Y71v505bwXEV1u28WFAHs12Qx0tKY7BDjFCc+oBgZcw="; }; propagatedBuildInputs = [ grpc-google-iam-v1 google-api-core libcst proto-plus ]; From 764dff4833642c7b6a3cc839d7eb1e713ff18f91 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Jun 2022 16:53:08 +0000 Subject: [PATCH 167/245] python310Packages.google-cloud-kms: 2.11.1 -> 2.11.2 --- pkgs/development/python-modules/google-cloud-kms/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-kms/default.nix b/pkgs/development/python-modules/google-cloud-kms/default.nix index 6317d621a0b9..6a55519f79e9 100644 --- a/pkgs/development/python-modules/google-cloud-kms/default.nix +++ b/pkgs/development/python-modules/google-cloud-kms/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-kms"; - version = "2.11.1"; + version = "2.11.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-n0alfJIsaqhQ4Wr4/d2JRXTCE24JTrRJBsYOnRhpV00="; + sha256 = "sha256-X95xD/L18dXPYxCbvxIPjaOolMSDr7vpyQnzb5oMFEQ="; }; propagatedBuildInputs = [ grpc-google-iam-v1 google-api-core libcst proto-plus ]; From 2ad850d21ff13198cf0f88e176a87897a11ff694 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Jun 2022 17:04:48 +0000 Subject: [PATCH 168/245] python310Packages.google-cloud-language: 2.4.2 -> 2.4.3 --- .../python-modules/google-cloud-language/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-language/default.nix b/pkgs/development/python-modules/google-cloud-language/default.nix index 2eb6869492f5..366341dc153d 100644 --- a/pkgs/development/python-modules/google-cloud-language/default.nix +++ b/pkgs/development/python-modules/google-cloud-language/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-cloud-language"; - version = "2.4.2"; + version = "2.4.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-kxJySGikHdichitekEiPjzs48bDqWaXMBhmI6IAwKRM="; + sha256 = "sha256-1N5nnT22ILyaubDrpj2bS260AP4YrjrMQ0tgBA3OChg="; }; propagatedBuildInputs = [ From c5d1acd593e0ee894445d129815e45da5476d4d3 Mon Sep 17 00:00:00 2001 From: Sandro Date: Tue, 7 Jun 2022 19:08:16 +0200 Subject: [PATCH 169/245] python310Packages.google-cloud-bigquery-datatransfer: fix editorconfig check --- .../google-cloud-bigquery-datatransfer/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix b/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix index 2717af605ef3..260b78b943e3 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { format = "setuptools"; disabled = pythonOlder "3.6"; - + src = fetchPypi { inherit pname version; hash = "sha256-hR5qHucBpq1LS9pIZeovcPMiVbw3dhSeeJxkYH8xuMk="; From edba69aee54544a38cb24476436f8107f554865d Mon Sep 17 00:00:00 2001 From: DarkOnion0 Date: Tue, 7 Jun 2022 19:11:54 +0200 Subject: [PATCH 170/245] drawio: 19.0.1 -> 19.0.2 --- pkgs/applications/graphics/drawio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/drawio/default.nix b/pkgs/applications/graphics/drawio/default.nix index d3f854966406..674a87dea47e 100644 --- a/pkgs/applications/graphics/drawio/default.nix +++ b/pkgs/applications/graphics/drawio/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "drawio"; - version = "19.0.1"; + version = "19.0.2"; src = fetchurl { url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/drawio-x86_64-${version}.rpm"; - sha256 = "da9fb38970987b7d5b84fd0d91824f206ba7a3681a7354adc6d6e795c7613828"; + sha256 = "46b4e7269628100ea3c083dee75308d9746780e46eac15d2c5495fdeece7e323"; }; nativeBuildInputs = [ From 79b681ed5d1ac3163b3ca3dd803d125f29b1a71c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Jun 2022 17:12:31 +0000 Subject: [PATCH 171/245] python310Packages.google-cloud-org-policy: 1.3.2 -> 1.3.3 --- .../python-modules/google-cloud-org-policy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-org-policy/default.nix b/pkgs/development/python-modules/google-cloud-org-policy/default.nix index 495623b3342a..d270a1efe72a 100644 --- a/pkgs/development/python-modules/google-cloud-org-policy/default.nix +++ b/pkgs/development/python-modules/google-cloud-org-policy/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "google-cloud-org-policy"; - version = "1.3.2"; + version = "1.3.3"; src = fetchPypi { inherit pname version; - sha256 = "sha256-i60DIRtWtB1MEB2/MuNycy7T9MFPnlRtJ7lnFhDVJbE="; + sha256 = "sha256-hZzujuHtj5g/dBJUhZBV4h8zJjtI1xitfjkcVzURfKU="; }; propagatedBuildInputs = [ google-api-core proto-plus ]; From 2925dab822fc9b43dd718fc74cb671bbd9785ac5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Jun 2022 17:16:48 +0000 Subject: [PATCH 172/245] python310Packages.google-cloud-os-config: 1.11.1 -> 1.11.2 --- .../python-modules/google-cloud-os-config/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-os-config/default.nix b/pkgs/development/python-modules/google-cloud-os-config/default.nix index 6f6223f1be98..d2235b44cf60 100644 --- a/pkgs/development/python-modules/google-cloud-os-config/default.nix +++ b/pkgs/development/python-modules/google-cloud-os-config/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "google-cloud-os-config"; - version = "1.11.1"; + version = "1.11.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-i4STXwnFyfXauRx4zvYMO1uWMechvNUOxolOcY3Z5us="; + sha256 = "sha256-n3bCKr+fszqHsi6uDmOXSfzoPP8JfpZRAGXIzE3gOVU="; }; propagatedBuildInputs = [ google-api-core libcst proto-plus ]; From 3f1ec25f902bf6cb93db3600d3f6cd69234e4b9d Mon Sep 17 00:00:00 2001 From: lodi Date: Mon, 7 Mar 2022 18:03:23 -0500 Subject: [PATCH 173/245] persistent-evdev: init at unstable-2022-01-14 --- .../from_md/release-notes/rl-2211.section.xml | 9 +++ .../manual/release-notes/rl-2211.section.md | 1 + nixos/modules/module-list.nix | 1 + .../services/misc/persistent-evdev.nix | 60 +++++++++++++++++++ pkgs/servers/persistent-evdev/default.nix | 42 +++++++++++++ pkgs/top-level/all-packages.nix | 2 + 6 files changed, 115 insertions(+) create mode 100644 nixos/modules/services/misc/persistent-evdev.nix create mode 100644 pkgs/servers/persistent-evdev/default.nix diff --git a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml index 65ba6033c834..f90003496280 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml @@ -55,6 +55,15 @@ services.infnoise. + + + persistent-evdev, + a daemon to add virtual proxy devices that mirror a physical + input device but persist even if the underlying hardware is + hot-plugged. Available as + services.persistent-evdev. + +
diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md index 864fe5c69346..ab131245c872 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -27,6 +27,7 @@ In addition to numerous new and upgraded packages, this release has the followin - [infnoise](https://github.com/leetronics/infnoise), a hardware True Random Number Generator dongle. Available as [services.infnoise](options.html#opt-services.infnoise.enable). +- [persistent-evdev](https://github.com/aiberia/persistent-evdev), a daemon to add virtual proxy devices that mirror a physical input device but persist even if the underlying hardware is hot-plugged. Available as [services.persistent-evdev](#opt-services.persistent-evdev.enable). diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index d59d7bfe40d9..a69c5249e28b 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -605,6 +605,7 @@ ./services/misc/packagekit.nix ./services/misc/paperless.nix ./services/misc/parsoid.nix + ./services/misc/persistent-evdev.nix ./services/misc/plex.nix ./services/misc/plikd.nix ./services/misc/podgrab.nix diff --git a/nixos/modules/services/misc/persistent-evdev.nix b/nixos/modules/services/misc/persistent-evdev.nix new file mode 100644 index 000000000000..401d20010b12 --- /dev/null +++ b/nixos/modules/services/misc/persistent-evdev.nix @@ -0,0 +1,60 @@ +{ config, lib, pkgs, ... }: + +let + cfg = config.services.persistent-evdev; + settingsFormat = pkgs.formats.json {}; + + configFile = settingsFormat.generate "persistent-evdev-config" { + cache = "/var/cache/persistent-evdev"; + devices = lib.mapAttrs (virt: phys: "/dev/input/by-id/${phys}") cfg.devices; + }; +in +{ + options.services.persistent-evdev = { + enable = lib.mkEnableOption "virtual input devices that persist even if the backing device is hotplugged"; + + devices = lib.mkOption { + default = {}; + type = with lib.types; attrsOf str; + description = '' + A set of virtual proxy device labels with backing physical device ids. + + Physical devices should already exist in /dev/input/by-id/. + Proxy devices will be automatically given a uinput- prefix. + + See the + project page for example configuration of virtual devices with libvirt + and remember to add uinput-* devices to the qemu + cgroup_device_acl list (see ). + ''; + example = lib.literalExpression '' + { + persist-mouse0 = "usb-Logitech_G403_Prodigy_Gaming_Mouse_078738533531-event-if01"; + persist-mouse1 = "usb-Logitech_G403_Prodigy_Gaming_Mouse_078738533531-event-mouse"; + persist-mouse2 = "usb-Logitech_G403_Prodigy_Gaming_Mouse_078738533531-if01-event-kbd"; + persist-keyboard0 = "usb-Microsoft_Natural®_Ergonomic_Keyboard_4000-event-kbd"; + persist-keyboard1 = "usb-Microsoft_Natural®_Ergonomic_Keyboard_4000-if01-event-kbd"; + } + ''; + }; + }; + + config = lib.mkIf cfg.enable { + + systemd.services.persistent-evdev = { + documentation = [ "https://github.com/aiberia/persistent-evdev/blob/master/README.md" ]; + description = "Persistent evdev proxy"; + wantedBy = [ "multi-user.target" ]; + + serviceConfig = { + Restart = "on-failure"; + ExecStart = "${pkgs.persistent-evdev}/bin/persistent-evdev.py ${configFile}"; + CacheDirectory = "persistent-evdev"; + }; + }; + + services.udev.packages = [ pkgs.persistent-evdev ]; + }; + + meta.maintainers = with lib.maintainers; [ lodi ]; +} diff --git a/pkgs/servers/persistent-evdev/default.nix b/pkgs/servers/persistent-evdev/default.nix new file mode 100644 index 000000000000..c666e9c8d799 --- /dev/null +++ b/pkgs/servers/persistent-evdev/default.nix @@ -0,0 +1,42 @@ +{ lib, buildPythonPackage, fetchFromGitHub, python3Packages }: + +buildPythonPackage rec { + pname = "persistent-evdev"; + version = "unstable-2022-05-07"; + + src = fetchFromGitHub { + owner = "aiberia"; + repo = pname; + rev = "52bf246464e09ef4e6f2e1877feccc7b9feba164"; + sha256 = "d0i6DL/qgDELet4ew2lyVqzd9TApivRxL3zA3dcsQXY="; + }; + + propagatedBuildInputs = with python3Packages; [ + evdev pyudev + ]; + + postPatch = '' + patchShebangs bin/persistent-evdev.py + ''; + + dontBuild = true; + + installPhase = '' + mkdir -p $out/bin + cp bin/persistent-evdev.py $out/bin + + mkdir -p $out/etc/udev/rules.d + cp udev/60-persistent-input-uinput.rules $out/etc/udev/rules.d + ''; + + # has no tests + doCheck = false; + + meta = with lib; { + homepage = "https://github.com/aiberia/persistent-evdev"; + description = "Persistent virtual input devices for qemu/libvirt/evdev hotplug support"; + license = licenses.mit; + maintainers = [ maintainers.lodi ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5716dd88ed2e..18a97fdfdfb0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4757,6 +4757,8 @@ with pkgs; evdevremapkeys = callPackage ../tools/inputmethods/evdevremapkeys { }; + persistent-evdev = python3Packages.callPackage ../servers/persistent-evdev { }; + evscript = callPackage ../tools/inputmethods/evscript { }; gebaar-libinput = callPackage ../tools/inputmethods/gebaar-libinput { stdenv = gcc10StdenvCompat; }; From f9aab9fed00fa7fa8cf3c698d9201d4ea399b183 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Jun 2022 17:21:02 +0000 Subject: [PATCH 174/245] python310Packages.google-cloud-pubsub: 2.12.1 -> 2.13.0 --- .../python-modules/google-cloud-pubsub/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-pubsub/default.nix b/pkgs/development/python-modules/google-cloud-pubsub/default.nix index 6871296a763d..aac222df0ac3 100644 --- a/pkgs/development/python-modules/google-cloud-pubsub/default.nix +++ b/pkgs/development/python-modules/google-cloud-pubsub/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "google-cloud-pubsub"; - version = "2.12.1"; + version = "2.13.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-mTphUjL61NwaE7vKDgeCv+0WeA15FNQzvnY/6fHZ/QU="; + hash = "sha256-pcLgXIPWC7F6FS5Znn9DJMn/tsjNpE/7YlCxYoDDg+Y="; }; propagatedBuildInputs = [ From bb9bd12c1547617f5d1fa20b587221023c012efb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Jun 2022 17:25:42 +0000 Subject: [PATCH 175/245] python310Packages.google-cloud-redis: 2.8.0 -> 2.8.1 --- .../development/python-modules/google-cloud-redis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-redis/default.nix b/pkgs/development/python-modules/google-cloud-redis/default.nix index ab432454bbaf..4a4e0e9a555f 100644 --- a/pkgs/development/python-modules/google-cloud-redis/default.nix +++ b/pkgs/development/python-modules/google-cloud-redis/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-cloud-redis"; - version = "2.8.0"; + version = "2.8.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-7L3SjViQmzTp//5LWWG9VG+TQuPay70KZdUuzhy7HS0="; + hash = "sha256-qI7bGk+BkLIfhrJHAfk2DVBp8vRc5dPLKjdKH0FPj8s="; }; propagatedBuildInputs = [ From 3410785b9b30c622e8ec1c3a86f6f4aefb1a8b31 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Jun 2022 17:33:14 +0000 Subject: [PATCH 176/245] python310Packages.google-cloud-secret-manager: 2.11.0 -> 2.11.1 --- .../python-modules/google-cloud-secret-manager/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-secret-manager/default.nix b/pkgs/development/python-modules/google-cloud-secret-manager/default.nix index b5c9f186fe55..edb73853cace 100644 --- a/pkgs/development/python-modules/google-cloud-secret-manager/default.nix +++ b/pkgs/development/python-modules/google-cloud-secret-manager/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-secret-manager"; - version = "2.11.0"; + version = "2.11.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-naE1e7T1E0P3MxJCMYc3YZ79v/3VTW19D/LhzRie7jk="; + hash = "sha256-tSy0d8kdyDSE+/gcg4B+fplnLJ4ipoa+TZvUoExaYVU="; }; propagatedBuildInputs = [ From ca3260b2dfb0579ea928a708e29e62b3506a0793 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Jun 2022 17:37:36 +0000 Subject: [PATCH 177/245] python310Packages.google-cloud-securitycenter: 1.11.0 -> 1.11.1 --- .../python-modules/google-cloud-securitycenter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-securitycenter/default.nix b/pkgs/development/python-modules/google-cloud-securitycenter/default.nix index 1df89058a6f5..5be79fd38fa5 100644 --- a/pkgs/development/python-modules/google-cloud-securitycenter/default.nix +++ b/pkgs/development/python-modules/google-cloud-securitycenter/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-securitycenter"; - version = "1.11.0"; + version = "1.11.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-+etRN3Q7Y1oYtQy0Fkoj6ujhx4gD5y+fUriu/eitIQM="; + hash = "sha256-XvjxdrGgdXaJqbArwdEWT31one+I43cpZ97PciM8yIA="; }; propagatedBuildInputs = [ From 384638512ca91a098c513ea5a1fcac2f304e4135 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Jun 2022 17:42:06 +0000 Subject: [PATCH 178/245] python310Packages.google-cloud-speech: 2.14.0 -> 2.14.1 --- .../python-modules/google-cloud-speech/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-speech/default.nix b/pkgs/development/python-modules/google-cloud-speech/default.nix index cd797240cc76..8c46aec477e0 100644 --- a/pkgs/development/python-modules/google-cloud-speech/default.nix +++ b/pkgs/development/python-modules/google-cloud-speech/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-speech"; - version = "2.14.0"; + version = "2.14.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-D8t8+rscImUvpHCEFGTzLU5FpAMZ62iHhRfLzUXqGV8="; + hash = "sha256-ImE08djcrhhC0VQJmL69hbfUDBALPUyW9IaSh1CIJqs="; }; propagatedBuildInputs = [ From 049ce2a9ec2cd065ae92643a29fec4ac3c31a6a3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Jun 2022 17:42:49 +0000 Subject: [PATCH 179/245] python310Packages.google-cloud-trace: 1.6.1 -> 1.6.2 --- .../development/python-modules/google-cloud-trace/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-trace/default.nix b/pkgs/development/python-modules/google-cloud-trace/default.nix index bb9eb5f477ac..8665718fb00f 100644 --- a/pkgs/development/python-modules/google-cloud-trace/default.nix +++ b/pkgs/development/python-modules/google-cloud-trace/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-trace"; - version = "1.6.1"; + version = "1.6.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-JkKW9vJAAkw3sHYDapRvu5jjunV8oWSg/ykDmd1wpyA="; + sha256 = "sha256-nxyd8zE8PEQupVutLWhLD4I1jNhhJ0ARpTi52f21iBE="; }; propagatedBuildInputs = [ google-api-core google-cloud-core proto-plus ]; From 165602b8016e4c3ca2c8a2e15086bfb84991b2b5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Jun 2022 17:53:17 +0000 Subject: [PATCH 180/245] python310Packages.google-cloud-translate: 3.7.3 -> 3.7.4 --- .../python-modules/google-cloud-translate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-translate/default.nix b/pkgs/development/python-modules/google-cloud-translate/default.nix index 4a9398ac4b42..ca961844a027 100644 --- a/pkgs/development/python-modules/google-cloud-translate/default.nix +++ b/pkgs/development/python-modules/google-cloud-translate/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-translate"; - version = "3.7.3"; + version = "3.7.4"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-c++DP97IhMKHKZqXWpVO/9Rw1q8eYs1ybNZDhviwB/A="; + hash = "sha256-B5MBpdcS6NN7rwvjLwbY55rV0dLDwWtnAadWsH2AwXE="; }; propagatedBuildInputs = [ From 43fa64fc984ec2a8a45a75f8c21bbe09d2250687 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Tue, 7 Jun 2022 14:23:59 -0400 Subject: [PATCH 181/245] python3Packages.questionary: not broken on darwin --- pkgs/development/python-modules/questionary/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/python-modules/questionary/default.nix b/pkgs/development/python-modules/questionary/default.nix index 5e750bbc195d..35257708ae05 100644 --- a/pkgs/development/python-modules/questionary/default.nix +++ b/pkgs/development/python-modules/questionary/default.nix @@ -44,7 +44,6 @@ buildPythonPackage rec { ]; meta = with lib; { - broken = stdenv.isDarwin; description = "Python library to build command line user prompts"; homepage = "https://github.com/tmbo/questionary"; license = with licenses; [ mit ]; From 55cadbcfa313f4e160fbcf0fa751a6dc4e95e205 Mon Sep 17 00:00:00 2001 From: Eliza <4576666+elizagamedev@users.noreply.github.com> Date: Tue, 7 Jun 2022 18:49:39 +0000 Subject: [PATCH 182/245] mujmap: 0.1.1 -> 0.2.0 (#176648) --- pkgs/applications/networking/mujmap/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/mujmap/default.nix b/pkgs/applications/networking/mujmap/default.nix index 247a8d589547..60f49163be73 100644 --- a/pkgs/applications/networking/mujmap/default.nix +++ b/pkgs/applications/networking/mujmap/default.nix @@ -8,23 +8,23 @@ rustPlatform.buildRustPackage rec { pname = "mujmap"; - version = "0.1.1"; + version = "0.2.0"; src = fetchFromGitHub { owner = "elizagamedev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-O5CbLgs+MkATPtess0gocgPB9kwD8FMR/urwm6jo2rA="; + sha256 = "sha256-Qb9fEPQrdn+Ek9bdOMfaPIxlGGpQ9RfQZOeeqoOf17E="; }; - cargoSha256 = "sha256-nOZ+HnzXhVp+tLrNMZO1NmZIhIqlWz0fRMbHVIQkOxI="; + cargoSha256 = "sha256-nnAYjutjxtEpDNoWTnlESDO4Haz14wZxY4gdyzdLgBU="; buildInputs = [ notmuch ] ++ lib.optional stdenv.isDarwin Security; meta = with lib; { - description = "Bridge for synchronizing email and tags between JMAP and notmuch"; + description = "JMAP integration for notmuch mail"; homepage = "https://github.com/elizagamedev/mujmap/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ elizagamedev ]; From c7658a87ac3e867dc1ea0e11ffc0cf10bb750553 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 7 Jun 2022 20:57:16 +0200 Subject: [PATCH 183/245] python310Packages.dulwich: 0.20.42 -> 0.20.43 --- pkgs/development/python-modules/dulwich/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dulwich/default.nix b/pkgs/development/python-modules/dulwich/default.nix index 570598e1a993..ccd816753a9a 100644 --- a/pkgs/development/python-modules/dulwich/default.nix +++ b/pkgs/development/python-modules/dulwich/default.nix @@ -17,7 +17,7 @@ }: buildPythonPackage rec { - version = "0.20.42"; + version = "0.20.43"; pname = "dulwich"; format = "setuptools"; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-cro7YK5qVU0TMrO0CjRf6+FuxGnPYBS7RDtxmQLjPvA="; + hash = "sha256-/MIWTgE7OQqe46EJ1+97ldjeKDsueJuwfpSqMRXjKeo="; }; LC_ALL = "en_US.UTF-8"; From a05afc66e8adf1c960e276fe91f83c6b21a45a9c Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 7 Jun 2022 21:12:21 +0200 Subject: [PATCH 184/245] haskellPackages.NGLess: disable incomplete test suite --- pkgs/development/haskell-modules/configuration-common.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 32c2126fbb5f..e55f32231cfa 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2549,6 +2549,10 @@ self: super: { sha256 = "0wxpqazjnal9naibapg63nm7x6qz0lklcfw2m5mzjrh2q9x2cvnd"; }) super.debian; + # Test data missing from sdist + # https://github.com/ngless-toolkit/ngless/issues/152 + NGLess = dontCheck super.NGLess; + # Raise version bounds for hspec records-sop = appendPatch (fetchpatch { url = "https://github.com/kosmikus/records-sop/pull/11/commits/d88831388ab3041190130fec3cdd679a4217b3c7.patch"; From d826ebc5a8e06dd89fbb82589d0f6fc07d52eba3 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 7 Jun 2022 21:12:33 +0200 Subject: [PATCH 185/245] haskellPackages.aws-sns-verify: disable network dependent tests --- pkgs/development/haskell-modules/configuration-nix.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 9d93cc84add7..f1396fd0dd78 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -924,6 +924,9 @@ self: super: builtins.intersectAttrs super { && buildPlatform.isx86; } super.hashes; + # Tries to access network + aws-sns-verify = dontCheck super.aws-sns-verify; + # procex relies on close_range which has been introduced in Linux 5.9, # the test suite seems to force the use of this feature (or the fallback # mechanism is broken), so we can't run the test suite on machines with a From 436bb2e60e26919a7b9c6a0d75205a60564c63e1 Mon Sep 17 00:00:00 2001 From: lunik1 Date: Sat, 23 Apr 2022 23:43:26 +0100 Subject: [PATCH 186/245] efficient-compression-tool: init at 0.9.1 --- .../efficient-compression-tool/default.nix | 39 +++++++ .../use-nixpkgs-libpng.patch | 108 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 149 insertions(+) create mode 100644 pkgs/tools/compression/efficient-compression-tool/default.nix create mode 100644 pkgs/tools/compression/efficient-compression-tool/use-nixpkgs-libpng.patch diff --git a/pkgs/tools/compression/efficient-compression-tool/default.nix b/pkgs/tools/compression/efficient-compression-tool/default.nix new file mode 100644 index 000000000000..6a9615601276 --- /dev/null +++ b/pkgs/tools/compression/efficient-compression-tool/default.nix @@ -0,0 +1,39 @@ +{ lib +, stdenv +, fetchFromGitHub +, boost +, cmake +, nasm +, libpng +}: + +stdenv.mkDerivation rec { + pname = "efficient-compression-tool"; + version = "0.9.1"; + + src = fetchFromGitHub { + owner = "fhanau"; + repo = "Efficient-Compression-Tool"; + rev = "v${version}"; + sha256 = "sha256-TSV5QXf6GuHAwQrde3Zo9MA1rtpAhtRg0UTzMkBnHB8="; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ cmake nasm ]; + + patches = [ ./use-nixpkgs-libpng.patch ]; + + buildInputs = [ boost libpng ]; + + cmakeDir = "../src"; + + cmakeFlags = [ "-DECT_FOLDER_SUPPORT=ON" ]; + + meta = with lib; { + description = "Fast and effective C++ file optimizer"; + homepage = "https://github.com/fhanau/Efficient-Compression-Tool"; + license = licenses.asl20; + maintainers = [ maintainers.lunik1 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/compression/efficient-compression-tool/use-nixpkgs-libpng.patch b/pkgs/tools/compression/efficient-compression-tool/use-nixpkgs-libpng.patch new file mode 100644 index 000000000000..f165b2b95506 --- /dev/null +++ b/pkgs/tools/compression/efficient-compression-tool/use-nixpkgs-libpng.patch @@ -0,0 +1,108 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index d18843c..a9df1fb 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -8,11 +8,6 @@ if(NOT CMAKE_BUILD_TYPE) + set(CMAKE_BUILD_TYPE Release) + endif() + +-# Check that submodules are present only if source was downloaded with git +-if(EXISTS "${CMAKE_SOURCE_DIR}/../.git" AND NOT EXISTS "${CMAKE_SOURCE_DIR}/../src/libpng/README") +- message (FATAL_ERROR "Submodules are not initialized. Run \n\tgit submodule update --init --recursive\n within the repository") +-endif() +- + add_executable(ect + main.cpp + gztools.cpp +@@ -56,7 +51,6 @@ add_subdirectory(lodepng EXCLUDE_FROM_ALL) + add_subdirectory(miniz EXCLUDE_FROM_ALL) + add_subdirectory(zlib EXCLUDE_FROM_ALL) + add_subdirectory(zopfli EXCLUDE_FROM_ALL) +-file(COPY ${CMAKE_SOURCE_DIR}/pngusr.h DESTINATION ${CMAKE_SOURCE_DIR}/libpng/) + add_subdirectory(optipng EXCLUDE_FROM_ALL) + # Mozjpeg changes the install prefix if it thinks the current is defaulted + set(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT FALSE) +diff --git a/src/Makefile b/src/Makefile +index cc24367..7aa9f0a 100755 +--- a/src/Makefile ++++ b/src/Makefile +@@ -18,7 +18,7 @@ CXXSRC = support.cpp zopflipng.cpp zopfli/deflate.cpp zopfli/zopfli_gzip.cpp zop + lodepng/lodepng.cpp lodepng/lodepng_util.cpp optipng/codec.cpp optipng/optipng.cpp jpegtran.cpp gztools.cpp \ + leanify/zip.cpp leanify/leanify.cpp + +-.PHONY: libpng mozjpeg deps bin all install ++.PHONY: mozjpeg deps bin all install + all: deps bin + + bin: deps +@@ -33,9 +33,6 @@ libz.a: + cd zlib/; \ + $(CC) $(UCFLAGS) -c adler32.c crc32.c deflate.c inffast.c inflate.c inftrees.c trees.c zutil.c gzlib.c gzread.c; \ + ar rcs ../libz.a adler32.o crc32.o deflate.o inffast.o inflate.o inftrees.o trees.o zutil.o gzlib.o gzread.o +-libpng: +- cp pngusr.h libpng/pngusr.h +- make -C libpng/ -f scripts/makefile.linux-opt CC="$(CC)" CFLAGS="$(UCFLAGS) -DPNG_USER_CONFIG -Wno-macro-redefined" libpng.a + mozjpeg: + cd mozjpeg/; \ + export CC="$(CC)"; \ +diff --git a/src/optipng/CMakeLists.txt b/src/optipng/CMakeLists.txt +index 1037a20..3c751e9 100644 +--- a/src/optipng/CMakeLists.txt ++++ b/src/optipng/CMakeLists.txt +@@ -16,16 +16,14 @@ add_library(optipng + add_library(optipng::optipng ALIAS optipng) + + #make sure that we are using custom zlib and custom libpng options +-set(PNG_BUILD_ZLIB ON CACHE BOOL "use custom zlib within libpng" FORCE) + set(ZLIB_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../zlib/ CACHE FILEPATH "custom zlib directory" FORCE) + if(NOT WIN32) + add_compile_options(-Wno-macro-redefined) + endif() + add_compile_definitions(PNG_USER_CONFIG) + +-add_subdirectory(../libpng libpng EXCLUDE_FROM_ALL) + target_link_libraries(optipng +- png_static) ++ png) + + # libpng generates some header files that we need to be able to include + target_include_directories(optipng +diff --git a/src/optipng/image.h b/src/optipng/image.h +index c439f84..8255fa0 100755 +--- a/src/optipng/image.h ++++ b/src/optipng/image.h +@@ -13,7 +13,7 @@ + #ifndef OPNGCORE_IMAGE_H + #define OPNGCORE_IMAGE_H + +-#include "../libpng/png.h" ++#include + + #ifdef __cplusplus + extern "C" { +diff --git a/src/optipng/opngreduc/opngreduc.h b/src/optipng/opngreduc/opngreduc.h +index a7e6553..06ef956 100755 +--- a/src/optipng/opngreduc/opngreduc.h ++++ b/src/optipng/opngreduc/opngreduc.h +@@ -13,7 +13,7 @@ + + #include + +-#include "../../libpng/png.h" ++#include + + + #ifdef __cplusplus +diff --git a/src/optipng/trans.h b/src/optipng/trans.h +index a2f7f3e..c0e8dc4 100755 +--- a/src/optipng/trans.h ++++ b/src/optipng/trans.h +@@ -13,7 +13,7 @@ + #ifndef OPNGTRANS_TRANS_H + #define OPNGTRANS_TRANS_H + +-#include "../libpng/png.h" ++#include + + #ifdef __cplusplus + extern "C" { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 98f94a756695..3bb191a1c950 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -377,6 +377,8 @@ with pkgs; eclipse-mat = callPackage ../development/tools/eclipse-mat { }; + efficient-compression-tool = callPackage ../tools/compression/efficient-compression-tool { }; + evans = callPackage ../development/tools/evans { }; firefly-desktop = callPackage ../applications/misc/firefly-desktop { }; From 3910b36a708b9e05bab14568bce61c7118ebf9ef Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 7 Jun 2022 21:23:53 +0200 Subject: [PATCH 187/245] haskellPackages: mark builds failing on hydra as broken This commit has been generated by maintainers/scripts/haskell/mark-broken.sh --- .../configuration-hackage2nix/broken.yaml | 7 ++++++- .../transitive-broken.yaml | 4 ++++ .../haskell-modules/hackage-packages.nix | 15 +++++++++++++++ 3 files changed, 25 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index e4491aca741a..0dc367e6e2e0 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -571,6 +571,7 @@ broken-packages: - call-alloy - cal-layout - call-haskell-from-anything + - call-plantuml - camfort - canon - canonical-filepath @@ -648,6 +649,7 @@ broken-packages: - checked - Checked - checkmate + - chez-grater - chiasma - Chitra - choose @@ -3782,6 +3784,7 @@ broken-packages: - pcf-font - pcgen - PCLT + - pcre2 - pcre-light-extra - pdfname - pdf-slave-template @@ -3943,6 +3946,7 @@ broken-packages: - polysemy-check - polysemy-keyed-state - polysemy-kvstore-jsonfile + - polysemy-managed - polysemy-mocks - polysemy-readline - polysemy-req @@ -5504,6 +5508,7 @@ broken-packages: - wai-graceful - wai-handler-devel - wai-handler-fastcgi + - wai-handler-hal - wai-handler-scgi - wai-handler-webkit - wai-hmac-auth @@ -5564,11 +5569,11 @@ broken-packages: - webdriver - webdriver-snoy - web-encodings - - webkitgtk3 - WeberLogic - webex-teams-pipes - webfinger-client - web-inv-route + - webkitgtk3 - webkit-javascriptcore - webmention - web-output diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index e44cbdc8571f..d0668b13a404 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -878,6 +878,7 @@ dont-distribute-packages: - cabal-query - cabal-test - cabal2arch + - cabal2json - cabalmdvrpm - cabalrpmdeps - cabocha @@ -3087,6 +3088,8 @@ dont-distribute-packages: - phonetic-languages-simplified-generalized-properties-array - phonetic-languages-simplified-lists-examples - phonetic-languages-simplified-properties-array + - phonetic-languages-simplified-properties-array-common + - phonetic-languages-simplified-properties-array-old - phonetic-languages-simplified-properties-lists - phonetic-languages-simplified-properties-lists-double - phonetic-languages-ukrainian @@ -4200,6 +4203,7 @@ dont-distribute-packages: - yesod-auth-fb - yesod-auth-ldap - yesod-auth-lti13 + - yesod-auth-simple - yesod-colonnade - yesod-comments - yesod-continuations diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 7b6fe7c7c045..2ddaee131927 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -51420,6 +51420,7 @@ self: { testToolDepends = [ sydtest-discover ]; description = "Turn a .cabal file into a .json file"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "cabal2nix" = callPackage @@ -52391,6 +52392,8 @@ self: { testHaskellDepends = [ base bytestring filepath hspec process ]; description = "A simple library to call PlantUML given a diagram specification"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "call-stack" = callPackage @@ -56167,6 +56170,8 @@ self: { ]; description = "Parse and scrape recipe blogs"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "chiasma" = callPackage @@ -208664,6 +208669,8 @@ self: { ]; description = "Regular expressions via the PCRE2 C library (included)"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "pcre2_2_2_1" = callPackage @@ -208689,6 +208696,7 @@ self: { description = "Regular expressions via the PCRE2 C library (included)"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "pdc" = callPackage @@ -211885,6 +211893,7 @@ self: { ]; description = "Common functionality for 'with-tuples' and old version of properties"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "phonetic-languages-simplified-properties-array-old" = callPackage @@ -211906,6 +211915,7 @@ self: { ]; description = "Some properties of the data related to rhythmicity"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "phonetic-languages-simplified-properties-lists" = callPackage @@ -216179,6 +216189,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "Primitive functions and data types"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "polysemy-methodology" = callPackage @@ -292621,6 +292633,8 @@ self: { testToolDepends = [ tasty-discover ]; description = "Wrap WAI applications to run on AWS Lambda"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "wai-handler-launch" = callPackage @@ -303595,6 +303609,7 @@ self: { testToolDepends = [ hspec-discover ]; description = "Traditional email/pass auth for Yesod"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "yesod-auth-smbclient" = callPackage From 6232c43e4da390007e8ddb787562c3040533dc11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 7 Jun 2022 17:01:38 +0000 Subject: [PATCH 188/245] deltachat-desktop: 1.30.0 -> 1.30.1 https://github.com/deltachat/deltachat-desktop/releases/tag/v1.30.1 --- .../deltachat-desktop/default.nix | 11 +- .../deltachat-desktop/package.json | 4 +- .../node-packages/node-packages.nix | 2263 ++++++++--------- 3 files changed, 1026 insertions(+), 1252 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix b/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix index 94ffd40364c0..980ff7e9b548 100644 --- a/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix @@ -18,17 +18,17 @@ let libdeltachat' = libdeltachat.overrideAttrs (old: rec { - version = "1.84.0"; + version = "1.86.0"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-core-rust"; rev = version; - hash = "sha256-ZG3siulXVHTbdSd9tmenljFODZ3LWX+BXn6OJfrbEYA="; + hash = "sha256-VLS93Ffeit2rVmXxYkXcnf8eDA3DC2/wKYZTh56QCk0="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${old.pname}-${version}"; - hash = "sha256-vQ+A4dEWh5+BgWOdxd7GTPuHk6M6bHgGnZcWNwR/Urs="; + hash = "sha256-4rpoDQ3o0WdWg/TmazTI+J0hL/MxwHcNMXWMq7GE7Tk="; }; }); electronExec = if stdenv.isDarwin then @@ -46,13 +46,13 @@ let }); in nodePackages.deltachat-desktop.override rec { pname = "deltachat-desktop"; - version = "1.30.0"; + version = "1.30.1"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-desktop"; rev = "v${version}"; - hash = "sha256-vp6vqoQvkAe7QPy4210r/5c1GNaGWgYvG0LyLqtCAxw="; + hash = "sha256-gZjZbXiqhFVfThZOsvL/nKkf6MX+E3KB5ldEAIuzBYA="; }; nativeBuildInputs = [ @@ -122,6 +122,7 @@ in nodePackages.deltachat-desktop.override rec { homepage = "https://github.com/deltachat/deltachat-desktop"; changelog = "https://github.com/deltachat/deltachat-desktop/blob/${src.rev}/CHANGELOG.md"; license = licenses.gpl3Plus; + mainProgram = "deltachat"; maintainers = with maintainers; [ dotlambda ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/deltachat-desktop/package.json b/pkgs/applications/networking/instant-messengers/deltachat-desktop/package.json index f331bdf190ee..96778eda7aa6 100644 --- a/pkgs/applications/networking/instant-messengers/deltachat-desktop/package.json +++ b/pkgs/applications/networking/instant-messengers/deltachat-desktop/package.json @@ -1,6 +1,6 @@ { "name": "deltachat-desktop", - "version": "1.30.0", + "version": "1.30.1", "dependencies": { "@blueprintjs/core": "^4.1.2", "@deltachat/message_parser_wasm": "^0.4.0", @@ -9,7 +9,7 @@ "application-config": "^1.0.1", "classnames": "^2.3.1", "debounce": "^1.2.0", - "deltachat-node": "1.84.0", + "deltachat-node": "1.86.0", "emoji-js-clean": "^4.0.0", "emoji-mart": "^3.0.1", "emoji-regex": "^9.2.2", diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 10600b44db37..336793be1f6e 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -481,31 +481,31 @@ let sha512 = "+D3xnPD5985iphgAqgUerBDs371a2WzzoEVi7eHJUMMsP/gEnSTdSH0HNxsqhYv6CW4EdKtvDAQdAwA1VtCf2A=="; }; }; - "@aws-sdk/client-s3-3.100.0" = { + "@aws-sdk/client-s3-3.105.0" = { name = "_at_aws-sdk_slash_client-s3"; packageName = "@aws-sdk/client-s3"; - version = "3.100.0"; + version = "3.105.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/client-s3/-/client-s3-3.100.0.tgz"; - sha512 = "UmgFdJabWtiUS4dWsC3kZ+ZMvH5QUUbDnLS8pT12duwLGt+xlWPn3PUkV8kL6qjG6XePLUgCqFTLjDD4tsTZNg=="; + url = "https://registry.npmjs.org/@aws-sdk/client-s3/-/client-s3-3.105.0.tgz"; + sha512 = "aYHUW8r+YrMPULRBKaFnEKMeWiWf4vE7qEOzRdyucSViyl9ZGqlbxBBAFVRlfGtIRb783DDeeR2j94ruGqMP5Q=="; }; }; - "@aws-sdk/client-sso-3.100.0" = { + "@aws-sdk/client-sso-3.105.0" = { name = "_at_aws-sdk_slash_client-sso"; packageName = "@aws-sdk/client-sso"; - version = "3.100.0"; + version = "3.105.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.100.0.tgz"; - sha512 = "nmBRUO5QfQ2IO8fHb37p8HT3n1ZooPb3sfTQejrpFH9Eq82VEOatIGt6yH3yTQ8+mhbabEhV5aY2wt/0D7wGVA=="; + url = "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.105.0.tgz"; + sha512 = "Lp92m3ayckXpAElpgZ8E6JEGB7B5sBsjCkTmYeZq3uVXF8uCVMQFmFo4v2yndLQ3NFCEE8qN2PE8obLDOAsNIA=="; }; }; - "@aws-sdk/client-sts-3.100.0" = { + "@aws-sdk/client-sts-3.105.0" = { name = "_at_aws-sdk_slash_client-sts"; packageName = "@aws-sdk/client-sts"; - version = "3.100.0"; + version = "3.105.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.100.0.tgz"; - sha512 = "WHy0e6COf6/LfMsYqG9H4SGaQRDjuckMtwOLtu6cYr4cro3bOU5pNuyEjAdUHCpuhZgiE6gkZozhTlxMJqIuRQ=="; + url = "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.105.0.tgz"; + sha512 = "ZZyw5hu0Ip/jHc9umpWTnWNUHV270fS25LB7fecUwQeC/cok+EvaG5QGBVI5t0GSUynEIC0sNlG9SDc1wLTZPA=="; }; }; "@aws-sdk/config-resolver-3.80.0" = { @@ -535,22 +535,22 @@ let sha512 = "BHopP+gaovTYj+4tSrwCk8NNCR48gE9CWmpIOLkP9ell0gOL81Qh7aCEiIK0BZBZkccv1s16cYq1MSZZGS7PEQ=="; }; }; - "@aws-sdk/credential-provider-ini-3.100.0" = { + "@aws-sdk/credential-provider-ini-3.105.0" = { name = "_at_aws-sdk_slash_credential-provider-ini"; packageName = "@aws-sdk/credential-provider-ini"; - version = "3.100.0"; + version = "3.105.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.100.0.tgz"; - sha512 = "2pCtth/Iv4mATRwb2g1nJdd9TolMyhTnhcskopukFvzp13VS5cgtz0hgYmJNnztTF8lpKJhJaidtKS5JJTWnHg=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.105.0.tgz"; + sha512 = "qYEUciSpeIBkIDt3ljWkVphG7OUIvQOMklYjtEYjYGFjHX7GuyNbV0NI0T6W/edV0aU/a/KpBi0uKd93Gi43Lg=="; }; }; - "@aws-sdk/credential-provider-node-3.100.0" = { + "@aws-sdk/credential-provider-node-3.105.0" = { name = "_at_aws-sdk_slash_credential-provider-node"; packageName = "@aws-sdk/credential-provider-node"; - version = "3.100.0"; + version = "3.105.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.100.0.tgz"; - sha512 = "PMIPnn/dhv9tlWR0qXnANJpTumujWfhKnLAsV3BUqB1K9IzWqz/zXjCT0jcSUTY8X/VkSuehtBdCKvOOM5mMqg=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.105.0.tgz"; + sha512 = "A781wWAcghqw21Vddj2jZo1BeKDyqqMcBYIuXJxjwK4fq+IBxlnI6De1vzv3H7QxosDyDS4mKWGW2FqUQI8ofg=="; }; }; "@aws-sdk/credential-provider-process-3.80.0" = { @@ -562,13 +562,13 @@ let sha512 = "3Ro+kMMyLUJHefOhGc5pOO/ibGcJi8bkj0z/Jtqd5I2Sm1qi7avoztST67/k48KMW1OqPnD/FUqxz5T8B2d+FQ=="; }; }; - "@aws-sdk/credential-provider-sso-3.100.0" = { + "@aws-sdk/credential-provider-sso-3.105.0" = { name = "_at_aws-sdk_slash_credential-provider-sso"; packageName = "@aws-sdk/credential-provider-sso"; - version = "3.100.0"; + version = "3.105.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.100.0.tgz"; - sha512 = "DwJvrh77vBJ1/fS9z0i2QuIvSk4pATA4DH8AEWoQ8LQX97tp3es7gZV5Wu93wFsEyIYC8penz6pNVq5QajMk2A=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.105.0.tgz"; + sha512 = "oHvMZ0uHfOzFkepX29GPXUrI7HTQklQl01laVxEdCNtgZGfos9gjz+xPUDBCaoiEzM+xF9uu4wtaQ15c1bCclQ=="; }; }; "@aws-sdk/credential-provider-web-identity-3.78.0" = { @@ -760,6 +760,15 @@ let sha512 = "GBhwxNjhCJUIeQQDaGasX/C23Jay77al2vRyGwmxf8no0DdFsa4J1Ik6/2hhIqkqko+WM4SpCnpZrY4MtnxNvA=="; }; }; + "@aws-sdk/middleware-recursion-detection-3.105.0" = { + name = "_at_aws-sdk_slash_middleware-recursion-detection"; + packageName = "@aws-sdk/middleware-recursion-detection"; + version = "3.105.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.105.0.tgz"; + sha512 = "KksW6cBQ3BWTNlN+4eMW8//oqsuKLYJsSUsdSLQb7MFBHnw+6r8GS9WXMYN0IBswlhdYi9fv83zlKDTV21ZL+g=="; + }; + }; "@aws-sdk/middleware-retry-3.80.0" = { name = "_at_aws-sdk_slash_middleware-retry"; packageName = "@aws-sdk/middleware-retry"; @@ -769,13 +778,13 @@ let sha512 = "CTk+tA4+WMUNOcUfR6UQrkhwvPYFpnMsQ1vuHlpLFOGG3nCqywA2hueLMRQmVcDXzP0sGeygce6dzRI9dJB/GA=="; }; }; - "@aws-sdk/middleware-sdk-s3-3.86.0" = { + "@aws-sdk/middleware-sdk-s3-3.105.0" = { name = "_at_aws-sdk_slash_middleware-sdk-s3"; packageName = "@aws-sdk/middleware-sdk-s3"; - version = "3.86.0"; + version = "3.105.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-sdk-s3/-/middleware-sdk-s3-3.86.0.tgz"; - sha512 = "1L9q8iJXy/KNyVR8JRs4DZ5SJse6nJPiK4AR8c2xF5FWHdGoFaLcdqpg2/TLB1kpdcfGgNp96uCROxh+IPXtDQ=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-sdk-s3/-/middleware-sdk-s3-3.105.0.tgz"; + sha512 = "GI2vYiboOc3GNpjNUtGyBVi9R6hwLhjId2PPqchyiRntlzz9CfF4F2qMjH/Vv0kE383hT8TN+5kGmaVSmeJqmg=="; }; }; "@aws-sdk/middleware-sdk-sts-3.78.0" = { @@ -886,13 +895,13 @@ let sha512 = "csaH8YTyN+KMNczeK6fBS8l7iJaqcQcKOIbpQFg5upX4Ly5A56HJn4sVQhY1LSgfSk4xRsNfMy5mu6BlsIiaXA=="; }; }; - "@aws-sdk/s3-request-presigner-3.100.0" = { + "@aws-sdk/s3-request-presigner-3.105.0" = { name = "_at_aws-sdk_slash_s3-request-presigner"; packageName = "@aws-sdk/s3-request-presigner"; - version = "3.100.0"; + version = "3.105.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/s3-request-presigner/-/s3-request-presigner-3.100.0.tgz"; - sha512 = "32j9o2ChP2pzsua5+Ci9XFKBsFXxlE5muVD9CSpEG9UfUieORAvXsZVChu86IWBFR2nQRm0vebrwJC2tKsgu1A=="; + url = "https://registry.npmjs.org/@aws-sdk/s3-request-presigner/-/s3-request-presigner-3.105.0.tgz"; + sha512 = "qnHScqU8PgY5mB1QmhkiRM6sz++RmUJKqzVjulpEv5iYzk3ey+eCf+4m3mDj7dx6Siw+ThAwTxVzkilnJNvJZg=="; }; }; "@aws-sdk/service-error-classification-3.78.0" = { @@ -3685,22 +3694,22 @@ let sha512 = "na1+hTRDg2xHSu3Vrr8ITrQpoFChOCSpqTYjLvdRD081p8o61hk9DeaXkUWr8E+2TZ06BXi2t0VyL4wfrYLU8Q=="; }; }; - "@fluentui/font-icons-mdl2-8.4.0" = { + "@fluentui/font-icons-mdl2-8.4.1" = { name = "_at_fluentui_slash_font-icons-mdl2"; packageName = "@fluentui/font-icons-mdl2"; - version = "8.4.0"; + version = "8.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/font-icons-mdl2/-/font-icons-mdl2-8.4.0.tgz"; - sha512 = "AV3XEOXfMwpXPdK+MJhJqCd9F9SLHTwsLEgP7Veebcg6cHxnYLcQME/QjwOjlVSdApg7pa1anJ0Fmjy4P85s5Q=="; + url = "https://registry.npmjs.org/@fluentui/font-icons-mdl2/-/font-icons-mdl2-8.4.1.tgz"; + sha512 = "nKVb7Jd52EQYASNHNtOVXT01SIzB4MoCPdKxXkwU1rvLe5u6RzAd4UHxjes09/KuvKrIG/Ixo0nv5mb+6NN2sw=="; }; }; - "@fluentui/foundation-legacy-8.2.7" = { + "@fluentui/foundation-legacy-8.2.8" = { name = "_at_fluentui_slash_foundation-legacy"; packageName = "@fluentui/foundation-legacy"; - version = "8.2.7"; + version = "8.2.8"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/foundation-legacy/-/foundation-legacy-8.2.7.tgz"; - sha512 = "/ehXnwMj2UkjJZc2pdhgBtmpEs4sghxbw2avm4vybFMeLpqyF7stXAGou3/v1ifjMqbYkSYo06uG/kk1B8vqSw=="; + url = "https://registry.npmjs.org/@fluentui/foundation-legacy/-/foundation-legacy-8.2.8.tgz"; + sha512 = "9K99k/Cexcn6+U5bbJe8sojd3U6/WID7zmqyDhlVfQDL5napa4Myv9049ToUQ6IUnDJSTZOnuHrWMoK5maUOdw=="; }; }; "@fluentui/keyboard-key-0.4.1" = { @@ -3721,22 +3730,22 @@ let sha512 = "ax8izl48JJuymEuvJzvNH22GHmpPEWLP+h4doyFZ/9IhR9AEycNc2rGBthZ5FiuktnFgusNag1AHr/WCj5pttw=="; }; }; - "@fluentui/react-8.72.1" = { + "@fluentui/react-8.72.2" = { name = "_at_fluentui_slash_react"; packageName = "@fluentui/react"; - version = "8.72.1"; + version = "8.72.2"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react/-/react-8.72.1.tgz"; - sha512 = "Uumnx5JzeSgirc/cfgXlgx95FExid2bgOp4n2X5YKViHwlqGrI5FTfcMQ47W8iwjK4RKBWlu+3yiYajlQ3kYAQ=="; + url = "https://registry.npmjs.org/@fluentui/react/-/react-8.72.2.tgz"; + sha512 = "/Wn2qIhHl5fJ7zhTNURbs3KzgXe3NuJOBirpZUd/RkLaWxEgb+1+ylw9ijae4Ll65LmEC3Qyu98o+ALxVS83Ww=="; }; }; - "@fluentui/react-focus-8.6.0" = { + "@fluentui/react-focus-8.6.1" = { name = "_at_fluentui_slash_react-focus"; packageName = "@fluentui/react-focus"; - version = "8.6.0"; + version = "8.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react-focus/-/react-focus-8.6.0.tgz"; - sha512 = "mQWAHZHmKd8hlUqNeagbIYMANECtFVPyizmDl1GIlhpT6bP7LR8xSf5oZ+Yv52tjhWjY4KWfivH9+fiBEUh5Wg=="; + url = "https://registry.npmjs.org/@fluentui/react-focus/-/react-focus-8.6.1.tgz"; + sha512 = "0DasQ31xEqND3OMd+svWto68+U5p6Z8Z+U92jZAlahfh5A6dRcDixu42hQkETmYg8oYaF0zMsVHAZKPx5EVy7w=="; }; }; "@fluentui/react-hooks-8.5.5" = { @@ -3775,13 +3784,13 @@ let sha512 = "SZMP2P7RSUuVHYWIBcnlxYruvchlnoqensCvoaGeiH0FisO7etwJdFwKNegV7WEA9uS5ZOK3qVmyvD71DxaSng=="; }; }; - "@fluentui/style-utilities-8.6.7" = { + "@fluentui/style-utilities-8.7.0" = { name = "_at_fluentui_slash_style-utilities"; packageName = "@fluentui/style-utilities"; - version = "8.6.7"; + version = "8.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/style-utilities/-/style-utilities-8.6.7.tgz"; - sha512 = "FVMXM9cuCuEVWvyJLE7rXVmbIvnY6lmyTbJcOwiyZMmQbQkggZnuJPJhDSCHjDW1DiVhEKjqBqOoiV7WqnDvMQ=="; + url = "https://registry.npmjs.org/@fluentui/style-utilities/-/style-utilities-8.7.0.tgz"; + sha512 = "coba9Xj85nlAtToSCV0dD5sHq4BSQk/pUD9y4ZfNhm7vAlju5caQFhpwCs+qsZQ2OIkkpeF2YzJ/SHjNrMECqw=="; }; }; "@fluentui/theme-2.6.6" = { @@ -3919,13 +3928,13 @@ let sha512 = "IuR2SB2MnC2ztA/XeTMTfWcA0Wy7ZH5u+nDkDNLAdX+AaSyDnsQS35sCmHqG0VOGTl7rzoyBWLCKGwSJplgtwg=="; }; }; - "@graphql-tools/batch-execute-8.4.9" = { + "@graphql-tools/batch-execute-8.4.10" = { name = "_at_graphql-tools_slash_batch-execute"; packageName = "@graphql-tools/batch-execute"; - version = "8.4.9"; + version = "8.4.10"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/batch-execute/-/batch-execute-8.4.9.tgz"; - sha512 = "McfAPdxP4mRGqm+NKQ0AN8aZXG7AnCcKqQxu5k0RP8Llg/81rImHqgBPO8L8GUW8E0Sx+PzeXmipHjS0MceN2Q=="; + url = "https://registry.npmjs.org/@graphql-tools/batch-execute/-/batch-execute-8.4.10.tgz"; + sha512 = "rugHElhKYZgb6w3mBuNdgjMIo0LW5QbwIwJ1bc9VKWh51dCQmNwJS1Nx8qFWUjhmjVJWbvKWqYb6Z7wTGnOc3g=="; }; }; "@graphql-tools/delegate-7.1.5" = { @@ -3937,13 +3946,13 @@ let sha512 = "bQu+hDd37e+FZ0CQGEEczmRSfQRnnXeUxI/0miDV+NV/zCbEdIJj5tYFNrKT03W6wgdqx8U06d8L23LxvGri/g=="; }; }; - "@graphql-tools/delegate-8.7.10" = { + "@graphql-tools/delegate-8.7.11" = { name = "_at_graphql-tools_slash_delegate"; packageName = "@graphql-tools/delegate"; - version = "8.7.10"; + version = "8.7.11"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/delegate/-/delegate-8.7.10.tgz"; - sha512 = "gzkXErvQEuCQF3Fn6ImADeuVHgiqIVE64Va4p3LMK2D/gDwwLeTVc7jY5rjd9oZwxz6JkVD77inbFjA/Nnqlxg=="; + url = "https://registry.npmjs.org/@graphql-tools/delegate/-/delegate-8.7.11.tgz"; + sha512 = "Rm9ThQHPOz/78OsoB8pZF+8YJm7cHsFMbGa67Q2hLmEAf2xLmNKvsfKfnxYuLnfmpdRxdSmab/ecHZ0qW/DS5w=="; }; }; "@graphql-tools/graphql-file-loader-6.2.7" = { @@ -3955,22 +3964,22 @@ let sha512 = "5k2SNz0W87tDcymhEMZMkd6/vs6QawDyjQXWtqkuLTBF3vxjxPD1I4dwHoxgWPIjjANhXybvulD7E+St/7s9TQ=="; }; }; - "@graphql-tools/graphql-file-loader-7.3.14" = { + "@graphql-tools/graphql-file-loader-7.3.15" = { name = "_at_graphql-tools_slash_graphql-file-loader"; packageName = "@graphql-tools/graphql-file-loader"; - version = "7.3.14"; + version = "7.3.15"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/graphql-file-loader/-/graphql-file-loader-7.3.14.tgz"; - sha512 = "BuzHyfml0SMxJuzHGO1Bl9kx6e6qrAyy47KNKOOpot3E0YYnQL53zCYCDQJ+sYjZIrE7Qi4wnMVHb44+juqN+g=="; + url = "https://registry.npmjs.org/@graphql-tools/graphql-file-loader/-/graphql-file-loader-7.3.15.tgz"; + sha512 = "Sw9XadW3bxH3ACNXE8Tsjh+BVedRCJTuRn3NfO//zOYQZiC3HDTzq9MvnW1a00SmPCXg47rxQpq9L3bdLX0Ohg=="; }; }; - "@graphql-tools/import-6.6.16" = { + "@graphql-tools/import-6.6.17" = { name = "_at_graphql-tools_slash_import"; packageName = "@graphql-tools/import"; - version = "6.6.16"; + version = "6.6.17"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/import/-/import-6.6.16.tgz"; - sha512 = "IKQMKysNL2Pq+aFpR28N9F7jGAUSRYS9q0RRwl9Ocr4UofqQDmUboECM9BiYUDmT3/h7dQTimb0tdNqHP+QCjA=="; + url = "https://registry.npmjs.org/@graphql-tools/import/-/import-6.6.17.tgz"; + sha512 = "rnKT2ZaFM+IbSFE0iOGG5sqdaDDv/XHHH43VIpV4ozryKoK9re3qrhEgfDOHaW47zMLGKrHLPCC/QGf0IpJquw=="; }; }; "@graphql-tools/json-file-loader-6.2.6" = { @@ -3982,13 +3991,13 @@ let sha512 = "CnfwBSY5926zyb6fkDBHnlTblHnHI4hoBALFYXnrg0Ev4yWU8B04DZl/pBRUc459VNgO2x8/mxGIZj2hPJG1EA=="; }; }; - "@graphql-tools/json-file-loader-7.3.14" = { + "@graphql-tools/json-file-loader-7.3.15" = { name = "_at_graphql-tools_slash_json-file-loader"; packageName = "@graphql-tools/json-file-loader"; - version = "7.3.14"; + version = "7.3.15"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/json-file-loader/-/json-file-loader-7.3.14.tgz"; - sha512 = "3/KJ52gTQrbF1HvUlN3/yKkA2ImiavgF2LGqsd+P4KmWt1nWpsu30M5VboECmLyLGjv7CQkM2ISE8GXy9IdzhA=="; + url = "https://registry.npmjs.org/@graphql-tools/json-file-loader/-/json-file-loader-7.3.15.tgz"; + sha512 = "aPxIWBahYVPAVeGxzAsoEsLm+KVfxPcx/wIUZZX8+02YYmuICNT0TeSAk6Q6iuKMJCS7gtU5eYVdEM7qzC2EfA=="; }; }; "@graphql-tools/load-6.2.4" = { @@ -4000,13 +4009,13 @@ let sha512 = "FlQC50VELwRxoWUbJMMMs5gG0Dl8BaQYMrXUHTsxwqR7UmksUYnysC21rdousvs6jVZ7pf4unZfZFtBjz+8Edg=="; }; }; - "@graphql-tools/load-7.5.13" = { + "@graphql-tools/load-7.5.14" = { name = "_at_graphql-tools_slash_load"; packageName = "@graphql-tools/load"; - version = "7.5.13"; + version = "7.5.14"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/load/-/load-7.5.13.tgz"; - sha512 = "GQ/RyVZUUVfxJ8jEg2sU0WK5i5VR7WLxMutbIvkYP3dcf1QpXSmQvCDP97smfJA34SYlkGUTP/B3PagfnAmhqQ=="; + url = "https://registry.npmjs.org/@graphql-tools/load/-/load-7.5.14.tgz"; + sha512 = "K7H4tKKGFliRyjbG92KCuv2fS2pHlRxkcNcDtuEQlA8dhthS9qGB14Ld4eHDuRq1RvHTS6mye5NE1alyY44K9g=="; }; }; "@graphql-tools/merge-6.2.17" = { @@ -4018,13 +4027,13 @@ let sha512 = "G5YrOew39fZf16VIrc49q3c8dBqQDD0ax5LYPiNja00xsXDi0T9zsEWVt06ApjtSdSF6HDddlu5S12QjeN8Tow=="; }; }; - "@graphql-tools/merge-8.2.13" = { + "@graphql-tools/merge-8.2.14" = { name = "_at_graphql-tools_slash_merge"; packageName = "@graphql-tools/merge"; - version = "8.2.13"; + version = "8.2.14"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-8.2.13.tgz"; - sha512 = "lhzjCa6wCthOYl7B6UzER3SGjU2WjSGnW0WGr8giMYsrtf6G3vIRotMcSVMlhDzyyMIOn7uPULOUt3/kaJ/rIA=="; + url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-8.2.14.tgz"; + sha512 = "od6lTF732nwPX91G79eiJf+dyRBHxCaKe7QL4IYeH4d1k+NYqx/ihYpFJNjDaqxmpHH92Hr+TxsP9SYRK3/QKg=="; }; }; "@graphql-tools/schema-7.1.5" = { @@ -4036,13 +4045,13 @@ let sha512 = "uyn3HSNSckf4mvQSq0Q07CPaVZMNFCYEVxroApOaw802m9DcZPgf9XVPy/gda5GWj9AhbijfRYVTZQgHnJ4CXA=="; }; }; - "@graphql-tools/schema-8.3.13" = { + "@graphql-tools/schema-8.3.14" = { name = "_at_graphql-tools_slash_schema"; packageName = "@graphql-tools/schema"; - version = "8.3.13"; + version = "8.3.14"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/schema/-/schema-8.3.13.tgz"; - sha512 = "e+bx1VHj1i5v4HmhCYCar0lqdoLmkRi/CfV07rTqHR6CRDbIb/S/qDCajHLt7FCovQ5ozlI5sRVbBhzfq5H0PQ=="; + url = "https://registry.npmjs.org/@graphql-tools/schema/-/schema-8.3.14.tgz"; + sha512 = "ntA4pKwyyPHFFKcIw17FfqGZAiTNZl0tHieQpPIkN5fPc4oHcXOfaj1vBjtIC/Qn6H7XBBu3l2kMA8FpobdxTQ=="; }; }; "@graphql-tools/url-loader-6.10.1" = { @@ -4054,13 +4063,13 @@ let sha512 = "DSDrbhQIv7fheQ60pfDpGD256ixUQIR6Hhf9Z5bRjVkXOCvO5XrkwoWLiU7iHL81GB1r0Ba31bf+sl+D4nyyfw=="; }; }; - "@graphql-tools/url-loader-7.9.23" = { + "@graphql-tools/url-loader-7.9.24" = { name = "_at_graphql-tools_slash_url-loader"; packageName = "@graphql-tools/url-loader"; - version = "7.9.23"; + version = "7.9.24"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/url-loader/-/url-loader-7.9.23.tgz"; - sha512 = "6IYn5bIaqlWHQksvuPCEPqr8pIuuXBaF8/XbcVdT7otPkyGIQjTxoOkLiWIQj5682aEgZ9Ky21KKcp7qOTWmDQ=="; + url = "https://registry.npmjs.org/@graphql-tools/url-loader/-/url-loader-7.9.24.tgz"; + sha512 = "DpIP9EVZSyhSJgX3P2/ka7lzmpDLqOQ4hDkt1oCBcRDzkeyMOKl5XQAg5/X6AaIonhss+/el0ELqTVOHt9zDxQ=="; }; }; "@graphql-tools/utils-6.2.4" = { @@ -4090,13 +4099,13 @@ let sha512 = "gzkavMOgbhnwkHJYg32Adv6f+LxjbQmmbdD5Hty0+CWxvaiuJq+nU6tzb/7VSU4cwhbNLx/lGu2jbCPEW1McZQ=="; }; }; - "@graphql-tools/utils-8.6.12" = { + "@graphql-tools/utils-8.6.13" = { name = "_at_graphql-tools_slash_utils"; packageName = "@graphql-tools/utils"; - version = "8.6.12"; + version = "8.6.13"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-8.6.12.tgz"; - sha512 = "WQ91O40RC+UJgZ9K+IzevSf8oolR1QE+WQ21Oyc2fgDYYiqT0eSf+HVyhZr/8x9rVjn3N9HeqCsywbdmbljg0w=="; + url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-8.6.13.tgz"; + sha512 = "FiVqrQzj4cgz0HcZ3CxUs8NtBGPZFpmsVyIgwmL6YCwIhjJQnT72h8G3/vk5zVfjfesht85YGp0inWWuoCKWzg=="; }; }; "@graphql-tools/wrap-7.0.8" = { @@ -4108,22 +4117,13 @@ let sha512 = "1NDUymworsOlb53Qfh7fonDi2STvqCtbeE68ntKY9K/Ju/be2ZNxrFSbrBHwnxWcN9PjISNnLcAyJ1L5tCUyhg=="; }; }; - "@graphql-tools/wrap-8.4.19" = { + "@graphql-tools/wrap-8.4.20" = { name = "_at_graphql-tools_slash_wrap"; packageName = "@graphql-tools/wrap"; - version = "8.4.19"; + version = "8.4.20"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/wrap/-/wrap-8.4.19.tgz"; - sha512 = "S+1zh+9+4MK3HSQMPjwerLybMtD8LCfte/wsZK4JgYhls2INrLJZEMquMxhQTma4jkKBL48GZtESIP0hFTP4Ow=="; - }; - }; - "@grpc/grpc-js-1.5.7" = { - name = "_at_grpc_slash_grpc-js"; - packageName = "@grpc/grpc-js"; - version = "1.5.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.5.7.tgz"; - sha512 = "RAlSbZ9LXo0wNoHKeUlwP9dtGgVBDUbnBKFpfAv5iSqMG4qWz9um2yLH215+Wow1I48etIa1QMS+WAGmsE/7HQ=="; + url = "https://registry.npmjs.org/@graphql-tools/wrap/-/wrap-8.4.20.tgz"; + sha512 = "qzlrOg9ddaA+30OdG8NU/zDPV2sbJ4Rvool+Zf0nLVRqkAUP/1uxXTQBLgEJKO1xxTlhJ+27FCJ42lG6JG9ZrA=="; }; }; "@grpc/grpc-js-1.6.1" = { @@ -4909,544 +4909,544 @@ let sha512 = "Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A=="; }; }; - "@lerna/add-5.0.0" = { + "@lerna/add-5.1.0" = { name = "_at_lerna_slash_add"; packageName = "@lerna/add"; - version = "5.0.0"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/add/-/add-5.0.0.tgz"; - sha512 = "KdIOQL+88iHU9zuAU8Be1AL4cOVmm77nlckylsNaVVTiomNipr/h7lStiBO52BoMkwKzNwOH6He5HGY0Yo7s2w=="; + url = "https://registry.npmjs.org/@lerna/add/-/add-5.1.0.tgz"; + sha512 = "JK6ezKNQCfXnuHuxd63HcFbgVzfXMcyC0HFKCU5juPaIvqVCXBFR2xNy4gYcMPE9dZS9THT719hf3c0RgWMl0w=="; }; }; - "@lerna/bootstrap-5.0.0" = { + "@lerna/bootstrap-5.1.0" = { name = "_at_lerna_slash_bootstrap"; packageName = "@lerna/bootstrap"; - version = "5.0.0"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/bootstrap/-/bootstrap-5.0.0.tgz"; - sha512 = "2m1BxKbYwDABy+uE/Da3EQM61R58bI3YQ0o1rsFQq1u0ltL9CJxw1o0lMg84hwMsBb4D+kLIXLqetYlLVgbr0Q=="; + url = "https://registry.npmjs.org/@lerna/bootstrap/-/bootstrap-5.1.0.tgz"; + sha512 = "TAIoRLiHfmFB1wZlHQ+YkkSaniqWshcxz2703U5iwrCeSOtWRE5+4G7d0wvNAXTLou8Azxjx+gXzU32IHS7k1g=="; }; }; - "@lerna/changed-5.0.0" = { + "@lerna/changed-5.1.0" = { name = "_at_lerna_slash_changed"; packageName = "@lerna/changed"; - version = "5.0.0"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/changed/-/changed-5.0.0.tgz"; - sha512 = "A24MHipPGODmzQBH1uIMPPUUOc1Zm7Qe/eSYzm52bFHtVxWH0nIVXfunadoMX32NhzKQH3Sw8X2rWHPQSRoUvA=="; + url = "https://registry.npmjs.org/@lerna/changed/-/changed-5.1.0.tgz"; + sha512 = "u6yHa/CLG9rQd0+TZLNSYTjiDIqN6hCfLbXrnT3oVsGmu2Agp/uSGvMS9SXsQEmztQLevOEZ/Rl7LCPVBa21dg=="; }; }; - "@lerna/check-working-tree-5.0.0" = { + "@lerna/check-working-tree-5.1.0" = { name = "_at_lerna_slash_check-working-tree"; packageName = "@lerna/check-working-tree"; - version = "5.0.0"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/check-working-tree/-/check-working-tree-5.0.0.tgz"; - sha512 = "PnUMdpT2qS4o+vs+7l5fFIizstGdqSkhLG+Z9ZiY5OMtnGd+pmAFQFlbLSZSmdvQSOSobl9fhB1St8qhPD60xQ=="; + url = "https://registry.npmjs.org/@lerna/check-working-tree/-/check-working-tree-5.1.0.tgz"; + sha512 = "Vd6Roa0TIXZVXXplx/EP/A4QtHFeCFHbk2MbK7t7CWiCK9pEU9nhF/j6SJhuPes3z1mSOn/FjaN2JjShvJII1w=="; }; }; - "@lerna/child-process-5.0.0" = { + "@lerna/child-process-5.1.0" = { name = "_at_lerna_slash_child-process"; packageName = "@lerna/child-process"; - version = "5.0.0"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/child-process/-/child-process-5.0.0.tgz"; - sha512 = "cFVNkedrlU8XTt15EvUtQ84hqtV4oToQW/elKNv//mhCz06HY8Y+Ia6XevK2zrIhZjS6DT576F/7SmTk3vnpmg=="; + url = "https://registry.npmjs.org/@lerna/child-process/-/child-process-5.1.0.tgz"; + sha512 = "BkPkeFpApuPYBYvnqLjdY3/qQV/6zouchrtMUnaQ3N8pdkU/NkSDEeBtl4hR5Coyb1jGjpYt63IrrD4i4Snyvg=="; }; }; - "@lerna/clean-5.0.0" = { + "@lerna/clean-5.1.0" = { name = "_at_lerna_slash_clean"; packageName = "@lerna/clean"; - version = "5.0.0"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/clean/-/clean-5.0.0.tgz"; - sha512 = "7B+0Nx6MEPmCfnEa1JFyZwJsC7qlGrikWXyLglLb/wcbapYVsuDauOl9AT1iOFoXKw82P77HWYUKWeD9DQgw/w=="; + url = "https://registry.npmjs.org/@lerna/clean/-/clean-5.1.0.tgz"; + sha512 = "hX0Y6cumy3Gn21WriFUEJgznbfaZQQYrOQJDu5FOd9EShKb0gfWpX8l/DmnDfcQoIXJSYV85oHPuB619sdZwUA=="; }; }; - "@lerna/cli-5.0.0" = { + "@lerna/cli-5.1.0" = { name = "_at_lerna_slash_cli"; packageName = "@lerna/cli"; - version = "5.0.0"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/cli/-/cli-5.0.0.tgz"; - sha512 = "g8Nifko8XNySOl8u2molSHVl+fk/E1e5FSn/W2ekeijmc3ezktp+xbPWofNq71N/d297+KPQpLBfwzXSo9ufIQ=="; + url = "https://registry.npmjs.org/@lerna/cli/-/cli-5.1.0.tgz"; + sha512 = "Mwod1swfQvYat60S2/otQVe64WQMUtdnNz/GaKoIbyIekqUC0Ozo6Ui0Qv9UdmowADdIRpHPEb3tK1i8Ze7rew=="; }; }; - "@lerna/collect-uncommitted-5.0.0" = { + "@lerna/collect-uncommitted-5.1.0" = { name = "_at_lerna_slash_collect-uncommitted"; packageName = "@lerna/collect-uncommitted"; - version = "5.0.0"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/collect-uncommitted/-/collect-uncommitted-5.0.0.tgz"; - sha512 = "mga/2S9rK0TP5UCulWiCTrC/uKaiIlOro1n8R3oCw6eRw9eupCSRx5zGI7pdh8CPD82MDL7w0a6OTep3WBSBVA=="; + url = "https://registry.npmjs.org/@lerna/collect-uncommitted/-/collect-uncommitted-5.1.0.tgz"; + sha512 = "NTE0z3mRILv/NY5iWUCbXt0W3LWYr5oBHXPRDwYOtb4K3c7WXHIZ6v4ZtsGFG++K+74Ak1sZj8wCQjntUklx9w=="; }; }; - "@lerna/collect-updates-5.0.0" = { + "@lerna/collect-updates-5.1.0" = { name = "_at_lerna_slash_collect-updates"; packageName = "@lerna/collect-updates"; - version = "5.0.0"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/collect-updates/-/collect-updates-5.0.0.tgz"; - sha512 = "X82i8SVgBXLCk8vbKWfQPRLTAXROCANL8Z/bU1l6n7yycsHKdjrrlNi1+KprFdfRsMvSm10R4qPNcl9jgsp/IA=="; + url = "https://registry.npmjs.org/@lerna/collect-updates/-/collect-updates-5.1.0.tgz"; + sha512 = "MKRTTZpBNeMsSp2FAjbczGN08ni2Cxrb4Y+RRX3FFNi46T+hfugkWWJraXRXJ+D4HNt6IsndxK0/5J6G3sIl9A=="; }; }; - "@lerna/command-5.0.0" = { + "@lerna/command-5.1.0" = { name = "_at_lerna_slash_command"; packageName = "@lerna/command"; - version = "5.0.0"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/command/-/command-5.0.0.tgz"; - sha512 = "j7/apU5d/nhSc1qIZgcV03KyO5jz3y7cwSum3IuK8/XF6rKwt3FVnbue1V3l9sJ6IRJjsRGKyViB1IdP5nSX4Q=="; + url = "https://registry.npmjs.org/@lerna/command/-/command-5.1.0.tgz"; + sha512 = "lPHtnvjsYVEqMQ06YjHcSqZrH7jjMPLC9vCo6lkm43QvtLmow5tGzUSt+ZkXJFa5iQp3/Qdzuf3KV2Oq2FAFbw=="; }; }; - "@lerna/conventional-commits-5.0.0" = { + "@lerna/conventional-commits-5.1.0" = { name = "_at_lerna_slash_conventional-commits"; packageName = "@lerna/conventional-commits"; - version = "5.0.0"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/conventional-commits/-/conventional-commits-5.0.0.tgz"; - sha512 = "tUCRTAycDCtSlCEI0hublq4uKHeV0UHpwIb3Fdt6iv2AoTSPBSX/Dwu/6VqguysOSEkkR4M2JCOLvJCl4IMxwg=="; + url = "https://registry.npmjs.org/@lerna/conventional-commits/-/conventional-commits-5.1.0.tgz"; + sha512 = "bC0oITKwaAGbM3I7pE3jf5NwwzjUoQH68DC1WAtaJurCtSvvuM00irtz8KqXeWsW9nUtY68gYUuV5btSkEZ4FA=="; }; }; - "@lerna/create-5.0.0" = { + "@lerna/create-5.1.0" = { name = "_at_lerna_slash_create"; packageName = "@lerna/create"; - version = "5.0.0"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/create/-/create-5.0.0.tgz"; - sha512 = "sdFTVTLOVuhHpzIYhFAwK0Ry3p4d7uMe9ZG/Ii128/pB9kEEfCth+1WBq6mBpYZ5mOLLgxJbWalbiJFl0toQRw=="; + url = "https://registry.npmjs.org/@lerna/create/-/create-5.1.0.tgz"; + sha512 = "5xw46aZrAQhJByKMyNs78Nl3SZI6yxqNA12pQR7HWf+2/VX29dxKao6W+4658OQIOw2G148TTadP4G9zRiRKRw=="; }; }; - "@lerna/create-symlink-5.0.0" = { + "@lerna/create-symlink-5.1.0" = { name = "_at_lerna_slash_create-symlink"; packageName = "@lerna/create-symlink"; - version = "5.0.0"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/create-symlink/-/create-symlink-5.0.0.tgz"; - sha512 = "nHYNacrh15Y0yEofVlUVu9dhf4JjIn9hY7v7rOUXzUeQ91iXY5Q3PVHkBeRUigyT5CWP5qozZwraCMwp+lDWYg=="; + url = "https://registry.npmjs.org/@lerna/create-symlink/-/create-symlink-5.1.0.tgz"; + sha512 = "FYCNdgP0xf65CokOyFFI63sAA2MfZbSPyDqRHyIJXkrjLCXIl6NZDsu6ppM2XqczDtawmo9YFPAUGZ2QgfowIQ=="; }; }; - "@lerna/describe-ref-5.0.0" = { + "@lerna/describe-ref-5.1.0" = { name = "_at_lerna_slash_describe-ref"; packageName = "@lerna/describe-ref"; - version = "5.0.0"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/describe-ref/-/describe-ref-5.0.0.tgz"; - sha512 = "iLvMHp3nl4wcMR3/lVkz0ng7pAHfLQ7yvz2HsYBq7wllCcEzpchzPgyVzyvbpJ+Ke/MKjQTsrHE/yOGOH67GVw=="; + url = "https://registry.npmjs.org/@lerna/describe-ref/-/describe-ref-5.1.0.tgz"; + sha512 = "eM7H4JJUyzpDoonSuH0kl3/UggvZUAE5UNFhkW2dTJESABusg7UOOnw615iwfiFcm9VeqEs7rXdhRpeBorPj4A=="; }; }; - "@lerna/diff-5.0.0" = { + "@lerna/diff-5.1.0" = { name = "_at_lerna_slash_diff"; packageName = "@lerna/diff"; - version = "5.0.0"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/diff/-/diff-5.0.0.tgz"; - sha512 = "S4XJ6i9oP77cSmJ3oRUJGMgrI+jOTmkYWur2nqgSdyJBE1J2eClgTJknb3WAHg2cHALT18WzFqNghFOGM+9dRA=="; + url = "https://registry.npmjs.org/@lerna/diff/-/diff-5.1.0.tgz"; + sha512 = "IfI9wLklqM9PRtdLXd3nZL0B/Dh0AdQ4hkEUexxQQYa9vGSk8f1oZ8W/mMQ43yvF+HrLOq9ggR0ZFR+9rm9fDA=="; }; }; - "@lerna/exec-5.0.0" = { + "@lerna/exec-5.1.0" = { name = "_at_lerna_slash_exec"; packageName = "@lerna/exec"; - version = "5.0.0"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/exec/-/exec-5.0.0.tgz"; - sha512 = "g5i+2RclCGWLsl88m11j99YM2Gqnwa2lxZ5tDeqqWZFno6Dlvop17Yl6/MFH42EgM2DQHUUCammvcLIAJ2XwEA=="; + url = "https://registry.npmjs.org/@lerna/exec/-/exec-5.1.0.tgz"; + sha512 = "JgHz/hTF47mRPd3o+gRtHSv7DMOvnXAkVdj/YLTCPgJ4IMvIeVY70sCWuvnJPo728k4fdIrgmw0BWpUBD64q9w=="; }; }; - "@lerna/filter-options-5.0.0" = { + "@lerna/filter-options-5.1.0" = { name = "_at_lerna_slash_filter-options"; packageName = "@lerna/filter-options"; - version = "5.0.0"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/filter-options/-/filter-options-5.0.0.tgz"; - sha512 = "un73aYkXlzKlnDPx2AlqNW+ArCZ20XaX+Y6C0F+av9VZriiBsCgZTnflhih9fiSMnXjN5r9CA8YdWvZqa3oAcQ=="; + url = "https://registry.npmjs.org/@lerna/filter-options/-/filter-options-5.1.0.tgz"; + sha512 = "FeUb2jjbNNm1pBbEclktQ7Yqxy5KBxpHAuHic4Arruaai2lxYEQaJKb3NoTFT+cBlY1zFPQcjc8bPbEshu0vuA=="; }; }; - "@lerna/filter-packages-5.0.0" = { + "@lerna/filter-packages-5.1.0" = { name = "_at_lerna_slash_filter-packages"; packageName = "@lerna/filter-packages"; - version = "5.0.0"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/filter-packages/-/filter-packages-5.0.0.tgz"; - sha512 = "+EIjVVaMPDZ05F/gZa+kcXjBOLXqEamcEIDr+2ZXRgJmnrLx9BBY1B7sBEFHg7JXbeOKS+fKtMGVveV0SzgH3Q=="; + url = "https://registry.npmjs.org/@lerna/filter-packages/-/filter-packages-5.1.0.tgz"; + sha512 = "X5FuSDeYBcEPPKmea/uA3FLz4Vheqv9Dmm3ZkVE+w9TRb1t52azavPm/bm99I/7aKr4+clOgf7AZ4NqFOaA+aQ=="; }; }; - "@lerna/get-npm-exec-opts-5.0.0" = { + "@lerna/get-npm-exec-opts-5.1.0" = { name = "_at_lerna_slash_get-npm-exec-opts"; packageName = "@lerna/get-npm-exec-opts"; - version = "5.0.0"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/get-npm-exec-opts/-/get-npm-exec-opts-5.0.0.tgz"; - sha512 = "ZOg3kc5FXYA1kVFD2hfJOl64hNASWD6panwD0HlyzXgfKKTDRm/P/qtAqS8WGCzQWgEdx4wvsDe/58Lzzh6QzQ=="; + url = "https://registry.npmjs.org/@lerna/get-npm-exec-opts/-/get-npm-exec-opts-5.1.0.tgz"; + sha512 = "54lkBLpuwq9XTaiejkNOvBk75SUNOj6YxZY+lbZzfMxqy107w4Fcwp3MdvYFaRO+0q8aderdYOUysv0X4q62Xg=="; }; }; - "@lerna/get-packed-5.0.0" = { + "@lerna/get-packed-5.1.0" = { name = "_at_lerna_slash_get-packed"; packageName = "@lerna/get-packed"; - version = "5.0.0"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/get-packed/-/get-packed-5.0.0.tgz"; - sha512 = "fks7Tg7DvcCZxRWPS3JAWVuLnwjPC/hLlNsdYmK9nN3+RtPhmYQgBjLSONcENw1E46t4Aph72lA9nLcYBLksqw=="; + url = "https://registry.npmjs.org/@lerna/get-packed/-/get-packed-5.1.0.tgz"; + sha512 = "waCjBLhIJ2Y1C3H3ny6zMFLH3Y8z6+ZiGYGgKXFuBD6ovmqZz7QInY63i+6FWIgwTE4FakbDsTK0xhaJEjz6/g=="; }; }; - "@lerna/github-client-5.0.0" = { + "@lerna/github-client-5.1.0" = { name = "_at_lerna_slash_github-client"; packageName = "@lerna/github-client"; - version = "5.0.0"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/github-client/-/github-client-5.0.0.tgz"; - sha512 = "NoEyRkQ8XgBnrjRfC9ph1npfg1/4OdYG+r8lG/1WkJbdt1Wlym4VNZU2BYPMWwSQYMJuppoEr0LL2uuVcS4ZUw=="; + url = "https://registry.npmjs.org/@lerna/github-client/-/github-client-5.1.0.tgz"; + sha512 = "wow6KytR+pPXU+0DyCWnNuMdCTRotQCtGf5K+2PziJI0zfow4uFh60hs58bRrv3GgotnXeEB6433tYdajNa+nA=="; }; }; - "@lerna/gitlab-client-5.0.0" = { + "@lerna/gitlab-client-5.1.0" = { name = "_at_lerna_slash_gitlab-client"; packageName = "@lerna/gitlab-client"; - version = "5.0.0"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/gitlab-client/-/gitlab-client-5.0.0.tgz"; - sha512 = "WREAT7qzta9hxNxktTX0x1/sEMpBP+4Gc00QSJYXt+ZzxY0t5RUx/ZK5pQl+IDhtkajrvXT6fSfZjMxxyE8hhQ=="; + url = "https://registry.npmjs.org/@lerna/gitlab-client/-/gitlab-client-5.1.0.tgz"; + sha512 = "nXUK6h8SpYRdocrzhA3wJDZ6ghQREBBxPbA5v2jVSY2xR3NxOcWjYOpq2BaQ5KE0j4OYenFL1kNn6baAQsw/XQ=="; }; }; - "@lerna/global-options-5.0.0" = { + "@lerna/global-options-5.1.0" = { name = "_at_lerna_slash_global-options"; packageName = "@lerna/global-options"; - version = "5.0.0"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/global-options/-/global-options-5.0.0.tgz"; - sha512 = "PZYy/3mTZwtA9lNmHHRCc/Ty1W20qGJ/BdDIo4bw/Bk0AOcoBCLT9b3Mjijkl4AbC9+eSGk3flUYapCGVuS32Q=="; + url = "https://registry.npmjs.org/@lerna/global-options/-/global-options-5.1.0.tgz"; + sha512 = "yh66x9+gQk5Wcjoys10DyzJ6EkCdx2+wjW9gdY+1KyfKHY3v4sLgHohGi8o7lKLr3ihaT/MgZSKmN9oLGpJVow=="; }; }; - "@lerna/has-npm-version-5.0.0" = { + "@lerna/has-npm-version-5.1.0" = { name = "_at_lerna_slash_has-npm-version"; packageName = "@lerna/has-npm-version"; - version = "5.0.0"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/has-npm-version/-/has-npm-version-5.0.0.tgz"; - sha512 = "zJPgcml86nhJFJTpT+kjkcafuCFvK7PSq3oDC2KJxwB1bhlYwy+SKtAEypHSsHQ2DwP0YgPITcy1pvtHkie1SA=="; + url = "https://registry.npmjs.org/@lerna/has-npm-version/-/has-npm-version-5.1.0.tgz"; + sha512 = "qihV4JthS3RG2w/GoioPIuU5MCauWI9+dddNgh5rHGfOuOudE4kPOLBa0CpcV06fjpgFNiyL0QOoSok2LVvnBQ=="; }; }; - "@lerna/import-5.0.0" = { + "@lerna/import-5.1.0" = { name = "_at_lerna_slash_import"; packageName = "@lerna/import"; - version = "5.0.0"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/import/-/import-5.0.0.tgz"; - sha512 = "cD+Is7eV/I+ZU0Wlg+yAgKaZbOvfzA7kBj2Qu1HtxeLhc7joTR8PFW1gNjEsvrWOTiaHAtObbo1A+MKYQ/T12g=="; + url = "https://registry.npmjs.org/@lerna/import/-/import-5.1.0.tgz"; + sha512 = "oG7KmYCiXikYFk8VXvew2hioFKNUgve0NGXpIW3eHM5vtWUoGa2EA+5TDJnzXWNDiW27PULrD/MBBfLchWfIpA=="; }; }; - "@lerna/info-5.0.0" = { + "@lerna/info-5.1.0" = { name = "_at_lerna_slash_info"; packageName = "@lerna/info"; - version = "5.0.0"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/info/-/info-5.0.0.tgz"; - sha512 = "k9TMK81apTjxxpnjfFOABKXndTtHBPgB8UO+I6zKhsfRqVb9FCz2MHOx8cQiSyolvNyGSQdSylSo4p7EBBomQQ=="; + url = "https://registry.npmjs.org/@lerna/info/-/info-5.1.0.tgz"; + sha512 = "RS25MvC2PpbPg8110e1FXo4rgU8VH0749/Kt4qwoMjXOxx/XecLWB69+YT1XZwi42XnzmfTSBWpi7ZuKZF++HA=="; }; }; - "@lerna/init-5.0.0" = { + "@lerna/init-5.1.0" = { name = "_at_lerna_slash_init"; packageName = "@lerna/init"; - version = "5.0.0"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/init/-/init-5.0.0.tgz"; - sha512 = "2n68x7AIqVa+Vev9xF3NV9ba0C599KYf7JsIrQ5ESv4593ftInJpwgMwjroLT3X/Chi4BK7y2/xGmrfFVwgILg=="; + url = "https://registry.npmjs.org/@lerna/init/-/init-5.1.0.tgz"; + sha512 = "Nhc6rUCYLo17zqZF3ONoyw7d6TEhQwADdEiDe3LWe2lv/AuTGFI7ZNgo5gduLkAsfw54i8kGUQNh2/lvfGqB1g=="; }; }; - "@lerna/link-5.0.0" = { + "@lerna/link-5.1.0" = { name = "_at_lerna_slash_link"; packageName = "@lerna/link"; - version = "5.0.0"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/link/-/link-5.0.0.tgz"; - sha512 = "00YxQ06TVhQJthOjcuxCCJRjkAM+qM/8Lv0ckdCzBBCSr4RdAGBp6QcAX/gjLNasgmNpyiza3ADet7mCH7uodw=="; + url = "https://registry.npmjs.org/@lerna/link/-/link-5.1.0.tgz"; + sha512 = "OHShGKIe83/GcBVivmFWO6R9g3K8MDZfKwtcgBxy6GeLNQ+IfxxwOIbPEcn2afpBrEuGaisaNHKf00YnnmCdRQ=="; }; }; - "@lerna/list-5.0.0" = { + "@lerna/list-5.1.0" = { name = "_at_lerna_slash_list"; packageName = "@lerna/list"; - version = "5.0.0"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/list/-/list-5.0.0.tgz"; - sha512 = "+B0yFil2AFdiYO8hyU1bFbKXGBAUUQQ43/fp2XS2jBFCipLme4eTILL5gMKOhr2Xg9AsfYPXRMRer5VW7qTeeQ=="; + url = "https://registry.npmjs.org/@lerna/list/-/list-5.1.0.tgz"; + sha512 = "MW+2ebEm/eEcHfEpdS/JM8XC0OrBbVH1HbTTHba7WUHTvjIeKj8qFD6wJa4YSqVWLC415Ev9ET9JnesIfL375w=="; }; }; - "@lerna/listable-5.0.0" = { + "@lerna/listable-5.1.0" = { name = "_at_lerna_slash_listable"; packageName = "@lerna/listable"; - version = "5.0.0"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/listable/-/listable-5.0.0.tgz"; - sha512 = "Rd5sE7KTbqA8u048qThH5IyBuJIwMcUnEObjFyJyKpc1SEWSumo4yAYmcEeN/9z62tcdud5wHYPSbVgfXJq37g=="; + url = "https://registry.npmjs.org/@lerna/listable/-/listable-5.1.0.tgz"; + sha512 = "L+zlyn+6LltxzER8c1GXq4k1EaRluuzQmEBIXnlHYgAQxrYpZ/L8U8h4zXWyaxUoJULHBCoLWxGq2cgJFxHE3w=="; }; }; - "@lerna/log-packed-5.0.0" = { + "@lerna/log-packed-5.1.0" = { name = "_at_lerna_slash_log-packed"; packageName = "@lerna/log-packed"; - version = "5.0.0"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/log-packed/-/log-packed-5.0.0.tgz"; - sha512 = "0TxKX+XnlEYj0du9U2kg3HEyIb/0QsM0Slt8utuCxALUnXRHTEKohjqVKsBdvh1QmJpnUbL5I+vfoYqno4Y42w=="; + url = "https://registry.npmjs.org/@lerna/log-packed/-/log-packed-5.1.0.tgz"; + sha512 = "nHoVWnq01RkIC4BDfGWRjaGSuKuVx31eY/JDx0NV+eVGoaTAp5YgMmZilRBSIQPRBlGMxEex89YLfXmOWfXuPg=="; }; }; - "@lerna/npm-conf-5.0.0" = { + "@lerna/npm-conf-5.1.0" = { name = "_at_lerna_slash_npm-conf"; packageName = "@lerna/npm-conf"; - version = "5.0.0"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/npm-conf/-/npm-conf-5.0.0.tgz"; - sha512 = "KSftxtMNVhLol1JNwFFNgh5jiCG010pewM+uKeSrUe0BCB3lnidiEDzu2CCn8JYYfIXqAiou/pScUiOxVLpcAA=="; + url = "https://registry.npmjs.org/@lerna/npm-conf/-/npm-conf-5.1.0.tgz"; + sha512 = "S//5yGukBEhVveGxrjKkGd7YUhAD2Es9wz5ec5GkfxH3jmPtc0Uxn/v87p7P6zxR/elt0fnFiwyK9Za1CDcmaA=="; }; }; - "@lerna/npm-dist-tag-5.0.0" = { + "@lerna/npm-dist-tag-5.1.0" = { name = "_at_lerna_slash_npm-dist-tag"; packageName = "@lerna/npm-dist-tag"; - version = "5.0.0"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/npm-dist-tag/-/npm-dist-tag-5.0.0.tgz"; - sha512 = "ccUFhp9Wu/FHW5/5fL+vLiSTcUZXtKQ7c0RMXtNRzIdTXBxPBkVi1k5QAnBAAffsz6Owc/K++cb+/zQ/asrG3g=="; + url = "https://registry.npmjs.org/@lerna/npm-dist-tag/-/npm-dist-tag-5.1.0.tgz"; + sha512 = "PlLJKsSUfdizQRMhvVCvnpGparTO9JTdybkiOeKApbz+BEnL+eANodY+eJs+ubO2mMsku8LEGyyUs2OyCP/23Q=="; }; }; - "@lerna/npm-install-5.0.0" = { + "@lerna/npm-install-5.1.0" = { name = "_at_lerna_slash_npm-install"; packageName = "@lerna/npm-install"; - version = "5.0.0"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/npm-install/-/npm-install-5.0.0.tgz"; - sha512 = "72Jf05JCIdeSBWXAiNjd/y2AQH4Ojgas55ojV2sAcEYz2wgyR7wSpiI6fHBRlRP+3XPjV9MXKxI3ZwOnznQxqQ=="; + url = "https://registry.npmjs.org/@lerna/npm-install/-/npm-install-5.1.0.tgz"; + sha512 = "uUiAN9eLyrvTjGKPLSgRtFi6Bu9QDGNu/EbYG14iBPLOmFbFVyhAQr4QHJ8lA/orJDKrTgEMWVl/rI++MX9Hxw=="; }; }; - "@lerna/npm-publish-5.0.0" = { + "@lerna/npm-publish-5.1.0" = { name = "_at_lerna_slash_npm-publish"; packageName = "@lerna/npm-publish"; - version = "5.0.0"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/npm-publish/-/npm-publish-5.0.0.tgz"; - sha512 = "jnapZ2jRajSzshSfd1Y3rHH5R7QC+JJlYST04FBebIH3VePwDT7uAglDCI4um2THvxkW4420EzE4BUMUwKlnXA=="; + url = "https://registry.npmjs.org/@lerna/npm-publish/-/npm-publish-5.1.0.tgz"; + sha512 = "vGCxUG1T2TmSzSlIMs8FGpdyLjv3kD8Wl68mI4g3NC4uOHuOPGCXlLjbgYlcT/v+d3L69jDfTFgiZhTiPFx8Jg=="; }; }; - "@lerna/npm-run-script-5.0.0" = { + "@lerna/npm-run-script-5.1.0" = { name = "_at_lerna_slash_npm-run-script"; packageName = "@lerna/npm-run-script"; - version = "5.0.0"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/npm-run-script/-/npm-run-script-5.0.0.tgz"; - sha512 = "qgGf0Wc/E2YxPwIiF8kC/OB9ffPf0/HVtPVkqrblVuNE9XVP80WilOH966PIDiXzwXaCo/cTswFoBeseccYRGw=="; + url = "https://registry.npmjs.org/@lerna/npm-run-script/-/npm-run-script-5.1.0.tgz"; + sha512 = "zaBfisZVSd0q8Q9+Dm4p9d1GoWdLjSbMpIs00QA/dTXtMr+X64AVcgZVsiXqxCzK/ZJh6uOPsUbv6NNMhFQERA=="; }; }; - "@lerna/otplease-5.0.0" = { + "@lerna/otplease-5.1.0" = { name = "_at_lerna_slash_otplease"; packageName = "@lerna/otplease"; - version = "5.0.0"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/otplease/-/otplease-5.0.0.tgz"; - sha512 = "QLLkEy1DPN1XFRAAZDHxAD26MHFQDHfzB6KKSzRYxbHc6lH/YbDaMH1RloSWIm7Hwkxl/3NgpokgN4Lj5XFuzg=="; + url = "https://registry.npmjs.org/@lerna/otplease/-/otplease-5.1.0.tgz"; + sha512 = "s3ps5aPcUlSUMVQ92UZSEairm+9MXOtlZ1P0BEolUL+e/Fj6jKL2r8A+RRfTXXoIDNLmAiM7BXkkUqvtHTWScw=="; }; }; - "@lerna/output-5.0.0" = { + "@lerna/output-5.1.0" = { name = "_at_lerna_slash_output"; packageName = "@lerna/output"; - version = "5.0.0"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/output/-/output-5.0.0.tgz"; - sha512 = "/7sUJQWPcvnLudjVIdN7t9MlfBLuP4JCDAWgQMqZe+wpQRuKNyKQ5dLBH5NHU/ElJCjAwMPfWuk3mh3GuvuiGA=="; + url = "https://registry.npmjs.org/@lerna/output/-/output-5.1.0.tgz"; + sha512 = "UKkyTFmZrDYOXKtXlub8K8uQ3FrbA59x6lxjCV1ucUuodIVuFU5zT604ae5zPy8eLPDSy3UmjkxkAlnbEw13OA=="; }; }; - "@lerna/pack-directory-5.0.0" = { + "@lerna/pack-directory-5.1.0" = { name = "_at_lerna_slash_pack-directory"; packageName = "@lerna/pack-directory"; - version = "5.0.0"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/pack-directory/-/pack-directory-5.0.0.tgz"; - sha512 = "E1SNDS7xSWhJrTSmRzJK7DibneljrymviKcsZW3mRl4TmF4CpYJmNXCMlhEtKEy6ghnGQvnl3/4+eslHDJ5J/w=="; + url = "https://registry.npmjs.org/@lerna/pack-directory/-/pack-directory-5.1.0.tgz"; + sha512 = "OBYtkUz5GpDvU+JCZSIPwB7XCv6B9xILd3pYYCM5ditkwI3te+J9AZt+aleYa1/NfJdTxenPdBjui656dCEMdw=="; }; }; - "@lerna/package-5.0.0" = { + "@lerna/package-5.1.0" = { name = "_at_lerna_slash_package"; packageName = "@lerna/package"; - version = "5.0.0"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/package/-/package-5.0.0.tgz"; - sha512 = "/JiUU88bhbYEUTzPqoGLGwrrdWWTIVMlBb1OPxCGNGDEqYYNySX+OTTSs3zGMcmJnRNI0UyQALiEd0sh3JFN5w=="; + url = "https://registry.npmjs.org/@lerna/package/-/package-5.1.0.tgz"; + sha512 = "Y2HF4Lrv4E7AwT97+G1lx6qIJB4Wzi4nHsNOgRC/dK4Hr7b5Qubv2bPEcb0mMqWlwSrvYQI4Zacelgy/mgxPsA=="; }; }; - "@lerna/package-graph-5.0.0" = { + "@lerna/package-graph-5.1.0" = { name = "_at_lerna_slash_package-graph"; packageName = "@lerna/package-graph"; - version = "5.0.0"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/package-graph/-/package-graph-5.0.0.tgz"; - sha512 = "Z3QeUQVjux0Blo64rA3/NivoLDlsQBjsZRIgGLbcQh7l7pJrqLK1WyNCBbPJ0KQNljQqUXthCKzdefnEWe37Ew=="; + url = "https://registry.npmjs.org/@lerna/package-graph/-/package-graph-5.1.0.tgz"; + sha512 = "Ero1z9fnu65WxzrAzw9/I5+kfbT7HkyV9F9MTxYpnk7zOAAYvR4qSCkc/yNEJPr4kN8NvcY8CifNEQtORxkVXg=="; }; }; - "@lerna/prerelease-id-from-version-5.0.0" = { + "@lerna/prerelease-id-from-version-5.1.0" = { name = "_at_lerna_slash_prerelease-id-from-version"; packageName = "@lerna/prerelease-id-from-version"; - version = "5.0.0"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/prerelease-id-from-version/-/prerelease-id-from-version-5.0.0.tgz"; - sha512 = "bUZwyx6evRn2RxogOQXaiYxRK1U/1Mh/KLO4n49wUhqb8S8Vb9aG3+7lLOgg4ZugHpj9KAlD3YGEKvwYQiWzhg=="; + url = "https://registry.npmjs.org/@lerna/prerelease-id-from-version/-/prerelease-id-from-version-5.1.0.tgz"; + sha512 = "sNjthszV+VkBVHPfTVquxoUQ+p8mtBxPFFoLjK+Bq+57xdmV6VGhZ/QL8HTQ7H7y8KzWuqVNMl0Z7G6PZXON9g=="; }; }; - "@lerna/profiler-5.0.0" = { + "@lerna/profiler-5.1.0" = { name = "_at_lerna_slash_profiler"; packageName = "@lerna/profiler"; - version = "5.0.0"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/profiler/-/profiler-5.0.0.tgz"; - sha512 = "hFX+ZtoH7BdDoGI+bqOYaSptJTFI58wNK9qq/pHwL5ksV7vOhxP2cQAuo1SjgBKHGl0Ex/9ZT080YVV4jP1ehw=="; + url = "https://registry.npmjs.org/@lerna/profiler/-/profiler-5.1.0.tgz"; + sha512 = "/CCYMtkF2xj3kjD9w29k7TDe40K/gk7goR2fvUf/6akPBG2KhFY+sQ0TQ2Ojnaym75OAn4WXta+FLdTQSdAFRQ=="; }; }; - "@lerna/project-5.0.0" = { + "@lerna/project-5.1.0" = { name = "_at_lerna_slash_project"; packageName = "@lerna/project"; - version = "5.0.0"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/project/-/project-5.0.0.tgz"; - sha512 = "+izHk7D/Di2b0s69AzKzAa/qBz32H9s67oN9aKntrjNylpY7iN5opU157l60Kh4TprYHU5bLisqzFLZsHHADGw=="; + url = "https://registry.npmjs.org/@lerna/project/-/project-5.1.0.tgz"; + sha512 = "QLrF+2CzPjP3ew8MJejI4pupRZDJvhpTDx/2f1sSfmHOiPsyxmx7DNhc/p9780MOhrSlokqDNfXDKph8bN3TrQ=="; }; }; - "@lerna/prompt-5.0.0" = { + "@lerna/prompt-5.1.0" = { name = "_at_lerna_slash_prompt"; packageName = "@lerna/prompt"; - version = "5.0.0"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/prompt/-/prompt-5.0.0.tgz"; - sha512 = "cq2k04kOPY1yuJNHJn4qfBDDrCi9PF4Q228JICa6bxaONRf/C/TRsEQXHVIdlax8B3l53LnlGv5GECwRuvkQbA=="; + url = "https://registry.npmjs.org/@lerna/prompt/-/prompt-5.1.0.tgz"; + sha512 = "CiQEtULXK3zF+mwP5bKhXvPKpw2fqXxLZ4InfokYVcLcR3PgUyu8wmmDxFqkaG7hZnBcDPsn/QAE2P9yYvvoDQ=="; }; }; - "@lerna/publish-5.0.0" = { + "@lerna/publish-5.1.0" = { name = "_at_lerna_slash_publish"; packageName = "@lerna/publish"; - version = "5.0.0"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/publish/-/publish-5.0.0.tgz"; - sha512 = "QEWFtN8fW1M+YXEQOWb2XBBCT137CrwHYK29ojMXW9HShvSZezf8Q/niH91nZ4kIhWdpOGz4w3rKopsumAM5SA=="; + url = "https://registry.npmjs.org/@lerna/publish/-/publish-5.1.0.tgz"; + sha512 = "7WlmuY5SxlFQz80EAziv0vgO0wbUufns9RYZZv8QKM6c17tBJJbRxguc3oxCx8m7V3BvrBeyvLBZUJhIKcyGNw=="; }; }; - "@lerna/pulse-till-done-5.0.0" = { + "@lerna/pulse-till-done-5.1.0" = { name = "_at_lerna_slash_pulse-till-done"; packageName = "@lerna/pulse-till-done"; - version = "5.0.0"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/pulse-till-done/-/pulse-till-done-5.0.0.tgz"; - sha512 = "qFeVybGIZbQSWKasWIzZmHsvCQMC/AwTz5B44a0zTt5eSNQuI65HRpKKUgmFFu/Jzd7u+yp7eP+NQ53gjOcQlQ=="; + url = "https://registry.npmjs.org/@lerna/pulse-till-done/-/pulse-till-done-5.1.0.tgz"; + sha512 = "CSYYtWk2/FMx7D7J/91MKstX+/zHdhtxAnSl+c+MDcf8gOtrcEdI41h4UDJi/q7E1STWvIhcq5OmFTOipoP37w=="; }; }; - "@lerna/query-graph-5.0.0" = { + "@lerna/query-graph-5.1.0" = { name = "_at_lerna_slash_query-graph"; packageName = "@lerna/query-graph"; - version = "5.0.0"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/query-graph/-/query-graph-5.0.0.tgz"; - sha512 = "C/HXssBI8DVsZ/7IDW6JG9xhoHtWywi3L5oZB9q84MBYpQ9otUv6zbB+K4JCj7w9WHcuFWe2T/mc9wsaFuvB5g=="; + url = "https://registry.npmjs.org/@lerna/query-graph/-/query-graph-5.1.0.tgz"; + sha512 = "O/c7frgoQFzmgOOWqm+EcY8s2zDKZBq3zyoy5xCbx5ohG5OBA7pHti3SvOP2Ex+YnAwl50r6Eb9Jdixo5ydWHg=="; }; }; - "@lerna/resolve-symlink-5.0.0" = { + "@lerna/resolve-symlink-5.1.0" = { name = "_at_lerna_slash_resolve-symlink"; packageName = "@lerna/resolve-symlink"; - version = "5.0.0"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/resolve-symlink/-/resolve-symlink-5.0.0.tgz"; - sha512 = "O1EMQh3O3nKjLyI2guCCaxmi9xzZXpiMZhrz2ki5ENEDB2N1+f7cZ2THT0lEOIkLRuADI6hrzoN1obJ+TTk+KQ=="; + url = "https://registry.npmjs.org/@lerna/resolve-symlink/-/resolve-symlink-5.1.0.tgz"; + sha512 = "dNIdtQMgsTLkeAZ5U7VH2oPt/ha81XgEiutIvgjjQH87Y5lYRNkX++ahN2/ccnDbv4aPf0tMxFEtRU6Jbh88Lw=="; }; }; - "@lerna/rimraf-dir-5.0.0" = { + "@lerna/rimraf-dir-5.1.0" = { name = "_at_lerna_slash_rimraf-dir"; packageName = "@lerna/rimraf-dir"; - version = "5.0.0"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/rimraf-dir/-/rimraf-dir-5.0.0.tgz"; - sha512 = "hWJg/13CiSUrWWEek3B/A1mkvBbcPvG5z69/Ugyerdpzlw44ubf02MAZ0/kXPJjkICI2hMrS07YotQ60LdYpCw=="; + url = "https://registry.npmjs.org/@lerna/rimraf-dir/-/rimraf-dir-5.1.0.tgz"; + sha512 = "RkLxq2SveLuhEFeVb6tRBzdxiOVJcV56CfcKupCAHmhewEI2At+T/mbqTSzIr+dX3tIWni1uDg2ASWdfgQbGZw=="; }; }; - "@lerna/run-5.0.0" = { + "@lerna/run-5.1.0" = { name = "_at_lerna_slash_run"; packageName = "@lerna/run"; - version = "5.0.0"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/run/-/run-5.0.0.tgz"; - sha512 = "8nBZstqKSO+7wHlKk1g+iexSYRVVNJq/u5ZbAzBiHNrABtqA6/0G7q9vsAEMsnPZ8ARAUYpwvbfKTipjpWH0VA=="; + url = "https://registry.npmjs.org/@lerna/run/-/run-5.1.0.tgz"; + sha512 = "RoBRZCoGklAbCvhPXh9CjUkB0IhdR0FciiFXlB+Wl1y6LZeNB5QEztCArrWiMO17gpa8+ZWAguPaWXhOcH1LZw=="; }; }; - "@lerna/run-lifecycle-5.0.0" = { + "@lerna/run-lifecycle-5.1.0" = { name = "_at_lerna_slash_run-lifecycle"; packageName = "@lerna/run-lifecycle"; - version = "5.0.0"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/run-lifecycle/-/run-lifecycle-5.0.0.tgz"; - sha512 = "36mAm9rC5DSliFShI0Y4ICjgrJXdIIVt7VW9rdbdJ8/XYjRHDzhGPB9Sc1neJOVlGL4DmaArvh5tGgo62KPJYQ=="; + url = "https://registry.npmjs.org/@lerna/run-lifecycle/-/run-lifecycle-5.1.0.tgz"; + sha512 = "CJ9LunNtzsLIt9wemwirBaIGGmwrHuEWWa7wIqPKee0R3LZJoUP471A/xK7eAkzmo2rty1JriMPsqg2SyfFDZg=="; }; }; - "@lerna/run-topologically-5.0.0" = { + "@lerna/run-topologically-5.1.0" = { name = "_at_lerna_slash_run-topologically"; packageName = "@lerna/run-topologically"; - version = "5.0.0"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/run-topologically/-/run-topologically-5.0.0.tgz"; - sha512 = "B2s1N/+r3sfPOLRA2svNk+C52JpXQleMuGap0yhOx5mZzR1M2Lo4vpe9Ody4hCvXQjfdLx/U342fxVmgugUtfQ=="; + url = "https://registry.npmjs.org/@lerna/run-topologically/-/run-topologically-5.1.0.tgz"; + sha512 = "CZs9GhiTVkfPsMivOzfrf8eWzSoKxJY57arwfPwSFmUdUTok6uZKmC4bo6uqd1eyRGIba6j03ivg0ehUbr7APQ=="; }; }; - "@lerna/symlink-binary-5.0.0" = { + "@lerna/symlink-binary-5.1.0" = { name = "_at_lerna_slash_symlink-binary"; packageName = "@lerna/symlink-binary"; - version = "5.0.0"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/symlink-binary/-/symlink-binary-5.0.0.tgz"; - sha512 = "uYyiiNjkdL1tWf8MDXIIyCa/a2gmYaUxagqMgEZ4wRtOk+PDypDwMUFVop/EQtUWZqG5CAJBJYOztG3DdapTbA=="; + url = "https://registry.npmjs.org/@lerna/symlink-binary/-/symlink-binary-5.1.0.tgz"; + sha512 = "D357qFkPhADU/bjK3vSPydG85gQGspgGg83EupAyocCPUyH0vE2YGNF713CXRTaMOkV8oxoH/QDcUVmqGybTVA=="; }; }; - "@lerna/symlink-dependencies-5.0.0" = { + "@lerna/symlink-dependencies-5.1.0" = { name = "_at_lerna_slash_symlink-dependencies"; packageName = "@lerna/symlink-dependencies"; - version = "5.0.0"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/symlink-dependencies/-/symlink-dependencies-5.0.0.tgz"; - sha512 = "wlZGOOB87XMy278hpF4fOwGNnjTXf1vJ/cFHIdKsJAiDipyhtnuCiJLBDPh4NzEGb02o4rhaqt8Nl5yWRu9CNA=="; + url = "https://registry.npmjs.org/@lerna/symlink-dependencies/-/symlink-dependencies-5.1.0.tgz"; + sha512 = "DN+Zk/aAbfhDx5dxbccb0n6AFj27cO3Tu+RITmzt1N4KfIrVpcsrxRN+dt+pc945SE8ccdO5vkKrybijjlGb4Q=="; }; }; - "@lerna/temp-write-5.0.0" = { + "@lerna/temp-write-5.1.0" = { name = "_at_lerna_slash_temp-write"; packageName = "@lerna/temp-write"; - version = "5.0.0"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/temp-write/-/temp-write-5.0.0.tgz"; - sha512 = "JOkRR6xyASuBy1udyS/VD52Wgywnz7cSKppD+QKIDseNzTq27I9mNmb702BSXNXIdD19lLVQ7q6WoAlpnelnZg=="; + url = "https://registry.npmjs.org/@lerna/temp-write/-/temp-write-5.1.0.tgz"; + sha512 = "IvtYcrnWISEe9nBjhvq+o1mfn85Kup6rd+/PHb3jFmxx7E6ON4BnuqGPOOjmEjboMIRaopWQrkuCoIVotP+sDw=="; }; }; - "@lerna/timer-5.0.0" = { + "@lerna/timer-5.1.0" = { name = "_at_lerna_slash_timer"; packageName = "@lerna/timer"; - version = "5.0.0"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/timer/-/timer-5.0.0.tgz"; - sha512 = "p2vevkpB6V/b0aR8VyMLDfg0Arp9VvMxcZOEu+IfZ9XKTtnbwjWPHKUOS34x/VGa6bnOIWjE046ixWymOs/fTw=="; + url = "https://registry.npmjs.org/@lerna/timer/-/timer-5.1.0.tgz"; + sha512 = "ukVB3eDBKjZd8TjOSB3uHJWpPBtf7Ryk5AfA1yAotVd0Uk4wztGE6ULpGteAAS4AyJ1Tw9Ux7OLWu6QGVNvYLQ=="; }; }; - "@lerna/validation-error-5.0.0" = { + "@lerna/validation-error-5.1.0" = { name = "_at_lerna_slash_validation-error"; packageName = "@lerna/validation-error"; - version = "5.0.0"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/validation-error/-/validation-error-5.0.0.tgz"; - sha512 = "fu/MhqRXiRQM2cirP/HoSkfwc5XtJ21G60WHv74RnanKBqWEZAUALWa3MQN2sYhVV/FpDW3GLkO008IW5NWzdg=="; + url = "https://registry.npmjs.org/@lerna/validation-error/-/validation-error-5.1.0.tgz"; + sha512 = "Csogf+BzsMa8vxj51KcHIg3RVWr0FbIkRXXALRT5c/shUsV7NClV/cpz35r3DzBIXdh168LftHBW49wxPXX5uw=="; }; }; - "@lerna/version-5.0.0" = { + "@lerna/version-5.1.0" = { name = "_at_lerna_slash_version"; packageName = "@lerna/version"; - version = "5.0.0"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/version/-/version-5.0.0.tgz"; - sha512 = "M8KvdyG5kR/d3wgg5S46Q2YMf0L9iw9MiumTvlDP4ckysTt+04kS74Vp4+aClgPM4xaoI5OuMrs6wy5ICcd3Pw=="; + url = "https://registry.npmjs.org/@lerna/version/-/version-5.1.0.tgz"; + sha512 = "KXvrudKfAUl/Fx1QkZXIaQ62O6/hcUZO48vCDG5ngEIfCUYxSneNgC/mp1J1rh3qC5ame9T3crP//ixYjGyHqQ=="; }; }; - "@lerna/write-log-file-5.0.0" = { + "@lerna/write-log-file-5.1.0" = { name = "_at_lerna_slash_write-log-file"; packageName = "@lerna/write-log-file"; - version = "5.0.0"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/write-log-file/-/write-log-file-5.0.0.tgz"; - sha512 = "kpPNxe9xm36QbCWY7DwO96Na6FpCHzZinJtw6ttBHslIcdR38lZuCp+/2KfJcVsRIPNOsp1VvgP7EZIKiBhgjw=="; + url = "https://registry.npmjs.org/@lerna/write-log-file/-/write-log-file-5.1.0.tgz"; + sha512 = "azYryoUcNnpKmV09PhyvkBManGvdWWdY3Zb6MGF73/mDeM4G9UoM/6mpNrcPwS3oEzKrc0hTwquuP3QyPiSuWw=="; }; }; "@lezer/common-0.15.12" = { @@ -5827,13 +5827,13 @@ let sha512 = "W6CLUJ2eBMw3Rec70qrsEW0jOm/3twwJv21mrmj2yORiaVmVYGS4sSS5yUwvQc1ZlDLYGPnClVWmUUMagKNsfA=="; }; }; - "@microsoft/load-themed-styles-1.10.267" = { + "@microsoft/load-themed-styles-1.10.268" = { name = "_at_microsoft_slash_load-themed-styles"; packageName = "@microsoft/load-themed-styles"; - version = "1.10.267"; + version = "1.10.268"; src = fetchurl { - url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.267.tgz"; - sha512 = "KlmENglyBXXtPfou+1kUtSIHZHmJrmDHYMvTXe82Ibucv+bpFg3xt3qd6UnqqwtaIM3SA+nKu8AhaL9FX6uk4A=="; + url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.268.tgz"; + sha512 = "2n4beGOWbxJp6D+eatPWocpywcJUlNCtkjQ6k7RSHiLWuv23HetqmESqrqZTTDjQ3JG0jOv+wVkXVNqXcfVlPw=="; }; }; "@mischnic/json-sourcemap-0.1.0" = { @@ -6727,13 +6727,13 @@ let sha512 = "hf+3bwuBwtXsugA2ULBc95qxrOqP2pOekLz34BJhcAKawt94vfeNyUKpYc0lZQ/3sCP6LqRa7UAdHA7i5UODzQ=="; }; }; - "@opentelemetry/semantic-conventions-1.3.0" = { + "@opentelemetry/semantic-conventions-1.3.1" = { name = "_at_opentelemetry_slash_semantic-conventions"; packageName = "@opentelemetry/semantic-conventions"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-1.3.0.tgz"; - sha512 = "7lmGpLL/7EHQcLVBxxOesgQQS7JSxzF/Xqx7VNMxAQbo14dzJEX6Ks0hb4LHqEMpCrKpErWXi4JxYCGrRJgx9A=="; + url = "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-1.3.1.tgz"; + sha512 = "wU5J8rUoo32oSef/rFpOT1HIjLjAv3qIDHkw1QIhODV3OpAVHi5oVzlouozg9obUmZKtbZ0qUe/m7FP0y0yBzA=="; }; }; "@ot-builder/bin-composite-types-1.5.2" = { @@ -7717,22 +7717,22 @@ let sha512 = "DiIjtous4XPuR2deTctD3/RVZy/vRzVYBgYYvHV313MmTfkbVP60qLH5txrT3/bYNvnb0poNDelLS6U0kqlvHA=="; }; }; - "@prisma/engines-3.14.0-36.2b0c12756921c891fec4f68d9444e18c7d5d4a6a" = { + "@prisma/engines-3.15.0-29.b9297dc3a59307060c1c39d7e4f5765066f38372" = { name = "_at_prisma_slash_engines"; packageName = "@prisma/engines"; - version = "3.14.0-36.2b0c12756921c891fec4f68d9444e18c7d5d4a6a"; + version = "3.15.0-29.b9297dc3a59307060c1c39d7e4f5765066f38372"; src = fetchurl { - url = "https://registry.npmjs.org/@prisma/engines/-/engines-3.14.0-36.2b0c12756921c891fec4f68d9444e18c7d5d4a6a.tgz"; - sha512 = "LwZvI3FY6f43xFjQNRuE10JM5R8vJzFTSmbV9X0Wuhv9kscLkjRlZt0BEoiHmO+2HA3B3xxbMfB5du7ZoSFXGg=="; + url = "https://registry.npmjs.org/@prisma/engines/-/engines-3.15.0-29.b9297dc3a59307060c1c39d7e4f5765066f38372.tgz"; + sha512 = "S5T0NuVF2+NoKoxY5bN6O/7avv4ifcjqqk5+JFZ6C4g+P7JMM3nY0wGBPI+46A8yGIDsyyFmvFTYiIDsEUwUeQ=="; }; }; - "@prisma/prisma-fmt-wasm-3.14.0-36.2b0c12756921c891fec4f68d9444e18c7d5d4a6a" = { + "@prisma/prisma-fmt-wasm-3.15.0-29.b9297dc3a59307060c1c39d7e4f5765066f38372" = { name = "_at_prisma_slash_prisma-fmt-wasm"; packageName = "@prisma/prisma-fmt-wasm"; - version = "3.14.0-36.2b0c12756921c891fec4f68d9444e18c7d5d4a6a"; + version = "3.15.0-29.b9297dc3a59307060c1c39d7e4f5765066f38372"; src = fetchurl { - url = "https://registry.npmjs.org/@prisma/prisma-fmt-wasm/-/prisma-fmt-wasm-3.14.0-36.2b0c12756921c891fec4f68d9444e18c7d5d4a6a.tgz"; - sha512 = "YwiGDAfUqLPz1NIyd6y6LyT1ViiTCXNx7AFWuMwb7aGhBmzhfuTeo/MQpzlA9x90wKh2ACJ4Fa3nZS5Wvr8xbg=="; + url = "https://registry.npmjs.org/@prisma/prisma-fmt-wasm/-/prisma-fmt-wasm-3.15.0-29.b9297dc3a59307060c1c39d7e4f5765066f38372.tgz"; + sha512 = "WZPmtF1rejy5aWyldms+zwP2IvI/g/j09fOD9+PnJJYAzgOXqGcp9lp0StTWZI0mZ1xNMlF5EIbcQHTWxGDYnw=="; }; }; "@protobufjs/aspromise-1.1.2" = { @@ -9625,15 +9625,6 @@ let sha512 = "ua7PgUoeQFjmWPcoo9khiPum3Pd60k4/2ZGXt18sm2Slk0W0xZTqt5Y0Ny1NyBiN1EVQ/+FaF9NcY4Qe6rwk5w=="; }; }; - "@types/node-17.0.21" = { - name = "_at_types_slash_node"; - packageName = "@types/node"; - version = "17.0.21"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-17.0.21.tgz"; - sha512 = "DBZCJbhII3r90XbQxI8Y9IjjiiOGlZ0Hr32omXIZvwwZ7p4DMMXGrKXVyPfuoBOri9XNtL0UK69jYIBIsRX3QQ=="; - }; - }; "@types/node-17.0.23" = { name = "_at_types_slash_node"; packageName = "@types/node"; @@ -10273,15 +10264,6 @@ let sha512 = "JQbbmxZTZehdc2iszGKs5oC3NFnjeay7mtAWrdt7qNtAVK0g19muApzAy4bm9byz79xa2ZnO/BOBC2R8RC5Lww=="; }; }; - "@types/ws-8.5.2" = { - name = "_at_types_slash_ws"; - packageName = "@types/ws"; - version = "8.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/ws/-/ws-8.5.2.tgz"; - sha512 = "VXI82ykONr5tacHEojnErTQk+KQSoYbW1NB6iz6wUwrNd+BqfkfggQNoNdCqhJSzbNumShPERbM+Pc5zpfhlbw=="; - }; - }; "@types/ws-8.5.3" = { name = "_at_types_slash_ws"; packageName = "@types/ws"; @@ -10354,13 +10336,13 @@ let sha512 = "aINiAxGVdOl1eJyVjaWn/YcVAq4Gi/Yo35qHGCnqbWVz61g39D0h23veY/MA0rFFGfxK7TySg2uwDeNv+JgVpg=="; }; }; - "@typescript-eslint/eslint-plugin-5.27.0" = { + "@typescript-eslint/eslint-plugin-5.27.1" = { name = "_at_typescript-eslint_slash_eslint-plugin"; packageName = "@typescript-eslint/eslint-plugin"; - version = "5.27.0"; + version = "5.27.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.27.0.tgz"; - sha512 = "DDrIA7GXtmHXr1VCcx9HivA39eprYBIFxbQEHI6NyraRDxCGpxAFiYQAT/1Y0vh1C+o2vfBiy4IuPoXxtTZCAQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.27.1.tgz"; + sha512 = "6dM5NKT57ZduNnJfpY81Phe9nc9wolnMCnknb1im6brWi1RYv84nbMS3olJa27B6+irUVV1X/Wb+Am0FjJdGFw=="; }; }; "@typescript-eslint/experimental-utils-4.33.0" = { @@ -10381,13 +10363,13 @@ let sha512 = "ZohdsbXadjGBSK0/r+d87X0SBmKzOq4/S5nzK6SBgJspFo9/CUDJ7hjayuze+JK7CZQLDMroqytp7pOcFKTxZA=="; }; }; - "@typescript-eslint/parser-5.27.0" = { + "@typescript-eslint/parser-5.27.1" = { name = "_at_typescript-eslint_slash_parser"; packageName = "@typescript-eslint/parser"; - version = "5.27.0"; + version = "5.27.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.27.0.tgz"; - sha512 = "8oGjQF46c52l7fMiPPvX4It3u3V3JipssqDfHQ2hcR0AeR8Zge+OYyKUCm5b70X72N1qXt0qgHenwN6Gc2SXZA=="; + url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.27.1.tgz"; + sha512 = "7Va2ZOkHi5NP+AZwb5ReLgNF6nWLGTeUJfxdkVUAPPSaAdbWNnFZzLZ4EGGmmiCTg+AwlbE1KyUYTBglosSLHQ=="; }; }; "@typescript-eslint/scope-manager-4.33.0" = { @@ -10399,22 +10381,22 @@ let sha512 = "5IfJHpgTsTZuONKbODctL4kKuQje/bzBRkwHE8UOZ4f89Zeddg+EGZs8PD8NcN4LdM3ygHWYB3ukPAYjvl/qbQ=="; }; }; - "@typescript-eslint/scope-manager-5.27.0" = { + "@typescript-eslint/scope-manager-5.27.1" = { name = "_at_typescript-eslint_slash_scope-manager"; packageName = "@typescript-eslint/scope-manager"; - version = "5.27.0"; + version = "5.27.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.27.0.tgz"; - sha512 = "VnykheBQ/sHd1Vt0LJ1JLrMH1GzHO+SzX6VTXuStISIsvRiurue/eRkTqSrG0CexHQgKG8shyJfR4o5VYioB9g=="; + url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.27.1.tgz"; + sha512 = "fQEOSa/QroWE6fAEg+bJxtRZJTH8NTskggybogHt4H9Da8zd4cJji76gA5SBlR0MgtwF7rebxTbDKB49YUCpAg=="; }; }; - "@typescript-eslint/type-utils-5.27.0" = { + "@typescript-eslint/type-utils-5.27.1" = { name = "_at_typescript-eslint_slash_type-utils"; packageName = "@typescript-eslint/type-utils"; - version = "5.27.0"; + version = "5.27.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.27.0.tgz"; - sha512 = "vpTvRRchaf628Hb/Xzfek+85o//zEUotr1SmexKvTfs7czXfYjXVT/a5yDbpzLBX1rhbqxjDdr1Gyo0x1Fc64g=="; + url = "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.27.1.tgz"; + sha512 = "+UC1vVUWaDHRnC2cQrCJ4QtVjpjjCgjNFpg8b03nERmkHv9JV9X5M19D7UFMd+/G7T/sgFwX2pGmWK38rqyvXw=="; }; }; "@typescript-eslint/types-4.33.0" = { @@ -10426,13 +10408,13 @@ let sha512 = "zKp7CjQzLQImXEpLt2BUw1tvOMPfNoTAfb8l51evhYbOEEzdWyQNmHWWGPR6hwKJDAi+1VXSBmnhL9kyVTTOuQ=="; }; }; - "@typescript-eslint/types-5.27.0" = { + "@typescript-eslint/types-5.27.1" = { name = "_at_typescript-eslint_slash_types"; packageName = "@typescript-eslint/types"; - version = "5.27.0"; + version = "5.27.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.27.0.tgz"; - sha512 = "lY6C7oGm9a/GWhmUDOs3xAVRz4ty/XKlQ2fOLr8GAIryGn0+UBOoJDWyHer3UgrHkenorwvBnphhP+zPmzmw0A=="; + url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.27.1.tgz"; + sha512 = "LgogNVkBhCTZU/m8XgEYIWICD6m4dmEDbKXESCbqOXfKZxRKeqpiJXQIErv66sdopRKZPo5l32ymNqibYEH/xg=="; }; }; "@typescript-eslint/typescript-estree-4.33.0" = { @@ -10444,22 +10426,22 @@ let sha512 = "rkWRY1MPFzjwnEVHsxGemDzqqddw2QbTJlICPD9p9I9LfsO8fdmfQPOX3uKfUaGRDFJbfrtm/sXhVXN4E+bzCA=="; }; }; - "@typescript-eslint/typescript-estree-5.27.0" = { + "@typescript-eslint/typescript-estree-5.27.1" = { name = "_at_typescript-eslint_slash_typescript-estree"; packageName = "@typescript-eslint/typescript-estree"; - version = "5.27.0"; + version = "5.27.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.27.0.tgz"; - sha512 = "QywPMFvgZ+MHSLRofLI7BDL+UczFFHyj0vF5ibeChDAJgdTV8k4xgEwF0geFhVlPc1p8r70eYewzpo6ps+9LJQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.27.1.tgz"; + sha512 = "DnZvvq3TAJ5ke+hk0LklvxwYsnXpRdqUY5gaVS0D4raKtbznPz71UJGnPTHEFo0GDxqLOLdMkkmVZjSpET1hFw=="; }; }; - "@typescript-eslint/utils-5.27.0" = { + "@typescript-eslint/utils-5.27.1" = { name = "_at_typescript-eslint_slash_utils"; packageName = "@typescript-eslint/utils"; - version = "5.27.0"; + version = "5.27.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.27.0.tgz"; - sha512 = "nZvCrkIJppym7cIbP3pOwIkAefXOmfGPnCM0LQfzNaKxJHI6VjI8NC662uoiPlaf5f6ymkTy9C3NQXev2mdXmA=="; + url = "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.27.1.tgz"; + sha512 = "mZ9WEn1ZLDaVrhRaYgzbkXBkTPghPFsup8zDbbsYTxC5OmqrFE7skkKS/sraVsLP3TcT3Ki5CSyEFBRkLH/H/w=="; }; }; "@typescript-eslint/visitor-keys-4.33.0" = { @@ -10471,13 +10453,13 @@ let sha512 = "uqi/2aSz9g2ftcHWf8uLPJA70rUv6yuMW5Bohw+bwcuzaxQIHaKFZCKGoGXIrc9vkTJ3+0txM73K0Hq3d5wgIg=="; }; }; - "@typescript-eslint/visitor-keys-5.27.0" = { + "@typescript-eslint/visitor-keys-5.27.1" = { name = "_at_typescript-eslint_slash_visitor-keys"; packageName = "@typescript-eslint/visitor-keys"; - version = "5.27.0"; + version = "5.27.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.27.0.tgz"; - sha512 = "46cYrteA2MrIAjv9ai44OQDUoCZyHeGIc4lsjCUX2WT6r4C+kidz1bNiR4017wHOPUythYeH+Sc7/cFP97KEAA=="; + url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.27.1.tgz"; + sha512 = "xYs6ffo01nhdJgPieyk7HAOpjhTsx7r/oB9LWEhwAXgwn33tkr+W8DI2ChboqhZlC4q3TC6geDYPoiX8ROqyOQ=="; }; }; "@ungap/promise-all-settled-1.1.2" = { @@ -10543,13 +10525,13 @@ let sha512 = "klR5oN7S3WJsZz0r6Xsq7o8YlFEyU3/00VmlpZzIPVFzKfbcEjXo/sVR5lQBUqNKuOzhcbxaFtzW9aOyHjmPYA=="; }; }; - "@vercel/node-2.0.0" = { + "@vercel/node-2.0.1" = { name = "_at_vercel_slash_node"; packageName = "@vercel/node"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/node/-/node-2.0.0.tgz"; - sha512 = "wGEZ/Ge2GrmcBQmuJHFq2h0gTy4XOn2oYJyceVnOsMPwSZXMdZet2E3xSff5VfmrK2yGxO4mUIBeYjsPH+ZwWg=="; + url = "https://registry.npmjs.org/@vercel/node/-/node-2.0.1.tgz"; + sha512 = "49VaRMz7R5H1I0fjLowF+y1rM7f7maLxxXZV2cKYZgkw8/6KnHOopfLtLWAVoiY8rIyLmGSxM1zT4ZrlyKMdww=="; }; }; "@vercel/node-bridge-3.0.0" = { @@ -10732,40 +10714,40 @@ let sha512 = "KmJUazIEZWhy0UaFHV5Uy8AXpTqJgCPizEHhtxs3f8mIkUnwWjcQFG7FGfsAW7RgsN8hwcSZ5ZFjmXhllVwrkw=="; }; }; - "@vue/compiler-core-3.2.36" = { + "@vue/compiler-core-3.2.37" = { name = "_at_vue_slash_compiler-core"; packageName = "@vue/compiler-core"; - version = "3.2.36"; + version = "3.2.37"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.36.tgz"; - sha512 = "bbyZM5hvBicv0PW3KUfVi+x3ylHnfKG7DOn5wM+f2OztTzTjLEyBb/5yrarIYpmnGitVGbjZqDbODyW4iK8hqw=="; + url = "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.37.tgz"; + sha512 = "81KhEjo7YAOh0vQJoSmAD68wLfYqJvoiD4ulyedzF+OEk/bk6/hx3fTNVfuzugIIaTrOx4PGx6pAiBRe5e9Zmg=="; }; }; - "@vue/compiler-dom-3.2.36" = { + "@vue/compiler-dom-3.2.37" = { name = "_at_vue_slash_compiler-dom"; packageName = "@vue/compiler-dom"; - version = "3.2.36"; + version = "3.2.37"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.36.tgz"; - sha512 = "tcOTAOiW4s24QLnq+ON6J+GRONXJ+A/mqKCORi0LSlIh8XQlNnlm24y8xIL8la+ZDgkdbjarQ9ZqYSvEja6gVA=="; + url = "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.37.tgz"; + sha512 = "yxJLH167fucHKxaqXpYk7x8z7mMEnXOw3G2q62FTkmsvNxu4FQSu5+3UMb+L7fjKa26DEzhrmCxAgFLLIzVfqQ=="; }; }; - "@vue/compiler-sfc-3.2.36" = { + "@vue/compiler-sfc-3.2.37" = { name = "_at_vue_slash_compiler-sfc"; packageName = "@vue/compiler-sfc"; - version = "3.2.36"; + version = "3.2.37"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.2.36.tgz"; - sha512 = "AvGb4bTj4W8uQ4BqaSxo7UwTEqX5utdRSMyHy58OragWlt8nEACQ9mIeQh3K4di4/SX+41+pJrLIY01lHAOFOA=="; + url = "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.2.37.tgz"; + sha512 = "+7i/2+9LYlpqDv+KTtWhOZH+pa8/HnX/905MdVmAcI/mPQOBwkHHIzrsEsucyOIZQYMkXUiTkmZq5am/NyXKkg=="; }; }; - "@vue/compiler-ssr-3.2.36" = { + "@vue/compiler-ssr-3.2.37" = { name = "_at_vue_slash_compiler-ssr"; packageName = "@vue/compiler-ssr"; - version = "3.2.36"; + version = "3.2.37"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.36.tgz"; - sha512 = "+KugInUFRvOxEdLkZwE+W43BqHyhBh0jpYXhmqw1xGq2dmE6J9eZ8UUSOKNhdHtQ/iNLWWeK/wPZkVLUf3YGaw=="; + url = "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.37.tgz"; + sha512 = "7mQJD7HdXxQjktmsWp/J67lThEIcxLemz1Vb5I6rYJHR5vI+lON3nPGOH3ubmbvYGt8xEUaAr1j7/tIFWiEOqw=="; }; }; "@vue/component-compiler-utils-3.3.0" = { @@ -10804,40 +10786,40 @@ let sha512 = "LIZMuJk38pk9U9Ur4YzHjlIyMuxPlACdBIHH9/nGYVTsaGKOSnSuELiE8vS9wa+dJpIYspYUOqk+L1Q4pgHQHQ=="; }; }; - "@vue/reactivity-3.2.36" = { + "@vue/reactivity-3.2.37" = { name = "_at_vue_slash_reactivity"; packageName = "@vue/reactivity"; - version = "3.2.36"; + version = "3.2.37"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.2.36.tgz"; - sha512 = "c2qvopo0crh9A4GXi2/2kfGYMxsJW4tVILrqRPydVGZHhq0fnzy6qmclWOhBFckEhmyxmpHpdJtIRYGeKcuhnA=="; + url = "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.2.37.tgz"; + sha512 = "/7WRafBOshOc6m3F7plwzPeCu/RCVv9uMpOwa/5PiY1Zz+WLVRWiy0MYKwmg19KBdGtFWsmZ4cD+LOdVPcs52A=="; }; }; - "@vue/reactivity-transform-3.2.36" = { + "@vue/reactivity-transform-3.2.37" = { name = "_at_vue_slash_reactivity-transform"; packageName = "@vue/reactivity-transform"; - version = "3.2.36"; + version = "3.2.37"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/reactivity-transform/-/reactivity-transform-3.2.36.tgz"; - sha512 = "Jk5o2BhpODC9XTA7o4EL8hSJ4JyrFWErLtClG3NH8wDS7ri9jBDWxI7/549T7JY9uilKsaNM+4pJASLj5dtRwA=="; + url = "https://registry.npmjs.org/@vue/reactivity-transform/-/reactivity-transform-3.2.37.tgz"; + sha512 = "IWopkKEb+8qpu/1eMKVeXrK0NLw9HicGviJzhJDEyfxTR9e1WtpnnbYkJWurX6WwoFP0sz10xQg8yL8lgskAZg=="; }; }; - "@vue/runtime-core-3.2.36" = { + "@vue/runtime-core-3.2.37" = { name = "_at_vue_slash_runtime-core"; packageName = "@vue/runtime-core"; - version = "3.2.36"; + version = "3.2.37"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.2.36.tgz"; - sha512 = "PTWBD+Lub+1U3/KhbCExrfxyS14hstLX+cBboxVHaz+kXoiDLNDEYAovPtxeTutbqtClIXtft+wcGdC+FUQ9qQ=="; + url = "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.2.37.tgz"; + sha512 = "JPcd9kFyEdXLl/i0ClS7lwgcs0QpUAWj+SKX2ZC3ANKi1U4DOtiEr6cRqFXsPwY5u1L9fAjkinIdB8Rz3FoYNQ=="; }; }; - "@vue/shared-3.2.36" = { + "@vue/shared-3.2.37" = { name = "_at_vue_slash_shared"; packageName = "@vue/shared"; - version = "3.2.36"; + version = "3.2.37"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/shared/-/shared-3.2.36.tgz"; - sha512 = "JtB41wXl7Au3+Nl3gD16Cfpj7k/6aCroZ6BbOiCMFCMvrOpkg/qQUXTso2XowaNqBbnkuGHurLAqkLBxNGc1hQ=="; + url = "https://registry.npmjs.org/@vue/shared/-/shared-3.2.37.tgz"; + sha512 = "4rSJemR2NQIo9Klm1vabqWjD8rs/ZaJSzMxkMNeJS6lHiUjjUeYFbooN19NgFjztubEKh3WlZUeOLVdbbUWHsw=="; }; }; "@vue/web-component-wrapper-1.3.0" = { @@ -13351,13 +13333,13 @@ let sha512 = "58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA=="; }; }; - "arg-5.0.1" = { + "arg-5.0.2" = { name = "arg"; packageName = "arg"; - version = "5.0.1"; + version = "5.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/arg/-/arg-5.0.1.tgz"; - sha512 = "e0hDa9H2Z9AwFkk2qDlwhoMYE4eToKarchkQHovNdLTCYMHZHeRjI71crOh+dio4K6u1IcwubQqo79Ga4CyAQA=="; + url = "https://registry.npmjs.org/arg/-/arg-5.0.2.tgz"; + sha512 = "PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg=="; }; }; "argparse-1.0.10" = { @@ -14242,6 +14224,15 @@ let sha512 = "spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g=="; }; }; + "async-3.2.4" = { + name = "async"; + packageName = "async"; + version = "3.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/async/-/async-3.2.4.tgz"; + sha512 = "iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ=="; + }; + }; "async-append-only-log-3.1.4" = { name = "async-append-only-log"; packageName = "async-append-only-log"; @@ -14593,13 +14584,22 @@ let sha512 = "545VawhsCQ7yEx9jZKV0hTTW3FS/waycISWMvnNwqRfpU9o4FQ4DSu3je7ekn5yFKM+91dxJC+IfJgtIV8WaUw=="; }; }; - "aws-sdk-2.1148.0" = { + "aws-sdk-2.1149.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.1148.0"; + version = "2.1149.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1148.0.tgz"; - sha512 = "FUYAyveKmS5eqIiGQgrGVsLZwwtI+K6S6Gz8oJf56pgypZCo9dV+cXO4aaS+vN0+LSmGh6dSKc6G8h8FYASIJg=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1149.0.tgz"; + sha512 = "wNb3YMLhXoK4UkjXhGAWMjRdrXT/Zhv3KdgPmd7VWlr3nXMViLwVJEEYdVmALUdkzCefdzY1JUTRLMgCxtn9EA=="; + }; + }; + "aws-sdk-2.1150.0" = { + name = "aws-sdk"; + packageName = "aws-sdk"; + version = "2.1150.0"; + src = fetchurl { + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1150.0.tgz"; + sha512 = "SNbVXNlFGNFVcztPk7iWnjtGL+Afm1nyidpvX2rEqYdap2Ow57njZJXvghQUici4Xhqe+BUuG+x1orlFjapo4g=="; }; }; "aws-sign2-0.6.0" = { @@ -15700,13 +15700,13 @@ let sha512 = "O1htyufFTYy3EO0JkHg2CLykdXEtV2ssqw47Gq9A0WByp662xpJnMEB9m43LZjsSDjIAOozWRExlFQk2hlV1XQ=="; }; }; - "bipf-1.6.5" = { + "bipf-1.9.0" = { name = "bipf"; packageName = "bipf"; - version = "1.6.5"; + version = "1.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/bipf/-/bipf-1.6.5.tgz"; - sha512 = "d3OnzFUE2G1nwJYP2pPGzLUz6PrMRWgRKi9ssfMN1GPDVCl8qGVDq+c+8I5p8Nnog0vZN4IOq1ojUufHfFRk8w=="; + url = "https://registry.npmjs.org/bipf/-/bipf-1.9.0.tgz"; + sha512 = "B/d8IADy5Y4v/CTMRWxLD8ONd2qRkF+2DbZLeIUql7PukfAiBhlGlw5qJcIU03l21qMEyvbi4PdntatH+j40vA=="; }; }; "bit-field-1.5.3" = { @@ -16330,13 +16330,13 @@ let sha512 = "RaVTblr+OnEli0r/ud8InrU7D+G0y6aJhlxaLa6Pwty4+xoxboF1BsUI45tujvRpbj9dQVoglChqonGAsjEBYg=="; }; }; - "bonjour-service-1.0.12" = { + "bonjour-service-1.0.13" = { name = "bonjour-service"; packageName = "bonjour-service"; - version = "1.0.12"; + version = "1.0.13"; src = fetchurl { - url = "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.0.12.tgz"; - sha512 = "pMmguXYCu63Ug37DluMKEHdxc+aaIf/ay4YbF8Gxtba+9d3u+rmEWy61VK3Z3hp8Rskok3BunHYnG0dUHAsblw=="; + url = "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.0.13.tgz"; + sha512 = "LWKRU/7EqDUC9CTAQtuZl5HzBALoCYwtLhffW3et7vZMwv3bWLpJf8bRYlMD5OCcDpTfnPgNCV4yo9ZIaJGMiA=="; }; }; "boolbase-1.0.0" = { @@ -16843,13 +16843,13 @@ let sha512 = "HI4lPveGKUR0x2StIz+2FXfDk9SfVMrxn6PLh1JeGUwcuoDkdKZebWiyLRJ68iIPDpMI4JLVDf7S7XzslgWOhw=="; }; }; - "browserslist-4.20.3" = { + "browserslist-4.20.4" = { name = "browserslist"; packageName = "browserslist"; - version = "4.20.3"; + version = "4.20.4"; src = fetchurl { - url = "https://registry.npmjs.org/browserslist/-/browserslist-4.20.3.tgz"; - sha512 = "NBhymBQl1zM0Y5dQT/O+xiLP9/rzOIQdKM/eMJBAq7yBgaB6krIYLGejrwVYnSHZdqjscB1SPuAjHwxjvN6Wdg=="; + url = "https://registry.npmjs.org/browserslist/-/browserslist-4.20.4.tgz"; + sha512 = "ok1d+1WpnU24XYN7oC3QWgTyMhY/avPJ/r9T00xxvUOIparA/gc+UPUMaod3i+G6s+nI2nUb9xZ5k794uIwShw=="; }; }; "brq-0.1.8" = { @@ -17978,13 +17978,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001346" = { + "caniuse-lite-1.0.30001349" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001346"; + version = "1.0.30001349"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001346.tgz"; - sha512 = "q6ibZUO2t88QCIPayP/euuDREq+aMAxFE5S70PkrLh0iTDj/zEhgvJRKC2+CvXY6EWc6oQwUR48lL5vCW6jiXQ=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001349.tgz"; + sha512 = "VFaWW3jeo6DLU5rwdiasosxhYSduJgSGil4cSyX3/85fbctlE58pXAkWyuRmVA0r2RxsOSVYUTZcySJ8WpbTxw=="; }; }; "canvas-2.9.1" = { @@ -18149,22 +18149,22 @@ let sha512 = "eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg=="; }; }; - "cdk8s-2.3.17" = { + "cdk8s-2.3.19" = { name = "cdk8s"; packageName = "cdk8s"; - version = "2.3.17"; + version = "2.3.19"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s/-/cdk8s-2.3.17.tgz"; - sha512 = "NOQwj7YlbGd0ySr9E0VNCY3zoSv26Ijnq8o1tunNZziLprghnIGQvqVYScKlWGukm7spZ9X659xjVg+BupLEbQ=="; + url = "https://registry.npmjs.org/cdk8s/-/cdk8s-2.3.19.tgz"; + sha512 = "TxAMyZPDMbglBlJMS0X1keCbKm2ObWI9keQKgVrtHt24REdYoaMrwJ4ap+IqweTgYGjiOs+XgStQqd7Exfrjvg=="; }; }; - "cdk8s-plus-22-2.0.0-rc.7" = { + "cdk8s-plus-22-2.0.0-rc.11" = { name = "cdk8s-plus-22"; packageName = "cdk8s-plus-22"; - version = "2.0.0-rc.7"; + version = "2.0.0-rc.11"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s-plus-22/-/cdk8s-plus-22-2.0.0-rc.7.tgz"; - sha512 = "GPsowxakBJndHtn11cC028Uu8pxzjMbpv4lgNk6jbvUZ9WrHv4xH7hTQ6E916IY5eG0NAqBiTRR3zih28h1Ihw=="; + url = "https://registry.npmjs.org/cdk8s-plus-22/-/cdk8s-plus-22-2.0.0-rc.11.tgz"; + sha512 = "wxumx8Tt/ZM1EHfK9Me/1sO4wP1bD5VdbodvMdPrz8izJPghzJ496DD5b4MWtaldOK+iDMMqx/bxCCR+QOXNrQ=="; }; }; "cdktf-0.11.1" = { @@ -20840,13 +20840,13 @@ let sha512 = "xFxOwqIzR/e1k1gLiWEophSCMqXcwVHIH7akf7b/vxcUeGunlj3hvZaaqxwHsTgn+IndtkQJgSztIDWeumWJDQ=="; }; }; - "constructs-10.1.27" = { + "constructs-10.1.31" = { name = "constructs"; packageName = "constructs"; - version = "10.1.27"; + version = "10.1.31"; src = fetchurl { - url = "https://registry.npmjs.org/constructs/-/constructs-10.1.27.tgz"; - sha512 = "OZwFH5VTPlPg5/PODDhusBPfRUw2OYVamuUJsoVIxdHfb/F8KSY6d4EKcQiwSU+xSSfTRtBjGCbty/ZkMEzqfg=="; + url = "https://registry.npmjs.org/constructs/-/constructs-10.1.31.tgz"; + sha512 = "rL5Vmy65kr+7n4swyEmD8gwrpiCtoUfhb1wNdg8UsdfzZT5AoU+fYx1shDOBpwAibm6yTim3Vjs/ZPR2iUFFQw=="; }; }; "consume-http-header-1.0.0" = { @@ -21741,13 +21741,13 @@ let sha512 = "gYTKKexFO3kh200H1Nit76sRwRtOY32vQd3jpAQKpLtZqyNsSQNfI4N7o3eP2wUjV35pTWKRYqFUDBvUha/Pkw=="; }; }; - "create-gatsby-2.15.1" = { + "create-gatsby-2.16.0" = { name = "create-gatsby"; packageName = "create-gatsby"; - version = "2.15.1"; + version = "2.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/create-gatsby/-/create-gatsby-2.15.1.tgz"; - sha512 = "oFZtU5NP5jUa/A/y6p8L2pNkW+BoE0aTPTYbZ+pwQw9sE7MfYeI+t9yNDBA/9qVaaAqUt7104NkQbix/mT1GVw=="; + url = "https://registry.npmjs.org/create-gatsby/-/create-gatsby-2.16.0.tgz"; + sha512 = "X/4fu+C8qBtfI9JTnnhI+zBFwe2V7uC27XEnA/9GbCp507xuiqkO6MuUJGDxdhe0cDBub+KD+3TLQ94XaXiJpg=="; }; }; "create-graphback-1.0.1" = { @@ -23667,13 +23667,13 @@ let sha512 = "2P0p0pFGzHS5EMnhdxQi7aJN+iMheud0UhG4dlE1DLAlvL8JHjJJTX/CSm4JXwV0Ka5nGk3zC5mcb5bUQUxxMA=="; }; }; - "dayjs-1.11.2" = { + "dayjs-1.11.3" = { name = "dayjs"; packageName = "dayjs"; - version = "1.11.2"; + version = "1.11.3"; src = fetchurl { - url = "https://registry.npmjs.org/dayjs/-/dayjs-1.11.2.tgz"; - sha512 = "F4LXf1OeU9hrSYRPTTj/6FbO4HTjPKXvEIC1P2kcnFurViINCVk3ZV0xAS3XVx9MkMsXbbqlK6hjseaYbgKEHw=="; + url = "https://registry.npmjs.org/dayjs/-/dayjs-1.11.3.tgz"; + sha512 = "xxwlswWOlGhzgQ4TKzASQkUhqERI3egRNqgV4ScR8wlANA/A9tZ7miXa44vTTKEq5l7vWoL5G57bG3zA+Kow0A=="; }; }; "dayjs-1.8.36" = { @@ -24531,13 +24531,13 @@ let sha512 = "bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ=="; }; }; - "deltachat-node-1.84.0" = { + "deltachat-node-1.86.0" = { name = "deltachat-node"; packageName = "deltachat-node"; - version = "1.84.0"; + version = "1.86.0"; src = fetchurl { - url = "https://registry.npmjs.org/deltachat-node/-/deltachat-node-1.84.0.tgz"; - sha512 = "/7tF4782VhWYtGgT1pbbodG0rkyhNQHhpkTLSrejJzl+PddC0CzOXYN8L7lcx5T9Pkxa3UPTsf7lDtlrNphRjg=="; + url = "https://registry.npmjs.org/deltachat-node/-/deltachat-node-1.86.0.tgz"; + sha512 = "mePZbE0tyYlOj7hXrQNyvMVn2NI6/K0obP9uIxZC11iTZMhFtJVUG+O18yWOLUCsDeCIDFJnrXDUc4HRbBndWw=="; }; }; "denodeify-1.2.1" = { @@ -26124,13 +26124,13 @@ let sha512 = "WvaW1EgRinDQ61khHFZfx30rkPQG5ItaOT0wrI7iJv9A3SbghriQGfZQfHZs25fWLBe6/vkv05LOqg6aDw6Wzw=="; }; }; - "electron-to-chromium-1.4.146" = { + "electron-to-chromium-1.4.147" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.4.146"; + version = "1.4.147"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.146.tgz"; - sha512 = "4eWebzDLd+hYLm4csbyMU2EbBnqhwl8Oe9eF/7CBDPWcRxFmqzx4izxvHH+lofQxzieg8UbB8ZuzNTxeukzfTg=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.147.tgz"; + sha512 = "czclPqxLMPqPMkahKcske4TaS5lcznsc26ByBlEFDU8grTBVK9C5W6K9I6oEEhm4Ai4jTihGnys90xY1yjXcRg=="; }; }; "electrum-client-git+https://github.com/janoside/electrum-client" = { @@ -26819,13 +26819,13 @@ let sha512 = "XHJk60ufE+TG/ydwp4lilOog549iiQF2OAPhkk9DdiYWMrltz5yhDz/xnKuenNwP7gy3dsibssO5QpVhkrSzzg=="; }; }; - "error-stack-parser-2.0.7" = { + "error-stack-parser-2.1.4" = { name = "error-stack-parser"; packageName = "error-stack-parser"; - version = "2.0.7"; + version = "2.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/error-stack-parser/-/error-stack-parser-2.0.7.tgz"; - sha512 = "chLOW0ZGRf4s8raLrDxa5sdkvPec5YdvwbFnqJme4rk0rFajP8mPtrDL1+I+CwrQDCjswDA5sREX7jYQDQs9vA=="; + url = "https://registry.npmjs.org/error-stack-parser/-/error-stack-parser-2.1.4.tgz"; + sha512 = "Sk5V6wVazPhq5MhpO+AUxJn5x7XSXGl1R93Vn7i+zS15KDVxQijejNCrz8340/2bgLBjR9GtEG8ZVKONDjcqGQ=="; }; }; "errorhandler-1.5.1" = { @@ -30914,13 +30914,13 @@ let sha512 = "xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ=="; }; }; - "fuse.js-6.4.1" = { + "fuse.js-6.6.2" = { name = "fuse.js"; packageName = "fuse.js"; - version = "6.4.1"; + version = "6.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/fuse.js/-/fuse.js-6.4.1.tgz"; - sha512 = "+hAS7KYgLXontDh/vqffs7wIBw0ceb9Sx8ywZQhOsiQGcSO5zInGhttWOUYQYlvV/yYMJOacQ129Xs3mP3+oZQ=="; + url = "https://registry.npmjs.org/fuse.js/-/fuse.js-6.6.2.tgz"; + sha512 = "cJaJkxCCxC8qIIcPBF9yGxY0W/tVZS3uEISDxhYIdtk8OL93pe+6Zj7LjCqVV4dzbqcriOZ+kQ/NE4RXZHsIGA=="; }; }; "fuzzy-0.1.3" = { @@ -30968,22 +30968,22 @@ let sha512 = "mDc8EQJKtxjp9PMYS3PbpjjbX3oXhBTxoGaPahw620XZBIHJ4+nvw5KN/tRtmmSDR9dypstGNvqQ3C29QGoGHQ=="; }; }; - "gatsby-core-utils-3.15.0" = { + "gatsby-core-utils-3.16.0" = { name = "gatsby-core-utils"; packageName = "gatsby-core-utils"; - version = "3.15.0"; + version = "3.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-3.15.0.tgz"; - sha512 = "aLNrH3gGUIeD9XGk3z/27N5qaVx7y3AAgs/Vu6PJm69t25kTwuOHKNzhlnHkIZypznZkkVeN7QbHBkIKam/ZIQ=="; + url = "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-3.16.0.tgz"; + sha512 = "cr3aIlzfzQkXSKng0dfAkg+v+Q0WOFJ1CCpM6HFvMykYtw5vSdaLxs6gwNmtPowG1wmCHkQ+pcyqppP+IdmVsg=="; }; }; - "gatsby-telemetry-3.15.0" = { + "gatsby-telemetry-3.16.0" = { name = "gatsby-telemetry"; packageName = "gatsby-telemetry"; - version = "3.15.0"; + version = "3.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/gatsby-telemetry/-/gatsby-telemetry-3.15.0.tgz"; - sha512 = "pXHnw79qmfN5bAVkgdQMCnq7rZFxfGU1YkZJQAG+gCsLRpDgYxgxZYhkbdRJzyF8vMYiCp7HlNsCMvBA75Rpug=="; + url = "https://registry.npmjs.org/gatsby-telemetry/-/gatsby-telemetry-3.16.0.tgz"; + sha512 = "u7s3/VoWwYO7gyqiEn7J1YiNxsdn26WSFL9egFM5jH1IMnj86fiFM4EnDfcaZ5MSTEA1dFqBa6hidwhrpv2rhw=="; }; }; "gauge-1.2.7" = { @@ -32166,15 +32166,6 @@ let sha512 = "wYGVAa8/sh9ggF5qWoOs6eArcAgwEPkDNvf637jHRHkMUznvs7m/Q2vrc0KLN6B8px3nnRJqJcXK4mTK6lLFmg=="; }; }; - "goldengate-11.1.0" = { - name = "goldengate"; - packageName = "goldengate"; - version = "11.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/goldengate/-/goldengate-11.1.0.tgz"; - sha512 = "nwrFxarqF2kxQXEzgcfvfqh64eokhcfyPl5i/RXGueRwUUSV7XW64A4BehcPcjKMKMxPM9RZarBTwa4vdnSZMA=="; - }; - }; "goldengate-11.2.1" = { name = "goldengate"; packageName = "goldengate"; @@ -32391,15 +32382,6 @@ let sha512 = "8tLu60LgxF6XpdbK8OW3FA+IfTNBn1ZHGHKF4KQbEeSkajYw5PlYJcKluntgegDPTg8UkHjpet1T82vk6TQ68w=="; }; }; - "grammy-1.8.2" = { - name = "grammy"; - packageName = "grammy"; - version = "1.8.2"; - src = fetchurl { - url = "https://registry.npmjs.org/grammy/-/grammy-1.8.2.tgz"; - sha512 = "mD3E/QxYJYfT8jPxWDxJPszVQteMtPoLHAMvXT1EsjEBvxCbrFVg5U3TKaA6Xgl6fhinBcv2yFT6tWw3h+xJzQ=="; - }; - }; "grammy-1.8.3" = { name = "grammy"; packageName = "grammy"; @@ -35595,15 +35577,6 @@ let sha512 = "0crLweprevJ02tTuA6ThpoAERAGyVILC4sS74uib58Xf/zSr1/ZWtmm7D5CI+bSQEaA04f0K7idaHpQbSWgiVQ=="; }; }; - "inquirer-8.2.2" = { - name = "inquirer"; - packageName = "inquirer"; - version = "8.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/inquirer/-/inquirer-8.2.2.tgz"; - sha512 = "pG7I/si6K/0X7p1qU+rfWnpTE1UIkTONN1wxtzh0d+dHXtT/JG6qBgLxoyHVsQa8cFABxAPh0pD6uUUHiAoaow=="; - }; - }; "inquirer-8.2.4" = { name = "inquirer"; packageName = "inquirer"; @@ -38187,13 +38160,13 @@ let sha512 = "Ni9PffhJtYtdD7VwxH6V2MnievekGfUefosGCHadog0/jAevRu6HPjYeMHbUemn0IPE8d4wGa8UsOGsX+iKy2g=="; }; }; - "jpeg-js-0.4.3" = { + "jpeg-js-0.4.4" = { name = "jpeg-js"; packageName = "jpeg-js"; - version = "0.4.3"; + version = "0.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/jpeg-js/-/jpeg-js-0.4.3.tgz"; - sha512 = "ru1HWKek8octvUHFHvE5ZzQ1yAsJmIvRdGWvSoKV52XKyuyYA437QWDttXT8eZXDSbuMpHlLzPDZUPd6idIz+Q=="; + url = "https://registry.npmjs.org/jpeg-js/-/jpeg-js-0.4.4.tgz"; + sha512 = "WZzeDOEtTOBK4Mdsar0IqEU5sMr3vSV2RqkAIzUEV2BHnUfKGyswWFPFwK5EeDo93K3FohSHbLAjj0s1Wzd+dg=="; }; }; "jpeg-turbo-0.4.0" = { @@ -38602,13 +38575,13 @@ let sha512 = "aJgfBwn3srai/4HGwYx5si+W4kuzaQh2/1xCzgpiOKwu/n0UZg0IB7z59IG6HQ/G5Yfu8Mc6AEfjAsi0kj2dbA=="; }; }; - "jsii-srcmak-0.1.581" = { + "jsii-srcmak-0.1.583" = { name = "jsii-srcmak"; packageName = "jsii-srcmak"; - version = "0.1.581"; + version = "0.1.583"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.581.tgz"; - sha512 = "Jcq1NJWZ4TaQDm/Awrh5uW8WwyPzLlz4nKEG5yKVCFE3eIBu2X0On39TFDoxWRICNe2bln/0vyja2J/t40mH9g=="; + url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.583.tgz"; + sha512 = "xuNRWTcnjLqJyEWDY5CBnK4eg5KUXGVkQiTFJs0YQOEfw0MLo5RzHrIlG/XST30wF0vkuPccSHVnjCIpUbGjzQ=="; }; }; "json-bigint-1.0.0" = { @@ -38899,13 +38872,13 @@ let sha512 = "YRZbUnyaJZLZUJSRi2G/MqahCyRv9n/ds+4oIetjDF3jWQA7AG7iSeKTiZiCNqtMZM7HDyt0e/W6lEnoGEmMGA=="; }; }; - "json2jsii-0.3.31" = { + "json2jsii-0.3.33" = { name = "json2jsii"; packageName = "json2jsii"; - version = "0.3.31"; + version = "0.3.33"; src = fetchurl { - url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.3.31.tgz"; - sha512 = "KcemeN9+s2gZj7Di2Xp05TSEx1U64SiBvOq91vKlLmRvpWxtL7gGjnOzZhHdlbL4xSUQkufLg/T3ZcoR1ZxmQw=="; + url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.3.33.tgz"; + sha512 = "yD0aMAWTRmsdM+n7WyCRg17/TvY/O9+/dI1245scj1nGd1KnK1SJrR307N9G9625+/NzFFc2E87CwPLSAhpg5A=="; }; }; "json3-3.2.6" = { @@ -40510,15 +40483,6 @@ let sha512 = "qKbf39l3k4xoY8ia0uDOvUkw8Zm3hlfiSrZasVdELlo4TJvrfZmHF5YadlWHdYFz9zFEeF4jINL3KQKGcYwliQ=="; }; }; - "lightning-5.8.2" = { - name = "lightning"; - packageName = "lightning"; - version = "5.8.2"; - src = fetchurl { - url = "https://registry.npmjs.org/lightning/-/lightning-5.8.2.tgz"; - sha512 = "ryJlD9qhbUSq4ZS6Q0WXnTgmj3IMqN1iBfUJoGAMzSbSGZAS8E8eejci88naBbbDA0N34hALpSsa5Ok7JayAdQ=="; - }; - }; "lightning-5.9.0" = { name = "lightning"; packageName = "lightning"; @@ -40771,15 +40735,6 @@ let sha512 = "gspWk34tDANhjn+brdqZstJMptGiwj4qFNVg0Zey9ds+BUlif+Lgf5szrfOVzZ8gVRkk1Lgbz7i78+V7YK7SCA=="; }; }; - "ln-accounting-5.0.6" = { - name = "ln-accounting"; - packageName = "ln-accounting"; - version = "5.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/ln-accounting/-/ln-accounting-5.0.6.tgz"; - sha512 = "ep+JDvgqQTINsUskIAlLgXE2mVsR01Atl0kFbd5D41RjCvr6tnTGocKG5CSxmp5USIpQnY2Jan1VQkXjrLukBg=="; - }; - }; "ln-accounting-5.0.7" = { name = "ln-accounting"; packageName = "ln-accounting"; @@ -40843,15 +40798,6 @@ let sha512 = "cmPDZUENkwB3Wvef16qvpYgpyEFE8eSpdkf00eMIWgUWqMcw4YYxMYrHlMvq0mELcyzQRmYld5yXUAQdQ43VAw=="; }; }; - "ln-service-53.9.3" = { - name = "ln-service"; - packageName = "ln-service"; - version = "53.9.3"; - src = fetchurl { - url = "https://registry.npmjs.org/ln-service/-/ln-service-53.9.3.tgz"; - sha512 = "vB7pnTJveZSMHbyO6qyGbxNqo+rNTYexb3PONon2+Ow4fBUQW5eeBTj+LguuQdN7AgpXX/PHZUQM0TPFeHlVWw=="; - }; - }; "ln-sync-3.12.0" = { name = "ln-sync"; packageName = "ln-sync"; @@ -40870,13 +40816,13 @@ let sha512 = "Wr1g/H0Vi322P7oLmSksNJxSgDbmyIAuVwSwHbo+tVpDRdJUSw/RxhRquLdFz/8ienXm2S9ylcaI8e21Xh6xJA=="; }; }; - "ln-telegram-3.21.5" = { + "ln-telegram-3.22.1" = { name = "ln-telegram"; packageName = "ln-telegram"; - version = "3.21.5"; + version = "3.22.1"; src = fetchurl { - url = "https://registry.npmjs.org/ln-telegram/-/ln-telegram-3.21.5.tgz"; - sha512 = "/x9yM8h9LyHMwZL/mjV95rS6zpKZDgATtSiPwYlsh+ZhAswVk3jcitgLckIJHV6I9kzgZb61ZIbPCk6o530MJQ=="; + url = "https://registry.npmjs.org/ln-telegram/-/ln-telegram-3.22.1.tgz"; + sha512 = "chYAssyd0UN97gCIoN1WDm4Ymlhs1xGIIsl9F5QHYV/ogpSZPsWHWyDPnQPMNhC3ik27H+LD5R7YjmQj8fEPlA=="; }; }; "load-bmfont-1.4.1" = { @@ -42869,13 +42815,13 @@ let sha512 = "zTU3DaZaF3Rt9rhN3uBMGQD3dD2/vFQqnvZCDv4dl5iOzq2IZQqTxu90r4E5J+nP70J3ilqVCrbho2eWaeW8Ow=="; }; }; - "luxon-2.3.2" = { + "luxon-2.4.0" = { name = "luxon"; packageName = "luxon"; - version = "2.3.2"; + version = "2.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/luxon/-/luxon-2.3.2.tgz"; - sha512 = "MlAQQVMFhGk4WUA6gpfsy0QycnKP0+NlCBJRVRNPxxSIbjrCbQ65nrpJD3FVyJNZLuJ0uoqL57ye6BmDYgHaSw=="; + url = "https://registry.npmjs.org/luxon/-/luxon-2.4.0.tgz"; + sha512 = "w+NAwWOUL5hO0SgwOHsMBAmZ15SoknmQXhSO0hIbJCAmPKSsGeK8MlmhYh2w6Iib38IxN2M+/ooXWLbeis7GuA=="; }; }; "lzma-native-8.0.6" = { @@ -45812,13 +45758,13 @@ let sha512 = "3zAEHh2hKUs3EXLESx/wsgw6IQdusOT8Bxm3D9UrHPQR7zlMmzwybC8zHEM1tQ4LJwP7fcxrWr8tuBg05fFCbg=="; }; }; - "mongodb-4.6.0" = { + "mongodb-4.7.0" = { name = "mongodb"; packageName = "mongodb"; - version = "4.6.0"; + version = "4.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/mongodb/-/mongodb-4.6.0.tgz"; - sha512 = "1gsxVXmjFTPJ+CkMG9olE4bcVsyY8lBJN9m5B5vj+LZ7wkBqq3PO8RVmNX9GwCBOBz1KV0zM00vPviUearSv7A=="; + url = "https://registry.npmjs.org/mongodb/-/mongodb-4.7.0.tgz"; + sha512 = "HhVar6hsUeMAVlIbwQwWtV36iyjKd9qdhY+s4wcU8K6TOj4Q331iiMy+FoPuxEntDIijTYWivwFJkLv8q/ZgvA=="; }; }; "mongodb-connection-string-url-2.5.2" = { @@ -50440,15 +50386,6 @@ let sha512 = "RRTnDb2TBG/epPRI2yYXsimO0v3BXC8Yd3ogr1545IaqKK17VGhbWVeGGN+XfCm/08OK8635nH31c8bATkHuSw=="; }; }; - "p2tr-1.3.0" = { - name = "p2tr"; - packageName = "p2tr"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/p2tr/-/p2tr-1.3.0.tgz"; - sha512 = "LdnkVwu808S7ngeKpUjJZDWXsWXqMLYtTGE2pXtKjpIs5Nn2qL6d84Sh+/gxyeJHtTz0qmOEuYnFfn61/TuU0A=="; - }; - }; "p2tr-1.3.1" = { name = "p2tr"; packageName = "p2tr"; @@ -50980,13 +50917,13 @@ let sha512 = "1Y1A//QUXEZK7YKz+rD9WydcE1+EuPr6ZBgKecAB8tmoW6UFv0NREVJe1p+jRxtThkcbbKkfwIbWJe/IeE6m2Q=="; }; }; - "parse-path-4.0.3" = { + "parse-path-4.0.4" = { name = "parse-path"; packageName = "parse-path"; - version = "4.0.3"; + version = "4.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/parse-path/-/parse-path-4.0.3.tgz"; - sha512 = "9Cepbp2asKnWTJ9x2kpw6Fe8y9JDbqwahGCTvklzd/cEq5C5JC59x2Xb0Kx+x0QZ8bvNquGO8/BWP0cwBHzSAA=="; + url = "https://registry.npmjs.org/parse-path/-/parse-path-4.0.4.tgz"; + sha512 = "Z2lWUis7jlmXC1jeOG9giRO2+FsuyNipeQ43HAjqAZjwSe3SEf+q/84FGPHoso3kyntbxa4c4i77t3m6fGf8cw=="; }; }; "parse-png-2.1.0" = { @@ -55273,13 +55210,13 @@ let sha512 = "U1uufzBjz3+PkpCxFrWzh4OrMIdIb2ztzCu0YEPfRHjHswcSwHZswnK+WdsOQJsRV8WeTg3jLhJR4D867+fjsA=="; }; }; - "puppeteer-14.2.1" = { + "puppeteer-14.3.0" = { name = "puppeteer"; packageName = "puppeteer"; - version = "14.2.1"; + version = "14.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/puppeteer/-/puppeteer-14.2.1.tgz"; - sha512 = "cIEsAbEbNYqHbkvdZY4+YSdxVwh4YFqOHSezuLpu46XAYlKkQeAMdJQ+mDAxg9v77gIn8PHJ6PlftIVsWKRACA=="; + url = "https://registry.npmjs.org/puppeteer/-/puppeteer-14.3.0.tgz"; + sha512 = "pDtg1+vyw1UPIhUjh2/VW1HUdQnaZJHfMacrJciR3AVm+PBiqdCEcFeFb3UJ/CDEQlHOClm3/WFa7IjY25zIGg=="; }; }; "purest-3.1.0" = { @@ -55498,6 +55435,15 @@ let sha512 = "wr7M2E0OFRfIfJZjKGieI8lBKb7fRCH4Fv5KNPEs7gJ8jadvotdsS08PzOKR7opXhZ/Xkjtt3WF9g38drmyRqQ=="; }; }; + "qs-6.10.5" = { + name = "qs"; + packageName = "qs"; + version = "6.10.5"; + src = fetchurl { + url = "https://registry.npmjs.org/qs/-/qs-6.10.5.tgz"; + sha512 = "O5RlPh0VFtR78y79rgcgKK4wbAI0C5zGVLztOIdpWX6ep368q5Hv6XRxDvXuZ9q3C6v+e3n8UfZZJw7IIG27eQ=="; + }; + }; "qs-6.2.3" = { name = "qs"; packageName = "qs"; @@ -56449,7 +56395,7 @@ let version = "1.0.5"; src = fetchurl { url = "https://registry.npmjs.org/read/-/read-1.0.5.tgz"; - sha1 = "007a3d169478aa710a491727e453effb92e76203"; + sha512 = "hDLATrzYLoMu23c/69pMC6u3fO3Y0qLTIygJkEZHLOn+AO2gSapu6QgrgwX9ehyVtaRoZVZbF4IuiZPPRdGgdg=="; }; }; "read-1.0.7" = { @@ -56458,7 +56404,7 @@ let version = "1.0.7"; src = fetchurl { url = "https://registry.npmjs.org/read/-/read-1.0.7.tgz"; - sha1 = "b3da19bd052431a97671d44a42634adf710b40c4"; + sha512 = "rSOKNYUmaxy0om1BNjMN4ezNT6VKK+2xF4GBhc81mkH7L60i6dp8qPYrkndNLT3QPphoII3maL9PVC9XmhHwVQ=="; }; }; "read-all-stream-3.1.0" = { @@ -56467,7 +56413,7 @@ let version = "3.1.0"; src = fetchurl { url = "https://registry.npmjs.org/read-all-stream/-/read-all-stream-3.1.0.tgz"; - sha1 = "35c3e177f2078ef789ee4bfafa4373074eaef4fa"; + sha512 = "DI1drPHbmBcUDWrJ7ull/F2Qb8HkwBncVx8/RpKYFSIACYaVRQReISYPdZz/mt1y1+qMCOrfReTopERmaxtP6w=="; }; }; "read-cache-1.0.0" = { @@ -56476,7 +56422,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz"; - sha1 = "e664ef31161166c9751cdbe8dbcf86b5fb58f774"; + sha512 = "Owdv/Ft7IjOgm/i0xvNDZ1LrRANRfew4b2prF3OWMQLxLfu3bS8FVhCsrSCMK4lR56Y9ya+AThoTpDCTxCmpRA=="; }; }; "read-chunk-2.1.0" = { @@ -56485,7 +56431,7 @@ let version = "2.1.0"; src = fetchurl { url = "https://registry.npmjs.org/read-chunk/-/read-chunk-2.1.0.tgz"; - sha1 = "6a04c0928005ed9d42e1a6ac5600e19cbc7ff655"; + sha512 = "QQqB2O9KX/BnztP1xkTRsBxABcWHCXTqQYmEm/DdNId1nw+leKkZvV/g5oCKUrXolGtU3zouoIxMLToAYyDgDw=="; }; }; "read-chunk-3.2.0" = { @@ -56530,7 +56476,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/read-metadata/-/read-metadata-1.0.0.tgz"; - sha1 = "6df9cbe51184e8ceb7d0668b40ee5191e6f3dac6"; + sha512 = "XJdiOrkzOlIac9vXNvgp/4I8qj9EPuHlbf/eoX2rusLFjdKjp0TQ82V3cj+AFjXBzzoZ1TaqAtHnGsR3UdO1Gw=="; }; }; "read-only-stream-2.0.0" = { @@ -56539,7 +56485,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/read-only-stream/-/read-only-stream-2.0.0.tgz"; - sha1 = "2724fd6a8113d73764ac288d4386270c1dbf17f0"; + sha512 = "3ALe0bjBVZtkdWKIcThYpQCLbBMd/+Tbh2CDSrAIDO3UsZ4Xs+tnyjv2MjCOMMgBG+AsUOeuP1cgtY1INISc8w=="; }; }; "read-package-json-3.0.1" = { @@ -56584,7 +56530,7 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz"; - sha1 = "f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"; + sha512 = "7BGwRHqt4s/uVbuyoeejRn4YmFnYZiFl4AuaeXHlgZf3sONF0SOGlxs2Pw8g6hCKupo08RafIO5YXFNOKTfwsQ=="; }; }; "read-pkg-2.0.0" = { @@ -56593,7 +56539,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz"; - sha1 = "8ef1c0623c6a6db0dc6713c4bfac46332b2368f8"; + sha512 = "eFIBOPW7FGjzBuk3hdXEuNSiTZS/xEMlH49HxMyzb0hyPfu4EhVjT2DH32K1hSSmVq4sebAWnZuuY5auISUTGA=="; }; }; "read-pkg-3.0.0" = { @@ -56602,7 +56548,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz"; - sha1 = "9cbc686978fee65d16c00e2b19c237fcf6e38389"; + sha512 = "BLq/cCO9two+lBgiTYNqD6GdtK8s4NpaWrl6/rCO9w0TUS8oJl7cmToOZfRYllKTISY6nt1U7jQ53brmKqY6BA=="; }; }; "read-pkg-5.2.0" = { @@ -56629,7 +56575,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz"; - sha1 = "9d63c13276c065918d57f002a57f40a1b643fb02"; + sha512 = "WD9MTlNtI55IwYUS27iHh9tK3YoIVhxis8yKhLpTqWtml739uXc9NWTpxoHkfZf3+DkCCsXox94/VWZniuZm6A=="; }; }; "read-pkg-up-2.0.0" = { @@ -56638,7 +56584,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz"; - sha1 = "6b72a8048984e0c41e79510fd5e9fa99b3b549be"; + sha512 = "1orxQfbWGUiTn9XsPlChs6rLie/AV9jwZTGmu2NZw/CUDJQchXJFYE0Fq5j7+n558T1JhDWLdhyd1Zj+wLY//w=="; }; }; "read-pkg-up-3.0.0" = { @@ -56647,7 +56593,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-3.0.0.tgz"; - sha1 = "3ed496685dba0f8fe118d0691dc51f4a1ff96f07"; + sha512 = "YFzFrVvpC6frF1sz8psoHDBGF7fLPc+llq/8NB43oagqWkx8ar5zYtsTORtOjw9W2RHLpWP+zTWwBvf1bCmcSw=="; }; }; "read-pkg-up-4.0.0" = { @@ -56692,7 +56638,7 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.2.tgz"; - sha1 = "213ce36864fc1f0d4e98e03b9eb92c64042299d4"; + sha512 = "El0AJ9aGxDbvoPzWx9rlD84bzmrhdoxytBbN4R4+fb9Wjx2UHdY9ghDTQPIFYw/eL7KwaKgyrTv2iH6IvCk3Ig=="; }; }; "readable-stream-1.0.27-1" = { @@ -56701,7 +56647,7 @@ let version = "1.0.27-1"; src = fetchurl { url = "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.27-1.tgz"; - sha1 = "6b67983c20357cefd07f0165001a16d710d91078"; + sha512 = "uQE31HGhpMrqZwtDjRliOs2aC3XBi+DdkhLs+Xa0dvVD5eDiZr3+k8rKVZcyTzxosgtMw7B/twQsK3P1KTZeVg=="; }; }; "readable-stream-1.0.34" = { @@ -56710,7 +56656,7 @@ let version = "1.0.34"; src = fetchurl { url = "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz"; - sha1 = "125820e34bc842d2f2aaafafe4c2916ee32c157c"; + sha512 = "ok1qVCJuRkNmvebYikljxJA/UEsKwLl2nI1OmaqAu4/UE+h0wKCHok4XkL/gvi39OacXvw59RJUOFUkDib2rHg=="; }; }; "readable-stream-1.1.14" = { @@ -56719,7 +56665,7 @@ let version = "1.1.14"; src = fetchurl { url = "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz"; - sha1 = "7cf4c54ef648e3813084c636dd2079e166c081d9"; + sha512 = "+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ=="; }; }; "readable-stream-2.0.6" = { @@ -56728,7 +56674,7 @@ let version = "2.0.6"; src = fetchurl { url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz"; - sha1 = "8f90341e68a53ccc928788dacfcd11b36eb9b78e"; + sha512 = "TXcFfb63BQe1+ySzsHZI/5v1aJPCShfqvWJ64ayNImXMsN1Cd0YGk/wm8KB7/OeessgPc9QvS9Zou8QTkFzsLw=="; }; }; "readable-stream-2.3.0" = { @@ -56827,7 +56773,7 @@ let version = "1.3.0"; src = fetchurl { url = "https://registry.npmjs.org/readline/-/readline-1.3.0.tgz"; - sha1 = "c580d77ef2cfc8752b132498060dc9793a7ac01c"; + sha512 = "k2d6ACCkiNYz222Fs/iNze30rRJ1iIicW7JuX/7/cozvih6YCkFZH+J6mAFDVgv0dRBaAyr4jDqC95R2y4IADg=="; }; }; "readline-sync-1.4.10" = { @@ -56845,7 +56791,7 @@ let version = "0.1.1"; src = fetchurl { url = "https://registry.npmjs.org/readline2/-/readline2-0.1.1.tgz"; - sha1 = "99443ba6e83b830ef3051bfd7dc241a82728d568"; + sha512 = "qs8GGG+hLGMaDOGjd+mDglDoYcHDkjIY7z5RU0/ApsGT0qypyrWskNeemUqD+UxIXiZoMYT5aLwGp4ehoyZhIg=="; }; }; "readline2-1.0.1" = { @@ -56854,7 +56800,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/readline2/-/readline2-1.0.1.tgz"; - sha1 = "41059608ffc154757b715d9989d199ffbf372e35"; + sha512 = "8/td4MmwUB6PkZUbV25uKz7dfrmjYWxsW8DVfibWdlHRk/l/DfHKn4pU+dfcoGLFgWOdyGCzINRQD7jn+Bv+/g=="; }; }; "real-require-0.1.0" = { @@ -56872,7 +56818,7 @@ let version = "0.10.43"; src = fetchurl { url = "https://registry.npmjs.org/recast/-/recast-0.10.43.tgz"; - sha1 = "b95d50f6d60761a5f6252e15d80678168491ce7f"; + sha512 = "GC1g4P336t8WOpzVGFOo83m14xQfHbVqe+eDus+4oubobkWb/kONwMWSG6+K3BUtBOoUdUU+GT9kmNCSOBv9+g=="; }; }; "recast-0.11.23" = { @@ -56881,7 +56827,7 @@ let version = "0.11.23"; src = fetchurl { url = "https://registry.npmjs.org/recast/-/recast-0.11.23.tgz"; - sha1 = "451fd3004ab1e4df9b4e4b66376b2a21912462d3"; + sha512 = "+nixG+3NugceyR8O1bLU45qs84JgI3+8EauyRZafLgC9XbdAOIVgwV1Pe2da0YzGo62KzWoZwUpVEQf6qNAXWA=="; }; }; "recast-0.17.2" = { @@ -56908,7 +56854,7 @@ let version = "0.6.2"; src = fetchurl { url = "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz"; - sha1 = "85204b54dba82d5742e28c96756ef43af50e3384"; + sha512 = "HFM8rkZ+i3zrV+4LQjwQ0W+ez98pApMGM3HUrN04j3CqzPOzl9nmP15Y8YXNm8QHGv/eacOVEjqhmWpkRV0NAw=="; }; }; "rechoir-0.7.1" = { @@ -56944,7 +56890,7 @@ let version = "1.0.6"; src = fetchurl { url = "https://registry.npmjs.org/recursive-readdir-sync/-/recursive-readdir-sync-1.0.6.tgz"; - sha1 = "1dbf6d32f3c5bb8d3cde97a6c588d547a9e13d56"; + sha512 = "QhkBh/V7T3L2m8FrwZEZ/VnSZU35bv7DSy/VlKVfcq10zvwwuxeuDLH7DZYFGHFyXefHchZmsHFLELR7poGjog=="; }; }; "recursive-watch-1.1.4" = { @@ -56962,7 +56908,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz"; - sha1 = "cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde"; + sha512 = "qtW5hKzGQZqKoh6JNSD+4lfitfPKGz42e6QwiRmPM5mmKtR0N41AbJRYu0xJi7nhOJ4WDgRkKvAk6tw4WIwR4g=="; }; }; "redent-2.0.0" = { @@ -56971,7 +56917,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/redent/-/redent-2.0.0.tgz"; - sha1 = "c1b2007b42d57eb1389079b3c8333639d5e1ccaa"; + sha512 = "XNwrTx77JQCEMXTeb8movBKuK75MgH0RZkujNuDKCezemx/voapl9i2gCSi8WWm8+ox5ycJi1gxF22fR7c0Ciw=="; }; }; "redent-3.0.0" = { @@ -56998,7 +56944,7 @@ let version = "2.1.1"; src = fetchurl { url = "https://registry.npmjs.org/redeyed/-/redeyed-2.1.1.tgz"; - sha1 = "8984b5815d99cb220469c99eeeffe38913e6cc0b"; + sha512 = "FNpGGo1DycYAdnrKFxCMmKYgo/mILAqtRYbkdQD8Ep/Hk2PQ5+aEAEx+IU713RTDmuBaH0c8P5ZozurNu5ObRQ=="; }; }; "redis-3.1.1" = { @@ -57034,7 +56980,7 @@ let version = "1.2.0"; src = fetchurl { url = "https://registry.npmjs.org/redis-errors/-/redis-errors-1.2.0.tgz"; - sha1 = "eb62d2adb15e4eaf4610c04afe1529384250abad"; + sha512 = "1qny3OExCf0UvUV/5wpYKf2YwPcOqXzkwKKSmKHiE6ZMQs5heeE/c8eXK+PNllPvmjgAbfnsbpkGZWy8cBpn9w=="; }; }; "redis-parser-3.0.0" = { @@ -57043,7 +56989,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/redis-parser/-/redis-parser-3.0.0.tgz"; - sha1 = "b66d828cdcafe6b4b8a428a7def4c6bcac31c8b4"; + sha512 = "DJnGAeenTdpMEH6uAJRK/uiyEIH9WVsUmoLwzudwGJUwZPp80PDBWPHXSAGNPwNvIXAbe7MSUB1zQFugFml66A=="; }; }; "redoc-2.0.0-rc.72" = { @@ -57061,7 +57007,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/reduce-component/-/reduce-component-1.0.1.tgz"; - sha1 = "e0c93542c574521bea13df0f9488ed82ab77c5da"; + sha512 = "y0wyCcdQul3hI3xHfIs0vg/jSbboQc/YTOAqaxjFG7At+XSexduuOqBVL9SmOLSwa/ldkbzVzdwuk9s2EKTAZg=="; }; }; "reduce-flatten-1.0.1" = { @@ -57070,7 +57016,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/reduce-flatten/-/reduce-flatten-1.0.1.tgz"; - sha1 = "258c78efd153ddf93cb561237f61184f3696e327"; + sha512 = "j5WfFJfc9CoXv/WbwVLHq74i/hdTUpy+iNC534LxczMRP67vJeK3V9JOdnL0N1cIRbn9mYhE2yVjvvKXDxvNXQ=="; }; }; "redux-3.7.2" = { @@ -57241,7 +57187,7 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/register-protocol-win32/-/register-protocol-win32-1.1.0.tgz"; - sha1 = "ac961c69caaa2d609eec368aa0e4daf81a2dfee3"; + sha512 = "Ca1loTkt5v1zZYBOCHDLiw21A/68iWbukmoCqauoczcXOBz14U8/tBeTa78ftdmrk7TgJIjLqbq5B8w3MettlQ=="; }; }; "registry-auth-token-3.3.2" = { @@ -57277,7 +57223,7 @@ let version = "3.1.0"; src = fetchurl { url = "https://registry.npmjs.org/registry-url/-/registry-url-3.1.0.tgz"; - sha1 = "3d4ef870f73dde1d77f0cf9a381432444e174942"; + sha512 = "ZbgR5aZEdf4UKZVBPYIgaglBmSF2Hi94s2PcIHhRGFjKYu+chjJdYfHn4rt3hB6eCKLJ8giVIIfgMa1ehDfZKA=="; }; }; "registry-url-5.1.0" = { @@ -57367,7 +57313,7 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/reinterval/-/reinterval-1.1.0.tgz"; - sha1 = "3361ecfa3ca6c18283380dd0bb9546f390f5ece7"; + sha512 = "QIRet3SYrGp0HUHO88jVskiG6seqUGC5iAG7AwI/BV4ypGcuqk9Du6YQBUOUqm9c8pw1eyLoIaONifRua1lsEQ=="; }; }; "relateurl-0.2.7" = { @@ -57376,7 +57322,7 @@ let version = "0.2.7"; src = fetchurl { url = "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz"; - sha1 = "54dbf377e51440aca90a4cd274600d3ff2d888a9"; + sha512 = "G08Dxvm4iDN3MLM0EsP62EDV9IuhXPR6blNz6Utcp7zyV3tr4HVNINt6MpaRWbxoOHT3Q7YN2P+jaHX8vUbgog=="; }; }; "relative-3.0.2" = { @@ -57385,7 +57331,7 @@ let version = "3.0.2"; src = fetchurl { url = "https://registry.npmjs.org/relative/-/relative-3.0.2.tgz"; - sha1 = "0dcd8ec54a5d35a3c15e104503d65375b5a5367f"; + sha512 = "Q5W2qeYtY9GbiR8z1yHNZ1DGhyjb4AnLEjt8iE6XfcC1QIu+FAtj3HQaO0wH28H1mX6cqNLvAqWhP402dxJGyA=="; }; }; "relative-url-1.0.2" = { @@ -57394,7 +57340,7 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/relative-url/-/relative-url-1.0.2.tgz"; - sha1 = "d21c52a72d6061018bcee9f9c9fc106bf7d65287"; + sha512 = "jI1AmBVFFMXwQ3I6tIYVmVOjy8f+ogHbqkeb8/LL9tszEQiTV8I0l8XT4oEomUOoxfm698f92gYlNKeA/9LJVQ=="; }; }; "relaxed-json-1.0.3" = { @@ -57421,7 +57367,7 @@ let version = "3.2.3"; src = fetchurl { url = "https://registry.npmjs.org/remark/-/remark-3.2.3.tgz"; - sha1 = "802a38c3aa98c9e1e3ea015eeba211d27cb65e1f"; + sha512 = "E+WibagMmLjs7y5d6qWRiwbL2/z0zbkLwCqvmNlxBTx2Y1ufZ06sir+ZdyQXTxDiEbkbsrX6kG883ItjrEkaSQ=="; }; }; "remark-footnotes-3.0.0" = { @@ -57484,7 +57430,7 @@ let version = "2.0.2"; src = fetchurl { url = "https://registry.npmjs.org/remark-html/-/remark-html-2.0.2.tgz"; - sha1 = "592a347bdd3d5881f4f080c98b5b152fb1407a92"; + sha512 = "2yj8Oad44uo/IWOssZs3Y4AvfrA9nGZqiHsL7ePyZuntPKjtljHZDcroljlQQ+sJryO3Bjnnj30e7wi8aTp/hQ=="; }; }; "remark-lint-8.0.0" = { @@ -58051,7 +57997,7 @@ let version = "1.2.0"; src = fetchurl { url = "https://registry.npmjs.org/remove-bom-stream/-/remove-bom-stream-1.2.0.tgz"; - sha1 = "05f1a593f16e42e1fb90ebf59de8e569525f9523"; + sha512 = "wigO8/O08XHb8YPzpDDT+QmRANfW6vLqxfaXm1YXhnFf3AkSLyjfG3GEFg4McZkmgL7KvCj5u2KczkvSP6NfHA=="; }; }; "remove-markdown-0.1.0" = { @@ -58060,7 +58006,7 @@ let version = "0.1.0"; src = fetchurl { url = "https://registry.npmjs.org/remove-markdown/-/remove-markdown-0.1.0.tgz"; - sha1 = "cf8b66e9e6fcb4acc9721048adeee7a357698ba9"; + sha512 = "MQ7eQbVShqsGdx4rO1wg0THlPUUKYGWDATsk7od6oH0FuPYUNW+yu/MUMluV5v+eKyJBlqcW4xBb8fZNS1ch6g=="; }; }; "remove-trailing-separator-1.1.0" = { @@ -58069,7 +58015,7 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz"; - sha1 = "c24bce2a283adad5bc3f58e0d48249b92379d8ef"; + sha512 = "/hS+Y0u3aOfIETiaiirUFwDBDzmXPvO+jAfKTitUngIPzdKc6Z0LoFjM/CK5PL4C+eKwHohlHAb6H0VFfmmUsw=="; }; }; "remove-trailing-slash-0.1.1" = { @@ -58114,7 +58060,7 @@ let version = "1.6.1"; src = fetchurl { url = "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz"; - sha1 = "8dcae470e1c88abc2d600fff4a776286da75e637"; + sha512 = "PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w=="; }; }; "repeating-1.1.3" = { @@ -58123,7 +58069,7 @@ let version = "1.1.3"; src = fetchurl { url = "https://registry.npmjs.org/repeating/-/repeating-1.1.3.tgz"; - sha1 = "3d4114218877537494f97f77f9785fab810fa4ac"; + sha512 = "Nh30JLeMHdoI+AsQ5eblhZ7YlTsM9wiJQe/AHIunlK3KWzvXhXb36IJ7K1IOeRjIOtzMjdUHjwXUFxKJoPTSOg=="; }; }; "repeating-2.0.1" = { @@ -58132,7 +58078,7 @@ let version = "2.0.1"; src = fetchurl { url = "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz"; - sha1 = "5214c53a926d3552707527fbab415dbc08d06dda"; + sha512 = "ZqtSMuVybkISo2OWvqvm7iHSWngvdaW3IpsT9/uP8v4gMi591LY6h35wdOfvQdWCKFWZWm2Y1Opp4kV7vQKT6A=="; }; }; "replace-buffer-1.2.1" = { @@ -58150,7 +58096,7 @@ let version = "0.0.1"; src = fetchurl { url = "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz"; - sha1 = "29bbd92078a739f0bcce2b4ee41e837953522924"; + sha512 = "AFBWBy9EVRTa/LhEcG8QDP3FvpwZqmvN2QFDuJswFeaVhWnZMp8q3E6Zd90SR04PlIwfGdyVjNyLPyen/ek5CQ=="; }; }; "replace-ext-1.0.0" = { @@ -58159,7 +58105,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.0.tgz"; - sha1 = "de63128373fcbf7c3ccfa4de5a480c45a67958eb"; + sha512 = "vuNYXC7gG7IeVNBC1xUllqCcZKRbJoSPOBhnTEcAIiKCsbuef6zO3F0Rve3isPMMoNoQRWjQwbAgAjHUHniyEA=="; }; }; "replace-ext-1.0.1" = { @@ -58177,7 +58123,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/replace-homedir/-/replace-homedir-1.0.0.tgz"; - sha1 = "e87f6d513b928dde808260c12be7fec6ff6e798c"; + sha512 = "CHPV/GAglbIB1tnQgaiysb8H2yCy8WQ7lcEwQ/eT+kLj0QHV8LnJW0zpqpE7RSkrMSRoa+EBoag86clf7WAgSg=="; }; }; "request-2.76.0" = { @@ -58186,7 +58132,7 @@ let version = "2.76.0"; src = fetchurl { url = "https://registry.npmjs.org/request/-/request-2.76.0.tgz"; - sha1 = "be44505afef70360a0436955106be3945d95560e"; + sha512 = "oAqKWlLKtLtHlLa/dxjQ0Q03rXvGeNd4Kdj63cIbxmi2VulqWTuccD5V8a7GtI3QjtJ9294dltpp4PMBokIsww=="; }; }; "request-2.81.0" = { @@ -58195,7 +58141,7 @@ let version = "2.81.0"; src = fetchurl { url = "https://registry.npmjs.org/request/-/request-2.81.0.tgz"; - sha1 = "c6928946a0e06c5f8d6f8a9333469ffda46298a0"; + sha512 = "IZnsR7voF0miGSu29EXPRgPTuEsI/+aibNSBbN1pplrfartF5wDYGADz3iD9vmBVf2r00rckWZf8BtS5kk7Niw=="; }; }; "request-2.88.0" = { @@ -58222,7 +58168,7 @@ let version = "2.9.203"; src = fetchurl { url = "https://registry.npmjs.org/request/-/request-2.9.203.tgz"; - sha1 = "6c1711a5407fb94a114219563e44145bcbf4723a"; + sha512 = "OWtna9w7yRI/gcfu3VaURgIwE1FHgbz5+fHGQ9GJTHcJ4+uvHnDjXd+N7mVDOv5+1fp1CRPzUSY2wcM345Z2Fw=="; }; }; "request-as-curl-0.1.0" = { @@ -58231,7 +58177,7 @@ let version = "0.1.0"; src = fetchurl { url = "https://registry.npmjs.org/request-as-curl/-/request-as-curl-0.1.0.tgz"; - sha1 = "f017ac5b2060e1c4fc9677575c381a08249d5bf7"; + sha512 = "dl51G1i9HLy2TGuNoBqYvo1qWV6dmMJtO8Z7ua7SrHBTpxoz9IR+bOlYUxGKzM27VaSeNN06xAJSIKG6CjnUNg=="; }; }; "request-compose-1.2.3" = { @@ -58285,7 +58231,7 @@ let version = "2.0.1"; src = fetchurl { url = "https://registry.npmjs.org/request-progress/-/request-progress-2.0.1.tgz"; - sha1 = "5d36bb57961c673aa5b788dbc8141fdf23b44e08"; + sha512 = "dxdraeZVUNEn9AvLrxkgB2k6buTlym71dJk1fk4v8j3Ou3RKNm07BcgbHdj2lLgYGfqX71F+awb1MR+tWPFJzA=="; }; }; "request-promise-4.2.6" = { @@ -58330,7 +58276,7 @@ let version = "2.1.1"; src = fetchurl { url = "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz"; - sha1 = "8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"; + sha512 = "fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q=="; }; }; "require-from-string-2.0.2" = { @@ -58357,7 +58303,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz"; - sha1 = "97f717b69d48784f5f526a6c5aa8ffdda055a4d1"; + sha512 = "IqSUtOVP4ksd1C/ej5zeEh/BIP2ajqpn8c5x+q99gvcIG/Qf0cud5raVnE/Dwd0ua9TXYDoDc0RE5hBSdz22Ug=="; }; }; "require-main-filename-2.0.0" = { @@ -58375,7 +58321,7 @@ let version = "0.8.7"; src = fetchurl { url = "https://registry.npmjs.org/require-relative/-/require-relative-0.8.7.tgz"; - sha1 = "7999539fc9e047a37928fa196f8e1563dabd36de"; + sha512 = "AKGr4qvHiryxRb19m3PsLRGuKVAbJLUD7E6eOaHkfKhwc+vSgVOCY5xNvm9EkolBKTOf0GrQAZKLimOCz81Khg=="; }; }; "require-uncached-1.0.3" = { @@ -58384,7 +58330,7 @@ let version = "1.0.3"; src = fetchurl { url = "https://registry.npmjs.org/require-uncached/-/require-uncached-1.0.3.tgz"; - sha1 = "4e0d56d6c9662fd31e43011c4b95aa49955421d3"; + sha512 = "Xct+41K3twrbBHdxAgMoOS+cNcoqIjfM2/VxBF4LL2hVph7YsF8VSKyQ3BDFZwEVbok9yeDl2le/qo0S77WG2w=="; }; }; "requireg-0.2.2" = { @@ -58411,7 +58357,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz"; - sha1 = "925d2601d39ac485e091cf0da5c6e694dc3dcaff"; + sha512 = "KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ=="; }; }; "requizzle-0.2.3" = { @@ -58423,13 +58369,13 @@ let sha512 = "YanoyJjykPxGHii0fZP0uUPEXpvqfBDxWV7s6GKAiiOsiqhX6vHNyW3Qzdmqp/iq/ExbhaGbVrjB4ruEVSM4GQ=="; }; }; - "reselect-4.1.5" = { + "reselect-4.1.6" = { name = "reselect"; packageName = "reselect"; - version = "4.1.5"; + version = "4.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/reselect/-/reselect-4.1.5.tgz"; - sha512 = "uVdlz8J7OO+ASpBYoz1Zypgx0KasCY20H+N8JD13oUMtPvSHQuscrHop4KbXrbsBcdB9Ds7lVK7eRkBIfO43vQ=="; + url = "https://registry.npmjs.org/reselect/-/reselect-4.1.6.tgz"; + sha512 = "ZovIuXqto7elwnxyXbBtCPo9YFEr3uJqj2rRbcOOog1bmu2Ag85M4hixSwFWyaBMKXNgvPaJ9OSu9SkBPIeJHQ=="; }; }; "reserved-words-0.1.2" = { @@ -58438,7 +58384,7 @@ let version = "0.1.2"; src = fetchurl { url = "https://registry.npmjs.org/reserved-words/-/reserved-words-0.1.2.tgz"; - sha1 = "00a0940f98cd501aeaaac316411d9adc52b31ab1"; + sha512 = "0S5SrIUJ9LfpbVl4Yzij6VipUdafHrOTzvmfazSw/jeZrZtQK303OPZW+obtkaw7jQlTQppy0UvZWm9872PbRw=="; }; }; "resize-observer-polyfill-1.5.1" = { @@ -58483,7 +58429,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-2.0.0.tgz"; - sha1 = "00a9f7387556e27038eae232caa372a6a59b665a"; + sha512 = "ccu8zQTrzVr954472aUVPLEcB3YpKSYR3cg/3lo1okzobPBM+1INXBbBZlDbnI/hbEocnf8j0QVo43hQKrbchg=="; }; }; "resolve-cwd-3.0.0" = { @@ -58501,7 +58447,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz"; - sha1 = "79a40644c362be82f26effe739c9bb5382046f43"; + sha512 = "R7uiTjECzvOsWSfdM0QKFNBVFcK27aHOUwdvK53BcW8zqnGdYp0Fbj82cy54+2A4P2tFM22J5kRfe1R+lM/1yg=="; }; }; "resolve-from-1.0.1" = { @@ -58510,7 +58456,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/resolve-from/-/resolve-from-1.0.1.tgz"; - sha1 = "26cbfe935d1aeeeabb29bc3fe5aeb01e93d44226"; + sha512 = "kT10v4dhrlLNcnO084hEjvXCI1wUG9qZLoz2RogxqDQQYy7IxjI/iMUkOtQTNEh6rzHxvdQWHsJyel1pKOVCxg=="; }; }; "resolve-from-2.0.0" = { @@ -58519,7 +58465,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/resolve-from/-/resolve-from-2.0.0.tgz"; - sha1 = "9480ab20e94ffa1d9e80a804c7ea147611966b57"; + sha512 = "qpFcKaXsq8+oRoLilkwyc7zHGF5i9Q2/25NIgLQQ/+VVv9rU4qvr6nXVAw1DsnXJyQkZsR4Ytfbtg5ehfcUssQ=="; }; }; "resolve-from-3.0.0" = { @@ -58528,7 +58474,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz"; - sha1 = "b22c7af7d9d6881bc8b6e653335eebcb0a188748"; + sha512 = "GnlH6vxLymXJNMBo7XP1fJIzBFbdYt49CuTwmB/6N53t+kMPRMFKz783LlQ4tv28XoQfMWinAJX6WCGf2IlaIw=="; }; }; "resolve-from-4.0.0" = { @@ -58564,7 +58510,7 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/resolve-options/-/resolve-options-1.1.0.tgz"; - sha1 = "32bb9e39c06d67338dc9378c0d6d6074566ad131"; + sha512 = "NYDgziiroVeDC29xq7bp/CacZERYsA9bXYd1ZmcJlF3BcrZv5pTb4NG7SjdyKDnXZ84aC4vo2u6sNKIA1LCu/A=="; }; }; "resolve-package-1.0.1" = { @@ -58573,7 +58519,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/resolve-package/-/resolve-package-1.0.1.tgz"; - sha1 = "686f70b188bd7d675f5bbc4282ccda060abb9d27"; + sha512 = "rzB7NnQpOkPHBWFPP3prUMqOP6yg3HkRGgcvR+lDyvyHoY3fZLFLYDkPXh78SPVBAE6VTCk/V+j8we4djg6o4g=="; }; }; "resolve-path-1.4.0" = { @@ -58582,7 +58528,7 @@ let version = "1.4.0"; src = fetchurl { url = "https://registry.npmjs.org/resolve-path/-/resolve-path-1.4.0.tgz"; - sha1 = "c4bda9f5efb2fce65247873ab36bb4d834fe16f7"; + sha512 = "i1xevIst/Qa+nA9olDxLWnLk8YZbi8R/7JPbCMcgyWaFR6bKWaexgJgEB5oc2PKMjYdrHynyz0NY+if+H98t1w=="; }; }; "resolve-protobuf-schema-2.1.0" = { @@ -58600,7 +58546,7 @@ let version = "0.2.1"; src = fetchurl { url = "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz"; - sha1 = "2c637fe77c893afd2a663fe21aa9080068e2052a"; + sha512 = "ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg=="; }; }; "resp-modifier-6.0.2" = { @@ -58609,7 +58555,7 @@ let version = "6.0.2"; src = fetchurl { url = "https://registry.npmjs.org/resp-modifier/-/resp-modifier-6.0.2.tgz"; - sha1 = "b124de5c4fbafcba541f48ffa73970f4aa456b4f"; + sha512 = "U1+0kWC/+4ncRFYqQWTx/3qkfE6a4B/h3XXgmXypfa0SPZ3t7cbbaFk297PjQS/yov24R18h6OZe6iZwj3NSLw=="; }; }; "responselike-1.0.2" = { @@ -58618,7 +58564,7 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/responselike/-/responselike-1.0.2.tgz"; - sha1 = "918720ef3b631c5642be068f15ade5a46f4ba1e7"; + sha512 = "/Fpe5guzJk1gPqdJLJR5u7eG/gNY4nImjbRDaVWVMRhne55TCmj2i9Q+54PBRfatRC8v/rIiv9BN0pMd9OV5EQ=="; }; }; "responselike-2.0.0" = { @@ -58636,7 +58582,7 @@ let version = "4.0.3"; src = fetchurl { url = "https://registry.npmjs.org/restify/-/restify-4.0.3.tgz"; - sha1 = "e1e5b7ad9d4f6aeacd20e28f44a045f26c146dbc"; + sha512 = "Wj+p3Y+5KFv+bzb7X+4H+RKaITS7y84xhR8KH1BfytpX6K1mnUVDqq2Kp0/jk/awSDQrWrkLtf0gzWfsmT1zcg=="; }; }; "restify-clients-1.5.2" = { @@ -58645,7 +58591,7 @@ let version = "1.5.2"; src = fetchurl { url = "https://registry.npmjs.org/restify-clients/-/restify-clients-1.5.2.tgz"; - sha1 = "d4b13d82f287e77e2eb5daae14e6ef8534aa7389"; + sha512 = "y4aJHEdQnAmQ8MyAuGSfVJCjAdArjPC5lmMTiWT1zDWi7GHQ1vTDoRng76mYZo1ev7bzd5YY/F3W3O/RRH//nQ=="; }; }; "restify-clients-1.6.0" = { @@ -58654,7 +58600,7 @@ let version = "1.6.0"; src = fetchurl { url = "https://registry.npmjs.org/restify-clients/-/restify-clients-1.6.0.tgz"; - sha1 = "1eaac176185162104dcc546f944950b70229f8e5"; + sha512 = "q5kF/KHkwC10PhEjZkgQnWCIVCq5rlKF+fbqjl51e28ArkztJNI5czFzwCd/4Qz3HRrfwidk1XcAKLxY75dT6w=="; }; }; "restify-errors-3.0.0" = { @@ -58663,7 +58609,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/restify-errors/-/restify-errors-3.0.0.tgz"; - sha1 = "3b17177d43954acece4291465a97ce1b58cf3d57"; + sha512 = "FvaN/X/a8uz1MJ9o/VsdHZ+GSbRoWdye8mUxpBab+U+tsXu5LZ5ywF/not/b0QnA6A3SBIPmiForlaXnMGRnNQ=="; }; }; "restify-errors-3.1.0" = { @@ -58672,7 +58618,7 @@ let version = "3.1.0"; src = fetchurl { url = "https://registry.npmjs.org/restify-errors/-/restify-errors-3.1.0.tgz"; - sha1 = "06b5479477874c0856d782a12c8707dcdad53f16"; + sha512 = "4RDQs4zirMPXH03y5LKIFoAs+LvO9HTd5Ig4KfD5h4yRtTC5aWK/F2L1g9O2CSjTsgNIc+d0ib0f1rSob3FjNg=="; }; }; "restore-cursor-1.0.1" = { @@ -58681,7 +58627,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/restore-cursor/-/restore-cursor-1.0.1.tgz"; - sha1 = "34661f46886327fed2991479152252df92daa541"; + sha512 = "reSjH4HuiFlxlaBaFCiS6O76ZGG2ygKoSlCsipKdaZuKSPx/+bt9mULkn4l0asVzbEfQQmXRg6Wp6gv6m0wElw=="; }; }; "restore-cursor-2.0.0" = { @@ -58690,7 +58636,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz"; - sha1 = "9f7ee287f82fd326d4fd162923d62129eee0dfaf"; + sha512 = "6IzJLuGi4+R14vwagDHX+JrXmPVtPpn4mffDJ1UdR7/Edm87fl6yi8mMBIVvFtJaNTUvjughmW4hwLhRG7gC1Q=="; }; }; "restore-cursor-3.1.0" = { @@ -58717,7 +58663,7 @@ let version = "0.0.0"; src = fetchurl { url = "https://registry.npmjs.org/resumer/-/resumer-0.0.0.tgz"; - sha1 = "f1e8f461e4064ba39e82af3cdc2a8c893d076759"; + sha512 = "Fn9X8rX8yYF4m81rZCK/5VmrmsSbqS/i3rDLl6ZZHAXgC2nTAx3dhwG8q8odP/RmdLa2YrybDJaAMg+X1ajY3w=="; }; }; "ret-0.1.15" = { @@ -58807,7 +58753,7 @@ let version = "0.10.1"; src = fetchurl { url = "https://registry.npmjs.org/retry/-/retry-0.10.1.tgz"; - sha1 = "e76388d217992c252750241d3d3956fed98d8ff4"; + sha512 = "ZXUSQYTHdl3uS7IuCehYfMzKyIDBNoAuUblvy5oGO5UJSUTmStUUVPXbA9Qxd173Bgre53yCQczQuHgRWAdvJQ=="; }; }; "retry-0.12.0" = { @@ -58816,7 +58762,7 @@ let version = "0.12.0"; src = fetchurl { url = "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz"; - sha1 = "1b42a6266a21f07421d1b0b54b7dc167b01c013b"; + sha512 = "9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow=="; }; }; "retry-0.13.1" = { @@ -58834,7 +58780,7 @@ let version = "0.6.1"; src = fetchurl { url = "https://registry.npmjs.org/retry/-/retry-0.6.1.tgz"; - sha1 = "fdc90eed943fde11b893554b8cc63d0e899ba918"; + sha512 = "txv1qsctZq8ei9J/uCXgaKKFPjlBB0H2hvtnzw9rjKWFNUFtKh59WprXxpAeAey3/QeWwHdxMFqStPaOAgy+dA=="; }; }; "retry-0.9.0" = { @@ -58843,7 +58789,7 @@ let version = "0.9.0"; src = fetchurl { url = "https://registry.npmjs.org/retry/-/retry-0.9.0.tgz"; - sha1 = "6f697e50a0e4ddc8c8f7fb547a9b60dead43678d"; + sha512 = "bkzdIZ5Xyim12j0jq6CQAHpfdsa2VqieWF6eN8vT2MXxCxLAZhgVUyu5EEMevJyXML+XWTxVbZ7mLaKx5F/DZw=="; }; }; "retry-request-4.2.2" = { @@ -58870,7 +58816,7 @@ let version = "0.1.8"; src = fetchurl { url = "https://registry.npmjs.org/revalidator/-/revalidator-0.1.8.tgz"; - sha1 = "fece61bfa0c1b52a206bd6b18198184bdd523a3b"; + sha512 = "xcBILK2pA9oh4SiinPEZfhP8HfrB/ha+a2fTMyl7Om2WjlDVrOQy99N2MXXlUHqGJz4qEu2duXxHJjDWuK/0xg=="; }; }; "reveal.js-4.3.1" = { @@ -58888,7 +58834,7 @@ let version = "1.3.0"; src = fetchurl { url = "https://registry.npmjs.org/reverse-http/-/reverse-http-1.3.0.tgz"; - sha1 = "61a9644bdea483aa281ffb62706e642f1a73a239"; + sha512 = "Bf9dO6G+st4L0Qj0qliH0djWf2w6NY5ijOyYQpMOZduS6kw+7xAZ3Li6ApISbSeIhpGVNgr+MpF5B0kuXwt2gg=="; }; }; "rfc-3986-1.0.1" = { @@ -58897,7 +58843,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/rfc-3986/-/rfc-3986-1.0.1.tgz"; - sha1 = "eeeb88342fadbe8027c0f36ada921a13e6f96206"; + sha512 = "4LMcbvBonVhsufIwa7Po+HhK0rznNyvQxIG/14/wTm7W88eFQy1jU+T7i5afaWOQ53czEJlaI3ua9pzZtqXE0w=="; }; }; "rfdc-1.3.0" = { @@ -58915,7 +58861,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/rgb-regex/-/rgb-regex-1.0.1.tgz"; - sha1 = "c0e0d6882df0e23be254a475e8edd41915feaeb1"; + sha512 = "gDK5mkALDFER2YLqH6imYvK6g02gpNGM4ILDZ472EwWfXZnC2ZEpoB2ECXTyOVUKuk/bPJZMzwQPBYICzP+D3w=="; }; }; "rgba-regex-1.0.0" = { @@ -58924,7 +58870,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/rgba-regex/-/rgba-regex-1.0.0.tgz"; - sha1 = "43374e2e2ca0968b0ef1523460b7d730ff22eeb3"; + sha512 = "zgn5OjNQXLUTdq8m17KdaicF6w89TZs8ZU8y0AYENIU6wG8GG6LLm0yLSiPY8DmaYmHdgRW8rnApjoT0fQRfMg=="; }; }; "rgbcolor-1.0.1" = { @@ -58933,7 +58879,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/rgbcolor/-/rgbcolor-1.0.1.tgz"; - sha1 = "d6505ecdb304a6595da26fa4b43307306775945d"; + sha512 = "9aZLIrhRaD97sgVhtJOW6ckOEh6/GnvQtdVNfdZ6s67+3/XwLS9lBcQYzEEhYVeUowN7pRzMLsyGhK2i/xvWbw=="; }; }; "right-align-0.1.3" = { @@ -58942,7 +58888,7 @@ let version = "0.1.3"; src = fetchurl { url = "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz"; - sha1 = "61339b722fe6a3515689210d24e14c96148613ef"; + sha512 = "yqINtL/G7vs2v+dFIZmFUDbnVyFUJFKd6gK22Kgo6R4jfJGFtisKyncWDDULgjfqf4ASQuIQyjJ7XZ+3aWpsAg=="; }; }; "right-pad-1.0.1" = { @@ -58951,7 +58897,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/right-pad/-/right-pad-1.0.1.tgz"; - sha1 = "8ca08c2cbb5b55e74dafa96bf7fd1a27d568c8d0"; + sha512 = "bYBjgxmkvTAfgIYy328fmkwhp39v8lwVgWhhrzxPV3yHtcSqyYKe9/XOhvW48UFjATg3VuJbpsp5822ACNvkmw=="; }; }; "rimraf-2.2.8" = { @@ -58960,7 +58906,7 @@ let version = "2.2.8"; src = fetchurl { url = "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"; - sha1 = "e439be2aaee327321952730f99a8929e4fc50582"; + sha512 = "R5KMKHnPAQaZMqLOsyuyUmcIjSeDm+73eoqQpaXA7AZ22BL+6C+1mcUscgOsNd8WVlJuvlgAPsegcx7pjlV0Dg=="; }; }; "rimraf-2.4.4" = { @@ -58969,7 +58915,7 @@ let version = "2.4.4"; src = fetchurl { url = "https://registry.npmjs.org/rimraf/-/rimraf-2.4.4.tgz"; - sha1 = "b528ce2ebe0e6d89fb03b265de11d61da0dbcf82"; + sha512 = "vM55sE6DOvNEHSEIQ7uCej02DKQYcGdnl1ToNfGy9t2jNrfNYcP5OwSkdeDXEpMtDqHEEFOORhvP0jA3/kBk1w=="; }; }; "rimraf-2.4.5" = { @@ -58978,7 +58924,7 @@ let version = "2.4.5"; src = fetchurl { url = "https://registry.npmjs.org/rimraf/-/rimraf-2.4.5.tgz"; - sha1 = "ee710ce5d93a8fdb856fb5ea8ff0e2d75934b2da"; + sha512 = "J5xnxTyqaiw06JjMftq7L9ouA448dw/E7dKghkP9WpKNuwmARNNg+Gk8/u5ryb9N/Yo2+z3MCwuqFK/+qPOPfQ=="; }; }; "rimraf-2.6.3" = { @@ -59041,7 +58987,7 @@ let version = "1.2.0"; src = fetchurl { url = "https://registry.npmjs.org/rndm/-/rndm-1.2.0.tgz"; - sha1 = "f33fe9cfb52bbfd520aa18323bc65db110a1b76c"; + sha512 = "fJhQQI5tLrQvYIYFpOnFinzv9dwmR7hRnUz1XqP3OJ1jIweTNOd6aTO4jwQSgcBSFUB+/KHJxuGneime+FdzOw=="; }; }; "rng-0.2.2" = { @@ -59050,7 +58996,7 @@ let version = "0.2.2"; src = fetchurl { url = "https://registry.npmjs.org/rng/-/rng-0.2.2.tgz"; - sha1 = "df43e80d9bc82ad4430bcfef03f49c717e8b2e8c"; + sha512 = "3F/A3swXdqb4JLpF22zwlCllyXlUWEE3T35GzJ+Vvtx4HnUYVAXovaK2TyUC04UlpxdVxB+E7HaKdDrGeOcJuA=="; }; }; "roarr-2.15.4" = { @@ -59095,7 +59041,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/root-check/-/root-check-1.0.0.tgz"; - sha1 = "c52a794bf0db9fad567536e41898f0c9e0a86697"; + sha512 = "lt1ts72QmU7jh1DlOJqFN/le/aiRGAbchSSMhNpLQubDWPEOe0YKCcrhprkgyMxxFAcrEhyfTTUfc+Dj/bo4JA=="; }; }; "round-to-6.0.0" = { @@ -59113,7 +59059,7 @@ let version = "0.6.2"; src = fetchurl { url = "https://registry.npmjs.org/router/-/router-0.6.2.tgz"; - sha1 = "6f04063a2d04eba3303a1bbc6765eef63037cf3d"; + sha512 = "tTMBCMVSP+sfSQyBbFrUuVPfxfKBhy6Hciz/SttYRxKteFqjPljrH2GqXoPSCOeubSgxPDRAbQOCvQzp2hNTOA=="; }; }; "router-1.3.7" = { @@ -59131,7 +59077,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/router-ips/-/router-ips-1.0.0.tgz"; - sha1 = "44e00858ebebc0133d58e40b2cd8a1fbb04203f5"; + sha512 = "yBo6F52Un/WYioXbedBGvrKIiofbwt+4cUhdqDb9fNMJBI4D4jOy7jlxxaRVEvICPKU7xMmJDtDFR6YswX/sFQ=="; }; }; "rss-parser-3.12.0" = { @@ -59176,7 +59122,7 @@ let version = "4.5.2"; src = fetchurl { url = "https://registry.npmjs.org/rttc/-/rttc-4.5.2.tgz"; - sha1 = "ba6a3e92898b4274f123bbac49485d7616a37cbc"; + sha512 = "6zLypmR2nKV20f9MHIsdR3+P8l7k4CxzKRn7nI/6Wlt5h4K8Gu64mXGTjaRAo/Cr8UVGRWdeFOtvpzixgA7SSA=="; }; }; "rttc-7.4.0" = { @@ -59185,7 +59131,7 @@ let version = "7.4.0"; src = fetchurl { url = "https://registry.npmjs.org/rttc/-/rttc-7.4.0.tgz"; - sha1 = "bc9cacd46add923deb62495a01934eb7ef619fb4"; + sha512 = "IcG+W2xwl+Ywsupu1ytLTtgnOz4PDOFJeTeSB2jG+xDTpBCFSf4tBGsS+VijwEJEXdJZ6+/3sYZuOv7KTX29Sw=="; }; }; "run-async-0.1.0" = { @@ -59194,7 +59140,7 @@ let version = "0.1.0"; src = fetchurl { url = "https://registry.npmjs.org/run-async/-/run-async-0.1.0.tgz"; - sha1 = "c8ad4a5e110661e402a7d21b530e009f25f8e389"; + sha512 = "qOX+w+IxFgpUpJfkv2oGN0+ExPs68F4sZHfaRRx4dDexAQkG83atugKVEylyT5ARees3HBbfmuvnjbrd8j9Wjw=="; }; }; "run-async-2.4.1" = { @@ -59239,7 +59185,7 @@ let version = "1.0.3"; src = fetchurl { url = "https://registry.npmjs.org/run-queue/-/run-queue-1.0.3.tgz"; - sha1 = "e848396f057d223f24386924618e25694161ec47"; + sha512 = "ntymy489o0/QQplUDnpYAYUsO50K9SBrIVaKCWDOJzYJts0f9WH9RFJkyagebkw5+y1oi00R7ynNW/d12GBumg=="; }; }; "run-series-1.1.9" = { @@ -59266,7 +59212,7 @@ let version = "0.1.4"; src = fetchurl { url = "https://registry.npmjs.org/rw/-/rw-0.1.4.tgz"; - sha1 = "4903cbd80248ae0ede685bf58fd236a7a9b29a3e"; + sha512 = "vSj3D96kMcjNyqPcp65wBRIDImGSrUuMxngNNxvw8MQaO+aQ6llzRPH7XcJy5zrpb3wU++045+Uz/IDIM684iw=="; }; }; "rw-1.3.3" = { @@ -59275,7 +59221,7 @@ let version = "1.3.3"; src = fetchurl { url = "https://registry.npmjs.org/rw/-/rw-1.3.3.tgz"; - sha1 = "3f862dfa91ab766b14885ef4d01124bfda074fb4"; + sha512 = "PdhdWy89SiZogBLaw42zdeqtRJ//zFd2PgQavcICDUgJT5oW10QCRKbJ6bg4r0/UY2M6BWd5tkxuGFRvCkgfHQ=="; }; }; "rwlock-5.0.0" = { @@ -59284,7 +59230,7 @@ let version = "5.0.0"; src = fetchurl { url = "https://registry.npmjs.org/rwlock/-/rwlock-5.0.0.tgz"; - sha1 = "888d6a77a3351cc1a209204ef2ee1722093836cf"; + sha512 = "XgzRqLMfCcm9QfZuPav9cV3Xin5TRcIlp4X/SH3CvB+x5D2AakdlEepfJKDd8ByncvfpcxNWdRZVUl38PS6ZJg=="; }; }; "rx-2.5.3" = { @@ -59293,7 +59239,7 @@ let version = "2.5.3"; src = fetchurl { url = "https://registry.npmjs.org/rx/-/rx-2.5.3.tgz"; - sha1 = "21adc7d80f02002af50dae97fd9dbf248755f566"; + sha512 = "u5qvfulb7NXoY/+OE28920WEgFi6aiDjf5iF9rA2f9tBXejLgTLd0WxkclvIQWjFFHfNJlb7pSTsrjgiDh+Uug=="; }; }; "rx-4.1.0" = { @@ -59302,7 +59248,7 @@ let version = "4.1.0"; src = fetchurl { url = "https://registry.npmjs.org/rx/-/rx-4.1.0.tgz"; - sha1 = "a5f13ff79ef3b740fe30aa803fb09f98805d4782"; + sha512 = "CiaiuN6gapkdl+cZUr67W6I8jquN4lkak3vtIsIWCl4XIPP8ffsoyN6/+PuGXnQy8Cu8W2y9Xxh31Rq4M6wUug=="; }; }; "rx-lite-3.1.2" = { @@ -59311,7 +59257,7 @@ let version = "3.1.2"; src = fetchurl { url = "https://registry.npmjs.org/rx-lite/-/rx-lite-3.1.2.tgz"; - sha1 = "19ce502ca572665f3b647b10939f97fd1615f102"; + sha512 = "1I1+G2gteLB8Tkt8YI1sJvSIfa0lWuRtC8GjvtyPBcLSF5jBCCJJqKrpER5JU5r6Bhe+i9/pK3VMuUcXu0kdwQ=="; }; }; "rx-lite-4.0.8" = { @@ -59320,7 +59266,7 @@ let version = "4.0.8"; src = fetchurl { url = "https://registry.npmjs.org/rx-lite/-/rx-lite-4.0.8.tgz"; - sha1 = "0b1e11af8bc44836f04a6407e92da42467b79444"; + sha512 = "Cun9QucwK6MIrp3mry/Y7hqD1oFqTYLQ4pGxaHTjIdaFDWRGGLikqp6u8LcWJnzpoALg9hap+JGk8sFIUuEGNA=="; }; }; "rx-lite-aggregates-4.0.8" = { @@ -59329,7 +59275,7 @@ let version = "4.0.8"; src = fetchurl { url = "https://registry.npmjs.org/rx-lite-aggregates/-/rx-lite-aggregates-4.0.8.tgz"; - sha1 = "753b87a89a11c95467c4ac1626c4efc4e05c67be"; + sha512 = "3xPNZGW93oCjiO7PtKxRK6iOVYBWBvtf9QHDfU23Oc+dLIQmAV//UnyXV/yihv81VS/UqoQPk4NegS8EFi55Hg=="; }; }; "rxjs-5.5.12" = { @@ -59365,7 +59311,7 @@ let version = "2.0.2"; src = fetchurl { url = "https://registry.npmjs.org/s3-stream-upload/-/s3-stream-upload-2.0.2.tgz"; - sha1 = "60342f12d4aa06ea8f389fb761a5393aedca017f"; + sha512 = "hSfGZ4InIUMH29niWCAkcDvmOGwADSy7j2Ktm6+nKI+ub6nPoLOboo1D+Q3mEIutTHu0J4+Sv92J0GOk5hAonQ=="; }; }; "s3signed-0.1.0" = { @@ -59374,7 +59320,7 @@ let version = "0.1.0"; src = fetchurl { url = "https://registry.npmjs.org/s3signed/-/s3signed-0.1.0.tgz"; - sha1 = "ae03b86259413215ed43e99285c8c347579735fb"; + sha512 = "08Jc0+GAaFjXgvl8qQytu6+wVBfcUUyCJDocj5kBUeq9YA+6mAM/6psDNxrg4PVkkLBvAK75mnjlaGckfOtDKA=="; }; }; "s3urls-1.5.2" = { @@ -59383,7 +59329,7 @@ let version = "1.5.2"; src = fetchurl { url = "https://registry.npmjs.org/s3urls/-/s3urls-1.5.2.tgz"; - sha1 = "182a991208fc1ab5214443eb250fc8f53b4bc9ea"; + sha512 = "3f4kprxnwAqoiVdR/XFoc997YEt0b6oY1VKrhl+kuWnHaUQ2cVe73TcQaww8geX5FKPuGBHl90xv70q7SlbBew=="; }; }; "sade-1.8.1" = { @@ -59401,7 +59347,7 @@ let version = "5.0.1"; src = fetchurl { url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz"; - sha1 = "d263ca54696cd8a306b5ca6551e92de57918fbe7"; + sha512 = "cr7dZWLwOeaFBLTIuZeYdkfO7UzGIKhjYENJFAxUOMKWGaWDm2nJM2rzxNRm5Owu0DH3ApwNo6kx5idXZfb/Iw=="; }; }; "safe-buffer-5.1.1" = { @@ -59455,7 +59401,7 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz"; - sha1 = "40a3669f3b077d1e943d44629e157dd48023bf2e"; + sha512 = "aJXcif4xnaNUzvUuC5gcb46oTS7zvg4jpMTnuqtrEPlR3vFr4pxtdTwaF1Qs3Enjn9HK+ZlwQui+a7z0SywIzg=="; }; }; "safe-stable-stringify-2.3.1" = { @@ -59482,7 +59428,7 @@ let version = "0.5.1"; src = fetchurl { url = "https://registry.npmjs.org/sander/-/sander-0.5.1.tgz"; - sha1 = "741e245e231f07cafb6fdf0f133adfa216a502ad"; + sha512 = "3lVqBir7WuKDHGrKRDn/1Ye3kwpXaDOMsiRP1wd6wpZW56gJhsbp5RqQpA6JG/P+pkXizygnr1dKR8vzWaVsfA=="; }; }; "sandwich-stream-2.0.2" = { @@ -59509,7 +59455,7 @@ let version = "0.1.0"; src = fetchurl { url = "https://registry.npmjs.org/sasl-anonymous/-/sasl-anonymous-0.1.0.tgz"; - sha1 = "f544c7e824df2a40d9ad4733829572cc8d9ed5a5"; + sha512 = "x+0sdsV0Gie2EexxAUsx6ZoB+X6OCthlNBvAQncQxreEWQJByAPntj0EAgTlJc2kZicoc+yFzeR6cl8VfsQGfA=="; }; }; "sasl-plain-0.1.0" = { @@ -59518,7 +59464,7 @@ let version = "0.1.0"; src = fetchurl { url = "https://registry.npmjs.org/sasl-plain/-/sasl-plain-0.1.0.tgz"; - sha1 = "cf145e7c02222b64d60c0806d9cd2ae5380426cc"; + sha512 = "X8mCSfR8y0NryTu0tuVyr4IS2jBunBgyG+3a0gEEkd0nlHGiyqJhlc4EIkzmSwaa7F8S4yo+LS6Cu5qxRkJrmg=="; }; }; "sasl-scram-sha-1-1.2.1" = { @@ -59527,7 +59473,7 @@ let version = "1.2.1"; src = fetchurl { url = "https://registry.npmjs.org/sasl-scram-sha-1/-/sasl-scram-sha-1-1.2.1.tgz"; - sha1 = "d88d51feaa0ff320d8eb1d6fc75657653f9dcd4b"; + sha512 = "o63gNo+EGsk1ML0bNeUAjRomIIcG7VaUyA+ffhd9MME5BjqVEpp42YkmBBZqzz1KmJG3YqpRLE4PfUe7FjexaA=="; }; }; "saslmechanisms-0.1.1" = { @@ -59536,7 +59482,7 @@ let version = "0.1.1"; src = fetchurl { url = "https://registry.npmjs.org/saslmechanisms/-/saslmechanisms-0.1.1.tgz"; - sha1 = "478be1429500fcfaa780be88b3343ced7d2a9182"; + sha512 = "pVlvK5ysevz8MzybRnDIa2YMxn0OJ7b9lDiWhMoaKPoJ7YkAg/7YtNjUgaYzElkwHxsw8dBMhaEn7UP6zxEwPg=="; }; }; "saslprep-1.0.3" = { @@ -59581,7 +59527,7 @@ let version = "0.5.8"; src = fetchurl { url = "https://registry.npmjs.org/sax/-/sax-0.5.8.tgz"; - sha1 = "d472db228eb331c2506b0e8c15524adb939d12c1"; + sha512 = "c0YL9VcSfcdH3F1Qij9qpYJFpKFKMXNOkLWFssBL3RuF7ZS8oZhllR2rWlCRjDTJsfq3R6wbSsaRU6o0rkEdNw=="; }; }; "sax-1.1.4" = { @@ -59590,7 +59536,7 @@ let version = "1.1.4"; src = fetchurl { url = "https://registry.npmjs.org/sax/-/sax-1.1.4.tgz"; - sha1 = "74b6d33c9ae1e001510f179a91168588f1aedaa9"; + sha512 = "5f3k2PbGGp+YtKJjOItpg3P99IMD84E4HOvcfleTb5joCHNXYLsR9yWFPOYGgaeMPDubQILTCMdsFb2OMeOjtg=="; }; }; "sax-1.2.1" = { @@ -59599,7 +59545,7 @@ let version = "1.2.1"; src = fetchurl { url = "https://registry.npmjs.org/sax/-/sax-1.2.1.tgz"; - sha1 = "7b8e656190b228e81a66aea748480d828cd2d37a"; + sha512 = "8I2a3LovHTOpm7NV5yOyO8IHqgVsfK4+UuySrXU8YXkSRX7k6hCV9b3HrkKCr3nMpgj+0bmocaJJWpvp1oc7ZA=="; }; }; "sax-1.2.4" = { @@ -63050,13 +62996,13 @@ let sha512 = "EeNzTVfj+1In7aSLPKDD03F/ly4RxEuF/EX0YcOG0cKoPXs+SLZxDawQbexQDBzwROs4VKLWTOaZQlZkGBFEIQ=="; }; }; - "stackframe-1.2.1" = { + "stackframe-1.3.4" = { name = "stackframe"; packageName = "stackframe"; - version = "1.2.1"; + version = "1.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/stackframe/-/stackframe-1.2.1.tgz"; - sha512 = "h88QkzREN/hy8eRdyNhhsO7RSJ5oyTqxxmmn0dzBIMUclZsjpfmrsg81vp8mjjAs2vAZ72nyWxRUwSwmh0e4xg=="; + url = "https://registry.npmjs.org/stackframe/-/stackframe-1.3.4.tgz"; + sha512 = "oeVtt7eWQS+Na6F//S4kJ2K2VbRlS9D43mAlMyVpVWovy9o+jfgH8O9agzANzaiLjclA0oYzUXEM4PurhSUChw=="; }; }; "stampit-1.2.0" = { @@ -64994,13 +64940,13 @@ let sha512 = "dJp4qg+x4JwSEW1HibAuMi0IIrBI3wuQr2GimmqB7OXR50wmwzfdusG+p39R9w3R6aFtZ2mzvxvWKQ3Bd/vx3g=="; }; }; - "sync-fetch-0.3.1" = { + "sync-fetch-0.4.1" = { name = "sync-fetch"; packageName = "sync-fetch"; - version = "0.3.1"; + version = "0.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/sync-fetch/-/sync-fetch-0.3.1.tgz"; - sha512 = "xj5qiCDap/03kpci5a+qc5wSJjc8ZSixgG2EUmH1B8Ea2sfWclQA7eH40hiHPCtkCn6MCk4Wb+dqcXdCy2PP3g=="; + url = "https://registry.npmjs.org/sync-fetch/-/sync-fetch-0.4.1.tgz"; + sha512 = "JDtyFEvnKUzt1CxRtzzsGgkBanEv8XRmLyJo0F0nGkpCR8EjYmpOJJXz8GA/SWtlPU0nAYh0+CNMNnFworGyOA=="; }; }; "syntax-error-1.4.0" = { @@ -67515,15 +67461,6 @@ let sha512 = "yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA=="; }; }; - "type-fest-2.12.0" = { - name = "type-fest"; - packageName = "type-fest"; - version = "2.12.0"; - src = fetchurl { - url = "https://registry.npmjs.org/type-fest/-/type-fest-2.12.0.tgz"; - sha512 = "Qe5GRT+n/4GoqCNGGVp5Snapg1Omq3V7irBJB3EaKsp7HWDo5Gv2d/67gfNyV+d5EXD+x/RF5l1h4yJ7qNkcGA=="; - }; - }; "type-fest-2.12.2" = { name = "type-fest"; packageName = "type-fest"; @@ -67857,13 +67794,13 @@ let sha512 = "FAGKF12fWdkpvNJZENacOH0e/83eG6JyVQyanIJaBXCN1J11TUQv1T1/z8S+Z0CG0ZPk1nPcreF/c7lrTd0TEQ=="; }; }; - "uglify-js-3.15.5" = { + "uglify-js-3.16.0" = { name = "uglify-js"; packageName = "uglify-js"; - version = "3.15.5"; + version = "3.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.15.5.tgz"; - sha512 = "hNM5q5GbBRB5xB+PMqVRcgYe4c8jbyZ1pzZhS6jbq54/4F2gFK869ZheiE5A8/t+W5jtTNpWef/5Q9zk639FNQ=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.16.0.tgz"; + sha512 = "FEikl6bR30n0T3amyBh3LoiBdqHRy/f4H80+My34HOesOKyHfOsxAPAxOoqC0JUnC1amnO0IwkYC3sko51caSw=="; }; }; "uglify-js-3.4.10" = { @@ -73573,13 +73510,13 @@ let sha1 = "f164263325ae671f53836fb210c7ddbcfda46598"; }; }; - "xss-1.0.12" = { + "xss-1.0.13" = { name = "xss"; packageName = "xss"; - version = "1.0.12"; + version = "1.0.13"; src = fetchurl { - url = "https://registry.npmjs.org/xss/-/xss-1.0.12.tgz"; - sha512 = "8pXgz5BUUfKMrb81tmcbvLNA97ab4d6HdoBHYF5XYHa8oarc2s64hF+oqI4FhBHVBWvEM1wHGy+vqt8kZhCaNw=="; + url = "https://registry.npmjs.org/xss/-/xss-1.0.13.tgz"; + sha512 = "clu7dxTm1e8Mo5fz3n/oW3UCXBfV89xZ72jM8yzo1vR/pIS0w3sgB3XV2H8Vm6zfGnHL0FzvLJPJEBhd86/z4Q=="; }; }; "xstream-11.14.0" = { @@ -74957,7 +74894,7 @@ in sources."to-regex-range-5.0.1" sources."to-through-2.0.0" sources."type-fest-1.4.0" - sources."uglify-js-3.15.5" + sources."uglify-js-3.16.0" sources."unc-path-regex-0.1.2" sources."unique-stream-2.3.1" sources."unxhr-1.0.1" @@ -75014,22 +74951,22 @@ in sources."vscode-uri-2.1.2" ]; }) - (sources."@vue/compiler-core-3.2.36" // { + (sources."@vue/compiler-core-3.2.37" // { dependencies = [ sources."source-map-0.6.1" ]; }) - sources."@vue/compiler-dom-3.2.36" - (sources."@vue/compiler-sfc-3.2.36" // { + sources."@vue/compiler-dom-3.2.37" + (sources."@vue/compiler-sfc-3.2.37" // { dependencies = [ sources."source-map-0.6.1" ]; }) - sources."@vue/compiler-ssr-3.2.36" - sources."@vue/reactivity-3.2.36" - sources."@vue/reactivity-transform-3.2.36" - sources."@vue/runtime-core-3.2.36" - sources."@vue/shared-3.2.36" + sources."@vue/compiler-ssr-3.2.37" + sources."@vue/reactivity-3.2.37" + sources."@vue/reactivity-transform-3.2.37" + sources."@vue/runtime-core-3.2.37" + sources."@vue/shared-3.2.37" sources."dedent-js-1.0.1" sources."emmet-2.3.6" sources."estree-walker-2.0.2" @@ -75261,7 +75198,7 @@ in sources."proper-lockfile-4.1.2" sources."psl-1.8.0" sources."punycode-2.1.1" - sources."qs-6.10.3" + sources."qs-6.10.5" (sources."raw-body-2.5.1" // { dependencies = [ sources."depd-2.0.0" @@ -75804,7 +75741,7 @@ in sources."picomatch-2.3.1" sources."prepend-http-3.0.1" sources."pump-3.0.0" - sources."qs-6.10.3" + sources."qs-6.10.5" sources."querystringify-2.2.0" sources."quick-lru-5.1.1" (sources."read-pkg-6.0.0" // { @@ -77104,7 +77041,7 @@ in sources."tweetnacl-0.14.5" sources."type-check-0.3.2" sources."uc.micro-1.0.6" - sources."uglify-js-3.15.5" + sources."uglify-js-3.16.0" sources."underscore-1.13.4" sources."union-value-1.0.1" (sources."universal-url-2.0.0" // { @@ -77366,11 +77303,11 @@ in sources."bl-4.1.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."browserslist-4.20.3" + sources."browserslist-4.20.4" sources."buffer-5.7.1" sources."buffer-from-1.1.2" sources."callsites-3.1.0" - sources."caniuse-lite-1.0.30001346" + sources."caniuse-lite-1.0.30001349" sources."chalk-3.0.0" sources."chardet-0.7.0" sources."chokidar-3.5.3" @@ -77388,7 +77325,7 @@ in sources."cross-spawn-7.0.3" sources."deepmerge-4.2.2" sources."defaults-1.0.3" - sources."electron-to-chromium-1.4.146" + sources."electron-to-chromium-1.4.147" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."enhanced-resolve-5.9.3" @@ -77768,7 +77705,7 @@ in sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."aws-sdk-2.1148.0" // { + (sources."aws-sdk-2.1149.0" // { dependencies = [ sources."uuid-8.0.0" ]; @@ -77861,7 +77798,7 @@ in sources."graceful-fs-4.2.10" (sources."grant-4.7.0" // { dependencies = [ - sources."qs-6.10.3" + sources."qs-6.10.5" ]; }) sources."har-schema-2.0.0" @@ -78264,9 +78201,9 @@ in }) sources."@vue/cli-ui-addon-webpack-5.0.4" sources."@vue/cli-ui-addon-widgets-5.0.4" - sources."@vue/compiler-core-3.2.36" - sources."@vue/compiler-dom-3.2.36" - sources."@vue/shared-3.2.36" + sources."@vue/compiler-core-3.2.37" + sources."@vue/compiler-dom-3.2.37" + sources."@vue/shared-3.2.37" (sources."@wry/equality-0.1.11" // { dependencies = [ sources."tslib-1.14.1" @@ -78357,7 +78294,7 @@ in }) sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."browserslist-4.20.3" + sources."browserslist-4.20.4" sources."buffer-5.7.1" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" @@ -78376,7 +78313,7 @@ in }) sources."call-bind-1.0.2" sources."camelcase-6.3.0" - sources."caniuse-lite-1.0.30001346" + sources."caniuse-lite-1.0.30001349" sources."caw-2.0.1" sources."chalk-4.1.2" sources."chardet-0.7.0" @@ -78497,7 +78434,7 @@ in sources."easy-stack-1.0.1" sources."ee-first-1.1.1" sources."ejs-3.1.8" - sources."electron-to-chromium-1.4.146" + sources."electron-to-chromium-1.4.147" sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" @@ -78741,7 +78678,7 @@ in sources."iterall-1.3.0" (sources."jake-10.8.5" // { dependencies = [ - sources."async-3.2.3" + sources."async-3.2.4" ]; }) sources."javascript-stringify-2.1.0" @@ -79189,7 +79126,7 @@ in sources."ws-7.5.8" sources."xml2js-0.4.23" sources."xmlbuilder-11.0.1" - (sources."xss-1.0.12" // { + (sources."xss-1.0.13" // { dependencies = [ sources."commander-2.20.3" ]; @@ -79943,11 +79880,11 @@ in sources."JSV-4.0.2" sources."ansi-styles-3.2.1" sources."array-unique-0.3.2" - sources."async-3.2.3" + sources."async-3.2.4" sources."balanced-match-1.0.2" sources."brace-expansion-2.0.1" - sources."browserslist-4.20.3" - sources."caniuse-lite-1.0.30001346" + sources."browserslist-4.20.4" + sources."caniuse-lite-1.0.30001349" sources."chalk-2.4.2" sources."color-convert-1.9.3" sources."color-name-1.1.3" @@ -79957,7 +79894,7 @@ in sources."convert-source-map-1.8.0" sources."debug-4.3.4" sources."ejs-3.1.6" - sources."electron-to-chromium-1.4.146" + sources."electron-to-chromium-1.4.147" sources."ensure-posix-path-1.1.1" sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" @@ -80342,9 +80279,9 @@ in sha512 = "ypHju4Y2Oav95SipEcCcI5J7CGPuvz8oat7sUtYj3ClK44bldfvtvcxK6IEK++7rqB7YchDGzweZIBG+SD0ZAA=="; }; dependencies = [ - sources."browserslist-4.20.3" - sources."caniuse-lite-1.0.30001346" - sources."electron-to-chromium-1.4.146" + sources."browserslist-4.20.4" + sources."caniuse-lite-1.0.30001349" + sources."electron-to-chromium-1.4.147" sources."escalade-3.1.1" sources."fraction.js-4.2.0" sources."node-releases-2.0.5" @@ -80379,7 +80316,7 @@ in sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" sources."ast-types-0.13.4" - (sources."aws-sdk-2.1148.0" // { + (sources."aws-sdk-2.1149.0" // { dependencies = [ sources."uuid-8.0.0" ]; @@ -80999,10 +80936,10 @@ in balanceofsatoshis = nodeEnv.buildNodePackage { name = "balanceofsatoshis"; packageName = "balanceofsatoshis"; - version = "12.10.0"; + version = "12.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-12.10.0.tgz"; - sha512 = "pJeuMYSv09VEXOfHmF7/B8kWXdVkUAnN8hoyzGJFbpchiopyvahKYHwdgav4RzSQ1CzuhnDC1LGMtwCOXekctA=="; + url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-12.11.0.tgz"; + sha512 = "ajrj5cYPvL1MAEwFi7i3PQA3eYwJ/Pyr74P/xoQELHPgTz6hq+HY3KWGJMc8A6UF10QsgySW/nMAeAkJcb5/5w=="; }; dependencies = [ (sources."@alexbosworth/caporal-1.4.4" // { @@ -81149,7 +81086,7 @@ in sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."color-string-1.9.1" - sources."colorette-2.0.16" + sources."colorette-2.0.17" sources."colors-1.4.0" sources."colorspace-1.1.4" sources."combined-stream-1.0.8" @@ -81357,6 +81294,7 @@ in sources."@types/node-17.0.33" sources."bn.js-5.2.0" sources."bolt07-1.8.1" + sources."colorette-2.0.16" (sources."lightning-5.16.0" // { dependencies = [ sources."psbt-2.0.1" @@ -81372,156 +81310,7 @@ in sources."ws-8.6.0" ]; }) - (sources."ln-telegram-3.21.5" // { - dependencies = [ - sources."@grpc/grpc-js-1.6.4" - sources."@grpc/proto-loader-0.6.9" - sources."@types/node-17.0.23" - sources."@types/ws-8.5.2" - sources."bn.js-5.2.0" - sources."body-parser-1.19.2" - sources."bolt01-1.2.4" - sources."bolt07-1.8.1" - sources."bolt09-0.2.2" - sources."cookie-0.4.2" - (sources."debug-4.3.4" // { - dependencies = [ - sources."ms-2.1.2" - ]; - }) - sources."depd-1.1.2" - sources."destroy-1.0.4" - sources."express-4.17.3" - sources."finalhandler-1.1.2" - (sources."goldengate-11.2.1" // { - dependencies = [ - sources."ln-service-53.11.0" - ]; - }) - sources."grammy-1.8.2" - sources."http-errors-1.8.1" - sources."invoices-2.0.5" - (sources."lightning-5.10.1" // { - dependencies = [ - sources."@grpc/grpc-js-1.6.2" - sources."body-parser-1.20.0" - sources."bolt09-0.2.3" - sources."depd-2.0.0" - sources."destroy-1.2.0" - sources."http-errors-2.0.0" - sources."on-finished-2.4.1" - sources."qs-6.10.3" - sources."raw-body-2.5.1" - sources."statuses-2.0.1" - ]; - }) - (sources."ln-accounting-5.0.6" // { - dependencies = [ - sources."@grpc/grpc-js-1.5.7" - sources."@types/node-17.0.21" - sources."bolt07-1.8.0" - sources."bolt09-0.2.1" - (sources."goldengate-11.1.0" // { - dependencies = [ - sources."asyncjs-util-1.2.8" - sources."ln-service-53.9.3" - ]; - }) - sources."invoices-2.0.4" - (sources."lightning-5.8.2" // { - dependencies = [ - sources."asyncjs-util-1.2.8" - sources."bolt09-0.2.2" - sources."tiny-secp256k1-2.2.1" - ]; - }) - (sources."ln-service-53.10.0" // { - dependencies = [ - sources."@grpc/grpc-js-1.6.1" - sources."@types/node-17.0.23" - sources."@types/ws-8.5.3" - sources."asyncjs-util-1.2.8" - sources."bolt09-0.2.2" - sources."lightning-5.9.0" - sources."tiny-secp256k1-2.2.1" - sources."type-fest-2.12.2" - ]; - }) - sources."psbt-2.0.0" - sources."type-fest-2.12.0" - sources."uint8array-tools-0.0.7" - ]; - }) - (sources."ln-service-53.15.0" // { - dependencies = [ - sources."@grpc/grpc-js-1.6.7" - sources."@types/node-17.0.25" - sources."@types/ws-8.5.3" - sources."body-parser-1.20.0" - sources."bolt09-0.2.3" - sources."debug-2.6.9" - sources."depd-2.0.0" - sources."destroy-1.2.0" - sources."http-errors-2.0.0" - sources."invoices-2.0.6" - sources."lightning-5.14.0" - sources."ms-2.0.0" - sources."on-finished-2.4.1" - sources."qs-6.10.3" - sources."raw-body-2.5.1" - sources."statuses-2.0.1" - sources."tiny-secp256k1-2.2.1" - sources."uint8array-tools-0.0.7" - ]; - }) - (sources."ln-sync-3.12.0" // { - dependencies = [ - sources."@grpc/grpc-js-1.6.1" - sources."@types/ws-8.5.3" - sources."bolt09-0.2.1" - (sources."invoices-2.0.4" // { - dependencies = [ - sources."bolt07-1.8.0" - sources."tiny-secp256k1-2.2.0" - ]; - }) - (sources."lightning-5.9.0" // { - dependencies = [ - sources."asyncjs-util-1.2.8" - sources."bolt07-1.8.0" - sources."bolt09-0.2.2" - sources."psbt-2.0.0" - ]; - }) - (sources."ln-service-53.10.0" // { - dependencies = [ - sources."bolt07-1.8.0" - ]; - }) - sources."tiny-secp256k1-2.2.1" - sources."uint8array-tools-0.0.7" - ]; - }) - sources."ms-2.1.3" - sources."on-finished-2.3.0" - (sources."p2tr-1.3.0" // { - dependencies = [ - sources."tiny-secp256k1-2.2.1" - sources."uint8array-tools-0.0.7" - ]; - }) - sources."psbt-2.0.1" - sources."qs-6.9.7" - sources."raw-body-2.4.3" - sources."safe-buffer-5.2.1" - sources."send-0.17.2" - sources."serve-static-1.14.2" - sources."statuses-1.5.0" - sources."tiny-secp256k1-2.2.0" - sources."type-fest-2.12.2" - sources."ws-8.5.0" - ]; - }) + sources."ln-telegram-3.22.1" sources."lodash-4.17.21" sources."lodash.camelcase-4.3.0" sources."lodash.difference-4.5.0" @@ -81548,7 +81337,7 @@ in sources."long-4.0.0" sources."lowercase-keys-1.0.1" sources."lru-cache-6.0.0" - sources."luxon-2.3.2" + sources."luxon-2.4.0" sources."macaroon-3.0.4" (sources."make-dir-3.1.0" // { dependencies = [ @@ -81619,6 +81408,7 @@ in sources."bolt01-1.2.4" sources."bolt07-1.8.1" sources."bolt09-0.2.2" + sources."colorette-2.0.16" sources."cookie-0.4.2" sources."depd-1.1.2" sources."destroy-1.0.4" @@ -82626,7 +82416,7 @@ in sources."asn1-0.2.6" sources."assert-never-1.2.1" sources."assert-plus-1.0.0" - sources."async-3.2.3" + sources."async-3.2.4" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" sources."aws4-1.11.0" @@ -84079,10 +83869,10 @@ in cdk8s-cli = nodeEnv.buildNodePackage { name = "cdk8s-cli"; packageName = "cdk8s-cli"; - version = "2.0.11"; + version = "2.0.13"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-2.0.11.tgz"; - sha512 = "mZKk7BqqEJXbls3+hqwx93c/31E+mSV4B7lc9PP2KdbmdRt2Qfgql3Q/AKIqrnMXMXpQkEh4tM0HqxMjA/Jeqw=="; + url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-2.0.13.tgz"; + sha512 = "bupth/QUGwryG8KIjgBb8catXS8OcgzUj6tZPJ+OGC4rppGLZOfkiyW0+rQsQ5BRGos8SZi9iGiFltSZVSM9PA=="; }; dependencies = [ sources."@jsii/check-node-1.59.0" @@ -84101,8 +83891,8 @@ in sources."call-bind-1.0.2" sources."camelcase-6.3.0" sources."case-1.6.3" - sources."cdk8s-2.3.17" - sources."cdk8s-plus-22-2.0.0-rc.7" + sources."cdk8s-2.3.19" + sources."cdk8s-plus-22-2.0.0-rc.11" sources."chalk-4.1.2" sources."cliui-7.0.4" sources."clone-2.1.2" @@ -84115,7 +83905,7 @@ in sources."color-name-1.1.4" sources."colors-1.4.0" sources."commonmark-0.30.0" - sources."constructs-10.1.27" + sources."constructs-10.1.31" sources."date-format-4.0.11" sources."debug-4.3.4" sources."decamelize-5.0.1" @@ -84205,14 +83995,14 @@ in sources."yargs-16.2.0" ]; }) - (sources."jsii-srcmak-0.1.581" // { + (sources."jsii-srcmak-0.1.583" // { dependencies = [ sources."fs-extra-9.1.0" ]; }) sources."json-schema-0.4.0" sources."json-schema-traverse-1.0.0" - sources."json2jsii-0.3.31" + sources."json2jsii-0.3.33" sources."jsonfile-6.1.0" sources."jsonschema-1.4.1" sources."locate-path-5.0.0" @@ -84389,7 +84179,7 @@ in sources."combined-stream-1.0.8" sources."commonmark-0.30.0" sources."concat-map-0.0.1" - sources."constructs-10.1.27" + sources."constructs-10.1.31" sources."cookie-0.4.2" sources."cross-spawn-7.0.3" sources."date-format-4.0.11" @@ -84537,7 +84327,7 @@ in sources."yargs-parser-20.2.9" ]; }) - (sources."jsii-srcmak-0.1.581" // { + (sources."jsii-srcmak-0.1.583" // { dependencies = [ sources."fs-extra-9.1.0" sources."jsonfile-6.1.0" @@ -84946,10 +84736,10 @@ in coc-diagnostic = nodeEnv.buildNodePackage { name = "coc-diagnostic"; packageName = "coc-diagnostic"; - version = "0.23.3"; + version = "0.23.4"; src = fetchurl { - url = "https://registry.npmjs.org/coc-diagnostic/-/coc-diagnostic-0.23.3.tgz"; - sha512 = "IJ6Z7wmyhufVD69rzc0NI4g4OH7fw88bJhfhZCeqTikk50IKBfd7D3hikuF8hbilu0M+67Z2RlZkaFFUgrnLhQ=="; + url = "https://registry.npmjs.org/coc-diagnostic/-/coc-diagnostic-0.23.4.tgz"; + sha512 = "XaA+RgnSMLmGpJnXLGWZCH5sONP80uYLpzNlwObMvs0AOuN3vXsu7qTE90qc5Jt/S6RIkF+u/XGDVb/z51E12g=="; }; buildInputs = globalBuildInputs; meta = { @@ -85771,11 +85561,11 @@ in ]; }) sources."braces-3.0.2" - sources."browserslist-4.20.3" + sources."browserslist-4.20.4" sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001346" + sources."caniuse-lite-1.0.30001349" (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -85812,7 +85602,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.4.146" + sources."electron-to-chromium-1.4.147" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -86812,7 +86602,7 @@ in dependencies = [ sources."@colors/colors-1.5.0" sources."@dabh/diagnostics-2.0.3" - sources."async-3.2.3" + sources."async-3.2.4" sources."bintrees-1.0.2" sources."color-3.2.1" sources."color-convert-1.9.3" @@ -87054,7 +86844,7 @@ in sources."through2-4.0.2" sources."trim-newlines-3.0.1" sources."type-fest-0.18.1" - sources."uglify-js-3.15.5" + sources."uglify-js-3.16.0" sources."util-deprecate-1.0.2" sources."uuid-3.4.0" sources."validate-npm-package-license-3.0.4" @@ -87944,7 +87734,7 @@ in sources."performance-now-2.1.0" sources."process-nextick-args-2.0.1" sources."pseudomap-1.0.2" - sources."qs-6.10.3" + sources."qs-6.10.5" sources."quicktask-1.1.0" sources."raf-3.3.2" sources."readable-stream-2.3.7" @@ -88958,7 +88748,7 @@ in "deltachat-desktop-../../applications/networking/instant-messengers/deltachat-desktop" = nodeEnv.buildNodePackage { name = "deltachat-desktop"; packageName = "deltachat-desktop"; - version = "1.30.0"; + version = "1.30.1"; src = ../../applications/networking/instant-messengers/deltachat-desktop; dependencies = [ sources."@ampproject/remapping-2.2.0" @@ -89151,7 +88941,7 @@ in sources."extend-shallow-2.0.1" ]; }) - sources."browserslist-4.20.3" + sources."browserslist-4.20.4" sources."buffer-crc32-0.2.13" sources."buffer-from-1.1.2" sources."cache-base-1.0.1" @@ -89163,7 +88953,7 @@ in }) sources."call-bind-1.0.2" sources."camel-case-4.1.2" - sources."caniuse-lite-1.0.30001346" + sources."caniuse-lite-1.0.30001349" sources."capital-case-1.0.4" sources."chalk-2.4.2" sources."change-case-4.1.2" @@ -89191,20 +88981,10 @@ in sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."component-emitter-1.3.0" - (sources."concat-stream-1.6.2" // { - dependencies = [ - sources."readable-stream-2.3.7" - sources."safe-buffer-5.1.2" - sources."string_decoder-1.1.1" - ]; - }) + sources."concat-stream-1.6.2" sources."config-chain-1.1.13" sources."constant-case-3.0.4" - (sources."convert-source-map-1.8.0" // { - dependencies = [ - sources."safe-buffer-5.1.2" - ]; - }) + sources."convert-source-map-1.8.0" sources."copy-descriptor-0.1.1" (sources."core-js-compat-3.22.8" // { dependencies = [ @@ -89223,7 +89003,7 @@ in sources."defer-to-connect-1.1.3" sources."define-properties-1.1.4" sources."define-property-2.0.2" - sources."deltachat-node-1.84.0" + sources."deltachat-node-1.86.0" sources."detect-node-2.1.0" sources."dom-helpers-5.2.1" sources."dom4-2.1.6" @@ -89235,14 +89015,14 @@ in sources."@types/node-16.11.38" ]; }) - sources."electron-to-chromium-1.4.146" + sources."electron-to-chromium-1.4.147" sources."emoji-js-clean-4.0.0" sources."emoji-mart-3.0.1" sources."emoji-regex-9.2.2" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" sources."env-paths-2.2.1" - sources."error-stack-parser-2.0.7" + sources."error-stack-parser-2.1.4" sources."es6-error-4.1.1" sources."esbuild-0.12.29" sources."escalade-3.1.1" @@ -89481,14 +89261,8 @@ in sources."react-window-1.8.7" sources."react-window-infinite-loader-1.0.7" sources."react-zoom-pan-pinch-2.1.3" - sources."readable-stream-3.6.0" - (sources."readdirp-2.2.1" // { - dependencies = [ - sources."readable-stream-2.3.7" - sources."safe-buffer-5.1.2" - sources."string_decoder-1.1.1" - ]; - }) + sources."readable-stream-2.3.7" + sources."readdirp-2.2.1" sources."regenerate-1.4.2" sources."regenerate-unicode-properties-10.0.1" sources."regenerator-runtime-0.13.9" @@ -89514,7 +89288,7 @@ in sources."roarr-2.15.4" sources."rtcpeerconnection-shim-1.2.15" sources."rw-0.1.4" - sources."safe-buffer-5.2.1" + sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" (sources."sass-1.52.2" // { dependencies = [ @@ -89581,9 +89355,8 @@ in sources."source-map-support-0.5.21" sources."source-map-url-0.4.1" sources."split-string-3.1.0" - sources."split2-3.2.2" sources."sprintf-js-1.1.2" - sources."stackframe-1.2.1" + sources."stackframe-1.3.4" (sources."static-extend-0.1.2" // { dependencies = [ sources."define-property-0.2.5" @@ -89602,7 +89375,7 @@ in ]; }) sources."stream-exhaust-1.0.2" - sources."string_decoder-1.3.0" + sources."string_decoder-1.1.1" sources."strip-json-comments-2.0.1" sources."sumchecker-3.0.1" sources."supercluster-7.1.5" @@ -90643,13 +90416,13 @@ in sources."auto-bind-4.0.0" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" - sources."browserslist-4.20.3" + sources."browserslist-4.20.4" sources."caller-callsite-4.1.0" sources."caller-path-3.0.1" sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001346" + sources."caniuse-lite-1.0.30001349" sources."chalk-2.4.2" sources."ci-info-2.0.0" sources."cli-boxes-2.2.1" @@ -90678,7 +90451,7 @@ in ]; }) sources."dot-prop-5.3.0" - sources."electron-to-chromium-1.4.146" + sources."electron-to-chromium-1.4.147" sources."emoji-regex-8.0.0" sources."emojilib-2.4.0" sources."end-of-stream-1.4.4" @@ -90943,17 +90716,17 @@ in }) sources."@fluentui/date-time-utilities-8.5.1" sources."@fluentui/dom-utilities-2.2.1" - sources."@fluentui/font-icons-mdl2-8.4.0" - sources."@fluentui/foundation-legacy-8.2.7" + sources."@fluentui/font-icons-mdl2-8.4.1" + sources."@fluentui/foundation-legacy-8.2.8" sources."@fluentui/keyboard-key-0.4.1" sources."@fluentui/merge-styles-8.5.2" - sources."@fluentui/react-8.72.1" - sources."@fluentui/react-focus-8.6.0" + sources."@fluentui/react-8.72.2" + sources."@fluentui/react-focus-8.6.1" sources."@fluentui/react-hooks-8.5.5" sources."@fluentui/react-portal-compat-context-9.0.0-rc.2" sources."@fluentui/react-window-provider-2.2.1" sources."@fluentui/set-version-8.2.1" - sources."@fluentui/style-utilities-8.6.7" + sources."@fluentui/style-utilities-8.7.0" sources."@fluentui/theme-2.6.6" sources."@fluentui/utilities-8.8.3" (sources."@gulp-sourcemaps/identity-map-2.0.1" // { @@ -90977,7 +90750,7 @@ in ]; }) sources."@humanwhocodes/object-schema-1.2.1" - sources."@microsoft/load-themed-styles-1.10.267" + sources."@microsoft/load-themed-styles-1.10.268" sources."@node-rs/crc32-1.5.1" sources."@node-rs/crc32-android-arm-eabi-1.5.1" sources."@node-rs/crc32-android-arm64-1.5.1" @@ -91903,7 +91676,7 @@ in ]; }) sources."mkdirp-1.0.4" - sources."mongodb-4.6.0" + sources."mongodb-4.7.0" sources."mongodb-connection-string-url-2.5.2" (sources."morgan-1.10.0" // { dependencies = [ @@ -92849,7 +92622,7 @@ in ]; }) sources."browserify-zlib-0.2.0" - sources."browserslist-4.20.3" + sources."browserslist-4.20.4" sources."buffer-4.9.2" sources."buffer-from-1.1.2" sources."buffer-indexof-1.1.1" @@ -92891,7 +92664,7 @@ in sources."camel-case-3.0.0" sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001346" + sources."caniuse-lite-1.0.30001349" sources."case-sensitive-paths-webpack-plugin-2.4.0" sources."caseless-0.12.0" sources."chalk-2.4.2" @@ -93132,7 +92905,7 @@ in sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.4.146" + sources."electron-to-chromium-1.4.147" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -93157,7 +92930,7 @@ in sources."entities-2.2.0" sources."errno-0.1.8" sources."error-ex-1.3.2" - sources."error-stack-parser-2.0.7" + sources."error-stack-parser-2.1.4" sources."es-abstract-1.20.1" sources."es-array-method-boxes-properly-1.0.0" sources."es-to-primitive-1.2.1" @@ -94105,7 +93878,7 @@ in sources."sshpk-1.17.0" sources."ssri-6.0.2" sources."stable-0.1.8" - sources."stackframe-1.2.1" + sources."stackframe-1.3.4" (sources."static-extend-0.1.2" // { dependencies = [ sources."define-property-0.2.5" @@ -95017,7 +94790,7 @@ in ]; }) sources."browserify-zlib-0.2.0" - (sources."browserslist-4.20.3" // { + (sources."browserslist-4.20.4" // { dependencies = [ sources."picocolors-1.0.0" ]; @@ -95050,7 +94823,7 @@ in }) sources."camelcase-6.3.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001346" + sources."caniuse-lite-1.0.30001349" (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -95309,7 +95082,7 @@ in sources."duplexer3-0.1.4" sources."duplexify-3.7.1" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.146" + sources."electron-to-chromium-1.4.147" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -96868,7 +96641,7 @@ in sources."base64-js-1.5.1" sources."bl-4.1.0" sources."brace-expansion-1.1.11" - sources."browserslist-4.20.3" + sources."browserslist-4.20.4" sources."buffer-5.7.1" sources."buffer-crc32-0.2.13" sources."caller-callsite-4.1.0" @@ -96876,7 +96649,7 @@ in sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001346" + sources."caniuse-lite-1.0.30001349" sources."chalk-2.4.2" sources."chownr-1.1.4" sources."ci-info-2.0.0" @@ -96901,7 +96674,7 @@ in }) sources."delay-5.0.0" sources."devtools-protocol-0.0.981744" - sources."electron-to-chromium-1.4.146" + sources."electron-to-chromium-1.4.147" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."error-ex-1.3.2" @@ -97511,7 +97284,7 @@ in ]; }) sources."@opentelemetry/api-1.1.0" - sources."@opentelemetry/semantic-conventions-1.3.0" + sources."@opentelemetry/semantic-conventions-1.3.1" sources."@protobufjs/aspromise-1.1.2" sources."@protobufjs/base64-1.1.2" sources."@protobufjs/codegen-2.0.4" @@ -97571,7 +97344,7 @@ in sources."asn1-0.2.6" sources."assert-plus-1.0.0" sources."ast-types-0.13.4" - sources."async-3.2.3" + sources."async-3.2.4" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" sources."aws4-1.11.0" @@ -99259,7 +99032,7 @@ in sources."which-typed-array-1.1.8" (sources."winston-3.7.2" // { dependencies = [ - sources."async-3.2.3" + sources."async-3.2.4" sources."readable-stream-3.6.0" ]; }) @@ -99367,10 +99140,10 @@ in gatsby-cli = nodeEnv.buildNodePackage { name = "gatsby-cli"; packageName = "gatsby-cli"; - version = "4.15.1"; + version = "4.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/gatsby-cli/-/gatsby-cli-4.15.1.tgz"; - sha512 = "PlwcfOYVpG1/YsctnY8M2sNt1wNR46AQD0SKg/lTMdjB/EhBp4jNQNYTEp5eZihOu7Ap98/igM+RMrAUFttj5g=="; + url = "https://registry.npmjs.org/gatsby-cli/-/gatsby-cli-4.16.0.tgz"; + sha512 = "VBQK46y5ZFKNQT4rCH134Du//y2hrxf7NXPB4WN+WzzplwtSo6wmU7cG1rPZWVNDCwZcJ1fpJCVIgKA62zAivw=="; }; dependencies = [ sources."@ampproject/remapping-2.2.0" @@ -99466,7 +99239,7 @@ in sources."boolbase-1.0.0" sources."boxen-5.1.2" sources."brace-expansion-1.1.11" - sources."browserslist-4.20.3" + sources."browserslist-4.20.4" sources."cacheable-lookup-5.0.4" (sources."cacheable-request-7.0.2" // { dependencies = [ @@ -99475,7 +99248,7 @@ in }) sources."call-bind-1.0.2" sources."camelcase-6.3.0" - sources."caniuse-lite-1.0.30001346" + sources."caniuse-lite-1.0.30001349" (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -99513,7 +99286,7 @@ in sources."configstore-5.0.1" sources."convert-hrtime-3.0.0" sources."convert-source-map-1.8.0" - sources."create-gatsby-2.15.1" + sources."create-gatsby-2.16.0" (sources."cross-spawn-6.0.5" // { dependencies = [ sources."semver-5.7.1" @@ -99540,7 +99313,7 @@ in sources."domutils-2.8.0" sources."dot-prop-5.3.0" sources."duplexer3-0.1.4" - sources."electron-to-chromium-1.4.146" + sources."electron-to-chromium-1.4.147" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."entities-2.2.0" @@ -99575,8 +99348,8 @@ in sources."fs-extra-10.1.0" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" - sources."gatsby-core-utils-3.15.0" - (sources."gatsby-telemetry-3.15.0" // { + sources."gatsby-core-utils-3.16.0" + (sources."gatsby-telemetry-3.16.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."boxen-4.2.0" @@ -99720,7 +99493,7 @@ in sources."semver-6.3.0" ]; }) - sources."parse-path-4.0.3" + sources."parse-path-4.0.4" sources."parse-url-6.0.0" sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" @@ -99735,7 +99508,7 @@ in sources."protocols-1.4.8" sources."pump-3.0.0" sources."pupa-2.1.1" - sources."qs-6.10.3" + sources."qs-6.10.5" sources."query-string-6.14.1" sources."quick-lru-5.1.1" (sources."rc-1.2.8" // { @@ -99781,7 +99554,6 @@ in sources."side-channel-1.0.4" sources."signal-exit-3.0.7" sources."sisteransi-1.0.5" - sources."source-map-0.7.3" sources."split-on-first-1.1.0" sources."stack-trace-0.0.10" sources."strict-uri-encode-2.0.0" @@ -100403,7 +100175,7 @@ in }) sources."p-cancelable-2.1.1" sources."pump-3.0.0" - sources."qs-6.10.3" + sources."qs-6.10.5" sources."query-string-7.1.1" sources."quick-lru-5.1.1" sources."readable-stream-3.6.0" @@ -100437,10 +100209,10 @@ in gitmoji-cli = nodeEnv.buildNodePackage { name = "gitmoji-cli"; packageName = "gitmoji-cli"; - version = "5.0.0"; + version = "5.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/gitmoji-cli/-/gitmoji-cli-5.0.0.tgz"; - sha512 = "DFiHpvCtnsX/e80RZSFhLZz7e9Ev102M3vLy9UYGi4XUaB5A1d158rLvVNi2Z66+5eKgaGi0k6L83i2QhI06ow=="; + url = "https://registry.npmjs.org/gitmoji-cli/-/gitmoji-cli-5.0.1.tgz"; + sha512 = "+uivild4BxNtPJhPU/iArWJx2cEcOqzwNmzca567AAiWB8RhDxTeXwoTPxbg15P6W1ykyWnfGKKvvfSuUNL++Q=="; }; dependencies = [ sources."@babel/code-frame-7.16.7" @@ -100553,7 +100325,7 @@ in ]; }) sources."function-bind-1.1.1" - sources."fuse.js-6.4.1" + sources."fuse.js-6.6.2" sources."get-stream-6.0.1" sources."get-uri-3.0.2" sources."global-dirs-3.0.0" @@ -100580,7 +100352,7 @@ in sources."indent-string-4.0.0" sources."inherits-2.0.4" sources."ini-2.0.0" - (sources."inquirer-8.2.2" // { + (sources."inquirer-8.2.4" // { dependencies = [ sources."chalk-4.1.2" ]; @@ -101030,9 +100802,9 @@ in sources."tslib-2.1.0" ]; }) - (sources."@graphql-tools/import-6.6.16" // { + (sources."@graphql-tools/import-6.6.17" // { dependencies = [ - sources."@graphql-tools/utils-8.6.12" + sources."@graphql-tools/utils-8.6.13" sources."tslib-2.4.0" ]; }) @@ -101057,10 +100829,10 @@ in sources."tslib-2.3.1" ]; }) - (sources."@graphql-tools/schema-8.3.13" // { + (sources."@graphql-tools/schema-8.3.14" // { dependencies = [ - sources."@graphql-tools/merge-8.2.13" - sources."@graphql-tools/utils-8.6.12" + sources."@graphql-tools/merge-8.2.14" + sources."@graphql-tools/utils-8.6.13" sources."tslib-2.4.0" ]; }) @@ -101584,21 +101356,21 @@ in }) sources."@cronvel/get-pixels-3.4.0" sources."@endemolshinegroup/cosmiconfig-typescript-loader-3.0.2" - sources."@graphql-tools/batch-execute-8.4.9" - sources."@graphql-tools/delegate-8.7.10" - sources."@graphql-tools/graphql-file-loader-7.3.14" - sources."@graphql-tools/import-6.6.16" - sources."@graphql-tools/json-file-loader-7.3.14" - sources."@graphql-tools/load-7.5.13" - sources."@graphql-tools/merge-8.2.13" - sources."@graphql-tools/schema-8.3.13" - (sources."@graphql-tools/url-loader-7.9.23" // { + sources."@graphql-tools/batch-execute-8.4.10" + sources."@graphql-tools/delegate-8.7.11" + sources."@graphql-tools/graphql-file-loader-7.3.15" + sources."@graphql-tools/import-6.6.17" + sources."@graphql-tools/json-file-loader-7.3.15" + sources."@graphql-tools/load-7.5.14" + sources."@graphql-tools/merge-8.2.14" + sources."@graphql-tools/schema-8.3.14" + (sources."@graphql-tools/url-loader-7.9.24" // { dependencies = [ sources."ws-8.7.0" ]; }) - sources."@graphql-tools/utils-8.6.12" - sources."@graphql-tools/wrap-8.4.19" + sources."@graphql-tools/utils-8.6.13" + sources."@graphql-tools/wrap-8.4.20" sources."@iarna/toml-2.2.5" sources."@n1ru4l/graphql-live-query-0.9.0" sources."@nodelib/fs.scandir-2.1.5" @@ -101788,7 +101560,7 @@ in sources."isomorphic-fetch-3.0.0" sources."isomorphic-ws-4.0.1" sources."iterall-1.3.0" - sources."jpeg-js-0.4.3" + sources."jpeg-js-0.4.4" sources."js-tokens-4.0.0" sources."json-parse-even-better-errors-2.3.1" sources."jsonfile-4.0.0" @@ -101891,7 +101663,7 @@ in ]; }) sources."symbol-observable-1.2.0" - sources."sync-fetch-0.3.1" + sources."sync-fetch-0.4.1" sources."terminal-kit-1.49.4" sources."to-regex-range-5.0.1" sources."tr46-0.0.3" @@ -103131,7 +102903,7 @@ in sources."param-case-2.1.1" sources."relateurl-0.2.7" sources."source-map-0.6.1" - sources."uglify-js-3.15.5" + sources."uglify-js-3.16.0" sources."upper-case-1.1.3" ]; buildInputs = globalBuildInputs; @@ -103228,7 +103000,7 @@ in sources."object-inspect-1.12.2" sources."opener-1.5.2" sources."portfinder-1.0.28" - sources."qs-6.10.3" + sources."qs-6.10.5" sources."requires-port-1.0.0" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" @@ -103432,7 +103204,7 @@ in sources."assert-plus-1.0.0" sources."async-2.6.4" sources."asynckit-0.4.0" - sources."aws-sdk-2.1148.0" + sources."aws-sdk-2.1150.0" sources."aws-sign2-0.7.0" sources."aws4-1.11.0" sources."base64-js-1.5.1" @@ -103603,7 +103375,7 @@ in sources."verror-1.10.1" (sources."winston-2.4.6" // { dependencies = [ - sources."async-3.2.3" + sources."async-3.2.4" sources."colors-1.0.3" ]; }) @@ -104468,7 +104240,7 @@ in sources."proxy-agent-4.0.1" sources."proxy-from-env-1.1.0" sources."pump-3.0.0" - sources."qs-6.10.3" + sources."qs-6.10.5" sources."raw-body-2.5.1" sources."readable-stream-3.6.0" sources."restore-cursor-2.0.0" @@ -104745,7 +104517,7 @@ in }; dependencies = [ sources."ansi-styles-4.3.0" - sources."async-3.2.3" + sources."async-3.2.4" sources."balanced-match-1.0.2" sources."brace-expansion-2.0.1" sources."chalk-4.1.2" @@ -104914,13 +104686,13 @@ in sources."@aws-sdk/abort-controller-3.78.0" sources."@aws-sdk/chunked-blob-reader-3.55.0" sources."@aws-sdk/chunked-blob-reader-native-3.58.0" - (sources."@aws-sdk/client-s3-3.100.0" // { + (sources."@aws-sdk/client-s3-3.105.0" // { dependencies = [ sources."fast-xml-parser-3.19.0" ]; }) - sources."@aws-sdk/client-sso-3.100.0" - (sources."@aws-sdk/client-sts-3.100.0" // { + sources."@aws-sdk/client-sso-3.105.0" + (sources."@aws-sdk/client-sts-3.105.0" // { dependencies = [ sources."fast-xml-parser-3.19.0" ]; @@ -104928,10 +104700,10 @@ in sources."@aws-sdk/config-resolver-3.80.0" sources."@aws-sdk/credential-provider-env-3.78.0" sources."@aws-sdk/credential-provider-imds-3.81.0" - sources."@aws-sdk/credential-provider-ini-3.100.0" - sources."@aws-sdk/credential-provider-node-3.100.0" + sources."@aws-sdk/credential-provider-ini-3.105.0" + sources."@aws-sdk/credential-provider-node-3.105.0" sources."@aws-sdk/credential-provider-process-3.80.0" - sources."@aws-sdk/credential-provider-sso-3.100.0" + sources."@aws-sdk/credential-provider-sso-3.105.0" sources."@aws-sdk/credential-provider-web-identity-3.78.0" sources."@aws-sdk/eventstream-marshaller-3.78.0" sources."@aws-sdk/eventstream-serde-browser-3.78.0" @@ -104953,12 +104725,13 @@ in sources."@aws-sdk/middleware-host-header-3.78.0" sources."@aws-sdk/middleware-location-constraint-3.78.0" sources."@aws-sdk/middleware-logger-3.78.0" + sources."@aws-sdk/middleware-recursion-detection-3.105.0" (sources."@aws-sdk/middleware-retry-3.80.0" // { dependencies = [ sources."uuid-8.3.2" ]; }) - sources."@aws-sdk/middleware-sdk-s3-3.86.0" + sources."@aws-sdk/middleware-sdk-s3-3.105.0" sources."@aws-sdk/middleware-sdk-sts-3.78.0" sources."@aws-sdk/middleware-serde-3.78.0" sources."@aws-sdk/middleware-signing-3.78.0" @@ -104971,7 +104744,7 @@ in sources."@aws-sdk/protocol-http-3.78.0" sources."@aws-sdk/querystring-builder-3.78.0" sources."@aws-sdk/querystring-parser-3.78.0" - sources."@aws-sdk/s3-request-presigner-3.100.0" + sources."@aws-sdk/s3-request-presigner-3.105.0" sources."@aws-sdk/service-error-classification-3.78.0" sources."@aws-sdk/shared-ini-file-loader-3.80.0" sources."@aws-sdk/signature-v4-3.78.0" @@ -105110,7 +104883,7 @@ in sources."async-mutex-0.1.4" sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."aws-sdk-2.1148.0" // { + (sources."aws-sdk-2.1150.0" // { dependencies = [ sources."sax-1.2.1" sources."uuid-8.0.0" @@ -105456,7 +105229,7 @@ in sources."isobject-2.1.0" sources."isstream-0.1.2" sources."jmespath-0.16.0" - sources."jpeg-js-0.4.3" + sources."jpeg-js-0.4.4" sources."js-tokens-4.0.0" sources."js-yaml-4.1.0" sources."jsbn-0.1.1" @@ -105687,7 +105460,7 @@ in ]; }) sources."requires-port-1.0.0" - sources."reselect-4.1.5" + sources."reselect-4.1.6" sources."resolve-url-0.2.1" sources."retry-0.10.1" sources."rimraf-2.7.1" @@ -106160,7 +105933,7 @@ in sources."path-loader-1.0.10" sources."process-nextick-args-2.0.1" sources."punycode-2.1.1" - sources."qs-6.10.3" + sources."qs-6.10.5" sources."readable-stream-2.3.7" sources."safe-buffer-5.1.2" sources."side-channel-1.0.4" @@ -107203,7 +106976,7 @@ in sources."picomatch-2.3.1" sources."pkg-up-3.1.0" sources."punycode-2.1.1" - sources."qs-6.10.3" + sources."qs-6.10.5" sources."queue-microtask-1.2.3" sources."redeyed-2.1.1" sources."restore-cursor-3.1.0" @@ -107257,10 +107030,10 @@ in katex = nodeEnv.buildNodePackage { name = "katex"; packageName = "katex"; - version = "0.15.6"; + version = "0.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/katex/-/katex-0.15.6.tgz"; - sha512 = "UpzJy4yrnqnhXvRPhjEuLA4lcPn6eRngixW7Q3TJErjg3Aw2PuLFBzTkdUb89UtumxjhHTqL3a5GDGETMSwgJA=="; + url = "https://registry.npmjs.org/katex/-/katex-0.16.0.tgz"; + sha512 = "wPRB4iUPysfH97wTgG5/tRLYxmKVq6Q4jRAWRVOUxXB1dsiv4cvcNjqabHkrOvJHM1Bpk3WrgmllSO1vIvP24w=="; }; dependencies = [ sources."commander-8.3.0" @@ -107587,12 +107360,12 @@ in sources."braces-3.0.2" sources."browser-or-node-1.3.0" sources."browser-process-hrtime-1.0.0" - sources."browserslist-4.20.3" + sources."browserslist-4.20.4" sources."buffer-5.7.1" sources."buffer-from-1.1.2" sources."bytes-3.1.2" sources."call-bind-1.0.2" - sources."caniuse-lite-1.0.30001346" + sources."caniuse-lite-1.0.30001349" sources."chalk-2.4.2" sources."chardet-1.4.0" sources."chownr-1.1.4" @@ -107660,7 +107433,7 @@ in }) sources."dotenv-8.6.0" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.146" + sources."electron-to-chromium-1.4.147" sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" @@ -108652,10 +108425,10 @@ in lerna = nodeEnv.buildNodePackage { name = "lerna"; packageName = "lerna"; - version = "5.0.0"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/lerna/-/lerna-5.0.0.tgz"; - sha512 = "dUYmJ7H9k/xHtwKpQWLTNUa1jnFUiW4o4K2LFkRchlIijoIUT4yK/RprIxNvYCrLrEaOdZryvY5UZvSHI2tBxA=="; + url = "https://registry.npmjs.org/lerna/-/lerna-5.1.0.tgz"; + sha512 = "Ur55ZCdELQzpMmJmcw3qzk0khqMQizYvpsOE9j0Q7rPtJ/5NfsDo3moMgLwTevmT3LeijyBaJmXVAU/z6rbPDg=="; }; dependencies = [ sources."@babel/code-frame-7.16.7" @@ -108673,56 +108446,56 @@ in sources."@gar/promisify-1.1.3" sources."@hutson/parse-repository-url-3.0.2" sources."@isaacs/string-locale-compare-1.1.0" - sources."@lerna/add-5.0.0" - sources."@lerna/bootstrap-5.0.0" - sources."@lerna/changed-5.0.0" - sources."@lerna/check-working-tree-5.0.0" - sources."@lerna/child-process-5.0.0" - sources."@lerna/clean-5.0.0" - sources."@lerna/cli-5.0.0" - sources."@lerna/collect-uncommitted-5.0.0" - sources."@lerna/collect-updates-5.0.0" - sources."@lerna/command-5.0.0" - (sources."@lerna/conventional-commits-5.0.0" // { + sources."@lerna/add-5.1.0" + sources."@lerna/bootstrap-5.1.0" + sources."@lerna/changed-5.1.0" + sources."@lerna/check-working-tree-5.1.0" + sources."@lerna/child-process-5.1.0" + sources."@lerna/clean-5.1.0" + sources."@lerna/cli-5.1.0" + sources."@lerna/collect-uncommitted-5.1.0" + sources."@lerna/collect-updates-5.1.0" + sources."@lerna/command-5.1.0" + (sources."@lerna/conventional-commits-5.1.0" // { dependencies = [ sources."pify-5.0.0" ]; }) - (sources."@lerna/create-5.0.0" // { + (sources."@lerna/create-5.1.0" // { dependencies = [ sources."pify-5.0.0" sources."yargs-parser-20.2.4" ]; }) - sources."@lerna/create-symlink-5.0.0" - sources."@lerna/describe-ref-5.0.0" - sources."@lerna/diff-5.0.0" - sources."@lerna/exec-5.0.0" - sources."@lerna/filter-options-5.0.0" - sources."@lerna/filter-packages-5.0.0" - sources."@lerna/get-npm-exec-opts-5.0.0" - (sources."@lerna/get-packed-5.0.0" // { + sources."@lerna/create-symlink-5.1.0" + sources."@lerna/describe-ref-5.1.0" + sources."@lerna/diff-5.1.0" + sources."@lerna/exec-5.1.0" + sources."@lerna/filter-options-5.1.0" + sources."@lerna/filter-packages-5.1.0" + sources."@lerna/get-npm-exec-opts-5.1.0" + (sources."@lerna/get-packed-5.1.0" // { dependencies = [ sources."ssri-8.0.1" ]; }) - sources."@lerna/github-client-5.0.0" - sources."@lerna/gitlab-client-5.0.0" - sources."@lerna/global-options-5.0.0" - sources."@lerna/has-npm-version-5.0.0" - sources."@lerna/import-5.0.0" - sources."@lerna/info-5.0.0" - sources."@lerna/init-5.0.0" - sources."@lerna/link-5.0.0" - sources."@lerna/list-5.0.0" - sources."@lerna/listable-5.0.0" - sources."@lerna/log-packed-5.0.0" - (sources."@lerna/npm-conf-5.0.0" // { + sources."@lerna/github-client-5.1.0" + sources."@lerna/gitlab-client-5.1.0" + sources."@lerna/global-options-5.1.0" + sources."@lerna/has-npm-version-5.1.0" + sources."@lerna/import-5.1.0" + sources."@lerna/info-5.1.0" + sources."@lerna/init-5.1.0" + sources."@lerna/link-5.1.0" + sources."@lerna/list-5.1.0" + sources."@lerna/listable-5.1.0" + sources."@lerna/log-packed-5.1.0" + (sources."@lerna/npm-conf-5.1.0" // { dependencies = [ sources."pify-5.0.0" ]; }) - (sources."@lerna/npm-dist-tag-5.0.0" // { + (sources."@lerna/npm-dist-tag-5.1.0" // { dependencies = [ sources."cacache-15.3.0" sources."make-fetch-happen-8.0.14" @@ -108731,30 +108504,30 @@ in sources."ssri-8.0.1" ]; }) - sources."@lerna/npm-install-5.0.0" - (sources."@lerna/npm-publish-5.0.0" // { + sources."@lerna/npm-install-5.1.0" + (sources."@lerna/npm-publish-5.1.0" // { dependencies = [ sources."normalize-package-data-3.0.3" sources."pify-5.0.0" sources."read-package-json-3.0.1" ]; }) - sources."@lerna/npm-run-script-5.0.0" - sources."@lerna/otplease-5.0.0" - sources."@lerna/output-5.0.0" - (sources."@lerna/pack-directory-5.0.0" // { + sources."@lerna/npm-run-script-5.1.0" + sources."@lerna/otplease-5.1.0" + sources."@lerna/output-5.1.0" + (sources."@lerna/pack-directory-5.1.0" // { dependencies = [ sources."ignore-walk-3.0.4" sources."npm-packlist-2.2.2" ]; }) - sources."@lerna/package-5.0.0" - sources."@lerna/package-graph-5.0.0" - sources."@lerna/prerelease-id-from-version-5.0.0" - sources."@lerna/profiler-5.0.0" - sources."@lerna/project-5.0.0" - sources."@lerna/prompt-5.0.0" - (sources."@lerna/publish-5.0.0" // { + sources."@lerna/package-5.1.0" + sources."@lerna/package-graph-5.1.0" + sources."@lerna/prerelease-id-from-version-5.1.0" + sources."@lerna/profiler-5.1.0" + sources."@lerna/project-5.1.0" + sources."@lerna/prompt-5.1.0" + (sources."@lerna/publish-5.1.0" // { dependencies = [ sources."cacache-15.3.0" sources."make-fetch-happen-8.0.14" @@ -108763,25 +108536,25 @@ in sources."ssri-8.0.1" ]; }) - sources."@lerna/pulse-till-done-5.0.0" - sources."@lerna/query-graph-5.0.0" - sources."@lerna/resolve-symlink-5.0.0" - sources."@lerna/rimraf-dir-5.0.0" - sources."@lerna/run-5.0.0" - sources."@lerna/run-lifecycle-5.0.0" - sources."@lerna/run-topologically-5.0.0" - sources."@lerna/symlink-binary-5.0.0" - sources."@lerna/symlink-dependencies-5.0.0" - (sources."@lerna/temp-write-5.0.0" // { + sources."@lerna/pulse-till-done-5.1.0" + sources."@lerna/query-graph-5.1.0" + sources."@lerna/resolve-symlink-5.1.0" + sources."@lerna/rimraf-dir-5.1.0" + sources."@lerna/run-5.1.0" + sources."@lerna/run-lifecycle-5.1.0" + sources."@lerna/run-topologically-5.1.0" + sources."@lerna/symlink-binary-5.1.0" + sources."@lerna/symlink-dependencies-5.1.0" + (sources."@lerna/temp-write-5.1.0" // { dependencies = [ sources."make-dir-3.1.0" sources."semver-6.3.0" ]; }) - sources."@lerna/timer-5.0.0" - sources."@lerna/validation-error-5.0.0" - sources."@lerna/version-5.0.0" - (sources."@lerna/write-log-file-5.0.0" // { + sources."@lerna/timer-5.1.0" + sources."@lerna/validation-error-5.1.0" + sources."@lerna/version-5.1.0" + (sources."@lerna/write-log-file-5.1.0" // { dependencies = [ sources."write-file-atomic-3.0.3" ]; @@ -109268,7 +109041,7 @@ in sources."parent-module-1.0.1" sources."parse-conflict-json-2.0.2" sources."parse-json-5.2.0" - sources."parse-path-4.0.3" + sources."parse-path-4.0.4" sources."parse-url-6.0.0" sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" @@ -109289,7 +109062,7 @@ in sources."protocols-1.4.8" sources."punycode-2.1.1" sources."q-1.5.1" - sources."qs-6.10.3" + sources."qs-6.10.5" sources."query-string-6.14.1" sources."queue-microtask-1.2.3" sources."quick-lru-4.0.1" @@ -109386,7 +109159,7 @@ in sources."type-fest-0.4.1" sources."typedarray-0.0.6" sources."typedarray-to-buffer-3.1.5" - sources."uglify-js-3.15.5" + sources."uglify-js-3.16.0" sources."unique-filename-1.1.1" sources."unique-slug-2.0.2" sources."universal-user-agent-6.0.0" @@ -110735,7 +110508,7 @@ in }; dependencies = [ sources."ansi-styles-4.3.0" - sources."async-3.2.3" + sources."async-3.2.4" sources."boolbase-1.0.0" sources."chalk-4.1.2" sources."cheerio-1.0.0-rc.11" @@ -110794,7 +110567,7 @@ in sources."accepts-1.3.8" sources."after-0.8.2" sources."arraybuffer.slice-0.0.7" - sources."async-3.2.3" + sources."async-3.2.4" sources."async-limiter-1.0.1" sources."backo2-1.0.2" sources."base64-arraybuffer-0.1.5" @@ -111397,7 +111170,7 @@ in sources."progress-2.0.3" sources."proxy-from-env-1.1.0" sources."pump-3.0.0" - sources."puppeteer-14.2.1" + sources."puppeteer-14.3.0" sources."readable-stream-3.6.0" sources."rimraf-3.0.2" sources."robust-predicates-3.0.1" @@ -111586,7 +111359,7 @@ in sources."path-loader-1.0.10" sources."process-nextick-args-2.0.1" sources."punycode-2.1.1" - sources."qs-6.10.3" + sources."qs-6.10.5" sources."readable-stream-2.3.7" sources."safe-buffer-5.1.2" sources."side-channel-1.0.4" @@ -112067,7 +111840,7 @@ in sources."@colors/colors-1.5.0" sources."@dabh/diagnostics-2.0.3" sources."@msgpack/msgpack-2.7.2" - sources."async-3.2.3" + sources."async-3.2.4" sources."color-3.2.1" sources."color-convert-1.9.3" sources."color-name-1.1.3" @@ -114680,7 +114453,7 @@ in sources."pako-1.0.11" ]; }) - sources."browserslist-4.20.3" + sources."browserslist-4.20.4" (sources."buffer-4.9.2" // { dependencies = [ sources."isarray-1.0.0" @@ -114697,7 +114470,7 @@ in sources."caller-path-2.0.0" sources."callsites-2.0.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001346" + sources."caniuse-lite-1.0.30001349" sources."caseless-0.12.0" sources."chalk-2.4.2" sources."chokidar-2.1.8" @@ -114834,7 +114607,7 @@ in sources."duplexer2-0.1.4" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.146" + sources."electron-to-chromium-1.4.147" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -115590,10 +115363,10 @@ in sources."ansi-styles-3.2.1" sources."base-x-3.0.9" sources."boolbase-1.0.0" - sources."browserslist-4.20.3" + sources."browserslist-4.20.4" sources."buffer-from-1.1.2" sources."callsites-3.1.0" - sources."caniuse-lite-1.0.30001346" + sources."caniuse-lite-1.0.30001349" (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -115624,7 +115397,7 @@ in sources."domutils-2.8.0" sources."dotenv-7.0.0" sources."dotenv-expand-5.1.0" - sources."electron-to-chromium-1.4.146" + sources."electron-to-chromium-1.4.147" sources."entities-3.0.1" sources."error-ex-1.3.2" sources."escalade-3.1.1" @@ -115960,7 +115733,7 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-is-1.6.18" - sources."uglify-js-3.15.5" + sources."uglify-js-3.16.0" sources."unix-dgram-2.0.4" sources."unpipe-1.0.0" sources."uri-js-4.4.1" @@ -117016,7 +116789,7 @@ in ]; }) sources."ast-types-0.13.4" - sources."async-3.2.3" + sources."async-3.2.4" (sources."async-listener-0.6.10" // { dependencies = [ sources."semver-5.7.1" @@ -117202,10 +116975,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "7.1.8"; + version = "7.1.9"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-7.1.8.tgz"; - sha512 = "6E+iGdkAcEtEvmxgLGpHiK51ArFK8mBUFIQ6/x5LeL+YCWbi1r1Fy2UPN1dDWUjy2xauLjgIMp/KQ5s5b85EBA=="; + url = "https://registry.npmjs.org/pnpm/-/pnpm-7.1.9.tgz"; + sha512 = "YWA+iqayHb0MndHTyqvVPKQVYVCOoBYlQNLP3hAf2DT/Iw2EHVcP18yCT+xnsPNvkC4VYfQepE6AZvySQue1TA=="; }; buildInputs = globalBuildInputs; meta = { @@ -117512,13 +117285,13 @@ in prisma = nodeEnv.buildNodePackage { name = "prisma"; packageName = "prisma"; - version = "3.14.0"; + version = "3.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/prisma/-/prisma-3.14.0.tgz"; - sha512 = "l9MOgNCn/paDE+i1K2fp9NZ+Du4trzPTJsGkaQHVBufTGqzoYHuNk8JfzXuIn0Gte6/ZjyKj652Jq/Lc1tp2yw=="; + url = "https://registry.npmjs.org/prisma/-/prisma-3.15.0.tgz"; + sha512 = "HL1kGDuFi9PdhbVLYsQO9vAH9uRFAHk7ifUOQxSrzUDs7R4VfLtg45VvXz8VHwcgLY5h0OrDVe1TdEX7a4o9tg=="; }; dependencies = [ - sources."@prisma/engines-3.14.0-36.2b0c12756921c891fec4f68d9444e18c7d5d4a6a" + sources."@prisma/engines-3.15.0-29.b9297dc3a59307060c1c39d7e4f5765066f38372" ]; buildInputs = globalBuildInputs; meta = { @@ -117533,21 +117306,21 @@ in "@prisma/language-server" = nodeEnv.buildNodePackage { name = "_at_prisma_slash_language-server"; packageName = "@prisma/language-server"; - version = "3.14.0"; + version = "3.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/@prisma/language-server/-/language-server-3.14.0.tgz"; - sha512 = "KP562fcqP010ja+Srt6Hi3XOooVQ11SwMAFvY9SxJfdRaLvU/vLxGW3+SnkAjq3tbQ0ij1ZyJTmshMWh/Vwevw=="; + url = "https://registry.npmjs.org/@prisma/language-server/-/language-server-3.15.0.tgz"; + sha512 = "zTftMfWBTa2fA2PLUsAiWTML8RbhFceX2/xD02Rajv3zaslDDAmfoe/+KHJ7BUpcP9yACLENUJIEA43qeT9uHQ=="; }; dependencies = [ - sources."@prisma/prisma-fmt-wasm-3.14.0-36.2b0c12756921c891fec4f68d9444e18c7d5d4a6a" + sources."@prisma/prisma-fmt-wasm-3.15.0-29.b9297dc3a59307060c1c39d7e4f5765066f38372" sources."@types/js-levenshtein-1.1.1" sources."js-levenshtein-1.1.6" sources."klona-2.0.5" - sources."vscode-jsonrpc-6.0.0" - sources."vscode-languageserver-7.0.0" - sources."vscode-languageserver-protocol-3.16.0" + sources."vscode-jsonrpc-8.0.1" + sources."vscode-languageserver-8.0.1" + sources."vscode-languageserver-protocol-3.17.1" sources."vscode-languageserver-textdocument-1.0.4" - sources."vscode-languageserver-types-3.16.0" + sources."vscode-languageserver-types-3.17.1" ]; buildInputs = globalBuildInputs; meta = { @@ -118037,7 +117810,7 @@ in sources."prepend-http-2.0.0" sources."prompts-2.4.2" sources."pump-3.0.0" - sources."qs-6.10.3" + sources."qs-6.10.5" sources."rc-1.2.8" sources."readline-sync-1.4.10" sources."register-protocol-win32-1.1.0" @@ -118318,7 +118091,7 @@ in version = "2.0.1"; src = fetchurl { url = "https://registry.npmjs.org/react-native-cli/-/react-native-cli-2.0.1.tgz"; - sha1 = "f2cd3c7aa1b83828cdfba630e2dfd817df766d54"; + sha512 = "QgkB1urUhGe9q1vcqQLIfNdCd/Qf3MdNQe19QO6lVjhIVKljlVMKtaK8RaZ8PCNB/cdXlO/G3tKUGk+ghMXE6w=="; }; dependencies = [ sources."ansi-regex-2.1.1" @@ -118737,7 +118510,7 @@ in ]; }) sources."browserify-zlib-0.1.4" - sources."browserslist-4.20.3" + sources."browserslist-4.20.4" sources."buffer-5.7.1" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" @@ -118771,7 +118544,7 @@ in sources."camel-case-3.0.0" sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001346" + sources."caniuse-lite-1.0.30001349" sources."case-sensitive-paths-webpack-plugin-2.4.0" sources."caw-2.0.1" sources."chalk-2.4.2" @@ -118992,7 +118765,7 @@ in sources."duplexify-3.7.1" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.4.146" + sources."electron-to-chromium-1.4.147" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -120205,7 +119978,7 @@ in version = "0.13.3"; src = fetchurl { url = "https://registry.npmjs.org/react-tools/-/react-tools-0.13.3.tgz"; - sha1 = "da6ac7d4d7777a59a5e951cf46e72fd4b6b40a2c"; + sha512 = "lmdjIRNk2cVUdlF/dyy6oP0nG2qrlX5qKFYRtiC5zK5Sg5QqgUEOrcS7Jz+kPNeOj9OWT7NfrR/cDvbGGSjCyg=="; }; dependencies = [ sources."acorn-5.7.4" @@ -120636,7 +120409,7 @@ in sources."to-regex-range-5.0.1" sources."tr46-0.0.3" sources."tty-browserify-0.0.0" - sources."uglify-js-3.15.5" + sources."uglify-js-3.16.0" (sources."uri-js-4.4.1" // { dependencies = [ sources."punycode-2.1.1" @@ -121180,10 +120953,10 @@ in rollup = nodeEnv.buildNodePackage { name = "rollup"; packageName = "rollup"; - version = "2.75.5"; + version = "2.75.6"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.75.5.tgz"; - sha512 = "JzNlJZDison3o2mOxVmb44Oz7t74EfSd1SQrplQk0wSaXV7uLQXtVdHbxlcT3w+8tZ1TL4r/eLfc7nAbz38BBA=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.75.6.tgz"; + sha512 = "OEf0TgpC9vU6WGROJIk1JA3LR5vk/yvqlzxqdrE2CzzXnqKXNzbAwlWUXis8RS3ZPe7LAq+YUxsRa0l3r27MLA=="; }; dependencies = [ sources."fsevents-2.3.2" @@ -121215,14 +120988,14 @@ in sources."@types/json-schema-7.0.11" sources."@types/node-14.17.34" sources."@types/vscode-1.66.0" - sources."@typescript-eslint/eslint-plugin-5.27.0" - sources."@typescript-eslint/parser-5.27.0" - sources."@typescript-eslint/scope-manager-5.27.0" - sources."@typescript-eslint/type-utils-5.27.0" - sources."@typescript-eslint/types-5.27.0" - sources."@typescript-eslint/typescript-estree-5.27.0" - sources."@typescript-eslint/utils-5.27.0" - sources."@typescript-eslint/visitor-keys-5.27.0" + sources."@typescript-eslint/eslint-plugin-5.27.1" + sources."@typescript-eslint/parser-5.27.1" + sources."@typescript-eslint/scope-manager-5.27.1" + sources."@typescript-eslint/type-utils-5.27.1" + sources."@typescript-eslint/types-5.27.1" + sources."@typescript-eslint/typescript-estree-5.27.1" + sources."@typescript-eslint/utils-5.27.1" + sources."@typescript-eslint/visitor-keys-5.27.1" sources."@vscode/test-electron-2.1.3" sources."acorn-8.7.1" sources."acorn-jsx-5.3.2" @@ -121487,7 +121260,7 @@ in sources."pseudomap-1.0.2" sources."pump-3.0.0" sources."punycode-2.1.1" - sources."qs-6.10.3" + sources."qs-6.10.5" sources."queue-microtask-1.2.3" (sources."rc-1.2.8" // { dependencies = [ @@ -121628,7 +121401,7 @@ in version = "0.0.5"; src = fetchurl { url = "https://registry.npmjs.org/s3http/-/s3http-0.0.5.tgz"; - sha1 = "c8fa1fffb8258ce68adf75df73f90fbb6f23d198"; + sha512 = "AvzoPrG52y/LXjDmKiRoLrZbTJHXdfGYqzHlVLTrdK/+aeCI+RyGB/F1gd9qs6qwP4c1Ntdgvx9W5FziivG4+Q=="; }; dependencies = [ sources."aws-sdk-1.18.0" @@ -121691,7 +121464,7 @@ in sources."object-inspect-1.12.2" (sources."openid-2.0.10" // { dependencies = [ - sources."qs-6.10.3" + sources."qs-6.10.5" ]; }) sources."pause-0.0.1" @@ -121956,10 +121729,10 @@ in sources."archiver-utils-2.1.0" sources."argparse-1.0.10" sources."array-union-2.1.0" - sources."async-3.2.3" + sources."async-3.2.4" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" - (sources."aws-sdk-2.1148.0" // { + (sources."aws-sdk-2.1150.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -122052,7 +121825,7 @@ in sources."type-1.2.0" ]; }) - sources."dayjs-1.11.2" + sources."dayjs-1.11.3" sources."debug-4.3.4" (sources."decompress-4.2.1" // { dependencies = [ @@ -122274,7 +122047,7 @@ in sources."promise-queue-2.2.5" sources."pump-3.0.0" sources."punycode-2.1.1" - sources."qs-6.10.3" + sources."qs-6.10.5" sources."querystring-0.2.1" sources."queue-microtask-1.2.3" sources."quick-lru-5.1.1" @@ -123032,10 +122805,10 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.946.0"; + version = "1.947.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.946.0.tgz"; - sha512 = "3XE1rk5qF1DOb5t5bQlOFDyp4x1V7HjpppH+RDVIqq7is0Hf9NTHeOpeNALplJjVVyEIfAzqiJThKupWDx5ptg=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.947.0.tgz"; + sha512 = "/u+HyhaIaFhnrpn+aOiGR0ts9ZR7mr6uiqgRn5EQIwaFKpCFOEnOJTlQAM25ggomqmxRldArMMXe4dBWw855LA=="; }; buildInputs = globalBuildInputs; meta = { @@ -123330,7 +123103,7 @@ in sources."binary-search-1.3.6" sources."binary-search-bounds-2.0.5" sources."bindings-1.5.0" - sources."bipf-1.6.5" + sources."bipf-1.9.0" sources."blake2s-1.1.0" sources."brace-expansion-1.1.11" sources."braces-1.8.5" @@ -124297,7 +124070,7 @@ in sources."async-1.5.2" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - (sources."aws-sdk-2.1148.0" // { + (sources."aws-sdk-2.1150.0" // { dependencies = [ sources."uuid-8.0.0" ]; @@ -124692,7 +124465,7 @@ in sources."once-1.4.0" (sources."openid-2.0.10" // { dependencies = [ - sources."qs-6.10.3" + sources."qs-6.10.5" ]; }) sources."options-0.0.6" @@ -124894,7 +124667,7 @@ in dependencies = [ sources."debug-3.2.7" sources."form-data-2.5.1" - sources."qs-6.10.3" + sources."qs-6.10.5" sources."readable-stream-2.3.7" sources."string_decoder-1.1.1" ]; @@ -124908,7 +124681,7 @@ in sources."esprima-4.0.1" sources."js-yaml-3.14.1" sources."lodash-3.10.1" - sources."qs-6.10.3" + sources."qs-6.10.5" ]; }) sources."swagger-schema-official-2.0.0-bab6bed" @@ -124993,7 +124766,7 @@ in sources."window-size-0.1.0" (sources."winston-2.4.6" // { dependencies = [ - sources."async-3.2.3" + sources."async-3.2.4" ]; }) sources."with-5.1.1" @@ -126070,7 +125843,7 @@ in dependencies = [ sources."debug-3.2.7" sources."ms-2.1.3" - sources."qs-6.10.3" + sources."qs-6.10.5" sources."superagent-3.8.3" ]; }) @@ -126250,7 +126023,7 @@ in sources."truncate-utf8-bytes-1.0.2" sources."type-is-1.6.18" sources."typedarray-0.0.6" - sources."uglify-js-3.15.5" + sources."uglify-js-3.16.0" sources."undefsafe-2.0.5" (sources."union-value-1.0.1" // { dependencies = [ @@ -126323,7 +126096,7 @@ in sources."acorn-node-1.8.2" sources."acorn-walk-7.2.0" sources."anymatch-3.1.2" - sources."arg-5.0.1" + sources."arg-5.0.2" sources."binary-extensions-2.2.0" sources."braces-3.0.2" sources."camelcase-css-2.0.1" @@ -128688,7 +128461,7 @@ in sources."psl-1.8.0" sources."pump-3.0.0" sources."punycode-2.1.1" - sources."qs-6.10.3" + sources."qs-6.10.5" sources."range-parser-1.2.1" sources."raw-body-2.4.0" sources."rc-1.2.8" @@ -130439,7 +130212,7 @@ in sources."ajv-6.12.6" sources."asn1-0.2.6" sources."assert-plus-1.0.0" - sources."async-3.2.3" + sources."async-3.2.4" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" sources."aws-sign2-0.7.0" @@ -130882,10 +130655,10 @@ in typescript-language-server = nodeEnv.buildNodePackage { name = "typescript-language-server"; packageName = "typescript-language-server"; - version = "0.10.1"; + version = "0.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/typescript-language-server/-/typescript-language-server-0.10.1.tgz"; - sha512 = "Lk98jYbHthLOhldFziQhk0TubE7RvUtQaVW5un7hOR2uDVH78lQHf5RZsgtmlAECgZRxWXgTOJUZ+BWJ+v/a7A=="; + url = "https://registry.npmjs.org/typescript-language-server/-/typescript-language-server-0.11.0.tgz"; + sha512 = "8nfW0+Ei7/h6c2/KCeduPbFxMDVJWok/H593v+gajxXrOCX4VMyoEVsu7BswMyyah8GWDbcNdNi9c812eBtH2A=="; }; dependencies = [ sources."@nodelib/fs.scandir-2.1.5" @@ -130955,7 +130728,7 @@ in sources."vscode-jsonrpc-6.0.0" sources."vscode-languageserver-7.0.0" sources."vscode-languageserver-protocol-3.16.0" - sources."vscode-languageserver-textdocument-1.0.4" + sources."vscode-languageserver-textdocument-1.0.5" sources."vscode-languageserver-types-3.16.0" sources."vscode-uri-3.0.3" sources."which-2.0.2" @@ -130974,10 +130747,10 @@ in uglify-js = nodeEnv.buildNodePackage { name = "uglify-js"; packageName = "uglify-js"; - version = "3.15.5"; + version = "3.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.15.5.tgz"; - sha512 = "hNM5q5GbBRB5xB+PMqVRcgYe4c8jbyZ1pzZhS6jbq54/4F2gFK869ZheiE5A8/t+W5jtTNpWef/5Q9zk639FNQ=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.16.0.tgz"; + sha512 = "FEikl6bR30n0T3amyBh3LoiBdqHRy/f4H80+My34HOesOKyHfOsxAPAxOoqC0JUnC1amnO0IwkYC3sko51caSw=="; }; buildInputs = globalBuildInputs; meta = { @@ -131041,7 +130814,7 @@ in }) sources."any-promise-1.3.0" sources."array-flatten-1.1.1" - sources."async-3.2.3" + sources."async-3.2.4" sources."balanced-match-1.0.2" sources."base64id-2.0.0" sources."blueimp-md5-2.19.0" @@ -131651,10 +131424,10 @@ in vercel = nodeEnv.buildNodePackage { name = "vercel"; packageName = "vercel"; - version = "25.0.0"; + version = "25.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/vercel/-/vercel-25.0.0.tgz"; - sha512 = "vBv5rKPiONRhE2Sh4QLzw77xwT0xKLPW3fF2kplF5JhKNonppC2Yvx+ktV2mUNzkCkNM7ruaVPktCiTgoJIBWQ=="; + url = "https://registry.npmjs.org/vercel/-/vercel-25.0.1.tgz"; + sha512 = "/IOCUIvxXw1by90fSOeTCgWQ8qMDgE7Mmcs7pb3CVLVdcZRJt6LJ97x49daFaLU/y4UKsPPGpB3brzdvqHVTBg=="; }; dependencies = [ sources."@babel/runtime-7.18.3" @@ -131684,7 +131457,7 @@ in sources."@vercel/go-2.0.0" sources."@vercel/next-3.0.0" sources."@vercel/nft-0.19.1" - sources."@vercel/node-2.0.0" + sources."@vercel/node-2.0.1" sources."@vercel/node-bridge-3.0.0" sources."@vercel/python-3.0.0" sources."@vercel/redwood-1.0.0" @@ -132475,12 +132248,12 @@ in sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."browser-stdout-1.3.1" - sources."browserslist-4.20.3" + sources."browserslist-4.20.4" sources."buffer-crc32-0.2.13" sources."buffer-from-1.1.2" sources."call-bind-1.0.2" sources."camelcase-6.3.0" - sources."caniuse-lite-1.0.30001346" + sources."caniuse-lite-1.0.30001349" (sources."chalk-4.1.2" // { dependencies = [ sources."supports-color-7.2.0" @@ -132520,7 +132293,7 @@ in sources."domelementtype-2.3.0" sources."domhandler-5.0.3" sources."domutils-3.0.1" - sources."electron-to-chromium-1.4.146" + sources."electron-to-chromium-1.4.147" sources."emoji-regex-8.0.0" sources."emojis-list-3.0.0" sources."enhanced-resolve-5.9.3" @@ -132655,7 +132428,7 @@ in sources."process-nextick-args-2.0.1" sources."prr-1.0.1" sources."punycode-2.1.1" - sources."qs-6.10.3" + sources."qs-6.10.5" sources."randombytes-2.1.0" sources."read-1.0.7" sources."readable-stream-1.0.34" @@ -133031,7 +132804,7 @@ in sources."tslib-1.14.1" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."uglify-js-3.15.5" + sources."uglify-js-3.16.0" sources."uid-0.0.2" sources."unbzip2-stream-1.4.3" sources."unyield-0.0.1" @@ -134754,7 +134527,7 @@ in sources."yauzl-2.10.0" (sources."zip-dir-2.0.0" // { dependencies = [ - sources."async-3.2.3" + sources."async-3.2.4" ]; }) ]; @@ -134809,12 +134582,12 @@ in sources."acorn-import-assertions-1.8.0" sources."ajv-6.12.6" sources."ajv-keywords-3.5.2" - sources."browserslist-4.20.3" + sources."browserslist-4.20.4" sources."buffer-from-1.1.2" - sources."caniuse-lite-1.0.30001346" + sources."caniuse-lite-1.0.30001349" sources."chrome-trace-event-1.0.3" sources."commander-2.20.3" - sources."electron-to-chromium-1.4.146" + sources."electron-to-chromium-1.4.147" sources."enhanced-resolve-5.9.3" sources."es-module-lexer-0.9.3" sources."escalade-3.1.1" @@ -134938,10 +134711,10 @@ in webpack-dev-server = nodeEnv.buildNodePackage { name = "webpack-dev-server"; packageName = "webpack-dev-server"; - version = "4.9.1"; + version = "4.9.2"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.9.1.tgz"; - sha512 = "CTMfu2UMdR/4OOZVHRpdy84pNopOuigVIsRbGX3LVDMWNP8EUgC5mUBMErbwBlHTEX99ejZJpVqrir6EXAEajA=="; + url = "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.9.2.tgz"; + sha512 = "H95Ns95dP24ZsEzO6G9iT+PNw4Q7ltll1GfJHV4fKphuHWgKFzGHWi4alTlTnpk1SPPk41X+l2RB7rLfIhnB9Q=="; }; dependencies = [ sources."@leichtgewicht/ip-codec-2.0.4" @@ -134977,7 +134750,7 @@ in sources."bytes-3.1.2" ]; }) - sources."bonjour-service-1.0.12" + sources."bonjour-service-1.0.13" sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."bytes-3.0.0" @@ -136153,7 +135926,7 @@ in (sources."jake-10.8.5" // { dependencies = [ sources."ansi-styles-4.3.0" - sources."async-3.2.3" + sources."async-3.2.4" sources."chalk-4.1.2" sources."color-convert-2.0.1" sources."color-name-1.1.4" From 9ad297f457fad9aa0d9684a5086b27646a414b85 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 7 Jun 2022 21:54:10 +0200 Subject: [PATCH 189/245] python310Packages.adb-shell: 0.4.2 -> 0.4.3 --- pkgs/development/python-modules/adb-shell/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/adb-shell/default.nix b/pkgs/development/python-modules/adb-shell/default.nix index bc10948f070f..f117167c8df0 100644 --- a/pkgs/development/python-modules/adb-shell/default.nix +++ b/pkgs/development/python-modules/adb-shell/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "adb-shell"; - version = "0.4.2"; + version = "0.4.3"; format = "setuptools"; disabled = !isPy3k; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "JeffLIrion"; repo = "adb_shell"; rev = "v${version}"; - hash = "sha256-8tclSjmLlTAIeq6t7YPGtJwvSwtlzQ7sRAQatcQRzeY="; + hash = "sha256-+RU3nyJpHq0r/9erEbjUILpwIPWq14HdOX7LkSxySs4="; }; propagatedBuildInputs = [ From 7c82506085269926301086ff96cb4184e0e52da4 Mon Sep 17 00:00:00 2001 From: pennae Date: Tue, 7 Jun 2022 22:20:54 +0200 Subject: [PATCH 190/245] python3Packages.pyfxa: fix fxa-client fxa-client imports pkg_resources, so it requires setuptools to run. --- pkgs/development/python-modules/pyfxa/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pyfxa/default.nix b/pkgs/development/python-modules/pyfxa/default.nix index eb5403c2b968..b7b1e61e8877 100644 --- a/pkgs/development/python-modules/pyfxa/default.nix +++ b/pkgs/development/python-modules/pyfxa/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchPypi , requests, cryptography, pybrowserid, hawkauthlib, six -, grequests, mock, responses, pytest, pyjwt }: +, grequests, mock, responses, pytest, pyjwt, setuptools }: buildPythonPackage rec { pname = "PyFxA"; @@ -18,6 +18,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pyjwt requests cryptography pybrowserid hawkauthlib six + setuptools # imports pkg_resources ]; checkInputs = [ From 278423ab654dd742386ca4e911c9b76774ff19ae Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 7 Jun 2022 23:20:18 +0200 Subject: [PATCH 191/245] python310Packages.plugwise: 0.19.0 -> 0.19.0 --- pkgs/development/python-modules/plugwise/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/plugwise/default.nix b/pkgs/development/python-modules/plugwise/default.nix index cf5b79fb7114..b8900b0f5506 100644 --- a/pkgs/development/python-modules/plugwise/default.nix +++ b/pkgs/development/python-modules/plugwise/default.nix @@ -1,10 +1,11 @@ -{ lib + { lib , aiohttp , async-timeout , buildPythonPackage , crcmod , defusedxml , fetchFromGitHub +, freezegun , jsonpickle , munch , mypy @@ -20,7 +21,7 @@ buildPythonPackage rec { pname = "plugwise"; - version = "0.18.5"; + version = "0.19.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -29,7 +30,7 @@ buildPythonPackage rec { owner = pname; repo = "python-plugwise"; rev = "refs/tags/v${version}"; - sha256 = "sha256-J6RwPkObcoXIQ93nD8FNNjwllHoID4nFzqilArBS1C8="; + sha256 = "sha256-ST7eC7IXW47b1AlX25ubUPTi6Hkcjd+7L0tzht3fz9s="; }; propagatedBuildInputs = [ @@ -45,6 +46,7 @@ buildPythonPackage rec { ]; checkInputs = [ + freezegun jsonpickle mypy pytest-aiohttp From 5cc98c37ad2f2258f7ad4d0cce00617ef853ca2e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 7 Jun 2022 23:22:10 +0200 Subject: [PATCH 192/245] python310Packages.pyroute2-core: 0.6.10 -> 0.6.11 --- pkgs/development/python-modules/pyroute2-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyroute2-core/default.nix b/pkgs/development/python-modules/pyroute2-core/default.nix index 3676ce9a469c..096085a27103 100644 --- a/pkgs/development/python-modules/pyroute2-core/default.nix +++ b/pkgs/development/python-modules/pyroute2-core/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pyroute2-core"; - version = "0.6.10"; + version = "0.6.11"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pyroute2.core"; inherit version; - hash = "sha256-hwI7sSaR0938VeCShzZ39b2CAU5SJLqui8Ri3CGXPwk="; + hash = "sha256-9Odxls1lje7pUCu0UkhfQIgbL2dOZQkiV1J/kgfgxGw="; }; # pyroute2 sub-modules have no tests From 49da7da0b427be4d5b4d4f420a11eea2f429beda Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 7 Jun 2022 23:22:15 +0200 Subject: [PATCH 193/245] python310Packages.pyroute2-ethtool: 0.6.10 -> 0.6.11 --- pkgs/development/python-modules/pyroute2-ethtool/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyroute2-ethtool/default.nix b/pkgs/development/python-modules/pyroute2-ethtool/default.nix index 515bdfb2d6d8..ba0f2a054e11 100644 --- a/pkgs/development/python-modules/pyroute2-ethtool/default.nix +++ b/pkgs/development/python-modules/pyroute2-ethtool/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pyroute2-ethtool"; - version = "0.6.10"; + version = "0.6.11"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pyroute2.ethtool"; inherit version; - hash = "sha256-5i1zbKs40RXCQB1cn3jrDOX+Fgl0nknTFLsvI69udxw="; + hash = "sha256-3xFsK50WtnRS8ImEWU4Hke9Ndp1Asm4wPEBfQT1rYXU="; }; propagatedBuildInputs = [ From a529fd4c2fac012dc9f1166663f7d11ef02ba0b1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 7 Jun 2022 23:22:20 +0200 Subject: [PATCH 194/245] python310Packages.pyroute2-ipdb: 0.6.10 -> 0.6.11 --- pkgs/development/python-modules/pyroute2-ipdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyroute2-ipdb/default.nix b/pkgs/development/python-modules/pyroute2-ipdb/default.nix index 5a3b4d186556..944b1ab4cfc1 100644 --- a/pkgs/development/python-modules/pyroute2-ipdb/default.nix +++ b/pkgs/development/python-modules/pyroute2-ipdb/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pyroute2-ipdb"; - version = "0.6.10"; + version = "0.6.11"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pyroute2.ipdb"; inherit version; - hash = "sha256-emPIh94LqN/QCCLC6Mr+IiVyXtjdsmhduBdPko1V83A="; + hash = "sha256-UTP5LuZbBukfDpQPJ+N5ZFtKGFJppZfpsISnsm9eabs="; }; propagatedBuildInputs = [ From 93eb7f89b8b96e063fd1ef8c9647bed6ddd8698e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 7 Jun 2022 23:22:26 +0200 Subject: [PATCH 195/245] python310Packages.pyroute2-ndb: 0.6.10 -> 0.6.11 --- pkgs/development/python-modules/pyroute2-ndb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyroute2-ndb/default.nix b/pkgs/development/python-modules/pyroute2-ndb/default.nix index b0e123bc4c4b..9bf7414c79ff 100644 --- a/pkgs/development/python-modules/pyroute2-ndb/default.nix +++ b/pkgs/development/python-modules/pyroute2-ndb/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pyroute2-ndb"; - version = "0.6.10"; + version = "0.6.11"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pyroute2.ndb"; inherit version; - hash = "sha256-kjgeA7PV6JLvCvaZxe4y984wTo8ExU7Yf1Wr+7jNwu4="; + hash = "sha256-jz956VgO9Z9ZPlMQobB34wd04Og/XV7IP+J58htdk+Y="; }; propagatedBuildInputs = [ From aacc1079c7d7f3546cc4e02f0f84fd45024dd0ee Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 7 Jun 2022 23:22:32 +0200 Subject: [PATCH 196/245] python310Packages.pyroute2-nftables: 0.6.10 -> 0.6.11 --- pkgs/development/python-modules/pyroute2-nftables/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyroute2-nftables/default.nix b/pkgs/development/python-modules/pyroute2-nftables/default.nix index 04f9b29bd56f..a251c34a8b28 100644 --- a/pkgs/development/python-modules/pyroute2-nftables/default.nix +++ b/pkgs/development/python-modules/pyroute2-nftables/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "pyroute2-nftables"; - version = "0.6.10"; + version = "0.6.11"; src = fetchPypi { pname = "pyroute2.nftables"; inherit version; - sha256 = "sha256-dUuCTGs7RaEehsAgK7yNw11tE3VGtT5LxDilMVWpCNU="; + sha256 = "sha256-2SHAH4HBcXknCa2rdHk1s+ju+IN5ndcLPD8dgSGagqU="; }; propagatedBuildInputs = [ From 14368fc622ab66b91493874837a5677efe5ae88f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 7 Jun 2022 23:22:37 +0200 Subject: [PATCH 197/245] python310Packages.pyroute2-nslink: 0.6.10 -> 0.6.11 --- pkgs/development/python-modules/pyroute2-nslink/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyroute2-nslink/default.nix b/pkgs/development/python-modules/pyroute2-nslink/default.nix index 368e9cc9fb55..af4d6a7a01d1 100644 --- a/pkgs/development/python-modules/pyroute2-nslink/default.nix +++ b/pkgs/development/python-modules/pyroute2-nslink/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pyroute2-nslink"; - version = "0.6.10"; + version = "0.6.11"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pyroute2.nslink"; inherit version; - hash = "sha256-PynJRg2pXZIeB4Ucz/tvghdEt1iWAr8azjET9hsnUPE="; + hash = "sha256-R94n1UEceOMmXXbCCkgq6N2JLnp2eqAW4qweIpNI2CI="; }; propagatedBuildInputs = [ From 61332648485146fa10263d959d000f915dbb9d8c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 7 Jun 2022 23:22:43 +0200 Subject: [PATCH 198/245] python310Packages.pyroute2-protocols: 0.6.10 -> 0.6.11 --- .../development/python-modules/pyroute2-protocols/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyroute2-protocols/default.nix b/pkgs/development/python-modules/pyroute2-protocols/default.nix index 401786f7cd60..9cf62994c3a1 100644 --- a/pkgs/development/python-modules/pyroute2-protocols/default.nix +++ b/pkgs/development/python-modules/pyroute2-protocols/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pyroute2-protocols"; - version = "0.6.10"; + version = "0.6.11"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pyroute2.protocols"; inherit version; - hash = "sha256-xMTKAJC++X1zO7rm+cUr0IuEDxkllyje00Omv9tLZ6E="; + hash = "sha256-AnmW9ILlcZh2mwO5fbhY4ZazWSAy2wHJgLp5Anlmxk4="; }; propagatedBuildInputs = [ From 4d10c2ce7f8893cd14abcc001b73ae6b91a0508a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 7 Jun 2022 23:22:49 +0200 Subject: [PATCH 199/245] python310Packages.pyroute2: 0.6.10 -> 0.6.11 --- pkgs/development/python-modules/pyroute2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyroute2/default.nix b/pkgs/development/python-modules/pyroute2/default.nix index 54540197f72b..a95356d58199 100644 --- a/pkgs/development/python-modules/pyroute2/default.nix +++ b/pkgs/development/python-modules/pyroute2/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "pyroute2"; - version = "0.6.10"; + version = "0.6.11"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Vj7W3/yQPYIUFEdvNv3AS9OqddqtISRbcmWUJxc5JiI="; + hash = "sha256-E2NGvmbVUuRUHQZ52/+say4SN9/TnuGpUGL4UCRJF70="; }; propagatedBuildInputs = [ From 1eae6a3c3a01963f6cc8500fd37ad7f2a40785ad Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 7 Jun 2022 23:22:54 +0200 Subject: [PATCH 200/245] python310Packages.pyroute2-ipset: 0.6.10 -> 0.6.11 --- pkgs/development/python-modules/pyroute2-ipset/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyroute2-ipset/default.nix b/pkgs/development/python-modules/pyroute2-ipset/default.nix index 783405f0eafc..967b232cd234 100644 --- a/pkgs/development/python-modules/pyroute2-ipset/default.nix +++ b/pkgs/development/python-modules/pyroute2-ipset/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pyroute2-ipset"; - version = "0.6.10"; + version = "0.6.11"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pyroute2.ipset"; inherit version; - hash = "sha256-1Fk3imqMz9qx1zBcQ/Uyp2eVrTygGIklVF5/QBbuSoI="; + hash = "sha256-uIfclrm1tujUickd5R4uyDHvPExyC2M9mpm5NLF1rts="; }; propagatedBuildInputs = [ From 659e7a4807121278a5a9b0d2fc63d60ff0916710 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 7 Jun 2022 23:25:52 +0200 Subject: [PATCH 201/245] python310Packages.webexteamssdk: 1.6 -> 1.6.1 --- pkgs/development/python-modules/webexteamssdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/webexteamssdk/default.nix b/pkgs/development/python-modules/webexteamssdk/default.nix index e70cdfd96c86..1fe2811477df 100644 --- a/pkgs/development/python-modules/webexteamssdk/default.nix +++ b/pkgs/development/python-modules/webexteamssdk/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "webexteamssdk"; - version = "1.6"; + version = "1.6.1"; src = fetchFromGitHub { owner = "CiscoDevNet"; repo = pname; rev = "v${version}"; - sha256 = "0bw28ag1iqyqlxz83m4qb3r94kipv5mpf3bsvc8zv5vh4dv52bp2"; + sha256 = "sha256-xlkmXl4tVm48drXmkUijv9GNXzJcDnfSKbOMciPIRRo="; }; propagatedBuildInputs = [ From 87807925c47ed18e3e595d75ea6a91eef6443ba8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 7 Jun 2022 23:29:23 +0200 Subject: [PATCH 202/245] python310Packages.webexteamssdk: disable on obsolete Python releases --- .../python-modules/webexteamssdk/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/webexteamssdk/default.nix b/pkgs/development/python-modules/webexteamssdk/default.nix index 1fe2811477df..1e81e90af9a6 100644 --- a/pkgs/development/python-modules/webexteamssdk/default.nix +++ b/pkgs/development/python-modules/webexteamssdk/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , future , pyjwt +, pythonOlder , requests , requests-toolbelt }: @@ -10,12 +11,15 @@ buildPythonPackage rec { pname = "webexteamssdk"; version = "1.6.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "CiscoDevNet"; repo = pname; rev = "v${version}"; - sha256 = "sha256-xlkmXl4tVm48drXmkUijv9GNXzJcDnfSKbOMciPIRRo="; + hash = "sha256-xlkmXl4tVm48drXmkUijv9GNXzJcDnfSKbOMciPIRRo="; }; propagatedBuildInputs = [ @@ -27,7 +31,10 @@ buildPythonPackage rec { # Tests require a Webex Teams test domain doCheck = false; - pythonImportsCheck = [ "webexteamssdk" ]; + + pythonImportsCheck = [ + "webexteamssdk" + ]; meta = with lib; { description = "Python module for Webex Teams APIs"; From ff71240d2e5cbb634b42b4bdb05f5a3cd9622493 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 7 Jun 2022 07:19:17 +1000 Subject: [PATCH 203/245] containerd: 1.6.5 -> 1.6.6 https://github.com/containerd/containerd/releases/tag/v1.6.6 --- pkgs/applications/virtualization/containerd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix index 29be2112896b..8c4fbce8e1e9 100644 --- a/pkgs/applications/virtualization/containerd/default.nix +++ b/pkgs/applications/virtualization/containerd/default.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "containerd"; - version = "1.6.5"; + version = "1.6.6"; src = fetchFromGitHub { owner = "containerd"; repo = "containerd"; rev = "v${version}"; - sha256 = "sha256-WEHhx9xSxzBoViujGc4yNt9K2gSMfU6GFmsYk3WDfu8="; + sha256 = "sha256-cmarbad6VzcGTCHT/NtApkYsK/oo6WZQ//q8Fvh+ez8="; }; vendorSha256 = null; From cf68deab17fde49169ff8d8217d936f7d235385d Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Tue, 7 Jun 2022 11:40:54 -0300 Subject: [PATCH 204/245] terraform-providers.hetznerdns: init at 2.1.0 Signed-off-by: Otavio Salvador --- .../cluster/terraform-providers/providers.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index b8f8a3db736c..db7b11b7c382 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -518,6 +518,15 @@ "vendorSha256": "sha256-HrsjhaMlzs+uel5tBlxJD69Kkjl+4qVisWWREANBx40=", "version": "5.0.2" }, + "hetznerdns": { + "owner": "timohirt", + "provider-source-address": "registry.terraform.io/timohirt/hetznerdns", + "repo": "terraform-provider-hetznerdns", + "rev": "v2.1.0", + "sha256": "sha256-QmD9UlQpyvEz4in1I960J0eC6xNtgk5z8tZUxaApOwE=", + "vendorSha256": "sha256-Bat/S4e5vzT0/XOhJ9zCWLa4IE4owLC6ec1yvEh+c0Y=", + "version": "2.1.0" + }, "htpasswd": { "owner": "loafoe", "provider-source-address": "registry.terraform.io/loafoe/htpasswd", From 7fc4e3b858bb2ab17353f419f9a1587fa3993726 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 7 Jun 2022 23:47:40 +0200 Subject: [PATCH 205/245] python310Packages.pyfxa: switch to pytestCheckHook - add pythonImportsCheck - update pname --- .../python-modules/pyfxa/default.nix | 62 +++++++++++++------ 1 file changed, 44 insertions(+), 18 deletions(-) diff --git a/pkgs/development/python-modules/pyfxa/default.nix b/pkgs/development/python-modules/pyfxa/default.nix index b7b1e61e8877..46a25e2c6bba 100644 --- a/pkgs/development/python-modules/pyfxa/default.nix +++ b/pkgs/development/python-modules/pyfxa/default.nix @@ -1,38 +1,64 @@ -{ lib, buildPythonPackage, fetchPypi -, requests, cryptography, pybrowserid, hawkauthlib, six -, grequests, mock, responses, pytest, pyjwt, setuptools }: +{ lib +, buildPythonPackage +, cryptography +, fetchPypi +, grequests +, hawkauthlib +, mock +, pybrowserid +, pyjwt +, pytestCheckHook +, pythonOlder +, requests +, responses +, setuptools +, six +}: buildPythonPackage rec { - pname = "PyFxA"; + pname = "pyfxa"; version = "0.7.7"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - sha256 = "6c85cd08cf05f7138dee1cf2a8a1d68fd428b7b5ad488917c70a2a763d651cdb"; + pname = "PyFxA"; + inherit version; + hash = "sha256-bIXNCM8F9xON7hzyqKHWj9Qot7WtSIkXxwoqdj1lHNs="; }; - postPatch = '' - # Requires network access - rm fxa/tests/test_core.py - ''; - propagatedBuildInputs = [ - pyjwt requests cryptography pybrowserid hawkauthlib six + cryptography + hawkauthlib + pybrowserid + pyjwt + requests setuptools # imports pkg_resources + six ]; checkInputs = [ - grequests mock responses pytest + grequests + mock + responses + pytestCheckHook ]; - # test_oath is mostly network calls - checkPhase = '' - pytest --ignore=fxa/tests/test_oauth.py - ''; + pythonImportsCheck = [ + "fxa" + ]; + + disabledTestPaths = [ + # Requires network access + "fxa/tests/test_core.py" + "fxa/tests/test_oauth.py" + ]; meta = with lib; { - description = "Firefox Accounts client library for Python"; + description = "Firefox Accounts client library"; homepage = "https://github.com/mozilla/PyFxA"; license = licenses.mpl20; + maintainers = with maintainers; [ ]; }; } From fa1d382bd6944b7b2d9f753b455b08ae99b075f1 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Tue, 7 Jun 2022 11:41:13 -0400 Subject: [PATCH 206/245] python3Packages.validphys2: add missing dependencies Those are needed for the report generation. --- pkgs/development/python-modules/validphys2/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/development/python-modules/validphys2/default.nix b/pkgs/development/python-modules/validphys2/default.nix index d434cbcc621c..c417cb47e2d3 100644 --- a/pkgs/development/python-modules/validphys2/default.nix +++ b/pkgs/development/python-modules/validphys2/default.nix @@ -1,7 +1,12 @@ { lib , buildPythonPackage +, lhapdf , nnpdf +, prompt-toolkit , reportengine +, requests +, seaborn +, validobj }: buildPythonPackage rec { @@ -21,8 +26,13 @@ buildPythonPackage rec { ''; propagatedBuildInputs = [ + lhapdf nnpdf + prompt-toolkit reportengine + requests + seaborn + validobj ]; doCheck = false; # no tests From 273f614b44d99e29f48b62a93505522b90e1aa85 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Wed, 8 Jun 2022 00:43:09 +0200 Subject: [PATCH 207/245] authy: 2.1.0 -> 2.2.0 (#175206) --- pkgs/applications/misc/authy/default.nix | 91 ++++-------------------- 1 file changed, 12 insertions(+), 79 deletions(-) diff --git a/pkgs/applications/misc/authy/default.nix b/pkgs/applications/misc/authy/default.nix index 1dfe075fa840..c448b86d0c4d 100644 --- a/pkgs/applications/misc/authy/default.nix +++ b/pkgs/applications/misc/authy/default.nix @@ -1,79 +1,21 @@ -{ alsa-lib -, at-spi2-atk -, at-spi2-core -, atk -, autoPatchelfHook -, cairo -, cups -, dbus -, electron_9 -, expat +{ autoPatchelfHook +, electron , fetchurl -, gdk-pixbuf -, glib -, gtk3 , lib -, libappindicator-gtk3 -, libdbusmenu-gtk3 -, libuuid , makeWrapper -, nspr -, nss -, pango , squashfsTools , stdenv -, systemd -, xorg }: -let - # Currently only works with electron 9 - electron = electron_9; -in - stdenv.mkDerivation rec { pname = "authy"; # curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/authy?channel=stable' | jq '.download_url,.version' - version = "2.1.0"; - rev = "9"; - - buildInputs = [ - alsa-lib - at-spi2-atk - at-spi2-core - atk - cairo - cups - dbus - expat - gdk-pixbuf - glib - gtk3 - libappindicator-gtk3 - libdbusmenu-gtk3 - libuuid - nspr - nss - pango - stdenv.cc.cc - systemd - xorg.libX11 - xorg.libXScrnSaver - xorg.libXcomposite - xorg.libXcursor - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXi - xorg.libXrandr - xorg.libXrender - xorg.libXtst - xorg.libxcb - ]; + version = "2.2.0"; + rev = "10"; src = fetchurl { url = "https://api.snapcraft.io/api/v1/snaps/download/H8ZpNgIoPyvmkgxOWw5MSzsXK1wRZiHn_${rev}.snap"; - sha256 = "sha256-RxjxOYrbneVctyTJTMvoN/UdREohaZWb1kTdEeI6mUU="; + sha256 = "sha256-sB9/fVV/qp+DfjxpvzIUHsLkeEu35i2rEv1/JYMytG8="; }; nativeBuildInputs = [ autoPatchelfHook makeWrapper squashfsTools ]; @@ -95,25 +37,16 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - mkdir -p $out/lib/ + mkdir -p $out/bin $out/share/applications $out/share/pixmaps/apps - cp -r ./* $out/ - rm -R ./* - - # The snap package has the `ffmpeg.so` file which is copied over with other .so files - mv $out/*.so $out/lib/ + # Copy only what is needed + cp -r resources* $out/ + cp -r locales* $out/ + cp meta/gui/authy.desktop $out/share/applications/ + cp meta/gui/icon.png $out/share/pixmaps/authy.png # Replace icon name in Desktop file - sed -i 's|''${SNAP}/meta/gui/icon.png|authy|g' "$out/meta/gui/authy.desktop" - - # Move the desktop file, icon, binary to their appropriate locations - mkdir -p $out/bin $out/share/applications $out/share/pixmaps/apps - cp $out/meta/gui/authy.desktop $out/share/applications/ - cp $out/meta/gui/icon.png $out/share/pixmaps/authy.png - cp $out/${pname} $out/bin/${pname} - - # Cleanup - rm -r $out/{data-dir,gnome-platform,meta,scripts,usr,*.sh,*.so} + sed -i 's|''${SNAP}/meta/gui/icon.png|authy|g' "$out/share/applications/authy.desktop" runHook postInstall ''; From 835be707da447620d2684160782b8283104b2551 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 5 Jun 2022 04:20:00 +0000 Subject: [PATCH 208/245] bzip3: fix build on darwin --- pkgs/tools/compression/bzip3/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/compression/bzip3/default.nix b/pkgs/tools/compression/bzip3/default.nix index 7fce055ce9fc..fa9b5d0845df 100644 --- a/pkgs/tools/compression/bzip3/default.nix +++ b/pkgs/tools/compression/bzip3/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-arch-native" - ]; + ] ++ lib.optionals stdenv.isDarwin [ "--disable-link-time-optimization" ]; meta = { description = "A better and stronger spiritual successor to BZip2"; @@ -36,7 +36,6 @@ stdenv.mkDerivation rec { changelog = "https://github.com/kspalaiologos/bzip3/blob/${src.rev}/NEWS"; license = lib.licenses.lgpl3Plus; maintainers = with lib.maintainers; [ dotlambda ]; - # upstream supports Darwin but I couldn't get it to work - platforms = lib.platforms.linux; + platforms = lib.platforms.unix; }; } From 712272f895ddb626727ed4049603f4725a935f7a Mon Sep 17 00:00:00 2001 From: patternspandemic Date: Tue, 7 Jun 2022 17:16:45 -0700 Subject: [PATCH 209/245] kodestudio: Remove. The nix package was way out of date and unmaintained. --- .../editors/kodestudio/default.nix | 135 ------------------ pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 3 files changed, 1 insertion(+), 137 deletions(-) delete mode 100644 pkgs/applications/editors/kodestudio/default.nix diff --git a/pkgs/applications/editors/kodestudio/default.nix b/pkgs/applications/editors/kodestudio/default.nix deleted file mode 100644 index 2620a87ce425..000000000000 --- a/pkgs/applications/editors/kodestudio/default.nix +++ /dev/null @@ -1,135 +0,0 @@ -{ stdenv, lib, fetchurl, makeDesktopItem, makeWrapper -, # Patchelf dependencies: - alsa-lib, atomEnv, boehmgc, flac, libogg, libvorbis, libXScrnSaver, libGLU, libGL -, openssl, xorg, zlib -}: - -let - - version = "17.1"; - - sha256 = if stdenv.hostPlatform.system == "x86_64-linux" then "1kddisnvlk48jip6k59mw3wlkrl7rkck2lxpaghn0gfx02cvms5f" - else if stdenv.hostPlatform.system == "i686-cygwin" then "1izp42afrlh4yd322ax9w85ki388gnkqfqbw8dwnn4k3j7r5487z" - else throw "Unsupported system: ${stdenv.hostPlatform.system}"; - - urlBase = "https://github.com/Kode/KodeStudio/releases/download/v${version}/KodeStudio-"; - - urlStr = if stdenv.hostPlatform.system == "x86_64-linux" then urlBase + "linux64.tar.gz" - else if stdenv.hostPlatform.system == "i686-cygwin" then urlBase + "win32.zip" - else throw "Unsupported system: ${stdenv.hostPlatform.system}"; - -in - - stdenv.mkDerivation { - pname = "kodestudio"; - inherit version; - - src = fetchurl { - url = urlStr; - inherit sha256; - }; - - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ libXScrnSaver ]; - - desktopItem = makeDesktopItem { - name = "kodestudio"; - exec = "kodestudio"; - icon = "kodestudio"; - comment = "Kode Studio is an IDE for Kha based on Visual Studio Code"; - desktopName = "Kode Studio"; - genericName = "Text Editor"; - categories = [ "GNOME" "GTK" "Utility" "TextEditor" "Development" ]; - }; - - sourceRoot = "."; - - installPhase = '' - mkdir -p $out - cp -r ./* $out - ''; - - postFixup = lib.optionalString (stdenv.hostPlatform.system == "i686-linux" || stdenv.hostPlatform.system == "x86_64-linux") '' - # Patch Binaries - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "$out:${atomEnv.libPath}" \ - $out/kodestudio - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ".:${stdenv.cc.libc}/lib:${xorg.libXinerama}/lib:${xorg.libX11}/lib:${alsa-lib}/lib:${libGL}/lib:${libGLU}/lib:${lib.getLib openssl}/lib" \ - $out/resources/app/extensions/krom/Krom/linux/Krom - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ".:${stdenv.cc.libc}/lib" \ - $out/resources/app/extensions/kha/Kha/Kore/Tools/krafix/krafix-linux64 - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ".:${stdenv.cc.libc}/lib" \ - $out/resources/app/extensions/kha/Kha/Kore/Tools/kraffiti/kraffiti-linux64 - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ".:${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib" \ - $out/resources/app/extensions/kha/Kha/Tools/kravur/kravur-linux64 - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ".:${stdenv.cc.libc}/lib:${zlib}/lib" \ - $out/resources/app/extensions/kha/Kha/Tools/haxe/haxe-linux64 - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ".:${stdenv.cc.libc}/lib:${libvorbis}/lib:${libogg}/lib:${flac.out}/lib" \ - $out/resources/app/extensions/kha/Kha/Tools/oggenc/oggenc-linux64 - - # Patch Shared Objects - patchelf --set-rpath ".:${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib" $out/libnode.so - patchelf --set-rpath ".:${stdenv.cc.libc}/lib" $out/libffmpeg.so - patchelf --set-rpath ".:${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib" $out/resources/app/extensions/krom/Krom/linux/libv8_libplatform.so - patchelf --set-rpath ".:${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib" $out/resources/app/extensions/krom/Krom/linux/libicuuc.so - patchelf --set-rpath ".:${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib" $out/resources/app/extensions/krom/Krom/linux/libv8_libbase.so - patchelf --set-rpath ".:${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib" $out/resources/app/extensions/krom/Krom/linux/libv8.so - patchelf --set-rpath ".:${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib" $out/resources/app/extensions/krom/Krom/linux/libicui18n.so - patchelf --set-rpath ".:${stdenv.cc.libc}/lib:${boehmgc}/lib" $out/resources/app/extensions/kha/Kha/Backends/Kore/khacpp/project/libs/nekoapi/bin/RPi/libneko.so - patchelf --set-rpath ".:${stdenv.cc.libc}/lib:${boehmgc}/lib" $out/resources/app/extensions/kha/Kha/Backends/Kore/khacpp/project/libs/nekoapi/bin/Linux64/libneko.so - patchelf --set-rpath ".:${stdenv.cc.libc}/lib:${boehmgc}/lib" $out/resources/app/extensions/kha/Kha/Backends/Kore/khacpp/project/libs/nekoapi/bin/Linux/libneko.so - patchelf --set-rpath ".:${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib" $out/resources/app/node_modules/pty.js/build/Release/pty.node - patchelf --set-rpath ".:${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib" $out/resources/app/node_modules/gc-signals/build/Release/gcsignals.node - patchelf --set-rpath ".:${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib" $out/resources/app/node_modules/gc-signals/build/Release/obj.target/gcsignals.node - patchelf --set-rpath ".:${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib" $out/resources/app/node_modules/oniguruma/build/Release/onig_scanner.node - patchelf --set-rpath ".:${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib" $out/resources/app/node_modules/oniguruma/build/Release/obj.target/onig_scanner.node - patchelf --set-rpath ".:${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib:${xorg.libX11}/lib" $out/resources/app/node_modules/native-keymap/build/Release/keymapping.node - patchelf --set-rpath ".:${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib:${xorg.libX11}/lib" $out/resources/app/node_modules/native-keymap/build/Release/obj.target/keymapping.node - - # Rewrite VSCODE_PATH inside bin/kodestudio to $out - substituteInPlace $out/bin/kodestudio --replace "/usr/share/kodestudio" $out - - # Patch library calls that expects nix store files to be mode 644: - # A stat is made on srcFile (in the nix store), and its mode used - # for destFile, but it expects the mode to be read write, whereas - # all regular files in the nix store are made read only. - # (33188 is 100644 octal, the required mode) - substituteInPlace $out/resources/app/extensions/kha/Kha/Tools/khamake/node_modules/fs-extra/lib/copy-sync/copy-file-sync.js --replace "stat.mode" "33188" - substituteInPlace $out/resources/app/extensions/kha/Kha/Kore/Tools/koremake/node_modules/fs-extra/lib/copy-sync/copy-file-sync.js --replace "stat.mode" "33188" - - # Wrap preload libXss - wrapProgram $out/bin/kodestudio \ - --prefix LD_PRELOAD : ${lib.makeLibraryPath [ libXScrnSaver ]}/libXss.so.1 - ''; - - meta = with lib; { - description = '' - An IDE for Kha based on Visual Studio Code - ''; - longDescription = '' - Kode Studio is an IDE for Kha based on Visual Studio Code. - - Kha and Kore are multimedia frameworks for Haxe and C++ respectively - (with JavaScript coming soon). Using Kha or Kore you can access all - hardware at the lowest possible level in a completely portable way. - ''; - homepage = "http://kode.tech/"; - downloadPage = "https://github.com/Kode/KodeStudio/releases"; - license = licenses.mit; - maintainers = [ maintainers.patternspandemic ]; - platforms = [ "x86_64-linux" "i686-cygwin" ]; - }; - } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 6894ed5335cb..1fc44abf1ab8 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -662,6 +662,7 @@ mapAliases ({ kinetic-cpp-client = throw "kinetic-cpp-client has been removed from nixpkgs, as it's abandoned"; # Added 2020-04-28 kino = throw "kino has been removed because it was broken and abandoned"; # Added 2021-04-25 knockknock = throw "knockknock has been removed from nixpkgs because the upstream project is abandoned"; # Added 2022-01-01 + kodestudio = throw "kodestudio has been removed from nixpkgs, as the nix package has been long unmaintained and out of date."; # Added 2022-06-07 kodiGBM = kodi-gbm; kodiPlain = kodi; kodiPlainWayland = kodi-wayland; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6dccba0a65e4..22df9a37bda7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27586,8 +27586,6 @@ with pkgs; kn = callPackage ../applications/networking/cluster/kn { }; - kodestudio = callPackage ../applications/editors/kodestudio { }; - kondo = callPackage ../applications/misc/kondo { }; konversation = libsForQt5.callPackage ../applications/networking/irc/konversation { }; From e94f0231b72af69410b6715a2973bf108e3aa655 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 Jun 2022 01:37:01 +0000 Subject: [PATCH 210/245] python310Packages.mkdocs-material: 8.3.2 -> 8.3.3 --- pkgs/development/python-modules/mkdocs-material/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mkdocs-material/default.nix b/pkgs/development/python-modules/mkdocs-material/default.nix index a55ca5cb2924..1cdf9d883a7d 100644 --- a/pkgs/development/python-modules/mkdocs-material/default.nix +++ b/pkgs/development/python-modules/mkdocs-material/default.nix @@ -13,7 +13,7 @@ buildPythonApplication rec { pname = "mkdocs-material"; - version = "8.3.2"; + version = "8.3.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonApplication rec { owner = "squidfunk"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-VcyBsIU2PJ2xh365kNAlO3wno3xushlaj43dIh1GkP8="; + hash = "sha256-4rJ1fKYIQli4j6x1/xipQeCXMfbILyroxrwbpcPGYiU="; }; propagatedBuildInputs = [ From fad47110258f30a43492c288f33bc52412ee7fd0 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 8 Jun 2022 12:14:45 +1000 Subject: [PATCH 211/245] easyjson: remove unnecessary `deps.nix` --- pkgs/development/tools/easyjson/deps.nix | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 pkgs/development/tools/easyjson/deps.nix diff --git a/pkgs/development/tools/easyjson/deps.nix b/pkgs/development/tools/easyjson/deps.nix deleted file mode 100644 index d5d7e1f15bc9..000000000000 --- a/pkgs/development/tools/easyjson/deps.nix +++ /dev/null @@ -1,11 +0,0 @@ -[ - { - goPackagePath = "github.com/josharian/intern"; - fetch = { - type = "git"; - url = "https://github.com/josharian/intern"; - rev = "8e6ff32b3e7c0b018c43953085fe2ac330fe9acd"; - sha256 = "1za48ppvwd5vg8vv25ldmwz1biwpb3p6qhf8vazhsfdg9m07951c"; - }; - } -] From 09570ee4a943b5b3e686f71fa93e4745e33316d3 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 8 Jun 2022 12:14:45 +1000 Subject: [PATCH 212/245] goa: remove unnecessary `deps.nix` --- pkgs/development/tools/goa/deps.nix | 75 ----------------------------- 1 file changed, 75 deletions(-) delete mode 100644 pkgs/development/tools/goa/deps.nix diff --git a/pkgs/development/tools/goa/deps.nix b/pkgs/development/tools/goa/deps.nix deleted file mode 100644 index bfe862a4006a..000000000000 --- a/pkgs/development/tools/goa/deps.nix +++ /dev/null @@ -1,75 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 -[ - { - goPackagePath = "github.com/dimfeld/httppath"; - fetch = { - type = "git"; - url = "https://github.com/dimfeld/httppath"; - rev = "ee938bf735983d53694d79138ad9820efff94c92"; - sha256 = "1c1kic8g3r78g6h4xl8n2ac1waxsb9fqz40k20ypi08k24mv3ha9"; - }; - } - { - goPackagePath = "github.com/gofrs/uuid"; - fetch = { - type = "git"; - url = "https://github.com/gofrs/uuid"; - rev = "e684523faa0581e44663968f097d478c499d4276"; - sha256 = "1p2md0bmfnn7kaa866fnb8lfnmlzzb8wfhp4ym5915p8mv4whxgz"; - }; - } - { - goPackagePath = "github.com/manveru/faker"; - fetch = { - type = "git"; - url = "https://github.com/manveru/faker"; - rev = "9fbc68a78c4dbc7914e1a23f88f126bea4383b97"; - sha256 = "1cnrf4wdjhxd9fryhlp2krl9acz6dzwic89gshs49pg3aajlf4dy"; - }; - } - { - goPackagePath = "github.com/spf13/cobra"; - fetch = { - type = "git"; - url = "https://github.com/spf13/cobra"; - rev = "4dab30cb33e6633c33c787106bafbfbfdde7842d"; - sha256 = "1g7p7c2azqaxbfkx5yaznk0z1inqnajlbwv921k6vh8i1xdblxk5"; - }; - } - { - goPackagePath = "github.com/spf13/pflag"; - fetch = { - type = "git"; - url = "https://github.com/spf13/pflag"; - rev = "1ce0cc6db4029d97571db82f85092fccedb572ce"; - sha256 = "02wsc01npnpc7srqw7rzaihn2hjmrkfy2x412fxbb675j2hk9cx6"; - }; - } - { - goPackagePath = "github.com/zach-klippenstein/goregen"; - fetch = { - type = "git"; - url = "https://github.com/zach-klippenstein/goregen"; - rev = "795b5e3961ea1912fde60af417ad85e86acc0d6a"; - sha256 = "113kx47ryhyb803v8ckizlrc34cmwcwb0h28v34bahd2mir8nq3l"; - }; - } - { - goPackagePath = "golang.org/x/tools"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/tools"; - rev = "a754db16a40a9d94359b6600b825419c0ca6f986"; - sha256 = "0n0cwb2szcjbyncqhdia77spcjsbm05jcgpnh0i8rdr16ixwanyq"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "51d6538a90f86fe93ac480b35f37b2be17fef232"; - sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa"; - }; - } -] From c1e680f8da4af10af2b1a79775e8797ee26e31e3 Mon Sep 17 00:00:00 2001 From: Matt Huszagh Date: Sun, 15 May 2022 09:38:00 -0700 Subject: [PATCH 213/245] =?UTF-8?q?inkscape:=201.1.2=20=E2=86=92=201.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://inkscape.org/news/2022/05/16/inkscape-12/ https://media.inkscape.org/media/doc/release_notes/1.2/Inkscape_1.2.html Needed to add some Python dependencies: - appdirs, beautifulsoup4, cachecontrol, requests and pygobject3 (gi) for clipart importer - cssselect and numpy for inkex - pygobject3 for inkex.gui Co-authored-by: Jan Tojnar --- .../graphics/inkscape/default.nix | 28 ++++++------------- .../python-modules/inkex/default.nix | 6 ++++ 2 files changed, 15 insertions(+), 19 deletions(-) diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index 75bfe5cff93d..4a6e28c3cf07 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -5,7 +5,6 @@ , cairo , cmake , fetchurl -, fetchpatch , gettext , ghostscript , glib @@ -44,20 +43,25 @@ let python3Env = python3.withPackages (ps: with ps; [ + appdirs + beautifulsoup4 + cachecontrol numpy lxml pillow scour pyserial - ]); + requests + pygobject3 + ] ++ inkex.propagatedBuildInputs); in stdenv.mkDerivation rec { pname = "inkscape"; - version = "1.1.2"; + version = "1.2"; src = fetchurl { - url = "https://media.inkscape.org/dl/resources/file/${pname}-${version}.tar.xz"; - sha256 = "sha256-P/5UoG0LJaTNi260JFNu8e0gW+E0Q6Oc1DfIx7ibltE="; + url = "https://media.inkscape.org/dl/resources/file/inkscape-${version}.tar.xz"; + sha256 = "jZsxFCVUlFZk7f7+LWtVkQpQmXZfcXanEQfDTx3N5q0="; }; # Inkscape hits the ARGMAX when linking on macOS. It appears to be @@ -73,20 +77,6 @@ stdenv.mkDerivation rec { # e.g., those from the "Effects" menu. python3 = "${python3Env}/bin/python"; }) - - # Fix build with poppler 22.03 - # https://gitlab.com/inkscape/inkscape/-/merge_requests/4187 - (fetchpatch { - url = "https://gitlab.com/inkscape/inkscape/-/commit/a18c57ffff313fd08bc8a44f6b6bf0b01d7e9b75.patch"; - sha256 = "UZb8ZTtfA5667uo5ZlVQ5vPowiSgd4ItAJ9U1BOsRQg="; - }) - - # Fix build with poppler 22.04 - # https://gitlab.com/inkscape/inkscape/-/merge_requests/4266 - (fetchpatch { - url = "https://gitlab.com/inkscape/inkscape/-/commit/d989cdf1059c78bc3bb6414330242073768d640b.patch"; - sha256 = "2cJZdunbRgPIwhJgz1dQoQRw3ZYZ2Fp6c3hpVBV2PbE="; - }) ]; postPatch = '' diff --git a/pkgs/development/python-modules/inkex/default.nix b/pkgs/development/python-modules/inkex/default.nix index c1c5479dfd8f..3f8bc99eeb6b 100644 --- a/pkgs/development/python-modules/inkex/default.nix +++ b/pkgs/development/python-modules/inkex/default.nix @@ -1,6 +1,9 @@ { buildPythonPackage , inkscape +, cssselect , lxml +, numpy +, pygobject3 , python }: @@ -11,7 +14,10 @@ buildPythonPackage { format = "other"; propagatedBuildInputs = [ + cssselect lxml + numpy + pygobject3 ]; # We just copy the files. From 63a13dba06c8a44b0cf83dc278ea442e9c67cb45 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 Jun 2022 04:00:41 +0000 Subject: [PATCH 214/245] inotify-tools: 3.22.1.0 -> 3.22.6.0 --- pkgs/development/tools/misc/inotify-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/inotify-tools/default.nix b/pkgs/development/tools/misc/inotify-tools/default.nix index b382cc51fa1e..8c5671605d55 100644 --- a/pkgs/development/tools/misc/inotify-tools/default.nix +++ b/pkgs/development/tools/misc/inotify-tools/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "inotify-tools"; - version = "3.22.1.0"; + version = "3.22.6.0"; src = fetchFromGitHub { repo = "inotify-tools"; owner = "inotify-tools"; rev = version; - sha256 = "sha256-I0kr+wFUWnovH9MXVsGaCBtp4+RnnMWD7sPecI3xz+Y="; + sha256 = "sha256-EYWVSgwoMjAlc/V5kv+2jfxEqWVW/lEoIxVd+ctEMsk="; }; nativeBuildInputs = [ autoreconfHook ]; From 36962c4c397e7a00a39616cad40641498ae2f769 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 Jun 2022 05:33:04 +0000 Subject: [PATCH 215/245] python310Packages.xknx: 0.21.3 -> 0.21.4 --- pkgs/development/python-modules/xknx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xknx/default.nix b/pkgs/development/python-modules/xknx/default.nix index 87a0fd54d2d9..5b5de10973f5 100644 --- a/pkgs/development/python-modules/xknx/default.nix +++ b/pkgs/development/python-modules/xknx/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "xknx"; - version = "0.21.3"; + version = "0.21.4"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "XKNX"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-AGKozbVdXfRPvaU1Et8GFu3vdNRLA8ZiV8Xc6T7BhOQ="; + sha256 = "sha256-eKbEeW+pa8lUbbzcvexURa6raN3HFzIWjwqE3L80KTY="; }; propagatedBuildInputs = [ From ee8a4e36152edef4599e7475c86bcb4171acc12a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 Jun 2022 06:20:40 +0000 Subject: [PATCH 216/245] python310Packages.databricks-connect: 9.1.16 -> 9.1.17 --- .../development/python-modules/databricks-connect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/databricks-connect/default.nix b/pkgs/development/python-modules/databricks-connect/default.nix index 2a67ef167c54..b271861e2789 100644 --- a/pkgs/development/python-modules/databricks-connect/default.nix +++ b/pkgs/development/python-modules/databricks-connect/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "databricks-connect"; - version = "9.1.16"; + version = "9.1.17"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-agdky7AhRuObU9GT8IpdgB3SWdHDBRnuoaAtYAlCv/4="; + sha256 = "sha256-QBGeXZ8zvRRjmKGs0vyBWTvcug3PF/BFV2asYTqsScw="; }; sourceRoot = "."; From 364e63d1640edc7abeac8ac44bd86cc806f9f33b Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Wed, 8 Jun 2022 08:26:50 +0100 Subject: [PATCH 217/245] fbpanel: add -fcommon workaround Workaround build failure on -fno-common toolchains like upstream gcc-10. Otherwise build fails as: ld: plugin.o:(.bss+0x0): multiple definition of `stam'; panel.o:(.bss+0x20): first defined here --- pkgs/applications/window-managers/fbpanel/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/window-managers/fbpanel/default.nix b/pkgs/applications/window-managers/fbpanel/default.nix index 1a87f29f67cd..33a313eb8eec 100644 --- a/pkgs/applications/window-managers/fbpanel/default.nix +++ b/pkgs/applications/window-managers/fbpanel/default.nix @@ -19,6 +19,10 @@ stdenv.mkDerivation rec { --replace "CFLAGSX =" "CFLAGSX = -I${gdk-pixbuf-xlib.dev}/include/gdk-pixbuf-2.0" ''; + # Workaround build failure on -fno-common toolchains like upstream + # gcc-10. Otherwise build fails as: + # ld: plugin.o:(.bss+0x0): multiple definition of `stam'; panel.o:(.bss+0x20): first defined here + NIX_CFLAGS_COMPILE = "-fcommon"; NIX_LDFLAGS="-lX11"; meta = with lib; { From 465622ad432e99c3c5f88f324d3b7043e509d847 Mon Sep 17 00:00:00 2001 From: linsui Date: Wed, 8 Jun 2022 15:36:20 +0800 Subject: [PATCH 218/245] apksigner: fix for gradle_5 --- pkgs/development/tools/apksigner/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/apksigner/default.nix b/pkgs/development/tools/apksigner/default.nix index e7afa7189c22..854e913dd58e 100644 --- a/pkgs/development/tools/apksigner/default.nix +++ b/pkgs/development/tools/apksigner/default.nix @@ -23,6 +23,7 @@ stdenv.mkDerivation rec { cat >> build.gradle < Date: Wed, 8 Jun 2022 08:37:46 +0100 Subject: [PATCH 219/245] gcl: add -fcommon workaround Workaround build failure on -fno-common toolchains like upstream gcc-10. Otherwise build fails as: ld: ./libgclp.a(user_match.o):(.bss+0x18): multiple definition of `tf'; ./libpre_gcl.a(main.o):(.bss+0x326d90): first defined here --- pkgs/development/compilers/gcl/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/gcl/default.nix b/pkgs/development/compilers/gcl/default.nix index 6d0471dacbb5..e6ccc2598035 100644 --- a/pkgs/development/compilers/gcl/default.nix +++ b/pkgs/development/compilers/gcl/default.nix @@ -40,7 +40,10 @@ stdenv.mkDerivation rec { hardeningDisable = [ "pic" "bindnow" ]; - NIX_CFLAGS_COMPILE = "-fgnu89-inline"; + # -fcommon: workaround build failure on -fno-common toolchains: + # ld: ./libgclp.a(user_match.o):(.bss+0x18): multiple definition of + # `tf'; ./libpre_gcl.a(main.o):(.bss+0x326d90): first defined here + NIX_CFLAGS_COMPILE = "-fgnu89-inline -fcommon"; meta = with lib; { description = "GNU Common Lisp compiler working via GCC"; From 321e60b24bc477e80b5b7266953cfefe256e1396 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 Jun 2022 07:39:19 +0000 Subject: [PATCH 220/245] python310Packages.dash: 2.4.1 -> 2.5.0 --- pkgs/development/python-modules/dash/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dash/default.nix b/pkgs/development/python-modules/dash/default.nix index 6aaabe3c744a..db24500f25b2 100644 --- a/pkgs/development/python-modules/dash/default.nix +++ b/pkgs/development/python-modules/dash/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "dash"; - version = "2.4.1"; + version = "2.5.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "plotly"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-7B1LEcEgUGJ/gDCDD4oURqli8I5YTJo9jl7l4E1aLVQ="; + sha256 = "sha256-Qh5oOkTxEbxXXDX+g9TDa5DiYBlMpnx0yKsn/XMfMF0="; }; propagatedBuildInputs = [ From 18aaa33f07a5193c18448d6f382a3c6662842ffc Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 29 May 2022 15:45:15 +0200 Subject: [PATCH 221/245] =?UTF-8?q?ocamlPackages.elpi:=201.14.1=20?= =?UTF-8?q?=E2=86=92=201.15.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../development/ocaml-modules/elpi/default.nix | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/pkgs/development/ocaml-modules/elpi/default.nix b/pkgs/development/ocaml-modules/elpi/default.nix index 40d1c3d9b31c..098f9f3ca512 100644 --- a/pkgs/development/ocaml-modules/elpi/default.nix +++ b/pkgs/development/ocaml-modules/elpi/default.nix @@ -1,13 +1,16 @@ { lib , buildDunePackage, camlp5 +, ocaml +, menhir, menhirLib , re, perl, ncurses , ppxlib, ppx_deriving , ppxlib_0_15, ppx_deriving_0_15 , coqPackages -, version ? "1.14.1" +, version ? if lib.versionAtLeast ocaml.version "4.07" then "1.15.0" else "1.14.1" }: with lib; let fetched = coqPackages.metaFetch ({ + release."1.15.0".sha256 = "sha256:1ngdc41sgyzyz3i3lkzjhnj66gza5h912virkh077dyv17ysb6ar"; release."1.14.1".sha256 = "sha256-BZPVL8ymjrE9kVGyf6bpc+GA2spS5JBpkUtZi04nPis="; release."1.13.7".sha256 = "10fnwz30bsvj7ii1vg4l1li5pd7n0qqmwj18snkdr5j9gk0apc1r"; release."1.13.5".sha256 = "02a6r23mximrdvs6kgv6rp0r2dgk7zynbs99nn7lphw2c4189kka"; @@ -23,11 +26,16 @@ buildDunePackage rec { pname = "elpi"; inherit (fetched) version src; - minimumOCamlVersion = "4.04"; + minimalOCamlVersion = "4.04"; - buildInputs = [ perl ncurses ]; + buildInputs = [ perl ncurses ] + ++ optional (versionAtLeast version "1.15" || version == "dev") menhir; - propagatedBuildInputs = [ camlp5 re ] + propagatedBuildInputs = [ re ] + ++ (if versionAtLeast version "1.15" || version == "dev" + then [ menhirLib ] + else [ camlp5 ] + ) ++ (if lib.versionAtLeast version "1.13" || version == "dev" then [ ppxlib ppx_deriving ] else [ ppxlib_0_15 ppx_deriving_0_15 ] @@ -43,6 +51,4 @@ buildDunePackage rec { postPatch = '' substituteInPlace elpi_REPL.ml --replace "tput cols" "${ncurses}/bin/tput cols" ''; - - useDune2 = true; } From f7373e4932d73da83f6c59b8d28bf53faf97ca2f Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 7 Jun 2022 14:51:16 +0200 Subject: [PATCH 222/245] =?UTF-8?q?ocamlPackages.elpi:=201.15.0=20?= =?UTF-8?q?=E2=86=92=201.15.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Pierre Roux --- pkgs/development/ocaml-modules/elpi/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/elpi/default.nix b/pkgs/development/ocaml-modules/elpi/default.nix index 098f9f3ca512..3b133407c30a 100644 --- a/pkgs/development/ocaml-modules/elpi/default.nix +++ b/pkgs/development/ocaml-modules/elpi/default.nix @@ -2,14 +2,16 @@ , buildDunePackage, camlp5 , ocaml , menhir, menhirLib +, stdlib-shims , re, perl, ncurses , ppxlib, ppx_deriving , ppxlib_0_15, ppx_deriving_0_15 , coqPackages -, version ? if lib.versionAtLeast ocaml.version "4.07" then "1.15.0" else "1.14.1" +, version ? if lib.versionAtLeast ocaml.version "4.07" then "1.15.2" else "1.14.1" }: with lib; let fetched = coqPackages.metaFetch ({ + release."1.15.2".sha256 = "sha256-XgopNP83POFbMNyl2D+gY1rmqGg03o++Ngv3zJfCn2s="; release."1.15.0".sha256 = "sha256:1ngdc41sgyzyz3i3lkzjhnj66gza5h912virkh077dyv17ysb6ar"; release."1.14.1".sha256 = "sha256-BZPVL8ymjrE9kVGyf6bpc+GA2spS5JBpkUtZi04nPis="; release."1.13.7".sha256 = "10fnwz30bsvj7ii1vg4l1li5pd7n0qqmwj18snkdr5j9gk0apc1r"; @@ -31,7 +33,7 @@ buildDunePackage rec { buildInputs = [ perl ncurses ] ++ optional (versionAtLeast version "1.15" || version == "dev") menhir; - propagatedBuildInputs = [ re ] + propagatedBuildInputs = [ re stdlib-shims ] ++ (if versionAtLeast version "1.15" || version == "dev" then [ menhirLib ] else [ camlp5 ] From 66a532257d8ede0a0bb425bb412a96692415e920 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 3 Jun 2022 15:13:52 +0200 Subject: [PATCH 223/245] =?UTF-8?q?coqPackages.coq-elpi:=201.13.0=20?= =?UTF-8?q?=E2=86=92=201.14.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/coq-modules/coq-elpi/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/coq-modules/coq-elpi/default.nix b/pkgs/development/coq-modules/coq-elpi/default.nix index 03fe8c32d5c3..4b471b55b482 100644 --- a/pkgs/development/coq-modules/coq-elpi/default.nix +++ b/pkgs/development/coq-modules/coq-elpi/default.nix @@ -6,20 +6,21 @@ with builtins; with lib; let { case = "8.12"; out = { version = "1.12.0"; };} { case = "8.13"; out = { version = "1.13.7"; };} { case = "8.14"; out = { version = "1.13.7"; };} - { case = "8.15"; out = { version = "1.14.1"; };} - ] { version = "1.14.1"; } ); + { case = "8.15"; out = { version = "1.15.0"; };} + ] {} ); in mkCoqDerivation { pname = "elpi"; repo = "coq-elpi"; owner = "LPCIC"; inherit version; defaultVersion = lib.switch coq.coq-version [ - { case = "8.15"; out = "1.13.0"; } + { case = "8.15"; out = "1.14.0"; } { case = "8.14"; out = "1.11.2"; } { case = "8.13"; out = "1.11.1"; } { case = "8.12"; out = "1.8.3_8.12"; } { case = "8.11"; out = "1.6.3_8.11"; } ] null; + release."1.14.0".sha256 = "sha256:1v2p5dlpviwzky2i14cj7gcgf8cr0j54bdm9fl5iz1ckx60j6nvp"; release."1.13.0".sha256 = "1j7s7dlnjbw222gnbrsjgmjck1yrx7h6hwm8zikcyxi0zys17w7n"; release."1.12.1".sha256 = "sha256-4mO6/co7NcIQSGIQJyoO8lNWXr6dqz+bIYPO/G0cPkY="; release."1.11.2".sha256 = "0qk5cfh15y2zrja7267629dybd3irvxk1raz7z8qfir25a81ckd4"; From cf924c74c7f83ffadad77f3258d6986f84af3771 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 8 Jun 2022 09:57:47 +0200 Subject: [PATCH 224/245] python310Packages.quantum-gateway: 0.0.6 -> 0.0.8 --- .../python-modules/quantum-gateway/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/quantum-gateway/default.nix b/pkgs/development/python-modules/quantum-gateway/default.nix index 19b9ae22264a..272899a6bbbd 100644 --- a/pkgs/development/python-modules/quantum-gateway/default.nix +++ b/pkgs/development/python-modules/quantum-gateway/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "quantum-gateway"; - version = "0.0.6"; + version = "0.0.8"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "cisasteelersfan"; repo = "quantum_gateway"; rev = version; - sha256 = "f2LYOr9xJSfbA/1aHfll5lg7r05o855Zkkk9HuRamP8="; + hash = "sha256-jwLfth+UaisPR0p+UHfm6qMXT2eSYWnsYEp0BqyeI9U="; }; propagatedBuildInputs = [ @@ -39,6 +39,11 @@ buildPythonPackage rec { "quantum_gateway" ]; + disabledTests = [ + # Tests require network features + "TestGateway3100" + ]; + meta = with lib; { description = "Python library for interacting with Verizon Fios Quantum gateway devices"; homepage = "https://github.com/cisasteelersfan/quantum_gateway"; From b383999d5034dc6041e61b81a762c3d762dd6d7b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 8 Jun 2022 09:58:53 +0200 Subject: [PATCH 225/245] python310Packages.yolink-api: 0.0.7 -> 0.0.8 --- pkgs/development/python-modules/yolink-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yolink-api/default.nix b/pkgs/development/python-modules/yolink-api/default.nix index 5dcfb9030550..17cd0d345faf 100644 --- a/pkgs/development/python-modules/yolink-api/default.nix +++ b/pkgs/development/python-modules/yolink-api/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "yolink-api"; - version = "0.0.7"; + version = "0.0.8"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "YoSmart-Inc"; repo = pname; rev = "v${version}"; - hash = "sha256-zdCHKckt28abeJ6PQjX50e/4wOl/xx0TKFEQaUIqrYo="; + hash = "sha256-jKyugylgV9B8+PxUPsz4YtQjCfhB8NA2BYMxJOqkIP8="; }; propagatedBuildInputs = [ From 2f9d125d5820ead05c19aa2eeb1a695451958b64 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Wed, 8 Jun 2022 09:03:34 +0100 Subject: [PATCH 226/245] gpredict: pull upstream fix for -fno-common toolchains Without the change build fails on upstream gcc-10 as: ld: save-pass.o:src/qth-data.h:36: multiple definition of `qth_data_type'; gtk-azel-plot.o:src/qth-data.h:36: first defined here --- .../science/astronomy/gpredict/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/science/astronomy/gpredict/default.nix b/pkgs/applications/science/astronomy/gpredict/default.nix index 3f82ff7b52a8..1fd2d4ac2adc 100644 --- a/pkgs/applications/science/astronomy/gpredict/default.nix +++ b/pkgs/applications/science/astronomy/gpredict/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, intltool +{ lib, stdenv, fetchurl, fetchpatch, pkg-config, intltool , gtk3, glib, curl, goocanvas2, gpsd , hamlib, wrapGAppsHook }: @@ -14,6 +14,16 @@ in stdenv.mkDerivation { sha256 = "0hwf97kng1zy8rxyglw04x89p0bg07zq30hgghm20yxiw2xc8ng7"; }; + patches = [ + # Pull upstream fix for -fno-common toolchains: + # https://github.com/csete/gpredict/issues/195 + (fetchpatch { + name = "fno-common.patch"; + url = "https://github.com/csete/gpredict/commit/c565bb3d48777bfe17114b5d01cd81150521f056.patch"; + sha256 = "1jhy9hpqlachq32bkij60q3dxkgi1kkr80rm29jjxqpmambf406a"; + }) + ]; + nativeBuildInputs = [ pkg-config intltool wrapGAppsHook ]; buildInputs = [ curl glib gtk3 goocanvas2 gpsd hamlib ]; From 9dfb84032067505dba8f5771e8cf6090c19c3083 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 8 Jun 2022 10:11:37 +0200 Subject: [PATCH 227/245] python310Packages.dash: add extra dependencies --- .../python-modules/dash/default.nix | 38 ++++++++++++++----- 1 file changed, 28 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/dash/default.nix b/pkgs/development/python-modules/dash/default.nix index db24500f25b2..d29a6321623b 100644 --- a/pkgs/development/python-modules/dash/default.nix +++ b/pkgs/development/python-modules/dash/default.nix @@ -1,17 +1,21 @@ { lib -, buildPythonPackage -, fetchFromGitHub -, plotly -, flask -, flask-compress +, celery , dash-core-components , dash-html-components , dash-table -, pytest-mock +, diskcache +, fetchFromGitHub +, flask +, flask-compress , mock -, pyyaml +, multiprocess +, plotly +, psutil +, pytest-mock , pytestCheckHook , pythonOlder +, pyyaml +, redis }: buildPythonPackage rec { @@ -25,7 +29,7 @@ buildPythonPackage rec { owner = "plotly"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-Qh5oOkTxEbxXXDX+g9TDa5DiYBlMpnx0yKsn/XMfMF0="; + hash = "sha256-Qh5oOkTxEbxXXDX+g9TDa5DiYBlMpnx0yKsn/XMfMF0="; }; propagatedBuildInputs = [ @@ -37,6 +41,18 @@ buildPythonPackage rec { dash-table ]; + passthru.optional-dependencies = { + celery = [ + celery + redis + ]; + diskcache = [ + diskcache + multiprocess + psutil + ]; + }; + checkInputs = [ pytestCheckHook pytest-mock @@ -50,12 +66,14 @@ buildPythonPackage rec { "tests/integration" ]; - pythonImportsCheck = [ "dash" ]; + pythonImportsCheck = [ + "dash" + ]; meta = with lib; { description = "Python framework for building analytical web applications"; homepage = "https://dash.plot.ly/"; license = licenses.mit; - maintainers = [ maintainers.antoinerg ]; + maintainers = with maintainers; [ antoinerg ]; }; } From e6b4eb3b78c949d7e3e05badbe90cc792d9d5c52 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 1 Jun 2022 06:50:34 +0200 Subject: [PATCH 228/245] =?UTF-8?q?qarte:=204.15.1=20=E2=86=92=204.17.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/video/qarte/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/video/qarte/default.nix b/pkgs/applications/video/qarte/default.nix index 5fc62912c24a..dd2a7dadc2f7 100644 --- a/pkgs/applications/video/qarte/default.nix +++ b/pkgs/applications/video/qarte/default.nix @@ -1,15 +1,15 @@ { mkDerivation, lib, fetchbzr, python3, rtmpdump }: let - pythonEnv = python3.withPackages (ps: with ps; [ pyqt5_with_qtmultimedia ]); + pythonEnv = python3.withPackages (ps: with ps; [ m3u8 pyqt5_with_qtmultimedia ]); in mkDerivation { pname = "qarte"; - version = "4.15.1"; + version = "4.17.1"; src = fetchbzr { url = "http://bazaar.launchpad.net/~vincent-vandevyvre/qarte/qarte-4"; - rev = "67"; - sha256 = "sha256:0ajvrvpyqyyxnq9nv69p3sr6c1kplphvrpph75k76yl0av94j2s3"; + rev = "74"; + sha256 = "sha256:18ky9qwfvbifd0xrbmnfm3cm2vyy5jgf9rrca2hby46sjf2745h4"; }; buildInputs = [ pythonEnv ]; From 788a347a174df3c1a0bc3710e45b5d053ef6a817 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Thu, 2 Jun 2022 23:10:37 +0200 Subject: [PATCH 229/245] stuntrally: 2.6.1 -> 2.6.2 This update also fixes the build problems reported in #175646. --- pkgs/games/stuntrally/default.nix | 10 +++------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/games/stuntrally/default.nix b/pkgs/games/stuntrally/default.nix index 64e2dcc379b1..537a3f83a036 100644 --- a/pkgs/games/stuntrally/default.nix +++ b/pkgs/games/stuntrally/default.nix @@ -18,25 +18,21 @@ stdenv.mkDerivation rec { pname = "stunt-rally"; - version = "2.6.1"; + version = "2.6.2"; src = fetchFromGitHub { owner = "stuntrally"; repo = "stuntrally"; rev = version; - hash = "sha256-1+Cc9I6TTa3b++/7Z2V+vAXcmFb2+wX7TnXEH6CRDWU="; + hash = "sha256-9I6hXsosqx+yYiEOEnPXQJHZkGtSU+JqThorwjemlc0="; }; tracks = fetchFromGitHub { owner = "stuntrally"; repo = "tracks"; rev = version; - hash = "sha256-FbZc87j/9cp4LxNaEO2wNTvwk1Aq/IWcKD3rTGkzqj0="; + hash = "sha256-eZJAvkKe3PrXDzxTa5WFBHfltB3jhQh8puzOFDO9lso="; }; - # include/OGRE/OgreException.h:265:126: error: invalid conversion from - # 'int' to 'Ogre::Exception::ExceptionCodes' [-fpermissive] - NIX_CFLAGS_COMPILE = "-fpermissive"; - preConfigure = '' ln -s ${tracks} data/tracks ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 19165528cefc..60fecba06a11 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32305,7 +32305,7 @@ with pkgs; stt = callPackage ../tools/audio/stt { }; stuntrally = callPackage ../games/stuntrally - { stdenv = gcc10StdenvCompat; ogre = ogre1_9; mygui = mygui.override { withOgre = true; }; }; + { ogre = ogre1_9; mygui = mygui.override { withOgre = true; }; }; superTux = callPackage ../games/supertux { }; From 08ff8db9b984aeda984e232b18d6cfbbc69d2dd3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 Jun 2022 08:14:35 +0000 Subject: [PATCH 230/245] python310Packages.spacy: 3.3.0 -> 3.3.1 --- pkgs/development/python-modules/spacy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix index 40bd609520f6..ee8b773c8b85 100644 --- a/pkgs/development/python-modules/spacy/default.nix +++ b/pkgs/development/python-modules/spacy/default.nix @@ -31,14 +31,14 @@ buildPythonPackage rec { pname = "spacy"; - version = "3.3.0"; + version = "3.3.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-xJ1Q++NxWtxXQUGTZ7OaRo0lVmSEIvELb8Tt846uLLM="; + hash = "sha256-f4fb2xBNhRrmul/Tp2ouFOIuBIE1kD6YuvCFcaOqgcA="; }; propagatedBuildInputs = [ From e0d8c56200fd7ec9a325dd80a8f4ef5a8de9209b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 8 Jun 2022 10:15:06 +0200 Subject: [PATCH 231/245] python310Packages.dash: add input --- pkgs/development/python-modules/dash/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/dash/default.nix b/pkgs/development/python-modules/dash/default.nix index d29a6321623b..eb2e64191091 100644 --- a/pkgs/development/python-modules/dash/default.nix +++ b/pkgs/development/python-modules/dash/default.nix @@ -1,4 +1,5 @@ { lib +, buildPythonPackage , celery , dash-core-components , dash-html-components From b246d54635583a058e31c8d28a552d7723669560 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 8 Jun 2022 12:05:43 +1000 Subject: [PATCH 232/245] buildGoModule: remove `runVend` follow up from 8a8c88de70bd7f967cb20ad07583ea9ef12a4a94 --- pkgs/development/go-modules/generic/default.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix index 4dff2d82848d..7cab5d38c7b3 100644 --- a/pkgs/development/go-modules/generic/default.nix +++ b/pkgs/development/go-modules/generic/default.nix @@ -41,9 +41,6 @@ , meta ? {} -# disabled -, runVend ? false - # Not needed with buildGoModule , goPackagePath ? "" @@ -55,8 +52,6 @@ with builtins; -assert runVend != false -> throw "`runVend` has been replaced by `proxyVendor`"; - assert goPackagePath != "" -> throw "`goPackagePath` is not needed with `buildGoModule`"; let From cb6b96591e3c9857ae4f0acebd1261daa6fd57cd Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 8 Jun 2022 12:05:54 +1000 Subject: [PATCH 233/245] vend: remove this is no longer used by `buildGoModule` --- pkgs/development/tools/vend/default.nix | 37 ------------------- pkgs/development/tools/vend/remove_tidy.patch | 13 ------- pkgs/top-level/all-packages.nix | 2 - 3 files changed, 52 deletions(-) delete mode 100644 pkgs/development/tools/vend/default.nix delete mode 100644 pkgs/development/tools/vend/remove_tidy.patch diff --git a/pkgs/development/tools/vend/default.nix b/pkgs/development/tools/vend/default.nix deleted file mode 100644 index 0b037a9068c1..000000000000 --- a/pkgs/development/tools/vend/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "vend"; - - /* - This package is used to generate vendor folders for - packages that use the `runVend` option with `buildGoModule`. - - Do not update this package without checking that the vendorSha256 - hashes of packages using the `runVend` option are unchanged - or updating their vendorSha256 hashes if necessary. - */ - version = "1.0.2"; - # Disable the bot - # nixpkgs-update: no auto update - - # Disable `mod tidy`, patch was refused upstream - # https://github.com/nomad-software/vend/pull/9 - patches = [ ./remove_tidy.patch ]; - - src = fetchFromGitHub { - owner = "nomad-software"; - repo = "vend"; - rev = "v${version}"; - sha256 = "0h9rwwb56nzs46xsvl92af71i8b3wz3pf9ngi8v0i2bpk7p3p89d"; - }; - - vendorSha256 = null; - - meta = with lib; { - homepage = "https://github.com/nomad-software/vend"; - description = "A utility which vendors go code including c dependencies"; - maintainers = with maintainers; [ c00w mic92 zowoq ]; - license = licenses.mit; - }; -} diff --git a/pkgs/development/tools/vend/remove_tidy.patch b/pkgs/development/tools/vend/remove_tidy.patch deleted file mode 100644 index d5db74a1bd70..000000000000 --- a/pkgs/development/tools/vend/remove_tidy.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/cli/cmd.go b/cli/cmd.go -index c766559..3a133fd 100644 ---- a/cli/cmd.go -+++ b/cli/cmd.go -@@ -12,7 +12,7 @@ import ( - // UpdateModule makes sure the module is updated ready to vendor the - // dependencies. - func UpdateModule() { -- var commands = []string{"tidy", "download", "vendor"} -+ var commands = []string{"download", "vendor"} - - for _, command := range commands { - cmd := exec.Command("go", "mod", command) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fbe82143c24e..a3f93bdfe181 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11288,8 +11288,6 @@ with pkgs; vcstool = callPackage ../development/tools/vcstool { }; - vend = callPackage ../development/tools/vend { }; - verco = callPackage ../applications/version-management/verco { }; verilator = callPackage ../applications/science/electronics/verilator {}; From 80755988848e1ab4b08fb026e1652ff50ab54b65 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 7 Jun 2022 15:17:26 +1000 Subject: [PATCH 234/245] terraform: add passthru.tests --- pkgs/applications/networking/cluster/terraform/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 2df294449f8b..0532dd84868b 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -196,7 +196,10 @@ rec { sha256 = "sha256-LkRCumyNHVBSsXRp1ovNMGCeidK/jVCjh9H1HSE1Lm8="; vendorSha256 = "sha256-CVgAmPM0nt0Wx+N0qs+IO5KwCWnbfif70EHjBi0bIsQ="; patches = [ ./provider-path-0_15.patch ]; - passthru = { inherit plugins; }; + passthru = { + inherit plugins; + tests = { inherit terraform_plugins_test; }; + }; }; # Tests that the plugins are being used. Terraform looks at the specific From 316f6d73684e083331659f0329d189392098dc31 Mon Sep 17 00:00:00 2001 From: zendo Date: Wed, 8 Jun 2022 19:33:04 +0800 Subject: [PATCH 235/245] ydict: 2.2.0 -> 2.2.1 --- pkgs/applications/misc/ydict/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/ydict/default.nix b/pkgs/applications/misc/ydict/default.nix index 49370870f692..9440c2368100 100644 --- a/pkgs/applications/misc/ydict/default.nix +++ b/pkgs/applications/misc/ydict/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "ydict"; - version = "2.2.0"; + version = "2.2.1"; src = fetchFromGitHub { owner = "TimothyYe"; repo = "ydict"; rev = "v${version}"; - sha256 = "sha256-zhjsXZsRk0UNijjqjGjZh4TiPxAM5p+ic3JMx2wrPeY="; + sha256 = "sha256-qrGOrqI+PXsDNCmgcCPDNn6qUYu2emhYSkYsz4sj27M="; }; - vendorSha256 = "sha256-O6czDfKD18rGVMIZv6II09oQu1w0ijQRuZRGt2gj9Cs="; + vendorSha256 = "sha256-c5nQVQd4n978kFAAKcx5mX2Jz16ZOhS8iL/oxS1o5xs="; ldflags = [ "-s" "-w" "-X=main.Version=${version}" ]; From a2e09a870383da5109f1d8b09c12031abc1a041c Mon Sep 17 00:00:00 2001 From: Mr Hedgehog Date: Wed, 8 Jun 2022 08:27:08 -0400 Subject: [PATCH 236/245] zellij: 0.29.1 -> 0.30.0 --- pkgs/tools/misc/zellij/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/zellij/default.nix b/pkgs/tools/misc/zellij/default.nix index 421c7d21d305..a97402e7ba90 100644 --- a/pkgs/tools/misc/zellij/default.nix +++ b/pkgs/tools/misc/zellij/default.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "zellij"; - version = "0.29.1"; + version = "0.30.0"; src = fetchFromGitHub { owner = "zellij-org"; repo = "zellij"; rev = "v${version}"; - sha256 = "sha256-KuelmMQdCazwTlolH5xvvNXZfzHQDUV6rrlk037GFb8="; + sha256 = "sha256-T2mkkE7z6AhHnn/77HcrvbY+32EOwE8jjh+veVOE1CY="; }; - cargoSha256 = "sha256-He8rMY8n15ZSF/GcbuYTx2JfZgqQnsZLfqP+lUYxnzw="; + cargoSha256 = "sha256-XTaQbMK7R43CE03niUaBzlYN4xRo7pUFdNYvUeA+MwA="; nativeBuildInputs = [ mandown @@ -61,6 +61,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://zellij.dev/"; changelog = "https://github.com/zellij-org/zellij/blob/v${version}/Changelog.md"; license = with licenses; [ mit ]; - maintainers = with maintainers; [ therealansh _0x4A6F abbe ]; + maintainers = with maintainers; [ therealansh _0x4A6F abbe thehedgeh0g ]; }; } From b54c34e4584a6605dc96d89af438a137108ef40d Mon Sep 17 00:00:00 2001 From: Mr Hedgehog Date: Wed, 8 Jun 2022 08:29:17 -0400 Subject: [PATCH 237/245] mprocs: 0.2.2 -> 0.4.0 --- pkgs/tools/misc/mprocs/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/mprocs/default.nix b/pkgs/tools/misc/mprocs/default.nix index 2a14f252f4ad..a91b2a4d6acb 100644 --- a/pkgs/tools/misc/mprocs/default.nix +++ b/pkgs/tools/misc/mprocs/default.nix @@ -2,21 +2,21 @@ rustPlatform.buildRustPackage rec { pname = "mprocs"; - version = "0.2.2"; + version = "0.4.0"; src = fetchFromGitHub { owner = "pvolok"; repo = pname; rev = "v${version}"; - sha256 = "sha256-9wac2jlh8MLggcYuEHVUPYPjhfzGN+4o1XT8B9pj4f8="; + sha256 = "sha256-IzaXcEm4eUpLWsn59ZSiIJ0mCegLhBiA3ONKI1Djemk="; }; - cargoSha256 = "sha256-vGhoM5VMJO+ppLk8DetNZ8UteU6ifdtRe1HNJ0dSB+0="; + cargoSha256 = "sha256-nTFCFmmS3IIm+D2PjvDxUKQGTn2h0ajXtxLuosa9rRY="; meta = with lib; { description = "A TUI tool to run multiple commands in parallel and show the output of each command separately"; homepage = "https://github.com/pvolok/mprocs"; license = licenses.mit; - maintainers = [ maintainers.GaetanLepage ]; + maintainers = with maintainers; [ GaetanLepage thehedgeh0g ]; }; } From 34b85dfb8503442a85e68a9d8ccaa7246ca3e9ef Mon Sep 17 00:00:00 2001 From: linj Date: Wed, 8 Jun 2022 19:36:52 +0800 Subject: [PATCH 238/245] nixos/ibus: fix services.dbus.package --- nixos/modules/i18n/input-method/ibus.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/i18n/input-method/ibus.nix b/nixos/modules/i18n/input-method/ibus.nix index c5b0cbc21502..d9d9864ab9e0 100644 --- a/nixos/modules/i18n/input-method/ibus.nix +++ b/nixos/modules/i18n/input-method/ibus.nix @@ -67,7 +67,7 @@ in programs.dconf.packages = [ ibusPackage ]; services.dbus.packages = [ - ibusAutostart + ibusPackage ]; environment.variables = { From 4b273cb243a93f026a478241c988f6e4a5c6ec6a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Mar 2022 16:38:50 +0000 Subject: [PATCH 239/245] ispell: 3.4.04 -> 3.4.05 --- pkgs/tools/text/ispell/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/ispell/default.nix b/pkgs/tools/text/ispell/default.nix index 9a3f37cc64a5..6a004253a4f0 100644 --- a/pkgs/tools/text/ispell/default.nix +++ b/pkgs/tools/text/ispell/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ispell"; - version = "3.4.04"; + version = "3.4.05"; src = fetchurl { url = "https://www.cs.hmc.edu/~geoff/tars/${pname}-${version}.tar.gz"; - sha256 = "sha256-h7zW8FIdhaCjp4NCFZVtdOvEkxRMx8eR+HvmhyzP4T4="; + sha256 = "sha256-zwxt7eP9JfraQ3XYasr+WDy5bY/lRt50apLrtt+JVgI="; }; buildInputs = [ bison ncurses ]; From 04dcb539343c0c9ab57575d241d8a7f196d7cbc8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 Jun 2022 08:03:49 +0000 Subject: [PATCH 240/245] picard: 2.8 -> 2.8.1 --- pkgs/applications/audio/picard/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix index aff62e96576a..481f151ed561 100644 --- a/pkgs/applications/audio/picard/default.nix +++ b/pkgs/applications/audio/picard/default.nix @@ -18,13 +18,13 @@ let in pythonPackages.buildPythonApplication rec { pname = "picard"; - version = "2.8"; + version = "2.8.1"; src = fetchFromGitHub { owner = "metabrainz"; repo = pname; rev = "refs/tags/release-${version}"; - sha256 = "sha256-DG5b3mw6AL4HSF3diGXOqIeH/eXGqLOsbcnPbD6kznE="; + sha256 = "sha256-KEKOouTNmmZiPyKo8xCQv6Zkreidtz2DaEbHjuwJJvY="; }; nativeBuildInputs = [ gettext qt5.wrapQtAppsHook qt5.qtbase ] From c0b05f106f816fd1dfe9a3ad71beb06f2d9bd1b5 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 8 Jun 2022 13:46:26 +0000 Subject: [PATCH 241/245] nixos/localtime: add missing mkRenamedOptionModule Fixes: ffae8569b01 ("nixos/localtimed: hopefully fix geoclue") --- nixos/modules/services/system/localtime.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/services/system/localtime.nix b/nixos/modules/services/system/localtime.nix index 6383e454e76b..689453375f5a 100644 --- a/nixos/modules/services/system/localtime.nix +++ b/nixos/modules/services/system/localtime.nix @@ -5,6 +5,8 @@ with lib; let cfg = config.services.localtimed; in { + imports = [ (lib.mkRenamedOptionModule [ "services" "localtime" ] [ "services" "localtimed" ]) ]; + options = { services.localtimed = { enable = mkOption { From 13712fce0efb0987a22e9780343c23a930621c2e Mon Sep 17 00:00:00 2001 From: necrophcodr Date: Mon, 6 Jun 2022 17:17:26 +0200 Subject: [PATCH 242/245] gmqcc: init at unstable-2021-07-09 --- maintainers/maintainer-list.nix | 6 +++ pkgs/development/compilers/gmqcc/default.nix | 43 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 51 insertions(+) create mode 100644 pkgs/development/compilers/gmqcc/default.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 34300227f125..69380e4c42d6 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -9091,6 +9091,12 @@ githubId = 3747396; name = "Nathan Isom"; }; + necrophcodr = { + email = "nc@scalehost.eu"; + github = "necrophcodr"; + githubId = 575887; + name = "Steffen Rytter Postas"; + }; neilmayhew = { email = "nix@neil.mayhew.name"; github = "neilmayhew"; diff --git a/pkgs/development/compilers/gmqcc/default.nix b/pkgs/development/compilers/gmqcc/default.nix new file mode 100644 index 000000000000..f3b25e2dbd4a --- /dev/null +++ b/pkgs/development/compilers/gmqcc/default.nix @@ -0,0 +1,43 @@ +{ lib +, pkgs +, stdenv +, fetchFromGitHub +}: + +stdenv.mkDerivation rec { + pname = "gmqcc"; + version = "unstable-2021-07-09"; + + src = fetchFromGitHub { + owner = "graphitemaster"; + repo = "gmqcc"; + rev = "297eab9e5e2c9cc4f41201b68821593a5cf9a725"; + sha256 = "1hl2qn7402ia03kjkblj4q4wfypxkil99sivsyk2vrnwwpdp4nzx"; + }; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + install -m755 gmqcc $out/bin + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://graphitemaster.github.io/gmqcc/"; + description = "A modern QuakeC compiler"; + longDescription = '' + For an enduring period of time the options for a decent compiler for + the Quake C programming language were confined to a specific compiler + known as QCC. Attempts were made to extend and improve upon the design + of QCC, but many foreseen the consequences of building on a broken + foundation. The solution was obvious, a new compiler; one born from + the NIH realm of sarcastic wit. + We welcome you. You won't find a better Quake C compiler. + ''; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ necrophcodr ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c428c25fdaf6..ee7693517faf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13020,6 +13020,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; + gmqcc = callPackage ../development/compilers/gmqcc {}; + gtk-server = callPackage ../development/interpreters/gtk-server {}; # Haskell and GHC From ecf2791d8b2a53d72545fc3650b1386f7284c064 Mon Sep 17 00:00:00 2001 From: Pierre Roux Date: Wed, 8 Jun 2022 14:38:58 +0200 Subject: [PATCH 243/245] coq_8_16: init at 8.16+rc1 --- pkgs/applications/science/logic/coq/default.nix | 1 + pkgs/development/coq-modules/bignums/default.nix | 1 + pkgs/top-level/all-packages.nix | 1 + pkgs/top-level/coq-packages.nix | 2 ++ 4 files changed, 5 insertions(+) diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index c85bcd21a0cc..f91b336cbf6f 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -49,6 +49,7 @@ let "8.15.0".sha256 = "sha256:1ma76wfrpfsl72yh10w1ys2a0vi0mdc2jc79kdc8nrmxkhpw1nxx"; "8.15.1".sha256 = "sha256:1dsa04jzkx5pw69pmxn0l55q4w88lg6fvz7clbga0bazzsfnsgd6"; "8.15.2".sha256 = "sha256:0gn8dz69scxnxaq6ycb3x34bjfk9wlp1y2xn8w69kg9fm4b6gkc7"; + "8.16+rc1".sha256 = "sha256-dU+E0Mz7MVntbQIeG9I59ANBaHaXXSrjCRdoqZ5TO60="; }; releaseRev = v: "V${v}"; fetched = import ../../../../build-support/coq/meta-fetch/default.nix diff --git a/pkgs/development/coq-modules/bignums/default.nix b/pkgs/development/coq-modules/bignums/default.nix index a53b8199fe96..798ea04368f8 100644 --- a/pkgs/development/coq-modules/bignums/default.nix +++ b/pkgs/development/coq-modules/bignums/default.nix @@ -8,6 +8,7 @@ with lib; mkCoqDerivation { defaultVersion = if versions.isGe "8.6" coq.coq-version then "${coq.coq-version}.0" else null; + release."8.16.0".sha256 = "sha256-DH3iWwatPlhhCVYVlgL2WLkvneSVzSXUiKo2e0+1zR4="; release."8.15.0".sha256 = "093klwlhclgyrba1iv18dyz1qp5f0lwiaa7y0qwvgmai8rll5fns"; release."8.14.0".sha256 = "0jsgdvj0ddhkls32krprp34r64y1rb5mwxl34fgaxk2k4664yq06"; release."8.13.0".sha256 = "1n66i7hd9222b2ks606mak7m4f0dgy02xgygjskmmav6h7g2sx7y"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 73693bab099b..72a7e29afb85 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33249,6 +33249,7 @@ with pkgs; coqPackages_8_13 coq_8_13 coqPackages_8_14 coq_8_14 coqPackages_8_15 coq_8_15 + coqPackages_8_16 coq_8_16 coqPackages coq ; diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index 6cfd34aa279b..91894bfaa9e7 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -151,6 +151,7 @@ in rec { coq_8_13 = mkCoq "8.13"; coq_8_14 = mkCoq "8.14"; coq_8_15 = mkCoq "8.15"; + coq_8_16 = mkCoq "8.16"; coqPackages_8_5 = mkCoqPackages coq_8_5; coqPackages_8_6 = mkCoqPackages coq_8_6; @@ -163,6 +164,7 @@ in rec { coqPackages_8_13 = mkCoqPackages coq_8_13; coqPackages_8_14 = mkCoqPackages coq_8_14; coqPackages_8_15 = mkCoqPackages coq_8_15; + coqPackages_8_16 = mkCoqPackages coq_8_16; coqPackages = recurseIntoAttrs coqPackages_8_15; coq = coqPackages.coq; From 74562a214ef5052e475baf29db5f92f0ae891093 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 8 Jun 2022 17:12:16 +0000 Subject: [PATCH 244/245] lib.systems.amd64-netbsd: remove This has been deprecated for a long time, and it's doubtful it had any users to start with. And having an undisablable warning when enumarating platforms is not good. --- lib/systems/examples.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix index e41290864ed1..b26407117c85 100644 --- a/lib/systems/examples.nix +++ b/lib/systems/examples.nix @@ -306,8 +306,6 @@ rec { # BSDs - amd64-netbsd = lib.warn "The amd64-netbsd system example is deprecated. Use x86_64-netbsd instead." x86_64-netbsd; - x86_64-netbsd = { config = "x86_64-unknown-netbsd"; libc = "nblibc"; From 5dfe7f928e43d6e493f3bec504fa94b6c38ee0c4 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 8 Jun 2022 13:23:00 +0000 Subject: [PATCH 245/245] release-cross.nix: fix cross bootstrap tools eval In 5643714dea5, I changed pkgs/stdenv/linux/make-bootstrap-tools.nix to take a package set instead of system and localSystem arguments, but I forgot to update make-bootstrap-tools-cross.nix. Fixes: 5643714dea5 ("stdenvBootstrapTools: inherit {cross,local}System") --- pkgs/stdenv/linux/make-bootstrap-tools-cross.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix index 02eb112451bd..2665330206e1 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix @@ -1,11 +1,16 @@ {system ? builtins.currentSystem}: let - make = crossSystem: import ./make-bootstrap-tools.nix { - localSystem = { inherit system; }; - inherit crossSystem; + inherit (releaseLib) lib; + releaseLib = import ../../top-level/release-lib.nix { + # We're not using any functions from release-lib.nix that look at + # supportedSystems. + supportedSystems = []; + }; + + make = crossSystem: import ./make-bootstrap-tools.nix { + pkgs = releaseLib.pkgsForCross crossSystem system; }; - lib = import ../../../lib; in lib.mapAttrs (n: make) (with lib.systems.examples; { armv5tel = sheevaplug; pogoplug4 = pogoplug4;